X-Git-Url: http://git.projectaon.org/?a=blobdiff_plain;ds=sidebyside;f=xml%2Fxhtml.xsl;h=c57e70e5a47f61e126bd7b5874e828c4827df6f3;hb=d5b44188b4a54534f3f2ac4902869e13ae792a59;hp=3447141adf34a7812d7251ccea9a912626f30ada;hpb=61f06c0a17a832a260d7a53f5027dcedf0d79599;p=project-aon.git

diff --git a/xml/xhtml.xsl b/xml/xhtml.xsl
index 3447141..c57e70e 100644
--- a/xml/xhtml.xsl
+++ b/xml/xhtml.xsl
@@ -9,6 +9,12 @@
 $Id$
 
 $Log$
+Revision 1.12  2006/06/05 23:46:46  jonathan.blake
+Fixing the handling of titles when <ch.*/> elements are used.
+
+Revision 1.11  2006/04/04 18:48:52  angantyr
+Fixed paragraphed list and illref template bug.
+
 Revision 1.10  2006/04/02 19:14:37  angantyr
 Introduced automatic footnotes list generation and changed the illustrations
 list generation so that links to numbered sections are titled "Section ...".
@@ -170,7 +176,7 @@ Todo:
 <!-- :::::::::::: third-level front matter sections ::::::::::::: -->
 
 <xsl:template match="/gamebook/section/data/section/data/section[@class='frontmatter']">
- <h3><xsl:value-of select="meta/title[1]" /></h3>
+ <h3><xsl:apply-templates select="meta/title[1]" /></h3>
 
  <xsl:value-of select="$newline" />
  <xsl:value-of select="$newline" />
@@ -188,7 +194,7 @@ Todo:
 <!-- :::::::::::: fourth-level front matter sections :::::::::::: -->
 
 <xsl:template match="/gamebook/section/data/section/data/section/data/section[@class='frontmatter']">
- <h4><xsl:value-of select="meta/title[1]" /></h4>
+ <h4><xsl:apply-templates select="meta/title[1]" /></h4>
 
  <xsl:value-of select="$newline" />
  <xsl:value-of select="$newline" />
@@ -199,7 +205,7 @@ Todo:
 <!-- ::::::::::::: fifth-level front matter sections :::::::::::: -->
 
 <xsl:template match="/gamebook/section/data/section/data/section/data/section/data/section[@class='frontmatter']">
- <h5><xsl:value-of select="meta/title[1]" /></h5>
+ <h5><xsl:apply-templates select="meta/title[1]" /></h5>
 
  <xsl:value-of select="$newline" />
  <xsl:value-of select="$newline" />
@@ -219,7 +225,7 @@ Todo:
 <!-- :::::::::::: third-level main matter sections ::::::::::::: -->
 
 <xsl:template match="/gamebook/section/data/section/data/section[@class='mainmatter']">
- <h3><xsl:value-of select="meta/title[1]" /></h3>
+ <h3><xsl:apply-templates select="meta/title[1]" /></h3>
 
  <xsl:value-of select="$newline" />
  <xsl:value-of select="$newline" />
@@ -237,7 +243,7 @@ Todo:
 <!-- :::::::::::: fourth-level main matter sections :::::::::::: -->
 
 <xsl:template match="/gamebook/section/data/section/data/section/data/section[@class='mainmatter']">
- <h4><xsl:value-of select="meta/title[1]" /></h4>
+ <h4><xsl:apply-templates select="meta/title[1]" /></h4>
 
  <xsl:value-of select="$newline" />
  <xsl:value-of select="$newline" />
@@ -248,7 +254,7 @@ Todo:
 <!-- ::::::::::::: fifth-level main matter sections :::::::::::: -->
 
 <xsl:template match="/gamebook/section/data/section/data/section/data/section/data/section[@class='mainmatter']">
- <h5><xsl:value-of select="meta/title[1]" /></h5>
+ <h5><xsl:apply-templates select="meta/title[1]" /></h5>
 
  <xsl:value-of select="$newline" />
  <xsl:value-of select="$newline" />
@@ -270,7 +276,7 @@ Todo:
 <!-- glossary sections should be enclosed in a second level glossary section -->
 
 <xsl:template match="/gamebook/section/data/section/data/section[@class='glossary']">
- <h3><xsl:value-of select="meta/title[1]" /></h3>
+ <h3><xsl:apply-templates select="meta/title[1]" /></h3>
 
  <xsl:value-of select="$newline" />
  <xsl:value-of select="$newline" />
@@ -316,7 +322,7 @@ Todo:
 <!-- ::::::::::::: third-level back matter sections ::::::::::::: -->
 
 <xsl:template match="/gamebook/section/data/section/data/section[@class='backmatter']">
