Merge branch 'master' into work

responsible for removing the log files.  Otherwise the log files
just keep accumulating output forever.

.gitignore

@@ -1,12 +1,12 @@
-*.*%
-*.cdslck
-.inca.db.*
-inca.*.pak
-*.swp
-*.log
+netgen
+netgenexec
+defs.mak
+config.cache
+config.log
+config.status
+*.o
 *.so
 *~
-*/av_extracted*/
-.nfs*
-*.cd-
-*/mommdl/
+*.log
+UPDATE_ME
+VERSION

Makefile

@@ -3,7 +3,7 @@
 #
 
 NETGENDIR = .
-PROGRAMS = netgen
+PROGRAMS = netgen python
 MODULES = base
 
 MAKEFLAGS =
@@ -61,7 +61,7 @@ install-real: install-dirs
 
 install-tcl-dirs:
 	${NETGENDIR}/scripts/mkdirs $(DESTDIR)${BINDIR} $(DESTDIR)${MANDIR} \
-		$(DESTDIR)${TCLDIR}
+		$(DESTDIR)${TCLDIR} $(DESTDIR)${PYDIR}
 
 install-dirs:
 	${NETGENDIR}/scripts/mkdirs $(DESTDIR)${BINDIR} $(DESTDIR)${MANDIR}
@@ -78,6 +78,7 @@ install-tcl-real: install-tcl-dirs
 clean:
 	for dir in ${MODULES} ${PROGRAMS} ${UNUSED_MODULES}; do \
 		(cd $$dir && ${MAKE} clean); done
+	${RM} *.tmp */*.tmp *.sav */*.sav *.log TAGS tags
 
 distclean:
 	touch defs.mak

README

@@ -78,7 +78,7 @@ of CVS check-in notes on http://opencircuitdesign.com/netgen/.
 
 BUILDING NETGEN:
 ----------------
-NETGEN version 1.4 uses the same "make" procedure as Magic version 7.5
+NETGEN version 1.5 uses the same "make" procedure as Magic version 8.1
 and IRSIM version 9.7:
 
    ./configure

TO_DO

@@ -1,37 +1,29 @@
 TO_DO list for version 1.5
 ------------------------------
 
- 1) Parallel (transistors and capacitors) and serial (resistors)
-    device merging, plus methods for describing how any device
-    class may be merged.
+ As of version 1.5.70, the major to-do item list is complete.
 
 Possible useful additions (not critical)
 ----------------------
 
- 1) Add new output style allowing netlists to be described by Tcl scripts
-    (similar to the C-Code format, but does not require compiling).
- 2) Add automatic file format guessing from file extension for "write" command
- 3) Add Tk GUI to match (and improve upon!) the original X11 GUI.
- 4) Incorporate into Tcl-based xcircuit
- 5) Extend 2-terminal device handling (namely R and C) to more formats
+ 1) Add automatic file format guessing from file extension for "write" command
+ 2) Incorporate into Tcl-based xcircuit
+ 3) Extend 2-terminal device handling (namely R and C) to more formats
     (where appropriate).
- 6) Generate feedback in the form of a .mag file to facilitate interactive
+ 4) Generate feedback in the form of a .mag file to facilitate interactive
     netlist comparison in conjunction with magic.  This may be an error
     file, but it may also make use of magic 7.2's "element" command to
     build rat's nests or outline areas of interest or anything else that
     might be helpful to interactive comparison.
- 7) Improve upon the readability of the netlist comparator output.
-    In particular, pinpoint situations in which an error does not show
-    up in an obvious way in either the element or node lists.
- 8) Handle the hierarchy of ".ext" files automatically.
- 9) Retain position information from ".ext" files for the purpose of writing
+ 5) Handle the hierarchy of ".ext" files automatically.
+ 6) Retain position information from ".ext" files for the purpose of writing
     feedback information into magic and for matching devices in the element
     list to their counterparts in the original layout [note---done for .sim
     format, which contains position information.  Usefulness of improving
     the .ext parsing is questionable.  Ditto for item 8].
-10) Expand upon the details of format-to-format translation, (especially
+ 7) Expand upon the details of format-to-format translation, (especially
     ntk and ext formats, SPICE format writing, and sim format reading).
-11) Add a "property" command to add/remove properties to check, and change
-    the slop values (done).
-12) Add a "subcircuit" command to mimic a SPICE ".SUBCKT ... .ENDS" card.
+ 8) Add a "subcircuit" command to mimic a SPICE ".SUBCKT ... .ENDS" card
+    (i.e., the ability to add subcircuit "stub" definitions from the
+    command line or from a setup file).
 

VERSION

@@ -1 +1 @@
-1.5.62
+1.5.102

base/Makefile

@@ -3,7 +3,7 @@ NETGENDIR = ..
 SRCS = actel.c ccode.c greedy.c ntk.c print.c actellib.c embed.c \
  hash.c netfile.c objlist.c query.c anneal.c ext.c netcmp.c netgen.c \
  pdutils.c random.c timing.c bottomup.c flatten.c place.c spice.c \
- wombat.c xilinx.c xillib.c
+ verilog.c wombat.c xilinx.c xillib.c
 X11_SRCS = xnetgen.c
 
 include ${NETGENDIR}/defs.mak

base/anneal.c

@@ -20,7 +20,6 @@ int MaxCPUTime = 100;  /* max number of seconds to burn */
 #define MAX_CHANGES_PER_ITER 2
 
 #if 0
-/* INLINE */
 float RandomUniform(void)
 {
   /* DANGER! DANGER! Non-portable code below!! */

base/bottomup.c

@@ -36,7 +36,6 @@ int CountFanoutOK;
 int CountSwallowedElements;
 
 
-INLINE 
 int Independent(int E1, int E2)
 /* return 1 if E1 and E2 share no leaves in common */
 {
@@ -47,7 +46,6 @@ int Independent(int E1, int E2)
   return(1);
 }
 
-INLINE
 int FanoutOK(int E1, int E2)
 {
   int approxfanout;
@@ -67,7 +65,6 @@ int FanoutOK(int E1, int E2)
 }
 
 
-INLINE
 int Swallowed(int Parent, int Child)
 /* returns 1 if Child's fanout is contained in Parent's */
 {
@@ -107,7 +104,6 @@ int SmallEnough(int E1, int E2)
 }
 #endif
 
-INLINE 
 int SuccessfulEmbedding(int E)
 /* returns 1 if element E is a successful embedding */
 {

base/config.h

@@ -117,15 +117,6 @@
 #define memzero(ptr, len) memset(ptr, 0, len)
 #endif
 
-
-#ifndef INLINE
-#ifdef __GNUC__
-#define INLINE inline
-#else
-#define INLINE
-#endif /* __GNUC__ */
-#endif
-
 #ifdef HAVE_SYSV_STRING
 #undef NEED_STRING
 #endif

base/embed.c

@@ -348,7 +348,6 @@ void PRINTPACKED(unsigned long *mstar)
 #ifdef IBMPC
 static unsigned int lochash(unsigned long *mstar)
 #else
-INLINE 
 static unsigned long lochash(unsigned long *mstar)
 #endif
 {
@@ -432,7 +431,6 @@ static struct ex_entry *hashinstall(unsigned long *mstar)
   return(ex_tab[hashval] = np);
 }
 
-/* INLINE */
 int Exists(int E1, int E2)
 {
   int i;
@@ -470,7 +468,6 @@ int InitializeExistTest(void)
   return(1);
 }
 
-/* INLINE */
 void AddToExistSet(int E1, int E2) 
 {
   int i;

base/ext.c

@@ -170,7 +170,7 @@ char *ReadExt(char *fname, int doflat, int *fnum)
 
     SetExtension(name, fname, EXT_EXTENSION);
     if ((filenum = OpenParseFile(name, *fnum)) < 0) {
-      Printf("No file: %s\n",name);
+      Printf("Error in ext file read: No file %s\n",name);
       *fnum = filenum;
       return NULL;
     }    
@@ -196,16 +196,16 @@ char *ReadExt(char *fname, int doflat, int *fnum)
   }
 
   while (!EndParseFile()) {
-    SkipTok();
+    SkipTok(NULL);
 
     if (EndParseFile()) break;
-    if (nexttok[0] == '#') SkipNewLine();
-    else if (match(nexttok, "timestamp")) SkipNewLine();
-    else if (match(nexttok, "version"))  SkipNewLine();
-    else if (match(nexttok, "tech"))  SkipNewLine();
-    else if (match(nexttok, "scale"))  SkipNewLine();
-    else if (match(nexttok, "style"))  SkipNewLine();
-    else if (match(nexttok, "resistclasses"))  SkipNewLine();
+    if (nexttok[0] == '#') SkipNewLine(NULL);
+    else if (match(nexttok, "timestamp")) SkipNewLine(NULL);
+    else if (match(nexttok, "version"))  SkipNewLine(NULL);
+    else if (match(nexttok, "tech"))  SkipNewLine(NULL);
+    else if (match(nexttok, "scale"))  SkipNewLine(NULL);
+    else if (match(nexttok, "style"))  SkipNewLine(NULL);
+    else if (match(nexttok, "resistclasses"))  SkipNewLine(NULL);
     else if (match(nexttok, "node")) {
       char name[200];
 
@@ -216,122 +216,122 @@ char *ReadExt(char *fname, int doflat, int *fnum)
 	CellDef(fname, filenum);
 	CellDefInProgress = 1;
       }
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(name, nexttok);
       Node(name);  	/* Ports will be determined by context */
-      SkipNewLine();
+      SkipNewLine(NULL);
     }
     else if (match(nexttok, "equiv")) {
       char name[200];
       char name2[200];
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(name, nexttok);
       if (LookupObject(name,CurrentCell) == NULL) Node(name);
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(name2, nexttok);
       if (LookupObject(name2,CurrentCell) == NULL) Node(name2);
       join(name, name2);
-      SkipNewLine();
+      SkipNewLine(NULL);
     }
     else if (match(nexttok, "device")) {
       char dev_name[100], dev_class[100];
       char gate[200], drain[200], source[200], subs[200];
       char inststr[64];
-      SkipTok();
+      SkipTok(NULL);
       strcpy(dev_class, nexttok);
-      SkipTok();
+      SkipTok(NULL);
       strcpy(dev_name, nexttok);
-      SkipTok(); /* x coord of gate box */
+      SkipTok(NULL); /* x coord of gate box */
       strcpy(inststr, dev_class);
       strcat(inststr, "@");
       strcat(inststr, nexttok);
-      SkipTok(); /* y coord of gate box */
+      SkipTok(NULL); /* y coord of gate box */
       strcat(inststr, ",");
       strcat(inststr, nexttok);
-      SkipTok(); /* skip coord of gate box */
-      SkipTok(); /* skip coord of gate box */
+      SkipTok(NULL); /* skip coord of gate box */
+      SkipTok(NULL); /* skip coord of gate box */
 
       /* Device-dependent parameters */
 
       if (match(dev_class, "mosfet")) {
-         SkipTok(); /* skip device length */
-         SkipTok(); /* skip device width */
-         SkipTok();
+         SkipTok(NULL); /* skip device length */
+         SkipTok(NULL); /* skip device width */
+         SkipTok(NULL);
          GetExtName(subs, nexttok);
       }
       else if (match(dev_class, "bjt")) {
-         SkipTok(); /* skip device length */
-         SkipTok(); /* skip device width */
-         SkipTok();
+         SkipTok(NULL); /* skip device length */
+         SkipTok(NULL); /* skip device width */
+         SkipTok(NULL);
          GetExtName(subs, nexttok);
       }
       else if (match(dev_class, "devcap")) {
-         SkipTok(); /* skip device length */
-         SkipTok(); /* skip device width */	/* or. . . */
+         SkipTok(NULL); /* skip device length */
+         SkipTok(NULL); /* skip device width */	/* or. . . */
       }
       else if (match(dev_class, "devres")) {
-         SkipTok(); /* skip device length */
-         SkipTok(); /* skip device width */	/* or. . . */
+         SkipTok(NULL); /* skip device length */
+         SkipTok(NULL); /* skip device width */	/* or. . . */
       }
       else if (match(dev_class, "diode")) {
-         SkipTok();
+         SkipTok(NULL);
          GetExtName(gate, nexttok);
-         SkipTok(); /* skip terminal length */
-         SkipTok(); /* skip terminal attributes */
-         SkipTok();
+         SkipTok(NULL); /* skip terminal length */
+         SkipTok(NULL); /* skip terminal attributes */
+         SkipTok(NULL);
          GetExtName(drain, nexttok);
-         SkipTok(); /* skip terminal length */
-         SkipTok(); /* skip terminal attributes */
+         SkipTok(NULL); /* skip terminal length */
+         SkipTok(NULL); /* skip terminal attributes */
       }
       else if (match(dev_class, "subckt")) {
-         SkipTok(); /* skip device length */
-         SkipTok(); /* skip device width */
-         SkipTok();
+         SkipTok(NULL); /* skip device length */
+         SkipTok(NULL); /* skip device width */
+         SkipTok(NULL);
          GetExtName(subs, nexttok);
 	 while (nexttok != NULL) {
-            SkipTok();
+            SkipTok(NULL);
             GetExtName(gate, nexttok);
-            SkipTok(); /* skip terminal length */
-            SkipTok(); /* skip terminal attributes */
+            SkipTok(NULL); /* skip terminal length */
+            SkipTok(NULL); /* skip terminal attributes */
 	 }
       }
       else if (match(dev_class, "rsubckt")) {
-         SkipTok(); /* skip device length */
-         SkipTok(); /* skip device width */
-         SkipTok();
+         SkipTok(NULL); /* skip device length */
+         SkipTok(NULL); /* skip device width */
+         SkipTok(NULL);
          GetExtName(subs, nexttok);
       }
-      SkipTokNoNewline();
-      SkipNewLine();
+      SkipTokNoNewline(NULL);
+      SkipNewLine(NULL);
     }
     else if (match(nexttok, "fet")) {	/* old-style FET record */
       char fet_class[100];
       char gate[200], drain[200], source[200], subs[200];
       char inststr[64];
-      SkipTok();
+      SkipTok(NULL);
       strcpy(fet_class, nexttok);
-      SkipTok(); /* x coord of gate box */
+      SkipTok(NULL); /* x coord of gate box */
       strcpy(inststr, fet_class);
       strcat(inststr, "@");
       strcat(inststr, nexttok);
-      SkipTok(); /* y coord of gate box */
+      SkipTok(NULL); /* y coord of gate box */
       strcat(inststr, ",");
       strcat(inststr, nexttok);
-      SkipTok(); /* skip coord of gate box */
-      SkipTok(); /* skip coord of gate box */
-      SkipTok(); /* skip gate area */
-      SkipTok(); /* skip gate perimeter */
-      SkipTok();
+      SkipTok(NULL); /* skip coord of gate box */
+      SkipTok(NULL); /* skip coord of gate box */
+      SkipTok(NULL); /* skip gate area */
+      SkipTok(NULL); /* skip gate perimeter */
+      SkipTok(NULL);
       GetExtName(subs, nexttok);
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(gate, nexttok);
-      SkipTok(); /* skip terminal length */
-      SkipTok(); /* skip terminal attributes */
-      SkipTok();
+      SkipTok(NULL); /* skip terminal length */
+      SkipTok(NULL); /* skip terminal attributes */
+      SkipTok(NULL);
       GetExtName(drain, nexttok);
-      SkipTok(); /* skip terminal length */
-      SkipTok(); /* skip terminal attributes */
-      SkipTokNoNewline();
+      SkipTok(NULL); /* skip terminal length */
+      SkipTok(NULL); /* skip terminal attributes */
+      SkipTokNoNewline(NULL);
       if (nexttok == NULL) {
 	/* This gets around a problem with the magic extractor in which */
 	/* transistors having shorted source-drain are written into the */
@@ -341,7 +341,7 @@ char *ReadExt(char *fname, int doflat, int *fnum)
       }
       else
         GetExtName(source, nexttok);
-      SkipNewLine();
+      SkipNewLine(NULL);
       /* remap transistors into things we know about */
       if (match(fet_class, "nfet"))
 	  N(fname, inststr, gate, drain, source);
@@ -361,15 +361,15 @@ char *ReadExt(char *fname, int doflat, int *fnum)
     else if (match(nexttok, "cap")) {
       if (IgnoreRC) {
 	/* ignore all capacitances */
-	SkipNewLine();
+	SkipNewLine(NULL);
       }
       else {
         char ctop[200], cbot[200], cdummy[200];
-	SkipTok();
+	SkipTok(NULL);
         GetExtName(ctop, nexttok);
-	SkipTok();
+	SkipTok(NULL);
         GetExtName(cbot, nexttok);
-	SkipNewLine();	/* Skip over capacitance value */
+	SkipNewLine(NULL);	/* Skip over capacitance value */
 	Cap(fname, NULL, ctop, cbot);
       }
     }
@@ -386,14 +386,14 @@ char *ReadExt(char *fname, int doflat, int *fnum)
 	CellDefInProgress = 1;
       }
 
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(name, nexttok);
       if ((basename = strrchr(name,'/')) != NULL) {
 	char tmp[200];
 	strcpy(tmp, basename+1);
 	strcpy(name, tmp);
       }
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(instancename, nexttok);
       Printf("Instancing %s as %s\n", name, instancename);
       Instance(name, instancename);
@@ -401,14 +401,14 @@ char *ReadExt(char *fname, int doflat, int *fnum)
         Printf("Flattening %s in %s\n", instancename, fname);
 	flattenInstancesOf(NULL, filenum, name);
       }
-      SkipNewLine();
+      SkipNewLine(NULL);
     }
     else if (match(nexttok, "merge")) {
       char name[200];
       char name2[200];
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(name, nexttok);
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(name2, nexttok);
       if (doflat)
 	 join(name, name2);
@@ -416,12 +416,12 @@ char *ReadExt(char *fname, int doflat, int *fnum)
 	 join(name, name2);
       else {
       }
-      SkipNewLine();
+      SkipNewLine(NULL);
     }
     else {
       Printf("Strange token in ext: '%s'\n", nexttok);
       InputParseError(stderr);
-      SkipNewLine();
+      SkipNewLine(NULL);
     }
   }
   CloseParseFile();
@@ -643,7 +643,7 @@ char *ReadSim(char *fname, int *fnum)
 
     SetExtension(name, fname, SIM_EXTENSION);
     if (OpenParseFile(name, *fnum) < 0) {
-      Printf("No file: %s\n",name);
+      Printf("Error in ext file read: No file %s\n",name);
       *fnum = filenum;
       return NULL;
     }    
@@ -657,189 +657,189 @@ char *ReadSim(char *fname, int *fnum)
   CellDef(fname, filenum);
 
   while (!EndParseFile()) {
-    SkipTok();
+    SkipTok(NULL);
 
     if (EndParseFile()) break;
     if (nexttok[0] == '|') {
-      SkipTok();		/* "units" */
+      SkipTok(NULL);		/* "units" */
       if (!strcmp(nexttok, "units:")) {
-        SkipTok();
+        SkipTok(NULL);
 	simscale = strtod(nexttok, NULL);
       }
-      SkipNewLine();
+      SkipNewLine(NULL);
     }
     else if (match(nexttok, "n")) {
       char gate[200], drain[200], source[200];
       char inststr[25], *instptr = NULL;
 
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(gate, nexttok);
       if (LookupObject(gate, CurrentCell) == NULL)
 	Node(gate);   /* define the node if it does not already exist */
 
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(drain, nexttok);
       if (LookupObject(drain, CurrentCell) == NULL)
 	Node(drain);   /* define the node if it does not already exist */
 
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(source, nexttok);
       if (LookupObject(source, CurrentCell) == NULL)
 	Node(source);   /* define the node if it does not already exist */
 
-      SkipTokNoNewline();	/* length */
+      SkipTokNoNewline(NULL);	/* length */
       if ((nexttok != NULL) && (nexttok[0] != '\0')) {
 	vstr = ScaleStringFloatValue(&nexttok[0], simscale * 1e-8);
 	AddProperty(&kvlist, "length", vstr);
-        SkipTok();		/* width */
+        SkipTok(NULL);		/* width */
 	if ((nexttok != NULL) && (nexttok[0] != '\0')) {
 	    vstr = ScaleStringFloatValue(&nexttok[0], simscale * 1e-8);
 	    AddProperty(&kvlist, "width", vstr);
 	}
-        SkipTokNoNewline();
+        SkipTokNoNewline(NULL);
         if (nexttok != NULL) {
 	  if (StrIsInt(nexttok)) {
 	    strcpy(inststr, "n@");
 	    strcat(inststr, nexttok);
-	    SkipTok();
+	    SkipTok(NULL);
 	    strcat(inststr, ",");
 	    strcat(inststr, nexttok);
 	    instptr = inststr;
 	  }
 	}
       }
-      SkipNewLine(); /* skip any attributes */
+      SkipNewLine(NULL); /* skip any attributes */
       N(fname, instptr, gate, drain, source);
       LinkProperties("n", kvlist);
     }
     else if (match(nexttok, "p")) {
       char gate[200], drain[200], source[200];
       char inststr[25], *instptr = NULL;
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(gate, nexttok);
       if (LookupObject(gate, CurrentCell) == NULL)
 	Node(gate);   /* define the node if it does not already exist */
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(drain, nexttok);
       if (LookupObject(drain, CurrentCell) == NULL)
 	Node(drain);   /* define the node if it does not already exist */
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(source, nexttok);
       if (LookupObject(source, CurrentCell) == NULL)
 	Node(source);   /* define the node if it does not already exist */
-      SkipTokNoNewline();	/* length */
+      SkipTokNoNewline(NULL);	/* length */
       if ((nexttok != NULL) && (nexttok[0] != '\0')) {
 	vstr = ScaleStringFloatValue(&nexttok[0], simscale * 1e-8);
 	AddProperty(&kvlist, "length", vstr);
-        SkipTok();	/* width */
+        SkipTok(NULL);	/* width */
 	if ((nexttok != NULL) && (nexttok[0] != '\0')) {
 	    vstr = ScaleStringFloatValue(&nexttok[0], simscale * 1e-8);
 	    AddProperty(&kvlist, "width", vstr);
 	}
-        SkipTokNoNewline();
+        SkipTokNoNewline(NULL);
         if (nexttok != NULL) {
 	  if (StrIsInt(nexttok)) {
 	    strcpy(inststr, "p@");
 	    strcat(inststr, nexttok);
-	    SkipTok();
+	    SkipTok(NULL);
 	    strcat(inststr, ",");
 	    strcat(inststr, nexttok);
 	    instptr = inststr;
 	  }
 	}
       }
-      SkipNewLine(); /* skip various attributes */
+      SkipNewLine(NULL); /* skip various attributes */
       P(fname, instptr, gate, drain, source);
       LinkProperties("p", kvlist);
     }
     else if (match(nexttok, "e")) {	/* 3-port capacitors (poly/poly2) */
       char gate[200], drain[200], source[200];
       char inststr[25], *instptr = NULL;
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(gate, nexttok);
       if (LookupObject(gate, CurrentCell) == NULL)
 	Node(gate);   /* define the node if it does not already exist */
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(drain, nexttok);
       if (LookupObject(drain, CurrentCell) == NULL)
 	Node(drain);   /* define the node if it does not already exist */
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(source, nexttok);
       if (LookupObject(source, CurrentCell) == NULL)
 	Node(source);   /* define the node if it does not already exist */
-      SkipTokNoNewline();	/* skip length */
+      SkipTokNoNewline(NULL);	/* skip length */
       if (nexttok != NULL) {
-        SkipTok();	/* skip width */
-        SkipTokNoNewline();
+        SkipTok(NULL);	/* skip width */
+        SkipTokNoNewline(NULL);
         inststr[0] = '\0';
         if (nexttok != NULL) {
 	  if (StrIsInt(nexttok)) {
 	    strcpy(inststr, "e@");
 	    strcat(inststr, nexttok);
-	    SkipTok();
+	    SkipTok(NULL);
 	    strcat(inststr, ",");
 	    strcat(inststr, nexttok);
 	    instptr = inststr;
 	  }
 	}
       }
-      SkipNewLine(); /* skip various attributes */
+      SkipNewLine(NULL); /* skip various attributes */
       E(fname, instptr, gate, drain, source);
     }
     else if (match(nexttok, "b")) {		/* bipolars added by Tim 7/16/96 */
       char base[200], emitter[200], collector[200];
       char inststr[25], *instptr = NULL;
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(base, nexttok);
       if (LookupObject(base, CurrentCell) == NULL)
 	Node(base);   /* define the node if it does not already exist */
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(emitter, nexttok);
       if (LookupObject(emitter, CurrentCell) == NULL)
 	Node(emitter);   /* define the node if it does not already exist */
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(collector, nexttok);
       if (LookupObject(collector, CurrentCell) == NULL)
 	Node(collector);   /* define the node if it does not already exist */
-      SkipTokNoNewline();	/* skip length */
+      SkipTokNoNewline(NULL);	/* skip length */
       if (nexttok != NULL) {
-        SkipTok();	/* skip width */
-        SkipTokNoNewline();
+        SkipTok(NULL);	/* skip width */
+        SkipTokNoNewline(NULL);
         if (nexttok != NULL) {
 	  if (StrIsInt(nexttok)) {
 	    strcpy(inststr, "b@");
 	    strcat(inststr, nexttok);
-	    SkipTok();
+	    SkipTok(NULL);
 	    strcat(inststr, ",");
 	    strcat(inststr, nexttok);
 	    instptr = inststr;
 	  }
 	}
       }
-      SkipNewLine(); /* skip various attributes */
+      SkipNewLine(NULL); /* skip various attributes */
       B(fname, instptr, collector, base, emitter);
     }
     else if (matchnocase(nexttok, "c")) { /* 2-port capacitors */
       if (IgnoreRC) {
 	/* ignore all capacitances */
-	SkipNewLine();
+	SkipNewLine(NULL);
       }
       else {
         char ctop[200], cbot[200], cdummy[200];
-        SkipTok();
+        SkipTok(NULL);
         GetExtName(ctop, nexttok);
         if (LookupObject(ctop, CurrentCell) == NULL)
 	  Node(ctop);   /* define the node if it does not already exist */
-        SkipTok();
+        SkipTok(NULL);
         GetExtName(cbot, nexttok);
         if (LookupObject(cbot, CurrentCell) == NULL)
 	  Node(cbot);   /* define the node if it does not already exist */
-	SkipTokNoNewline();
+	SkipTokNoNewline(NULL);
 	if (nexttok != NULL) {
 	   vstr = ScaleStringFloatValue(&nexttok[0], 1e-15);
 	   AddProperty(&kvlist, "value", vstr);
 	}
-        SkipNewLine();
+        SkipNewLine(NULL);
         Cap(fname, NULL, ctop, cbot);
 	LinkProperties("c", kvlist);
       }
@@ -847,23 +847,23 @@ char *ReadSim(char *fname, int *fnum)
     else if (match(nexttok, "r")) {	/* 2-port resistors */
       if (IgnoreRC) {
 	/* ignore all capacitances */
-	SkipNewLine();
+	SkipNewLine(NULL);
       }
       else {
         char rtop[200], rbot[200];
-        SkipTok();
+        SkipTok(NULL);
         GetExtName(rtop, nexttok);
         if (LookupObject(rtop, CurrentCell) == NULL)
 	  Node(rtop);   /* define the node if it does not already exist */
-        SkipTok();
+        SkipTok(NULL);
         GetExtName(rbot, nexttok);
         if (LookupObject(rbot, CurrentCell) == NULL)
 	  Node(rbot);   /* define the node if it does not already exist */
-	SkipTokNoNewline();
+	SkipTokNoNewline(NULL);
 	if (nexttok != NULL) {
 	   AddProperty(&kvlist, "value", &nexttok[0]);
 	}
-        SkipNewLine(); /* skip various attributes */
+        SkipNewLine(NULL); /* skip various attributes */
         Res(fname, NULL, rtop, rbot);
 	LinkProperties("r", kvlist);
       }
@@ -871,55 +871,55 @@ char *ReadSim(char *fname, int *fnum)
     else if (match(nexttok, "z")) {	/* 3-port resistors from magic */
       if (IgnoreRC) {
 	/* ignore all capacitances */
-	SkipNewLine();
+	SkipNewLine(NULL);
       }
       else {
         char rtop[200], rbot[200], rdummy[200];
 	char inststr[25], *instptr = NULL;
-        SkipTok();
+        SkipTok(NULL);
         GetExtName(rdummy, nexttok);
         if (LookupObject(rdummy, CurrentCell) == NULL)
 	  Node(rdummy);   /* define the node if it does not already exist */
-        SkipTok();
+        SkipTok(NULL);
         GetExtName(rtop, nexttok);
         if (LookupObject(rtop, CurrentCell) == NULL)
 	  Node(rtop);   /* define the node if it does not already exist */
-        SkipTok();
+        SkipTok(NULL);
         GetExtName(rbot, nexttok);
         if (LookupObject(rbot, CurrentCell) == NULL)
 	  Node(rbot);   /* define the node if it does not already exist */
-        SkipTokNoNewline();	/* skip length */
+        SkipTokNoNewline(NULL);	/* skip length */
         if (nexttok != NULL) {
-          SkipTok();	/* skip width */
-          SkipTokNoNewline();
+          SkipTok(NULL);	/* skip width */
+          SkipTokNoNewline(NULL);
           if (nexttok != NULL) {
 	    if (StrIsInt(nexttok)) {
 	      strcpy(inststr, "z@");
 	      strcat(inststr, nexttok);
-	      SkipTok();
+	      SkipTok(NULL);
 	      strcat(inststr, ",");
 	      strcat(inststr, nexttok);
 	      instptr = inststr;
 	    }
 	  }
 	}
-        SkipNewLine(); /* skip various attributes */
+        SkipNewLine(NULL); /* skip various attributes */
         Res3(fname, instptr, rdummy, rtop, rbot);
       }
     }
     else if (match(nexttok, "N")) {
       /* ignore this keyword */
-      SkipNewLine();
+      SkipNewLine(NULL);
     }
     else if (match(nexttok, "A")) {
       /* ignore this keyword */
-      SkipNewLine();
+      SkipNewLine(NULL);
     }
     else if (match(nexttok, "=")) {
       char node1[200], node2[200];
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(node1, nexttok);
-      SkipTok();
+      SkipTok(NULL);
       GetExtName(node2, nexttok);
       join(node1, node2);
     }
@@ -928,12 +928,12 @@ char *ReadSim(char *fname, int *fnum)
         Printf("Ignoring lumped resistances (\"R\" records) in .sim.\n");
 	has_lumped = 1;	  /* Don't print this message more than once */
       }
-      SkipNewLine();
+      SkipNewLine(NULL);
     }
     else {
       Printf("Strange token in .sim: '%s'\n", nexttok);
       InputParseError(stderr);
-      SkipNewLine();
+      SkipNewLine(NULL);
     }
     DeleteProperties(&kvlist);
   }

base/flatten.c

@@ -486,24 +486,30 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
       }
 
       /* splice instance out of parent */
-      if (ParentParams == ThisCell->cell) {
-	/* ParentParams are the very first thing in the list */
-	ThisCell->cell = ChildObjList;
-	for (ob2 = ChildObjList; ob2 && ob2->next != NULL; ob2 = ob2->next) ;
+      if ((ParentParams == ThisCell->cell) && (ChildObjList == NULL)) {
+	ThisCell->cell = ob2;	/* Child cell was empty */
+	tmp = ob2;
       }
       else {
-	/* find ParentParams in ThisCell list */
-	for (ob2 = ThisCell->cell; ob2 && ob2->next != ParentParams; ob2=ob2->next); 
-	if (ob2)
-	   for (ob2->next = ChildObjList; ob2->next != NULL; ob2 = ob2->next) ;
-      }
-      /* now, ob2 is last element in child list, so skip and reclaim parent */
+         if (ParentParams == ThisCell->cell) {
+	   /* ParentParams are the very first thing in the list */
+	   ThisCell->cell = ChildObjList;
+	   for (ob2 = ChildObjList; ob2 && ob2->next != NULL; ob2 = ob2->next) ;
+         }
+         else {
+	   /* find ParentParams in ThisCell list */
+	   for (ob2 = ThisCell->cell; ob2 && ob2->next != ParentParams; ob2=ob2->next); 
+	   if (ob2)
+	      for (ob2->next = ChildObjList; ob2->next != NULL; ob2 = ob2->next) ;
+         }
+         /* now, ob2 is last element in child list, so skip and reclaim parent */
 
-      tmp = ParentParams;
-      do {
-	tmp = tmp->next;
-      } while ((tmp != NULL) && ((tmp->type > FIRSTPIN) || (tmp->type == PROPERTY)));
-      if (ob2) ob2->next = tmp;
+         tmp = ParentParams;
+         do {
+	   tmp = tmp->next;
+         } while ((tmp != NULL) && ((tmp->type > FIRSTPIN) || (tmp->type == PROPERTY)));
+         if (ob2) ob2->next = tmp;
+      }
       while (ParentParams != tmp) {
 	ob2 = ParentParams->next;
 	FreeObjectAndHash(ParentParams, ThisCell);
@@ -1224,6 +1230,10 @@ int CleanupPins(char *name, int filenum)
       return 0;
    }
 
+   // If cell is type MODULE, this is a black-box circuit and
+   // pins are expected to be disconnected (so don't remove them).
+   if (ThisCell->class == CLASS_MODULE) return 0;
+
    // Avoid a loop through all cells unless we have to do it.
 
    for (ob = ThisCell->cell; ob != NULL; ob = ob->next) {
@@ -1407,7 +1417,7 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
     else
 	tc2 = LookupCellFile(name2, file2);
 
-    if (tc1 == NULL || tc2 == NULL) return;
+    if (tc1 == NULL || tc2 == NULL) return 0;
 
     InitializeHashTable(&compdict, OBJHASHSIZE);
 

base/hash.c

@@ -309,7 +309,7 @@ struct hashlist *HashInt2PtrInstall(char *name, int c, void *ptr,
 /* destroy a hash table, freeing associated memory 			*/
 /*----------------------------------------------------------------------*/
 
-void *HashKill(struct hashdict *dict)
+void HashKill(struct hashdict *dict)
 {
   struct hashlist *np, *p;
   int i;

base/hash.h

@@ -25,6 +25,7 @@ extern struct nlist *RecurseHashTablePointer(struct hashdict *dict,
 	void *pointer);
 extern void HashDelete(char *name, struct hashdict *dict);
 extern void HashIntDelete(char *name, int value, struct hashdict *dict);
+extern void HashKill(struct hashdict *dict);
 
 
 extern int CountHashTableEntries(struct hashlist *p);

base/netcmp.h

@@ -9,6 +9,7 @@ extern struct nlist *Circuit2;
 extern int ExhaustiveSubdivision;
 
 #ifdef TCL_NETGEN
+#include <tcl.h>
 extern int InterruptPending;
 #endif
 
@@ -17,10 +18,11 @@ extern int InterruptPending;
 extern void PrintElementClasses(struct ElementClass *EC, int type, int dolist);
 extern void PrintNodeClasses(struct NodeClass *NC, int type, int dolist);
 extern void SummarizeNodeClasses(struct NodeClass *NC);
-extern void PrintPropertyResults(void);
+extern void PrintPropertyResults(int do_list);
 extern void PrintCoreStats(void);
 extern void ResetState(void);
-extern void CreateTwoLists(char *name1, int file1, char *name2, int file2);
+extern void CreateTwoLists(char *name1, int file1, char *name2, int file2,
+		int dolist);
 extern int Iterate(void);
 extern int VerifyMatching(void);
 extern void PrintAutomorphisms(void);
@@ -32,8 +34,9 @@ extern int PermuteForget(char *model, int filenum, char *pin1, char *pin2);
 extern int EquivalenceElements(char *name1, int file1, char *name2, int file2);
 extern int EquivalenceNodes(char *name1, int file1, char *name2, int file2);
 extern int EquivalenceClasses(char *name1, int file1, char *name2, int file2);
-extern int IgnoreClass(char *name, int file);
-extern int MatchPins(struct nlist *tp1, struct nlist *tp2);
+extern int IgnoreClass(char *name, int file, unsigned char type);
+extern int MatchPins(struct nlist *tp1, struct nlist *tp2, int dolist);
+extern int PropertyOptimize(struct objlist *ob, struct nlist *tp, int run, int serial);
 
 extern int  CreateCompareQueue(char *, int, char *, int);
 extern int  GetCompareQueueTop(char **, int *, char **, int *);
@@ -50,5 +53,8 @@ extern int EquivalentElement();
 
 extern void enable_interrupt();
 extern void disable_interrupt();
+
+extern Tcl_Obj *ListNodeClasses(int legal);
+extern Tcl_Obj *ListElementClasses(int legal);
 #endif
 

base/netfile.c

@@ -77,8 +77,9 @@ extern char *SetExtension(char *buffer, char *path, char *extension)
   strcat(tmpbuf, extension);
 
   /* step 4: lower-case the entire name */
-  for (pt = tmpbuf; *pt != '\0'; pt++)
-    if (isupper(*pt)) *pt = tolower(*pt);
+  /* (Commented out because this is really stupid.) */
+  // for (pt = tmpbuf; *pt != '\0'; pt++)
+  //   if (isupper(*pt)) *pt = tolower(*pt);
 
   if (buffer != NULL) {
     strcpy(buffer, tmpbuf);
@@ -192,6 +193,67 @@ static struct filestack *OpenFiles = NULL;
 
 #define TOKEN_DELIMITER " \t\n\r"
 
+/*----------------------------------------------------------------------*/
+/* TrimQuoted() ---							*/
+/* Remove spaces from inside single- or double-quoted strings.		*/
+/*----------------------------------------------------------------------*/
+
+void TrimQuoted(char *line)
+{
+    char *qstart, *qend, *lptr;
+    int slen;
+    int changed;
+
+    /* Single-quoted entries */
+    changed = TRUE;
+    lptr = line;
+    while (changed)
+    {
+	changed = FALSE;
+	qstart = strchr(lptr, '\'');
+	if (qstart)
+	{
+	    qend = strchr(qstart + 1, '\'');
+	    if (qend && (qend > qstart)) {
+		slen = strlen(lptr);
+		for (lptr = qstart + 1; lptr < qend; lptr++) {
+		    if (*lptr == ' ') {
+			memmove(lptr, lptr + 1, slen);
+			qend--;
+			changed = TRUE;
+		    }
+		}
+		lptr++;
+	    }
+	}
+    }
+
+    /* Double-quoted entries */
+    changed = TRUE;
+    lptr = line;
+    while (changed)
+    {
+	changed = FALSE;
+	qstart = strchr(lptr, '\"');
+	if (qstart)
+	{
+	    qend = strchr(qstart + 1, '\"');
+	    if (qend && (qend > qstart)) {
+		slen = strlen(lptr);
+		for (lptr = qstart + 1; lptr < qend; lptr++) {
+		    if (*lptr == ' ') {
+			memmove(lptr, lptr + 1, slen);
+			qend--;
+			changed = TRUE;
+		    }
+		}
+		lptr++;
+	    }
+	}
+    }
+
+}
+
 /*----------------------------------------------------------------------*/
 /* GetNextLineNoNewline()						*/
 /*									*/
@@ -201,7 +263,7 @@ static struct filestack *OpenFiles = NULL;
 /*									*/
 /*----------------------------------------------------------------------*/
 
-int GetNextLineNoNewline()
+int GetNextLineNoNewline(char *delimiter)
 {
   char *newbuf;
   int testc;
@@ -232,8 +294,9 @@ int GetNextLineNoNewline()
   }
   linenum++;
   strcpy(linetok, line);
+  TrimQuoted(linetok);
 
-  nexttok = strtok(linetok, TOKEN_DELIMITER);
+  nexttok = strtok(linetok, delimiter);
   return 0;
 }
 
@@ -242,10 +305,10 @@ int GetNextLineNoNewline()
 /* valid token.								*/
 /*----------------------------------------------------------------------*/
 
-void GetNextLine()
+void GetNextLine(char *delimiter)
 {
     do {
-	if (GetNextLineNoNewline() == -1) return;
+	if (GetNextLineNoNewline(delimiter) == -1) return;
     } while (nexttok == NULL);
 }
 
@@ -253,11 +316,13 @@ void GetNextLine()
 /* if nexttok is already NULL, force scanner to read new line		*/
 /*----------------------------------------------------------------------*/
 
-void SkipTok(void)
+void SkipTok(char *delimiter)
 {
-  if (nexttok != NULL && 
-      (nexttok = strtok(NULL, TOKEN_DELIMITER)) != NULL) return;
-  GetNextLine();
+    if (nexttok != NULL && 
+		(nexttok = strtok(NULL, (delimiter) ? delimiter : TOKEN_DELIMITER))
+		!= NULL)
+	return;
+    GetNextLine((delimiter) ? delimiter : TOKEN_DELIMITER);
 }
 
 /*----------------------------------------------------------------------*/
@@ -265,9 +330,9 @@ void SkipTok(void)
 /* must be preceeded by at least one call to SkipTok()			*/
 /*----------------------------------------------------------------------*/
 
-void SkipTokNoNewline(void)
+void SkipTokNoNewline(char *delimiter)
 {
-  nexttok = strtok(NULL, TOKEN_DELIMITER);
+  nexttok = strtok(NULL, (delimiter) ? delimiter : TOKEN_DELIMITER);
 }
 
 /*----------------------------------------------------------------------*/
@@ -294,15 +359,15 @@ void SpiceTokNoNewline(void)
     while (nexttok == NULL) {
 	contline = getc(infile);
 	if (contline == '*') {
-	   GetNextLine();
-	   SkipNewLine();
+	   GetNextLine(TOKEN_DELIMITER);
+	   SkipNewLine(NULL);
 	   continue;
 	}
 	else if (contline != '+') {
 	    ungetc(contline, infile);
 	    return;
 	}
-	if (GetNextLineNoNewline() == -1) break;
+	if (GetNextLineNoNewline(TOKEN_DELIMITER) == -1) break;
     }
 }
 
@@ -310,9 +375,10 @@ void SpiceTokNoNewline(void)
 /* skip to the end of the current line					*/
 /*----------------------------------------------------------------------*/
 
-void SkipNewLine(void)
+void SkipNewLine(char *delimiter)
 {
-  while (nexttok != NULL) nexttok = strtok(NULL, TOKEN_DELIMITER);
+    while (nexttok != NULL)
+	nexttok = strtok(NULL, (delimiter) ? delimiter : TOKEN_DELIMITER);
 }
 
 /*----------------------------------------------------------------------*/
@@ -324,13 +390,13 @@ void SpiceSkipNewLine(void)
 {
   int contline;
 
-  SkipNewLine();
+  SkipNewLine(NULL);
   contline = getc(infile);
 
   while (contline == '+') {
      ungetc(contline, infile);
-     GetNextLine();
-     SkipNewLine();
+     GetNextLine(TOKEN_DELIMITER);
+     SkipNewLine(NULL);
      contline = getc(infile);
   }
   ungetc(contline, infile);
@@ -417,7 +483,7 @@ char *ReadNetlist(char *fname, int *fnum)
   };
   
 #ifdef mips
-  struct filetype formats[6];
+  struct filetype formats[7];
 
   formats[0].extension = NTK_EXTENSION;
   formats[0].proc = ReadNtk;
@@ -429,8 +495,10 @@ char *ReadNetlist(char *fname, int *fnum)
   formats[3].proc = ReadSpice;
   formats[4].extension = NETGEN_EXTENSION;
   formats[4].proc = ReadNetgenFile;
-  formats[5].extension = NULL;
-  formats[5].proc = NULL;
+  formats[5].extension = VERILOG_EXTENSION;
+  formats[5].proc = ReadVerilogFile;
+  formats[6].extension = NULL;
+  formats[6].proc = NULL;
 
 #else  /* not mips (i.e. compiler with reasonable initializers) */
   
@@ -442,6 +510,7 @@ char *ReadNetlist(char *fname, int *fnum)
       {SPICE_EXTENSION, ReadSpice},
       {SPICE_EXT2, ReadSpice},
       {SPICE_EXT3, ReadSpice},
+      {VERILOG_EXTENSION, ReadVerilog},
       {NETGEN_EXTENSION, ReadNetgenFile},
       {NULL, NULL}
     };
@@ -567,7 +636,7 @@ char *ReadNetgenFile (char *fname, int *fnum)
   if ((filenum = OpenParseFile(fname, *fnum)) < 0) {
     SetExtension(name, fname, NETGEN_EXTENSION);
     if ((filenum = OpenParseFile(name, *fnum)) < 0) {
-      Printf("No file: %s\n",name);
+      Printf("Error in netgen read: No file %s\n",name);
       *fnum = -1;
       return NULL;
     }    
@@ -730,7 +799,6 @@ char *readbuf;
 int bytes_in_buffer;
 char *bufptr;
 
-INLINE
 int READ(void *buf, int bytes)
 {
   if (bytes_in_buffer >= bytes) {
@@ -804,7 +872,7 @@ char *ReadNetgenFile (char *fname, int *fnum)
   if ((File = open(fname, O_RDONLY, FILE_ACCESS_BITS)) == -1) {
     SetExtension(name, fname, NETGEN_EXTENSION);
     if ((File = open(name, O_RDONLY, FILE_ACCESS_BITS)) == -1) {
-      Printf("No file: %s\n",name);
+      Printf("Error in netgen read: No file %s\n",name);
       return NULL;
     }    
   }

base/netfile.h

@@ -13,6 +13,7 @@
 #define NETGEN_EXTENSION ".ntg"
 #define CCODE_EXTENSION ".c.code"
 #define ESACAP_EXTENSION ".esa"
+#define VERILOG_EXTENSION ".v"
 
 #define LINELENGTH 80
 
@@ -27,11 +28,11 @@ extern int File;
 /* input routines */
 
 extern char *nexttok;
-#define SKIPTO(a) do {SkipTok();} while (!match(nexttok,a))
-extern void SkipTok(void);
-extern void SkipTokNoNewline(void);
+#define SKIPTO(a) do {SkipTok(NULL);} while (!match(nexttok,a))
+extern void SkipTok(char *delimiter);
+extern void SkipTokNoNewline(char *delimiter);
+extern void SkipNewLine(char *delimiter);
 extern void SpiceTokNoNewline(void);	/* handles SPICE "+" continuation line */
-extern void SkipNewLine(void);
 extern void SpiceSkipNewLine(void);	/* handles SPICE "+" continuation line */
 extern void InputParseError(FILE *f);
 extern int OpenParseFile(char *name, int fnum);

base/netgen.c

@@ -49,6 +49,7 @@ int NextNode;
 
 int Composition = NONE;
 int QuickSearch = 0;
+int GlobalParallelNone = FALSE;
 
 int AddToExistingDefinition = 0;  /* default: overwrite cell when reopened */
 
@@ -870,6 +871,32 @@ int ReduceExpressions(struct objlist *instprop, struct objlist *parprops,
     return 0;
 }
 
+/*----------------------------------------------------------------------*/
+/* Set/clear the flag bit COMB_NO_PARALLEL on all cells.  Note that the	*/
+/* function is called with value for enabling combine parallel, so	*/
+/* value TRUE means clear bit, value FALSE means set bit.		*/
+/*----------------------------------------------------------------------*/
+
+struct nlist *SetParallelCombineFlag(struct hashlist *p, void *clientdata)
+{
+  struct nlist *ptr;
+  int *value = (int *)clientdata;
+
+  ptr = (struct nlist *)(p->ptr);
+  if (*value == TRUE)
+     ptr->flags &= (~COMB_NO_PARALLEL);
+  else
+     ptr->flags |= COMB_NO_PARALLEL;
+
+  return NULL;	/* NULL keeps search alive */
+}
+
+void SetParallelCombine(int value)
+{
+  ClearDumpedList();
+  RecurseCellHashTable2(SetParallelCombineFlag, (void *)(&value));
+}
+
 /*----------------------------------------------------------------------*/
 /* Delete a property from the master cell record.			*/
 /*----------------------------------------------------------------------*/
@@ -948,10 +975,10 @@ PropertyTolerance(char *name, int fnum, char *key, int ival, double dval)
         switch (kl->type) {
 	    case PROP_DOUBLE:
 	    case PROP_VALUE:
+	    case PROP_STRING:
 		kl->slop.dval = dval;
 		break;
 	    case PROP_INTEGER:
-	    case PROP_STRING:
 	    case PROP_EXPRESSION:
 		kl->slop.ival = ival;
 		break;
@@ -1011,7 +1038,7 @@ struct property *PropertyValue(char *name, int fnum, char *key,
    if ((fnum == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) {
       PropertyValue(name, Circuit1->file, key, slop, pdefault);
       PropertyValue(name, Circuit2->file, key, slop, pdefault);
-      return;
+      return NULL;
    }
 
    tc = LookupCellFile(name, fnum);
@@ -1046,7 +1073,7 @@ struct property *PropertyDouble(char *name, int fnum, char *key,
    if ((fnum == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) {
       PropertyDouble(name, Circuit1->file, key, slop, pdefault);
       PropertyDouble(name, Circuit2->file, key, slop, pdefault);
-      return;
+      return NULL;
    }
 
    tc = LookupCellFile(name, fnum);
@@ -1079,7 +1106,7 @@ struct property *PropertyInteger(char *name, int fnum, char *key,
    if ((fnum == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) {
       PropertyInteger(name, Circuit1->file, key, slop, pdefault);
       PropertyInteger(name, Circuit2->file, key, slop, pdefault);
-      return;
+      return NULL;
    }
 
    tc = LookupCellFile(name, fnum);
@@ -1103,16 +1130,16 @@ struct property *PropertyInteger(char *name, int fnum, char *key,
 
 /*----------------------------------------------------------------------*/
 
-struct property *PropertyString(char *name, int fnum, char *key, int range,
+struct property *PropertyString(char *name, int fnum, char *key, double dval,
 		char *pdefault)
 {
    struct property *kl = NULL;
    struct nlist *tc;
 
    if ((fnum == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) {
-      PropertyString(name, Circuit1->file, key, range, pdefault);
-      PropertyString(name, Circuit2->file, key, range, pdefault);
-      return;
+      PropertyString(name, Circuit1->file, key, dval, pdefault);
+      PropertyString(name, Circuit2->file, key, dval, pdefault);
+      return NULL;
    }
 
    tc = LookupCellFile(name, fnum);
@@ -1127,7 +1154,7 @@ struct property *PropertyString(char *name, int fnum, char *key, int range,
       kl->idx = 0;
       kl->merge = MERGE_NONE;
       kl->type = PROP_STRING;
-      kl->slop.ival = (range >= 0) ? range : 0;
+      kl->slop.dval = dval;
       if (pdefault != NULL)
          kl->pdefault.string = strsave(pdefault);
       else
@@ -1176,42 +1203,37 @@ void CellDef(char *name, int fnum)
 {
     struct nlist *np;
 
-	if (Debug) Printf("Defining cell: %s\n",name);
-	GarbageCollect();
-	if ((CurrentCell = LookupCellFile(name, fnum)) != NULL) {
-	  if (AddToExistingDefinition) {
+    if (Debug) Printf("Defining cell: %s\n",name);
+    GarbageCollect();
+    if ((CurrentCell = LookupCellFile(name, fnum)) != NULL) {
+	if (AddToExistingDefinition) {
 	    ReopenCellDef(name, fnum);
 	    return ;
-	  }
-	  else {
+	}
+	else {
 	    Printf("Cell: %s exists already, and will be overwritten.\n", name);
 	    CellDelete(name, fnum);
-	  }
 	}
-	/* install a new cell in lookup table (hashed) */
-	np = InstallInCellHashTable(name, fnum);
-	CurrentCell = LookupCellFile(name, fnum);
-	CurrentCell->class = CLASS_SUBCKT;	/* default */
-	CurrentCell->flags = 0;
+    }
+    /* install a new cell in lookup table (hashed) */
+    np = InstallInCellHashTable(name, fnum);
+    CurrentCell = LookupCellFile(name, fnum);
+    CurrentCell->class = CLASS_SUBCKT;	/* default */
+    CurrentCell->flags = (GlobalParallelNone) ? COMB_NO_PARALLEL : 0;
 
-	LastPlaced = NULL;
-	CurrentTail = NULL;
-	FreeNodeNames(CurrentCell);
-	NextNode = 1;
+    LastPlaced = NULL;
+    CurrentTail = NULL;
+    FreeNodeNames(CurrentCell);
+    NextNode = 1;
+
+    // Mark cell as case insensitive if case insensitivity is in effect
+    if (matchfunc == matchnocase) CurrentCell->flags |= CELL_NOCASE;
 }
 
 /*----------------------------------------------------------------------*/
-/* Same as CellDef() above, but mark cell as case-insensitive.		*/
-/* This routine is used only by	the ReadSpice() function.		*/
-/*----------------------------------------------------------------------*/
-
-void CellDefNoCase(char *name, int file)
-{
-   CellDef(name, file);
-   CurrentCell->file = file;
-   CurrentCell->flags |= CELL_NOCASE;
-}
-
+/* Return 0 if class 'name' is not being ignored (per the 'ignore'	*/
+/* command);  1 if it is ignored, and 2 if shorted instances should be	*/
+/* ignored.								*/
 /*----------------------------------------------------------------------*/
 
 int IsIgnored(char *name, int file)
@@ -1223,7 +1245,7 @@ int IsIgnored(char *name, int file)
     {
 	if ((file == -1) || (ilist->file == -1) || (file == ilist->file)) 
 	    if ((*matchfunc)(ilist->class, nptr))
-		return 1;
+		return ilist->type;	/* IGNORE_CLASS or IGNORE_SHORTED */
     }
    return 0;
 }
@@ -1361,10 +1383,6 @@ void Instance(char *model, char *instancename)
     return;
   }
   fnum = CurrentCell->file;
-  if (IsIgnored(model, fnum)) {
-    Printf("Class '%s' instanced in input but is being ignored.\n", model);
-    return;
-  }
   instanced_cell = LookupCellFile(model, fnum);
   if (instanced_cell == NULL) {
     Printf("Attempt to instance undefined model '%s'\n", model);
@@ -1504,7 +1522,7 @@ char *Cell(char *inststr, char *model, ...)
   struct objlist *namedporthead, *namedportp, *namedlisthead, *namedlistp;
   int portnum, portlist, done;
   char namedport[512]; /* tmp buffers */
-  int filenum;
+  int filenum, itype, samenode;
 
   static char *instancename = NULL;
   char *instnameptr;
@@ -1517,7 +1535,7 @@ char *Cell(char *inststr, char *model, ...)
      filenum = CurrentCell->file;
 	
   if (Debug) Printf("   calling cell: %s\n",model);
-  if (IsIgnored(model, filenum)) {
+  if ((itype = IsIgnored(model, filenum)) == IGNORE_CLASS) {
     Printf("Class '%s' instanced in input but is being ignored.\n", model);
     return NULL;
   }
@@ -1600,6 +1618,21 @@ char *Cell(char *inststr, char *model, ...)
   }
   va_end(ap);
 
+  /* Check for shorted pins */
+  if ((itype == IGNORE_SHORTED) && (head != NULL)) {
+     unsigned char shorted = (unsigned char)1;
+     for (tp = head->next; tp; tp = tp->next) {
+        if (strcasecmp(head->name, tp->name))
+           shorted = (unsigned char)0;
+           break;
+     }
+     if (shorted == (unsigned char)1) {
+        Printf("Instance of '%s' is shorted, ignoring.\n", model);
+        FreeObject(head);
+        return NULL;
+     }
+  }
+
   if (inststr == NULL) {
     if (instancename != NULL)
        FreeString(instancename);
@@ -1992,7 +2025,7 @@ struct objlist *LinkProperties(char *model, struct keyvalue *topptr)
     else
 	filenum = CurrentCell->file;
 
-    if (IsIgnored(model, filenum)) {
+    if (IsIgnored(model, filenum) == IGNORE_CLASS) {
 	Printf("Class '%s' instanced in input but is being ignored.\n", model);
 	return NULL;
     }
@@ -2039,7 +2072,7 @@ struct objlist *LinkProperties(char *model, struct keyvalue *topptr)
 		kl->idx = 0;
 		kl->merge = MERGE_NONE;
 		kl->type = PROP_STRING;
-		kl->slop.ival = 0;
+		kl->slop.dval = 0.0;
 		kl->pdefault.string = NULL;
 		HashPtrInstall(kl->key, kl, &(cell->propdict));
 	    }
@@ -2303,7 +2336,7 @@ void ResolveProperties(char *name1, int file1, char *name2, int file2)
 	    switch (kl1->type) {
 		case PROP_STRING:
 		    kl2 = PropertyString(tp2->name, tp2->file, kl1->key,
-				kl1->slop.ival, kl1->pdefault.string); 
+				kl1->slop.dval, kl1->pdefault.string); 
 		    break;
 		case PROP_INTEGER:
 		    kl2 = PropertyInteger(tp2->name, tp2->file, kl1->key,
@@ -2335,7 +2368,7 @@ void ResolveProperties(char *name1, int file1, char *name2, int file2)
 	    switch (kl2->type) {
 		case PROP_STRING:
 		    kl1 = PropertyString(tp1->name, tp1->file, kl2->key,
-				kl2->slop.ival, kl2->pdefault.string); 
+				kl2->slop.dval, kl2->pdefault.string); 
 		    break;
 		case PROP_INTEGER:
 		    kl1 = PropertyInteger(tp1->name, tp1->file, kl2->key,
@@ -2834,6 +2867,157 @@ void ConnectAllNodes(char *model, int file)
     if (ob->node == -1) ob->node = nodenum++;
 }
 
+/*----------------------------------------------------------------------*/
+/* Serial and Parallel combination:					*/
+/* All devices of the same type that exist in serial and parallel	*/
+/* combinations will be treated as a single device in a network.	*/
+/* Serial connections are only allowed for resistors and inductors.	*/
+/* Any device may be connected in parallel.  For combinations of serial	*/
+/* and parallel, as in a resistor network, there is a set of rules:	*/
+/*									*/
+/* Running parallel and serial checks:					*/
+/* 1. Run parallel once.  If a repeat run and no devices are merged,	*/
+/*    then go to 4.							*/
+/* 2. Run serial until no devices are merged.				*/
+/* 3. If serial ran more than once, then go to 1.			*/
+/* 4. End merge								*/
+/*									*/
+/* Each merge procedure, when it finds two devices that can be merged,	*/
+/* removes the second device from the netlist and adds its properties	*/
+/* to the first device.  If a serial merge, then the nodes are adjusted	*/
+/* appropriately.  Where A is the property list of the first device and	*/
+/* B is the property list of the second device, the first and last	*/
+/* properties of A and the first property of B may require a marker to	*/
+/* indicate the topology of the network, as follows (in order):		*/
+/*									*/
+/* For a parallel merge:						*/
+/*    1) If A has serial components then tag first property of A with	*/
+/*	 "open" and tag first property of B with "close".		*/
+/*    2) If B has serial components then tag first property of B with	*/
+/*	 "open". 							*/
+/*									*/
+/* For a serial merge:							*/
+/*    1) If A has unbalanced "opens", then add "close" to first		*/
+/*	 property of B to balance the "opens".				*/
+/*    2) Always tag B with "serial".					*/
+/*									*/
+/* Tags are indicated by a property named "_tag" which has a string	*/
+/* value of ordered characters, "+" for serial, "(" for open, and ")"	*/
+/* for close.  A device with only one property record has no "_tag"	*/
+/* record.  A device which is in parallel with the device(s) in front	*/
+/* of it is implicitly parallel by not having an "+" tag, and may not	*/
+/* have a tag at all.							*/
+/*									*/
+/* The property check routine is responsible for comparing device	*/
+/* serial/parallel networks against each other.  Otherwise, each	*/
+/* serial/parallel network is considered topologically as a single	*/
+/* device, and any differences in the serial/parallel networks between	*/
+/* two circuits being matched will be treated as a property error.	*/
+/*----------------------------------------------------------------------*/
+
+/* add_prop_tag --- add the tag character tagc to the property list of	*/
+/* obr.  obr points to the first property record.			*/
+
+int add_prop_tag(struct objlist *obr, char tagc)
+{
+   struct objlist *nob;
+   int i, k, l;
+   struct valuelist *kv, *kv2;
+   int hastag;
+   char *tmpstr;
+
+   hastag = FALSE;
+   for (nob = obr; nob->next && nob->next->type == PROPERTY; nob = nob->next) {
+      for (i = 0; ; i++) {
+         kv = &(nob->instance.props[i]);
+	 if (kv->type == PROP_ENDLIST) break;
+         if (kv->type == PROP_STRING) {
+	    if (!strcmp(kv->key, "_tag")) {
+	       hastag = TRUE;
+	       break;
+	    }
+	 }
+      }
+   }
+   if (hastag) {
+      if (nob == obr) {
+         // If _tag was first in the list, then just prepend tagc to the tag value
+	 tmpstr = kv->value.string;
+         kv->value.string = (char *)MALLOC(strlen(tmpstr) + 2);
+	 sprintf(kv->value.string, "%c%s", tagc, tmpstr);
+	 FREE(tmpstr);
+      }
+      else {
+         // Add a _tag key to the first property list and set value to tagc
+
+	 kv = &(obr->instance.props[i]);
+	 k = 0;
+	 for (k = 0; ; k++) {
+	    kv = &(obr->instance.props[k]);
+	    if (kv->type == PROP_ENDLIST)
+	       break;
+         }
+	 kv2 = (struct valuelist *)MALLOC((k + 2) * sizeof(struct valuelist));
+	 kv2->key = strsave("_tag");
+	 kv2->type = PROP_STRING;
+	 /* Value is set to tagc */
+	 kv2->value.string = (char *)MALLOC(2);
+	 sprintf(kv2->value.string, "%c", tagc);
+	 for (l = 0; l <= k; l++)
+	    kv2[l + 1] = obr->instance.props[l];
+	 FREE(obr->instance.props);
+	 obr->instance.props = kv2;
+      }
+   }
+   return hastag;
+}
+
+/* add_balancing_close --- find the number of unbalanced 'open'		*/
+/* records in ob1's property list, and prepend the correct number of	*/
+/* 'C' closures to the property list of ob2.				*/
+
+void add_balancing_close(struct objlist *ob1, struct objlist *ob2)
+{
+   struct objlist *nob;
+   int i, k, l;
+   struct valuelist *kv, *kv2;
+   int opentags;
+   char *tmpstr, *tag;
+
+   /* Find the first property record in ob1. */
+   for (nob = ob1->next; nob && nob->type != FIRSTPIN; nob = nob->next)
+      if (nob->type == PROPERTY)
+	 break;
+   if (nob->type != PROPERTY) return;	// shouldn't happen
+
+   opentags = 0;
+   for (; nob->next && nob->next->type == PROPERTY; nob = nob->next) {
+      for (i = 0; ; i++) {
+         kv = &(nob->instance.props[i]);
+	 if (kv->type == PROP_ENDLIST) break;
+         if (kv->type == PROP_STRING) {
+	    if (!strcmp(kv->key, "_tag")) {
+	       for (tag = kv->value.string; *tag != '\0'; tag++) {
+		  if (*tag == '(') opentags++;
+		  else if (*tag == ')') opentags--;
+	       }
+               break;
+	    }
+	 }
+      }
+   }
+   if (opentags == 0) return;
+
+   /* Find the first property record in ob2. */
+   for (nob = ob2->next; nob && nob->type != FIRSTPIN; nob = nob->next)
+      if (nob->type == PROPERTY)
+	 break;
+   if (nob->type != PROPERTY) return;	// shouldn't happen
+
+   // This is slow but it's the easiest way to do it
+   while (opentags-- > 0) add_prop_tag(nob, ')');
+}
+
 /*----------------------------------------------------------------------*/
 /* Find all devices that are of the same class and check for parallel	*/
 /* combinations, and combine them where found, adjusting property "M"	*/
@@ -2850,23 +3034,26 @@ void ConnectAllNodes(char *model, int file)
 /*									*/
 /* If the device has permutable pins, then duplicate hashes are made	*/
 /* for each permutation.						*/
+/*									*/
+/* Return the number of devices merged.					*/
 /*----------------------------------------------------------------------*/
 
-void CombineParallel(char *model, int file)
+int CombineParallel(char *model, int file)
 {
    struct nlist *tp, *tsub;
    struct objlist *ob, *ob2, *nextob;
-   struct objlist *sob, *lob, *tlob, *nob, *pob, *obr;
+   struct objlist *sob, *lob, *nob, *pob, *obr;
+   struct objlist *propfirst, *proplast, *spropfirst, *sproplast;
    struct hashdict devdict;
    struct Permutation *perm;
    size_t pcnt;
-   int dcnt = 0;
+   int i, dcnt = 0, hastag;
    char *pstr, *p2str, *pptr;
    struct valuelist *kv;
 
    if ((tp = LookupCellFile(model, file)) == NULL) {
       Printf("Cell: %s does not exist.\n", model);
-      return;
+      return -1;
    }
 
    InitializeHashTable(&devdict, OBJHASHSIZE);
@@ -2875,12 +3062,21 @@ void CombineParallel(char *model, int file)
    for (ob = tp->cell; ob; ) {
       if (ob->type == FIRSTPIN) {
 
+         /* Watch for devices prohibited from parallel combination.	*/
+	 /* All devices allow parallel combination by default.		*/
+
+	 tsub = LookupCellFile(ob->model.class, file);
+         if ((tsub != NULL) && (tsub->flags & COMB_NO_PARALLEL)) {
+            lob = ob;
+	    ob = ob->next;
+	    continue;
+         }
+
 	 /* ------------------------------------*/
 	 /* Generate hash key from pins 	*/
 	 /* Handle pin permuations		*/
 	 /* ------------------------------------*/
 
-	 tsub = LookupCellFile(ob->model.class, file);
 	 if ((tsub != NULL) && (tsub->permutes != NULL))
 	    perm = tsub->permutes;
 	 else
@@ -2888,14 +3084,17 @@ void CombineParallel(char *model, int file)
 
 	 pcnt = strlen(ob->model.class) + 2;
 	 pptr = (char *)pcnt;
+
+	 propfirst = proplast = NULL;
 	 for (ob2 = ob; ob2 && (ob2->type > FIRSTPIN || ob2 == ob); ob2 = ob2->next) {
-	    tlob = ob2;
+	    pob = ob2;
 	    pcnt += 10;
 	 }
+	 if (ob2 && (ob2->type == PROPERTY)) propfirst = ob2;
 
 	 /* Find last record in device and first record in next object */
 	 while (ob2 && ob2->type == PROPERTY) {
-	    tlob = ob2;
+	    proplast = ob2;
 	    ob2 = ob2->next;
 	 }
 	 nextob = ob2;
@@ -2952,70 +3151,399 @@ void CombineParallel(char *model, int file)
 		FREE((char *)p2str);
 	    }
 
-	    /* Set last object ptr to end of this record */
-	    lob = tlob;
+	    /* Move last object marker to end of sob record */
+	    if (proplast != NULL)
+	       lob = proplast;
+	    else
+	       lob = pob;
 	 }
 	 else {
-	    /* Remove parallel device "ob" and append properties of	*/
+	    /* Find parallel device "ob" and append properties of	*/
 	    /* "sob" to it.  If "ob" does not have properties, then	*/
 	    /* create a property record and set property "M" to 2.	*/
 
-	    for (obr = ob; obr != ob2 ; ) {
+	    /* Find last non-property record of sob ( = pob) */
+	    /* Find first property record of sob ( = spropfirst) */
+	    /* Find last property record of sob ( = sproplast)	*/
+
+	    spropfirst = sproplast = NULL;
+	    for (ob2 = sob; ob2->type > FIRSTPIN || ob2 == sob; ob2 = ob2->next)
+	       pob = ob2;
+	    if (ob2->type == PROPERTY) spropfirst = ob2;
+	    for (; ob2->type == PROPERTY; ob2 = ob2->next)
+	       sproplast = ob2;
+	    
+            if (spropfirst == NULL) {
+	       /* Create new property instance record if one doesn't exist */
+	       nob = GetObject();
+	       nob->type = PROPERTY;
+	       nob->name = strsave("properties");
+	       nob->node = -2;	/* Don't report as disconnected node */
+	       nob->model.class = strsave(sob->model.class);
+	       nob->instance.props = NewPropValue(2);
+
+	       /* Create property record for property "M" and set to 1 */
+	       kv = &(nob->instance.props[0]);
+	       kv->key = strsave("M");
+	       kv->type = PROP_INTEGER;
+	       kv->value.ival = 1;
+
+	       /* End of property list */
+	       kv = &(nob->instance.props[1]);
+	       kv->key = NULL;
+	       kv->type = PROP_ENDLIST;
+	       kv->value.ival = 0;
+
+	       nob->next = pob->next;
+	       pob->next = nob;
+
+	       if (lob == pob) lob = nob;
+	       spropfirst = sproplast = nob;
+	    }
+	    if (propfirst == NULL) {
+	       /* Create new property instance record if one doesn't exist */
+	       nob = GetObject();
+	       nob->type = PROPERTY;
+	       nob->name = strsave("properties");
+	       nob->node = -2;	/* Don't report as disconnected node */
+	       nob->model.class = strsave(ob->model.class);
+	       nob->instance.props = NewPropValue(2);
+
+	       /* Create property record for property "M" and set to 1 */
+	       kv = &(nob->instance.props[0]);
+	       kv->key = strsave("M");
+	       kv->type = PROP_INTEGER;
+	       kv->value.ival = 1;
+
+	       /* End of property list */
+	       kv = &(nob->instance.props[1]);
+	       kv->key = NULL;
+	       kv->type = PROP_ENDLIST;
+	       kv->value.ival = 0;
+
+	       /* Append to sob's property list */
+	       nob->next = sproplast->next;
+	       sproplast->next = nob;
+	       if (lob == sproplast) lob = nob;
+	    }
+		
+	    if (propfirst != NULL) {
+
+	       // Serial/Parallel logic:
+	       // If propfirst has _tag in properties,
+	       // then add an "open" tag at propfirst
+               add_prop_tag(propfirst, '(');
+
+	       // if spropfirst has _tag in properties then add an "open" tag
+	       // to spropfirst and a "close" tag to propfirst
+	       if (add_prop_tag(spropfirst, '(')) add_prop_tag(propfirst, ')');
+
+	       /* Append ob's property list to sob */
+	       proplast->next = sproplast->next;
+	       sproplast->next = propfirst;
+	       if (lob == sproplast) lob = proplast;
+	    }
+
+            /* Link up around object to be removed */
+	    lob->next = nextob;
+
+	    /* Remove the object */
+	    for (obr = ob; obr != propfirst && obr != nextob; ) {
 	       nob = obr->next;
 	       FreeObjectAndHash(obr, tp);
 	       obr = nob;
 	    }
 	    dcnt++;
-	    /* Find (first) property record of sob */
-	    for (pob = sob->next; pob->type > FIRSTPIN; pob = pob->next) {
-	       if (pob->next->type == PROPERTY)
-		  break;
-	       else if (pob->next->type == FIRSTPIN) {
-		  /* Create new property instance record if one doesn't exist */
-		  nob = GetObject();
-		  nob->type = PROPERTY;
-		  nob->name = strsave("properties");
-		  nob->node = -2;	/* Don't report as disconnected node */
-		  nob->model.class = strsave(sob->model.class);
-		  nob->instance.props = NewPropValue(2);
 
-		  /* Create property record for property "M" and set to 1 */
-		  kv = &(nob->instance.props[0]);
-		  kv->key = strsave("M");
-		  kv->type = PROP_INTEGER;
-		  kv->value.ival = (obr->type != PROPERTY) ? 2 : 1;
-
-		  /* End of property list */
-		  kv = &(nob->instance.props[1]);
-		  kv->key = NULL;
-		  kv->type = PROP_ENDLIST;
-		  kv->value.ival = 0;
-
-		  nob->next = pob->next;
-		  pob->next = nob;
-		  break;
-	       }
-	    }
-		
-	    if (lob == pob) lob = tlob;
-	    if (obr->type == PROPERTY) {
-	       /* Pull out property records and append to sob's	*/
-	       /* property list					*/
-	       tlob->next = pob->next;
-	       pob->next = obr;
-	    }
-	    lob->next = nextob;
 	 }
 	 FREE((char *)pstr);
       }
-      else
+      else {
+         lob = ob;
 	 nextob = ob->next;
+      }
       ob = nextob;
    }
    HashKill(&devdict);
    if (dcnt > 0) {
       Fprintf(stdout, "Class %s:  Merged %d devices.\n", model, dcnt);
    }
+   return dcnt;
+}
+
+/*----------------------------------------------------------------------*/
+/* For the purposes of serial connection checking, find if all pins	*/
+/* of two instances after the first two pins are connected to the name	*/
+/* nodes.  This depends on the definition of a serial device as having	*/
+/* two ports, but any additional ports (such as a substrate connection)	*/
+/* must be the same for all devices in series.				*/
+/*----------------------------------------------------------------------*/
+
+int check_pin_nodes(struct objlist *ob1, struct objlist *ob2)
+{
+   struct objlist *nob, *pob;
+
+   /* A dummy device may have both terminals connected to the same	*/
+   /* point, triggering a false check for a serial device.		*/
+   if (ob1 == ob2) return FALSE;
+
+   for (nob = ob1->next; nob && nob->type != FIRSTPIN; nob = nob->next)
+      if (nob->type == 3) break;
+
+   for (pob = ob2->next; pob && pob->type != FIRSTPIN; pob = pob->next)
+      if (pob->type == 3) break;
+
+   while (nob && pob && nob->type > FIRSTPIN && pob->type > FIRSTPIN) {
+      if (nob->node != pob->node)
+          return FALSE;
+      nob = nob->next;
+      pob = pob->next;
+   }
+
+   if (nob && pob && (nob->type > FIRSTPIN || pob->type > FIRSTPIN))
+      return FALSE;
+
+   return TRUE;
+}
+
+/*----------------------------------------------------------------------*/
+/* Find all nodes that are connected to exactly two devices of the same	*/
+/* class.  Where found, if the device is allowed to combine serially	*/
+/* (check properties), then remove the node and merge the devices into	*/
+/* one. 								*/
+/*									*/
+/* This routine depends on CombineParallel() being run first so that no	*/
+/* parallel devices are reported as serial.				*/
+/*									*/
+/* Return the number of devices merged.					*/
+/*----------------------------------------------------------------------*/
+
+int CombineSerial(char *model, int file)
+{
+   struct nlist *tp, *tp2;
+   struct objlist ***instlist;
+   struct objlist *ob, *ob2, *obs, *obp, *obn;
+   int i, j, scnt = 0;
+   struct valuelist *kv;
+
+   if ((tp = LookupCellFile(model, file)) == NULL) {
+      Printf("Cell: %s does not exist.\n", model);
+      return -1;
+   }
+   /* Diagnostic */
+   /* Printf("CombineSerial start model = %s file = %d\n", model, file); */
+
+   instlist = (struct objlist ***)CALLOC((tp->nodename_cache_maxnodenum + 1),
+		sizeof(struct objlist **));
+
+   for (ob = tp->cell; ob; ob = ob->next) {
+      if ((ob->type >= FIRSTPIN) && (ob->node >= 0)) {
+          if (ob->type == FIRSTPIN)
+	     obp = ob;	// Save pointer to first pin of device
+
+          if (instlist[ob->node] == NULL) {
+             /* Node has not been seen before, so add it to list */
+	     instlist[ob->node] = (struct objlist **)CALLOC(2,
+			sizeof(struct objlist *));
+
+	     /* Device must be marked as able to be combined in	serial.	*/
+	     /* Note that devices with more than two pins are expected	*/
+	     /* to serial connect along the first two pins, and the 	*/
+	     /* remaining pins must all connect to the same nodes.  By	*/
+	     /* default, CLASS_RES, CLASS_RES3, and CLASS_INDUCTOR are	*/
+	     /* all allowed to combine in serial.  All other devices	*/
+	     /* must have serial combination explicitly enabled.	*/
+	     /* NOTE:  Arbitrarily, the first two pins of a device are	*/
+	     /* assumed to be the ones that make serial connections.	*/
+	     /* Additional pins, if any, do not.			*/
+	
+             tp2 = LookupCellFile(ob->model.class, file);
+             if ((tp2->flags & COMB_SERIAL) && (ob->type <= 2))
+	         instlist[ob->node][0] = obp;
+	     else
+	         /* invalidate node */
+	         instlist[ob->node][0] = NULL;
+          }
+          else if (instlist[ob->node][0] == NULL) {
+             /* Node is not valid for serial connection */
+          }
+          else if (instlist[ob->node][1] == NULL) {
+             /* Check if first instance is the same type */
+             if ((*matchfunc)(instlist[ob->node][0]->model.class, ob->model.class)) {
+                 if (check_pin_nodes(instlist[ob->node][0], obp))
+	             instlist[ob->node][1] = obp;
+		 else
+		    /* invalidate node */
+		    instlist[ob->node][0] = NULL;
+	     }
+	     else
+		/* invalidate node */
+		instlist[ob->node][0] = NULL;
+          }
+	  else {
+	     /* More than two devices connect here, so invalidate */
+	     instlist[ob->node][0] = NULL;
+	  }
+      }
+   }
+   for (i = 0; i <= tp->nodename_cache_maxnodenum; i++) {
+      if (instlist[i] != NULL) {
+         if ((instlist[i][0] != NULL) && (instlist[i][1] != NULL)) {
+	    int k, l;
+	    struct valuelist *kv2;
+
+            /* Diagnostic */
+	    /* Fprintf(stdout, "Found serial instances %s and %s\n",
+			instlist[i][0]->instance.name,
+			instlist[i][1]->instance.name); */
+            scnt++;
+
+	    /* To maintain knowledge of the topology, 2nd device gets	*/
+	    /* a parameter '_tag', string value set to "+".		*/
+
+            for (obn = instlist[i][1]; obn->next &&
+			obn->next->type > FIRSTPIN; obn = obn->next);
+	    obp = obn->next;
+
+	    if (obp == NULL || obp->type != PROPERTY) {
+	       struct objlist *nob;
+	       /* No property record, so insert one */
+	       nob = GetObject();
+	       nob->type = PROPERTY;
+	       nob->name = strsave("properties");
+	       nob->node = -2;	/* Don't report as disconnected node */
+	       nob->model.class = (obp->model.class == NULL) ? NULL :
+				strsave(obp->model.class);
+	       nob->instance.props = NewPropValue(2);
+
+	       /* Create property record for property "_tag" */
+	       kv = &(nob->instance.props[0]);
+	       kv->key = strsave("_tag");
+	       kv->type = PROP_STRING;
+	       /* Value is set to "+" */
+	       kv->value.string = (char *)MALLOC(2);
+	       sprintf(kv->value.string, "+");
+
+	       /* End of property list */
+	       kv = &(nob->instance.props[1]);
+	       kv->key = NULL;
+	       kv->type = PROP_ENDLIST;
+	       kv->value.ival = 0;
+
+	       nob->next = obp;
+	       obn->next = nob;
+	    }
+	    else if (obp->type == PROPERTY) {
+	       /* Add to properties */
+	       k = 0;
+	       for (k = 0; ; k++) {
+		  kv = &(obp->instance.props[k]);
+		  if (kv->type == PROP_ENDLIST) {
+		     kv2 = (struct valuelist *)MALLOC((k + 2) *
+				sizeof(struct valuelist));
+		     kv2->key = strsave("_tag");
+		     kv2->type = PROP_STRING;
+		     /* Value is set to "+" */
+		     kv2->value.string = (char *)MALLOC(2);
+		     sprintf(kv2->value.string, "+");
+		     for (l = 0; l <= k; l++)
+		        kv2[l + 1] = obp->instance.props[l];
+		     FREE(obp->instance.props);
+		     obp->instance.props = kv2;
+		     break;
+		  }
+		  else if (!strcmp(kv->key, "_tag")) {
+		     int l = strlen(kv->value.string);
+		     char *newstr = (char *)MALLOC(l + 2);
+		     sprintf(newstr, "S%s", kv->value.string);
+		     FREE(kv->value.string);
+		     kv->value.string = newstr;
+		     break;
+		  }
+	       }
+	    }
+
+            /* Combine these two instances and remove node i */
+            for (ob2 = instlist[i][0]; ob2; ob2 = ob2->next) {
+	       if (ob2->node == i)
+		  break;
+	    }
+            for (obs = instlist[i][1]; obs; obs = obs->next) {
+	       if (obs->node != i) {
+		  ob2->node = obs->node;
+		  break;
+	       }
+	    }
+
+	    /* Excise the 2nd instance.  instlist[i][1] remains as the	*/
+	    /* only pointer to it.					*/
+            for (obp = instlist[i][0]; obp->next->type > FIRSTPIN ||
+			obp->next->type == PROPERTY; obp = obp->next);
+            for (ob2 = obp; ob2 && ob2->next != instlist[i][1]; ob2 = ob2->next);
+
+	    /* Device may have been moved by the above code.  If so, look for	*/
+	    /* it from the beginning of the list. */
+	    if (ob2 == NULL)
+               for (ob2 = tp->cell; ob2->next != instlist[i][1]; ob2 = ob2->next);
+
+	    for (obs = ob2->next; obs->next && (obs->next->type > FIRSTPIN
+			|| obs->next->type == PROPERTY); obs = obs->next);
+	    ob2->next = obs->next;
+	    if (obs->next) obs->next = NULL;	// Terminate 2nd instance record
+
+	    /* If 1st device has unbalanced 'open' records, then add 'close'	*/
+	    /* records to the 2nd device to balance.				*/
+            add_balancing_close(instlist[i][0], instlist[i][1]);
+
+	    /* Move property record(s) of the 2nd device to the first */
+	    for (obs = instlist[i][1]; obs && obs->type != PROPERTY; obs = obs->next);
+	    while (obs && (obs->type == PROPERTY)) {
+	       obn = obs->next;
+	       obs->next = obp->next;
+	       obp->next = obs;
+	       obs = obn;
+	    }
+
+	    /* If 2nd device appears anywhere else in the serial device	*/
+	    /* list, replace it with the 1st device.			*/
+	    for (j = i + 1; j <= tp->nodename_cache_maxnodenum; j++) {
+               if (instlist[j] == NULL) continue;
+
+	       if (instlist[j][0] == instlist[i][1])
+		  instlist[j][0] = instlist[i][0];
+	       if (instlist[j][1] == instlist[i][1])
+		  instlist[j][1] = instlist[i][0];
+
+               /* If instlist[j]'s two entries point to the same device */
+	       /* then invalidate it.					*/
+	       if (instlist[j][0] == instlist[j][1]) {
+		  FREE(instlist[j]);
+		  instlist[j] = NULL;
+	       }
+	    }
+
+	    /* Free 2nd device's object */
+	    for (obs = instlist[i][1]; obs && obs->type != PROPERTY; ) {
+               obn = obs->next;
+	       FreeObjectAndHash(obs, tp);
+	       obs = obn;
+	    }
+
+	    /* Free node i and remove from object hash */
+	    for (obp = tp->cell; obp->next; obp = obp->next) {
+	       if ((obp->next->type == NODE) && (obp->next->node == i)) {
+	          obn = obp->next;
+		  obp->next = obp->next->next;
+		  FreeObjectAndHash(obn, tp);
+	          break;
+	       }
+	    }
+         }
+         FREE(instlist[i]);
+      }
+   }
+   FREE(instlist);
+   return scnt;
 }
 
 /*----------------------------------------------------------------------*/

base/netgen.h

@@ -33,8 +33,9 @@ extern struct property *PropertyDouble(char *name, int fnum, char *key,
 extern struct property *PropertyInteger(char *name, int fnum, char *key,
 		int slop, int pdefault);
 extern struct property *PropertyString(char *name, int fnum, char *key,
-		int range, char *pdefault);
+		double slop, char *pdefault);
 extern int  PropertyDelete(char *name, int fnum, char *key);
+extern void SetParallelCombine(int value);
 extern int  PropertyTolerance(char *name, int fnum, char *key, int ival,
 		double dval);
 extern int  PropertyMerge(char *name, int fnum, char *key, int merge_type);
@@ -53,6 +54,8 @@ extern void PortList(char *prefix, char *list_template);
 extern char *Cell(char *inststr, char *model, ...);
 extern int  IsIgnored(char *, int);
 
+extern int auto_blackbox;	/* For handling empty subcircuits */
+
 /* netcmp.c */
 extern struct nlist *LookupClassEquivalent(char *model, int file1, int file2);
 extern void AssignCircuits(char *name1, int file1, char *name2, int file2);
@@ -100,9 +103,9 @@ extern char *Res(char *fname, char *inststr, char *, char *);
 extern char *XLine(char *fname, char *inststr, char *, char *, char *, char *);
 extern char *Inductor(char *fname, char *inststr, char *, char *);
 
-extern int StringIsValue(char *);
+extern int  StringIsValue(char *);
 extern char *ConvertParam(char *);
-extern int ConvertStringToFloat(char *, double *);
+extern int  ConvertStringToFloat(char *, double *);
 extern char *ScaleStringFloatValue(char *, double);
 extern void join(char *node1, char *node2);
 extern void Connect(char *tplt1, char *tplt2);
@@ -116,7 +119,8 @@ extern void FlattenCurrent();
 extern void ConvertGlobals(char *name, int fnum);
 extern int  CleanupPins(char *name, int fnum);
 extern void ConnectAllNodes(char *model, int fnum);
-extern void CombineParallel(char *model, int fnum);
+extern int  CombineParallel(char *model, int fnum);
+extern int  CombineSerial(char *model, int fnum);
 extern int  NoDisconnectedNodes;
 extern int  PropertyKeyMatch(char *, char *);
 extern int  PropertyValueMatch(char *, char *);
@@ -131,6 +135,7 @@ extern int IgnoreRC;	  /* set this to 1 to ignore capacitance and resistance */
 extern int NoOutput;      /* set this to 1 to disable stdout output */
 extern int Composition;	  /* direction of composition */
 extern int UnixWildcards; /* TRUE if *,?,{},[] only; false if full REGEXP */
+extern int GlobalParallelNone;	/* If TRUE, don't parallel combine any cells */
 /* magic internal flag to restrict searches to recently placed cells */
 extern int QuickSearch;
 /* does re"CellDef"ing a cell add to it or overwrite it??? */
@@ -173,6 +178,7 @@ extern char *ReadSim(char *fname, int *fnum);
 extern char *ReadSpice(char *fname, int *fnum);
 extern char *ReadSpiceLib(char *fname, int *fnum);
 extern char *ReadNetgenFile (char *fname, int *fnum);
+extern char *ReadVerilog(char *fname, int *fnum);
 
 extern char *ReadNetlist(char *fname, int *fnum);
 

base/ntk.c

@@ -186,14 +186,14 @@ char *ReadNtk (char *fname, int *fnum)
   if ((filenum = OpenParseFile(fname, *fnum)) < 0) {
     SetExtension(name, fname, NTK_EXTENSION);
     if ((filenum = OpenParseFile(name, *fnum)) < 0) {
-      Printf("No file: %s\n",name);
+      Printf("Error in ntk file read: No file %s\n",name);
       *fnum = filenum;
       return NULL;
     }    
   }
 
   while (!EndParseFile()) {
-    SkipTok();
+    SkipTok(NULL);
     if (EndParseFile()) break;
     if (nexttok[0] == '|') SKIPTO(";");
     else if (match(nexttok, "c")) {
@@ -203,14 +203,14 @@ char *ReadNtk (char *fname, int *fnum)
 	EndCell();
 	CellDefInProgress = 0;
       }
-      SkipTok();
+      SkipTok(NULL);
       CellDef(nexttok, CurrentCell->file);
       LastCellRead = CurrentCell->name;
       CellDefInProgress = 1;
-      SkipTok();
+      SkipTok(NULL);
       while (!match(nexttok, ";")) {
 	Port(nexttok);
-	SkipTok();
+	SkipTok(NULL);
       }
     } 
     else if (match(nexttok, "s")) {
@@ -224,8 +224,8 @@ char *ReadNtk (char *fname, int *fnum)
 	if (LastCellRead == NULL)
 	  LastCellRead = CurrentCell->name;
       }
-      SkipTok();
-      SkipTok();		/* eat the 'size' of the node */
+      SkipTok(NULL);
+      SkipTok(NULL);		/* eat the 'size' of the node */
       /* after the 'size', all names are synonyms */
       while (!match(nexttok, ";")) {
 #if 1	
@@ -240,7 +240,7 @@ char *ReadNtk (char *fname, int *fnum)
 #endif
 	if (strlen(last)) join(last, nexttok);
 	strcpy(last, nexttok);
-	SkipTok();
+	SkipTok(NULL);
       }
     } 
     else if (match(nexttok, "h")) {
@@ -250,11 +250,11 @@ char *ReadNtk (char *fname, int *fnum)
 	if (LastCellRead == NULL)
 	  LastCellRead = CurrentCell->name;
       }
-      SkipTok();
+      SkipTok(NULL);
       strcpy(model, nexttok);
       strcpy(instancename, nexttok);
       strcat(instancename, INSTANCE_DELIMITER);
-      SkipTok();
+      SkipTok(NULL);
       strcat(instancename, nexttok);
       if (LookupCell(model) == NULL) {
 #ifdef DEFINE_UNDEFINED_CELLS
@@ -264,7 +264,7 @@ char *ReadNtk (char *fname, int *fnum)
 
 	previous_cell = CurrentCell->name;
 	CellDef(model, CurrentCell->file);
-	SkipTok(); 
+	SkipTok(NULL); 
 	args = 0;
 	while (!match(nexttok, ";")) {
 	  sprintf(name, "pin%d", args+1);
@@ -273,11 +273,11 @@ char *ReadNtk (char *fname, int *fnum)
 	  args++;
 	  /* check for overflow */
 	  if (args == (sizeof(ports) / sizeof(ports[0]))) {
-	    while (!match(nexttok, ";")) SkipTok();
+	    while (!match(nexttok, ";")) SkipTok(NULL);
 	    break; /* out of while loop */
 	  }
 	  /* if no overflow, get the next token */
-	  SkipTok();
+	  SkipTok(NULL);
 	}
 	EndCell();
 	/* now, reopen previous cell, instance the new cell,
@@ -301,7 +301,7 @@ char *ReadNtk (char *fname, int *fnum)
 	ob = LookupCell(model)->cell;
 	while ((ob != NULL) && !IsPort(ob))
 	  ob = ob->next;
-	SkipTok();
+	SkipTok(NULL);
 	while (!match(nexttok, ";")) {
 	  strcpy(name, instancename);
 	  strcat(name, SEPARATOR);
@@ -311,7 +311,7 @@ char *ReadNtk (char *fname, int *fnum)
 	  do {
 	    ob = ob->next;
 	  } while ((ob != NULL) && !IsPort(ob)) ;
-	  SkipTok();
+	  SkipTok(NULL);
 	}
       }
     } 
@@ -322,12 +322,12 @@ char *ReadNtk (char *fname, int *fnum)
 	if (LastCellRead == NULL)
 	  LastCellRead = CurrentCell->name;
       }
-      SkipTok();
-      SkipTok();		/* skip the transistor size */
+      SkipTok(NULL);
+      SkipTok(NULL);		/* skip the transistor size */
       strcpy(name, nexttok);
-      SkipTok();
+      SkipTok(NULL);
       strcpy(model, nexttok);
-      SkipTok();
+      SkipTok(NULL);
       strcpy(instancename, nexttok);
       N(fname, NULL, name, model, instancename);
       SKIPTO(";");
@@ -339,12 +339,12 @@ char *ReadNtk (char *fname, int *fnum)
 	if (LastCellRead == NULL)
 	  LastCellRead = CurrentCell->name;
       }
-      SkipTok();
-      SkipTok();		/* skip the transistor size */
+      SkipTok(NULL);
+      SkipTok(NULL);		/* skip the transistor size */
       strcpy(name, nexttok);
-      SkipTok();
+      SkipTok(NULL);
       strcpy(model, nexttok);
-      SkipTok();
+      SkipTok(NULL);
       strcpy(instancename, nexttok);
       P(fname, NULL, name, model, instancename);
       SKIPTO(";");

base/objlist.c

@@ -184,13 +184,46 @@ int match(char *st1, char *st2)
 
 /* Case-insensitive matching */
 
+/* For case-insensitivity, the alphabet is lower-cased, but	*/
+/* also all common vector delimiters are cast to the same	*/
+/* character so that different vector notations will match.	*/
+
+static char to_lower[256] = {
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+	10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+	20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+	30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+	40, 41, 42, 43, 44, 45, 46, 47,
+	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+	':', ';', '<', '=', '>', '?', '@',
+	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+	'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+	'<', '\\', '>', '^', '_', '`',
+	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+	'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+	'<', '|', '>', '~', 127,
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+	10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+	20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+	30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+	40, 41, 42, 43, 44, 45, 46, 47,
+	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+	':', ';', '<', '=', '>', '?', '@',
+	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+	'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+	'<', '\\', '>', '^', '_', '`',
+	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+	'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+	'<', '|', '>', '~', 127
+};
+
 int matchnocase(char *st1, char *st2)
 {
    char *sp1 = st1;
    char *sp2 = st2;
 
    while (*sp1 != '\0' && *sp2 != '\0') {
-      if (tolower(*sp1) != tolower(*sp2)) break;
+      if (to_lower[*sp1] != to_lower[*sp2]) break;
       sp1++;
       sp2++;
    }
@@ -216,7 +249,7 @@ int matchfilenocase(char *st1, char *st2, int f1, int f2)
 
    if (f1 != f2) return 0;
    while (*sp1 != '\0' && *sp2 != '\0') {
-      if (tolower(*sp1) != tolower(*sp2)) break;
+      if (to_lower[*sp1] != to_lower[*sp2]) break;
       sp1++;
       sp2++;
    }
@@ -257,6 +290,7 @@ void InitCellHashTable(void)
 {
     hashfunc = hash;
     matchfunc = match;
+    matchintfunc = matchfile;
     InitializeHashTable(&cell_dict, CELLHASHSIZE);
 }
 
@@ -340,6 +374,71 @@ void CellRehash(char *name, char *newname, int file)
 
 struct nlist *OldCell;
 
+int removeshorted(struct hashlist *p, int file)
+{
+   struct nlist *ptr;
+   struct objlist *ob, *lob, *nob, *tob;
+   unsigned char shorted;
+
+   ptr = (struct nlist *)(p->ptr);
+
+   if ((file != -1) && (ptr->file != file)) return 0;
+
+   lob = NULL;
+   for (ob = ptr->cell; ob != NULL;) {
+      nob = ob->next;
+      if ((ob->type == FIRSTPIN) && (ob->model.class != NULL)) {
+	 if ((*matchfunc)(ob->model.class, OldCell->name)) {
+            shorted = (unsigned char)1;
+	    for (tob = nob; tob->type > FIRSTPIN; tob = tob->next) {
+	       if (tob->node != ob->node) {
+	           shorted = (unsigned char)0;
+	           break;
+	       }
+            }
+	    if (shorted == (unsigned char)0) {
+               lob = ob;
+               ob = nob;
+	       continue;
+	    }
+	    HashDelete(ob->instance.name, &(ptr->instdict));
+	    while (1) {
+	       FreeObjectAndHash(ob, ptr);
+	       ob = nob;
+	       if (ob == NULL) break;
+	       nob = ob->next;
+	       if (ob->type != PROPERTY && ob->type <= FIRSTPIN) break;
+	    }
+	    if (lob == NULL)
+	       ptr->cell = ob;
+	    else
+	       lob->next = ob;
+	 }
+	 else {
+	    lob = ob;
+	    ob = nob;
+	 }
+      }
+      else {
+         lob = ob;
+         ob = nob;
+      }
+   }
+}
+
+/* Remove shorted instances of class "class" from the database */
+
+void RemoveShorted(char *class, int file)
+{
+   if (file == -1)
+      OldCell = LookupCell(class);
+   else
+      OldCell = LookupCellFile(class, file);
+
+   if (OldCell == NULL) return;
+   RecurseCellFileHashTable(removeshorted, file);
+}
+
 int deleteclass(struct hashlist *p, int file)
 {
    struct nlist *ptr;
@@ -347,7 +446,7 @@ int deleteclass(struct hashlist *p, int file)
 
    ptr = (struct nlist *)(p->ptr);
 
-   if ((file != -1) && (ptr->file != file)) return;
+   if ((file != -1) && (ptr->file != file)) return 0;
 
    lob = NULL;
    for (ob = ptr->cell; ob != NULL;) {
@@ -360,7 +459,7 @@ int deleteclass(struct hashlist *p, int file)
 	       ob = nob;
 	       if (ob == NULL) break;
 	       nob = ob->next;
-	       if (ob->type <= FIRSTPIN) break;
+	       if (ob->type != PROPERTY && ob->type <= FIRSTPIN) break;
 	    }
 	    if (lob == NULL)
 	       ptr->cell = ob;
@@ -404,7 +503,7 @@ int renameinstances(struct hashlist *p, int file)
 
    ptr = (struct nlist *)(p->ptr);
 
-   if ((file != -1) && (ptr->file != file)) return;
+   if ((file != -1) && (ptr->file != file)) return 0;
 
    for (ob = ptr->cell; ob != NULL; ob = ob->next) {
       if ((ob->type >= FIRSTPIN) && (ob->model.class != NULL)) {
@@ -498,8 +597,11 @@ static int PrintCellHashTableElement(struct hashlist *p)
     /* only print primitive cells if Debug is enabled */
     if (Debug == 1)  Printf("Cell: %s (instanced %d times); Primitive\n",
 		       ptr->name, ptr->number);
+    else if (Debug == 3) {	/* list */
+       Tcl_AppendElement(netgeninterp, ptr->name);
+    }
   }
-  else if (Debug == 2) {	/* list only */
+  else if ((Debug == 2) || (Debug == 3)) {	/* list only */
 #ifdef TCL_NETGEN
      Tcl_AppendElement(netgeninterp, ptr->name);
 #else
@@ -530,7 +632,7 @@ void PrintCellHashTable(int full, int filenum)
 
   bins  = RecurseHashTable(&cell_dict, CountHashTableBinsUsed);
   total = RecurseHashTable(&cell_dict, CountHashTableEntries);
-  if (full != 2)
+  if (full < 2)
      Printf("Hash table: %d of %d bins used; %d cells total (%.2f per bin)\n",
 		bins, CELLHASHSIZE, total, (bins == 0) ? 0 :
 		(float)((float)total / (float)bins));
@@ -540,7 +642,7 @@ void PrintCellHashTable(int full, int filenum)
   RecurseHashTable(&cell_dict, PrintCellHashTableElement);
   Debug = OldDebug;
 #ifndef TCL_NETGEN
-  if (full == 2) Printf("\n");
+  if (full >= 2) Printf("\n");
 #endif
 }
 

base/objlist.h

@@ -104,10 +104,12 @@ struct valuelist {
 /* Part 3:  Keys & Defaults (kept in the cell record as a hash table) */
 
 #define MERGE_NONE	0	/* Property does not change when devices merge */
-#define MERGE_ADD	1	/* Properties sum with device merge */
-#define MERGE_ADD_CRIT	2	/* Properties sum with device merge */
+#define MERGE_ADD	1	/* Properties sum with device parallel merge */
+#define MERGE_ADD_CRIT	2	/* Properties sum with device parallel merge */
 #define MERGE_PAR	3	/* Properties add in parallel with device merge */
 #define MERGE_PAR_CRIT	4	/* Properties add in parallel with device merge */
+#define MERGE_SER	5	/* Properties sum with device parallel merge */
+#define MERGE_SER_CRIT	6	/* Properties sum with device parallel merge */
 
 /* Note:  A "critical" merge means that the property causes the number of	*/
 /* devices to change.  e.g., transistor width is critical;  transistor drain	*/
@@ -159,9 +161,16 @@ extern struct objlist *LastPlaced;
 struct IgnoreList {
     char *class;
     int file;
+    unsigned char type;
     struct IgnoreList *next;
 };
 
+/* Types used by IgnoreList above */
+
+#define IGNORE_NONE	(unsigned char)0
+#define IGNORE_CLASS	(unsigned char)1
+#define IGNORE_SHORTED	(unsigned char)2
+
 /* Record structure for handling pin permutations in a cell	*/
 /* Linked list structure allows multiple permutations per cell.	*/
 
@@ -206,10 +215,10 @@ struct nlist {
 #define CELL_PROPSMATCHED	0x10	/* properties matched to matching cell */
 #define CELL_DUPLICATE		0x20	/* cell has a duplicate */
 
-/* Flags for combination allowances */
+/* Flags for combination allowances and prohibitions */
 
-#define COMB_SERIAL		0x20
-#define COMB_PARALLEL		0x40
+#define COMB_SERIAL		0x40
+#define COMB_NO_PARALLEL	0x80
 
 extern struct nlist *CurrentCell;
 extern struct objlist *CurrentTail;

base/place.c

@@ -315,7 +315,6 @@ void PrintE(FILE *outfile, int E)
 
 
 #if 0
-INLINE
 int UsedLeaves(int E1, int E2)
 /* returns the number of leaves in E1 + E2, which are assumed independent */
 {
@@ -327,7 +326,6 @@ int UsedLeaves(int E1, int E2)
 #endif
 
 
-INLINE
 int CommonNodes(int E1, int E2, int IncludeGlobals)
 /* returns the number of nodes that E1 and E2 share */
 /* if IncludeGlobals == 0, do not count large connectivity nodes */
@@ -350,7 +348,6 @@ int CommonNodes(int E1, int E2, int IncludeGlobals)
   return(result);
 }
 
-INLINE
 int GlobalNodes(int E)
 /* return the number of global nodes that E contacts */
 /* for now, global nodes are just cell ports */

base/query.c

@@ -1024,6 +1024,10 @@ void Query(void)
       promptstring("Write SPICE: circuit name: ", repstr);
       SpiceCell(repstr, filenum, "");
       break;
+    case 'v':
+      promptstring("Write Verilog: circuit name: ", repstr);
+      VerilogModule(repstr, filenum, "");
+      break;
     case 'E':
       promptstring("Write ESACAP: circuit name: ", repstr);
       EsacapCell(repstr,"");
@@ -1062,6 +1066,10 @@ void Query(void)
       promptstring("Read SPICE (.ckt) file? ", repstr);
       ReadSpice(repstr, &filenum);
       break;
+    case 'V':
+      promptstring("Read Verilog (.v) file? ", repstr);
+      ReadVerilog(repstr, &filenum);
+      break;
     case 'G' : 
       promptstring("Read NETGEN: file? ", repstr);
       ReadNetgenFile(repstr, &filenum);

base/spice.c

@@ -25,8 +25,10 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 #include <stdarg.h>  /* what about varargs, like in pdutils.c ??? */
 #endif
 
-#ifdef IBMPC
-#include <stdlib.h>  /* for calloc(), free() */
+#include <stdlib.h>  /* for calloc(), free(), getenv() */
+#ifndef IBMPC
+#include <sys/types.h>	/* for getpwnam() tilde expansion */
+#include <pwd.h>
 #endif
 
 #ifdef TCL_NETGEN
@@ -42,6 +44,10 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 // Global storage for parameters from .PARAM
 struct hashdict spiceparams;
 
+// Global setting for auto-detect of empty subcircuits as
+// black-box subcells.
+int auto_blackbox = FALSE;
+
 // Check if a token represents a numerical value (with
 // units) or an expression.  This is basically a hack
 // to see if it either passes StringIsValue() or is
@@ -398,6 +404,7 @@ int renamepins(struct hashlist *p, int file)
 
 void CleanupSubcell() {
    int maxnode = 0;
+   int has_devices = FALSE;
    struct objlist *sobj, *nobj, *lobj, *pobj;
 
    if (CurrentCell == NULL) return;
@@ -409,6 +416,8 @@ void CleanupSubcell() {
    lobj = NULL;
    for (sobj = CurrentCell->cell; sobj != NULL;) {
       nobj = sobj->next;
+      if (sobj->type == FIRSTPIN)
+	 has_devices = TRUE;
       if (sobj->node < 0) {
          if (IsGlobal(sobj)) {
  	    if (lobj != NULL)
@@ -437,6 +446,8 @@ void CleanupSubcell() {
          lobj = sobj;
       sobj = nobj;
    }
+   if ((has_devices == FALSE) && (auto_blackbox == TRUE))
+      SetClass(CLASS_MODULE);
 }
 
 /*------------------------------------------------------*/
@@ -501,10 +512,10 @@ void ReadSpiceFile(char *fname, int filenum, struct cellstack **CellStackPtr,
   
   while (!EndParseFile()) {
 
-    SkipTok(); /* get the next token */
+    SkipTok(NULL); /* get the next token */
     if ((EndParseFile()) && (nexttok == NULL)) break;
 
-    if (nexttok[0] == '*') SkipNewLine();
+    if (nexttok[0] == '*') SkipNewLine(NULL);
 
     else if (matchnocase(nexttok, ".SUBCKT")) {
       SpiceTokNoNewline();
@@ -563,18 +574,18 @@ void ReadSpiceFile(char *fname, int filenum, struct cellstack **CellStackPtr,
 	 Printf("Renaming original cell to %s\n", model);
 	 InstanceRename(nexttok, model, filenum);
 	 CellRehash(nexttok, model, filenum);
-         CellDefNoCase(nexttok, filenum);
+         CellDef(nexttok, filenum);
          tp = LookupCellFile(nexttok, filenum);
       }
       else if (tp != NULL) {	/* Make a new definition for an empty cell */
 	 FreePorts(nexttok);
 	 CellDelete(nexttok, filenum);	/* This removes any PLACEHOLDER flag */
-	 CellDefNoCase(model, filenum);
+	 CellDef(model, filenum);
 	 tp = LookupCellFile(model, filenum);
 	 update = 1;	/* Will need to update existing instances */
       }
       else if (tp == NULL) {	/* Completely new cell, no name conflict */
-         CellDefNoCase(model, filenum);
+         CellDef(model, filenum);
          tp = LookupCellFile(model, filenum);
       }
 
@@ -615,7 +626,7 @@ void ReadSpiceFile(char *fname, int filenum, struct cellstack **CellStackPtr,
 	    }
 	    SpiceTokNoNewline();
          }
-         SetClass((blackbox) ? CLASS_MODULE : CLASS_SUBCKT);
+	 SetClass((blackbox) ? CLASS_MODULE : CLASS_SUBCKT);
 
 	 if (hasports == 0) {
 	    // If the cell defines no ports, then create a proxy
@@ -640,7 +651,7 @@ skip_ends:
 
 	 while (1) {
 	    SpiceSkipNewLine();
-	    SkipTok();
+	    SkipTok(NULL);
 	    if (EndParseFile()) break;
 	    if (matchnocase(nexttok, ".ENDS")) {
 	       in_subckt = 0;
@@ -662,7 +673,7 @@ skip_ends:
 
       if (*CellStackPtr) PopStack(CellStackPtr);
       if (*CellStackPtr) ReopenCellDef((*CellStackPtr)->cellname, filenum);
-      SkipNewLine();
+      SkipNewLine(NULL);
     }
     else if (matchnocase(nexttok, ".MODEL")) {
       unsigned char class = CLASS_SUBCKT;
@@ -734,7 +745,7 @@ skip_ends:
          if (numnodes == 0) {
 	    // If there is no current cell, make one
 	    if (!(*CellStackPtr)) {
-	       CellDefNoCase(fname, filenum);
+	       CellDef(fname, filenum);
 	       PushStack(fname, CellStackPtr);
 	    }
 	    Global(nexttok);
@@ -743,7 +754,7 @@ skip_ends:
       SpiceSkipNewLine();
     }
     else if (matchnocase(nexttok, ".INCLUDE")) {
-      char *iname, *iptr, *quotptr, *pathend;
+      char *iname, *iptr, *quotptr, *pathend, *userpath = NULL;
 
       SpiceTokNoNewline();
       if (nexttok == NULL) continue;	/* Ignore if no filename */
@@ -755,12 +766,44 @@ skip_ends:
       pathend = strrchr(fname, '/');
       iptr = nexttok;
       while (*iptr == '\'' || *iptr == '\"' || *iptr == '`') iptr++;
-      if ((pathend != NULL) && (*iptr != '/')) {
+      if ((pathend != NULL) && (*iptr != '/') && (*iptr != '~')) {
 	 *pathend = '\0';
 	 iname = (char *)MALLOC(strlen(fname) + strlen(iptr) + 2);
 	 sprintf(iname, "%s/%s", fname, iptr);
 	 *pathend = '/';
       }
+#ifndef IBMPC
+      else if ((*iptr == '~') && (*(iptr + 1) == '/')) {
+	 /* For ~/<path>, substitute tilde from $HOME */
+	 userpath = getenv("HOME");
+	 iname = (char *)MALLOC(strlen(userpath) + strlen(iptr));
+	 sprintf(iname, "%s%s", userpath, iptr + 1);
+      }
+      else if (*iptr == '~') {
+	 /* For ~<user>/<path>, substitute tilde from getpwnam() */
+	 struct passwd *passwd;
+	 char *pathstart;
+         pathstart = strchr(iptr, '/');
+	 if (pathstart) *pathstart = '\0';
+	 passwd = getpwnam(iptr + 1);
+	 if (passwd != NULL) {
+	    userpath = passwd->pw_dir;
+	    if (pathstart) {
+	       *pathstart = '/';
+	       iname = (char *)MALLOC(strlen(userpath) + strlen(pathstart) + 1);
+	       sprintf(iname, "%s%s", userpath, pathstart);
+	    }
+	    else {
+	       /* Almost certainly an error, but make the substitution anyway */
+	       iname = STRDUP(userpath);
+	    }
+	 }
+	 else {
+	    /* Probably an error, but copy the filename verbatim */
+	    iname = STRDUP(iptr);
+	 }
+      }
+#endif
       else
 	 iname = STRDUP(iptr);
 
@@ -795,7 +838,7 @@ skip_ends:
 	    kl->key = strsave(nexttok);
 	    kl->idx = 0;
 	    kl->type = PROP_STRING;
-	    kl->slop.ival = 0;
+	    kl->slop.dval = 0.0;
 	    kl->pdefault.string = strsave(eqptr + 1);
 	    HashPtrInstall(nexttok, kl, &spiceparams);
 	 }
@@ -816,7 +859,7 @@ skip_ends:
       collector[99] = '\0';
 
       if (!(*CellStackPtr)) {
-	CellDefNoCase(fname, filenum);
+	CellDef(fname, filenum);
 	PushStack(fname, CellStackPtr);
       }
       strncpy(inst, nexttok + 1, 99); SpiceTokNoNewline(); 
@@ -848,7 +891,7 @@ skip_ends:
       }
 
       if (LookupCellFile(model, filenum) == NULL) {
-	 CellDefNoCase(model, filenum);
+	 CellDef(model, filenum);
 	 Port("collector");
 	 Port("base");
 	 Port("emitter");
@@ -877,7 +920,7 @@ skip_ends:
       bulk[99] = '\0';
 
       if (!(*CellStackPtr)) {
-	CellDefNoCase(fname, filenum);
+	CellDef(fname, filenum);
 	PushStack(fname, CellStackPtr);
       }
       strncpy(inst, nexttok + 1, 99); SpiceTokNoNewline(); 
@@ -918,7 +961,7 @@ skip_ends:
       /* SPICE transistor.						*/
 
       if (LookupCellFile(model, filenum) == NULL) {
-	 CellDefNoCase(model, filenum);
+	 CellDef(model, filenum);
 	 Port("drain");
 	 Port("gate");
 	 Port("source");
@@ -955,7 +998,7 @@ skip_ends:
         cbot[99] = '\0';
 
         if (!(*CellStackPtr)) {
-	  CellDefNoCase(fname, filenum);
+	  CellDef(fname, filenum);
 	  PushStack(fname, CellStackPtr);
         }
         strncpy(inst, nexttok + 1, 99); SpiceTokNoNewline(); 
@@ -1009,7 +1052,7 @@ skip_ends:
 	else
 	{
 	   if (LookupCellFile(model, filenum) == NULL) {
-	      CellDefNoCase(model, filenum);
+	      CellDef(model, filenum);
 	      Port("top");
 	      Port("bottom");
 	      PropertyValue(model, filenum, "value", 0.01, 0.0);
@@ -1049,7 +1092,7 @@ skip_ends:
 	rbot[99] = '\0';
 
         if (!(*CellStackPtr)) {
-	  CellDefNoCase(fname, filenum);
+	  CellDef(fname, filenum);
 	  PushStack(fname, CellStackPtr);
         }
         strncpy(inst, nexttok + 1, 99); SpiceTokNoNewline(); 
@@ -1100,7 +1143,7 @@ skip_ends:
 	if (model[0] != '\0')
 	{
 	   if (LookupCellFile(model, filenum) == NULL) {
-	      CellDefNoCase(model, filenum);
+	      CellDef(model, filenum);
 	      Port("end_a");
 	      Port("end_b");
 	      PropertyValue(model, filenum, "value", 0.01, 0.0);
@@ -1136,7 +1179,7 @@ skip_ends:
       anode[99] = '\0';
 
       if (!(*CellStackPtr)) {
-	CellDefNoCase(fname, filenum);
+	CellDef(fname, filenum);
 	PushStack(fname, CellStackPtr);
       }
       strncpy(inst, nexttok + 1, 99); SpiceTokNoNewline(); 
@@ -1165,7 +1208,7 @@ skip_ends:
       }
 
       if (LookupCellFile(model, filenum) == NULL) {
-	 CellDefNoCase(model, filenum);
+	 CellDef(model, filenum);
 	 Port("anode");
 	 Port("cathode");
          PropertyInteger(model, filenum, "M", 0, 1);
@@ -1198,7 +1241,7 @@ skip_ends:
 	node4[99] = '\0';
 
         if (!(*CellStackPtr)) {
-	  CellDefNoCase(fname, filenum);
+	  CellDef(fname, filenum);
 	  PushStack(fname, CellStackPtr);
         }
         strncpy(inst, nexttok + 1, 99); SpiceTokNoNewline(); 
@@ -1236,7 +1279,7 @@ skip_ends:
 	if (model[0] != '\0')
 	{
 	   if (LookupCellFile(model, filenum) == NULL) {
-	      CellDefNoCase(model, filenum);
+	      CellDef(model, filenum);
 	      Port("node1");
 	      Port("node2");
 	      Port("node3");
@@ -1276,7 +1319,7 @@ skip_ends:
       end_b[99] = '\0';
 
       if (!(*CellStackPtr)) {
-	CellDefNoCase(fname, filenum);
+	CellDef(fname, filenum);
 	PushStack(fname, CellStackPtr);
       }
       strncpy(inst, nexttok + 1, 99); SpiceTokNoNewline(); 
@@ -1321,7 +1364,7 @@ skip_ends:
       if (model[0] != '\0')
       {
 	 if (LookupCellFile(model, filenum) == NULL) {
-	    CellDefNoCase(model, filenum);
+	    CellDef(model, filenum);
 	    Port("end_a");
 	    Port("end_b");
 	    PropertyInteger(model, filenum, "M", 0, 1);
@@ -1359,7 +1402,7 @@ skip_ends:
       neg[99] = '\0';
 
       if (!(*CellStackPtr)) {
-	CellDefNoCase(fname, filenum);
+	CellDef(fname, filenum);
 	PushStack(fname, CellStackPtr);
       }
       strncpy(inst, nexttok + 1, 99); SpiceTokNoNewline(); 
@@ -1389,7 +1432,7 @@ skip_ends:
       }
       strcpy(model, "vsrc");		/* Default voltage source */
       if (LookupCellFile(model, filenum) == NULL) {
-	 CellDefNoCase(model, filenum);
+	 CellDef(model, filenum);
 	 Port("pos");
 	 Port("neg");
 	 PropertyInteger(model, filenum, "M", 0, 1);
@@ -1414,7 +1457,7 @@ skip_ends:
       neg[99] = '\0';
 
       if (!(*CellStackPtr)) {
-	CellDefNoCase(fname, filenum);
+	CellDef(fname, filenum);
 	PushStack(fname, CellStackPtr);
       }
       strncpy(inst, nexttok + 1, 99); SpiceTokNoNewline(); 
@@ -1443,7 +1486,7 @@ skip_ends:
       }
       strcpy(model, "isrc");		/* Default current source */
       if (LookupCellFile(model, filenum) == NULL) {
-	 CellDefNoCase(model, filenum);
+	 CellDef(model, filenum);
 	 Port("pos");
 	 Port("neg");
 	 PropertyInteger(model, filenum, "M", 0, 1);
@@ -1470,7 +1513,7 @@ skip_ends:
       ctrln[99] = '\0';
 
       if (!(*CellStackPtr)) {
-	CellDefNoCase(fname, filenum);
+	CellDef(fname, filenum);
 	PushStack(fname, CellStackPtr);
       }
       strncpy(inst, nexttok + 1, 99); SpiceTokNoNewline(); 
@@ -1506,7 +1549,7 @@ skip_ends:
       }
       strcpy(model, "vcvs");		/* Default controlled voltage source */
       if (LookupCellFile(model, filenum) == NULL) {
-	 CellDefNoCase(model, filenum);
+	 CellDef(model, filenum);
 	 Port("pos");
 	 Port("neg");
 	 Port("ctrlp");
@@ -1530,6 +1573,8 @@ skip_ends:
 
     else if (toupper(nexttok[0]) == 'X') {	/* subcircuit instances */
       char instancename[100], subcktname[100];
+      int itype;
+
       instancename[99] = '\0';
       subcktname[99] = '\0';
 
@@ -1544,7 +1589,7 @@ skip_ends:
       snprintf(instancename, 99, "%s", nexttok + 1);
       strncpy(instancename, nexttok + 1, 99);
       if (!(*CellStackPtr)) {
-	CellDefNoCase(fname, filenum);
+	CellDef(fname, filenum);
 	PushStack(fname, CellStackPtr);
       }
       
@@ -1602,6 +1647,34 @@ skip_ends:
       if (scan->next != NULL) scan = scan->next;
       tail->next = NULL;
 
+      /* Check for ignored class */
+
+      if ((itype = IsIgnored(subcktname, filenum)) == IGNORE_CLASS) {
+          Printf("Class '%s' instanced in input but is being ignored.\n", model);
+          return;
+      }
+
+      /* Check for shorted pins */
+
+      if ((itype == IGNORE_SHORTED) && (head != NULL)) {
+         unsigned char shorted = (unsigned char)1;
+         struct portelement *p;
+         for (p = head->next; p; p = p->next) {
+            if (strcasecmp(head->name, p->name))
+               shorted = (unsigned char)0;
+               break;
+         }
+         if (shorted == (unsigned char)1) {
+            Printf("Instance of '%s' is shorted, ignoring.\n", subcktname);
+	    while (head) {
+	       p = head->next;
+	       FREE(head);
+	       head = p;
+            }
+            return;
+         }
+      }
+
       /* Create cell name and revise instance name based on the cell name */
       /* For clarity, if "instancename" does not contain the cellname,	  */
       /* then prepend the cellname to the instance name.  HOWEVER, if any */
@@ -1641,7 +1714,7 @@ skip_ends:
 
 	 Fprintf(stdout, "Call to undefined subcircuit %s\n"
 		"Creating placeholder cell definition.\n", subcktname);
-	 CellDefNoCase(subcktname, filenum);
+	 CellDef(subcktname, filenum);
 	 CurrentCell->flags |= CELL_PLACEHOLDER;
          for (scan = head, i = 1; scan != NULL; scan = scan->next, i++) {
 	    sprintf(defport, "%d", i);	
@@ -1658,6 +1731,7 @@ skip_ends:
       }
 
       /* nexttok is now NULL, scan->name points to class */
+
       Instance(subcktname, instancename);
       pobj = LinkProperties(subcktname, kvlist);
       ReduceExpressions(pobj, NULL, CurrentCell, TRUE);
@@ -1777,7 +1851,7 @@ char *ReadSpiceTop(char *fname, int *fnum, int blackbox)
 
     SetExtension(name, fname, SPICE_EXTENSION);
     if ((filenum = OpenParseFile(name, *fnum)) < 0) {
-      Fprintf(stderr,"No file: %s\n",name);
+      Fprintf(stderr,"Error in SPICE file read: No file %s\n",name);
       *fnum = filenum;
       return NULL;
     }    
@@ -1808,7 +1882,7 @@ char *ReadSpiceTop(char *fname, int *fnum, int blackbox)
   // as an empty cell.  Otherwise, the filename is lost and cells
   // cannot be matched to the file!
 
-  if (LookupCellFile(fname, filenum) == NULL) CellDefNoCase(fname, filenum);
+  if (LookupCellFile(fname, filenum) == NULL) CellDef(fname, filenum);
 
   tp = LookupCellFile(fname, filenum);
   if (tp) tp->flags |= CELL_TOP;
@@ -1867,12 +1941,15 @@ void IncludeSpice(char *fname, int parent, struct cellstack **CellStackPtr,
      if ((filenum = OpenParseFile(fname, parent)) < 0) {
 
 	/* If that fails, see if a standard SPICE extension	*/
-	/* helps.  But really, we're getting desperate at this	*/
-	/* point.						*/
+	/* helps, if the file didn't have an extension.  But	*/
+	/* really, we're getting desperate at this point.	*/
 
-        SetExtension(name, fname, SPICE_EXTENSION);
-        if ((filenum = OpenParseFile(name, parent)) < 0) {
-           Fprintf(stderr,"No file: %s\n",name);
+	if (strchr(fname, '.') == NULL) {
+           SetExtension(name, fname, SPICE_EXTENSION);
+           filenum = OpenParseFile(name, parent);
+	}
+        if (filenum < 0) {
+           Fprintf(stderr,"Error in SPICE file include: No file %s\n",name);
            return;
         }    
      }

base/xilinx.c

@@ -132,6 +132,7 @@ char *xilinx_class(model)
 	}
 	return(model);
 }
+void
 Xilinx(cellname, filename)
 	char *cellname;
 	char *filename;

base/xnetgen.c

@@ -271,7 +271,7 @@ void initialize_netcmp_datastructures(Widget w, Widget textwidget,
 {
   X_START();
   Printf("Comparing cells '%s' and '%s'\n", get_cell(), get_other());
-  CreateTwoLists(get_cell(), get_other());
+  CreateTwoLists(get_cell(), get_other(), 0);
   Permute();
 #ifdef DEBUG_ALLOC
   PrintCoreStats();

defs.mak

@@ -33,6 +33,7 @@ MANDIR                 = ${mandir}
 LIBDIR                 = ${libdir}
 DOCDIR                 = ${libdir}/netgen/doc
 TCLDIR                 = ${libdir}/netgen/tcl
+PYDIR		       = ${libdir}/netgen/python
 
 MAIN_EXTRA_LIBS        =  ${NETGENDIR}/tcltk/libtcltk.o
 LD_EXTRA_LIBS          = 
@@ -66,8 +67,8 @@ CPP                    = gcc -E -x c
 CXX                    = @CXX@
 
 CPPFLAGS               = -I. -I${NETGENDIR} 
-DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\"  -DUSE_TCL_STUBS -DUSE_TK_STUBS -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"60\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
-DFLAGS_NOSTUB          =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"60\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
+DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\"  -DUSE_TCL_STUBS -DUSE_TK_STUBS -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"98\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
+DFLAGS_NOSTUB          =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"98\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
 CFLAGS                 = -g -m64 -fPIC -fPIC 
 
 DEPEND_FILE            = Depend

netgen/Makefile

@@ -22,8 +22,8 @@ tclnetgen${SHDLIB_EXT}: ${EXTRA_LIBS}
 	@echo --- making netgen Tcl library \(tclnetgen${SHDLIB_EXT}\)
 	${RM} tclnetgen${SHDLIB_EXT}
 	${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} \
-		${LD_RUN_PATH} ${EXTRA_LIBS} ${LD_EXTRA_LIBS} -lc ${LIBS} \
-		${LIB_SPECS} ${LDFLAGS}
+		${LD_RUN_PATH} ${EXTRA_LIBS} ${LD_EXTRA_LIBS} \
+		-lc ${LIBS} ${LIB_SPECS} ${LDFLAGS}
 
 $(DESTDIR)${BINDIR}/netgen:
 	${RM} $@

python/Makefile

@@ -0,0 +1,54 @@
+MODULE = python
+NETGENDIR = ..
+SRCS = 
+SCRIPTS = consoletext.py helpwindow.py lvs_manager.py treeviewsplit.py
+SCRIPTS += tksimpledialog.py tooltip.py lvs_help.txt
+
+SCRIPTINSTALL = $(DESTDIR)${PYDIR}
+
+include ${NETGENDIR}/defs.mak
+
+main: lvs_manager.py
+
+tcl-main: lvs_manager.py
+
+$(DESTDIR)${PYDIR}/consoletext.py:
+	${RM} $@
+	${CP} consoletext.py $@
+
+$(DESTDIR)${PYDIR}/helpwindow.py:
+	${RM} $@
+	${CP} helpwindow.py $@
+
+lvs_manager.py: lvs_manager.py.in
+	sed -e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
+		lvs_manager.py.in > lvs_manager.py
+
+$(DESTDIR)${PYDIR}/lvs_manager.py: lvs_manager.py
+	${RM} $@
+	${CP} lvs_manager.py $@
+
+$(DESTDIR)${PYDIR}/treeviewsplit.py: treeviewsplit.py
+	${RM} $@
+	${CP} treeviewsplit.py $@
+
+$(DESTDIR)${PYDIR}/tksimpledialog.py: tksimpledialog.py
+	${RM} $@
+	${CP} tksimpledialog.py $@
+
+$(DESTDIR)${PYDIR}/tooltip.py: tooltip.py
+	${RM} $@
+	${CP} tooltip.py $@
+
+$(DESTDIR)${PYDIR}/lvs_help.txt: lvs_help.txt
+	${RM} $@
+	${CP} lvs_help.txt $@
+
+install: install-tcl
+
+install-tcl: $(DESTDIR)${PYDIR} $(DESTDIR)${PYDIR}/consoletext.py \
+	$(DESTDIR)${PYDIR}/helpwindow.py $(DESTDIR)${PYDIR}/lvs_manager.py \
+	$(DESTDIR)${PYDIR}/treeviewsplit.py $(DESTDIR)${PYDIR}/tksimpledialog.py \
+	$(DESTDIR)${PYDIR}/tooltip.py $(DESTDIR)${PYDIR}/lvs_help.txt
+
+include ${NETGENDIR}/rules.mak

python/consoletext.py

@@ -0,0 +1,54 @@
+#!/bin/env python3
+#
+#--------------------------------------------------------
+"""
+  consoletext --- extends tkinter class Text
+  with stdout and stderr redirection.
+"""
+#--------------------------------------------------------
+# Written by Tim Edwards
+# efabless, inc.
+# September 11, 2016
+# Version 0.1
+#--------------------------------------------------------
+
+import sys
+import tkinter
+
+class ConsoleText(tkinter.Text):
+    linelimit = 500
+    class IORedirector(object):
+        '''A general class for redirecting I/O to this Text widget.'''
+        def __init__(self,text_area):
+            self.text_area = text_area
+
+    class StdoutRedirector(IORedirector):
+        '''A class for redirecting stdout to this Text widget.'''
+        def write(self,str):
+            self.text_area.write(str,False)
+
+    class StderrRedirector(IORedirector):
+        '''A class for redirecting stderr to this Text widget.'''
+        def write(self,str):
+            self.text_area.write(str,True)
+
+    def __init__(self, master=None, cnf={}, **kw):
+        '''See the __init__ for Tkinter.Text.'''
+
+        tkinter.Text.__init__(self, master, cnf, **kw)
+
+        self.tag_configure('stdout',background='white',foreground='black')
+        self.tag_configure('stderr',background='white',foreground='red')
+        # None of these works!  Cannot change selected text background!
+        self.config(selectbackground='blue', selectforeground='white')
+        self.tag_configure('sel',background='blue',foreground='white')
+
+    def write(self, val, is_stderr=False):
+        lines = int(self.index('end-1c').split('.')[0])
+        if lines > self.linelimit:
+            self.delete('1.0', str(lines - self.linelimit) + '.0')
+        self.insert('end',val,'stderr' if is_stderr else 'stdout')
+        self.see('end')
+
+    def limit(self, val):
+        self.linelimit = val

python/helpwindow.py

@@ -0,0 +1,229 @@
+#!/bin/env python3
+#
+#--------------------------------------------------------
+# Help Window for the Open Galaxy project manager
+#
+#--------------------------------------------------------
+# Written by Tim Edwards
+# efabless, inc.
+# September 12, 2016
+# Version 0.1
+#--------------------------------------------------------
+
+import re
+import tkinter
+from tkinter import ttk
+
+class HelpWindow(tkinter.Toplevel):
+    """Open Galaxy help window."""
+
+    def __init__(self, parent=None, fontsize = 11, *args, **kwargs):
+        '''See the __init__ for Tkinter.Toplevel.'''
+        tkinter.Toplevel.__init__(self, parent, *args, **kwargs)
+
+        s = ttk.Style()
+        s.configure('normal.TButton', font=('Helvetica', fontsize), border = 3, relief = 'raised')
+
+        self.withdraw()
+        self.title('Open Galaxy Help')
+
+        self.helptitle = ttk.Label(self, style='title.TLabel', text = '(no text)')
+        self.helptitle.grid(column = 0, row = 0, sticky = "news")
+        self.helpbar = ttk.Separator(self, orient='horizontal')
+        self.helpbar.grid(column = 0, row = 1, sticky = "news")
+
+        self.hframe = tkinter.Frame(self)
+        self.hframe.grid(column = 0, row = 2, sticky = "news")
+        self.hframe.helpdisplay = ttk.Frame(self.hframe)
+        self.hframe.helpdisplay.pack(side = 'left', fill = 'both', expand = 'true')
+
+        self.hframe.helpdisplay.helptext = tkinter.Text(self.hframe.helpdisplay, wrap='word')
+        self.hframe.helpdisplay.helptext.pack(side = 'top', fill = 'both', expand = 'true')
+        # Add scrollbar to help window
+        self.hframe.scrollbar = ttk.Scrollbar(self.hframe)
+        self.hframe.scrollbar.pack(side='right', fill='y')
+        # attach help window to scrollbar
+        self.hframe.helpdisplay.helptext.config(yscrollcommand = self.hframe.scrollbar.set)
+        self.hframe.scrollbar.config(command = self.hframe.helpdisplay.helptext.yview)
+
+        self.hframe.toc = ttk.Treeview(self.hframe, selectmode='browse')
+        self.hframe.toc.bind('<<TreeviewSelect>>', self.toc_to_page)
+        self.hframe.toc.bind('<<TreeviewOpen>>', self.toc_toggle)
+        self.hframe.toc.bind('<<TreeviewClose>>', self.toc_toggle)
+        self.hframe.toc.tag_configure('title', font=('Helvetica', fontsize, 'bold italic'),
+                        foreground = 'brown', anchor = 'center')
+        self.hframe.toc.heading('#0', text = "Table of Contents")
+
+        self.bbar = ttk.Frame(self)
+        self.bbar.grid(column = 0, row = 3, sticky = "news")
+        self.bbar.close_button = ttk.Button(self.bbar, text='Close',
+		command=self.close, style = 'normal.TButton')
+        self.bbar.close_button.grid(column=0, row=0, padx = 5)
+
+        self.bbar.prev_button = ttk.Button(self.bbar, text='Prev',
+		command=self.prevpage, style = 'normal.TButton')
+        self.bbar.prev_button.grid(column=1, row=0, padx = 5)
+
+        self.bbar.next_button = ttk.Button(self.bbar, text='Next',
+		command=self.nextpage, style = 'normal.TButton')
+        self.bbar.next_button.grid(column=2, row=0, padx = 5)
+
+        self.bbar.contents_button = ttk.Button(self.bbar, text='Table of Contents',
+		command=self.page_to_toc, style = 'normal.TButton')
+        self.bbar.contents_button.grid(column=3, row=0, padx = 5)
+
+        self.rowconfigure(0, weight=0)
+        self.rowconfigure(1, weight=0)
+        self.rowconfigure(2, weight=1)
+        self.rowconfigure(3, weight=0)
+        self.columnconfigure(0, weight=1)
+
+        # Help pages
+        self.pages = []
+        self.pageno = -1		# No page
+        self.toggle = False
+
+    def grid_configure(self, padx, pady):
+        pass
+
+    def redisplay(self):
+        # remove contents
+        if self.pageno >= 0 and self.pageno < len(self.pages):
+            self.hframe.helpdisplay.helptext.delete('1.0', 'end')
+            self.hframe.helpdisplay.helptext.insert('end', self.pages[self.pageno]['text'])
+            self.helptitle.configure(text = self.pages[self.pageno]['title'])
+
+    def toc_toggle(self, event):
+        self.toggle = True
+
+    def toc_to_page(self, event):
+        treeview = event.widget
+        selection = treeview.item(treeview.selection())
+
+        # Make sure any open/close callback is handled first!
+        self.update_idletasks()
+        if self.toggle:
+            # Item was opened or closed, so consider this a 'false select' and
+            # do not go to the page.
+            self.toggle = False
+            return
+
+        if 'values' in selection:
+            pagenum = selection['values'][0]
+        else:
+            print('Unknown page selected.')
+            pagenum = 0
+
+        # Display a page after displaying the table of contents
+        self.hframe.toc.pack_forget()
+        self.hframe.scrollbar.pack_forget()
+        self.hframe.helpdisplay.pack(side='left', fill='both', expand = 'true')
+        self.hframe.scrollbar.pack(side='right', fill='y')
+        self.hframe.scrollbar.config(command = self.hframe.helpdisplay.helptext.yview)
+        # Enable Prev and Next buttons
+        self.bbar.prev_button.configure(state='enabled')
+        self.bbar.next_button.configure(state='enabled')
+        # Redisplay
+        self.page(pagenum)
+
+    def page_to_toc(self):
+        # Display the table of contents after displaying a page
+        self.hframe.scrollbar.pack_forget()
+        self.hframe.helpdisplay.pack_forget()
+        self.hframe.toc.pack(side='left', fill='both', expand = 'true')
+        self.hframe.scrollbar.pack(side='right', fill='y')
+        self.hframe.scrollbar.config(command = self.hframe.toc.yview)
+        # Disable Prev and Next buttons
+        self.bbar.prev_button.configure(state='disabled')
+        self.bbar.next_button.configure(state='disabled')
+
+    # Simple add page with a single block of plain text
+    def add_page(self, toc_text, text_block):
+        newdict = {}
+        newdict['text'] = text_block
+        newdict['title'] = toc_text
+        self.pages.append(newdict)
+        newpageno = len(self.pages)
+        self.hframe.toc.insert('', 'end', text=str(newpageno) + '.  ' + toc_text,
+		tag='title', value = newpageno - 1)
+        if self.pageno < 0:
+            self.pageno = 0	# First page
+
+    # Fill the help text from a file.  The format of the file is:
+    # <page_num>
+    # <title>
+    # <text>
+    # '.'
+    # Text is multi-line and ends when '.' is encountered by itself
+
+    def add_pages_from_file(self, filename):
+        endpagerex = re.compile('^\.$')
+        newpagerex = re.compile('^[0-9\.]+$')
+        commentrex = re.compile('^[\-]+$')
+        hierarchy = ''
+        print('Loading help text from file ' + filename)
+        with open(filename, 'r') as f:
+            toc_text = []
+            page_text = []
+            for line in f:
+                if newpagerex.match(line) or endpagerex.match(line):
+                    if toc_text and page_text:
+                        newdict = {}
+                        self.pages.append(newdict)
+                        newpageno = len(self.pages)
+                        if '.' in hierarchy:
+                            pageinfo = hierarchy.rsplit('.', 1)
+                            if pageinfo[1] == '':
+                                parentid = ''
+                                pageid = pageinfo[0]
+                            else:
+                                parentid = pageinfo[0]
+                                pageid = pageinfo[1]
+                        else:
+                            parentid = ''
+                            pageid = hierarchy
+                        if parentid:
+                            pageid = parentid + '.' + pageid
+                        newdict['text'] = page_text
+                        newdict['title'] = pageid + '.  ' + toc_text
+                        self.hframe.toc.insert(parentid, 'end',
+				text=newdict['title'], tag='title',
+				value = newpageno - 1, iid = pageid)
+                    if newpagerex.match(line):
+                        hierarchy = line.rstrip()
+                        toc_text = []
+                elif not toc_text:
+                    toc_text = line.rstrip()
+                    page_text = []
+                elif not commentrex.match(line):
+                    if not page_text:
+                        page_text = line
+                    else:
+                        page_text += line
+
+    def nextpage(self):
+        # Go to next page
+        if self.pageno < len(self.pages) - 1:
+            self.pageno += 1
+            self.redisplay()
+
+    def prevpage(self):
+        # Go to previous page
+        if self.pageno > 0:
+            self.pageno -= 1
+            self.redisplay()
+
+    def page(self, pagenum):
+        # Go to indicated page
+        if pagenum >= 0 and pagenum < len(self.pages):
+            self.pageno = pagenum 
+            self.redisplay()
+
+    def close(self):
+        # pop down help window
+        self.withdraw()
+
+    def open(self):
+        # pop up help window
+        self.deiconify()
+        self.lift()

python/lvs_help.txt

@@ -0,0 +1,5 @@
+1.
+Selecting a project
+-------
+Start by selecting a project.  This step is only necessary if the application is started from the command line.  If started from the project manager, then it can only be run if a project was selected.
+.

python/lvs_manager.py

@@ -0,0 +1,819 @@
+#!/bin/env python3
+#
+#--------------------------------------------------------
+# LVS Manager GUI.
+#
+# This is a Python tkinter script that handles the
+# process of running LVS and interpreting results.
+#
+#--------------------------------------------------------
+# Written by Tim Edwards
+# efabless, inc.
+# Version 1.  November 30, 2016
+# Version 2.  March 6, 2017.  Reads JSON format output
+# Version 3.  April 25, 2018. Handles layout vs. verilog
+#--------------------------------------------------------
+
+import io
+import os
+import re
+import sys
+import json
+import shutil
+import signal
+import socket
+import select
+import datetime
+import contextlib
+import subprocess
+
+import tkinter
+from tkinter import ttk
+from tkinter import filedialog
+
+import tksimpledialog
+import tooltip
+from consoletext import ConsoleText
+from helpwindow import HelpWindow
+from treeviewsplit import TreeViewSplit
+
+# User preferences file (if it exists)
+prefsfile = '~/.profile/prefs.json'
+
+netgen_script_dir = '/usr/local/lib/netgen/python'
+
+#------------------------------------------------------
+# Simple dialog for confirming quit
+#------------------------------------------------------
+
+class ConfirmDialog(tksimpledialog.Dialog):
+    def body(self, master, warning, seed):
+        if warning:
+            ttk.Label(master, text=warning, wraplength=500).grid(row = 0, columnspan = 2, sticky = 'wns')
+        return self
+
+    def apply(self):
+        return 'okay'
+
+#------------------------------------------------------
+# Main class for this application
+#------------------------------------------------------
+
+class LVSManager(ttk.Frame):
+    """LVS Manager GUI."""
+
+    def __init__(self, parent, *args, **kwargs):
+        ttk.Frame.__init__(self, parent, *args, **kwargs)
+        self.root = parent
+        self.init_gui()
+        parent.protocol("WM_DELETE_WINDOW", self.on_quit)
+
+    def on_quit(self):
+        """Exits program."""
+        if self.msock:
+            self.msock.close()
+        quit()
+
+    def init_gui(self):
+        """Builds GUI."""
+        global prefsfile
+
+        message = []
+        fontsize = 11
+
+        # Read user preferences file, get default font size from it.
+        prefspath = os.path.expanduser(prefsfile)
+        if os.path.exists(prefspath):
+            with open(prefspath, 'r') as f:
+                self.prefs = json.load(f)
+            if 'fontsize' in self.prefs:
+                fontsize = self.prefs['fontsize']
+        else:
+            self.prefs = {}
+
+        s = ttk.Style()
+
+        available_themes = s.theme_names()
+        s.theme_use(available_themes[0])
+
+        s.configure('bg.TFrame', background='gray40')
+        s.configure('italic.TLabel', font=('Helvetica', fontsize, 'italic'))
+        s.configure('title.TLabel', font=('Helvetica', fontsize, 'bold italic'),
+                        foreground = 'brown', anchor = 'center')
+        s.configure('normal.TLabel', font=('Helvetica', fontsize))
+        s.configure('red.TLabel', font=('Helvetica', fontsize), foreground = 'red')
+        s.configure('green.TLabel', font=('Helvetica', fontsize), foreground = 'green3')
+        s.configure('blue.TLabel', font=('Helvetica', fontsize), foreground = 'blue')
+        s.configure('normal.TButton', font=('Helvetica', fontsize),
+                        border = 3, relief = 'raised')
+        s.configure('red.TButton', font=('Helvetica', fontsize), foreground = 'red',
+                        border = 3, relief = 'raised')
+        s.configure('green.TButton', font=('Helvetica', fontsize), foreground = 'green3',
+                        border = 3, relief = 'raised')
+        s.configure('blue.TButton', font=('Helvetica', fontsize), foreground = 'blue',
+                        border = 3, relief = 'raised')
+        s.configure('redtitle.TButton', font=('Helvetica', fontsize, 'bold italic'),
+                        foreground = 'red', border = 3, relief = 'raised')
+        s.configure('bluetitle.TButton', font=('Helvetica', fontsize, 'bold italic'),
+                        foreground = 'blue', border = 3, relief = 'raised')
+
+        # These values to be overridden from arguments
+        self.rootpath = None
+        self.project = None
+        self.logfile = None
+        self.msock = None
+        self.help = None
+
+        # Create the help window
+        if os.path.exists(netgen_script_dir + '/netgen_help.txt'):
+            self.help = HelpWindow(self, fontsize = fontsize)
+            with io.StringIO() as buf, contextlib.redirect_stdout(buf):
+                self.help.add_pages_from_file('lvs_help.txt')
+                message = buf.getvalue()
+
+            # Set the help display to the first page
+            self.help.page(0)
+
+        # Variables used by option menus and other stuff
+        self.project = "(no selection)"
+        self.layout = "(default)"
+        self.schematic = "(default)"
+        self.tech = "(none)"
+        self.lvs_setup = ''
+        self.lvsdata = {}
+
+        # Root window title
+        self.root.title('LVS Manager')
+        self.root.option_add('*tearOff', 'FALSE')
+        self.pack(side = 'top', fill = 'both', expand = 'true')
+
+        pane = tkinter.PanedWindow(self, orient = 'vertical', sashrelief='groove', sashwidth=6)
+        pane.pack(side = 'top', fill = 'both', expand = 'true')
+        self.toppane = ttk.Frame(pane)
+        self.botpane = ttk.Frame(pane)
+
+        # Get username
+        if 'username' in self.prefs:
+            username = self.prefs['username']
+        else:
+            username = os.environ['USER']
+
+        # Label with the user
+        self.toppane.title_frame = ttk.Frame(self.toppane)
+        self.toppane.title_frame.pack(side = 'top', fill = 'x')
+
+        self.toppane.title_frame.title = ttk.Label(self.toppane.title_frame, text='User:', style = 'red.TLabel')
+        self.toppane.title_frame.user = ttk.Label(self.toppane.title_frame, text=username, style = 'blue.TLabel')
+
+        self.toppane.title_frame.title.grid(column=0, row=0, ipadx = 5)
+        self.toppane.title_frame.user.grid(column=1, row=0, ipadx = 5)
+
+        self.toppane.title2_frame = ttk.Frame(self.toppane)
+        self.toppane.title2_frame.pack(side = 'top', fill = 'x')
+        self.toppane.title2_frame.project_label = ttk.Label(self.toppane.title2_frame, text="Project:",
+                style = 'title.TLabel')
+        self.toppane.title2_frame.project_label.grid(column=0, row=0, ipadx = 5)
+
+        # New project select button
+        self.toppane.title2_frame.project_select = ttk.Button(self.toppane.title2_frame,
+                text=self.project, style='normal.TButton', command=self.choose_project)
+        self.toppane.title2_frame.project_select.grid(column=1, row=0, ipadx = 5)
+
+        tooltip.ToolTip(self.toppane.title2_frame.project_select,
+                        text = "Select new project")
+
+        # Show path to project
+        self.toppane.title2_frame.path_label = ttk.Label(self.toppane.title2_frame, text=self.project,
+                style = 'normal.TLabel')
+        self.toppane.title2_frame.path_label.grid(column=2, row=0, ipadx = 5, padx = 10)
+
+        # Show top-level layout cellname with select button.  Initial cell name is the top-level cell.
+        self.toppane.title2_frame.tech_label = ttk.Label(self.toppane.title2_frame, text="Technology setup:",
+                style = 'title.TLabel')
+
+        self.toppane.title2_frame.tech_label.grid(column=3, row=0, ipadx = 5)
+        self.toppane.title2_frame.tech_select = ttk.Button(self.toppane.title2_frame,
+                text=self.tech, style='normal.TButton', command=self.choose_tech)
+        self.toppane.title2_frame.tech_select.grid(column=4, row=0, ipadx = 3, padx = 3)
+
+        self.toppane.title2_frame.layout_label = ttk.Label(self.toppane.title2_frame, text="Layout:",
+                style = 'title.TLabel')
+        self.toppane.title2_frame.layout_label.grid(column=0, row=1, ipadx = 5)
+        self.toppane.title2_frame.layout_select = ttk.Button(self.toppane.title2_frame,
+                text=self.layout, style='normal.TButton', command=self.choose_layout)
+        self.toppane.title2_frame.layout_select.grid(column=1, row=1, ipadx = 3, padx = 3)
+
+        # Show top-level schematic cellname with select button.  Initial cell name is the top-level cell.
+        self.toppane.title2_frame.schem_label = ttk.Label(self.toppane.title2_frame, text="Schematic:",
+                style = 'title.TLabel')
+        self.toppane.title2_frame.schem_label.grid(column=3, row=1, ipadx = 5)
+        self.toppane.title2_frame.schem_select = ttk.Button(self.toppane.title2_frame,
+                text=self.schematic, style='normal.TButton', command=self.choose_netlist)
+        self.toppane.title2_frame.schem_select.grid(column=4, row=1, ipadx = 3, padx = 3)
+
+        tooltip.ToolTip(self.toppane.title2_frame.project_select,
+                        text = "Select new project")
+        tooltip.ToolTip(self.toppane.title2_frame.layout_select,
+                        text = "Select a layout subcirucit to compare")
+        tooltip.ToolTip(self.toppane.title2_frame.schem_select,
+                        text = "Select a schematic subcirucit to compare")
+
+        #---------------------------------------------
+        ttk.Separator(self.toppane, orient='horizontal').pack(side = 'top', fill = 'x')
+        #---------------------------------------------
+
+        # Create listbox of Circuit1 vs. Circuit2 results
+        height = 10
+        self.toppane.lvsreport = TreeViewSplit(self.toppane, fontsize = fontsize)
+        self.toppane.lvsreport.populate("Layout:", [], "Schematic:", [],
+			[["Run", True, self.run_lvs],
+			# ["Find", True, self.findrecord]
+			], height = height)
+        self.toppane.lvsreport.set_title("Line")
+        self.toppane.lvsreport.pack(side = 'top', fill = 'both', expand = 'true')
+
+        tooltip.ToolTip(self.toppane.lvsreport.get_button(0), text="Run LVS")
+
+        #---------------------------------------------
+        # ttk.Separator(self, orient='horizontal').grid(column=0, row=3, sticky='ew')
+        #---------------------------------------------
+
+        # Add a text window below the project name to capture output.  Redirect
+        # print statements to it.
+
+        self.botpane.console = ttk.Frame(self.botpane)
+        self.botpane.console.pack(side = 'top', fill = 'both', expand = 'true')
+
+        self.text_box = ConsoleText(self.botpane.console, wrap='word', height = 4)
+        self.text_box.pack(side='left', fill='both', expand='true')
+        console_scrollbar = ttk.Scrollbar(self.botpane.console)
+        console_scrollbar.pack(side='right', fill='y')
+        # attach console to scrollbar
+        self.text_box.config(yscrollcommand = console_scrollbar.set)
+        console_scrollbar.config(command = self.text_box.yview)
+
+        # Add button bar at the bottom of the window
+        self.botpane.bbar = ttk.Frame(self.botpane)
+        self.botpane.bbar.pack(side = 'top', fill = 'x')
+
+        # Define the "quit" button and action
+        self.botpane.bbar.quit_button = ttk.Button(self.botpane.bbar, text='Quit', command=self.on_quit,
+                style = 'normal.TButton')
+        self.botpane.bbar.quit_button.grid(column=0, row=0, padx = 5)
+
+        # Define help button
+        if self.help:
+            self.botpane.bbar.help_button = ttk.Button(self.botpane.bbar, text='Help',
+		command=self.help.open, style = 'normal.TButton')
+            self.botpane.bbar.help_button.grid(column = 2, row = 0, padx = 5)
+            tooltip.ToolTip(self.botpane.bbar.help_button, text = "Show help window")
+
+        # Add the panes once the internal geometry is known.
+        pane.add(self.toppane)
+        pane.add(self.botpane)
+        pane.paneconfig(self.toppane, stretch='first')
+
+        # Redirect stdout and stderr to the console as the last thing to do. . .
+        # Otherwise errors in the GUI get sucked into the void.
+
+        self.stdout = sys.stdout
+        self.stderr = sys.stderr
+        sys.stdout = ConsoleText.StdoutRedirector(self.text_box)
+        sys.stderr = ConsoleText.StderrRedirector(self.text_box)
+
+        if message:
+            print(message)
+
+    def logprint(self, message, doflush=False):
+        if self.logfile:
+            self.logfile.buffer.write(message.encode('utf-8'))
+            self.logfile.buffer.write('\n'.encode('utf-8'))
+            if doflush:
+                self.logfile.flush()
+
+    def printout(self, output):
+        # Generate output
+        if not output:
+            return
+
+        outlines = output.splitlines()
+        for line in outlines:
+            try:
+                print(line)
+            except TypeError:
+                line = line.decode('utf-8')
+                pritn(line)
+
+    def printwarn(self, output):
+        # Check output for warning or error
+        if not output:
+            return 0
+
+        warnrex = re.compile('.*warning', re.IGNORECASE)
+        errrex = re.compile('.*error', re.IGNORECASE)
+
+        errors = 0
+        outlines = output.splitlines()
+        for line in outlines:
+            try:
+                wmatch = warnrex.match(line)
+            except TypeError:
+                line = line.decode('utf-8')
+                wmatch = warnrex.match(line)
+            ematch = errrex.match(line)
+            if ematch:
+                errors += 1
+            if ematch or wmatch:
+                print(line)
+        return errors
+
+    def choose_tech(self):
+        try:
+            project_path = self.rootpath
+            initdirname = self.rootpath + '/tech',
+        except:
+            print('Must choose a project first.')
+            return
+        techname = filedialog.askopenfilename(multiple=False,
+			initialdir = initdirname,
+			filetypes = (("Tcl script", "*.tcl"),("All Files","*.*")),
+			title = "Choose a netgen technology setup script.")
+        if techname != '':
+            print("Selected technology setup script " + techname)
+            techbase = os.path.split(techname)[1]
+            self.tech = os.path.splitext(techbase)[0]
+            self.lvs_setup = techname
+            self.toppane.title2_frame.layout_select.config(text = self.tech)
+
+    def choose_layout(self):
+        try:
+            project_path = self.rootpath
+            initdirname = self.rootpath + '/layout',
+        except:
+            print('Must choose a project first.')
+            return
+        cellname = filedialog.askopenfilename(multiple=False,
+			initialdir = initdirname,
+			filetypes = (("Magic layout", "*.mag"),("All Files","*.*")),
+			title = "Choose a layout cell to compare.")
+        if cellname != '':
+            print("Selected compare cell " + cellname)
+            cellbase = os.path.split(cellname)[1]
+            self.layout = os.path.splitext(cellbase)[0]
+            self.toppane.title2_frame.layout_select.config(text = self.layout)
+
+    def choose_netlist(self):
+        try:
+            project_path = self.rootpath
+            initdirname = self.rootpath + '/netlist/' + self.project + '.spi'
+        except:
+            print('Must choose a project first.')
+            return
+        cellname = filedialog.askopenfilename(multiple=False,
+			initialdir = initdirname,
+			filetypes = (("Spice netlist", "*.spi"),("Verilog netlist", "*.v")),
+			title = "Choose a netlist to compare.")
+        if cellname != '':
+            print("Selected compare cell " + cellname)
+            cellbase = os.path.split(cellname)[1]
+            self.schematic = os.path.splitext(cellbase)[0]
+            self.toppane.title2_frame.schem_select.config(text = self.schematic)
+            fileext = os.path.splitext(cellbase)[1]
+            if fileext == '.v':
+                self.toppane.title2_frame.schem_label.config(text = 'Verilog netlist:')
+            elif fileext == '.sp' or fileext == '.spi' or fileext == '.spice' or fileext == '.spc' or fileext == '.ckt':
+                self.toppane.title2_frame.schem_label.config(text = 'SPICE netlist:')
+            elif fileext == '.cdl':
+                self.toppane.title2_frame.schem_label.config(text = 'CDL netlist:')
+            else:
+                self.toppane.title2_frame.schem_label.config(text = 'Unknown netlist:')
+
+    def choose_project(self):
+        project = filedialog.askdirectory(initialdir = os.getcwd(),
+			title = "Find a project.")
+        if project != '':
+            print("Selected project " + str(project))
+            result = self.set_project(project)
+
+    def set_project(self, rootpath, project_name=None):
+
+        # Check if rootpath is valid.  For LVS, there should be subdirectories
+        # "layout/" and "netlist/" or "verilog/".
+
+        haslay = os.path.isdir(rootpath + '/layout')
+        hasvlog = os.path.isdir(rootpath + '/verilog')
+        hasnet = os.path.isdir(rootpath + '/netlist')
+        if not haslay or not (hasvlog or hasnet):
+            if not haslay:
+                print("Project path has no layout (/layout) subdirectory.")
+            if not (hasvlog or hasnet):
+                print("Project path has no verilog (/verilog), or netlist (/netlist) subdirectory.")
+            # Continue anyway;  assume that netlists will be selected manually
+
+        if self.logfile:
+            self.logfile.close()
+            self.logfile = None
+
+        if not project_name:
+            project = os.path.split(rootpath)[1]
+        else:
+            project = project_name
+
+        if self.project != project:
+
+            self.rootpath = rootpath
+            self.project = project
+
+            # Clear out old project data
+            self.toppane.lvsreport.repopulate([], [])
+
+            # Close any open logfile.
+            if self.logfile:
+                self.logfile.close()
+                self.logfile = None
+
+            # Put new log file called 'lvs.log' in the mag/ subdirectory
+            self.logfile = open(rootpath + '/layout/lvs.log', 'w')
+            # Print some initial information to the logfile.
+            self.logprint('Starting new log file ' + datetime.datetime.now().strftime('%c'),
+				doflush=True)
+
+            # Update project button
+            self.toppane.title2_frame.project_select.config(text = self.project)
+            self.toppane.title2_frame.path_label.config(text = self.rootpath)
+            # Cell name is the same as project name initially
+            self.layout = self.project
+            self.schematic = self.project
+            self.toppane.title2_frame.layout_select.config(text = self.layout)
+            self.toppane.title2_frame.schem_select.config(text = self.schematic)
+
+            # Update schematic button
+            if os.path.isfile(rootpath + '/verilog/' + self.schematic + '.v'):
+                self.toppane.title2_frame.schem_label.config(text = 'Verilog netlist:')
+            else:
+                self.toppane.title2_frame.schem_label.config(text = 'Schematic netlist:')
+
+            # If there is a comparison file that post-dates both netlists, load it.
+            self.check_lvs()
+        return True
+
+    def check_layout_out_of_date(self, spipath, layoutpath):
+        # Check if a netlist (spipath) is out-of-date relative to the layouts
+        # (layoutpath).  Need to read the netlist and check all of the subcells.
+        need_capture = False
+        if not os.path.isfile(spipath):
+            return True
+        if os.path.isfile(layoutpath):
+            spi_statbuf = os.stat(spipath)
+            lay_statbuf = os.stat(layoutpath)
+            if spi_statbuf.st_mtime < lay_statbuf.st_mtime:
+                # netlist exists but is out-of-date
+                need_capture = True
+            else:
+                # only found that the top-level-layout is older than the
+                # netlist.  Now need to read the netlist, find all subcircuits,
+                # and check those dates, too.
+                layoutdir = os.path.split(layoutpath)[0]
+                subrex = re.compile('^[^\*]*[ \t]*.subckt[ \t]+([^ \t]+).*$', re.IGNORECASE)
+                with open(spipath, 'r') as ifile:
+                    duttext = ifile.read()
+ 
+                dutlines = duttext.replace('\n+', ' ').splitlines()
+                for line in dutlines:
+                    lmatch = subrex.match(line)
+                    if lmatch:
+                        subname = lmatch.group(1)
+                        sublayout = layoutdir + '/' + subname + '.mag'
+                        # subcircuits that cannot be found in the current directory are
+                        # assumed to be library components and therefore never out-of-date.
+                        if os.path.exists(sublayout):
+                            sub_statbuf = os.stat(sublayout)
+                            if spi_statbuf.st_mtime < lay_statbuf.st_mtime:
+                                # netlist exists but is out-of-date
+                                need_capture = True
+                                break
+        return need_capture
+
+    def check_schematic_out_of_date(self, spipath, schempath):
+        # Check if a netlist (spipath) is out-of-date relative to the schematics
+        # (schempath).  Need to read the netlist and check all of the subcells.
+        need_capture = False
+        if not os.path.isfile(spipath):
+            return True
+        if os.path.isfile(schempath):
+            spi_statbuf = os.stat(spipath)
+            sch_statbuf = os.stat(schempath)
+            if spi_statbuf.st_mtime < sch_statbuf.st_mtime:
+                # netlist exists but is out-of-date
+                need_capture = True
+            else:
+                # only found that the top-level-schematic is older than the
+                # netlist.  Now need to read the netlist, find all subcircuits,
+                # and check those dates, too.
+                schemdir = os.path.split(schempath)[0]
+                subrex = re.compile('^[^\*]*[ \t]*.subckt[ \t]+([^ \t]+).*$', re.IGNORECASE)
+                with open(spipath, 'r') as ifile:
+                    duttext = ifile.read()
+ 
+                dutlines = duttext.replace('\n+', ' ').splitlines()
+                for line in dutlines:
+                    lmatch = subrex.match(line)
+                    if lmatch:
+                        subname = lmatch.group(1)
+                        # NOTE: Electric uses library:cell internally to track libraries,
+                        # and maps the ":" to "__" in the netlist.  Not entirely certain that
+                        # the double-underscore uniquely identifies the library:cell. . .
+                        librex = re.compile('(.*)__(.*)', re.IGNORECASE)
+                        lmatch = librex.match(subname)
+                        if lmatch:
+                            elecpath = os.path.split(os.path.split(schempath)[0])[0]
+                            libname = lmatch.group(1)
+                            subschem = elecpath + '/' + libname + '.delib/' + lmatch.group(2) + '.sch'
+                        else:
+                            libname = {}
+                            subschem = schemdir + '/' + subname + '.sch'
+                        # subcircuits that cannot be found in the current directory are
+                        # assumed to be library components and therefore never out-of-date.
+                        if os.path.exists(subschem):
+                            sub_statbuf = os.stat(subschem)
+                            if spi_statbuf.st_mtime < sub_statbuf.st_mtime:
+                                # netlist exists but is out-of-date
+                                need_capture = True
+                                break
+                        # mapping of characters to what's allowed in SPICE makes finding
+                        # the associated schematic file a bit difficult.  Requires wild-card
+                        # searching.
+                        elif libname:
+                            restr = lmatch.group(2) + '.sch'
+                            restr = restr.replace('.', '\.')
+                            restr = restr.replace('_', '.')
+                            schrex = re.compile(restr, re.IGNORECASE)
+                            libpath = elecpath + '/' + libname + '.delib'
+                            if os.path.exists(libpath):
+                                liblist = os.listdir(libpath)
+                                for file in liblist:
+                                    lmatch = schrex.match(file)
+                                    if lmatch:
+                                        subschem = libpath + '/' + file
+                                        sub_statbuf = os.stat(subschem)
+                                        if spi_statbuf.st_mtime < sch_statbuf.st_mtime:
+                                            # netlist exists but is out-of-date
+                                            need_capture = True
+                                        break
+        return need_capture
+
+    def check_lvs(self):
+        # If both netlists exist, and comp.json is more recent than both, then
+        # load LVS results from comp.json
+        project_path = self.rootpath
+        project_name = self.project
+        layout_path = project_path + '/layout/' + project_name + '.spc'
+        net_path = project_path + '/netlist/' + project_name + '.spi'
+        comp_path = project_path + '/layout/comp.json'
+
+        if os.path.exists(layout_path) and os.path.exists(net_path) and os.path.exists(comp_path):
+            magtime = os.stat(layout_path).st_mtime
+            schemtime = os.stat(net_path).st_mtime
+            comptime = os.stat(comp_path).st_mtime
+            if comptime > magtime and comptime > schemtime:
+                print("Loading LVS results from file.")
+                self.generate(comp_path)
+
+    def generate_layout_netlist(self, layout_path, layout_src, project_path):
+        # Does layout netlist exist and is it current?
+        if self.check_layout_out_of_date(layout_path, layout_src):
+            print('Generating layout netlist.')
+            self.update_idletasks()
+            mproc = subprocess.Popen(['magic', '-dnull', '-noconsole',
+			self.layout], stdin = subprocess.PIPE, stdout = subprocess.PIPE,
+			stderr = subprocess.PIPE, cwd = project_path + '/layout',
+			universal_newlines = True)
+            mproc.stdin.write("select top cell\n")
+            mproc.stdin.write("expand\n")
+            mproc.stdin.write("extract all\n")
+            mproc.stdin.write("ext2spice hierarchy on\n")
+            mproc.stdin.write("ext2spice format ngspice\n")
+            mproc.stdin.write("ext2spice scale off\n")
+            mproc.stdin.write("ext2spice renumber off\n")
+            mproc.stdin.write("ext2spice subcircuit top auto\n")
+            mproc.stdin.write("ext2spice cthresh infinite\n")
+            mproc.stdin.write("ext2spice rthresh infinite\n")
+            mproc.stdin.write("ext2spice blackbox on\n")
+            mproc.stdin.write("ext2spice -o " + self.layout + ".spi\n")
+            mproc.stdin.write("quit -noprompt\n")
+            magicout = mproc.communicate()[0]
+            self.printwarn(magicout)
+            if mproc.returncode != 0:
+                print('Failure to generate new layout netlist.')
+                return False
+
+            # Move .spi netlist to project_dir/netlist/lvs/
+            shutil.move(project_path + '/layout/' + self.layout + '.spi', layout_path)
+            # Remove extraction files
+            for file in os.listdir(project_path + '/layout'):
+                if os.path.splitext(file)[1] == '.ext':
+                    os.remove(project_path + '/layout/' + file)
+        else:
+            print('Layout netlist is up-to-date, not regenerating.')
+        return True
+
+    def run_lvs(self, value):
+        # "value" is ignored (?)
+
+        # Check if netlists exist and are current;  otherwise create them.
+        # Then run LVS.
+
+        project_path = self.rootpath
+        project_name = self.project
+        comp_path = project_path + '/layout/comp.json'
+        has_vlog = False
+        vlog_path = project_path + '/verilog/' + project_name + '.v'
+
+        layout_path = project_path + '/netlist/lvs/' + self.layout + '.spi'
+        net_path = project_path + '/netlist/schem/' + self.schematic + '.spi'
+        layout_src = project_path + '/layout/' + self.layout + '.mag'
+
+        # Does the setup file exist (this is optional)?
+        if self.lvs_setup != '' and not os.path.isfile('setup.tcl'):
+            print('No technology setup file selected.')
+
+        # Does schematic netlist exist?
+        if not os.path.isfile(vlog_path) and not os.path.isfile(net_path):
+            print('Error:  No schematic netlist or verilog netlist.')
+            return
+
+        # Does LVS netlist subdirectory exist?
+        if not os.path.exists(project_path + '/netlist/lvs'):
+            os.makedirs(project_path + '/netlist/lvs')
+
+        # Does layout netlist exist and is it current?
+        if not self.generate_layout_netlist(layout_path, layout_src, project_path):
+            return False
+
+        # Final check
+        if not os.path.isfile(layout_path):
+            print('Error:  No netlist generated from magic.')
+            return
+
+        else:
+            # Read in netlist and convert commas from [X,Y] arrays to vertical bars
+            # as something that can be converted back as necessary.  ngspice treats
+            # commas as special characters for some reason.
+            with open(layout_path) as ifile:
+                spitext = ifile.read()
+
+            # spilines = spitext.replace(',', '|')
+            # with open(layout_path, 'w') as ofile:
+            #     ofile.write(spilines)
+
+        # Check the netlist to see if the cell to match is a subcircuit.  If
+        # not, then assume it is the top level.
+
+        is_subckt = False
+        subrex = re.compile('^[^\*]*[ \t]*.subckt[ \t]+([^ \t]+).*$', re.IGNORECASE)
+        dutlines = spitext.replace('\n+', ' ').splitlines()
+        for line in dutlines:
+            lmatch = subrex.match(line)
+            if lmatch:
+                subname = lmatch.group(1)
+                if subname == self.layout:
+                    is_subckt = True
+                    break
+
+        if is_subckt:
+            layout_arg = layout_path + ' ' + self.layout
+            layout_text = '"' + layout_arg + '"'
+        else:
+            layout_arg = layout_path
+            layout_text = layout_arg
+
+        if has_vlog:
+            schem_arg = vlog_path + ' ' + self.schematic
+        else:
+            schem_arg = net_path + ' ' + self.schematic
+        schem_text = '"' + schem_arg + '"'
+
+        # Remove any previous comparison output file
+        comp_out_path = os.path.splitext(comp_path)[0] + '.out'
+        if os.path.exists(comp_out_path):
+            os.remove(comp_out_path)
+
+        # Run netgen as subprocess
+        print('Running: netgen -batch lvs ' + layout_text + 
+		' ' + schem_text + ' ' + self.lvs_setup + ' ' + comp_out_path +
+		' -json -blackbox')
+        # Note: Because arguments to subprocess are list items, the {filename cell}
+        # pair does *not* have to be quoted or braced.  Doing so causes a parse
+        # error.
+        self.lvsproc = subprocess.Popen(['netgen', '-batch', 'lvs',
+		layout_arg, schem_arg,
+		self.lvs_setup, comp_out_path, '-json', '-blackbox'],
+		cwd=project_path + '/layout',
+		stdout=subprocess.PIPE, stderr=subprocess.PIPE, bufsize=0)
+        # This is largely unnecessary as netgen usually runs to completion very quickly.
+        self.watchclock(comp_path)
+
+    def watchclock(self, filename):
+        if self.lvsproc == None:
+            return
+
+        lvs_status = self.lvsproc.poll()
+        sresult = select.select([self.lvsproc.stdout, self.lvsproc.stderr], [], [], 0)[0]
+        if self.lvsproc.stdout in sresult:
+            outstring = self.lvsproc.stdout.readline().decode().strip()
+            self.logprint(outstring, doflush=True)
+            print(outstring)
+        elif self.lvsproc.stderr in sresult:
+            errstring = self.lvsproc.stderr.readline().decode().strip()
+            self.logprint(errstring, doflush = True)
+            print(errstring, file=sys.stderr)
+
+        if lvs_status != None:
+            print("netgen LVS exited with status " + str(lvs_status))
+            self.lvsproc = None
+            if lvs_status != 0:
+                print('Errors encountered in LVS.')
+                self.logprint('Errors in LVS, lvs status = ' + str(lvs_status), doflush=True)
+            # Done;  now read comp.json and fill the treeview listbox.
+            self.generate(filename)
+        else:
+            self.after(500, lambda: self.watchclock(filename))
+
+    # Generate display from "comp.out" file (json file now preferred)
+
+    def generate_orig(self, lvspath):
+        lefttext = []
+        righttext = []
+        print("Reading LVS output file " + lvspath)
+        if os.path.exists(lvspath):
+            with open(lvspath, 'r') as ifile:
+                lvslines = ifile.read().splitlines()
+            for line in lvslines:
+                if '|' in line:
+                    # parts = line.split('|')
+                    # lefttext.append(parts[0])
+                    # righttext.append(parts[1])
+                    lefttext.append(line[0:42].strip())
+                    righttext.append(line[44:].strip())
+                else:
+                    lefttext.append(line)
+                    righttext.append('')
+            # Populate treeview with text
+            self.toppane.lvsreport.repopulate(lefttext, righttext)
+ 
+        else:
+            print("Error:  No output file generated from LVS.")
+
+    # Generate output from LVS report JSON file comp.json
+
+    def generate(self, lvspath):
+        lefttext = []
+        righttext = []
+        print("Reading LVS output file " + lvspath)
+        if os.path.exists(lvspath):
+            with open(lvspath, 'r') as ifile:
+                self.lvsdata = json.load(ifile)
+
+            # Populate treeview with text
+            self.toppane.lvsreport.json_repopulate(self.lvsdata)
+ 
+        else:
+            print("Error:  No output file generated from LVS.")
+
+    def findrecord(self, value):
+        print("Unimplemented function")
+
+    def findrecord_test(self, value):
+        # Check if socket is defined;  if not, attempt to open one
+        if not self.msock:
+            try:
+                self.msock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            except:
+                 print("No response from layout tool.")
+
+            if self.msock:
+                self.msock.connect(("0.0.0.0", 12946))
+                self.msock.setblocking(False)
+        if self.msock:
+            # Pull name of net or device from 'value'
+            # This is a test:
+            self.msock.sendall(b'box 0 0 100 100\r\n')
+
+if __name__ == '__main__':
+    options = []
+    arguments = []
+    for item in sys.argv[1:]:
+        if item.find('-', 0) == 0:
+            options.append(item)
+        else:
+            arguments.append(item)
+
+    root = tkinter.Tk()
+    app = LVSManager(root)
+    if arguments:
+        if len(arguments) >= 2:
+            app.set_project(arguments[0], project_name=arguments[1])
+        else:
+            app.set_project(arguments[0])
+
+    root.mainloop()

python/lvs_manager.py.in

@@ -0,0 +1,819 @@
+#!/bin/env python3
+#
+#--------------------------------------------------------
+# LVS Manager GUI.
+#
+# This is a Python tkinter script that handles the
+# process of running LVS and interpreting results.
+#
+#--------------------------------------------------------
+# Written by Tim Edwards
+# efabless, inc.
+# Version 1.  November 30, 2016
+# Version 2.  March 6, 2017.  Reads JSON format output
+# Version 3.  April 25, 2018. Handles layout vs. verilog
+#--------------------------------------------------------
+
+import io
+import os
+import re
+import sys
+import json
+import shutil
+import signal
+import socket
+import select
+import datetime
+import contextlib
+import subprocess
+
+import tkinter
+from tkinter import ttk
+from tkinter import filedialog
+
+import tksimpledialog
+import tooltip
+from consoletext import ConsoleText
+from helpwindow import HelpWindow
+from treeviewsplit import TreeViewSplit
+
+# User preferences file (if it exists)
+prefsfile = '~/.profile/prefs.json'
+
+netgen_script_dir = 'SUBST_SCRIPT_DIR'
+
+#------------------------------------------------------
+# Simple dialog for confirming quit
+#------------------------------------------------------
+
+class ConfirmDialog(tksimpledialog.Dialog):
+    def body(self, master, warning, seed):
+        if warning:
+            ttk.Label(master, text=warning, wraplength=500).grid(row = 0, columnspan = 2, sticky = 'wns')
+        return self
+
+    def apply(self):
+        return 'okay'
+
+#------------------------------------------------------
+# Main class for this application
+#------------------------------------------------------
+
+class LVSManager(ttk.Frame):
+    """LVS Manager GUI."""
+
+    def __init__(self, parent, *args, **kwargs):
+        ttk.Frame.__init__(self, parent, *args, **kwargs)
+        self.root = parent
+        self.init_gui()
+        parent.protocol("WM_DELETE_WINDOW", self.on_quit)
+
+    def on_quit(self):
+        """Exits program."""
+        if self.msock:
+            self.msock.close()
+        quit()
+
+    def init_gui(self):
+        """Builds GUI."""
+        global prefsfile
+
+        message = []
+        fontsize = 11
+
+        # Read user preferences file, get default font size from it.
+        prefspath = os.path.expanduser(prefsfile)
+        if os.path.exists(prefspath):
+            with open(prefspath, 'r') as f:
+                self.prefs = json.load(f)
+            if 'fontsize' in self.prefs:
+                fontsize = self.prefs['fontsize']
+        else:
+            self.prefs = {}
+
+        s = ttk.Style()
+
+        available_themes = s.theme_names()
+        s.theme_use(available_themes[0])
+
+        s.configure('bg.TFrame', background='gray40')
+        s.configure('italic.TLabel', font=('Helvetica', fontsize, 'italic'))
+        s.configure('title.TLabel', font=('Helvetica', fontsize, 'bold italic'),
+                        foreground = 'brown', anchor = 'center')
+        s.configure('normal.TLabel', font=('Helvetica', fontsize))
+        s.configure('red.TLabel', font=('Helvetica', fontsize), foreground = 'red')
+        s.configure('green.TLabel', font=('Helvetica', fontsize), foreground = 'green3')
+        s.configure('blue.TLabel', font=('Helvetica', fontsize), foreground = 'blue')
+        s.configure('normal.TButton', font=('Helvetica', fontsize),
+                        border = 3, relief = 'raised')
+        s.configure('red.TButton', font=('Helvetica', fontsize), foreground = 'red',
+                        border = 3, relief = 'raised')
+        s.configure('green.TButton', font=('Helvetica', fontsize), foreground = 'green3',
+                        border = 3, relief = 'raised')
+        s.configure('blue.TButton', font=('Helvetica', fontsize), foreground = 'blue',
+                        border = 3, relief = 'raised')
+        s.configure('redtitle.TButton', font=('Helvetica', fontsize, 'bold italic'),
+                        foreground = 'red', border = 3, relief = 'raised')
+        s.configure('bluetitle.TButton', font=('Helvetica', fontsize, 'bold italic'),
+                        foreground = 'blue', border = 3, relief = 'raised')
+
+        # These values to be overridden from arguments
+        self.rootpath = None
+        self.project = None
+        self.logfile = None
+        self.msock = None
+        self.help = None
+
+        # Create the help window
+        if os.path.exists(netgen_script_dir + '/netgen_help.txt'):
+            self.help = HelpWindow(self, fontsize = fontsize)
+            with io.StringIO() as buf, contextlib.redirect_stdout(buf):
+                self.help.add_pages_from_file('lvs_help.txt')
+                message = buf.getvalue()
+
+            # Set the help display to the first page
+            self.help.page(0)
+
+        # Variables used by option menus and other stuff
+        self.project = "(no selection)"
+        self.layout = "(default)"
+        self.schematic = "(default)"
+        self.tech = "(none)"
+        self.lvs_setup = ''
+        self.lvsdata = {}
+
+        # Root window title
+        self.root.title('LVS Manager')
+        self.root.option_add('*tearOff', 'FALSE')
+        self.pack(side = 'top', fill = 'both', expand = 'true')
+
+        pane = tkinter.PanedWindow(self, orient = 'vertical', sashrelief='groove', sashwidth=6)
+        pane.pack(side = 'top', fill = 'both', expand = 'true')
+        self.toppane = ttk.Frame(pane)
+        self.botpane = ttk.Frame(pane)
+
+        # Get username
+        if 'username' in self.prefs:
+            username = self.prefs['username']
+        else:
+            username = os.environ['USER']
+
+        # Label with the user
+        self.toppane.title_frame = ttk.Frame(self.toppane)
+        self.toppane.title_frame.pack(side = 'top', fill = 'x')
+
+        self.toppane.title_frame.title = ttk.Label(self.toppane.title_frame, text='User:', style = 'red.TLabel')
+        self.toppane.title_frame.user = ttk.Label(self.toppane.title_frame, text=username, style = 'blue.TLabel')
+
+        self.toppane.title_frame.title.grid(column=0, row=0, ipadx = 5)
+        self.toppane.title_frame.user.grid(column=1, row=0, ipadx = 5)
+
+        self.toppane.title2_frame = ttk.Frame(self.toppane)
+        self.toppane.title2_frame.pack(side = 'top', fill = 'x')
+        self.toppane.title2_frame.project_label = ttk.Label(self.toppane.title2_frame, text="Project:",
+                style = 'title.TLabel')
+        self.toppane.title2_frame.project_label.grid(column=0, row=0, ipadx = 5)
+
+        # New project select button
+        self.toppane.title2_frame.project_select = ttk.Button(self.toppane.title2_frame,
+                text=self.project, style='normal.TButton', command=self.choose_project)
+        self.toppane.title2_frame.project_select.grid(column=1, row=0, ipadx = 5)
+
+        tooltip.ToolTip(self.toppane.title2_frame.project_select,
+                        text = "Select new project")
+
+        # Show path to project
+        self.toppane.title2_frame.path_label = ttk.Label(self.toppane.title2_frame, text=self.project,
+                style = 'normal.TLabel')
+        self.toppane.title2_frame.path_label.grid(column=2, row=0, ipadx = 5, padx = 10)
+
+        # Show top-level layout cellname with select button.  Initial cell name is the top-level cell.
+        self.toppane.title2_frame.tech_label = ttk.Label(self.toppane.title2_frame, text="Technology setup:",
+                style = 'title.TLabel')
+
+        self.toppane.title2_frame.tech_label.grid(column=3, row=0, ipadx = 5)
+        self.toppane.title2_frame.tech_select = ttk.Button(self.toppane.title2_frame,
+                text=self.tech, style='normal.TButton', command=self.choose_tech)
+        self.toppane.title2_frame.tech_select.grid(column=4, row=0, ipadx = 3, padx = 3)
+
+        self.toppane.title2_frame.layout_label = ttk.Label(self.toppane.title2_frame, text="Layout:",
+                style = 'title.TLabel')
+        self.toppane.title2_frame.layout_label.grid(column=0, row=1, ipadx = 5)
+        self.toppane.title2_frame.layout_select = ttk.Button(self.toppane.title2_frame,
+                text=self.layout, style='normal.TButton', command=self.choose_layout)
+        self.toppane.title2_frame.layout_select.grid(column=1, row=1, ipadx = 3, padx = 3)
+
+        # Show top-level schematic cellname with select button.  Initial cell name is the top-level cell.
+        self.toppane.title2_frame.schem_label = ttk.Label(self.toppane.title2_frame, text="Schematic:",
+                style = 'title.TLabel')
+        self.toppane.title2_frame.schem_label.grid(column=3, row=1, ipadx = 5)
+        self.toppane.title2_frame.schem_select = ttk.Button(self.toppane.title2_frame,
+                text=self.schematic, style='normal.TButton', command=self.choose_netlist)
+        self.toppane.title2_frame.schem_select.grid(column=4, row=1, ipadx = 3, padx = 3)
+
+        tooltip.ToolTip(self.toppane.title2_frame.project_select,
+                        text = "Select new project")
+        tooltip.ToolTip(self.toppane.title2_frame.layout_select,
+                        text = "Select a layout subcirucit to compare")
+        tooltip.ToolTip(self.toppane.title2_frame.schem_select,
+                        text = "Select a schematic subcirucit to compare")
+
+        #---------------------------------------------
+        ttk.Separator(self.toppane, orient='horizontal').pack(side = 'top', fill = 'x')
+        #---------------------------------------------
+
+        # Create listbox of Circuit1 vs. Circuit2 results
+        height = 10
+        self.toppane.lvsreport = TreeViewSplit(self.toppane, fontsize = fontsize)
+        self.toppane.lvsreport.populate("Layout:", [], "Schematic:", [],
+			[["Run", True, self.run_lvs],
+			# ["Find", True, self.findrecord]
+			], height = height)
+        self.toppane.lvsreport.set_title("Line")
+        self.toppane.lvsreport.pack(side = 'top', fill = 'both', expand = 'true')
+
+        tooltip.ToolTip(self.toppane.lvsreport.get_button(0), text="Run LVS")
+
+        #---------------------------------------------
+        # ttk.Separator(self, orient='horizontal').grid(column=0, row=3, sticky='ew')
+        #---------------------------------------------
+
+        # Add a text window below the project name to capture output.  Redirect
+        # print statements to it.
+
+        self.botpane.console = ttk.Frame(self.botpane)
+        self.botpane.console.pack(side = 'top', fill = 'both', expand = 'true')
+
+        self.text_box = ConsoleText(self.botpane.console, wrap='word', height = 4)
+        self.text_box.pack(side='left', fill='both', expand='true')
+        console_scrollbar = ttk.Scrollbar(self.botpane.console)
+        console_scrollbar.pack(side='right', fill='y')
+        # attach console to scrollbar
+        self.text_box.config(yscrollcommand = console_scrollbar.set)
+        console_scrollbar.config(command = self.text_box.yview)
+
+        # Add button bar at the bottom of the window
+        self.botpane.bbar = ttk.Frame(self.botpane)
+        self.botpane.bbar.pack(side = 'top', fill = 'x')
+
+        # Define the "quit" button and action
+        self.botpane.bbar.quit_button = ttk.Button(self.botpane.bbar, text='Quit', command=self.on_quit,
+                style = 'normal.TButton')
+        self.botpane.bbar.quit_button.grid(column=0, row=0, padx = 5)
+
+        # Define help button
+        if self.help:
+            self.botpane.bbar.help_button = ttk.Button(self.botpane.bbar, text='Help',
+		command=self.help.open, style = 'normal.TButton')
+            self.botpane.bbar.help_button.grid(column = 2, row = 0, padx = 5)
+            tooltip.ToolTip(self.botpane.bbar.help_button, text = "Show help window")
+
+        # Add the panes once the internal geometry is known.
+        pane.add(self.toppane)
+        pane.add(self.botpane)
+        pane.paneconfig(self.toppane, stretch='first')
+
+        # Redirect stdout and stderr to the console as the last thing to do. . .
+        # Otherwise errors in the GUI get sucked into the void.
+
+        self.stdout = sys.stdout
+        self.stderr = sys.stderr
+        sys.stdout = ConsoleText.StdoutRedirector(self.text_box)
+        sys.stderr = ConsoleText.StderrRedirector(self.text_box)
+
+        if message:
+            print(message)
+
+    def logprint(self, message, doflush=False):
+        if self.logfile:
+            self.logfile.buffer.write(message.encode('utf-8'))
+            self.logfile.buffer.write('\n'.encode('utf-8'))
+            if doflush:
+                self.logfile.flush()
+
+    def printout(self, output):
+        # Generate output
+        if not output:
+            return
+
+        outlines = output.splitlines()
+        for line in outlines:
+            try:
+                print(line)
+            except TypeError:
+                line = line.decode('utf-8')
+                pritn(line)
+
+    def printwarn(self, output):
+        # Check output for warning or error
+        if not output:
+            return 0
+
+        warnrex = re.compile('.*warning', re.IGNORECASE)
+        errrex = re.compile('.*error', re.IGNORECASE)
+
+        errors = 0
+        outlines = output.splitlines()
+        for line in outlines:
+            try:
+                wmatch = warnrex.match(line)
+            except TypeError:
+                line = line.decode('utf-8')
+                wmatch = warnrex.match(line)
+            ematch = errrex.match(line)
+            if ematch:
+                errors += 1
+            if ematch or wmatch:
+                print(line)
+        return errors
+
+    def choose_tech(self):
+        try:
+            project_path = self.rootpath
+            initdirname = self.rootpath + '/tech',
+        except:
+            print('Must choose a project first.')
+            return
+        techname = filedialog.askopenfilename(multiple=False,
+			initialdir = initdirname,
+			filetypes = (("Tcl script", "*.tcl"),("All Files","*.*")),
+			title = "Choose a netgen technology setup script.")
+        if techname != '':
+            print("Selected technology setup script " + techname)
+            techbase = os.path.split(techname)[1]
+            self.tech = os.path.splitext(techbase)[0]
+            self.lvs_setup = techname
+            self.toppane.title2_frame.layout_select.config(text = self.tech)
+
+    def choose_layout(self):
+        try:
+            project_path = self.rootpath
+            initdirname = self.rootpath + '/layout',
+        except:
+            print('Must choose a project first.')
+            return
+        cellname = filedialog.askopenfilename(multiple=False,
+			initialdir = initdirname,
+			filetypes = (("Magic layout", "*.mag"),("All Files","*.*")),
+			title = "Choose a layout cell to compare.")
+        if cellname != '':
+            print("Selected compare cell " + cellname)
+            cellbase = os.path.split(cellname)[1]
+            self.layout = os.path.splitext(cellbase)[0]
+            self.toppane.title2_frame.layout_select.config(text = self.layout)
+
+    def choose_netlist(self):
+        try:
+            project_path = self.rootpath
+            initdirname = self.rootpath + '/netlist/' + self.project + '.spi'
+        except:
+            print('Must choose a project first.')
+            return
+        cellname = filedialog.askopenfilename(multiple=False,
+			initialdir = initdirname,
+			filetypes = (("Spice netlist", "*.spi"),("Verilog netlist", "*.v")),
+			title = "Choose a netlist to compare.")
+        if cellname != '':
+            print("Selected compare cell " + cellname)
+            cellbase = os.path.split(cellname)[1]
+            self.schematic = os.path.splitext(cellbase)[0]
+            self.toppane.title2_frame.schem_select.config(text = self.schematic)
+            fileext = os.path.splitext(cellbase)[1]
+            if fileext == '.v':
+                self.toppane.title2_frame.schem_label.config(text = 'Verilog netlist:')
+            elif fileext == '.sp' or fileext == '.spi' or fileext == '.spice' or fileext == '.spc' or fileext == '.ckt':
+                self.toppane.title2_frame.schem_label.config(text = 'SPICE netlist:')
+            elif fileext == '.cdl':
+                self.toppane.title2_frame.schem_label.config(text = 'CDL netlist:')
+            else:
+                self.toppane.title2_frame.schem_label.config(text = 'Unknown netlist:')
+
+    def choose_project(self):
+        project = filedialog.askdirectory(initialdir = os.getcwd(),
+			title = "Find a project.")
+        if project != '':
+            print("Selected project " + str(project))
+            result = self.set_project(project)
+
+    def set_project(self, rootpath, project_name=None):
+
+        # Check if rootpath is valid.  For LVS, there should be subdirectories
+        # "layout/" and "netlist/" or "verilog/".
+
+        haslay = os.path.isdir(rootpath + '/layout')
+        hasvlog = os.path.isdir(rootpath + '/verilog')
+        hasnet = os.path.isdir(rootpath + '/netlist')
+        if not haslay or not (hasvlog or hasnet):
+            if not haslay:
+                print("Project path has no layout (/layout) subdirectory.")
+            if not (hasvlog or hasnet):
+                print("Project path has no verilog (/verilog), or netlist (/netlist) subdirectory.")
+            # Continue anyway;  assume that netlists will be selected manually
+
+        if self.logfile:
+            self.logfile.close()
+            self.logfile = None
+
+        if not project_name:
+            project = os.path.split(rootpath)[1]
+        else:
+            project = project_name
+
+        if self.project != project:
+
+            self.rootpath = rootpath
+            self.project = project
+
+            # Clear out old project data
+            self.toppane.lvsreport.repopulate([], [])
+
+            # Close any open logfile.
+            if self.logfile:
+                self.logfile.close()
+                self.logfile = None
+
+            # Put new log file called 'lvs.log' in the mag/ subdirectory
+            self.logfile = open(rootpath + '/layout/lvs.log', 'w')
+            # Print some initial information to the logfile.
+            self.logprint('Starting new log file ' + datetime.datetime.now().strftime('%c'),
+				doflush=True)
+
+            # Update project button
+            self.toppane.title2_frame.project_select.config(text = self.project)
+            self.toppane.title2_frame.path_label.config(text = self.rootpath)
+            # Cell name is the same as project name initially
+            self.layout = self.project
+            self.schematic = self.project
+            self.toppane.title2_frame.layout_select.config(text = self.layout)
+            self.toppane.title2_frame.schem_select.config(text = self.schematic)
+
+            # Update schematic button
+            if os.path.isfile(rootpath + '/verilog/' + self.schematic + '.v'):
+                self.toppane.title2_frame.schem_label.config(text = 'Verilog netlist:')
+            else:
+                self.toppane.title2_frame.schem_label.config(text = 'Schematic netlist:')
+
+            # If there is a comparison file that post-dates both netlists, load it.
+            self.check_lvs()
+        return True
+
+    def check_layout_out_of_date(self, spipath, layoutpath):
+        # Check if a netlist (spipath) is out-of-date relative to the layouts
+        # (layoutpath).  Need to read the netlist and check all of the subcells.
+        need_capture = False
+        if not os.path.isfile(spipath):
+            return True
+        if os.path.isfile(layoutpath):
+            spi_statbuf = os.stat(spipath)
+            lay_statbuf = os.stat(layoutpath)
+            if spi_statbuf.st_mtime < lay_statbuf.st_mtime:
+                # netlist exists but is out-of-date
+                need_capture = True
+            else:
+                # only found that the top-level-layout is older than the
+                # netlist.  Now need to read the netlist, find all subcircuits,
+                # and check those dates, too.
+                layoutdir = os.path.split(layoutpath)[0]
+                subrex = re.compile('^[^\*]*[ \t]*.subckt[ \t]+([^ \t]+).*$', re.IGNORECASE)
+                with open(spipath, 'r') as ifile:
+                    duttext = ifile.read()
+ 
+                dutlines = duttext.replace('\n+', ' ').splitlines()
+                for line in dutlines:
+                    lmatch = subrex.match(line)
+                    if lmatch:
+                        subname = lmatch.group(1)
+                        sublayout = layoutdir + '/' + subname + '.mag'
+                        # subcircuits that cannot be found in the current directory are
+                        # assumed to be library components and therefore never out-of-date.
+                        if os.path.exists(sublayout):
+                            sub_statbuf = os.stat(sublayout)
+                            if spi_statbuf.st_mtime < lay_statbuf.st_mtime:
+                                # netlist exists but is out-of-date
+                                need_capture = True
+                                break
+        return need_capture
+
+    def check_schematic_out_of_date(self, spipath, schempath):
+        # Check if a netlist (spipath) is out-of-date relative to the schematics
+        # (schempath).  Need to read the netlist and check all of the subcells.
+        need_capture = False
+        if not os.path.isfile(spipath):
+            return True
+        if os.path.isfile(schempath):
+            spi_statbuf = os.stat(spipath)
+            sch_statbuf = os.stat(schempath)
+            if spi_statbuf.st_mtime < sch_statbuf.st_mtime:
+                # netlist exists but is out-of-date
+                need_capture = True
+            else:
+                # only found that the top-level-schematic is older than the
+                # netlist.  Now need to read the netlist, find all subcircuits,
+                # and check those dates, too.
+                schemdir = os.path.split(schempath)[0]
+                subrex = re.compile('^[^\*]*[ \t]*.subckt[ \t]+([^ \t]+).*$', re.IGNORECASE)
+                with open(spipath, 'r') as ifile:
+                    duttext = ifile.read()
+ 
+                dutlines = duttext.replace('\n+', ' ').splitlines()
+                for line in dutlines:
+                    lmatch = subrex.match(line)
+                    if lmatch:
+                        subname = lmatch.group(1)
+                        # NOTE: Electric uses library:cell internally to track libraries,
+                        # and maps the ":" to "__" in the netlist.  Not entirely certain that
+                        # the double-underscore uniquely identifies the library:cell. . .
+                        librex = re.compile('(.*)__(.*)', re.IGNORECASE)
+                        lmatch = librex.match(subname)
+                        if lmatch:
+                            elecpath = os.path.split(os.path.split(schempath)[0])[0]
+                            libname = lmatch.group(1)
+                            subschem = elecpath + '/' + libname + '.delib/' + lmatch.group(2) + '.sch'
+                        else:
+                            libname = {}
+                            subschem = schemdir + '/' + subname + '.sch'
+                        # subcircuits that cannot be found in the current directory are
+                        # assumed to be library components and therefore never out-of-date.
+                        if os.path.exists(subschem):
+                            sub_statbuf = os.stat(subschem)
+                            if spi_statbuf.st_mtime < sub_statbuf.st_mtime:
+                                # netlist exists but is out-of-date
+                                need_capture = True
+                                break
+                        # mapping of characters to what's allowed in SPICE makes finding
+                        # the associated schematic file a bit difficult.  Requires wild-card
+                        # searching.
+                        elif libname:
+                            restr = lmatch.group(2) + '.sch'
+                            restr = restr.replace('.', '\.')
+                            restr = restr.replace('_', '.')
+                            schrex = re.compile(restr, re.IGNORECASE)
+                            libpath = elecpath + '/' + libname + '.delib'
+                            if os.path.exists(libpath):
+                                liblist = os.listdir(libpath)
+                                for file in liblist:
+                                    lmatch = schrex.match(file)
+                                    if lmatch:
+                                        subschem = libpath + '/' + file
+                                        sub_statbuf = os.stat(subschem)
+                                        if spi_statbuf.st_mtime < sch_statbuf.st_mtime:
+                                            # netlist exists but is out-of-date
+                                            need_capture = True
+                                        break
+        return need_capture
+
+    def check_lvs(self):
+        # If both netlists exist, and comp.json is more recent than both, then
+        # load LVS results from comp.json
+        project_path = self.rootpath
+        project_name = self.project
+        layout_path = project_path + '/layout/' + project_name + '.spc'
+        net_path = project_path + '/netlist/' + project_name + '.spi'
+        comp_path = project_path + '/layout/comp.json'
+
+        if os.path.exists(layout_path) and os.path.exists(net_path) and os.path.exists(comp_path):
+            magtime = os.stat(layout_path).st_mtime
+            schemtime = os.stat(net_path).st_mtime
+            comptime = os.stat(comp_path).st_mtime
+            if comptime > magtime and comptime > schemtime:
+                print("Loading LVS results from file.")
+                self.generate(comp_path)
+
+    def generate_layout_netlist(self, layout_path, layout_src, project_path):
+        # Does layout netlist exist and is it current?
+        if self.check_layout_out_of_date(layout_path, layout_src):
+            print('Generating layout netlist.')
+            self.update_idletasks()
+            mproc = subprocess.Popen(['magic', '-dnull', '-noconsole',
+			self.layout], stdin = subprocess.PIPE, stdout = subprocess.PIPE,
+			stderr = subprocess.PIPE, cwd = project_path + '/layout',
+			universal_newlines = True)
+            mproc.stdin.write("select top cell\n")
+            mproc.stdin.write("expand\n")
+            mproc.stdin.write("extract all\n")
+            mproc.stdin.write("ext2spice hierarchy on\n")
+            mproc.stdin.write("ext2spice format ngspice\n")
+            mproc.stdin.write("ext2spice scale off\n")
+            mproc.stdin.write("ext2spice renumber off\n")
+            mproc.stdin.write("ext2spice subcircuit top auto\n")
+            mproc.stdin.write("ext2spice cthresh infinite\n")
+            mproc.stdin.write("ext2spice rthresh infinite\n")
+            mproc.stdin.write("ext2spice blackbox on\n")
+            mproc.stdin.write("ext2spice -o " + self.layout + ".spi\n")
+            mproc.stdin.write("quit -noprompt\n")
+            magicout = mproc.communicate()[0]
+            self.printwarn(magicout)
+            if mproc.returncode != 0:
+                print('Failure to generate new layout netlist.')
+                return False
+
+            # Move .spi netlist to project_dir/netlist/lvs/
+            shutil.move(project_path + '/layout/' + self.layout + '.spi', layout_path)
+            # Remove extraction files
+            for file in os.listdir(project_path + '/layout'):
+                if os.path.splitext(file)[1] == '.ext':
+                    os.remove(project_path + '/layout/' + file)
+        else:
+            print('Layout netlist is up-to-date, not regenerating.')
+        return True
+
+    def run_lvs(self, value):
+        # "value" is ignored (?)
+
+        # Check if netlists exist and are current;  otherwise create them.
+        # Then run LVS.
+
+        project_path = self.rootpath
+        project_name = self.project
+        comp_path = project_path + '/layout/comp.json'
+        has_vlog = False
+        vlog_path = project_path + '/verilog/' + project_name + '.v'
+
+        layout_path = project_path + '/netlist/lvs/' + self.layout + '.spi'
+        net_path = project_path + '/netlist/schem/' + self.schematic + '.spi'
+        layout_src = project_path + '/layout/' + self.layout + '.mag'
+
+        # Does the setup file exist (this is optional)?
+        if self.lvs_setup != '' and not os.path.isfile('setup.tcl'):
+            print('No technology setup file selected.')
+
+        # Does schematic netlist exist?
+        if not os.path.isfile(vlog_path) and not os.path.isfile(net_path):
+            print('Error:  No schematic netlist or verilog netlist.')
+            return
+
+        # Does LVS netlist subdirectory exist?
+        if not os.path.exists(project_path + '/netlist/lvs'):
+            os.makedirs(project_path + '/netlist/lvs')
+
+        # Does layout netlist exist and is it current?
+        if not self.generate_layout_netlist(layout_path, layout_src, project_path):
+            return False
+
+        # Final check
+        if not os.path.isfile(layout_path):
+            print('Error:  No netlist generated from magic.')
+            return
+
+        else:
+            # Read in netlist and convert commas from [X,Y] arrays to vertical bars
+            # as something that can be converted back as necessary.  ngspice treats
+            # commas as special characters for some reason.
+            with open(layout_path) as ifile:
+                spitext = ifile.read()
+
+            # spilines = spitext.replace(',', '|')
+            # with open(layout_path, 'w') as ofile:
+            #     ofile.write(spilines)
+
+        # Check the netlist to see if the cell to match is a subcircuit.  If
+        # not, then assume it is the top level.
+
+        is_subckt = False
+        subrex = re.compile('^[^\*]*[ \t]*.subckt[ \t]+([^ \t]+).*$', re.IGNORECASE)
+        dutlines = spitext.replace('\n+', ' ').splitlines()
+        for line in dutlines:
+            lmatch = subrex.match(line)
+            if lmatch:
+                subname = lmatch.group(1)
+                if subname == self.layout:
+                    is_subckt = True
+                    break
+
+        if is_subckt:
+            layout_arg = layout_path + ' ' + self.layout
+            layout_text = '"' + layout_arg + '"'
+        else:
+            layout_arg = layout_path
+            layout_text = layout_arg
+
+        if has_vlog:
+            schem_arg = vlog_path + ' ' + self.schematic
+        else:
+            schem_arg = net_path + ' ' + self.schematic
+        schem_text = '"' + schem_arg + '"'
+
+        # Remove any previous comparison output file
+        comp_out_path = os.path.splitext(comp_path)[0] + '.out'
+        if os.path.exists(comp_out_path):
+            os.remove(comp_out_path)
+
+        # Run netgen as subprocess
+        print('Running: netgen -batch lvs ' + layout_text + 
+		' ' + schem_text + ' ' + self.lvs_setup + ' ' + comp_out_path +
+		' -json -blackbox')
+        # Note: Because arguments to subprocess are list items, the {filename cell}
+        # pair does *not* have to be quoted or braced.  Doing so causes a parse
+        # error.
+        self.lvsproc = subprocess.Popen(['netgen', '-batch', 'lvs',
+		layout_arg, schem_arg,
+		self.lvs_setup, comp_out_path, '-json', '-blackbox'],
+		cwd=project_path + '/layout',
+		stdout=subprocess.PIPE, stderr=subprocess.PIPE, bufsize=0)
+        # This is largely unnecessary as netgen usually runs to completion very quickly.
+        self.watchclock(comp_path)
+
+    def watchclock(self, filename):
+        if self.lvsproc == None:
+            return
+
+        lvs_status = self.lvsproc.poll()
+        sresult = select.select([self.lvsproc.stdout, self.lvsproc.stderr], [], [], 0)[0]
+        if self.lvsproc.stdout in sresult:
+            outstring = self.lvsproc.stdout.readline().decode().strip()
+            self.logprint(outstring, doflush=True)
+            print(outstring)
+        elif self.lvsproc.stderr in sresult:
+            errstring = self.lvsproc.stderr.readline().decode().strip()
+            self.logprint(errstring, doflush = True)
+            print(errstring, file=sys.stderr)
+
+        if lvs_status != None:
+            print("netgen LVS exited with status " + str(lvs_status))
+            self.lvsproc = None
+            if lvs_status != 0:
+                print('Errors encountered in LVS.')
+                self.logprint('Errors in LVS, lvs status = ' + str(lvs_status), doflush=True)
+            # Done;  now read comp.json and fill the treeview listbox.
+            self.generate(filename)
+        else:
+            self.after(500, lambda: self.watchclock(filename))
+
+    # Generate display from "comp.out" file (json file now preferred)
+
+    def generate_orig(self, lvspath):
+        lefttext = []
+        righttext = []
+        print("Reading LVS output file " + lvspath)
+        if os.path.exists(lvspath):
+            with open(lvspath, 'r') as ifile:
+                lvslines = ifile.read().splitlines()
+            for line in lvslines:
+                if '|' in line:
+                    # parts = line.split('|')
+                    # lefttext.append(parts[0])
+                    # righttext.append(parts[1])
+                    lefttext.append(line[0:42].strip())
+                    righttext.append(line[44:].strip())
+                else:
+                    lefttext.append(line)
+                    righttext.append('')
+            # Populate treeview with text
+            self.toppane.lvsreport.repopulate(lefttext, righttext)
+ 
+        else:
+            print("Error:  No output file generated from LVS.")
+
+    # Generate output from LVS report JSON file comp.json
+
+    def generate(self, lvspath):
+        lefttext = []
+        righttext = []
+        print("Reading LVS output file " + lvspath)
+        if os.path.exists(lvspath):
+            with open(lvspath, 'r') as ifile:
+                self.lvsdata = json.load(ifile)
+
+            # Populate treeview with text
+            self.toppane.lvsreport.json_repopulate(self.lvsdata)
+ 
+        else:
+            print("Error:  No output file generated from LVS.")
+
+    def findrecord(self, value):
+        print("Unimplemented function")
+
+    def findrecord_test(self, value):
+        # Check if socket is defined;  if not, attempt to open one
+        if not self.msock:
+            try:
+                self.msock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            except:
+                 print("No response from layout tool.")
+
+            if self.msock:
+                self.msock.connect(("0.0.0.0", 12946))
+                self.msock.setblocking(False)
+        if self.msock:
+            # Pull name of net or device from 'value'
+            # This is a test:
+            self.msock.sendall(b'box 0 0 100 100\r\n')
+
+if __name__ == '__main__':
+    options = []
+    arguments = []
+    for item in sys.argv[1:]:
+        if item.find('-', 0) == 0:
+            options.append(item)
+        else:
+            arguments.append(item)
+
+    root = tkinter.Tk()
+    app = LVSManager(root)
+    if arguments:
+        if len(arguments) >= 2:
+            app.set_project(arguments[0], project_name=arguments[1])
+        else:
+            app.set_project(arguments[0])
+
+    root.mainloop()

python/tksimpledialog.py

@@ -0,0 +1,86 @@
+#!/bin/env python3
+#
+# Dialog class for tkinter
+
+import os
+import tkinter
+from tkinter import ttk
+
+class Dialog(tkinter.Toplevel):
+
+    def __init__(self, parent, message = None, title = None, seed = None, border = 'blue', **kwargs):
+
+        tkinter.Toplevel.__init__(self, parent)
+        self.transient(parent)
+
+        if title:
+            self.title(title)
+
+        self.configure(background=border, padx=2, pady=2)
+        self.obox = ttk.Frame(self)
+        self.obox.pack(side = 'left', fill = 'both', expand = 'true')
+
+        self.parent = parent
+        self.result = None
+        body = ttk.Frame(self.obox)
+        self.initial_focus = self.body(body, message, seed, **kwargs)
+        body.pack(padx = 5, pady = 5)
+        self.buttonbox()
+        self.grab_set()
+
+        if not self.initial_focus:
+            self.initial_focus = self
+
+        self.protocol("WM_DELETE_WINDOW", self.cancel)
+        self.geometry("+%d+%d" % (parent.winfo_rootx() + 50,
+                                  parent.winfo_rooty() + 50))
+
+        self.initial_focus.focus_set()
+        self.wait_window(self)
+
+    # Construction hooks
+
+    def body(self, master, **kwargs):
+        # Create dialog body.  Return widget that should have
+        # initial focus.  This method should be overridden
+        pass
+
+    def buttonbox(self):
+        # Add standard button box.  Override if you don't want the
+        # standard buttons
+
+        box = ttk.Frame(self.obox)
+
+        self.okb = ttk.Button(box, text="OK", width=10, command=self.ok, default='active')
+        self.okb.pack(side='left', padx=5, pady=5)
+        w = ttk.Button(box, text="Cancel", width=10, command=self.cancel)
+        w.pack(side='left', padx=5, pady=5)
+
+        self.bind("<Return>", self.ok)
+        self.bind("<Escape>", self.cancel)
+        box.pack(fill='x', expand='true')
+
+    # Standard button semantics
+
+    def ok(self, event=None):
+
+        if not self.validate():
+            self.initial_focus.focus_set() # put focus back
+            return
+
+        self.withdraw()
+        self.update_idletasks()
+        self.result = self.apply()
+        self.cancel()
+
+    def cancel(self, event=None):
+
+        # Put focus back to the parent window
+        self.parent.focus_set()
+        self.destroy()
+
+    def validate(self):
+        return 1 # Override this
+
+    def apply(self):
+        return None # Override this

python/tooltip.py

@@ -0,0 +1,158 @@
+#!/bin/env python3
+'''Michael Lange <klappnase (at) freakmail (dot) de>
+The ToolTip class provides a flexible tooltip widget for tkinter; it is based on IDLE's ToolTip
+module which unfortunately seems to be broken (at least the version I saw).
+INITIALIZATION OPTIONS:
+anchor :        where the text should be positioned inside the widget, must be on of "n", "s", "e", "w", "nw" and so on;
+                default is "center"
+bd :            borderwidth of the widget; default is 1 (NOTE: don't use "borderwidth" here)
+bg :            background color to use for the widget; default is "lightyellow" (NOTE: don't use "background")
+delay :         time in ms that it takes for the widget to appear on the screen when the mouse pointer has
+                entered the parent widget; default is 1500
+fg :            foreground (i.e. text) color to use; default is "black" (NOTE: don't use "foreground")
+follow_mouse :  if set to 1 the tooltip will follow the mouse pointer instead of being displayed
+                outside of the parent widget; this may be useful if you want to use tooltips for
+                large widgets like listboxes or canvases; default is 0
+font :          font to use for the widget; default is system specific
+justify :       how multiple lines of text will be aligned, must be "left", "right" or "center"; default is "left"
+padx :          extra space added to the left and right within the widget; default is 4
+pady :          extra space above and below the text; default is 2
+relief :        one of "flat", "ridge", "groove", "raised", "sunken" or "solid"; default is "solid"
+state :         must be "normal" or "disabled"; if set to "disabled" the tooltip will not appear; default is "normal"
+text :          the text that is displayed inside the widget
+textvariable :  if set to an instance of tkinter.StringVar() the variable's value will be used as text for the widget
+width :         width of the widget; the default is 0, which means that "wraplength" will be used to limit the widgets width
+wraplength :    limits the number of characters in each line; default is 150
+
+WIDGET METHODS:
+configure(**opts) : change one or more of the widget's options as described above; the changes will take effect the
+                    next time the tooltip shows up; NOTE: follow_mouse cannot be changed after widget initialization
+
+Other widget methods that might be useful if you want to subclass ToolTip:
+enter() :           callback when the mouse pointer enters the parent widget
+leave() :           called when the mouse pointer leaves the parent widget
+motion() :          is called when the mouse pointer moves inside the parent widget if follow_mouse is set to 1 and the
+                    tooltip has shown up to continually update the coordinates of the tooltip window
+coords() :          calculates the screen coordinates of the tooltip window
+create_contents() : creates the contents of the tooltip window (by default a tkinter.Label)
+'''
+# Ideas gleaned from PySol
+
+import tkinter
+
+class ToolTip:
+    def __init__(self, master, text='Your text here', delay=1500, **opts):
+        self.master = master
+        self._opts = {'anchor':'center', 'bd':1, 'bg':'lightyellow', 'delay':delay, 'fg':'black',\
+                      'follow_mouse':0, 'font':None, 'justify':'left', 'padx':4, 'pady':2,\
+                      'relief':'solid', 'state':'normal', 'text':text, 'textvariable':None,\
+                      'width':0, 'wraplength':150}
+        self.configure(**opts)
+        self._tipwindow = None
+        self._id = None
+        self._id1 = self.master.bind("<Enter>", self.enter, '+')
+        self._id2 = self.master.bind("<Leave>", self.leave, '+')
+        self._id3 = self.master.bind("<ButtonPress>", self.leave, '+')
+        self._follow_mouse = 0
+        if self._opts['follow_mouse']:
+            self._id4 = self.master.bind("<Motion>", self.motion, '+')
+            self._follow_mouse = 1
+    
+    def configure(self, **opts):
+        for key in opts:
+            if key in self._opts:
+                self._opts[key] = opts[key]
+            else:
+                KeyError = 'KeyError: Unknown option: "%s"' %key
+                raise KeyError
+    
+    ##----these methods handle the callbacks on "<Enter>", "<Leave>" and "<Motion>"---------------##
+    ##----events on the parent widget; override them if you want to change the widget's behavior--##
+    
+    def enter(self, event=None):
+        self._schedule()
+        
+    def leave(self, event=None):
+        self._unschedule()
+        self._hide()
+    
+    def motion(self, event=None):
+        if self._tipwindow and self._follow_mouse:
+            x, y = self.coords()
+            self._tipwindow.wm_geometry("+%d+%d" % (x, y))
+    
+    ##------the methods that do the work:---------------------------------------------------------##
+    
+    def _schedule(self):
+        self._unschedule()
+        if self._opts['state'] == 'disabled':
+            return
+        self._id = self.master.after(self._opts['delay'], self._show)
+
+    def _unschedule(self):
+        id = self._id
+        self._id = None
+        if id:
+            self.master.after_cancel(id)
+
+    def _show(self):
+        if self._opts['state'] == 'disabled':
+            self._unschedule()
+            return
+        if not self._tipwindow:
+            self._tipwindow = tw = tkinter.Toplevel(self.master)
+            # hide the window until we know the geometry
+            tw.withdraw()
+            tw.wm_overrideredirect(1)
+
+            if tw.tk.call("tk", "windowingsystem") == 'aqua':
+                tw.tk.call("::tk::unsupported::MacWindowStyle", "style", tw._w, "help", "none")
+
+            self.create_contents()
+            tw.update_idletasks()
+            x, y = self.coords()
+            tw.wm_geometry("+%d+%d" % (x, y))
+            tw.deiconify()
+            tw.lift()
+    
+    def _hide(self):
+        tw = self._tipwindow
+        self._tipwindow = None
+        if tw:
+            tw.destroy()
+                
+    ##----these methods might be overridden in derived classes:----------------------------------##
+    
+    def coords(self):
+        # The tip window must be completely outside the master widget;
+        # otherwise when the mouse enters the tip window we get
+        # a leave event and it disappears, and then we get an enter
+        # event and it reappears, and so on forever :-(
+        # or we take care that the mouse pointer is always outside the tipwindow :-)
+        tw = self._tipwindow
+        twx, twy = tw.winfo_reqwidth(), tw.winfo_reqheight()
+        w, h = tw.winfo_screenwidth(), tw.winfo_screenheight()
+        # calculate the y coordinate:
+        if self._follow_mouse:
+            y = tw.winfo_pointery() + 20
+            # make sure the tipwindow is never outside the screen:
+            if y + twy > h:
+                y = y - twy - 30
+        else:
+            y = self.master.winfo_rooty() + self.master.winfo_height() + 3
+            if y + twy > h:
+                y = self.master.winfo_rooty() - twy - 3
+        # we can use the same x coord in both cases:
+        x = tw.winfo_pointerx() - twx / 2
+        if x < 0:
+            x = 0
+        elif x + twx > w:
+            x = w - twx
+        return x, y
+
+    def create_contents(self):
+        opts = self._opts.copy()
+        for opt in ('delay', 'follow_mouse', 'state'):
+            del opts[opt]
+        label = tkinter.Label(self._tipwindow, **opts)
+        label.pack()

python/treeviewsplit.py

@@ -0,0 +1,653 @@
+#!/bin/env python3
+#
+# Simple ttk treeview with split view, scrollbar, and
+# row of callback buttons
+
+import os
+import re
+import itertools
+
+import tkinter
+from tkinter import ttk
+
+#------------------------------------------------------
+# Tree view used as a multi-column list box
+#------------------------------------------------------
+
+class TreeViewSplit(ttk.Frame):
+    def __init__(self, parent, fontsize=11, *args, **kwargs):
+        ttk.Frame.__init__(self, parent, *args, **kwargs)
+        s = ttk.Style()
+        s.configure('normal.TLabel', font=('Helvetica', fontsize))
+        s.configure('title.TLabel', font=('Helvetica', fontsize, 'bold'))
+        s.configure('normal.TButton', font=('Helvetica', fontsize),
+			border = 3, relief = 'raised')
+        s.configure('Treeview.Heading', font=('Helvetica', fontsize, 'bold'))
+        s.configure('Treeview.Column', font=('Helvetica', fontsize))
+        self.fontsize = fontsize
+
+    # Last item is a list of 2-item lists, each containing the name of a button
+    # to place along the button bar at the bottom, and a callback function to
+    # run when the button is pressed.
+
+    def populate(self, title1="", item1list=[], title2="", item2list=[], buttons=[], height=10):
+        self.item1list = item1list[:]
+        self.item2list = item2list[:]
+        columns = [0, 1]
+        
+        treeFrame = ttk.Frame(self)
+        treeFrame.pack(side='top', padx=5, pady=5, fill='both', expand='true')
+        
+        scrollBar = ttk.Scrollbar(treeFrame)
+        scrollBar.pack(side='right', fill='y')
+        self.treeView = ttk.Treeview(treeFrame, selectmode='browse', columns=columns, height=height)
+        self.treeView.pack(side='left', fill='both', expand='true')
+        scrollBar.config(command=self.treeView.yview)
+        self.treeView.config(yscrollcommand=scrollBar.set)
+        self.treeView.column('#0', width=120, stretch='false')
+        self.treeView.heading(0, text=title1, anchor='w')
+        self.treeView.heading(1, text=title2, anchor='w')
+        buttonFrame = ttk.Frame(self)
+        buttonFrame.pack(side='bottom', fill='x')
+
+        self.treeView.tag_configure('select',background='darkslategray',foreground='white')
+
+        # Test type tags
+        self.treeView.tag_configure('error', font=('Helvetica', self.fontsize - 1), foreground = 'red')
+        self.treeView.tag_configure('clean', font=('Helvetica', self.fontsize - 1), foreground = 'green3')
+        self.treeView.tag_configure('normal', font=('Helvetica', self.fontsize - 1), foreground = 'black')
+        self.treeView.tag_configure('prep', font=('Helvetica', self.fontsize, 'bold italic'),
+                        foreground = 'black', anchor = 'center')
+        self.treeView.tag_configure('header1', font=('Helvetica', self.fontsize, 'bold italic'),
+                        foreground = 'brown', anchor = 'center')
+        self.treeView.tag_configure('header2', font=('Helvetica', self.fontsize - 1, 'bold'),
+                        foreground = 'blue', anchor = 'center')
+        self.treeView.tag_configure('header3', font=('Helvetica', self.fontsize - 1, 'italic'),
+                        foreground = 'green4', anchor = 'center')
+        self.treeView.tag_configure('header4', font=('Helvetica', self.fontsize - 1),
+                        foreground = 'purple', anchor = 'center')
+
+
+        self.func_buttons = []
+        for button in buttons:
+            func = button[2]
+            # Each func_buttons entry is a list of two items;  first is the
+            # button widget, and the second is a boolean that is True if the
+            # button is to be present always, False if the button is only
+            # present when there are entries in the itemlists.
+            self.func_buttons.append([ttk.Button(buttonFrame, text=button[0],
+			style = 'normal.TButton',
+			command = lambda func=func: self.func_callback(func)),
+			button[1]])
+
+        self.selectcallback = None
+        self.lastselected = None
+        self.lasttag = None
+        self.repopulate(item1list, item2list)
+
+    def get_button(self, index):
+        if index >= 0 and index < len(self.func_buttons):
+            return self.func_buttons[index][0]
+        else:
+            return None
+
+    def set_title(self, title):
+        self.treeView.heading('#0', text=title, anchor='w')
+
+    def repopulate(self, item1list=[], item2list=[]):
+
+        # Remove all children of treeview
+        self.treeView.delete(*self.treeView.get_children())
+
+        self.item1list = item1list[:]
+        self.item2list = item2list[:]
+        lines = max(len(self.item1list), len(self.item2list))
+
+        # Parse the information coming from comp.out.  This is preferably
+        # handled from inside netgen, but that requires development in netgen.
+        # Note:  A top-level group is denoted by an empty string.
+
+        nested = ['']
+        if lines > 0:
+            # print("Create item ID 0 parent = ''")
+            self.treeView.insert(nested[-1], 'end', text='-', iid='0',
+			value=['Initialize', 'Initialize'], tags=['prep'])
+            nested.append('0')
+            tagstyle = 'header1'
+
+        emptyrec = re.compile('^[\t ]*$')
+        subrex = re.compile('Subcircuit summary')
+        cktrex = re.compile('Circuit[\t ]+[12]:[\t ]+([^ \t]+)')
+        netrex = re.compile('NET mismatches')
+        devrex = re.compile('DEVICE mismatches')
+        seprex = re.compile('-----')
+        sumrex = re.compile('Netlists ')
+        matchrex = re.compile('.*\*\*Mismatch\*\*')
+        incircuit = False
+        watchgroup = False
+        groupnum = 0
+
+        for item1, item2, index in zip(self.item1list, self.item2list, range(lines)):
+            cname1 = 'Layout'		# Placeholder
+            cname2 = 'Schematic'		# Placeholder
+
+            # Remove blank lines from the display
+            lmatch = emptyrec.match(item1)
+            if lmatch:
+                lmatch = emptyrec.match(item2)
+                if lmatch:
+                    continue
+            index = str(index + 1)
+            # Parse text to determine how to structure and display it.
+            tagstyle = 'normal'
+            nextnest = None
+            lmatch = subrex.match(item1)
+            if lmatch:
+                nested = ['']		# pop back to topmost level
+                nextnest = index
+                tagstyle = 'header1'
+                incircuit = False
+                watchgroup = False
+                groupnum = 0
+                item1 = 'Layout compare'
+                item2 = 'Schematic compare'
+            else:
+                lmatch = cktrex.match(item1)
+                if lmatch and not incircuit:
+                    # Pick up circuit names and replace them in the title, then use them
+                    # for all following titles.
+                    cname1 = lmatch.group(1)
+                    lmatch = cktrex.match(item2)
+                    cname2 = lmatch.group(1)
+                    print("Circuit names " + cname1 + " " + cname2)
+                    # Rewrite title
+                    cktitem = self.treeView.item(nested[-1], values=[cname1 + ' compare',
+				cname2 + ' compare'])
+                    nextnest = index
+                    tagstyle = 'header2'
+                    incircuit = True
+                    item1 = cname1 + ' Summary'
+                    item2 = cname2 + ' Summary'
+                elif lmatch:
+                    continue
+                else:
+                    lmatch = netrex.match(item1)
+                    if lmatch:
+                        if watchgroup:
+                            nested = nested[0:-1]
+                        nested = nested[0:-1]
+                        nextnest = index
+                        tagstyle = 'header2'
+                        groupnum = 1
+                        watchgroup = True
+                        item1 = cname1 + ' Net mismatches'
+                        item2 = cname2 + ' Net mismatches'
+                    else:
+                        lmatch = devrex.match(item1)
+                        if lmatch:
+                            if watchgroup:
+                                nested = nested[0:-1]
+                            nested = nested[0:-1]
+                            nextnest = index
+                            tagstyle = 'header2'
+                            groupnum = 1
+                            watchgroup = True
+                            item1 = cname1 + ' Device mismatches'
+                            item2 = cname2 + ' Device mismatches'
+                        else:
+                            lmatch = seprex.match(item1)
+                            if lmatch:
+                                if watchgroup:
+                                    tagstyle = 'header3'
+                                    item1 = 'Group ' + str(groupnum)
+                                    item2 = 'Group ' + str(groupnum)
+                                    if groupnum > 1:
+                                        nested = nested[0:-1]
+                                    groupnum += 1 
+                                    nextnest = index
+                                    watchgroup = False
+                                else:
+                                    if groupnum > 0:
+                                        watchgroup = True
+                                    continue
+                            else:
+                                lmatch = sumrex.match(item1)
+                                if lmatch:
+                                    if watchgroup:
+                                        nested = nested[0:-1]
+                                    nested = nested[0:-1]
+                                    watchgroup = False
+                                    tagstyle = 'header2'
+                                    groupnum = 0
+
+            lmatch1 = matchrex.match(item1)
+            lmatch2 = matchrex.match(item2)
+            if lmatch1 or lmatch2:
+                tagstyle='error'
+            
+            # print("Create item ID " + str(index) + " parent = " + str(nested[-1]))
+            self.treeView.insert(nested[-1], 'end', text=index, iid=index, value=[item1, item2],
+			tags=[tagstyle])
+
+            if nextnest:
+                nested.append(nextnest)
+
+        for button in self.func_buttons:
+            button[0].pack_forget()
+
+        if lines == 0:
+            self.treeView.insert('', 'end', text='-', value=['(no items)', '(no items)'])
+            for button in self.func_buttons:
+                if button[1]:
+                    button[0].pack(side='left', padx = 5)
+        else:
+            for button in self.func_buttons:
+                button[0].pack(side='left', padx = 5)
+
+    # Special routine to pull in the JSON file data produced by netgen-1.5.72
+    def json_repopulate(self, lvsdata):
+
+        # Remove all children of treeview
+        self.treeView.delete(*self.treeView.get_children())
+
+        # Parse the information coming from comp.out.  This is preferably
+        # handled from inside netgen, but that requires development in netgen.
+        # Note:  A top-level group is denoted by an empty string.
+
+        index = 0
+        errtotal = {}
+        errtotal['net'] = 0
+        errtotal['netmatch'] = 0
+        errtotal['device'] = 0
+        errtotal['devmatch'] = 0
+        errtotal['property'] = 0
+        errtotal['pin'] = 0
+        ncells = len(lvsdata)
+        for c in range(0, ncells):
+            cellrec = lvsdata[c]
+            if c == ncells - 1:
+                topcell = True
+            else:
+                topcell = False
+
+            errcell = {}
+            errcell['net'] = 0
+            errcell['netmatch'] = 0
+            errcell['device'] = 0
+            errcell['devmatch'] = 0
+            errcell['property'] = 0
+            errcell['pin'] = 0;
+
+            cname1 = 'Layout'
+            cname2 = 'Schematic'
+
+	    # cellrec is a dictionary.  Parse the cell summary, then failing nets,
+	    # devices, and properties, and finally pins.
+
+            if 'name' in cellrec:
+                names = cellrec['name']
+                cname1 = names[0]
+                cname2 = names[1]
+            else:
+                # This is an error but don't halt the program because of it.
+                cname1 = '(unknown layout)'
+                cname2 = '(unknown schematic)'
+
+            item1 = cname1
+            item2 = cname2
+            tagstyle = 'header1'
+            index += 1
+            nest0 = index
+            self.treeView.insert('', 'end', text=index, iid=index, value=[item1, item2],
+				tags=[tagstyle])
+
+            if 'devices' in cellrec or 'nets' in cellrec:
+                item1 = cname1 + " Summary"
+                item2 = cname2 + " Summary"
+                tagstyle = 'header2'
+                index += 1
+                nest1 = index
+                self.treeView.insert(nest0, 'end', text=index, iid=index, value=[item1, item2],
+				tags=[tagstyle])
+
+            if 'devices' in cellrec:
+                item1 = cname1 + " Devices"
+                item2 = cname2 + " Devices"
+                tagstyle = 'header3'
+                index += 1
+                nest2 = index
+                self.treeView.insert(nest1, 'end', text=index, iid=index, value=[item1, item2],
+				tags=[tagstyle])
+
+                devices = cellrec['devices']
+                devlist = [val for pair in zip(devices[0], devices[1]) for val in pair]
+                devpair = list(devlist[p:p + 2] for p in range(0, len(devlist), 2))
+                for dev in devpair:
+                    c1dev = dev[0]
+                    c2dev = dev[1]
+
+                    item1 = c1dev[0] + "(" + str(c1dev[1]) + ")"
+                    item2 = c2dev[0] + "(" + str(c2dev[1]) + ")"
+
+                    diffdevs = abs(c1dev[1] - c2dev[1])
+                    if diffdevs == 0:
+                        tagstyle = 'normal'
+                    else:
+                        tagstyle = 'error'
+                        errcell['device'] += diffdevs
+                        if topcell:
+                            errtotal['device'] += diffdevs
+                    index += 1
+                    nest2 = index
+                    self.treeView.insert(nest1, 'end', text=index, iid=index,
+				value=[item1, item2], tags=[tagstyle])
+
+            if 'nets' in cellrec:
+                item1 = cname1 + " Nets"
+                item2 = cname2 + " Nets"
+                tagstyle = 'header3'
+                index += 1
+                nest2 = index
+                self.treeView.insert(nest1, 'end', text=index, iid=index, value=[item1, item2],
+				tags=[tagstyle])
+
+                nets = cellrec['nets']
+
+                item1 = nets[0]
+                item2 = nets[1]
+                diffnets = abs(nets[0] - nets[1])
+                if diffnets == 0:
+                    tagstyle = 'normal'
+                else:
+                    tagstyle = 'error'
+                    errcell['net'] = diffnets
+                    if topcell:
+                        errtotal['net'] += diffnets
+                index += 1
+                nest2 = index
+                self.treeView.insert(nest1, 'end', text=index, iid=index,
+				value=[item1, item2], tags=[tagstyle])
+
+            if 'badnets' in cellrec:
+                badnets = cellrec['badnets']
+
+                if len(badnets) > 0:
+                    item1 = cname1 + " Net Mismatches"
+                    item2 = cname2 + " Net Mismatches"
+                    tagstyle = 'header2'
+                    index += 1
+                    nest1 = index
+                    self.treeView.insert(nest0, 'end', text=index, iid=index,
+				value=[item1, item2], tags=[tagstyle])
+
+                groupnum = 0
+                for group in badnets:
+                    groupc1 = group[0]
+                    groupc2 = group[1]
+                    nnets = len(groupc1)
+
+                    groupnum += 1
+                    tagstyle = 'header3'
+                    index += 1
+                    nest2 = index
+                    item1 = "Group " + str(groupnum) + ' (' + str(nnets) + ' nets)'
+                    self.treeView.insert(nest1, 'end', text=index, iid=index,
+				value=[item1, item1], tags=[tagstyle])
+
+                    tagstyle = 'error'
+                    errcell['netmatch'] += nnets
+                    if topcell:
+                        errtotal['netmatch'] += nnets
+
+                    for netnum in range(0, nnets):
+                        if netnum > 0:
+                            item1 = ""
+                            index += 1
+                            nest3 = index
+                            self.treeView.insert(nest2, 'end', text=index, iid=index,
+					value=[item1, item1], tags=[tagstyle])
+
+                        net1 = groupc1[netnum]
+                        net2 = groupc2[netnum]
+                        tagstyle = 'header4'
+                        item1 = net1[0]
+                        item2 = net2[0]
+                        index += 1
+                        nest3 = index
+                        self.treeView.insert(nest2, 'end', text=index, iid=index,
+				value=[item1, item2], tags=[tagstyle])
+
+                        # Pad shorter device list to the length of the longer one
+                        netdevs = list(itertools.zip_longest(net1[1], net2[1]))
+                        for devpair in netdevs:
+                            devc1 = devpair[0]
+                            devc2 = devpair[1]
+                            tagstyle = 'normal'
+                            if devc1 and devc1[0] != "":
+                                item1 = devc1[0] + '/' + devc1[1] + ' = ' + str(devc1[2])
+                            else:
+                                item1 = ""
+                            if devc2 and devc2[0] != "":
+                                item2 = devc2[0] + '/' + devc2[1] + ' = ' + str(devc2[2])
+                            else:
+                                item2 = ""
+                            index += 1
+                            nest3 = index
+                            self.treeView.insert(nest2, 'end', text=index, iid=index,
+					value=[item1, item2], tags=[tagstyle])
+
+            if 'badelements' in cellrec:
+                badelements = cellrec['badelements']
+
+                if len(badelements) > 0:
+                    item1 = cname1 + " Device Mismatches"
+                    item2 = cname2 + " Device Mismatches"
+                    tagstyle = 'header2'
+                    index += 1
+                    nest1 = index
+                    self.treeView.insert(nest0, 'end', text=index, iid=index,
+				value=[item1, item2], tags=[tagstyle])
+
+                groupnum = 0
+                for group in badelements:
+                    groupc1 = group[0]
+                    groupc2 = group[1]
+                    ndevs = len(groupc1)
+
+                    groupnum += 1
+                    tagstyle = 'header3'
+                    index += 1
+                    nest2 = index
+                    item1 = "Group " + str(groupnum) + ' (' + str(ndevs) + ' devices)'
+                    self.treeView.insert(nest1, 'end', text=index, iid=index,
+				value=[item1, item1], tags=[tagstyle])
+
+                    tagstyle = 'error'
+                    errcell['devmatch'] += ndevs
+                    if topcell:
+                        errtotal['devmatch'] += ndevs
+
+                    for elemnum in range(0, ndevs):
+                        if elemnum > 0:
+                            item1 = ""
+                            index += 1
+                            nest3 = index
+                            self.treeView.insert(nest2, 'end', text=index, iid=index,
+					value=[item1, item1], tags=[tagstyle])
+
+                        elem1 = groupc1[elemnum]
+                        elem2 = groupc2[elemnum]
+                        tagstyle = 'header4'
+                        item1 = elem1[0]
+                        item2 = elem2[0]
+                        index += 1
+                        nest3 = index
+                        self.treeView.insert(nest2, 'end', text=index, iid=index,
+				value=[item1, item2], tags=[tagstyle])
+
+                        # Pad shorter pin list to the length of the longer one
+                        elempins = list(itertools.zip_longest(elem1[1], elem2[1]))
+                        for pinpair in elempins:
+                            pinc1 = pinpair[0]
+                            pinc2 = pinpair[1]
+                            tagstyle = 'normal'
+                            if pinc1 and pinc1[0] != "":
+                                item1 = pinc1[0] + ' = ' + str(pinc1[1])
+                            else:
+                                item1 = ""
+                            if pinc2 and pinc2[0] != "":
+                                item2 = pinc2[0] + ' = ' + str(pinc2[1])
+                            else:
+                                item2 = ""
+                            index += 1
+                            nest3 = index
+                            self.treeView.insert(nest2, 'end', text=index, iid=index,
+					value=[item1, item2], tags=[tagstyle])
+
+            if 'properties' in cellrec:
+                properties = cellrec['properties']
+                numproperr = len(properties)
+                if numproperr > 0:
+                    item1 = cname1 + " Properties"
+                    item2 = cname2 + " Properties"
+                    tagstyle = 'header2'
+                    index += 1
+                    nest1 = index
+                    self.treeView.insert(nest0, 'end', text=index, iid=index, value=[item1, item2],
+				tags=[tagstyle])
+                    errcell['property'] = numproperr
+                    errtotal['property'] += numproperr
+
+                for prop in properties:
+
+                    if prop != properties[0]:
+                        item1 = ""
+                        index += 1
+                        nest2 = index
+                        self.treeView.insert(nest1, 'end', text=index, iid=index,
+				value=[item1, item1], tags=[tagstyle])
+
+                    propc1 = prop[0]
+                    propc2 = prop[1]
+
+                    tagstyle = 'header3'
+                    item1 = propc1[0]
+                    item2 = propc2[0]
+                    index += 1
+                    nest2 = index
+                    self.treeView.insert(nest1, 'end', text=index, iid=index,
+				value=[item1, item2], tags=[tagstyle])
+
+                   # Pad shorter property list to the length of the longer one
+                    elemprops = list(itertools.zip_longest(propc1[1], propc2[1]))
+                    for proppair in elemprops:
+                        perrc1 = proppair[0]
+                        perrc2 = proppair[1]
+                        tagstyle = 'normal'
+                        if perrc1 and perrc1[0] != "":
+                            item1 = perrc1[0] + ' = ' + str(perrc1[1])
+                        else:
+                            item1 = ""
+                        if perrc2 and perrc2[0] != "":
+                            item2 = perrc2[0] + ' = ' + str(perrc2[1])
+                        else:
+                            item2 = ""
+                        index += 1
+                        nest2 = index
+                        self.treeView.insert(nest1, 'end', text=index, iid=index,
+					value=[item1, item2], tags=[tagstyle])
+
+            if 'pins' in cellrec:
+                item1 = cname1 + " Pins"
+                item2 = cname2 + " Pins"
+                tagstyle = 'header2'
+                index += 1
+                nest1 = index
+                self.treeView.insert(nest0, 'end', text=index, iid=index, value=[item1, item2],
+				tags=[tagstyle])
+
+                pins = cellrec['pins']
+                pinlist = [val for pair in zip(pins[0], pins[1]) for val in pair]
+                pinpair = list(pinlist[p:p + 2] for p in range(0, len(pinlist), 2))
+                for pin in pinpair:
+                    item1 = pin[0]
+                    item2 = pin[1]
+                    if item1.lower() == item2.lower():
+                        tagstyle = 'header4'
+                    else:
+                        tagstyle = 'error'
+                        errcell['pin'] += 1
+                        if topcell:
+                            errtotal['pin'] += 1
+                    index += 1
+                    nest2 = index
+                    self.treeView.insert(nest1, 'end', text=index, iid=index,
+				value=[item1, item2], tags=[tagstyle])
+
+            allcellerror = errcell['net'] + errcell['device'] + errcell['property'] + errcell['pin'] + errcell['netmatch'] + errcell['devmatch']
+            if allcellerror > 0:
+                item1 = 'Errors:  Net = ' + str(errcell['net']) + ', Device = ' + str(errcell['device']) + ', Property = ' + str(errcell['property']) + ', Pin = ' + str(errcell['pin']) + ', Net match = ' + str(errcell['netmatch']) + ', Device match = ' + str(errcell['devmatch'])
+                tagstyle = 'error'
+            else:
+                item1 = 'LVS Clean'
+                tagstyle = 'clean'
+
+            item2 = ""
+            index += 1
+            nest0 = index
+            self.treeView.insert('', 'end', text=index, iid=index, value=[item1, item2],
+				tags=[tagstyle])
+
+        item1 = "Final LVS result:"
+        item2 = ""
+        tagstyle = 'header1'
+        index += 1
+        nest0 = index
+        self.treeView.insert('', 'end', text=index, iid=index, value=[item1, item2],
+				tags=[tagstyle])
+
+        allerror = errtotal['net'] + errtotal['device'] + errtotal['property'] + errtotal['pin'] + errtotal['netmatch'] + errtotal['devmatch']
+        if allerror > 0:
+            item1 = 'Errors:  Net = ' + str(errtotal['net']) + ', Device = ' + str(errtotal['device']) + ', Property = ' + str(errtotal['property']) + ', Pin = ' + str(errtotal['pin']) + ', Net match = ' + str(errtotal['netmatch']) + ', Device match = ' + str(errtotal['devmatch'])
+            tagstyle = 'error'
+        else:
+            item1 = 'LVS Clean'
+            tagstyle = 'clean'
+
+        item2 = ""
+        index += 1
+        nest0 = index
+        self.treeView.insert('', 'end', text=index, iid=index, value=[item1, item2],
+				tags=[tagstyle])
+
+        for button in self.func_buttons:
+            button[0].pack_forget()
+
+        if index == 0:
+            self.treeView.insert('', 'end', text='-', value=['(no items)', '(no items)'])
+            for button in self.func_buttons:
+                if button[1]:
+                    button[0].pack(side='left', padx = 5)
+        else:
+            for button in self.func_buttons:
+                button[0].pack(side='left', padx = 5)
+
+    # Return values from the treeview
+    def getlist(self):
+        return self.treeView.get_children()
+
+    def func_callback(self, callback, event=None):
+        callback(self.treeView.item(self.treeView.selection()))
+
+    def bindselect(self, callback):
+        self.selectcallback = callback
+
+    def setselect(self, value):
+        self.treeView.selection_set(value)
+
+    def selected(self):
+        value = self.treeView.item(self.treeView.selection())
+        if value['values']:
+            return value
+        else:
+            return None

scripts/config.log

@@ -12,9 +12,9 @@ generated by GNU Autoconf 2.69.  Invocation command line was
 
 hostname = stravinsky
 uname -m = x86_64
-uname -r = 3.18.3-201.fc21.x86_64
+uname -r = 4.1.13-100.fc21.x86_64
 uname -s = Linux
-uname -v = #1 SMP Mon Jan 19 15:59:31 UTC 2015
+uname -v = #1 SMP Tue Nov 10 13:13:20 UTC 2015
 
 /usr/bin/uname -p = x86_64
 /bin/uname -X     = unknown
@@ -39,83 +39,83 @@ PATH: /usr/local/bin
 ## Core tests. ##
 ## ----------- ##
 
-configure:2397: checking build system type
-configure:2411: result: x86_64-unknown-linux-gnu
-configure:2431: checking host system type
-configure:2444: result: x86_64-unknown-linux-gnu
-configure:2464: checking target system type
-configure:2477: result: x86_64-unknown-linux-gnu
-configure:2568: checking for gcc
-configure:2584: found /bin/gcc
-configure:2595: result: gcc
-configure:2824: checking for C compiler version
-configure:2833: gcc --version >&5
-gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1)
+configure:2398: checking build system type
+configure:2412: result: x86_64-unknown-linux-gnu
+configure:2432: checking host system type
+configure:2445: result: x86_64-unknown-linux-gnu
+configure:2465: checking target system type
+configure:2478: result: x86_64-unknown-linux-gnu
+configure:2569: checking for gcc
+configure:2585: found /bin/gcc
+configure:2596: result: gcc
+configure:2825: checking for C compiler version
+configure:2834: gcc --version >&5
+gcc (GCC) 4.9.2 20150212 (Red Hat 4.9.2-6)
 Copyright (C) 2014 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-configure:2844: $? = 0
-configure:2833: gcc -v >&5
+configure:2845: $? = 0
+configure:2834: gcc -v >&5
 Using built-in specs.
 COLLECT_GCC=gcc
 COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.9.2/lto-wrapper
 Target: x86_64-redhat-linux
-Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --enable-multilib --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-languages=c,c++,objc,obj-c++,fortran,ada,go,lto --enable-plugin --enable-initfini-array --disable-libgcj --with-isl=/builddir/build/BUILD/gcc-4.9.2-20141101/obj-x86_64-redhat-linux/isl-install --with-cloog=/builddir/build/BUILD/gcc-4.9.2-20141101/obj-x86_64-redhat-linux/cloog-install --enable-gnu-indirect-function --with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux
+Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --enable-multilib --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-languages=c,c++,objc,obj-c++,fortran,ada,go,lto --enable-plugin --enable-initfini-array --disable-libgcj --with-isl=/builddir/build/BUILD/gcc-4.9.2-20150212/obj-x86_64-redhat-linux/isl-install --with-cloog=/builddir/build/BUILD/gcc-4.9.2-20150212/obj-x86_64-redhat-linux/cloog-install --enable-gnu-indirect-function --with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux
 Thread model: posix
-gcc version 4.9.2 20141101 (Red Hat 4.9.2-1) (GCC) 
-configure:2844: $? = 0
-configure:2833: gcc -V >&5
+gcc version 4.9.2 20150212 (Red Hat 4.9.2-6) (GCC) 
+configure:2845: $? = 0
+configure:2834: gcc -V >&5
 gcc: error: unrecognized command line option '-V'
 gcc: fatal error: no input files
 compilation terminated.
-configure:2844: $? = 4
-configure:2833: gcc -qversion >&5
+configure:2845: $? = 4
+configure:2834: gcc -qversion >&5
 gcc: error: unrecognized command line option '-qversion'
 gcc: fatal error: no input files
 compilation terminated.
-configure:2844: $? = 4
-configure:2864: checking whether the C compiler works
-configure:2886: gcc -g   conftest.c  >&5
-configure:2890: $? = 0
-configure:2938: result: yes
-configure:2941: checking for C compiler default output file name
-configure:2943: result: a.out
-configure:2949: checking for suffix of executables
-configure:2956: gcc -o conftest -g   conftest.c  >&5
-configure:2960: $? = 0
-configure:2982: result: 
-configure:3004: checking whether we are cross compiling
-configure:3012: gcc -o conftest -g   conftest.c  >&5
-configure:3016: $? = 0
-configure:3023: ./conftest
-configure:3027: $? = 0
-configure:3042: result: no
-configure:3047: checking for suffix of object files
-configure:3069: gcc -c -g  conftest.c >&5
-configure:3073: $? = 0
-configure:3094: result: o
-configure:3098: checking whether we are using the GNU C compiler
-configure:3117: gcc -c -g  conftest.c >&5
-configure:3117: $? = 0
-configure:3126: result: yes
-configure:3135: checking whether gcc accepts -g
-configure:3155: gcc -c -g  conftest.c >&5
-configure:3155: $? = 0
-configure:3196: result: yes
-configure:3213: checking for gcc option to accept ISO C89
-configure:3276: gcc  -c -g  conftest.c >&5
-configure:3276: $? = 0
-configure:3289: result: none needed
-configure:3314: checking how to run the C preprocessor
-configure:3345: gcc -E  conftest.c
-configure:3345: $? = 0
-configure:3359: gcc -E  conftest.c
+configure:2845: $? = 4
+configure:2865: checking whether the C compiler works
+configure:2887: gcc -g   conftest.c  >&5
+configure:2891: $? = 0
+configure:2939: result: yes
+configure:2942: checking for C compiler default output file name
+configure:2944: result: a.out
+configure:2950: checking for suffix of executables
+configure:2957: gcc -o conftest -g   conftest.c  >&5
+configure:2961: $? = 0
+configure:2983: result: 
+configure:3005: checking whether we are cross compiling
+configure:3013: gcc -o conftest -g   conftest.c  >&5
+configure:3017: $? = 0
+configure:3024: ./conftest
+configure:3028: $? = 0
+configure:3043: result: no
+configure:3048: checking for suffix of object files
+configure:3070: gcc -c -g  conftest.c >&5
+configure:3074: $? = 0
+configure:3095: result: o
+configure:3099: checking whether we are using the GNU C compiler
+configure:3118: gcc -c -g  conftest.c >&5
+configure:3118: $? = 0
+configure:3127: result: yes
+configure:3136: checking whether gcc accepts -g
+configure:3156: gcc -c -g  conftest.c >&5
+configure:3156: $? = 0
+configure:3197: result: yes
+configure:3214: checking for gcc option to accept ISO C89
+configure:3277: gcc  -c -g  conftest.c >&5
+configure:3277: $? = 0
+configure:3290: result: none needed
+configure:3315: checking how to run the C preprocessor
+configure:3346: gcc -E  conftest.c
+configure:3346: $? = 0
+configure:3360: gcc -E  conftest.c
 conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory
  #include <ac_nonexistent.h>
                             ^
 compilation terminated.
-configure:3359: $? = 1
+configure:3360: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -125,18 +125,18 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "60"
+| #define NETGEN_REVISION "98"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:3384: result: gcc -E
-configure:3404: gcc -E  conftest.c
-configure:3404: $? = 0
-configure:3418: gcc -E  conftest.c
+configure:3385: result: gcc -E
+configure:3405: gcc -E  conftest.c
+configure:3405: $? = 0
+configure:3419: gcc -E  conftest.c
 conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory
  #include <ac_nonexistent.h>
                             ^
 compilation terminated.
-configure:3418: $? = 1
+configure:3419: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -146,104 +146,104 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "60"
+| #define NETGEN_REVISION "98"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:3447: checking for library containing strerror
-configure:3478: gcc -o conftest -g   conftest.c  >&5
-configure:3478: $? = 0
-configure:3495: result: none required
-configure:3517: checking for a BSD-compatible install
-configure:3585: result: /bin/install -c
-configure:3639: checking for ranlib
-configure:3655: found /bin/ranlib
-configure:3666: result: ranlib
-configure:3693: checking for gm4
-configure:3726: result: no
-configure:3693: checking for gnum4
-configure:3726: result: no
-configure:3693: checking for m4
-configure:3711: found /bin/m4
-configure:3723: result: /bin/m4
-configure:3764: checking for ld used by GCC
-configure:3827: result: /bin/ld
-configure:3834: checking if the linker (/bin/ld) is GNU ld
+configure:3448: checking for library containing strerror
+configure:3479: gcc -o conftest -g   conftest.c  >&5
+configure:3479: $? = 0
+configure:3496: result: none required
+configure:3518: checking for a BSD-compatible install
+configure:3586: result: /bin/install -c
+configure:3640: checking for ranlib
+configure:3656: found /bin/ranlib
+configure:3667: result: ranlib
+configure:3694: checking for gm4
+configure:3727: result: no
+configure:3694: checking for gnum4
+configure:3727: result: no
+configure:3694: checking for m4
+configure:3712: found /bin/m4
+configure:3724: result: /bin/m4
+configure:3765: checking for ld used by GCC
+configure:3828: result: /bin/ld
+configure:3835: checking if the linker (/bin/ld) is GNU ld
 GNU ld version 2.24
-configure:3846: result: yes
-configure:3853: checking for grep that handles long lines and -e
-configure:3911: result: /bin/grep
-configure:3916: checking for egrep
-configure:3978: result: /bin/grep -E
-configure:3983: checking for ANSI C header files
-configure:4003: gcc -c -g  conftest.c >&5
-configure:4003: $? = 0
-configure:4076: gcc -o conftest -g   conftest.c  >&5
-configure:4076: $? = 0
-configure:4076: ./conftest
-configure:4076: $? = 0
-configure:4087: result: yes
-configure:4100: checking for sys/types.h
-configure:4100: gcc -c -g  conftest.c >&5
-configure:4100: $? = 0
-configure:4100: result: yes
-configure:4100: checking for sys/stat.h
-configure:4100: gcc -c -g  conftest.c >&5
-configure:4100: $? = 0
-configure:4100: result: yes
-configure:4100: checking for stdlib.h
-configure:4100: gcc -c -g  conftest.c >&5
-configure:4100: $? = 0
-configure:4100: result: yes
-configure:4100: checking for string.h
-configure:4100: gcc -c -g  conftest.c >&5
-configure:4100: $? = 0
-configure:4100: result: yes
-configure:4100: checking for memory.h
-configure:4100: gcc -c -g  conftest.c >&5
-configure:4100: $? = 0
-configure:4100: result: yes
-configure:4100: checking for strings.h
-configure:4100: gcc -c -g  conftest.c >&5
-configure:4100: $? = 0
-configure:4100: result: yes
-configure:4100: checking for inttypes.h
-configure:4100: gcc -c -g  conftest.c >&5
-configure:4100: $? = 0
-configure:4100: result: yes
-configure:4100: checking for stdint.h
-configure:4100: gcc -c -g  conftest.c >&5
-configure:4100: $? = 0
-configure:4100: result: yes
-configure:4100: checking for unistd.h
-configure:4100: gcc -c -g  conftest.c >&5
-configure:4100: $? = 0
-configure:4100: result: yes
-configure:4116: checking size of void *
-configure:4121: gcc -o conftest -g   conftest.c  >&5
-configure:4121: $? = 0
-configure:4121: ./conftest
-configure:4121: $? = 0
-configure:4135: result: 8
-configure:4149: checking size of unsigned int
-configure:4154: gcc -o conftest -g   conftest.c  >&5
-configure:4154: $? = 0
-configure:4154: ./conftest
-configure:4154: $? = 0
-configure:4168: result: 4
-configure:4182: checking size of unsigned long
-configure:4187: gcc -o conftest -g   conftest.c  >&5
-configure:4187: $? = 0
-configure:4187: ./conftest
-configure:4187: $? = 0
-configure:4201: result: 8
-configure:4215: checking size of unsigned long long
-configure:4220: gcc -o conftest -g   conftest.c  >&5
-configure:4220: $? = 0
-configure:4220: ./conftest
-configure:4220: $? = 0
-configure:4234: result: 8
-configure:4245: checking whether byte ordering is bigendian
-configure:4260: gcc -c -g  conftest.c >&5
+configure:3847: result: yes
+configure:3854: checking for grep that handles long lines and -e
+configure:3912: result: /bin/grep
+configure:3917: checking for egrep
+configure:3979: result: /bin/grep -E
+configure:3984: checking for ANSI C header files
+configure:4004: gcc -c -g  conftest.c >&5
+configure:4004: $? = 0
+configure:4077: gcc -o conftest -g   conftest.c  >&5
+configure:4077: $? = 0
+configure:4077: ./conftest
+configure:4077: $? = 0
+configure:4088: result: yes
+configure:4101: checking for sys/types.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4101: checking for sys/stat.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4101: checking for stdlib.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4101: checking for string.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4101: checking for memory.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4101: checking for strings.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4101: checking for inttypes.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4101: checking for stdint.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4101: checking for unistd.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4117: checking size of void *
+configure:4122: gcc -o conftest -g   conftest.c  >&5
+configure:4122: $? = 0
+configure:4122: ./conftest
+configure:4122: $? = 0
+configure:4136: result: 8
+configure:4150: checking size of unsigned int
+configure:4155: gcc -o conftest -g   conftest.c  >&5
+configure:4155: $? = 0
+configure:4155: ./conftest
+configure:4155: $? = 0
+configure:4169: result: 4
+configure:4183: checking size of unsigned long
+configure:4188: gcc -o conftest -g   conftest.c  >&5
+configure:4188: $? = 0
+configure:4188: ./conftest
+configure:4188: $? = 0
+configure:4202: result: 8
+configure:4216: checking size of unsigned long long
+configure:4221: gcc -o conftest -g   conftest.c  >&5
+configure:4221: $? = 0
+configure:4221: ./conftest
+configure:4221: $? = 0
+configure:4235: result: 8
+configure:4246: checking whether byte ordering is bigendian
+configure:4261: gcc -c -g  conftest.c >&5
 conftest.c:26:9: error: unknown type name 'not'
          not a universal capable compiler
          ^
@@ -251,7 +251,7 @@ conftest.c:26:15: error: expected '=', ',', ';', 'asm' or '__attribute__' before
          not a universal capable compiler
                ^
 conftest.c:26:15: error: unknown type name 'universal'
-configure:4260: $? = 1
+configure:4261: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -261,7 +261,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "60"
+| #define NETGEN_REVISION "98"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -282,9 +282,9 @@ configure: failed program was:
 | 	     #endif
 | 	     typedef int dummy;
 | 
-configure:4305: gcc -c -g  conftest.c >&5
-configure:4305: $? = 0
-configure:4323: gcc -c -g  conftest.c >&5
+configure:4306: gcc -c -g  conftest.c >&5
+configure:4306: $? = 0
+configure:4324: gcc -c -g  conftest.c >&5
 conftest.c: In function 'main':
 conftest.c:32:4: error: unknown type name 'not'
     not big endian
@@ -292,7 +292,7 @@ conftest.c:32:4: error: unknown type name 'not'
 conftest.c:32:12: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'endian'
     not big endian
             ^
-configure:4323: $? = 1
+configure:4324: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -302,7 +302,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "60"
+| #define NETGEN_REVISION "98"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -331,48 +331,48 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:4451: result: no
-configure:4470: checking for ANSI C header files
-configure:4574: result: yes
-configure:4586: checking for setenv
-configure:4586: gcc -o conftest -g   conftest.c  >&5
-configure:4586: $? = 0
-configure:4586: result: yes
-configure:4586: checking for putenv
-configure:4586: gcc -o conftest -g   conftest.c  >&5
-configure:4586: $? = 0
-configure:4586: result: yes
-configure:4596: checking for vfork
-configure:4596: gcc -o conftest -g   conftest.c  >&5
-configure:4596: $? = 0
-configure:4596: result: yes
-configure:4604: checking dirent.h usability
-configure:4604: gcc -c -g  conftest.c >&5
-configure:4604: $? = 0
-configure:4604: result: yes
-configure:4604: checking dirent.h presence
-configure:4604: gcc -E -x c  conftest.c
-configure:4604: $? = 0
-configure:4604: result: yes
-configure:4604: checking for dirent.h
-configure:4604: result: yes
-configure:4617: checking limits.h usability
-configure:4617: gcc -c -g  conftest.c >&5
-configure:4617: $? = 0
-configure:4617: result: yes
-configure:4617: checking limits.h presence
-configure:4617: gcc -E -x c  conftest.c
-configure:4617: $? = 0
-configure:4617: result: yes
-configure:4617: checking for limits.h
-configure:4617: result: yes
-configure:4630: checking param.h usability
-configure:4630: gcc -c -g  conftest.c >&5
+configure:4452: result: no
+configure:4471: checking for ANSI C header files
+configure:4575: result: yes
+configure:4587: checking for setenv
+configure:4587: gcc -o conftest -g   conftest.c  >&5
+configure:4587: $? = 0
+configure:4587: result: yes
+configure:4587: checking for putenv
+configure:4587: gcc -o conftest -g   conftest.c  >&5
+configure:4587: $? = 0
+configure:4587: result: yes
+configure:4597: checking for vfork
+configure:4597: gcc -o conftest -g   conftest.c  >&5
+configure:4597: $? = 0
+configure:4597: result: yes
+configure:4605: checking dirent.h usability
+configure:4605: gcc -c -g  conftest.c >&5
+configure:4605: $? = 0
+configure:4605: result: yes
+configure:4605: checking dirent.h presence
+configure:4605: gcc -E -x c  conftest.c
+configure:4605: $? = 0
+configure:4605: result: yes
+configure:4605: checking for dirent.h
+configure:4605: result: yes
+configure:4618: checking limits.h usability
+configure:4618: gcc -c -g  conftest.c >&5
+configure:4618: $? = 0
+configure:4618: result: yes
+configure:4618: checking limits.h presence
+configure:4618: gcc -E -x c  conftest.c
+configure:4618: $? = 0
+configure:4618: result: yes
+configure:4618: checking for limits.h
+configure:4618: result: yes
+configure:4631: checking param.h usability
+configure:4631: gcc -c -g  conftest.c >&5
 conftest.c:63:19: fatal error: param.h: No such file or directory
  #include <param.h>
                    ^
 compilation terminated.
-configure:4630: $? = 1
+configure:4631: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -382,7 +382,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "60"
+| #define NETGEN_REVISION "98"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -437,14 +437,14 @@ configure: failed program was:
 | # include <unistd.h>
 | #endif
 | #include <param.h>
-configure:4630: result: no
-configure:4630: checking param.h presence
-configure:4630: gcc -E -x c  conftest.c
+configure:4631: result: no
+configure:4631: checking param.h presence
+configure:4631: gcc -E -x c  conftest.c
 conftest.c:30:19: fatal error: param.h: No such file or directory
  #include <param.h>
                    ^
 compilation terminated.
-configure:4630: $? = 1
+configure:4631: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -454,7 +454,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "60"
+| #define NETGEN_REVISION "98"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -476,52 +476,55 @@ configure: failed program was:
 | #define HAVE_LIMITS_H 1
 | /* end confdefs.h.  */
 | #include <param.h>
-configure:4630: result: no
-configure:4630: checking for param.h
-configure:4630: result: no
-configure:4641: checking for va_copy
-configure:4659: gcc -o conftest -g   conftest.c  >&5
-configure:4659: $? = 0
-configure:4668: result: yes
-configure:4676: checking for __va_copy
-configure:4694: gcc -o conftest -g   conftest.c  >&5
-configure:4694: $? = 0
-configure:4703: result: yes
-configure:4834: checking for tclConfig.sh
-configure:4906: result: /usr/lib64/tclConfig.sh
-configure:4922: checking for tkConfig.sh
-configure:4995: result: /usr/lib64/tkConfig.sh
-configure:5128: checking for wish executable
-configure:5155: result: /usr/bin/wish
-configure:5161: checking for tclsh executable
-configure:5187: result: /usr/bin/tclsh
-configure:5310: checking for X
-configure:5449: gcc -o conftest -g   conftest.c -lX11  >&5
-configure:5449: $? = 0
-configure:5499: result: libraries , headers 
-configure:5598: gcc -o conftest -g   conftest.c   -lX11 >&5
-configure:5598: $? = 0
-configure:5696: checking for gethostbyname
-configure:5696: gcc -o conftest -g   conftest.c  >&5
-configure:5696: $? = 0
-configure:5696: result: yes
-configure:5793: checking for connect
-configure:5793: gcc -o conftest -g   conftest.c  >&5
-configure:5793: $? = 0
-configure:5793: result: yes
-configure:5842: checking for remove
-configure:5842: gcc -o conftest -g   conftest.c  >&5
-configure:5842: $? = 0
-configure:5842: result: yes
-configure:5891: checking for shmat
-configure:5891: gcc -o conftest -g   conftest.c  >&5
-configure:5891: $? = 0
-configure:5891: result: yes
-configure:5949: checking for IceConnectionNumber in -lICE
-configure:5974: gcc -o conftest -g   conftest.c -lICE   >&5
-configure:5974: $? = 0
-configure:5983: result: yes
-configure:6705: creating ./config.status
+configure:4631: result: no
+configure:4631: checking for param.h
+configure:4631: result: no
+configure:4644: checking for python3
+configure:4660: found /bin/python3
+configure:4672: result: yes
+configure:4681: checking for va_copy
+configure:4699: gcc -o conftest -g   conftest.c  >&5
+configure:4699: $? = 0
+configure:4708: result: yes
+configure:4716: checking for __va_copy
+configure:4734: gcc -o conftest -g   conftest.c  >&5
+configure:4734: $? = 0
+configure:4743: result: yes
+configure:4874: checking for tclConfig.sh
+configure:4946: result: /usr/lib64/tclConfig.sh
+configure:4962: checking for tkConfig.sh
+configure:5035: result: /usr/lib64/tkConfig.sh
+configure:5168: checking for wish executable
+configure:5195: result: /usr/bin/wish
+configure:5201: checking for tclsh executable
+configure:5227: result: /usr/bin/tclsh
+configure:5350: checking for X
+configure:5489: gcc -o conftest -g   conftest.c -lX11  >&5
+configure:5489: $? = 0
+configure:5539: result: libraries , headers 
+configure:5638: gcc -o conftest -g   conftest.c   -lX11 >&5
+configure:5638: $? = 0
+configure:5736: checking for gethostbyname
+configure:5736: gcc -o conftest -g   conftest.c  >&5
+configure:5736: $? = 0
+configure:5736: result: yes
+configure:5833: checking for connect
+configure:5833: gcc -o conftest -g   conftest.c  >&5
+configure:5833: $? = 0
+configure:5833: result: yes
+configure:5882: checking for remove
+configure:5882: gcc -o conftest -g   conftest.c  >&5
+configure:5882: $? = 0
+configure:5882: result: yes
+configure:5931: checking for shmat
+configure:5931: gcc -o conftest -g   conftest.c  >&5
+configure:5931: $? = 0
+configure:5931: result: yes
+configure:5989: checking for IceConnectionNumber in -lICE
+configure:6014: gcc -o conftest -g   conftest.c -lICE   >&5
+configure:6014: $? = 0
+configure:6023: result: yes
+configure:6745: creating ./config.status
 
 ## ---------------------- ##
 ## Running config.status. ##
@@ -538,8 +541,8 @@ generated by GNU Autoconf 2.69.  Invocation command line was
 
 on stravinsky
 
-config.status:783: creating defs.mak
-config.status:886: WARNING:  'defs.mak.in' seems to ignore the --datarootdir setting
+config.status:784: creating defs.mak
+config.status:887: WARNING:  'defs.mak.in' seems to ignore the --datarootdir setting
 
 ## ---------------- ##
 ## Cache variables. ##
@@ -600,6 +603,7 @@ ac_cv_path_LD=/bin/ld
 ac_cv_path_M4=/bin/m4
 ac_cv_path_install='/bin/install -c'
 ac_cv_prog_CPP='gcc -E'
+ac_cv_prog_HAVE_PYTHON3=yes
 ac_cv_prog_ac_ct_CC=gcc
 ac_cv_prog_ac_ct_RANLIB=ranlib
 ac_cv_prog_cc_c89=
@@ -621,7 +625,7 @@ CC='gcc'
 CFLAGS='-g -m64 -fPIC'
 CPP='gcc -E -x c'
 CPPFLAGS=''
-DEFS='-DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"60\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1'
+DEFS='-DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"98\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1'
 DEPEND_FLAG='-MM'
 ECHO_C=''
 ECHO_N='printf'
@@ -630,6 +634,7 @@ EGREP='/bin/grep -E'
 EXEEXT=''
 EXTRA_LIB_SPECS='-ldl'
 GREP='/bin/grep'
+HAVE_PYTHON3='yes'
 INC_SPECS=''
 INSTALL_DATA='${INSTALL} -m 644'
 INSTALL_PROGRAM='${INSTALL}'
@@ -736,7 +741,7 @@ unused=''
 #define PACKAGE_BUGREPORT "[email protected]"
 #define PACKAGE_URL ""
 #define NETGEN_VERSION "1.5"
-#define NETGEN_REVISION "60"
+#define NETGEN_REVISION "98"
 #define STDC_HEADERS 1
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_STAT_H 1

scripts/config.status

@@ -624,6 +624,7 @@ S["X_LIBS"]=""
 S["X_PRE_LIBS"]=" -lSM -lICE"
 S["X_CFLAGS"]=""
 S["XMKMF"]=""
+S["HAVE_PYTHON3"]="yes"
 S["EGREP"]="/bin/grep -E"
 S["GREP"]="/bin/grep"
 S["M4"]="/bin/m4"
@@ -659,7 +660,7 @@ S["ECHO_T"]=""
 S["ECHO_N"]="-n"
 S["ECHO_C"]=""
 S["DEFS"]="-DPACKAGE_NAME=\\\"netgen\\\" -DPACKAGE_TARNAME=\\\"netgen\\\" -DPACKAGE_VERSION=\\\"1.3\\\" -DPACKAGE_STRING=\\\"netgen\\ 1.3\\\" -DPACKAGE_BUGREPORT=\\\"eda-dev@open"\
-"circuitdesign.com\\\" -DPACKAGE_URL=\\\"\\\" -DNETGEN_VERSION=\\\"1.5\\\" -DNETGEN_REVISION=\\\"60\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -"\
+"circuitdesign.com\\\" -DPACKAGE_URL=\\\"\\\" -DNETGEN_VERSION=\\\"1.5\\\" -DNETGEN_REVISION=\\\"98\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -"\
 "DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -D"\
 "SIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHA"\
 "VE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1"

scripts/configure

@@ -664,6 +664,7 @@ X_LIBS
 X_PRE_LIBS
 X_CFLAGS
 XMKMF
+HAVE_PYTHON3
 EGREP
 GREP
 M4
@@ -4638,6 +4639,45 @@ fi
 done
 
 
+# Extract the first word of "python3", so it can be a program name with args.
+set dummy python3; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_HAVE_PYTHON3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$HAVE_PYTHON3"; then
+  ac_cv_prog_HAVE_PYTHON3="$HAVE_PYTHON3" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_HAVE_PYTHON3="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_HAVE_PYTHON3" && ac_cv_prog_HAVE_PYTHON3="no"
+fi
+fi
+HAVE_PYTHON3=$ac_cv_prog_HAVE_PYTHON3
+if test -n "$HAVE_PYTHON3"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_PYTHON3" >&5
+$as_echo "$HAVE_PYTHON3" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
 $as_echo_n "checking for va_copy... " >&6; }
 if ${ac_cv_c_va_copy+:} false; then :
@@ -6081,8 +6121,7 @@ case $target in
 
     ;;
   *darwin*)
-    $as_echo "#define macosx 1" >>confdefs.h
-
+    $as_echo "#define macosx macos" >> confdefs.h
     if test "$CPP" = "cc -E" ; then
        CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
     fi
@@ -6547,6 +6586,7 @@ fi
 
 
 
+
 
 
 ac_config_files="$ac_config_files defs.mak"
@@ -7738,6 +7778,20 @@ else
    echo
 fi
 
+${ECHO_N} "Python3:    "
+if test "x${HAVE_PYTHON3}" == "x"; then
+   echo "no"
+   echo
+   echo "   Without Python3, you cannot run the GUI interface to netgen."
+   echo "   This is purely optional, as it contains no features not"
+   echo "   available in the command-line (Tcl/Tk) version.  If you want"
+   echo "   python3 support, make sure that you have installed python3"
+   echo "   on your system."
+   echo
+else
+   echo "yes"
+fi
+
 echo "-----------------------------------------------------------"
 echo
 

scripts/configure.in

@@ -163,6 +163,9 @@ AC_CHECK_HEADERS(limits.h)
 dnl Check for <param.h>
 AC_CHECK_HEADERS(param.h)
 
+dnl Check for Python3
+AC_CHECK_PROG(HAVE_PYTHON3, python3, yes, no)
+
 dnl Check for va_copy
 AC_CACHE_CHECK([for va_copy], ac_cv_c_va_copy,
  AC_TRY_LINK(
@@ -868,7 +871,7 @@ case $target in
     AC_DEFINE(i386)
     ;; 
   *darwin*)
-    AC_DEFINE(macosx)
+    $as_echo "#define macosx macos" >> confdefs.h
     if test "$CPP" = "cc -E" ; then
        CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
     fi
@@ -1274,6 +1277,7 @@ AC_SUBST(gr_cflags)
 AC_SUBST(gr_dflags)
 AC_SUBST(gr_libs)
 AC_SUBST(gr_srcs)
+AC_SUBST(HAVE_PYTHON3)
 
 AC_SUBST(X_LIBS)
 AC_SUBST(X_CFLAGS)
@@ -1314,6 +1318,20 @@ else
    echo
 fi
 
+${ECHO_N} "Python3:    "
+if test "x${HAVE_PYTHON3}" == "x"; then
+   echo "no"
+   echo
+   echo "   Without Python3, you cannot run the GUI interface to netgen."
+   echo "   This is purely optional, as it contains no features not"
+   echo "   available in the command-line (Tcl/Tk) version.  If you want"
+   echo "   python3 support, make sure that you have installed python3"
+   echo "   on your system."
+   echo
+else
+   echo "yes"
+fi
+
 echo "-----------------------------------------------------------"
 echo
 

scripts/defs.mak

@@ -33,6 +33,7 @@ MANDIR                 = ${mandir}
 LIBDIR                 = ${libdir}
 DOCDIR                 = ${libdir}/netgen/doc
 TCLDIR                 = ${libdir}/netgen/tcl
+PYDIR		       = ${libdir}/netgen/python
 
 MAIN_EXTRA_LIBS        =  ${NETGENDIR}/tcltk/libtcltk.o
 LD_EXTRA_LIBS          = 
@@ -66,8 +67,8 @@ CPP                    = gcc -E -x c
 CXX                    = @CXX@
 
 CPPFLAGS               = -I. -I${NETGENDIR} 
-DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\"  -DUSE_TCL_STUBS -DUSE_TK_STUBS -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"60\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
-DFLAGS_NOSTUB          =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"60\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
+DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\"  -DUSE_TCL_STUBS -DUSE_TK_STUBS -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"98\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
+DFLAGS_NOSTUB          =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"98\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
 CFLAGS                 = -g -m64 -fPIC -fPIC 
 
 DEPEND_FILE            = Depend

scripts/defs.mak.in

@@ -33,6 +33,7 @@ MANDIR                 = ${mandir}
 LIBDIR                 = ${libdir}
 DOCDIR                 = ${libdir}/netgen/doc
 TCLDIR                 = ${libdir}/netgen/tcl
+PYDIR		       = ${libdir}/netgen/python
 
 MAIN_EXTRA_LIBS        = @extra_libs@
 LD_EXTRA_LIBS          = @ld_extra_libs@

tcltk/Makefile

@@ -28,14 +28,15 @@ netgenexec${EXEEXT}: netgenexec.c
 		${LDFLAGS} ${LIBS} ${LIB_SPECS_NOSTUB}
 
 netgen.tcl: netgen.tcl.in
-	sed -e /TCL_DIR/s%TCL_DIR%${TCLDIR}%g \
-	    -e /SHDLIB_EXT/s%SHDLIB_EXT%${SHDLIB_EXT}%g \
+	sed -e 's%TCL_DIR%${TCLDIR}%g' \
+	    -e 's%SHDLIB_EXT%${SHDLIB_EXT}%g' \
 	    netgen.tcl.in > netgen.tcl
 
 netgen.sh: netgen.sh.in
-	sed -e /TCL_DIR/s%TCL_DIR%${TCLDIR}%g \
-	    -e /TCLLIB_DIR/s%TCLLIB_DIR%${TCL_LIB_DIR}%g \
-	    -e /WISH_EXE/s%WISH_EXE%${WISH_EXE}%g \
+	sed -e 's%TCL_DIR%${TCLDIR}%g' \
+	    -e 's%PY_DIR%${PYDIR}%g' \
+	    -e 's%TCLLIB_DIR%${TCL_LIB_DIR}%g' \
+	    -e 's%WISH_EXE%${WISH_EXE}%g' \
 	    netgen.sh.in > netgen.sh
 
 $(DESTDIR)${TCLDIR}/%: %

tcltk/netgen.sh.in

@@ -14,6 +14,7 @@
 
 TKCON=true
 BATCH=
+GUI=
 NETGEN_WISH=WISH_EXE
 export NETGEN_WISH
 
@@ -29,6 +30,7 @@ for i in "$@" ; do
    case $i in
       -noc*) TKCON=;;
       -bat*) BATCH=true; TKCON=;;
+      -gui) GUI=true; TKCON=;;
       *) arglist="$arglist${arglist:+ }\"${i//\"/\\\"}\"";;
    esac
 done 
@@ -40,7 +42,10 @@ if [ $TKCON ]; then
 	-slave "package require Tk; set argc $#; set argv [list $arglist]; \
 	source TCL_DIR/netgen.tcl"
 
-else
+# Run the Python LVS manager GUI
+
+elif [ $GUI ]; then
+    exec PY_DIR/lvs_manager.py $@
 
 #
 # Run the stand-in for wish (netgenexec), which acts exactly like "wish"
@@ -49,6 +54,7 @@ else
 # capable of sourcing the startup script.
 #
 
+else
    exec TCL_DIR/netgenexec -- "$@"
 
 fi

tcltk/netgen.tcl.in

@@ -20,10 +20,336 @@ foreach i $nlist {
    }
 }
 
-if {${tcl_version} >= 8.6} {
-   load -lazy TCL_DIR/tclnetgenSHDLIB_EXT
-} else {
-   load TCL_DIR/tclnetgenSHDLIB_EXT
+# -lazy option not needed if stubs libraries are handled correctly
+# load -lazy TCL_DIR/tclnetgenSHDLIB_EXT
+
+load TCL_DIR/tclnetgenSHDLIB_EXT
+
+#----------------------------------------------------------------
+# Convert LVS list result into a JSON file 
+#----------------------------------------------------------------
+
+proc netgen::convert_to_json {filename lvs_final} {
+   set pidx [string last . $filename]
+   set jsonname [string replace $filename $pidx end ".json"]
+   if {![catch {open $jsonname w} fjson]} {
+      puts $fjson "\["
+      # Outer list is of each cell compared
+      set clen [llength $lvs_final]
+      set cidx 0
+      foreach circuit $lvs_final {
+         incr cidx
+         puts $fjson "  \{"
+         set nkeys [llength $circuit]
+         set kidx 0
+	 foreach {key value} $circuit {
+            incr kidx 2
+	    switch $key {
+	       name {
+	          puts $fjson "   \"${key}\": \["
+		  set cktval [lindex $value 0]
+		  puts $fjson "      \"${cktval}\","
+		  set cktval [lindex $value 1]
+		  puts $fjson "      \"${cktval}\""
+		  if {$kidx == $nkeys} {
+		     puts $fjson "   \]"
+		  } else {
+		     puts $fjson "   \],"
+		  }
+	       }
+	       pins {
+	          puts $fjson "   \"${key}\": \["
+	          puts $fjson "      \["
+		  set cktval [lindex $value 0]
+		  foreach pin [lrange $cktval 0 end-1] {
+		     puts $fjson "        \"$pin\","
+		  }
+		  set pin [lindex $cktval end]
+		  puts $fjson "        \"$pin\""
+	          puts $fjson "      \], \["
+		  set cktval [lindex $value 1]
+		  foreach pin [lrange $cktval 0 end-1] {
+		     puts $fjson "        \"$pin\","
+		  }
+		  set pin [lindex $cktval end]
+		  puts $fjson "        \"$pin\""
+	          puts $fjson "      \]"
+		  if {$kidx == $nkeys} {
+		     puts $fjson "   \]"
+		  } else {
+		     puts $fjson "   \],"
+		  }
+	       }
+               nets {
+	          puts $fjson "   \"${key}\": \["
+		  set cktval [lindex $value 0]
+		  puts $fjson "    $cktval,"
+		  set cktval [lindex $value 1]
+		  puts $fjson "    $cktval"
+		  if {$kidx == $nkeys} {
+		     puts $fjson "   \]"
+		  } else {
+		     puts $fjson "   \],"
+		  }
+               }
+	       devices {
+	          puts $fjson "   \"${key}\": \["
+	          puts $fjson "       \["
+		  set cktval [lindex $value 0]
+		  foreach dev [lrange $cktval 0 end-1] {
+		     set devname [lindex $dev 0]
+		     set devnum  [lindex $dev 1]
+		     puts $fjson "         \[\"${devname}\", ${devnum}\],"
+		  }
+		  set dev [lindex $cktval end]
+		  set devname [lindex $dev 0]
+		  set devnum  [lindex $dev 1]
+		  puts $fjson "         \[\"${devname}\", ${devnum} \]"
+	          puts $fjson "       \], \["
+		  set cktval [lindex $value 1]
+		  foreach dev [lrange $cktval 0 end-1] {
+		     set devname [lindex $dev 0]
+		     set devnum  [lindex $dev 1]
+		     puts $fjson "         \[\"${devname}\", ${devnum} \],"
+		  }
+		  set dev [lindex $cktval end]
+		  set devname [lindex $dev 0]
+		  set devnum  [lindex $dev 1]
+		  puts $fjson "         \[\"${devname}\", ${devnum} \]"
+	          puts $fjson "       \]"
+		  if {$kidx == $nkeys} {
+		     puts $fjson "   \]"
+		  } else {
+		     puts $fjson "   \],"
+		  }
+	       }
+	       goodnets -
+	       badnets {
+	          puts $fjson "   \"${key}\": \["
+		  set glen [llength $value]
+		  set gidx 0
+		  foreach group $value {
+		     incr gidx
+	             puts $fjson "      \["
+	             puts $fjson "        \["
+		     set cktval [lindex $group 0]
+		     set nlen [llength $cktval]
+		     set nidx 0
+		     foreach net $cktval {
+			incr nidx
+	                puts $fjson "          \["
+			set netname [lindex $net 0]
+		        puts $fjson "            \"$netname\","
+		        puts $fjson "            \["
+			set netconn [lindex $net 1]
+			foreach fanout [lrange $netconn 0 end-1] {
+			   set devname [lindex $fanout 0]
+			   set pinname [lindex $fanout 1]
+			   set count [lindex $fanout 2]
+			   if {$count == {}} {set count 0}
+		           puts $fjson "              \[ \"$devname\", \"$pinname\", $count \],"
+			}
+			set fanout [lindex $netconn end]
+			set devname [lindex $fanout 0]
+			set pinname [lindex $fanout 1]
+			set count [lindex $fanout 2]
+			if {$count == {}} {set count 0}
+		        puts $fjson "              \[ \"$devname\", \"$pinname\", $count \]"
+		        puts $fjson "            \]"
+			if {$nidx == $nlen} {
+	                   puts $fjson "          \]"
+			} else {
+	                   puts $fjson "          \],"
+			}
+		     }
+	             puts $fjson "        \], \["
+		     set cktval [lindex $group 1]
+		     set nlen [llength $cktval]
+		     set nidx 0
+		     foreach net $cktval {
+			incr nidx
+	                puts $fjson "          \["
+			set netname [lindex $net 0]
+		        puts $fjson "            \"$netname\","
+		        puts $fjson "            \["
+			set netconn [lindex $net 1]
+			foreach fanout [lrange $netconn 0 end-1] {
+			   set devname [lindex $fanout 0]
+			   set pinname [lindex $fanout 1]
+			   set count [lindex $fanout 2]
+			   if {$count == {}} {set count 0}
+		           puts $fjson "              \[ \"$devname\", \"$pinname\", $count \],"
+			}
+			set fanout [lindex $netconn end]
+			set devname [lindex $fanout 0]
+			set pinname [lindex $fanout 1]
+			set count [lindex $fanout 2]
+			if {$count == {}} {set count 0}
+		        puts $fjson "              \[ \"$devname\", \"$pinname\", $count \]"
+		        puts $fjson "            \]"
+			if {$nidx == $nlen} {
+	                   puts $fjson "          \]"
+			} else {
+	                   puts $fjson "          \],"
+			}
+		     }
+	             puts $fjson "        \]"
+		     if {$gidx == $glen} {
+	                puts $fjson "      \]"
+		     } else {
+	                puts $fjson "      \],"
+		     }
+		  }
+		  if {$kidx == $nkeys} {
+		     puts $fjson "   \]"
+		  } else {
+		     puts $fjson "   \],"
+		  }
+	       }
+	       goodelements -
+	       badelements {
+	          puts $fjson "   \"${key}\": \["
+		  set glen [llength $value]
+		  set gidx 0
+		  foreach group $value {
+		     incr gidx
+	             puts $fjson "      \["
+	             puts $fjson "        \["
+		     set cktval [lindex $group 0]
+		     set ilen [llength $cktval]
+		     set iidx 0
+		     foreach inst $cktval {
+			incr iidx
+	                puts $fjson "          \["
+			set instname [lindex $inst 0]
+		        puts $fjson "            \"$instname\","
+		        puts $fjson "            \["
+			set instpins [lindex $inst 1]
+			foreach fanout [lrange $instpins 0 end-1] {
+			   set pinname [lindex $fanout 0]
+			   set count [lindex $fanout 1]
+			   if {$count == {}} {set count 0}
+		           puts $fjson "              \[ \"$pinname\", $count \],"
+			}
+			set fanout [lindex $instpins end]
+			set pinname [lindex $fanout 0]
+			set count [lindex $fanout 1]
+			if {$count == {}} {set count 0}
+		        puts $fjson "              \[ \"$pinname\", $count \]"
+		        puts $fjson "            \]"
+			if {$iidx == $ilen} {
+	                   puts $fjson "          \]"
+			} else {
+	                   puts $fjson "          \],"
+			}
+		     }
+	             puts $fjson "        \], \["
+		     set cktval [lindex $group 1]
+		     set ilen [llength $cktval]
+		     set iidx 0
+		     foreach inst $cktval {
+			incr iidx
+	                puts $fjson "          \["
+			set instname [lindex $inst 0]
+		        puts $fjson "            \"$instname\","
+		        puts $fjson "            \["
+			set instpins [lindex $inst 1]
+			foreach fanout [lrange $instpins 0 end-1] {
+			   set pinname [lindex $fanout 0]
+			   set count [lindex $fanout 1]
+			   if {$count == {}} {set count 0}
+		           puts $fjson "              \[ \"$pinname\", $count \],"
+			}
+			set fanout [lindex $instpins end]
+			set pinname [lindex $fanout 0]
+			set count [lindex $fanout 1]
+			if {$count == {}} {set count 0}
+		        puts $fjson "              \[ \"$pinname\", $count \]"
+		        puts $fjson "            \]"
+			if {$iidx == $ilen} {
+	                   puts $fjson "          \]"
+			} else {
+	                   puts $fjson "          \],"
+			}
+		     }
+	             puts $fjson "        \]"
+		     if {$gidx == $glen} {
+	                puts $fjson "      \]"
+		     } else {
+	                puts $fjson "      \],"
+		     }
+		  }
+		  if {$kidx == $nkeys} {
+		     puts $fjson "   \]"
+		  } else {
+		     puts $fjson "   \],"
+		  }
+	       }
+	       properties {
+	          puts $fjson "   \"${key}\": \["
+		  set plen [llength $value]
+                  set pidx 0
+		  foreach instance $value {
+		     incr pidx
+	             puts $fjson "      \["
+		     set instnames [lindex $instance 0]
+		     set instname0 [lindex $instnames 0]
+	             puts $fjson "         \["
+		     puts $fjson "           \"${instname0}\","
+	             puts $fjson "           \["
+		     foreach property [lrange $instance 1 end-1] {
+		        set prop0 [lindex $property 0]
+			set propname [lindex $prop0 0]
+			set propval [lindex $prop0 1]
+		        puts $fjson "             \[\"${propname}\", \"${propval}\"\],"
+		     }
+		     set property [lindex $instance end]
+		     set prop0 [lindex $property 0]
+		     set propname [lindex $prop0 0]
+		     set propval [lindex $prop0 1]
+		     puts $fjson "             \[\"${propname}\", \"${propval}\"\]"
+	             puts $fjson "           \]"
+	             puts $fjson "         \],"
+		     set instname1 [lindex $instnames 1]
+	             puts $fjson "         \["
+		     puts $fjson "           \"${instname1}\","
+	             puts $fjson "           \["
+		     foreach property [lrange $instance 1 end-1] {
+		        set prop1 [lindex $property 1]
+			set propname [lindex $prop1 0]
+			set propval [lindex $prop1 1]
+		        puts $fjson "             \[\"${propname}\", \"${propval}\"\],"
+		     }
+		     set property [lindex $instance end]
+		     set prop1 [lindex $property 1]
+		     set propname [lindex $prop1 0]
+		     set propval [lindex $prop1 1]
+		     puts $fjson "             \[\"${propname}\", \"${propval}\"\]"
+	             puts $fjson "           \]"
+	             puts $fjson "         \]"
+		     if {$pidx == $plen} {
+	                puts $fjson "      \]"
+		     } else {
+	                puts $fjson "      \],"
+		     }
+		  }
+		  if {$kidx == $nkeys} {
+		     puts $fjson "   \]"
+		  } else {
+		     puts $fjson "   \],"
+		  }
+	       }
+	    }
+	 }
+         if {$cidx == $clen} {
+            puts $fjson "  \}"
+	 } else {
+            puts $fjson "  \},"
+	 }
+      }
+      puts $fjson "\]"
+   }
+   close $fjson
 }
 
 #----------------------------------------------------------------
@@ -34,9 +360,30 @@ if {${tcl_version} >= 8.6} {
 # Use the "canonical" command to parse the file and cell names,
 # although if the cells have not been read in yet, then the
 # original syntax of filename or {filename cellname} is required.
+#
+# "args" is passed to verify and may therefore contain only the
+# value "-list" or nothing.  If "-list", then output is returned
+# as a nested list.
 #----------------------------------------------------------------
 
-proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out}} {
+proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
+   set dolist 0
+   set dojson 0
+   foreach arg $args {
+      if {$arg == "-list"} {
+	 puts stdout "Generating list result"
+	 set dolist 1
+	 set lvs_final {}
+      } elseif {$arg == "-json"} {
+	 puts stdout "Generating JSON file result"
+	 set dolist 1
+	 set dojson 1
+	 set lvs_final {}
+      } elseif {$arg == "-blackbox"} {
+	 puts stdout "Treating empty subcircuits as black-box cells"
+	 netgen::model blackbox on
+      }
+   }
 
    # Allow name1 or name2 to be a list of {filename cellname},
    # A single <filename>, or any valid_cellname form if the
@@ -128,33 +475,56 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out}} {
       if {$perrors > 0} {
 	 puts stdout "Warning:  There were errors reading the setup file"
       }
-   } else {
+   } elseif {[string first nosetup $setupfile] < 0} {
       netgen::permute default	;# transistors and resistors
       netgen::property default
    }
 
-   puts stdout "Comparison output logged to file $logfile"
-   netgen::log file $logfile
-   netgen::log start
-   netgen::log echo off
-   set endval [netgen::compare hierarchical "$fnum1 $cell1" "$fnum2 $cell2"]
+   if {[string first nolog $logfile] < 0} {
+      puts stdout "Comparison output logged to file $logfile"
+      netgen::log file $logfile
+
+      netgen::log start
+      netgen::log echo off
+      set dolog true
+   } else {
+      set dolog false
+   }
+
+   if {$dolist == 1} {
+      set endval [netgen::compare -list hierarchical "$fnum1 $cell1" "$fnum2 $cell2"]
+   } else {
+      set endval [netgen::compare hierarchical "$fnum1 $cell1" "$fnum2 $cell2"]
+   }
    if {$endval == {}} {
       netgen::log put "No cells in queue!\n"
       return
    }
    set properr {}
    while {$endval != {}} {
-      netgen::run converge
+      if {$dolist == 1} {
+         netgen::run -list converge
+      } else {
+         netgen::run converge
+      }
       netgen::log echo on
       if {[verify equivalent]} {
 	 # Resolve automorphisms by pin and property
-         netgen::run resolve
+	 if {$dolist == 1} {
+            netgen::run -list resolve
+	 } else {
+            netgen::run resolve
+	 }
 	 set uresult [verify unique]
          if {$uresult == 0} {
 	    netgen::log put "   Networks match locally but not globally.\n"
 	    netgen::log put "   Probably connections are swapped.\n"
 	    netgen::log put "   Check the end of logfile ${logfile} for implicated nodes.\n"
-	    netgen::verify nodes
+	    if {$dolist == 1} {
+	       verify -list nodes
+	    } else {
+	       verify nodes
+	    }
 
 	    # Flatten the non-matching subcircuit (but not the top-level cells)
             if {[netgen::print queue] != {}} {
@@ -165,8 +535,13 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out}} {
 	 } else {
 	    # Match pins
             netgen::log echo off
-	    set result [equate pins "$fnum1 [lindex $endval 0]" \
-			"$fnum2 [lindex $endval 1]"]
+	    if {$dolist == 1} {
+		set result [equate -list pins "$fnum1 [lindex $endval 0]" \
+				"$fnum2 [lindex $endval 1]"]
+	    } else {
+		set result [equate pins "$fnum1 [lindex $endval 0]" \
+				"$fnum2 [lindex $endval 1]"]
+	    }
 	    if {$result != 0} {
 		equate classes "$fnum1 [lindex $endval 0]" \
 			 "$fnum2 [lindex $endval 1]"
@@ -183,17 +558,30 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out}} {
 	 }
       }
       netgen::log echo off
-      set endval [netgen::compare hierarchical]
+      if {$dolist == 1} {
+         catch {lappend lvs_final $lvs_out}
+         set lvs_out {}
+         set endval [netgen::compare -list hierarchical]
+      } else {
+         set endval [netgen::compare hierarchical]
+      }
    }
    netgen::log echo off
    puts stdout "Result: " nonewline
    netgen::log echo on
-   netgen::verify only
+   verify only
    if {$properr != {}} {
       netgen::log put "The following cells had property errors: $properr\n"
    }
-   netgen::log end
+   if {$dolog} {
+      netgen::log end
+   }
    puts stdout "LVS Done."
+   if {$dojson == 1} {
+      netgen::convert_to_json $logfile $lvs_final
+   } elseif {$dolist == 1} {
+      return $lvs_final
+   }
 }
 
 # It is important to make sure no netgen commands overlap with Tcl built-in

tcltk/tclnetgen.c

@@ -497,7 +497,9 @@ CommonParseCell(Tcl_Interp *interp, Tcl_Obj *objv,
 		fnum = -1;
 	    }
 	    else
-		filename = Tcl_GetString(fobj);
+		/* Both file numbers have been provided, so a	*/
+		/* filename is not required.			*/
+		filename = NULL;
 	}
 	else {
 	    filename = NULL;
@@ -696,11 +698,11 @@ _netgen_readnet(ClientData clientData,
 {
    char *formats[] = {
       "automatic", "ext", "extflat", "sim", "ntk", "spice",
-      "netgen", "actel", "xilinx", NULL
+      "verilog", "netgen", "actel", "xilinx", NULL
    };
    enum FormatIdx {
       AUTO_IDX, EXT_IDX, EXTFLAT_IDX, SIM_IDX, NTK_IDX,
-      SPICE_IDX, NETGEN_IDX, ACTEL_IDX, XILINX_IDX
+      SPICE_IDX, VERILOG_IDX, NETGEN_IDX, ACTEL_IDX, XILINX_IDX
    };
    struct nlist *tc;
    int result, index, filenum = -1;
@@ -769,7 +771,7 @@ _netgen_readnet(ClientData clientData,
 
    if (retstr) savstr = STRDUP(retstr);
 
-   // Check if the file is already loaded
+   // Check if the file is already loaded.
 
    tc = LookupCell(savstr);
    if (tc != NULL) {
@@ -801,6 +803,9 @@ _netgen_readnet(ClientData clientData,
          case SPICE_IDX:
             retstr = ReadSpice(savstr, &filenum);
             break;
+         case VERILOG_IDX:
+            retstr = ReadVerilog(savstr, &filenum);
+            break;
          case NETGEN_IDX:
             retstr = ReadNetgenFile(savstr, &filenum);
             break;
@@ -916,11 +921,13 @@ _netgen_writenet(ClientData clientData,
 {
    char *formats[] = {
       "ext", "sim", "ntk", "actel",
-      "spice", "wombat", "esacap", "netgen", "ccode", "xilinx", NULL
+      "spice", "verilog", "wombat", "esacap", "netgen",
+      "ccode", "xilinx", NULL
    };
    enum FormatIdx {
       EXT_IDX, SIM_IDX, NTK_IDX, ACTEL_IDX,
-      SPICE_IDX, WOMBAT_IDX, ESACAP_IDX, NETGEN_IDX, CCODE_IDX, XILINX_IDX
+      SPICE_IDX, VERILOG_IDX, WOMBAT_IDX, ESACAP_IDX, NETGEN_IDX,
+      CCODE_IDX, XILINX_IDX
    };
    int result, index, filenum;
    char *repstr;
@@ -961,6 +968,9 @@ _netgen_writenet(ClientData clientData,
       case SPICE_IDX:
          SpiceCell(repstr, filenum, "");
          break;
+      case VERILOG_IDX:
+         VerilogModule(repstr, filenum, "");
+         break;
       case WOMBAT_IDX:
          Wombat(repstr,NULL);
          break;
@@ -1435,9 +1445,9 @@ _netgen_cells(ClientData clientData,
    char *optstart;
    int filenum = -1;
    struct nlist *np = NULL;
-   int result, dolist = 0;
+   int result, printopt, dolist = 0, doall = 0, dotop = 0;
 
-   if (objc > 1) {
+   while (objc > 1) {
       optstart = Tcl_GetString(objv[1]);
       if (*optstart == '-') optstart++;
       if (!strcmp(optstart, "list")) {
@@ -1445,27 +1455,41 @@ _netgen_cells(ClientData clientData,
 	 objv++;
 	 objc--;
       }
+      else if (!strcmp(optstart, "all")) {
+	 doall = 1;
+	 objv++;
+	 objc--;
+      }
+      else if (!strcmp(optstart, "top")) {
+	 dotop = 1;
+	 objv++;
+	 objc--;
+      }
+      else {
+	 result = CommonParseCell(interp, objv[1], &np, &filenum);
+	 if (result != TCL_OK) return result;
+	 objv++;
+	 objc--;
+      }
    }
 
-   if (objc == 1) {
-      PrintCellHashTable((dolist) ? 2 : 0, -1);
-   }
-   else if (objc != 2) {
-      Tcl_WrongNumArgs(interp, 1, objv, "[list] [-all|-top|valid_filename]");
+   if (objc != 1) {
+      Tcl_WrongNumArgs(interp, 1, objv, "[list] [-top] [-all] [valid_filename]");
       return TCL_ERROR;
    }
    else {
       Tcl_Obj *lobj;
 
-      repstr = Tcl_GetString(objv[1]);
-      if (!strncmp(repstr, "-top", 4)) {
+      if (dotop) {
 	 if (dolist)
 	     lobj = Tcl_NewListObj(0, NULL);
 	 else
 	     Fprintf(stdout, "Top level cells: ");
 	 np = FirstCell();
 	 while (np != NULL) {
-	    if (np->flags & CELL_TOP) {
+	    if ((np->flags & CELL_TOP) && ((filenum == -1) ||
+			(np->file == filenum))) {
+		
 		if (dolist)
 		    Tcl_ListObjAppendElement(interp, lobj,
 			Tcl_NewStringObj(np->name, -1));
@@ -1481,11 +1505,13 @@ _netgen_cells(ClientData clientData,
 
 	 return TCL_OK;
       }
-      else if (strncmp(repstr, "-all", 4)) {
-	 result = CommonParseCell(interp, objv[1], &np, &filenum);
-	 if (result != TCL_OK) return result;
+      else {
+	 if (dolist)
+	    printopt = (doall) ? 3 : 2;
+	 else
+	    printopt = (doall) ? 1 : 0;
+         PrintCellHashTable(printopt, filenum);
       }
-      PrintCellHashTable((dolist) ? 2 : 1, filenum);
    }
    return TCL_OK;
 }
@@ -1526,8 +1552,27 @@ _netgen_model(ClientData clientData,
       return TCL_ERROR;
    }
 
+   /* Check for "model blackbox on|off"	*/
+   /* Behavior is to treat empty subcircuits as blackbox cells */
+
+   if ((objc > 1) && !strcmp(Tcl_GetString(objv[1]), "blackbox")) {
+      if ((objc > 2) && !strcmp(Tcl_GetString(objv[2]), "on")) {
+	 auto_blackbox = TRUE;
+	 return TCL_OK;
+      }
+      else if ((objc > 2) && !strcmp(Tcl_GetString(objv[2]), "off")) {
+	 auto_blackbox = FALSE;
+	 return TCL_OK;
+      }
+      else if (objc == 2) {
+	 Tcl_SetObjResult(interp, Tcl_NewBooleanObj(auto_blackbox));
+	 return TCL_OK;
+      }
+   }
+
    result = CommonParseCell(interp, objv[1], &tp, &fnum);
-   if (result != TCL_OK) return result;
+   if (result != TCL_OK)
+      return result;
 
    if (objc == 3) {
       model = Tcl_GetString(objv[2]);
@@ -1639,6 +1684,13 @@ _netgen_model(ClientData clientData,
 	    retclass = modelclasses[SUBCKT_IDX];
 	    break;
 
+	 case CLASS_MODULE:
+	    if (auto_blackbox)
+		retclass = modelclasses[BLACKBOX_IDX];
+	    else
+		retclass = modelclasses[MODULE_IDX];
+	    break;
+
 	 default: /* (includes case CLASS_UNDEF) */
 	    retclass = modelclasses[UNDEF_IDX];
 	    break;
@@ -1937,13 +1989,24 @@ int
 _netcmp_compare(ClientData clientData,
     Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
-   char *name1, *name2, *file1, *file2;
-   int fnum1, fnum2;
+   char *name1, *name2, *file1, *file2, *optstart;
+   int fnum1, fnum2, dolist = 0;
    int dohierarchy = FALSE;
    int assignonly = FALSE;
    int argstart = 1, qresult, llen, result;
    struct Correspond *nextcomp;
    struct nlist *tp;
+   Tcl_Obj *flist = NULL;
+
+   if (objc > 1) {
+      optstart = Tcl_GetString(objv[1]);
+      if (*optstart == '-') optstart++;
+      if (!strcmp(optstart, "list")) {
+	 dolist = 1;
+	 objv++;
+	 objc--;
+      }
+   }
 
    if (objc > 1) {
       if (!strncmp(Tcl_GetString(objv[argstart]), "assign", 6)) {
@@ -2022,10 +2085,6 @@ _netcmp_compare(ClientData clientData,
       return TCL_ERROR;
    }
 
-   // WIP!
-   // CleanupPins(name1, fnum1);		// Remove unconnected pins
-   // CleanupPins(name2, fnum2);		// Remove unconnected pins
-
    UniquePins(name1, fnum1);		// Check for and remove duplicate pins
    UniquePins(name2, fnum2);		// Check for and remove duplicate pins
 
@@ -2035,22 +2094,15 @@ _netcmp_compare(ClientData clientData,
       ConvertGlobals(name2, fnum2);
    }
 
-   // Run cleanup a 2nd time;  this corrects for cells that have no ports
-   // but define global nodes that are brought out as ports by
-   // ConvertGlobals().
-
-   // WIP!
-   // CleanupPins(name1, fnum1);
-   // CleanupPins(name2, fnum2);
-
-   CreateTwoLists(name1, fnum1, name2, fnum2);
+   CreateTwoLists(name1, fnum1, name2, fnum2, dolist);
    while (PrematchLists(name1, fnum1, name2, fnum2) > 0) {
       Fprintf(stdout, "Making another compare attempt.\n");
-      CreateTwoLists(name1, fnum1, name2, fnum2);
+      CreateTwoLists(name1, fnum1, name2, fnum2, dolist);
    }
 
    // Return the names of the two cells being compared, if doing "compare
-   // hierarchical"
+   // hierarchical".  If "-list" was specified, then append the output
+   // to the end of the list.
 
    if (dohierarchy) {
       Tcl_Obj *lobj;
@@ -2248,6 +2300,19 @@ _netcmp_run(ClientData clientData,
    };
    int result, index;
    int automorphisms;
+   char *optstart;
+   int dolist;
+
+   dolist = 0;
+   if (objc > 1) {
+      optstart = Tcl_GetString(objv[1]);
+      if (*optstart == '-') optstart++;
+      if (!strcmp(optstart, "list")) {
+	 dolist = 1;
+	 objv++;
+	 objc--;
+      }
+   }
 
    if (objc == 1)
       index = RESOLVE_IDX;
@@ -2266,8 +2331,13 @@ _netcmp_run(ClientData clientData,
 	 else {
 	    enable_interrupt();
 	    while (!Iterate() && !InterruptPending);
-	    _netcmp_verify(clientData, interp, 1, NULL);
+	    if (dolist) {
+	       result = _netcmp_verify(clientData, interp, 2, objv - 1);
+	    }
+	    else
+	       result = _netcmp_verify(clientData, interp, 1, NULL);
 	    disable_interrupt();
+	    if (result != TCL_OK) return result;
 	 }
 	 break;
       case RESOLVE_IDX:
@@ -2310,7 +2380,7 @@ _netcmp_run(ClientData clientData,
 	    }
 	    if (PropertyErrorDetected) {
 	       Fprintf(stdout, "There were property errors.\n");
-	       PrintPropertyResults();
+	       PrintPropertyResults(dolist);
 	    }
 	    disable_interrupt();
          }
@@ -2324,9 +2394,17 @@ _netcmp_run(ClientData clientData,
 /* Syntax: netgen::verify [option]			*/
 /* 	options: nodes, elements, only, all,		*/
 /*		 equivalent, or unique.			*/
+/* 	option "-list" may be used with nodes, elements	*/
+/*		 all, or no option.			*/
 /* Formerly: v						*/
 /* Results:						*/
+/*	For only, equivalent, unique:  Return 1 if 	*/
+/*	verified, zero if not.				*/
 /* Side Effects:					*/
+/*	For options elements, nodes, and all without	*/
+/*	option -list:  Write output to log file.	*/
+/*	For -list options, append list to global	*/
+/*	variable "lvs_out", if it exists.		*/
 /*------------------------------------------------------*/
 
 int
@@ -2339,8 +2417,23 @@ _netcmp_verify(ClientData clientData,
    enum OptionIdx {
       NODE_IDX, ELEM_IDX, PROP_IDX, ONLY_IDX, ALL_IDX, EQUIV_IDX, UNIQUE_IDX
    };
+   char *optstart;
    int result, index = -1;
    int automorphisms;
+   int dolist = 0;
+   Tcl_Obj *egood, *ebad, *ngood, *nbad;
+
+   if (objc > 1) {
+      optstart = Tcl_GetString(objv[1]);
+      if (*optstart == '-') optstart++;
+      if (!strcmp(optstart, "list")) {
+	 dolist = 1;
+	 egood = ngood = NULL;
+	 ebad = nbad = NULL;
+	 objv++;
+	 objc--;
+      }
+   }
 
    if (objc != 1 && objc != 2) {
       Tcl_WrongNumArgs(interp, 1, objv,	
@@ -2371,14 +2464,28 @@ _netcmp_verify(ClientData clientData,
 	 if (objc == 1 || index == NODE_IDX || index == ALL_IDX) {
 	     if (Debug == TRUE)
 	        PrintIllegalNodeClasses();	// Old style
-	     else
-	        FormatIllegalNodeClasses();	// Side-by-side
+	     else {
+	        FormatIllegalNodeClasses(); // Side-by-side, to log file
+	        if (dolist) {
+	           nbad = ListNodeClasses(FALSE);	// As Tcl nested list
+#if 0
+	           ngood = ListNodeClasses(TRUE);	// As Tcl nested list
+#endif
+		}
+	     }
 	 }
 	 if (objc == 1 || index == ELEM_IDX || index == ALL_IDX) {
 	     if (Debug == TRUE)
 	        PrintIllegalElementClasses();	// Old style
-	     else
-	        FormatIllegalElementClasses();	// Side-by-side
+	     else {
+	        FormatIllegalElementClasses();	// Side-by-side, to log file
+	        if (dolist) {
+	           ebad = ListElementClasses(FALSE); // As Tcl nested list
+#if 0
+	           egood = ListElementClasses(TRUE); // As Tcl nested list
+#endif
+		}
+	     }
 	 }
 	 disable_interrupt();
 	 if (index == EQUIV_IDX || index == UNIQUE_IDX)
@@ -2409,9 +2516,57 @@ _netcmp_verify(ClientData clientData,
 		   Fprintf(stdout, "Property errors were found.\n");
 	    }
 	 }
-         if ((index == PROP_IDX) && (PropertyErrorDetected != 0)) {
-	    PrintPropertyResults();
+#if 0
+	 if (dolist) {
+	    ngood = ListNodeClasses(TRUE);	// As Tcl nested list
+	    egood = ListElementClasses(TRUE);	// As Tcl nested list
 	 }
+#endif
+         if ((index == PROP_IDX) && (PropertyErrorDetected != 0)) {
+	    PrintPropertyResults(dolist);
+	 }
+      }
+   }
+
+   /* If "dolist" has been specified, then return the	*/
+   /* list-formatted output.  For "verify nodes" or	*/
+   /* "verify elements", return the associated list.	*/
+   /* For "verify" or "verify all", return a nested	*/
+   /* list of {node list, element list}.		*/
+
+   if (dolist)
+   {
+      if (objc == 1 || index == NODE_IDX || index == ALL_IDX) {
+	 if (nbad == NULL) nbad = Tcl_NewListObj(0, NULL);
+	 Tcl_SetVar2Ex(interp, "lvs_out", NULL,
+		Tcl_NewStringObj("badnets", -1),
+		TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
+	 Tcl_SetVar2Ex(interp, "lvs_out", NULL, nbad,
+		TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
+#if 0
+	 if (ngood == NULL) ngood = Tcl_NewListObj(0, NULL);
+	 Tcl_SetVar2Ex(interp, "lvs_out", NULL,
+		Tcl_NewStringObj("goodnets", -1),
+		TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
+	 Tcl_SetVar2Ex(interp, "lvs_out", NULL, ngood,
+		TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
+#endif
+      }
+      if (objc == 1 || index == ELEM_IDX || index == ALL_IDX) {
+	 if (ebad == NULL) ebad = Tcl_NewListObj(0, NULL);
+	 Tcl_SetVar2Ex(interp, "lvs_out", NULL,
+		Tcl_NewStringObj("badelements", -1),
+		TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
+	 Tcl_SetVar2Ex(interp, "lvs_out", NULL, ebad,
+		TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
+#if 0
+	 if (egood == NULL) egood = Tcl_NewListObj(0, NULL);
+	 Tcl_SetVar2Ex(interp, "lvs_out", NULL,
+		Tcl_NewStringObj("goodelements", -1),
+		TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
+	 Tcl_SetVar2Ex(interp, "lvs_out", NULL, egood,
+		TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
+#endif
       }
    }
    return TCL_OK;
@@ -2518,10 +2673,10 @@ _netcmp_ignore(ClientData clientData,
     Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *options[] = {
-      "class", NULL
+      "class", "shorted", NULL
    };
    enum OptionIdx {
-      CLASS_IDX
+      CLASS_IDX, SHORTED_IDX
    };
    int result, index;
    int file = -1;
@@ -2542,7 +2697,14 @@ _netcmp_ignore(ClientData clientData,
       Tcl_WrongNumArgs(interp, 1, objv, "[class] valid_cellname");
       return TCL_ERROR;
    }
-   IgnoreClass(name, file);
+   switch (index) {
+      case CLASS_IDX:
+         IgnoreClass(name, file, IGNORE_CLASS);
+	 break;
+      case SHORTED_IDX:
+         IgnoreClass(name, file, IGNORE_SHORTED);
+	 break;
+   }
    return TCL_OK;
 }
 
@@ -2565,13 +2727,23 @@ _netcmp_equate(ClientData clientData,
       NODE_IDX, ELEM_IDX, CLASS_IDX, PINS_IDX
    };
    int result, index;
-   char *name1 = NULL, *name2 = NULL;
-   struct nlist *tp1, *tp2;
+   char *name1 = NULL, *name2 = NULL, *optstart;
+   struct nlist *tp1, *tp2, *SaveC1, *SaveC2;
    struct objlist *ob1, *ob2;
    int file1, file2;
-   int i, l1, l2, ltest, lent;
+   int i, l1, l2, ltest, lent, dolist = 0;
    Tcl_Obj *tobj1, *tobj2, *tobj3;
 
+   if (objc > 1) {
+      optstart = Tcl_GetString(objv[1]);
+      if (*optstart == '-') optstart++;
+      if (!strcmp(optstart, "list")) {
+	 dolist = 1;
+	 objv++;
+	 objc--;
+      }
+   }
+
    if ((objc != 2) && (objc != 4) && (objc != 6)) {
       Tcl_WrongNumArgs(interp, 1, objv, "?nodes|elements|classes|pins? name1 name2");
       return TCL_ERROR;
@@ -2727,7 +2899,7 @@ _netcmp_equate(ClientData clientData,
 	 break;
 
       case PINS_IDX:
-	 if (ElementClasses == NULL) {
+	 if ((ElementClasses == NULL) && (auto_blackbox == FALSE)) {
 	    if (CurrentCell == NULL)
 		Fprintf(stderr, "Equate elements:  no current cell.\n");
 	    Fprintf(stderr, "Equate pins:  cell %s and/or %s has no elements.\n",
@@ -2735,19 +2907,41 @@ _netcmp_equate(ClientData clientData,
 	    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(0));
 	    return TCL_OK;
 	 }
-	 if (tp1 == Circuit1 && tp2 == Circuit2) {
-	    if (MatchPins(tp1, tp2)) {
-	       Fprintf(stdout, "Cell pin lists are equivalent.\n");
-	       Tcl_SetObjResult(interp, Tcl_NewBooleanObj(1));
-	    }
-	    else {
-	       Fprintf(stdout, "Cell pin lists for %s and %s altered to match.\n",
-			name1, name2);
-	       Tcl_SetObjResult(interp, Tcl_NewBooleanObj(0));
-	    }
+	 else if (ElementClasses == NULL) {
+	    /* This has been called outside of a netlist compare,	*/
+	    /* probably to force name matching of pins on black-box	*/
+	    /* devices.  But MatchPins only works if tp1 == Circuit1	*/
+	    /* and tp2 == Circuit2, so preserve these values and 	*/
+	    /* recover afterward (what a hack).				*/
+	    SaveC1 = Circuit1;
+	    SaveC2 = Circuit2;
+	    Circuit1 = tp1;
+	    Circuit2 = tp2;
+	 }
+
+	 // Check for and remove duplicate pins.  Normally this is called
+	 // from "compare", but since "equate pins" may be called outside
+	 // of and before "compare", pin uniqueness needs to be ensured.
+
+	 UniquePins(tp1->name, tp1->file);
+	 UniquePins(tp2->name, tp2->file);
+
+	 result = MatchPins(tp1, tp2, dolist);
+	 if (result == 2) {
+	    Fprintf(stdout, "Cells have no pins;  pin matching not needed.\n");
+	 }
+	 else if (result > 0) {
+	    Fprintf(stdout, "Cell pin lists are equivalent.\n");
 	 }
 	 else {
-	    Fprintf(stderr, "Function not yet defined outside of LVS scope.\n");
+	    Fprintf(stdout, "Cell pin lists for %s and %s altered to match.\n",
+			name1, name2);
+	 }
+	 Tcl_SetObjResult(interp, Tcl_NewIntObj(result));
+	 if (ElementClasses == NULL) {
+	    /* Recover temporarily set global variables (see above) */
+	    Circuit1 = SaveC1;
+	    Circuit2 = SaveC2;
 	 }
 	 break;
 
@@ -2966,6 +3160,17 @@ _netcmp_equate(ClientData clientData,
 /*	merge	  --- set property merge behavior	*/
 /* or							*/
 /*	netgen::property default			*/
+/* or							*/
+/*	netgen::property <device>|<model> <option>	*/
+/*		yes|no					*/
+/* Where <option> is one of:				*/
+/*     serial	--- allow/prohibit serial combination	*/
+/*     parallel --- allow/prohibit parallel combination	*/
+/* or							*/
+/*	netgen::property parallel none			*/
+/*		--- prohibit parallel combinations by	*/
+/*		    default.				*/
+/*							*/
 /* Formerly: (none)					*/
 /* Results:						*/
 /* Side Effects:					*/
@@ -2983,10 +3188,12 @@ _netcmp_property(ClientData clientData,
     int ival, argstart;
 
     char *options[] = {
-	"add", "create", "remove", "delete", "tolerance", "merge", NULL
+	"add", "create", "remove", "delete", "tolerance", "merge", "serial",
+	"parallel", NULL
     };
     enum OptionIdx {
-	ADD_IDX, CREATE_IDX, REMOVE_IDX, DELETE_IDX, TOLERANCE_IDX, MERGE_IDX
+	ADD_IDX, CREATE_IDX, REMOVE_IDX, DELETE_IDX, TOLERANCE_IDX, MERGE_IDX,
+	SERIAL_IDX, PARALLEL_IDX
     };
     int result, index, idx2;
 
@@ -2998,10 +3205,18 @@ _netcmp_property(ClientData clientData,
     };
 
     char *mergeoptions[] = {
-	"none", "add", "add_critical", "par", "par_critical", NULL
+	"none", "add", "add_critical", "par", "par_critical",
+	"parallel", "parallel_critical", "ser_critical", "ser",
+	"serial_critical", "serial", NULL
     };
     enum MergeOptionIdx {
-	NONE_IDX, ADD_ONLY_IDX, ADD_CRIT_IDX, PAR_ONLY_IDX, PAR_CRIT_IDX
+	NONE_IDX, ADD_ONLY_IDX, ADD_CRIT_IDX,
+	PAR_ONLY_IDX, PAR_CRIT_IDX, PAR2_ONLY_IDX, PAR2_CRIT_IDX,
+	SER_CRIT_IDX, SER_IDX, SER2_CRIT_IDX, SER2_IDX
+    };
+    char *yesno[] = {
+	"on", "yes", "true", "enable", "allow",
+	"off", "no", "false", "disable", "prohibit", NULL
     };
 
     if (objc < 2) {
@@ -3018,8 +3233,8 @@ _netcmp_property(ClientData clientData,
 	/* compare source/drain area and perimeter.		*/
 
 	tp = FirstCell();
-	 while (tp != NULL) {
-	     switch (tp->class) {
+	while (tp != NULL) {
+	    switch (tp->class) {
 		case CLASS_NMOS: case CLASS_PMOS: case CLASS_FET3:
 		case CLASS_NMOS4: case CLASS_PMOS4: case CLASS_FET4:
 		case CLASS_FET:
@@ -3030,7 +3245,9 @@ _netcmp_property(ClientData clientData,
 		    PropertyDelete(tp->name, tp->file, "pd");
 		    break;
 		case CLASS_RES: case CLASS_RES3:
-		    PropertyMerge(tp->name, tp->file, "l", MERGE_PAR_CRIT);
+		    PropertyMerge(tp->name, tp->file, "w", MERGE_ADD_CRIT);
+		    PropertyMerge(tp->name, tp->file, "l", MERGE_SER_CRIT);
+		    tp->flags |= COMB_SERIAL;
 		    break;
 		case CLASS_CAP: case CLASS_ECAP: case CLASS_CAP3:
 		    // NOTE:  No attempt to combine area, width, or length;
@@ -3039,12 +3256,29 @@ _netcmp_property(ClientData clientData,
 		    break;
 		case CLASS_INDUCTOR:
 		    PropertyMerge(tp->name, tp->file, "value", MERGE_PAR_CRIT);
+		    tp->flags |= COMB_SERIAL;
 		    break;
 	    }
 	    tp = NextCell();
 	}
 	return TCL_OK;
     }
+    else if ((objc == 3) && (!strcmp(Tcl_GetString(objv[1]), "parallel"))) {
+	if (!strcmp(Tcl_GetString(objv[2]), "none")) {
+	    GlobalParallelNone = TRUE;
+	    SetParallelCombine(FALSE);
+	}
+	else if (!strcmp(Tcl_GetString(objv[2]), "all")) {
+	    GlobalParallelNone = FALSE;
+	    SetParallelCombine(TRUE);
+	}
+	else {
+	    Tcl_SetResult(interp, "Bad option, should be property parallel none|all",
+			NONE);
+	    return TCL_ERROR;
+	}
+	return TCL_OK;
+    }
 
     result = CommonParseCell(interp, objv[1], &tp, &fnum);
     if (result != TCL_OK) return result;
@@ -3094,6 +3328,45 @@ _netcmp_property(ClientData clientData,
 	    argstart = 3;
 
 	switch (index) {
+	    case SERIAL_IDX:
+	    case PARALLEL_IDX:
+                if (objc == 3) {
+		    if (index == SERIAL_IDX) {
+			tobj1 = Tcl_NewBooleanObj((tp->flags & COMB_SERIAL) ? 1 : 0);
+			Tcl_SetObjResult(interp, tobj1);
+			return TCL_OK;
+		    }
+		    else {
+			tobj1 = Tcl_NewBooleanObj((tp->flags & COMB_NO_PARALLEL) ? 0 : 1);
+			Tcl_SetObjResult(interp, tobj1);
+			return TCL_OK;
+		    }
+		}
+		else if (objc == 4) {
+		    if (Tcl_GetIndexFromObj(interp, objv[3],
+				(CONST84 char **)yesno,
+				"combine", 0, &idx2) != TCL_OK) {
+		        Tcl_WrongNumArgs(interp, 3, objv, "enable|disable");
+		        return TCL_ERROR;
+                    }
+                    if (idx2 <= 4) {	/* true, enable, etc. */
+			if (index == SERIAL_IDX)
+			    tp->flags |= COMB_SERIAL;
+			else
+			    tp->flags &= ~COMB_NO_PARALLEL;
+		    }
+		    else {	/* false, disable, etc. */
+			if (index == SERIAL_IDX)
+			    tp->flags &= ~COMB_SERIAL;
+			else
+			    tp->flags |= COMB_NO_PARALLEL;
+		    }
+		}
+		else {
+		    Tcl_WrongNumArgs(interp, 2, objv, "serial|parallel enable|disable");
+		    return TCL_ERROR;
+		}
+		break;
 
 	    case ADD_IDX:
 	    case CREATE_IDX:
@@ -3297,11 +3570,21 @@ _netcmp_property(ClientData clientData,
 				mergeval = MERGE_ADD_CRIT;
 				break;
 			    case PAR_ONLY_IDX:
+			    case PAR2_ONLY_IDX:
 				mergeval = MERGE_PAR;
 				break;
 			    case PAR_CRIT_IDX:
+			    case PAR2_CRIT_IDX:
 				mergeval = MERGE_PAR_CRIT;
 				break;
+			    case SER_CRIT_IDX:
+			    case SER2_CRIT_IDX:
+				mergeval = MERGE_SER_CRIT;
+				break;
+			    case SER_IDX:
+			    case SER2_IDX:
+				mergeval = MERGE_SER;
+				break;
 			}
 			PropertyMerge(tp->name, fnum, Tcl_GetString(tobj1), mergeval);
 		    }
@@ -3807,7 +4090,7 @@ int Tclnetgen_Init(Tcl_Interp *interp)
    if (cadroot == NULL) cadroot = CAD_DIR;
    Tcl_SetVar(interp, "CAD_ROOT", cadroot, TCL_GLOBAL_ONLY);
 
-   Tcl_PkgProvide(interp, "Tclnetgen", "1.1");
+   Tcl_PkgProvide(interp, "Tclnetgen", NETGEN_VERSION);
 
    if ((consoleinterp = Tcl_GetMaster(interp)) == NULL)
       consoleinterp = interp;