From bb8e8c31dc36e8fb21165ecf3965ecad5f31caad Mon Sep 17 00:00:00 2001
From: milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Sat, 31 Dec 2016 13:55:06 +0000
Subject: [PATCH] Fix problems with DTD.

* align is a new attribute for the table element (was attached to the table
  entry)
* measures may contain the percent sign (%), not allowed in NMTOKENS
* documentation update

Still errors with xmllint: IDREF cannot ref to "ids". An ID must be unique.
There is no IDS datatype.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@8008 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 docs/ref/docutils.dtd | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/ref/docutils.dtd b/docs/ref/docutils.dtd
index 2ae4b9f8c..1723115bd 100644
--- a/docs/ref/docutils.dtd
+++ b/docs/ref/docutils.dtd
@@ -39,15 +39,15 @@ by wrapper DTDs.
 <!-- Emphasize that the attribute value must be a number. -->
 <!ENTITY % number  "NMTOKEN">
 
-<!-- A number which may be immediately followed by a unit. -->
-<!ENTITY % measure "NMTOKEN">
+<!-- A number which may be immediately followed by a unit or percent sign. -->
+<!ENTITY % measure "CDATA">
 
 <!ENTITY % additional.basic.atts "">
 <!--
 Attributes shared by all elements in this DTD:
 
-- `id` is a unique identifier, typically assigned by the system.
-- `name` is an identifier assigned in the markup.
+- `ids` are unique identifiers, typically assigned by the system.
+- `names` are identifiers assigned in the markup.
 - `dupnames` is the same as `name`, used when it's a duplicate.
 - `source` is the name of the source of this document or fragment.
 - `classes` is used to transmit individuality information forward.
@@ -181,12 +181,13 @@ http://www.oasis-open.org/html/tm9901.htm).
   " %basic.atts;
     stub      %yesorno; #IMPLIED ">
 <!ENTITY % tbl.row.att          " %basic.atts; ">
-<!-- nested tables are supported -->
+<!-- ``(...)*``: nested tables are supported -->
 <!ENTITY % tbl.entry.mdl        " (%body.elements;)* ">
 <!ENTITY % tbl.entry.att
   " %basic.atts;
-    %align-h.att;
     morecols  %number;  #IMPLIED ">
+<!ATTLIST table
+    %align-h.att;>
 
 <!--
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- 
2.11.4.GIT