diff options
| author | Lars Thorsen <[email protected]> | 2015-10-05 12:35:27 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2015-11-30 08:42:17 +0100 |
| commit | cb431af03a56ac195862289da474947c2107cdde (patch) | |
| tree | b0ca2c54e9d92af36334a4e969846595bc7bcef7 | |
| parent | 8574c1ad8dd5ae8b4d7234fd97f1c33c71710ab0 (diff) | |
| download | otp-cb431af03a56ac195862289da474947c2107cdde.tar.gz otp-cb431af03a56ac195862289da474947c2107cdde.tar.bz2 otp-cb431af03a56ac195862289da474947c2107cdde.zip | |
[erl_docgen] Update DTD for anno tag
| -rw-r--r-- | lib/erl_docgen/priv/dtd/common.dtd | 7 | ||||
| -rw-r--r-- | lib/erl_docgen/priv/dtd/common.header.dtd | 4 | ||||
| -rw-r--r-- | lib/erl_docgen/priv/dtd/common.refs.dtd | 6 | ||||
| -rw-r--r-- | lib/erl_docgen/vsn.mk | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd index ded16d308f..5297b510ab 100644 --- a/lib/erl_docgen/priv/dtd/common.dtd +++ b/lib/erl_docgen/priv/dtd/common.dtd @@ -25,7 +25,7 @@ <!ENTITY % block "p|pre|code|list|taglist|codeinclude| erleval" > <!ENTITY % inline "#PCDATA|c|em|term|cite|br|path|seealso| - url|marker" > + url|marker|anno" > <!-- XXX --> <!ELEMENT p (%inline;)* > <!ELEMENT pre (#PCDATA|seealso|url|input)* > @@ -37,8 +37,9 @@ <!ELEMENT note (%block;|quote|br|marker)* > <!ELEMENT dont (%block;|quote|br|marker)* > <!ELEMENT do (%block;|quote|br|marker)* > -<!ELEMENT c (#PCDATA) > +<!ELEMENT c (#PCDATA|anno)* > <!ELEMENT em (#PCDATA|c)* > +<!ELEMENT anno (#PCDATA) > <!-- XXX --> <!ELEMENT term (termdef?) > @@ -64,7 +65,7 @@ <!ELEMENT list (item+) > <!ATTLIST list type (ordered|bulleted) "bulleted" > -<!ELEMENT taglist (tag,item)+ > +<!ELEMENT taglist (tag,item+)+ > <!ELEMENT tag (#PCDATA|c|em|seealso|url|marker)* > <!ELEMENT item (%inline;|%block;)* > diff --git a/lib/erl_docgen/priv/dtd/common.header.dtd b/lib/erl_docgen/priv/dtd/common.header.dtd index 71a8662572..eb27dc8f97 100644 --- a/lib/erl_docgen/priv/dtd/common.header.dtd +++ b/lib/erl_docgen/priv/dtd/common.header.dtd @@ -18,8 +18,8 @@ $Id$ --> <!ELEMENT header (copyright?,legalnotice?,title,shorttitle?, - prepared,responsible?,docno,approved?, - checked?,date,rev,file?) > + prepared?,responsible?,docno?,approved?, + checked?,date?,rev?,file?) > <!-- The titlestyle attribute is only defined to make all the book.xml files diff --git a/lib/erl_docgen/priv/dtd/common.refs.dtd b/lib/erl_docgen/priv/dtd/common.refs.dtd index f57e46a624..a59462bb3f 100644 --- a/lib/erl_docgen/priv/dtd/common.refs.dtd +++ b/lib/erl_docgen/priv/dtd/common.refs.dtd @@ -33,9 +33,9 @@ <!ELEMENT type (v,d?)* > <!ATTLIST type variable CDATA #IMPLIED name_i CDATA #IMPLIED> -<!ELEMENT v (#PCDATA) > +<!ELEMENT v (#PCDATA|seealso)* > <!ELEMENT d (#PCDATA|c|em)* > -<!ELEMENT desc (%block;|quote|br|marker|warning|note|dont|do|anno)* > +<!ELEMENT desc (%block;|quote|br|marker|warning|note|dont|do)* > <!ELEMENT authors (aname,email)+ > <!ELEMENT aname (#PCDATA) > <!ELEMENT email (#PCDATA) > @@ -43,5 +43,5 @@ warning|note|dont|do)*) > <!ELEMENT datatypes (datatype)+ > <!ELEMENT datatype (name+,desc?) > -<!ELEMENT type_desc (#PCDATA) > +<!ELEMENT type_desc (#PCDATA|anno)* > <!ATTLIST type_desc variable CDATA #REQUIRED> diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk index 2abd3d2b7e..43f5a570d7 100644 --- a/lib/erl_docgen/vsn.mk +++ b/lib/erl_docgen/vsn.mk @@ -1 +1 @@ -ERL_DOCGEN_VSN = 0.4 +ERL_DOCGEN_VSN = 0.4.1 |