better handling of middle line (hyphen)

ecstrema · Sep 14, 2020 · f1f873d · f1f873d
1 parent a0c7565
commit f1f873d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/redist/Saxy.otf b/redist/Saxy.otf
diff --git a/redist/Saxy.ttf b/redist/Saxy.ttf
diff --git a/redist/saxy.woff2 b/redist/saxy.woff2
diff --git a/src/MASTER.svg b/src/MASTER.svg
diff --git a/src/build.py b/src/build.py
@@ -46,7 +46,7 @@ def add_kerning(font):
     font.addKerningClass("kern", "kern-1", tuple(svg_map), tuple(svg_map), tuple(offsets_tuple))
 
 if __name__ == "__main__":
-    svg_map = generate_svgs.generate(master_svg, output_dir, template_svg, master_char)
+    svg_map = generate_svgs.generate(master_svg, output_dir, template_svg, master_char, ["nine"])
 
     font = fontforge.font()  # new font
     for char in svg_map:

diff --git a/src/generate_svgs.py b/src/generate_svgs.py
@@ -48,14 +48,14 @@ def check_output_dir(output_dir):
 
 def generate_merge(merge_char, names, values, template: str, output_dir, exclude_from_master_char):
     inside_str = ""
-    for svg in values:
-        if not svg in exclude_from_master_char:
-            inside_str += '\n    ' + svg
+    for index in range(len(names)):
+        if not names[index] in exclude_from_master_char:
+            inside_str += '\n    ' + values[index]
 
     value = template.replace('<!--$Value-->', inside_str)
 
-    value = value.replace('class="key"', 'class="key" fill="none" stroke="black" stroke-width="3px"').replace('class="normal"', 'class="normal" fill="none" stroke="black" stroke-width="3px"')
-
+    value = value.replace('class="key"', 'class="key" fill="none" stroke="black" stroke-width="3px"')
+    value = value.replace('class="normal"', 'class="normal" fill="black" stroke="none" stroke-width="3px"')
     with open(os.path.join(os.path.dirname(current_file_path), output_dir, merge_char + ".svg"), 'w') as file:
         file.write(value)