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/dtd/common.dtd | |
| 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/dtd/common.dtd')
| -rw-r--r-- | lib/erl_docgen/priv/dtd/common.dtd | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd index ded16d308f..a29fc233fa 100644 --- a/lib/erl_docgen/priv/dtd/common.dtd +++ b/lib/erl_docgen/priv/dtd/common.dtd @@ -24,21 +24,23 @@ <!ENTITY % block "p|pre|code|list|taglist|codeinclude| erleval" > -<!ENTITY % inline "#PCDATA|c|em|term|cite|br|path|seealso| - url|marker" > +<!ENTITY % inline "#PCDATA|c|i|em|term|cite|br|path|seealso| + url|marker|anno" > <!-- XXX --> <!ELEMENT p (%inline;)* > -<!ELEMENT pre (#PCDATA|seealso|url|input)* > -<!ELEMENT input (#PCDATA|seealso|url)* > -<!ELEMENT code (#PCDATA) > +<!ELEMENT pre (#PCDATA|seealso|url|input|anno)* > +<!ELEMENT input (#PCDATA|seealso|url|anno)* > +<!ELEMENT code (#PCDATA|anno)* > <!ATTLIST code type (erl|c|none) "none" > <!ELEMENT quote (p)* > <!ELEMENT warning (%block;|quote|br|marker)* > <!ELEMENT note (%block;|quote|br|marker)* > <!ELEMENT dont (%block;|quote|br|marker)* > <!ELEMENT do (%block;|quote|br|marker)* > -<!ELEMENT c (#PCDATA) > -<!ELEMENT em (#PCDATA|c)* > +<!ELEMENT c (#PCDATA|anno)* > +<!ELEMENT i (#PCDATA|c|anno)* > +<!ELEMENT em (#PCDATA|c|anno)* > +<!ELEMENT anno (#PCDATA) > <!-- XXX --> <!ELEMENT term (termdef?) > @@ -64,13 +66,13 @@ <!ELEMENT list (item+) > <!ATTLIST list type (ordered|bulleted) "bulleted" > -<!ELEMENT taglist (tag,item)+ > -<!ELEMENT tag (#PCDATA|c|em|seealso|url|marker)* > +<!ELEMENT taglist (tag,item+)+ > +<!ELEMENT tag (#PCDATA|c|i|em|br|seealso|url|marker|anno)* > <!ELEMENT item (%inline;|%block;)* > <!-- References --> -<!ELEMENT seealso (#PCDATA|c|em)* > +<!ELEMENT seealso (#PCDATA|c|i|em|anno)* > <!ATTLIST seealso marker CDATA #REQUIRED > <!ELEMENT url (#PCDATA) > <!ATTLIST url href CDATA #REQUIRED > |