cstyle/transformers/ol/main.go

diff --git a/cstyle/transformers/ol/main.go b/cstyle/transformers/ol/main.go
index eab80c6..e393379 100644
--- a/cstyle/transformers/ol/main.go
+++ b/cstyle/transformers/ol/main.go
@@ -26,4 +26,4 @@ func Init() cstyle.Transformer {
-				li.CStyle = v.CStyle
-				li.CStyle["display"] = "flex"
-				li.CStyle["align-items"] = "center"
-				li.CStyle = c.QuickStyles(&li)
+				li.Style = v.Style
+				li.Style["display"] = "flex"
+				li.Style["align-items"] = "center"
+				li.Style = c.QuickStyles(&li)
@@ -32,2 +32,2 @@ func Init() cstyle.Transformer {
-				dot.CStyle = li.CStyle
-				dot.CStyle["margin-right"] = "6px"
+				dot.Style = li.Style
+				dot.Style["margin-right"] = "6px"
@@ -35,2 +35,2 @@ func Init() cstyle.Transformer {
-				dot.CStyle = c.QuickStyles(&dot)
-				dot.CStyle["display"] = "block"
+				dot.Style = c.QuickStyles(&dot)
+				dot.Style["display"] = "block"
@@ -40 +40 @@ func Init() cstyle.Transformer {
-				if n.CStyle["font-style"] == "italic" {
+				if n.Style["font-style"] == "italic" {
@@ -48 +48 @@ func Init() cstyle.Transformer {
-				fs := utils.ConvertToPixels(n.CStyle["font-size"], 16, c.Width)
+				fs := utils.ConvertToPixels(n.Style["font-size"], 16, c.Width)
@@ -51 +51 @@ func Init() cstyle.Transformer {
-				fid := n.CStyle["font-family"] + fmt.Sprint(em, n.CStyle["font-weight"], italic)
+				fid := n.Style["font-family"] + fmt.Sprint(em, n.Style["font-weight"], italic)
@@ -53 +53 @@ func Init() cstyle.Transformer {
-					f, _ := font.LoadFont(n.CStyle["font-family"], int(em), n.CStyle["font-weight"], italic, &c.Adapter.FileSystem)
+					f, _ := font.LoadFont(n.Style["font-family"], int(em), n.Style["font-weight"], italic, &c.Adapter.FileSystem)
@@ -67,3 +67,3 @@ func Init() cstyle.Transformer {
-				content.CStyle = li.CStyle
-				content.CStyle = c.QuickStyles(&content)
-				content.CStyle["display"] = "block"
+				content.Style = li.Style
+				content.Style = c.QuickStyles(&content)
+				content.Style["display"] = "block"
@@ -79 +79 @@ func Init() cstyle.Transformer {
-				tN.Children[i].Children[0].CStyle["margin-left"] = strconv.Itoa((maxOS - widths[i])) + "px"
+				tN.Children[i].Children[0].Style["margin-left"] = strconv.Itoa((maxOS - widths[i])) + "px"

package ol

import (
	"fmt"
	"grim/cstyle"
	"grim/element"
	"grim/font"
	"grim/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.CStyle = v.CStyle
				li.CStyle["display"] = "flex"
				li.CStyle["align-items"] = "center"
				li.CStyle = c.QuickStyles(&li)

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

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

				italic := false

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

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

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

				fid := n.CStyle["font-family"] + fmt.Sprint(em, n.CStyle["font-weight"], italic)
				if c.Fonts[fid] == nil {
					f, _ := font.LoadFont(n.CStyle["font-family"], int(em), n.CStyle["font-weight"], italic, &c.Adapter.FileSystem)
					c.Fonts[fid] = f
				}
				fnt := c.Fonts[fid]
				w, _ := font.MeasureText(&font.MetaData{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.CStyle = li.CStyle
				content.CStyle = c.QuickStyles(&content)
				content.CStyle["display"] = "block"

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

				tN.AppendChild(&li)
			}

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