cstyle/transformers/text/main.go

diff --git a/cstyle/transformers/text/main.go b/cstyle/transformers/text/main.go
index fac138d..854288d 100644
--- a/cstyle/transformers/text/main.go
+++ b/cstyle/transformers/text/main.go
@@ -5,0 +6 @@ import (
+	"grim/utils"
@@ -20,3 +21,2 @@ func Init() cstyle.Transformer {
-		Selector: func(n *element.Node, c *cstyle.CSS) bool {
-			if n.TagName == "text" && len(n.Children) == 0 {
-				// fmt.Println("HAS TEXT: ", n.Properties.Id, n.InnerText)
+		Selector: func(n *element.Node) bool {
+			if !utils.ChildrenHaveText(n) && len(strings.TrimSpace(n.InnerText)) > 0 {
@@ -35 +35 @@ func Init() cstyle.Transformer {
-			if c.Styles[n.Properties.Id]["display"] == "inline" {
+			if n.CStyle["display"] == "inline" {
@@ -45,6 +45,2 @@ func Init() cstyle.Transformer {
-						qs := c.QuickStyles(&el)
-
-						for k, v := range qs {
-							el.Style(k, v)
-						}
-						el.Style("display", "inline")
+						el.CStyle = c.QuickStyles(&el)
+						el.CStyle["display"] = "inline"
@@ -52 +48 @@ func Init() cstyle.Transformer {
-						// fmt.Println("Insert", n.Properties.Id)
+
@@ -54 +49,0 @@ func Init() cstyle.Transformer {
-						// c.Styles[el.Properties.Id] = map[string]string{}
@@ -65,7 +60,3 @@ func Init() cstyle.Transformer {
-						qs := c.QuickStyles(&el)
-
-						for k, v := range qs {
-							el.Style(k, v)
-						}
-						el.Style("display", "inline")
-						el.Style("font-size", "1em")
+						el.CStyle = c.QuickStyles(&el)
+						el.CStyle["display"] = "inline"
+						el.CStyle["font-size"] = "1em"
@@ -74 +64,0 @@ func Init() cstyle.Transformer {
-						// fmt.Println("Insert", n.Properties.Id)
@@ -76 +65,0 @@ func Init() cstyle.Transformer {
-						// c.Styles[el.Properties.Id] = map[string]string{}

package text

import (
	"grim/cstyle"
	"grim/element"
	"html"
	"strings"
)

var nonRenderTags = map[string]bool{
	"head":  true,
	"meta":  true,
	"link":  true,
	"title": true,
	"style": true,
}

func Init() cstyle.Transformer {
	return cstyle.Transformer{
		Selector: func(n *element.Node, c *cstyle.CSS) bool {
			if n.TagName == "text" && len(n.Children) == 0 {
				// fmt.Println("HAS TEXT: ", n.Properties.Id, n.InnerText)
				return true
			} else {
				return false
			}
		},
		Handler: func(n *element.Node, c *cstyle.CSS) *element.Node {
			if nonRenderTags[n.TagName] {
				return n
			}

			words := strings.Split(strings.TrimSpace(n.InnerText), " ")
			n.InnerText = ""
			if c.Styles[n.Properties.Id]["display"] == "inline" {
				n.InnerText = DecodeHTMLEscapes(words[0])
				for i := 0; i < len(words)-1; i++ {
					// Add the words backwards because you are inserting adjacent to the parent
					a := (len(words) - 1) - i
					if len(strings.TrimSpace(words[a])) > 0 {
						el := n.CreateElement("text")
						el.InnerText = DecodeHTMLEscapes(words[a])
						el.Parent = n

						qs := c.QuickStyles(&el)

						for k, v := range qs {
							el.Style(k, v)
						}
						el.Style("display", "inline")
						// el.Style["margin-top"] = "10px"
						// fmt.Println("Insert", n.Properties.Id)
						n.Parent.InsertAfter(&el, n)
						// c.Styles[el.Properties.Id] = map[string]string{}
					}
				}

			} else {
				for i := 0; i < len(words); i++ {
					if len(strings.TrimSpace(words[i])) > 0 {
						el := n.CreateElement("text")
						el.InnerText = DecodeHTMLEscapes(words[i])
						el.Parent = n

						qs := c.QuickStyles(&el)

						for k, v := range qs {
							el.Style(k, v)
						}
						el.Style("display", "inline")
						el.Style("font-size", "1em")
						// el.Style["margin-top"] = "10px"

						// fmt.Println("Insert", n.Properties.Id)
						n.AppendChild(&el)
						// c.Styles[el.Properties.Id] = map[string]string{}
					}
				}
			}

			return n
		},
	}
}

func DecodeHTMLEscapes(input string) string {
	return html.UnescapeString(input)
}