diff options
Diffstat (limited to 'docutils')
21 files changed, 27 insertions, 22 deletions
diff --git a/docutils/HISTORY.txt b/docutils/HISTORY.txt index e1b597b77..862bf8f0d 100644 --- a/docutils/HISTORY.txt +++ b/docutils/HISTORY.txt @@ -11,6 +11,11 @@ .. contents:: +Changes Since 0.18b1 +==================== + +Will be merged on release. + Release 0.18b1 (2021-10-05) =========================== diff --git a/docutils/README.txt b/docutils/README.txt index e7ef6dbba..ff47f9690 100644 --- a/docutils/README.txt +++ b/docutils/README.txt @@ -1,5 +1,5 @@ ========================= - README: Docutils 0.18b1 + README: Docutils 0.18b2.dev ========================= :Author: David Goodger diff --git a/docutils/docutils/__init__.py b/docutils/docutils/__init__.py index deae0f438..3e518129d 100644 --- a/docutils/docutils/__init__.py +++ b/docutils/docutils/__init__.py @@ -56,7 +56,7 @@ from collections import namedtuple __docformat__ = 'reStructuredText' -__version__ = '0.18b1' +__version__ = '0.18b2.dev' """Docutils version identifier (complies with PEP 440):: major.minor[.micro][releaselevel[serial]][.dev] @@ -115,8 +115,8 @@ __version_info__ = VersionInfo( micro=0, releaselevel='beta', # one of 'alpha', 'beta', 'candidate', 'final' # pre-release serial number (0 for final releases and active development): - serial=1, - release=True # True for official releases and pre-releases + serial=2, + release=False # True for official releases and pre-releases ) """Comprehensive version information tuple. See 'Version Numbering' in docs/dev/policies.txt.""" diff --git a/docutils/setup.py b/docutils/setup.py index 4c6313765..5b7e8aee0 100755 --- a/docutils/setup.py +++ b/docutils/setup.py @@ -31,7 +31,7 @@ into useful formats, such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.18b1', + 'version': '0.18b2.dev', 'author': 'David Goodger', 'author_email': 'goodger@python.org', 'maintainer': 'docutils-develop list', diff --git a/docutils/test/functional/expected/compact_lists.html b/docutils/test/functional/expected/compact_lists.html index 137386578..7acd6bcd8 100644 --- a/docutils/test/functional/expected/compact_lists.html +++ b/docutils/test/functional/expected/compact_lists.html @@ -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.18b1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.18b2.dev: http://docutils.sourceforge.net/" /> <title>compact_lists.txt</title> <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" /> </head> diff --git a/docutils/test/functional/expected/dangerous.html b/docutils/test/functional/expected/dangerous.html index 9adf75eb5..df314f0b6 100644 --- a/docutils/test/functional/expected/dangerous.html +++ b/docutils/test/functional/expected/dangerous.html @@ -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.18b1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.18b2.dev: http://docutils.sourceforge.net/" /> <title>dangerous.txt</title> <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" /> </head> diff --git a/docutils/test/functional/expected/embed_images_html5.html b/docutils/test/functional/expected/embed_images_html5.html index 4180b0a9d..65c1ef28a 100644 --- a/docutils/test/functional/expected/embed_images_html5.html +++ b/docutils/test/functional/expected/embed_images_html5.html @@ -3,7 +3,7 @@ <head> <meta charset="utf-8"/> <meta name="viewport" content="width=device-width, initial-scale=1" /> -<meta name="generator" content="Docutils 0.18b1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.18b2.dev: http://docutils.sourceforge.net/" /> <title>Embedded Images</title> <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" /> <link rel="stylesheet" href="../input/data/plain.css" type="text/css" /> diff --git a/docutils/test/functional/expected/field_name_limit.html b/docutils/test/functional/expected/field_name_limit.html index 167933d01..b948f31bd 100644 --- a/docutils/test/functional/expected/field_name_limit.html +++ b/docutils/test/functional/expected/field_name_limit.html @@ -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.18b1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.18b2.dev: http://docutils.sourceforge.net/" /> <title>field_list.txt</title> <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" /> </head> diff --git a/docutils/test/functional/expected/footnotes_html5.html b/docutils/test/functional/expected/footnotes_html5.html index 2d7559f83..cfdceed01 100644 --- a/docutils/test/functional/expected/footnotes_html5.html +++ b/docutils/test/functional/expected/footnotes_html5.html @@ -3,7 +3,7 @@ <head> <meta charset="utf-8"/> <meta name="viewport" content="width=device-width, initial-scale=1" /> -<meta name="generator" content="Docutils 0.18b1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.18b2.dev: http://docutils.sourceforge.net/" /> <title>Test footnote and citation rendering</title> <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" /> <link rel="stylesheet" href="../input/data/responsive.css" type="text/css" /> diff --git a/docutils/test/functional/expected/math_output_html.html b/docutils/test/functional/expected/math_output_html.html index 51fd85b05..c6c952d40 100644 --- a/docutils/test/functional/expected/math_output_html.html +++ b/docutils/test/functional/expected/math_output_html.html @@ -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.18b1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.18b2.dev: http://docutils.sourceforge.net/" /> <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" /> diff --git a/docutils/test/functional/expected/math_output_latex.html b/docutils/test/functional/expected/math_output_latex.html index b20297d8c..187bef2d5 100644 --- a/docutils/test/functional/expected/math_output_latex.html +++ b/docutils/test/functional/expected/math_output_latex.html @@ -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.18b1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.18b2.dev: http://docutils.sourceforge.net/" /> <title>Mathematics</title> <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" /> </head> diff --git a/docutils/test/functional/expected/math_output_mathjax.html b/docutils/test/functional/expected/math_output_mathjax.html index 2334dad00..7890423b3 100644 --- a/docutils/test/functional/expected/math_output_mathjax.html +++ b/docutils/test/functional/expected/math_output_mathjax.html @@ -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.18b1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.18b2.dev: http://docutils.sourceforge.net/" /> <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" /> diff --git a/docutils/test/functional/expected/math_output_mathml.html b/docutils/test/functional/expected/math_output_mathml.html index 551836f81..e26ac42d0 100644 --- a/docutils/test/functional/expected/math_output_mathml.html +++ b/docutils/test/functional/expected/math_output_mathml.html @@ -3,7 +3,7 @@ <head> <meta charset="utf-8"/> <meta name="viewport" content="width=device-width, initial-scale=1" /> -<meta name="generator" content="Docutils 0.18b1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.18b2.dev: http://docutils.sourceforge.net/" /> <title>Mathematics</title> <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" /> <link rel="stylesheet" href="../input/data/plain.css" type="text/css" /> diff --git a/docutils/test/functional/expected/misc_rst_html4css1.html b/docutils/test/functional/expected/misc_rst_html4css1.html index 6479dba3b..12f2ea10c 100644 --- a/docutils/test/functional/expected/misc_rst_html4css1.html +++ b/docutils/test/functional/expected/misc_rst_html4css1.html @@ -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.18b1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.18b2.dev: http://docutils.sourceforge.net/" /> <title>Additional tests with html4css1</title> <link rel="stylesheet" href="foo&bar.css" type="text/css" /> <link rel="stylesheet" href="functional/input/data/html4css1.css" type="text/css" /> diff --git a/docutils/test/functional/expected/misc_rst_html5.html b/docutils/test/functional/expected/misc_rst_html5.html index 6c8e75a3d..74f1f702a 100644 --- a/docutils/test/functional/expected/misc_rst_html5.html +++ b/docutils/test/functional/expected/misc_rst_html5.html @@ -3,7 +3,7 @@ <head> <meta charset="utf-8"/> <meta name="viewport" content="width=device-width, initial-scale=1" /> -<meta name="generator" content="Docutils 0.18b1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.18b2.dev: http://docutils.sourceforge.net/" /> <title>Additional tests with HTML 5</title> <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" /> <link rel="stylesheet" href="../input/data/responsive.css" type="text/css" /> diff --git a/docutils/test/functional/expected/pep_html.html b/docutils/test/functional/expected/pep_html.html index 35375265e..688ecc69f 100644 --- a/docutils/test/functional/expected/pep_html.html +++ b/docutils/test/functional/expected/pep_html.html @@ -8,7 +8,7 @@ to templates. DO NOT USE THIS HTML FILE AS YOUR TEMPLATE! --> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <meta name="generator" content="Docutils 0.18b1: http://docutils.sourceforge.net/" /> + <meta name="generator" content="Docutils 0.18b2.dev: http://docutils.sourceforge.net/" /> <title>PEP 100 -- Test PEP</title> <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" /> </head> diff --git a/docutils/test/functional/expected/standalone_rst_docutils_xml.xml b/docutils/test/functional/expected/standalone_rst_docutils_xml.xml index b6be5ffe5..77e169ea2 100644 --- a/docutils/test/functional/expected/standalone_rst_docutils_xml.xml +++ b/docutils/test/functional/expected/standalone_rst_docutils_xml.xml @@ -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.18b1 --> +<!-- Generated by Docutils 0.18b2.dev --> <document ids="restructuredtext-test-document doctitle" names="restructuredtext\ test\ document doctitle" source="functional/input/standalone_rst_docutils_xml.txt" 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> diff --git a/docutils/test/functional/expected/standalone_rst_html4css1.html b/docutils/test/functional/expected/standalone_rst_html4css1.html index 31c426797..e164abf81 100644 --- a/docutils/test/functional/expected/standalone_rst_html4css1.html +++ b/docutils/test/functional/expected/standalone_rst_html4css1.html @@ -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.18b1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.18b2.dev: http://docutils.sourceforge.net/" /> <title>reStructuredText Test Document</title> <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" /> diff --git a/docutils/test/functional/expected/standalone_rst_html5.html b/docutils/test/functional/expected/standalone_rst_html5.html index d6fed0bc5..d5c2e9da8 100644 --- a/docutils/test/functional/expected/standalone_rst_html5.html +++ b/docutils/test/functional/expected/standalone_rst_html5.html @@ -3,7 +3,7 @@ <head> <meta charset="utf-8"/> <meta name="viewport" content="width=device-width, initial-scale=1" /> -<meta name="generator" content="Docutils 0.18b1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.18b2.dev: http://docutils.sourceforge.net/" /> <title>reStructuredText Test Document</title> <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" /> diff --git a/docutils/test/functional/expected/standalone_rst_s5_html_1.html b/docutils/test/functional/expected/standalone_rst_s5_html_1.html index a60904094..b5c5b171c 100644 --- a/docutils/test/functional/expected/standalone_rst_s5_html_1.html +++ b/docutils/test/functional/expected/standalone_rst_s5_html_1.html @@ -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.18b1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.18b2.dev: http://docutils.sourceforge.net/" /> <meta name="version" content="S5 1.1" /> <title>Slide Shows</title> <meta name="author" content="David Goodger" /> diff --git a/docutils/test/functional/expected/standalone_rst_s5_html_2.html b/docutils/test/functional/expected/standalone_rst_s5_html_2.html index b8e7c20ad..38acc39a3 100644 --- a/docutils/test/functional/expected/standalone_rst_s5_html_2.html +++ b/docutils/test/functional/expected/standalone_rst_s5_html_2.html @@ -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.18b1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.18b2.dev: http://docutils.sourceforge.net/" /> <meta name="version" content="S5 1.1" /> <title>Slide Shows</title> <meta name="author" content="David Goodger" /> |