[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

gEDA-cvs: gaf.git: branch: master updated (1.6.1-20100214-188-gf5ada1d)



The branch, master has been updated
  discards  0e3b488a4f76b5250625c3935bab0b874c004d72 (commit)
  discards  6b10eeb5a51d56186ad0d93cd56327f628bd0a4d (commit)
       via  f5ada1de1372bd3772b4f4bd33afa59803c1dade (commit)
       via  9a141d60f045c620ce647fa0efe522593f46880b (commit)
       via  746737d8bff55ce807b12d62b3a665f7843b5965 (commit)
      from  0e3b488a4f76b5250625c3935bab0b874c004d72 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 docs/scripts/Makefile.am                           |    3 ---
 gnetlist/scheme/Makefile.am                        |    3 ---
 gnetlist/scheme/gnet-verilog.scm                   |    4 ----
 .../tests/common/outputs/verilog/JD-output.net     |    4 ----
 .../common/outputs/verilog/JD_Include-output.net   |    4 ----
 .../outputs/verilog/JD_Include_nomunge-output.net  |    4 ----
 .../common/outputs/verilog/JD_Sort-output.net      |    4 ----
 .../outputs/verilog/JD_Sort_nomunge-output.net     |    4 ----
 .../common/outputs/verilog/JD_nomunge-output.net   |    4 ----
 .../outputs/verilog/SlottedOpamps-output.net       |    4 ----
 .../common/outputs/verilog/TwoStageAmp-output.net  |    4 ----
 .../outputs/verilog/TwoStageAmp_Include-output.net |    4 ----
 .../outputs/verilog/TwoStageAmp_Sort-output.net    |    4 ----
 .../common/outputs/verilog/cascade-output.net      |    4 ----
 .../common/outputs/verilog/multiequal-output.net   |    4 ----
 .../common/outputs/verilog/netattrib-output.net    |    4 ----
 .../common/outputs/verilog/powersupply-output.net  |    4 ----
 .../common/outputs/verilog/singlenet-output.net    |    4 ----
 .../outputs/verilog/stack-torture-output.net       |    4 ----
 gschem/include/Makefile.am                         |    2 --
 gschem/include/prototype.h                         |    2 --
 gschem/scheme/pcb.scm                              |    2 --
 gschem/scripts/gschemdoc.sh                        |    2 --
 gschem/scripts/image.scm                           |    2 --
 gschem/scripts/makeimages                          |    1 -
 gschem/scripts/print.scm                           |    2 --
 libgeda/share/Makefile.am                          |    3 ---
 symbols/documentation/nc.doc                       |    2 --
 utils/examples/gsch2pcb/project.sample             |    2 --
 utils/scripts/Makefile.am                          |    2 --
 utils/scripts/convert_sym.awk                      |    2 --
 utils/scripts/pads_backannotate                    |    2 --
 utils/scripts/pcb_backannotate                     |    2 --
 utils/scripts/refdes_renum                         |    2 --
 utils/src/convert_sym.c                            |    1 -
 utils/src/grenum.c                                 |    1 -
 utils/src/grenum.h                                 |    1 -
 utils/src/gsch2pcb.c                               |    2 --
 utils/src/olib.l                                   |    4 +---
 utils/src/smash_megafile.c                         |    2 --
 utils/tests/gxyrs/README.txt                       |    3 ---
 utils/tests/gxyrs/inputs/pcb_example1.xy           |    1 -
 utils/tests/gxyrs/inputs/pcb_example2.xy           |    1 -
 .../outputs/chunits_bad_col_num1-pcb_example1.xy   |    1 -
 .../outputs/chunits_bad_col_num2-pcb_example1.xy   |    1 -
 .../chunits_col_num_too_high-pcb_example1.xy       |    1 -
 .../chunits_negative_col_num-pcb_example1.xy       |    1 -
 .../gxyrs/outputs/chunits_no_units-pcb_example1.xy |    1 -
 .../gxyrs/outputs/del_case_insens1-pcb_example1.xy |    1 -
 .../gxyrs/outputs/del_case_insens2-pcb_example2.xy |    1 -
 .../gxyrs/outputs/del_case_sens1-pcb_example1.xy   |    1 -
 .../gxyrs/outputs/del_case_sens2-pcb_example2.xy   |    1 -
 .../gxyrs/outputs/del_case_sens3-pcb_example1.xy   |    1 -
 .../gxyrs/outputs/del_case_sens4-pcb_example2.xy   |    1 -
 .../del_check_cols_no_match-pcb_example1.xy        |    1 -
 .../del_check_cols_return_minus1-pcb_example1.xy   |    1 -
 .../tests/gxyrs/outputs/do_nothing-pcb_example1.xy |    1 -
 .../outputs/do_nothing_tabulated-pcb_example1.xy   |    1 -
 .../gxyrs/outputs/footprint_pcb1-pcb_example1.xy   |    1 -
 .../insert_col_bad_col_num1-pcb_example1.xy        |    1 -
 .../insert_col_bad_col_num2-pcb_example1.xy        |    1 -
 .../insert_col_col_num_too_high-pcb_example1.xy    |    1 -
 utils/tests/refdes_renum/README.txt                |    3 ---
 utils/tests/refdes_renum/run_tests.sh              |    2 --
 utils/tests/refdes_renum/tests.list                |    2 --
 65 files changed, 1 insertions(+), 145 deletions(-)


=================
 Commit Messages
=================

commit f5ada1de1372bd3772b4f4bd33afa59803c1dade
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Remove some CVS keywords.

:100644 100644 2a9ed40... 4a40a7f... M	docs/scripts/Makefile.am
:100644 100644 dcbc582... 92e707a... M	gnetlist/scheme/Makefile.am
:100644 100644 f0f5b8c... e006a1e... M	gnetlist/scheme/gnet-verilog.scm
:100644 100644 d6e3814... 7bafd8f... M	gnetlist/tests/common/outputs/verilog/JD-output.net
:100644 100644 d6e3814... 7bafd8f... M	gnetlist/tests/common/outputs/verilog/JD_Include-output.net
:100644 100644 d6e3814... 7bafd8f... M	gnetlist/tests/common/outputs/verilog/JD_Include_nomunge-output.net
:100644 100644 d6e3814... 7bafd8f... M	gnetlist/tests/common/outputs/verilog/JD_Sort-output.net
:100644 100644 d6e3814... 7bafd8f... M	gnetlist/tests/common/outputs/verilog/JD_Sort_nomunge-output.net
:100644 100644 d6e3814... 7bafd8f... M	gnetlist/tests/common/outputs/verilog/JD_nomunge-output.net
:100644 100644 4522bca... e420a9a... M	gnetlist/tests/common/outputs/verilog/SlottedOpamps-output.net
:100644 100644 2fd2eb3... ff6c48a... M	gnetlist/tests/common/outputs/verilog/TwoStageAmp-output.net
:100644 100644 2fd2eb3... ff6c48a... M	gnetlist/tests/common/outputs/verilog/TwoStageAmp_Include-output.net
:100644 100644 2fd2eb3... ff6c48a... M	gnetlist/tests/common/outputs/verilog/TwoStageAmp_Sort-output.net
:100644 100644 5af04ac... 587a11a... M	gnetlist/tests/common/outputs/verilog/cascade-output.net
:100644 100644 5a2fe51... 37d6e9f... M	gnetlist/tests/common/outputs/verilog/multiequal-output.net
:100644 100644 dba917e... 495fe68... M	gnetlist/tests/common/outputs/verilog/netattrib-output.net
:100644 100644 3611994... e9a27a9... M	gnetlist/tests/common/outputs/verilog/powersupply-output.net
:100644 100644 3790cab... e1beddd... M	gnetlist/tests/common/outputs/verilog/singlenet-output.net
:100644 100644 8d1bed4... cfde1f8... M	gnetlist/tests/common/outputs/verilog/stack-torture-output.net
:100644 100644 00b553d... baa74ea... M	gschem/include/Makefile.am
:100644 100644 d0439a3... 4c80281... M	gschem/include/prototype.h
:100644 100644 ef615c2... 97231bb... M	gschem/scheme/pcb.scm
:100644 100644 c24cde8... 52aa080... M	gschem/scripts/gschemdoc.sh
:100644 100644 e2bd3e0... f5e1c63... M	gschem/scripts/image.scm
:100755 100755 1790f46... 41e580c... M	gschem/scripts/makeimages
:100644 100644 b2c5d3f... 200a159... M	gschem/scripts/print.scm
:100644 100644 8f1f08f... e2fb92c... M	libgeda/share/Makefile.am
:100644 100644 cef6cd4... 196b7ac... M	symbols/documentation/nc.doc
:100644 100644 8a1d134... 38078d0... M	utils/examples/gsch2pcb/project.sample
:100644 100644 5ab4527... 5636420... M	utils/scripts/Makefile.am
:100644 100644 1877f6a... 723c919... M	utils/scripts/convert_sym.awk
:100755 100755 84fe2be... c7038f0... M	utils/scripts/pads_backannotate
:100755 100755 10042e4... a994c42... M	utils/scripts/pcb_backannotate
:100755 100755 88e1876... da6dbba... M	utils/scripts/refdes_renum
:100644 100644 fa61810... 1b122b5... M	utils/src/convert_sym.c
:100644 100644 086aef2... 9d9b11c... M	utils/src/grenum.c
:100644 100644 f729825... 0978e60... M	utils/src/grenum.h
:100644 100644 4d3a825... 5ed70b4... M	utils/src/gsch2pcb.c
:100644 100644 9a24376... 2cbc2f5... M	utils/src/olib.l
:100644 100644 d2910bd... 519692d... M	utils/src/smash_megafile.c
:100644 100644 1c325bb... 11177a8... M	utils/tests/gxyrs/README.txt
:100644 100644 ee9854b... a00ad3a... M	utils/tests/gxyrs/inputs/pcb_example1.xy
:100644 100644 c1bda42... 2a946d0... M	utils/tests/gxyrs/inputs/pcb_example2.xy
:100644 100644 ee9854b... a00ad3a... M	utils/tests/gxyrs/outputs/chunits_bad_col_num1-pcb_example1.xy
:100644 100644 ee9854b... a00ad3a... M	utils/tests/gxyrs/outputs/chunits_bad_col_num2-pcb_example1.xy
:100644 100644 ee9854b... a00ad3a... M	utils/tests/gxyrs/outputs/chunits_col_num_too_high-pcb_example1.xy
:100644 100644 ee9854b... a00ad3a... M	utils/tests/gxyrs/outputs/chunits_negative_col_num-pcb_example1.xy
:100644 100644 ee9854b... a00ad3a... M	utils/tests/gxyrs/outputs/chunits_no_units-pcb_example1.xy
:100644 100644 3d383f4... 6bda2c6... M	utils/tests/gxyrs/outputs/del_case_insens1-pcb_example1.xy
:100644 100644 3d383f4... 6bda2c6... M	utils/tests/gxyrs/outputs/del_case_insens2-pcb_example2.xy
:100644 100644 3d383f4... 6bda2c6... M	utils/tests/gxyrs/outputs/del_case_sens1-pcb_example1.xy
:100644 100644 c1bda42... 2a946d0... M	utils/tests/gxyrs/outputs/del_case_sens2-pcb_example2.xy
:100644 100644 ee9854b... a00ad3a... M	utils/tests/gxyrs/outputs/del_case_sens3-pcb_example1.xy
:100644 100644 3d383f4... 6bda2c6... M	utils/tests/gxyrs/outputs/del_case_sens4-pcb_example2.xy
:100644 100644 ee9854b... a00ad3a... M	utils/tests/gxyrs/outputs/del_check_cols_no_match-pcb_example1.xy
:100644 100644 ee9854b... a00ad3a... M	utils/tests/gxyrs/outputs/del_check_cols_return_minus1-pcb_example1.xy
:100644 100644 ee9854b... a00ad3a... M	utils/tests/gxyrs/outputs/do_nothing-pcb_example1.xy
:100644 100644 a47d267... 5d5215c... M	utils/tests/gxyrs/outputs/do_nothing_tabulated-pcb_example1.xy
:100644 100644 8d7d3c1... 063e266... M	utils/tests/gxyrs/outputs/footprint_pcb1-pcb_example1.xy
:100644 100644 ee9854b... a00ad3a... M	utils/tests/gxyrs/outputs/insert_col_bad_col_num1-pcb_example1.xy
:100644 100644 ee9854b... a00ad3a... M	utils/tests/gxyrs/outputs/insert_col_bad_col_num2-pcb_example1.xy
:100644 100644 ee9854b... a00ad3a... M	utils/tests/gxyrs/outputs/insert_col_col_num_too_high-pcb_example1.xy
:100644 100644 9bb960b... 0fe875c... M	utils/tests/refdes_renum/README.txt
:100755 100755 9bcfab2... 873fa41... M	utils/tests/refdes_renum/run_tests.sh
:100644 100644 c2c6bf0... e6fdcd7... M	utils/tests/refdes_renum/tests.list

commit 9a141d60f045c620ce647fa0efe522593f46880b
Author: Clif Cox <clif@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: Cleaned up several routines in spice-sdb. [3117075]
    
    Combine write-ic and write-subcircuit with a fix to the unbound type
    variable.  Fully document a check for the special "?" value explaining
    why it fails silently.  Clean up write-net-names-on-component to make
    it a bit more flexible.  Combine write-probe-item and
    write-net-names-on-component.  Add a range utility function.
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

:100644 100644 7debb8b... 1babe4e... M	gnetlist/scheme/gnet-spice-sdb.scm
:100644 100644 67fbaa9... 994fb63... M	gnetlist/tests/common/outputs/spice-sdb/stack-torture-output.net
:100644 100644 d00491f... 573541a... M	gnetlist/tests/common/outputs/spice-sdb/stack-torture.retcode

commit 746737d8bff55ce807b12d62b3a665f7843b5965
Author: Clif Cox <clif@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: White space consistancy cleanup in spice-sdb. [3117075]
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

:100644 100644 39ea063... 7debb8b... M	gnetlist/scheme/gnet-spice-sdb.scm

=========
 Changes
=========

commit f5ada1de1372bd3772b4f4bd33afa59803c1dade
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Remove some CVS keywords.

diff --git a/docs/scripts/Makefile.am b/docs/scripts/Makefile.am
index 2a9ed40..4a40a7f 100644
--- a/docs/scripts/Makefile.am
+++ b/docs/scripts/Makefile.am
@@ -1,6 +1,3 @@
-## $Id$
-##
-
 EXTRA_DIST = populatemkfiles.sh copygitignores.sh
 
 MOSTLYCLEANFILES =	*.log *~
diff --git a/gnetlist/scheme/Makefile.am b/gnetlist/scheme/Makefile.am
index dcbc582..92e707a 100644
--- a/gnetlist/scheme/Makefile.am
+++ b/gnetlist/scheme/Makefile.am
@@ -1,6 +1,3 @@
-## $Id$
-##
-
 M4=		@M4@
 PCBM4DIR=	@PCBM4DIR@
 PCBCONFDIR=	@PCBCONFDIR@
diff --git a/gnetlist/scheme/gnet-verilog.scm b/gnetlist/scheme/gnet-verilog.scm
index f0f5b8c..e006a1e 100644
--- a/gnetlist/scheme/gnet-verilog.scm
+++ b/gnetlist/scheme/gnet-verilog.scm
@@ -179,10 +179,6 @@
 	      (display "/* WARNING: This is a generated file, edits */\n" p)
 	      (display "/*        made here will be lost next time  */\n" p)
 	      (display "/*        you run gnetlist!                 */\n" p)
-	      (display "/* Id ..........$Id$ */\n" p)
-	      (display "/* Source.......$Source$ */\n" p)
-	      (display "/* Revision.....$Revision$ */\n" p)
-	      (display "/* Author.......$Author$ */\n" p)
 	      (newline p)
 	      (verilog:write-module-declaration verilog:get-module-name
 						port-list p)
diff --git a/gnetlist/tests/common/outputs/verilog/JD-output.net b/gnetlist/tests/common/outputs/verilog/JD-output.net
index d6e3814..7bafd8f 100644
--- a/gnetlist/tests/common/outputs/verilog/JD-output.net
+++ b/gnetlist/tests/common/outputs/verilog/JD-output.net
@@ -2,10 +2,6 @@
 /* WARNING: This is a generated file, edits */
 /*        made here will be lost next time  */
 /*        you run gnetlist!                 */
-/* Id ..........$Id$ */
-/* Source.......$Source$ */
-/* Revision.....$Revision$ */
-/* Author.......$Author$ */
 
 module \not found  (
 
diff --git a/gnetlist/tests/common/outputs/verilog/JD_Include-output.net b/gnetlist/tests/common/outputs/verilog/JD_Include-output.net
index d6e3814..7bafd8f 100644
--- a/gnetlist/tests/common/outputs/verilog/JD_Include-output.net
+++ b/gnetlist/tests/common/outputs/verilog/JD_Include-output.net
@@ -2,10 +2,6 @@
 /* WARNING: This is a generated file, edits */
 /*        made here will be lost next time  */
 /*        you run gnetlist!                 */
-/* Id ..........$Id$ */
-/* Source.......$Source$ */
-/* Revision.....$Revision$ */
-/* Author.......$Author$ */
 
 module \not found  (
 
diff --git a/gnetlist/tests/common/outputs/verilog/JD_Include_nomunge-output.net b/gnetlist/tests/common/outputs/verilog/JD_Include_nomunge-output.net
index d6e3814..7bafd8f 100644
--- a/gnetlist/tests/common/outputs/verilog/JD_Include_nomunge-output.net
+++ b/gnetlist/tests/common/outputs/verilog/JD_Include_nomunge-output.net
@@ -2,10 +2,6 @@
 /* WARNING: This is a generated file, edits */
 /*        made here will be lost next time  */
 /*        you run gnetlist!                 */
-/* Id ..........$Id$ */
-/* Source.......$Source$ */
-/* Revision.....$Revision$ */
-/* Author.......$Author$ */
 
 module \not found  (
 
diff --git a/gnetlist/tests/common/outputs/verilog/JD_Sort-output.net b/gnetlist/tests/common/outputs/verilog/JD_Sort-output.net
index d6e3814..7bafd8f 100644
--- a/gnetlist/tests/common/outputs/verilog/JD_Sort-output.net
+++ b/gnetlist/tests/common/outputs/verilog/JD_Sort-output.net
@@ -2,10 +2,6 @@
 /* WARNING: This is a generated file, edits */
 /*        made here will be lost next time  */
 /*        you run gnetlist!                 */
-/* Id ..........$Id$ */
-/* Source.......$Source$ */
-/* Revision.....$Revision$ */
-/* Author.......$Author$ */
 
 module \not found  (
 
diff --git a/gnetlist/tests/common/outputs/verilog/JD_Sort_nomunge-output.net b/gnetlist/tests/common/outputs/verilog/JD_Sort_nomunge-output.net
index d6e3814..7bafd8f 100644
--- a/gnetlist/tests/common/outputs/verilog/JD_Sort_nomunge-output.net
+++ b/gnetlist/tests/common/outputs/verilog/JD_Sort_nomunge-output.net
@@ -2,10 +2,6 @@
 /* WARNING: This is a generated file, edits */
 /*        made here will be lost next time  */
 /*        you run gnetlist!                 */
-/* Id ..........$Id$ */
-/* Source.......$Source$ */
-/* Revision.....$Revision$ */
-/* Author.......$Author$ */
 
 module \not found  (
 
diff --git a/gnetlist/tests/common/outputs/verilog/JD_nomunge-output.net b/gnetlist/tests/common/outputs/verilog/JD_nomunge-output.net
index d6e3814..7bafd8f 100644
--- a/gnetlist/tests/common/outputs/verilog/JD_nomunge-output.net
+++ b/gnetlist/tests/common/outputs/verilog/JD_nomunge-output.net
@@ -2,10 +2,6 @@
 /* WARNING: This is a generated file, edits */
 /*        made here will be lost next time  */
 /*        you run gnetlist!                 */
-/* Id ..........$Id$ */
-/* Source.......$Source$ */
-/* Revision.....$Revision$ */
-/* Author.......$Author$ */
 
 module \not found  (
 
diff --git a/gnetlist/tests/common/outputs/verilog/SlottedOpamps-output.net b/gnetlist/tests/common/outputs/verilog/SlottedOpamps-output.net
index 4522bca..e420a9a 100644
--- a/gnetlist/tests/common/outputs/verilog/SlottedOpamps-output.net
+++ b/gnetlist/tests/common/outputs/verilog/SlottedOpamps-output.net
@@ -2,10 +2,6 @@
 /* WARNING: This is a generated file, edits */
 /*        made here will be lost next time  */
 /*        you run gnetlist!                 */
-/* Id ..........$Id$ */
-/* Source.......$Source$ */
-/* Revision.....$Revision$ */
-/* Author.......$Author$ */
 
 module \not found  (
 
diff --git a/gnetlist/tests/common/outputs/verilog/TwoStageAmp-output.net b/gnetlist/tests/common/outputs/verilog/TwoStageAmp-output.net
index 2fd2eb3..ff6c48a 100644
--- a/gnetlist/tests/common/outputs/verilog/TwoStageAmp-output.net
+++ b/gnetlist/tests/common/outputs/verilog/TwoStageAmp-output.net
@@ -2,10 +2,6 @@
 /* WARNING: This is a generated file, edits */
 /*        made here will be lost next time  */
 /*        you run gnetlist!                 */
-/* Id ..........$Id$ */
-/* Source.......$Source$ */
-/* Revision.....$Revision$ */
-/* Author.......$Author$ */
 
 module \not found  (
 
diff --git a/gnetlist/tests/common/outputs/verilog/TwoStageAmp_Include-output.net b/gnetlist/tests/common/outputs/verilog/TwoStageAmp_Include-output.net
index 2fd2eb3..ff6c48a 100644
--- a/gnetlist/tests/common/outputs/verilog/TwoStageAmp_Include-output.net
+++ b/gnetlist/tests/common/outputs/verilog/TwoStageAmp_Include-output.net
@@ -2,10 +2,6 @@
 /* WARNING: This is a generated file, edits */
 /*        made here will be lost next time  */
 /*        you run gnetlist!                 */
-/* Id ..........$Id$ */
-/* Source.......$Source$ */
-/* Revision.....$Revision$ */
-/* Author.......$Author$ */
 
 module \not found  (
 
diff --git a/gnetlist/tests/common/outputs/verilog/TwoStageAmp_Sort-output.net b/gnetlist/tests/common/outputs/verilog/TwoStageAmp_Sort-output.net
index 2fd2eb3..ff6c48a 100644
--- a/gnetlist/tests/common/outputs/verilog/TwoStageAmp_Sort-output.net
+++ b/gnetlist/tests/common/outputs/verilog/TwoStageAmp_Sort-output.net
@@ -2,10 +2,6 @@
 /* WARNING: This is a generated file, edits */
 /*        made here will be lost next time  */
 /*        you run gnetlist!                 */
-/* Id ..........$Id$ */
-/* Source.......$Source$ */
-/* Revision.....$Revision$ */
-/* Author.......$Author$ */
 
 module \not found  (
 
diff --git a/gnetlist/tests/common/outputs/verilog/cascade-output.net b/gnetlist/tests/common/outputs/verilog/cascade-output.net
index 5af04ac..587a11a 100644
--- a/gnetlist/tests/common/outputs/verilog/cascade-output.net
+++ b/gnetlist/tests/common/outputs/verilog/cascade-output.net
@@ -2,10 +2,6 @@
 /* WARNING: This is a generated file, edits */
 /*        made here will be lost next time  */
 /*        you run gnetlist!                 */
-/* Id ..........$Id$ */
-/* Source.......$Source$ */
-/* Revision.....$Revision$ */
-/* Author.......$Author$ */
 
 module \not found  (
 
diff --git a/gnetlist/tests/common/outputs/verilog/multiequal-output.net b/gnetlist/tests/common/outputs/verilog/multiequal-output.net
index 5a2fe51..37d6e9f 100644
--- a/gnetlist/tests/common/outputs/verilog/multiequal-output.net
+++ b/gnetlist/tests/common/outputs/verilog/multiequal-output.net
@@ -2,10 +2,6 @@
 /* WARNING: This is a generated file, edits */
 /*        made here will be lost next time  */
 /*        you run gnetlist!                 */
-/* Id ..........$Id$ */
-/* Source.......$Source$ */
-/* Revision.....$Revision$ */
-/* Author.......$Author$ */
 
 module \not found  (
 
diff --git a/gnetlist/tests/common/outputs/verilog/netattrib-output.net b/gnetlist/tests/common/outputs/verilog/netattrib-output.net
index dba917e..495fe68 100644
--- a/gnetlist/tests/common/outputs/verilog/netattrib-output.net
+++ b/gnetlist/tests/common/outputs/verilog/netattrib-output.net
@@ -2,10 +2,6 @@
 /* WARNING: This is a generated file, edits */
 /*        made here will be lost next time  */
 /*        you run gnetlist!                 */
-/* Id ..........$Id$ */
-/* Source.......$Source$ */
-/* Revision.....$Revision$ */
-/* Author.......$Author$ */
 
 module \not found  (
 
diff --git a/gnetlist/tests/common/outputs/verilog/powersupply-output.net b/gnetlist/tests/common/outputs/verilog/powersupply-output.net
index 3611994..e9a27a9 100644
--- a/gnetlist/tests/common/outputs/verilog/powersupply-output.net
+++ b/gnetlist/tests/common/outputs/verilog/powersupply-output.net
@@ -2,10 +2,6 @@
 /* WARNING: This is a generated file, edits */
 /*        made here will be lost next time  */
 /*        you run gnetlist!                 */
-/* Id ..........$Id$ */
-/* Source.......$Source$ */
-/* Revision.....$Revision$ */
-/* Author.......$Author$ */
 
 module \not found  (
 
diff --git a/gnetlist/tests/common/outputs/verilog/singlenet-output.net b/gnetlist/tests/common/outputs/verilog/singlenet-output.net
index 3790cab..e1beddd 100644
--- a/gnetlist/tests/common/outputs/verilog/singlenet-output.net
+++ b/gnetlist/tests/common/outputs/verilog/singlenet-output.net
@@ -2,10 +2,6 @@
 /* WARNING: This is a generated file, edits */
 /*        made here will be lost next time  */
 /*        you run gnetlist!                 */
-/* Id ..........$Id$ */
-/* Source.......$Source$ */
-/* Revision.....$Revision$ */
-/* Author.......$Author$ */
 
 module \not found  (
 
diff --git a/gnetlist/tests/common/outputs/verilog/stack-torture-output.net b/gnetlist/tests/common/outputs/verilog/stack-torture-output.net
index 8d1bed4..cfde1f8 100644
--- a/gnetlist/tests/common/outputs/verilog/stack-torture-output.net
+++ b/gnetlist/tests/common/outputs/verilog/stack-torture-output.net
@@ -2,10 +2,6 @@
 /* WARNING: This is a generated file, edits */
 /*        made here will be lost next time  */
 /*        you run gnetlist!                 */
-/* Id ..........$Id$ */
-/* Source.......$Source$ */
-/* Revision.....$Revision$ */
-/* Author.......$Author$ */
 
 module \not found  (
 
diff --git a/gschem/include/Makefile.am b/gschem/include/Makefile.am
index 00b553d..baa74ea 100644
--- a/gschem/include/Makefile.am
+++ b/gschem/include/Makefile.am
@@ -1,5 +1,3 @@
-## $Id$
-##
 ## Process this file with automake to produce Makefile.in
 
 noinst_HEADERS = \
diff --git a/gschem/include/prototype.h b/gschem/include/prototype.h
index d0439a3..4c80281 100644
--- a/gschem/include/prototype.h
+++ b/gschem/include/prototype.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* gschem_toplevel.c */
 GSCHEM_TOPLEVEL *gschem_toplevel_new();
 /* a_pan.c */
diff --git a/gschem/scheme/pcb.scm b/gschem/scheme/pcb.scm
index ef615c2..97231bb 100644
--- a/gschem/scheme/pcb.scm
+++ b/gschem/scheme/pcb.scm
@@ -53,7 +53,6 @@
 (use-modules (ice-9 popen))
 
 (gschem-log "Loading the PCB major mode\n")
-(gschem-log "PCB-mode version $Id$\n")
 (gschem-log "The PCB major mode is incomplete and considered experimental at this time\n")
 
 ;; These may be changed by the user in their gafrc files (FIXME -- make this
@@ -214,7 +213,6 @@
 (define (pcb:about)
   (gschem-msg (string-append
 	       "This is the pcb major mode for gschem\n"
-	       "pcb.scm version $Id$\n"
 	       "***** WARNING *****\n"
 	       "This is highly experimental\n"
 	       "You should save your work often\n"
diff --git a/gschem/scripts/gschemdoc.sh b/gschem/scripts/gschemdoc.sh
index c24cde8..52aa080 100644
--- a/gschem/scripts/gschemdoc.sh
+++ b/gschem/scripts/gschemdoc.sh
@@ -1,6 +1,4 @@
 #!/bin/sh
-# $Id$
-#
 # NOTE: built from gschemdoc.sh
 #
 # Present as relevant documentation as possible wrt a component
diff --git a/gschem/scripts/image.scm b/gschem/scripts/image.scm
index e2bd3e0..f5e1c63 100644
--- a/gschem/scripts/image.scm
+++ b/gschem/scripts/image.scm
@@ -1,5 +1,3 @@
-;; $Id$
-;;
 ;; This file may be used to produce png files from gschem schematics from the
 ;; command line.  Typical usage is:
 ;;
diff --git a/gschem/scripts/makeimages b/gschem/scripts/makeimages
index 1790f46..41e580c 100755
--- a/gschem/scripts/makeimages
+++ b/gschem/scripts/makeimages
@@ -1,6 +1,5 @@
 #!/bin/sh
 #
-# $Id$
 
 # This script requires the following packages :
 #	- gschem (located the your PATH )
diff --git a/gschem/scripts/print.scm b/gschem/scripts/print.scm
index b2c5d3f..200a159 100644
--- a/gschem/scripts/print.scm
+++ b/gschem/scripts/print.scm
@@ -1,5 +1,3 @@
-;; $Id$
-;;
 ;; This file may be used to print gschem schematics from the
 ;; command line.  Typical usage is:
 ;;
diff --git a/libgeda/share/Makefile.am b/libgeda/share/Makefile.am
index 8f1f08f..e2fb92c 100644
--- a/libgeda/share/Makefile.am
+++ b/libgeda/share/Makefile.am
@@ -1,6 +1,3 @@
-# $Id$
-#
-
 prologdatadir = $(GEDADATADIR)
 prologdata_DATA = prolog.ps
 
diff --git a/symbols/documentation/nc.doc b/symbols/documentation/nc.doc
index cef6cd4..196b7ac 100644
--- a/symbols/documentation/nc.doc
+++ b/symbols/documentation/nc.doc
@@ -1,5 +1,3 @@
-.\" $Id$
-.\"
 .\" Example documentation for "No connection"
 .\" don't take it too seriously ;-)"
 .\"
diff --git a/utils/examples/gsch2pcb/project.sample b/utils/examples/gsch2pcb/project.sample
index 8a1d134..38078d0 100644
--- a/utils/examples/gsch2pcb/project.sample
+++ b/utils/examples/gsch2pcb/project.sample
@@ -1,5 +1,3 @@
-# $Id$
-#
 #           Sample poject file for gsch2pcb versions >= 1.0
 #
 # A project file may be named anything that does not end in ".sch" and placed
diff --git a/utils/scripts/Makefile.am b/utils/scripts/Makefile.am
index 5ab4527..5636420 100644
--- a/utils/scripts/Makefile.am
+++ b/utils/scripts/Makefile.am
@@ -1,5 +1,3 @@
-## $Id$
-##
 ## Process this file with automake to produce Makefile.in
 
 bin_SCRIPTS = sarlacc_sym gschupdate gsymupdate refdes_renum \
diff --git a/utils/scripts/convert_sym.awk b/utils/scripts/convert_sym.awk
index 1877f6a..723c919 100644
--- a/utils/scripts/convert_sym.awk
+++ b/utils/scripts/convert_sym.awk
@@ -1,6 +1,4 @@
 #!/usr/bin/awk -f 
-# 	$Id$	
-#       $Author$
 # awk script to convert viewlogic symbol files to geda files
 #
 #
diff --git a/utils/scripts/pads_backannotate b/utils/scripts/pads_backannotate
index 84fe2be..c7038f0 100755
--- a/utils/scripts/pads_backannotate
+++ b/utils/scripts/pads_backannotate
@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 #
-# $Id$
-#
 # Copyright (C) 2003 Dan McMahill
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/utils/scripts/pcb_backannotate b/utils/scripts/pcb_backannotate
index 10042e4..a994c42 100755
--- a/utils/scripts/pcb_backannotate
+++ b/utils/scripts/pcb_backannotate
@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 #
-# $Id$
-#
 # Copyright (C) 2003, 2006 Dan McMahill
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/utils/scripts/refdes_renum b/utils/scripts/refdes_renum
index 88e1876..da6dbba 100755
--- a/utils/scripts/refdes_renum
+++ b/utils/scripts/refdes_renum
@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 #
-# $Id$
-#
 # Copyright (C) 2003 Dan McMahill
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/utils/src/convert_sym.c b/utils/src/convert_sym.c
index fa61810..1b122b5 100644
--- a/utils/src/convert_sym.c
+++ b/utils/src/convert_sym.c
@@ -33,7 +33,6 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
  *
- * 	$Id$	 
  */
 
 #include <stdio.h>
diff --git a/utils/src/grenum.c b/utils/src/grenum.c
index 086aef2..9d9b11c 100644
--- a/utils/src/grenum.c
+++ b/utils/src/grenum.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*	This is grenum, an advanced refdes renumber utility for gEDA's gschem.
  *
  *	Copyright (C) 2005-2010  Levente Kovacs
diff --git a/utils/src/grenum.h b/utils/src/grenum.h
index f729825..0978e60 100644
--- a/utils/src/grenum.h
+++ b/utils/src/grenum.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <stdio.h>
 #define GRVERSION "24052006"
 #define COMP_DATE __DATE__
diff --git a/utils/src/gsch2pcb.c b/utils/src/gsch2pcb.c
index 4d3a825..5ed70b4 100644
--- a/utils/src/gsch2pcb.c
+++ b/utils/src/gsch2pcb.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* gsch2pcb
 |
 |  Bill Wilson    billw@xxxxxx
diff --git a/utils/src/olib.l b/utils/src/olib.l
index 9a24376..2cbc2f5 100644
--- a/utils/src/olib.l
+++ b/utils/src/olib.l
@@ -1,7 +1,5 @@
 %{
-/*  $Id$
-
-    olib.lex - Orcad to gEDA lib converter
+/*  olib.lex - Orcad to gEDA lib converter
     Copyright (C) 2002 Mario Pascucci <m.pas@xxxxxxxxx>
 
     This program is free software; you can redistribute it and/or modify
diff --git a/utils/src/smash_megafile.c b/utils/src/smash_megafile.c
index d2910bd..519692d 100644
--- a/utils/src/smash_megafile.c
+++ b/utils/src/smash_megafile.c
@@ -19,8 +19,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
  *
- *  $Id$
- *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/utils/tests/gxyrs/README.txt b/utils/tests/gxyrs/README.txt
index 1c325bb..11177a8 100644
--- a/utils/tests/gxyrs/README.txt
+++ b/utils/tests/gxyrs/README.txt
@@ -1,6 +1,3 @@
-# $Id$
-#
-
 This directory contains the testsuite for the "gxyrs" script.
 No modifications to this script are allowed without adding tests here.
 If a bug report is filed, a test must be added to show the bug before
diff --git a/utils/tests/gxyrs/inputs/pcb_example1.xy b/utils/tests/gxyrs/inputs/pcb_example1.xy
index ee9854b..a00ad3a 100644
--- a/utils/tests/gxyrs/inputs/pcb_example1.xy
+++ b/utils/tests/gxyrs/inputs/pcb_example1.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/inputs/pcb_example2.xy b/utils/tests/gxyrs/inputs/pcb_example2.xy
index c1bda42..2a946d0 100644
--- a/utils/tests/gxyrs/inputs/pcb_example2.xy
+++ b/utils/tests/gxyrs/inputs/pcb_example2.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/chunits_bad_col_num1-pcb_example1.xy b/utils/tests/gxyrs/outputs/chunits_bad_col_num1-pcb_example1.xy
index ee9854b..a00ad3a 100644
--- a/utils/tests/gxyrs/outputs/chunits_bad_col_num1-pcb_example1.xy
+++ b/utils/tests/gxyrs/outputs/chunits_bad_col_num1-pcb_example1.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/chunits_bad_col_num2-pcb_example1.xy b/utils/tests/gxyrs/outputs/chunits_bad_col_num2-pcb_example1.xy
index ee9854b..a00ad3a 100644
--- a/utils/tests/gxyrs/outputs/chunits_bad_col_num2-pcb_example1.xy
+++ b/utils/tests/gxyrs/outputs/chunits_bad_col_num2-pcb_example1.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/chunits_col_num_too_high-pcb_example1.xy b/utils/tests/gxyrs/outputs/chunits_col_num_too_high-pcb_example1.xy
index ee9854b..a00ad3a 100644
--- a/utils/tests/gxyrs/outputs/chunits_col_num_too_high-pcb_example1.xy
+++ b/utils/tests/gxyrs/outputs/chunits_col_num_too_high-pcb_example1.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/chunits_negative_col_num-pcb_example1.xy b/utils/tests/gxyrs/outputs/chunits_negative_col_num-pcb_example1.xy
index ee9854b..a00ad3a 100644
--- a/utils/tests/gxyrs/outputs/chunits_negative_col_num-pcb_example1.xy
+++ b/utils/tests/gxyrs/outputs/chunits_negative_col_num-pcb_example1.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/chunits_no_units-pcb_example1.xy b/utils/tests/gxyrs/outputs/chunits_no_units-pcb_example1.xy
index ee9854b..a00ad3a 100644
--- a/utils/tests/gxyrs/outputs/chunits_no_units-pcb_example1.xy
+++ b/utils/tests/gxyrs/outputs/chunits_no_units-pcb_example1.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/del_case_insens1-pcb_example1.xy b/utils/tests/gxyrs/outputs/del_case_insens1-pcb_example1.xy
index 3d383f4..6bda2c6 100644
--- a/utils/tests/gxyrs/outputs/del_case_insens1-pcb_example1.xy
+++ b/utils/tests/gxyrs/outputs/del_case_insens1-pcb_example1.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/del_case_insens2-pcb_example2.xy b/utils/tests/gxyrs/outputs/del_case_insens2-pcb_example2.xy
index 3d383f4..6bda2c6 100644
--- a/utils/tests/gxyrs/outputs/del_case_insens2-pcb_example2.xy
+++ b/utils/tests/gxyrs/outputs/del_case_insens2-pcb_example2.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/del_case_sens1-pcb_example1.xy b/utils/tests/gxyrs/outputs/del_case_sens1-pcb_example1.xy
index 3d383f4..6bda2c6 100644
--- a/utils/tests/gxyrs/outputs/del_case_sens1-pcb_example1.xy
+++ b/utils/tests/gxyrs/outputs/del_case_sens1-pcb_example1.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/del_case_sens2-pcb_example2.xy b/utils/tests/gxyrs/outputs/del_case_sens2-pcb_example2.xy
index c1bda42..2a946d0 100644
--- a/utils/tests/gxyrs/outputs/del_case_sens2-pcb_example2.xy
+++ b/utils/tests/gxyrs/outputs/del_case_sens2-pcb_example2.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/del_case_sens3-pcb_example1.xy b/utils/tests/gxyrs/outputs/del_case_sens3-pcb_example1.xy
index ee9854b..a00ad3a 100644
--- a/utils/tests/gxyrs/outputs/del_case_sens3-pcb_example1.xy
+++ b/utils/tests/gxyrs/outputs/del_case_sens3-pcb_example1.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/del_case_sens4-pcb_example2.xy b/utils/tests/gxyrs/outputs/del_case_sens4-pcb_example2.xy
index 3d383f4..6bda2c6 100644
--- a/utils/tests/gxyrs/outputs/del_case_sens4-pcb_example2.xy
+++ b/utils/tests/gxyrs/outputs/del_case_sens4-pcb_example2.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/del_check_cols_no_match-pcb_example1.xy b/utils/tests/gxyrs/outputs/del_check_cols_no_match-pcb_example1.xy
index ee9854b..a00ad3a 100644
--- a/utils/tests/gxyrs/outputs/del_check_cols_no_match-pcb_example1.xy
+++ b/utils/tests/gxyrs/outputs/del_check_cols_no_match-pcb_example1.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/del_check_cols_return_minus1-pcb_example1.xy b/utils/tests/gxyrs/outputs/del_check_cols_return_minus1-pcb_example1.xy
index ee9854b..a00ad3a 100644
--- a/utils/tests/gxyrs/outputs/del_check_cols_return_minus1-pcb_example1.xy
+++ b/utils/tests/gxyrs/outputs/del_check_cols_return_minus1-pcb_example1.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/do_nothing-pcb_example1.xy b/utils/tests/gxyrs/outputs/do_nothing-pcb_example1.xy
index ee9854b..a00ad3a 100644
--- a/utils/tests/gxyrs/outputs/do_nothing-pcb_example1.xy
+++ b/utils/tests/gxyrs/outputs/do_nothing-pcb_example1.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/do_nothing_tabulated-pcb_example1.xy b/utils/tests/gxyrs/outputs/do_nothing_tabulated-pcb_example1.xy
index a47d267..5d5215c 100644
--- a/utils/tests/gxyrs/outputs/do_nothing_tabulated-pcb_example1.xy
+++ b/utils/tests/gxyrs/outputs/do_nothing_tabulated-pcb_example1.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/footprint_pcb1-pcb_example1.xy b/utils/tests/gxyrs/outputs/footprint_pcb1-pcb_example1.xy
index 8d7d3c1..063e266 100644
--- a/utils/tests/gxyrs/outputs/footprint_pcb1-pcb_example1.xy
+++ b/utils/tests/gxyrs/outputs/footprint_pcb1-pcb_example1.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/insert_col_bad_col_num1-pcb_example1.xy b/utils/tests/gxyrs/outputs/insert_col_bad_col_num1-pcb_example1.xy
index ee9854b..a00ad3a 100644
--- a/utils/tests/gxyrs/outputs/insert_col_bad_col_num1-pcb_example1.xy
+++ b/utils/tests/gxyrs/outputs/insert_col_bad_col_num1-pcb_example1.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/insert_col_bad_col_num2-pcb_example1.xy b/utils/tests/gxyrs/outputs/insert_col_bad_col_num2-pcb_example1.xy
index ee9854b..a00ad3a 100644
--- a/utils/tests/gxyrs/outputs/insert_col_bad_col_num2-pcb_example1.xy
+++ b/utils/tests/gxyrs/outputs/insert_col_bad_col_num2-pcb_example1.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/gxyrs/outputs/insert_col_col_num_too_high-pcb_example1.xy b/utils/tests/gxyrs/outputs/insert_col_col_num_too_high-pcb_example1.xy
index ee9854b..a00ad3a 100644
--- a/utils/tests/gxyrs/outputs/insert_col_col_num_too_high-pcb_example1.xy
+++ b/utils/tests/gxyrs/outputs/insert_col_col_num_too_high-pcb_example1.xy
@@ -1,4 +1,3 @@
-# $Id$
 # PcbXY Version 1.0
 # Date: Sat Sep  6 14:29:26 2008 UTC
 # Author: 
diff --git a/utils/tests/refdes_renum/README.txt b/utils/tests/refdes_renum/README.txt
index 9bb960b..0fe875c 100644
--- a/utils/tests/refdes_renum/README.txt
+++ b/utils/tests/refdes_renum/README.txt
@@ -1,6 +1,3 @@
-# $Id$
-#
-
 This directory contains the testsuite for the "refdes_renum" script.
 No modifications to refdes_renum are allowed without adding tests here.
 If a bug report is filed, a test must be added to show the bug before
diff --git a/utils/tests/refdes_renum/run_tests.sh b/utils/tests/refdes_renum/run_tests.sh
index 9bcfab2..873fa41 100755
--- a/utils/tests/refdes_renum/run_tests.sh
+++ b/utils/tests/refdes_renum/run_tests.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# $Id$
-#
 
 # Copyright (C) 2007-2008 Dan McMahill
  
diff --git a/utils/tests/refdes_renum/tests.list b/utils/tests/refdes_renum/tests.list
index c2c6bf0..e6fdcd7 100644
--- a/utils/tests/refdes_renum/tests.list
+++ b/utils/tests/refdes_renum/tests.list
@@ -1,5 +1,3 @@
-# $Id$
-#
 #
 # Format:
 #

commit 9a141d60f045c620ce647fa0efe522593f46880b
Author: Clif Cox <clif@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: Cleaned up several routines in spice-sdb. [3117075]
    
    Combine write-ic and write-subcircuit with a fix to the unbound type
    variable.  Fully document a check for the special "?" value explaining
    why it fails silently.  Clean up write-net-names-on-component to make
    it a bit more flexible.  Combine write-probe-item and
    write-net-names-on-component.  Add a range utility function.
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

diff --git a/gnetlist/scheme/gnet-spice-sdb.scm b/gnetlist/scheme/gnet-spice-sdb.scm
index 7debb8b..1babe4e 100644
--- a/gnetlist/scheme/gnet-spice-sdb.scm
+++ b/gnetlist/scheme/gnet-spice-sdb.scm
@@ -87,7 +87,13 @@
 ;;               netlist patch from Jeff Mallatt.  SDB.
 ;;  4.28.2007 -- Fixed slotted part stuff so that it uses pinseq to emit pins.  SDB
 ;;  1.9.2008 -- Fix slotted part handling to work without a modified pinseq.  pcjc2
-;;               
+;;  1.3.2011 -- Combine write-ic and write-subcircuit with a fix to the unbound
+;;              type variable.  Fully document a check for the special "?" value
+;;              explaining why it fails silently.  Clean up
+;;              write-net-names-on-component to make it a bit more flexible.
+;;              Combine write-probe-item and write-net-names-on-component.  Add
+;;              a range utility function.  CC
+;;
 ;;**********************************************************************************
 ;;
 ;;  Organization of gnet-spice-sdb.scm file:
@@ -106,7 +112,7 @@
 ;;**********************************************************************************
 
 ;; The following is needed to make guile 1.8.x happy.
-(use-modules (ice-9 rdelim))
+(use-modules (ice-9 rdelim) (srfi srfi-1))
 
 ;;--------------------------------------------------------------------------------
 ;; spice-sdb:loop-through-files -- loops through the model-file list, and for each file
@@ -359,6 +365,22 @@
   )
 )
 
+
+;;----------------------------------------------------------
+;;  This returns a list of all the integers from start to
+;;  stop. It is similar to perl's range operator '..'
+;;----------------------------------------------------------
+(define (range start stop . step)
+  (if (null? step)
+    (iota (+ (- stop start) 1) start)
+    (begin
+      (set! step (car step))
+      (iota (+ (ceiling (/ (- stop start) step)) 1) start step)
+    )
+  )
+)
+
+
 ;;----------------------------------------------------------
 ;; Given a filename, open the file, get the first line,
 ;; and see if it is a .MODEL or .SUBCKT file.  
@@ -598,7 +620,7 @@
           ;; implement the controlled current source
           ;; the user should create a refdes label beginning with a g
       (display (string-append package " ") port)
-      (spice-sdb:write-net-names-on-component package (length (gnetlist:get-pins package)) port)
+      (spice-sdb:write-net-names-on-component package port)
        (display  (string-append (spice-sdb:component-value package) "\n")  port)
           ;; implement the voltage measuring current source
           ;; imagine yourself copying the voltage of a voltage source with an internal
@@ -621,7 +643,7 @@
           ;; implement the controlled voltage source
           ;; the user should create a refdes label beginning with an e
       (display (string-append package " ") port)
-      (spice-sdb:write-net-names-on-component package (length (gnetlist:get-pins package)) port)
+      (spice-sdb:write-net-names-on-component package port)
       (display (string-append (gnetlist:get-package-attribute package "value") "\n" ) port)
           ;; implement the voltage measuring current source
           ;; imagine yourself copying the voltage of a voltage source with an internal
@@ -647,7 +669,7 @@
       (display "* begin nullor expansion, e<name>\n" port)
           ;; implement the controlled voltage source
       (display (string-append "E-" package " ") port)
-      (spice-sdb:write-net-names-on-component package (length (gnetlist:get-pins package)) port)
+      (spice-sdb:write-net-names-on-component package port)
       (display (string-append (gnetlist:get-package-attribute package "value") "\n" ) port)
           ;; implement the voltage measuring current source
           ;; imagine yourself copying the voltage of a voltage source with an internal
@@ -774,122 +796,37 @@
 
 ;;----------------------------------------------------------------
 ;;  spice-sdb:write-ic
-;;  This writes out a valid ic line.
+;;  This writes out a valid ic or subcircuit line.
 ;;  The algorithm is as follows:
-;;  1.  Figure out what type of model goes with this part from 
+;;  1.  Figure out what type of model goes with this part from
 ;;      file-info-list.  If it isn't listed, look for a MODEL attribute.
 ;;      If MODEL attribute is attached, write out SPICE card, and then
 ;;      write out .MODEL on next line.
-;;      If no MODEL attribute is attached, just write out what litte 
+;;      If no MODEL attribute is attached, just write out what little
 ;;      we know.  Then return
 ;;  2.  If the model-name is in the file-info-list, get the associated
 ;;      file-type.  Compare it against the component's refdes.  If model-type 
-;;      == .SUBCKT and refdes doesn't begin with X, prepend an X to the refdes.
+;;      is .MODEL or .SUBCKT and refdes doesn't begin with a U or X
+;;      respectively, prepend the correct prefix to the refdes.
 ;; 3.   Print out the rest of the line.     
 ;;
 ;;----------------------------------------------------------------
-(define spice-sdb:write-ic
-  (lambda (package file-info-list port)
-
-    (debug-spew (string-append "Found ic.  Refdes = " package "\n"))
+(define (spice-sdb:write-ic package file-info-list port)
 
     ;; First do local assignments
-    (let ((model-name (gnetlist:get-package-attribute package "model-name"))
+    (let ((first-char (string (string-ref package 0)))  ;; extract first char of refdes
+	  (model-name (gnetlist:get-package-attribute package "model-name"))
 	  (model (gnetlist:get-package-attribute package "model"))
 	  (value (gnetlist:get-package-attribute package "value"))
+          (type  (gnetlist:get-package-attribute package "type"))
 	  (model-file (gnetlist:get-package-attribute package "file"))
 	  (list-item (list))
 	 )   ;; end of local assignments
 
-    ;; First, if model-name is empty, we use value attribute instead.
-    ;; We do this by sticking the contents of "value" into "model-name".
-      (if (string=? model-name "unknown")
-	  (set! model-name value))
-      
-    ;; Now get item from file-info-list using model-name as key
-      (set! list-item (spice-sdb:get-file-info-list-item model-name file-info-list))
-
-    ;; check to see if list-item is null.
-      (if (null? list-item)
-
-    ;; list-item is null.  Evidently, we didn't discover any files holding this model.  
-    ;; Instead we look for model attribute
-	  (if (not (string=? model "unknown"))             
-	    (begin                                     ;; model attribute exists -- write out card and model.
-	      (debug-spew "Model info not found in model file list, but model attribute exists.  Write out spice card and .model line..\n") 
-              (spice-sdb:write-component-no-value package port)
-              (display (string-append model-name "\n" ) port)
-	      (display (string-append ".MODEL " model-name " " type " (" model ")\n") port)
-	    )
-	    (begin                                     ;; no model attribute either.  Just write out card.
-	      (debug-spew "Model info not found in model file list.  No model attribute either.  Just write what we know.\n")
-              (spice-sdb:write-component-no-value package port)
-              (display (string-append model-name "\n" ) port)
-	    )
-	  )   ;; end if (not (string=? . . . .
-
-    ;; list-item is not null.  Therefore we process line depending upon contents of list-item
-	  (let ((file-type (caddr list-item)) )
-	   (cond 
-	      ;; ---- file holds a model ----
-	      ((string=? file-type ".MODEL") 
-	       (begin
-		(debug-spew (string-append "Found .MODEL with model-file and model-name for " package "\n")) 
-                 (spice-sdb:write-prefix package "U" port)  ;; this appends an "U" to the refdes since we have a .model
-                 (spice-sdb:write-component-no-value package port)
-                 (display (string-append model-name "\n" ) port)
-		(debug-spew "We'll handle the file contents later . . .\n")
-	       ))
-
-	      ;; ---- file holds a subcircuit ----
-	      ((string=? file-type ".SUBCKT") 
-	       (begin
-		 (debug-spew (string-append "Found .SUBCKT with model-file and model-name for " package "\n")) 
-                 (spice-sdb:write-prefix package "X" port)  ;; this appends an "X" to the refdes since we have a .subckt
-                 (spice-sdb:write-component-no-value package port)
-                 (display (string-append model-name "\n" ) port)
-		 (debug-spew "We'll handle the file contents later . . .\n")
-	       ))
-	   )  ;; close of inner cond
-	 )   ;; end of inner let
-       )  ;; end of if (null? list-item
-
-  ) ;; end of outer let
- )
-)
-
-
-;;----------------------------------------------------------------
-;;  spice-sdb:write-subcircuit
-;;  This writes out a valid subcircuit line.
-;;  The algorithm is as follows:
-;;  1.  Figure out what type of model goes with this part from 
-;;      file-info-list.  If it isn't listed, look for a MODEL attribute.
-;;      If MODEL attribute is attached, write out SPICE card, and then
-;;      write out .MODEL on next line.
-;;      If no MODEL attribute is attached, just write out what little 
-;;      we know.  Then return.
-;;  2.  If the model-name is in the file-info-list, get the associated
-;;      file-type.  Compare it against the component's refdes.  If model-type 
-;;      == .MODEL and refdes doesn't begin with U, prepend an U to the refdes.
-;; 3.   Print out the rest of the line.     
-;;
-;;  Note:  This is basically a clone of write-ic.  I can probably just
-;;         eliminate this fcn and call write-ic for all U or X refdeses.
-;;         Maybe on the next revision?
-;;----------------------------------------------------------------
-(define spice-sdb:write-subcircuit
-  (lambda (package file-info-list port)
-
-    (debug-spew (string-append "Found subcircuit.  Refdes = " package "\n"))
-
-    ;; First do local assignments
-    (let ((model-name (gnetlist:get-package-attribute package "model-name"))
-	  (model (gnetlist:get-package-attribute package "model"))
-	  (value (gnetlist:get-package-attribute package "value"))
-	  (model-file (gnetlist:get-package-attribute package "file"))
-	  (list-item (list))
-	 )   ;; end of local assignments
+      (cond
+        ((string=? first-char "U") (debug-spew (string-append "Found ic.  Refdes = " package "\n")))
+        ((string=? first-char "X") (debug-spew (string-append "Found subcircuit.  Refdes = " package "\n")))
+      )
 
     ;; First, if model-name is empty, we use value attribute instead.
     ;; We do this by sticking the contents of "value" into "model-name".
@@ -909,7 +846,9 @@
 	      (debug-spew "Model info not found in model file list, but model attribute exists.  Write out spice card and .model line..\n") 
               (spice-sdb:write-component-no-value package port)
               (display (string-append model-name "\n" ) port)
-	      (display (string-append ".MODEL " model-name " " type " (" model ")\n") port)
+	      (display (string-append ".MODEL " model-name " ") port)
+	      (if (not (string=? type "unknown")) (display (string-append type " ") port))  ;; If no type then just skip it.
+	      (display (string-append "(" model ")\n") port)
 	    )
 	    (begin                                     ;; no model attribute either.  Just write out card.
 	      (debug-spew "Model info not found in model file list.  No model attribute either.  Just write what we know.\n")
@@ -925,7 +864,7 @@
 	      ((string=? file-type ".MODEL") 
 	       (begin
 		(debug-spew (string-append "Found .MODEL with model-file and model-name for " package "\n")) 
-                 (spice-sdb:write-prefix package "U" port)  ;; this prepends an "U" to the refdes if needed
+                 (spice-sdb:write-prefix package "U" port)  ;; this prepends an "U" to the refdes if needed, since we have a .model
                  (spice-sdb:write-component-no-value package port)
                  (display (string-append model-name "\n" ) port)
 		(debug-spew "We'll handle the file contents later . . .\n")
@@ -935,7 +874,7 @@
 	      ((string=? file-type ".SUBCKT") 
 	       (begin
 		 (debug-spew (string-append "Found .SUBCKT with model-file and model-name for " package "\n")) 
-                 (spice-sdb:write-prefix package "X" port)  ;; this appends an "X" to the refdes if needed
+                 (spice-sdb:write-prefix package "X" port)  ;; this prepends an "X" to the refdes if needed, since we have a .subckt
                  (spice-sdb:write-component-no-value package port)
                  (display (string-append model-name "\n" ) port)
 		 (debug-spew "We'll handle the file contents later . . .\n")
@@ -945,7 +884,6 @@
        )  ;; end of if (null? list-item
 
   ) ;; end of outer let
- )
 )
 
 
@@ -1258,41 +1196,11 @@
   )
 )
 
-; most of this code is shamelessly copied from write-net-names-on-component
-; probably net-on-component could take one more argument that will be formater
-; which receives pin data those generated in let, etc
-; then this cruft might just provide own formater and reuse code
-(define spice-sdb:write-probe-item
-  (lambda (refdes number-of-pins port)
-    (if (> number-of-pins 0)
-      (begin
-        (spice-sdb:write-probe-item refdes (- number-of-pins 1) port)
-        (let* ((pin-name (number->string number-of-pins))
-	       (pinnumber (gnetlist:get-attribute-by-pinseq refdes pin-name "pinnumber"))
-	       (pinseq (gnetlist:get-attribute-by-pinseq refdes pin-name "pinseq"))
-	       (netname (car (spice-sdb:get-net refdes pinnumber)) )
-	       )
 
-;; -------  Super debug stuff  --------
-	  (debug-spew "  In write-probe-item. . . . \n")
-	  (debug-spew (string-append "     pin-name = " pin-name "\n"))
-	  (debug-spew (string-append "     pinnumber = " pinnumber "\n"))
-	  (debug-spew (string-append "     pinseq = " pinseq "\n"))
-	  (debug-spew (string-append "     netname = " netname "\n"))
-;; ------------------------------ 
-
-	  (if (not (string=? netname "ERROR_INVALID_PIN"))
-             (display (string-append "V(" netname ") ") port)     ;; write out attached net if OK.
-             (debug-spew (string-append "For " refdes ", found pin with no pinseq attribute.  Ignoring. . . .\n"))
-          )
-        )  ;; let*
-      ) ;; begin
-    ) ;; if
-  ) ;; lambda
-)
-
-(define spice-sdb:write-probe
-  (lambda (package port)
+;;----------------------------------------------------------------------------
+; write a voltage probe
+;;----------------------------------------------------------------------------
+(define (spice-sdb:write-probe package port)
     ;; fetch only one attr we care about, so far
     (let ((value (gnetlist:get-package-attribute package "value"))
 	 ) ;; end of local assignments
@@ -1303,50 +1211,57 @@
       (set! value "TRAN"))
 
     (display (string-append "* Probe device " package " on nets ") port)
-    (spice-sdb:write-probe-item package (length (gnetlist:get-pins package)) port)
+    (spice-sdb:write-net-names-on-component package port)
     (newline port)
     (display (string-append ".print " value " +") port)
-    (spice-sdb:write-probe-item package (length (gnetlist:get-pins package)) port)
+    (spice-sdb:write-net-names-on-component package port
+      (string-join (map (lambda (x) "V(~a)") (gnetlist:get-pins package)) " " 'infix) )	;; make format string
     (newline port)
   ) ;; end of let
- ) ;; close of lambda
 ) ;; close of define
 
+
 ;;--------------------------------------------------------------------
-;; Given a refdes and number of pins, this writes out the nets
-;; attached to the component's pins.  This is used to write out
-;; non-slotted parts.  Call it with a component refdes and the number 
-;; of pins left on this component to look at.
+;; Given a refdes and port, and optionaly a format string, this writes
+;; out the nets attached to the component's pins.  This is used to write
+;; out non-slotted parts.
 ;;--------------------------------------------------------------------
-(define spice-sdb:write-net-names-on-component
-  (lambda (refdes number-of-pins port)
-    (if (> number-of-pins 0)
-      (begin
-            ;; first find pin1 and then start writing the connected net name
-        (spice-sdb:write-net-names-on-component refdes (- number-of-pins 1) port)
-            ;; generate a pin-name e.g. pin1, pin2, pin3 ...
-        (let* ((pin-name (number->string number-of-pins))
-	       (pinnumber (gnetlist:get-attribute-by-pinseq refdes pin-name "pinnumber"))
-	       (pinseq (gnetlist:get-attribute-by-pinseq refdes pin-name "pinseq"))
-	       (netname (car (spice-sdb:get-net refdes pinnumber)) )
-	       )
+(define (spice-sdb:write-net-names-on-component refdes port . format)
+
+;; get-net-name -- helper function. Called with pinseq, returns net name,
+;; unless net name is "ERROR_INVALID_PIN" then it returns false.
+    (define (get-net-name pin)
+        (set! pin (number->string pin))
 
 ;; -------  Super debug stuff  --------
-	  (debug-spew "  In write-net-names-on-component. . . . \n")
-	  (debug-spew (string-append "     pin-name = " pin-name "\n"))
-	  (debug-spew (string-append "     pinnumber = " pinnumber "\n"))
-	  (debug-spew (string-append "     pinseq = " pinseq "\n"))
-	  (debug-spew (string-append "     netname = " netname "\n"))
-;; ------------------------------ 
-
-	  (if (not (string=? netname "ERROR_INVALID_PIN"))
-             (display (string-append netname " ") port)     ;; write out attached net if OK.
-             (debug-spew (string-append "For " refdes ", found pin with no pinseq attribute.  Ignoring. . . .\n"))
-          )
-        )  ;; let*
-      )    ;; begin
-    )
-  )
+          (if #f
+	    (begin
+	      (debug-spew "  In write-net-names-on-component. . . . \n")
+	      (debug-spew (string-append "     pin-name = " pin "\n"))
+	      (debug-spew (string-append "     pinnumber = " (gnetlist:get-attribute-by-pinseq refdes pin "pinnumber") "\n"))
+	      (debug-spew (string-append "     pinseq = " (gnetlist:get-attribute-by-pinseq refdes pin "pinseq")))
+	      (if (not (string=? pin (gnetlist:get-attribute-by-pinseq refdes pin "pinseq")))
+		(debug-spew " <== INCONSISTANT!\n")
+		(debug-spew "\n") )
+	      (debug-spew (string-append "     netname = " (car (spice-sdb:get-net refdes (gnetlist:get-attribute-by-pinseq refdes pin "pinnumber"))) "\n"))
+	  )) ;; if #T for super debugging
+;; -------------------------------------
+
+	(set! pin (car (spice-sdb:get-net refdes (gnetlist:get-attribute-by-pinseq refdes pin "pinnumber"))))
+	(if (string=? pin "ERROR_INVALID_PIN")
+	  (begin
+	    (debug-spew (string-append "For " refdes ", found pin with no pinseq attribute.  Ignoring. . . .\n"))
+	    #f)  ;; begin
+	pin)  ;; if
+    )  ;; define get-net-name
+
+    ;; First do local assignments
+    (let ((netnames (filter-map get-net-name (range 1 (length (gnetlist:get-pins refdes)))))
+         )  ;; let
+      (if (null? format)
+        (display (string-join netnames " " 'suffix) port)			;; write out nets.
+        (apply simple-format (cons port (cons (car format) netnames))) )	;; write out nets with format string
+    )  ;; let
 )
 
 
@@ -1358,7 +1273,7 @@
 (define spice-sdb:write-component-no-value
   (lambda (package port)
     (display (string-append package " ") port)  ;; write component refdes
-    (spice-sdb:write-net-names-on-component package (length (gnetlist:get-pins package)) port)
+    (spice-sdb:write-net-names-on-component package port)
   )
 )
 
@@ -1549,8 +1464,8 @@
 ;;            has been careless.)
 ;;      U? -- Invokes write-ic. This provides the opportunity for a component
 ;;            model to be instantiated.
-;;      X? -- Invokes write-subcircuit.  This provides the opportunity for a component
-;;            model to be instantiated. 
+;;      X? -- Invokes write-ic.  This provides the opportunity for a component
+;;            subcircuit to be instantiated.
 ;;      V? -- Invokes write-independent-voltage-source
 ;;      I? -- Invokes write-independent-current-source
 ;;      Otherwise, it just outputs the refdes, the attached nets, and the 
@@ -1568,7 +1483,7 @@
        ((string=? first-char "U") (spice-sdb:write-ic package file-info-list port))
        ((string=? first-char "V") (spice-sdb:write-independent-voltage-source package port))
        ((string=? first-char "I") (spice-sdb:write-independent-current-source package port))
-       ((string=? first-char "X") (spice-sdb:write-subcircuit package file-info-list port))
+       ((string=? first-char "X") (spice-sdb:write-ic package file-info-list port))
        (else 
 	(display (string-append "Found unknown component.  Refdes = " package "\n"))
         (spice-sdb:write-component-no-value package port)
@@ -1702,7 +1617,13 @@
 	  (set! value (gnetlist:get-package-attribute package "value") )
 	  (set! model-file (gnetlist:get-package-attribute package "file") )
 
-	  ;; sometimes get-package-attribute returns "?" instead of "unknown".  WTF?  This should fix that . . .
+	  ;; Sometimes get-package-attribute returns "?" instead of "unknown".
+	  ;; This is because some symbols use file=? as a place holder value to indicate that
+	  ;; it needs to be filled in. It is simular other place holders like  footprint=none, and refdes=R?.
+	  ;; ? seems to be an ad hoc place holder for other attributes as well, like value for example.
+	  ;; FIXME: Of couse there could be many other places that this problem occurs. An effort should be
+	  ;; made to come up with a consistant way of representing place holders.
+
 	  (if (string-ci=? model-file "?")
 	      (set! model-file "unknown"))
 
diff --git a/gnetlist/tests/common/outputs/spice-sdb/stack-torture-output.net b/gnetlist/tests/common/outputs/spice-sdb/stack-torture-output.net
index 67fbaa9..994fb63 100644
--- a/gnetlist/tests/common/outputs/spice-sdb/stack-torture-output.net
+++ b/gnetlist/tests/common/outputs/spice-sdb/stack-torture-output.net
@@ -1,3 +1,4 @@
+* /usr/src/gaf/gnetlist/src/.libs/lt-gnetlist -g spice-sdb -o foo.bar inputs/stack-torture.sch
 *********************************************************
 * Spice file generated by gnetlist                      *
 * spice-sdb version 4.28.2007 by SDB --                 *
@@ -5,4 +6,5 @@
 * Documentation at http://www.brorson.com/gEDA/SPICE/   *
 *********************************************************
 *==============  Begin SPICE netlist of main design ============
-C? 
\ No newline at end of file
+C? 1024 1025
+.end
diff --git a/gnetlist/tests/common/outputs/spice-sdb/stack-torture.retcode b/gnetlist/tests/common/outputs/spice-sdb/stack-torture.retcode
index d00491f..573541a 100644
--- a/gnetlist/tests/common/outputs/spice-sdb/stack-torture.retcode
+++ b/gnetlist/tests/common/outputs/spice-sdb/stack-torture.retcode
@@ -1 +1 @@
-1
+0

commit 746737d8bff55ce807b12d62b3a665f7843b5965
Author: Clif Cox <clif@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: White space consistancy cleanup in spice-sdb. [3117075]
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

diff --git a/gnetlist/scheme/gnet-spice-sdb.scm b/gnetlist/scheme/gnet-spice-sdb.scm
index 39ea063..7debb8b 100644
--- a/gnetlist/scheme/gnet-spice-sdb.scm
+++ b/gnetlist/scheme/gnet-spice-sdb.scm
@@ -149,7 +149,6 @@
 )))
 
 
-
 ;;--------------------------------------------------------------------------
 ;; handle-spice-file:  This wraps insert-text-file.
 ;; Calling form: (handle-spice-file file-name)
@@ -167,7 +166,6 @@
 ))
 
 
-
 ;;--------------------------------------------------------------------------
 ;; Given a filename, open the file, get the contents, and dump them
 ;; into the spice file.
@@ -199,6 +197,7 @@
   )
 )
 
+
 ;;----------------------------------------------------------
 ;; Figure out if this schematic is a .SUBCKT lower level.
 ;; This is determined if there is a spice-subcircuit-LL  
@@ -264,6 +263,7 @@
  )
 )
 
+
 ;;----------------------------------------------------------------
 ;;  This takes the list of io-pin-packages and sorts it in order of 
 ;;  refdes.
@@ -303,7 +303,6 @@
 )
 
 
-
 ;;----------------------------------------------------------------
 ;;  Given a list of spice-IO packages (refdeses), this function returns the list
 ;;  of nets attached to the IOs.
@@ -347,6 +346,7 @@
   )
 )
 
+
 ;;----------------------------------------------------------
 ;;  This returns #t if the string is composed only of
 ;;  whitespace.  It works by turning the string into 
@@ -513,8 +513,6 @@
 ))
 	    
 
-
-
 ;;**********************************************************************************
 ;;***************  Dealing with nets, devices, & SPICE cards.    *******************
 ;;**********************************************************************************
@@ -531,6 +529,7 @@
   )
 )
 
+
 ;;---------------------------------------------------------------------
 ;; write netnames connected to pin-a and pin-b
 ;;   (currently used by the controlled sources (e, g, f and h)
@@ -950,8 +949,6 @@
 )
 
 
-
-
 ;;-----------------------------------------------------------
 ;;  write npn bipolar transistor
 ;;  This writes out a valid transistor refdes & then calls
@@ -989,6 +986,7 @@
   )
 )
 
+
 ;;-----------------------------------------------------------
 ;;  write p-channel jfet transistor
 ;;-----------------------------------------------------------
@@ -1012,6 +1010,7 @@
   )
 )
 
+
 ;;------------------------------------------------------
 ;;  write nmos transistor
 ;;------------------------------------------------------
@@ -1177,6 +1176,7 @@
   )
 )
 
+
 ;;-------------------------------------------------------------------------
 ;;  write independent current source
 ;;  The behavior of the current source is held in the "value" attribute
@@ -1199,6 +1199,7 @@
   )
 )
 
+
 ;;----------------------------------------------------------------------------
 ;;  write Josephson junction in wrspice format. Paul Bunyk, Sep 2, 2005
 ;;----------------------------------------------------------------------------
@@ -1231,6 +1232,7 @@
   )
 )
 
+
 ;;----------------------------------------------------------------------------
 ;;  write mutual inductance(actually K). Paul Bunyk, Sep 2, 2005
 ;;----------------------------------------------------------------------------
@@ -1478,6 +1480,7 @@
      ) ;; end of cond
 )))
 
+
 ;;----------------------------------------------------------
 ;; Include an option using an .OPTIONS directive
 ;;----------------------------------------------------------
@@ -1533,8 +1536,6 @@
 ) ;; close of define
 
 
-
-
 ;;-------------------------------------------------------------------
 ;;  This writes out the default component (i.e. the "device" attribute
 ;;  was not recognized).  This function does the following:
@@ -1582,7 +1583,6 @@
 )
 
 
-
 ;;**********************************************************************************
 ;;***************  High-level functions for program control  ***********************
 ;;**********************************************************************************
@@ -1680,7 +1680,6 @@
 	 ))))
 
 
-
 ;;----------------------------------------------------------------------
 ;; create-file-info-list: This takes as arugment the list of packages (refdesses).
 ;;   It runs through the package list, and for each gets the attributes.  If there is a
@@ -1752,7 +1751,6 @@
 )
 
 
-
 ;;  in-file-info-list? -- helper function.  Returns #t if file is already in file-info-list, otherwise #f
 ;;  assumes file-info-list of form: ((model1 file1 file-type1)  (model2 file2 file-type2) . . . .)
 (define spice-sdb:in-file-info-list?
@@ -1776,8 +1774,6 @@
 ))  ;; end define spice-sdb:in-file-info-list?
 
 
-
-
 ;;--------------------------------------------------------------
 ;; Write out spice netlist header
 ;;--------------------------------------------------------------
@@ -1792,6 +1788,7 @@
   )
 )
 
+
 ;;--------------------------------------------------------------
 ;; Write out .SUBCKT netlist header
 ;;--------------------------------------------------------------
@@ -1944,7 +1941,6 @@
       )
 
 
-
 ;;
 ;;  Finally, close up and go home.
 ;;




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs