diff options
author | Peter Andersson <[email protected]> | 2012-08-10 11:41:38 +0200 |
---|---|---|
committer | Peter Andersson <[email protected]> | 2012-08-10 11:41:38 +0200 |
commit | 4b70df67d825c1b44ca15a5a4ecd57ad1828ead3 (patch) | |
tree | cd31772649b8f1e599e7fbe2cf7b76b1c2dc7a7b /lib/erl_docgen/priv/xsl/db_pdf.xsl | |
parent | c075ac6484e3d5a93a0d870ab4483d39ae26eaec (diff) | |
parent | f968ff87b1d6fb74237010bffa0390953337425e (diff) | |
download | otp-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_pdf.xsl')
-rw-r--r-- | lib/erl_docgen/priv/xsl/db_pdf.xsl | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl index bf17406d84..da96052462 100644 --- a/lib/erl_docgen/priv/xsl/db_pdf.xsl +++ b/lib/erl_docgen/priv/xsl/db_pdf.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 @@ -1424,7 +1424,13 @@ <xsl:param name="partnum"/> <xsl:choose> <xsl:when test="ancestor::cref"> - <fo:block id="{generate-id(nametext)}"><xsl:value-of select="ret"/><xsl:text></xsl:text><xsl:value-of select="nametext"/></fo:block> + <fo:block id="{generate-id(nametext)}"> + <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"/> + </fo:block> </xsl:when> <xsl:otherwise> <fo:block id="{generate-id(.)}"><xsl:value-of select="."/></fo:block> @@ -1432,6 +1438,16 @@ </xsl:choose> </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"> |