Making it validate and tidying the indentation

[project-aon.git] / xml / xhtml-mongoose.xsl

diff --git a/xml/xhtml-mongoose.xsl b/xml/xhtml-mongoose.xsl
index 884d6b3..f5ff53a 100644 (file)
--- a/xml/xhtml-mongoose.xsl
+++ b/xml/xhtml-mongoose.xsl
@@ -9,6 +9,12 @@
 $Id$
 
 $Log$
+Revision 1.3  2006/12/07 01:42:28  jonathan.blake
+Text illustrations need inclusion
+
+Revision 1.2  2006/11/25 18:57:16  jonathan.blake
+Fixed links to footnotes
+
 Revision 1.1  2006/11/25 04:48:52  jonathan.blake
 Modified to generate a single unstyled, UTF-8, HTML file which lacks any illustrations
 
@@ -539,12 +545,14 @@ Todo:
     <!-- will the list always contain the closest ancestor first? -->
     <xsl:variable name="footnote-section"><xsl:value-of select="ancestor::section[position()=1]/@id" /></xsl:variable>
     <xsl:variable name="footnote-marker"><xsl:number count="footnotes/footnote" from="/" level="any" format="1" /></xsl:variable>
+    <xsl:variable name="footnote-id"><xsl:value-of select="@id" /></xsl:variable>
     <xsl:variable name="footnote-idref"><xsl:text>#</xsl:text><xsl:value-of select="@idref" /></xsl:variable>
      
     <xsl:for-each select="*[1]">
      <p>
       <xsl:text>[</xsl:text>
       <a>
+       <xsl:attribute name="name"><xsl:value-of select="$footnote-id" /></xsl:attribute>
        <xsl:attribute name="href"><xsl:value-of select="$footnote-idref" /></xsl:attribute>
        <xsl:value-of select="$footnote-marker" />
       </a>
@@ -847,19 +855,24 @@ Todo:
 </xsl:template>
 
 <xsl:template match="illustration">
- <xsl:if test="instance[@class='html'] and contains( $use-illustrators, concat( ':', meta/creator, ':' ) )">
-  <xsl:choose>
-   <xsl:when test="@class='float'">
-    <div class="illustration">
-     <xsl:text>[[Illustration </xsl:text>
-     <xsl:number count="illustration[@class='float' and contains( $use-illustrators, concat( ':', meta/creator, ':' ) )]" from="/" level="any" format="I" />
-     <xsl:text>]]</xsl:text>
-    </div><xsl:value-of select="$newline" />
-   </xsl:when>
-
-   <xsl:otherwise></xsl:otherwise>
-  </xsl:choose>
- </xsl:if>
+ <xsl:choose>
+  <xsl:when test="instance[@class='text'] and contains( $use-illustrators, concat( ':', meta/creator, ':' ) )">
+   <xsl:apply-templates select="instance[@class='text']/*"/>
+  </xsl:when>
+  <xsl:when test="instance[@class='html'] and contains( $use-illustrators, concat( ':', meta/creator, ':' ) )">
+   <xsl:choose>
+    <xsl:when test="@class='float'">
+     <div class="illustration">
+      <xsl:text>[[Illustration </xsl:text>
+      <xsl:number count="illustration[@class='float' and contains( $use-illustrators, concat( ':', meta/creator, ':' ) )]" from="/" level="any" format="I" />
+      <xsl:text>]]</xsl:text>
+     </div><xsl:value-of select="$newline" />
+    </xsl:when>
+    <xsl:otherwise></xsl:otherwise>
+   </xsl:choose>
+  </xsl:when>
+  <xsl:otherwise></xsl:otherwise>
+ </xsl:choose>
 </xsl:template>
 
 <xsl:template match="instance" />