some better jack renderind

Author: dragoncoder047

schemascii/components_render.py

@@ -315,7 +315,7 @@ def jack(
     t1 = terminals[0].pt
     t2 = t1 + rect(1, SIDE_TO_ANGLE_MAP[terminals[0].side])
     sc_t2 = t2 * scale
-    sc_text_pt = sc_t2 + rect(scale, SIDE_TO_ANGLE_MAP[terminals[0].side])
+    sc_text_pt = sc_t2 + rect(scale / 2, SIDE_TO_ANGLE_MAP[terminals[0].side])
     style = "input" if terminals[0].side in (
         Side.LEFT, Side.TOP) else "output"
     if any(bom_data.data.endswith(x)

schemascii/edgemarks.py

@@ -37,13 +37,8 @@ def flags(p: complex, s: Side) -> Flag | None:
         c = grid.get(p)
         if c in ' -|()*':
             return None
-        if s in (Side.TOP, Side.BOTTOM):
-            grid.setmask(p, '|')
-            return Flag(p, c, s)
-        if s in (Side.LEFT, Side.RIGHT):
-            grid.setmask(p, '-')
-            return Flag(p, c, s)
-        return None
+        grid.setmask(p, '*')
+        return Flag(p, c, s)
     return flags
 
 

schemascii/utils.py

@@ -145,6 +145,9 @@ def find_dots(points: list[tuple[complex, complex]]) -> list[complex]:
     "Finds all the points where there are 4 or more connecting wires."
     seen = {}
     for p1, p2 in points:
+        if p1 == p2:
+            # Skip zero-length wires
+            continue
         if p1 not in seen:
             seen[p1] = 1
         else:
@@ -202,17 +205,22 @@ def id_text(
                             for x, (y, six) in zip(text.split(","), unit))
             classy = "cmp-value"
         data = XML.tspan(text, class_=classy)
+    if len(terminals) > 1:
+        textach = "start" if (
+            any(Side.BOTTOM == t.side for t in terminals)
+            or any(Side.TOP == t.side for t in terminals)
+        ) else "middle"
+    else:
+        textach = "middle" if terminals[0].side in (
+            Side.TOP, Side.BOTTOM) else "start"
     return XML.text(
         (XML.tspan(f"{box.type}{box.id}", class_="cmp-id")
          * bool("L" in label_style)),
         " " * (bool(data) and "L" in label_style),
         data * bool("V" in label_style),
         x=point.real,
         y=point.imag,
-        text__anchor="start" if (
-            any(Side.BOTTOM == t.side for t in terminals)
-            or any(Side.TOP == t.side for t in terminals)
-        ) else "middle",
+        text__anchor=textach,
         font__size=options["scale"],
         fill=options["stroke"])
 

scripts/release.py

@@ -39,7 +39,7 @@ def writefile(file, text):
           re.sub(r'__version__ = "[\d.]+"',
                  f'__version__ = "{args.version}"', init_text))
 
-
+cmd("scripts/docs.py")
 cmd("python3 -m build --sdist")
 cmd("python3 -m build --wheel")
 

test_data/all_gates_3t.txt

@@ -0,0 +1,67 @@
+Q:nfet: R:1k !label=V!!padding=30!
+J1:A J2:B J4:VCC,circle J5:gnd,circle
+J1 J2     J4   J5
+|  |      |    |
+|  |      *-R-----*----------J1001 J1001:NAND
+|  |      |    |  d
+*----------------gQ
+|  |      |    |  s
+|  |      |    |  d
+|  *-------------gQ
+|  |      |    |  s
+|  |      |    *--*
+|  |      |    |
+|  |      *-R-----*---*------J1002 J1002:NOR
+|  |      |    |  d   d
+*----------------gQ *gQ
+|  |      |    |  s | s
+|  |      |    *--*-|-*
+|  *-----------|----*
+|  |      |    |
+|  |      *-R---------*------J1003 J1003:XNOR
+|  |      |    |      |
+|  |      |    |    d-*
+*----------------*-gQ |
+|  |      |    | |  s |
+|  *--------------*-* |
+|  |      |    | ||   |
+|  |      |    | || d-*
+|  |      |    | |*gQ
+|  |      |    | |  s
+|  |      |    | *--*
+|  |      |    |
+|  |      *-R-------*--------J1004 J1004:AND
+|  |      |    |    d
+|  |      *-R-----*gQ
+|  |      |    |  d s
+*----------------gQ |
+|  |      |    |  s |
+|  |      |    |  d |
+|  *-------------gQ |
+|  |      |    |  s |
+|  |      |    *--*-*
+|  |      |    |
+|  |      *-R-----------*----J1005 J1005:OR
+|  |      |    |        d
+|  |      *-R-----*---*gQ
+|  |      |    |  d   d s
+*----------------gQ *gQ |
+|  |      |    |  s | s |
+|  |      |    *--*-|-*-*
+|  *-----------|----*
+|  |      |    |
+|  |      *-R-----------*----J1006 J1006:XOR
+|  |      |    |        |
+|  |      *-R---------* |
+|  |      |    |      | |
+|  |      |    |    d-* |
+*----------------*-gQ | |
+|  |      |    | |  s | |
+|  *--------------*-* | |
+|  |      |    | ||   | d
+|  |      |    | || d-*gQ
+|  |      |    | |*gQ   s
+|  |      |    | |  s   |
+|  |      |    | *--*   |
+|  |      |    *--------*
+|  |      |    |