From 75a18d202b53286e68a2e6674c9a34a9caa27627 Mon Sep 17 00:00:00 2001
From: milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Wed, 6 Dec 2023 20:48:38 +0000
Subject: [PATCH] Validate and fix `docutils XML` output.

Fix "xml" writer:
The <meta> element must be empty (no whitespace allowed inside).

Fix definition of <meta> in the DTD.
<meta> does *not* take the basic attributes, instead a long list
of custom ones similar to it's HTML role model.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@9497 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 docutils/docs/dev/testing.txt                      |  8 ++------
 docutils/docs/ref/docutils.dtd                     | 23 ++++++++++++++--------
 docutils/docutils/writers/docutils_xml.py          |  2 +-
 .../expected/standalone_rst_docutils_xml.xml       |  6 ++----
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/docutils/docs/dev/testing.txt b/docutils/docs/dev/testing.txt
index 817f20733..b1382e5f4 100644
--- a/docutils/docs/dev/testing.txt
+++ b/docutils/docs/dev/testing.txt
@@ -286,9 +286,5 @@ actual output for validity and correctness, copy it to
 ``functional/expected/`` (overwriting the old expected output), and
 commit the change.
 
-.. [#] The validity of `Docutils XML` can be tested with
-   ``xmllint <document-referencing-local-Docutils-DTD>.xml --valid --noout``.
-
-   .. note: the ``--dtdvalid`` and ``--nonet`` options do not help override
-     a reference to the PUBLIC "docutils.dtd" if there is a local version
-     on the system (e.g. /usr/share/xml/docutils/docutils.dtd in Debian).
+.. [#] `Docutils XML` can be validated with
+   ``xmllint --dtdvalid docs/ref/docutils.dtd --noout *.xml``.
diff --git a/docutils/docs/ref/docutils.dtd b/docutils/docs/ref/docutils.dtd
index 2ab5c87d4..58e2d1cc5 100644
--- a/docutils/docs/ref/docutils.dtd
+++ b/docutils/docs/ref/docutils.dtd
@@ -132,7 +132,7 @@ Internal reference to the `name` attribute of an element. On a
 resolve to either an internal or external reference.
 -->
 <!ENTITY % refname.att
-  " refname  %refname.type;   #IMPLIED ">
+  " refname  %refname.type;      #IMPLIED ">
 
 <!ENTITY % additional.reference.atts "">
 <!-- Collected hyperlink reference attributes. -->
@@ -167,8 +167,7 @@ resolve to either an internal or external reference.
 <!ENTITY % additional.bibliographic.elements "">
 <!ENTITY % bibliographic.elements
   " author | authors | organization | address | contact
-    | version | revision | status | date | copyright
-    | field
+    | version | revision | status | date | copyright | field
     %additional.bibliographic.elements; ">
 
 <!ENTITY % additional.section.elements "">
@@ -227,7 +226,7 @@ http://www.oasis-open.org/html/tm9901.htm).
 <!-- These parameter entities customize the table model DTD. -->
 <!ENTITY % bodyatt              " %basic.atts; ">  <!-- table elt -->
 <!-- 1 colspec element is expected per table column: -->
-<!ENTITY % tbl.tgroup.mdl      "colspec+,thead?,tbody">
+<!ENTITY % tbl.tgroup.mdl       "colspec+,thead?,tbody">
 <!ENTITY % tbl.tgroup.att       " %basic.atts; ">
 <!ENTITY % tbl.thead.att        " %basic.atts; ">
 <!ENTITY % tbl.tbody.att        " %basic.atts; ">
@@ -253,7 +252,7 @@ http://www.oasis-open.org/html/tm9901.htm).
 <!-- Optional elements may be generated by internal processing. -->
 <!ELEMENT document
     ( (title, subtitle?)?,
-      meta?,
+      meta*,
       decoration?,
       (docinfo, transition?)?,
       %structure.model; )>
@@ -323,9 +322,17 @@ Eventual replacement for docinfo? -->
 <!ELEMENT copyright %text.model;>
 <!ATTLIST copyright %basic.atts;>
 
-<!-- Container for "hidden" meta-data. Must not be empty. -->
-<!ELEMENT meta (field_list+)>
-<!ATTLIST meta %basic.atts;>
+<!-- Container for "hidden" meta-data. Attributes follow HTML -->
+<!ELEMENT meta EMPTY>
+<!ATTLIST meta
+  name        NMTOKEN            #IMPLIED
+  content     CDATA              #REQUIRED
+  http-equiv  CDATA              #IMPLIED
+  scheme      CDATA              #IMPLIED
+  lang        CDATA              #IMPLIED
+  dir         (ltr | rtl | auto) #IMPLIED
+  media       CDATA              #IMPLIED
+  >
 
 <!--
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docutils/docutils/writers/docutils_xml.py b/docutils/docutils/writers/docutils_xml.py
index 4ea1c6682..38bf3f936 100644
--- a/docutils/docutils/writers/docutils_xml.py
+++ b/docutils/docutils/writers/docutils_xml.py
@@ -111,7 +111,7 @@ class XMLTranslator(nodes.GenericNodeVisitor):
     # generic visit and depart methods
     # --------------------------------
 
-    simple_nodes = (nodes.TextElement,
+    simple_nodes = (nodes.TextElement, nodes.meta,
                     nodes.image, nodes.colspec, nodes.transition)
 
     def default_visit(self, node):
diff --git a/docutils/test/functional/expected/standalone_rst_docutils_xml.xml b/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
index b14e2d1f2..e5bdad04b 100644
--- a/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
+++ b/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
@@ -4,10 +4,8 @@
 <document ids="restructuredtext-test-document doctitle" names="restructuredtext\ test\ document doctitle" source="functional/input/standalone_rst_docutils_xml.txt" title="reStructuredText Test Document">
     <title>reStructuredText Test Document</title>
     <subtitle ids="examples-of-syntax-constructs subtitle" names="examples\ of\ syntax\ constructs subtitle">Examples of Syntax Constructs</subtitle>
-    <meta content="reStructuredText, test, parser" name="keywords">
-    </meta>
-    <meta content="A test document, containing at least one example of each reStructuredText construct." lang="en" name="description">
-    </meta>
+    <meta content="reStructuredText, test, parser" name="keywords"></meta>
+    <meta content="A test document, containing at least one example of each reStructuredText construct." lang="en" name="description"></meta>
     <decoration>
         <header>
             <paragraph>Document header</paragraph>
-- 
2.11.4.GIT