From b1f011f933e2943a7b773cef02cc95db793c747f Mon Sep 17 00:00:00 2001
From: Stefan Frederik <stefan.schippers@gmail.com>
Date: Tue, 1 Nov 2022 13:17:51 +0100
Subject: [PATCH] clean up testing @path in symbols

---
 xschem_library/devices/nmos4.sym            | 2 +-
 xschem_library/devices/pmos4.sym            | 2 +-
 xschem_library/devices/title.sym            | 4 +++-
 xschem_library/examples/mos_power_ampli.sch | 2 +-
 xschem_library/rom8k/n.sym                  | 2 +-
 xschem_library/rom8k/nlv.sym                | 2 +-
 xschem_library/rom8k/p.sym                  | 2 +-
 xschem_library/rom8k/plv.sym                | 2 +-
 xschem_library/rom8k/rom8k.sch              | 5 -----
 9 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/xschem_library/devices/nmos4.sym b/xschem_library/devices/nmos4.sym
index 73845463..0ef55181 100644
--- a/xschem_library/devices/nmos4.sym
+++ b/xschem_library/devices/nmos4.sym
@@ -25,7 +25,7 @@ B 5 -22.5 -2.5 -17.5 2.5 {name=g dir=in}
 B 5 17.5 27.5 22.5 32.5 {name=s dir=inout}
 B 5 17.5 -2.5 22.5 2.5 {name=b dir=in}
 T {@w\\/@l\\/@m} 7.5 -18.75 0 0 0.2 0.2 {}
