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

[Docutils-checkins] SF.net SVN: docutils:[10153] trunk/docutils/docutils/ writers/latex2e/__init__.py

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

Revision: 10153
          http://sourceforge.net/p/docutils/code/10153
Author:   milde
Date:     2025-06-02 19:20:47 +0000 (Mon, 02 Jun 2025)
Log Message:
-----------
LaTeX writer: refactor visit_math() and visit_math_block().

Make the methods independent:
+1 simpler logic
-1 repeat some boilerplate code

Modified Paths:
--------------
    trunk/docutils/docutils/writers/latex2e/__init__.py

Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py	2025-06-02 19:20:17 UTC (rev 10152)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py	2025-06-02 19:20:47 UTC (rev 10153)
@@ -2713,38 +2713,38 @@
     def depart_meta(self, node) -> None:
         pass
 
-    def visit_math(self, node, math_env='$'):
-        """math role"""
+    def visit_math(self, node, math_env='$') -> None:
+        """
+        Provisional: the `math_env` argument will be dropped in Docutils 2.0.
+        """
         self.requirements['amsmath'] = r'\usepackage{amsmath}'
+        self.visit_inline(node)
         math_code = node.astext().translate(unichar2tex.uni2tex_table)
-        if math_env == '$':
-            self.visit_inline(node)
-            if self.alltt:
-                wrapper = ['\\(', '\\)']
-            else:
-                wrapper = ['$', '$']
+        if self.alltt:
+            self.out += ['\\(', math_code, '\\)']
         else:
-            for cls in node['classes']:
-                if not self.fallback_stylesheet:
-                    self.fallbacks['inline'] = PreambleCmds.inline
-                self.out.append(r'\DUrole{%s}{' % cls)
-            labels = self.ids_to_labels(node, set_anchor=False, newline=True)
-            wrapper = ['%%\n\\begin{%s}\n' % math_env,
-                       '\n',
-                       ''.join(labels),
-                       '\\end{%s}' % math_env]
-        wrapper.insert(1, math_code)
-        self.out.extend(wrapper)
+            self.out += ['$', math_code, '$']
         self.depart_inline(node)
-        # Content already processed:
-        raise nodes.SkipNode
+        raise nodes.SkipNode  # content already processed
 
     def depart_math(self, node) -> None:
         pass  # never reached
 
     def visit_math_block(self, node) -> None:
+        self.requirements['amsmath'] = r'\usepackage{amsmath}'
+        for cls in node['classes']:
+            if not self.fallback_stylesheet:
+                self.fallbacks['inline'] = PreambleCmds.inline
+            self.out.append(r'\DUrole{%s}{' % cls)
         math_env = pick_math_environment(node.astext())
-        self.visit_math(node, math_env=math_env)
+        labels = self.ids_to_labels(node, set_anchor=False, newline=True)
+        self.out += [f'%\n\\begin{{{math_env}}}\n',
+                     node.astext().translate(unichar2tex.uni2tex_table),
+                     '\n',
+                     *labels,
+                     f'\\end{{{math_env}}}']
+        self.out.append('}' * len(node['classes']))
+        raise nodes.SkipNode  # content already processed
 
     def depart_math_block(self, node) -> None:
         pass  # never reached

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

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

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

Revision: 10152
          http://sourceforge.net/p/docutils/code/10152
Author:   milde
Date:     2025-06-02 19:20:17 +0000 (Mon, 02 Jun 2025)
Log Message:
-----------
Announce deprecation of `<target>` elements with content. Prepare "latex" writer.

The `<target>` element has 2 use cases:

a) as empty "body element" to provide a "name" attribute for the next
   body element (via the `references.PropagateTargets` transform)
   or to map a reference name to a "refid" or "refuri".

b) as "inline element" with text content to provide an anchor.

For use case b), the generic `<inline>` element is equally well suited.
Deprecation of the inline use simplifies the definition and validation
of `<target>` elements (only valid as empty block-level element).

Change `LaTeXTranslator.visit_inline()` to insert labels for the given node's IDs.
(Preparation for the future use of `<inline>` for inline anchors and generally
a good idea.)

Modified Paths:
--------------
    trunk/docutils/HISTORY.rst
    trunk/docutils/RELEASE-NOTES.rst
    trunk/docutils/docutils/writers/latex2e/__init__.py

Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst	2025-06-01 15:39:34 UTC (rev 10151)
+++ trunk/docutils/HISTORY.rst	2025-06-02 19:20:17 UTC (rev 10152)
@@ -20,6 +20,8 @@
 * docutils/writers/latex2e/__init__.py
 
   - Replace `Writer.bibtex_reference_resolver()` with a transform.
+  - `LaTeXTranslator.visit_inline()` now inserts labels for the
+    node's IDs.
 
 * docutils/transforms/references.py
 

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2025-06-01 15:39:34 UTC (rev 10151)
+++ trunk/docutils/RELEASE-NOTES.rst	2025-06-02 19:20:17 UTC (rev 10152)
@@ -59,6 +59,12 @@
 * The "rst" parser will warn if a `"figure"`_ directive is missing both
   caption and legend in Docutils 1.0.
 
+* The "rst" parser will use <inline> elements for inline targets
+  in Docutils 1.0.
+
+* <target> elements with content will be deprecated in Docutils 1.0
+  and invalid in Docutils 2.0.
+
 * To match the definition in the "Exchange Table Model", the
   `"colwidth" attribute`_ will be stored as a `str` (instead of
   numerical) value in Python element instances in Docutils 1.0.

Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py	2025-06-01 15:39:34 UTC (rev 10151)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py	2025-06-02 19:20:17 UTC (rev 10152)
@@ -1765,7 +1765,6 @@
 
     def visit_caption(self, node) -> None:
         self.out.append('\n\\caption{')
-        self.out += self.ids_to_labels(node, set_anchor=False)
         self.visit_inline(node)
 
     def depart_caption(self, node) -> None:
@@ -2334,7 +2333,8 @@
                 num = '[%s]' % num
             self.out.append('%%\n\\DUfootnotetext{%s}{%s}{%s}{' %
                             (node['ids'][0], backref, self.encode(num)))
-            if node['ids'] == node['names']:
+            if node['ids'] == [nodes.make_id(n) for n in node['names']]:
+                # autonumber-label: create anchor
                 self.out += self.ids_to_labels(node)
             # prevent spurious whitespace if footnote starts with paragraph:
             if len(node) > 1 and isinstance(node[1], nodes.paragraph):
@@ -2505,7 +2505,17 @@
     def depart_image(self, node) -> None:
         self.out += self.ids_to_labels(node, newline=True)
 
-    def visit_inline(self, node) -> None:  # <span>, i.e. custom roles
+    def visit_inline(self, node) -> None:
+        # This function is also called by the visiting functions for
+        # specific inline elements, <caption>, and <paragraph>.
+
+        # Handle "ids" attribute:
+        # do we need a \phantomsection?
+        set_anchor = not (isinstance(node.parent, (nodes.caption, nodes.title))
+                          or isinstance(node, nodes.caption))
+        add_newline = isinstance(node, nodes.paragraph)
+        self.out += self.ids_to_labels(node, set_anchor, newline=add_newline)
+        # Handle "classes" attribute:
         for cls in node['classes']:
             if cls.startswith('language-'):
                 language = self.babel.language_name(cls[9:])
@@ -2705,15 +2715,19 @@
 
     def visit_math(self, node, math_env='$'):
         """math role"""
-        self.visit_inline(node)
         self.requirements['amsmath'] = r'\usepackage{amsmath}'
         math_code = node.astext().translate(unichar2tex.uni2tex_table)
         if math_env == '$':
+            self.visit_inline(node)
             if self.alltt:
                 wrapper = ['\\(', '\\)']
             else:
                 wrapper = ['$', '$']
         else:
