# HG changeset patch
# User paulb
# Date 1138322456 0
# Node ID 490425e80153d5637a1adee4a70bb2d92435cb5d
# Parent  1c7309b5dadadd1e32ce51855e1321e94f9bcd46
[project @ 2006-01-27 00:40:56 by paulb]
Changed the method of preparation so that output stylesheets use template
rules as opposed to nested for-each loops; this potentially allows
recursive templates.
Changed the extraction stylesheet to operate on original templates rather
than output stylesheets.
Added template:copy to various lists for attribute exclusion.

diff -r 1c7309b5dada -r 490425e80153 XSLForms/XSL/Extract.xsl
--- a/XSLForms/XSL/Extract.xsl	Fri Jan 27 00:35:15 2006 +0000
+++ b/XSLForms/XSL/Extract.xsl	Fri Jan 27 00:40:56 2006 +0000
@@ -18,13 +18,9 @@
 -->
 <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"
-  xmlns:dyn="http://exslt.org/dynamic"
-  extension-element-prefixes="dyn">
+  xmlns:template="http://www.boddie.org.uk/ns/xmltools/template">
 
   <xsl:output indent="yes"/>
-  <xsl:namespace-alias stylesheet-prefix="axsl" result-prefix="xsl"/>
 
   <xsl:param name="element-id"/>
 
@@ -33,33 +29,7 @@
   <!-- Start at the top, finding only the specified element. -->
 
   <xsl:template match="/">
-    <axsl:stylesheet version="1.0"
-      xmlns:dyn="http://exslt.org/dynamic"
-      extension-element-prefixes="dyn">
-
-      <axsl:output indent="yes"/>
-      <axsl:param name="element-path"/>
-
-      <!-- NOTE: Hard-coded doctypes to hopefully satisfy JavaScript code. -->
-      <!-- doctype-public="-//W3C//DTD XHTML 1.1//EN"
-        doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" -->
-
-      <axsl:template match="/">
-
-        <!-- Include the remaining attributes. -->
-        <xsl:apply-templates select="@*"/>
-
-        <!-- Process the elements. -->
-        <xsl:for-each select="//*[@template:id=$element-id]">
-          <axsl:for-each select="dyn:evaluate($element-path)">
-            <xsl:copy>
-              <xsl:apply-templates select="@*|node()"/>
-            </xsl:copy>
-          </axsl:for-each>
-        </xsl:for-each>
-
-      </axsl:template>
-    </axsl:stylesheet>
+    <xsl:apply-templates select="//*[@template:id=$element-id]"/>
   </xsl:template>
 
 
diff -r 1c7309b5dada -r 490425e80153 XSLForms/XSL/FixNamespace.xsl
--- a/XSLForms/XSL/FixNamespace.xsl	Fri Jan 27 00:35:15 2006 +0000
+++ b/XSLForms/XSL/FixNamespace.xsl	Fri Jan 27 00:40:56 2006 +0000
@@ -39,7 +39,7 @@
 
   <!-- Match specific template attributes. -->
 
-  <xsl:template match="@if|@element|@attribute|@attribute-field|@attribute-area|@attribute-button|@attribute-list-button|@selector-field|@multiple-choice-field|@multiple-choice-list-field|@multiple-choice-value|@multiple-choice-list-value|@multiple-choice-list-element|@effect|@value|@expr|@expr-attr|@i18n">
+  <xsl:template match="@if|@element|@attribute|@attribute-field|@attribute-area|@attribute-button|@attribute-list-button|@selector-field|@multiple-choice-field|@multiple-choice-list-field|@multiple-choice-value|@multiple-choice-list-value|@multiple-choice-list-element|@effect|@value|@expr|@expr-attr|@i18n|@copy">
     <!-- Add the namespace. -->
     <xsl:attribute name="template:{local-name(.)}">
       <xsl:copy-of select="string(.)"/>
diff -r 1c7309b5dada -r 490425e80153 XSLForms/XSL/Prepare.xsl
--- a/XSLForms/XSL/Prepare.xsl	Fri Jan 27 00:35:15 2006 +0000
+++ b/XSLForms/XSL/Prepare.xsl	Fri Jan 27 00:40:56 2006 +0000
@@ -23,109 +23,158 @@
 <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">
