Fix tab handling in text rendering

Fixes #120
openscopeproject · Nov 12, 2019 · d0bd8d5 · d0bd8d5
1 parent 70239a4
commit d0bd8d5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/InteractiveHtmlBom/core/fontparser.py b/InteractiveHtmlBom/core/fontparser.py
@@ -42,6 +42,9 @@ def parse_font_char(self, chr):
 
     def parse_font_for_string(self, s):
         for c in s:
+            if c == '\t' and ' ' not in self.parsed_font:
+                # tabs rely on space char to calculate offset
+                self.parsed_font[' '] = self.parse_font_char(' ')
             if c not in self.parsed_font and ord(c) >= ord(' '):
                 self.parsed_font[c] = self.parse_font_char(c)
 

diff --git a/InteractiveHtmlBom/web/render.js b/InteractiveHtmlBom/web/render.js
@@ -58,7 +58,12 @@ function drawtext(ctx, text, color, flip) {
     var offsety = (-(txt.length - 1) + i * 2) * interline + text.height / 2;
     var lineWidth = 0;
     for (var c of txt[i]) {
-      lineWidth += pcbdata.font_data[c].w * text.width;
+      if (c == '\t') {
+        var fourSpaces = 4 * pcbdata.font_data[' '].w * text.width;
+        lineWidth += fourSpaces - lineWidth % fourSpaces;
+      } else {
+        lineWidth += pcbdata.font_data[c].w * text.width;
+      }
     }
     var offsetx = 0;
     switch (text.horiz_justify) {
@@ -75,6 +80,11 @@ function drawtext(ctx, text, color, flip) {
         break;
     }
     for (var c of txt[i]) {
+      if (c == '\t') {
+        var fourSpaces = 4 * pcbdata.font_data[' '].w * text.width;
+        offsetx += fourSpaces - offsetx % fourSpaces;
+        continue;
+      }
       for (var line of pcbdata.font_data[c].l) {
         ctx.beginPath();
         ctx.moveTo(...calcFontPoint(line[0], text, offsetx, offsety, tilt));