Run textUber though computePaths.

src/pixie/fonts.nim

@@ -500,19 +500,16 @@ proc parseSvgFont*(buf: string): Typeface {.raises: [PixieError].} =
   result = Typeface()
   result.svgFont = svgfont.parseSvgFont(buf)
 
-proc textUber(
-  target: Image | Mask,
-  arrangement: Arrangement,
-  transform = mat3(),
-  strokeWidth: float32 = 1.0,
-  lineCap = ButtCap,
-  lineJoin = MiterJoin,
-  miterLimit = defaultMiterLimit,
-  dashes: seq[float32] = @[],
-  stroke: static[bool] = false
-) =
+
+proc computePaths(
+  arrangement: Arrangement
+): seq[Path] =
+  ## Takes an Arrangement and computes Paths for drawing.
+  ## Returns a seq of paths that match the Spans in the arrangement.
+  ## If you only have one Span you should only get one Path.
   var line: int
   for spanIndex, (start, stop) in arrangement.spans:
+    var spanPath = Path()
     let
       font = arrangement.fonts[spanIndex]
       underlineThickness = font.typeface.underlineThickness * font.scale
@@ -553,6 +550,33 @@ proc textUber(
             font.typeface.isCCW()
           )
 
+      spanPath.addPath(path)
+
+    result.add(spanPath)
+
+proc textUber(
+  target: Image | Mask,
+  arrangement: Arrangement,
+  transform = mat3(),
+  strokeWidth: float32 = 1.0,
+  lineCap = ButtCap,
+  lineJoin = MiterJoin,
+  miterLimit = defaultMiterLimit,
+  dashes: seq[float32] = @[],
+  stroke: static[bool] = false
+) =
+  var line: int
+  let spanPaths = arrangement.computePaths()
+  for spanIndex, (start, stop) in arrangement.spans:
+    let
+      font = arrangement.fonts[spanIndex]
+      underlineThickness = font.typeface.underlineThickness * font.scale
+      underlinePosition = font.typeface.underlinePosition * font.scale
+      strikeoutThickness = font.typeface.strikeoutThickness * font.scale
+      strikeoutPosition = font.typeface.strikeoutPosition * font.scale
+
+    let path = spanPaths[spanIndex]
+
     when stroke:
       when type(target) is Image:
         for paint in font.paints:
@@ -579,6 +603,7 @@ proc textUber(
     else:
       when type(target) is Image:
         for paint in font.paints:
+          #echo transform
           target.fillPath(path, paint, transform)
       else: # target is Mask
         target.fillPath(path, transform)
@@ -587,52 +612,9 @@ proc computeBounds*(
   arrangement: Arrangement,
   transform = mat3()
 ): Rect =
-  var
-    fullPath = newPath()
-    line: int
-  for spanIndex, (start, stop) in arrangement.spans:
-    let
-      font = arrangement.fonts[spanIndex]
-      underlineThickness = font.typeface.underlineThickness * font.scale
-      underlinePosition = font.typeface.underlinePosition * font.scale
-      strikeoutThickness = font.typeface.strikeoutThickness * font.scale
-      strikeoutPosition = font.typeface.strikeoutPosition * font.scale
-    for runeIndex in start .. stop:
-      let position = arrangement.positions[runeIndex]
-
-      let path = font.typeface.getGlyphPath(arrangement.runes[runeIndex])
-      path.transform(
-        translate(position) *
-        scale(vec2(font.scale))
-      )
-
-      var applyDecoration = true
-      if runeIndex == arrangement.lines[line][1]:
-        inc line
-        if arrangement.runes[runeIndex] == SP:
-          # Do not apply decoration to the space at end of lines
-          applyDecoration = false
-
-      if applyDecoration:
-        if font.underline:
-          path.rect(
-            arrangement.selectionRects[runeIndex].x,
-            position.y - underlinePosition + underlineThickness / 2,
-            arrangement.selectionRects[runeIndex].w,
-            underlineThickness,
-            font.typeface.isCCW()
-          )
-        if font.strikethrough:
-          path.rect(
-            arrangement.selectionRects[runeIndex].x,
-            position.y - strikeoutPosition,
-            arrangement.selectionRects[runeIndex].w,
-            strikeoutThickness,
-            font.typeface.isCCW()
-          )
-
+  var fullPath = newPath()
+  for path in arrangement.computePaths():
     fullPath.addPath(path)
-
   fullPath.transform(transform)
   fullPath.computeBounds()