diff --git a/font/main.go b/font/main.go
index 14f534e..050b338 100644
--- a/font/main.go
+++ b/font/main.go
@@ -89,0 +90 @@ func LoadFont(fontName string, fontSize int, bold, italic bool) (font.Face, erro
+	println(fontFile)
@@ -113,0 +115 @@ func MeasureText(t *Text, text string) int {
+	dot := fixed.Point26_6{}
@@ -125,0 +128,3 @@ func MeasureText(t *Text, text string) int {
+			// Calculate the glyph bounds
+			bounds, _, _ := t.Font.GlyphBounds(runeValue)
+
@@ -127 +132,2 @@ func MeasureText(t *Text, text string) int {
-			width += adv + fixed.I(t.LetterSpacing)
+			width += adv + bounds.Min.X + fixed.I(t.LetterSpacing)
+			dot.X += adv
@@ -134,0 +141,3 @@ func MeasureSpace(t *Text) int {
+	dot := fixed.Point26_6{}
+	var width fixed.Int26_6
+
@@ -136 +145,9 @@ func MeasureSpace(t *Text) int {
-	return adv.Round()
+
+	// Calculate the glyph bounds
+	bounds, _, _ := t.Font.GlyphBounds(' ')
+
+	// Update the total width with the glyph advance and bounds
+	width += adv + bounds.Min.X
+	dot.X += adv
+
+	return width.Round()
@@ -222,18 +239,17 @@ type Text struct {
-	Text                string
-	Font                font.Face
-	Color               color.Color
-	Image               *image.RGBA
-	Underlined          bool
-	Overlined           bool
-	LineThrough         bool
-	DecorationColor     color.Color
-	DecorationThickness int
-	Align               string
-	Indent              int // very low priority
-	LetterSpacing       int
-	LineHeight          int
-	WordSpacing         int
-	WhiteSpace          string
-	Shadows             []Shadow // need
-	Width               int
-	WordBreak           string
+	Text            string
+	Font            font.Face
+	Color           color.Color
+	Image           *image.RGBA
+	Underlined      bool   // need
+	Overlined       bool   // need
+	LineThrough     bool   // need
+	DecorationColor string // need
+	Align           string
+	Indent          int // very low priority
+	LetterSpacing   int
+	LineHeight      int
+	WordSpacing     int
+	WhiteSpace      string
+	Shadows         []Shadow // need
+	Width           int
+	WordBreak       string
@@ -250 +266,24 @@ func (t *Text) Render() float32 {
-	lines := t.GetLines()
+	var lines []string
+	if t.WhiteSpace == "nowrap" {
+		re := regexp.MustCompile(`\s+`)
+		t.Text = re.ReplaceAllString(t.Text, " ")
+		lines = t.wrap("
", false)
+	} else {
+		if t.WhiteSpace == "pre" {
+			re := regexp.MustCompile("\t")
+			t.Text = re.ReplaceAllString(t.Text, "     ")
+			nl := regexp.MustCompile(`[\r\n]+`)
+			lines = nl.Split(t.Text, -1)
+		} else if t.WhiteSpace == "pre-line" {
+			re := regexp.MustCompile(`\s+`)
+			t.Text = re.ReplaceAllString(t.Text, " ")
+			lines = t.wrap(" ", true)
+		} else if t.WhiteSpace == "pre-wrap" {
+			lines = t.wrap(" ", true)
+		} else {
+			re := regexp.MustCompile(`\s+`)
+			t.Text = re.ReplaceAllString(t.Text, " ")
+			lines = t.wrap(t.WordBreak, false)
+		}
+	}
+
@@ -266 +304,0 @@ func (t *Text) Render() float32 {
-	t.Image = img
@@ -302,0 +341 @@ func (t *Text) Render() float32 {
+	t.Image = img
@@ -307 +345,0 @@ func (t *Text) DrawString(dr *font.Drawer, v string) {
-	underlinePosition := dr.Dot
@@ -317,18 +354,0 @@ func (t *Text) DrawString(dr *font.Drawer, v string) {
-	if t.Underlined || t.Overlined || t.LineThrough {
-
-		underlinePosition.X = 0
-		baseLineY := underlinePosition.Y
-
-		if t.Underlined {
-			underlinePosition.Y = baseLineY + t.Font.Metrics().Descent
-			drawLine(t.Image, underlinePosition, dr.Dot.X, t.DecorationThickness, t.DecorationColor)
-		}
-		if t.LineThrough {
-			underlinePosition.Y = baseLineY - (t.Font.Metrics().Descent)
-			drawLine(t.Image, underlinePosition, dr.Dot.X, t.DecorationThickness, t.DecorationColor)
-		}
-		if t.Overlined {
-			underlinePosition.Y = baseLineY - t.Font.Metrics().Descent*3
-			drawLine(t.Image, underlinePosition, dr.Dot.X, t.DecorationThickness, t.DecorationColor)
-		}
-	}
@@ -368 +388,6 @@ func (t *Text) wrap(breaker string, breakNewLines bool) []string {
-func drawLine(img draw.Image, start fixed.Point26_6, width fixed.Int26_6, thickness int, col color.Color) {
+func drawLine(img draw.Image, start, end fixed.Point26_6, col color.Color) {
+	// Draw a line from start to end
+	drawLineToImage(img, start.X.Floor(), start.Y.Floor(), end.X.Floor(), end.Y.Floor(), col)
+}
+
+func drawLineToImage(img draw.Image, x0, y0, x1, y1 int, col color.Color) {
@@ -370,3 +394,0 @@ func drawLine(img draw.Image, start fixed.Point26_6, width fixed.Int26_6, thickn
-	x0, y0 := start.X.Round(), start.Y.Round()
-	x1 := x0 + int(width)
-	y1 := y0
@@ -387,3 +409 @@ func drawLine(img draw.Image, start fixed.Point26_6, width fixed.Int26_6, thickn
-		for i := 0; i < thickness; i++ {
-			img.Set(x0, (y0-(thickness/2))+i, col)
-		}
+		img.Set(x0, y0, col)
@@ -413,34 +432,0 @@ func abs(x int) int {
-
-func (t *Text) GetLines() []string {
-	var lines []string
-	if t.WhiteSpace == "nowrap" {
-		re := regexp.MustCompile(`\s+`)
-		t.Text = re.ReplaceAllString(t.Text, " ")
-		lines = t.wrap("
", false)
-	} else {
-		if t.WhiteSpace == "pre" {
-			re := regexp.MustCompile("\t")
-			t.Text = re.ReplaceAllString(t.Text, "     ")
-			nl := regexp.MustCompile(`[\r\n]+`)
-			lines = nl.Split(t.Text, -1)
-		} else if t.WhiteSpace == "pre-line" {
-			re := regexp.MustCompile(`\s+`)
-			t.Text = re.ReplaceAllString(t.Text, " ")
-			lines = t.wrap(" ", true)
-		} else if t.WhiteSpace == "pre-wrap" {
-			lines = t.wrap(" ", true)
-		} else {
-			re := regexp.MustCompile(`\s+`)
-			t.Text = re.ReplaceAllString(t.Text, " ")
-			nl := regexp.MustCompile(`[\r\n]+`)
-			t.Text = nl.ReplaceAllString(t.Text, "")
-			t.Text = strings.TrimSpace(t.Text)
-			lines = t.wrap(t.WordBreak, false)
-		}
-		for i, v := range lines {
-			lines[i] = v + t.WordBreak
-		}
-	}
-
-	return lines
-}

package font

import (
	"fmt"
	"image"
	"image/color"
	"image/draw"
	"io/ioutil"
	"os"
	"path/filepath"
	"regexp"
	"runtime"
	"sort"
	"strconv"
	"strings"

	"github.com/golang/freetype/truetype"
	"golang.org/x/image/font"
	"golang.org/x/image/math/fixed"
)

// LoadSystemFont loads a font from the system fonts directory or loads a specific font by name
func GetFontPath(fontName string, bold, italic bool) string {

	if len(fontName) == 0 {
		fontName = "serif"
	}

	// Check if a special font family is requested
	switch fontName {
	case "sans-serif":
		return tryLoadSystemFont("Arial", bold, italic)
	case "monospace":
		return tryLoadSystemFont("Andle Mono", bold, italic)
	case "serif":
		return tryLoadSystemFont("Georgia", bold, italic)
	}

	// Use the default font if the specified font is not found
	return tryLoadSystemFont(fontName, bold, italic)
}

var allFonts, _ = getSystemFonts()

func tryLoadSystemFont(fontName string, bold, italic bool) string {
	font := fontName
	if bold {
		font += " Bold"
	}
	if italic {
		font += " Italic"
	}
	for _, v := range allFonts {
		if strings.Contains(v, "/"+font) {
			return v
		}
	}

	return ""
}

func sortByLength(strings []string) {
	sort.Slice(strings, func(i, j int) bool {
		return len(strings[i]) < len(strings[j])
	})
}

func GetFontSize(css map[string]string) float32 {
	fL := len(css["font-size"])

	var fs float32 = 16

	if fL > 0 {
		if css["font-size"][fL-2:] == "px" {
			fs64, _ := strconv.ParseFloat(css["font-size"][0:fL-2], 32)
			fs = float32(fs64)
		}
		if css["font-size"][fL-2:] == "em" {
			fs64, _ := strconv.ParseFloat(css["font-size"][0:fL-2], 32)
			fs = float32(fs64)
		}
	}

	return fs
}

func LoadFont(fontName string, fontSize int, bold, italic bool) (font.Face, error) {
	// Use a TrueType font file for the specified font name
	fontFile := GetFontPath(fontName, bold, italic)

	// Read the font file
	fontData, err := os.ReadFile(fontFile)
	if err != nil {
		return nil, err
	}

	// Parse the TrueType font data
	fnt, err := truetype.Parse(fontData)
	if err != nil {
		return nil, err
	}

	options := truetype.Options{
		Size:    float64(fontSize),
		DPI:     72,
		Hinting: font.HintingNone,
	}

	// Create a new font face with the specified size
	return truetype.NewFace(fnt, &options), nil
}

func MeasureText(t *Text, text string) int {
	var width fixed.Int26_6

	for _, runeValue := range text {
		if runeValue == ' ' {
			// Handle spaces separately, add word spacing
			width += fixed.I(t.WordSpacing)
		} else {
			adv, ok := t.Font.GlyphAdvance(runeValue)
			if !ok {
				continue
			}

			// Update the total width with the glyph advance and bounds
			width += adv + fixed.I(t.LetterSpacing)
		}
	}

	return width.Round()
}

func MeasureSpace(t *Text) int {
	adv, _ := t.Font.GlyphAdvance(' ')
	return adv.Round()
}

func getSystemFonts() ([]string, error) {
	var fontPaths []string

	switch runtime.GOOS {
	case "windows":
		fontPaths = append(fontPaths, getWindowsFontPaths()...)
	case "darwin":
		fontPaths = append(fontPaths, getMacFontPaths()...)
	case "linux":
		fontPaths = append(fontPaths, getLinuxFontPaths()...)
	default:
		return nil, fmt.Errorf("unsupported operating system: %s", runtime.GOOS)
	}

	sortByLength(fontPaths)

	return fontPaths, nil
}

func getWindowsFontPaths() []string {
	var fontPaths []string

	// System Fonts
	systemFontsDir := "C:\\Windows\\Fonts"
	getFontsRecursively(systemFontsDir, &fontPaths)

	// User Fonts
	userFontsDir := os.ExpandEnv("%APPDATA%\\Microsoft\\Windows\\Fonts")
	getFontsRecursively(userFontsDir, &fontPaths)

	return fontPaths
}

func getMacFontPaths() []string {
	var fontPaths []string

	// System Fonts
	systemFontsDirs := []string{"/System/Library/Fonts", "/Library/Fonts"}
	for _, dir := range systemFontsDirs {
		getFontsRecursively(dir, &fontPaths)
	}

	// User Fonts
	userFontsDir := filepath.Join(os.Getenv("HOME"), "Library/Fonts")
	getFontsRecursively(userFontsDir, &fontPaths)

	return fontPaths
}

func getLinuxFontPaths() []string {
	var fontPaths []string

	// System Fonts
	systemFontsDirs := []string{"/usr/share/fonts", "/usr/local/share/fonts"}
	for _, dir := range systemFontsDirs {
		getFontsRecursively(dir, &fontPaths)
	}

	// User Fonts
	userFontsDir := filepath.Join(os.Getenv("HOME"), ".fonts")
	getFontsRecursively(userFontsDir, &fontPaths)

	return fontPaths
}

func getFontsRecursively(dir string, fontPaths *[]string) {
	files, err := ioutil.ReadDir(dir)
	if err != nil {
		fmt.Println("Error reading directory:", err)
		return
	}

	for _, file := range files {
		path := filepath.Join(dir, file.Name())
		if file.IsDir() {
			getFontsRecursively(path, fontPaths)
		} else if strings.HasSuffix(strings.ToLower(file.Name()), ".ttf") {
			*fontPaths = append(*fontPaths, path)
		}
	}
}

type Text struct {
	Text                string
	Font                font.Face
	Color               color.Color
	Image               *image.RGBA
	Underlined          bool
	Overlined           bool
	LineThrough         bool
	DecorationColor     color.Color
	DecorationThickness int
	Align               string
	Indent              int // very low priority
	LetterSpacing       int
	LineHeight          int
	WordSpacing         int
	WhiteSpace          string
	Shadows             []Shadow // need
	Width               int
	WordBreak           string
}

type Shadow struct {
	X     int
	Y     int
	Blur  int
	Color color.Color
}

func (t *Text) Render() float32 {
	lines := t.GetLines()
	// Use fully transparent color for the background
	img := image.NewRGBA(image.Rect(0, 0, t.Width, t.LineHeight*(len(lines)+2)))

	r, g, b, a := t.Color.RGBA()

	draw.Draw(img, img.Bounds(), &image.Uniform{color.RGBA{uint8(r), uint8(g), uint8(b), 0}}, image.Point{}, draw.Over)

	dot := fixed.Point26_6{X: fixed.I(0), Y: t.Font.Metrics().Ascent}

	dr := &font.Drawer{
		Dst:  img,
		Src:  &image.Uniform{color.RGBA{uint8(r), uint8(g), uint8(b), uint8(a)}},
		Face: t.Font,
		Dot:  dot,
	}
	t.Image = img

	fh := fixed.I(t.LineHeight)
	for _, v := range lines {
		if t.Align == "justify" {
			dr.Dot.X = 0
			spaces := strings.Count(v, " ")
			if spaces > 1 {
				spacing := fixed.I((t.Width - MeasureText(t, v)) / spaces)

				if spacing > 0 {
					for _, word := range strings.Fields(v) {
						dr.DrawString(word)
						dr.Dot.X += spacing
					}
				} else {
					dr.Dot.X = 0
					t.DrawString(dr, v)
				}
			} else {
				dr.Dot.X = 0
				t.DrawString(dr, v)
			}

		} else {
			if t.Align == "left" || t.Align == "" {
				dr.Dot.X = 0
			} else if t.Align == "center" {
				dr.Dot.X = fixed.I((t.Width - MeasureText(t, v)) / 2)
			} else if t.Align == "right" {
				dr.Dot.X = fixed.I(t.Width - MeasureText(t, v))
			}
			t.DrawString(dr, v)
		}
		dr.Dot.Y += fh
	}

	return float32(t.LineHeight * len(lines))
}

func (t *Text) DrawString(dr *font.Drawer, v string) {
	underlinePosition := dr.Dot
	for _, ch := range v {
		if ch == ' ' {
			// Handle spaces separately, add word spacing
			dr.Dot.X += fixed.I(t.WordSpacing)
		} else {
			dr.DrawString(string(ch))
			dr.Dot.X += fixed.I(t.LetterSpacing)
		}
	}
	if t.Underlined || t.Overlined || t.LineThrough {

		underlinePosition.X = 0
		baseLineY := underlinePosition.Y

		if t.Underlined {
			underlinePosition.Y = baseLineY + t.Font.Metrics().Descent
			drawLine(t.Image, underlinePosition, dr.Dot.X, t.DecorationThickness, t.DecorationColor)
		}
		if t.LineThrough {
			underlinePosition.Y = baseLineY - (t.Font.Metrics().Descent)
			drawLine(t.Image, underlinePosition, dr.Dot.X, t.DecorationThickness, t.DecorationColor)
		}
		if t.Overlined {
			underlinePosition.Y = baseLineY - t.Font.Metrics().Descent*3
			drawLine(t.Image, underlinePosition, dr.Dot.X, t.DecorationThickness, t.DecorationColor)
		}
	}
}

func (t *Text) wrap(breaker string, breakNewLines bool) []string {
	var start int = 0
	strngs := []string{}
	var text []string
	broken := strings.Split(t.Text, breaker)
	re := regexp.MustCompile(`[\r\n]+`)
	if breakNewLines {
		for _, v := range broken {
			text = append(text, re.Split(v, -1)...)
		}
	} else {
		text = append(text, broken...)
	}
	for i := 0; i < len(text); i++ {
		text[i] = re.ReplaceAllString(text[i], "")
	}
	for i := 0; i < len(text)-1; i++ {
		seg := strings.Join(text[start:i], breaker)
		if MeasureText(t, seg+breaker+text[i+1]) > t.Width {
			strngs = append(strngs, seg)
			start = i
		}
	}
	if len(strngs) > 0 {
		strngs = append(strngs, strings.Join(text[start:], breaker))
	} else {
		strngs = append(strngs, strings.Join(text[start:], breaker))
	}
	return strngs
}

func drawLine(img draw.Image, start fixed.Point26_6, width fixed.Int26_6, thickness int, col color.Color) {
	// Bresenham's line algorithm
	x0, y0 := start.X.Round(), start.Y.Round()
	x1 := x0 + int(width)
	y1 := y0
	dx := abs(x1 - x0)
	dy := abs(y1 - y0)
	sx, sy := 1, 1

	if x0 > x1 {
		sx = -1
	}
	if y0 > y1 {
		sy = -1
	}

	err := dx - dy

	for {
		for i := 0; i < thickness; i++ {
			img.Set(x0, (y0-(thickness/2))+i, col)
		}

		if x0 == x1 && y0 == y1 {
			break
		}

		e2 := 2 * err
		if e2 > -dy {
			err -= dy
			x0 += sx
		}
		if e2 < dx {
			err += dx
			y0 += sy
		}
	}
}

func abs(x int) int {
	if x < 0 {
		return -x
	}
	return x
}

func (t *Text) GetLines() []string {
	var lines []string
	if t.WhiteSpace == "nowrap" {
		re := regexp.MustCompile(`\s+`)
		t.Text = re.ReplaceAllString(t.Text, " ")
		lines = t.wrap("
", false)
	} else {
		if t.WhiteSpace == "pre" {
			re := regexp.MustCompile("\t")
			t.Text = re.ReplaceAllString(t.Text, "     ")
			nl := regexp.MustCompile(`[\r\n]+`)
			lines = nl.Split(t.Text, -1)
		} else if t.WhiteSpace == "pre-line" {
			re := regexp.MustCompile(`\s+`)
			t.Text = re.ReplaceAllString(t.Text, " ")
			lines = t.wrap(" ", true)
		} else if t.WhiteSpace == "pre-wrap" {
			lines = t.wrap(" ", true)
		} else {
			re := regexp.MustCompile(`\s+`)
			t.Text = re.ReplaceAllString(t.Text, " ")
			nl := regexp.MustCompile(`[\r\n]+`)
			t.Text = nl.ReplaceAllString(t.Text, "")
			t.Text = strings.TrimSpace(t.Text)
			lines = t.wrap(t.WordBreak, false)
		}
		for i, v := range lines {
			lines[i] = v + t.WordBreak
		}
	}

	return lines
}