cstyle/transformers/ol/main.go

diff --git a/cstyle/transformers/ol/main.go b/cstyle/transformers/ol/main.go
index 7d7f891..d243037 100644
--- a/cstyle/transformers/ol/main.go
+++ b/cstyle/transformers/ol/main.go
@@ -4 +3,0 @@ import (
-	"fmt"
@@ -8 +6,0 @@ import (
-	"gui/utils"
@@ -10,2 +7,0 @@ import (
-
-	imgFont "golang.org/x/image/font"
@@ -19 +15 @@ func Init() cstyle.Transformer {
-		Handler: func(n *element.Node, c *cstyle.CSS) *element.Node {
+		Handler: func(n element.Node, c *cstyle.CSS) element.Node {
@@ -38,12 +34,7 @@ func Init() cstyle.Transformer {
-				bold, italic := false, false
-
-				if n.Style["font-weight"] == "bold" {
-					bold = true
-				}
-
-				if n.Style["font-style"] == "italic" {
-					italic = true
-				}
-
-				if c.Fonts == nil {
-					c.Fonts = map[string]imgFont.Face{}
+				for _, b := range c.Fonts {
+					w := font.MeasureText(&element.Text{Font: &b}, strconv.Itoa(i+1)+".")
+					widths = append(widths, w)
+					if w > maxOS {
+						maxOS = w
+					}
+					break
@@ -51,16 +41,0 @@ func Init() cstyle.Transformer {
-
-				fs := utils.ConvertToPixels(n.Style["font-size"], 16, c.Width)
-				em := fs
-
-				fid := n.Style["font-family"] + fmt.Sprint(em, bold, italic)
-				if c.Fonts[fid] == nil {
-					f, _ := font.LoadFont(n.Style["font-family"], int(em), bold, italic)
-					c.Fonts[fid] = f
-				}
-				fnt := c.Fonts[fid]
-				w := font.MeasureText(&element.Text{Font: &fnt}, strconv.Itoa(i+1)+".")
-				widths = append(widths, w)
-				if w > maxOS {
-					maxOS = w
-				}
-
@@ -75,3 +50,3 @@ func Init() cstyle.Transformer {
-				li.AppendChild(&dot)
-				li.AppendChild(&content)
-				li.Parent = n
+				li.AppendChild(dot)
+				li.AppendChild(content)
+				li.Parent = &n
@@ -79 +54 @@ func Init() cstyle.Transformer {
-				tN.AppendChild(&li)
+				tN.AppendChild(li)
@@ -81 +55,0 @@ func Init() cstyle.Transformer {
-

package ol

import (
	"fmt"
	"gui/cstyle"
	"gui/element"
	"gui/font"
	"gui/utils"
	"strconv"

	imgFont "golang.org/x/image/font"
)

func Init() cstyle.Transformer {
	return cstyle.Transformer{
		Selector: func(n *element.Node) bool {
			return n.TagName == "ol"
		},
		Handler: func(n *element.Node, c *cstyle.CSS) *element.Node {
			tN := n.CreateElement(n.TagName)
			var maxOS int
			var widths []int
			for i, v := range n.Children {
				li := n.CreateElement("li")

				li.Style = v.Style
				li.Style["display"] = "flex"
				li.Style["align-items"] = "center"
				li.Style = c.QuickStyles(&li)

				dot := li.CreateElement("div")
				dot.Style = li.Style
				dot.Style["margin-right"] = "6px"

				dot.Style = c.QuickStyles(&dot)
				dot.Style["display"] = "block"

				bold, italic := false, false

				if n.Style["font-weight"] == "bold" {
					bold = true
				}

				if n.Style["font-style"] == "italic" {
					italic = true
				}

				if c.Fonts == nil {
					c.Fonts = map[string]imgFont.Face{}
				}

				fs := utils.ConvertToPixels(n.Style["font-size"], 16, c.Width)
				em := fs

				fid := n.Style["font-family"] + fmt.Sprint(em, bold, italic)
				if c.Fonts[fid] == nil {
					f, _ := font.LoadFont(n.Style["font-family"], int(em), bold, italic)
					c.Fonts[fid] = f
				}
				fnt := c.Fonts[fid]
				w := font.MeasureText(&element.Text{Font: &fnt}, strconv.Itoa(i+1)+".")
				widths = append(widths, w)
				if w > maxOS {
					maxOS = w
				}

				dot.InnerText = strconv.Itoa(i+1) + "."

				content := li.CreateElement("div")
				content.InnerText = v.InnerText
				content.Style = li.Style
				content.Style = c.QuickStyles(&content)
				content.Style["display"] = "block"

				li.AppendChild(&dot)
				li.AppendChild(&content)
				li.Parent = n

				tN.AppendChild(&li)
			}

			for i := range tN.Children {
				tN.Children[i].Children[0].Style["margin-left"] = strconv.Itoa((maxOS - widths[i])) + "px"
			}
			n.Children = tN.Children
			return n
		},
	}
}