Skip to content

Commit

Permalink
Remove varentry modification from DTD (#103)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Girgias
Girgias authored Nov 1, 2023
1 parent cce6f7f commit 4269a93
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions docbook/docbook-xml/docbook.dtd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2332,7 +2332,7 @@
role CDATA #IMPLIED
%db.common.attributes;
%db.common.linking.attributes;
pubwork (article|bbs|book|cdrom|chapter|dvd|emailmessage|gopher|journal|manuscript|newsposting|part|phpdoc:varentry|refentry|section|series|set|webpage|wiki) #IMPLIED
pubwork (article|bbs|book|cdrom|chapter|dvd|emailmessage|gopher|journal|manuscript|newsposting|part|refentry|section|series|set|webpage|wiki) #IMPLIED

>

Expand Down Expand Up @@ -2584,7 +2584,7 @@

>

<!ELEMENT appendix (((title|titleabbrev|subtitle)*, info?), ((glossary|bibliography|index|toc)*, (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+), (glossary|bibliography|index|toc)*))>
<!ELEMENT appendix (((title|titleabbrev|subtitle)*, info?), ((glossary|bibliography|index|toc)*, (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+), (glossary|bibliography|index|toc)*))>

<!ATTLIST appendix
xmlns CDATA #FIXED "http://docbook.org/ns/docbook"
Expand All @@ -2596,7 +2596,7 @@

>

<!ELEMENT chapter (((title|titleabbrev|subtitle)*, info?), ((glossary|bibliography|index|toc)*, (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+), (glossary|bibliography|index|toc)*))>
<!ELEMENT chapter (((title|titleabbrev|subtitle)*, info?), ((glossary|bibliography|index|toc)*, (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+), (glossary|bibliography|index|toc)*))>

<!ATTLIST chapter
xmlns CDATA #FIXED "http://docbook.org/ns/docbook"
Expand All @@ -2608,7 +2608,7 @@

>

<!ELEMENT part (((title|titleabbrev|subtitle)*, info?), partintro?, (glossary|bibliography|index|toc|dedication|acknowledgements|preface|chapter|appendix|article|colophon|phpdoc:varentry|refentry|reference|phpdoc:exceptionref|phpdoc:classref)+)>
<!ELEMENT part (((title|titleabbrev|subtitle)*, info?), partintro?, (glossary|bibliography|index|toc|dedication|acknowledgements|preface|chapter|appendix|article|colophon|refentry|reference|phpdoc:exceptionref|phpdoc:classref)+)>

<!ATTLIST part
xmlns CDATA #FIXED "http://docbook.org/ns/docbook"
Expand All @@ -2620,7 +2620,7 @@

>

<!ELEMENT preface (((title|titleabbrev|subtitle)*, info?), ((glossary|bibliography|index|toc)*, (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+), (glossary|bibliography|index|toc)*))>
<!ELEMENT preface (((title|titleabbrev|subtitle)*, info?), ((glossary|bibliography|index|toc)*, (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+), (glossary|bibliography|index|toc)*))>

<!ATTLIST preface
xmlns CDATA #FIXED "http://docbook.org/ns/docbook"
Expand All @@ -2632,7 +2632,7 @@

>

<!ELEMENT partintro (((title|titleabbrev|subtitle)*, info?), (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+))>
<!ELEMENT partintro (((title|titleabbrev|subtitle)*, info?), (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+))>

<!ATTLIST partintro
xmlns CDATA #FIXED "http://docbook.org/ns/docbook"
Expand All @@ -2644,7 +2644,7 @@

>

<!ELEMENT section (((title|titleabbrev|subtitle)*, info?), (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|(phpdoc:varentry|refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|(phpdoc:varentry|refentry|xi:include)+), (glossary|bibliography|index|toc)*)>
<!ELEMENT section (((title|titleabbrev|subtitle)*, info?), (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|(refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|(refentry|xi:include)+), (glossary|bibliography|index|toc)*)>

<!ATTLIST section
xmlns CDATA #FIXED "http://docbook.org/ns/docbook"
Expand All @@ -2668,7 +2668,7 @@

>

<!ELEMENT article (((title|titleabbrev|subtitle)*, info?), (glossary|bibliography|index|toc|appendix|acknowledgements|colophon)*, (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+), (glossary|bibliography|index|toc|appendix|acknowledgements|colophon)*)>
<!ELEMENT article (((title|titleabbrev|subtitle)*, info?), (glossary|bibliography|index|toc|appendix|acknowledgements|colophon)*, (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+), (glossary|bibliography|index|toc|appendix|acknowledgements|colophon)*)>

<!ATTLIST article
xmlns CDATA #FIXED "http://docbook.org/ns/docbook"
Expand Down Expand Up @@ -2741,7 +2741,7 @@

>

<!ELEMENT reference (((title|titleabbrev|subtitle)*, info?), partintro?, (phpdoc:varentry|refentry)+)>
<!ELEMENT reference (((title|titleabbrev|subtitle)*, info?), partintro?, (refentry)+)>

<!ATTLIST reference
xmlns CDATA #FIXED "http://docbook.org/ns/docbook"
Expand All @@ -2753,7 +2753,7 @@

>

<!ELEMENT classref (((title|titleabbrev|subtitle)*, info?), partintro?, (phpdoc:varentry|refentry)*)>
<!ELEMENT classref (((title|titleabbrev|subtitle)*, info?), partintro?, (refentry)*)>

<!ATTLIST classref
xmlns CDATA #FIXED "http://docbook.org/ns/docbook"
Expand All @@ -2773,7 +2773,7 @@
>
<!ELEMENT fallback EMPTY>

<!ELEMENT exceptionref (((title|titleabbrev|subtitle)*, info?), partintro?, (phpdoc:varentry|refentry)*)>
<!ELEMENT exceptionref (((title|titleabbrev|subtitle)*, info?), partintro?, (refentry)*)>

<!ATTLIST exceptionref
xmlns CDATA #FIXED "http://docbook.org/ns/docbook"
Expand Down

0 comments on commit 4269a93

Please sign in to comment.