[Docutils-checkins] SF.net SVN: docutils:[10389] trunk/docutils

[<mi...@us...>]

Revision: 10389
          http://sourceforge.net/p/docutils/code/10389
Author:   milde
Date:     2026-07-21 17:55:03 +0000 (Tue, 21 Jul 2026)
Log Message:
-----------
Use `%tbl.table.att` instead of `%bodyatt` in docutils.dtd.

Use the ``%tbl.table.att`` parameter entity instead of ``%bodyatt``
to customize the <table> element's attribute list.
The "CALS XML Exchange Table Model" defines both parameter entities
(%bodyatt for backwards compatibility).

Move the reference to the CALS-table model behind the declarations of
the customization parameter entities:

> [...] these entities can be redefined (by giving the appropriate
> parameter entity declaration(s) prior to the reference
> to this Table Model declaration set entity)
-- https://www.oasis-open.org/specs/tm9901.html

Modified Paths:
--------------
    trunk/docutils/HISTORY.rst
    trunk/docutils/RELEASE-NOTES.rst
    trunk/docutils/docs/ref/doctree.rst
    trunk/docutils/docs/ref/docutils.dtd

Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst	2026-07-16 10:43:55 UTC (rev 10388)
+++ trunk/docutils/HISTORY.rst	2026-07-21 17:55:03 UTC (rev 10389)
@@ -17,6 +17,11 @@
 Release 1.0b1.dev (unpublished)
 ===============================
 
+* docs/ref/docutils.dtd
+
+  - Use the ``%tbl.table.att`` parameter entity instead of ``%bodyatt``
+    to customize the <table> element's attribute list.
+
 * docutils/__init__.py
 
   - Remove `TransformSpec.unknown_reference_resolvers`.

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2026-07-16 10:43:55 UTC (rev 10388)
+++ trunk/docutils/RELEASE-NOTES.rst	2026-07-21 17:55:03 UTC (rev 10389)
@@ -46,9 +46,6 @@
 Document Tree / Docutils DTD
 ----------------------------
 
-* Use the ``%tbl.table.att`` parameter entity instead of ``%bodyatt``
-  to customize the <table> element's attribute list in Docutils 1.0.
-
 * The <footnote> element's first child (<label>) will become mandatory
   in Docutils 1.0.
 
@@ -210,6 +207,8 @@
 
 Document Tree / Docutils DTD:
   - Drop the `name` attribute from <reference> nodes.
+  - Use the ``%tbl.table.att`` parameter entity instead of ``%bodyatt``
+    to customize the <table> element's attribute list in Docutils 1.0.
 
 Configuration changes:
   - `Auto-detection`_ of the input encoding is no longer supported.
@@ -292,6 +291,8 @@
   `writers.latex2e.SortableDict`
       Not used and deprecated since Docutils 0.22.
 
+Bugfixes and improvements (see HISTORY_).
+
 .. [#cross-links] This includes links from the table of contents_ and
    "`section self-links <section_self_link_>`_" added by the HTML5
    writer.

Modified: trunk/docutils/docs/ref/doctree.rst
===================================================================
--- trunk/docutils/docs/ref/doctree.rst	2026-07-16 10:43:55 UTC (rev 10388)
+++ trunk/docutils/docs/ref/doctree.rst	2026-07-21 17:55:03 UTC (rev 10389)
@@ -3900,7 +3900,7 @@
 
 :Attributes: The <table> element may contain the frame_, colsep_,
              rowsep_, and pgwide_ attributes (ignored by Docutils)
-             and (via the `%bodyatt`_ parameter entity)
+             and (via the `%tbl.table.att`_ parameter entity)
              the `common attributes`_, align_, and width_.
 
 __ https://www.oasis-open.org/specs/tm9901.html#AEN142
@@ -5344,9 +5344,8 @@
 The ``%bodyatt`` parameter entity is defined in the `Exchange Table Model`_
 to allow customization of the `\<table>`_ element's attribute list.
 
-The `Docutils Generic DTD`_ redefines it to add align_, width_, and the
-`common attributes`_.  (In Docutils versions ≥ 1.0, the `%tbl.table.att`_
-parameter entity will be redefined instead.)
+It was used (instead of `%tbl.table.att`_) in Docutils versions < 1.0 to
+add align_, width_, and the `common attributes`_.
 
 
 ``%fixedspace.att``
@@ -5480,8 +5479,8 @@
 Model`_ to allow customization of the `\<table>`_ element's attribute
 list.
 
-Docutils versions ≥ 1.0 will use ``%tbl.table.att`` (instead of the
-obsolete `%bodyatt`_) to add align_, width_, and the `common attributes`_.
+The `Docutils Generic DTD`_ redefines it to add align_, width_, and the
+`common attributes`_ (Docutils versions < 1.0 used `%bodyatt`_ instead).
 
 
 ``%tbl.tbody.att``

Modified: trunk/docutils/docs/ref/docutils.dtd
===================================================================
--- trunk/docutils/docs/ref/docutils.dtd	2026-07-16 10:43:55 UTC (rev 10388)
+++ trunk/docutils/docs/ref/docutils.dtd	2026-07-21 17:55:03 UTC (rev 10389)
@@ -218,16 +218,13 @@
 http://www.oasis-open.org/html/tm9901.htm).
 -->
 
-<!ENTITY % calstblx PUBLIC
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
-    "soextblx.dtd">
-
 <!-- These parameter entities customize the table model DTD. -->
-<!-- table element TODO: use %tbl.table.att.  Keep or drop pgwide? -->
-<!ENTITY % bodyatt
+<!-- table element the "pgwide" attribute is ignored by Docutils -->
+<!ENTITY % tbl.table.att
   " %basic.atts;
     %align-h.att;
-    width     %measure;  #IMPLIED ">
+    width     %measure;  #IMPLIED
+    pgwide    %yesorno;  #IMPLIED ">
 <!-- 1 colspec element is expected per table column: -->
 <!ENTITY % tbl.tgroup.mdl       "colspec+,thead?,tbody">
 <!ENTITY % tbl.tgroup.att       " %basic.atts; ">
@@ -243,6 +240,10 @@
   " %basic.atts;
     morecols  %number;  #IMPLIED ">
 
+<!ENTITY % calstblx PUBLIC
+    "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
+    "soextblx.dtd">
+
 <!--
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Root Element

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.