+            for cls in node['classes']:
+                if not self.fallback_stylesheet:
+                    self.fallbacks['inline'] = PreambleCmds.inline
+                self.out.append(r'\DUrole{%s}{' % cls)
             labels = self.ids_to_labels(node, set_anchor=False, newline=True)
             wrapper = ['%%\n\\begin{%s}\n' % math_env,
                        '\n',
@@ -2814,7 +2828,6 @@
                 self.out.append('\n')
         else:
             self.out.append('\n')
-        self.out += self.ids_to_labels(node, newline=True)
         self.visit_inline(node)
 
     def depart_paragraph(self, node) -> None:
@@ -3111,13 +3124,10 @@
             ## self.out.append('%% %s\n' % node)   # for debugging
             return
         self.out.append('%\n')
-        # do we need an anchor (\phantomsection)?
-        set_anchor = not isinstance(node.parent, (nodes.caption, nodes.title))
-        # TODO: where else can/must we omit the \phantomsection?
-        self.out += self.ids_to_labels(node, set_anchor)
+        self.visit_inline(node)
 
     def depart_target(self, node) -> None:
-        pass
+        self.depart_inline(node)
 
     def visit_tbody(self, node) -> None:
         # BUG write preamble if not yet done (colspecs not [])

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

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

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

Revision: 10151
          http://sourceforge.net/p/docutils/code/10151
Author:   milde
Date:     2025-06-01 15:39:34 +0000 (Sun, 01 Jun 2025)
Log Message:
-----------
Warn about duplicate name in references with embedded internal targets.

Named references with embedded internal targets like
```this <that_>`_`` did not check for duplicate names when generating
the target `<target ids="this" names="this" refid="that">`.
(References with embedded URI did check.)

Modified Paths:
--------------
    trunk/docutils/HISTORY.rst
    trunk/docutils/docutils/parsers/rst/states.py
    trunk/docutils/test/test_parsers/test_rst/test_inline_markup.py
    trunk/docutils/test/test_transforms/test_hyperlinks.py

Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst	2025-06-01 08:34:07 UTC (rev 10150)
+++ trunk/docutils/HISTORY.rst	2025-06-01 15:39:34 UTC (rev 10151)
@@ -26,7 +26,15 @@
   - New transform `CitationReferences`. Marks citation_references
     as resolved if BibTeX is used by the backend (LaTeX).
 
+* docutils/parsers/rst/states.py
 
+  - Warn about duplicate name in references with embedded internal targets.
+
+* docutils/writers/manpage.py
+
+  - Do not drop text of internal targets.
+
+
 Release 0.22rc2 (2025-05-22)
 ============================
 
@@ -256,7 +264,6 @@
   - Print Docutils version in header comment (feature-request #105).
   - Stop converting text to full capitals (bug #481).
   - Fix reference output (bug #497).
-  - Do not drop text of internal targets.
   - Use macros .UR/.UE for hyperlink references unless the new
     configuration setting text_references_ is True.
     The current default is True (text references), it will change

Modified: trunk/docutils/docutils/parsers/rst/states.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/states.py	2025-06-01 08:34:07 UTC (rev 10150)
+++ trunk/docutils/docutils/parsers/rst/states.py	2025-06-01 15:39:34 UTC (rev 10151)
@@ -857,8 +857,8 @@
                     self.document.note_refname(reference)
                 else:
                     reference['refuri'] = alias
-                    self.document.note_explicit_target(target, self.parent)
                 # target.note_referenced_by(name=refname)
+                self.document.note_explicit_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-01 08:34:07 UTC (rev 10150)
+++ trunk/docutils/test/test_parsers/test_rst/test_inline_markup.py	2025-06-01 15:39:34 UTC (rev 10151)
@@ -23,6 +23,8 @@
 
 
 class ParserTestCase(unittest.TestCase):
+    maxDiff = None
+
     def test_parser(self):
         parser = Parser()
         settings = get_default_settings(Parser)
@@ -1152,6 +1154,33 @@
         <reference name="anonymouscall" refuri="anonymouscall">
             anonymouscall
 """],
+["""\
+Report duplicate refnames. First use: _`named.txt` vs. _`anonymous.html`.
+
+Embedded targets: `<named.txt>`_, `<anonymous.html>`__
+""",
+"""\
+<document source="test data">
+    <paragraph>
+        Report duplicate refnames. First use: \n\
+        <target dupnames="named.txt" ids="named-txt">
+            named.txt
+         vs. \n\
+        <target ids="anonymous-html" names="anonymous.html">
+            anonymous.html
+        .
+    <system_message backrefs="named-txt-1" level="2" line="4" source="test data" type="WARNING">
+        <paragraph>
+            Duplicate explicit target name: "named.txt".
+    <paragraph>
+        Embedded targets: \n\
+        <reference name="named.txt" refuri="named.txt">
+            named.txt
+        <target dupnames="named.txt" ids="named-txt-1" refuri="named.txt">
+        , \n\
+        <reference name="anonymous.html" refuri="anonymous.html">
+            anonymous.html
+"""],
 ]
 
 totest['embedded_aliases'] = [
@@ -1163,7 +1192,7 @@
     <paragraph>
         <reference name="phrase reference" refname="alias">
             phrase reference
-        <target names="phrase\\ reference" refname="alias">
+        <target ids="phrase-reference" names="phrase\\ reference" refname="alias">
 """],
 ["""\
 `anonymous reference <alias_>`__
@@ -1245,6 +1274,33 @@
         <reference name="anonymous reference" refname="aliaswith\\ escaped :characters">
             anonymous reference
 """],
+["""\
+Report duplicate refnames: First use: _`named` vs. _`anonymous`.
+
+Embedded alias: `named <anonymous_>`_, `ano <anonymous_>`__
+""",
+"""\
+<document source="test data">
+    <paragraph>
+        Report duplicate refnames: First use: \n\
+        <target dupnames="named" ids="named">
+            named
+         vs. \n\
+        <target ids="anonymous" names="anonymous">
+            anonymous
+        .
+    <system_message backrefs="named-1" level="2" line="4" source="test data" type="WARNING">
+        <paragraph>
+            Duplicate explicit target name: "named".
+    <paragraph>
+        Embedded alias: \n\
+        <reference name="named" refname="anonymous">
+            named
+        <target dupnames="named" ids="named-1" refname="anonymous">
+        , \n\
+        <reference name="ano" refname="anonymous">
+            ano
+"""],
 ]
 
 totest['inline_targets'] = [

Modified: trunk/docutils/test/test_transforms/test_hyperlinks.py
===================================================================
--- trunk/docutils/test/test_transforms/test_hyperlinks.py	2025-06-01 08:34:07 UTC (rev 10150)
+++ trunk/docutils/test/test_transforms/test_hyperlinks.py	2025-06-01 15:39:34 UTC (rev 10151)
@@ -27,6 +27,8 @@
 
 
 class TransformTestCase(unittest.TestCase):
+    maxDiff = None
+
     def test_transforms(self):
         parser = Parser()
         settings = get_default_settings(Parser)
@@ -373,7 +375,7 @@
         An \n\
         <reference name="embedded alias" refuri="ham.py">
             embedded alias
-        <target names="embedded\\ alias" refuri="ham.py">
+        <target ids="embedded-alias" names="embedded\\ alias" refuri="ham.py">
         .
     <paragraph>
         Another reference to the same \n\
@@ -405,11 +407,11 @@
         An \n\
         <problematic ids="problematic-1" refid="system-message-2">
             `embedded alias <alias_>`_
-        <target names="embedded\\ alias" refname="alias">
+        <target ids="embedded-alias" names="embedded\\ alias" refname="alias">
          with unknown reference.
     <system_message ids="system-message-1" level="3" line="1" source="test data" type="ERROR">
         <paragraph>
-            Indirect hyperlink target "embedded alias"  refers to target "alias", which does not exist.
+            Indirect hyperlink target "embedded alias" (id="embedded-alias") refers to target "alias", which does not exist.
     <system_message backrefs="problematic-1" ids="system-message-2" level="3" line="1" source="test data" type="ERROR">
         <paragraph>
             Unknown target name: "alias".

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

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

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

Revision: 10150
          http://sourceforge.net/p/docutils/code/10150
Author:   milde
Date:     2025-06-01 08:34:07 +0000 (Sun, 01 Jun 2025)
Log Message:
-----------
manpage writer: do not drop text content of inline targets.

Inline targets are eponymous, they point to a text portion that is
also the base of the target's name and id.

Generated manpages do not implement internal hyperlinks but the
document source may be used with different writers and contain
cross references -> print the text as normal text.

Modified Paths:
--------------
    trunk/docutils/HISTORY.rst
    trunk/docutils/docutils/writers/manpage.py
    trunk/docutils/test/test_writers/test_manpage.py

Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst	2025-05-27 06:17:51 UTC (rev 10149)
+++ trunk/docutils/HISTORY.rst	2025-06-01 08:34:07 UTC (rev 10150)
@@ -256,6 +256,7 @@
   - Print Docutils version in header comment (feature-request #105).
   - Stop converting text to full capitals (bug #481).
   - Fix reference output (bug #497).
+  - Do not drop text of internal targets.
   - Use macros .UR/.UE for hyperlink references unless the new
     configuration setting text_references_ is True.
     The current default is True (text references), it will change

Modified: trunk/docutils/docutils/writers/manpage.py
===================================================================
--- trunk/docutils/docutils/writers/manpage.py	2025-05-27 06:17:51 UTC (rev 10149)
+++ trunk/docutils/docutils/writers/manpage.py	2025-06-01 08:34:07 UTC (rev 10150)
@@ -1113,6 +1113,7 @@
                                  % insert_URI_breakpoints(node.astext()))
                 raise nodes.SkipNode
         # elif 'refid' in node:
+        #     internal cross references are ignored (just print the text)
 
     def _depart_reference_no_macro(self, node) -> None:
         if 'refuri' in node:
@@ -1233,9 +1234,13 @@
         self._active_table = None
 
     def visit_target(self, node):
-        # targets are in-document hyper targets, without any use for man-pages.
-        raise nodes.SkipNode
+        # <target> elements are anchors of internal hyperlinks (not used
+        # in man-pages). Just print content (inline targets may contain text):
+        pass
 
+    def depart_target(self, node):
+        pass
+
     def visit_tbody(self, node) -> None:
         pass
 

Modified: trunk/docutils/test/test_writers/test_manpage.py
===================================================================
--- trunk/docutils/test/test_writers/test_manpage.py	2025-05-27 06:17:51 UTC (rev 10149)
+++ trunk/docutils/test/test_writers/test_manpage.py	2025-06-01 08:34:07 UTC (rev 10150)
@@ -358,6 +358,22 @@
 public domain
 .\\" End of generated man page.
 """],
+["""\
+Internal hyperlinks_ and targets_ are ignored.
+
+.. _hyperlinks:
+
+(Text content of hyperlinks and _`targets` is printed as normal text.)
+""",
+f"""{document_start}{indend_macros}.TH "" "" "" ""
+.SH Name
+ \\- \n\
+Internal hyperlinks and targets are ignored.
+.sp
+(Text content of hyperlinks and targets is printed as normal text.)
+.\\" End of generated man page.
+"""],
+
 ]
 
 totest['table'] = [

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

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

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

Revision: 10149
          http://sourceforge.net/p/docutils/code/10149
Author:   milde
Date:     2025-05-27 06:17:51 +0000 (Tue, 27 May 2025)
Log Message:
-----------
Announce upcoming changes to the default transforms.

Modified Paths:
--------------
    trunk/docutils/RELEASE-NOTES.rst
    trunk/docutils/docs/api/transforms.rst

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2025-05-27 06:17:22 UTC (rev 10148)
+++ trunk/docutils/RELEASE-NOTES.rst	2025-05-27 06:17:51 UTC (rev 10149)
@@ -167,6 +167,12 @@
   in Docutils 1.0.  Use a transform_,
   see `transforms.references.CitationReferences` for an example.
 
+* Ignore `transforms.references.DanglingReferences` and
+  `transforms.references.DanglingReferencesVisitor` in Docutils 1.0;
+  remove them in Docutils 2.0. [rationale__]
+
+  __ docs/api/transforms.html#dangling
+
 * Remove `parsers.rst.roles.set_classes()` and
   `parsers.rst.roles.normalized_role_options()`
   (obsoleted by `parsers.rst.roles.normalize_options()`) in Docutils 2.0.
@@ -208,6 +214,9 @@
 
   __ docs/api/publisher.html#string-i-o
 
+* Change the default priority of the `universal.SmartQuotes` transform_
+  from 855 (very late) to 510 (main) in Docutils 1.0.
+
 * Move math format conversion from docutils/utils/math (called from
   docutils/writers/_html_base.py) to a transform_.
 

Modified: trunk/docutils/docs/api/transforms.rst
===================================================================
--- trunk/docutils/docs/api/transforms.rst	2025-05-27 06:17:22 UTC (rev 10148)
+++ trunk/docutils/docs/api/transforms.rst	2025-05-27 06:17:51 UTC (rev 10149)
@@ -110,7 +110,8 @@
 
 universal_.ExposeInternals          readers_ (r)                  _`840`
 
-references_.DanglingReferences      standalone_ (r), pep_ (r)     _`850`
+references_.DanglingReferences      standalone_ (r), pep_ (r),    _`850`
+                                    *deprecated* [#dangling]_
 
 universal_.SmartQuotes              rst_ (p)                      _`855`
 
@@ -136,7 +137,17 @@
 * (t): Transform
 * (/p): Via a `\<pending>`_ element
 
+.. [#dangling] `references.DanglingReferences` will be split into a
+   transform resolving refnames__ to refids__ and a transform reporting
+   unresolved references to make space for reference-resolving transforms
+   added by extensions or applications
+   (cf. `Release Notes`__).
 
+   __ ../ref/doctree.html#refname
+   __ ../ref/doctree.html#refid
+   __ ../../RELEASE-NOTES.html#removals
+
+
 Transform Priority Range Categories
 -----------------------------------
 

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

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

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

Revision: 10148
          http://sourceforge.net/p/docutils/code/10148
Author:   milde
Date:     2025-05-27 06:17:22 +0000 (Tue, 27 May 2025)
Log Message:
-----------
Documentation Update

Update Link List:
 reorganize, fix links, remove broken links and dead projects.

Update "transforms" documentation:
 add cross-links, update, small edits.

Various minor documentation fixes.

Modified Paths:
--------------
    trunk/docutils/FAQ.rst
    trunk/docutils/RELEASE-NOTES.rst
    trunk/docutils/docs/api/transforms.rst
    trunk/docutils/docs/ref/doctree.rst
    trunk/docutils/docs/user/config.rst
    trunk/docutils/docs/user/links.rst

Modified: trunk/docutils/FAQ.rst
===================================================================
--- trunk/docutils/FAQ.rst	2025-05-27 06:15:14 UTC (rev 10147)
+++ trunk/docutils/FAQ.rst	2025-05-27 06:17:22 UTC (rev 10148)
@@ -382,18 +382,10 @@
 Are there any Weblog (Blog) projects that use reStructuredText syntax?
 ----------------------------------------------------------------------
 
-With no implied endorsement or recommendation, and in no particular
-order:
+See the `Docutils Links`_.
 
-* `Firedrop <http://www.voidspace.org.uk/python/firedrop2/>`__
-* `PyBloxsom <http://pyblosxom.github.io/>`__
-* `Lino WebMan <http://lino.sourceforge.net/webman.html>`__
-* `Pelican <http://blog.getpelican.com/>`__
-  (also  listed `on PyPi <http://pypi.python.org/pypi/pelican>`__)
-
 Please `let us know`_ of any other reStructuredText Blogs.
 
-
 .. _Can lists be indented without generating block quotes?:
 
 How should I mark up lists?

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2025-05-27 06:15:14 UTC (rev 10147)
+++ trunk/docutils/RELEASE-NOTES.rst	2025-05-27 06:17:22 UTC (rev 10148)
@@ -164,8 +164,8 @@
 * Remove the input_encoding_ auto-detection code in Docutils 1.0.
 
 * Remove the "TransformSpec.unknown_reference_resolvers" hook chain
-  in Docutils 1.0.  Use a transform, see
-  `transforms.references.CitationReferences` for an example.
+  in Docutils 1.0.  Use a transform_,
+  see `transforms.references.CitationReferences` for an example.
 
 * Remove `parsers.rst.roles.set_classes()` and
   `parsers.rst.roles.normalized_role_options()`
@@ -209,10 +209,8 @@
   __ docs/api/publisher.html#string-i-o
 
 * Move math format conversion from docutils/utils/math (called from
-  docutils/writers/_html_base.py) to a transform__.
+  docutils/writers/_html_base.py) to a transform_.
 
-  __ docs/ref/transforms.html
-
 * If the environment variable `SOURCE_DATE_EPOCH`_ is set, the `"date"`_
   directive and the timestamp inserted by the "datestamp_"
   configuration setting will use its value instead of the current time to
@@ -1441,11 +1439,11 @@
    ==========
 
 .. _HISTORY: HISTORY.html
-.. _Python 3 compatibility: README.html#python-3-compatibility
 
+.. _transform: docs/api/transforms.html
+
 .. _Docutils Document Model:
 .. _Docutils XML: docs/ref/doctree.html
-.. _"refname" attribute: docs/ref/doctree.html#refname
 .. _"colwidth" attribute: docs/ref/doctree.html#colwidth
 .. _<doctest_block>: docs/ref/doctree.html#doctest-block
 
@@ -1494,7 +1492,6 @@
 .. _docutils-cli.py:
 .. _generic command line front end tool:
     docs/user/tools.html#generic-command-line-front-end
-.. _rst2html.py:
 .. _rst2html: docs/user/tools.html#rst2html
 .. _rst2html4: docs/user/tools.html#rst2html4
 .. _rst2html5: docs/user/tools.html#rst2html5

Modified: trunk/docutils/docs/api/transforms.rst
===================================================================
--- trunk/docutils/docs/api/transforms.rst	2025-05-27 06:15:14 UTC (rev 10147)
+++ trunk/docutils/docs/api/transforms.rst	2025-05-27 06:17:22 UTC (rev 10148)
@@ -22,29 +22,30 @@
 `interpreted text`_, and do other context-sensitive processing.
 Each transform is a subclass of `docutils.transforms.Transform`.
 
-There are `transforms added by components`_, others (e.g.
-``parts.Contents``) are added by the parser, if a corresponding directive_ is
-found in the document.
+Most transforms are added by components, others (e.g. `parts.Contents`) are
+added by the parser if a corresponding directive_ is found in the document.
 
 To add a transform, components (objects inheriting from
 `docutils.Component` like Readers, Parsers, Writers, Input, Output) overwrite
-the ``get_transforms()`` method of their base class. After the Reader has
+the `get_transforms()` method of their base class. After the Reader has
 finished processing, the Publisher calls
-``Transformer.populate_from_components()`` with a list of components and all
-transforms returned by the component's ``get_transforms()`` method are
-stored in a `transformer object` attached to the document tree.
+`Transformer.populate_from_components()` with a list of components and all
+transforms returned by the component's `get_transforms()` method are
+stored in a `Transformer` object attached to the document tree.
 
 
-For more about transforms and the Transformer object, see also `PEP
-258`_. (The ``default_transforms()`` attribute of component classes mentioned
-there is deprecated. Use the ``get_transforms()`` method instead.)
+For more info about transforms and the `Transformer` object,
+see also `PEP 258`_. [#]_
 
+.. [#] The `default_transforms()` attribute of component classes mentioned
+   in PEP 258 is deprecated. Use the `get_transforms()` method instead.
+
 .. _priority:
 
 Transforms Listed in Priority Order
 ===================================
 
-Transform classes each have a `default priority` attribute which is used by
+Transform classes each have a `default_priority` attribute which is used by
 the Transformer to apply transforms in order (low to high). The default
 priority can be overridden when adding transforms to the Transformer object.
 
@@ -52,79 +53,79 @@
 ==================================  ============================  ========
 Transform: module.Class             Added By                      Priority
 ==================================  ============================  ========
-misc_.ClassAttribute                `"class"`_ (d/p)              210
+misc_.ClassAttribute                `"class"`_ (d/p)              _`210`
 
-references_.Substitutions           standalone (r), pep (r)       220
+references_.Substitutions           standalone_ (r), pep_ (r)     _`220`
 
-references_.PropagateTargets        standalone (r), pep (r)       260
+references_.PropagateTargets        standalone_ (r), pep_ (r)     _`260`
 
-frontmatter.\ DocTitle_             standalone (r)                320
+frontmatter.\ DocTitle_             standalone_ (r)               _`320`
 
-frontmatter.\ DocInfo_              standalone (r)                340
+frontmatter.\ DocInfo_              standalone_ (r)               _`340`
 
-frontmatter.\ SectSubTitle_         standalone (r)                350
+frontmatter.\ SectSubTitle_         standalone_ (r)               _`350`
 
-peps_.Headers                       pep (r)                       360
+peps_.Headers                       pep_ (r)                      _`360`
 
-peps_.Contents                      pep (r)                       380
+peps_.Contents                      pep_ (r)                      _`380`
 
-universal_.StripClassesAndElements  Writer (w)                    420
+universal_.StripClassesAndElements  writers_ (w)                  _`420`
 
-references_.AnonymousHyperlinks     standalone (r), pep (r)       440
+references_.AnonymousHyperlinks     standalone_ (r), pep_ (r)     _`440`
 
-references_.IndirectHyperlinks      standalone (r), pep (r)       460
+references_.IndirectHyperlinks      standalone_ (r), pep_ (r)     _`460`
 
-peps_.TargetNotes                   pep (r)                       520
+peps_.TargetNotes                   pep_ (r)                      _`520`
 
-references_.TargetNotes             peps.TargetNotes (t/p)        0
+references_.TargetNotes             peps.TargetNotes (t/p)          0
 
-misc_.CallBack                      peps.TargetNotes (t/p)        1
+misc_.CallBack                      peps.TargetNotes (t/p)          1
 
-references_.TargetNotes             `"target-notes"`_ (d/p)       540
+references_.TargetNotes             `"target-notes"`_ (d/p)       _`540`
 
-references_.Footnotes               standalone (r), pep (r)       620
+references_.Footnotes               standalone_ (r), pep_ (r)     _`620`
 
-references_.ExternalTargets         standalone (r), pep (r)       640
+references_.ExternalTargets         standalone_ (r), pep_ (r)     _`640`
 
-references_.InternalTargets         standalone (r), pep (r)       660
+references_.InternalTargets         standalone_ (r), pep_ (r)     _`660`
 
-parts_.SectNum                      `"sectnum"`_ (d/p)            710
+parts_.SectNum                      `"sectnum"`_ (d/p)            _`710`
 
-parts_.Contents                     `"contents"`_ (d/p),          720
+parts_.Contents                     `"contents"`_ (d/p),          _`720`
                                     peps.Contents (t/p)
 
-universal_.StripComments            Reader (r)                    740
+universal_.StripComments            readers_ (r)                  _`740`
 
-peps_.PEPZero                       peps.Headers (t/p)            760
+peps_.PEPZero                       peps.Headers (t/p)            _`760`
 
-references_.CitationReferences      latex2e (w)                   770
+references_.CitationReferences      latex2e_ (w)                  _`770`
 
-components.Filter                   *not used*                    780
+components.Filter                   *not used*                    _`780`
 
-universal_.Decorations              Reader (r)                    820
+universal_.Decorations              readers_ (r)                  _`820`
 
-misc_.Transitions                   standalone (r), pep (r)       830
+misc_.Transitions                   standalone_ (r), pep_ (r)     _`830`
 
-universal_.Validate                 Parser                        835
+universal_.Validate                 parsers_ (p)                  _`835`
 
-universal_.ExposeInternals          Reader (r)                    840
+universal_.ExposeInternals          readers_ (r)                  _`840`
 
-references_.DanglingReferences      standalone (r), pep (r)       850
+references_.DanglingReferences      standalone_ (r), pep_ (r)     _`850`
 
-universal_.SmartQuotes              Parser                        855
+universal_.SmartQuotes              rst_ (p)                      _`855`
 
-universal_.Messages                 Writer (w)                    860
+universal_.Messages                 writers_ (w)                  _`860`
 
-universal_.FilterMessages           Writer (w)                    870
+universal_.FilterMessages           writers_ (w)                  _`870`
 
-universal_.TestMessages             DocutilsTestSupport           880
+universal_.TestMessages             DocutilsTestSupport           _`880`
 
-writer_aux_.Compound                *not used, to be removed*     910
+writer_aux_.Compound                *not used, to be removed*     _`910`
 
-writer_aux_.Admonitions             _html_base (w),               920
-                                    latex2e (w)
+writer_aux_.Admonitions             `_html_base`_ (w),            _`920`
+                                    latex2e_ (w)
 
-misc_.CallBack                      n/a                           990
+misc_.CallBack                      n/a                           _`990`
 ==================================  ============================  ========
 
 Key:
@@ -155,62 +156,81 @@
 ====  ====  ================================================
 
 
-Transforms added by components
-===============================
+Transforms Added by Components
+==============================
 
+.. _readers:
+
 readers.Reader:
-  | universal.Decorations,
-  | universal.ExposeInternals,
-  | universal.StripComments
+  | universal.StripComments             (740_)
+  | universal.Decorations               (820_)
+  | universal.ExposeInternals           (840_)
 
 readers.ReReader:
   None
 
+  .. _standalone:
+
 readers.standalone.Reader:
-  | references.Substitutions,
-  | references.PropagateTargets,
-  | frontmatter.DocTitle,
-  | frontmatter.SectionSubTitle,
-  | frontmatter.DocInfo,
-  | references.AnonymousHyperlinks,
-  | references.IndirectHyperlinks,
-  | references.Footnotes,
-  | references.ExternalTargets,
-  | references.InternalTargets,
-  | references.DanglingReferences,
-  | misc.Transitions
+  | references.Substitutions            (220_)
+  | references.PropagateTargets         (260_)
+  | frontmatter.\ DocTitle_             (320_)
+  | frontmatter.\ DocInfo_              (340_)
+  | frontmatter.\ SectSubTitle_         (350_)
+  | references.AnonymousHyperlinks      (440_)
+  | references.IndirectHyperlinks       (460_)
+  | references.Footnotes                (620_)
+  | references.ExternalTargets          (640_)
+  | references.InternalTargets          (660_)
+  | misc.Transitions                    (830_)
+  | references.DanglingReferences       (850_)
 
+  .. _pep:
+
 readers.pep.Reader:
-  | references.Substitutions,
-  | references.PropagateTargets,
-  | references.AnonymousHyperlinks,
-  | references.IndirectHyperlinks,
-  | references.Footnotes,
-  | references.ExternalTargets,
-  | references.InternalTargets,
-  | references.DanglingReferences,
-  | misc.Transitions,
-  | peps.Headers,
-  | peps.Contents,
-  | peps.TargetNotes
+  | references.Substitutions            (220_)
+  | references.PropagateTargets         (260_)
+  | peps.Headers                        (360_)
+  | peps.Contents                       (380_)
+  | references.AnonymousHyperlinks      (440_)
+  | references.IndirectHyperlinks       (460_)
+  | peps.TargetNotes                    (520_)
+  | references.Footnotes                (620_)
+  | references.ExternalTargets          (640_)
+  | references.InternalTargets          (660_)
+  | misc.Transitions                    (830_)
+  | references.DanglingReferences       (850_)
 
+  .. _parsers:
+
+parsers.Parser
+  universal_.Validate                   (835_)
+
+  .. _rst:
+
 parsers.rst.Parser
-  universal.SmartQuotes
+  universal.SmartQuotes                 (855_)
 
+  .. _writers:
+
 writers.Writer:
-  | universal.Messages,
-  | universal.FilterMessages,
-  | universal.StripClassesAndElements
+  | universal.StripClassesAndElements   (420_)
+  | universal.Messages                  (860_)
+  | universal.FilterMessages            (870_)
 
 writers.UnfilteredWriter
   None
 
+  .. _latex2e:
+
 writers.latex2e.Writer
-  writer_aux.Admonitions
-  references.CitationReferences
+  | writer_aux.Admonitions              (920_)
+  | references.CitationReferences       (770_)
 
+  .. _`_html_base`:
+
 writers._html_base.Writer:
-  writer_aux.Admonitions
+  writer_aux.Admonitions                (920_)
 
 writers.odf_odt.Writer:
   removes references.DanglingReferences
@@ -233,8 +253,8 @@
 .. class:: field-indent-12em
 
 :Module: frontmatter_
-:Added by:  standalone Reader
-:Default priority_: 340
+:Added by:  standalone_ Reader
+:Default priority_: 340_
 :Configuration_ setting: docinfo_xform_ (default: True)
 
 Given a document starting [#pre-docinfo]_ with a field list, the DocInfo
@@ -288,8 +308,8 @@
 .. class:: field-indent-12em
 
 :Module: frontmatter_
-:Added by:  standalone Reader
-:Default priority_: 320
+:Added by:  standalone_ Reader
+:Default priority_: 320_
 :Configuration_ setting: doctitle_xform_ (default: True)
 
 Under the conditions explained below, the DocTitle transform converts
@@ -433,8 +453,8 @@
 .. class:: field-indent-12em
 
 :Module: frontmatter_
-:Added by:  standalone Reader
-:Default priority_: 350
+:Added by:  standalone_ Reader
+:Default priority_: 350_
 :Configuration_ setting: sectsubtitle_xform_ (default: False)
 
 The SectSubTitle transform works like `step 2`_ of the DocTitle_

Modified: trunk/docutils/docs/ref/doctree.rst
===================================================================
--- trunk/docutils/docs/ref/doctree.rst	2025-05-27 06:15:14 UTC (rev 10147)
+++ trunk/docutils/docs/ref/doctree.rst	2025-05-27 06:17:22 UTC (rev 10148)
@@ -4805,8 +4805,9 @@
 
 On a `\<target>`_ element, ``refname`` indicates an `indirect target`_
 which may resolve to either an internal or external reference.
-Docutils transforms_ replace the ``refname`` attribute with a refid_
-pointing to the same element.
+Docutils transforms_ replace the ``refname`` attribute with
+a refid_ (refering to the same element) or a refuri_ (refering to an
+external ressource).
 
 
 ``refuri``

Modified: trunk/docutils/docs/user/config.rst
===================================================================
--- trunk/docutils/docs/user/config.rst	2025-05-27 06:15:14 UTC (rev 10147)
+++ trunk/docutils/docs/user/config.rst	2025-05-27 06:17:22 UTC (rev 10148)
@@ -1978,7 +1978,7 @@
 use_bibtex
 ~~~~~~~~~~
 
-List of style and database(s) for the experimental `BibTeX` support
+List of style and database(s) for the experimental `BibTeX`_ support
 (comma-separated_). Example::
 
   --use-bibtex=unsrt,mydb1,mydb2
@@ -1990,6 +1990,8 @@
 
 *Default*: empty list (don't use BibTeX).  *Option* ``--use-bibtex``.
 
+.. _BibTeX: https://www.ctan.org/pkg/bibtex
+
 use_latex_abstract
 ~~~~~~~~~~~~~~~~~~
 Use LaTeX abstract environment for the document's abstract_.

Modified: trunk/docutils/docs/user/links.rst
===================================================================
--- trunk/docutils/docs/user/links.rst	2025-05-27 06:15:14 UTC (rev 10147)
+++ trunk/docutils/docs/user/links.rst	2025-05-27 06:17:22 UTC (rev 10148)
@@ -7,481 +7,416 @@
 :Author: Lea Wiemann, the Docutils team
 :Contact: doc...@li...
 :Revision: $Revision$
-:Date: $Date$
+:Date: $Date$ [#]_
 :Copyright: This document has been placed in the public domain.
+:Abstract: Links that users of Docutils_ and reStructuredText_ may find useful.
 
 .. title:: Docutils Links
 
 .. contents::
+   :depth: 2
 
-This document contains links that users of Docutils_ and reStructuredText_
-may find useful.
+.. [#] The most current version of this link list can always be found at
+   https://docutils.sourceforge.io/docs/user/links.html. If you find
+   outdated or broken links or want to suggest additions, please `let us
+   know`__ and we'll update the list here.
 
-The most current version of this link list can always be found at
-https://docutils.sourceforge.io/docs/user/links.html.
-If you find outdated or broken links or want to suggest additions,
-please `let us know`__ and we'll update the list here.
-
 .. _Docutils: https://docutils.sourceforge.io/
 .. _reStructuredText: https://docutils.sourceforge.io/rst.html
 __ mailing-lists.html#docutils-users
 
 
-Editors
--------
+Extensions
+==========
 
-Advanced text editors with reStructuredText support, IDEs, and docutils GUIs:
+Drop-in components and front-end tools for Docutils that extend the
+reStructuredText syntax or feature set.
 
-* Emacs `rst mode <https://docutils.sourceforge.io/tools/editors/emacs>`__.
+Import
+------
 
-* `Vim <https://www.vim.org/index.php>`__:
+Markdown
+````````
 
-  - `reStructuredText syntax highlighting mode
-    <https://www.vim.org/scripts/script.php?script_id=973>`__,
+* `myst-docutils`_ --- the MyST_ Markdown parser for `single page builds`_.
 
-  - `VST <https://www.vim.org/scripts/script.php?script_id=1334>`__ (Vim
-    reStructuredText) plugin for Vim7 with folding.
+  .. _myst-docutils: https://pypi.org/project/myst-docutils/
+  .. _MyST: https://mystmd.org/guide/quickstart-myst-markdown
+  .. _single page builds:
+     https://myst-parser.readthedocs.io/en/latest/docutils.html
 
-  - `VOoM <https://www.vim.org/scripts/script.php?script_id=2657>`__
-    plugin for Vim that emulates two-pane outliner with
-    support for reStructuredText (since version 4.0b2).
+* pycmark_ --- small, customizable drop-in parser for CommonMark_ Markdown.
 
-  - `Riv: Take notes in rST <https://github.com/Rykka/riv.vim>`__ Vim
-    plugin to take notes in reStructured text.
+  .. _pycmark: https://pypi.org/project/pycmark/
+  .. _CommonMark: https://spec.commonmark.org/current/
 
-* `reStructuredText Language Support for Visual Studio Code`__
 
-  __ https://github.com/vscode-restructuredtext/vscode-restructuredtext
+.. Python 2 only
 
-* `reStructuredText editor plug-in for Eclipse`__
+  PySource_, by Tony Ibbs, is an experimental Python source Reader.
+  There is some related code in David Goodger's sandbox
+  (pysource_reader_) and a `Python Source Reader`_ document.
 
-  __ http://resteditor.sourceforge.net/
+  .. _PySource: https://docutils.sourceforge.io/sandbox/tibs/pysource/
+  .. _pysource_reader: https://docutils.sourceforge.io/sandbox/davidg/pysource_reader/
+  .. _Python Source Reader: https://docutils.sourceforge.io/docs/dev/pysource.html
 
-* `JED <https://www.jedsoft.org/jed/>`__ programmers editor with
-  `rst mode <httpss://jedmodes.sourceforge.io/mode/rst/>`__
 
-* Gnome's gedit offers syntax highlighting and a reST preview pane.
 
-  Latest version of the plugin is available from `bittner @ github`_
-  (See also: `Gedit third party plugins`__).
+.. Python 2 only
 
-  .. _bittner @ github:  https://github.com/bittner/gedit-reST-plugin
-  __ https://wiki.gnome.org/Apps/Gedit/ThirdPartyPlugins-v3.8
+  The `ASCII art to SVG converter`_ (aafigure_) developed by
+  Chris Liechti can parse ASCII art images, embedded in reST documents and
+  output an image. This would mean that simple illustrations could be
+  embedded as ASCII art in the reST source and still look nice when
+  converted to e.g. HTML
 
+  .. _ASCII art to SVG converter:
+     https://docutils.sourceforge.io/sandbox/aafigure/
+  .. _aafigure: https://pypi.org/project/docutils-aafigure/
 
-* Gunnar Schwant's DocFactory_ is a wxPython GUI application for
-  Docutils.
+.. only Python 2
 
-  .. _DocFactory: https://docutils.sourceforge.io/sandbox/gschwant/docfactory/doc/
+  restxsl_ by Michael Alyn Miller, lets you transform reStructuredText
+  documents into XML/XHTML files using XSLT stylesheets.
 
-* ReSTedit_ by Bill Bumgarner is a Docutils GUI for Mac OS X.
+  .. _restxsl: http://www.strangeGizmo.com/products/restxsl/
 
-  .. _ReSTedit: https://svn.red-bean.com/restedit/trunk/README.html
 
-* `ReText <https://pypi.org/project/ReText/>`_ is a simple but powerful
-  editor for Markdown and reStructuredText markup languages.
-  It is written in Python using PyQt libraries.
+Export
+------
 
-* Leo_ is an outliner_, written in Python using PyQt. It can be used as IDE
-  for literal programming, as a filing cabinet holding any kind of data and
-  as `document editor`__ with outlines containing reStructuredText markup.
+PDF
+```
 
-  .. _Leo: https://leoeditor.com/
-  .. _outliner: https://en.wikipedia.org/wiki/Outliner
-  __ https://leoeditor.com/tutorial-rst3.html
+* RinohType_ --- pure Python PDF writer
 
-* `NoTex <https://notex.ch>`_ is a browser-based reStructuredText editor
-  with syntax highlighting and PDF/HTML export functionality using Sphinx.
+  .. _RinohType: https://pypi.python.org/pypi/RinohType
 
-* `rsted <https://github.com/anru/rsted>`_ is a "simple online editor for
-  reStructuredText on Flask". You can try it on http://rst.ninjs.org/
+* `rst2pdf (reportlab)`__ --- PDF writer based on ReportLab_.
 
+  __ https://pypi.org/project/rst2pdf/
+  .. _ReportLab: https://pypi.org/project/reportlab/
 
-Export
-------
+.. only Python 2
 
-Projects providing additional export routes.
+  `rst2pdf (rubber)`__ --- front end for PDF generation via LaTeX
+  using the rubber_ building system.
 
-PDF
-```
+  __ https://docutils.sourceforge.io/sandbox/rst2pdf_rubber/README.html
+  .. _rubber: https://gitlab.com/latex-rubber/rubber/
 
-* `rst2pdf (reportlab)`__ is a tool to go directly from
-  reStructuredText to PDF, via ReportLab__. No LaTeX installation
-  is required.
+ `rst2pdf (pdflatex)`__ --- minimal front end for PDF generation via LaTeX.
 
-  __ https://pypi.org/project/rst2pdf/
-  __ https://pypi.org/project/reportlab/
-
-* `rst2pdf (pdflatex)`__ by Martin Blais is a minimal front end
-  producing LaTeX, compiling the LaTeX file, getting the produced
-  output to the destination location and finally deleting all the
-  messy temporary files that this process generates.
-
   __ https://docutils.sourceforge.io/sandbox/blais/rst2pdf/
 
-* `rst2pdf (rubber)`__ is a front end for the generation of PDF
-  documents from a reStructuredText source via LaTeX in one step
-  cleaning up intermediate files. It uses the rubber__ Python wrapper
-  for LaTeX and friends.
+.. Python 2 only (or broken)
 
-  __ https://docutils.sourceforge.io/sandbox/rst2pdf/README.html
-  __ https://launchpad.net/rubber
+  rlpdf_ --- another PDF writer based on ReportLab_.
 
-* rlpdf_ is another PDF Writer based on ReportLabs.
-
   .. _rlpdf: https://docutils.sourceforge.io/sandbox/dreamcatcher/rlpdf/
 
-* RinohType_ is a pure Python PDF Writer based on a document template and a
-  style sheet (beta).
+  >>> from rlpdf import Writer
+  ImportError: cannot import name 'Writer' from partially initialized
+  module 'rlpdf' (most likely due to a circular import)
 
-  .. _RinohType: https://pypi.python.org/pypi/RinohType
 
-website generators and HTML variants
-````````````````````````````````````
+Others
+``````
 
-* The Sphinx_ Python Documentation Generator by Georg Brandl was
-  originally created to translate the `Python documentation`_.
-  In the meantime, there is a wide range of `Projects using Sphinx`__
+* `DocBook Writer`_ (only Python 2)
 
-  It can generate complete web sites (interlinked and indexed HTML pages),
-  ePub, LaTeX, and others from a set of rST source files.
+  .. _DocBook Writer: https://docutils.sourceforge.io/sandbox/oliverr/docbook/
 
-  .. _Sphinx: https://www.sphinx-doc.org
-  __ https://www.sphinx-doc.org/en/master/examples.html
+* `pickle writer`_ --- "pickle__" the document tree to a binary string.
 
-* The Nikola_ static site generator, uses reStructuredText by
-  default.
+  .. _pickle writer:
+      https://docutils.sourceforge.io/sandbox/blais/pickle_writer/
+  __ https://docs.python.org/3/library/pickle.html
 
-  .. _nikola:  https://getnikola.com/
+* rst2confluence__ converts reStructuredText to Confluence__ CMS markup.
 
-* Pelican_ is a static site generator (mainly for blogs). Articles/pages can
-  be written in reStructuredText or Markdown_ format.
+  __ https://github.com/netresearch/rst2confluence
+  __ https://www.atlassian.com/software/confluence
 
-  .. _pelican: https://docs.getpelican.com
+* rst2epub2_ (only Python 2)
 
-* tinkerer_ is a static bloggin framework based on Sphinx_.
+  .. _rst2epub2: https://github.com/mattharrison/rst2epub2
 
-  .. _tinkerer: https://pypi.org/project/Tinkerer/
+----------------------------------------------------------
 
-* htmlnav_ by Gunnar Schwant, is an HTML writer which supports navigation
-  bars.
+There are more extensions in the `Docutils Sandbox`_.
 
-  .. _htmlnav: https://docutils.sourceforge.io/sandbox/gschwant/htmlnav/
+.. _Docutils Sandbox: https://docutils.sourceforge.io/sandbox/README.html
 
-* rest2web, by Michael Foord, is a tool for creating web sites with
-  reStructuredText. Development stalled, there is a fork at
-  https://gitlab.com/wavexx/rest2web
 
-* `html4trans <https://docutils.sourceforge.io/sandbox/html4trans/>`__
-  produces XHTML conforming to the version 1.0 Transitional DTD that
-  contains enough formatting information to be viewed by a lightweight HTML
-  browser without CSS support.
+Tools
+=====
 
-* A `simple HTML writer`_ by Bill Bumgarner that doesn't rely on CSS
-  stylesheets.
+* a Makefile_ for driving Docutils,
 
-  .. _simple HTML writer: https://docutils.sourceforge.io/sandbox/bbum/DocArticle/
+  .. _Makefile: https://docutils.sourceforge.io/sandbox/cben/make/
 
-ePub
-````
+* rstcheck_ checks syntax of reStructuredText and code blocks nested
+  within it.
 
-* rst2epub2_ by Matt Harrison includes the epublib (originally by Tim
-  Tambin) and a rst2epub.py executable for the conversion.
+  .. _rstcheck: https://pypi.python.org/pypi/rstcheck
 
-  .. _rst2epub2: https://github.com/mattharrison/rst2epub2
+* restview_ --- live preview for reStructuredText documents,
 
-* Sphinx_ provides ePub as output option, too.
+  .. _restview: https://mg.pov.lt/restview/
 
 
-Others
-``````
+Editors
+-------
 
-* Pandoc_ is a document converter that can write Markdown_,
-  reStructuredText, HTML, LaTeX, RTF, DocBook XML, and S5.
+Editors and IDEs with reStructuredText support.
 
-  .. _Pandoc: https://pandoc.org/
+* Eclipse_ IDE with `ReST Editor`__ plug-in.
 
-* restxsl_ by Michael Alyn Miller, lets you transform reStructuredText
-  documents into XML/XHTML files using XSLT stylesheets.
+  .. _Eclipse: https://eclipseide.org/
+  __  http://resteditor.sourceforge.net/
 
-  .. _restxsl: http://www.strangeGizmo.com/products/restxsl/
+* Emacs__ extensible text editor with `rst mode`__.
 
-* An `XSLT script`__ by Ladislav Lhotka enables reStructuredText annotations
-  to be included in RELAG NG XML schemas.
+  __ https://www.gnu.org/software/emacs/
+  __ https://docutils.sourceforge.io/tools/editors/emacs/
 
-  __ https://www.cesnet.cz/doc/techzpravy/2006/rngrest/
+* Geany_ lightweight IDE.
 
-* `DocBook Writer`_ by Oliver Rutherfurd.
+  .. _geany: http://www.geany.org/
 
-  .. _DocBook Writer: https://docutils.sourceforge.io/sandbox/oliverr/docbook/
+* gedit_ with the gedit-reST-plugin__.
 
-* Nabu_, written by Martin Blais, is a publishing system which
-  extracts information from reStructuredText documents and stores it
-  in a database.  Python knowledge is required to write extractor
-  functions and to retrieve the data from the database again.
+  .. _gedit: https://gedit-text-editor.org/
+  __ https://github.com/bittner/gedit-reST-plugin
 
-  .. _Nabu: https://github.com/blais/nabu
+* JED__ programmers editor with `rst mode`__.
 
-* The `pickle writer`_ by Martin Blais pickles the document tree to a binary
-  string. Later unpickling will allow you to publish with other Writers.
+  __ https://www.jedsoft.org/jed/
+  __ https://jedmodes.sourceforge.io/mode/rst/
 
-  .. _pickle writer: https://docutils.sourceforge.io/sandbox/blais/pickle_writer/
+* Leo_ PIM, IDE and outliner (see `creating documents from outlines`__).
 
-* The `Texinfo Writer`_, by Jon Waltman converts reStructuredText to
-  Texinfo, the documentation format used by the GNU project and the
-  Emacs text editor.  Texinfo can be used to produce multiple output
-  formats, including HTML, PDF, and Info.
+  .. _Leo: https://leo-editor.github.io/leo-editor/
+  __ https://leo-editor.github.io/leo-editor/tutorial-rst3.html
 
-  .. _Texinfo Writer: https://docutils.sourceforge.io/sandbox/texinfo-writer/README.html
+* `Notepad++`_ with reStructuredText_NPP__ (basic syntax highlighting).
 
-* For `confluence CMS`_ see https://github.com/netresearch/rst2confluence.
+  .. _Notepad++: https://www.notepad-plus-plus.org/
+  __ https://github.com/steenhulthin/reStructuredText_NPP
 
-  .. _confluence CMS: https://www.atlassian.com/software/confluence
+* ReSTedit_ --- Docutils GUI for Mac OS X.
 
-* Deploying into wikis might be aided by deploy-rst_.
+  .. _ReSTedit: https://svn.red-bean.com/restedit/trunk/README.html
 
-  .. _deploy-rst: https://github.com/netresearch/deploy-rst
+* ReText_ --- editor for markup languages with live preview.
 
+  .. _ReText: https://pypi.org/project/ReText/
 
-Import
-------
+* RSTPad_ --- reStructuredText editor with live preview.
 
-Convert other formats to reStructuredText:
+  .. _RSTPad: https://github.com/shira-374/rstpad?tab=readme-ov-file#rstpad
 
-* recommonmark_ is a Markdown_ (CommonMark_) parser for
-  docutils originally created by Luca Barbato.
+* `Vim <https://www.vim.org/>`__ with
 
-  Docutils "markdown" parser (new in Docutils 0.17) is a wrapper
-  around recommonmark.
+  - `rest.vim <https://www.vim.org/scripts/script.php?script_id=973>`__
+    reStructuredText syntax mode,
+  - `VST <https://www.vim.org/scripts/script.php?script_id=1334>`__
+    (Vim reStructuredText) plugin,
+  - `VOoM <https://www.vim.org/scripts/script.php?script_id=2657>`__
+    two-pane text outliner, or
+  - `Riv: <https://github.com/Rykka/riv.vim>`__
+    Notes and wiki in rST.
 
-  .. _recommonmark: https://github.com/rtfd/recommonmark
-  .. _Markdown: https://daringfireball.net/projects/markdown/syntax
-  .. _CommonMark: https://commonmark.org/
+* `Visual Studio Code`__ with `vscode-restructuredtext`__
+  Language Support extension.
 
+  __ https://code.visualstudio.com
+  __ https://github.com/vscode-restructuredtext/vscode-restructuredtext
 
-* sxw2rest_, by Trent W. Buck, converts StarOffice XML Writer (SXW)
-  files to reStructuredText. (link down)
 
-  .. _sxw2rest: https://twb.ath.cx/~twb/darcs/sxw2rest/
+.. \http://rst.ninjs.org/ is down, the repository marked as UNMAINTAINED:
 
-* xml2rst_, an XSLT stylesheet written by Stefan Merten, converts XML
-  dumps of the document tree (e.g. created with ``rst2xml``) back to
+  `rsted <https://github.com/anru/rsted>`_: a simple online editor for
   reStructuredText.
 
-  .. _xml2rst: http://www.merten-home.de/FreeSoftware/xml2rst/index.html
+.. last update 2004, Python 2 -> incompatible with Docutils > 0.18
 
-* xhtml2rest_, written by Antonios Christofides, is a simple utility
-  to convert XHTML to reStructuredText.
+  DocFactory_ is a wxPython GUI application for Docutils.
+  The last version (from 2004) still requires Python 2.
 
-  .. _xhtml2rest: https://docutils.sourceforge.io/sandbox/wiemann/xhtml2rest/
+  .. _DocFactory:
+   https://docutils.sourceforge.io/sandbox/gschwant/docfactory/doc/
 
-* DashTable_ by Gustav Klopp converts HTML tables into reStructuredText.
-  Colspan and Rowspan supported!
 
-  .. _DashTable: https://github.com/gustavklopp/DashTable
+Related Applications
+====================
 
-* Sphinx_ includes a `LaTeX to rST converter
-  <https://svn.python.org/projects/doctools/converter/>`__ in its source code
-  (trimmed to importing the old Python docs).
+Applications using Docutils/reStructuredText and helper applications.
 
-* Pandoc_ can read Markdown_ and (subsets of) HTML, and LaTeX and
-  export to (amongst others) reStructuredText.
 
-* PySource_, by Tony Ibbs, is an experimental Python source Reader.
-  There is some related code in David Goodger's sandbox
-  (pysource_reader_) and a `Python Source Reader`_ document.
-
-  .. _PySource: https://docutils.sourceforge.io/sandbox/tibs/pysource/
-  .. _pysource_reader: https://docutils.sourceforge.io/sandbox/davidg/pysource_reader/
-  .. _Python Source Reader: https://docutils.sourceforge.io/docs/dev/pysource.html
-
-
-Extensions
+Converters
 ----------
 
-Extend the reStructuredText syntax or the features of Docutils.
-More extensions are in the `Docutils Sandbox`_.
+Alternative implementations to convert between reStructuredText
+and other formats.
 
-* Beni Cherniavsky has written a generic `preprocessing module`_ for
-  roles and/or directives and built preprocessors for TeX math for
-  both LaTeX and HTML output on top of it.
+* Pandoc_ --- universal document converter written in Haskell.
+  Can read/write reStructuredText, DocBook, EPUB, HTML, LaTeX,
+  docx, Markdown, ODT, and more.
 
-  .. _preprocessing module: https://docutils.sourceforge.io/sandbox/cben/rolehack/
+  .. _Pandoc: https://pandoc.org/
 
-* Beni Cherniavsky maintains a Makefile_ for driving Docutils, hoping
-  to handle everything one might do with Docutils.
+* Laika_ --- Site and E-book Generator and Customizable Text Markup
+  Transformer for sbt, Scala and Scala.js.
 
-  .. _Makefile: https://docutils.sourceforge.io/sandbox/cben/make/
+  .. _Laika: https://typelevel.org/Laika/
 
-* The `ASCII art to SVG converter`_ (aafigure) developed by
-  Chris Liechti can parse ASCII art images, embedded in reST documents and
-  output an image. This would mean that simple illustrations could be
-  embedded as ASCII art in the reST source and still look nice when
-  converted to e.g. HTML
+* Nim_ --- system programming language.  Supports `Nim-flavoured
+  reStructuredText`__ with the rst__, rstast__, and rstgen__ modules.
+  The Nim compiler provides the  ``nim rst2html`` and ``nim rst2latex``
+  sub-commands.
 
-  .. _ASCII art to SVG converter:
-     https://docutils.sourceforge.io/sandbox/cliechti/aafigure/
+  .. _Nim: https://nim-lang.org/
+  __ https://nim-lang.org/docs/markdown_rst.html
+  __ https://nim-lang.org/docs/rst.html
+  __ http://nim-lang.org/docs/rstast.html
+  __ http://nim-lang.org/docs/rstgen.html
 
-* Quick and easy publishing reStructuredText source files as blog posts
-  on blogger.com is possible with `rst2blogger`_ .
+* RST__ --- PHP library to parse reStructuredText documents.
 
-  .. _rst2blogger: https://github.com/dhellmann/rst2blogger#readme
+  __ https://github.com/Gregwar/RST
 
-.. _Docutils Sandbox: https://docutils.sourceforge.io/sandbox/README.html
+* Text-Restructured_ --- a set of Perl_ modules to parse reStructuredText
+  documents and output them in various formats.
 
+  .. _Text-Restructured: https://metacpan.org/dist/Text-Restructured
+  .. _Perl: https://www.perl.org
 
-Related Applications
---------------------
+* xml2rst_ --- an XSLT stylesheet that converts `Docutils XML`_
+  back to reStructuredText.
 
-Applications using docutils/reStructuredText and helper applications.
+  .. _xml2rst: http://www.merten-home.de/FreeSoftware/xml2rst/index.html
+  .. _Docutils XML: ../ref/doctree.html
 
-* For Blogs (Weblogs), please see the `FAQ entry about Blogs`_.
+Website Generators
+------------------
 
-* `Project Gutenberg`_ uses  Docutils for its "ebookmaker_"
-  xetex, nroff, and epub generator (with some `extensions to rST`__).
+* Sphinx_ Documentation Generator.
 
-  __ http://pgrst.pglaf.org/publish/181/181-h.html
+  .. _Sphinx: https://www.sphinx-doc.org
 
+* ipsumgenera_ --- static blog generator written in Nim.
 
-* Text-Restructured_ at CPAN is a set of modules to parse
-  reStructuredText documents and output them in various formats written
-  in Perl_.
-  Up to January 2021, the sources were stored in the Docutils repository_.
-  After long inactivity (the last commit was r6498__
-  2010-12-08), ``trunk/prest/`` was moved to the attic.
+  .. _ipsumgenera: https://github.com/dom96/ipsumgenera
 
-  __ https://sourceforge.net/p/docutils/code/6498/
+* Nikola_ --- static site generator.
 
-.. _FAQ entry about Wikis: http://docutils.sf.net/FAQ.html
-    #are-there-any-wikis-that-use-restructuredtext-syntax
-.. _FAQ entry about Blogs: https://docutils.sourceforge.io/FAQ.html
-    #are-there-any-weblog-blog-projects-that-use-restructuredtext-syntax
-.. _Project Gutenberg: http://www.gutenberg.org
-.. _ebookmaker: https://pypi.org/project/ebookmaker/
-.. _Perl: https://www.perl.org
-.. _Text-Restructured: https://metacpan.org/dist/Text-Restructured
-.. _repository: ../dev/repository.html
+  .. _nikola:  https://getnikola.com/
 
+* Pelican_ --- another static site generator.
 
-Wikis
-`````
+  .. _pelican: https://docs.getpelican.com
 
-* Trac_ supports `using reStructuredText`__ as an alternative to wiki markup.
-  This includes support for TracLinks_ from within reStructuredText
-  via a custom rST reference-directive or, even easier, an interpreted
-  text role "trac".
+* rest2web_ --- simple tool for creating web sites with reStructuredText.
 
-  __ http://trac.edgewall.com//wiki/WikiRestructuredText
+  .. _rest2web: https://gitlab.com/wavexx/rest2web
 
-* MoinMoin_ includes a `ReStructuredText Parser
-  <http://moinmo.in/HelpOnParsers/ReStructuredText>`__.
+* Yozuch_ --- reStructuredText based static blog generator written in Python.
 
-* Ian Bicking's experimental `wiki module`__ in the sandbox.
+  .. _Yozuch: https://github.com/akrylysov/yozuch
 
-  __ https://docutils.sourceforge.io/sandbox/ianb/wiki
 
-* Zope-based Zwiki_
-  (requires Zope2, which reached end of life on December 31, 2020).
+Wikis
+-----
 
-.. _TracLinks: http://trac.edgewall.com//wiki/TracLinks
-.. _MoinMoin: http://moinmo.in/
-.. _ZWiki: https://github.com/simonmichael/ZWiki
+* MoinMoin_ includes a `ReStructuredText parser`__.
 
+  .. _MoinMoin: http://moinmo.in/
+  __ http://moinmo.in/HelpOnParsers/ReStructuredText
 
-Tools
-`````
+* Trac_ supports  `reStructuredText as alternative wiki markup`__.
 
-* rstcheck_ Checks syntax of reStructuredText and code blocks nested within
-  it. (Using the Sphinx syntax "code-block" for the "code" directive.)
+  __ https://trac.edgewall.org/wiki/WikiRestructuredText
 
-  .. _rstcheck: https://pypi.python.org/pypi/rstcheck
 
-* restview_ is a viewer for reStructuredText documents.
-
-  Pass the name of a ReStructuredText document to restview, and it will
-  launch a web server on localhost:random-port and open a web browser. It
-  will also watch for changes in that file and automatically reload and
-  rerender it. This is very convenient for previewing a document while
-  you're editing it.
-
-  .. _restview: https://mg.pov.lt/restview/
-
-
 Development
-```````````
+-----------
 
 * Sphinx_ extends the ReStructuredText syntax to better support the
-  documentation of Software projects (but other documents
-  can be written with it too).
+  documentation of Software projects.
 
-* `Sphinx Extensions`_ allow automatic testing of code snippets,
+  `Sphinx Extensions`_ allow automatic testing of code snippets,
   inclusion of docstrings from Python modules (API docs), and more.
 
-* Trac_, a project management and bug/issue tracking system, supports
-  `using reStructuredText
-  <https://trac.edgewall.org/wiki/WikiRestructuredText>`__ as an
-  alternative to wiki markup.
+  .. _Sphinx extensions: https://www.sphinx-doc.org/en/master/usage/extensions/
 
+* Trac_, a wiki and issue tracking system, supports
+  `reStructuredText as alternative wiki markup`__.
+  This includes support for TracLinks__ via a `:trac: role`__.
 
-* PyLit_ provides a bidirectional text <--> code converter for *literate
-  programming with reStructuredText*.
+  .. _Trac: https://trac.edgewall.org
+  __ https://trac.edgewall.org/wiki/WikiRestructuredText
+  __ https://trac.edgewall.org/wiki/TracLinks
+  __ https://trac.edgewall.org/wiki/WikiRestructuredTextLinks
 
-.. _Sphinx extensions: https://www.sphinx-doc.org/en/master/usage/extensions/
-.. _Python documentation: https://docs.python.org/
-.. _Trac: https://trac.edgewall.org
-.. _PyLit: https://codeberg.org/milde/pylit
+* PyLit_ provides a bidirectional text ↔ code converter for Literate
+  Programming with reStructuredText.
 
+  .. _PyLit: https://codeberg.org/milde/pylit
 
+
 CMS Systems
-```````````
+-----------
 
-* Plone_ and Zope_ both support reStructuredText markup.
+* Plone_ supports `reStructuredText content`__.
 
-* ZReST_, by Richard Jones, is a "ReStructuredText Document for Zope_"
-  application that is complete and ready to install.
+  __ https://6.docs.plone.org/backend/fields.html
+     #restructuredtext-transformation
 
+* Zope_ (Zope 4 `dropped the ReST shim`__).
+
+  __ https://github.com/zopefoundation/Products.CMFDefault/issues/5
+
 .. _Plone: https://plone.org/
 .. _Zope: https://www.zope.dev/
-.. _ZReST: https://docutils.sourceforge.io/sandbox/richard/ZReST/
 
 
 Presentations
-`````````````
+-------------
 
-* rst2html5_ transform restructuredtext documents to html5 + twitter's
-  bootstrap css, deck.js or reveal.js
+There is native support for `slide shows with S5`__.
 
-  .. _rst2html5: https://github.com/marianoguerra/rst2html5
+__ https://docutils.sourceforge.io/docs/user/slide-shows.s5.html
 
+* InkSlide_ quick and easy presentations using Inkscape_. InkSlide uses
+  reStructuredText for markup, although it renders only a subset of rST.
+
+  .. _InkSlide: http://wiki.inkscape.org/wiki/index.php/InkSlide
+  .. _Inkscape: http://inkscape.org/
+
 * landslide_ generates HTML5 slideshows from markdown, ReST, or textile.
 
   .. _landslide: https://github.com/adamzap/landslide
 
-* `native support for S5 <slide-shows.s5.html>`_.
+* `marianoguerra/rst2html5`__ can produce slides using
+  HTML5 + deck.js, impress.js, or reveal.js.
 
-* The `PythonPoint interface`_ by Richard Jones produces PDF
-  presentations using ReportLabs' PythonPoint.
+  __ https://github.com/marianoguerra/rst2html5
 
-  .. _PythonPoint interface:
-     https://docutils.sourceforge.io/sandbox/richard/pythonpoint/
+* Pandoc_ can export to various slide show formats
+  (LaTeX Beamer, PowerPoint, Slidy, S5, ...).
 
-* rst2beamer_ generates a LaTeX source that uses the `Beamer` document class.
-  Can be converted to PDF slides with pdfLaTeX/XeLaTeX/LuaLaTeX.
+* rst2odp_ --- rst to LibreOffice impress.
 
-  .. _rst2beamer: https://docutils.sourceforge.io/sandbox/rst2beamer/
+  .. _rst2odp: https://github.com/mattharrison/rst2odp
 
-* InkSlide_ quick and easy presentations using Inkscape_. InkSlide uses
-  reStructuredText for markup, although it renders only a subset of rst.
 
-  .. _InkSlide: http://wiki.inkscape.org/wiki/index.php/InkSlide
-  .. _Inkscape: http://inkscape.org/
+Help / Q&A
+==========
 
-* rst2outline_ translates a reStructuredText document to a plain text
-  outline. This can then be transformed to PowerPoint.
+* Stackoverflow tags `[restructuredtext]`__ and `[docutils]`__.
 
-  .. _rst2outline: https://docutils.sourceforge.io/sandbox/rst2outline/
-
-* Pandoc_ can also be used to produce slides
-
-.. TODO: update with input from
-   https://stackoverflow.com/questions/2746692/restructuredtext-tool-support
+  __ https://stackoverflow.com/questions/tagged/restructuredtext
+  __ https://stackoverflow.com/questions/tagged/docutils

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

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

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

Revision: 10147
          http://sourceforge.net/p/docutils/code/10147
Author:   milde
Date:     2025-05-27 06:15:14 +0000 (Tue, 27 May 2025)
Log Message:
-----------
LaTeX writer: Use a transform to resolve BibTeX references.

The 'use_bibtex' setting indicates that citation entries are fetched
from a BibTeX database by the backend (LaTeX).
Use a transfrom instead of the deprecated "unknown_reference_resolvers"
hook chain to mark citation_references as resolved.

Modified Paths:
--------------
    trunk/docutils/HISTORY.rst
    trunk/docutils/RELEASE-NOTES.rst
    trunk/docutils/docs/api/transforms.rst
    trunk/docutils/docutils/transforms/references.py
    trunk/docutils/docutils/writers/latex2e/__init__.py

Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst	2025-05-27 06:14:22 UTC (rev 10146)
+++ trunk/docutils/HISTORY.rst	2025-05-27 06:15:14 UTC (rev 10147)
@@ -17,8 +17,16 @@
 Release 0.22rc3 (unpublished)
 =============================
 
-* nothing yet.
+* docutils/writers/latex2e/__init__.py
 
+  - Replace `Writer.bibtex_reference_resolver()` with a transform.
+
+* docutils/transforms/references.py
+
+  - New transform `CitationReferences`. Marks citation_references
+    as resolved if BibTeX is used by the backend (LaTeX).
+
+
 Release 0.22rc2 (2025-05-22)
 ============================
 

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2025-05-27 06:14:22 UTC (rev 10146)
+++ trunk/docutils/RELEASE-NOTES.rst	2025-05-27 06:15:14 UTC (rev 10147)
@@ -164,7 +164,8 @@
 * Remove the input_encoding_ auto-detection code in Docutils 1.0.
 
 * Remove the "TransformSpec.unknown_reference_resolvers" hook chain
-  in Docutils 1.0.  Use a transform.
+  in Docutils 1.0.  Use a transform, see
+  `transforms.references.CitationReferences` for an example.
 
 * Remove `parsers.rst.roles.set_classes()` and
   `parsers.rst.roles.normalized_role_options()`
@@ -230,7 +231,10 @@
 Release 0.22rc3 (unpublished)
 =============================
 
-* nothing yet.
+New objects
+  `transforms.references.`CitationReferences`
+     Mark citation_references as resolved if the backend (LaTeX)
+     uses a BibTeX database.
 
 Release 0.22rc2 (2025-05-22)
 ============================

Modified: trunk/docutils/docs/api/transforms.rst
===================================================================
--- trunk/docutils/docs/api/transforms.rst	2025-05-27 06:14:22 UTC (rev 10146)
+++ trunk/docutils/docs/api/transforms.rst	2025-05-27 06:15:14 UTC (rev 10147)
@@ -97,6 +97,8 @@
 
 peps_.PEPZero                       peps.Headers (t/p)            760
 
+references_.CitationReferences      latex2e (w)                   770
+
 components.Filter                   *not used*                    780
 
 universal_.Decorations              Reader (r)                    820
@@ -205,6 +207,7 @@
 
 writers.latex2e.Writer
   writer_aux.Admonitions
+  references.CitationReferences
 
 writers._html_base.Writer:
   writer_aux.Admonitions

Modified: trunk/docutils/docutils/transforms/references.py
===================================================================
--- trunk/docutils/docutils/transforms/references.py	2025-05-27 06:14:22 UTC (rev 10146)
+++ trunk/docutils/docutils/transforms/references.py	2025-05-27 06:15:14 UTC (rev 10147)
@@ -842,6 +842,31 @@
         return footnote
 
 
+class CitationReferences(Transform):
+    """Resolve <citation_references>.
+
+    The 'use_bibtex'__ configuration setting indicates that citation entries
+    are fetched from a BibTeX database by the backend (LaTeX).
+
+    __ https://docutils.sourceforge.io/docs/user/config.html#use-bibtex
+    """
+    # TODO: Bibliography database support for other output formats.
+
+    default_priority = 770
+    # Apply between `InternalTargets` (660) and `DanglingReferences` (850)
+
+    def apply(self) -> None:
+        if not getattr(self.document.settings, 'use_bibtex', []):
+            return
+        for node in self.document.findall(nodes.citation_reference):
+            # Skip nodes that are resolved or have a matching target:
+            if node.resolved or self.document.nameids.get(node.get('refname')):
+                continue
+            if node.astext():  # ensure text content (becomes the BibTeX key)
+                node.delattr('refname')
+                node.resolved = True
+
+
 class DanglingReferences(Transform):
 
     """

Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py	2025-05-27 06:14:22 UTC (rev 10146)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py	2025-05-27 06:15:14 UTC (rev 10147)
@@ -20,7 +20,7 @@
 from pathlib import Path
 
 from docutils import frontend, nodes, languages, writers, utils
-from docutils.transforms import writer_aux
+from docutils.transforms import references, writer_aux
 from docutils.utils._roman_numerals import RomanNumeral
 from docutils.utils.math import pick_math_environment, unichar2tex
 
@@ -254,29 +254,13 @@
     def __init__(self) -> None:
         writers.Writer.__init__(self)
         self.translator_class = LaTeXTranslator
-        self.unknown_reference_resolvers = [self.bibtex_reference_resolver]
-        self.bibtex_reference_resolver.priority = 400
 
-    @staticmethod
-    def bibtex_reference_resolver(node: nodes.Element) -> bool:
-        """Mark citation references as resolved if BibTeX is used.
-
-        Cf. `TransformSpec.unknown_reference_resolvers`.
-        """
-        if (isinstance(node, nodes.citation_reference)
-            and node.document.settings.use_bibtex):
-            del node['refname']
-            node.resolved = True
-            return True
-        else:
-            return False
-
     def get_transforms(self):
         # Override parent method to add latex-specific transforms
         return super().get_transforms() + [
                    # Convert specific admonitions to generic one
                    writer_aux.Admonitions,
-                   # TODO: footnote collection transform
+                   references.CitationReferences,
                    ]
 
     def translate(self) -> None:

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

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

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

Revision: 10146
          http://sourceforge.net/p/docutils/code/10146
Author:   milde
Date:     2025-05-27 06:14:22 +0000 (Tue, 27 May 2025)
Log Message:
-----------
Deprecate the `TransformSpec.unknown_reference_resolvers` hook chain.

`unknown_reference_resolvers` were introduced to support component-specific
resolving of unknown references. Ian Bicking's "Wiki.py" module in the sandbox
shows that a simple transform can be used for that task.
Removing the hook and its complex specification will simplify both,
API and code base without loss of functionality.

The only known use case is the MoinMoin wiki.1
Versions <= 1.9 register a "resolver" function for "Wiki references".
MoinMoin 2.0 does not use the "unknown_reference_resolvers" hook;
MoinMoin 1.9 requires Python 2, so a removal will not affect
existing installations.

1 The LaTeX writer uses a "resolver function" for BibTeX citation_references
  in Docutils 0.22 development and pre-release versions.
  It will be changed to use a transform in the next commit.

Modified Paths:
--------------
    trunk/docutils/RELEASE-NOTES.rst
    trunk/docutils/docutils/__init__.py
    trunk/docutils/docutils/io.py
    trunk/docutils/docutils/transforms/__init__.py
    trunk/docutils/test/test_transforms/test__init__.py

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2025-05-25 21:05:14 UTC (rev 10145)
+++ trunk/docutils/RELEASE-NOTES.rst	2025-05-27 06:14:22 UTC (rev 10146)
@@ -163,6 +163,9 @@
 
 * Remove the input_encoding_ auto-detection code in Docutils 1.0.
 
+* Remove the "TransformSpec.unknown_reference_resolvers" hook chain
+  in Docutils 1.0.  Use a transform.
+
 * Remove `parsers.rst.roles.set_classes()` and
   `parsers.rst.roles.normalized_role_options()`
   (obsoleted by `parsers.rst.roles.normalize_options()`) in Docutils 2.0.

Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py	2025-05-25 21:05:14 UTC (rev 10145)
+++ trunk/docutils/docutils/__init__.py	2025-05-27 06:14:22 UTC (rev 10146)
@@ -75,7 +75,8 @@
         ]
 
     class _UnknownReferenceResolver(Protocol):
-        """See `TransformSpec.unknown_reference_resolvers`."""
+        """Deprecated. Will be removed in Docutils 1.0."""
+        # See `TransformSpec.unknown_reference_resolvers`.
 
         priority: int
 
@@ -284,41 +285,39 @@
     unknown_reference_resolvers: Sequence[_UnknownReferenceResolver] = ()
     """List of hook functions which assist in resolving references.
 
-    Override in subclasses to implement component-specific resolving of
-    unknown references.
-
-    Unknown references have a 'refname' attribute which doesn't correspond
-    to any target in the document.  Called when the transforms in
-    `docutils.transforms.references` are unable to find a correct target.
-
-    The list should contain functions which will try to resolve unknown
-    references, with the following signature::
-
-        def reference_resolver(node: nodes.Element) -> bool:
-            '''Returns boolean: true if resolved, false if not.'''
-
-    If the function is able to resolve the reference, it should also remove
-    the 'refname' attribute and mark the node as resolved::
-
-        del node['refname']
-        node.resolved = True
-
-    Each function must have a "priority" attribute which will affect the order
-    the unknown_reference_resolvers are run
-    cf. ../docs/api/transforms.html#transform-priority-range-categories ::
-
-        reference_resolver.priority = 500
-
-    Examples:
-      `writers.latex2e.Writer` defines a resolver to mark citation references
-      as resolved by BibTeX if the "use_bibtex" configuration setting is set.
-
-      The `MoinMoin ReStructured Text Parser`__ provides a resolver for
-      "WikiWiki links" (currently only in the outdated 1.9 version).
-
-      __ https://github.com/moinwiki/moin-1.9/blob/1.9.11/MoinMoin/parser/
-         text_rst.py
+    Deprecated. Will be removed in Docutils 1.0
     """
+    # Override in subclasses to implement component-specific resolving of
+    # unknown references.
+    #
+    # Unknown references have a 'refname' attribute which doesn't correspond
+    # to any target in the document.  Called when the transforms in
+    # `docutils.transforms.references` are unable to find a correct target.
+    #
+    # The list should contain functions which will try to resolve unknown
+    # references, with the following signature::
+    #
+    #     def reference_resolver(node: nodes.Element) -> bool:
+    #         '''Returns boolean: true if resolved, false if not.'''
+    #
+    # If the function is able to resolve the reference, it should also remove
+    # the 'refname' attribute and mark the node as resolved::
+    #
+    #     del node['refname']
+    #     node.resolved = True
+    #
+    # Each function must have a "priority" attribute which will affect the
+    # order the unknown_reference_resolvers are run
+    # cf. ../docs/api/transforms.html#transform-priority-range-categories ::
+    #
+    #     reference_resolver.priority = 500
+    #
+    # Examples:
+    #   The `MoinMoin ReStructured Text Parser`__ provided a resolver for
+    #   "WikiWiki links" in the 1.9 version.
+    #
+    #   __ https://github.com/moinwiki/moin-1.9/blob/1.9.11/MoinMoin/parser/
+    #      text_rst.py
 
 
 class Component(SettingsSpec, TransformSpec):

Modified: trunk/docutils/docutils/io.py
===================================================================
--- trunk/docutils/docutils/io.py	2025-05-25 21:05:14 UTC (rev 10145)
+++ trunk/docutils/docutils/io.py	2025-05-27 06:14:22 UTC (rev 10146)
@@ -82,9 +82,9 @@
     Docutils input objects must provide a `read()` method that
     returns the source, typically as `str` instance.
 
-    Inheriting `TransformSpec` allows input objects to add
-    "transforms" and "unknown_reference_resolvers" to the "Transformer".
-    (Optional for custom input objects since Docutils 0.19.)
+    Inheriting `TransformSpec` allows input objects to add "transforms" to
+    the "Transformer".  (Since Docutils 0.19, input objects are no longer
+    required to be `TransformSpec` instances.)
     """
 
     component_type: Final = 'input'
@@ -242,9 +242,9 @@
     Docutils output objects must provide a `write()` method that
     expects and handles one argument (the output).
 
-    Inheriting `TransformSpec` allows output objects to add
-    "transforms" and "unknown_reference_resolvers" to the "Transformer".
-    (Optional for custom output objects since Docutils 0.19.)
+    Inheriting `TransformSpec` allows output objects to add "transforms" to
+    the "Transformer".  (Since Docutils 0.19, output objects are no longer
+    required to be `TransformSpec` instances.)
     """
 
     component_type: Final = 'output'

Modified: trunk/docutils/docutils/transforms/__init__.py
===================================================================
--- trunk/docutils/docutils/transforms/__init__.py	2025-05-25 21:05:14 UTC (rev 10145)
+++ trunk/docutils/docutils/transforms/__init__.py	2025-05-27 06:14:22 UTC (rev 10146)
@@ -25,6 +25,8 @@
 
 __docformat__ = 'reStructuredText'
 
+import warnings
+
 from docutils import languages, ApplicationError, TransformSpec
 
 
@@ -64,8 +66,8 @@
     """
     Store "transforms" and apply them to the document tree.
 
-    Collect lists of `Transform` instances and "unknown_reference_resolvers"
-    from Docutils components (`TransformSpec` instances).
+    Collect lists of `Transform` instances from Docutils
+    components (`TransformSpec` instances).
     Apply collected "transforms" to the document tree.
 
     Also keeps track of components by component type name.
@@ -80,8 +82,11 @@
         """
 
         self.unknown_reference_resolvers = []
-        """List of hook functions which assist in resolving references."""
+        """List of hook functions which assist in resolving references.
 
+        Deprecated. Will be removed in Docutils 1.0.
+        """
+
         self.document = document
         """The `nodes.document` object this Transformer is attached to."""
 
@@ -167,6 +172,11 @@
             return f.priority
         resolvers.sort(key=keyfun)
         self.unknown_reference_resolvers += resolvers
+        if self.unknown_reference_resolvers:
+            warnings.warn('The `unknown_reference_resolvers` hook chain '
+                          'will be removed in Docutils 1.0.\n'
+                          'Use a transform to resolve references.',
+                          DeprecationWarning, stacklevel=2)
 
     def apply_transforms(self) -> None:
         """Apply all of the stored transforms, in priority order."""

Modified: trunk/docutils/test/test_transforms/test__init__.py
===================================================================
--- trunk/docutils/test/test_transforms/test__init__.py	2025-05-25 21:05:14 UTC (rev 10145)
+++ trunk/docutils/test/test_transforms/test__init__.py	2025-05-27 06:14:22 UTC (rev 10146)
@@ -17,6 +17,7 @@
     # so we import the local `docutils` package.
     sys.path.insert(0, str(Path(__file__).resolve().parents[2]))
 
+import docutils
 from docutils import transforms, utils
 
 
@@ -47,5 +48,21 @@
         self.assertEqual(transform_record[3], {'foo': 42})
 
 
+class TransformerWarningsTestCase(unittest.TestCase):
+
+    @staticmethod
+    def dummy_resolver(node):
+        # Cf. `TransformSpec.unknown_reference_resolvers`.
+        return node.resolved
+
+    def test_deprecation_warnings(self):
+        transformer = transforms.Transformer(utils.new_document('test data'))
+        component = docutils.Component()
+        component.unknown_reference_resolvers = [self.dummy_resolver]
+        self.dummy_resolver.priority = 50
+        with self.assertWarnsRegex(DeprecationWarning, 'will be removed'):
+            transformer.populate_from_components([component])
+
+
 if __name__ == '__main__':
     unittest.main()

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

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

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

Revision: 10145
          http://sourceforge.net/p/docutils/code/10145
Author:   milde
Date:     2025-05-25 21:05:14 +0000 (Sun, 25 May 2025)
Log Message:
-----------
Use True instead of 1 for boolean attribute.

Fix leftover from the times when there was no boolean data type.

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

Modified: trunk/docutils/docutils/transforms/references.py
===================================================================
--- trunk/docutils/docutils/transforms/references.py	2025-05-22 20:00:51 UTC (rev 10144)
+++ trunk/docutils/docutils/transforms/references.py	2025-05-25 21:05:14 UTC (rev 10145)
@@ -259,7 +259,7 @@
                 return
         if refname is not None:
             del target['refname']
-        target.resolved = 1
+        target.resolved = True
 
     def nonexistent_indirect_target(self, target) -> None:
         if target['refname'] in self.document.nameids:
@@ -292,7 +292,7 @@
             prbid = self.document.set_id(prb)
             msg.add_backref(prbid)
             ref.replace_self(prb)
-        target.resolved = 1
+        target.resolved = True
 
     def resolve_indirect_references(self, target) -> None:
         if target.hasattr('refid'):
@@ -315,7 +315,7 @@
                 ref[attname] = attval
                 if call_method:
                     call_method(ref)
-                ref.resolved = 1
+                ref.resolved = True
                 if isinstance(ref, nodes.target):
                     self.resolve_indirect_references(ref)
         for id in target['ids']:
@@ -329,7 +329,7 @@
                 ref[attname] = attval
                 if call_method:
                     call_method(ref)
-                ref.resolved = 1
+                ref.resolved = True
                 if isinstance(ref, nodes.target):
                     self.resolve_indirect_references(ref)
 
@@ -367,7 +367,7 @@
                             continue
                         del ref['refname']
                         ref['refuri'] = refuri
-                        ref.resolved = 1
+                        ref.resolved = True
 
 
 class InternalTargets(Transform):
@@ -407,7 +407,7 @@
                 if refid:
                     del ref['refname']
                     ref['refid'] = refid
-                ref.resolved = 1
+                ref.resolved = True
 
 
 class Footnotes(Transform):
@@ -523,7 +523,7 @@
                     ref['refid'] = footnote['ids'][0]
                     footnote.add_backref(ref['ids'][0])
                     self.document.note_refid(ref)
-                    ref.resolved = 1
+                    ref.resolved = True
             if not footnote['names'] and not footnote['dupnames']:
                 footnote['names'].append(label)
                 self.document.note_explicit_target(footnote, footnote)
@@ -560,7 +560,7 @@
             self.document.note_refid(ref)
             assert len(ref['ids']) == 1
             footnote.add_backref(ref['ids'][0])
-            ref.resolved = 1
+            ref.resolved = True
             i += 1
 
     def symbolize_footnotes(self) -> None:
@@ -626,8 +626,8 @@
             ref['refid'] = id
             assert len(ref['ids']) == 1
             note.add_backref(ref['ids'][0])
-            ref.resolved = 1
-        note.resolved = 1
+            ref.resolved = True
+        note.resolved = True
 
 
 class CircularSubstitutionDefinitionError(Exception):

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

[Docutils-checkins] SF.net SVN: docutils:[10144] trunk/sandbox/manpage-writer

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

Revision: 10144
          http://sourceforge.net/p/docutils/code/10144
Author:   grubert
Date:     2025-05-22 20:00:51 +0000 (Thu, 22 May 2025)
Log Message:
-----------
change version in test expects

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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/characters.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/compact_lists.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/docinfo-deu-l_de.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/docinfo-deu-l_en.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/docinfo-deu.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/docinfo-eng-l_de.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/docinfo-eng-l_en.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/docinfo-eng.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/dotted.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/dotted.man	2025-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/dotted.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/indent.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/indent.man	2025-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/indent.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/man-de.1.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,6 +1,6 @@
 '\" t
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/optionslisttest.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/optionslisttest.man	2025-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/optionslisttest.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/optionstoo.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/optionstoo.man	2025-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/optionstoo.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/quotes.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/quotes.man	2025-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/quotes.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/ref-2025-urue.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/ref-2025.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/references.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/references.man	2025-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/references.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/refs-urue.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/refs.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/refs.man	2025-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/refs.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/test.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/test.man	2025-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected/test.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,6 +1,6 @@
 '\" t
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected-mandoc/characters.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected-mandoc/compact_lists.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu-l_de.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu-l_en.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng-l_de.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng-l_en.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected-mandoc/dotted.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected-mandoc/indent.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected-mandoc/man-de.1.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,6 +1,6 @@
 '\" t
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected-mandoc/optionslisttest.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected-mandoc/optionstoo.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected-mandoc/quotes.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected-mandoc/references.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:57:27 UTC (rev 10143)
+++ trunk/sandbox/manpage-writer/expected-mandoc/test.man	2025-05-22 20:00:51 UTC (rev 10144)
@@ -1,6 +1,6 @@
 '\" t
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc3.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:[10143] trunk/docutils/README.rst

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

Revision: 10143
          http://sourceforge.net/p/docutils/code/10143
Author:   grubert
Date:     2025-05-22 19:57:27 +0000 (Thu, 22 May 2025)
Log Message:
-----------
fix title over/underline

Modified Paths:
--------------
    trunk/docutils/README.rst

Modified: trunk/docutils/README.rst
===================================================================
--- trunk/docutils/README.rst	2025-05-22 19:55:00 UTC (rev 10142)
+++ trunk/docutils/README.rst	2025-05-22 19:57:27 UTC (rev 10143)
@@ -1,6 +1,6 @@
-==========================
+==============================
  README: Docutils 0.22rc3.dev
-==========================
+==============================
 
 :Author: David Goodger
 :Contact: go...@py...

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

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

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

Revision: 10142
          http://sourceforge.net/p/docutils/code/10142
Author:   grubert
Date:     2025-05-22 19:55:00 +0000 (Thu, 22 May 2025)
Log Message:
-----------
short log for 0.22rc2

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

Modified: trunk/sandbox/infrastructure/releasing-log.rst
===================================================================
--- trunk/sandbox/infrastructure/releasing-log.rst	2025-05-22 19:54:34 UTC (rev 10141)
+++ trunk/sandbox/infrastructure/releasing-log.rst	2025-05-22 19:55:00 UTC (rev 10142)
@@ -8,6 +8,18 @@
 
 Notes on what happend while releasing.
 
+Release 0.22rc2 (2025-05-22)
+============================
+
+Follow docs/release.rst.
+
+* Change release.rst: 
+
+  - Commit before uploading to test-pypi.
+  - test locally.
+
+* test source from test.pypi breaks like before.
+
 Release 0.22rc1 (2025-05-06)
 ============================
 

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

[Docutils-checkins] SF.net SVN: docutils:[10141] trunk/docutils/docs/dev/ release.rst

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

Revision: 10141
          http://sourceforge.net/p/docutils/code/10141
Author:   grubert
Date:     2025-05-22 19:54:34 +0000 (Thu, 22 May 2025)
Log Message:
-----------
clean up while 0.22rc2

Modified Paths:
--------------
    trunk/docutils/docs/dev/release.rst

Modified: trunk/docutils/docs/dev/release.rst
===================================================================
--- trunk/docutils/docs/dev/release.rst	2025-05-22 19:53:59 UTC (rev 10140)
+++ trunk/docutils/docs/dev/release.rst	2025-05-22 19:54:34 UTC (rev 10141)
@@ -15,10 +15,10 @@
 Steps to take and watch
 -----------------------
 
-* Make a clean checkout of svn.code.sf.net/p/docutils/code/trunk/docutils
-  to avoid having development files in the released packages.
+Make a clean checkout of svn.code.sf.net/p/docutils/code/trunk/docutils
+to avoid having development files in the released packages.
 
-  Test, package and release this checkout.
+Test, package and release this checkout.
 
 * Announce the upcoming release on docutils-develop list.
 
@@ -35,7 +35,7 @@
 
   Change the version insert date for unpublished.
 
-* Update RELEASE-NOTES.rst add section ``Release <version> (unpublished)``.
+* Update RELEASE-NOTES.rst section ``Release <version> (unpublished)``.
 
   Change the version insert date for unpublished.
 
@@ -83,6 +83,10 @@
 
   Uploads to pypi/test.pypi can not be overwritten, require a new version.
 
+* Commit changes ... the changed version number.
+
+* build again and test locally.
+
 * Upload wheel and source to test.pypi.
 
   Set repository and key in ~/.pypirc with a <server-name> and
@@ -124,26 +128,26 @@
     python test/alltests.py
 
   Ignore ``test_find_file_in_dirs`` fails because HISTORY.rst is missing or/and
-  missing pil.
+  missing pil.::
 
     deactivate ; cd .. ; rm -r du3s
 
-* Commit changes ... the changed version number.
+* If final release
+ 
+  - tag #.# (Note: only directory docutils is copied)::
 
-* If final release 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-#.# \
+               -m "tagging release #.#"
 
-    svn copy svn+ssh://gr...@sv.../p/docutils/code/trunk/docutils \
-             svn+ssh://gr...@sv.../p/docutils/code/tags/docutils-#.# \
-             -m "tagging release #.#"
+  - Update your source directory.
 
-* Update your source directory.
+  - Rebuild wheel and source-distribution, e.g::
 
-* Rebuild wheel and source-distribution, e.g::
+      python3 -m build
 
-    python3 -m build
+* Upload to pypi::
 
-* Now upload to pypi::
-
     python3 -m twine upload --repository <server-name> dist/docutils-#.#*
 
 * Remove previous package from local cache::

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

[Docutils-checkins] SF.net SVN: docutils:[10140] trunk/sandbox/infrastructure/set_version.sh

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

Revision: 10140
          http://sourceforge.net/p/docutils/code/10140
Author:   grubert
Date:     2025-05-22 19:53:59 +0000 (Thu, 22 May 2025)
Log Message:
-----------
add test_manpage.py

Modified Paths:
--------------
    trunk/sandbox/infrastructure/set_version.sh

Modified: trunk/sandbox/infrastructure/set_version.sh
===================================================================
--- trunk/sandbox/infrastructure/set_version.sh	2025-05-22 19:52:06 UTC (rev 10139)
+++ trunk/sandbox/infrastructure/set_version.sh	2025-05-22 19:53:59 UTC (rev 10140)
@@ -42,7 +42,7 @@
     echo Determining list of files to be changed...
     # BUG ls lists directories but does not descend
     # (try ls --recursive)
-    files="docutils/__init__.py setup.py README.rst `$svn ls test/functional/expected/ | sed 's|^|test/functional/expected/|'`"
+    files="docutils/__init__.py setup.py README.rst test/test_writers/test_manpage.py `$svn ls test/functional/expected/ | sed 's|^|test/functional/expected/|'`"
     echo "Now I'll change the version identifier to ${2} in the following files:"
     echo $files
     echo 'and update the version_info in docutils/__init__.py.'

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

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

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

Revision: 10139
          http://sourceforge.net/p/docutils/code/10139
Author:   grubert
Date:     2025-05-22 19:52:06 +0000 (Thu, 22 May 2025)
Log Message:
-----------
version to 0.22rc3.dev

Modified Paths:
--------------
    trunk/docutils/README.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/README.rst
===================================================================
--- trunk/docutils/README.rst	2025-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/README.rst	2025-05-22 19:52:06 UTC (rev 10139)
@@ -1,5 +1,5 @@
 ==========================
- README: Docutils 0.22rc2
+ README: Docutils 0.22rc3.dev
 ==========================
 
 :Author: David Goodger

Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py	2025-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/docutils/__init__.py	2025-05-22 19:52:06 UTC (rev 10139)
@@ -84,7 +84,7 @@
 
 __docformat__ = 'reStructuredText'
 
-__version__ = '0.22rc2'
+__version__ = '0.22rc3.dev'
 """Docutils version identifier (complies with PEP 440)::
 
     major.minor[.micro][releaselevel[serial]][.dev]
@@ -160,8 +160,8 @@
     minor=22,
     micro=0,
     releaselevel='candidate',  # one of 'alpha', 'beta', 'candidate', 'final'
-    serial=2,  # pre-release number (0 for final releases and snapshots)
-    release=True  # True for official releases and pre-releases
+    serial=3,  # 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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/buggy_mathml.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/buggy_mathml_ttm.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/compact_lists.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/dangerous.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/field_name_limit.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/length_units_html5.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/math_output_html.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/math_output_latex.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/math_output_mathml.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/mathematics_mathml.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/misc_rst_html5.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/pep_html.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -8,7 +8,7 @@
 -->
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta name="generator" content="Docutils 0.22rc2: https://docutils.sourceforge.io/" />
+  <meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/rst_html5_tuftig.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2 -->
+<!-- Generated by Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/standalone_rst_manpage.man	2025-05-22 19:52:06 UTC (rev 10139)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2 manpage writer.
+.\" by the Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html	2025-05-22 19:52:06 UTC (rev 10139)
@@ -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.22rc2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc3.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-05-22 19:18:51 UTC (rev 10138)
+++ trunk/docutils/test/test_writers/test_manpage.py	2025-05-22 19:52:06 UTC (rev 10139)
@@ -96,7 +96,7 @@
 
 
 document_start = r""".\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2 manpage writer.
+.\" by the Docutils 0.22rc3.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:[10138] trunk/docutils

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

Revision: 10138
          http://sourceforge.net/p/docutils/code/10138
Author:   grubert
Date:     2025-05-22 19:18:51 +0000 (Thu, 22 May 2025)
Log Message:
-----------
version 0.22rc2

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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/HISTORY.rst	2025-05-22 19:18:51 UTC (rev 10138)
@@ -14,9 +14,15 @@
 .. contents::
 
 
-Release 0.22rc2 (unpublished)
+Release 0.22rc3 (unpublished)
 =============================
 
+* nothing yet.
+
+Release 0.22rc2 (2025-05-22)
+============================
+
+
 * docutils/parsers/rst/directives/misc.py
 
   - Pass default settings to custom parser for included file.

Modified: trunk/docutils/README.rst
===================================================================
--- trunk/docutils/README.rst	2025-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/README.rst	2025-05-22 19:18:51 UTC (rev 10138)
@@ -1,5 +1,5 @@
 ==========================
- README: Docutils 0.22rc2.dev
+ README: Docutils 0.22rc2
 ==========================
 
 :Author: David Goodger

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2025-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/RELEASE-NOTES.rst	2025-05-22 19:18:51 UTC (rev 10138)
@@ -224,9 +224,14 @@
    __ https://packages.debian.org/source/trixie/python-docutils
 
 
-Release 0.22rc2 (unpublished)
+Release 0.22rc3 (unpublished)
 =============================
 
+* nothing yet.
+
+Release 0.22rc2 (2025-05-22)
+============================
+
 Fix backwards-compatibility problem:
   reStructuredText section parsing no longer requires
   `parsers.rst.states.RSTStateMachine.memo.section_parents`

Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py	2025-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/docutils/__init__.py	2025-05-22 19:18:51 UTC (rev 10138)
@@ -84,7 +84,7 @@
 
 __docformat__ = 'reStructuredText'
 
-__version__ = '0.22rc2.dev'
+__version__ = '0.22rc2'
 """Docutils version identifier (complies with PEP 440)::
 
     major.minor[.micro][releaselevel[serial]][.dev]
@@ -161,7 +161,7 @@
     micro=0,
     releaselevel='candidate',  # one of 'alpha', 'beta', 'candidate', 'final'
     serial=2,  # 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/buggy_mathml.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/buggy_mathml_ttm.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/compact_lists.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/dangerous.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/field_name_limit.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/length_units_html5.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/math_output_html.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/math_output_latex.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/math_output_mathml.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/mathematics_mathml.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/misc_rst_html5.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/pep_html.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -8,7 +8,7 @@
 -->
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta name="generator" content="Docutils 0.22rc2.dev: https://docutils.sourceforge.io/" />
+  <meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/rst_html5_tuftig.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev -->
+<!-- Generated by Docutils 0.22rc2 -->
 <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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/standalone_rst_manpage.man	2025-05-22 19:18:51 UTC (rev 10138)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc2 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html	2025-05-22 19:18:51 UTC (rev 10138)
@@ -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.22rc2.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22rc2: 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-05-20 15:48:42 UTC (rev 10137)
+++ trunk/docutils/test/test_writers/test_manpage.py	2025-05-22 19:18:51 UTC (rev 10138)
@@ -96,7 +96,7 @@
 
 
 document_start = r""".\" Man page generated from reStructuredText
-.\" by the Docutils 0.22rc2.dev manpage writer.
+.\" by the Docutils 0.22rc2 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:[10137] trunk/docutils

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

Revision: 10137
          http://sourceforge.net/p/docutils/code/10137
Author:   milde
Date:     2025-05-20 15:48:42 +0000 (Tue, 20 May 2025)
Log Message:
-----------
More detailled error message for inconsistent title levels.

Modified Paths:
--------------
    trunk/docutils/docutils/parsers/rst/states.py
    trunk/docutils/test/test_parsers/test_rst/test_section_headers.py

Modified: trunk/docutils/docutils/parsers/rst/states.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/states.py	2025-05-20 15:48:27 UTC (rev 10136)
+++ trunk/docutils/docutils/parsers/rst/states.py	2025-05-20 15:48:42 UTC (rev 10137)
@@ -341,10 +341,14 @@
         # 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)
             self.parent += self.reporter.severe(
-                               'Title level inconsistent:',
-                               nodes.literal_block('', source),
-                               line=lineno)
+                'Inconsistent title style:'
+                f' skip from level {mylevel} to {level}.',
+                nodes.literal_block('', source),
+                nodes.paragraph('', f'Established title styles: {styles}'),
+                line=lineno)
             return False
         # Update parent state:
         self.memo.section_level = level

Modified: trunk/docutils/test/test_parsers/test_rst/test_section_headers.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_section_headers.py	2025-05-20 15:48:27 UTC (rev 10136)
+++ trunk/docutils/test/test_parsers/test_rst/test_section_headers.py	2025-05-20 15:48:42 UTC (rev 10137)
@@ -22,6 +22,9 @@
 
 
 class ParserTestCase(unittest.TestCase):
+
+    maxDiff = None
+
     def test_parser(self):
         parser = Parser()
         settings = get_default_settings(Parser)
@@ -494,10 +497,12 @@
             Paragraph 3.
         <system_message level="4" line="15" source="test data" type="SEVERE">
             <paragraph>
-                Title level inconsistent:
+                Inconsistent title style: skip from level 1 to 3.
             <literal_block xml:space="preserve">
                 Title 4
                 ```````
+            <paragraph>
+                Established title styles: = - `
         <paragraph>
             Paragraph 4.
 """],
@@ -545,11 +550,13 @@
             Paragraph 3.
         <system_message level="4" line="19" source="test data" type="SEVERE">
             <paragraph>
-                Title level inconsistent:
+                Inconsistent title style: skip from level 1 to 3.
             <literal_block xml:space="preserve">
                 ```````
                 Title 4
                 ```````
+            <paragraph>
+                Established title styles: =/= -/- `/`
         <paragraph>
             Paragraph 4.
 """],

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

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

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

Revision: 10136
          http://sourceforge.net/p/docutils/code/10136
Author:   milde
Date:     2025-05-20 15:48:27 +0000 (Tue, 20 May 2025)
Log Message:
-----------
Minor edits.

Formatting.
Delayed annotations (from __future__).
Documentation.

Modified Paths:
--------------
    trunk/docutils/docs/ref/rst/directives.rst
    trunk/docutils/docutils/__main__.py
    trunk/docutils/docutils/nodes.py
    trunk/docutils/docutils/parsers/docutils_xml.py
    trunk/docutils/docutils/parsers/null.py
    trunk/docutils/docutils/parsers/recommonmark_wrapper.py
    trunk/docutils/docutils/parsers/rst/__init__.py
    trunk/docutils/docutils/parsers/rst/directives/tables.py
    trunk/docutils/docutils/parsers/rst/roles.py
    trunk/docutils/docutils/parsers/rst/states.py
    trunk/docutils/docutils/parsers/rst/tableparser.py
    trunk/docutils/docutils/readers/doctree.py
    trunk/docutils/docutils/readers/pep.py
    trunk/docutils/docutils/statemachine.py
    trunk/docutils/docutils/transforms/__init__.py
    trunk/docutils/docutils/transforms/components.py
    trunk/docutils/docutils/transforms/frontmatter.py
    trunk/docutils/docutils/transforms/misc.py
    trunk/docutils/docutils/transforms/parts.py
    trunk/docutils/docutils/transforms/peps.py
    trunk/docutils/docutils/transforms/references.py
    trunk/docutils/docutils/transforms/universal.py
    trunk/docutils/docutils/transforms/writer_aux.py
    trunk/docutils/docutils/utils/code_analyzer.py
    trunk/docutils/docutils/utils/math/__init__.py
    trunk/docutils/docutils/utils/math/math2html.py
    trunk/docutils/docutils/utils/math/mathml_elements.py
    trunk/docutils/docutils/utils/math/tex2mathml_extern.py
    trunk/docutils/docutils/utils/smartquotes.py
    trunk/docutils/docutils/writers/docutils_xml.py
    trunk/docutils/docutils/writers/html4css1/__init__.py
    trunk/docutils/docutils/writers/html5_polyglot/__init__.py
    trunk/docutils/docutils/writers/manpage.py
    trunk/docutils/docutils/writers/null.py
    trunk/docutils/docutils/writers/odf_odt/__init__.py
    trunk/docutils/docutils/writers/odf_odt/prepstyles.py
    trunk/docutils/docutils/writers/odf_odt/pygmentsformatter.py
    trunk/docutils/docutils/writers/pep_html/__init__.py
    trunk/docutils/docutils/writers/pseudoxml.py
    trunk/docutils/docutils/writers/s5_html/__init__.py
    trunk/docutils/docutils/writers/xetex/__init__.py

Modified: trunk/docutils/docs/ref/rst/directives.rst
===================================================================
--- trunk/docutils/docs/ref/rst/directives.rst	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docs/ref/rst/directives.rst	2025-05-20 15:48:27 UTC (rev 10136)
@@ -1983,7 +1983,7 @@
 
     Only recognized with the `"raw" <"raw" role_>`__ base role.
 
-_`language` : text
+_`language` : text_ (formal language)
     Name of a formal language, passed to Pygments_ for syntax highlighting.
     See `supported languages and markup formats`_ for recognized values.
 

Modified: trunk/docutils/docutils/__main__.py
===================================================================
--- trunk/docutils/docutils/__main__.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/__main__.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -18,6 +18,10 @@
 https://docs.python.org/3/library/__main__.html#main-py-in-python-packages
 """
 
+from __future__ import annotations
+
+__docformat__ = 'reStructuredText'
+
 import argparse
 import locale
 import sys

Modified: trunk/docutils/docutils/nodes.py
===================================================================
--- trunk/docutils/docutils/nodes.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/nodes.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -806,11 +806,7 @@
     def remove(self, item) -> None:
         self.children.remove(item)
 
-    def index(self,
-              item,
-              start: int = 0,
-              stop: int = sys.maxsize,
-              ) -> int:
+    def index(self, item, start: int = 0, stop: int = sys.maxsize) -> int:
         return self.children.index(item, start, stop)
 
     def previous_sibling(self):

Modified: trunk/docutils/docutils/parsers/docutils_xml.py
===================================================================
--- trunk/docutils/docutils/parsers/docutils_xml.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/parsers/docutils_xml.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -20,6 +20,10 @@
      in any Docutils release without prior notice.
 """
 
+from __future__ import annotations
+
+__docformat__ = 'reStructuredText'
+
 import re
 import xml.etree.ElementTree as ET
 

Modified: trunk/docutils/docutils/parsers/null.py
===================================================================
--- trunk/docutils/docutils/parsers/null.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/parsers/null.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -4,6 +4,10 @@
 
 """A do-nothing parser."""
 
+from __future__ import annotations
+
+__docformat__ = 'reStructuredText'
+
 from docutils import parsers
 
 

Modified: trunk/docutils/docutils/parsers/recommonmark_wrapper.py
===================================================================
--- trunk/docutils/docutils/parsers/recommonmark_wrapper.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/parsers/recommonmark_wrapper.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -24,6 +24,10 @@
    * The API is not settled and may change with any minor Docutils version.
 """
 
+from __future__ import annotations
+
+__docformat__ = 'reStructuredText'
+
 from docutils import Component
 from docutils import nodes
 

Modified: trunk/docutils/docutils/parsers/rst/__init__.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/__init__.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/parsers/rst/__init__.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -67,9 +67,10 @@
 appropriate).
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
-
 import docutils.parsers
 import docutils.statemachine
 from docutils.parsers.rst import roles, states

Modified: trunk/docutils/docutils/parsers/rst/directives/tables.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/directives/tables.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/parsers/rst/directives/tables.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -6,9 +6,10 @@
 Directives for table elements.
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
-
 import csv
 from urllib.request import urlopen
 from urllib.error import URLError

Modified: trunk/docutils/docutils/parsers/rst/roles.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/roles.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/parsers/rst/roles.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -74,6 +74,8 @@
   immediately after the end of the current inline block (can also be empty).
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
 import warnings

Modified: trunk/docutils/docutils/parsers/rst/states.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/states.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/parsers/rst/states.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -100,9 +100,10 @@
         continues with step 1.
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
-
 import re
 from types import FunctionType, MethodType
 from types import SimpleNamespace as Struct
@@ -117,10 +118,8 @@
 from docutils.utils import escape2null, column_width
 from docutils.utils import punctuation_chars, urischemes
 from docutils.utils import split_escaped_whitespace
-from docutils.utils._roman_numerals import (
-    InvalidRomanNumeralError,
-    RomanNumeral,
-)
+from docutils.utils._roman_numerals import (InvalidRomanNumeralError,
+                                            RomanNumeral)
 
 
 class MarkupError(DataError): pass

Modified: trunk/docutils/docutils/parsers/rst/tableparser.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/tableparser.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/parsers/rst/tableparser.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -17,9 +17,10 @@
     `update_dict_of_lists()`: Merge two dictionaries containing list values.
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
-
 import re
 import sys
 from docutils import DataError

Modified: trunk/docutils/docutils/readers/doctree.py
===================================================================
--- trunk/docutils/docutils/readers/doctree.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/readers/doctree.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -4,6 +4,10 @@
 
 """Reader for existing document trees."""
 
+from __future__ import annotations
+
+__docformat__ = 'reStructuredText'
+
 from docutils import readers, utils, transforms
 
 

Modified: trunk/docutils/docutils/readers/pep.py
===================================================================
--- trunk/docutils/docutils/readers/pep.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/readers/pep.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -6,6 +6,8 @@
 Python Enhancement Proposal (PEP) Reader.
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
 from docutils.readers import standalone

Modified: trunk/docutils/docutils/statemachine.py
===================================================================
--- trunk/docutils/docutils/statemachine.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/statemachine.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -105,6 +105,8 @@
        sm.unlink()
 """
 
+from __future__ import annotations
+
 __docformat__ = 'restructuredtext'
 
 import sys

Modified: trunk/docutils/docutils/transforms/__init__.py
===================================================================
--- trunk/docutils/docutils/transforms/__init__.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/transforms/__init__.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -21,9 +21,10 @@
 choose to perform on the parsed document.
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
-
 from docutils import languages, ApplicationError, TransformSpec
 
 

Modified: trunk/docutils/docutils/transforms/components.py
===================================================================
--- trunk/docutils/docutils/transforms/components.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/transforms/components.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -6,11 +6,13 @@
 Docutils component-related transforms.
 """
 
-from docutils.transforms import Transform
+from __future__ import annotations
 
 __docformat__ = 'reStructuredText'
 
+from docutils.transforms import Transform
 
+
 class Filter(Transform):
 
     """

Modified: trunk/docutils/docutils/transforms/frontmatter.py
===================================================================
--- trunk/docutils/docutils/transforms/frontmatter.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/transforms/frontmatter.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -21,6 +21,8 @@
 .. _transforms: https://docutils.sourceforge.io/docs/api/transforms.html
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
 import re

Modified: trunk/docutils/docutils/transforms/misc.py
===================================================================
--- trunk/docutils/docutils/transforms/misc.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/transforms/misc.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -6,6 +6,8 @@
 Miscellaneous transforms.
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
 from docutils import nodes

Modified: trunk/docutils/docutils/transforms/parts.py
===================================================================
--- trunk/docutils/docutils/transforms/parts.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/transforms/parts.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -6,9 +6,10 @@
 Transforms related to document parts.
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
-
 import sys
 from docutils import nodes
 from docutils.transforms import Transform

Modified: trunk/docutils/docutils/transforms/peps.py
===================================================================
--- trunk/docutils/docutils/transforms/peps.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/transforms/peps.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -11,6 +11,8 @@
 - `PEPZero`: Special processing for PEP 0.
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
 import os

Modified: trunk/docutils/docutils/transforms/references.py
===================================================================
--- trunk/docutils/docutils/transforms/references.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/transforms/references.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -6,6 +6,8 @@
 Transforms for resolving references.
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
 from docutils import nodes, utils

Modified: trunk/docutils/docutils/transforms/universal.py
===================================================================
--- trunk/docutils/docutils/transforms/universal.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/transforms/universal.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -19,6 +19,8 @@
 - `Validate`: Validate the document tree, report violations as warning.
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
 import re

Modified: trunk/docutils/docutils/transforms/writer_aux.py
===================================================================
--- trunk/docutils/docutils/transforms/writer_aux.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/transforms/writer_aux.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -11,6 +11,7 @@
     from docutils import writers
     from docutils.transforms import writers
 """
+from __future__ import annotations
 
 __docformat__ = 'reStructuredText'
 

Modified: trunk/docutils/docutils/utils/code_analyzer.py
===================================================================
--- trunk/docutils/docutils/utils/code_analyzer.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/utils/code_analyzer.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -4,7 +4,10 @@
 
 """Lexical analysis of formal languages (i.e. code) using Pygments."""
 
-from docutils import ApplicationError
+from __future__ import annotations
+
+__docformat__ = 'reStructuredText'
+
 try:
     import pygments
     from pygments.lexers import get_lexer_by_name
@@ -13,6 +16,8 @@
 except ImportError:
     with_pygments = False
 
+from docutils import ApplicationError
+
 # Filter the following token types from the list of class arguments:
 unstyled_tokens = ['token',  # Token (base token type)
                    'text',   # Token.Text

Modified: trunk/docutils/docutils/utils/math/__init__.py
===================================================================
--- trunk/docutils/docutils/utils/math/__init__.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/utils/math/__init__.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -23,6 +23,10 @@
 :tex2mathml_extern: Wrapper for 3rd party TeX -> MathML converters
 """
 
+from __future__ import annotations
+
+__docformat__ = 'reStructuredText'
+
 # helpers for Docutils math support
 # =================================
 

Modified: trunk/docutils/docutils/utils/math/math2html.py
===================================================================
--- trunk/docutils/docutils/utils/math/math2html.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/utils/math/math2html.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -21,6 +21,10 @@
 #                    Support for more math commands from the AMS "math-guide".
 # 2.0    2021-12-31  Drop 2.7 compatibility code.
 
+from __future__ import annotations
+
+__docformat__ = 'reStructuredText'
+
 import pathlib
 import sys
 import unicodedata
@@ -27,7 +31,6 @@
 
 from docutils.utils.math import tex2unichar
 
-
 __version__ = '1.3 (2021-06-02)'
 
 

Modified: trunk/docutils/docutils/utils/math/mathml_elements.py
===================================================================
--- trunk/docutils/docutils/utils/math/mathml_elements.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/utils/math/mathml_elements.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -22,6 +22,10 @@
 .. _MathML Core: https://www.w3.org/TR/mathml-core/
 """
 
+from __future__ import annotations
+
+__docformat__ = 'reStructuredText'
+
 # Usage:
 #
 # >>> from mathml_elements import *

Modified: trunk/docutils/docutils/utils/math/tex2mathml_extern.py
===================================================================
--- trunk/docutils/docutils/utils/math/tex2mathml_extern.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/utils/math/tex2mathml_extern.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -15,6 +15,10 @@
 the API is not settled and may change with any minor Docutils version.
 """
 
+from __future__ import annotations
+
+__docformat__ = 'reStructuredText'
+
 import subprocess
 
 from docutils import nodes

Modified: trunk/docutils/docutils/utils/smartquotes.py
===================================================================
--- trunk/docutils/docutils/utils/smartquotes.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/utils/smartquotes.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -315,6 +315,8 @@
         - Initial release
 """
 
+from __future__ import annotations
+
 import re
 import sys
 

Modified: trunk/docutils/docutils/writers/docutils_xml.py
===================================================================
--- trunk/docutils/docutils/writers/docutils_xml.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/writers/docutils_xml.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -8,6 +8,8 @@
 https://docutils.sourceforge.io/docs/ref/docutils.dtd.
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
 from io import StringIO

Modified: trunk/docutils/docutils/writers/html4css1/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html4css1/__init__.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/writers/html4css1/__init__.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -12,6 +12,8 @@
 for proper viewing with a modern graphical browser.
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
 import os.path

Modified: trunk/docutils/docutils/writers/html5_polyglot/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html5_polyglot/__init__.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/writers/html5_polyglot/__init__.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -24,6 +24,9 @@
 The cascading style sheet "minimal.css" is required for proper viewing,
 the style sheet "plain.css" improves reading experience.
 """
+
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
 from pathlib import Path

Modified: trunk/docutils/docutils/writers/manpage.py
===================================================================
--- trunk/docutils/docutils/writers/manpage.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/writers/manpage.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -41,6 +41,8 @@
 
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
 import re
@@ -359,11 +361,11 @@
                 # a) a line end, disable it
                 if self.body[i+1][0] in ('\n', '\r'):
                     self.body[i+1] = '.' + self.body[i+1]
-                # b) with a separator: moving the 1st char to current item
-                #    would require to check the second, use \c instead.
+                    # b) with a separator: moving the 1st char to current item
+                    #    would require to check the second, use \c instead.
                 else:
-                # append \c to end the text line, .ME or .UE without inserting
-                # space or attempting a break.
+                    # append \c to end the text line, .ME or .UE without
+                    # inserting space or attempting a break.
                     self.body[i] = "%s \\c\n" % (self.body[i][:3])
         return ''.join(self.head + self.body + self.foot)
 

Modified: trunk/docutils/docutils/writers/null.py
===================================================================
--- trunk/docutils/docutils/writers/null.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/writers/null.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -9,6 +9,10 @@
 in Docutils 0.22.
 """
 
+from __future__ import annotations
+
+__docformat__ = 'reStructuredText'
+
 from docutils import writers
 
 

Modified: trunk/docutils/docutils/writers/odf_odt/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/odf_odt/__init__.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/writers/odf_odt/__init__.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -9,9 +9,10 @@
 the API is not settled and may change with any minor Docutils version.
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
-
 from configparser import ConfigParser
 import copy
 from io import StringIO

Modified: trunk/docutils/docutils/writers/odf_odt/prepstyles.py
===================================================================
--- trunk/docutils/docutils/writers/odf_odt/prepstyles.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/writers/odf_odt/prepstyles.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -11,6 +11,8 @@
 See https://docutils.sourceforge.io/docs/user/odt.html#page-size
 """
 
+from __future__ import annotations
+
 # Author: Michael Schutte <mi...@ui...>
 
 from xml.etree import ElementTree as ET

Modified: trunk/docutils/docutils/writers/odf_odt/pygmentsformatter.py
===================================================================
--- trunk/docutils/docutils/writers/odf_odt/pygmentsformatter.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/writers/odf_odt/pygmentsformatter.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -2,13 +2,10 @@
 # Author: Dave Kuhlman <dku...@re...>
 # Copyright: This module has been placed in the public domain.
 
-"""
+"""Additional support for Pygments formatter."""
 
-Additional support for Pygments formatter.
+from __future__ import annotations
 
-"""
-
-
 import pygments
 import pygments.formatter
 

Modified: trunk/docutils/docutils/writers/pep_html/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/pep_html/__init__.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/writers/pep_html/__init__.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -6,9 +6,10 @@
 PEP HTML Writer.
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
-
 import os
 import os.path
 

Modified: trunk/docutils/docutils/writers/pseudoxml.py
===================================================================
--- trunk/docutils/docutils/writers/pseudoxml.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/writers/pseudoxml.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -6,9 +6,10 @@
 Simple internal document tree Writer, writes indented pseudo-XML.
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
-
 from docutils import writers, frontend
 
 

Modified: trunk/docutils/docutils/writers/s5_html/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/s5_html/__init__.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/writers/s5_html/__init__.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -6,6 +6,7 @@
 """
 S5/HTML Slideshow Writer.
 """
+from __future__ import annotations
 
 __docformat__ = 'reStructuredText'
 

Modified: trunk/docutils/docutils/writers/xetex/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/xetex/__init__.py	2025-05-20 15:07:28 UTC (rev 10135)
+++ trunk/docutils/docutils/writers/xetex/__init__.py	2025-05-20 15:48:27 UTC (rev 10136)
@@ -20,6 +20,8 @@
 LuaTeX and XeTeX.
 """
 
+from __future__ import annotations
+
 __docformat__ = 'reStructuredText'
 
 from docutils import frontend

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

[Docutils-checkins] SF.net SVN: docutils:[10135] trunk/docutils/test/test_writers/ test_html5_polyglot.py

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

Revision: 10135
          http://sourceforge.net/p/docutils/code/10135
Author:   milde
Date:     2025-05-20 15:07:28 +0000 (Tue, 20 May 2025)
Log Message:
-----------
Fixup for [r10134]. Test failure due to varying PIL error messages.

Pillow versions vary in their error output (cf. bugs: #485 and #500)
Use error output from a probe in constant "DUMMY_PNG_NOT_FOUND".

Modified Paths:
--------------
    trunk/docutils/test/test_writers/test_html5_polyglot.py

Modified: trunk/docutils/test/test_writers/test_html5_polyglot.py
===================================================================
--- trunk/docutils/test/test_writers/test_html5_polyglot.py	2025-05-19 21:12:34 UTC (rev 10134)
+++ trunk/docutils/test/test_writers/test_html5_polyglot.py	2025-05-20 15:07:28 UTC (rev 10135)
@@ -41,13 +41,11 @@
 if PIL:
     REQUIRES_PIL = ''
     ONLY_LOCAL = 'Cannot get file path corresponding to https://dummy.png.'
-    DUMMY_PNG_NOT_FOUND = "[Errno 2] No such file or directory: 'dummy.png'"
-    # Pillow reports the absolute path since version 10.3.0 (cf. [bugs: 485])
-    # Backported to version 9.1 (or does it depend on the Python version)?
-    pil_version = tuple(int(i) for i in PIL.__version__.split('.'))
-    if pil_version >= (10, 3) or pil_version[0] == 9 and pil_version[1] >= 1:
-        DUMMY_PNG_NOT_FOUND = ("[Errno 2] No such file or directory: '%s'"
-                               % Path('dummy.png').resolve())
+    # Pillow versions vary in their error output (cf. bugs: #485 and #500)
+    try:
+        PIL.Image.open(Path('dummy.png'))
+    except OSError as err:
+        DUMMY_PNG_NOT_FOUND = str(err)
     HEIGHT_ATTR = 'height="32" '
     WIDTH_ATTR = 'width="32" '
     NO_PIL_SYSTEM_MESSAGE = ''

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

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

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

Revision: 10134
          http://sourceforge.net/p/docutils/code/10134
Author:   milde
Date:     2025-05-19 21:12:34 +0000 (Mon, 19 May 2025)
Log Message:
-----------
Fixes for the test suite.

Move skipTest-clauses in a loop into sub-tests to avoid aborting the loop.
Fixes [bugs:#500].

Fix false positives due to version-dependent error messages from PIL and
parsing output from pygments.

Fix typo.

Modified Paths:
--------------
    trunk/docutils/test/test_nodes.py
    trunk/docutils/test/test_parsers/test_rst/test_directives/test_code.py
    trunk/docutils/test/test_parsers/test_rst/test_directives/test_include.py
    trunk/docutils/test/test_parsers/test_rst/test_interpreted.py
    trunk/docutils/test/test_writers/test_html5_polyglot.py

Modified: trunk/docutils/test/test_nodes.py
===================================================================
--- trunk/docutils/test/test_nodes.py	2025-05-16 16:25:37 UTC (rev 10133)
+++ trunk/docutils/test/test_nodes.py	2025-05-19 21:12:34 UTC (rev 10134)
@@ -937,7 +937,7 @@
             self.visitor.dispatch_visit(self.element)
 
     def test_dispatch_visit_optional(self):
-        # silently skip nodes of a calss in tuple nodes.NodeVisitor.optional
+        # silently skip nodes of a class in tuple nodes.NodeVisitor.optional
         rv = self.visitor.dispatch_visit(nodes.meta())
         self.assertIsNone(rv)
 

Modified: trunk/docutils/test/test_parsers/test_rst/test_directives/test_code.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_directives/test_code.py	2025-05-16 16:25:37 UTC (rev 10133)
+++ trunk/docutils/test/test_parsers/test_rst/test_directives/test_code.py	2025-05-19 21:12:34 UTC (rev 10134)
@@ -43,10 +43,10 @@
         settings.warning_stream = ''
         settings.report_level = 5
         for name, cases in totest.items():
-            if name == 'code_parsing' and not with_pygments:
-                self.skipTest('syntax highlight requires pygments')
             for casenum, (case_input, case_expected) in enumerate(cases):
                 with self.subTest(id=f'totest[{name!r}][{casenum}]'):
+                    if name == 'code_parsing' and not with_pygments:
+                        self.skipTest('syntax highlight requires pygments')
                     document = new_document('test data', settings.copy())
                     parser.parse(case_input, document)
                     output = document.pformat()

Modified: trunk/docutils/test/test_parsers/test_rst/test_directives/test_include.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_directives/test_include.py	2025-05-16 16:25:37 UTC (rev 10133)
+++ trunk/docutils/test/test_parsers/test_rst/test_directives/test_include.py	2025-05-19 21:12:34 UTC (rev 10134)
@@ -47,13 +47,13 @@
         for name, cases in totest.items():
             if name == 'with transforms':
                 continue  # see test_publish() below
-            # eventually skip optional parts:
-            if name == 'include_markdown' and not md_parser_class:
-                self.skipTest('no markdown parser available')
-            if name == 'include_parsed_code' and not with_pygments:
-                self.skipTest('syntax highlight requires pygments')
             for casenum, (case_input, case_expected) in enumerate(cases):
                 with self.subTest(id=f'totest[{name!r}][{casenum}]'):
+                    # eventually skip optional parts:
+                    if name == 'include_markdown' and not md_parser_class:
+                        self.skipTest('no markdown parser available')
+                    if name == 'include_parsed_code' and not with_pygments:
+                        self.skipTest('syntax highlight requires pygments')
                     document = new_document('test data', settings.copy())
                     parser.parse(case_input, document)
                     output = document.pformat()

Modified: trunk/docutils/test/test_parsers/test_rst/test_interpreted.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_interpreted.py	2025-05-16 16:25:37 UTC (rev 10133)
+++ trunk/docutils/test/test_parsers/test_rst/test_interpreted.py	2025-05-19 21:12:34 UTC (rev 10134)
@@ -29,10 +29,10 @@
         settings = get_default_settings(Parser)
         settings.warning_stream = ''
         for name, cases in totest.items():
-            if name == 'code_parsing' and not with_pygments:
-                self.skipTest('syntax highlight requires pygments')
             for casenum, (case_input, case_expected) in enumerate(cases):
                 with self.subTest(id=f'totest[{name!r}][{casenum}]'):
+                    if name == 'code_parsing' and not with_pygments:
+                        self.skipTest('syntax highlight requires pygments')
                     document = new_document('test data', settings.copy())
                     parser.parse(case_input, document)
                     output = document.pformat()

Modified: trunk/docutils/test/test_writers/test_html5_polyglot.py
===================================================================
--- trunk/docutils/test/test_writers/test_html5_polyglot.py	2025-05-16 16:25:37 UTC (rev 10133)
+++ trunk/docutils/test/test_writers/test_html5_polyglot.py	2025-05-19 21:12:34 UTC (rev 10134)
@@ -28,7 +28,7 @@
 if with_pygments:
     import pygments
 
-    if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 14):
+    if tuple(map(int, pygments.__version__.split('.')[:2])) < (2, 14):
         # pygments output changed in version 2.14
         with_pygments = False
 
@@ -40,10 +40,12 @@
 # Pillow/PIL is optional:
 if PIL:
     REQUIRES_PIL = ''
-    ONLY_LOCAL = 'Can only read local images.'
+    ONLY_LOCAL = 'Cannot get file path corresponding to https://dummy.png.'
     DUMMY_PNG_NOT_FOUND = "[Errno 2] No such file or directory: 'dummy.png'"
     # Pillow reports the absolute path since version 10.3.0 (cf. [bugs: 485])
-    if (tuple(int(i) for i in PIL.__version__.split('.')) >= (10, 3)):
+    # Backported to version 9.1 (or does it depend on the Python version)?
+    pil_version = tuple(int(i) for i in PIL.__version__.split('.'))
+    if pil_version >= (10, 3) or pil_version[0] == 9 and pil_version[1] >= 1:
         DUMMY_PNG_NOT_FOUND = ("[Errno 2] No such file or directory: '%s'"
                                % Path('dummy.png').resolve())
     HEIGHT_ATTR = 'height="32" '
@@ -73,10 +75,10 @@
 
     def test_publish(self):
         for name, (settings_overrides, cases) in totest.items():
-            if name == 'syntax_highlight' and not with_pygments:
-                self.skipTest('syntax highlight requires pygments')
             for casenum, (case_input, case_expected) in enumerate(cases):
                 with self.subTest(id=f'totest[{name!r}][{casenum}]'):
+                    if name == 'syntax_highlight' and not with_pygments:
+                        self.skipTest('syntax highlight requires pygments')
                     parts = docutils.core.publish_parts(
                         source=case_input,
                         writer=html5_polyglot.Writer(),
@@ -519,7 +521,7 @@
     EOF
 """,
 """\
-<pre class="code shell literal-block"><code>cat <span class="s">&lt;&lt;EOF
+<pre class="code shell literal-block"><code>cat<span class="w"> </span><span class="s">&lt;&lt;EOF
 Hello World
 EOF</span></code></pre>
 """,
@@ -531,7 +533,7 @@
 :shell:`cat <<EOF Hello World EOF`
 """,
 """\
-<p><code class="shell">cat <span class="s">&lt;&lt;EOF Hello World EOF</span></code></p>
+<p><code class="shell">cat<span class="w"> </span><span class="s">&lt;&lt;EOF Hello World EOF</span></code></p>
 """,
 ],
 ])
@@ -550,7 +552,7 @@
 <p class="system-message-title">System Message: ERROR/3 \
 (<span class="docutils literal">&lt;string&gt;</span>, line 1)</p>
 <p>Cannot embed image &quot;https://dummy.png&quot;:
-  Can only read local images.</p>
+  Cannot get file path corresponding to https://dummy.png.</p>
 </aside>
 """,
 ],
@@ -642,7 +644,7 @@
 <p class="system-message-title">System Message: ERROR/3 \
 (<span class="docutils literal">&lt;string&gt;</span>, line 1)</p>
 <p>Cannot embed image &quot;https://dummy.png&quot;:
-  Can only read local images.</p>
+  Cannot get file path corresponding to https://dummy.png.</p>
 </aside>
 """,
 ],

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

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

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

Revision: 10133
          http://sourceforge.net/p/docutils/code/10133
Author:   grubert
Date:     2025-05-16 16:25:37 +0000 (Fri, 16 May 2025)
Log Message:
-----------
version 0.22rc2

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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/characters.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/compact_lists.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/docinfo-deu-l_de.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/docinfo-deu-l_en.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/docinfo-deu.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/docinfo-eng-l_de.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/docinfo-eng-l_en.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/docinfo-eng.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/dotted.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/dotted.man	2025-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/dotted.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/indent.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/indent.man	2025-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/indent.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/man-de.1.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,6 +1,6 @@
 '\" t
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/optionslisttest.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/optionslisttest.man	2025-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/optionslisttest.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/optionstoo.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/optionstoo.man	2025-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/optionstoo.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/quotes.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/quotes.man	2025-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/quotes.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/ref-2025-urue.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/ref-2025.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/references.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/references.man	2025-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/references.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/refs-urue.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/refs.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/refs.man	2025-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/refs.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.dev manpage writer.
 .
 .
 .nr rst2man-indent-level 0

Modified: trunk/sandbox/manpage-writer/expected/test.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/test.man	2025-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected/test.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,6 +1,6 @@
 '\" t
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected-mandoc/characters.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected-mandoc/compact_lists.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu-l_de.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu-l_en.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-deu.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng-l_de.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng-l_en.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected-mandoc/docinfo-eng.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected-mandoc/dotted.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected-mandoc/indent.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected-mandoc/man-de.1.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,6 +1,6 @@
 '\" t
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected-mandoc/optionslisttest.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected-mandoc/optionstoo.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected-mandoc/quotes.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected-mandoc/references.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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-05-16 13:38:58 UTC (rev 10132)
+++ trunk/sandbox/manpage-writer/expected-mandoc/test.man	2025-05-16 16:25:37 UTC (rev 10133)
@@ -1,6 +1,6 @@
 '\" t
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22b.dev manpage writer.
+.\" by the Docutils 0.22rc2.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:[10132] trunk/docutils

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

Revision: 10132
          http://sourceforge.net/p/docutils/code/10132
Author:   milde
Date:     2025-05-16 13:38:58 +0000 (Fri, 16 May 2025)
Log Message:
-----------
Announce switch to "argparse" for Docutils 2.0 or later.

Modified Paths:
--------------
    trunk/docutils/RELEASE-NOTES.rst
    trunk/docutils/docs/user/config.rst
    trunk/docutils/docutils/frontend.py

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2025-05-16 12:39:28 UTC (rev 10131)
+++ trunk/docutils/RELEASE-NOTES.rst	2025-05-16 13:38:58 UTC (rev 10132)
@@ -40,7 +40,11 @@
 
   For the rationale, see https://clig.dev/#arguments-and-flags.
 
+* The `front end tools`_ will use argparse_ for command line parsing
+  in Docutils 2.0 or later.
 
+  .. _argparse: https://docs.python.org/3/library/argparse.html
+
 Document Tree / Docutils DTD
 ----------------------------
 
@@ -187,6 +191,10 @@
   `states.RSTState.title_inconsistent()`, and `states.Line.eofcheck`
   in Docutils 2.0. Ignored since Docutils 0.22.
 
+* 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.
+
 Misc
 ----
 

Modified: trunk/docutils/docs/user/config.rst
===================================================================
--- trunk/docutils/docs/user/config.rst	2025-05-16 12:39:28 UTC (rev 10131)
+++ trunk/docutils/docs/user/config.rst	2025-05-16 13:38:58 UTC (rev 10132)
@@ -2430,7 +2430,7 @@
 ~~~~~~
 Path to an additional configuration file.
 The file is processed immediately (if it exists) with
-settings overriding defaults and earlier settings.
+settings overriding defaults and earlier settings. [#config-change]_
 
 Filesystem path settings [#pwd]_ contained within the config file will be
 interpreted relative to the config file's location (*not* relative to the
@@ -2437,11 +2437,17 @@
 current working directory).
 
 Multiple ``--config`` options may be specified;
-each will be processed in turn.
+each will be processed in turn. [#config-change]_
 
 *Default*: None.  *Option*: ``--config``.
 
+.. [#config-change] After the `transition to the "argparse" module`__,
+   files specified with the ``--config`` option will be appended
+   to the list of `configuration files`_ and evaluated before any
+   other command line arguments.
 
+   __ ../../RELEASE-NOTES.html#command-line-interface
+
 Internal Settings
 -----------------
 

Modified: trunk/docutils/docutils/frontend.py
===================================================================
--- trunk/docutils/docutils/frontend.py	2025-05-16 12:39:28 UTC (rev 10131)
+++ trunk/docutils/docutils/frontend.py	2025-05-16 13:38:58 UTC (rev 10132)
@@ -6,8 +6,8 @@
 Command-line and common processing for Docutils front-end tools.
 
 This module is provisional.
-Major changes will happen with the switch from the deprecated
-"optparse" module to "arparse".
+Major changes will happen with the transition from the
+"optparse" module to "arparse" in Docutils 2.0 or later.
 
 Applications should use the high-level API provided by `docutils.core`.
 See https://docutils.sourceforge.io/docs/api/runtime-settings.html.
@@ -30,7 +30,7 @@
   `get_default_settings()`.  New in 0.19.
 
 Option callbacks:
-  `store_multiple()`, `read_config_file()`. Deprecated.
+  `store_multiple()`, `read_config_file()`. Deprecated. To be removed.
 
 Setting validators:
   `validate_encoding()`, `validate_encoding_error_handler()`,
@@ -101,6 +101,8 @@
 
     Store `None` for each attribute named in `args`, and store the value for
     each key (attribute name) in `kwargs`.
+
+    Deprecated. Will be removed with the switch to from optparse to argparse.
     """
     for attribute in args:
         setattr(parser.values, attribute, None)
@@ -115,6 +117,8 @@
                      ) -> None:
     """
     Read a configuration file during option processing.  (Option callback.)
+
+    Deprecated. Will be removed with the switch to from optparse to argparse.
     """
     try:
         new_settings = parser.get_config_file_settings(value)
