From: Jonathan Blake <jonathan.blake@projectaon.org>
Date: Thu, 7 Dec 2006 01:42:28 +0000 (+0000)
Subject: Text illustrations need inclusion
X-Git-Tag: 20121028~34
X-Git-Url: http://git.projectaon.org/?a=commitdiff_plain;h=fbeef9cd5db4d9ebf735d075072e47eb53206611;p=project-aon.git

Text illustrations need inclusion


git-svn-id: https://projectaon.org/data/trunk@199 f6f3e2d7-ff33-0410-aaf5-b4bee2cdac11
---

diff --git a/xml/xhtml-mongoose.xsl b/xml/xhtml-mongoose.xsl
index 9c252af..f5ff53a 100644
--- a/xml/xhtml-mongoose.xsl
+++ b/xml/xhtml-mongoose.xsl
@@ -9,6 +9,9 @@
 $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
 
@@ -852,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" />