From 86e84c8ca64881240a6a7ca57c4eff674fb8612a Mon Sep 17 00:00:00 2001
From: klayoutmatthias <matthias@klayout.org>
Date: Sun, 2 Jun 2024 20:12:18 +0200
Subject: [PATCH] Updating further golden data files with MacOS variants

---
 testdata/drc/drcSimpleTests_au56.gds.4        | Bin 0 -> 26018 bytes
 testdata/drc/drcSimpleTests_au70.gds.5        | Bin 0 -> 71406 bytes
 ...m_resistors.cir => custom_resistors.cir.1} |   0
 testdata/lvs/custom_resistors.cir.2           |  18 ++
 testdata/lvs/custom_resistors.l2n.3           | 103 +++++++++
 testdata/lvs/res_combine1.cir.3               |   7 +
 testdata/lvs/res_combine1.lvsdb.6             | 197 ++++++++++++++++++
 testdata/lvs/res_combine2.cir.1               |   2 +-
 testdata/lvs/res_combine2.lvsdb.6             | 193 +++++++++++++++++
 testdata/lvs/res_combine3.cir.3               |   7 +
 testdata/lvs/res_combine3.lvsdb.6             | 196 +++++++++++++++++
 11 files changed, 722 insertions(+), 1 deletion(-)
 create mode 100644 testdata/drc/drcSimpleTests_au56.gds.4
 create mode 100644 testdata/drc/drcSimpleTests_au70.gds.5
 rename testdata/lvs/{custom_resistors.cir => custom_resistors.cir.1} (100%)
 create mode 100644 testdata/lvs/custom_resistors.cir.2
 create mode 100644 testdata/lvs/custom_resistors.l2n.3
 create mode 100644 testdata/lvs/res_combine1.cir.3
 create mode 100644 testdata/lvs/res_combine1.lvsdb.6
 create mode 100644 testdata/lvs/res_combine2.lvsdb.6
 create mode 100644 testdata/lvs/res_combine3.cir.3
 create mode 100644 testdata/lvs/res_combine3.lvsdb.6

