[docbook-checkins] CVS: xsl/htmlhelp htmlhelp-common.xsl,1.15,1.16

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/docbook/xsl/htmlhelp
In directory usw-pr-cvs1:/tmp/cvs-serv1066/htmlhelp

Modified Files:
	htmlhelp-common.xsl 
Log Message:
Index can be alternatively created using HHK file from now. This allows see-also processing and index terms also points to their exact location.


Index: htmlhelp-common.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/htmlhelp/htmlhelp-common.xsl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** htmlhelp-common.xsl	13 Jun 2002 22:19:24 -0000	1.15
--- htmlhelp-common.xsl	22 Aug 2002 18:17:13 -0000	1.16
***************
*** 767,799 ****
  
  <xsl:template match="indexterm">
! 
!   <xsl:variable name="primary" select="normalize-space(primary)"/>
!   <xsl:variable name="secondary" select="normalize-space(secondary)"/>
!   <xsl:variable name="tertiary" select="normalize-space(tertiary)"/>
! 
!   <xsl:variable name="text">
!     <xsl:value-of select="$primary"/>
!     <xsl:if test="secondary">
!       <xsl:text>, </xsl:text>
!       <xsl:value-of select="$secondary"/>
!     </xsl:if>
!     <xsl:if test="tertiary">
!       <xsl:text>, </xsl:text>
!       <xsl:value-of select="$tertiary"/>
!     </xsl:if>
!   </xsl:variable>
! 
!   <xsl:if test="secondary">
!     <xsl:if test="not(//indexterm[normalize-space(primary)=$primary and not(secondary)])">
        <xsl:call-template name="write.indexterm">
!         <xsl:with-param name="text" select="$primary"/>
        </xsl:call-template>
!     </xsl:if>
!   </xsl:if>
! 
!   <xsl:call-template name="write.indexterm">
!     <xsl:with-param name="text" select="$text"/>
!   </xsl:call-template>
! 
  </xsl:template>
  
--- 767,811 ----
  
  <xsl:template match="indexterm">
!   <xsl:choose>
!     <xsl:when test="$htmlhelp.use.hhk = 0">
!   
!       <xsl:variable name="primary" select="normalize-space(primary)"/>
!       <xsl:variable name="secondary" select="normalize-space(secondary)"/>
!       <xsl:variable name="tertiary" select="normalize-space(tertiary)"/>
!       
!       <xsl:variable name="text">
!         <xsl:value-of select="$primary"/>
!         <xsl:if test="secondary">
!           <xsl:text>, </xsl:text>
!           <xsl:value-of select="$secondary"/>
!         </xsl:if>
!         <xsl:if test="tertiary">
!           <xsl:text>, </xsl:text>
!           <xsl:value-of select="$tertiary"/>
!         </xsl:if>
!       </xsl:variable>
!       
!       <xsl:if test="secondary">
!         <xsl:if test="not(//indexterm[normalize-space(primary)=$primary and not(secondary)])">
!           <xsl:call-template name="write.indexterm">
!             <xsl:with-param name="text" select="$primary"/>
!           </xsl:call-template>
!         </xsl:if>
!       </xsl:if>
!       
        <xsl:call-template name="write.indexterm">
!         <xsl:with-param name="text" select="$text"/>
        </xsl:call-template>
!       
!     </xsl:when>
!     <xsl:otherwise>
!       <a>
!         <xsl:attribute name="name">
!           <xsl:call-template name="object.id"/>
!         </xsl:attribute>
!       </a>
!     </xsl:otherwise>
!     
!   </xsl:choose>
  </xsl:template>
  
***************
*** 815,824 ****
  <HTML>
  <HEAD>
  </HEAD><BODY>
! <UL>
! </UL>
  </BODY></HTML>]]></xsl:with-param>
      <xsl:with-param name="encoding" select="$htmlhelp.encoding"/>
    </xsl:call-template>
  </xsl:template>
  
--- 827,918 ----
  <HTML>
  <HEAD>
+ <meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
+ <!-- Sitemap 1.0 -->
  </HEAD><BODY>
