Menu
▾
▴
docutils-checkins
|
From: <gr...@us...> - 2025-09-20 17:45:23
|
Revision: 10245
http://sourceforge.net/p/docutils/code/10245
Author: grubert
Date: 2025-09-20 17:45:20 +0000 (Sat, 20 Sep 2025)
Log Message:
-----------
version 0.22.2
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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/HISTORY.rst 2025-09-20 17:45:20 UTC (rev 10245)
@@ -14,12 +14,15 @@
.. contents::
-Release 0.22.2b1.dev (unpublished)
-==================================
+Release 0.22.2 (2025-09-20)
+===========================
-.
+CI of snakemake on an MacOS arm failed, because homebrew possibly restored
+a vim .swp-file ... maybe.
+So release without the .swp.
+
Release 0.22.1 (2025-09-17)
===========================
Modified: trunk/docutils/README.rst
===================================================================
--- trunk/docutils/README.rst 2025-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/README.rst 2025-09-20 17:45:20 UTC (rev 10245)
@@ -1,6 +1,6 @@
-===============================
- README: Docutils 0.22.2b1.dev
-===============================
+=========================
+ README: Docutils 0.22.2
+=========================
:Author: David Goodger
:Contact: go...@py...
Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst 2025-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/RELEASE-NOTES.rst 2025-09-20 17:45:20 UTC (rev 10245)
@@ -263,12 +263,15 @@
__ https://packages.debian.org/source/trixie/python-docutils
-Release 0.22.2b1.dev (unpublished)
-==================================
+Release 0.22.2 (2025-09-20)
+===========================
-.
+CI of snakemake on an MacOS arm failed, because homebrew possibly restored
+a vim .swp-file ... maybe.
+So release without the .swp.
+
Release 0.22.1 (2025-09-17)
===========================
Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py 2025-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/docutils/__init__.py 2025-09-20 17:45:20 UTC (rev 10245)
@@ -85,7 +85,7 @@
__docformat__ = 'reStructuredText'
-__version__ = '0.22.2b1.dev'
+__version__ = '0.22.2'
"""Docutils version identifier (complies with PEP 440)::
major.minor[.micro][releaselevel[serial]][.dev]
@@ -160,9 +160,9 @@
major=0,
minor=22,
micro=2,
- releaselevel='beta', # one of 'alpha', 'beta', 'candidate', 'final'
- serial=1, # pre-release number (0 for final releases and snapshots)
- release=False # True for official releases and pre-releases
+ releaselevel='final', # one of 'alpha', 'beta', 'candidate', 'final'
+ serial=0, # pre-release number (0 for final releases and snapshots)
+ release=True # True for official releases and pre-releases
)
"""Comprehensive version information tuple.
Modified: trunk/docutils/test/functional/expected/buggy_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml.html 2025-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/buggy_mathml.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/buggy_mathml_ttm.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/compact_lists.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/dangerous.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/field_name_limit.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/length_units_html5.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/math_output_html.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/math_output_latex.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/math_output_mathml.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/mathematics_mathml.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
<title>Additional tests with html4css1</title>
<link rel="stylesheet" href="foo&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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/misc_rst_html5.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/pep_html.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -8,7 +8,7 @@
-->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+ <meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/rst_html5_tuftig.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2025-09-20 17:45:20 UTC (rev 10245)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<!-- Generated by Docutils 0.22.2b1.dev -->
+<!-- Generated by Docutils 0.22.2 -->
<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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html 2025-09-20 17:45:20 UTC (rev 10245)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.2: 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-09-18 01:29:47 UTC (rev 10244)
+++ trunk/docutils/test/functional/expected/standalone_rst_manpage.man 2025-09-20 17:45:20 UTC (rev 10245)
@@ -1,5 +1,5 @@
.\" Man page generated from reStructuredText
-.\" by the Docutils 0.22.2b1.dev manpage writer.
+.\" by the Docutils 0.22.2 manpage writer.
.
.
.nr rst2man-indent-level 0
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
==============================================...
[truncated message content] |
|
From: <gr...@us...> - 2025-09-20 18:25:17
|
Revision: 10247
http://sourceforge.net/p/docutils/code/10247
Author: grubert
Date: 2025-09-20 18:25:13 +0000 (Sat, 20 Sep 2025)
Log Message:
-----------
version 0.22.3b1.dev
Modified Paths:
--------------
trunk/docutils/HISTORY.rst
trunk/docutils/README.rst
trunk/docutils/RELEASE-NOTES.rst
trunk/docutils/docutils/__init__.py
trunk/docutils/test/functional/expected/buggy_mathml.html
trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html
trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html
trunk/docutils/test/functional/expected/buggy_mathml_ttm.html
trunk/docutils/test/functional/expected/compact_lists.html
trunk/docutils/test/functional/expected/dangerous.html
trunk/docutils/test/functional/expected/field_name_limit.html
trunk/docutils/test/functional/expected/footnotes_html5.html
trunk/docutils/test/functional/expected/length_units_html5.html
trunk/docutils/test/functional/expected/math_experiments_mathml.html
trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html
trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html
trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html
trunk/docutils/test/functional/expected/math_output_html.html
trunk/docutils/test/functional/expected/math_output_latex.html
trunk/docutils/test/functional/expected/math_output_mathjax.html
trunk/docutils/test/functional/expected/math_output_mathml.html
trunk/docutils/test/functional/expected/mathematics_mathml.html
trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html
trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html
trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html
trunk/docutils/test/functional/expected/misc_rst_html4css1.html
trunk/docutils/test/functional/expected/misc_rst_html5.html
trunk/docutils/test/functional/expected/pep_html.html
trunk/docutils/test/functional/expected/rst_html5_tuftig.html
trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
trunk/docutils/test/functional/expected/standalone_rst_html5.html
trunk/docutils/test/functional/expected/standalone_rst_manpage.man
trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
trunk/docutils/test/test_writers/test_manpage.py
Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst 2025-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/HISTORY.rst 2025-09-20 18:25:13 UTC (rev 10247)
@@ -14,6 +14,12 @@
.. contents::
+Release 0.22.3b1.dev (unpublished)
+==================================
+
+.
+
+
Release 0.22.2 (2025-09-20)
===========================
Modified: trunk/docutils/README.rst
===================================================================
--- trunk/docutils/README.rst 2025-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/README.rst 2025-09-20 18:25:13 UTC (rev 10247)
@@ -1,6 +1,6 @@
-=========================
- README: Docutils 0.22.2
-=========================
+===============================
+ README: Docutils 0.22.3b1.dev
+===============================
:Author: David Goodger
:Contact: go...@py...
Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst 2025-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/RELEASE-NOTES.rst 2025-09-20 18:25:13 UTC (rev 10247)
@@ -263,6 +263,12 @@
__ https://packages.debian.org/source/trixie/python-docutils
+Release 0.22.3b1.dev (unpublished)
+==================================
+
+.
+
+
Release 0.22.2 (2025-09-20)
===========================
Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py 2025-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/docutils/__init__.py 2025-09-20 18:25:13 UTC (rev 10247)
@@ -85,7 +85,7 @@
__docformat__ = 'reStructuredText'
-__version__ = '0.22.2'
+__version__ = '0.22.3b1.dev'
"""Docutils version identifier (complies with PEP 440)::
major.minor[.micro][releaselevel[serial]][.dev]
@@ -159,10 +159,10 @@
__version_info__ = VersionInfo(
major=0,
minor=22,
- micro=2,
- releaselevel='final', # one of 'alpha', 'beta', 'candidate', 'final'
- serial=0, # pre-release number (0 for final releases and snapshots)
- release=True # True for official releases and pre-releases
+ micro=3,
+ releaselevel='beta', # one of 'alpha', 'beta', 'candidate', 'final'
+ serial=1, # 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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/buggy_mathml.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/buggy_mathml_ttm.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/compact_lists.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/dangerous.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/field_name_limit.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/length_units_html5.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/math_output_html.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/math_output_latex.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/math_output_mathml.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/mathematics_mathml.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
<title>Additional tests with html4css1</title>
<link rel="stylesheet" href="foo&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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/misc_rst_html5.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/pep_html.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -8,7 +8,7 @@
-->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+ <meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/rst_html5_tuftig.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2025-09-20 18:25:13 UTC (rev 10247)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<!-- Generated by Docutils 0.22.2 -->
+<!-- Generated by Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.2: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/standalone_rst_manpage.man 2025-09-20 18:25:13 UTC (rev 10247)
@@ -1,5 +1,5 @@
.\" Man page generated from reStructuredText
-.\" by the Docutils 0.22.2 manpage writer.
+.\" by the Docutils 0.22.3b1.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-09-20 18:05:03 UTC (rev 10246)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2025-09-20 18:25:13 UTC (rev 10247)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
...
[truncated message content] |
|
From: <mi...@us...> - 2025-09-20 22:08:40
|
Revision: 10249
http://sourceforge.net/p/docutils/code/10249
Author: milde
Date: 2025-09-20 22:08:37 +0000 (Sat, 20 Sep 2025)
Log Message:
-----------
Documentation fixes.
Drop *rc1 release entries from HISTORY and RELEASE NOTES.
Add missing period.
Fix link target. Thanks to Dmitry Shachnev for reporting and patch #215.
Modified Paths:
--------------
trunk/docutils/HISTORY.rst
trunk/docutils/RELEASE-NOTES.rst
trunk/docutils/docs/ref/rst/definitions.rst
trunk/docutils/docs/ref/rst/roles.rst
Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst 2025-09-20 18:28:24 UTC (rev 10248)
+++ trunk/docutils/HISTORY.rst 2025-09-20 22:08:37 UTC (rev 10249)
@@ -23,21 +23,12 @@
Release 0.22.2 (2025-09-20)
===========================
-CI of snakemake on an MacOS arm failed, because homebrew possibly restored
-a vim .swp-file ... maybe.
+Remove a spurious vim .swp-file to fix bug #513.
-So release without the .swp.
-
Release 0.22.1 (2025-09-17)
===========================
-Only documentation fixes.
-
-
-Release 0.22.1rc1 (2025-09-13)
-==============================
-
* docutils/frontend.py, docutils/writers/
- More consistent and concise command line help.
Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst 2025-09-20 18:28:24 UTC (rev 10248)
+++ trunk/docutils/RELEASE-NOTES.rst 2025-09-20 22:08:37 UTC (rev 10249)
@@ -272,21 +272,12 @@
Release 0.22.2 (2025-09-20)
===========================
-CI of snakemake on an MacOS arm failed, because homebrew possibly restored
-a vim .swp-file ... maybe.
+Remove a spurious vim .swp-file.
-So release without the .swp.
-
Release 0.22.1 (2025-09-17)
===========================
-Only documentation fixes.
-
-
-Release 0.22.1rc1 (2025-09-13)
-==============================
-
* docutils/parsers/rst/states.py
- Relax "section title" system messages from SEVERE to ERROR.
Modified: trunk/docutils/docs/ref/rst/definitions.rst
===================================================================
--- trunk/docutils/docs/ref/rst/definitions.rst 2025-09-20 18:28:24 UTC (rev 10248)
+++ trunk/docutils/docs/ref/rst/definitions.rst 2025-09-20 22:08:37 UTC (rev 10249)
@@ -215,7 +215,7 @@
.. [#attribute-optional] Would gain from support for attributes/arguments
to inline roles (see TODO_).
-New in Docutils 0.22
+New in Docutils 0.22.
.. _TODO: https://docutils.sourceforge.io/docs/dev/todo.html
#acronym-and-abbreviation
Modified: trunk/docutils/docs/ref/rst/roles.rst
===================================================================
--- trunk/docutils/docs/ref/rst/roles.rst 2025-09-20 18:28:24 UTC (rev 10248)
+++ trunk/docutils/docs/ref/rst/roles.rst 2025-09-20 22:08:37 UTC (rev 10249)
@@ -400,7 +400,7 @@
.. _hyperlink references: restructuredtext.html#hyperlink-references
.. _reStructuredText Standard Definition Files: definitions.html
-.. _HTML5 inline markup elements: definitions.html#additional-roles-for-html
+.. _semantic inline markup: definitions.html#additional-roles-for-html
.. _S5/HTML slide shows: definitions.html#s5-html-definitions
.. _The Docutils Document Tree: ../doctree.html
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2025-09-22 21:00:16
|
Revision: 10251
http://sourceforge.net/p/docutils/code/10251
Author: milde
Date: 2025-09-22 21:00:13 +0000 (Mon, 22 Sep 2025)
Log Message:
-----------
rST parser: allow for combining characters in grid tables.
Ignore combining characters when extracting a grid table block and
when parsing the grid table structure.
Allow for combining characters when extracting 2d-block with cell content.
Missing part of the fixes in [r7231].
Fixes [bugs:#128] and [bugs:#512].
Modified Paths:
--------------
trunk/docutils/HISTORY.rst
trunk/docutils/RELEASE-NOTES.rst
trunk/docutils/docutils/parsers/rst/states.py
trunk/docutils/docutils/parsers/rst/tableparser.py
trunk/docutils/docutils/statemachine.py
trunk/docutils/test/test_parsers/test_rst/test_TableParser.py
Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst 2025-09-22 20:59:57 UTC (rev 10250)
+++ trunk/docutils/HISTORY.rst 2025-09-22 21:00:13 UTC (rev 10251)
@@ -17,9 +17,19 @@
Release 0.22.3b1.dev (unpublished)
==================================
-.
+* docutils/parsers/rst/states.py
+ - Ignore combining characters when extracting a grid table block
+* docutils/parsers/rst/tableparser.py
+
+ - Ignore combining characters when parsing the grid table structure.
+
+* docutils/statemachine.py
+
+ - Fix handling of combining characters when extracting 2d-block.
+
+
Release 0.22.2 (2025-09-20)
===========================
Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst 2025-09-22 20:59:57 UTC (rev 10250)
+++ trunk/docutils/RELEASE-NOTES.rst 2025-09-22 21:00:13 UTC (rev 10251)
@@ -266,7 +266,9 @@
Release 0.22.3b1.dev (unpublished)
==================================
-.
+Rst parser:
+ Allow for combining characters in grid tables.
+ Fixes bugs #128 and #512.
Release 0.22.2 (2025-09-20)
@@ -278,19 +280,11 @@
Release 0.22.1 (2025-09-17)
===========================
-* docutils/parsers/rst/states.py
-
+Rst parser:
- Relax "section title" system messages from SEVERE to ERROR.
- - Fix behaviour with nested parsing into a detached node
- (cf. bugs #508 and #509).
- - New attribute `NestedStateMachine.parent_state_machine`.
- Use case: update the "current node" of parent state machine(s)
- after nested parsing.
- - Better error messages for grid table markup errors (bug #504),
- based on patch #214 by Jynn Nelson.
+ - New attribute `parsers.rst.states.NestedStateMachine.parent_state_machine`.
-* docutils/writers/latex2e/__init__.py
-
+LaTeX writer:
- Add cross-reference anchors (``\phantomsection\label{...}``)
for elements with IDs (fixes bug #503).
- Fix cross-reference anchor placement in figures, images,
Modified: trunk/docutils/docutils/parsers/rst/states.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/states.py 2025-09-22 20:59:57 UTC (rev 10250)
+++ trunk/docutils/docutils/parsers/rst/states.py 2025-09-22 21:00:13 UTC (rev 10251)
@@ -116,7 +116,7 @@
from docutils.nodes import unescape, whitespace_normalize_name
import docutils.parsers.rst
from docutils.parsers.rst import directives, languages, tableparser, roles
-from docutils.utils import escape2null, column_width
+from docutils.utils import escape2null, column_width, strip_combining_chars
from docutils.utils import punctuation_chars, urischemes
from docutils.utils import split_escaped_whitespace
from docutils.utils._roman_numerals import (InvalidRomanNumeralError,
@@ -1848,7 +1848,8 @@
messages.extend(self.malformed_table(block, detail, i))
return [], messages, blank_finish
for i in range(len(block)): # check right edge
- if len(block[i]) != width or block[i][-1] not in '+|':
+ if len(strip_combining_chars(block[i])
+ ) != width or block[i][-1] not in '+|':
detail = 'Right border not aligned or missing.'
messages.extend(self.malformed_table(block, detail, i))
return [], messages, blank_finish
Modified: trunk/docutils/docutils/parsers/rst/tableparser.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/tableparser.py 2025-09-22 20:59:57 UTC (rev 10250)
+++ trunk/docutils/docutils/parsers/rst/tableparser.py 2025-09-22 21:00:13 UTC (rev 10251)
@@ -167,6 +167,9 @@
We'll end up knowing all the row and column boundaries, cell positions
and their dimensions.
"""
+ # a copy of the block without combining characters:
+ self.stripped_block = [strip_combining_chars(line)
+ for line in self.block]
corners = [(0, 0)]
while corners:
top, left = corners.pop(0)
@@ -209,7 +212,7 @@
def scan_cell(self, top, left):
"""Starting at the top-left corner, start tracing out a cell."""
- assert self.block[top][left] == '+'
+ assert self.stripped_block[top][left] == '+'
return self.scan_right(top, left)
def scan_right(self, top, left):
@@ -218,7 +221,7 @@
boundaries ('+').
"""
colseps = {}
- line = self.block[top]
+ line = self.stripped_block[top]
for i in range(left + 1, self.right + 1):
if line[i] == '+':
colseps[i] = [top]
@@ -238,7 +241,7 @@
"""
rowseps = {}
for i in range(top + 1, self.bottom + 1):
- if self.block[i][right] == '+':
+ if self.stripped_block[i][right] == '+':
rowseps[i] = [right]
result = self.scan_left(top, left, i, right)
if result:
@@ -245,7 +248,7 @@
newrowseps, colseps = result
update_dict_of_lists(rowseps, newrowseps)
return i, rowseps, colseps
- elif self.block[i][right] != '|':
+ elif self.stripped_block[i][right] != '|':
return None
return None
@@ -255,7 +258,7 @@
It must line up with the starting point.
"""
colseps = {}
- line = self.block[bottom]
+ line = self.stripped_block[bottom]
for i in range(right - 1, left, -1):
if line[i] == '+':
colseps[i] = [bottom]
@@ -275,9 +278,9 @@
"""
rowseps = {}
for i in range(bottom - 1, top, -1):
- if self.block[i][left] == '+':
+ if self.stripped_block[i][left] == '+':
rowseps[i] = [left]
- elif self.block[i][left] != '|':
+ elif self.stripped_block[i][left] != '|':
return None
return rowseps
Modified: trunk/docutils/docutils/statemachine.py
===================================================================
--- trunk/docutils/docutils/statemachine.py 2025-09-22 20:59:57 UTC (rev 10250)
+++ trunk/docutils/docutils/statemachine.py 2025-09-22 21:00:13 UTC (rev 10251)
@@ -1426,18 +1426,18 @@
def get_2D_block(self, top, left, bottom, right, strip_indent=True):
block = self[top:bottom]
indent = right
- for i in range(len(block.data)):
- # get slice from line, care for combining characters
- ci = utils.column_indices(block.data[i])
+ for i, line in enumerate(block.data):
+ # trim line to block borders, allow for for combining characters
+ adjusted_indices = utils.column_indices(line)
try:
- left = ci[left]
+ left_i = adjusted_indices[left]
except IndexError:
- left += len(block.data[i]) - len(ci)
+ left_i = left
try:
- right = ci[right]
+ right_i = adjusted_indices[right]
except IndexError:
- right += len(block.data[i]) - len(ci)
- block.data[i] = line = block.data[i][left:right].rstrip()
+ right_i = len(line)
+ block.data[i] = line = line[left_i:right_i].rstrip()
if line:
indent = min(indent, len(line) - len(line.lstrip()))
if strip_indent and 0 < indent < right:
Modified: trunk/docutils/test/test_parsers/test_rst/test_TableParser.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_TableParser.py 2025-09-22 20:59:57 UTC (rev 10250)
+++ trunk/docutils/test/test_parsers/test_rst/test_TableParser.py 2025-09-22 21:00:13 UTC (rev 10251)
@@ -73,32 +73,32 @@
[],
[[(0, 0, 1, ['A table with']),
(0, 0, 1, ['two columns.'])]])],
-# Combining chars in grid tables still fail
-# ["""\
-# +--------------+------------------+
-# | A tāble w̅ith | comb̲ining chars. |
-# +--------------+------------------+
-# """,
-# [(0, 0, 2, 15, ['A table with']),
-# (0, 15, 2, 30, ['combining chars.'])],
-# ([14, 14],
-# [],
-# [[(0, 0, 1, ['A table with']),
-# (0, 0, 1, ['combining chars.'])]])],
+# Combining chars in table cells
["""\
++--------------+------------------+
+| A tāble w̅ith | comb̲ining chars. |
++--------------+------------------+
+""",
+[(0, 0, 2, 15, ['A tāble w̅ith']),
+ (0, 15, 2, 34, ['comb̲ining chars.'])],
+([14, 18],
+ [],
+ [[(0, 0, 1, ['A tāble w̅ith']),
+ (0, 0, 1, ['comb̲ining chars.'])]])],
+["""\
+--------------+-------------+
-| A table with | two columns |
+| A tāble w̅ith | two columns |
+--------------+-------------+
| and | two rows. |
+--------------+-------------+
""",
-[(0, 0, 2, 15, ['A table with']),
+[(0, 0, 2, 15, ['A tāble w̅ith']),
(0, 15, 2, 29, ['two columns']),
(2, 0, 4, 15, ['and']),
(2, 15, 4, 29, ['two rows.'])],
([14, 13],
[],
- [[(0, 0, 1, ['A table with']),
+ [[(0, 0, 1, ['A tāble w̅ith']),
(0, 0, 1, ['two columns'])],
[(0, 0, 3, ['and']),
(0, 0, 3, ['two rows.'])]])],
@@ -126,18 +126,18 @@
None]])],
["""\
+------------+-------------+---------------+
-| A table | two rows in | and row spans |
-| with three +-------------+ to left and |
+| A tāble | two rows in | and row spans |
+| with t̲h̲r̲e̲e̲ +-------------+ to left and |
| columns, | the middle, | right. |
+------------+-------------+---------------+
""",
-[(0, 0, 4, 13, ['A table', 'with three', 'columns,']),
+[(0, 0, 4, 13, ['A tāble', 'with t̲h̲r̲e̲e̲', 'columns,']),
(0, 13, 2, 27, ['two rows in']),
(0, 27, 4, 43, ['and row spans', 'to left and', 'right.']),
(2, 13, 4, 27, ['the middle,'])],
([12, 13, 15],
[],
- [[(1, 0, 1, ['A table', 'with three', 'columns,']),
+ [[(1, 0, 1, ['A tāble', 'with t̲h̲r̲e̲e̲', 'columns,']),
(0, 0, 1, ['two rows in']),
(1, 0, 1, ['and row spans', 'to left and', 'right.'])],
[None,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2025-11-02 17:51:00
|
Revision: 10254
http://sourceforge.net/p/docutils/code/10254
Author: milde
Date: 2025-11-02 17:50:57 +0000 (Sun, 02 Nov 2025)
Log Message:
-----------
Better error message for substitution definitions.
More informative and easier to comprehend error messages when a
substitution definition contains problematic or not supported content.
Document limits to content of substitution definitions.
Modified Paths:
--------------
trunk/docutils/HISTORY.rst
trunk/docutils/docs/ref/rst/directives.rst
trunk/docutils/docutils/parsers/rst/states.py
trunk/docutils/test/test_parsers/test_rst/test_directives/test_replace.py
trunk/docutils/test/test_parsers/test_rst/test_substitutions.py
trunk/docutils/test/test_transforms/test_hyperlinks.py
trunk/docutils/test/test_transforms/test_substitutions.py
Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst 2025-10-06 12:29:47 UTC (rev 10253)
+++ trunk/docutils/HISTORY.rst 2025-11-02 17:50:57 UTC (rev 10254)
@@ -20,6 +20,8 @@
* docutils/parsers/rst/states.py
- Ignore combining characters when extracting a grid table block
+ - More informative error messages when a substitution definition contains
+ problematic or not supported content.
* docutils/parsers/rst/tableparser.py
Modified: trunk/docutils/docs/ref/rst/directives.rst
===================================================================
--- trunk/docutils/docs/ref/rst/directives.rst 2025-10-06 12:29:47 UTC (rev 10253)
+++ trunk/docutils/docs/ref/rst/directives.rst 2025-11-02 17:50:57 UTC (rev 10254)
@@ -259,7 +259,7 @@
.. _image options:
The "image" directive recognizes the common options `class <class option_>`_
-and name_ as well as
+and name_ [#no-inline-name]_ as well as
``align`` : "top", "middle", "bottom", "left", "center", or "right"
The alignment of the image, equivalent to the HTML ``<img>`` tag's
@@ -1424,9 +1424,12 @@
The `image`_ directive can be used both, stand-alone (to define
block-level images) and in substitution definitions to define
-inline images.
+inline images. [#no-inline-name]_
+.. [#no-inline-name] The name_ option cannot be used in
+ a substitution definition. [#substitution-limits]_
+
.. _replace:
Replacement Text
@@ -1435,7 +1438,7 @@
.. class:: field-indent-13em
:Directive Type: "replace"
-:Doctree Element: Text & `inline elements`_
+:Doctree Element: Text & `inline elements`_ [#substitution-limits]_
:Directive Arguments: none
:Directive Options: none
:Directive Content: A single paragraph; may contain inline markup.
@@ -1461,7 +1464,14 @@
.. |Python| replace:: Python, *the* best language around
.. _Python: https://www.python.org/
+.. [#substitution-limits] As a substitution may be referenced more than
+ one time, a substitution definition may not contain references to
+ `anonymous hyperlinks`_, `auto-numbered`_ or `auto-symbol`_ footnotes
+ and no `hyperlink targets`__ (names and identifiers must be unique).
+ __ restructuredtext.html#inline-internal-targets
+
+
.. _unicode:
Unicode Character Codes
@@ -2312,6 +2322,9 @@
https://docs.python.org/3/library/codecs.html#standard-encodings
.. _reStructuredText Markup Specification: restructuredtext.html
+.. _anonymous hyperlinks: restructuredtext.html#anonymous-hyperlinks
+.. _auto-numbered: restructuredtext.html#auto-numbered-footnotes
+.. _auto-symbol: restructuredtext.html#auto-symbol-footnotes
.. _block quote: restructuredtext.html#block-quotes
.. _citation references: restructuredtext.html#citation-references
.. _citation: restructuredtext.html#citations
Modified: trunk/docutils/docutils/parsers/rst/states.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/states.py 2025-10-06 12:29:47 UTC (rev 10253)
+++ trunk/docutils/docutils/parsers/rst/states.py 2025-11-02 17:50:57 UTC (rev 10254)
@@ -2189,15 +2189,23 @@
del substitution_node[i]
else:
i += 1
- for node in substitution_node.findall(nodes.Element):
- if self.disallowed_inside_substitution_definitions(node):
- pformat = nodes.literal_block('', node.pformat().rstrip())
+ for node in substitution_node.findall(nodes.Element,
+ include_self=False):
+ if isinstance(node, nodes.problematic):
msg = self.reporter.error(
- 'Substitution definition contains illegal element <%s>:'
- % node.tagname,
- pformat, nodes.literal_block(blocktext, blocktext),
+ 'Problematic content in substitution definition',
+ nodes.literal_block('', blocktext),
source=src, line=srcline)
+ msg.append(nodes.block_quote(
+ '', nodes.paragraph('', '', *substitution_node.children)))
return [msg], blank_finish
+ illegal = self.disallowed_inside_substitution_definitions(node)
+ if illegal:
+ msg = self.reporter.error(f'{illegal} are not supported in '
+ 'a substitution definition.',
+ nodes.literal_block('', blocktext),
+ source=src, line=srcline)
+ return [msg], blank_finish
if len(substitution_node) == 0:
msg = self.reporter.warning(
'Substitution definition "%s" empty or invalid.' % subname,
@@ -2208,13 +2216,15 @@
substitution_node, subname, self.parent)
return [substitution_node], blank_finish
- def disallowed_inside_substitution_definitions(self, node) -> bool:
- if (node['ids']
- or isinstance(node, nodes.reference) and node.get('anonymous')
- or isinstance(node, nodes.footnote_reference) and node.get('auto')): # noqa: E501
- return True
+ def disallowed_inside_substitution_definitions(self, node) -> str:
+ if isinstance(node, nodes.reference) and node.get('anonymous'):
+ return 'Anonymous references'
+ if isinstance(node, nodes.footnote_reference) and node.get('auto'):
+ return 'References to auto-numbered and auto-symbol footnotes'
+ if node['names'] or node['ids']:
+ return 'Targets (names and identifiers)'
else:
- return False
+ return ''
def directive(self, match, **option_presets):
"""Returns a 2-tuple: list of nodes, and a "blank finish" boolean."""
Modified: trunk/docutils/test/test_parsers/test_rst/test_directives/test_replace.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_directives/test_replace.py 2025-10-06 12:29:47 UTC (rev 10253)
+++ trunk/docutils/test/test_parsers/test_rst/test_directives/test_replace.py 2025-11-02 17:50:57 UTC (rev 10254)
@@ -23,6 +23,8 @@
class ParserTestCase(unittest.TestCase):
+ maxDiff = None
+
def test_parser(self):
parser = Parser()
settings = get_default_settings(Parser)
@@ -129,12 +131,20 @@
Inline literal start-string without end-string.
<system_message level="3" line="1" source="test data" type="ERROR">
<paragraph>
- Substitution definition contains illegal element <problematic>:
+ Problematic content in substitution definition
<literal_block xml:space="preserve">
- <problematic ids="problematic-1" refid="system-message-1">
- *
- <literal_block xml:space="preserve">
.. |name| replace:: *error in **inline ``markup
+ <block_quote>
+ <paragraph>
+ <problematic ids="problematic-1" refid="system-message-1">
+ *
+ error in \n\
+ <problematic ids="problematic-2" refid="system-message-2">
+ **
+ inline \n\
+ <problematic ids="problematic-3" refid="system-message-3">
+ ``
+ markup
"""],
["""\
.. replace:: not valid outside of a substitution definition
Modified: trunk/docutils/test/test_parsers/test_rst/test_substitutions.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_substitutions.py 2025-10-06 12:29:47 UTC (rev 10253)
+++ trunk/docutils/test/test_parsers/test_rst/test_substitutions.py 2025-11-02 17:50:57 UTC (rev 10254)
@@ -23,6 +23,8 @@
class ParserTestCase(unittest.TestCase):
+ maxDiff = None
+
def test_parser(self):
parser = Parser()
settings = get_default_settings(Parser)
@@ -287,26 +289,18 @@
Elements that are prohibited inside of substitution definitions:
<system_message level="3" line="3" source="test data" type="ERROR">
<paragraph>
- Substitution definition contains illegal element <target>:
+ Targets (names and identifiers) are not supported in a substitution definition.
<literal_block xml:space="preserve">
- <target ids="target" names="target">
- target
- <literal_block xml:space="preserve">
.. |target| replace:: _`target`
<system_message level="3" line="4" source="test data" type="ERROR">
<paragraph>
- Substitution definition contains illegal element <reference>:
+ Anonymous references are not supported in a substitution definition.
<literal_block xml:space="preserve">
- <reference anonymous="1" name="anonymous">
- anonymous
- <literal_block xml:space="preserve">
.. |reference| replace:: anonymous__
<system_message level="3" line="5" source="test data" type="ERROR">
<paragraph>
- Substitution definition contains illegal element <footnote_reference>:
+ References to auto-numbered and auto-symbol footnotes are not supported in a substitution definition.
<literal_block xml:space="preserve">
- <footnote_reference auto="1" ids="footnote-reference-1">
- <literal_block xml:space="preserve">
.. |auto-numbered footnote| replace:: [#]_
"""],
]
Modified: trunk/docutils/test/test_transforms/test_hyperlinks.py
===================================================================
--- trunk/docutils/test/test_transforms/test_hyperlinks.py 2025-10-06 12:29:47 UTC (rev 10253)
+++ trunk/docutils/test/test_transforms/test_hyperlinks.py 2025-11-02 17:50:57 UTC (rev 10254)
@@ -321,11 +321,8 @@
match in this snippet.
<system_message level="3" line="5" source="test data" type="ERROR">
<paragraph>
- Substitution definition contains illegal element <reference>:
+ Anonymous references are not supported in a substitution definition.
<literal_block xml:space="preserve">
- <reference anonymous="1" name="anonymous">
- anonymous
- <literal_block xml:space="preserve">
.. |invalid| replace:: anonymous__
<paragraph>
<reference anonymous="1" name="hyperlink" refuri="URL">
Modified: trunk/docutils/test/test_transforms/test_substitutions.py
===================================================================
--- trunk/docutils/test/test_transforms/test_substitutions.py 2025-10-06 12:29:47 UTC (rev 10253)
+++ trunk/docutils/test/test_transforms/test_substitutions.py 2025-11-02 17:50:57 UTC (rev 10254)
@@ -25,6 +25,8 @@
class TransformTestCase(unittest.TestCase):
+ maxDiff = None
+
def test_transforms(self):
parser = Parser()
settings = get_default_settings(Parser)
@@ -378,11 +380,8 @@
Substitution definition with an illegal element:
<system_message level="3" line="3" source="test data" type="ERROR">
<paragraph>
- Substitution definition contains illegal element <target>:
+ Targets (names and identifiers) are not supported in a substitution definition.
<literal_block xml:space="preserve">
- <target ids="target" names="target">
- target
- <literal_block xml:space="preserve">
.. |target| replace:: _`target`
<paragraph>
Make sure this substitution definition is not registered: \n\
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2025-11-02 17:51:24
|
Revision: 10256
http://sourceforge.net/p/docutils/code/10256
Author: milde
Date: 2025-11-02 17:51:21 +0000 (Sun, 02 Nov 2025)
Log Message:
-----------
Relax test for valid parents of topics or sidebars.
Raise error if the parent element belongs to a not-allowed parent class
instead of when the parent element is not in a supported parent class.
The difference is with uncategorized parent classes (like `node.Element`
or `sphinx.addnodes.only`). This allows for auxiliary wrappers during
the parsing step and fixes issues with the Sphinx "only" directive.
cf. https://github.com/sphinx-doc/sphinx/issues/14002
Modified Paths:
--------------
trunk/docutils/HISTORY.rst
trunk/docutils/RELEASE-NOTES.rst
trunk/docutils/docutils/parsers/rst/directives/body.py
trunk/docutils/docutils/parsers/rst/directives/parts.py
trunk/docutils/docutils/writers/html5_polyglot/responsive.css
trunk/docutils/test/test_parsers/test_rst/test_directives/test_sidebars.py
Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst 2025-11-02 17:51:07 UTC (rev 10255)
+++ trunk/docutils/HISTORY.rst 2025-11-02 17:51:21 UTC (rev 10256)
@@ -17,6 +17,13 @@
Release 0.22.3b1.dev (unpublished)
==================================
+* docutils/parsers/rst/directives/body.py,
+ docutils/parsers/rst/directives/parts.py
+
+ - Ignore auxiliary elements like `sphinx.addnodes.only`
+ when testing for invalid parents of topics or sidebars
+ (cf. https://github.com/sphinx-doc/sphinx/issues/14002).
+
* docutils/parsers/rst/states.py
- Ignore combining characters when extracting a grid table block
Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst 2025-11-02 17:51:07 UTC (rev 10255)
+++ trunk/docutils/RELEASE-NOTES.rst 2025-11-02 17:51:21 UTC (rev 10256)
@@ -267,10 +267,13 @@
==================================
Rst parser:
- Allow for combining characters in grid tables.
- Fixes bugs #128 and #512.
+ - Allow for combining characters in grid tables.
+ Fixes bugs #128 and #512.
+ - Ignore auxiliary elements like `sphinx.addnodes.only`
+ when testing for invalid parents of topics or sidebars.
+
Release 0.22.2 (2025-09-20)
===========================
Modified: trunk/docutils/docutils/parsers/rst/directives/body.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/directives/body.py 2025-11-02 17:51:07 UTC (rev 10255)
+++ trunk/docutils/docutils/parsers/rst/directives/body.py 2025-11-02 17:51:21 UTC (rev 10256)
@@ -29,9 +29,18 @@
node_class = None
"""Node class to be used (must be set in subclasses)."""
+ invalid_parents = (nodes.SubStructural, nodes.Bibliographic,
+ nodes.Decorative, nodes.Body, nodes.Part, nodes.topic)
+ """
+ Node categories where topics and sidebars are invalid children.
+
+ Sidebars are only valid in <document> and <section> elements,
+ topics also in <sidebar> elements. However, during parsing,
+ there may be wrapper nodes (like `sphinx.addnodes.only`).
+ """
+
def run(self):
- if not isinstance(self.state_machine.node,
- (nodes.document, nodes.section, nodes.sidebar)):
+ if isinstance(self.state_machine.node, self.invalid_parents):
raise self.error('The "%s" directive may not be used within '
'topics or body elements.' % self.name)
self.assert_has_content()
Modified: trunk/docutils/docutils/parsers/rst/directives/parts.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/directives/parts.py 2025-11-02 17:51:07 UTC (rev 10255)
+++ trunk/docutils/docutils/parsers/rst/directives/parts.py 2025-11-02 17:51:21 UTC (rev 10256)
@@ -12,6 +12,7 @@
from docutils.transforms import parts
from docutils.parsers.rst import Directive
from docutils.parsers.rst import directives
+from docutils.parsers.rst.directives.body import BasePseudoSection
class Contents(Directive):
@@ -43,8 +44,8 @@
'class': directives.class_option}
def run(self):
- if not isinstance(self.state_machine.node,
- (nodes.document, nodes.section, nodes.sidebar)):
+ if isinstance(self.state_machine.node,
+ BasePseudoSection.invalid_parents):
raise self.error('The "%s" directive may not be used within '
'topics or body elements.' % self.name)
document = self.state_machine.document
Modified: trunk/docutils/docutils/writers/html5_polyglot/responsive.css
===================================================================
--- trunk/docutils/docutils/writers/html5_polyglot/responsive.css 2025-11-02 17:51:07 UTC (rev 10255)
+++ trunk/docutils/docutils/writers/html5_polyglot/responsive.css 2025-11-02 17:51:21 UTC (rev 10256)
@@ -72,7 +72,12 @@
pre, dd, dl.option-list {
margin-left: calc(2% + 1em);
}
+/* but not in a table cell */
+td pre, td dl.option-list {
+ margin-left: 0;
+}
+
/* Object styling */
/* ============== */
@@ -201,6 +206,8 @@
text-align: left;
vertical-align: baseline;
}
+td *:first-child { margin-top: 0; }
+td *:last-child { margin-bottom: 0; }
table.booktabs { /* "booktabs" style (no vertical lines) */
border-top: 2px solid;
border-bottom: 2px solid;
Modified: trunk/docutils/test/test_parsers/test_rst/test_directives/test_sidebars.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_directives/test_sidebars.py 2025-11-02 17:51:07 UTC (rev 10255)
+++ trunk/docutils/test/test_parsers/test_rst/test_directives/test_sidebars.py 2025-11-02 17:51:21 UTC (rev 10256)
@@ -23,6 +23,8 @@
class ParserTestCase(unittest.TestCase):
+ maxDiff = None
+
def test_parser(self):
parser = Parser()
settings = get_default_settings(Parser)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2025-11-04 09:02:22
|
Revision: 10257
http://sourceforge.net/p/docutils/code/10257
Author: milde
Date: 2025-11-04 09:02:20 +0000 (Tue, 04 Nov 2025)
Log Message:
-----------
Small edits in description of recent changes.
Rephrase and rearrange the description of changes in the HISTORY and RELEASE-NOTES.
Modified Paths:
--------------
trunk/docutils/HISTORY.rst
trunk/docutils/RELEASE-NOTES.rst
Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst 2025-11-02 17:51:21 UTC (rev 10256)
+++ trunk/docutils/HISTORY.rst 2025-11-04 09:02:20 UTC (rev 10257)
@@ -20,19 +20,20 @@
* docutils/parsers/rst/directives/body.py,
docutils/parsers/rst/directives/parts.py
- - Ignore auxiliary elements like `sphinx.addnodes.only`
+ - Do not flag uncategorized, auxiliary elements like `sphinx.addnodes.only`
when testing for invalid parents of topics or sidebars
(cf. https://github.com/sphinx-doc/sphinx/issues/14002).
* docutils/parsers/rst/states.py
- - Ignore combining characters when extracting a grid table block
- More informative error messages when a substitution definition contains
problematic or not supported content.
+ - Ignore combining characters when extracting a grid table block
* docutils/parsers/rst/tableparser.py
- Ignore combining characters when parsing the grid table structure.
+ Fixes bugs #128 and #512.
* docutils/statemachine.py
Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst 2025-11-02 17:51:21 UTC (rev 10256)
+++ trunk/docutils/RELEASE-NOTES.rst 2025-11-04 09:02:20 UTC (rev 10257)
@@ -267,10 +267,9 @@
==================================
Rst parser:
- - Allow for combining characters in grid tables.
- Fixes bugs #128 and #512.
+ - Ignore combining characters when parsing the grid table structure.
- - Ignore auxiliary elements like `sphinx.addnodes.only`
+ - Allow for auxiliary elements like `sphinx.addnodes.only`
when testing for invalid parents of topics or sidebars.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gr...@us...> - 2025-11-06 02:17:11
|
Revision: 10258
http://sourceforge.net/p/docutils/code/10258
Author: grubert
Date: 2025-11-06 02:17:08 +0000 (Thu, 06 Nov 2025)
Log Message:
-----------
version 0.22.3
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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/HISTORY.rst 2025-11-06 02:17:08 UTC (rev 10258)
@@ -14,8 +14,8 @@
.. contents::
-Release 0.22.3b1.dev (unpublished)
-==================================
+Release 0.22.3 (2025-11-06)
+===========================
* docutils/parsers/rst/directives/body.py,
docutils/parsers/rst/directives/parts.py
Modified: trunk/docutils/README.rst
===================================================================
--- trunk/docutils/README.rst 2025-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/README.rst 2025-11-06 02:17:08 UTC (rev 10258)
@@ -1,6 +1,6 @@
-===============================
- README: Docutils 0.22.3b1.dev
-===============================
+=========================
+ README: Docutils 0.22.3
+=========================
:Author: David Goodger
:Contact: go...@py...
Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst 2025-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/RELEASE-NOTES.rst 2025-11-06 02:17:08 UTC (rev 10258)
@@ -263,8 +263,8 @@
__ https://packages.debian.org/source/trixie/python-docutils
-Release 0.22.3b1.dev (unpublished)
-==================================
+Release 0.22.3 (2025-11-06)
+===========================
Rst parser:
- Ignore combining characters when parsing the grid table structure.
Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py 2025-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/docutils/__init__.py 2025-11-06 02:17:08 UTC (rev 10258)
@@ -85,7 +85,7 @@
__docformat__ = 'reStructuredText'
-__version__ = '0.22.3b1.dev'
+__version__ = '0.22.3'
"""Docutils version identifier (complies with PEP 440)::
major.minor[.micro][releaselevel[serial]][.dev]
@@ -160,9 +160,9 @@
major=0,
minor=22,
micro=3,
- releaselevel='beta', # one of 'alpha', 'beta', 'candidate', 'final'
- serial=1, # pre-release number (0 for final releases and snapshots)
- release=False # True for official releases and pre-releases
+ releaselevel='final', # one of 'alpha', 'beta', 'candidate', 'final'
+ serial=0, # pre-release number (0 for final releases and snapshots)
+ release=True # True for official releases and pre-releases
)
"""Comprehensive version information tuple.
Modified: trunk/docutils/test/functional/expected/buggy_mathml.html
===================================================================
--- trunk/docutils/test/functional/expected/buggy_mathml.html 2025-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/buggy_mathml.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/buggy_mathml_ttm.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/compact_lists.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/dangerous.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/field_name_limit.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/length_units_html5.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/math_output_html.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/math_output_latex.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/math_output_mathml.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/mathematics_mathml.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
<title>Additional tests with html4css1</title>
<link rel="stylesheet" href="foo&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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/misc_rst_html5.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/pep_html.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -8,7 +8,7 @@
-->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+ <meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/rst_html5_tuftig.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2025-11-06 02:17:08 UTC (rev 10258)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<!-- Generated by Docutils 0.22.3b1.dev -->
+<!-- Generated by Docutils 0.22.3 -->
<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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html 2025-11-06 02:17:08 UTC (rev 10258)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3b1.dev: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.3: 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/standalone_rst_manpage.man 2025-11-06 02:17:08 UTC (rev 10258)
@@ -1,5 +1,5 @@
.\" Man page generated from reStructuredText
-.\" by the Docutils 0.22.3b1.dev manpage writer.
+.\" by the Docutils 0.22.3 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-11-04 09:02:20 UTC (rev 10257)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2025-11-06 02:17:08 UTC (rev 10...
[truncated message content] |
|
From: <gr...@us...> - 2025-11-06 03:36:19
|
Revision: 10260
http://sourceforge.net/p/docutils/code/10260
Author: grubert
Date: 2025-11-06 03:36:16 +0000 (Thu, 06 Nov 2025)
Log Message:
-----------
version 0.22.4b1
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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/HISTORY.rst 2025-11-06 03:36:16 UTC (rev 10260)
@@ -14,6 +14,12 @@
.. contents::
+Release 0.22.4b1 (unpublished)
+==============================
+
+.
+
+
Release 0.22.3 (2025-11-06)
===========================
Modified: trunk/docutils/README.rst
===================================================================
--- trunk/docutils/README.rst 2025-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/README.rst 2025-11-06 03:36:16 UTC (rev 10260)
@@ -1,6 +1,6 @@
-=========================
- README: Docutils 0.22.3
-=========================
+===============================
+ README: Docutils 0.22.4b1.dev
+===============================
:Author: David Goodger
:Contact: go...@py...
Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst 2025-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/RELEASE-NOTES.rst 2025-11-06 03:36:16 UTC (rev 10260)
@@ -263,6 +263,12 @@
__ https://packages.debian.org/source/trixie/python-docutils
+Release 0.22.4b1 (unpublished)
+==============================
+
+.
+
+
Release 0.22.3 (2025-11-06)
===========================
Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py 2025-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/docutils/__init__.py 2025-11-06 03:36:16 UTC (rev 10260)
@@ -85,7 +85,7 @@
__docformat__ = 'reStructuredText'
-__version__ = '0.22.3'
+__version__ = '0.22.4b1.dev'
"""Docutils version identifier (complies with PEP 440)::
major.minor[.micro][releaselevel[serial]][.dev]
@@ -159,10 +159,10 @@
__version_info__ = VersionInfo(
major=0,
minor=22,
- micro=3,
- releaselevel='final', # one of 'alpha', 'beta', 'candidate', 'final'
- serial=0, # pre-release number (0 for final releases and snapshots)
- release=True # True for official releases and pre-releases
+ micro=4,
+ releaselevel='beta', # one of 'alpha', 'beta', 'candidate', 'final'
+ serial=1, # 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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/buggy_mathml.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/buggy_mathml_blahtexml.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/buggy_mathml_pandoc.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/buggy_mathml_ttm.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/compact_lists.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/dangerous.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/field_name_limit.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/length_units_html5.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_blahtexml.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_pandoc.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/math_experiments_mathml_ttm.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/math_output_html.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/math_output_latex.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/math_output_mathml.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/mathematics_mathml.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_blahtexml.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_pandoc.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/mathematics_mathml_ttm.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.dev: https://docutils.sourceforge.io/" />
<title>Additional tests with html4css1</title>
<link rel="stylesheet" href="foo&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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/misc_rst_html5.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/pep_html.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -8,7 +8,7 @@
-->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+ <meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/rst_html5_tuftig.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2025-11-06 03:36:16 UTC (rev 10260)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<!-- Generated by Docutils 0.22.3 -->
+<!-- Generated by Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8" />
-<meta name="generator" content="Docutils 0.22.3: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/standalone_rst_manpage.man 2025-11-06 03:36:16 UTC (rev 10260)
@@ -1,5 +1,5 @@
.\" Man page generated from reStructuredText
-.\" by the Docutils 0.22.3 manpage writer.
+.\" by the Docutils 0.22.4b1.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-11-06 02:29:16 UTC (rev 10259)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2025-11-06 03:36:16 UTC (rev 10260)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="C...
[truncated message content] |
|
From: <mi...@us...> - 2025-11-28 13:51:34
|
Revision: 10263
http://sourceforge.net/p/docutils/code/10263
Author: milde
Date: 2025-11-28 13:51:32 +0000 (Fri, 28 Nov 2025)
Log Message:
-----------
Future-proof the test for valid parents of topics or sidebars.
Test a "whitelist" of categories before the "blacklist"
to allow auxiliary elements belonging to several categories
(e.g. `nodes.Root` and `nodes.BodyElements`) as parents
of topics or sidebars.
This still gives uncategorized nodes the "benefit of daubt"
but supports properly categorized nodes as well.
Modified Paths:
--------------
trunk/docutils/HISTORY.rst
trunk/docutils/docutils/parsers/rst/directives/body.py
trunk/docutils/docutils/parsers/rst/directives/parts.py
Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst 2025-11-06 03:39:16 UTC (rev 10262)
+++ trunk/docutils/HISTORY.rst 2025-11-28 13:51:32 UTC (rev 10263)
@@ -17,9 +17,14 @@
Release 0.22.4b1 (unpublished)
==============================
-.
+* docutils/parsers/rst/directives/body.py,
+ docutils/parsers/rst/directives/parts.py
+ - Test a "whitelist" of categories before the "blacklist" to allow
+ auxiliary elements belonging to several categories (e.g. `nodes.Root`
+ and `nodes.BodyElements`) as parents of topics or sidebars.
+
Release 0.22.3 (2025-11-06)
===========================
Modified: trunk/docutils/docutils/parsers/rst/directives/body.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/directives/body.py 2025-11-06 03:39:16 UTC (rev 10262)
+++ trunk/docutils/docutils/parsers/rst/directives/body.py 2025-11-28 13:51:32 UTC (rev 10263)
@@ -40,7 +40,9 @@
"""
def run(self):
- if isinstance(self.state_machine.node, self.invalid_parents):
+ if (not isinstance(self.state_machine.node,
+ (nodes.Root, nodes.section, nodes.sidebar))
+ and isinstance(self.state_machine.node, self.invalid_parents)):
raise self.error('The "%s" directive may not be used within '
'topics or body elements.' % self.name)
self.assert_has_content()
Modified: trunk/docutils/docutils/parsers/rst/directives/parts.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/directives/parts.py 2025-11-06 03:39:16 UTC (rev 10262)
+++ trunk/docutils/docutils/parsers/rst/directives/parts.py 2025-11-28 13:51:32 UTC (rev 10263)
@@ -44,8 +44,10 @@
'class': directives.class_option}
def run(self):
- if isinstance(self.state_machine.node,
- BasePseudoSection.invalid_parents):
+ if (not isinstance(self.state_machine.node,
+ (nodes.Root, nodes.section, nodes.sidebar))
+ and isinstance(self.state_machine.node,
+ BasePseudoSection.invalid_parents)):
raise self.error('The "%s" directive may not be used within '
'topics or body elements.' % self.name)
document = self.state_machine.document
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2025-11-28 13:51:55
|
Revision: 10264
http://sourceforge.net/p/docutils/code/10264
Author: milde
Date: 2025-11-28 13:51:41 +0000 (Fri, 28 Nov 2025)
Log Message:
-----------
Fixes for the "responsive" CSS style sheet.
Modified Paths:
--------------
trunk/docutils/HISTORY.rst
trunk/docutils/docutils/writers/html5_polyglot/responsive.css
Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst 2025-11-28 13:51:32 UTC (rev 10263)
+++ trunk/docutils/HISTORY.rst 2025-11-28 13:51:41 UTC (rev 10264)
@@ -24,7 +24,15 @@
auxiliary elements belonging to several categories (e.g. `nodes.Root`
and `nodes.BodyElements`) as parents of topics or sidebars.
+* docutils/writers/html5_polyglot/responsive.css
+ - Increase indentation of enumerated lists to fit 2-digit numerals
+ and of bullet lists to keep them looking similar.
+ - Use "top" instead of "baseline" for the vertical alignment in table
+ rows. ("Baseline" fails if one cell contains certain body elements,
+ e.g. a figure or a table with caption.)
+
+
Release 0.22.3 (2025-11-06)
===========================
Modified: trunk/docutils/docutils/writers/html5_polyglot/responsive.css
===================================================================
--- trunk/docutils/docutils/writers/html5_polyglot/responsive.css 2025-11-28 13:51:32 UTC (rev 10263)
+++ trunk/docutils/docutils/writers/html5_polyglot/responsive.css 2025-11-28 13:51:41 UTC (rev 10264)
@@ -134,13 +134,12 @@
/* Lists */
+ul, ol {
+ padding-left: 2em; /* allow for 2-digit numbers */
+}
dl.field-list.narrow {
--field-indent: 2.4em;
}
-
-ul, ol {
- padding-left: 1.1em; /* indent by bullet width (Firefox, DejaVu fonts) */
-}
dl.field-list > dd,
dl.docinfo > dd {
margin-left: var(--field-indent); /* adapted in media queries or HTML */
@@ -204,7 +203,7 @@
table tr {
text-align: left;
- vertical-align: baseline;
+ vertical-align: top;
}
td *:first-child { margin-top: 0; }
td *:last-child { margin-bottom: 0; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2025-11-28 13:52:12
|
Revision: 10266
http://sourceforge.net/p/docutils/code/10266
Author: milde
Date: 2025-11-28 13:52:09 +0000 (Fri, 28 Nov 2025)
Log Message:
-----------
Documentation update and fixes.
Announce upcoming changes.
The "raw" directive can be used in substitution definitions.
Hide documentation for deprecated "line-block" directive in a
details/disclosure list.
Small edits for improved clarity.
Modified Paths:
--------------
trunk/docutils/RELEASE-NOTES.rst
trunk/docutils/docs/ref/doctree.rst
trunk/docutils/docs/ref/rst/directives.rst
trunk/docutils/docs/ref/rst/restructuredtext.rst
trunk/docutils/docs/user/config.rst
trunk/docutils/docs/user/rst/demo.rst
trunk/docutils/docutils/writers/html5_polyglot/__init__.py
trunk/docutils/docutils/writers/latex2e/__init__.py
Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst 2025-11-28 13:51:57 UTC (rev 10265)
+++ trunk/docutils/RELEASE-NOTES.rst 2025-11-28 13:52:09 UTC (rev 10266)
@@ -56,9 +56,6 @@
* The <footnote> element's first child (<label>) will become mandatory
in Docutils 1.0.
-* The "rst" parser will warn if a `"figure"`_ directive is missing both
- caption and legend in Docutils 1.0.
-
* Inline `\<target>`_ elements and <target> elements with content will be
deprecated in Docutils 1.0 and invalid in Docutils 2.0.
The "rst" parser will use <inline> elements for inline targets
@@ -74,6 +71,15 @@
The rST parser will handle a `doctest block`_ similar to a "code" directive
with language "pycon" (Python console) and generate a <literal_block>.
+Parsers
+-------
+
+* The "rst" parser will warn, if a directive that does not take arguments
+ has content above and below directive options in Docutils 0.23.
+
+* The "rst" parser will warn if a `"figure"`_ directive is missing both
+ caption and legend in Docutils 1.0.
+
Writers
-------
@@ -93,6 +99,11 @@
* "html5" writer:
+ - If a section title has several IDs, use the last one (from the first
+ `explicit target`__) as self-link_ in Docutils 0.23.
+
+ __ docs/ref/rst/restructuredtext.html#explicit-hyperlink-targets
+
- Move attribution behind the blockquote to comply with the
`"HTML living standard"`__ [#]_ and adapt CSS stylesheets
in Docutils 1.0.
@@ -107,8 +118,9 @@
* "latex2e" writer:
- - Only write ``\label`` commands for IDs that are referenced in the
- current document in Docutils 0.23.
+ - Only write ``\label`` commands for explicit IDs and IDs that are
+ referenced in the current document (i.e. not for un-referenced
+ section titles) in Docutils 0.23.
- Change default of use_latex_citations_ setting to True
in Docutils 1.0.
@@ -1560,6 +1572,7 @@
.. _output_path: docs/user/config.html#output-path
.. _reference_label: docs/user/config.html#reference-label
.. _root_prefix: docs/user/config.html#root-prefix
+.. _self-link: docs/user/config.html#section-self-link
.. _SmartQuotes: docs/user/config.html#smart-quotes
.. _sources: docs/user/config.html#sources
.. _use_latex_citations: docs/user/config.html#use-latex-citations
Modified: trunk/docutils/docs/ref/doctree.rst
===================================================================
--- trunk/docutils/docs/ref/doctree.rst 2025-11-28 13:51:57 UTC (rev 10265)
+++ trunk/docutils/docs/ref/doctree.rst 2025-11-28 13:52:09 UTC (rev 10266)
@@ -3854,8 +3854,9 @@
:Children: one or more `body elements`_
:Attributes: backrefs_, level_, line_, type_, and the `common attributes`_.
-In Docutils, the generation of system messages can be configured with the
-`"report_level"`_ setting.
+In Docutils, system messages with a level lower than the
+`"report_level"`_ setting are removed by the `universal.FilterMessages`
+transform_.
Examples
--------
@@ -4249,8 +4250,9 @@
:Category: `Structural Elements`_
-:Analogues: <topic> is analogous to the DocBook_ <simplesect> element
- and the HTML_ <aside> element.
+:Analogues: <topic> is analogous to the HTML_ <aside> element.
+ The DocBook_ <simplesect> element is similar, but you cannot
+ place `body elements`_ after a <simplesect>.
:Processing: A <topic> element should be set off from the rest of the
document somehow, such as with indentation or a border.
@@ -5794,7 +5796,7 @@
.. _namespace:
Almost all elements in a document share a common *namespace*
- for reference names, comparison ignores case.
+ for reference names and match them ignoring case.
Only `\<substitution_definition>`_ and `\<substitution_reference>`_
elements use a distinct namespace with `case-sensitive but forgiving`_
matching of reference names.
Modified: trunk/docutils/docs/ref/rst/directives.rst
===================================================================
--- trunk/docutils/docs/ref/rst/directives.rst 2025-11-28 13:51:57 UTC (rev 10265)
+++ trunk/docutils/docs/ref/rst/directives.rst 2025-11-28 13:52:09 UTC (rev 10266)
@@ -453,8 +453,8 @@
A topic is like a block quote with a title, or a self-contained
section with no subsections. Use the "topic" directive to indicate a
self-contained idea that is separate from the flow of the document.
-Topics may occur anywhere a section or transition may occur and
-in sidebars. Body elements and topics may not contain nested topics.
+Topics may be nested in the document, a section, or a
+sidebar_. Body elements and topics may not contain topics.
The directive's sole argument is interpreted as the topic title; the
next line must be blank. All subsequent lines make up the topic body,
@@ -511,13 +511,6 @@
Line Block
==========
-.. admonition:: Deprecated
-
- The "line-block" directive is deprecated. Use the `line block
- syntax`_ instead.
-
- .. _line block syntax: restructuredtext.html#line-blocks
-
.. class:: field-indent-13em
:Directive Type: "line-block"
@@ -526,28 +519,31 @@
:Directive Options: `class <class option_>`_, name_
:Directive Content: Becomes the body of the line block.
-The "line-block" directive constructs an element where line breaks and
-initial indentation is significant and inline markup is supported. It
-is equivalent to a `parsed literal block`_ with different rendering:
-typically in an ordinary serif typeface instead of a
-typewriter/monospaced face, and not automatically indented. (Have the
-line-block directive begin a block quote to get an indented line
-block.) Line blocks are useful for address blocks and verse (poetry,
-song lyrics), where the structure of lines is significant. For
-example, here's a classic::
+.. class:: details
- "To Ma Own Beloved Lassie: A Poem on her 17th Birthday", by
- Ewan McTeagle (for Lassie O'Shea):
+**Deprecated.** Use the `line block syntax`_ instead.
+ The "line-block" directive constructs an element where line breaks and
+ initial indentation is significant and inline markup is supported. It
+ is comparable to a `parsed literal block`_ with different rendering:
+ typically in an ordinary serif typeface instead of a
+ typewriter/monospaced face, and not automatically indented. (Have the
+ line-block directive begin a block quote to get an indented line
+ block.) Line blocks are useful for address blocks and verse (poetry,
+ song lyrics), where the structure of lines is significant. For
+ example, here's a classic::
- .. line-block::
+ "To Ma Own Beloved Lassie: A Poem on her 17th Birthday", by
+ Ewan McTeagle (for Lassie O'Shea):
- Lend us a couple of bob till Thursday.
- I'm absolutely skint.
- But I'm expecting a postal order and I can pay you back
- as soon as it comes.
- Love, Ewan.
+ .. line-block::
+ Lend us a couple of bob till Thursday.
+ I'm absolutely skint.
+ But I'm expecting a postal order and I can pay you back
+ as soon as it comes.
+ Love, Ewan.
+
.. _parsed-literal:
Parsed Literal Block
@@ -1171,9 +1167,9 @@
:Directive Content: none
:Configuration Settings: toc_backlinks_, use_latex_toc_, generate_oowriter_toc_
-The "contents" directive generates a table of contents (TOC) in
+The "contents" directive generates a table of contents (ToC) in
a `\<topic>`_ element. Topics, and therefore tables of contents,
-may occur anywhere a section or transition may occur and in sidebars.
+may be nested in the document, a section, or a sidebar_.
Body elements and topics may not contain tables of contents.
Here's the directive in its simplest form::
@@ -1284,6 +1280,8 @@
Document Header & Footer
========================
+.. class:: field-indent-13em
+
:Directive Types: "header" and "footer"
:Doctree Elements: `\<decoration>`_, `\<header>`_, `\<footer>`_
:Directive Arguments: none
@@ -1411,18 +1409,13 @@
Directives for Substitution Definitions
-----------------------------------------
-The directives introduced in this section may be used in
-`substitution definitions`_. They may not be used directly,
-in standalone context (except for the image_ directive).
+This section lists directives that may be used in `substitution definitions`_.
-.. _substitution definitions:
-.. _substitution definition: restructuredtext.html#substitution-definitions
-
Inline Images
=============
-The `image`_ directive can be used both, stand-alone (to define
+The "`image`_" directive can be used both, stand-alone (to define
block-level images) and in substitution definitions to define
inline images. [#no-inline-name]_
@@ -1430,6 +1423,15 @@
a substitution definition. [#substitution-limits]_
+Inline Raw
+==========
+
+The "raw_" directive can be used stand-alone and in substitution definitions.
+
+"Raw data pass-through" in inline context is also possible with
+a `custom role`_ derived from the `"raw" role`_.
+
+
.. _replace:
Replacement Text
@@ -1464,10 +1466,11 @@
.. |Python| replace:: Python, *the* best language around
.. _Python: https://www.python.org/
-.. [#substitution-limits] As a substitution may be referenced more than
- one time, a substitution definition may not contain references to
- `anonymous hyperlinks`_, `auto-numbered`_ or `auto-symbol`_ footnotes
- and no `hyperlink targets`__ (names and identifiers must be unique).
+.. [#substitution-limits]
+ A substitution definition may not contain references to `anonymous
+ hyperlinks`_, `auto-numbered`_ or `auto-symbol`_ footnotes and no
+ `hyperlink targets`__ because a substitution may be referenced more
+ than once but names and identifiers must be unique.
__ restructuredtext.html#inline-internal-targets
@@ -1768,6 +1771,8 @@
Inline equivalents of the "raw" directive can be defined via
`custom interpreted text roles`_ derived from the `"raw" role`_.
+The "raw" directive can also be used directly in a `substitution
+definition`_.
.. _raw options:
@@ -1788,8 +1793,8 @@
.. _class directive:
.. _rst-class:
-Class
-=====
+Setting Class Attributes
+========================
.. class:: field-indent-13em
@@ -1949,6 +1954,7 @@
.. _role:
+.. _custom role:
Custom Interpreted Text Roles
=============================
@@ -2342,10 +2348,13 @@
.. _hyperlink references: restructuredtext.html#hyperlink-references
.. _hyperlink targets:
.. _hyperlink target: restructuredtext.html#hyperlink-targets
+.. _line block syntax: restructuredtext.html#line-blocks
.. _reference name:
.. _reference names: restructuredtext.html#reference-names
.. _section title style hierarchy: restructuredtext.html#title-styles
.. _simple table: restructuredtext.html#simple-tables
+.. _substitution definitions:
+.. _substitution definition: restructuredtext.html#substitution-definitions
.. _supported length units: restructuredtext.html#length-units
.. _reStructuredText Interpreted Text Roles:
Modified: trunk/docutils/docs/ref/rst/restructuredtext.rst
===================================================================
--- trunk/docutils/docs/ref/rst/restructuredtext.rst 2025-11-28 13:51:57 UTC (rev 10265)
+++ trunk/docutils/docs/ref/rst/restructuredtext.rst 2025-11-28 13:52:09 UTC (rev 10266)
@@ -88,7 +88,7 @@
1. This is an enumerated list.
- 2. Enumerators may be arabic numbers, letters, or roman
+ 2. Enumerators may be arabic numerals, letters, or roman
numerals.
3. `Definition lists`_::
@@ -204,7 +204,7 @@
- Comments_::
- .. Comments begin with two dots and a space. Anything may
+ .. Comments begin with two dots and whitespace. Anything may
follow, except for the syntax of footnotes/citations,
hyperlink targets, directives, or substitution definitions.
@@ -359,7 +359,7 @@
itself. (A literal backslash can be specified by two backslashes in a
row -- the first backslash escapes the second. [#caveat]_)
-* Escaped whitespace characters are removed from the output document
+* _`Escaped whitespace` characters are removed from the output document
together with the escaping backslash. This allows for `character-level
inline markup`_.
@@ -743,7 +743,7 @@
Enumerated lists (a.k.a. "ordered" lists) are similar to bullet lists,
but use enumerators instead of bullets. An enumerator consists of an
enumeration sequence member and formatting, followed by whitespace.
-The following enumeration sequences are recognized:
+The following *enumeration sequences* are recognized:
- arabic numerals: 1, 2, 3, ... (no upper limit).
- uppercase alphabet characters: A, B, C, ..., Z.
@@ -753,10 +753,10 @@
In addition, the auto-enumerator, ``#``, may be used to automatically
enumerate a list. Auto-enumerated lists may begin with explicit
-enumeration, which sets the sequence. Fully auto-enumerated lists use
-arabic numerals and begin with 1.
+enumeration, which sets the sequence and start value.
+Fully auto-enumerated lists use arabic numerals and begin with 1.
-The following formatting types are recognized:
+The following *formatting types* are recognized:
- suffixed with a period: ``1.``, ``A.``, ``a.``, ``I.``, ``i.``.
- surrounded by parentheses: ``(1)``, ``(A)``, ``(a)``, ``(I)``, ``(i)``.
@@ -1377,7 +1377,7 @@
-- Sherlock Holmes
-A block quote may end with an attribution: a text block beginning with
+A block quote may end with an _`attribution`: a paragraph beginning with
``--``, ``---``, or a true em-dash, flush left within the block quote. If
the attribution consists of multiple lines, the left edges of the
second and subsequent lines must align.
@@ -2299,9 +2299,14 @@
The following *inline-compatible directives* are implemented in Docutils:
+:`"date"`_: inserts the current local date.
+
:`"image"`_: can be used for block-level images as well as in a
substitution definition for `inline images`_.
+:`"raw"`_: can be used in block-level context as well as in a
+ substitution definition.
+
:`"replace"`_: allows simple macro substitution.
It also provides a workaround__ for the still missing support of
nested inline markup.
@@ -2310,8 +2315,6 @@
:`"unicode"`_: converts Unicode character codes to characters.
-:`"date"`_: inserts the current local date.
-
Applications may find other use cases for the substitution mechanism.
The following are ideas that have not been implemented in Docutils.
Modified: trunk/docutils/docs/user/config.rst
===================================================================
--- trunk/docutils/docs/user/config.rst 2025-11-28 13:51:57 UTC (rev 10265)
+++ trunk/docutils/docs/user/config.rst 2025-11-28 13:52:09 UTC (rev 10266)
@@ -1521,8 +1521,8 @@
section_self_link
"""""""""""""""""
-Append an empty anchor element with a ``href`` to the section to
-section headings. See ``responsive.css`` for an example how this can be
+Extend section headings with an empty <a> element with a ``href`` to
+the section. See ``responsive.css`` for an example how this can be
styled to show a symbol allowing users to copy the section's URL.
:Default: False.
Modified: trunk/docutils/docs/user/rst/demo.rst
===================================================================
--- trunk/docutils/docs/user/rst/demo.rst 2025-11-28 13:51:57 UTC (rev 10265)
+++ trunk/docutils/docs/user/rst/demo.rst 2025-11-28 13:52:09 UTC (rev 10266)
@@ -546,7 +546,7 @@
Here's one:
-.. Comments begin with two dots and a space. Anything may
+.. Comments begin with two dots and whitespace. Anything may
follow, except for the syntax of footnotes, hyperlink
targets, directives, or substitution definitions.
Modified: trunk/docutils/docutils/writers/html5_polyglot/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html5_polyglot/__init__.py 2025-11-28 13:51:57 UTC (rev 10265)
+++ trunk/docutils/docutils/writers/html5_polyglot/__init__.py 2025-11-28 13:52:09 UTC (rev 10266)
@@ -388,6 +388,8 @@
def section_title_tags(self, node):
start_tag, close_tag = super().section_title_tags(node)
ids = node.parent['ids']
+ # TODO: use ``ids[-1]``
+ # (IDs from explicit targets are appended to the implicit ID)
if (ids and getattr(self.settings, 'section_self_link', None)
and not isinstance(node.parent, nodes.document)):
self_link = ('<a class="self-link" title="link to this section"'
Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py 2025-11-28 13:51:57 UTC (rev 10265)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py 2025-11-28 13:52:09 UTC (rev 10266)
@@ -2600,23 +2600,21 @@
self.depart_inline(node)
self.out.append('}')
- # Literal blocks are used for '::'-prefixed literal-indented
- # blocks of text, where the inline markup is not recognized,
- # but are also the product of the "parsed-literal" directive,
- # where the markup is respected.
+ # <literal_block> elements are used
+ # for literal blocks (where content is not parsed),
+ # for the "code" directive (where content may be parsed by Pygments), and
+ # for the "parsed-literal" directive (where rST inline markup is parsed).
#
- # In both cases, we want to use a typewriter/monospaced typeface.
- # For "real" literal-blocks, we can use \verbatim, while for all
- # the others we must use \ttfamily and \raggedright.
+ # In all cases, we want to use a monospaced typeface.
+ # If the <literal_block> contains only text, we can use a "verbatim-like"
+ # environment, for mixed content we must use \ttfamily and \raggedright.
#
- # We can distinguish between the two kinds by the number of
- # siblings that compose this node: if it is composed by a
- # single element, it's either
- # * a real one,
- # * a parsed-literal that does not contain any markup, or
- # * a parsed-literal containing just one markup construct.
+ # We can distinguish between the use cases looking at the element's
+ # children: if there is a single <Text> child, it is either
+ # * a "real" literal block or
+ # * a parsed-literal that does not contain any markup.
def is_plaintext(self, node):
- """Check whether a node can be typeset verbatim"""
+ """Check whether `node` contains only text"""
return (len(node) == 1) and isinstance(node[0], nodes.Text)
def visit_literal_block(self, node) -> None:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2025-12-01 22:43:35
|
Revision: 10267
http://sourceforge.net/p/docutils/code/10267
Author: milde
Date: 2025-12-01 22:43:32 +0000 (Mon, 01 Dec 2025)
Log Message:
-----------
docutils.io.FileInput: ensure read() returns a `str`.
Decode data read from a file-like object, if it is a `bytes` instance.
Fixes bug #514
Modified Paths:
--------------
trunk/docutils/docs/api/publisher.rst
trunk/docutils/docutils/core.py
trunk/docutils/docutils/io.py
Modified: trunk/docutils/docs/api/publisher.rst
===================================================================
--- trunk/docutils/docs/api/publisher.rst 2025-11-28 13:52:09 UTC (rev 10266)
+++ trunk/docutils/docs/api/publisher.rst 2025-12-01 22:43:32 UTC (rev 10267)
@@ -525,9 +525,9 @@
A file-like object holding the document source
(must have `read()` and `close()` methods).
- Default: None (open `source_path <source_path (file I/O)_>`__
- or use `sys.stdin`).
+ Default: None (open `source_path`__ or use `sys.stdin`).
+ __
.. _source_path (file I/O):
source_path : str | pathlib.Path
@@ -534,7 +534,7 @@
Path to the source file,
opened if `source <source (file I/O)_>`__ is None.
- Default: None (use `source <source (file I/O)_>`__).
+ Default: None (use `source <source (file I/O)_>`__ or `sys.stdin`).
_`destination` : file-like
A file-like object that will receive the output document
@@ -548,7 +548,7 @@
destination_path : str | pathlib.Path
Path to the destination file, opened if destination_ is None.
- Default: None (use destination_).
+ Default: None (use destination_ or `sys.stdout`).
.. _string input:
@@ -594,6 +594,7 @@
Default: None.
+
Component Specification
-----------------------
Modified: trunk/docutils/docutils/core.py
===================================================================
--- trunk/docutils/docutils/core.py 2025-11-28 13:52:09 UTC (rev 10266)
+++ trunk/docutils/docutils/core.py 2025-12-01 22:43:32 UTC (rev 10267)
@@ -719,7 +719,7 @@
- `io.FileInput`: Path to the input file, opened if no `source`
supplied.
- - `io.StringInput`: Optional. Path to the file or name of the
+ - `io.StringInput`: Optional. Path to the file or description of the
object that produced `source`. Only used for diagnostic output.
* `destination_class` **required**: The class for dynamically created
Modified: trunk/docutils/docutils/io.py
===================================================================
--- trunk/docutils/docutils/io.py 2025-11-28 13:52:09 UTC (rev 10266)
+++ trunk/docutils/docutils/io.py 2025-12-01 22:43:32 UTC (rev 10267)
@@ -141,15 +141,13 @@
Provisional: encoding detection will be removed in Docutils 1.0.
"""
- if self.encoding and self.encoding.lower() == 'unicode':
- assert isinstance(data, str), ('input encoding is "unicode" '
- 'but `data` is no `str` instance')
if isinstance(data, str):
- # nothing to decode
- return data
+ return data # nothing to decode
if self.encoding:
# We believe the user/application when the encoding is
# explicitly given.
+ assert self.encoding.lower() != 'unicode', (
+ 'input encoding is "unicode" but `data` is no `str` instance')
encoding_candidates = [self.encoding]
else:
with warnings.catch_warnings():
@@ -419,15 +417,15 @@
) -> None:
"""
:Parameters:
- - `source`: either a file-like object (which is read directly), or
- `None` (which implies `sys.stdin` if no `source_path` given).
- - `source_path`: a path to a file, which is opened for reading.
- - `encoding`: the expected text encoding of the input file.
+ - `source`: either a file-like object (with `read()` and `close()`
+ methods) or None (use source indicated by `source_path`).
+ - `source_path`: a path to a file (which is opened for reading
+ if `source` is None) or `None` (implies `sys.stdin`).
+ - `encoding`: the text encoding of the input file.
- `error_handler`: the encoding error handler to use.
- `autoclose`: close automatically after read (except when
- `sys.stdin` is the source).
- - `mode`: how the file is to be opened (see standard function
- `open`). The default is read only ('r').
+ the source is `sys.stdin`).
+ - `mode`: how the file is to be opened. Default is read only ('r').
"""
super().__init__(source, source_path, encoding, error_handler)
self.autoclose = autoclose
@@ -467,7 +465,7 @@
# normalize newlines
data = '\n'.join(data.splitlines()+[''])
else:
- data = self.source.read()
+ data = self.decode(self.source.read())
finally:
if self.autoclose:
self.close()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2025-12-03 11:38:57
|
Revision: 10270
http://sourceforge.net/p/docutils/code/10270
Author: milde
Date: 2025-12-03 11:38:54 +0000 (Wed, 03 Dec 2025)
Log Message:
-----------
New value "auto" for "initial_header_level" config setting.
``initial_header_level: auto`` tells the HTML writer to use
<h2> if there is a document title, else <h1>.
This ensures a valid "outline" of the HTML document (top heading level 1,
nested headings one level below their parent).
Cf. https://html.spec.whatwg.org/multipage/sections.html#outline
Modified Paths:
--------------
trunk/docutils/HISTORY.rst
trunk/docutils/docs/user/config.rst
trunk/docutils/docutils/writers/_html_base.py
trunk/docutils/docutils/writers/html4css1/__init__.py
trunk/docutils/docutils/writers/html5_polyglot/__init__.py
trunk/docutils/test/test_writers/test_html5_polyglot_parts.py
Modified: trunk/docutils/HISTORY.rst
===================================================================
--- trunk/docutils/HISTORY.rst 2025-12-02 19:48:48 UTC (rev 10269)
+++ trunk/docutils/HISTORY.rst 2025-12-03 11:38:54 UTC (rev 10270)
@@ -17,6 +17,11 @@
Release 0.22.4b1 (unpublished)
==============================
+* docutils/io.py
+
+ - Ensure `FileInput.read()` returns a `str` (decode if `source.read`
+ returns `bytes`. Fixes bug #514.
+
* docutils/parsers/rst/directives/body.py,
docutils/parsers/rst/directives/parts.py
@@ -24,6 +29,10 @@
auxiliary elements belonging to several categories (e.g. `nodes.Root`
and `nodes.BodyElements`) as parents of topics or sidebars.
+* docutils/writers/html/*
+
+ - New value "auto" for `initial_header_level`_ configuration setting.
+
* docutils/writers/html5_polyglot/responsive.css
- Increase indentation of enumerated lists to fit 2-digit numerals
Modified: trunk/docutils/docs/user/config.rst
===================================================================
--- trunk/docutils/docs/user/config.rst 2025-12-02 19:48:48 UTC (rev 10269)
+++ trunk/docutils/docs/user/config.rst 2025-12-03 11:38:54 UTC (rev 10270)
@@ -1195,13 +1195,23 @@
initial_header_level
~~~~~~~~~~~~~~~~~~~~
-The initial level for section header elements. This does not affect the
-document title & subtitle; see doctitle_xform_.
+The level of the first *section* heading element
+(the `document title`_ always uses <h1>).
+Supported values:
+:1, ..., 6: <h1>, ..., <h6>,
+:auto: <h2> if there is a `document title`_, else <h1>. [#auto-header-level]_
+
+See also `doctitle_xform`_.
+
:Default: writer dependent
(see `[html4css1 writer]`_, `[html5 writer]`_, `[pep_html writer]`_).
:Option: ``--initial-header-level``.
+.. [#auto-header-level] Ensures the HTML document has a valid outline__
+ in documents with/without a document title.
+ New in Docutils 0.22.3.
+__ https://html.spec.whatwg.org/multipage/sections.html#outline
math_output
~~~~~~~~~~~
@@ -1489,14 +1499,8 @@
"minimal.css, plain.css".
:`xml_declaration <xml_declaration [html writers]_>`__: False.
-.. [#] Documents without (visible) document title may have <h2> as highest
- heading level, which is not recommended but valid (cf. "`Headings and
- outlines`__" in the HTML Standard). The default will change to None
- (<h2> if there is a document title, else <h1>) in Docutils 1.0.
+.. [#] The default will change to "auto" in Docutils 1.0.
-__ https://html.spec.whatwg.org/multipage/sections.html
- #headings-and-outlines-2
-
image_loading
"""""""""""""
Indicate at which point images should be loaded.
Modified: trunk/docutils/docutils/writers/_html_base.py
===================================================================
--- trunk/docutils/docutils/writers/_html_base.py 2025-12-02 19:48:48 UTC (rev 10269)
+++ trunk/docutils/docutils/writers/_html_base.py 2025-12-03 11:38:54 UTC (rev 10270)
@@ -85,7 +85,7 @@
'Does not affect document title & subtitle (see --no-doc-title).'
'(default: writer dependent).',
['--initial-header-level'],
- {'choices': '1 2 3 4 5 6'.split(), 'default': '2',
+ {'choices': '1 2 3 4 5 6 auto'.split(), 'default': '2',
'metavar': '<level>'}),
('Format for footnote references: one of "superscript" or '
'"brackets". (default: "brackets")',
@@ -295,7 +295,14 @@
settings = self.settings
self.language = languages.get_language(
settings.language_code, document.reporter)
- self.initial_header_level = int(settings.initial_header_level)
+ if settings.initial_header_level == 'auto':
+ if len(document) and document[0].next_node(
+ nodes.title, include_self=True, descend=False):
+ self.initial_header_level = 2
+ else:
+ self.initial_header_level = 1
+ else:
+ self.initial_header_level = int(settings.initial_header_level)
# image_loading (only defined for HTML5 writer)
_image_loading_default = 'link'
# convert legacy setting embed_images:
Modified: trunk/docutils/docutils/writers/html4css1/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html4css1/__init__.py 2025-12-02 19:48:48 UTC (rev 10269)
+++ trunk/docutils/docutils/writers/html4css1/__init__.py 2025-12-03 11:38:54 UTC (rev 10270)
@@ -68,7 +68,7 @@
'Specify the initial header level. Does not affect document '
'title & subtitle (see --no-doc-title). (default: 1 for "<h1>")',
['--initial-header-level'],
- {'choices': '1 2 3 4 5 6'.split(), 'default': '1',
+ {'choices': '1 2 3 4 5 6 auto'.split(), 'default': '1',
'metavar': '<level>'}),
math_output=(
'Math output format (one of "MathML", "HTML", "MathJax", or '
Modified: trunk/docutils/docutils/writers/html5_polyglot/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html5_polyglot/__init__.py 2025-12-02 19:48:48 UTC (rev 10269)
+++ trunk/docutils/docutils/writers/html5_polyglot/__init__.py 2025-12-03 11:38:54 UTC (rev 10270)
@@ -73,7 +73,7 @@
'Specify the initial header level. Does not affect document '
'title & subtitle (see --no-doc-title). (default: 2 for "<h2>")',
['--initial-header-level'],
- {'choices': '1 2 3 4 5 6'.split(), 'default': '2',
+ {'choices': '1 2 3 4 5 6 auto'.split(), 'default': '2',
'metavar': '<level>'}),
no_xml_declaration=(
'Omit the XML declaration (default).',
Modified: trunk/docutils/test/test_writers/test_html5_polyglot_parts.py
===================================================================
--- trunk/docutils/test/test_writers/test_html5_polyglot_parts.py 2025-12-02 19:48:48 UTC (rev 10269)
+++ trunk/docutils/test/test_writers/test_html5_polyglot_parts.py 2025-12-03 11:38:54 UTC (rev 10270)
@@ -119,7 +119,8 @@
totest = {}
-totest['standard'] = ({}, [
+totest['standard'] = ({'initial_header_level': 'auto' # becomes standard in 1.0
+ }, [
['', # empty input string
{} # results in default parts
],
@@ -231,7 +232,8 @@
}],
])
-totest['no_title_promotion'] = ({'doctitle_xform': False}, [
+totest['no_title_promotion'] = ({'doctitle_xform': False,
+ 'initial_header_level': 'auto'}, [
["""\
+++++
Title
@@ -254,15 +256,15 @@
""",
{'fragment': """\
<section id="title">
-<h2>Title<a class="self-link" title="link to this section" href="#title"></a></h2>
+<h1>Title<a class="self-link" title="link to this section" href="#title"></a></h1>
<section id="not-a-subtitle">
-<h3>Not A Subtitle<a class="self-link" title="link to this section" href="#not-a-subtitle"></a></h3>
+<h2>Not A Subtitle<a class="self-link" title="link to this section" href="#not-a-subtitle"></a></h2>
<p>Some stuff</p>
<section id="section">
-<h4>Section<a class="self-link" title="link to this section" href="#section"></a></h4>
+<h3>Section<a class="self-link" title="link to this section" href="#section"></a></h3>
<p>Some more stuff</p>
<section id="another-section">
-<h5>Another Section<a class="self-link" title="link to this section" href="#another-section"></a></h5>
+<h4>Another Section<a class="self-link" title="link to this section" href="#another-section"></a></h4>
<p>And even more stuff</p>
</section>
</section>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2025-12-14 13:21:02
|
Revision: 10272
http://sourceforge.net/p/docutils/code/10272
Author: milde
Date: 2025-12-14 13:20:59 +0000 (Sun, 14 Dec 2025)
Log Message:
-----------
Documentation update
Announce change to "ids" handling in case of a name conflict between
explicit and implicit targets.
Update security howto.
Add hyperlink target for the description of the special syntax for
Standard Definition Files in the "include" directive documentation.
Small fixes and additions to documentation and comments.
Modified Paths:
--------------
trunk/docutils/RELEASE-NOTES.rst
trunk/docutils/docs/howto/security.rst
trunk/docutils/docs/index.rst
trunk/docutils/docs/ref/rst/directives.rst
trunk/docutils/docutils/nodes.py
trunk/docutils/docutils/utils/urischemes.py
trunk/docutils/docutils/writers/_html_base.py
Modified: trunk/docutils/RELEASE-NOTES.rst
===================================================================
--- trunk/docutils/RELEASE-NOTES.rst 2025-12-14 11:03:06 UTC (rev 10271)
+++ trunk/docutils/RELEASE-NOTES.rst 2025-12-14 13:20:59 UTC (rev 10272)
@@ -75,6 +75,11 @@
<substitution_definition>, and <target> elements when warning about
transitions at the start or end of the document or a section.
+* In case of name conflicts, an explicit target will not only override
+ the "name" attribute of an implicit target but also its name-based "id".
+ Use case: "sane" anchors for links from an external source to a fragment
+ of the document. Cf. https://github.com/sphinx-doc/sphinx/issues/1961
+
Parsers
-------
@@ -291,7 +296,8 @@
Release 0.22.4b1 (unpublished)
==============================
-.
+HTML writers:
+ - New value "auto" for the initial_header_level_ setting.
Release 0.22.3 (2025-11-06)
Modified: trunk/docutils/docs/howto/security.rst
===================================================================
--- trunk/docutils/docs/howto/security.rst 2025-12-14 11:03:06 UTC (rev 10271)
+++ trunk/docutils/docs/howto/security.rst 2025-12-14 13:20:59 UTC (rev 10272)
@@ -42,26 +42,26 @@
* Files may be **written to any location** accessible to the process.
* There are **no restrictions to** the **file names**.
-Special care must be taken when allowing users to configure the *output
-destination* or the `warning_stream`_, `record_dependencies`_, or
-`_destination`_ settings.
+Special care must be taken when allowing users to configure the `output`_
+(or `_destination`_), `warning_stream`_, or `record_dependencies`_ settings.
+.. _output: ../user/config.html#output
+.. _`_destination`: ../user/config.html#destination
.. _warning_stream: ../user/config.html#warning-stream
.. _record_dependencies: ../user/config.html#record-dependencies
-.. _`_destination`: ../user/config.html#destination
External Data Insertion
-----------------------
-There are several `reStructuredText directives`_ that can insert
-external data (files and URLs) into the output document. These
-directives are:
+There are several `reStructuredText directives`_ that can insert external
+data (files or content fetched from a URL) into the output document.
+These directives are:
* "include_", by its very nature,
* "raw_", through its ``:file:`` and ``:url:`` options,
* "csv-table_", through its ``:file:`` and ``:url:`` options,
-* "image_", if `embed_images`_ is true.
+* "image_" through its ``:loading:`` option.
The "include_" directive and the other directives' file insertion
features can be disabled by setting "file_insertion_enabled_" to
@@ -70,7 +70,7 @@
__ ../user/config.html#configuration-file-syntax
.. _reStructuredText directives: ../ref/rst/directives.html
.. _include: ../ref/rst/directives.html#include
-.. _raw: ../ref/rst/directives.html#raw-directive
+.. _raw: ../ref/rst/directives.html#raw
.. _csv-table: ../ref/rst/directives.html#csv-table
.. _image: ../ref/rst/directives.html#image
.. _embed_images: ../user/config.html#embed-images
@@ -80,15 +80,19 @@
Raw HTML Insertion
------------------
-The "raw_" directive is intended for the insertion of
-non-reStructuredText data that is passed untouched to the Writer.
-This directive can be abused to bypass site features or insert
-malicious JavaScript code into a web page. The "raw_" directive can
-be disabled by setting "raw_enabled_" to "false".
+Content of the "raw_" directive is passed untouched to the Writer.
+Docutils standard writers insert "raw" content with matching
+format_ into the output document without any checks or changes.
+This can be abused to bypass site features or insert malicious
+script code into a web page.
+A web-secure Writer must ignore or sanitize "raw" content.
+Alternatively, the "raw" directive can be disabled by setting
+"raw_enabled_" to "false".
+
.. _raw_enabled: ../user/config.html#raw-enabled
+.. _format: ../ref/doctree.html#format
-
CPU and memory utilization
--------------------------
Modified: trunk/docutils/docs/index.rst
===================================================================
--- trunk/docutils/docs/index.rst 2025-12-14 11:03:06 UTC (rev 10271)
+++ trunk/docutils/docs/index.rst 2025-12-14 13:20:59 UTC (rev 10272)
@@ -126,7 +126,7 @@
become reference material. Successful specs evolve into refs.
Docutils-general:
- * `The Docutils Document Tree <ref/doctree.html>`__ (incomplete)
+ * `The Docutils Document Tree <ref/doctree.html>`__
* `Docutils Generic DTD <ref/docutils.dtd>`__
* `OASIS XML Exchange Table Model Declaration Module
<ref/soextblx.dtd>`__ (CALS tables DTD module)
Modified: trunk/docutils/docs/ref/rst/directives.rst
===================================================================
--- trunk/docutils/docs/ref/rst/directives.rst 2025-12-14 11:03:06 UTC (rev 10271)
+++ trunk/docutils/docs/ref/rst/directives.rst 2025-12-14 13:20:59 UTC (rev 10272)
@@ -1627,11 +1627,14 @@
If an included document fragment contains section structure, the title
adornments must match those of the master document.
-Standard data files intended for inclusion in reStructuredText
-documents are distributed with the Docutils source code, located in
+.. _include Standard Definition files:
+
+`reStructuredText Standard Definition Files`_
+intended for inclusion in reStructuredText documents
+are distributed with the Docutils source code, located in
the "docutils" package in the ``docutils/parsers/rst/include``
-directory. To access these files, use the special syntax for standard
-"include" data files, angle brackets around the file name::
+directory. To access these files, use the *special syntax for standard
+definition files*: angle brackets around the file name, e.g. ::
.. include:: <isonum.txt>
Modified: trunk/docutils/docutils/nodes.py
===================================================================
--- trunk/docutils/docutils/nodes.py 2025-12-14 11:03:06 UTC (rev 10271)
+++ trunk/docutils/docutils/nodes.py 2025-12-14 13:20:59 UTC (rev 10272)
@@ -1995,14 +1995,14 @@
# "note" here is an imperative verb: "take note of".
def note_implicit_target(
self, target: Element, msgnode: Element | None = None) -> None:
- # TODO: Postpone ID creation. Register reference name instead of ID
- # to allow for IDs based on explicit target pointing to the same
- # element. https://github.com/sphinx-doc/sphinx/issues/1961
+ # TODO: Postpone ID creation and register reference name instead of ID?
id = self.set_id(target, msgnode)
self.set_name_id_map(target, id, msgnode, explicit=False)
def note_explicit_target(
self, target: Element, msgnode: Element | None = None) -> None:
+ # TODO: if the id matching the name is applied to an implicid target,
+ # transfer it to this target and put a "disambiguated" id on the other.
id = self.set_id(target, msgnode)
self.set_name_id_map(target, id, msgnode, explicit=True)
Modified: trunk/docutils/docutils/utils/urischemes.py
===================================================================
--- trunk/docutils/docutils/utils/urischemes.py 2025-12-14 11:03:06 UTC (rev 10271)
+++ trunk/docutils/docutils/utils/urischemes.py 2025-12-14 13:20:59 UTC (rev 10272)
@@ -35,7 +35,7 @@
'(facsimiles); RFC 2806',
'feed': 'NetNewsWire feed',
'file': 'Host-specific file names; RFC 1738',
- 'finger': '',
+ 'finger': 'Querying user information using the Finger protocol',
'freenet': '',
'ftp': 'File Transfer Protocol; RFC 1738',
'go': 'go; RFC 3368',
@@ -99,7 +99,7 @@
'rx': 'Remote Execution',
'sdp': '',
'service': 'service location; RFC 2609',
- 'shttp': 'secure hypertext transfer protocol',
+ 'shttp': 'secure hypertext transfer protocol (OBSOLETE)',
'sip': 'Session Initiation Protocol; RFC 3261',
'sips': 'secure session intitiaion protocol; RFC 3261',
'smb': 'SAMBA filesystems.',
@@ -124,7 +124,7 @@
'urn': 'Uniform Resource Name; RFC 2141',
'uuid': '',
'vemmi': 'versatile multimedia interface; RFC 2122',
- 'videotex': '',
+ 'videotex': 'videotex (historical)',
'view-source': 'displays HTML code that was generated with JavaScript',
'wais': 'Wide Area Information Servers; RFC 4156',
'whodp': '',
Modified: trunk/docutils/docutils/writers/_html_base.py
===================================================================
--- trunk/docutils/docutils/writers/_html_base.py 2025-12-14 11:03:06 UTC (rev 10271)
+++ trunk/docutils/docutils/writers/_html_base.py 2025-12-14 13:20:59 UTC (rev 10272)
@@ -637,6 +637,9 @@
return
child['classes'].append(class_)
+ # Visitor methods
+ # ---------------
+
def visit_Text(self, node) -> None:
text = node.astext()
encoded = self.encode(text)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X