diff options
| author | Astrid Malo <kess@apache.org> | 2002-12-25 03:50:09 +0100 |
|---|---|---|
| committer | Astrid Malo <kess@apache.org> | 2002-12-25 03:50:09 +0100 |
| commit | 54a94c31116d50842b646f77f46cdd74c015f71b (patch) | |
| tree | 7effea1917c12c000f603424f7516c41be268d93 | |
| parent | Sun Forte requires having the same CFLAGS passed to the link stage as was (diff) | |
| download | apache2-54a94c31116d50842b646f77f46cdd74c015f71b.tar.xz apache2-54a94c31116d50842b646f77f46cdd74c015f71b.zip | |
allow <br/> within <default> to increase readability for directives
with OS dependent defaults
thanks to nd for his help with xsl
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98109 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | docs/manual/style/modulesynopsis.dtd | 2 | ||||
| -rw-r--r-- | docs/manual/style/xsl/quickreference.xsl | 22 | ||||
| -rw-r--r-- | docs/manual/style/xsl/synopsis.xsl | 32 |
3 files changed, 34 insertions, 22 deletions
diff --git a/docs/manual/style/modulesynopsis.dtd b/docs/manual/style/modulesynopsis.dtd index 4e4ca4842f..b308891910 100644 --- a/docs/manual/style/modulesynopsis.dtd +++ b/docs/manual/style/modulesynopsis.dtd @@ -30,7 +30,7 @@ usage?, seealso*)> <!ELEMENT syntax %Inline;> -<!ELEMENT default (#PCDATA)> +<!ELEMENT default (#PCDATA | br)*> <!ELEMENT contextlist (context+)+> diff --git a/docs/manual/style/xsl/quickreference.xsl b/docs/manual/style/xsl/quickreference.xsl index 51799dfc88..4e79a43f76 100644 --- a/docs/manual/style/xsl/quickreference.xsl +++ b/docs/manual/style/xsl/quickreference.xsl @@ -49,7 +49,7 @@ <xsl:with-param name="directives" select="$directives"/> </xsl:call-template> </xsl:variable> - + <table id="legend"> <xsl:text> @@ -110,7 +110,7 @@ </body> </html> - </xsl:template> + </xsl:template> <!-- --> @@ -145,8 +145,20 @@ </td> <td> - <xsl:value-of select="substring(substring-after(concat(default,' '),name),1,20)"/> - <xsl:if test="string-length(substring-after(concat(default,' '),name)) > 20"> + <xsl:variable name="default"> + <xsl:choose> + <xsl:when test="count(default[count(br) > 0]) > 0"> + <xsl:value-of select="default/child::node()[count(preceding-sibling::*) = 0]"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="default"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <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(default[count(br) > 0]) > 0"> <xsl:text> +</xsl:text> </xsl:if> </td> @@ -202,4 +214,4 @@ </xsl:template> <!-- /reference-of-letter --> -</xsl:stylesheet> +</xsl:stylesheet>
\ No newline at end of file diff --git a/docs/manual/style/xsl/synopsis.xsl b/docs/manual/style/xsl/synopsis.xsl index e5f34ab38a..0804fef45d 100644 --- a/docs/manual/style/xsl/synopsis.xsl +++ b/docs/manual/style/xsl/synopsis.xsl @@ -36,7 +36,7 @@ <xsl:when test="status='Core'"> <xsl:value-of select="$messages/message[@name='apachecore']"/> </xsl:when> - + <xsl:when test="name='mpm_common'"> <xsl:value-of select="$messages/message[@name='apachempmcommon']"/> </xsl:when> @@ -113,7 +113,7 @@ <a href="module-dict.html#ModuleIdentifier"> <xsl:value-of select="$messages/message[@name='moduleidentifier']"/> <xsl:text>:</xsl:text> - </a> + </a> </th> <td> <xsl:value-of select="identifier"/> @@ -131,7 +131,7 @@ <a href="module-dict.html#SourceFile"> <xsl:value-of select="$messages/message[@name='sourcefile']"/> <xsl:text>:</xsl:text> - </a> + </a> </th> <td> <xsl:value-of select="sourcefile"/> @@ -270,7 +270,7 @@ <h3> <xsl:value-of select="$messages/message[@name='seealso']"/> </h3> - + <xsl:text> </xsl:text> <!-- insert line break --> @@ -388,7 +388,7 @@ <a href="directive-dict.html#Syntax"> <xsl:value-of select="$messages/message[@name='syntax']"/> <xsl:text>:</xsl:text> - </a> + </a> </th> <td> <code> @@ -407,11 +407,11 @@ <a href="directive-dict.html#Default"> <xsl:value-of select="$messages/message[@name='default']"/> <xsl:text>:</xsl:text> - </a> + </a> </th> <td> <code> - <xsl:value-of select="default"/> + <xsl:apply-templates select="default"/> </code> </td> </tr> @@ -425,7 +425,7 @@ <a href="directive-dict.html#Context"> <xsl:value-of select="$messages/message[@name='context']"/> <xsl:text>:</xsl:text> - </a> + </a> </th> <td> <xsl:apply-templates select="contextlist"/> @@ -442,7 +442,7 @@ <a href="directive-dict.html#Override"> <xsl:value-of select="$messages/message[@name='override']"/> <xsl:text>:</xsl:text> - </a> + </a> </th> <td> <xsl:value-of select="override"/> @@ -458,7 +458,7 @@ <a href="directive-dict.html#Status"> <xsl:value-of select="$messages/message[@name='status']"/> <xsl:text>:</xsl:text> - </a> + </a> </th> <td> <xsl:value-of select="../status"/> @@ -473,7 +473,7 @@ <a href="directive-dict.html#Module"> <xsl:value-of select="$messages/message[@name='module']"/> <xsl:text>:</xsl:text> - </a> + </a> </th> <td> <xsl:if test="modulelist"> @@ -496,7 +496,7 @@ <a href="directive-dict.html#Compatibility"> <xsl:value-of select="$messages/message[@name='compatibility']"/> <xsl:text>:</xsl:text> - </a> + </a> </th> <td> <xsl:value-of select="compatibility"/> @@ -559,7 +559,7 @@ <!-- --> <xsl:template match="contextlist"> <xsl:apply-templates select="context"/> - </xsl:template> + </xsl:template> <!-- /contextlist --> @@ -592,7 +592,7 @@ <xsl:if test="position() != last()"> <xsl:text>, </xsl:text> </xsl:if> - </xsl:template> + </xsl:template> <!-- /context --> @@ -607,7 +607,7 @@ <xsl:text>, </xsl:text> </xsl:if> </xsl:for-each> - </xsl:template> + </xsl:template> <!-- /modulelist --> -</xsl:stylesheet> +</xsl:stylesheet>
\ No newline at end of file |