summaryrefslogtreecommitdiff
path: root/docutils/docs
diff options
context:
space:
mode:
authormilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2016-12-31 13:55:06 +0000
committermilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2016-12-31 13:55:06 +0000
commit161d97b15058e073041cc637d7ded18dd87ea315 (patch)
treea65ddcb4811dfad16f6a05eefbbacd8e855f742e /docutils/docs
parentd4ed302113b836c4cce560b7afe4f987b5d11705 (diff)
downloaddocutils-161d97b15058e073041cc637d7ded18dd87ea315.tar.gz
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@8008 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
Diffstat (limited to 'docutils/docs')
-rw-r--r--docutils/docs/ref/docutils.dtd13
1 files changed, 7 insertions, 6 deletions
diff --git a/docutils/docs/ref/docutils.dtd b/docutils/docs/ref/docutils.dtd
index 2ae4b9f8c..1723115bd 100644
--- a/docutils/docs/ref/docutils.dtd
+++ b/docutils/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;>
<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~