+  xmlns:template="http://www.boddie.org.uk/ns/xmltools/template"
+  xmlns:str="http://exslt.org/strings"
+  extension-element-prefixes="str">
 
   <xsl:output indent="yes"/>
   <xsl:namespace-alias stylesheet-prefix="axsl" result-prefix="xsl"/>
 
-
+  <!-- Fragment extraction support. -->
+  <xsl:param name="element-id"/>
 
   <!-- Match the document itself. -->
 
   <xsl:template match="/">
-    <axsl:stylesheet version="1.0">
+    <axsl:stylesheet version="1.0"
+      xmlns:dyn="http://exslt.org/dynamic"
+      extension-element-prefixes="dyn">
 
       <axsl:output indent="yes"/>
-      <!-- NOTE: Hard-coded doctypes to hopefully satisfy JavaScript code. -->
-      <!-- doctype-public="-//W3C//DTD XHTML 1.1//EN"
-        doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" -->
 
       <!-- Include internationalisation (i18n) support if appropriate. -->
       <axsl:param name="translations"/>
       <axsl:param name="locale"/>
 
+      <!-- Include fragment support if appropriate. -->
+      <axsl:param name="element-path"/>
+
       <axsl:template match="/">
+        <xsl:choose>
+          <!-- Fragment production. -->
+          <xsl:when test="$element-id != ''">
+            <axsl:for-each select="dyn:evaluate($element-path)">
+              <xsl:apply-templates select="@*|node()"/>
+            </axsl:for-each>
+          </xsl:when>
+          <!-- Whole template production. -->
+          <xsl:otherwise>
+            <xsl:apply-templates select="@*|node()"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </axsl:template>
 
-        <!-- Include the remaining attributes. -->
-        <xsl:apply-templates select="@*"/>
+      <!-- Produce the rules for each element. -->
+
+      <xsl:apply-templates select="//*[@template:element]">
+        <xsl:with-param name="top-level">true</xsl:with-param>
+      </xsl:apply-templates>
+
+    </axsl:stylesheet>
+  </xsl:template>
+
+
+
+  <!-- Match elements referencing elements. -->
+
+  <xsl:template match="*[@template:element]" priority="1">
+    <xsl:param name="top-level">false</xsl:param>
+    <xsl:call-template name="enter-element">
+      <xsl:with-param name="top-level" select="$top-level"/>
+    </xsl:call-template>
+  </xsl:template>
 
-        <!-- Process the elements. -->
-        <xsl:apply-templates select="*"/>
+  <xsl:template name="enter-element">
+    <xsl:param name="top-level"/>
+    <xsl:choose>
+      <!-- Produce templates where this is a top-level definition. -->
+      <xsl:when test="$top-level = 'true'">
+        <xsl:call-template name="element-template">
+          <xsl:with-param name="element-names" select="@template:element"/>
+        </xsl:call-template>
+      </xsl:when>
+      <!-- Produce references to elements where this is within a template. -->
+      <xsl:otherwise>
+        <xsl:variable name="first-name" select="str:split(@template:element, ',')[1]"/>
+        <!-- Check to see if this is a recursive reference. -->
+        <xsl:variable name="recursive-element" select="ancestor::*[$first-name = str:split(@template:element, ',')[1]]"/>
+        <xsl:choose>
+          <!-- Generate a reference to the previous element definition. -->
+          <xsl:when test="$recursive-element">
+            <axsl:apply-templates select="{$first-name}" mode="{generate-id($recursive-element)}"/>
+          </xsl:when>
+          <!-- Generate a reference to this element definition. -->
+          <xsl:otherwise>
+            <axsl:apply-templates select="{$first-name}" mode="{generate-id(.)}"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
 