- <h3><xsl:value-of select="meta/title[1]" /></h3>
+ <h3><xsl:apply-templates select="meta/title[1]" /></h3>
 
  <xsl:value-of select="$newline" />
  <xsl:value-of select="$newline" />
@@ -327,7 +333,7 @@ Todo:
 <!-- ::::::::::::: fourth-level back matter sections ::::::::::::: -->
 
 <xsl:template match="/gamebook/section/data/section/data/section/data/section[@class='backmatter']">
- <h4><xsl:value-of select="meta/title[1]" /></h4>
+ <h4><xsl:apply-templates select="meta/title[1]" /></h4>
 
  <xsl:value-of select="$newline" />
  <xsl:value-of select="$newline" />
@@ -410,6 +416,7 @@ Todo:
    </blockquote><xsl:value-of select="$newline" />
   </xsl:when>
   <xsl:when test="self::illustration">
+   <!-- Backwards compatibility code -->
    <xsl:variable name="illustration-width" select="instance[@class='html']/@width" />
    <xsl:variable name="illustration-height" select="instance[@class='html']/@height" />
    <xsl:variable name="illustration-src" select="instance[@class='html']/@src" />
@@ -426,8 +433,16 @@ Todo:
     </div></div><xsl:value-of select="$newline" />
    </xsl:if>
   </xsl:when>
+  <xsl:when test="self::illref">
+   <xsl:if test="@class='html'">
+    <xsl:for-each select="id( @idref )">
+     <xsl:apply-templates select="." />
+    </xsl:for-each>
+   </xsl:if>
+  </xsl:when>
   <xsl:otherwise>
    <xsl:text>[error: paragraphed list template]</xsl:text>
+   <xsl:message><xsl:text>error: paragraphed list template</xsl:text></xsl:message>
   </xsl:otherwise>
  </xsl:choose>
 </xsl:template>
@@ -610,12 +625,15 @@ Todo:
  </blockquote><xsl:value-of select="$newline" />
 </xsl:template>
 
-<xsl:template match="illref[@class='html']">
- <xsl:for-each select="id( @idref )">
-  <!-- This creates unneccessary regeneration of float illustration pages, but it is easiest to keep things this way as long as we have to be backwards compatible... -->
-  <!-- When backwards compatibility can be dropped, most of (all?) the <illustration> processing can happen here -->
-  <xsl:apply-templates select="." />
- </xsl:for-each>
+<xsl:template match="illref">
+ <!-- It is important that the class is not checked right in the template - that would make this template match with higher priority, which will turn a few things upside down --> 
+ <xsl:if test="@class='html'">
+  <xsl:for-each select="id( @idref )">
+   <!-- This creates unneccessary regeneration of float illustration pages, but it is easiest to keep things this way as long as we have to be backwards compatible... -->
+   <!-- When backwards compatibility can be dropped, most of (all?) the <illustration> processing can happen here -->
+   <xsl:apply-templates select="." />
+  </xsl:for-each>
+ </xsl:if>
 </xsl:template>
 
 <xsl:template match="illustrations">
@@ -661,7 +679,7 @@ Todo:
       <xsl:for-each select="//illref[@class='html' and @idref=current()/@id]">
        <xsl:call-template name="section-title-link" />
        <xsl:if test="position()!=last()">
-        <xsl:text>, </xsl:text>        
+        <xsl:text>, </xsl:text>     
        </xsl:if>
       </xsl:for-each>
      </li>
@@ -788,6 +806,7 @@ Todo:
        </xsl:when>
        <xsl:otherwise>
         <xsl:text>[error: a template]</xsl:text>
+        <xsl:message><xsl:text>error: a template</xsl:text></xsl:message>
        </xsl:otherwise>
       </xsl:choose>
      </xsl:attribute>
@@ -1073,7 +1092,7 @@ is included in all copies.
 
    <head><xsl:value-of select="$newline" />
     <title>
-     <xsl:value-of select="/gamebook/meta/title[1]" />
+     <xsl:apply-templates select="/gamebook/meta/title[1]" />
      <xsl:text>: </xsl:text>
      <xsl:choose>
       <xsl:when test="$document-type='illustration'">
@@ -1087,7 +1106,7 @@ is included in all copies.
        </xsl:choose>
        <xsl:number count="illustration[@class='float' and contains( $use-illustrators, concat( ':', meta/creator, ':' ) )]" from="/" level="any" format="I" />
       </xsl:when>
-      <xsl:otherwise><xsl:value-of select="meta/title[1]" /></xsl:otherwise>
+      <xsl:otherwise><xsl:apply-templates select="meta/title[1]" /></xsl:otherwise>
      </xsl:choose>
     </title><xsl:value-of select="$newline" />
     <meta http-equiv="Content-type" content="text/html; charset=ISO-8859-1" /><xsl:value-of select="$newline" />
