From 8a88cd29fab11dc5418e362bb0b6a36d98f0a030 Mon Sep 17 00:00:00 2001
From: treeform <starplant@gmail.com>
Date: Fri, 1 Oct 2021 10:18:12 -0700
Subject: [PATCH] No need to check for rune.uint32 > SP.uint32 because typeset
 alreayd does.

---
 src/pixie/fonts.nim | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/pixie/fonts.nim b/src/pixie/fonts.nim
index ec7d585..d409434 100644
--- a/src/pixie/fonts.nim
+++ b/src/pixie/fonts.nim
@@ -107,31 +107,27 @@ proc isCCW(typeface: Typeface): bool {.inline.} =
 
 proc hasGlyph*(typeface: Typeface, rune: Rune): bool {.inline.} =
   ## Returns if there is a glyph for this rune.
-  if rune.uint32 > SP.uint32: # Empty paths for control runes (not tofu)
-    if typeface.opentype != nil:
-      typeface.opentype.hasGlyph(rune)
-    else:
-      typeface.svgFont.hasGlyph(rune)
+  if typeface.opentype != nil:
+    typeface.opentype.hasGlyph(rune)
   else:
-    false
+    typeface.svgFont.hasGlyph(rune)
 
 proc getGlyphPath*(
   typeface: Typeface, rune: Rune
 ): Path {.inline, raises: [PixieError].} =
   ## The glyph path for the rune.
   result = newPath()
-  if rune.uint32 > SP.uint32: # Empty paths for control runes (not tofu)
-    if typeface.hasGlyph(rune):
-      if typeface.opentype != nil:
-        result.addPath(typeface.opentype.getGlyphPath(rune))
-      else:
-        result.addPath(typeface.svgFont.getGlyphPath(rune))
+  if typeface.hasGlyph(rune):
+    if typeface.opentype != nil:
+      result.addPath(typeface.opentype.getGlyphPath(rune))
     else:
-      for fallback in typeface.fallbacks:
-        if fallback.hasGlyph(rune):
-          result = fallback.getGlyphPath(rune)
-          let ratio = typeface.scale / fallback.scale
-          result.transform(scale(vec2(ratio, ratio)))
+      result.addPath(typeface.svgFont.getGlyphPath(rune))
+  else:
+    for fallback in typeface.fallbacks:
+      if fallback.hasGlyph(rune):
+        result = fallback.getGlyphPath(rune)
+        let ratio = typeface.scale / fallback.scale
+        result.transform(scale(vec2(ratio, ratio)))
 
 proc getAdvance*(typeface: Typeface, rune: Rune): float32 {.inline, raises: [].} =
   ## The advance for the rune in pixels.
@@ -153,7 +149,6 @@ proc getAdvance*(typeface: Typeface, rune: Rune): float32 {.inline, raises: [].}
     else:
       return typeface.svgFont.getAdvance(rune)
 
-
 proc getKerningAdjustment*(
   typeface: Typeface, left, right: Rune
 ): float32 {.inline, raises: [].} =