From 5993a30d9c2d4a300951fe0ed95bb7abcfd4ca6d Mon Sep 17 00:00:00 2001
From: dwarning <dwarning>
Date: Sat, 23 Jul 2011 07:57:07 +0000
Subject: [PATCH] lower case substitution in xml module

---
 ChangeLog                                           | 11 +++++++++++
 src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml | 13 ++++++++-----
 .../devices/adms/admst/ngspiceMakefile.am.xml       |  6 ++++--
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f4739dda1..e2db36456 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-07-23  Dietmar Warning
+ * ngspiceMODULE.c.xml, ngspiceMakefile.am.xml: lower case substitution in xml module 
+   instead with perl in make process
+
+2011-07-22  Laurent Lemaitre
+ * ngspice.xml: add code to create Makefile.am using flag --create_makefile_am 
+   at admsXml command line
+
+2011-07-21  Laurent Lemaitre
+ * ngspice.xml: resync with adms api changes
+
 2011-07-20  Holger Vogt
  * commands.c, runcoms2.c, runcoms2.h:
    command 'remcirc': remove the current circuit
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml
index 6fe23762a..ca5e70c7f 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.5  2011-01-13 17:05:46  dwarning
+  Revision 1.6  2011-07-23 07:57:07  dwarning
+  lower case substitution in xml module
+
+  Revision 1.5  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.4  2006/03/05 09:38:41  pnenzi
@@ -62,13 +65,13 @@
     <admst:when test="[type='real']">
       <admst:value-of select="name"/>
       <admst:value-of select="name"/>
-      <admst:value-of select="name"/>
+      <admst:value-of select="lower-case(name)"/>
       <admst:text format=" IOP(&quot;%s&quot;,$(module)_instance_%s,IF_REAL,&quot;%s&quot;)"/>
     </admst:when>
     <admst:when test="[type='integer']">
       <admst:value-of select="name"/>
       <admst:value-of select="name"/>
-      <admst:value-of select="name"/>
+      <admst:value-of select="lower-case(name)"/>
       <admst:text format=" IOP(&quot;%s&quot;,$(module)_instance_%s,IF_INTEGER,&quot;%s&quot;)"/>
     </admst:when>
     <admst:otherwise>
@@ -83,13 +86,13 @@
     <admst:when test="[type='real']">
       <admst:value-of select="name"/>
       <admst:value-of select="name"/>
-      <admst:value-of select="name"/>
+      <admst:value-of select="lower-case(name)"/>
       <admst:text format=" IOP(&quot;%s&quot;,$(module)_model_%s,IF_REAL,&quot;%s&quot;)"/>
     </admst:when>
     <admst:when test="[type='integer']">
       <admst:value-of select="name"/>
       <admst:value-of select="name"/>
-      <admst:value-of select="name"/>
+      <admst:value-of select="lower-case(name)"/>
       <admst:text format=" IOP(&quot;%s&quot;,$(module)_model_%s,IF_INTEGER,&quot;%s&quot;)"/>
     </admst:when>
     <admst:otherwise>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
index 9e8f7f201..379274b48 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.20  2011-05-20 16:15:04  rlar
+  Revision 1.21  2011-07-23 07:57:07  dwarning
+  lower case substitution in xml module
+
+  Revision 1.20  2011/05/20 16:15:04  rlar
   revert ngspiceMakfile.am.xml
 
   Revision 1.17  2011-02-21 19:40:23  dwarning
@@ -123,7 +126,6 @@ $(module).c: admsva/$(module).va
 	-e \$(ADMSXMLINTERFACE)/ngspiceMODULEguesstopology.c.xml \\
 	-e \$(ADMSXMLINTERFACE)/ngspiceMODULE.hxx.xml \\
 	-e \$(ADMSXMLINTERFACE)/ngspiceMODULE.c.xml
-	perl -p -i.bak -e 's/IOP\\("(\\w+)"/IOP("\\L\\1"/' $(module).c
 
 noinst_LTLIBRARIES = lib$(module).la