@@ -1125,7 +1144,7 @@ is included in all copies.
     <xsl:attribute name="vlink"><xsl:value-of select="$vlink-color" /></xsl:attribute>
 
     <xsl:value-of select="$newline" />
-    <div id="title"><img src="title.gif" width="550" height="100" border="0" align="middle" usemap="#imagemap"><xsl:attribute name="alt"><xsl:value-of select="/gamebook/meta/title[1]" /></xsl:attribute></img></div><xsl:value-of select="$newline" />
+    <div id="title"><img src="title.gif" width="550" height="100" border="0" align="middle" usemap="#imagemap"><xsl:attribute name="alt"><xsl:apply-templates select="/gamebook/meta/title[1]" /></xsl:attribute></img></div><xsl:value-of select="$newline" />
     <div id="body"><xsl:value-of select="$newline" />
 
      <xsl:choose>
@@ -1279,7 +1298,7 @@ is included in all copies.
          <xsl:for-each select="/gamebook/section/data/section">
           <li>
            <a><xsl:attribute name="href"><xsl:value-of select="@id" /><xsl:text>.htm</xsl:text></xsl:attribute>
-            <xsl:value-of select="meta/title[1]" />
+            <xsl:apply-templates select="meta/title[1]" />
            </a>
            <xsl:if test="data/section[@class='frontmatter-separate' or @class='mainmatter-separate']">
             <xsl:value-of select="$newline" />
@@ -1307,7 +1326,7 @@ is included in all copies.
 
       <xsl:when test="$document-type='second-level-frontmatter'">
        <div class="frontmatter"><xsl:value-of select="$newline" />
-        <h2><xsl:value-of select="meta/title" /></h2><xsl:value-of select="$newline" />
+        <h2><xsl:apply-templates select="meta/title" /></h2><xsl:value-of select="$newline" />
 
         <xsl:value-of select="$newline" />
 
@@ -1324,7 +1343,7 @@ is included in all copies.
 
       <xsl:when test="$document-type='third-level-frontmatter-separate'">
        <div class="frontmatter"><xsl:value-of select="$newline" />
-        <h3><xsl:value-of select="meta/title" /></h3><xsl:value-of select="$newline" />
+        <h3><xsl:apply-templates select="meta/title" /></h3><xsl:value-of select="$newline" />
         <xsl:value-of select="$newline" />
 
         <xsl:apply-templates />
@@ -1340,7 +1359,7 @@ is included in all copies.
 
       <xsl:when test="$document-type='second-level-mainmatter'">
        <div class="mainmatter"><xsl:value-of select="$newline" />
-        <h2><xsl:value-of select="meta/title" /></h2><xsl:value-of select="$newline" />
+        <h2><xsl:apply-templates select="meta/title" /></h2><xsl:value-of select="$newline" />
         <xsl:value-of select="$newline" />
 
         <xsl:apply-templates />
@@ -1356,7 +1375,7 @@ is included in all copies.
 
       <xsl:when test="$document-type='third-level-mainmatter-separate'">
        <div class="mainmatter"><xsl:value-of select="$newline" />
-        <h3><xsl:value-of select="meta/title" /></h3><xsl:value-of select="$newline" />
+        <h3><xsl:apply-templates select="meta/title" /></h3><xsl:value-of select="$newline" />
         <xsl:value-of select="$newline" />
 
         <xsl:apply-templates />
@@ -1372,7 +1391,7 @@ is included in all copies.
 
       <xsl:when test="$document-type='second-level-glossary'">
        <div class="mainmatter"><xsl:value-of select="$newline" />
-        <h2><xsl:value-of select="meta/title" /></h2><xsl:value-of select="$newline" />
+        <h2><xsl:apply-templates select="meta/title" /></h2><xsl:value-of select="$newline" />
         <xsl:value-of select="$newline" />
 
         <xsl:apply-templates />
@@ -1392,7 +1411,7 @@ is included in all copies.
 
       <xsl:when test="$document-type='third-level-glossary-separate'">
        <div class="glossary"><xsl:value-of select="$newline" />
-        <h3><xsl:value-of select="meta/title" /></h3><xsl:value-of select="$newline" />
+        <h3><xsl:apply-templates select="meta/title" /></h3><xsl:value-of select="$newline" />
         <xsl:call-template name="alpha-bar">
          <xsl:with-param name="alpha-bar-id-prefix"><xsl:value-of select="$glossary-id-prefix" /></xsl:with-param>
         </xsl:call-template>
@@ -1417,7 +1436,7 @@ title of each section be a simple number.
 -->
       <xsl:when test="$document-type='second-level-numbered'">
        <div class="numbered"><xsl:value-of select="$newline" />
