Merge pull request #85 from guzba/master

0.7.14 fix for pixie 5
treeform · Aug 21, 2022 · a2a5165 · a2a5165
2 parents 0ef0e0b + 6ccf6b2
commit a2a5165
Show file tree

Hide file tree

Showing 116 changed files with 263 additions and 227 deletions.
diff --git a/src/typography/font.nim b/src/typography/font.nim
diff --git a/src/typography/rasterizer.nim b/src/typography/rasterizer.nim
@@ -162,89 +162,89 @@ proc getGlyphImage*(
         var color = ColorRgba(r: 255, g: 255, b: 255, a: uint8(a * 255.0))
         result[x, h-y-1] = color
 
-proc getGlyphOutlineImage*(
-  font: Font,
-  unicode: string,
-  lines=true,
-  points=true,
-  winding=true
-): Image =
-  ## Get an outline of the glyph with controls points. Useful for debugging.
-  var glyph = font.typeface.glyphs[unicode]
-
-  const
-    green = ColorRgba(r: 0, g: 255, b: 0, a: 255)
-    red = ColorRgba(r: 255, g: 0, b: 0, a: 255)
-    blue = ColorRgba(r: 0, g: 0, b: 255, a: 255)
-
-  glyph.makeReady(font)
-
-  var fontHeight = font.typeface.ascent - font.typeface.descent
-  var scale = font.size / (fontHeight)
-  var tx = int floor(glyph.bboxMin.x * scale)
-  var ty = int floor(glyph.bboxMin.y * scale)
-  var w = int(ceil(glyph.bboxMax.x * scale)) - tx + 1
-  var h = int(ceil(glyph.bboxMax.y * scale)) - ty + 1
-
-  result = newImage(w, h)
-  let origin = vec2(float32 tx, float32 ty)
-
-  proc adjust(v: Vec2): Vec2 = (v) * scale - origin
-
-  proc flip(v: Vec2): Vec2 =
-    result.x = v.x
-    result.y = float32(h) - v.y
-
-  let ctx = newContext(result)
-
-  # Draw the outline.
-  for segments in glyph.segments:
-    if lines:
-      # Draw lines.
-      ctx.strokeStyle = red
-      for s in segments:
-        ctx.strokeSegment(segment(flip(adjust(s.at)), flip(adjust(s.to))))
-    if points:
-      # Draw points.
-      ctx.strokeStyle = blue
-      for ruleNum, c in cast[PathShim](glyph.path).commands:
-
-        for i in 0..<c.numbers.len div 2:
-          var at: Vec2
-          at.x = c.numbers[i*2+0]
-          at.y = c.numbers[i*2+1]
-          ctx.strokeSegment(segment(
-            flip(adjust(at)) + vec2(1, 1),
-            flip(adjust(at)) + vec2(-1, -1))
-          )
-          ctx.strokeSegment(segment(
-            flip(adjust(at)) + vec2(-1, 1),
-            flip(adjust(at)) + vec2(1, -1))
-          )
-    if winding:
-      # Draw winding order
-      for s in segments:
-        let
-          at = flip(adjust(s.at))
-          to = flip(adjust(s.to))
-          length = (at - to).length
-          mid = (at + to) / 2
-          angle = angle(at - to)
-          dir = dir(angle) * 3
-          dir2 = dir(angle + float32(PI/2)) * 3
-          winding = s.at.y > s.to.y
-        var color = if winding: blue else: green
-
-        if length > 0:
-          # Triangle.
-          ctx.strokeStyle = color
-          let
-            head = mid + dir
-            left = mid - dir + dir2
-            right = mid - dir - dir2
-          ctx.strokeSegment(segment(head, left))
-          ctx.strokeSegment(segment(left, right))
-          ctx.strokeSegment(segment(right, head))
+# proc getGlyphOutlineImage*(
+#   font: Font,
+#   unicode: string,
+#   lines=true,
+#   points=true,
+#   winding=true
+# ): Image =
+#   ## Get an outline of the glyph with controls points. Useful for debugging.
+#   var glyph = font.typeface.glyphs[unicode]
+
+#   const
+#     green = ColorRgba(r: 0, g: 255, b: 0, a: 255)
+#     red = ColorRgba(r: 255, g: 0, b: 0, a: 255)
+#     blue = ColorRgba(r: 0, g: 0, b: 255, a: 255)
+
+#   glyph.makeReady(font)
+
+#   var fontHeight = font.typeface.ascent - font.typeface.descent
+#   var scale = font.size / (fontHeight)
+#   var tx = int floor(glyph.bboxMin.x * scale)
+#   var ty = int floor(glyph.bboxMin.y * scale)
+#   var w = int(ceil(glyph.bboxMax.x * scale)) - tx + 1
+#   var h = int(ceil(glyph.bboxMax.y * scale)) - ty + 1
+
+#   result = newImage(w, h)
+#   let origin = vec2(float32 tx, float32 ty)
+
+#   proc adjust(v: Vec2): Vec2 = (v) * scale - origin
+
+#   proc flip(v: Vec2): Vec2 =
+#     result.x = v.x
+#     result.y = float32(h) - v.y
+
+#   let ctx = newContext(result)
+
+#   # Draw the outline.
+#   for segments in glyph.segments:
+#     if lines:
+#       # Draw lines.
+#       ctx.strokeStyle = red
+#       for s in segments:
+#         ctx.strokeSegment(segment(flip(adjust(s.at)), flip(adjust(s.to))))
+#     if points:
+#       # Draw points.
+#       ctx.strokeStyle = blue
+#       for ruleNum, c in cast[PathShim](glyph.path).commands:
+
+#         for i in 0..<c.numbers.len div 2:
+#           var at: Vec2
+#           at.x = c.numbers[i*2+0]
+#           at.y = c.numbers[i*2+1]
+#           ctx.strokeSegment(segment(
+#             flip(adjust(at)) + vec2(1, 1),
+#             flip(adjust(at)) + vec2(-1, -1))
+#           )
+#           ctx.strokeSegment(segment(
+#             flip(adjust(at)) + vec2(-1, 1),
+#             flip(adjust(at)) + vec2(1, -1))
+#           )
+#     if winding:
+#       # Draw winding order
+#       for s in segments:
+#         let
+#           at = flip(adjust(s.at))
+#           to = flip(adjust(s.to))
+#           length = (at - to).length
+#           mid = (at + to) / 2
+#           angle = angle(at - to)
+#           dir = dir(angle) * 3
+#           dir2 = dir(angle + float32(PI/2)) * 3
+#           winding = s.at.y > s.to.y
+#         var color = if winding: blue else: green
+
+#         if length > 0:
+#           # Triangle.
+#           ctx.strokeStyle = color
+#           let
+#             head = mid + dir
+#             left = mid - dir + dir2
+#             right = mid - dir - dir2
+#           ctx.strokeSegment(segment(head, left))
+#           ctx.strokeSegment(segment(left, right))
+#           ctx.strokeSegment(segment(right, head))
 
 proc getGlyphImage*(
   font: Font,

diff --git a/tests/rendered/alignment.png b/tests/rendered/alignment.png
diff --git a/tests/rendered/basicSvg.png b/tests/rendered/basicSvg.png
diff --git a/tests/rendered/basicTtf.png b/tests/rendered/basicTtf.png
diff --git a/tests/rendered/basicTtf2.png b/tests/rendered/basicTtf2.png
diff --git a/tests/rendered/ch.png b/tests/rendered/ch.png
diff --git a/tests/rendered/hFill.png b/tests/rendered/hFill.png
diff --git a/tests/rendered/layout.png b/tests/rendered/layout.png
diff --git a/tests/rendered/layoutNoText.png b/tests/rendered/layoutNoText.png
diff --git a/tests/rendered/picking.png b/tests/rendered/picking.png
diff --git a/tests/rendered/ru.png b/tests/rendered/ru.png
diff --git a/tests/rendered/sample_svg.png b/tests/rendered/sample_svg.png
diff --git a/tests/rendered/sample_ttf.png b/tests/rendered/sample_ttf.png
diff --git a/tests/rendered/scaledup.png b/tests/rendered/scaledup.png
diff --git a/tests/rendered/selection.png b/tests/rendered/selection.png
diff --git a/tests/rendered/sizes.png b/tests/rendered/sizes.png
diff --git a/tests/rendered/subpixelglyphs.png b/tests/rendered/subpixelglyphs.png
diff --git a/tests/rendered/subpixelpos.png b/tests/rendered/subpixelpos.png
diff --git a/tests/rendered/tabs.png b/tests/rendered/tabs.png
diff --git a/tests/rendered/test_otf.png b/tests/rendered/test_otf.png
diff --git a/tests/rendered/test_svg.png b/tests/rendered/test_svg.png
diff --git a/tests/rendered/test_ttf.png b/tests/rendered/test_ttf.png
diff --git a/tests/rendered/wordwrap.png b/tests/rendered/wordwrap.png
diff --git a/tests/rendered/wordwrapch.png b/tests/rendered/wordwrapch.png
diff --git a/tests/test.nim b/tests/test.nim
@@ -202,20 +202,20 @@ block:
 
   image.writeFile("rendered/subpixelglyphs.png")
 
-block:
-  var font = readFontTtf("fonts/Moon Bold.otf")
-  font.size = 300
-  font.lineHeight = 300
+# block:
+#   var font = readFontTtf("fonts/Moon Bold.otf")
+#   font.size = 300
+#   font.lineHeight = 300
 
-  var image = font.getGlyphOutlineImage("Q")
+  # var image = font.getGlyphOutlineImage("Q")
 
-  echo font.typeface.glyphs["Q"].pathStr
+  # echo font.typeface.glyphs["Q"].pathStr
 
-  image.writeFile("rendered/qOutLine.png")
+  # image.writeFile("rendered/qOutLine.png")
 
-  image = font.getGlyphImage("Q")
-  image.alphaToBlackAndWhite()
-  image.writeFile("rendered/qFill.png")
+  # image = font.getGlyphImage("Q")
+  # image.alphaToBlackAndWhite()
+  # image.writeFile("rendered/qFill.png")
 
 block:
   var image = newImage(200, 100)

diff --git a/tests/test_char.nim b/tests/test_char.nim
@@ -48,22 +48,22 @@ block:
 
       #print glyph
 
-      var image = font.getGlyphOutlineImage(
-        glyph.code,
-        lines=true,
-        points=true,
-        winding=true
-      )
-
-      image.writeFile("rendered/test_char.png")
-
-      var glyphOffset: Vec2
-      image = font.getGlyphImage(glyph, glyphOffset, quality=4)
-      image.alphaToBlackAndWhite()
-      image.writeFile("rendered/test_charFill.png")
-
-      if image.width == 1396:
-        quit()
+      # var image = font.getGlyphOutlineImage(
+      #   glyph.code,
+      #   lines=true,
+      #   points=true,
+      #   winding=true
+      # )
+
+      # image.writeFile("rendered/test_char.png")
+
+      # var glyphOffset: Vec2
+      # image = font.getGlyphImage(glyph, glyphOffset, quality=4)
+      # image.alphaToBlackAndWhite()
+      # image.writeFile("rendered/test_charFill.png")
+
+      # if image.width == 1396:
+      #   quit()
 
 let (outp, _) = execCmdEx("git diff tests/rendered/*.png")
 if len(outp) != 0:

diff --git a/tests/textbox/backspace_delete.png b/tests/textbox/backspace_delete.png
diff --git a/tests/textbox/copy.png b/tests/textbox/copy.png
diff --git a/tests/textbox/cut.png b/tests/textbox/cut.png
diff --git a/tests/textbox/jump_down_0.png b/tests/textbox/jump_down_0.png
diff --git a/tests/textbox/jump_down_1.png b/tests/textbox/jump_down_1.png
diff --git a/tests/textbox/jump_down_2.png b/tests/textbox/jump_down_2.png
diff --git a/tests/textbox/jump_down_3.png b/tests/textbox/jump_down_3.png
diff --git a/tests/textbox/jump_up_0.png b/tests/textbox/jump_up_0.png
diff --git a/tests/textbox/jump_up_1.png b/tests/textbox/jump_up_1.png
diff --git a/tests/textbox/jump_up_2.png b/tests/textbox/jump_up_2.png
diff --git a/tests/textbox/jump_up_3.png b/tests/textbox/jump_up_3.png
diff --git a/tests/textbox/left_right.png b/tests/textbox/left_right.png
diff --git a/tests/textbox/left_right_shift_0.png b/tests/textbox/left_right_shift_0.png
diff --git a/tests/textbox/left_right_shift_1.png b/tests/textbox/left_right_shift_1.png
diff --git a/tests/textbox/left_right_shift_10.png b/tests/textbox/left_right_shift_10.png
diff --git a/tests/textbox/left_right_shift_11.png b/tests/textbox/left_right_shift_11.png
diff --git a/tests/textbox/left_right_shift_12.png b/tests/textbox/left_right_shift_12.png
diff --git a/tests/textbox/left_right_shift_13.png b/tests/textbox/left_right_shift_13.png
diff --git a/tests/textbox/left_right_shift_14.png b/tests/textbox/left_right_shift_14.png
diff --git a/tests/textbox/left_right_shift_15.png b/tests/textbox/left_right_shift_15.png
diff --git a/tests/textbox/left_right_shift_16.png b/tests/textbox/left_right_shift_16.png
diff --git a/tests/textbox/left_right_shift_17.png b/tests/textbox/left_right_shift_17.png
diff --git a/tests/textbox/left_right_shift_18.png b/tests/textbox/left_right_shift_18.png
diff --git a/tests/textbox/left_right_shift_19.png b/tests/textbox/left_right_shift_19.png
diff --git a/tests/textbox/left_right_shift_2.png b/tests/textbox/left_right_shift_2.png
diff --git a/tests/textbox/left_right_shift_20.png b/tests/textbox/left_right_shift_20.png
diff --git a/tests/textbox/left_right_shift_21.png b/tests/textbox/left_right_shift_21.png
diff --git a/tests/textbox/left_right_shift_22.png b/tests/textbox/left_right_shift_22.png
diff --git a/tests/textbox/left_right_shift_23.png b/tests/textbox/left_right_shift_23.png
diff --git a/tests/textbox/left_right_shift_3.png b/tests/textbox/left_right_shift_3.png
diff --git a/tests/textbox/left_right_shift_4.png b/tests/textbox/left_right_shift_4.png
diff --git a/tests/textbox/left_right_shift_5.png b/tests/textbox/left_right_shift_5.png
diff --git a/tests/textbox/left_right_shift_6.png b/tests/textbox/left_right_shift_6.png
diff --git a/tests/textbox/left_right_shift_7.png b/tests/textbox/left_right_shift_7.png
diff --git a/tests/textbox/left_right_shift_8.png b/tests/textbox/left_right_shift_8.png
diff --git a/tests/textbox/left_right_shift_9.png b/tests/textbox/left_right_shift_9.png
diff --git a/tests/textbox/paste_0.png b/tests/textbox/paste_0.png
diff --git a/tests/textbox/paste_1.png b/tests/textbox/paste_1.png
diff --git a/tests/textbox/picking_0.png b/tests/textbox/picking_0.png
diff --git a/tests/textbox/picking_1.png b/tests/textbox/picking_1.png
diff --git a/tests/textbox/picking_10.png b/tests/textbox/picking_10.png
diff --git a/tests/textbox/picking_2.png b/tests/textbox/picking_2.png
diff --git a/tests/textbox/picking_3.png b/tests/textbox/picking_3.png
diff --git a/tests/textbox/picking_4.png b/tests/textbox/picking_4.png
diff --git a/tests/textbox/picking_5.png b/tests/textbox/picking_5.png
diff --git a/tests/textbox/picking_6.png b/tests/textbox/picking_6.png
diff --git a/tests/textbox/picking_7.png b/tests/textbox/picking_7.png
diff --git a/tests/textbox/picking_8.png b/tests/textbox/picking_8.png
diff --git a/tests/textbox/picking_9.png b/tests/textbox/picking_9.png
diff --git a/tests/textbox/plain.png b/tests/textbox/plain.png
diff --git a/tests/textbox/scroll_0.png b/tests/textbox/scroll_0.png
diff --git a/tests/textbox/scroll_1.png b/tests/textbox/scroll_1.png
diff --git a/tests/textbox/scroll_10.png b/tests/textbox/scroll_10.png
diff --git a/tests/textbox/scroll_11.png b/tests/textbox/scroll_11.png
diff --git a/tests/textbox/scroll_12.png b/tests/textbox/scroll_12.png
diff --git a/tests/textbox/scroll_13.png b/tests/textbox/scroll_13.png
diff --git a/tests/textbox/scroll_14.png b/tests/textbox/scroll_14.png
diff --git a/tests/textbox/scroll_15.png b/tests/textbox/scroll_15.png
diff --git a/tests/textbox/scroll_16.png b/tests/textbox/scroll_16.png
diff --git a/tests/textbox/scroll_17.png b/tests/textbox/scroll_17.png
diff --git a/tests/textbox/scroll_18.png b/tests/textbox/scroll_18.png
diff --git a/tests/textbox/scroll_19.png b/tests/textbox/scroll_19.png
diff --git a/tests/textbox/scroll_2.png b/tests/textbox/scroll_2.png
diff --git a/tests/textbox/scroll_20.png b/tests/textbox/scroll_20.png
diff --git a/tests/textbox/scroll_21.png b/tests/textbox/scroll_21.png
diff --git a/tests/textbox/scroll_22.png b/tests/textbox/scroll_22.png
diff --git a/tests/textbox/scroll_3.png b/tests/textbox/scroll_3.png
diff --git a/tests/textbox/scroll_4.png b/tests/textbox/scroll_4.png
diff --git a/tests/textbox/scroll_5.png b/tests/textbox/scroll_5.png
diff --git a/tests/textbox/scroll_6.png b/tests/textbox/scroll_6.png
diff --git a/tests/textbox/scroll_7.png b/tests/textbox/scroll_7.png
diff --git a/tests/textbox/scroll_8.png b/tests/textbox/scroll_8.png
diff --git a/tests/textbox/scroll_9.png b/tests/textbox/scroll_9.png
diff --git a/tests/textbox/select_all.png b/tests/textbox/select_all.png
diff --git a/tests/textbox/select_peragraph.png b/tests/textbox/select_peragraph.png
diff --git a/tests/textbox/select_word.png b/tests/textbox/select_word.png
diff --git a/tests/textbox/typing.png b/tests/textbox/typing.png
diff --git a/tests/textbox/up_down_0.png b/tests/textbox/up_down_0.png
diff --git a/tests/textbox/up_down_1.png b/tests/textbox/up_down_1.png
diff --git a/tests/textbox/up_down_2.png b/tests/textbox/up_down_2.png
diff --git a/tests/textbox/up_down_3.png b/tests/textbox/up_down_3.png
diff --git a/tests/textbox/up_down_4.png b/tests/textbox/up_down_4.png
diff --git a/tests/textbox/up_down_5.png b/tests/textbox/up_down_5.png
diff --git a/tests/textbox/up_down_6.png b/tests/textbox/up_down_6.png
diff --git a/tests/textbox/up_down_7.png b/tests/textbox/up_down_7.png
diff --git a/tests/textbox/up_down_8.png b/tests/textbox/up_down_8.png
diff --git a/tests/textbox/up_down_9.png b/tests/textbox/up_down_9.png
diff --git a/tests/textbox/word_backspace_delete.png b/tests/textbox/word_backspace_delete.png
diff --git a/typography.nimble b/typography.nimble
@@ -1,16 +1,12 @@
-version       = "0.7.13"
+version       = "0.7.14"
 author        = "Andre von Houck"
 description   = "Fonts, Typesetting and Rasterization for Nim."
 license       = "MIT"
 srcDir        = "src"
 
 requires "nim >= 1.4.0"
-requires "pixie >= 3.1.1"
-requires "vmath >= 1.0.0"
-requires "chroma >= 0.2.3"
+requires "pixie >= 5.0.1"
 requires "print >= 0.1.0"
-requires "bumpy >= 1.0.3"
-requires "flatty >= 0.1.3"
 
 task docs, "Generate API documents":
   exec "nimble doc --index:on --project --out:docs --hints:off src/typography.nim"