third round of additions to improve auto_hilight_graph_nodes

src/hilight.c

@@ -284,7 +284,10 @@ int hilight_graph_node(const char *node, int col)
     *ptr2 = '\0';
     path3 = nptr;
     nptr = ptr2 + 1;
-    my_mstrcat(_ALLOC_ID_, &path2, path, path3, ".", NULL);
+    if(!strstr(path, path3))
+      my_mstrcat(_ALLOC_ID_, &path2, path, path3, ".", NULL);
+    else 
+      my_strdup2(_ALLOC_ID_, &path2, path);
   }
   else {
     my_strdup2(_ALLOC_ID_, &path2, path);

xschem_library/ngspice/delta_sigma.sch

@@ -39,7 +39,7 @@ subdivx=1
 node="SIG_IN
 VREF
 VCC"
-color="8 9 4"
+color="12 9 4"
 dataset=0
 unitx=u
 }
@@ -59,7 +59,7 @@ node="CODE;CODE[5],CODE[4],CODE[3],CODE[2],CODE[1],CODE[0]
 CK
 RST
 x1.COMP"
-color="7 4 10 4"
+color="7 8 10 4"
 dataset=0
 unitx=u
 digital=1

xschem_library/rom8k/rom2_sa.sch

@@ -1,4 +1,4 @@
-v {xschem version=3.4.4 file_version=1.2
+v {xschem version=3.4.5 file_version=1.2
 *
 * This file is part of XSCHEM,
 * a schematic capture and Spice/Vhdl/Verilog netlisting tool for circuit
@@ -28,35 +28,35 @@ B 2 380 -820 1060 -660 {flags=graph
 y1 = 0
 y2 = 2
 divy = 4
-x1=2.6e-07
-x2=3.4e-07
+x1=2.44e-07
+x2=3.24e-07
 divx=8
-node="tcleval($\{path\}ldqi
-$\{path\}ldqib
-$\{path\}ldsali)"
-color="9 6 7"
+node="tcleval($\{path\}LDQI
+$\{path\}LDQIB
+$\{path\}LDSALI)"
+color="9 18 7"
 jpeg_quality=30}
 B 2 380 -940 1060 -830 {flags=graph
 y1 = 0
 y2 = 2
 divy = 2
-x1=2.6e-07
-x2=3.4e-07
+x1=2.44e-07
+x2=3.24e-07
 divx=8
 node="v(ldcp)
 v(ldprech)"
 color="12 10"
 jpeg_quality=30}
 B 2 380 -650 1060 -510 {flags=graph
-y1 = 0
-y2 = 2
+y1 = -0.02
+y2 = 1.6
 divy = 2
-x1=2.6e-07
-x2=3.4e-07
+x1=2.44e-07
+x2=3.24e-07
 divx=8
-node="tcleval($\{path\}ldqiii
-$\{path\}ldqii
-$\{path\}ldsali)"
+node="tcleval($\{path\}LDQIII
+$\{path\}LDQII
+$\{path\}LDSALI)"
 color="6 8 7"
 jpeg_quality=30}
 T {Was:

xschem_library/rom8k/rom8k.sch

@@ -76,12 +76,12 @@ x1=1.25008e-07
 x2=2.42972e-07
 divx=10
 subdivx=4
-node="ldcp
-ldyms[4]
-ldyms[5]
-ldyms[6]
-ldymsref
-xsa[14].ldqii"
+node="LDCP
+LDYMS[4]
+LDYMS[5]
+LDYMS[6]
+LDYMSREF
+xsa[14].LDQII"
 color="6 12 13 14 11 4"
 unitx=n