docutils-checkins — SVN checkin messages, auto-generated.

[Docutils-checkins] SF.net SVN: docutils:[10200] trunk/docutils/docutils/ parsers/rst/states.py

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

Revision: 10200
          http://sourceforge.net/p/docutils/code/10200
Author:   milde
Date:     2025-08-11 12:07:22 +0000 (Mon, 11 Aug 2025)
Log Message:
-----------
Fix error/crash whith Sphinx "autoprogram" [bugs:#509].

Sphinx's "autoprogram" fails to parse docstrings containing a section header.

"autoprogram" starts nested parsing with empty `memo.title_styles` and a
`<section>` as root node.  In this context, the "root section" should be
considered a "level 0" section.
Remove the unattached "root section" from the list of `parent_sections` so that
appending a new top-level section to `parent_sections[0].parent` works.

Modified Paths:
--------------
    trunk/docutils/docutils/parsers/rst/states.py

Modified: trunk/docutils/docutils/parsers/rst/states.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/states.py	2025-08-11 12:07:14 UTC (rev 10199)
+++ trunk/docutils/docutils/parsers/rst/states.py	2025-08-11 12:07:22 UTC (rev 10200)
@@ -169,7 +169,6 @@
 
 
 class NestedStateMachine(StateMachineWS):
-
     """
     StateMachine run from within other StateMachine runs, to parse nested
     document structures.
@@ -177,7 +176,7 @@
 
     def run(self, input_lines, input_offset, memo, node, match_titles=True):
         """
-        Parse `input_lines` and populate a `docutils.nodes.document` instance.
+        Parse `input_lines` and populate `node`.
 
         Extend `StateMachineWS.run()`: set up document-wide data.
         """
@@ -326,11 +325,17 @@
 
         When a new section is reached that isn't a subsection of the current
         section, set `self.parent` to the new section's parent section
-        (or the document if the new section is a top-level section).
+        (or the root node if the new section is a top-level section).
         """
         title_styles = self.memo.title_styles
         parent_sections = self.parent.section_hierarchy()
-        # current section level: (0 document, 1 section, 2 subsection, ...)
+        # Adding a new <section> at level "i" is done by appending to
+        # ``parent_sections[i-1].parent``.
+        # However, in nested parsing the root `node` may be a <section>.
+        # Then ``parent_sections[0]`` has no parent and must be discarded:
+        if parent_sections and parent_sections[0].parent is None:
+            parent_sections.pop(0)
+        # current section level: (0 root, 1 section, 2 subsection, ...)
         oldlevel = len(parent_sections)
         # new section level:
         try:  # check for existing title style

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

[Docutils-checkins] SF.net SVN: docutils:[10199] trunk/docutils/docs/ref/ doctree.rst

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

Revision: 10199
          http://sourceforge.net/p/docutils/code/10199
Author:   milde
Date:     2025-08-11 12:07:14 +0000 (Mon, 11 Aug 2025)
Log Message:
-----------
Restore accidentially deleted text in doctree documentation.

Modified Paths:
--------------
    trunk/docutils/docs/ref/doctree.rst

Modified: trunk/docutils/docs/ref/doctree.rst
===================================================================
--- trunk/docutils/docs/ref/doctree.rst	2025-08-10 12:13:20 UTC (rev 10198)
+++ trunk/docutils/docs/ref/doctree.rst	2025-08-11 12:07:14 UTC (rev 10199)
@@ -3398,7 +3398,7 @@
              `%structure.model`_ indirectly includes <section>.
 
 The Docutils document model uses a simple, recursive model for section
-structure.  A `\<document>`_ nodeelements.
+structure.  A `\<document>`_ element may contain <section> elements.
 Sections in turn may contain other <section> elements, without limit.
 The level (depth) of a section element is determined from its physical
 nesting level.

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

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

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

Revision: 10198
          http://sourceforge.net/p/docutils/code/10198
Author:   milde
Date:     2025-08-10 12:13:20 +0000 (Sun, 10 Aug 2025)
Log Message:
-----------
Relax "Unexpected section" system message from SEVERE to ERROR.

The new section parsing algorithm [r10093] allows to continue parsing after
problems with the section title markup.

Better feedback to users in cases like::

==  ===========  ===========
1   Not a span   Not a span
    -----------  -----------
2
==  ===========  ===========

Also fix typo in last commit and log changes.

Modified Paths:
--------------
    trunk/docutils/HISTORY.rst
    trunk/docutils/RELEASE-NOTES.rst
    trunk/docutils/docutils/parsers/rst/states.py
    trunk/docutils/test/test_parsers/test_rst/test_section_headers.py
    trunk/docutils/test/test_parsers/test_rst/test_tables.py
    trunk/docutils/test/test_parsers/test_rst/test_transitions.py

Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst	2025-08-08 18:23:50 UTC (rev 10197)
+++ trunk/docutils/HISTORY.rst	2025-08-10 12:13:20 UTC (rev 10198)
@@ -21,7 +21,13 @@
 
   - More consistent and concise command line help.
 
+* docutils/parsers/rst/states.py
 
+  - Relax "section title" system message from SEVERE to ERROR.
+  - Ensure new "current node" is valid when switching section level
+    (cf. bugs #508 and #509).
+
+
 Release 0.22 (2026-07-29)
 =========================
 

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2025-08-08 18:23:50 UTC (rev 10197)
+++ trunk/docutils/RELEASE-NOTES.rst	2025-08-10 12:13:20 UTC (rev 10198)
@@ -259,7 +259,7 @@
 Release 0.23b0 (unpublished)
 ============================
 
-...
+Bugfixes and improvements (see HISTORY_).
 
 
 Release 0.22 (2025-07-29)

Modified: trunk/docutils/docutils/parsers/rst/states.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/states.py	2025-08-08 18:23:50 UTC (rev 10197)
+++ trunk/docutils/docutils/parsers/rst/states.py	2025-08-10 12:13:20 UTC (rev 10198)
@@ -342,7 +342,7 @@
         # of the current level:
         if newlevel > oldlevel + 1:
             styles = ' '.join('/'.join(style) for style in title_styles)
-            self.parent += self.reporter.severe(
+            self.parent += self.reporter.error(
                 'Inconsistent title style:'
                 f' skip from level {oldlevel} to {newlevel}.',
                 nodes.literal_block('', source),
@@ -356,9 +356,9 @@
             new_parent = parent_sections[newlevel-1].parent
             if new_parent is None:
                 styles = ' '.join('/'.join(style) for style in title_styles)
-                self.parent += self.reporter.severe(
+                self.parent += self.reporter.error(
                     f'Cannot skip from level {oldlevel} to {newlevel}.'
-                    ' Current element has only {len(self.parent_sections)'
+                    ' Current element has only {len(self.parent_sections)}'
                     ' parent sections.'
                     ' (Mismatch of `memo.section_styles`,'
                     ' and the root node of a nested parser?)',
@@ -371,7 +371,7 @@
 
     def title_inconsistent(self, sourcetext, lineno):
         # Ignored. Will be removed in Docutils 2.0.
-        error = self.reporter.severe(
+        error = self.reporter.error(
             'Title level inconsistent:', nodes.literal_block('', sourcetext),
             line=lineno)
         return error
@@ -2432,7 +2432,7 @@
             raise statemachine.TransitionCorrection('text')
         else:
             blocktext = self.state_machine.line
-            msg = self.reporter.severe(
+            msg = self.reporter.error(
                   'Unexpected section title or transition.',
                   nodes.literal_block(blocktext, blocktext),
                   line=self.state_machine.abs_line_number())
@@ -2787,7 +2787,7 @@
             # if the error is in a table (try with test_tables.py)?
             # print("get_source_and_line", srcline)
             # print("abs_line_number", self.state_machine.abs_line_number())
-            msg = self.reporter.severe(
+            msg = self.reporter.error(
                 'Unexpected section title.',
                 nodes.literal_block(blocktext, blocktext),
                 source=src, line=srcline)
@@ -2989,7 +2989,7 @@
             if len(overline.rstrip()) < 4:
                 self.short_overline(context, blocktext, lineno, 2)
             else:
-                msg = self.reporter.severe(
+                msg = self.reporter.error(
                     'Incomplete section title.',
                     nodes.literal_block(blocktext, blocktext),
                     line=lineno)
@@ -3003,7 +3003,7 @@
             if len(overline.rstrip()) < 4:
                 self.short_overline(context, blocktext, lineno, 2)
             else:
-                msg = self.reporter.severe(
+                msg = self.reporter.error(
                     'Missing matching underline for section title overline.',
                     nodes.literal_block(source, source),
                     line=lineno)
@@ -3014,7 +3014,7 @@
             if len(overline.rstrip()) < 4:
                 self.short_overline(context, blocktext, lineno, 2)
             else:
-                msg = self.reporter.severe(
+                msg = self.reporter.error(
                       'Title overline & underline mismatch.',
                       nodes.literal_block(source, source),
                       line=lineno)

Modified: trunk/docutils/test/test_parsers/test_rst/test_section_headers.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_section_headers.py	2025-08-08 18:23:50 UTC (rev 10197)
+++ trunk/docutils/test/test_parsers/test_rst/test_section_headers.py	2025-08-10 12:13:20 UTC (rev 10198)
@@ -104,7 +104,7 @@
     <paragraph>
         Test unexpected section titles.
     <block_quote>
-        <system_message level="4" line="4" source="test data" type="SEVERE">
+        <system_message level="3" line="4" source="test data" type="ERROR">
             <paragraph>
                 Unexpected section title.
             <literal_block xml:space="preserve">
@@ -112,12 +112,12 @@
                 =====
         <paragraph>
             Paragraph.
-        <system_message level="4" line="7" source="test data" type="SEVERE">
+        <system_message level="3" line="7" source="test data" type="ERROR">
             <paragraph>
                 Unexpected section title or transition.
             <literal_block xml:space="preserve">
                 -----
-        <system_message level="4" line="9" source="test data" type="SEVERE">
+        <system_message level="3" line="9" source="test data" type="ERROR">
             <paragraph>
                 Unexpected section title.
             <literal_block xml:space="preserve">
@@ -196,7 +196,7 @@
 """,
 """\
 <document source="test data">
-    <system_message level="4" line="1" source="test data" type="SEVERE">
+    <system_message level="3" line="1" source="test data" type="ERROR">
         <paragraph>
             Incomplete section title.
         <literal_block xml:space="preserve">
@@ -210,7 +210,7 @@
 """,
 """\
 <document source="test data">
-    <system_message level="4" line="1" source="test data" type="SEVERE">
+    <system_message level="3" line="1" source="test data" type="ERROR">
         <paragraph>
             Missing matching underline for section title overline.
         <literal_block xml:space="preserve">
@@ -225,7 +225,7 @@
 """,
 """\
 <document source="test data">
-    <system_message level="4" line="1" source="test data" type="SEVERE">
+    <system_message level="3" line="1" source="test data" type="ERROR">
         <paragraph>
             Missing matching underline for section title overline.
         <literal_block xml:space="preserve">
@@ -265,7 +265,7 @@
 """,
 """\
 <document source="test data">
-    <system_message level="4" line="1" source="test data" type="SEVERE">
+    <system_message level="3" line="1" source="test data" type="ERROR">
         <paragraph>
             Title overline & underline mismatch.
         <literal_block xml:space="preserve">
@@ -495,7 +495,7 @@
             Title 3
         <paragraph>
             Paragraph 3.
-        <system_message level="4" line="15" source="test data" type="SEVERE">
+        <system_message level="3" line="15" source="test data" type="ERROR">
             <paragraph>
                 Inconsistent title style: skip from level 1 to 3.
             <literal_block xml:space="preserve">
@@ -548,7 +548,7 @@
             Title 3
         <paragraph>
             Paragraph 3.
-        <system_message level="4" line="19" source="test data" type="SEVERE">
+        <system_message level="3" line="19" source="test data" type="ERROR">
             <paragraph>
                 Inconsistent title style: skip from level 1 to 3.
             <literal_block xml:space="preserve">

Modified: trunk/docutils/test/test_parsers/test_rst/test_tables.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_tables.py	2025-08-08 18:23:50 UTC (rev 10197)
+++ trunk/docutils/test/test_parsers/test_rst/test_tables.py	2025-08-10 12:13:20 UTC (rev 10198)
@@ -28,6 +28,8 @@
 
 
 class ParserTestCase(unittest.TestCase):
+    maxDiff = None
+
     def test_parser(self):
         parser = Parser()
         settings = get_default_settings(Parser)
@@ -1269,7 +1271,7 @@
                         <paragraph>
                             1
                     <entry>
-                        <system_message level="4" line="19" source="test data" type="SEVERE">
+                        <system_message level="3" line="19" source="test data" type="ERROR">
                             <paragraph>
                                 Unexpected section title.
                             <literal_block xml:space="preserve">
@@ -1276,7 +1278,7 @@
                                 Not a span
                                 -----------
                     <entry>
-                        <system_message level="4" line="19" source="test data" type="SEVERE">
+                        <system_message level="3" line="19" source="test data" type="ERROR">
                             <paragraph>
                                 Unexpected section title.
                             <literal_block xml:space="preserve">

Modified: trunk/docutils/test/test_parsers/test_rst/test_transitions.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_transitions.py	2025-08-08 18:23:50 UTC (rev 10197)
+++ trunk/docutils/test/test_parsers/test_rst/test_transitions.py	2025-08-10 12:13:20 UTC (rev 10198)
@@ -23,6 +23,8 @@
 
 
 class ParserTestCase(unittest.TestCase):
+    maxDiff = None
+
     def test_parser(self):
         parser = Parser()
         settings = get_default_settings(Parser)
@@ -146,7 +148,7 @@
     <block_quote>
         <paragraph>
             Block quote.
-        <system_message level="4" line="5" source="test data" type="SEVERE">
+        <system_message level="3" line="5" source="test data" type="ERROR">
             <paragraph>
                 Unexpected section title or transition.
             <literal_block xml:space="preserve">

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

[Docutils-checkins] SF.net SVN: docutils:[10197] trunk/docutils/docutils/ parsers/rst/states.py

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

Revision: 10197
          http://sourceforge.net/p/docutils/code/10197
Author:   milde
Date:     2025-08-08 18:23:50 +0000 (Fri, 08 Aug 2025)
Log Message:
-----------
Catch invalid node.parent when switching section levels.

Better error report for problems with the new section parsing algorithm.
See [bugs:#] and [bugs:#].

Modified Paths:
--------------
    trunk/docutils/docutils/parsers/rst/states.py

Modified: trunk/docutils/docutils/parsers/rst/states.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/states.py	2025-08-07 06:35:37 UTC (rev 10196)
+++ trunk/docutils/docutils/parsers/rst/states.py	2025-08-08 18:23:50 UTC (rev 10197)
@@ -331,30 +331,42 @@
         title_styles = self.memo.title_styles
         parent_sections = self.parent.section_hierarchy()
         # current section level: (0 document, 1 section, 2 subsection, ...)
-        mylevel = len(parent_sections)
-        # Determine the level of the new section:
+        oldlevel = len(parent_sections)
+        # new section level:
         try:  # check for existing title style
-            level = title_styles.index(style) + 1
+            newlevel = title_styles.index(style) + 1
         except ValueError:  # new title style
             title_styles.append(style)
-            level = len(title_styles)
+            newlevel = len(title_styles)
         # The new level must not be deeper than an immediate child
         # of the current level:
-        if level > mylevel + 1:
-            styles = " ".join("/".join(s for s in style)
-                              for style in title_styles)
+        if newlevel > oldlevel + 1:
+            styles = ' '.join('/'.join(style) for style in title_styles)
             self.parent += self.reporter.severe(
                 'Inconsistent title style:'
-                f' skip from level {mylevel} to {level}.',
+                f' skip from level {oldlevel} to {newlevel}.',
                 nodes.literal_block('', source),
                 nodes.paragraph('', f'Established title styles: {styles}'),
                 line=lineno)
             return False
         # Update parent state:
-        self.memo.section_level = level
-        if level <= mylevel:
+        self.memo.section_level = newlevel
+        if newlevel <= oldlevel:
             # new section is sibling or higher up in the section hierarchy
-            self.parent = parent_sections[level-1].parent
+            new_parent = parent_sections[newlevel-1].parent
+            if new_parent is None:
+                styles = ' '.join('/'.join(style) for style in title_styles)
+                self.parent += self.reporter.severe(
+                    f'Cannot skip from level {oldlevel} to {newlevel}.'
+                    ' Current element has only {len(self.parent_sections)'
+                    ' parent sections.'
+                    ' (Mismatch of `memo.section_styles`,'
+                    ' and the root node of a nested parser?)',
+                    nodes.literal_block('', source),
+                    nodes.paragraph('', f'Established title styles: {styles}'),
+                    line=lineno)
+                return False
+            self.parent = new_parent
         return True
 
     def title_inconsistent(self, sourcetext, lineno):

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

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

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

Revision: 10196
          http://sourceforge.net/p/docutils/code/10196
Author:   milde
Date:     2025-08-07 06:35:37 +0000 (Thu, 07 Aug 2025)
Log Message:
-----------
More consistent and concise command line help.

Document the short option "-e" as deprecated.

Hide "--*-encoding-error-handler" options.
On the command line, it is more convenient to append the error handler to the
matching "--*-encoding" option.

Use "metavar"s for all option arguments.

Fix typos.

Modified Paths:
--------------
    trunk/docutils/HISTORY.rst
    trunk/docutils/RELEASE-NOTES.rst
    trunk/docutils/docs/user/config.rst
    trunk/docutils/docutils/frontend.py
    trunk/docutils/docutils/writers/_html_base.py
    trunk/docutils/docutils/writers/html4css1/__init__.py
    trunk/docutils/docutils/writers/html5_polyglot/__init__.py
    trunk/docutils/docutils/writers/latex2e/__init__.py
    trunk/docutils/docutils/writers/odf_odt/__init__.py
    trunk/docutils/docutils/writers/xetex/__init__.py
    trunk/docutils/test/data/help/docutils.rst
    trunk/docutils/test/data/help/rst2html.rst
    trunk/docutils/test/data/help/rst2latex.rst

Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst	2025-08-06 16:42:09 UTC (rev 10195)
+++ trunk/docutils/HISTORY.rst	2025-08-07 06:35:37 UTC (rev 10196)
@@ -17,9 +17,11 @@
 Release 0.23b0 (unpublished)
 ============================
 
-...
+* docutils/frontend.py, docutils/writers/
 
+  - More consistent and concise command line help.
 
+
 Release 0.22 (2026-07-29)
 =========================
 

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2025-08-06 16:42:09 UTC (rev 10195)
+++ trunk/docutils/RELEASE-NOTES.rst	2025-08-07 06:35:37 UTC (rev 10196)
@@ -199,6 +199,9 @@
   (obsoleted by the `"writer" setting`_ since Docutils 0.18)
   in Docutils 2.0.
 
+* Drop short option ``-e`` in Docutils 2.0.
+  Use the long equivalent ``--error-encoding``.
+
 * Remove the "reader_name", "parser_name", and "writer_name" arguments of
   `core.Publisher.__init__()` and the `core.publish_*()` convenience
   functions as well as the "parser_name" argument of `Reader.__init__()`

Modified: trunk/docutils/docs/user/config.rst
===================================================================
--- trunk/docutils/docs/user/config.rst	2025-08-06 16:42:09 UTC (rev 10195)
+++ trunk/docutils/docs/user/config.rst	2025-08-07 06:35:37 UTC (rev 10196)
@@ -335,7 +335,7 @@
 The text encoding [#encodings]_ for error output.
 
 :Default: The encoding reported by ``sys.stderr``, locale encoding, or "ascii".
-:Options: ``--error-encoding``, ``-e``.
+:Options: ``--error-encoding``, ``-e`` (deprecated).
 
 
 error_encoding_error_handler
@@ -345,8 +345,12 @@
 Acceptable values are the `Error Handlers`_ of Python's "codecs" module.
 See also output_encoding_error_handler_.
 
+The error handler may also be appended to the error_encoding_
+setting, delimited by a colon, e.g. ``--error-encoding=ascii:replace``.
+
 :Default: "backslashreplace"
-:Options: ``--error-encoding-error-handler``, ``--error-encoding``, ``-e``.
+:Options: ``--error-encoding-error-handler``
+          (hidden, intended mainly for programmatic use).
 
 
 exit_status_level
@@ -441,8 +445,9 @@
 The error handler may also be appended to the input_encoding_
 setting, delimited by a colon, e.g. ``--input-encoding=ascii:replace``.
 
-*Default*: "strict".
-*Options*: ``--input-encoding-error-handler``.
+:Default: "strict".
+:Options: ``--input-encoding-error-handler``
+           (hidden, intended mainly for programmatic use).
 
 
 language_code
@@ -504,7 +509,7 @@
      In non-English documents, also auto-generated labels
      may contain non-ASCII characters.
 
-This setting is ignored by the `ODF/ODT Writer`_ which always usues UTF-8.
+This setting is ignored by the `ODF/ODT Writer`_ which always uses UTF-8.
 
 :Default: "utf-8".
 :Option: ``--output-encoding`` (shortcut ``-o`` removed in Docutils 0.22).
@@ -534,8 +539,9 @@
 setting using a colon as delimiter, e.g.
 ``--output-encoding=ascii:xmlcharrefreplace``.
 
-*Default*: "strict".
-*Options*: ``--output-encoding-error-handler``.
+:Default: "strict".
+:Options: ``--output-encoding-error-handler``
+          (hidden, intended mainly for programmatic use).
 
 
 record_dependencies
@@ -1366,7 +1372,7 @@
 
 table_style
 ~~~~~~~~~~~
-Class value(s) added to all tables_.
+Class value(s) assigned to all tables_.
 See also `table_style [latex writers]`_.
 
 The default CSS sylesheets define:

Modified: trunk/docutils/docutils/frontend.py
===================================================================
--- trunk/docutils/docutils/frontend.py	2025-08-06 16:42:09 UTC (rev 10195)
+++ trunk/docutils/docutils/frontend.py	2025-08-07 06:35:37 UTC (rev 10196)
@@ -808,9 +808,7 @@
           ['--input-encoding'],
           {'metavar': '<name[:handler]>', 'default': 'utf-8',
            'validator': validate_encoding_and_error_handler}),
-         ('Specify the error handler for undecodable characters.  '
-          'Choices: "strict" (default), "ignore", and "replace".',
-          ['--input-encoding-error-handler'],
+         (SUPPRESS_HELP, ['--input-encoding-error-handler'],
           {'default': 'strict', 'validator': validate_encoding_error_handler}),
          ('Specify the text encoding and optionally the error handler for '
           'output.  Default: utf-8.',
@@ -817,25 +815,19 @@
           ['--output-encoding'],
           {'metavar': '<name[:handler]>', 'default': 'utf-8',
            'validator': validate_encoding_and_error_handler}),
-         ('Specify error handler for unencodable output characters; '
-          '"strict" (default), "ignore", "replace", '
-          '"xmlcharrefreplace", "backslashreplace".',
-          ['--output-encoding-error-handler'],
+         (SUPPRESS_HELP, ['--output-encoding-error-handler'],
           {'default': 'strict', 'validator': validate_encoding_error_handler}),
-         ('Specify text encoding and optionally error handler '
-          'for error output.  Default: %s.' % default_error_encoding,
+         ('Specify text encoding and optionally the error handler'
+          f' for error output.  Default: {default_error_encoding}.',
           ['--error-encoding', '-e'],
           {'metavar': '<name[:handler]>', 'default': default_error_encoding,
            'validator': validate_encoding_and_error_handler}),
-         ('Specify the error handler for unencodable characters in '
-          'error output.  Default: %s.'
-          % default_error_encoding_error_handler,
-          ['--error-encoding-error-handler'],
+         (SUPPRESS_HELP, ['--error-encoding-error-handler'],
           {'default': default_error_encoding_error_handler,
            'validator': validate_encoding_error_handler}),
          ('Specify the language (as BCP 47 language tag).  Default: en.',
           ['--language', '-l'], {'dest': 'language_code', 'default': 'en',
-                                 'metavar': '<name>'}),
+                                 'metavar': '<tag>'}),
          ('Write output file dependencies to <file>.',
           ['--record-dependencies'],
           {'metavar': '<file>', 'validator': validate_dependency_file,

Modified: trunk/docutils/docutils/writers/_html_base.py
===================================================================
--- trunk/docutils/docutils/writers/_html_base.py	2025-08-06 16:42:09 UTC (rev 10195)
+++ trunk/docutils/docutils/writers/_html_base.py	2025-08-07 06:35:37 UTC (rev 10196)
@@ -115,16 +115,16 @@
          ('Disable compact simple field lists.',
           ['--no-compact-field-lists'],
           {'dest': 'compact_field_lists', 'action': 'store_false'}),
-         ('Added to standard table classes. '
+         ('Class value(s) assigned to all tables. '
           'Defined styles: borderless, booktabs, '
           'align-left, align-center, align-right, '
           'colwidths-auto, colwidths-grid.',
           ['--table-style'],
-          {'default': ''}),
+          {'metavar': '<style>', 'default': ''}),
          ('Math output format (one of "MathML", "HTML", "MathJax", '
           'or "LaTeX") and option(s). (default: "MathML")',
           ['--math-output'],
-          {'default': 'MathML',
+          {'metavar': '<format [option(s)]>', 'default': 'MathML',
            'validator': frontend.validate_math_output}),
          ('Prepend an XML declaration. ',
           ['--xml-declaration'],

Modified: trunk/docutils/docutils/writers/html4css1/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html4css1/__init__.py	2025-08-06 16:42:09 UTC (rev 10195)
+++ trunk/docutils/docutils/writers/html4css1/__init__.py	2025-08-07 06:35:37 UTC (rev 10196)
@@ -74,7 +74,7 @@
             'Math output format (one of "MathML", "HTML", "MathJax", or '
             '"LaTeX") and option(s). (default: "HTML math.css")',
             ['--math-output'],
-            {'default': 'HTML math.css',
+            {'metavar': '<format [option(s)]>', 'default': 'HTML math.css',
              'validator': frontend.validate_math_output}),
         xml_declaration=(
             'Prepend an XML declaration (default). ',

Modified: trunk/docutils/docutils/writers/html5_polyglot/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html5_polyglot/__init__.py	2025-08-06 16:42:09 UTC (rev 10195)
+++ trunk/docutils/docutils/writers/html5_polyglot/__init__.py	2025-08-07 06:35:37 UTC (rev 10196)
@@ -93,7 +93,7 @@
          ('Suggest at which point images should be loaded: '
           '"embed", "link" (default), or "lazy".',
           ['--image-loading'],
-          {'choices': ('embed', 'link', 'lazy'),
+          {'metavar': '<strategy>', 'choices': ('embed', 'link', 'lazy'),
            # 'default': 'link'  # default set in _html_base.py
            }),
          ('Append a self-link to section headings.',

Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py	2025-08-06 16:42:09 UTC (rev 10195)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py	2025-08-07 06:35:37 UTC (rev 10196)
@@ -47,11 +47,11 @@
         None,
         (('Specify LaTeX documentclass.  Default: "article".',
           ['--documentclass'],
-          {'default': 'article', }),
+          {'metavar': '<documentclass>', 'default': 'article'}),
          ('Specify document options.  Multiple options can be given, '
           'separated by commas.  Default: "a4paper".',
           ['--documentoptions'],
-          {'default': 'a4paper', }),
+          {'metavar': '<options>', 'default': 'a4paper'}),
          ('Format for footnote references: one of "superscript" or '
           '"brackets".  Default: "superscript".',
           ['--footnote-references'],
@@ -105,7 +105,7 @@
          ('Customization by LaTeX code in the preamble. '
           'Default: select PDF standard fonts (Times, Helvetica, Courier).',
           ['--latex-preamble'],
-          {'default': default_preamble}),
+          {'metavar': '<preamble>', 'default': default_preamble}),
          ('Specify the template file. Default: "%s".' % default_template,
           ['--template'],
           {'default': default_template, 'metavar': '<file>'}),
@@ -139,9 +139,11 @@
            'validator': frontend.validate_boolean}),
          ('Color of any hyperlinks embedded in text. '
           'Default: "blue" (use "false" to disable).',
-          ['--hyperlink-color'], {'default': 'blue'}),
+          ['--hyperlink-color'],
+          {'metavar': '<color>', 'default': 'blue'}),
          ('Additional options to the "hyperref" package.',
-          ['--hyperref-options'], {'default': ''}),
+          ['--hyperref-options'],
+          {'metavar': '<options>', 'default': ''}),
          ('Enable compound enumerators for nested enumerated lists '
           '(e.g. "1.2.a.ii").',
           ['--compound-enumerators'],
@@ -166,8 +168,8 @@
          ('When possible, use the specified environment for literal-blocks. '
           'Default: "" (fall back to "alltt").',
           ['--literal-block-env'],
-          {'default': ''}),
-         ('Deprecated alias for "--literal-block-env=verbatim".',
+          {'metavar': '<environment>', 'default': ''}),
+         (frontend.SUPPRESS_HELP,  # deprecated legacy option
           ['--use-verbatim-when-possible'],
           {'action': 'store_true',
            'validator': frontend.validate_boolean}),
@@ -181,22 +183,19 @@
            'action': 'append',
            'validator': frontend.validate_comma_separated_list,
            'choices': table_style_values}),
-         ('LaTeX graphicx package option. '
-          'Possible values are "dvipdfmx", "dvips", "dvisvgm", '
-          '"luatex", "pdftex", and "xetex".'
-          'Default: "".',
+         ('LaTeX graphicx package option. Default: "".',
           ['--graphicx-option'],
-          {'default': ''}),
+          {'metavar': '<option>', 'default': ''}),
          ('LaTeX font encoding. '
           'Possible values are "", "T1" (default), "OT1", "LGR,T1" or '
           'any other combination of options to the `fontenc` package. ',
           ['--font-encoding'],
-          {'default': 'T1'}),
+          {'metavar': '<encoding>', 'default': 'T1'}),
          ('Per default the latex-writer puts the reference title into '
-          'hyperreferences. Specify "ref*" or "pageref*" to get the section '
+          'hyperreferences. Specify "ref" or "pageref" to get the section '
           'number or the page number.',
           ['--reference-label'],
-          {'default': ''}),
+          {'metavar': '<command name>', 'default': ''}),
          ('Specify style and database(s) for bibtex, for example '
           '"--use-bibtex=unsrt,mydb1,mydb2". Provisional!',
           ['--use-bibtex'],

Modified: trunk/docutils/docutils/writers/odf_odt/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/odf_odt/__init__.py	2025-08-06 16:42:09 UTC (rev 10195)
+++ trunk/docutils/docutils/writers/odf_odt/__init__.py	2025-08-07 06:35:37 UTC (rev 10196)
@@ -386,10 +386,9 @@
             ('Specify a stylesheet.  '
                 'Default: "%s"' % default_stylesheet_path,
                 ['--stylesheet'],
-                {
-                    'default': default_stylesheet_path,
-                    'dest': 'stylesheet'
-                }),
+                {'default': default_stylesheet_path,
+                    'dest': 'stylesheet',
+                    'metavar': '<filename>'}),
             ('Specify an ODF-specific configuration/mapping file '
                 'relative to the current working directory.',
                 ['--odf-config-file'],

Modified: trunk/docutils/docutils/writers/xetex/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/xetex/__init__.py	2025-08-06 16:42:09 UTC (rev 10195)
+++ trunk/docutils/docutils/writers/xetex/__init__.py	2025-08-07 06:35:37 UTC (rev 10196)
@@ -57,7 +57,8 @@
         latex_preamble=('Customization by LaTeX code in the preamble. '
                         'Default: select "Linux Libertine" fonts.',
                         ['--latex-preamble'],
-                        {'default': default_preamble}),
+                        {'metavar': '<preamble>',
+                         'default': default_preamble}),
         )
 
     def __init__(self) -> None:

Modified: trunk/docutils/test/data/help/docutils.rst
===================================================================
--- trunk/docutils/test/data/help/docutils.rst	2025-08-06 16:42:09 UTC (rev 10195)
+++ trunk/docutils/test/data/help/docutils.rst	2025-08-07 06:35:37 UTC (rev 10196)
@@ -61,23 +61,13 @@
 --input-encoding=<name[:handler]>
                         Specify the encoding and optionally the error handler
                         of input text.  Default: utf-8.
---input-encoding-error-handler=INPUT_ENCODING_ERROR_HANDLER
-                        Specify the error handler for undecodable characters.
-                        Choices: "strict" (default), "ignore", and "replace".
 --output-encoding=<name[:handler]>
                         Specify the text encoding and optionally the error
                         handler for output.  Default: utf-8.
---output-encoding-error-handler=OUTPUT_ENCODING_ERROR_HANDLER
-                        Specify error handler for unencodable output
-                        characters; "strict" (default), "ignore", "replace",
-                        "xmlcharrefreplace", "backslashreplace".
 --error-encoding=<name[:handler]>, -e <name[:handler]>
-                        Specify text encoding and optionally error handler for
-                        error output.  Default: utf-8.
---error-encoding-error-handler=ERROR_ENCODING_ERROR_HANDLER
-                        Specify the error handler for unencodable characters
-                        in error output.  Default: backslashreplace.
---language=<name>, -l <name>
+                        Specify text encoding and optionally the error handler
+                        for error output.  Default: utf-8.
+--language=<tag>, -l <tag>
                         Specify the language (as BCP 47 language tag).
                         Default: en.
 --record-dependencies=<file>
@@ -189,11 +179,10 @@
                         simple field lists. (default)
 --no-compact-field-lists
                         Disable compact simple field lists.
---table-style=TABLE_STYLE
-                        Added to standard table classes. Defined styles:
+--table-style=<style>   Class value(s) assigned to all tables. Defined styles:
                         borderless, booktabs, align-left, align-center, align-
                         right, colwidths-auto, colwidths-grid.
---math-output=MATH_OUTPUT
+--math-output=<format [option(s)]>
                         Math output format (one of "MathML", "HTML",
                         "MathJax", or "LaTeX") and option(s). (default:
                         "MathML")
@@ -206,7 +195,7 @@
 
 HTML5 Writer Options
 --------------------
---image-loading=IMAGE_LOADING
+--image-loading=<strategy>
                         Suggest at which point images should be loaded:
                         "embed", "link" (default), or "lazy".
 --section-self-link     Append a self-link to section headings.

Modified: trunk/docutils/test/data/help/rst2html.rst
===================================================================
--- trunk/docutils/test/data/help/rst2html.rst	2025-08-06 16:42:09 UTC (rev 10195)
+++ trunk/docutils/test/data/help/rst2html.rst	2025-08-07 06:35:37 UTC (rev 10196)
@@ -62,23 +62,13 @@
 --input-encoding=<name[:handler]>
                         Specify the encoding and optionally the error handler
                         of input text.  Default: utf-8.
---input-encoding-error-handler=INPUT_ENCODING_ERROR_HANDLER
-                        Specify the error handler for undecodable characters.
-                        Choices: "strict" (default), "ignore", and "replace".
 --output-encoding=<name[:handler]>
                         Specify the text encoding and optionally the error
                         handler for output.  Default: utf-8.
---output-encoding-error-handler=OUTPUT_ENCODING_ERROR_HANDLER
-                        Specify error handler for unencodable output
-                        characters; "strict" (default), "ignore", "replace",
-                        "xmlcharrefreplace", "backslashreplace".
 --error-encoding=<name[:handler]>, -e <name[:handler]>
-                        Specify text encoding and optionally error handler for
-                        error output.  Default: utf-8.
---error-encoding-error-handler=ERROR_ENCODING_ERROR_HANDLER
-                        Specify the error handler for unencodable characters
-                        in error output.  Default: backslashreplace.
---language=<name>, -l <name>
+                        Specify text encoding and optionally the error handler
+                        for error output.  Default: utf-8.
+--language=<tag>, -l <tag>
                         Specify the language (as BCP 47 language tag).
                         Default: en.
 --record-dependencies=<file>
@@ -190,11 +180,10 @@
                         simple field lists. (default)
 --no-compact-field-lists
                         Disable compact simple field lists.
---table-style=TABLE_STYLE
-                        Added to standard table classes. Defined styles:
+--table-style=<style>   Class value(s) assigned to all tables. Defined styles:
                         borderless, booktabs, align-left, align-center, align-
                         right, colwidths-auto, colwidths-grid.
---math-output=MATH_OUTPUT
+--math-output=<format [option(s)]>
                         Math output format (one of "MathML", "HTML",
                         "MathJax", or "LaTeX") and option(s). (default: "HTML
                         math.css")

Modified: trunk/docutils/test/data/help/rst2latex.rst
===================================================================
--- trunk/docutils/test/data/help/rst2latex.rst	2025-08-06 16:42:09 UTC (rev 10195)
+++ trunk/docutils/test/data/help/rst2latex.rst	2025-08-07 06:35:37 UTC (rev 10196)
@@ -62,23 +62,13 @@
 --input-encoding=<name[:handler]>
                         Specify the encoding and optionally the error handler
                         of input text.  Default: utf-8.
---input-encoding-error-handler=INPUT_ENCODING_ERROR_HANDLER
-                        Specify the error handler for undecodable characters.
-                        Choices: "strict" (default), "ignore", and "replace".
 --output-encoding=<name[:handler]>
                         Specify the text encoding and optionally the error
                         handler for output.  Default: utf-8.
---output-encoding-error-handler=OUTPUT_ENCODING_ERROR_HANDLER
-                        Specify error handler for unencodable output
-                        characters; "strict" (default), "ignore", "replace",
-                        "xmlcharrefreplace", "backslashreplace".
 --error-encoding=<name[:handler]>, -e <name[:handler]>
-                        Specify text encoding and optionally error handler for
-                        error output.  Default: utf-8.
---error-encoding-error-handler=ERROR_ENCODING_ERROR_HANDLER
-                        Specify the error handler for unencodable characters
-                        in error output.  Default: backslashreplace.
---language=<name>, -l <name>
+                        Specify text encoding and optionally the error handler
+                        for error output.  Default: utf-8.
+--language=<tag>, -l <tag>
                         Specify the language (as BCP 47 language tag).
                         Default: en.
 --record-dependencies=<file>
@@ -155,9 +145,9 @@
 
 LaTeX-Specific Options
 ----------------------
---documentclass=DOCUMENTCLASS
+--documentclass=<documentclass>
                         Specify LaTeX documentclass.  Default: "article".
---documentoptions=DOCUMENTOPTIONS
+--documentoptions=<options>
                         Specify document options.  Multiple options can be
                         given, separated by commas.  Default: "a4paper".
 --footnote-references=<format>
@@ -188,7 +178,7 @@
                         Comma-separated list of directories where stylesheets
                         are found. Used by --stylesheet-path when expanding
                         relative path arguments. Default: ".".
---latex-preamble=LATEX_PREAMBLE
+--latex-preamble=<preamble>
                         Customization by LaTeX code in the preamble. Default:
                         select PDF standard fonts (Times, Helvetica, Courier).
 --template=<file>       Specify the template file. Default: "default.tex".
@@ -201,10 +191,10 @@
 --topic-abstract        Typeset abstract as topic. (default)
 --use-latex-abstract    Use LaTeX abstract environment for the document's
                         abstract.
---hyperlink-color=HYPERLINK_COLOR
+--hyperlink-color=<color>
                         Color of any hyperlinks embedded in text. Default:
                         "blue" (use "false" to disable).
---hyperref-options=HYPERREF_OPTIONS
+--hyperref-options=<options>
                         Additional options to the "hyperref" package.
 --compound-enumerators  Enable compound enumerators for nested enumerated
                         lists (e.g. "1.2.a.ii").
@@ -222,26 +212,22 @@
                         Set the separator between section number and
                         enumerator for compound enumerated lists.  Default:
                         "-".
---literal-block-env=LITERAL_BLOCK_ENV
+--literal-block-env=<environment>
                         When possible, use the specified environment for
                         literal-blocks. Default: "" (fall back to "alltt").
---use-verbatim-when-possible
-                        Deprecated alias for "--literal-block-env=verbatim".
 --table-style=<format>  Table style. "standard" with horizontal and vertical
                         lines, "booktabs" (LaTeX booktabs style) only
                         horizontal lines above and below the table and below
                         the header, or "borderless". Default: "standard"
---graphicx-option=GRAPHICX_OPTION
-                        LaTeX graphicx package option. Possible values are
-                        "dvipdfmx", "dvips", "dvisvgm", "luatex", "pdftex",
-                        and "xetex".Default: "".
---font-encoding=FONT_ENCODING
+--graphicx-option=<option>
+                        LaTeX graphicx package option. Default: "".
+--font-encoding=<encoding>
                         LaTeX font encoding. Possible values are "", "T1"
                         (default), "OT1", "LGR,T1" or any other combination of
                         options to the `fontenc` package.
---reference-label=REFERENCE_LABEL
+--reference-label=<command name>
                         Per default the latex-writer puts the reference title
-                        into hyperreferences. Specify "ref*" or "pageref*" to
+                        into hyperreferences. Specify "ref" or "pageref" to
                         get the section number or the page number.
 --use-bibtex=<style,bibfile[,bibfile,...]>
                         Specify style and database(s) for bibtex, for example

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

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

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

Revision: 10195
          http://sourceforge.net/p/docutils/code/10195
Author:   milde
Date:     2025-08-06 16:42:09 +0000 (Wed, 06 Aug 2025)
Log Message:
-----------
Test behaviour and fix documentation of rST footnotes.

All numbered footnotes are assigned a *reference name* with the same
priority as *explicit hyperlink targets*.

The sample document "footnote-targets.rst" was used to check the actual
behaviour. It is currently not used in the test suite.

Modified Paths:
--------------
    trunk/docutils/docs/ref/doctree.rst
    trunk/docutils/docs/ref/rst/restructuredtext.rst

Added Paths:
-----------
    trunk/docutils/test/functional/input/data/footnote-targets.rst

Modified: trunk/docutils/docs/ref/doctree.rst
===================================================================
--- trunk/docutils/docs/ref/doctree.rst	2025-08-01 10:58:54 UTC (rev 10194)
+++ trunk/docutils/docs/ref/doctree.rst	2025-08-06 16:42:09 UTC (rev 10195)
@@ -4718,16 +4718,22 @@
 names`_ of an element (spaces inside a name are backslash-escaped).
 It is one of the `common attributes`_, shared by all Docutils elements.
 
-Each name in the list must be unique; if there are name conflicts (two or
-more elements want to use the same name), the contents will be transferred
-to the `dupnames`_ attribute on the duplicate elements. [#]_
+.. _reference name removal:
 
-.. [#] An element may have both ``names`` and ``dupnames`` attributes,
-   if the ``dupnames`` are from conflicting `implicit hyperlink targets`_
-   and the ``names`` from `explicit hyperlink targets`_ or a directive's
-   `name option`_.
+Each reference name must be unique in its namespace_;
+if there are name conflicts (two or more elements want to use the same
+name), the affected name will be transferred to the `dupnames`_ attribute on
+the duplicate element(s). The element can no longer be used as hyperlink
+target. [#]_
 
+An element may have both ``names`` and ``dupnames`` attributes,
+if the ``dupnames`` are from conflicting `implicit hyperlink targets`_
+and the ``names`` from `explicit hyperlink targets`_ or a directive's
+`name option`_.
 
+.. [#] See `Implicit Hyperlink Targets`_ for details of conflict resolution.
+
+
 ``namest``
 ==========
 
@@ -5581,11 +5587,15 @@
 
   Reference names may consist of any text.
   Whitespace is normalized. [#whitespace-normalization]_
-  Hyperlinks_, footnotes_, and citations_ all share the same namespace
-  for reference names. Comparison ignores case.
-  Substitutions_ use a distinct namespace.  Comparison is case-sensitive
-  but forgiving.
 
+  .. _namespace:
+
+  Almost all elements in a document share a common *namespace*
+  for reference names, comparison ignores case.
+  Only `\<substitution_definition>`_ and `\<substitution_reference>`_
+  elements use a distinct namespace with `case-sensitive but forgiving`_
+  matching of reference names.
+
   In reStructuredText, `reference names <rST reference names_>`__
   originate from `internal hyperlink targets`_, a directive's `name
   option`_, or the element's title or content and are used for internal
@@ -5718,6 +5728,8 @@
 .. _"authors" field:        rst/restructuredtext.html#authors
 .. _block quote:            rst/restructuredtext.html#block-quotes
 .. _bullet list:            rst/restructuredtext.html#bullet-lists
+.. _case-sensitive but forgiving: rst/restructuredtext.html
+                                  #case-sensitive-but-forgiving
 .. _CSS3 length units:      rst/restructuredtext.html#length-units
 .. _citations:              rst/restructuredtext.html#citations
 .. _citation references:    rst/restructuredtext.html#citation-references

Modified: trunk/docutils/docs/ref/rst/restructuredtext.rst
===================================================================
--- trunk/docutils/docs/ref/rst/restructuredtext.rst	2025-08-01 10:58:54 UTC (rev 10194)
+++ trunk/docutils/docs/ref/rst/restructuredtext.rst	2025-08-06 16:42:09 UTC (rev 10195)
@@ -430,8 +430,9 @@
 
 .. _normalized reference names:
 
-Reference names are whitespace-neutral and case-insensitive. [#case-forgiving]_
-When resolving reference names internally:
+Reference names are whitespace-neutral and
+case-insensitive [#substitution-text]_:
+When resolving reference names internally,
 
 - whitespace is normalized (one or more spaces, horizontal or vertical
   tabs, newlines, carriage returns, or form feeds, are interpreted as
@@ -438,7 +439,7 @@
   a single space), and
 
 - case is normalized (all alphabetic characters are converted to
-  lowercase). [#case-forgiving]_
+  lowercase). [#substitution-text]_
 
 For example, the following `hyperlink references`_ are equivalent::
 
@@ -448,23 +449,21 @@
       Hyperlink`_
 
 Hyperlinks_, footnotes_, and citations_ all share the same namespace
-for reference names.  The labels of citations (simple reference names)
-and manually-numbered footnotes (numbers) are entered into the same
-database as other hyperlink names.  This means that a footnote_
-(defined as "``.. [#note]``") which can be referred to by a footnote
-reference (``[#note]_``), can also be referred to by a plain hyperlink
-reference (``note_``).  Of course, each type of reference (hyperlink,
+for reference names. [#substitution-text]_
+This means that a footnote defined as "``.. [#note]``" can be referred to
+by the `footnote reference`_ ``[#note]_`` as well as a plain `hyperlink
+reference`_ ``note_``. Of course, each type of reference (hyperlink,
 footnote, citation) may be processed and rendered differently.  Some
 care should be taken to avoid reference name conflicts. [#]_
-References to `substitution definitions`_ (`substitution references`_)
-use a different namespace.
 
-.. [#case-forgiving] Matching `substitution references`_ to
-   `substitution definitions`_ is `case-sensitive but forgiving`_.
-.. [#] Docutils' rules for handling duplicate names are described in
-   section `Implicit Hyperlink Targets`_.
+.. [#substitution-text]
+   `Substitution references`_ and `substitution definitions`_
+   use a different namespace. Matching is `case-sensitive but forgiving`_.
 
+.. [#] Docutils' rules for handling duplicate reference names are described
+   in section `Implicit Hyperlink Targets`_.
 
+
 Document Structure
 ==================
 
@@ -1695,7 +1694,7 @@
 .. _footnote:
 
 Footnotes
-`````````
+---------
 
 :Doctree elements: `\<footnote>`_, `\<label>`_
 :Config settings:  footnote_references_
@@ -1703,15 +1702,15 @@
 
 Each footnote consists of an explicit markup start (:literal:`.. \ `),
 a left square bracket, the footnote label, a right square bracket, and
-whitespace, followed by indented body elements.  A footnote label can
-be:
+whitespace, followed by indented body elements.
+A _`footnote label` can be:
 
-- an integer consisting of one or more digits,
+- a decimal integer (manually `numbered footnotes`_),
 
 - a single ``#`` (denoting `auto-numbered footnotes`_),
 
-- a ``#`` followed by a `simple reference name`_ (an `autonumber label`_),
-  or
+- a ``#`` followed by a simple `reference name`_
+  (auto-numbered footnotes with `autonumber label`_), or
 
 - a single ``*`` (denoting `auto-symbol footnotes`_).
 
@@ -1723,17 +1722,13 @@
 line after the footnote label.  Otherwise, the difference in
 indentation will not be detected.
 
-Footnotes may occur anywhere in the document, not only at the end.
-Where and how they appear in the processed output depends on the
-processing system.
-
 Here is a manually numbered footnote::
 
     .. [1] Body elements go here.
 
-Each footnote automatically generates a `hyperlink target`_ pointing
-to itself (auto-numbered and auto-symbol footnotes generate `implicit
-hyperlink targets`_).  The target name is is the footnote label.
+Footnotes may occur anywhere in the document, not only at the end.
+Where and how they appear in the processed output depends on the
+processing system.
 
 Syntax diagram::
 
@@ -1744,6 +1739,17 @@
             +-------------------------+
 
 
+Numbered Footnotes
+``````````````````
+
+`Numbered footnotes` use decimal numbers as label. The number may
+be specified in the source or automatically assigned.
+Numbered footnotes are assigned a `reference name`_;
+they can be referred to more than once, with a `footnote reference`_
+or `hyperlink reference`_::
+
+    The footnote above can be referred to with 1_ or [1]_.
+
 Auto-Numbered Footnotes
 .......................
 
@@ -1753,36 +1759,29 @@
 
 The first footnote to request automatic numbering is assigned the
 label "1", the second is assigned the label "2", and so on (assuming
-there are no manually numbered footnotes present; see `Mixed Manual
-and Auto-Numbered Footnotes`_ below).  A footnote which has
-automatically received a label "1" generates an `implicit hyperlink
-target`_ with name "1".
+there is no conflict with another reference name; see also
+`Mixed Manual and Auto-Numbered Footnotes`_ below).
+If the footnote label is a single ``#``, the assigned number is also used
+as reference name.
 
 .. _autonumber label:
 
-A footnote may specify a label explicitly while at the same time
-requesting automatic numbering: ``[#label]``.  These labels are called
-_`autonumber labels`.  Autonumber labels do two things:
+A custom reference name can be specified appending a `simple reference
+name`_ to the number sign to form an *autonumber label*.
+For example::
 
-- On the footnote itself, they generate a hyperlink target whose name
-  is the autonumber label (doesn't include the ``#``).
-
-- They allow an automatically numbered footnote to be referred to more
-  than once, as a footnote reference or hyperlink reference.  For
-  example::
-
       If [#note]_ is the first footnote reference, it will
       show up as "[1]".  We can refer to it again as [#note]_
       and again see "[1]".  We can also refer to it as note_
       (an ordinary internal hyperlink reference).
 
-      .. [#note] This is the footnote labeled "note".
+      .. [#note] This is the footnote with reference name "note".
 
 The numbering is determined by the order of the footnotes, not by the
-order of the references.  For footnote references without autonumber
-labels (``[#]_``), the footnotes and footnote references must be in
-the same relative order but need not alternate in lock-step.  For
-example::
+order of the references.
+Auto-numbered footnotes and footnote references without autonumber label
+must be in the same relative order but need not alternate in lock-step.
+For example::
 
     [#]_ is a reference to footnote 1,
     and [#]_ is a reference to footnote 2.
@@ -1800,12 +1799,36 @@
 same as the order in which a person would read them.
 
 
+Mixed Manual and Auto-Numbered Footnotes
+........................................
+
+Manual and automatic footnote numbering may both be used within a
+single document, although the results may not be expected.  Manual
+numbering takes priority.  Only unused footnote numbers are assigned
+to auto-numbered footnotes.  The following example should be
+illustrative::
+
+    [2]_ will be "2" (manually numbered),
+    [#]_ will be "3" (anonymous auto-numbered), and
+    [#label]_ will be "1" (labeled auto-numbered).
+
+    .. [2] This footnote is labeled manually, so its number is fixed.
+
+    .. [#label] This autonumber-labeled footnote will be labeled "1".
+       It is the first auto-numbered footnote and no other footnote
+       with label "1" exists.  The order of the footnotes is used to
+       determine numbering, not the order of the footnote references.
+
+    .. [#] This footnote will be labeled "3".  It is the second
+       auto-numbered footnote, but footnote label "2" is already used.
+
+
 Auto-Symbol Footnotes
-.....................
+`````````````````````
 
-An asterisk (``*``) may be used for footnote labels to request automatic
+An asterisk (``*``) may be used as footnote label to request automatic
 symbol generation for footnotes and footnote references.  The asterisk
-may be the only character in the label.  For example::
+must be the only character in the label.  For example::
 
     Here is a symbolic footnote reference: [*]_.
 
@@ -1847,37 +1870,13 @@
    "xmlcharrefreplace" `output encoding error handler`_.
 
 
-Mixed Manual and Auto-Numbered Footnotes
-........................................
-
-Manual and automatic footnote numbering may both be used within a
-single document, although the results may not be expected.  Manual
-numbering takes priority.  Only unused footnote numbers are assigned
-to auto-numbered footnotes.  The following example should be
-illustrative::
-
-    [2]_ will be "2" (manually numbered),
-    [#]_ will be "3" (anonymous auto-numbered), and
-    [#label]_ will be "1" (labeled auto-numbered).
-
-    .. [2] This footnote is labeled manually, so its number is fixed.
-
-    .. [#label] This autonumber-labeled footnote will be labeled "1".
-       It is the first auto-numbered footnote and no other footnote
-       with label "1" exists.  The order of the footnotes is used to
-       determine numbering, not the order of the footnote references.
-
-    .. [#] This footnote will be labeled "3".  It is the second
-       auto-numbered footnote, but footnote label "2" is already used.
-
-
 Citations
-`````````
+---------
 
 :Doctree element: `\<citation>`_
 :See also:        `citation references`_
 
-Citations are identical to footnotes_ except that they use only
+Citations are identical to manually numbered footnotes_ except that they use
 non-numeric labels such as ``[note]`` or ``[GVR2001]``.  Citation
 labels are simple `reference names`_ (case-insensitive single words
 consisting of alphanumerics plus internal hyphens, underscores, and
@@ -1894,7 +1893,7 @@
 .. _hyperlink target:
 
 Hyperlink Targets
-`````````````````
+-----------------
 
 :Doctree element: `\<target>`_
 :See also:        | `hyperlink references`_
@@ -1909,7 +1908,7 @@
 
 Hyperlink targets may be named or anonymous.  *Named hyperlink targets*
 consist of an explicit markup start (:literal:`.. \ `), an underscore,
-the reference name (no trailing underscore), a colon, whitespace, and
+the `reference name`_ (no trailing underscore), a colon, whitespace, and
 a link block::
 
     .. _hyperlink-name: link-block
@@ -2089,15 +2088,15 @@
 .. _anonymous:
 
 Anonymous Hyperlinks
-....................
+````````````````````
 
 The `World Wide Web Consortium`_ recommends in its `HTML Techniques
 for Web Content Accessibility Guidelines`_ that authors should
 "clearly identify the target of each link."  Hyperlink references
 should be as verbose as possible, but duplicating a verbose hyperlink
-name in the target is onerous and error-prone.  Anonymous hyperlinks
+name in the target is onerous and error-prone.  *Anonymous hyperlinks*
 are designed to allow convenient verbose hyperlink references, and are
-analogous to `Auto-Numbered Footnotes`_.  They are particularly useful
+analogous to `auto-numbered footnotes`_.  They are particularly useful
 in short or one-off documents.  However, this feature is easily abused
 and can result in unreadable plaintext and/or unmaintainable
 documents.  Caution is advised.
@@ -2107,8 +2106,8 @@
 
     See `the web site of my favorite programming language`__.
 
-Anonymous targets begin with ``.. __:``, no reference name is required
-or allowed::
+Anonymous `hyperlink targets`_ begin with ``.. __:``, no reference name
+is required or allowed::
 
     .. __: https://www.python.org
 
@@ -2117,12 +2116,15 @@
 
     __ https://www.python.org
 
-The reference name of the reference is not used to match the reference
-to its target.  Instead, the order of anonymous hyperlink references
+.. _anonymous matching:
+
+The order of anonymous hyperlink references
 and targets within the document is significant: the first anonymous
 reference will link to the first anonymous target.  The number of
 anonymous hyperlink references in a document must match the number of
-anonymous targets.  For readability, it is recommended that targets be
+anonymous targets.
+
+For readability, it is recommended that targets be
 kept close to references.  Take care when editing text containing
 anonymous references; adding, removing, and rearranging references
 require attention to the order of corresponding targets.
@@ -2129,7 +2131,7 @@
 
 
 Directives
-``````````
+----------
 
 :Doctree elements: depend on the directive
 
@@ -2234,7 +2236,7 @@
 
 
 Substitution Definitions
-````````````````````````
+------------------------
 
 :Doctree element: `\<substitution_definition>`_
 :See also:        `substitution references`_
@@ -2394,7 +2396,7 @@
 
 
 Comments
-````````
+--------
 
 :Doctree element: `\<comment>`_
 :Config setting:  strip_comments_
@@ -2436,7 +2438,7 @@
             +----------------------+
 
 Empty Comments
-..............
+``````````````
 
 An explicit markup start followed by a blank line and nothing else
 (apart from whitespace) is an "_`empty comment`".  It serves to
@@ -2457,35 +2459,41 @@
 Implicit Hyperlink Targets
 ==========================
 
-:Doctree element: `\<target>`_
+:Doctree elements: `\<section>`_, `\<target>`_
 
-Implicit hyperlink targets are generated by `section titles`_,
-auto-numbered footnotes_, and hyperlink references with `embedded URIs
-and aliases`_. They may also be generated by extension constructs.
+Implicit hyperlink targets are generated by `section titles`_
+and named hyperlink references with `embedded URIs and aliases`_.
+They may also be generated by extension constructs.
 Implicit hyperlink targets behave identically to `explicit hyperlink
 targets`_ except in case of duplicate reference names.
 
-Ambiguity due to different targets with the same reference name is
+.. _name conflicts:
+
+Ambiguity due to different objects with the same `reference name`_ is
 avoided by the following procedure:
 
 #. Duplicate external__ or indirect__ hyperlink targets that refer to
    the same URI or hyperlink reference do not conflict.  One target
-   is removed and an INFO [#level]_ system message inserted.
+   is invalidated_ and an INFO [#level]_ system message inserted.
 
    __ `external hyperlink targets`_
    __ `indirect hyperlink targets`_
 
-#. `Explicit hyperlink targets`_ override any implicit targets having
-   the same reference name.  The implicit hyperlink target is removed,
+#. `Explicit hyperlink targets`_, citations_, `numbered footnotes`_,
+   and directives_ with `"name" option`_
+   override any implicit targets having the same reference name.
+   The implicit hyperlink target is invalidated_,
    and an INFO [#level]_ system message inserted.
 
-#. Duplicate implicit hyperlink targets are removed, and INFO [#level]_
-   system messages inserted.  For example, if two or more sections
+#. Duplicate implicit hyperlink targets are both invalidated_,
+   and INFO [#level]_ system messages inserted.
+   For example, if two or more sections
    have the same title (such as "Introduction" subsections of a
    rigidly-structured document), there will be duplicate implicit
    hyperlink targets.
 
-#. Duplicate explicit hyperlink targets are removed, and WARNING [#level]_
+#. Duplicate `explicit hyperlink targets`_ (or other objects with
+   the same reference name) are both invalidated_, and WARNING [#level]_
    system messages inserted.
 
 The parser returns a set of *unique* hyperlink targets.  The calling
@@ -2826,6 +2834,8 @@
     floating-point numbers (without exponents).
 
 
+.. _hyperlink reference:
+
 Hyperlink References
 --------------------
 
@@ -2857,21 +2867,28 @@
 arrow.  The trailing underscores point away from hyperlink references,
 and the leading underscores point toward `hyperlink targets`_.
 
-_`Hyperlinks` consist of two parts:
+.. _hyperlinks:
 
-1. In the text body, there is a source link, a reference name with a
+*Hyperlinks* consist of two parts:
+
+1. In the text body, there is a *reference*, a `reference name`_ with a
    trailing underscore (or two underscores for `anonymous hyperlinks`_)::
 
        See the Python_ home page for info.
 
-2. A matching target link must exist in the document. It may be embedded
-   (see below) or exist somewhere else in the document (see `Hyperlink
-   Targets`_).
+2. A matching *target* must exist in the document.
+   It may be embedded (see below) or exist somewhere else in the document
+   (`explicit hyperlink targets`_, `implicit hyperlink targets`_,
+   `inline internal targets`_, directives_ with `"name" option`_,
+   citations_, or `numbered footnotes`_).
 
-`Anonymous hyperlinks`_ do not use reference names to match references
-to targets, but otherwise behave similarly to named hyperlinks.
+*Named* hyperlinks match reference and target by their `reference names`_.
+*Anonymous* hyperlinks match references to targets by their
+`order within the document`__.
 
+__ `anonymous matching`_
 
+
 Embedded URIs and Aliases
 `````````````````````````
 
@@ -2978,6 +2995,8 @@
 reference names.
 
 
+.. _footnote reference:
+
 Footnote References
 -------------------
 
@@ -2989,19 +3008,8 @@
                    trim_footnote_reference_space_
 :See also:         footnotes_
 
-
-Each footnote reference consists of a square-bracketed label followed
-by a trailing underscore.  Footnote labels are one of:
-
-- one or more digits (i.e., a number),
-
-- a single ``#`` (denoting `auto-numbered footnotes`_),
-
-- a ``#`` followed by a simple `reference name`_ (an `autonumber label`_),
-  or
-
-- a single ``*`` (denoting `auto-symbol footnotes`_).
-
+A *footnote reference* consists of a square-bracketed
+`footnote label`_ followed by a trailing underscore.
 For example::
 
     Please RTFM [1]_.
@@ -3040,7 +3048,7 @@
 :See also: `substitution definitions`_
 
 Vertical bars are used to bracket the substitution reference text.  A
-substitution reference may also be a hyperlink reference by appending
+substitution reference may also be a `hyperlink reference`_ by appending
 a ``_`` (named) or ``__`` (anonymous_) suffix; the substitution text is
 used for the reference text in the named case.
 
@@ -3230,6 +3238,7 @@
 .. _"list-table": directives.html#list-table
 .. _"math": directives.html#math
 .. _"meta": directives.html#metadata
+.. _"name" option: directives.html#name
 .. _"raw": directives.html#raw
 .. _"replace": directives.html#replace
 .. _"role" directive: directives.html#custom-interpreted-text-roles
@@ -3314,6 +3323,7 @@
 .. _`<version>`: ../doctree.html#version
 .. _"classes" attribute:  ../doctree.html#classes
 .. _identifier key: ../doctree.html#identifiers
+.. _invalidated: ../doctree.html#reference-name-removal
 .. _`measure`: ../doctree.html#measure
 .. _metadata title: ../doctree.html#title-attribute
 

Added: trunk/docutils/test/functional/input/data/footnote-targets.rst
===================================================================
--- trunk/docutils/test/functional/input/data/footnote-targets.rst	                        (rev 0)
+++ trunk/docutils/test/functional/input/data/footnote-targets.rst	2025-08-06 16:42:09 UTC (rev 10195)
@@ -0,0 +1,60 @@
+.. [4] manually numbered
+.. [#exi] autonumber-label
+.. [#] auto-numbered (skipping 2)
+.. [#] autonumber label (skipping 4_ and 5_)
+.. [*] auto-symbol
+.. [*] second auto-symbol
+
+Numbered footnotes [#exi]_ [#]_ [5]_ may be referenced more than once
+and also via hyperlink references:
+
+.. class:: run-in
+
+manually numbered [4]_
+  reference name is the specified number: 4_,
+
+auto-number [3]_
+  reference name is the auto-assigned number: 3_
+  (caution: the assigned number may change if another auto-numbered
+  footnote is added or removed),
+
+autonumber label [#exi]_
+  refname is the label (without #) *not* the number: exi_
+  (both ``1_`` and ``[1]_`` fail).
+
+
+Auto-symbol footnotes [*]_ [*]_ can only be referenced once and only
+with a footnote-reference.
+
+The markup characters for auto-labeled footnotes _`*` and _`#` and
+the symbols selected by auto-symbol footnotes _`†` don't become
+reference names and can be used in other hyperref targets allowing
+links to `*`_, `#`_ and `†`_.
+
+
+4
+=======
+
+An implicit target with conflicting refname (like this section) is
+overwritten by manually numbered footnotes [4]_ and footnotes with
+autonumber-label [#exi]_. An INFO is generated.
+Hyperlink references to 4_ and exi_ point to the footnotes, not the
+sections.
+
+exi
+---
+
+Explicit targets conflicting with manually numbered footnotes (``_`4```)
+or footnotes with autonumber-label (``_`exi```) .
+
+5
+=======
+
+Both, explicit and implicit targets with conflicting refname (e.g. _`2` and
+this section title) cause a gap in footnote numbering.
+
+The refname can still be used in a footnote reference [2]_: it refers to
+the target whatever it is. [5]_
+
+TODO:
+  Emit a warning if a footnote referenc references something else?

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

[Docutils-checkins] SF.net SVN: docutils:[10194] trunk/docutils/docutils/ transforms/references.py

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

Revision: 10194
          http://sourceforge.net/p/docutils/code/10194
Author:   milde
Date:     2025-08-01 10:58:54 +0000 (Fri, 01 Aug 2025)
Log Message:
-----------
Fix plural case of an error message.

Don't add the plural "s" if there is only one footnote.

Modified Paths:
--------------
    trunk/docutils/docutils/transforms/references.py

Modified: trunk/docutils/docutils/transforms/references.py
===================================================================
--- trunk/docutils/docutils/transforms/references.py	2025-07-31 14:18:24 UTC (rev 10193)
+++ trunk/docutils/docutils/transforms/references.py	2025-08-01 10:58:54 UTC (rev 10194)
@@ -542,10 +542,12 @@
             try:
                 label = self.autofootnote_labels[i]
             except IndexError:
+                n = len(self.autofootnote_labels)
+                s = 's' if n > 1 else ''
                 msg = self.document.reporter.error(
-                      'Too many autonumbered footnote references: only %s '
-                      'corresponding footnotes available.'
-                      % len(self.autofootnote_labels), base_node=ref)
+                          'Too many autonumbered footnote references: '
+                          f'only {n} corresponding footnote{s} available.',
+                          base_node=ref)
                 msgid = self.document.set_id(msg)
                 for ref in self.document.autofootnote_refs[i:]:
                     if ref.resolved or ref.hasattr('refname'):

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

[Docutils-checkins] SF.net SVN: docutils:[10193] trunk/docutils/docs/user /rst/cheatsheet.rst

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

Revision: 10193
          http://sourceforge.net/p/docutils/code/10193
Author:   milde
Date:     2025-07-31 14:18:24 +0000 (Thu, 31 Jul 2025)
Log Message:
-----------
Update reStructuredText Cheat Sheet.

Remove "new in 0.3.x" markers (this was before 2006).

Add "code" role and directive and "math" role.

Sort directives as in "directives.rst".
TODO: rather sort alphabetically?

Modified Paths:
--------------
    trunk/docutils/docs/user/rst/cheatsheet.rst

Modified: trunk/docutils/docs/user/rst/cheatsheet.rst
===================================================================
--- trunk/docutils/docs/user/rst/cheatsheet.rst	2025-07-30 08:22:51 UTC (rev 10192)
+++ trunk/docutils/docs/user/rst/cheatsheet.rst	2025-07-31 14:18:24 UTC (rev 10193)
@@ -27,7 +27,7 @@
 | >>> print 'Doctest block'      |                                   |
 | Doctest block                  | > Quoted                          |
 +--------------------------------+-----------------------------------+
-| | Line blocks preserve line breaks & indents. [new in 0.3.6]       |
+| | Line blocks preserve line breaks & indents.                      |
 | |     Useful for addresses, verse, and adornment-free lists; long  |
 |       lines can be wrapped with continuation lines.                |
 +--------------------------------------------------------------------+
@@ -70,7 +70,7 @@
 https://docutils.sourceforge.io; named reference, reStructuredText_;
 `anonymous reference`__; footnote reference, [1]_; citation reference,
 [CIT2002]_; |substitution|; _`inline internal target`.
-
+
 Directive Quick Reference
 =========================
 See <https://docutils.sourceforge.io/docs/ref/rst/directives.html> for full info.
@@ -86,30 +86,31 @@
 topic             ``.. topic:: Title``; like a mini section
 sidebar           ``.. sidebar:: Title``; like a mini parallel document
 parsed-literal    A literal block with parsed inline markup
+code              Literal block for code with optional syntax highlighting
+math              Mathematical notation (input in LaTeX format)
 rubric            ``.. rubric:: Informal Heading``
 epigraph          Block quote with class="epigraph"
 highlights        Block quote with class="highlights"
 pull-quote        Block quote with class="pull-quote"
-compound          Compound paragraphs [0.3.6]
-container         Generic block-level container element [0.3.10]
-table             Create a titled table [0.3.1]
-list-table        Create a table from a uniform two-level bullet list [0.3.8]
-csv-table         Create a table from CSV data [0.3.4]
+compound          Compound paragraphs
+container         Generic block-level container element
+table             Create a titled table
+list-table        Create a table from a uniform two-level bullet list
+csv-table         Create a table from CSV data
 contents          Generate a table of contents
 sectnum           Automatically number sections, subsections, etc.
-header, footer    Create document decorations [0.3.8]
+header, footer    Create document decorations
 target-notes      Create an explicit footnote for each external target
-math              Mathematical notation (input in LaTeX format)
-meta              Document metadata
-include           Read an external reST file as if it were inline
-raw               Non-reST data passed untouched to the Writer
 replace           Replacement text for substitution definitions
 unicode           Unicode character code conversion for substitution defs
 date              Generates today's date; for substitution defs
+include           Read an external reST file as if it were inline
+raw               Non-reST data passed untouched to the Writer
 class             Set a "class" attribute on the next element
-role              Create a custom interpreted text role [0.3.2]
-default-role      Set the default interpreted text role [0.3.10]
-title             Set the metadata document title [0.3.10]
+role              Create a custom interpreted text role
+default-role      Set the default interpreted text role
+meta              Document metadata
+title             Set the metadata document title
 ================  ============================================================
 
 Interpreted Text Role Quick Reference
@@ -119,12 +120,13 @@
 ================  ============================================================
 Role Name         Description
 ================  ============================================================
+code              code in a formal language (see docs for syntax highlighting)
 emphasis          Equivalent to *emphasis*
 literal           Equivalent to ``literal`` but processes backslash escapes
 math              Mathematical notation (input in LaTeX format)
 PEP               Reference to a numbered Python Enhancement Proposal
 RFC               Reference to a numbered Internet Request For Comments
-raw               For non-reST data; cannot be used directly (see docs) [0.3.6]
+raw               For non-reST data; cannot be used directly (see docs)
 strong            Equivalent to **strong**
 sub               Subscript
 sup               Superscript

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

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

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

Revision: 10192
          http://sourceforge.net/p/docutils/code/10192
Author:   milde
Date:     2025-07-30 08:22:51 +0000 (Wed, 30 Jul 2025)
Log Message:
-----------
Consolidate HISTORY and RELEASE NOTES for 0.22.

Merge entries for the 0.22 release candidates 1 to 5 into a common section
for relase 0.22.

Fix 0.22 release date. Thanks to Jeff McKenna for reporting.

Modified Paths:
--------------
    trunk/docutils/HISTORY.rst
    trunk/docutils/RELEASE-NOTES.rst

Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst	2025-07-30 08:22:43 UTC (rev 10191)
+++ trunk/docutils/HISTORY.rst	2025-07-30 08:22:51 UTC (rev 10192)
@@ -17,102 +17,12 @@
 Release 0.23b0 (unpublished)
 ============================
 
-.
+...
 
+
 Release 0.22 (2026-07-29)
 =========================
 
-No changes to rc5.
-
-Release 0.22rc5 (2025-06-24)
-============================
-
-* docutils/nodes.py
-
-  - Don't invalidate indirect targets with duplicate name, if they refer to
-    the same refname (similar to external targets refering to the same URI).
-
-* docutils/parsers/rst/states.py
-
-  - "Downgrade" targets generated from hyperlink references with embedded
-    URI or alias from explicit to implicit (cf. bug #502).
-
-
-Release 0.22rc4 (2025-06-17)
-============================
-
-* docutils/nodes.py
-
-  - Don't include a "backlink" reference in system messages, if the
-    referenced element is an external target (not visible in the output).
-
-* docutils/parsers/rst/directives/references.py
-
-  - Remove "name" from `TargetNotes.option_spec`.
-    The "target-notes" directive generates one footnote element per
-    external target but "name" must be unique across the document.
-    So far, the name was silently dropped.
-
-* docutils/parsers/rst/languages/en.py
-
-  - Add alias "rst-class" for the "class" directive to improve the
-    compatibility with Sphinx.
-
-
-Release 0.22rc3 (2025-06-10)
-============================
-
-* docutils/parsers/rst/states.py
-
-  - Warn about duplicate name in references with embedded internal targets.
-    Fixes bug #502.
-
-* docutils/transforms/references.py
-
-  - New transform `CitationReferences`. Marks citation_references
-    as resolved if BibTeX is used by the backend (LaTeX).
-
-* docutils/writers/latex2e/__init__.py
-
-  - Replace `Writer.bibtex_reference_resolver()` with a transform.
-  - `LaTeXTranslator.visit_inline()` now inserts labels for the
-    node's IDs.
-  - Disable footnote handling by the "hyperref" LaTeX package (Docutils'
-    ``\DUfootnotemark`` and ``\DUfootnotetext`` macros implement
-    hyperlinks and backlinks).  Avoids "empty anchor" warnings.
-  - Fix target position and re-style system messages.
-  - Don't merge paragraphs if there is a target between them.
-
-* docutils/writers/manpage.py
-
-  - Do not drop text of internal targets.
-
-
-Release 0.22rc2 (2025-05-22)
-============================
-
-
-* docutils/parsers/rst/directives/misc.py
-
-  - Pass default settings to custom parser for included file.
-
-* docutils/parsers/rst/states.py
-
-  - Remove the `states.RSTStateMachine.memo.section_parents` cache
-    (introduced in Docutils 0.22rc1) that broke 3rd-party applications
-    employing a "mock memo".
-  - Use `types.SimpleNamespace` instead of a local definition for
-    the auxilliary class `states.Struct`.
-
-* docutils/writers/_html_base.py
-
-  - Fix error when determining the document metadata title from the
-    source path and the internal `source` attribute is None.
-
-
-Release 0.22rc1 (2025-05-06)
-============================
-
 * General
 
   - We have started to add type hints to Docutils (feature-request #87).
@@ -171,6 +81,10 @@
   - Fix recursion in `Element.get_language_code()`.
   - Do not insert <system_message> elements for duplicate explicit targets
     if this results in an invalid doctree (cf. bug #489).
+  - Don't include a "backlink" reference in system messages, if the
+    referenced element is an external target (not visible in the output).
+  - Don't invalidate indirect targets with duplicate name, if they refer to
+    the same refname (similar to external targets refering to the same URI).
 
 * docutils/parsers/docutils_xml.py
 
@@ -184,6 +98,11 @@
 
   - Remove mistranslations of the "admonition" directive name.
 
+* docutils/parsers/rst/languages/en.py
+
+  - Add alias "rst-class" for the "class" directive to improve the
+    compatibility with Sphinx.
+
 * docutils/parsers/rst/directives/__init__.py
 
   - Support CSS3 `length units`_. Fixes feature-request #57.
@@ -198,7 +117,15 @@
   - Pass the included file's path to the parser when the
     "include" directive is used with :parser: option.
     Enables system messages with correct source/line info.
+  - Pass default settings to custom parser for included file.
 
+* docutils/parsers/rst/directives/references.py
+
+  - Remove "name" from `TargetNotes.option_spec`.
+    The "target-notes" directive generates one footnote element per
+    external target but "name" must be unique across the document.
+    So far, the name was silently dropped.
+
 * docutils/parsers/rst/directives/tables.py
 
   - Removed `CSVTable.decode_from_csv()` and `CSVTable.encode_from_csv()`.
@@ -217,6 +144,12 @@
   - Change section handling to not rely on exceptions and reparsing.
     Based on patch #213 by Arne Skjærholt.
     Fixes bug #346 (duplicate System Messages).
+  - Use `types.SimpleNamespace` instead of a local definition for
+    the auxilliary class `states.Struct`.
+  - Warn about duplicate name in references with embedded internal targets.
+    Fixes bug #502.
+  - "Downgrade" targets generated from hyperlink references with embedded
+    URI or alias from explicit to implicit (cf. bug #502).
 
 * docutils/readers/__init__.py:
 
@@ -232,6 +165,11 @@
     follows a <meta> or <decoration> element as this is invalid
     according to ``docutils.dtd``.
 
+* docutils/transforms/references.py
+
+  - New transform `CitationReferences`. Marks citation_references
+    as resolved if BibTeX is used by the backend (LaTeX).
+
 * docutils/transforms/writer_aux.py
 
   - Removed `Compound` transform.
@@ -275,6 +213,8 @@
   - Revise image size handling methods,
     use "width" and "height" attributes for unitless values.
   - Add "px" to unitless table "width" values.
+  - Fix error when determining the document metadata title from the
+    source path and the internal `source` attribute is None.
 
 * docutils/writers/html4css1/__init__.py
 
@@ -302,6 +242,14 @@
   - Encode <meta> element content in pdfinfo.
   - Improve formatting of docinfo fields.
   - `LaTeXTranslator.pop_output_collector()` now returns the popped list.
+  - Replace `Writer.bibtex_reference_resolver()` with a transform.
+  - `LaTeXTranslator.visit_inline()` now inserts labels for the
+    node's IDs.
+  - Disable footnote handling by the "hyperref" LaTeX package (Docutils'
+    ``\DUfootnotemark`` and ``\DUfootnotetext`` macros implement
+    hyperlinks and backlinks).  Avoids "empty anchor" warnings.
+  - Fix target position and re-style system messages.
+  - Don't merge paragraphs if there is a target between them.
 
   .. _reference-label: docs/user/config.html#reference-label
   __ docs/user/config.html#stylesheet-latex-writers
@@ -322,6 +270,7 @@
     configuration setting text_references_ is True.
     The current default is True (text references), it will change
     to False (macro references) in Docutils 1.0.
+  - Do not drop text of internal targets.
 
 * docutils/writers/null.py
 

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2025-07-30 08:22:43 UTC (rev 10191)
+++ trunk/docutils/RELEASE-NOTES.rst	2025-07-30 08:22:51 UTC (rev 10192)
@@ -210,6 +210,9 @@
   `states.RSTState.title_inconsistent()`, and `states.Line.eofcheck`
   in Docutils 2.0. Ignored since Docutils 0.22.
 
+* Remove `parsers.rst.states.Struct` (obsoleted by `types.SimpleNamespace`)
+  in Docutils 2.0.
+
 * Remove `frontend.OptionParser`, `frontend.Option`, `frontend.Values`,
   `frontend.store_multiple()`, and `frontend.read_config_file()` when
   migrating to argparse_ in Docutils 2.0 or later.
@@ -253,71 +256,31 @@
 Release 0.23b0 (unpublished)
 ============================
 
-.
+...
 
-Release 0.22 (2026-07-29)
+
+Release 0.22 (2025-07-29)
 =========================
 
-No changes to rc5.
-
-Release 0.22rc5 (2025-06-24)
-============================
-
-Targets generated from hyperlink references with embedded URI or alias
-are no longer "explicit" but "implicit" (i.e. with the same priority as
-auto-generated section targets, see `implicit hyperlink targets`__).
-
-__ https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html
-   #implicit-hyperlink-targets
-
-Don't report an error for duplicate targets with identical refname.
-
-Release 0.22rc4 (2025-06-17)
-============================
-
-Drop the "name" option of the "target-notes" directive.
-(Report an error instead of silently ignoring the value.)
-
-New alias "rst-class" for the `"class"`_ directive to improve the
-compatibility with Sphinx.
-
-
-Release 0.22rc3 (2025-06-10)
-============================
-
-New objects
-  `transforms.references.CitationReferences`
-     Mark citation_references as resolved if the backend
-     uses a BibTeX database.
-
-Output changes
-
-  manpage:
-     Do not drop text of internal targets.
-
-
-Release 0.22rc2 (2025-05-22)
-============================
-
-Fix backwards-compatibility problem:
-  reStructuredText section parsing no longer requires
-  `parsers.rst.states.RSTStateMachine.memo.section_parents`
-  (a cache introduced in Docutils 0.22rc1).
-
-Deprecate `parsers.rst.states.Struct` (obsoleted by `types.SimpleNamespace`).
-
-
-Release 0.22rc1 (2025-05-06)
-============================
-
 reStructuredText:
   - Support `CSS3 units`_. This adds "ch", "rem", "vw", "vh", "vmin",
     "vmax", and "Q" to the `supported length units`__. Note that some
     output formats don't support all units.
   - New option "figname" for the `"figure"`_ directive.
+  - Targets generated from hyperlink references with embedded URI or
+    alias are no longer "explicit" but "implicit" (i.e. with the same
+    priority as auto-generated section targets, see `implicit hyperlink
+    targets`__).
+  - Don't report an error for duplicate targets with identical refname.
+  - Drop the "name" option of the "target-notes" directive.
+    (Report an error instead of silently ignoring the value.)
+  - New alias "rst-class" for the `"class"`_ directive to improve the
+    compatibility with Sphinx.
 
   .. _CSS3 units: https://www.w3.org/TR/css-values-3/#lengths
   __ docs/ref/rst/restructuredtext.html#length-units
+  __ https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html
+     #implicit-hyperlink-targets
 
 Document Tree / Docutils DTD
   - Allow multiple <term> elements in a `\<definition_list_item>`__
@@ -384,6 +347,10 @@
      the `Docutils Document Model`_.
      Provisional.
 
+  `transforms.references.CitationReferences`
+     Mark citation_references as resolved if the backend
+     uses a BibTeX database.
+
   `writers.DoctreeTranslator`
      Generic Docutils document tree translator base class with
      `uri2path()` auxiliary method.

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

[Docutils-checkins] SF.net SVN: docutils:[10191] trunk/web/rst.rst

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

Revision: 10191
          http://sourceforge.net/p/docutils/code/10191
Author:   milde
Date:     2025-07-30 08:22:43 +0000 (Wed, 30 Jul 2025)
Log Message:
-----------
Fix link in "rst" web page.

Fixes bugs:#507.

Modified Paths:
--------------
    trunk/web/rst.rst

Modified: trunk/web/rst.rst
===================================================================
--- trunk/web/rst.rst	2025-07-30 08:22:32 UTC (rev 10190)
+++ trunk/web/rst.rst	2025-07-30 08:22:43 UTC (rev 10191)
@@ -43,9 +43,9 @@
 list.
 
 __ docs/user/rst/quickstart.html
-__ docs/user/rst/quickstart.txt
+__ docs/user/rst/quickstart.rst
 __ docs/user/rst/quickref.html
-__ docs/user/rst/cheatsheet.txt
+__ docs/user/rst/cheatsheet.rst
 .. _Docutils-users: docs/user/mailing-lists.html#docutils-users
 
 
@@ -235,7 +235,7 @@
 
 .. |reStructuredText| image:: rst.png
 
-
+
 ..
    Local Variables:
    mode: indented-text

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

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

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

Revision: 10190
          http://sourceforge.net/p/docutils/code/10190
Author:   milde
Date:     2025-07-30 08:22:32 +0000 (Wed, 30 Jul 2025)
Log Message:
-----------
Document table width determination by the LaTeX writer.

See also the discussion in the related Sphinx issue
https://github.com/sphinx-doc/sphinx/issues/3411.

Modified Paths:
--------------
    trunk/docutils/docs/ref/rst/directives.rst
    trunk/docutils/docs/user/config.rst
    trunk/docutils/docs/user/latex.rst

Modified: trunk/docutils/docs/ref/rst/directives.rst
===================================================================
--- trunk/docutils/docs/ref/rst/directives.rst	2025-07-29 16:12:15 UTC (rev 10189)
+++ trunk/docutils/docs/ref/rst/directives.rst	2025-07-30 08:22:32 UTC (rev 10190)
@@ -892,34 +892,40 @@
     The horizontal alignment of the table (new in Docutils 0.13).
 
 ``width`` : length_ or percentage_  of the current line width
-    Sets the width of the table to the specified length or percentage
-    of the line width.  If omitted, the renderer determines the width
-    of the table based on its contents or the column ``widths``.
+    The width of the table.
+    By default, the renderer determines the width of a table
+    from its contents. [#width-from-widths]_
 
 ``widths`` : "auto", "grid", or a `list of integers`_
-    Explicitly set column widths.
-    Specifies relative widths if used with the ``width`` option.
+    Table column widths.
     Possible values:
 
-    .. class:: field-indent-4em run-in
+    .. class:: field-indent-7ex run-in
 
-    :auto: Delegate the determination of column widths to the backend
-           (LaTeX, the HTML browser, ...).
+    :"auto": Delegate the determination of column widths to the backend
+             (LaTeX, the HTML browser, ...).
 
-    :grid: Determine column widths from the widths of the input columns
-           (in characters).
+    :"grid": Relative column widths match the widths of the columns
+             in the reStructuredText table markup.
 
-    :list of integers: Must match the number of table columns.
-           Used instead of the input column widths. Implies *"grid"*.
+    :list of integers: Specifies relative column widths.
+             Must match the number of table columns.
 
-    The default depends on the writer. Most writers default to *grid*. [#]_
+    The default depends on the writer.
+    The HTML5_ and manpage_ writers default to *"auto"*,
+    the html4_ and LaTeX_ writers default to *"grid"*. [#widths-default]_
 
-    .. [#] The `html5 writer`_ defaults to *auto*.
-       The default for the HTML and LaTeX writers can be configured
-       with the `table_style`_ configuration setting or the special class
-       values "colwidths-auto"/"colwidths-grid").
+.. [#width-from-widths] The LaTeX writer determines the `table width
+   from column widths`__ unless the ``widths`` option is set to *"auto"*.
 
+   __ ../../user/latex.html#table-width
 
+.. [#widths-default] The ``widths`` default of the HTML and LaTeX
+   writers can be configured with the `table_style`_ configuration
+   setting using the special class values "colwidths-auto" or
+   "colwidths-grid".
+
+
 .. _csv-table:
 
 CSV Table
@@ -1032,24 +1038,26 @@
     A URI reference to a CSV data file.
 
 ``width`` : length_ or percentage_ of the current line width
-    Sets the width of the table to the specified length or percentage
-    of the line width.  If omitted, the renderer determines the width
-    of the table based on its contents or the column ``widths``.
+    The width of the table.
+    By default, the renderer determines the width of a table
+    from its contents. [#width-from-widths2]_
 
 ``widths`` : `list of integers`_ or "auto"
-    A list of relative column widths.
-    The default is equal-width columns (100%/#columns).
-
+    A list of relative column widths. The special value
     "auto" delegates the determination of column widths to the backend
     (LaTeX, the HTML browser, ...).
 
+    The default depends on the writer.
+    The html5_ and manpage_ writers default to *"auto"*, the html4_ and
+    LaTeX_ writers default to equal-width columns. [#widths-default]_
+
 .. [#CSV] CSV (comma separated values) is a common data format generated
    by spreadsheet applications and commercial databases. Despite the
    "comma" in its name, the field delimiter_ may be any Unicode character.
 
-.. [#tab-expansion] Note, that tabs can be used as separator only in
-   external files because hard tabs in the directive content are
-   `converted to spaces`__ before it reaches the CVS reader.
+.. [#tab-expansion] Note, that *tabs* can be used as separator only in
+   external files because hard tabs in the reStructuredText source are
+   `converted to spaces`__ before parsing.
 
    __ restructuredtext.html#whitespace
 
@@ -1056,7 +1064,12 @@
 .. [#] Before Docutils 0.21, the header option used a hard-coded
    CSV dialect with the backslash as escape character.
 
+.. [#width-from-widths2] The `LaTeX writer defaults to a table width
+   of 100%`__ unless the ``width`` or ``widths`` option is set.
 
+   __ ../../user/latex.html#table-width
+
+
 .. _list-table:
 
 List Table
@@ -1119,17 +1132,19 @@
     .. _table width:
 
 ``width`` : length_ or percentage_ of the current line width
-    Sets the width of the table to the specified length or percentage
-    of the line width.  If omitted, the renderer determines the width
-    of the table based on its contents or the column ``widths``.
+    The width of the table.
+    By default, the renderer determines the width of a table
+    from its contents. [#width-from-widths2]_
 
 ``widths`` : `list of integers`_ or "auto"
-    A list of relative column widths.
-    The default is equal-width columns (100%/#columns).
-
+    A list of relative column widths. The special value
     "auto" delegates the determination of column widths to the backend
     (LaTeX, the HTML browser, ...).
 
+    The default depends on the writer.
+    The HTML5_ and manpage_ writers default to *"auto"*, the html4_ and
+    LaTeX_ writers default to equal-width columns. [#widths-default]_
+
 .. TODO
     Add option ``missing-cells`` with keywords "strict", "fill", "span"?
     (cf. [feature-requests:#103])

Modified: trunk/docutils/docs/user/config.rst
===================================================================
--- trunk/docutils/docs/user/config.rst	2025-07-29 16:12:15 UTC (rev 10189)
+++ trunk/docutils/docs/user/config.rst	2025-07-30 08:22:32 UTC (rev 10190)
@@ -1788,7 +1788,7 @@
 
 New in Docutils 0.18.
 
-__ latex.html#table-style
+__ latex.html#table-width
 
 
 literal_block_env

Modified: trunk/docutils/docs/user/latex.rst
===================================================================
--- trunk/docutils/docs/user/latex.rst	2025-07-29 16:12:15 UTC (rev 10189)
+++ trunk/docutils/docs/user/latex.rst	2025-07-30 08:22:32 UTC (rev 10190)
@@ -1664,7 +1664,7 @@
 
 A pre-configured *table style* can be globally selected via the table_style_
 setting or set for individual tables via a `class directive`_ or the
-``class`` option of the `table directive`_.
+``class`` option of the `table directives`_.
 
 Supported values:
 
@@ -1672,39 +1672,103 @@
   Borders around all cells.
 
 booktabs
-  A line above and below the table and one after the head.
+  Use the booktabs_ package for publication quality tables (no vertical rules).
 
 borderless
   No borders around table cells.
 
-colwidths-auto
+_`colwidths-auto`
   Column width determination by LaTeX.
-  Overridden by the `table directive`_'s ``widths`` option.
+  Overridden by the `table directive option`_ ``widths``.
 
-  .. warning::
+  .. Caution::
+     `Auto-sized columns`_ work only with simple cell content.
 
-    ``colwidths-auto`` is only suited for tables with simple cell content.
-
-    LaTeX puts the content of auto-sized columns on one line (merging
-    paragraphs) and may fail with complex content.
-
 .. eventually in future
 
    align-left, align-center, align-right
      Align tables.
 
-By default, *column widths* are computed from the source column widths.
-The `legacy_column_widths`_ setting selects the conversion algorithm.
-Custom column widths can be set with the ``widths`` option of the `table
-directive`_.
+.. _booktabs: https://ctan.org/pkg/booktabs
 
-See also the section on problems with tables_ below.
 
-.. _new_column_widths:
+.. _table width:
+
+table width and column widths
+-----------------------------
+
+To support automatic line breaks, standard LaTeX tables need to know the
+column widths. Therefore, the LaTeX writer determines default values for
+both, relative column widths and the total width of a table from the
+table's ``colwidth`` [#fn:colwidth]_ values. [#fn:table-width]_
+The algorithm works sufficiently well in typical use cases. However,
+there are cases where the table layout requires manual intervention,
+for example:
+
+* Tables where the cells contain only numbers or short text look better
+  with `auto-sized columns`_.
+
+* If the input table contains verbose markup syntax, column widths in the
+  source may be bad indicators for output column widths.
+
+* Columns may become too narrow in tables that are nested inside lists,
+  quotes, or similar.
+
+To improve the table layout, you may:
+
+* Use the `table directive option`_ ``width`` to set the table width
+  to a custom `length <length units_>`__ or percentage_ of the current
+  line width.
+
+* Adjust the table column widths in the source document or use the
+  `table directive option`_ ``widths`` to specify column widths.
+
+  .. _auto-sized columns:
+
+* Set the `table directive option`_ ``widths`` to the value *"auto"* or
+  select the `table style`_ "colwidths-auto_" to let LaTeX determine
+  table and column widths from the table content.
+
+  .. Caution::
+     Auto-sized columns only work with simple cell content.
+
+     LaTeX sets cell content in auto-sized columns in one line (merging
+     paragraphs) and fails with other block level content.
+
+The `legacy_column_widths`_ setting provides backwards compatibility with
+the (faulty) legacy algorithm.
+
+.. [#fn:colwidth]
+   Docutils stores the column widths in the reStructuredText
+   `table markup`_ (in characters) in the colwidth_ attribute
+   of the table column specifications.
+   (The colwidth_\ s of a `list table`_ or `CSV table`_ with :math:`n`
+   columns default to :math:`w_i = 100\text{⫽}n`.)
+   The ``widths`` `table directive option`_ can be used to provide custom
+   values.
+
+.. [#fn:table-width]
+   The default width :math:`w` of a table with :math:`n` columns and
+   ``colwidth`` [#fn:colwidth]_ values :math:`w_i` is computed using
+   the equation
+
+   .. math::
+       w = \frac{100\,\%}{40} \left( n + \sum_{i=1}^n w_i \right)
+
+   with an upper limit of 100%.
+
+   .. For details see `docutils.writers.latex2e.Table.get_colspecs()`.
+
+.. _colwidth: ../ref/doctree.html#colwidth
+.. _CSV table: ../ref/rst/directives.html#csv-table
+.. _document tree: ../ref/doctree.html
 .. _legacy_column_widths: config.html#legacy-column-widths
+.. _list table: ../ref/rst/directives.html#list-table
+.. _percentage:  ../ref/rst/restructuredtext.html#percentage-unit
+.. _table directives: ../ref/rst/directives.html#tables
+.. _table directive option: ../ref/rst/directives.html#table-options
+.. _table markup: ../ref/rst/restructuredtext.html#tables
 .. _table_style: config.html#table-style-latex-writers
-.. _"widths" option:
-.. _table directive: ../ref/rst/directives.html#table
 
 
 table of contents
@@ -2163,10 +2227,10 @@
 Tables
 ``````
 
-* Too wide tables (cf. `bug #422`_):
+* Too wide tables:
 
-  Try the new_column_widths_ setting or use the `"widths" option`_ to
-  manually set the table column widths.
+  - Turn off the legacy_column_widths_ setting (cf. `bug #422`_)
+    or manually set the `table width`_.
 
 * Table cells with both multirow and multicolumn are currently not possible.
 

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

[Docutils-checkins] SF.net SVN: docutils:[10189] trunk/sandbox/infrastruc ture/releasing-log.rst

[<gr...@us...>]

Revision: 10189
          http://sourceforge.net/p/docutils/code/10189
Author:   grubert
Date:     2025-07-29 16:12:15 +0000 (Tue, 29 Jul 2025)
Log Message:
-----------
release 0.22

Modified Paths:
--------------
    trunk/sandbox/infrastructure/releasing-log.rst

Modified: trunk/sandbox/infrastructure/releasing-log.rst
===================================================================
--- trunk/sandbox/infrastructure/releasing-log.rst	2025-07-29 16:11:43 UTC (rev 10188)
+++ trunk/sandbox/infrastructure/releasing-log.rst	2025-07-29 16:12:15 UTC (rev 10189)
@@ -10,6 +10,71 @@
 Notes on what happend while releasing.
 
 
+Release 0.22 (2025-07-29)
+=========================
+
+* checkout current code
+* run: tox -epy313
+* set_version 0.22
+* run: tox -epy311
+* fix the version_info release to True
+* run: tox -epy39
+* Check README, HISTORY and RELEASE-NOTES titles.
+* check: svn di
+* svn commit 
+* build wheel and tgz
+* test tgz and wheel locally
+* upload to pypi
+* test src.tgz from pypi, ignore missing HISTORY
+* test wheel from pypi, ignore missing HISTORY.rst
+* update code in working directory
+* run tox : pass 39, 310, 311, 313, 314
+* tag #.# (Note: only directory docutils is copied)::
+
+    svn copy svn+ssh://gr...@sv.../p/docutils/code/trunk/docutils \
+             svn+ssh://gr...@sv.../p/docutils/code/tags/docutils-0.22 \
+             -m "tagging release 0.22"
+
+* check on sourceforge
+* update code in working directory
+* upload source and generated html to sf-htdocs/#.# ::
+
+    mkdir tmp1
+    cd tmp1
+    tar xzvf ../dist/docutils-0.22.tar.gz
+    cd docutils-0.22/
+    python3 tools/buildhtml.py .
+    find . -name \*.pyc -exec rm -v {} \;
+    find . -name __pycache__ -exec rmdir -v {} \;
+    rsync -e ssh -r -t ./ web.sourceforge.net:/home/project-web/docutils/htdocs/0.22
+
+* Check https://docutils.sourceforge.io/0.22/
+* Check web/index.rst for necessary corrections.
+* Run sandbox/infrastructure/docutils-update.local to update web-content.
+
+  Unnecessary will be 0.23b.dev soon.
+* Release to sourceforge.
+
+  - Upload docutils-0.22.tar.gz and release notes to sourceforge.
+  - Upload RELEASE_NOTES.rst as README.rst.
+  - Select docutils-0.22.tar.gz as default for all OS.
+
+* update working directory
+* set_version 0.23b.dev
+* docutils/HISTORY.rst: add title "Release 0.23b0.dev (unpublished)"
+* docutils/RELEASE-NOTES.rst: add title "Release 0.23b0.dev (unpublished)"
+* Check README, HISTORY and RELEASE-NOTES titles.
+
+  Fix: README, the version number should not be changed in line ::
+
+   The **type hints** added in version 0.22 use Python 3.10 syntax.
+
+* check docutils/__init__ : failed
+* run: tox -epy313
+* commit
+* run: sandbox/infrastructure/docutils-update.local
+
+
 Release 0.22rc5 (2025-06-24)
 ============================
 

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

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

[<gr...@us...>]

Revision: 10188
          http://sourceforge.net/p/docutils/code/10188
Author:   grubert
Date:     2025-07-29 16:11:43 +0000 (Tue, 29 Jul 2025)
Log Message:
-----------
version 0.23b0.dev

Modified Paths:
--------------
    trunk/docutils/HISTORY.rst
    trunk/docutils/README.rst
    trunk/docutils/RELEASE-NOTES.rst
    trunk/docutils/docutils/__init__.py
    trunk/docutils/test/functional/expected/buggy_mathml.html
    trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html
    trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html
    trunk/docutils/test/functional/expected/buggy_mathml_ttm.html
    trunk/docutils/test/functional/expected/compact_lists.html
    trunk/docutils/test/functional/expected/dangerous.html
    trunk/docutils/test/functional/expected/field_name_limit.html
    trunk/docutils/test/functional/expected/footnotes_html5.html
    trunk/docutils/test/functional/expected/length_units_html5.html
    trunk/docutils/test/functional/expected/math_experiments_mathml.html
    trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html
    trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html
    trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html
    trunk/docutils/test/functional/expected/math_output_html.html
    trunk/docutils/test/functional/expected/math_output_latex.html
    trunk/docutils/test/functional/expected/math_output_mathjax.html
    trunk/docutils/test/functional/expected/math_output_mathml.html
    trunk/docutils/test/functional/expected/mathematics_mathml.html
    trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html
    trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html
    trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html
    trunk/docutils/test/functional/expected/misc_rst_html4css1.html
    trunk/docutils/test/functional/expected/misc_rst_html5.html
    trunk/docutils/test/functional/expected/pep_html.html
    trunk/docutils/test/functional/expected/rst_html5_tuftig.html
    trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
    trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
    trunk/docutils/test/functional/expected/standalone_rst_html5.html
    trunk/docutils/test/functional/expected/standalone_rst_manpage.man
    trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
    trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
    trunk/docutils/test/test_writers/test_manpage.py

Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/HISTORY.rst	2025-07-29 16:11:43 UTC (rev 10188)
@@ -14,6 +14,11 @@
 .. contents::
 
 
+Release 0.23b0 (unpublished)
+============================
+
+.
+
 Release 0.22 (2026-07-29)
 =========================
 

Modified: trunk/docutils/README.rst
===================================================================
--- trunk/docutils/README.rst	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/README.rst	2025-07-29 16:11:43 UTC (rev 10188)
@@ -1,6 +1,6 @@
-=======================
- README: Docutils 0.22
-=======================
+============================
+ README: Docutils 0.23b.dev
+============================
 
 :Author: David Goodger
 :Contact: go...@py...

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/RELEASE-NOTES.rst	2025-07-29 16:11:43 UTC (rev 10188)
@@ -250,6 +250,11 @@
    __ https://packages.debian.org/source/trixie/python-docutils
 
 
+Release 0.23b0 (unpublished)
+============================
+
+.
+
 Release 0.22 (2026-07-29)
 =========================
 

Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/docutils/__init__.py	2025-07-29 16:11:43 UTC (rev 10188)
@@ -85,7 +85,7 @@
 
 __docformat__ = 'reStructuredText'
 
-__version__ = '0.22'
+__version__ = '0.23b.dev'
 """Docutils version identifier (complies with PEP 440)::
 
     major.minor[.micro][releaselevel[serial]][.dev]
@@ -158,11 +158,11 @@
 
 __version_info__ = VersionInfo(
     major=0,
-    minor=22,
+    minor=23,
     micro=0,
-    releaselevel='final',  # one of 'alpha', 'beta', 'candidate', 'final'
+    releaselevel='beta',  # one of 'alpha', 'beta', 'candidate', 'final'
     serial=0,  # pre-release number (0 for final releases and snapshots)
-    release=True  # True for official releases and pre-releases
+    release=False  # True for official releases and pre-releases
     )
 """Comprehensive version information tuple.
 

Modified: trunk/docutils/test/functional/expected/buggy_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/buggy_mathml.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>buggy-maths</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>buggy-maths</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>buggy-maths</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/buggy_mathml_ttm.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml_ttm.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/buggy_mathml_ttm.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>buggy-maths</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/compact_lists.html
===================================================================
--- trunk/docutils/test/functional/expected/compact_lists.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/compact_lists.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <title>compact_lists.rst</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/dangerous.html
===================================================================
--- trunk/docutils/test/functional/expected/dangerous.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/dangerous.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <title>dangerous.rst</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/field_name_limit.html
===================================================================
--- trunk/docutils/test/functional/expected/field_name_limit.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/field_name_limit.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <title>field_list.rst</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/footnotes_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/footnotes_html5.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Test footnote and citation rendering</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/length_units_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/length_units_html5.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/length_units_html5.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Test length specifications</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_experiments_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/math_experiments_mathml.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Math Conversion Tests</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html
===================================================================
--- trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Math Conversion Tests</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html
===================================================================
--- trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Math Conversion Tests</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html
===================================================================
--- trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Math Conversion Tests</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_output_html.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_html.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/math_output_html.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 <link rel="stylesheet" href="../input/data/math.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_output_latex.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_latex.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/math_output_latex.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/math_output_mathjax.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathjax.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <title>Mathematics</title>
 <script type="text/javascript" src="/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS_CHTML"></script>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_output_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathml.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/math_output_mathml.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/mathematics_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/mathematics_mathml.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/mathematics_mathml.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>LaTeX syntax for mathematics</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html
===================================================================
--- trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>LaTeX syntax for mathematics</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html
===================================================================
--- trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>LaTeX syntax for mathematics</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html
===================================================================
--- trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>LaTeX syntax for mathematics</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/misc_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html4css1.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <title>Additional tests with html4css1</title>
 <link rel="stylesheet" href="foo&amp;bar.css" type="text/css" />
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/misc_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html5.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/misc_rst_html5.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Additional tests with HTML 5</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/pep_html.html
===================================================================
--- trunk/docutils/test/functional/expected/pep_html.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/pep_html.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -8,7 +8,7 @@
 -->
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+  <meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
   <title>PEP 100 - Test PEP</title>
   <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/rst_html5_tuftig.html
===================================================================
--- trunk/docutils/test/functional/expected/rst_html5_tuftig.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/rst_html5_tuftig.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Special Features of the tuftig.css Stylesheet</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml	2025-07-29 16:11:43 UTC (rev 10188)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<!-- Generated by Docutils 0.22 -->
+<!-- Generated by Docutils 0.23b.dev -->
 <document ids="restructuredtext-test-document doctitle" names="restructuredtext\ test\ document doctitle" source="functional/input/standalone_rst_docutils_xml.rst" 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>

Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta content="reStructuredText, test, parser" name="keywords" />
 <meta content="A test document, containing at least one example of each reStructuredText construct." lang="en" name="description" />
 <meta name="author" content="David Goodger" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html5.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <meta content="reStructuredText, test, parser" name="keywords" />
 <meta content="A test document, containing at least one example of each reStructuredText construct." lang="en" name="description" xml:lang="en" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_manpage.man
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_manpage.man	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/standalone_rst_manpage.man	2025-07-29 16:11:43 UTC (rev 10188)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22 manpage writer.
+.\" by the Docutils 0.23b.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="version" content="S5 1.1" />
 <meta name="author" content="David Goodger" />
 <meta name="date" content="2005-11-28" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html	2025-07-29 16:11:43 UTC (rev 10188)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.23b.dev: https://docutils.sourceforge.io/" />
 <meta name="version" content="S5 1.1" />
 <meta name="author" content="David Goodger" />
 <meta name="date" content="2005-11-28" />

Modified: trunk/docutils/test/test_writers/test_manpage.py
===================================================================
--- trunk/docutils/test/test_writers/test_manpage.py	2025-07-29 15:33:02 UTC (rev 10187)
+++ trunk/docutils/test/test_writers/test_manpage.py	2025-07-29 16:11:43 UTC (rev 10188)
@@ -96,7 +96,7 @@
 
 
 document_start = r""".\" Man page generated from reStructuredText
-.\" by the Docutils 0.22 manpage writer.
+.\" by the Docutils 0.23b.dev manpage writer.
 .
 """
 

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

[Docutils-checkins] SF.net SVN: docutils:[10187] tags/docutils-0.22/

[<gr...@us...>]

Revision: 10187
          http://sourceforge.net/p/docutils/code/10187
Author:   grubert
Date:     2025-07-29 15:33:02 +0000 (Tue, 29 Jul 2025)
Log Message:
-----------
tagging release 0.22

Added Paths:
-----------
    tags/docutils-0.22/

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

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

[<gr...@us...>]

Revision: 10186
          http://sourceforge.net/p/docutils/code/10186
Author:   grubert
Date:     2025-07-29 15:03:01 +0000 (Tue, 29 Jul 2025)
Log Message:
-----------
version 0.22

Modified Paths:
--------------
    trunk/docutils/HISTORY.rst
    trunk/docutils/README.rst
    trunk/docutils/RELEASE-NOTES.rst
    trunk/docutils/docutils/__init__.py
    trunk/docutils/test/functional/expected/buggy_mathml.html
    trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html
    trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html
    trunk/docutils/test/functional/expected/buggy_mathml_ttm.html
    trunk/docutils/test/functional/expected/compact_lists.html
    trunk/docutils/test/functional/expected/dangerous.html
    trunk/docutils/test/functional/expected/field_name_limit.html
    trunk/docutils/test/functional/expected/footnotes_html5.html
    trunk/docutils/test/functional/expected/length_units_html5.html
    trunk/docutils/test/functional/expected/math_experiments_mathml.html
    trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html
    trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html
    trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html
    trunk/docutils/test/functional/expected/math_output_html.html
    trunk/docutils/test/functional/expected/math_output_latex.html
    trunk/docutils/test/functional/expected/math_output_mathjax.html
    trunk/docutils/test/functional/expected/math_output_mathml.html
    trunk/docutils/test/functional/expected/mathematics_mathml.html
    trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html
    trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html
    trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html
    trunk/docutils/test/functional/expected/misc_rst_html4css1.html
    trunk/docutils/test/functional/expected/misc_rst_html5.html
    trunk/docutils/test/functional/expected/pep_html.html
    trunk/docutils/test/functional/expected/rst_html5_tuftig.html
    trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
    trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
    trunk/docutils/test/functional/expected/standalone_rst_html5.html
    trunk/docutils/test/functional/expected/standalone_rst_manpage.man
    trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
    trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
    trunk/docutils/test/test_writers/test_manpage.py

Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/HISTORY.rst	2025-07-29 15:03:01 UTC (rev 10186)
@@ -14,10 +14,10 @@
 .. contents::
 
 
-Release 0.22rc6 (unpublished)
-=============================
+Release 0.22 (2026-07-29)
+=========================
 
-.
+No changes to rc5.
 
 Release 0.22rc5 (2025-06-24)
 ============================

Modified: trunk/docutils/README.rst
===================================================================
--- trunk/docutils/README.rst	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/README.rst	2025-07-29 15:03:01 UTC (rev 10186)
@@ -1,6 +1,6 @@
-==============================
- README: Docutils 0.22rc6.dev
-==============================
+=======================
+ README: Docutils 0.22
+=======================
 
 :Author: David Goodger
 :Contact: go...@py...

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/RELEASE-NOTES.rst	2025-07-29 15:03:01 UTC (rev 10186)
@@ -250,10 +250,10 @@
    __ https://packages.debian.org/source/trixie/python-docutils
 
 
-Release 0.22rc6 (unpublished)
-=============================
+Release 0.22 (2026-07-29)
+=========================
 
-.
+No changes to rc5.
 
 Release 0.22rc5 (2025-06-24)
 ============================

Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/docutils/__init__.py	2025-07-29 15:03:01 UTC (rev 10186)
@@ -85,7 +85,7 @@
 
 __docformat__ = 'reStructuredText'
 
-__version__ = '0.22rc6.dev'
+__version__ = '0.22'
 """Docutils version identifier (complies with PEP 440)::
 
     major.minor[.micro][releaselevel[serial]][.dev]
@@ -160,9 +160,9 @@
     major=0,
     minor=22,
     micro=0,
-    releaselevel='candidate',  # one of 'alpha', 'beta', 'candidate', 'final'
-    serial=6,  # pre-release number (0 for final releases and snapshots)
-    release=False  # True for official releases and pre-releases
+    releaselevel='final',  # one of 'alpha', 'beta', 'candidate', 'final'
+    serial=0,  # pre-release number (0 for final releases and snapshots)
+    release=True  # True for official releases and pre-releases
     )
 """Comprehensive version information tuple.
 

Modified: trunk/docutils/test/functional/expected/buggy_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/buggy_mathml.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>buggy-maths</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>buggy-maths</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>buggy-maths</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/buggy_mathml_ttm.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml_ttm.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/buggy_mathml_ttm.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>buggy-maths</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/compact_lists.html
===================================================================
--- trunk/docutils/test/functional/expected/compact_lists.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/compact_lists.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <title>compact_lists.rst</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/dangerous.html
===================================================================
--- trunk/docutils/test/functional/expected/dangerous.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/dangerous.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <title>dangerous.rst</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/field_name_limit.html
===================================================================
--- trunk/docutils/test/functional/expected/field_name_limit.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/field_name_limit.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <title>field_list.rst</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/footnotes_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/footnotes_html5.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Test footnote and citation rendering</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/length_units_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/length_units_html5.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/length_units_html5.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Test length specifications</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_experiments_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/math_experiments_mathml.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Math Conversion Tests</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html
===================================================================
--- trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Math Conversion Tests</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html
===================================================================
--- trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Math Conversion Tests</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html
===================================================================
--- trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Math Conversion Tests</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_output_html.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_html.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/math_output_html.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 <link rel="stylesheet" href="../input/data/math.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_output_latex.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_latex.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/math_output_latex.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/math_output_mathjax.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathjax.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <title>Mathematics</title>
 <script type="text/javascript" src="/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS_CHTML"></script>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_output_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathml.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/math_output_mathml.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/mathematics_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/mathematics_mathml.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/mathematics_mathml.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>LaTeX syntax for mathematics</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html
===================================================================
--- trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>LaTeX syntax for mathematics</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html
===================================================================
--- trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>LaTeX syntax for mathematics</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html
===================================================================
--- trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>LaTeX syntax for mathematics</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/misc_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html4css1.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <title>Additional tests with html4css1</title>
 <link rel="stylesheet" href="foo&amp;bar.css" type="text/css" />
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/misc_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html5.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/misc_rst_html5.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Additional tests with HTML 5</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/pep_html.html
===================================================================
--- trunk/docutils/test/functional/expected/pep_html.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/pep_html.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -8,7 +8,7 @@
 -->
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+  <meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
   <title>PEP 100 - Test PEP</title>
   <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/rst_html5_tuftig.html
===================================================================
--- trunk/docutils/test/functional/expected/rst_html5_tuftig.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/rst_html5_tuftig.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Special Features of the tuftig.css Stylesheet</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml	2025-07-29 15:03:01 UTC (rev 10186)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<!-- Generated by Docutils 0.22rc6.dev -->
+<!-- Generated by Docutils 0.22 -->
 <document ids="restructuredtext-test-document doctitle" names="restructuredtext\ test\ document doctitle" source="functional/input/standalone_rst_docutils_xml.rst" 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>

Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta content="reStructuredText, test, parser" name="keywords" />
 <meta content="A test document, containing at least one example of each reStructuredText construct." lang="en" name="description" />
 <meta name="author" content="David Goodger" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html5.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <meta content="reStructuredText, test, parser" name="keywords" />
 <meta content="A test document, containing at least one example of each reStructuredText construct." lang="en" name="description" xml:lang="en" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_manpage.man
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_manpage.man	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/standalone_rst_manpage.man	2025-07-29 15:03:01 UTC (rev 10186)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc6.dev manpage writer.
+.\" by the Docutils 0.22 manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="version" content="S5 1.1" />
 <meta name="author" content="David Goodger" />
 <meta name="date" content="2005-11-28" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html	2025-07-29 15:03:01 UTC (rev 10186)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22: https://docutils.sourceforge.io/" />
 <meta name="version" content="S5 1.1" />
 <meta name="author" content="David Goodger" />
 <meta name="date" content="2005-11-28" />

Modified: trunk/docutils/test/test_writers/test_manpage.py
===================================================================
--- trunk/docutils/test/test_writers/test_manpage.py	2025-07-28 20:10:46 UTC (rev 10185)
+++ trunk/docutils/test/test_writers/test_manpage.py	2025-07-29 15:03:01 UTC (rev 10186)
@@ -96,7 +96,7 @@
 
 
 document_start = r""".\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc6.dev manpage writer.
+.\" by the Docutils 0.22 manpage writer.
 .
 """
 

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

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

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

Revision: 10185
          http://sourceforge.net/p/docutils/code/10185
Author:   milde
Date:     2025-07-28 20:10:46 +0000 (Mon, 28 Jul 2025)
Log Message:
-----------
Documentation additions and fixes.

Announce future changes to the ID generation.
Cf. Sphinx issue #1961 (https://github.com/sphinx-doc/sphinx/issues/1961).

Glossary entry for "unit proportion" in doctree doc.

TODO-comment: use imagesize.py to get dimensions from image files.
Faster than PIL, also handles SVG. (cf. Sphinx)

Various small fixes.

Modified Paths:
--------------
    trunk/docutils/RELEASE-NOTES.rst
    trunk/docutils/docs/ref/doctree.rst
    trunk/docutils/docs/ref/rst/directives.rst
    trunk/docutils/docs/user/html.rst
    trunk/docutils/docs/user/latex.rst
    trunk/docutils/docutils/nodes.py
    trunk/docutils/docutils/writers/_html_base.py

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2025-07-11 12:41:40 UTC (rev 10184)
+++ trunk/docutils/RELEASE-NOTES.rst	2025-07-28 20:10:46 UTC (rev 10185)
@@ -217,6 +217,12 @@
 Misc
 ----
 
+* Prefer explicit reference names as base for an HTML element's ID
+  in Docutils 1.0. No change for internal cross-references.
+  Cf. `Sphinx issue #1961`__
+
+  __ https://github.com/sphinx-doc/sphinx/issues/1961
+
 * Revise the `String I/O`__ interface used by the `publish_string()`
   and `publish_from_doctree()` publisher convenience functions.
   (In Python 3, name and behaviour no longer match.)

Modified: trunk/docutils/docs/ref/doctree.rst
===================================================================
--- trunk/docutils/docs/ref/doctree.rst	2025-07-11 12:41:40 UTC (rev 10184)
+++ trunk/docutils/docs/ref/doctree.rst	2025-07-28 20:10:46 UTC (rev 10185)
@@ -972,7 +972,7 @@
              Via the `%tbl.colspec.att`_ parameter entity, <colspec>
              also accepts the `common attributes`_ and `stub`_.
 
-             .. [#] Docutils ignores all but colwidth_.
+             .. [#] Docutils ignores all attributes except colwidth_.
 
 __ https://www.oasis-open.org/specs/tm9901.html#AEN446
 
@@ -4516,8 +4516,9 @@
 
 The attribute is defined in the `Exchange Table Model`_
 (which `see for details`__) as either a *proportional measure*
-(positive number followed by "*", e.g., "5*" for 5 times the unit proportion,
-or just "*" for one unit proportion) or a *fixed measure* (e.g., 2.5cm).
+(positive number followed by "*", e.g., "5*" for 5 times the
+`unit proportion`_ , or just "*" for one unit proportion)
+or a *fixed measure* (e.g., 2.5cm).
 Docutils supports only proportional measures.
 
 .. important::
@@ -5594,7 +5595,25 @@
      tabs, newlines, carriage returns, or form feeds, are replaced by a
      single space.  Leading and trailing whitespace is removed.
 
+_`Unit proportion`
+  is a length unit used in the definition of relative `table column widths`_
+  in the `Exchange Table Model`_.
 
+  Its definition boils down to
+
+     …, the *unit proportion* is determined by starting with the target
+     table width […].
+     Reduce that by the sum of border widths, column ruling widths, and
+     the fixed colwidths to get the available proportional width. […]
+     Then the unit proportion is the available proportional width divided
+     by the sum of the proportionality factors.
+
+     --- `Exchange Table Model, section 3.2.1`__
+
+  .. _table column widths: colwidth_
+  __ https://www.oasis-open.org/specs/tm9901.html#AEN285
+
+
 ------------
 Bibliography
 ------------

Modified: trunk/docutils/docs/ref/rst/directives.rst
===================================================================
--- trunk/docutils/docs/ref/rst/directives.rst	2025-07-11 12:41:40 UTC (rev 10184)
+++ trunk/docutils/docs/ref/rst/directives.rst	2025-07-28 20:10:46 UTC (rev 10185)
@@ -151,14 +151,13 @@
 --------
 
 There are two directives to include images: image_ and figure_.
+The table below provides a non exhaustive overview of
+supported image formats.
 
 .. attention::
 
-  Images are not supported by the `manpage`_ writer.
-
   It is up to the author to ensure compatibility of the image data format
-  with the output format or user agent (LaTeX engine, `HTML browser`__).
-  The following, non exhaustive table provides an overview.
+  with the output format or user agent (LaTeX engine, `HTML browser`__, …).
 
 .. _image formats:
 
@@ -173,6 +172,8 @@
 
 LaTeX_ [#]_ ✓ [#]_ ✓      ✓     ✓
 
+manpage_
+
 ODT_        ✓      ✓      ✓     ✓     ✓
 =========== ====== ====== ===== ===== ===== ===== ===== ===== ===== =====
 
@@ -188,7 +189,8 @@
 .. [#] When compiling with ``pdflatex``, ``xelatex``, or ``lualatex``.
        The original ``latex`` engine supports only the EPS image format.
        Some build systems, e.g. rubber_ support additional formats
-       via on-the-fly image conversion.
+       via on-the-fly image conversion. For details, see section
+       `image inclusion`__ in the LaTeX writer documentation.
 
 .. [#] New in Docutils 0.22.
        The `"svg" package`_ must be listed in the stylesheet__ setting.
@@ -198,10 +200,12 @@
 .. _html4 writer: ../../user/html.html#html4css1
 .. _HTML5:
 .. _html5 writer: ../../user/html.html#html5
-.. _LaTeX: ../../user/latex.html#image-inclusion
+.. _LaTeX:
+.. _LaTeX writer: ../../user/latex.html
 .. _ODT: ../../user/odt.html
 .. _manpage: ../../user/manpage.html
 .. _rubber: https://gitlab.com/latex-rubber/rubber
+__ ../../user/latex.html#image-inclusion
 .. _"svg" package: https://ctan.org/pkg/svg
 __ ../../user/config.html#stylesheet-latex-writers
 
@@ -849,7 +853,8 @@
 supplies.  Tables may be given titles with the "table_" directive.
 Sometimes reStructuredText tables are inconvenient to write, or table
 data in a standard format is readily available.  The "csv-table_"
-directive supports CSV [#CSV]_ data.
+directive supports CSV [#CSV]_ data, the "list-table_" directive uses
+a list-based input format.
 
 .. _table syntax: restructuredtext.html#tables
 
@@ -863,7 +868,7 @@
 :Doctree Element: `\<table>`_
 :Directive Arguments: one, optional (table caption)
 :Directive Options: `see below <table options_>`__
-:Directive Content: A normal `reStructuredText table`_.
+:Directive Content: one reStructuredText `grid table`_ or `simple table`_
 :Configuration Setting: table_style_
 
 The "table" directive is used to provide a table caption
@@ -1052,6 +1057,8 @@
    CSV dialect with the backslash as escape character.
 
 
+.. _list-table:
+
 List Table
 ==========
 
@@ -2283,6 +2290,7 @@
 .. _external hyperlink target:
 .. _external hyperlink targets:
     restructuredtext.html#external-hyperlink-targets
+.. _grid table: restructuredtext.html#grid-tables
 .. _hyperlink reference:
 .. _hyperlink references: restructuredtext.html#hyperlink-references
 .. _hyperlink targets:
@@ -2290,7 +2298,7 @@
 .. _supported length units: restructuredtext.html#length-units
 .. _reference name:
 .. _reference names: restructuredtext.html#reference-names
-.. _reStructuredText table: restructuredtext.html#tables
+.. _simple table: restructuredtext.html#simple-tables
 
 .. _reStructuredText Interpreted Text Roles:
 .. _interpreted text role: roles.html

Modified: trunk/docutils/docs/user/html.rst
===================================================================
--- trunk/docutils/docs/user/html.rst	2025-07-11 12:41:40 UTC (rev 10184)
+++ trunk/docutils/docs/user/html.rst	2025-07-28 20:10:46 UTC (rev 10185)
@@ -35,7 +35,7 @@
 html5
 -----
 
-:aliases:   _`html5_polyglot`
+:aliases:   _`html5_polyglot`, xhtml
 :front-end: rst2html5_
 :config:    `[html5 writer]`_
 
@@ -84,7 +84,7 @@
 html4css1
 ---------
 
-:aliases:   html4, html_
+:aliases:   html4, html_, xhtml10
 :front-end: rst2html4_
 :config:    `[html4css1 writer]`_
 

Modified: trunk/docutils/docs/user/latex.rst
===================================================================
--- trunk/docutils/docs/user/latex.rst	2025-07-11 12:41:40 UTC (rev 10184)
+++ trunk/docutils/docs/user/latex.rst	2025-07-28 20:10:46 UTC (rev 10185)
@@ -171,7 +171,6 @@
 
 .. contents:: :local:
 
-.. _option:
 .. _setting:
 .. _settings:
 
@@ -178,17 +177,16 @@
 Options/Settings
 ----------------
 
-Docutils configuration settings can be specified as
+`Docutils configuration settings`_ can be specified as
+*command-line options* or *configuration settings*.
 
-* command-line options, or
-
-* configuration settings.
-
-Run ``rst2latex --help`` to get a list of available options;
+Run ``rst2latex --help`` to get a list of available options or
 see `Docutils Configuration`_ for details.
 
+.. _Docutils configuration settings:
 .. _Docutils Configuration: config.html
 
+
 Classes
 -------
 
@@ -564,7 +562,7 @@
 
 .. _role directive: ../ref/rst/directives.html#role
 .. _text roles: ../ref/rst/roles.html
-.. _class directive: ../ref/rst/directives.html#class
+.. _class directive: ../ref/rst/directives.html#class-directive
 
 definition lists
 ----------------
@@ -1665,8 +1663,8 @@
 ------------
 
 A pre-configured *table style* can be globally selected via the table_style_
-setting or set for individual tables via a `class directive`_ or the class
-option of the `table directive`_.
+setting or set for individual tables via a `class directive`_ or the
+``class`` option of the `table directive`_.
 
 Supported values:
 
@@ -1681,7 +1679,7 @@
 
 colwidths-auto
   Column width determination by LaTeX.
-  Overridden by the `table directive`_'s "widths" option.
+  Overridden by the `table directive`_'s ``widths`` option.
 
   .. warning::
 
@@ -1697,7 +1695,7 @@
 
 By default, *column widths* are computed from the source column widths.
 The `legacy_column_widths`_ setting selects the conversion algorithm.
-Custom column widths can be set with the "widths" option of the `table
+Custom column widths can be set with the ``widths`` option of the `table
 directive`_.
 
 See also the section on problems with tables_ below.
@@ -1726,7 +1724,7 @@
 
 * The depth of the ToC and PDF-bookmarks can be configured
 
-  + with the "depth" argument of the `contents directive`_, or
+  + with the ``depth`` option of the `contents directive`_, or
 
   + in a style sheet with e.g. ``\setcounter{tocdepth}{5}``.
 
@@ -1735,7 +1733,7 @@
 
 .. note::
    Minitoc supports local ToCs only at "part" and top section level
-   ("chapter" or "section"). Local `contents` directives at lower levels
+   ("chapter" or "section"). Local "contents" directives at lower levels
    are ignored (a warning is issued).
 
    This is an intended feature of the minitoc_ package. If you really
@@ -2141,7 +2139,7 @@
 ```````````````````````
 
 Initially both were implemented using figure floats, because hyperlinking
-back and forth seemed to be impossible. Later the `figure` directive was
+back and forth seemed to be impossible. Later the `figure directive`_ was
 added that puts images into figure floats.
 
 This results in footnotes, citations, and figures possibly being mixed at
@@ -2158,6 +2156,7 @@
 group, i.e. ``[cite1]_ [cite2]_`` results in ``\cite{cite1,cite2}``.
 The appearance in the output can be configured in a `style sheet`_.
 
+.. _figure directive: ../ref/rst/directives.html#figure
 .. _use_latex_citations: config.html#use-latex-citations
 
 
@@ -2193,5 +2192,5 @@
 * Pdfbookmark level 4 (and greater) does not work (might be settable but
   complicated).
 
-* Hyperlinks are not hyphenated; this leads to bad spacing. See
-  docs/user/rst/demo.rst 2.14 directives.
+* Hyperlinks are not hyphenated; this leads to bad spacing.
+  See ``docs/user/rst/demo.rst`` section 2.14 "directives".

Modified: trunk/docutils/docutils/nodes.py
===================================================================
--- trunk/docutils/docutils/nodes.py	2025-07-11 12:41:40 UTC (rev 10184)
+++ trunk/docutils/docutils/nodes.py	2025-07-28 20:10:46 UTC (rev 10185)
@@ -1911,6 +1911,9 @@
         .. [#] Do not clear the name-to-id map or invalidate the old target if
            both old and new targets refer to identical URIs or reference names.
            The new target is invalidated regardless.
+
+        Provisional. There will be changes to prefer explicit reference names
+        as base for an element's ID.
         """
         for name in tuple(node['names']):
             if name in self.nameids:
@@ -1989,6 +1992,9 @@
     # "note" here is an imperative verb: "take note of".
     def note_implicit_target(
             self, target: Element, msgnode: Element | None = None) -> None:
+        # TODO: Postpone ID creation.  Register reference name instead of ID
+        # to allow for IDs based on explicit target pointing to the same
+        # element.  https://github.com/sphinx-doc/sphinx/issues/1961
         id = self.set_id(target, msgnode)
         self.set_name_id_map(target, id, msgnode, explicit=False)
 

Modified: trunk/docutils/docutils/writers/_html_base.py
===================================================================
--- trunk/docutils/docutils/writers/_html_base.py	2025-07-11 12:41:40 UTC (rev 10184)
+++ trunk/docutils/docutils/writers/_html_base.py	2025-07-28 20:10:46 UTC (rev 10185)
@@ -448,6 +448,8 @@
     def read_size_with_PIL(self, node) -> tuple[int, int] | None:
         # Try reading size from image file.
         # Internal auxiliary method called from `self.image_size()`.
+        # TODO: use https://github.com/shibukawa/imagesize_py
+        #       faster, also handles SVG, attention: bug
         reading_problems = []
         uri = node['uri']
         if not PIL:

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

[Docutils-checkins] SF.net SVN: docutils:[10184] trunk/docutils/docs/ref/ rst/restructuredtext.rst

[<gr...@us...>]

Revision: 10184
          http://sourceforge.net/p/docutils/code/10184
Author:   grubert
Date:     2025-07-11 12:41:40 +0000 (Fri, 11 Jul 2025)
Log Message:
-----------
Fix: documentation #506 backslash is not needed for backticks in backtics :-)

Modified Paths:
--------------
    trunk/docutils/docs/ref/rst/restructuredtext.rst

Modified: trunk/docutils/docs/ref/rst/restructuredtext.rst
===================================================================
--- trunk/docutils/docs/ref/rst/restructuredtext.rst	2025-06-24 07:23:08 UTC (rev 10183)
+++ trunk/docutils/docs/ref/rst/restructuredtext.rst	2025-07-11 12:41:40 UTC (rev 10184)
@@ -2522,7 +2522,7 @@
 
 - `inline internal targets`_: ``_``` and `````
 - `footnote references`_: ``[`` and ``]_``
-- `hyperlink references`_: ````` and ``\`_`` (phrases), or just a
+- `hyperlink references`_: ````` and ```_`` (phrases), or just a
   trailing ``_`` (single words)
 
 `Standalone hyperlinks`_ are recognized implicitly, and use no extra
@@ -2650,7 +2650,7 @@
 - Backquotes: `Inline literals`_ (``````), `inline internal targets`_
   (leading ``_```, trailing `````), are mutually independent, and are
   recognized before phrase `hyperlink references`_ (leading `````,
-  trailing ``\`_``) and `interpreted text`_ (`````).
+  trailing ```_``) and `interpreted text`_ (`````).
 
 - Trailing underscores: Footnote references (``[`` + label + ``]_``) and
   simple `hyperlink references`_ (name + trailing ``_``) are mutually
@@ -2841,9 +2841,9 @@
       reference type       name        start     end
      ===================  ==========  ========  =========
       named                simple_     none      ``_``
-      ..                   phrase_     `````\    ``\`_``
+      ..                   phrase_     `````\    ```_``
       anonymous_           simple      none      ``__``
-      ..                   phrase      `````\    ``\`__``
+      ..                   phrase      `````\    ```__``
      ===================  ==========  ========  =========
 
 :See also:        `hyperlink targets`_

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

[Docutils-checkins] SF.net SVN: docutils:[10183] trunk/sandbox/manpage-wr iter

[<gr...@us...>]

Revision: 10183
          http://sourceforge.net/p/docutils/code/10183
Author:   grubert
Date:     2025-06-24 07:23:08 +0000 (Tue, 24 Jun 2025)
Log Message:
-----------
version 0.22rc6.dev

Modified Paths:
--------------
    trunk/sandbox/manpage-writer/expected/characters.man
    trunk/sandbox/manpage-writer/expected/compact_lists.man
    trunk/sandbox/manpage-writer/expected/docinfo-deu-l_de.man
    trunk/sandbox/manpage-writer/expected/docinfo-deu-l_en.man
    trunk/sandbox/manpage-writer/expected/docinfo-deu.man
    trunk/sandbox/manpage-writer/expected/docinfo-eng-l_de.man
    trunk/sandbox/manpage-writer/expected/docinfo-eng-l_en.man
    trunk/sandbox/manpage-writer/expected/docinfo-eng.man
    trunk/sandbox/manpage-writer/expected/dotted.man
    trunk/sandbox/manpage-writer/expected/indent.man
    trunk/sandbox/manpage-writer/expected/man-de.1.man
    trunk/sandbox/manpage-writer/expected/optionslisttest.man
    trunk/sandbox/manpage-writer/expected/optionstoo.man
    trunk/sandbox/manpage-writer/expected/quotes.man
    trunk/sandbox/manpage-writer/expected/ref-2025-urue.man
    trunk/sandbox/manpage-writer/expected/ref-2025.man
    trunk/sandbox/manpage-writer/expected/references.man
    trunk/sandbox/manpage-writer/expected/refs-urue.man
    trunk/sandbox/manpage-writer/expected/refs.man
    trunk/sandbox/manpage-writer/expected/test.man
    trunk/sandbox/manpage-writer/expected-mandoc/characters.man
    trunk/sandbox/manpage-writer/expected-mandoc/compact_lists.man
    trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu-l_de.man
    trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu-l_en.man
    trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu.man
    trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng-l_de.man
    trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng-l_en.man
    trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng.man
    trunk/sandbox/manpage-writer/expected-mandoc/dotted.man
    trunk/sandbox/manpage-writer/expected-mandoc/indent.man
    trunk/sandbox/manpage-writer/expected-mandoc/man-de.1.man
    trunk/sandbox/manpage-writer/expected-mandoc/optionslisttest.man
    trunk/sandbox/manpage-writer/expected-mandoc/optionstoo.man
    trunk/sandbox/manpage-writer/expected-mandoc/quotes.man
    trunk/sandbox/manpage-writer/expected-mandoc/references.man
    trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.man
    trunk/sandbox/manpage-writer/expected-mandoc/test.man

Modified: trunk/sandbox/manpage-writer/expected/characters.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/characters.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/characters.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/compact_lists.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/compact_lists.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/compact_lists.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/docinfo-deu-l_de.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/docinfo-deu-l_de.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/docinfo-deu-l_de.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/docinfo-deu-l_en.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/docinfo-deu-l_en.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/docinfo-deu-l_en.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/docinfo-deu.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/docinfo-deu.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/docinfo-deu.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/docinfo-eng-l_de.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/docinfo-eng-l_de.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/docinfo-eng-l_de.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/docinfo-eng-l_en.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/docinfo-eng-l_en.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/docinfo-eng-l_en.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/docinfo-eng.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/docinfo-eng.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/docinfo-eng.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/dotted.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/dotted.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/dotted.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/indent.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/indent.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/indent.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/man-de.1.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/man-de.1.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/man-de.1.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,6 +1,6 @@
 '\" t
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/optionslisttest.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/optionslisttest.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/optionslisttest.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/optionstoo.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/optionstoo.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/optionstoo.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/quotes.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/quotes.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/quotes.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/ref-2025-urue.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/ref-2025-urue.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/ref-2025-urue.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/ref-2025.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/ref-2025.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/ref-2025.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/references.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/references.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/references.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/refs-urue.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/refs-urue.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/refs-urue.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/refs.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/refs.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/refs.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/test.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/test.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected/test.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,6 +1,6 @@
 '\" t
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/characters.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/characters.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected-mandoc/characters.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/compact_lists.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/compact_lists.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected-mandoc/compact_lists.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu-l_de.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu-l_de.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu-l_de.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu-l_en.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu-l_en.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu-l_en.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng-l_de.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng-l_de.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng-l_de.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng-l_en.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng-l_en.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng-l_en.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/dotted.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/dotted.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected-mandoc/dotted.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/indent.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/indent.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected-mandoc/indent.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/man-de.1.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/man-de.1.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected-mandoc/man-de.1.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,6 +1,6 @@
 '\" t
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/optionslisttest.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/optionslisttest.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected-mandoc/optionslisttest.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/optionstoo.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/optionstoo.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected-mandoc/optionstoo.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/quotes.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/quotes.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected-mandoc/quotes.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/references.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/references.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected-mandoc/references.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/test.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/test.man	2025-06-24 07:21:23 UTC (rev 10182)
+++ trunk/sandbox/manpage-writer/expected-mandoc/test.man	2025-06-24 07:23:08 UTC (rev 10183)
@@ -1,6 +1,6 @@
 '\" t
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

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

[Docutils-checkins] SF.net SVN: docutils:[10182] trunk/sandbox/infrastructure/ releasing-log.rst

[<gr...@us...>]

Revision: 10182
          http://sourceforge.net/p/docutils/code/10182
Author:   grubert
Date:     2025-06-24 07:21:23 +0000 (Tue, 24 Jun 2025)
Log Message:
-----------
0.2rc5 log

Modified Paths:
--------------
    trunk/sandbox/infrastructure/releasing-log.rst

Modified: trunk/sandbox/infrastructure/releasing-log.rst
===================================================================
--- trunk/sandbox/infrastructure/releasing-log.rst	2025-06-24 07:20:11 UTC (rev 10181)
+++ trunk/sandbox/infrastructure/releasing-log.rst	2025-06-24 07:21:23 UTC (rev 10182)
@@ -19,6 +19,36 @@
 
 Follow steps from rc4, varying the python versions in tox runs.
 
+* checkout current code
+* run: tox -epy313
+* set_version 0.22rc5
+* run: tox -epy314 : fail
+* fix the version_info release to True
+* run: tox -epy310
+* Check README, HISTORY and RELEASE-NOTES titles.
+* check: svn di
+* svn commit 
+* build wheel and tgz
+* upload to pypi
+* remove all docutils wheels from pip cache
+* test src.tgz from pypi, do not forget --pre argument to get the pre-release:
+  ignore missing HISTORY
+* test wheel from pypi::
+  
+    pip install --pre  --no-cache-dir docutils
+
+  ignore missing HISTORY.rst
+
+* update code in working directory
+* run tox : pass 39, 311, 312, 313
+* set_version 0.22rc6.dev
+* check docutils/__init__ : was False ... good
+* run: tox -epy312
+* Check README, HISTORY and RELEASE-NOTES titles.
+* Check: svn di
+* commit
+* run: sandbox/infrastructure/docutils-update.local
+
 Release 0.22rc4 (2025-06-17)
 ============================
 
@@ -47,7 +77,7 @@
 * update code in working directory
 * run tox : pass 39, 311, 312, 313
 * set_version 0.22rc5.dev
-* check docutils/__init__ : was Fale ... good
+* check docutils/__init__ : was False ... good
 * run: tox -epy314
 * Check README, HISTORY and RELEASE-NOTES titles.
 * Check: svn di

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

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

[<gr...@us...>]

Revision: 10181
          http://sourceforge.net/p/docutils/code/10181
Author:   grubert
Date:     2025-06-24 07:20:11 +0000 (Tue, 24 Jun 2025)
Log Message:
-----------
version 0.22rc6.dev

Modified Paths:
--------------
    trunk/docutils/HISTORY.rst
    trunk/docutils/README.rst
    trunk/docutils/RELEASE-NOTES.rst
    trunk/docutils/docutils/__init__.py
    trunk/docutils/test/functional/expected/buggy_mathml.html
    trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html
    trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html
    trunk/docutils/test/functional/expected/buggy_mathml_ttm.html
    trunk/docutils/test/functional/expected/compact_lists.html
    trunk/docutils/test/functional/expected/dangerous.html
    trunk/docutils/test/functional/expected/field_name_limit.html
    trunk/docutils/test/functional/expected/footnotes_html5.html
    trunk/docutils/test/functional/expected/length_units_html5.html
    trunk/docutils/test/functional/expected/math_experiments_mathml.html
    trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html
    trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html
    trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html
    trunk/docutils/test/functional/expected/math_output_html.html
    trunk/docutils/test/functional/expected/math_output_latex.html
    trunk/docutils/test/functional/expected/math_output_mathjax.html
    trunk/docutils/test/functional/expected/math_output_mathml.html
    trunk/docutils/test/functional/expected/mathematics_mathml.html
    trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html
    trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html
    trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html
    trunk/docutils/test/functional/expected/misc_rst_html4css1.html
    trunk/docutils/test/functional/expected/misc_rst_html5.html
    trunk/docutils/test/functional/expected/pep_html.html
    trunk/docutils/test/functional/expected/rst_html5_tuftig.html
    trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
    trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
    trunk/docutils/test/functional/expected/standalone_rst_html5.html
    trunk/docutils/test/functional/expected/standalone_rst_manpage.man
    trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
    trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
    trunk/docutils/test/test_writers/test_manpage.py

Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/HISTORY.rst	2025-06-24 07:20:11 UTC (rev 10181)
@@ -14,6 +14,11 @@
 .. contents::
 
 
+Release 0.22rc6 (unpublished)
+=============================
+
+.
+
 Release 0.22rc5 (2025-06-24)
 ============================
 

Modified: trunk/docutils/README.rst
===================================================================
--- trunk/docutils/README.rst	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/README.rst	2025-06-24 07:20:11 UTC (rev 10181)
@@ -1,6 +1,6 @@
-==========================
- README: Docutils 0.22rc5
-==========================
+==============================
+ README: Docutils 0.22rc6.dev
+==============================
 
 :Author: David Goodger
 :Contact: go...@py...

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/RELEASE-NOTES.rst	2025-06-24 07:20:11 UTC (rev 10181)
@@ -244,6 +244,11 @@
    __ https://packages.debian.org/source/trixie/python-docutils
 
 
+Release 0.22rc6 (unpublished)
+=============================
+
+.
+
 Release 0.22rc5 (2025-06-24)
 ============================
 

Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/docutils/__init__.py	2025-06-24 07:20:11 UTC (rev 10181)
@@ -85,7 +85,7 @@
 
 __docformat__ = 'reStructuredText'
 
-__version__ = '0.22rc5'
+__version__ = '0.22rc6.dev'
 """Docutils version identifier (complies with PEP 440)::
 
     major.minor[.micro][releaselevel[serial]][.dev]
@@ -161,8 +161,8 @@
     minor=22,
     micro=0,
     releaselevel='candidate',  # one of 'alpha', 'beta', 'candidate', 'final'
-    serial=5,  # pre-release number (0 for final releases and snapshots)
-    release=True  # True for official releases and pre-releases
+    serial=6,  # pre-release number (0 for final releases and snapshots)
+    release=False  # True for official releases and pre-releases
     )
 """Comprehensive version information tuple.
 

Modified: trunk/docutils/test/functional/expected/buggy_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/buggy_mathml.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>buggy-maths</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>buggy-maths</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>buggy-maths</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/buggy_mathml_ttm.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml_ttm.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/buggy_mathml_ttm.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>buggy-maths</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/compact_lists.html
===================================================================
--- trunk/docutils/test/functional/expected/compact_lists.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/compact_lists.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <title>compact_lists.rst</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/dangerous.html
===================================================================
--- trunk/docutils/test/functional/expected/dangerous.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/dangerous.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <title>dangerous.rst</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/field_name_limit.html
===================================================================
--- trunk/docutils/test/functional/expected/field_name_limit.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/field_name_limit.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <title>field_list.rst</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/footnotes_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/footnotes_html5.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Test footnote and citation rendering</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/length_units_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/length_units_html5.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/length_units_html5.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Test length specifications</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_experiments_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/math_experiments_mathml.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Math Conversion Tests</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html
===================================================================
--- trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Math Conversion Tests</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html
===================================================================
--- trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Math Conversion Tests</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html
===================================================================
--- trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Math Conversion Tests</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_output_html.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_html.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/math_output_html.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 <link rel="stylesheet" href="../input/data/math.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_output_latex.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_latex.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/math_output_latex.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/math_output_mathjax.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathjax.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <title>Mathematics</title>
 <script type="text/javascript" src="/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS_CHTML"></script>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_output_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathml.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/math_output_mathml.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/mathematics_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/mathematics_mathml.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/mathematics_mathml.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>LaTeX syntax for mathematics</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html
===================================================================
--- trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>LaTeX syntax for mathematics</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html
===================================================================
--- trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>LaTeX syntax for mathematics</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html
===================================================================
--- trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>LaTeX syntax for mathematics</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/misc_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html4css1.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <title>Additional tests with html4css1</title>
 <link rel="stylesheet" href="foo&amp;bar.css" type="text/css" />
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/misc_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html5.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/misc_rst_html5.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Additional tests with HTML 5</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/pep_html.html
===================================================================
--- trunk/docutils/test/functional/expected/pep_html.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/pep_html.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -8,7 +8,7 @@
 -->
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+  <meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
   <title>PEP 100 - Test PEP</title>
   <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/rst_html5_tuftig.html
===================================================================
--- trunk/docutils/test/functional/expected/rst_html5_tuftig.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/rst_html5_tuftig.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Special Features of the tuftig.css Stylesheet</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml	2025-06-24 07:20:11 UTC (rev 10181)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<!-- Generated by Docutils 0.22rc5 -->
+<!-- Generated by Docutils 0.22rc6.dev -->
 <document ids="restructuredtext-test-document doctitle" names="restructuredtext\ test\ document doctitle" source="functional/input/standalone_rst_docutils_xml.rst" 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>

Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta content="reStructuredText, test, parser" name="keywords" />
 <meta content="A test document, containing at least one example of each reStructuredText construct." lang="en" name="description" />
 <meta name="author" content="David Goodger" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html5.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <meta content="reStructuredText, test, parser" name="keywords" />
 <meta content="A test document, containing at least one example of each reStructuredText construct." lang="en" name="description" xml:lang="en" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_manpage.man
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_manpage.man	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/standalone_rst_manpage.man	2025-06-24 07:20:11 UTC (rev 10181)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5 manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="version" content="S5 1.1" />
 <meta name="author" content="David Goodger" />
 <meta name="date" content="2005-11-28" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html	2025-06-24 07:20:11 UTC (rev 10181)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc6.dev: https://docutils.sourceforge.io/" />
 <meta name="version" content="S5 1.1" />
 <meta name="author" content="David Goodger" />
 <meta name="date" content="2005-11-28" />

Modified: trunk/docutils/test/test_writers/test_manpage.py
===================================================================
--- trunk/docutils/test/test_writers/test_manpage.py	2025-06-24 06:58:29 UTC (rev 10180)
+++ trunk/docutils/test/test_writers/test_manpage.py	2025-06-24 07:20:11 UTC (rev 10181)
@@ -96,7 +96,7 @@
 
 
 document_start = r""".\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5 manpage writer.
+.\" by the Docutils 0.22rc6.dev manpage writer.
 .
 """
 

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

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

[<gr...@us...>]

Revision: 10180
          http://sourceforge.net/p/docutils/code/10180
Author:   grubert
Date:     2025-06-24 06:58:29 +0000 (Tue, 24 Jun 2025)
Log Message:
-----------
version 0.22rc5

Modified Paths:
--------------
    trunk/docutils/HISTORY.rst
    trunk/docutils/README.rst
    trunk/docutils/RELEASE-NOTES.rst
    trunk/docutils/docutils/__init__.py
    trunk/docutils/test/functional/expected/buggy_mathml.html
    trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html
    trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html
    trunk/docutils/test/functional/expected/buggy_mathml_ttm.html
    trunk/docutils/test/functional/expected/compact_lists.html
    trunk/docutils/test/functional/expected/dangerous.html
    trunk/docutils/test/functional/expected/field_name_limit.html
    trunk/docutils/test/functional/expected/footnotes_html5.html
    trunk/docutils/test/functional/expected/length_units_html5.html
    trunk/docutils/test/functional/expected/math_experiments_mathml.html
    trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html
    trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html
    trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html
    trunk/docutils/test/functional/expected/math_output_html.html
    trunk/docutils/test/functional/expected/math_output_latex.html
    trunk/docutils/test/functional/expected/math_output_mathjax.html
    trunk/docutils/test/functional/expected/math_output_mathml.html
    trunk/docutils/test/functional/expected/mathematics_mathml.html
    trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html
    trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html
    trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html
    trunk/docutils/test/functional/expected/misc_rst_html4css1.html
    trunk/docutils/test/functional/expected/misc_rst_html5.html
    trunk/docutils/test/functional/expected/pep_html.html
    trunk/docutils/test/functional/expected/rst_html5_tuftig.html
    trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
    trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
    trunk/docutils/test/functional/expected/standalone_rst_html5.html
    trunk/docutils/test/functional/expected/standalone_rst_manpage.man
    trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
    trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
    trunk/docutils/test/test_writers/test_manpage.py

Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/HISTORY.rst	2025-06-24 06:58:29 UTC (rev 10180)
@@ -14,8 +14,8 @@
 .. contents::
 
 
-Release 0.22rc5 (unpublished)
-=============================
+Release 0.22rc5 (2025-06-24)
+============================
 
 * docutils/nodes.py
 

Modified: trunk/docutils/README.rst
===================================================================
--- trunk/docutils/README.rst	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/README.rst	2025-06-24 06:58:29 UTC (rev 10180)
@@ -1,6 +1,6 @@
-==============================
- README: Docutils 0.22rc5.dev
-==============================
+==========================
+ README: Docutils 0.22rc5
+==========================
 
 :Author: David Goodger
 :Contact: go...@py...

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/RELEASE-NOTES.rst	2025-06-24 06:58:29 UTC (rev 10180)
@@ -244,8 +244,8 @@
    __ https://packages.debian.org/source/trixie/python-docutils
 
 
-Release 0.22rc5 (unpublished)
-=============================
+Release 0.22rc5 (2025-06-24)
+============================
 
 Targets generated from hyperlink references with embedded URI or alias
 are no longer "explicit" but "implicit" (i.e. with the same priority as
@@ -254,8 +254,8 @@
 __ https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html
    #implicit-hyperlink-targets
 
+Don't report an error for duplicate targets with identical refname.
 
-
 Release 0.22rc4 (2025-06-17)
 ============================
 

Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/docutils/__init__.py	2025-06-24 06:58:29 UTC (rev 10180)
@@ -85,7 +85,7 @@
 
 __docformat__ = 'reStructuredText'
 
-__version__ = '0.22rc5.dev'
+__version__ = '0.22rc5'
 """Docutils version identifier (complies with PEP 440)::
 
     major.minor[.micro][releaselevel[serial]][.dev]
@@ -162,7 +162,7 @@
     micro=0,
     releaselevel='candidate',  # one of 'alpha', 'beta', 'candidate', 'final'
     serial=5,  # pre-release number (0 for final releases and snapshots)
-    release=False  # True for official releases and pre-releases
+    release=True  # True for official releases and pre-releases
     )
 """Comprehensive version information tuple.
 

Modified: trunk/docutils/test/functional/expected/buggy_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/buggy_mathml.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>buggy-maths</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>buggy-maths</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>buggy-maths</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/buggy_mathml_ttm.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml_ttm.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/buggy_mathml_ttm.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>buggy-maths</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/compact_lists.html
===================================================================
--- trunk/docutils/test/functional/expected/compact_lists.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/compact_lists.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <title>compact_lists.rst</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/dangerous.html
===================================================================
--- trunk/docutils/test/functional/expected/dangerous.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/dangerous.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <title>dangerous.rst</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/field_name_limit.html
===================================================================
--- trunk/docutils/test/functional/expected/field_name_limit.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/field_name_limit.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <title>field_list.rst</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/footnotes_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/footnotes_html5.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Test footnote and citation rendering</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/length_units_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/length_units_html5.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/length_units_html5.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Test length specifications</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_experiments_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/math_experiments_mathml.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Math Conversion Tests</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html
===================================================================
--- trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Math Conversion Tests</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html
===================================================================
--- trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Math Conversion Tests</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html
===================================================================
--- trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Math Conversion Tests</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_output_html.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_html.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/math_output_html.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 <link rel="stylesheet" href="../input/data/math.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_output_latex.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_latex.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/math_output_latex.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/math_output_mathjax.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathjax.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <title>Mathematics</title>
 <script type="text/javascript" src="/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS_CHTML"></script>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_output_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathml.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/math_output_mathml.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/mathematics_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/mathematics_mathml.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/mathematics_mathml.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>LaTeX syntax for mathematics</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html
===================================================================
--- trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>LaTeX syntax for mathematics</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html
===================================================================
--- trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>LaTeX syntax for mathematics</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html
===================================================================
--- trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>LaTeX syntax for mathematics</title>
 <link rel="stylesheet" href="../../../docutils/writers/html5_polyglot/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/misc_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html4css1.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <title>Additional tests with html4css1</title>
 <link rel="stylesheet" href="foo&amp;bar.css" type="text/css" />
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/misc_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html5.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/misc_rst_html5.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Additional tests with HTML 5</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/pep_html.html
===================================================================
--- trunk/docutils/test/functional/expected/pep_html.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/pep_html.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -8,7 +8,7 @@
 -->
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+  <meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
   <title>PEP 100 - Test PEP</title>
   <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/rst_html5_tuftig.html
===================================================================
--- trunk/docutils/test/functional/expected/rst_html5_tuftig.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/rst_html5_tuftig.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Special Features of the tuftig.css Stylesheet</title>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml	2025-06-24 06:58:29 UTC (rev 10180)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<!-- Generated by Docutils 0.22rc5.dev -->
+<!-- Generated by Docutils 0.22rc5 -->
 <document ids="restructuredtext-test-document doctitle" names="restructuredtext\ test\ document doctitle" source="functional/input/standalone_rst_docutils_xml.rst" 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>

Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta content="reStructuredText, test, parser" name="keywords" />
 <meta content="A test document, containing at least one example of each reStructuredText construct." lang="en" name="description" />
 <meta name="author" content="David Goodger" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html5.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <meta content="reStructuredText, test, parser" name="keywords" />
 <meta content="A test document, containing at least one example of each reStructuredText construct." lang="en" name="description" xml:lang="en" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_manpage.man
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_manpage.man	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/standalone_rst_manpage.man	2025-06-24 06:58:29 UTC (rev 10180)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc5 manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="version" content="S5 1.1" />
 <meta name="author" content="David Goodger" />
 <meta name="date" content="2005-11-28" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html	2025-06-24 06:58:29 UTC (rev 10180)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22rc5.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc5: https://docutils.sourceforge.io/" />
 <meta name="version" content="S5 1.1" />
 <meta name="author" content="David Goodger" />
 <meta name="date" content="2005-11-28" />

Modified: trunk/docutils/test/test_writers/test_manpage.py
===================================================================
--- trunk/docutils/test/test_writers/test_manpage.py	2025-06-24 06:52:39 UTC (rev 10179)
+++ trunk/docutils/test/test_writers/test_manpage.py	2025-06-24 06:58:29 UTC (rev 10180)
@@ -96,7 +96,7 @@
 
 
 document_start = r""".\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc5.dev manpage writer.
+.\" by the Docutils 0.22rc5 manpage writer.
 .
 """
 

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

[Docutils-checkins] SF.net SVN: docutils:[10179] trunk/sandbox/infrastruc ture/releasing-log.rst

[<gr...@us...>]

Revision: 10179
          http://sourceforge.net/p/docutils/code/10179
Author:   grubert
Date:     2025-06-24 06:52:39 +0000 (Tue, 24 Jun 2025)
Log Message:
-----------
typo

Modified Paths:
--------------
    trunk/sandbox/infrastructure/releasing-log.rst

Modified: trunk/sandbox/infrastructure/releasing-log.rst
===================================================================
--- trunk/sandbox/infrastructure/releasing-log.rst	2025-06-23 15:42:44 UTC (rev 10178)
+++ trunk/sandbox/infrastructure/releasing-log.rst	2025-06-24 06:52:39 UTC (rev 10179)
@@ -10,6 +10,15 @@
 Notes on what happend while releasing.
 
 
+Release 0.22rc5 (2025-06-24)
+============================
+
+A small correction:
+
+  Don't report an error for duplicate targets with identical refname
+
+Follow steps from rc4, varying the python versions in tox runs.
+
 Release 0.22rc4 (2025-06-17)
 ============================
 
@@ -17,7 +26,7 @@
 
 * checkout current code
 * run: tox -epy312
-* set_version 022rc4
+* set_version 0.22rc4
 * run: tox -epy313 : fail
 * fix the version_info release to True
 * run: tox -epy314

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

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

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

Revision: 10178
          http://sourceforge.net/p/docutils/code/10178
Author:   milde
Date:     2025-06-23 15:42:44 +0000 (Mon, 23 Jun 2025)
Log Message:
-----------
Revise documentation.

Clarify description of the handling of duplicate reference names in the
reStructuredText Specification and the docstring in docutils.nodes.

Modified Paths:
--------------
    trunk/docutils/docs/ref/rst/restructuredtext.rst
    trunk/docutils/docutils/nodes.py

Modified: trunk/docutils/docs/ref/rst/restructuredtext.rst
===================================================================
--- trunk/docutils/docs/ref/rst/restructuredtext.rst	2025-06-21 22:10:15 UTC (rev 10177)
+++ trunk/docutils/docs/ref/rst/restructuredtext.rst	2025-06-23 15:42:44 UTC (rev 10178)
@@ -455,12 +455,14 @@
 reference (``[#note]_``), can also be referred to by a plain hyperlink
 reference (``note_``).  Of course, each type of reference (hyperlink,
 footnote, citation) may be processed and rendered differently.  Some
-care should be taken to avoid reference name conflicts.
+care should be taken to avoid reference name conflicts. [#]_
 References to `substitution definitions`_ (`substitution references`_)
 use a different namespace.
 
 .. [#case-forgiving] Matching `substitution references`_ to
    `substitution definitions`_ is `case-sensitive but forgiving`_.
+.. [#] Docutils' rules for handling duplicate names are described in
+   section `Implicit Hyperlink Targets`_.
 
 
 Document Structure
@@ -1704,7 +1706,7 @@
 whitespace, followed by indented body elements.  A footnote label can
 be:
 
-- a whole decimal number consisting of one or more digits,
+- an integer consisting of one or more digits,
 
 - a single ``#`` (denoting `auto-numbered footnotes`_),
 
@@ -1729,11 +1731,9 @@
 
     .. [1] Body elements go here.
 
-Each footnote automatically generates a hyperlink target pointing to
-itself.  The text of the hyperlink target name is the same as that of
-the footnote label.  `Auto-numbered footnotes`_ generate a number as
-their footnote label and reference name.  See `Implicit Hyperlink
-Targets`_ for a complete description of the mechanism.
+Each footnote automatically generates a `hyperlink target`_ pointing
+to itself (auto-numbered and auto-symbol footnotes generate `implicit
+hyperlink targets`_).  The target name is is the footnote label.
 
 Syntax diagram::
 
@@ -1755,10 +1755,10 @@
 label "1", the second is assigned the label "2", and so on (assuming
 there are no manually numbered footnotes present; see `Mixed Manual
 and Auto-Numbered Footnotes`_ below).  A footnote which has
-automatically received a label "1" generates an implicit hyperlink
-target with name "1", just as if the label was explicitly specified.
+automatically received a label "1" generates an `implicit hyperlink
+target`_ with name "1".
 
-.. _autonumber label: `autonumber labels`_
+.. _autonumber label:
 
 A footnote may specify a label explicitly while at the same time
 requesting automatic numbering: ``[#label]``.  These labels are called
@@ -1891,6 +1891,7 @@
 
 
 .. _explicit hyperlink targets:
+.. _hyperlink target:
 
 Hyperlink Targets
 `````````````````
@@ -2461,33 +2462,40 @@
 Implicit hyperlink targets are generated by `section titles`_,
 auto-numbered footnotes_, and hyperlink references with `embedded URIs
 and aliases`_. They may also be generated by extension constructs.
+Implicit hyperlink targets behave identically to `explicit hyperlink
+targets`_ except in case of duplicate reference names.
 
-Implicit hyperlink targets behave identically to explicit `hyperlink
-targets`_ except in case of duplicate reference names:
+Ambiguity due to different targets with the same reference name is
+avoided by the following procedure:
 
-1. `Explicit hyperlink targets`_ override any implicit targets having
-   the same reference name.  The implicit hyperlink targets are
-   removed, and level-1 (info) system messages are inserted.
+#. Duplicate external__ or indirect__ hyperlink targets that refer to
+   the same URI or hyperlink reference do not conflict.  One target
+   is removed and an INFO [#level]_ system message inserted.
 
-2. Duplicate implicit hyperlink targets are removed, and level-1
-   (info) system messages inserted.  For example, if two or more
-   sections have the same title (such as "Introduction" subsections of
-   a rigidly-structured document), there will be duplicate implicit
+   __ `external hyperlink targets`_
+   __ `indirect hyperlink targets`_
+
+#. `Explicit hyperlink targets`_ override any implicit targets having
+   the same reference name.  The implicit hyperlink target is removed,
+   and an INFO [#level]_ system message inserted.
+
+#. Duplicate implicit hyperlink targets are removed, and INFO [#level]_
+   system messages inserted.  For example, if two or more sections
+   have the same title (such as "Introduction" subsections of a
+   rigidly-structured document), there will be duplicate implicit
    hyperlink targets.
 
-3. Duplicate explicit hyperlink targets are removed, and level-2
-   (warning) system messages are inserted.
+#. Duplicate explicit hyperlink targets are removed, and WARNING [#level]_
+   system messages inserted.
 
-4. Exception: duplicate external or indirect hyperlink targets
-   (identical reference names and referenced URIs or hyperlink
-   references) do not conflict, one is removed.
+The parser returns a set of *unique* hyperlink targets.  The calling
+software (such as Docutils_) can warn of unresolvable links, giving
+reasons for the messages.
 
-System messages are inserted where target links have been removed.
-See "Error Handling" in `PEP 258`_.
+.. [#level] See `Error Handling`__ in PEP 258 for a description of
+   system message levels.
 
-The parser must return a set of *unique* hyperlink targets.  The
-calling software (such as Docutils_) can warn of unresolvable
-links, giving reasons for the messages.
+   __ ../../peps/pep-0258.html#error-handling
 
 
 Inline Markup

Modified: trunk/docutils/docutils/nodes.py
===================================================================
--- trunk/docutils/docutils/nodes.py	2025-06-21 22:10:15 UTC (rev 10177)
+++ trunk/docutils/docutils/nodes.py	2025-06-23 15:42:44 UTC (rev 10178)
@@ -1878,30 +1878,35 @@
                         explicit: bool = False,
                         ) -> None:
         """
-        `self.nameids` maps names to IDs, while `self.nametypes` maps names to
-        booleans representing hyperlink target type (True==explicit,
-        False==implicit).  This method updates the mappings.
+        Update the name/id mappings.
 
+        `self.nameids` maps names to IDs. The value ``None`` indicates
+        that the name is a "dupname" (i.e. there are already at least
+        two targets with the same name and type).
+
+        `self.nametypes` maps names to booleans representing
+        hyperlink target type (True==explicit, False==implicit).
+
         The following state transition table shows how `self.nameids` items
         ("id") and `self.nametypes` items ("type") change with new input
         (a call to this method), and what actions are performed:
 
-        ====  ========  ========  ========  =======  ====  ========  =====
-          Old State      Input          Action        New State      Notes
-        --------------  --------  -----------------  --------------  -----
-        id    type      new type  sys.msg.  dupname  id    type
-        ====  ========  ========  ========  =======  ====  ========  =====
-        -     -         explicit  -         -        new   explicit
-        -     -         implicit  -         -        new   implicit
-        -     implicit  explicit  -         -        new   explicit
-        old   implicit  explicit  INFO      old      new   explicit
-        -     explicit  explicit  ERROR     new      -     explicit
-        old   explicit  explicit  ERROR     new,old  -     explicit  [#]_
-        -     implicit  implicit  INFO      new      -     implicit
-        old   implicit  implicit  INFO      new,old  -     implicit
-        -     explicit  implicit  INFO      new      -     explicit
-        old   explicit  implicit  INFO      new      old   explicit
-        ====  ========  ========  ========  =======  ====  ========  =====
+        ========  ====  ========  ====  ========  ======== =======  ======
+         Input      Old State      New State            Action      Notes
+        --------  --------------  --------------  ----------------  ------
+        type      id    type      id    type      dupname  report
+        ========  ====  ========  ====  ========  ======== =======  ======
+        explicit                  new   explicit
+        implicit                  new   implicit
+        explicit  old   explicit  None  explicit  new,old  WARNING  [#ex]_
+        implicit  old   explicit  old   explicit  new      INFO     [#ex]_
+        explicit  old   implicit  new   explicit  old      INFO     [#ex]_
+        implicit  old   implicit  None  implicit  new,old  INFO     [#ex]_
+        explicit  None  explicit  None  explicit  new      WARNING
+        implicit  None  explicit  None  explicit  new      INFO
+        explicit  None  implicit  new   explicit
+        implicit  None  implicit  None  implicit  new      INFO
+        ========  ====  ========  ====  ========  ======== =======  ======
 
         .. [#] Do not clear the name-to-id map or invalidate the old target if
            both old and new targets refer to identical URIs or reference names.

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

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

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

Revision: 10177
          http://sourceforge.net/p/docutils/code/10177
Author:   milde
Date:     2025-06-21 22:10:15 +0000 (Sat, 21 Jun 2025)
Log Message:
-----------
Don't report an error for duplicate targets with identical refname.

Widen the existing exception for external targets with duplicate names
(no warning/error, if both refer to the same URI) to indirect targets
(no warning/error, if both refer to the same refname).

Modified Paths:
--------------
    trunk/docutils/HISTORY.rst
    trunk/docutils/docs/ref/rst/restructuredtext.rst
    trunk/docutils/docutils/nodes.py
    trunk/docutils/test/test_parsers/test_rst/test_targets.py

Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst	2025-06-18 14:03:25 UTC (rev 10176)
+++ trunk/docutils/HISTORY.rst	2025-06-21 22:10:15 UTC (rev 10177)
@@ -17,8 +17,13 @@
 Release 0.22rc5 (unpublished)
 =============================
 
-* docutils/docutils/parsers/rst/states.py
+* docutils/nodes.py
 
+  - Don't invalidate indirect targets with duplicate name, if they refer to
+    the same refname (similar to external targets refering to the same URI).
+
+* docutils/parsers/rst/states.py
+
   - "Downgrade" targets generated from hyperlink references with embedded
     URI or alias from explicit to implicit (cf. bug #502).
 

Modified: trunk/docutils/docs/ref/rst/restructuredtext.rst
===================================================================
--- trunk/docutils/docs/ref/rst/restructuredtext.rst	2025-06-18 14:03:25 UTC (rev 10176)
+++ trunk/docutils/docs/ref/rst/restructuredtext.rst	2025-06-21 22:10:15 UTC (rev 10177)
@@ -2478,9 +2478,9 @@
 3. Duplicate explicit hyperlink targets are removed, and level-2
    (warning) system messages are inserted.
 
-4. Exception: duplicate `external hyperlink targets`_ (identical
-   reference names and referenced URIs) do not conflict, and are not
-   removed.
+4. Exception: duplicate external or indirect hyperlink targets
+   (identical reference names and referenced URIs or hyperlink
+   references) do not conflict, one is removed.
 
 System messages are inserted where target links have been removed.
 See "Error Handling" in `PEP 258`_.

Modified: trunk/docutils/docutils/nodes.py
===================================================================
--- trunk/docutils/docutils/nodes.py	2025-06-18 14:03:25 UTC (rev 10176)
+++ trunk/docutils/docutils/nodes.py	2025-06-21 22:10:15 UTC (rev 10177)
@@ -1904,7 +1904,7 @@
         ====  ========  ========  ========  =======  ====  ========  =====
 
         .. [#] Do not clear the name-to-id map or invalidate the old target if
-           both old and new targets are external and refer to identical URIs.
+           both old and new targets refer to identical URIs or reference names.
            The new target is invalidated regardless.
         """
         for name in tuple(node['names']):
@@ -1929,11 +1929,13 @@
 
         self.nametypes[name] = old_explicit or explicit
 
-        if (old_id is not None and 'refuri' in node
-            and node['refuri'] == old_node.get('refuri')):
-            # external targets with same URI -> keep old target
+        if old_id is not None and (
+            'refname' in node and node['refname'] == old_node.get('refname')
+            or 'refuri' in node and node['refuri'] == old_node.get('refuri')
+            ):
+            # indirect targets with same reference -> keep old target
             level = 1
-            ref = node["refuri"]
+            ref = node.get('refuri') or node.get('refname')
             s = f'Duplicate name "{name}" for external target "{ref}".'
             dupname(node, name)
         elif explicit:

Modified: trunk/docutils/test/test_parsers/test_rst/test_targets.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_targets.py	2025-06-18 14:03:25 UTC (rev 10176)
+++ trunk/docutils/test/test_parsers/test_rst/test_targets.py	2025-06-21 22:10:15 UTC (rev 10177)
@@ -249,6 +249,33 @@
     <target dupnames="example" ids="example-1" refuri="example.rst">
 """],
 ["""\
+Duplicate indirect _`targets` (same refname):
+
+.. _link: targets_
+
+.. _link: targets_
+
+do not conflict. The reference name can be used in a link_.
+""",
+"""\
+<document source="test data">
+    <paragraph>
+        Duplicate indirect \n\
+        <target ids="targets" names="targets">
+            targets
+         (same refname):
+    <target ids="link" names="link" refname="targets">
+    <system_message backrefs="link-1" level="1" line="5" source="test data" type="INFO">
+        <paragraph>
+            Duplicate name "link" for external target "targets".
+    <target dupnames="link" ids="link-1" refname="targets">
+    <paragraph>
+        do not conflict. The reference name can be used in a \n\
+        <reference name="link" refname="link">
+            link
+        .
+"""],
+["""\
 Duplicate implicit targets.
 
 Title

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

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

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

Revision: 10176
          http://sourceforge.net/p/docutils/code/10176
Author:   milde
Date:     2025-06-18 14:03:25 +0000 (Wed, 18 Jun 2025)
Log Message:
-----------
Make targets from hyperlink references with embedded URI or alias implicit.

Embedding a URI or alias name in a hyperlink reference is no explicit request
for a target (cf. bug #502). Downgrade the priority of the generated targets from
explicit to implicit to avoid surprising warnings in case of name duplication.

(Anonymous references can be used to avoid the warnings but, in case of a typo,
the warnings/errors have no source/line information.)

Modified Paths:
--------------
    trunk/docutils/HISTORY.rst
    trunk/docutils/RELEASE-NOTES.rst
    trunk/docutils/docs/ref/rst/restructuredtext.rst
    trunk/docutils/docutils/nodes.py
    trunk/docutils/docutils/parsers/rst/states.py
    trunk/docutils/test/test_parsers/test_rst/test_inline_markup.py
    trunk/docutils/test/test_parsers/test_rst/test_targets.py

Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst	2025-06-17 13:10:08 UTC (rev 10175)
+++ trunk/docutils/HISTORY.rst	2025-06-18 14:03:25 UTC (rev 10176)
@@ -17,28 +17,31 @@
 Release 0.22rc5 (unpublished)
 =============================
 
-.
+* docutils/docutils/parsers/rst/states.py
 
+  - "Downgrade" targets generated from hyperlink references with embedded
+    URI or alias from explicit to implicit (cf. bug #502).
 
+
 Release 0.22rc4 (2025-06-17)
 ============================
 
 * docutils/nodes.py
 
-  Don't include a "backlink" reference in system messages, if the
-  referenced element is an external target (not visible in the output).
+  - Don't include a "backlink" reference in system messages, if the
+    referenced element is an external target (not visible in the output).
 
 * docutils/parsers/rst/directives/references.py
 
-  Remove "name" from `TargetNotes.option_spec`.
-  The "target-notes" directive generates one footnote element per
-  external target but "name" must be unique across the document.
-  So far, the name was silently dropped.
+  - Remove "name" from `TargetNotes.option_spec`.
+    The "target-notes" directive generates one footnote element per
+    external target but "name" must be unique across the document.
+    So far, the name was silently dropped.
 
 * docutils/parsers/rst/languages/en.py
 
-  Add alias "rst-class" for the "class" directive to improve the
-  compatibility with Sphinx.
+  - Add alias "rst-class" for the "class" directive to improve the
+    compatibility with Sphinx.
 
 
 Release 0.22rc3 (2025-06-10)

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2025-06-17 13:10:08 UTC (rev 10175)
+++ trunk/docutils/RELEASE-NOTES.rst	2025-06-18 14:03:25 UTC (rev 10176)
@@ -247,9 +247,15 @@
 Release 0.22rc5 (unpublished)
 =============================
 
-.
+Targets generated from hyperlink references with embedded URI or alias
+are no longer "explicit" but "implicit" (i.e. with the same priority as
+auto-generated section targets, see `implicit hyperlink targets`__).
 
+__ https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html
+   #implicit-hyperlink-targets
 
+
+
 Release 0.22rc4 (2025-06-17)
 ============================
 

Modified: trunk/docutils/docs/ref/rst/restructuredtext.rst
===================================================================
--- trunk/docutils/docs/ref/rst/restructuredtext.rst	2025-06-17 13:10:08 UTC (rev 10175)
+++ trunk/docutils/docs/ref/rst/restructuredtext.rst	2025-06-18 14:03:25 UTC (rev 10176)
@@ -1877,7 +1877,7 @@
 :Doctree element: `\<citation>`_
 :See also:        `citation references`_
 
-Citations are identical to footnotes except that they use only
+Citations are identical to footnotes_ except that they use only
 non-numeric labels such as ``[note]`` or ``[GVR2001]``.  Citation
 labels are simple `reference names`_ (case-insensitive single words
 consisting of alphanumerics plus internal hyphens, underscores, and
@@ -2451,18 +2451,19 @@
       This is a block quote.
 
 
+.. _implicit hyperlink target:
+
 Implicit Hyperlink Targets
 ==========================
 
 :Doctree element: `\<target>`_
 
-Implicit hyperlink targets are generated by `section titles`_, footnotes_,
-and citations_, and may also be generated by extension constructs.
-Implicit hyperlink targets otherwise behave identically to explicit
-`hyperlink targets`_.
+Implicit hyperlink targets are generated by `section titles`_,
+auto-numbered footnotes_, and hyperlink references with `embedded URIs
+and aliases`_. They may also be generated by extension constructs.
 
-Problems of ambiguity due to conflicting duplicate implicit and
-explicit reference names are avoided by following this procedure:
+Implicit hyperlink targets behave identically to explicit `hyperlink
+targets`_ except in case of duplicate reference names:
 
 1. `Explicit hyperlink targets`_ override any implicit targets having
    the same reference name.  The implicit hyperlink targets are
@@ -2475,10 +2476,12 @@
    hyperlink targets.
 
 3. Duplicate explicit hyperlink targets are removed, and level-2
-   (warning) system messages are inserted.  Exception: duplicate
-   `external hyperlink targets`_ (identical hyperlink names and
-   referenced URIs) do not conflict, and are not removed.
+   (warning) system messages are inserted.
 
+4. Exception: duplicate `external hyperlink targets`_ (identical
+   reference names and referenced URIs) do not conflict, and are not
+   removed.
+
 System messages are inserted where target links have been removed.
 See "Error Handling" in `PEP 258`_.
 
@@ -2875,7 +2878,7 @@
 
     This `link <Python home page_>`_ is an alias to the link above.
 
-This is exactly equivalent to::
+This is equivalent to::
 
     See the `Python home page`_ for info.
 
@@ -2887,12 +2890,13 @@
 The bracketed URI must be preceded by whitespace and be the last text
 before the end string.
 
-With a single trailing underscore, the reference is *named* -- the
-`reference name`_ should be unique and may be referred to again.
-With two trailing underscores, the reference and target are both
-anonymous_ and the target cannot be referred to again.  These are
-"one-off" hyperlinks.  For example::
+With a single trailing underscore, the reference is *named*
+and generates an `implicit hyperlink target`_.
 
+With two trailing underscores, the reference is anonymous_
+and the link text cannot be re-used as reference name.
+These are "one-off" hyperlinks.  For example::
+
     `RFC 2396 <https://www.rfc-editor.org/rfc/rfc2396.txt>`__ and `RFC
     2732 <https://www.rfc-editor.org/rfc/rfc2732.txt>`__ together
     define the syntax of URIs.
@@ -2922,7 +2926,7 @@
 be backslash-escaped or an escaped space should follow. For example, here
 are three references to titles describing a tag::
 
-    See `HTML Element: \<a>`_, `HTML Element: <b\> `_, and
+    See `HTML Element: \<a>`_, `HTML Element: <b\>`_, and
     `HTML Element: <c>\ `_.
 
 The reference text may also be omitted, in which case the URI will be

Modified: trunk/docutils/docutils/nodes.py
===================================================================
--- trunk/docutils/docutils/nodes.py	2025-06-17 13:10:08 UTC (rev 10175)
+++ trunk/docutils/docutils/nodes.py	2025-06-18 14:03:25 UTC (rev 10176)
@@ -1929,18 +1929,21 @@
 
         self.nametypes[name] = old_explicit or explicit
 
-        if explicit:
+        if (old_id is not None and 'refuri' in node
+            and node['refuri'] == old_node.get('refuri')):
+            # external targets with same URI -> keep old target
+            level = 1
+            ref = node["refuri"]
+            s = f'Duplicate name "{name}" for external target "{ref}".'
+            dupname(node, name)
+        elif explicit:
             if old_explicit:
                 level = 2
                 s = f'Duplicate explicit target name: "{name}".'
                 dupname(node, name)
                 if old_id is not None:
-                    if ('refuri' in node and 'refuri' in old_node
-                            and node['refuri'] == old_node['refuri']):
-                        level = 1  # keep old target, just inform
-                    else:
-                        dupname(old_node, name)
-                        self.nameids[name] = None
+                    dupname(old_node, name)
+                    self.nameids[name] = None
             else:  # new explicit, old implicit -> override
                 self.nameids[name] = id
                 if old_id is not None:

Modified: trunk/docutils/docutils/parsers/rst/states.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/states.py	2025-06-17 13:10:08 UTC (rev 10175)
+++ trunk/docutils/docutils/parsers/rst/states.py	2025-06-18 14:03:25 UTC (rev 10176)
@@ -858,7 +858,7 @@
                 else:
                     reference['refuri'] = alias
                 # target.note_referenced_by(name=refname)
-                self.document.note_explicit_target(target, self.parent)
+                self.document.note_implicit_target(target, self.parent)
                 node_list.append(target)
             else:
                 reference['refname'] = refname

Modified: trunk/docutils/test/test_parsers/test_rst/test_inline_markup.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_inline_markup.py	2025-06-17 13:10:08 UTC (rev 10175)
+++ trunk/docutils/test/test_parsers/test_rst/test_inline_markup.py	2025-06-18 14:03:25 UTC (rev 10176)
@@ -1167,15 +1167,15 @@
         Report duplicate refname.
     <paragraph>
         Explicit targets: \n\
-        <target dupnames="file.txt" ids="file-txt">
+        <target ids="file-txt" names="file.txt">
             file.txt
         , \n\
         <target ids="file-html" names="file.html">
             file.html
         .
-    <system_message level="2" line="6" source="test data" type="WARNING">
+    <system_message level="1" line="6" source="test data" type="INFO">
         <paragraph>
-            Duplicate explicit target name: "file.txt".
+            Duplicate implicit target name: "file.txt".
     <paragraph>
         Embedded URI: named \n\
         <reference name="file.txt" refuri="file.txt">
@@ -1300,9 +1300,9 @@
         <target ids="tg2" names="tg2">
             tg2
         .
-    <system_message backrefs="link-1" level="2" line="6" source="test data" type="WARNING">
+    <system_message backrefs="link-1" level="1" line="6" source="test data" type="INFO">
         <paragraph>
-            Duplicate explicit target name: "link".
+            Duplicate implicit target name: "link".
     <paragraph>
         References with embedded alias: \n\
         <reference name="link" refname="tg1">

Modified: trunk/docutils/test/test_parsers/test_rst/test_targets.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_targets.py	2025-06-17 13:10:08 UTC (rev 10175)
+++ trunk/docutils/test/test_parsers/test_rst/test_targets.py	2025-06-18 14:03:25 UTC (rev 10176)
@@ -218,11 +218,11 @@
     <target ids="target" names="target" refuri="first">
     <system_message level="1" line="5" source="test data" type="INFO">
         <paragraph>
-            Duplicate explicit target name: "target".
+            Duplicate name "target" for external target "first".
     <target dupnames="target" ids="target-1" refuri="first">
 """],
 ["""\
-Duplicate external targets (same URIs):
+Duplicate external targets (embedded/explicit, same URIs):
 
 See the `example <example.rst>`_
 
@@ -233,7 +233,7 @@
 """\
 <document source="test data">
     <paragraph>
-        Duplicate external targets (same URIs):
+        Duplicate external targets (embedded/explicit, same URIs):
     <paragraph>
         See the \n\
         <reference name="example" refuri="example.rst">
@@ -245,7 +245,7 @@
             example
     <system_message level="1" line="7" source="test data" type="INFO">
         <paragraph>
-            Duplicate explicit target name: "example".
+            Duplicate name "example" for external target "example.rst".
     <target dupnames="example" ids="example-1" refuri="example.rst">
 """],
 ["""\

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