! <OBJECT type="text/site properties">
! </OBJECT>
! <UL>]]>
! <xsl:if test="($htmlhelp.use.hhk != 0) and $generate.index">
!   <xsl:choose>
!     <xsl:when test="$rootid != ''">
!       <xsl:apply-templates select="key('id',$rootid)" mode="hhk"/>
!     </xsl:when>
!     <xsl:otherwise>
!       <xsl:apply-templates select="/" mode="hhk"/>
!     </xsl:otherwise>
!   </xsl:choose>
! </xsl:if>
! <![CDATA[</UL>
  </BODY></HTML>]]></xsl:with-param>
      <xsl:with-param name="encoding" select="$htmlhelp.encoding"/>
    </xsl:call-template>
+ </xsl:template>
+ 
+ <xsl:template match="indexterm[@class='endofrange']" mode="hhk"/>
+ 
+ <xsl:template match="indexterm" mode="hhk">
+   <xsl:variable name="primary" select="normalize-space(primary)"/>
+   <xsl:variable name="secondary" select="normalize-space(secondary)"/>
+   <xsl:variable name="tertiary" select="normalize-space(tertiary)"/>
+ 
+   <xsl:call-template name="write.indexterm.hhk">
+     <xsl:with-param name="text" select="$primary"/>
+     <xsl:with-param name="seealso" select="seealso"/>
+   </xsl:call-template>
+ 
+   <xsl:if test="secondary">
+     <xsl:if test="not(//indexterm[normalize-space(primary)=$primary and not(secondary)])">
+       <xsl:call-template name="write.indexterm.hhk">
+         <!-- We must create fake entry when there is secondary without primary --> 
+         <xsl:with-param name="text" select="$primary"/>
+         <xsl:with-param name="seealso" select="$primary"/>
+       </xsl:call-template>
+     </xsl:if>
+     <![CDATA[<UL>]]>
+     <xsl:call-template name="write.indexterm.hhk">
+       <xsl:with-param name="text" select="$secondary"/>
+       <xsl:with-param name="seealso" select="secondary/seealso"/>
+     </xsl:call-template>
+     <xsl:if test="tertiary">
+       <![CDATA[<UL>]]>
+       <xsl:call-template name="write.indexterm.hhk">
+         <xsl:with-param name="text" select="$tertiary"/>
+         <xsl:with-param name="seealso" select="tertiary/seealso"/>
+       </xsl:call-template>
+       <![CDATA[</UL>]]>
+     </xsl:if>
+     <![CDATA[</UL>]]>
+   </xsl:if>
+ 
+ </xsl:template>
+ 
+ <xsl:template name="write.indexterm.hhk">
+   <xsl:param name="text"/>
+   <xsl:param name="seealso"/>
+   <![CDATA[<LI> <OBJECT type="text/sitemap">
+         <param name="Name" value="]]><xsl:value-of select="$text"/><xsl:text><![CDATA[">]]></xsl:text>
+       <xsl:if test="not(seealso)">
+         <xsl:variable name="href">
+           <xsl:call-template name="href.target.with.base.dir"/>
+         </xsl:variable>
+         <xsl:variable name="title">
+           <xsl:call-template name="nearest.title">
+             <xsl:with-param name="object" select=".."/>
+           </xsl:call-template>
+         </xsl:variable>
+         <![CDATA[<param name="Name" value="]]><xsl:value-of select="$title"/><![CDATA[">]]>
+         <![CDATA[<param name="Local" value="]]><xsl:value-of select="$href"/><![CDATA[">]]>
+       </xsl:if>
+       <xsl:if test="seealso">
+         <![CDATA[<param name="See Also" value="]]><xsl:value-of select="$seealso"/><![CDATA[">]]>
+       </xsl:if>
+       <xsl:text><![CDATA[ </OBJECT>]]></xsl:text>
+ </xsl:template>
+ 
+ <xsl:template match="text()" mode="hhk"/>
+ 
+ <xsl:template name="nearest.title">
+   <xsl:param name="object"/>
+   <xsl:apply-templates select="$object/ancestor-or-self::*[title][1]" mode="title.markup"/>
  </xsl:template>