You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2014/02/02 20:53:58 UTC
svn commit: r1563698 -
/httpd/httpd/branches/2.4.x/docs/manual/style/xsl/quickreference.xsl
Author: nd
Date: Sun Feb 2 19:53:57 2014
New Revision: 1563698
URL: http://svn.apache.org/r1563698
Log:
prepare for upcoming xalan update
Modified:
httpd/httpd/branches/2.4.x/docs/manual/style/xsl/quickreference.xsl
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/xsl/quickreference.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/xsl/quickreference.xsl?rev=1563698&r1=1563697&r2=1563698&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/xsl/quickreference.xsl (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/xsl/quickreference.xsl Sun Feb 2 19:53:57 2014
@@ -288,28 +288,36 @@
<xsl:apply-templates select="$directive/syntax" />
</a>
</td>
- <td>
- <!-- if the default value contains (at least) one <br />, -->
- <!-- this probably means that a short explanation follows -->
- <!-- the actual default value. We cut off the string -->
- <!-- after the <br /> so it will not be shown here. -->
- <!-- (add the + character instead) -->
- <xsl:variable name="default">
- <xsl:choose>
- <xsl:when test="count($directive/default[count(br) > 0])
- > 0">
- <xsl:value-of
- select="$directive/default/child::node()
- [count(preceding-sibling::*) = 0]" />
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$directive/default"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
+ <!-- if the default value contains (at least) one <br />, -->
+ <!-- this probably means that a short explanation follows -->
+ <!-- the actual default value. We cut off the string -->
+ <!-- after the <br /> so it will not be shown here. -->
+ <!-- (add the + character instead) -->
+ <xsl:variable name="default">
+ <xsl:choose>
+ <xsl:when test="count($directive/default[count(br) > 0])
+ > 0">
+ <xsl:value-of
+ select="$directive/default/child::node()
+ [count(preceding-sibling::*) = 0]" />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$directive/default"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <!-- Now. If the default output is empty, the xslt processor emits -->
+ <!-- <td />. In order to avoid this, we simply emit <td></td> -->
+ <!-- by ourselves. Crap. -->
+ <xsl:choose>
+ <xsl:when test="not(substring(substring-after(
+ concat($default, ' '), name),1,20) = '')">
+ <td>
<xsl:value-of select="substring(substring-after(concat($default,
' '), name),1,20)" />
+
<xsl:if test="string-length(substring-after(concat($default, ' '),
name)) > 20
or count($directive/default[count(br) > 0])
@@ -317,6 +325,12 @@
<xsl:text> +</xsl:text>
</xsl:if>
</td>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text disable-output-escaping="yes"><td></td></xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+
<td>
<xsl:if test="$directive/contextlist/context
[normalize-space(.)='server config']">