-        <h2><xsl:value-of select="meta/title" /></h2><xsl:value-of select="$newline" />
+        <h2><xsl:apply-templates select="meta/title" /></h2><xsl:value-of select="$newline" />
         <xsl:value-of select="$newline" />
 
         <xsl:variable name="base-section-number" select="number( data/section[1]/meta/title ) - 1" />
@@ -1441,7 +1460,7 @@ title of each section be a simple number.
           </xsl:if>
           <a>
            <xsl:attribute name="href"><xsl:value-of select="@id" /><xsl:text>.htm</xsl:text></xsl:attribute>
-           <xsl:value-of select="meta/title" />
+           <xsl:apply-templates select="meta/title" />
           </a>
           <xsl:choose>
            <xsl:when test="position( ) mod 10 = 0">
@@ -1466,7 +1485,7 @@ title of each section be a simple number.
 
       <xsl:when test="$document-type='third-level-numbered'">
        <div class="numbered"><xsl:value-of select="$newline" />
-        <h3><xsl:value-of select="meta/title" /></h3><xsl:value-of select="$newline" />
+        <h3><xsl:apply-templates select="meta/title" /></h3><xsl:value-of select="$newline" />
         <xsl:value-of select="$newline" />
 
         <xsl:apply-templates />
@@ -1483,7 +1502,7 @@ title of each section be a simple number.
        <div class="backmatter">
         <xsl:value-of select="$newline" />
         <!-- No particular reason to code title here -->
-        <h2><xsl:value-of select="meta/title" /></h2><xsl:value-of select="$newline" />
+        <h2><xsl:apply-templates select="meta/title" /></h2><xsl:value-of select="$newline" />
         <xsl:value-of select="$newline" />
         <xsl:value-of select="$newline" />
         
@@ -1533,7 +1552,7 @@ title of each section be a simple number.
 
       <xsl:when test="$document-type='second-level-backmatter'">
        <div class="frontmatter"><xsl:value-of select="$newline" />
-        <h2><xsl:value-of select="meta/title" /></h2><xsl:value-of select="$newline" />
+        <h2><xsl:apply-templates select="meta/title" /></h2><xsl:value-of select="$newline" />
 
         <xsl:value-of select="$newline" />
         <xsl:value-of select="$newline" />
@@ -1551,7 +1570,7 @@ title of each section be a simple number.
 
       <xsl:when test="$document-type='map-adjusted'">
        <div class="frontmatter"><xsl:value-of select="$newline" />
-        <h2><xsl:value-of select="meta/title" /></h2><xsl:value-of select="$newline" />
+        <h2><xsl:apply-templates select="meta/title" /></h2><xsl:value-of select="$newline" />
 
         <xsl:value-of select="$newline" />
         <xsl:value-of select="$newline" />
@@ -1635,7 +1654,7 @@ title of each section be a simple number.
 
       <xsl:when test="$document-type='map'">
        <div class="frontmatter"><xsl:value-of select="$newline" />
-        <h2><xsl:value-of select="meta/title" /></h2><xsl:value-of select="$newline" />
+        <h2><xsl:apply-templates select="meta/title" /></h2><xsl:value-of select="$newline" />
 
         <xsl:value-of select="$newline" />
         <xsl:value-of select="$newline" />
@@ -1769,7 +1788,7 @@ title of each section be a simple number.
     <map name="imagemap" id="imagemap">
      <area shape="rect" coords="0,0,99,99" href="http://www.projectaon.org/" alt="Project Aon" target="_top" />
      <area shape="default" href="title.htm">
-      <xsl:attribute name="alt"><xsl:value-of select="/gamebook/meta/title[1]" /></xsl:attribute>
+      <xsl:attribute name="alt"><xsl:apply-templates select="/gamebook/meta/title[1]" /></xsl:attribute>
      </area>
     </map>
 
@@ -1827,7 +1846,7 @@ title of each section be a simple number.
       <xsl:when test="meta/link[@class='prev']">
        <a>
         <xsl:attribute name="href">
-         <xsl:value-of select="meta/link[@class='prev']/@idref" />
+         <xsl:apply-templates select="meta/link[@class='prev']/@idref" />
          <xsl:text>.htm</xsl:text>
         </xsl:attribute>
         <img src="back.gif" width="150" height="30" border="0">
@@ -1960,7 +1979,7 @@ title of each section be a simple number.
     </xsl:otherwise>
    </xsl:choose>
   </xsl:if>
-  <xsl:value-of select="ancestor::section[position()=1]/meta/title[1]" />
+  <xsl:apply-templates select="ancestor::section[position()=1]/meta/title[1]" />
  </xsl:variable>
  
  <a>