-T {@path@spiceprefix@name} 7.5 7.5 0 0 0.2 0.2 {}
+T {@spiceprefix@name} 7.5 7.5 0 0 0.2 0.2 {}
 T {D} 25 -27.5 0 0 0.15 0.15 {}
 T {@#0:net_name} 25 -42.5 0 0 0.15 0.15 {layer=15}
 T {@#2:net_name} 25 32.5 0 0 0.15 0.15 {layer=15}
diff --git a/xschem_library/devices/pmos4.sym b/xschem_library/devices/pmos4.sym
index d8347d00..d021664d 100644
--- a/xschem_library/devices/pmos4.sym
+++ b/xschem_library/devices/pmos4.sym
@@ -31,7 +31,7 @@ B 5 -22.5 -2.5 -17.5 2.5 {name=g dir=in}
 B 5 17.5 -32.5 22.5 -27.5 {name=s dir=inout}
 B 5 17.5 -2.5 22.5 2.5 {name=b dir=in}
 T {@w\\/@l\\/@m} 7.5 -17.5 0 0 0.2 0.2 {}
-T {@path@spiceprefix@name} 7.5 7.5 0 0 0.2 0.2 {}
+T {@spiceprefix@name} 7.5 7.5 0 0 0.2 0.2 {}
 T {D} 25 20 0 0 0.15 0.15 {}
 T {@#2:net_name} 25 -42.5 0 0 0.15 0.15 {layer=15}
 T {@#0:net_name} 25 32.5 0 0 0.15 0.15 {layer=15}
diff --git a/xschem_library/devices/title.sym b/xschem_library/devices/title.sym
index 5f679048..bad52ce3 100644
--- a/xschem_library/devices/title.sym
+++ b/xschem_library/devices/title.sym
@@ -1,4 +1,5 @@
-v {xschem version=3.1.0 file_version=1.2 }
+v {xschem version=3.1.0 file_version=1.2
+}
 G {}
 K {type=logo
 template="name=l1 author=\\"Stefan Schippers\\""
@@ -16,3 +17,4 @@ T {@schname_ext} 235 5 0 0 0.4 0.4 {}
 T {@author} 235 -25 0 0 0.4 0.4 {}
 T {@time_last_modified} 1020 -25 0 1 0.4 0.3 {}
 T {SCHEM} 5 -25 0 0 1 1 {}
+T {@path} 1020 5 0 1 0.4 0.3 {}
diff --git a/xschem_library/examples/mos_power_ampli.sch b/xschem_library/examples/mos_power_ampli.sch
index b23b1d16..3c76f194 100644
--- a/xschem_library/examples/mos_power_ampli.sch
+++ b/xschem_library/examples/mos_power_ampli.sch
@@ -409,7 +409,7 @@ node="[format %.4g [expr \{([ngspice::get_node v(vpp)] - [ngspice::get_voltage o
 descr = power
 }
 C {lab_wire.sym} 910 -690 0 1 {name=l40 lab=OUTI}
-C {ngspice_get_expr.sym} 980 -490 0 0 {name=r44 
+C {ngspice_get_expr.sym} 1000 -480 0 0 {name=r44 
 node="[ngspice::get_current \{r7[i]\}]" 
 descr = current
 }
diff --git a/xschem_library/rom8k/n.sym b/xschem_library/rom8k/n.sym
index f360d1f1..2d5558dc 100644
--- a/xschem_library/rom8k/n.sym
+++ b/xschem_library/rom8k/n.sym
@@ -44,4 +44,4 @@ B 5 -22.5 -2.5 -17.5 2.5 {name=g dir=in}
 B 5 17.5 27.5 22.5 32.5 {name=s dir=inout}
 B 5 17.5 -2.5 22.5 2.5 {name=b dir=in}
 T {@w\\/@l\\/@m} 7.5 -17.5 0 0 0.2 0.2 {}
-T {@path@name} 7.5 5 0 0 0.2 0.2 {}
+T {@name} 7.5 5 0 0 0.2 0.2 {}
diff --git a/xschem_library/rom8k/nlv.sym b/xschem_library/rom8k/nlv.sym
index ffcc9430..7f71d543 100644
--- a/xschem_library/rom8k/nlv.sym
+++ b/xschem_library/rom8k/nlv.sym
@@ -33,4 +33,4 @@ B 5 17.5 -32.5 22.5 -27.5 {name=d dir=inout}
 B 5 -22.5 -2.5 -17.5 2.5 {name=g dir=in}
 B 5 17.5 27.5 22.5 32.5 {name=s dir=inout}
 T {@w\\/@l\\/@m} 7.5 -17.5 0 0 0.2 0.2 {}
-T {@path@name} 7.5 5 0 0 0.2 0.2 {}
+T {@name} 7.5 5 0 0 0.2 0.2 {}
diff --git a/xschem_library/rom8k/p.sym b/xschem_library/rom8k/p.sym
index bedfb424..80465ad0 100644
--- a/xschem_library/rom8k/p.sym
+++ b/xschem_library/rom8k/p.sym
@@ -42,4 +42,4 @@ B 5 -22.5 -2.5 -17.5 2.5 {name=g dir=in}
 B 5 17.5 -32.5 22.5 -27.5 {name=s dir=inout}
 B 5 17.5 -2.5 22.5 2.5 {name=b dir=in}
 T {@w\\/@l\\/@m} 7.5 -17.5 0 0 0.2 0.2 {}
-T {@path@name} 7.5 5 0 0 0.2 0.2 {999}
+T {@name} 7.5 5 0 0 0.2 0.2 {999}
diff --git a/xschem_library/rom8k/plv.sym b/xschem_library/rom8k/plv.sym
index 4e3990c6..dd6b64aa 100644
--- a/xschem_library/rom8k/plv.sym
+++ b/xschem_library/rom8k/plv.sym
@@ -39,4 +39,4 @@ B 5 17.5 27.5 22.5 32.5 {name=d dir=inout}
 B 5 -22.5 -2.5 -17.5 2.5 {name=g dir=in}
 B 5 17.5 -32.5 22.5 -27.5 {name=s dir=inout}
 T {@w\\/@l\\/@m} 7.5 -17.5 0 0 0.2 0.2 {}
-T {@path@name} 7.5 5 0 0 0.2 0.2 {999}
+T {@name} 7.5 5 0 0 0.2 0.2 {999}
diff --git a/xschem_library/rom8k/rom8k.sch b/xschem_library/rom8k/rom8k.sch
index bd72bba3..39491b18 100644
--- a/xschem_library/rom8k/rom8k.sch
+++ b/xschem_library/rom8k/rom8k.sch
@@ -176,10 +176,6 @@ N 1530 -350 1530 -330 {lab=vss}
 N 1530 -530 1530 -510 {lab=vss}
 N 1710 -180 1710 -160 {lab=vss}
 N 1530 -180 1530 -160 {lab=vss}
-N 780 -900 780 -890 {}
-N 780 -930 790 -930 {}
-N 730 -930 740 -930 {}
-N 780 -970 780 -960 {}
 C {title.sym} 170 0 0 0 {name=l3 author="Stefan Schippers"}
 C {rom2_coldec.sym} 1190 -890 0 0 {name=xcdec[15:0]}
 C {lab_pin.sym} 1040 -910 0 0 {name=p377 lab=LDY1[15:0]}
@@ -456,4 +452,3 @@ tclcommand="
   \}
 "
 }
-C {n.sym} 760 -930 0 0 {name=m1 model=cmosn w=4u l=2.4u m=1}