@@ -508,7 +512,8 @@
 def make_one_path_absolute(base_path: StrPath, path: StrPath) -> str:
     # deprecated, will be removed
     warnings.warn('frontend.make_one_path_absolute() will be removed '
-                  'in Docutils 0.23.', DeprecationWarning, stacklevel=2)
+                  'in Docutils 2.0 or later.',
+                  DeprecationWarning, stacklevel=2)
     return os.path.abspath(os.path.join(base_path, path))
 
 
@@ -555,7 +560,7 @@
 
     def __init__(self, defaults: dict[str, Any] | None = None) -> None:
         warnings.warn('frontend.Values class will be removed '
-                      'in Docutils 0.21 or later.',
+                      'in Docutils 2.0 or later.',
                       DeprecationWarning, stacklevel=2)
         super().__init__(defaults=defaults)
         if getattr(self, 'record_dependencies', None) is None:
@@ -606,7 +611,7 @@
 
     def __init__(self, *args: str | None, **kwargs: Any) -> None:
         warnings.warn('The frontend.Option class will be removed '
-                      'in Docutils 0.21 or later.',
+                      'in Docutils 2.0 or later.',
                       DeprecationWarning, stacklevel=2)
         super().__init__(*args, **kwargs)
 
@@ -903,7 +908,7 @@
 
         warnings.warn(
             'The frontend.OptionParser class will be replaced by a subclass '
-            'of argparse.ArgumentParser in Docutils 0.21 or later.\n  '
+            'of argparse.ArgumentParser in Docutils 2.0 or later.\n  '
             'To get default settings, use frontend.get_default_settings().',
             DeprecationWarning, stacklevel=2)
         super().__init__(option_class=Option, add_help_option=False,
@@ -1086,7 +1091,7 @@
         if option_parser is not None:
             warnings.warn('frontend.ConfigParser.read(): parameter '
                           '"option_parser" will be removed '
-                          'in Docutils 0.21 or later.',
+                          'in Docutils 2.0 or later.',
                           DeprecationWarning, stacklevel=2)
         read_ok = []
         if isinstance(filenames, str):

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

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

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

Revision: 10131
          http://sourceforge.net/p/docutils/code/10131
Author:   milde
Date:     2025-05-16 12:39:28 +0000 (Fri, 16 May 2025)
Log Message:
-----------
Refactor section parsing change.

Make the auxilliary function collection section parents a method
of nodes.Element.
Change it to collect only section elements
(starting with `self` if it is a section element).

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

Modified: trunk/docutils/docutils/nodes.py
===================================================================
--- trunk/docutils/docutils/nodes.py	2025-05-14 09:18:09 UTC (rev 10130)
+++ trunk/docutils/docutils/nodes.py	2025-05-16 12:39:28 UTC (rev 10131)
@@ -821,6 +821,27 @@
             return None
         return self.parent[i-1] if i > 0 else None
 
+    def section_hierarchy(self) -> list[section]:
+        """Return the element's section hierarchy.
+
+        Return a list of all <section> elements containing `self`
+        (including `self` if it is a <section>).
+
+        List item ``[i]`` is the parent <section> of level i+1
+        (1: section, 2: subsection, 3: subsubsection, ...).
+        The length of the list is the element's section level.
+
+        Provisional. May be changed or removed without warning.
+        """
+        sections = []
+        node = self
+        while node is not None:
+            if isinstance(node, section):
+                sections.append(node)
+            node = node.parent
+        sections.reverse()
+        return sections
+
     def is_not_default(self, key: str) -> bool:
         if self[key] == [] and key in self.list_attributes:
             return False

Modified: trunk/docutils/docutils/parsers/rst/states.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/states.py	2025-05-14 09:18:09 UTC (rev 10130)
+++ trunk/docutils/docutils/parsers/rst/states.py	2025-05-16 12:39:28 UTC (rev 10131)
@@ -326,11 +326,13 @@
         Check for a valid subsection header.  Update section data in `memo`.
 
         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.
+        section, set `self.parent` to the new section's parent section
+        (or the document if the new section is a top-level section).
         """
         title_styles = self.memo.title_styles
-        section_parents = get_section_parents(self.parent)
-        mylevel = len(section_parents)
+        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:
         try:  # check for existing title style
             level = title_styles.index(style) + 1
@@ -349,7 +351,7 @@
         self.memo.section_level = level
         if level <= mylevel:
             # new section is sibling or higher up in the section hierarchy
-            self.parent = section_parents[level-1]
+            self.parent = parent_sections[level-1].parent
         return True
 
     def title_inconsistent(self, sourcetext, lineno):
@@ -360,7 +362,7 @@
         return error
 
     def new_subsection(self, title, lineno, messages):
-        """Append new subsection to document tree. On return, check level."""
+        """Append new subsection to document tree."""
         section_node = nodes.section()
         self.parent += section_node
         textnodes, title_messages = self.inline_text(title, lineno)
@@ -3127,24 +3129,3 @@
                  OptionList, LineBlock, ExtensionOptions, Explicit, Text,
                  Definition, Line, SubstitutionDef, RFC2822Body, RFC2822List)
 """Standard set of State classes used to start `RSTStateMachine`."""
-
-
-# Auxiliary functions
-# ===================
-
-def get_section_parents(node: nodes.Element) -> list[nodes.section]:
-    """Return list of the the current node's parent sections.
-
-    List <section> elements that are parents of the current node.
-    The length of this list is the current section level.
-
-    Provisional. May be changed or removed without warning.
-    """
-    section_parents = []
-    parent = node.parent
-    while parent is not None:
-        if isinstance(parent, (nodes.section, nodes.document)):
-            section_parents.append(parent)
-        parent = parent.parent
-    section_parents.reverse()
-    return section_parents

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

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

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

Revision: 10130
          http://sourceforge.net/p/docutils/code/10130
Author:   milde
Date:     2025-05-14 09:18:09 +0000 (Wed, 14 May 2025)
Log Message:
-----------
Log entries for [r10129]. Deprecate `parsers.rst.states.Struct`.

Replace local definition of `parsers.rst.states.Struct` with
an import of `types.SimpleNamespace` (available since Python 3.3).

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

Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst	2025-05-13 20:49:37 UTC (rev 10129)
+++ trunk/docutils/HISTORY.rst	2025-05-14 09:18:09 UTC (rev 10130)
@@ -21,6 +21,14 @@
 
   - Pass default settings to custom parser for included file.
 
+* docutils/parsers/rst/states.py
+
+  - Remove the list`states.RSTStateMachine.memo.section_parents`
+    (introduced in Docutils 0.22rc1) that broke 3rd-party applications
+    setting up 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

Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst	2025-05-13 20:49:37 UTC (rev 10129)
+++ trunk/docutils/RELEASE-NOTES.rst	2025-05-14 09:18:09 UTC (rev 10130)
@@ -219,8 +219,14 @@
 Release 0.22rc2 (unpublished)
 =============================
 
-Nothing yet.
+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)
 ============================
 

Modified: trunk/docutils/docutils/parsers/rst/states.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/states.py	2025-05-13 20:49:37 UTC (rev 10129)
+++ trunk/docutils/docutils/parsers/rst/states.py	2025-05-14 09:18:09 UTC (rev 10130)
@@ -26,7 +26,7 @@
     - `SpecializedText`: Superclass for continuation lines of Text-variants.
     - `Definition`: Second line of potential definition_list_item.
     - `Line`: Second line of overlined section title or transition marker.
-    - `Struct`: An auxiliary collection class.
+    - `Struct`: obsolete, use `types.SimpleNamespace`.
 
 :Exception classes:
     - `MarkupError`
@@ -105,6 +105,7 @@
 
 import re
 from types import FunctionType, MethodType
+from types import SimpleNamespace as Struct
 
 from docutils import nodes, statemachine, utils
 from docutils import ApplicationError, DataError
@@ -129,14 +130,6 @@
 class MarkupMismatch(Exception): pass
 
 
-class Struct:
-
-    """Stores data attributes for dotted-attribute access."""
-
-    def __init__(self, **keywordargs) -> None:
-        self.__dict__.update(keywordargs)
-
-
 class RSTStateMachine(StateMachineWS):
 
     """

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

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

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

Revision: 10129
          http://sourceforge.net/p/docutils/code/10129
Author:   milde
Date:     2025-05-13 20:49:37 +0000 (Tue, 13 May 2025)
Log Message:
-----------
Improve backwards-compatibility of section parsing. Fixup for r10093.

Determine the "section_parents" list by inspecting the current node's parents
when required instead of keeping it in the `states.RSTStateMachine.memo`.

The introduction of a stack of "section_parents" in `states.RSTStateMachine.memo`
proved to be a "hard breaking change" for Sphinx and several Sphinx extensions.
https://github.com/sphinx-doc/sphinx/issues/13539#issuecomment-2874341471

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-05-13 20:49:24 UTC (rev 10128)
+++ trunk/docutils/docutils/parsers/rst/states.py	2025-05-13 20:49:37 UTC (rev 10129)
@@ -163,9 +163,8 @@
                            reporter=document.reporter,
                            language=self.language,
                            title_styles=[],
-                           section_parents=[],
-                           section_level=0,  # will be removed in Docutils 2.0
-                           section_bubble_up_kludge=False,  # will be removed
+                           section_level=0,  # ignored, to be removed in 2.0
+                           section_bubble_up_kludge=False,  # ignored, ""
                            inliner=inliner)
         self.document = document
         self.attach_observer(document.note_source)
