# HG changeset patch
# User paulb
# Date 1128215450 0
# Node ID 0804afb44c80bb7cd90b35971285d872bf899ab8
# Parent  e80fa9008246d83426d2f9480a05489d8207e8ba
[project @ 2005-10-02 01:10:50 by paulb]
Made the Schema output more informative, describing enumerations better.
Added a stylesheet which could be used for simple sanity-checking of
input documents.

diff -r e80fa9008246 -r 0804afb44c80 XSLForms/XSL/Input.xsl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/XSLForms/XSL/Input.xsl	Sun Oct 02 01:10:50 2005 +0000
@@ -0,0 +1,134 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:axsl="http://www.w3.org/1999/XSL/TransformAlias"
+  xmlns:template="http://www.boddie.org.uk/ns/xmltools/template">
+
+  <xsl:output indent="yes"/>
+  <xsl:namespace-alias stylesheet-prefix="axsl" result-prefix="xsl"/>
+
+
+
+  <!-- Match the document itself. -->
+
+  <xsl:template match="/">
+    <axsl:stylesheet version="1.0">
+
+      <axsl:output indent="yes"/>
+
+      <!-- Make document parameters for all elements appearing to use enumerations. -->
+      <xsl:for-each select="//element[*/@expr]">
+        <axsl:param name="{@name}"/>
+      </xsl:for-each>
+
+      <!-- Make a document-level rule. -->
+      <axsl:template match="/">
+        <axsl:apply-templates select="*"/>
+      </axsl:template>
+
+      <!-- Process the top-level element to make other rules. -->
+      <xsl:apply-templates select="*"/>
+
+      <!-- Replicate unknown elements. -->
+      <axsl:template match="@*|node()">
+        <axsl:copy>
+          <axsl:apply-templates select="@*|node()"/>
+        </axsl:copy>
+      </axsl:template>
+
+    </axsl:stylesheet>
+  </xsl:template>
+
+
+
+  <!-- Match element references. -->
+
+  <xsl:template match="element">
+    <xsl:param name="nested">false</xsl:param>
+
+    <!-- Make a rule for the element. -->
+    <axsl:template match="{@name}">
+
+      <!-- Copy the element. -->
+      <xsl:element name="{@name}">
+
+        <!-- Process attributes. -->
+        <axsl:apply-templates select="@*"/>
+
+        <!-- Find elements and determine how to process them. -->
+        <xsl:for-each select="element">
+          <xsl:choose>
+            <!-- Enumerations. -->
+            <xsl:when test="@expr">
+              <xsl:call-template name="inside-element"/>
+            </xsl:when>
+            <!-- Top-level or "section" elements are added. -->
+            <xsl:when test="count(attribute) = 0 or $nested = 'false'">
+              <xsl:element name="{@name}">
+                <xsl:call-template name="inside-element"/>
+              </xsl:element>
+            </xsl:when>
+            <!-- Other elements are only added if found. -->
+            <xsl:otherwise>
+              <axsl:apply-templates select="{@name}"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:for-each>
+
+      </xsl:element>
+
+    </axsl:template>
+
+    <!-- Make rules for nested elements. -->
+    <xsl:choose>
+      <xsl:when test="$nested = 'true'">
+        <xsl:apply-templates select="*[not(@expr)]">
+          <xsl:with-param name="nested">true</xsl:with-param>
+        </xsl:apply-templates>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select="*/*[not(@expr)]">
+          <xsl:with-param name="nested">true</xsl:with-param>
+        </xsl:apply-templates>
+      </xsl:otherwise>
+    </xsl:choose>
+
+  </xsl:template>
+
+
+
+  <!-- Fill in elements. -->
+
+  <xsl:template name="inside-element">
+    <axsl:apply-templates select="{@name}/@*"/>
+    <xsl:choose>
+      <!-- Enumerations. -->
+      <xsl:when test="@expr">
+        <xsl:call-template name="inside-enumeration"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <!-- Enumeration containers. -->
+        <xsl:for-each select="*[@expr]">
+          <xsl:call-template name="inside-element"/>
+        </xsl:for-each>
+        <!-- Normal elements. -->
+        <xsl:if test="count(element[not(@expr)]) != 0">
+          <axsl:apply-templates select="{@name}/*"/>
+        </xsl:if>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+
+
+  <!-- Fill in enumerations. -->
+
+  <xsl:template name="inside-enumeration">
+    <axsl:for-each select="${../@name}/{../@name}/{@name}">
+      <axsl:copy>
+        <axsl:apply-templates select="@*"/>
+      </axsl:copy>
+    </axsl:for-each>
+  </xsl:template>
+
+</xsl:stylesheet>
diff -r e80fa9008246 -r 0804afb44c80 XSLForms/XSL/Schema.xsl
--- a/XSLForms/XSL/Schema.xsl	Sun Oct 02 01:10:02 2005 +0000
+++ b/XSLForms/XSL/Schema.xsl	Sun Oct 02 01:10:50 2005 +0000
@@ -48,8 +48,11 @@
   <xsl:template name="next-element">
     <xsl:param name="first-element"/>
     <xsl:param name="remaining-elements"/>
-    <xsl:element name="element">
+    <element>
       <xsl:attribute name="name"><xsl:value-of select="$first-element"/></xsl:attribute>
+      <xsl:if test="@template:expr">
+        <xsl:attribute name="expr"><xsl:value-of select="@template:expr"/></xsl:attribute>
+      </xsl:if>
       <xsl:choose>
         <xsl:when test="$remaining-elements = ''">
           <xsl:call-template name="enter-attribute"/>
@@ -60,7 +63,7 @@
           </xsl:call-template>
         </xsl:otherwise>
       </xsl:choose>
-    </xsl:element>
+    </element>
   </xsl:template>
 
 
@@ -74,16 +77,20 @@
   <xsl:template name="enter-attribute">
     <xsl:choose>
       <xsl:when test="@template:attribute">
-        <xsl:element name="attribute">
+        <attribute>
           <xsl:attribute name="name"><xsl:value-of select="@template:attribute"/></xsl:attribute>
-        </xsl:element>
-      </xsl:when>
-      <xsl:when test="@template:expr-attr">
-        <xsl:element name="attribute">
-          <xsl:attribute name="name"><xsl:value-of select="@template:value"/></xsl:attribute>
-        </xsl:element>
+        </attribute>
       </xsl:when>
       <xsl:otherwise>
+        <xsl:if test="@template:expr-attr">
+          <xsl:attribute name="expr-attr"><xsl:value-of select="@template:expr-attr"/></xsl:attribute>
+        </xsl:if>
+        <xsl:if test="@template:expr">
+          <xsl:attribute name="expr"><xsl:value-of select="@template:expr"/></xsl:attribute>
+        </xsl:if>
+        <xsl:if test="@template:value">
+          <xsl:attribute name="value"><xsl:value-of select="@template:value"/></xsl:attribute>
+        </xsl:if>
         <xsl:apply-templates select="*"/>
       </xsl:otherwise>
     </xsl:choose>