-      </axsl:template>
-    </axsl:stylesheet>
+  <xsl:template name="element-template">
+    <xsl:param name="element-names"/>
+    <xsl:variable name="this-name" select="substring-before($element-names, ',')"/>
+    <xsl:variable name="next-names" select="substring-after($element-names, ',')"/>
+    <xsl:variable name="next-name" select="str:split($next-names, ',')[1]"/>
+    <xsl:choose>
+      <!-- Non-last part of a list of element names. -->
+      <!-- Produce a template referencing another template. -->
+      <xsl:when test="$this-name != ''">
+        <!-- Produce a template with a mode. -->
+        <axsl:template match="{$this-name}" mode="{generate-id(.)}">
+          <axsl:apply-templates select="{$next-name}" mode="{generate-id(.)}"/>
+        </axsl:template>
+        <!-- Produce the other elements' templates... -->
+        <xsl:call-template name="element-template">
+          <xsl:with-param name="element-names" select="$next-names"/>
+        </xsl:call-template>
+      </xsl:when>
+      <!-- Last part of a list of element names. -->
+      <!-- Produce a template with content. -->
+      <xsl:otherwise>
+        <!-- Produce a template with a mode. -->
+        <axsl:template match="{$element-names}" mode="{generate-id(.)}">
+          <xsl:call-template name="enter-attribute"/>
+        </axsl:template>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
 
 
   <!-- Match special conditional expression attributes. -->
 
-  <xsl:template match="*[@template:if]">
-    <axsl:if test="{@template:if}">
-      <xsl:choose>
-        <xsl:when test="@template:element">
-          <xsl:call-template name="enter-element">
-            <xsl:with-param name="other-elements" select="@template:element"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="enter-attribute"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </axsl:if>
-  </xsl:template>
-
-
-
-  <!-- Match element references. -->
-
-  <xsl:template match="*[not(@template:if) and @template:element]">
-    <xsl:call-template name="enter-element">
-      <xsl:with-param name="other-elements" select="@template:element"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template name="enter-element">
-    <xsl:param name="other-elements"/>
-    <xsl:variable name="first-element" select="substring-before($other-elements, ',')"/>
-    <xsl:variable name="remaining-elements" select="substring-after($other-elements, ',')"/>
+  <xsl:template match="*[@template:if]" priority="2">
+    <xsl:param name="top-level">false</xsl:param>
     <xsl:choose>
-      <xsl:when test="$first-element = ''">
-        <xsl:call-template name="next-element">
-          <xsl:with-param name="first-element" select="$other-elements"/>
+      <!-- Since this rule may be invoked at the top level, ignore conditions. -->
+      <xsl:when test="$top-level = 'true'">
+        <xsl:call-template name="enter-element">
+          <xsl:with-param name="top-level" select="$top-level"/>
         </xsl:call-template>
       </xsl:when>
+      <!-- As part of a template, generate the condition. -->
       <xsl:otherwise>
-        <xsl:call-template name="next-element">
-          <xsl:with-param name="first-element" select="$first-element"/>
-          <xsl:with-param name="remaining-elements" select="$remaining-elements"/>
-        </xsl:call-template>
+        <axsl:if test="{@template:if}">
+          <xsl:choose>
+            <xsl:when test="@template:element">
+              <xsl:call-template name="enter-element"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:call-template name="enter-attribute"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </axsl:if>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
-  <xsl:template name="next-element">
-    <xsl:param name="first-element"/>
-    <xsl:param name="remaining-elements"/>
-    <axsl:for-each select="{$first-element}">
-      <xsl:choose>
-        <xsl:when test="$remaining-elements = ''">
-          <xsl:call-template name="enter-attribute"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="enter-element">
-            <xsl:with-param name="other-elements" select="$remaining-elements"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </axsl:for-each>
-  </xsl:template>
-
 
 
   <!-- Match special expression attributes. -->
 
-  <xsl:template match="*[not(@template:if) and not(@template:element) and (@template:attribute or @template:value or @template:expr or @template:copy)]">
+  <xsl:template match="*[@template:attribute or @template:value or @template:expr or @template:copy]">
     <xsl:call-template name="enter-attribute"/>
   </xsl:template>
 
@@ -242,7 +291,7 @@
 
   <!-- Remove template attributes. -->
 
-  <xsl:template match="@template:element|@template:init|@template:attribute|@template:value|@template:expr|@template:expr-attr|@template:effect|@template:if|@template:i18n">
+  <xsl:template match="@template:element|@template:init|@template:attribute|@template:value|@template:expr|@template:expr-attr|@template:effect|@template:if|@template:i18n|@template:copy">
   </xsl:template>