fix a few bugs

- use unicode for characters instead of entities
- use fixed values instead of data-attributes and calc()
  which are not widely supported

Author: dragoncoder047

release.py

@@ -3,33 +3,55 @@
 import re
 import sys
 
+
+def cmd(sh_line):
+    print(sh_line)
+    if code := os.system(sh_line):
+        print("***Exit", code, file=sys.stderr)
+        sys.exit(code)
+
+
+def readfile(file):
+    with open(file) as f:
+        return f.read()
+
+
+def writefile(file, text):
+    with open(file, "w") as f:
+        f.write(text)
+
+
 a = argparse.ArgumentParser("release.py")
 a.add_argument("version", help="release tag")
 args = a.parse_args()
 
 # Patch new version into files
-with open("pyproject.toml") as pyproject:
-    pp_text = pyproject.read()
-with open("pyproject.toml", "w") as pyproject:
-    pyproject.write(
-        re.sub(r'version = "[\d.]+"', f'version = "{args.version}"', pp_text))
-
-with open("schemascii/__init__.py") as init:
-    init_text = init.read()
-with open("schemascii/__init__.py", "w") as init:
-    init.write(
-        re.sub(r'__version__ = "[\d.]+"', f'__version__ = "{args.version}"', init_text))
+pp_text = readfile("pyproject.toml")
+writefile("pyproject.toml",
+          re.sub(r'version = "[\d.]+"', f'version = "{args.version}"', pp_text))
 
-
-def cmd(sh_line):
-    print(sh_line)
-    if os.system(sh_line):
-        sys.exit(1)
+init_text = readfile("schemascii/__init__.py")
+writefile("schemascii/__init__.py",
+          re.sub(r'__version__ = "[\d.]+"', f'__version__ = "{args.version}"', init_text))
 
 
 cmd("python3 -m build --sdist")
 cmd("python3 -m build --wheel")
-print("git add -A")
-print("git commit -m 'blah'")
-print(f"git tag {args.version}")
-print("git push --tags")
+cmd("schemascii test_data/test_charge_pump.txt --out test_data/test_charge_pump.txt.svg --padding 30")
+cmd("convert test_data/test_charge_pump.txt.svg test_data/test_charge_pump.png")
+
+svg_content = readfile("test_data/test_charge_pump.txt.svg")
+css_content = readfile("schemascii_example.css")
+writefile("test_data/test_charge_pump.txt.svg",
+          svg_content.replace("</svg>", f'<style>{css_content}</style></svg>'))
+cmd("convert test_data/test_charge_pump.txt.svg test_data/test_charge_pump_css.png")
+writefile("test_data/test_charge_pump.txt.svg", svg_content)
+
+# cmd("git add -A")
+# cmd("git commit -m 'blah'")
+# cmd(f"git tag {args.version}")
+# cmd("git push --tags")
+
+# sudo apt update && sudo apt install imagemagick
+# for convert command
+# doesn't seem to work with the css though :(

schemascii/__init__.py

@@ -60,7 +60,6 @@ def render(filename: str, text: str = None, **options) -> str:
         f'{grid.height * scale + padding * 2}',
         xmlns="http://www.w3.org/2000/svg",
         class_="schemascii",
-        data__scale=scale,
     )
 
 

schemascii/components_render.py

@@ -107,7 +107,7 @@ def resistor(
     return (polylinegon(points, **options)
             + make_variable(mid, angle, "V" in box.type, **options)
             + id_text(
-        box, bom_data, terminals, (("Ω", False), ("W", False)),
+        box, bom_data, terminals, (("Ω", False), ("W", False)),
         text_pt, **options))
 
 

schemascii/metric.py

@@ -25,6 +25,8 @@ def prefix_to_exponent(prefix: int) -> str:
     E.g. "u" --> -6 (micro)"""
     if prefix in (' ', ''):
         return 0
+    if prefix == "µ":
+        prefix = "u" # allow unicode
     if prefix == 'K':
         prefix = prefix.lower()  # special case (preferred is lowercase)
     i = "pnum kMG".index(prefix)
@@ -59,7 +61,7 @@ def format_metric_unit(num: str, unit: str = '', six: bool = False) -> str:
     exp, digits = sorted(possibilities, key=lambda x: len(
         x[1]) + (0.5 * ('.' in x[1])))[0]
     out = digits + " " + exponent_to_prefix(exp) + unit
-    return out.replace(" u", " µ")
+    return out.replace(" u", " µ")
 
 
 if __name__ == '__main__':

schemascii_example.css

@@ -1,12 +1,11 @@
 svg.schemascii {
     background: black;
 
-    --sch-scale: attr(data-scale);
 }
 
 svg.schemascii .wire line {
     stroke: var(--sch-color, blue);
-    stroke-width: calc(0.15 * var(--sch-scale, 1));
+    stroke-width: 2;
     stroke-linecap: round;
     transition-duration: 0.2s;
 }
@@ -22,14 +21,14 @@ svg.schemascii :is(.wire, .component):hover {
 
 svg.schemascii .component :is(polyline, path, line, polygon, rect, circle) {
     stroke: var(--sch-color, red);
-    stroke-width: calc(0.15 * var(--sch-scale, 1));
+    stroke-width: 2;
     stroke-linecap: round;
     transition-duration: 0.2s;
     fill: transparent;
 }
 
 svg.schemascii .component .plus :is(polyline, path, line) {
-    stroke-width: calc(0.075 * var(--sch-scale, 1));
+    stroke-width: 1;
 }
 
 svg.schemascii .component polygon {