Merge branch 'main' into feat/circle-inverter-style

Author: l0uisgrange

docs/main.typ

@@ -915,12 +915,13 @@ The `diode` symbol accepts only one parameter, called `type`, and its appearance
     #zap.circuit({
         import zap: *
 
-        wire((0, 0), (8, 0))
+        wire((0, 0), (10, 0))
         vcc("s1", (0, 0))
         vee("s2", (2, 0))
         earth("s3", (4, 0))
         frame("s4", (6, 0))
         ground("s5", (8, 0))
+        rground("s6", (10, 0))
     })
     ```,
 )

src/components/stub.typ

@@ -36,7 +36,6 @@
         wire((0, 0), (rel: diff))
     }
 
-
     // Component call
     component("stub", "l", node, draw: draw, ..args)
 }

src/components/supply.typ

@@ -9,7 +9,16 @@
     // Drawing function
     let draw(ctx, position, style) = {
         wire((0, 0), (0, -style.distance))
-        polygon((0, -style.distance), 3, anchor: "north", radius: style.radius, angle: -90deg, name: "polygon", stroke: style.stroke, fill: style.fill)
+        polygon(
+            (0, -style.distance),
+            3,
+            anchor: "north",
+            radius: style.radius,
+            angle: -90deg,
+            name: "polygon",
+            stroke: style.stroke,
+            fill: style.fill,
+        )
 
         let (width, height) = cetz.util.measure(ctx, "polygon")
         interface((-width / 2, -height / 2), (width / 2, height / 2))
@@ -31,7 +40,9 @@
         set-style(stroke: style.stroke)
         line((-style.width / 2, -style.distance), (style.width / 2, -style.distance))
         for i in (0, 1, 2) {
-            line((-style.width / 2 + (1 - i) * .01 + i * delta, -style.distance), (rel: (angle: -style.angle - 90deg, radius: style.depth)))
+            line((-style.width / 2 + (1 - i) * .01 + i * delta, -style.distance), (
+                rel: (angle: -style.angle - 90deg, radius: style.depth),
+            ))
         }
 
         interface((-style.width / 2, style.distance), (style.width / 2, -style.distance))
@@ -49,7 +60,11 @@
     let draw(ctx, position, style) = {
         wire((0, 0), (0, -style.distance))
         for i in (0, 1, 2) {
-            line((-style.width / 2 + i * style.delta, -style.distance - i * style.spacing), (style.width / 2 - i * style.delta, -style.distance - i * style.spacing), ..style)
+            line(
+                (-style.width / 2 + i * style.delta, -style.distance - i * style.spacing),
+                (style.width / 2 - i * style.delta, -style.distance - i * style.spacing),
+                ..style,
+            )
         }
 
         interface((-style.width / 2, -style.distance - style.spacing * 2), (style.width / 2, -style.distance))
@@ -86,5 +101,21 @@
     )
 }
 
+#let rground(name, node, ..params) = {
+    assert(params.pos().len() == 0, message: "earth supports only one node")
+
+    // Drawing function
+    let draw(ctx, position, style) = {
+        wire((0, 0), (0, -style.distance))
+        line((-style.width / 2, -style.distance), (style.width / 2, -style.distance))
+
+        interface((-style.width / 2, style.distance), (style.width / 2, -style.distance))
+        anchor("default", (0, 0))
+    }
+
+    // Component call
+    component("rground", name, node, draw: draw, ..params)
+}
+
 #let vcc(name, node, ..params) = vsupply("vcc", name, node, ..params)
 #let vee(name, node, ..params) = vsupply("vee", name, node, ..params, invert: true)

src/lib.typ

@@ -25,7 +25,7 @@
 #import "components/diode.typ": diode, led, photodiode, schottky, tunnel, zener
 #import "components/switch.typ": switch
 #import "components/fuse.typ": afuse, fuse
-#import "components/supply.typ": earth, frame, ground, vcc, vee
+#import "components/supply.typ": earth, frame, ground, rground, vcc, vee
 #import "components/inductor.typ": inductor
 #import "components/logic.typ": land, lnand, lnor, lnot, lor, lxnor, lxor
 #import "components/resistor.typ": heater, potentiometer, resistor, rheostat

src/styles.typ

@@ -223,6 +223,13 @@
         radius: 0.22,
         distance: 0.28,
     ),
+    rground: (
+        variant: auto,
+        scale: auto,
+        stroke: auto,
+        width: .53,
+        distance: .28,
+    ),
     frame: (
         variant: auto,
         scale: auto,

tests/supplies/ref/1.png

@@ -9,6 +9,7 @@
     ground("gnd", (2, 0))
     frame("fr", (3, 0))
     earth("ea", (4, 0))
+    rground("rg", (5, 0))
 })
 
 // Test label position
@@ -26,7 +27,8 @@
     ground("gnd", (2, 0))
     frame("fr", (3, 0))
     earth("ea", (4, 0))
-    wire("vcc", "vee", "gnd", "fr", "ea")
+    rground("rg", (5, 0))
+    wire("vcc", "vee", "gnd", "fr", "ea", "rg")
 })
 
 // Test styling