@@ -336,13 +335,13 @@
         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.
         """
-        memo = self.memo
-        title_styles = memo.title_styles
-        mylevel = len(memo.section_parents)
+        title_styles = self.memo.title_styles
+        section_parents = get_section_parents(self.parent)
+        mylevel = len(section_parents)
         # Determine the level of the new section:
-        try:                            # check for existing title style
+        try:  # check for existing title style
             level = title_styles.index(style) + 1
-        except ValueError:              # new title style
+        except ValueError:  # new title style
             title_styles.append(style)
             level = len(title_styles)
         # The new level must not be deeper than an immediate child
@@ -354,15 +353,10 @@
                                line=lineno)
             return False
         # Update parent state:
-        if level > mylevel:
-            # new section is subsection of current section
-            memo.section_parents.append(self.parent)
-            memo.section_level += 1
-        else:
+        self.memo.section_level = level
+        if level <= mylevel:
             # new section is sibling or higher up in the section hierarchy
-            memo.section_parents[level:] = []
-            self.parent = memo.section_parents[-1]
-            memo.section_level = len(memo.section_parents)
+            self.parent = section_parents[level-1]
         return True
 
     def title_inconsistent(self, sourcetext, lineno):
@@ -2944,7 +2938,7 @@
     Second line of over- & underlined section title or transition marker.
     """
 
-    eofcheck = 1  # will be removed in Docutils 2.0.
+    eofcheck = 1  # ignored, will be removed in Docutils 2.0.
 
     def eof(self, context):
         """Transition marker at end of section or document."""
@@ -3140,3 +3134,24 @@
                  OptionList, LineBlock, ExtensionOptions, Explicit, Text,
                  Definition, Line, SubstitutionDef, RFC2822Body, RFC2822List)
 """Standard set of State classes used to start `RSTStateMachine`."""
+
+
+# Auxiliary functions
+# ===================
+
+def get_section_parents(node: nodes.Element) -> list[nodes.section]:
+    """Return list of the the current node's parent sections.
+
+    List <section> elements that are parents of the current node.
+    The length of this list is the current section level.
+
+    Provisional. May be changed or removed without warning.
+    """
+    section_parents = []
+    parent = node.parent
+    while parent is not None:
+        if isinstance(parent, (nodes.section, nodes.document)):
+            section_parents.append(parent)
+        parent = parent.parent
+    section_parents.reverse()
+    return section_parents

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