--- a/Orb/Doxygen/DITA/plugins/apiref/xsl/apiref2xhtml.xsl Thu Jan 21 17:29:01 2010 +0000
+++ b/Orb/Doxygen/DITA/plugins/apiref/xsl/apiref2xhtml.xsl Thu Mar 18 18:26:18 2010 +0000
@@ -16,6 +16,7 @@
<xsl:param name="APIREFCSS" select="'ibmapiref.css'"/>
<xsl:param name="APIREFCSSRTL" select="'ibmapirefrtl.css'"/>
+<xsl:param name="FILEREF">file:/</xsl:param>
<xsl:param name="WORKDIR" select="'./'"/>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -29,6 +30,9 @@
<xsl:text>apiDef element found. Please either use apiSyntax or provide an XSLT extension to format apiDef for the specific programming language</xsl:text>
</div>
</xsl:template>
+<!-- Until P019897, the following rule in the javaRef code always overrode the previous rule.
+ It does not belong in JavaRef, adding it here so we do not start breaking people. -->
+<xsl:template match="*[contains(@class,' apiRef/apiDef ')]" priority="1"/>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Alternatives to base processing
@@ -89,17 +93,11 @@
</xsl:template>
<xsl:template name="apiChapterBody">
- <xsl:variable name="flagrules">
- <xsl:call-template name="getrules"/>
- </xsl:variable>
<body>
<!-- Already put xml:lang on <html>; do not copy to body with commonattributes -->
<xsl:call-template name="setidaname"/>
<xsl:value-of select="$newline"/>
- <!-- Replaces <xsl:call-template name="flagit"/> -->
- <xsl:call-template name="start-flagit">
- <xsl:with-param name="flagrules" select="$flagrules" />
- </xsl:call-template>
+ <xsl:call-template name="flagit"/>
<xsl:call-template name="start-revflag"/>
<xsl:call-template name="generateBreadcrumbs"/>
<xsl:call-template name="api-gen-user-header"/> <!-- include user's XSL running header here -->
@@ -117,10 +115,6 @@
<xsl:call-template name="api-gen-user-footer"/> <!-- include user's XSL running footer here -->
<xsl:call-template name="processFTR"/> <!-- Include XHTML footer, if specified -->
<xsl:call-template name="end-revflag"/>
- <!-- Added as flagit is deprecated -->
- <xsl:call-template name="end-flagit">
- <xsl:with-param name="flagrules" select="$flagrules" />
- </xsl:call-template>
</body>
<xsl:value-of select="$newline"/>
</xsl:template>
@@ -253,7 +247,7 @@
</xsl:template>
<xsl:template match="*[contains(@class,' apiRef/apiDetail ')]">
- <xsl:apply-imports/>
+ <xsl:call-template name="topic.body"/>
<hr/>
</xsl:template>
@@ -311,7 +305,10 @@
</p>
</xsl:if>
<pre>
- <xsl:apply-imports/>
+ <xsl:call-template name="commonattributes"/>
+ <xsl:call-template name="setscale"/>
+ <xsl:call-template name="setidaname"/>
+ <xsl:apply-templates/>
</pre>
</xsl:template>
@@ -336,14 +333,6 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - General topic rules
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!--<xsl:template match="node()" mode="default">
- <xsl:apply-imports/>
-</xsl:template>-->
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Filename manipulation
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- adapted from topicpull.xsl - should be shared utilities -->
@@ -453,7 +442,6 @@
<xsl:param name="stringName"/>
<xsl:call-template name="getString">
<xsl:with-param name="stringName" select="$stringName"/>
- <xsl:with-param name="stringFileList">../../demo/apiref/xsl/apistrings.xml</xsl:with-param>
</xsl:call-template>
</xsl:template>