From 10219ace637c2bf3f34ec0f532668bda95afdce6 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 13 May 2017 17:07:34 +0200
Subject: [PATCH] avoid unneccessairy diff noise (due to currentdate) in the
 adms generated files

---
 src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml        | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMODULEacld.c.xml    | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml     | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml    | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMODULEdel.c.xml     | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMODULEdest.c.xml    | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMODULEext.h.xml     | 7 ++-----
 .../devices/adms/admst/ngspiceMODULEguesstopology.c.xml    | 2 +-
 src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml    | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMODULEinit.h.xml    | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMODULEitf.h.xml     | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml    | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml    | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMODULEmdel.c.xml    | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMODULEmpar.c.xml    | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMODULEnoise.c.xml   | 2 +-
 src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml     | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMODULEpzld.c.xml    | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMODULEsetup.c.xml   | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml    | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMODULEtrunc.c.xml   | 7 ++-----
 src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml     | 7 ++-----
 22 files changed, 42 insertions(+), 102 deletions(-)

diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml
index 9d466c854..dc887ee58 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml
@@ -103,11 +103,8 @@ int $(module)mSize = sizeof($(module)model);
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%s.c">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEacld.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEacld.c.xml
index f4e890a22..2e9206c1a 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEacld.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEacld.c.xml
@@ -84,11 +84,8 @@ int $(module)acLoad(GENmodel *inModel, CKTcircuit *ckt)
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sacld.c">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
index 1da24a76d..2ebcdef42 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
@@ -73,11 +73,8 @@ int $(module)ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sask.c">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml
index cb449e526..c39485a36 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml
@@ -332,11 +332,8 @@ typedef struct s$(module)model {         /* model structure */
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sdefs.h">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdel.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdel.c.xml
index 91e67e531..00a7aa96f 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEdel.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdel.c.xml
@@ -56,11 +56,8 @@ $(module)delete(GENinstance *gen_inst)
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sdel.c">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdest.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdest.c.xml
index 5e5f9b6fd..eadee1a98 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEdest.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdest.c.xml
@@ -53,11 +53,8 @@ $(module)destroy(void)
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sdest.c">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEext.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEext.h.xml
index 63ada4f98..1217fc866 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEext.h.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEext.h.xml
@@ -61,11 +61,8 @@ extern void $(module)destroy(void);
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sext.h">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
index b27faae1f..0b96cf071 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
@@ -295,7 +295,7 @@ int $(module)guesstopology (SMPmatrix *matrix, CKTcircuit *ckt, $(module)model *
   <admst:variable name="module" select="%(attribute[name='ngspicename']/value)"/>
   <admst:open file="$(module)guesstopology.c">
     <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
-    <admst:text format=" *** created by: %(/simulator/fullname) - %(/simulator/currentdate) ***/\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:message format="$(module)guesstopology.c: file created\n"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml
index 4721505dd..83bde7ad1 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml
@@ -107,11 +107,8 @@ get_$(module)_info(void)
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sinit.c">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEinit.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEinit.h.xml
index f8433dd93..78d732bdc 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEinit.h.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEinit.h.xml
@@ -46,11 +46,8 @@ extern int $(module)mSize;
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sinit.h">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEitf.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEitf.h.xml
index 84454cb6b..7a5c9c9f0 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEitf.h.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEitf.h.xml
@@ -39,11 +39,8 @@ extern SPICEdev *get_$(module)_info(void);
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sitf.h">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml
index 815e08aec..c673fbd64 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml
@@ -321,11 +321,8 @@ int $(module)load(GENmodel *inModel, CKTcircuit *ckt)
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sload.c">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml
index 7740115c2..1c519b3f3 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml
@@ -71,11 +71,8 @@ int $(module)mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%smask.c">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEmdel.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEmdel.c.xml
index 849aaf938..55267306f 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEmdel.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEmdel.c.xml
@@ -56,11 +56,8 @@ $(module)mDelete(GENmodel *gen_model)
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%smdel.c">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEmpar.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEmpar.c.xml
index 5829ccc0e..2b5170f93 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEmpar.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEmpar.c.xml
@@ -71,11 +71,8 @@ int $(module)mParam(int param, IFvalue *value, GENmodel *inMod)
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%smpar.c">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEnoise.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEnoise.c.xml
index bdadeeceb..eb71f4823 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEnoise.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEnoise.c.xml
@@ -78,7 +78,7 @@ $(module)noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Nd
 <admst:for-each select="/module">
   <admst:open file="%(attribute[name='ngspicename']/value)noise.c">
     <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
-    <admst:text format=" *** created by: %(/simulator/fullname) - %(/simulator/currentdate) ***/\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:message format="%(attribute[name='ngspicename']/value)noise.c: file created\n"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml
index 165ff943d..e05987c36 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml
@@ -72,11 +72,8 @@ int $(module)par(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%spar.c">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEpzld.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEpzld.c.xml
index 950003beb..d43dec4b2 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEpzld.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEpzld.c.xml
@@ -95,11 +95,8 @@ int $(module)pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%spzld.c">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEsetup.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEsetup.c.xml
index c2d5aa11f..90d80c350 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEsetup.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEsetup.c.xml
@@ -197,11 +197,8 @@ $(module)unsetup(GENmodel *inModel, CKTcircuit *ckt)
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%ssetup.c">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml
index b4c756360..b40c18aa1 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml
@@ -77,11 +77,8 @@ int $(module)temp(GENmodel *inModel, CKTcircuit *ckt)
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%stemp.c">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEtrunc.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEtrunc.c.xml
index cf69c31d8..4b5152c8f 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEtrunc.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEtrunc.c.xml
@@ -89,11 +89,8 @@ int $(module)trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
 <admst:for-each select="/module">
   <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%strunc.c">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="/***\n*** Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format=" *** created by: %s - %s ***/\n"/>
+    <admst:text format="/***\n*** Interface: %(/simulator/package_string)\n"/>
+    <admst:text format=" *** created by: %(/simulator/fullname) ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:value-of select="attribute[name='ngspicename']/value"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
index df6c79fd7..0d5dc3afb 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
@@ -138,11 +138,8 @@ DISTCLEANFILES = Makefile.am \\
 
 <admst:for-each select="/module">
   <admst:open file="Makefile.am">
-    <admst:value-of select="/simulator/package_string"/>
-    <admst:text format="##\n## Interface: %s\n"/>
-    <admst:value-of select="/simulator/currentdate"/>
-    <admst:value-of select="/simulator/fullname"/>
-    <admst:text format="## created by: %s - %s\n"/>
+    <admst:text format="##\n## Interface: %(/simulator/package_string)\n"/>
+    <admst:text format="## created by: %(/simulator/fullname)\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
   <admst:message format="Makefile.am: file created\n"/>