diff --git a/testdata/drc/drcSimpleTests_au56.gds.4 b/testdata/drc/drcSimpleTests_au56.gds.4
new file mode 100644
index 0000000000000000000000000000000000000000..4922db8045be61556a87c58a22eff8279ce162bd
GIT binary patch
literal 26018
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
PPw`#O-&hX2$I$-)vPaS>

literal 0
HcmV?d00001

diff --git a/testdata/drc/drcSimpleTests_au70.gds.5 b/testdata/drc/drcSimpleTests_au70.gds.5
new file mode 100644
index 0000000000000000000000000000000000000000..5c6ce599612ac56526b481c1b682322092d9eeac
GIT binary patch
literal 71406
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

literal 0
HcmV?d00001

diff --git a/testdata/lvs/custom_resistors.cir b/testdata/lvs/custom_resistors.cir.1
similarity index 100%
rename from testdata/lvs/custom_resistors.cir
rename to testdata/lvs/custom_resistors.cir.1
diff --git a/testdata/lvs/custom_resistors.cir.2 b/testdata/lvs/custom_resistors.cir.2
new file mode 100644
index 000000000..da72185a9
--- /dev/null
+++ b/testdata/lvs/custom_resistors.cir.2
@@ -0,0 +1,18 @@
+
+* cell TOP
+.SUBCKT TOP
+* cell instance $1 r180 *1 2,2.6
+X$1 6 1 A
+* cell instance $2 r0 *1 2.2,1
+X$2 6 5 A
+* device instance $1 r0 *1 0.8,0.75 RPP1
+R$1 1 2 0.555555555556 RPP1
+.ENDS TOP
+
+* cell A
+* pin 
+* pin 
+.SUBCKT A 1 2
+* device instance $1 r0 *1 -0.2,0.4 RPP1
+R$1 2 1 1.25 RPP1
+.ENDS A
diff --git a/testdata/lvs/custom_resistors.l2n.3 b/testdata/lvs/custom_resistors.l2n.3
new file mode 100644
index 000000000..01f44b800
--- /dev/null
+++ b/testdata/lvs/custom_resistors.l2n.3
@@ -0,0 +1,103 @@
+#%l2n-klayout
+W(TOP)
+U(0.001)
+L(l4 '15/0')
+L(l3 '16/0')
+L(l1)
+C(l4 l4 l3 l1)
+C(l3 l4 l3)
+C(l1 l4 l1)
+H(E B('Resistor shape does not touch marker border in exactly two places') C(TOP) X('device-extract') Q('(0.8,0.75;0.8,1.15;1,1.15;1,0.75)'))
+H(E B('Resistor shape does not touch marker border in exactly two places') C(TOP) X('device-extract') Q('(0,0.75;0,1.15;0.2,1.15;0.2,0.75)'))
+H(E B('Resistor shape does not touch marker border in exactly two places') C(A) X('device-extract') Q('(0.85,-0.4;0.85,-0.2;1.25,-0.2;1.25,-0.4)'))
+K(RPP1 RES)
+D(D$RPP1 RPP1
+ T(A
+  R(l1 (0 1200) (200 250))
+ )
+ T(B
+  R(l1 (0 400) (200 300))
+ )
+)
+D(D$RPP1$1 RPP1
+ T(A
+  R(l1 (750 0) (250 200))
+ )
+ T(B
+  R(l1 (0 0) (250 200))
+ )
+)
+X(A
+ R((-200 -450) (1750 1350))
+ N(1
+  R(l4 (-150 450) (100 100))
+  R(l3 (-150 -150) (200 500))
+  R(l1 (-200 -500) (250 200))
+ )
+ N(2
+  R(l4 (650 450) (100 100))
+  R(l4 (-100 -900) (100 100))
+  R(l3 (-150 200) (200 650))
+  R(l3 (-200 -1000) (200 500))
+  R(l1 (-250 300) (250 200))
+  R(l1 (-200 -1000) (250 200))
+ )
+ N(3
+  R(l4 (1450 -350) (100 100))
+ )
+ P(1)
+ P(2)
+ D(1 D$RPP1$1
+  Y(-200 400)
+  E(R 1.25)
+  E(L 0.5)
+  E(W 0.2)
+  E(A 0.1)
+  E(P 1.4)
+  T(A 2)
+  T(B 1)
+ )
+)
+X(TOP
+ R((-50 450) (3800 2600))
+ N(1
+  R(l4 (850 2050) (100 100))
+  R(l3 (-150 -150) (500 200))
+  R(l1 (-500 -250) (200 250))
+ )
+ N(2
+  R(l4 (850 1250) (100 100))
+  R(l4 (-100 -100) (100 100))
+  R(l4 (-900 -100) (100 100))
+  R(l3 (200 -150) (650 200))
+  R(l3 (-1000 -200) (500 200))
+  R(l1 (300 -250) (200 300))
+  R(l1 (-1000 -300) (200 250))
+ )
+ N(3
+  R(l4 (50 450) (100 100))
+ )
+ N(4
+  R(l4 (850 450) (100 100))
+ )
+ N(5)
+ N(6)
+ D(1 D$RPP1
+  Y(800 750)
+  E(R 0.555555555556)
+  E(L 0.333333333333)
+  E(W 0.3)
+  E(A 0.1)
+  E(P 1.26666666667)
+  T(A 1)
+  T(B 2)
+ )
+ X(1 A O(180) Y(2000 2600)
+  P(0 6)
+  P(1 1)
+ )
+ X(2 A Y(2200 1000)
+  P(0 6)
+  P(1 5)
+ )
+)
diff --git a/testdata/lvs/res_combine1.cir.3 b/testdata/lvs/res_combine1.cir.3
new file mode 100644
index 000000000..aa8016e4d
--- /dev/null
+++ b/testdata/lvs/res_combine1.cir.3
@@ -0,0 +1,7 @@
+* Extracted by KLayout
+
+* cell Res2
+.SUBCKT Res2
+* device instance $1 r0 *1 110.14,51.795 RPP1
+R$1 2 1 95 RPP1 L=420U W=2.21052631579U
+.ENDS Res2
diff --git a/testdata/lvs/res_combine1.lvsdb.6 b/testdata/lvs/res_combine1.lvsdb.6
new file mode 100644
index 000000000..856312de7
--- /dev/null
+++ b/testdata/lvs/res_combine1.lvsdb.6
@@ -0,0 +1,197 @@
+#%lvsdb-klayout
+
+# Layout
+layout(
+ top(Res2)
+ unit(0.001)
+
+ # Layer section
+ # This section lists the mask layers (drawing or derived) and their connections.
+
+ # Mask layers
+ layer(l4 '15/0')
+ layer(l3 '16/0')
+ layer(l1)
+
+ # Mask layer connectivity
+ connect(l4 l4 l3 l1)
+ connect(l3 l4 l3)
+ connect(l1 l4 l1)
+
+ # Device class section
+ class(RPP1 RES
+  param(R 0 0)
+  param(L 1 0)
+  param(W 1 0)
+ )
+
+ # Device abstracts section
+ # Device abstracts list the pin shapes of the devices.
+ device(D$RPP1 RPP1
+  terminal(A
+   rect(l1 (10540 0) (540 2000))
+  )
+  terminal(B
+   rect(l1 (0 0) (540 2000))
+  )
+ )
+
+ # Circuit section
+ # Circuits are the hierarchical building blocks of the netlist.
+ circuit(Res2
+
+  # Circuit boundary
+  rect((8285 720) (117975 57350))
+
+  # Nets with their geometries
+  net(1
+   rect(l4 (120580 32490) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -750) (220 220))
+   rect(l4 (-22355 1390) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -750) (220 220))
+   rect(l4 (-21520 1755) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -750) (220 220))
+   rect(l3 (0 -4795) (1065 5850))
+   rect(l3 (-5155 -6930) (52985 1475))
+   rect(l3 (-27585 -395) (1065 5850))
+   rect(l3 (20990 -5850) (1065 5850))
+   rect(l3 (-1275 -1760) (340 1920))
+   rect(l3 (-22475 -1890) (340 1920))
+   rect(l3 (-21640 -1525) (340 1920))
+   rect(l1 (42935 -2385) (540 2000))
+   rect(l1 (-22675 -1970) (540 2000))
+   rect(l1 (-21840 -1605) (540 2000))
+  )
+  net(2
+   rect(l4 (19795 5575) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -750) (220 220))
+   rect(l3 (-195 -995) (2395 2500))
+   rect(l3 (-2480 -1785) (340 1920))
+   rect(l1 (-500 -1960) (540 2000))
+  )
+
+  # Devices and their connections
+  device(1 D$RPP1
+   device(D$RPP1 location(-65 -8175))
+   device(D$RPP1 location(-205 -12595))
+   device(D$RPP1 location(-320 -20985))
+   device(D$RPP1 location(-225 -16825))
+   device(D$RPP1 location(30 -3970))
+   device(D$RPP1 location(-22135 30))
+   device(D$RPP1 location(-22200 -8145))
+   device(D$RPP1 location(-22340 -12565))
+   device(D$RPP1 location(-22455 -20955))
+   device(D$RPP1 location(-22360 -16795))
+   device(D$RPP1 location(-22105 -3940))
+   device(D$RPP1 location(-43435 425))
+   device(D$RPP1 location(-43500 -7750))
+   device(D$RPP1 location(-43640 -12170))
+   device(D$RPP1 location(-43755 -20560))
+   device(D$RPP1 location(-43660 -16400))
+   device(D$RPP1 location(-43405 -3545))
+   device(D$RPP1 location(-100465 855))
+   device(D$RPP1 location(-81950 425))
+   device(D$RPP1 location(-100530 -7320))
+   device(D$RPP1 location(-100670 -11740))
+   device(D$RPP1 location(-100785 -20130))
+   device(D$RPP1 location(-100785 -26915))
+   device(D$RPP1 location(-100690 -15970))
+   device(D$RPP1 location(-100435 -3115))
+   device(D$RPP1 location(-82015 -7750))
+   device(D$RPP1 location(-82155 -12170))
+   device(D$RPP1 location(-82175 -16400))
+   device(D$RPP1 location(-63435 640))
+   device(D$RPP1 location(-63500 -7535))
+   device(D$RPP1 location(-63640 -11955))
+   device(D$RPP1 location(-63755 -20345))
+   device(D$RPP1 location(-63865 -26810))
+   device(D$RPP1 location(-63660 -16185))
+   device(D$RPP1 location(-63405 -3330))
+   device(D$RPP1 location(-63930 -34985))
+   device(D$RPP1 location(-64070 -39405))
+   device(D$RPP1 location(-64090 -43635))
+   device(D$RPP1 location(-82380 -26810))
+   device(D$RPP1 location(-82270 -20560))
+   device(D$RPP1 location(-82445 -34985))
+   device(D$RPP1 location(-82585 -39405))
+   device(D$RPP1 location(-82700 -47795))
+   device(D$RPP1 location(-64185 -47795))
+   device(D$RPP1 location(-82605 -43635))
+   device(D$RPP1 location(-82350 -30780))
+   device(D$RPP1 location(-63835 -30780))
+   device(D$RPP1 location(-81920 -3545))
+   device(D$RPP1 location(-100850 -35090))
+   device(D$RPP1 location(-100990 -39510))
+   device(D$RPP1 location(-101105 -47900))
+   device(D$RPP1 location(-101010 -43740))
+   device(D$RPP1 location(-100755 -30885))
+   connect(51 A A)
+   connect(3 B A)
+   connect(9 B A)
+   connect(15 B A)
+   location(110140 51795)
+   param(R 95)
+   param(L 420)
+   param(W 2.21052631579)
+   param(A 1080)
+   param(P 1296)
+   terminal(A 2)
+   terminal(B 1)
+  )
+
+ )
+)
+
+# Reference netlist
+reference(
+
+ # Device class section
+ class(RPP1 RES)
+
+ # Circuit section
+ # Circuits are the hierarchical building blocks of the netlist.
+ circuit(RES2
+
+  # Nets
+  net(1 name(GND))
+  net(2 name(VDD))
+
+  # Outgoing pins and their connections to nets
+  pin(1 name(GND))
+  pin(2 name(VDD))
+
+  # Devices and their connections
+  device(1 RPP1
+   name(I0.I106.R0)
+   param(R 59475.7)
+   param(L 420)
+   param(W 2.21052631579)
+   param(A 0)
+   param(P 0)
+   terminal(A 2)
+   terminal(B 1)
+  )
+
+ )
+)
+
+# Cross reference
+xref(
+ circuit(Res2 RES2 match
+  xref(
+   net(1 1 warning)
+   net(2 2 warning)
+   pin(() 0 match)
+   pin(() 1 match)
+   device(1 1 match)
+  )
+ )
+)
diff --git a/testdata/lvs/res_combine2.cir.1 b/testdata/lvs/res_combine2.cir.1
index 650763fba..e440a8095 100644
--- a/testdata/lvs/res_combine2.cir.1
+++ b/testdata/lvs/res_combine2.cir.1
@@ -3,5 +3,5 @@
 * cell Res2
 .SUBCKT Res2
 * device instance $1 r0 *1 110.14,51.795 RPP1
-R$1 1 2 95 RPP1
+R$1 2 1 95 RPP1
 .ENDS Res2
diff --git a/testdata/lvs/res_combine2.lvsdb.6 b/testdata/lvs/res_combine2.lvsdb.6
new file mode 100644
index 000000000..89c533976
--- /dev/null
+++ b/testdata/lvs/res_combine2.lvsdb.6
@@ -0,0 +1,193 @@
+#%lvsdb-klayout
+
+# Layout
+layout(
+ top(Res2)
+ unit(0.001)
+
+ # Layer section
+ # This section lists the mask layers (drawing or derived) and their connections.
+
+ # Mask layers
+ layer(l4 '15/0')
+ layer(l3 '16/0')
+ layer(l1)
+
+ # Mask layer connectivity
+ connect(l4 l4 l3 l1)
+ connect(l3 l4 l3)
+ connect(l1 l4 l1)
+
+ # Device class section
+ class(RPP1 RES)
+
+ # Device abstracts section
+ # Device abstracts list the pin shapes of the devices.
+ device(D$RPP1 RPP1
+  terminal(A
+   rect(l1 (10540 0) (540 2000))
+  )
+  terminal(B
+   rect(l1 (0 0) (540 2000))
+  )
+ )
+
+ # Circuit section
+ # Circuits are the hierarchical building blocks of the netlist.
+ circuit(Res2
+
+  # Circuit boundary
+  rect((8285 720) (117975 57350))
+
+  # Nets with their geometries
+  net(1
+   rect(l4 (120580 32490) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -750) (220 220))
+   rect(l4 (-22355 1390) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -750) (220 220))
+   rect(l4 (-21520 1755) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -750) (220 220))
+   rect(l3 (0 -4795) (1065 5850))
+   rect(l3 (-5155 -6930) (52985 1475))
+   rect(l3 (-27585 -395) (1065 5850))
+   rect(l3 (20990 -5850) (1065 5850))
+   rect(l3 (-1275 -1760) (340 1920))
+   rect(l3 (-22475 -1890) (340 1920))
+   rect(l3 (-21640 -1525) (340 1920))
+   rect(l1 (42935 -2385) (540 2000))
+   rect(l1 (-22675 -1970) (540 2000))
+   rect(l1 (-21840 -1605) (540 2000))
+  )
+  net(2
+   rect(l4 (19795 5575) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -750) (220 220))
+   rect(l3 (-195 -995) (2395 2500))
+   rect(l3 (-2480 -1785) (340 1920))
+   rect(l1 (-500 -1960) (540 2000))
+  )
+
+  # Devices and their connections
+  device(1 D$RPP1
+   device(D$RPP1 location(-65 -8175))
+   device(D$RPP1 location(-205 -12595))
+   device(D$RPP1 location(-320 -20985))
+   device(D$RPP1 location(-225 -16825))
+   device(D$RPP1 location(30 -3970))
+   device(D$RPP1 location(-22135 30))
+   device(D$RPP1 location(-22200 -8145))
+   device(D$RPP1 location(-22340 -12565))
+   device(D$RPP1 location(-22455 -20955))
+   device(D$RPP1 location(-22360 -16795))
+   device(D$RPP1 location(-22105 -3940))
+   device(D$RPP1 location(-43435 425))
+   device(D$RPP1 location(-43500 -7750))
+   device(D$RPP1 location(-43640 -12170))
+   device(D$RPP1 location(-43755 -20560))
+   device(D$RPP1 location(-43660 -16400))
+   device(D$RPP1 location(-43405 -3545))
+   device(D$RPP1 location(-100465 855))
+   device(D$RPP1 location(-81950 425))
+   device(D$RPP1 location(-100530 -7320))
+   device(D$RPP1 location(-100670 -11740))
+   device(D$RPP1 location(-100785 -20130))
+   device(D$RPP1 location(-100785 -26915))
+   device(D$RPP1 location(-100690 -15970))
+   device(D$RPP1 location(-100435 -3115))
+   device(D$RPP1 location(-82015 -7750))
+   device(D$RPP1 location(-82155 -12170))
+   device(D$RPP1 location(-82175 -16400))
+   device(D$RPP1 location(-63435 640))
+   device(D$RPP1 location(-63500 -7535))
+   device(D$RPP1 location(-63640 -11955))
+   device(D$RPP1 location(-63755 -20345))
+   device(D$RPP1 location(-63865 -26810))
+   device(D$RPP1 location(-63660 -16185))
+   device(D$RPP1 location(-63405 -3330))
+   device(D$RPP1 location(-63930 -34985))
+   device(D$RPP1 location(-64070 -39405))
+   device(D$RPP1 location(-64090 -43635))
+   device(D$RPP1 location(-82380 -26810))
+   device(D$RPP1 location(-82270 -20560))
+   device(D$RPP1 location(-82445 -34985))
+   device(D$RPP1 location(-82585 -39405))
+   device(D$RPP1 location(-82700 -47795))
+   device(D$RPP1 location(-64185 -47795))
+   device(D$RPP1 location(-82605 -43635))
+   device(D$RPP1 location(-82350 -30780))
+   device(D$RPP1 location(-63835 -30780))
+   device(D$RPP1 location(-81920 -3545))
+   device(D$RPP1 location(-100850 -35090))
+   device(D$RPP1 location(-100990 -39510))
+   device(D$RPP1 location(-101105 -47900))
+   device(D$RPP1 location(-101010 -43740))
+   device(D$RPP1 location(-100755 -30885))
+   connect(51 A A)
+   connect(3 B A)
+   connect(9 B A)
+   connect(15 B A)
+   location(110140 51795)
+   param(R 95)
+   param(L 420)
+   param(W 2.21052631579)
+   param(A 1080)
+   param(P 1296)
+   terminal(A 2)
+   terminal(B 1)
+  )
+
+ )
+)
+
+# Reference netlist
+reference(
+
+ # Device class section
+ class(RPP1 RES)
+
+ # Circuit section
+ # Circuits are the hierarchical building blocks of the netlist.
+ circuit(RES2
+
+  # Nets
+  net(1 name(GND))
+  net(2 name(VDD))
+
+  # Outgoing pins and their connections to nets
+  pin(1 name(GND))
+  pin(2 name(VDD))
+
+  # Devices and their connections
+  device(1 RPP1
+   name(I0.I106.R0)
+   param(R 59475.7)
+   param(L 420)
+   param(W 2.21052631579)
+   param(A 0)
+   param(P 0)
+   terminal(A 2)
+   terminal(B 1)
+  )
+
+ )
+)
+
+# Cross reference
+xref(
+ circuit(Res2 RES2 match
+  xref(
+   net(1 1 warning)
+   net(2 2 warning)
+   pin(() 0 match)
+   pin(() 1 match)
+   device(1 1 match)
+  )
+ )
+)
diff --git a/testdata/lvs/res_combine3.cir.3 b/testdata/lvs/res_combine3.cir.3
new file mode 100644
index 000000000..e440a8095
--- /dev/null
+++ b/testdata/lvs/res_combine3.cir.3
@@ -0,0 +1,7 @@
+* Extracted by KLayout
+
+* cell Res2
+.SUBCKT Res2
+* device instance $1 r0 *1 110.14,51.795 RPP1
+R$1 2 1 95 RPP1
+.ENDS Res2
diff --git a/testdata/lvs/res_combine3.lvsdb.6 b/testdata/lvs/res_combine3.lvsdb.6
new file mode 100644
index 000000000..1bb644fbe
--- /dev/null
+++ b/testdata/lvs/res_combine3.lvsdb.6
@@ -0,0 +1,196 @@
+#%lvsdb-klayout
+
+# Layout
+layout(
+ top(Res2)
+ unit(0.001)
+
+ # Layer section
+ # This section lists the mask layers (drawing or derived) and their connections.
+
+ # Mask layers
+ layer(l4 '15/0')
+ layer(l3 '16/0')
+ layer(l1)
+
+ # Mask layer connectivity
+ connect(l4 l4 l3 l1)
+ connect(l3 l4 l3)
+ connect(l1 l4 l1)
+
+ # Device class section
+ class(RPP1 RES)
+
+ # Device abstracts section
+ # Device abstracts list the pin shapes of the devices.
+ device(D$RPP1 RPP1
+  terminal(A
+   rect(l1 (10540 0) (540 2000))
+  )
+  terminal(B
+   rect(l1 (0 0) (540 2000))
+  )
+ )
+
+ # Circuit section
+ # Circuits are the hierarchical building blocks of the netlist.
+ circuit(Res2
+
+  # Circuit boundary
+  rect((8285 720) (117975 57350))
+
+  # Nets with their geometries
+  net(1
+   rect(l4 (120580 32490) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -750) (220 220))
+   rect(l4 (-22355 1390) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -750) (220 220))
+   rect(l4 (-21520 1755) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -750) (220 220))
+   rect(l3 (0 -4795) (1065 5850))
+   rect(l3 (-5155 -6930) (52985 1475))
+   rect(l3 (-27585 -395) (1065 5850))
+   rect(l3 (20990 -5850) (1065 5850))
+   rect(l3 (-1275 -1760) (340 1920))
+   rect(l3 (-22475 -1890) (340 1920))
+   rect(l3 (-21640 -1525) (340 1920))
+   rect(l1 (42935 -2385) (540 2000))
+   rect(l1 (-22675 -1970) (540 2000))
+   rect(l1 (-21840 -1605) (540 2000))
+  )
+  net(2
+   rect(l4 (19795 5575) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -745) (220 220))
+   rect(l4 (-220 -750) (220 220))
+   rect(l3 (-195 -995) (2395 2500))
+   rect(l3 (-2480 -1785) (340 1920))
+   rect(l1 (-500 -1960) (540 2000))
+  )
+
+  # Devices and their connections
+  device(1 D$RPP1
+   device(D$RPP1 location(-65 -8175))
+   device(D$RPP1 location(-205 -12595))
+   device(D$RPP1 location(-320 -20985))
+   device(D$RPP1 location(-225 -16825))
+   device(D$RPP1 location(30 -3970))
+   device(D$RPP1 location(-22135 30))
+   device(D$RPP1 location(-22200 -8145))
+   device(D$RPP1 location(-22340 -12565))
+   device(D$RPP1 location(-22455 -20955))
+   device(D$RPP1 location(-22360 -16795))
+   device(D$RPP1 location(-22105 -3940))
+   device(D$RPP1 location(-43435 425))
+   device(D$RPP1 location(-43500 -7750))
+   device(D$RPP1 location(-43640 -12170))
+   device(D$RPP1 location(-43755 -20560))
+   device(D$RPP1 location(-43660 -16400))
+   device(D$RPP1 location(-43405 -3545))
+   device(D$RPP1 location(-100465 855))
+   device(D$RPP1 location(-81950 425))
+   device(D$RPP1 location(-100530 -7320))
+   device(D$RPP1 location(-100670 -11740))
+   device(D$RPP1 location(-100785 -20130))
+   device(D$RPP1 location(-100785 -26915))
+   device(D$RPP1 location(-100690 -15970))
+   device(D$RPP1 location(-100435 -3115))
+   device(D$RPP1 location(-82015 -7750))
+   device(D$RPP1 location(-82155 -12170))
+   device(D$RPP1 location(-82175 -16400))
+   device(D$RPP1 location(-63435 640))
+   device(D$RPP1 location(-63500 -7535))
+   device(D$RPP1 location(-63640 -11955))
+   device(D$RPP1 location(-63755 -20345))
+   device(D$RPP1 location(-63865 -26810))
+   device(D$RPP1 location(-63660 -16185))
+   device(D$RPP1 location(-63405 -3330))
+   device(D$RPP1 location(-63930 -34985))
+   device(D$RPP1 location(-64070 -39405))
+   device(D$RPP1 location(-64090 -43635))
+   device(D$RPP1 location(-82380 -26810))
+   device(D$RPP1 location(-82270 -20560))
+   device(D$RPP1 location(-82445 -34985))
+   device(D$RPP1 location(-82585 -39405))
+   device(D$RPP1 location(-82700 -47795))
+   device(D$RPP1 location(-64185 -47795))
+   device(D$RPP1 location(-82605 -43635))
+   device(D$RPP1 location(-82350 -30780))
+   device(D$RPP1 location(-63835 -30780))
+   device(D$RPP1 location(-81920 -3545))
+   device(D$RPP1 location(-100850 -35090))
+   device(D$RPP1 location(-100990 -39510))
+   device(D$RPP1 location(-101105 -47900))
+   device(D$RPP1 location(-101010 -43740))
+   device(D$RPP1 location(-100755 -30885))
+   connect(51 A A)
+   connect(3 B A)
+   connect(9 B A)
+   connect(15 B A)
+   location(110140 51795)
+   param(R 95)
+   param(L 420)
+   param(W 2.21052631579)
+   param(A 1080)
+   param(P 1296)
+   terminal(A 2)
+   terminal(B 1)
+  )
+
+ )
+)
+
+# Reference netlist
+reference(
+
+ # Device class section
+ class(RPP1 RES)
+
+ # Circuit section
+ # Circuits are the hierarchical building blocks of the netlist.
+ circuit(RES2
+
+  # Nets
+  net(1 name(GND))
+  net(2 name(VDD))
+
+  # Outgoing pins and their connections to nets
+  pin(1 name(GND))
+  pin(2 name(VDD))
+
+  # Devices and their connections
+  device(1 RPP1
+   name(I0.I106.R0)
+   param(R 59475.7)
+   param(L 420)
+   param(W 2.21052631579)
+   param(A 0)
+   param(P 0)
+   terminal(A 2)
+   terminal(B 1)
+  )
+
+ )
+)
+
+# Cross reference
+xref(
+ circuit(Res2 RES2 nomatch
+  xref(
+   net(() 1 mismatch)
+   net(() 2 mismatch)
+   net(1 () mismatch)
+   net(2 () mismatch)
+   pin(() 0 match)
+   pin(() 1 match)
+   device(() 1 mismatch)
+   device(1 () mismatch)
+  )
+ )
+)