diff options
| author | Lars Thorsen <[email protected]> | 2015-12-04 12:56:09 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2015-12-04 12:56:09 +0100 |
| commit | f86828fead59ba0a28658d3f5e7d8dc80f1c73fb (patch) | |
| tree | 234beceeb9dbb3dae9750703f02bd0450d192d53 /lib/erl_docgen/priv/xsl | |
| parent | 7a13283ac6f4a7738dbe2a2ccfce392a820dca2a (diff) | |
| parent | 03dfbda168896807c75bd396262a3de060a91b13 (diff) | |
| download | otp-f86828fead59ba0a28658d3f5e7d8dc80f1c73fb.tar.gz otp-f86828fead59ba0a28658d3f5e7d8dc80f1c73fb.tar.bz2 otp-f86828fead59ba0a28658d3f5e7d8dc80f1c73fb.zip | |
Merge branch 'lars/xmllint-incorrect-errors/OTP-13026' into maint
* lars/xmllint-incorrect-errors/OTP-13026:
[erl_docgen] Allow br in the tag of tagged lists
[erl_docgen] Add conversion of the i tag in the XSL specs
[erl_docgen] Correct DTD for tags anno, fsummary and add an tag i (italic).
[erl_docgen] Correct faults in the dtd
Change xmllint target
[erl_docgen] Update DTD for anno tag
Diffstat (limited to 'lib/erl_docgen/priv/xsl')
| -rw-r--r-- | lib/erl_docgen/priv/xsl/db_html.xsl | 5 | ||||
| -rw-r--r-- | lib/erl_docgen/priv/xsl/db_man.xsl | 6 | ||||
| -rw-r--r-- | lib/erl_docgen/priv/xsl/db_pdf.xsl | 6 |
3 files changed, 16 insertions, 1 deletions
diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl index f5ddd364d3..c2325fbee9 100644 --- a/lib/erl_docgen/priv/xsl/db_html.xsl +++ b/lib/erl_docgen/priv/xsl/db_html.xsl @@ -990,12 +990,15 @@ </p> </xsl:template> - <!-- Inline elements --> <xsl:template match="b"> <strong><xsl:apply-templates/></strong> </xsl:template> + <xsl:template match="i"> + <i><xsl:apply-templates/></i> + </xsl:template> + <xsl:template match="br"> <br/> </xsl:template> diff --git a/lib/erl_docgen/priv/xsl/db_man.xsl b/lib/erl_docgen/priv/xsl/db_man.xsl index 120bf9880d..5201465e42 100644 --- a/lib/erl_docgen/priv/xsl/db_man.xsl +++ b/lib/erl_docgen/priv/xsl/db_man.xsl @@ -595,6 +595,12 @@ <xsl:text>\fR\& </xsl:text> </xsl:template> + <xsl:template match="i"> + <xsl:text>\fI</xsl:text> + <xsl:apply-templates/> + <xsl:text>\fR\& </xsl:text> + </xsl:template> + <xsl:template match="br"> <xsl:choose> <xsl:when test="ancestor::head"> diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl index 53e202d52c..37a2d55274 100644 --- a/lib/erl_docgen/priv/xsl/db_pdf.xsl +++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl @@ -1186,6 +1186,12 @@ </fo:inline> </xsl:template> + <xsl:template match="i"> + <fo:inline font-weight="italic"> + <xsl:apply-templates/> + </fo:inline> + </xsl:template> + <xsl:template match="br"> <fo:block/> </xsl:template> |