aboutsummaryrefslogtreecommitdiffstats
path: root/lib/erl_docgen/priv/xsl/db_man.xsl
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2012-08-10 11:41:38 +0200
committerPeter Andersson <[email protected]>2012-08-10 11:41:38 +0200
commit4b70df67d825c1b44ca15a5a4ecd57ad1828ead3 (patch)
treecd31772649b8f1e599e7fbe2cf7b76b1c2dc7a7b /lib/erl_docgen/priv/xsl/db_man.xsl
parentc075ac6484e3d5a93a0d870ab4483d39ae26eaec (diff)
parentf968ff87b1d6fb74237010bffa0390953337425e (diff)
downloadotp-4b70df67d825c1b44ca15a5a4ecd57ad1828ead3.tar.gz
otp-4b70df67d825c1b44ca15a5a4ecd57ad1828ead3.tar.bz2
otp-4b70df67d825c1b44ca15a5a4ecd57ad1828ead3.zip
Merge remote branch 'upstream/maint' into maint
Diffstat (limited to 'lib/erl_docgen/priv/xsl/db_man.xsl')
-rw-r--r--lib/erl_docgen/priv/xsl/db_man.xsl26
1 files changed, 24 insertions, 2 deletions
diff --git a/lib/erl_docgen/priv/xsl/db_man.xsl b/lib/erl_docgen/priv/xsl/db_man.xsl
index 5234ba6bd0..33808859c7 100644
--- a/lib/erl_docgen/priv/xsl/db_man.xsl
+++ b/lib/erl_docgen/priv/xsl/db_man.xsl
@@ -3,7 +3,7 @@
#
# %CopyrightBegin%
#
- # Copyright Ericsson AB 2009-2011. All Rights Reserved.
+ # Copyright Ericsson AB 2009-2012. All Rights Reserved.
#
# The contents of this file are subject to the Erlang Public License,
# Version 1.1, (the "License"); you may not use this file except in
@@ -758,10 +758,32 @@
<xsl:template name="name">
<xsl:text>&#10;.B&#10;</xsl:text>
- <xsl:apply-templates/>
+ <xsl:choose>
+ <xsl:when test="ancestor::cref">
+ <xsl:value-of select="ret"/>
+ <xsl:call-template name="maybe-space-after-ret">
+ <xsl:with-param name="s" select="ret"/>
+ </xsl:call-template>
+ <xsl:value-of select="nametext"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates/>
+ </xsl:otherwise>
+ </xsl:choose>
<xsl:text>&#10;.br</xsl:text>
</xsl:template>
+ <xsl:template name="maybe-space-after-ret">
+ <xsl:param name="s"/>
+ <xsl:variable name="last_char"
+ select="substring($s, string-length($s), 1)"/>
+ <xsl:choose>
+ <xsl:when test="$last_char != '*'">
+ <xsl:text> </xsl:text>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:template>
+
<!-- Type -->
<xsl:template match="type">