diff options
| author | Lars Thorsen <[email protected]> | 2013-01-21 15:01:58 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2013-01-21 15:01:58 +0100 |
| commit | bb65d760aa2281c4a7bb216ec1c858813869759d (patch) | |
| tree | a861d3632bd29106f9f2fe2f7dcd0f2de7ee8020 /lib | |
| parent | 043da0de9576732671fb61f560070932024dde87 (diff) | |
| parent | fdd89ea15130484cb29c27b18b22c8835108f20f (diff) | |
| download | otp-bb65d760aa2281c4a7bb216ec1c858813869759d.tar.gz otp-bb65d760aa2281c4a7bb216ec1c858813869759d.tar.bz2 otp-bb65d760aa2281c4a7bb216ec1c858813869759d.zip | |
Merge branch 'lars/erl_docgen/indenterings-bug/OTP-10725'
* lars/erl_docgen/indenterings-bug/OTP-10725:
[erl_docgen] Fix include path to xmllint
[erl_docgen] Update vsn.mk
[erl_docgen] Add xmllint target for the documentation and fix some DTD errors
[erl_docgen] Fix dtd error for type_desc tag
[erl_docgen] Fix pdf indentation bug for tagged lists
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/erl_docgen/priv/dtd/common.refs.dtd | 7 | ||||
| -rw-r--r-- | lib/erl_docgen/priv/dtd/erlref.dtd | 3 | ||||
| -rw-r--r-- | lib/erl_docgen/priv/xsl/db_pdf.xsl | 12 | ||||
| -rw-r--r-- | lib/erl_docgen/vsn.mk | 3 |
4 files changed, 16 insertions, 9 deletions
diff --git a/lib/erl_docgen/priv/dtd/common.refs.dtd b/lib/erl_docgen/priv/dtd/common.refs.dtd index c1237766e1..93592607df 100644 --- a/lib/erl_docgen/priv/dtd/common.refs.dtd +++ b/lib/erl_docgen/priv/dtd/common.refs.dtd @@ -26,10 +26,12 @@ <!ELEMENT description (%block;|quote|br|marker|warning|note)* > <!ELEMENT funcs (func)+ > -<!ELEMENT func (name+,type_desc+,fsummary,type?,desc?) > +<!ELEMENT func (name+,type_desc*,fsummary,type?,desc?) > <!-- ELEMENT name is defined in each ref dtd --> <!ELEMENT fsummary (#PCDATA|c|em)* > -<!ELEMENT type (v,d?)+ > +<!ELEMENT type (v,d?)* > +<!ATTLIST type variable CDATA #IMPLIED + name_i CDATA #IMPLIED> <!ELEMENT v (#PCDATA) > <!ELEMENT d (#PCDATA|c|em)* > <!ELEMENT desc (%block;|quote|br|marker|warning|note|anno)* > @@ -41,3 +43,4 @@ <!ELEMENT datatypes (datatype)+ > <!ELEMENT datatype (name+,desc?) > <!ELEMENT type_desc (#PCDATA) > +<!ATTLIST type_desc variable CDATA #REQUIRED> diff --git a/lib/erl_docgen/priv/dtd/erlref.dtd b/lib/erl_docgen/priv/dtd/erlref.dtd index 9905086ff4..0cc5cfa06d 100644 --- a/lib/erl_docgen/priv/dtd/erlref.dtd +++ b/lib/erl_docgen/priv/dtd/erlref.dtd @@ -29,3 +29,6 @@ <!-- `name' is used in common.refs.dtd and must therefore be defined in each *ref. dtd --> <!ELEMENT name (#PCDATA) > +<!ATTLIST name name CDATA #IMPLIED + arity CDATA #IMPLIED + clause_i CDATA #IMPLIED> diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl index 7de5af2a49..c846bdbf34 100644 --- a/lib/erl_docgen/priv/xsl/db_pdf.xsl +++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl @@ -1102,11 +1102,13 @@ <xsl:template match="taglist/item"> <xsl:param name="partnum"/> - <fo:block xsl:use-attribute-sets="tagitem"> - <xsl:apply-templates> - <xsl:with-param name="partnum" select="$partnum"/> - </xsl:apply-templates> - </fo:block> + <fo:block-container> + <fo:block xsl:use-attribute-sets="tagitem"> + <xsl:apply-templates> + <xsl:with-param name="partnum" select="$partnum"/> + </xsl:apply-templates> + </fo:block> + </fo:block-container> </xsl:template> diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk index 2599dc0ff7..a2262198dc 100644 --- a/lib/erl_docgen/vsn.mk +++ b/lib/erl_docgen/vsn.mk @@ -1,2 +1 @@ -ERL_DOCGEN_VSN = 0.3.3 - +ERL_DOCGEN_VSN = 0.3.4 |