|
From: <dku...@us...> - 2017-05-16 21:07:09
|
Revision: 8069
http://sourceforge.net/p/docutils/code/8069
Author: dkuhlman
Date: 2017-05-16 21:07:07 +0000 (Tue, 16 May 2017)
Log Message:
-----------
Fixes to language/region and image size control
Modified Paths:
--------------
trunk/docutils/docutils/writers/odf_odt/__init__.py
trunk/docutils/test/test_writers/test_odt.py
Modified: trunk/docutils/docutils/writers/odf_odt/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/odf_odt/__init__.py 2017-05-08 22:10:39 UTC (rev 8068)
+++ trunk/docutils/docutils/writers/odf_odt/__init__.py 2017-05-16 21:07:07 UTC (rev 8069)
@@ -24,6 +24,7 @@
import copy
import urllib2
import docutils
+import locale
from docutils import frontend, nodes, utils, writers, languages
from docutils.readers import standalone
from docutils.transforms import references
@@ -569,6 +570,48 @@
s1 = self.create_meta()
self.write_zip_str(zfile, 'meta.xml', s1)
s1 = self.get_stylesheet()
+ # Set default language in document to be generated.
+ # Language is specified by the -l/--language command line option.
+ # Allowed values are "ll", "ll-rr" or "ll_rr", where ll is language
+ # and rr is region. If region is omitted, we use
+ # local.normalize(ll) to obtain a region.
+ language_code = None
+ region_code = None
+ if len(self.visitor.normalized_language_code) > 0:
+ language_ids = self.visitor.normalized_language_code[0].split('-')
+ if len(language_ids) == 2:
+ language_code = language_ids[0]
+ region_code = language_ids[1]
+ elif len(language_ids) == 1:
+ language_code = language_ids[0]
+ rcode = locale.normalize(language_code)
+ rcode = rcode.split('_')
+ if len(rcode) > 1:
+ rcode = rcode[1]
+ rcode = rcode.split('.')
+ if len(rcode) >= 1:
+ region_code = rcode[0]
+ if region_code is None:
+ raise RuntimeError(
+ 'invalid language-region. '
+ 'Could not find region with locale.normalize(). '
+ 'If language is supplied, then you must specify '
+ 'both lanauge and region (ll-rr). Examples: '
+ 'es-mx (Spanish, Mexico), en-au (English, Australia).')
+ else:
+ raise RuntimeError(
+ 'invalid language-region. '
+ 'Format must be "ll-rr" or "ll_rr", where ll is language '
+ 'and rr is region. '
+ 'See https://en.wikipedia.org/wiki/IETF_language_tag')
+ # Update the style ElementTree with the language and region.
+ # Note that we keep a reference to the modified node because
+ # it is possible that ElementTree will throw away the Python
+ # representation of the updated node if we do not.
+ updated, new_dom_styles, updated_node = self.update_stylesheet(
+ self.visitor.get_dom_stylesheet(), language_code, region_code)
+ if updated:
+ s1 = etree.tostring(new_dom_styles)
self.write_zip_str(zfile, 'styles.xml', s1)
self.store_embedded_files(zfile)
self.copy_from_stylesheet(zfile)
@@ -580,7 +623,58 @@
self.parts['encoding'] = self.document.settings.output_encoding
self.parts['version'] = docutils.__version__
- def write_zip_str(self, zfile, name, bytes, compress_type=zipfile.ZIP_DEFLATED):
+ def update_stylesheet(self, stylesheet_root, language_code, region_code):
+ """Update xml style sheet element with language and region/country."""
+ updated = False
+ modified_nodes = set()
+ if language_code is not None or region_code is not None:
+ n1 = stylesheet_root.find(
+ '{urn:oasis:names:tc:opendocument:xmlns:office:1.0}'
+ 'styles')
+ if n1 is None:
+ raise RuntimeError(
+ "Cannot find 'styles' element in styles.odt/styles.xml")
+ n2_nodes = n1.findall(
+ '{urn:oasis:names:tc:opendocument:xmlns:style:1.0}'
+ 'default-style')
+ if not n2_nodes:
+ raise RuntimeError(
+ "Cannot find 'default-style' "
+ "element in styles.xml")
+ for node in n2_nodes:
+ family = node.attrib.get(
+ '{urn:oasis:names:tc:opendocument:xmlns:style:1.0}'
+ 'family')
+ if family == 'paragraph' or family == 'graphic':
+ n3 = node.find(
+ '{urn:oasis:names:tc:opendocument:xmlns:style:1.0}'
+ 'text-properties')
+ if n3 is None:
+ raise RuntimeError(
+ "Cannot find 'text-properties' "
+ "element in styles.xml")
+ if language_code is not None:
+ n3.attrib[
+ '{urn:oasis:names:tc:opendocument:xmlns:'
+ 'xsl-fo-compatible:1.0}language'] = language_code
+ n3.attrib[
+ '{urn:oasis:names:tc:opendocument:xmlns:'
+ 'style:1.0}language-complex'] = language_code
+ updated = True
+ modified_nodes.add(n3)
+ if region_code is not None:
+ n3.attrib[
+ '{urn:oasis:names:tc:opendocument:xmlns:'
+ 'xsl-fo-compatible:1.0}country'] = region_code
+ n3.attrib[
+ '{urn:oasis:names:tc:opendocument:xmlns:'
+ 'style:1.0}country-complex'] = region_code
+ updated = True
+ modified_nodes.add(n3)
+ return updated, stylesheet_root, modified_nodes
+
+ def write_zip_str(
+ self, zfile, name, bytes, compress_type=zipfile.ZIP_DEFLATED):
localtime = time.localtime(time.time())
zinfo = zipfile.ZipInfo(name, localtime)
# Add some standard UNIX file access permissions (-rw-r--r--).
@@ -725,8 +819,8 @@
#s1 = doc.toprettyxml(' ')
return s1
+
# class ODFTranslator(nodes.SparseNodeVisitor):
-
class ODFTranslator(nodes.GenericNodeVisitor):
used_styles = (
@@ -784,15 +878,19 @@
'lineblock5',
'lineblock6',
'image', 'figureframe',
- )
+ )
def __init__(self, document):
#nodes.SparseNodeVisitor.__init__(self, document)
nodes.GenericNodeVisitor.__init__(self, document)
self.settings = document.settings
- lcode = self.settings.language_code
- self.language = languages.get_language(lcode, document.reporter)
- self.format_map = { }
+ self.language_code = self.settings.language_code
+ self.language = languages.get_language(
+ self.language_code,
+ document.reporter)
+ self.normalized_language_code = languages.normalize_language_tag(
+ self.language_code)
+ self.format_map = {}
if self.settings.odf_config_file:
from ConfigParser import ConfigParser
@@ -802,7 +900,7 @@
if rststyle not in self.used_styles:
self.document.reporter.warning(
'Style "%s" is not a style used by odtwriter.' % (
- rststyle, ))
+ rststyle, ))
self.format_map[rststyle] = format.decode('utf-8')
self.section_level = 0
self.section_count = 0
@@ -982,18 +1080,18 @@
'style:name': style_name,
'style:master-page-name': "rststyle-pagedefault",
'style:family': "paragraph",
- }, nsdict=SNSD)
+ }, nsdict=SNSD)
if current_style:
el1.set('style:parent-style-name', current_style)
el.set('text:style-name', style_name)
-
- def rststyle(self, name, parameters=( )):
+ def rststyle(self, name, parameters=()):
"""
Returns the style name to use for the given style.
- If `parameters` is given `name` must contain a matching number of ``%`` and
- is used as a format expression with `parameters` as the value.
+ If `parameters` is given `name` must contain a matching number of
+ ``%`` and is used as a format expression with `parameters` as
+ the value.
"""
name1 = name % parameters
stylename = self.format_map.get(name1, 'rststyle-%s' % name1)
@@ -1010,6 +1108,9 @@
new_content = etree.tostring(self.dom_stylesheet)
return new_content
+ def get_dom_stylesheet(self):
+ return self.dom_stylesheet
+
def setup_paper(self, root_el):
try:
fin = os.popen("paperconf -s 2> /dev/null")
@@ -2118,44 +2219,76 @@
def get_image_width_height(self, node, attr):
size = None
+ unit = None
if attr in node.attributes:
size = node.attributes[attr]
- unit = size[-2:]
- if unit.isalpha():
- size = size[:-2]
- else:
- unit = 'px'
+ size = size.strip()
+ # For conversion factors, see:
+ # http://www.unitconversion.org/unit_converter/typography-ex.html
try:
- size = float(size)
- except ValueError, e:
+ if size.endswith('%'):
+ if attr == 'height':
+ # Percentage allowed for width but not height.
+ raise ValueError('percentage not allowed for height')
+ size = size.rstrip(' %')
+ size = float(size) / 100.0
+ unit = '%'
+ else:
+ size, unit = convert_to_cm(size)
+ except ValueError, exp:
self.document.reporter.warning(
- 'Invalid %s for image: "%s"' % (
- attr, node.attributes[attr]))
- size = [size, unit]
- return size
+ 'Invalid %s for image: "%s". '
+ 'Error: "%s".' % (
+ attr, node.attributes[attr], exp))
+ return size, unit
+ def convert_to_cm(self, size):
+ """Convert various units to centimeters.
+
+ Note that a call to this method should be wrapped in:
+ try: except ValueError:
+ """
+ size = size.strip()
+ if size.endswith('px'):
+ size = float(size[:-2]) * 0.026 # convert px to cm
+ elif size.endswith('in'):
+ size = float(size[:-2]) * 2.54 # convert in to cm
+ elif size.endswith('pt'):
+ size = float(size[:-2]) * 0.035 # convert pt to cm
+ elif size.endswith('pc'):
+ size = float(size[:-2]) * 2.371 # convert pc to cm
+ elif size.endswith('mm'):
+ size = float(size[:-2]) * 10.0 # convert mm to cm
+ elif size.endswith('cm'):
+ size = float(size[:-2])
+ else:
+ raise ValueError('unknown unit type')
+ unit = 'cm'
+ return size, unit
+
def get_image_scale(self, node):
if 'scale' in node.attributes:
+ scale = node.attributes['scale']
try:
- scale = int(node.attributes['scale'])
- if scale < 1: # or scale > 100:
- self.document.reporter.warning(
- 'scale out of range (%s), using 1.' % (scale, ))
- scale = 1
- scale = scale * 0.01
- except ValueError, e:
+ scale = int(scale)
+ except ValueError:
self.document.reporter.warning(
'Invalid scale for image: "%s"' % (
node.attributes['scale'], ))
+ if scale < 1: # or scale > 100:
+ self.document.reporter.warning(
+ 'scale out of range (%s), using 1.' % (scale, ))
+ scale = 1
+ scale = scale * 0.01
else:
scale = 1.0
return scale
def get_image_scaled_width_height(self, node, source):
+ """Return the image size in centimeters adjusted by image attrs."""
scale = self.get_image_scale(node)
- width = self.get_image_width_height(node, 'width')
- height = self.get_image_width_height(node, 'height')
-
+ width, width_unit = self.get_image_width_height(node, 'width')
+ height, _ = self.get_image_width_height(node, 'height')
dpi = (72, 72)
if PIL is not None and source in self.image_dict:
filename, destination = self.image_dict[source]
@@ -2162,27 +2295,76 @@
imageobj = PIL.Image.open(filename, 'r')
dpi = imageobj.info.get('dpi', dpi)
# dpi information can be (xdpi, ydpi) or xydpi
- try: iter(dpi)
- except: dpi = (dpi, dpi)
+ try:
+ iter(dpi)
+ except:
+ dpi = (dpi, dpi)
else:
imageobj = None
-
if width is None or height is None:
if imageobj is None:
raise RuntimeError(
'image size not fully specified and PIL not installed')
- if width is None: width = [imageobj.size[0], 'px']
- if height is None: height = [imageobj.size[1], 'px']
+ if width is None:
+ width = imageobj.size[0]
+ width = float(width) * 0.026 # convert px to cm
+ if height is None:
+ height = imageobj.size[1]
+ height = float(height) * 0.026 # convert px to cm
+ if width_unit == '%':
+ factor = width
+ image_width = imageobj.size[0]
+ image_width = float(image_width) * 0.026 # convert px to cm
+ image_height = imageobj.size[1]
+ image_height = float(image_height) * 0.026 # convert px to cm
+ line_width = self.get_page_width()
+ width = factor * line_width
+ factor = (factor * line_width) / image_width
+ height = factor * image_height
+ width *= scale
+ height *= scale
+ width = '%.2fcm' % width
+ height = '%.2fcm' % height
+ return width, height
- width[0] *= scale
- height[0] *= scale
- if width[1] == 'px': width = [width[0] / dpi[0], 'in']
- if height[1] == 'px': height = [height[0] / dpi[1], 'in']
+ def get_page_width(self):
+ """Return the document's page width in centimeters."""
+ root = self.get_dom_stylesheet()
+ nodes = root.iterfind(
+ './/{urn:oasis:names:tc:opendocument:xmlns:style:1.0}'
+ 'page-layout/'
+ '{urn:oasis:names:tc:opendocument:xmlns:style:1.0}'
+ 'page-layout-properties')
+ width = None
+ for node in nodes:
+ page_width = node.get(
+ '{urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0}'
+ 'page-width')
+ margin_left = node.get(
+ '{urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0}'
+ 'margin-left')
+ margin_right = node.get(
+ '{urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0}'
+ 'margin-right')
+ if (page_width is None or
+ margin_left is None or
+ margin_right is None):
+ continue
+ try:
+ page_width, _ = self.convert_to_cm(page_width)
+ margin_left, _ = self.convert_to_cm(margin_left)
+ margin_right, _ = self.convert_to_cm(margin_right)
+ except ValueError, exp:
+ self.document.reporter.warning(
+ 'Stylesheet file contains invalid page width '
+ 'or margin size.')
+ width = page_width - margin_left - margin_right
+ if width is None:
+ # We can't find the width in styles, so we make a guess.
+ # Use a width of 6 in = 15.24 cm.
+ width = 15.24
+ return width
- width[0] = str(width[0])
- height[0] = str(height[0])
- return ''.join(width), ''.join(height)
-
def generate_figure(self, node, source, destination, current_element):
caption = None
width, height = self.get_image_scaled_width_height(node, source)
@@ -3263,14 +3445,16 @@
depart_admonition = depart_warning
def generate_admonition(self, node, label, title=None):
- el1 = SubElement(self.current_element, 'text:p', attrib = {
- 'text:style-name': self.rststyle('admon-%s-hdr', ( label, )),
- })
+ translated_label = self.language.labels[label]
+ el1 = SubElement(self.current_element, 'text:p', attrib={
+ 'text:style-name': self.rststyle(
+ 'admon-%s-hdr', (label, )),
+ })
if title:
el1.text = title
else:
- el1.text = '%s!' % (label.capitalize(), )
- s1 = self.rststyle('admon-%s-body', ( label, ))
+ el1.text = '%s!' % (translated_label.capitalize(), )
+ s1 = self.rststyle('admon-%s-body', (label, ))
self.paragraph_style_stack.append(s1)
#
Modified: trunk/docutils/test/test_writers/test_odt.py
===================================================================
--- trunk/docutils/test/test_writers/test_odt.py 2017-05-08 22:10:39 UTC (rev 8068)
+++ trunk/docutils/test/test_writers/test_odt.py 2017-05-16 21:07:07 UTC (rev 8069)
@@ -96,6 +96,7 @@
if settings_overrides is None:
settings_overrides={}
settings_overrides['_disable_config'] = True
+ settings_overrides['language_code'] = 'en-US'
result = docutils.core.publish_string(
source=input,
@@ -175,6 +176,7 @@
settings_overrides = {
'custom_header': 'Page %p% of %P%',
'custom_footer': 'Title: %t% Date: %d3% Time: %t4%',
+ 'language_code': 'en-US',
}
self.process_test('odt_custom_headfoot.txt', 'odt_custom_headfoot.odt',
settings_overrides=settings_overrides,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dku...@us...> - 2017-05-22 23:24:09
|
Revision: 8072
http://sourceforge.net/p/docutils/code/8072
Author: dkuhlman
Date: 2017-05-22 23:24:06 +0000 (Mon, 22 May 2017)
Log Message:
-----------
Enable use of Jython without import exception of locale
Modified Paths:
--------------
trunk/docutils/HISTORY.txt
trunk/docutils/docutils/writers/odf_odt/__init__.py
Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt 2017-05-21 10:16:33 UTC (rev 8071)
+++ trunk/docutils/HISTORY.txt 2017-05-22 23:24:06 UTC (rev 8072)
@@ -87,7 +87,17 @@
* tools/dev/generate_punctuation_chars.py: New skript
to test and update utils.punctuation_chars.
+* docutils/writers/odf_ odt/__init__.py:
+ - Command line option -l/--language now sets the default language
+ of the generated ODF document.
+ - The use of image directive options :width: (%), :scale:, etc now
+ set the width/height/size of images in the generated ODF
+ documents.
+ - The heading/title of admonitions now reflects the language
+ specified by the -l/--language command line option.
+
+
Release 0.13.1 (2016-12-09)
===========================
Modified: trunk/docutils/docutils/writers/odf_odt/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/odf_odt/__init__.py 2017-05-21 10:16:33 UTC (rev 8071)
+++ trunk/docutils/docutils/writers/odf_odt/__init__.py 2017-05-22 23:24:06 UTC (rev 8072)
@@ -24,7 +24,10 @@
import copy
import urllib2
import docutils
-import locale
+try:
+ import locale # module missing in Jython
+except ImportError:
+ pass
from docutils import frontend, nodes, utils, writers, languages
from docutils.readers import standalone
from docutils.transforms import references
@@ -589,7 +592,10 @@
elif len(subtag) == 1:
break # 1-letter tag is never before valid region tag
if region_code is None:
- rcode = locale.normalize(language_code)
+ try:
+ rcode = locale.normalize(language_code)
+ except NameError:
+ rcode = language_code
rcode = rcode.split('_')
if len(rcode) > 1:
rcode = rcode[1].split('.')
@@ -596,11 +602,11 @@
region_code = rcode[0]
if region_code is None:
self.document.reporter.warning(
- 'invalid language-region. '
- 'Could not find region with locale.normalize(). '
- 'If language is supplied, then you must specify '
- 'both language and region (ll-RR). Examples: '
- 'es-MX (Spanish, Mexico), en-AU (English, Australia).')
+ 'invalid language-region.\n'
+ ' Could not find region with locale.normalize().\n'
+ ' Please specify both language and region (ll-RR).\n'
+ ' Examples: es-MX (Spanish, Mexico),\n'
+ ' en-AU (English, Australia).')
# Update the style ElementTree with the language and region.
# Note that we keep a reference to the modified node because
# it is possible that ElementTree will throw away the Python
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2017-05-23 12:41:53
|
Revision: 8073
http://sourceforge.net/p/docutils/code/8073
Author: milde
Date: 2017-05-23 12:41:45 +0000 (Tue, 23 May 2017)
Log Message:
-----------
Minor documentation fixes.
Modified Paths:
--------------
trunk/docutils/HISTORY.txt
trunk/docutils/docutils/utils/__init__.py
Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt 2017-05-22 23:24:06 UTC (rev 8072)
+++ trunk/docutils/HISTORY.txt 2017-05-23 12:41:45 UTC (rev 8073)
@@ -82,22 +82,22 @@
in a "DUclass" environment. This replaces the special handling for
"epigraph" and "topic" elements.
-* tools/rst2html4.py: New front-end.
-
-* tools/dev/generate_punctuation_chars.py: New skript
- to test and update utils.punctuation_chars.
-
* docutils/writers/odf_ odt/__init__.py:
- - Command line option -l/--language now sets the default language
+ - Command setting ``language`` now sets the default language
of the generated ODF document.
- The use of image directive options :width: (%), :scale:, etc now
set the width/height/size of images in the generated ODF
documents.
- The heading/title of admonitions now reflects the language
- specified by the -l/--language command line option.
+ specified by the ``language`` setting.
+* tools/rst2html4.py: New front-end.
+* tools/dev/generate_punctuation_chars.py: New skript
+ to test and update utils.punctuation_chars.
+
+
Release 0.13.1 (2016-12-09)
===========================
Modified: trunk/docutils/docutils/utils/__init__.py
===================================================================
--- trunk/docutils/docutils/utils/__init__.py 2017-05-22 23:24:06 UTC (rev 8072)
+++ trunk/docutils/docutils/utils/__init__.py 2017-05-23 12:41:45 UTC (rev 8073)
@@ -606,8 +606,10 @@
def find_combining_chars(text):
"""Return indices of all combining chars in Unicode string `text`.
+ >>> from docutils.utils import find_combining_chars
>>> find_combining_chars(u'A t̆ab̆lĕ')
[3, 6, 9]
+
"""
if isinstance(text, str) and sys.version_info < (3,0):
return []
@@ -616,8 +618,10 @@
def column_indices(text):
"""Indices of Unicode string `text` when skipping combining characters.
+ >>> from docutils.utils import column_indices
>>> column_indices(u'A t̆ab̆lĕ')
[0, 1, 2, 4, 5, 7, 8]
+
"""
# TODO: account for asian wide chars here instead of using dummy
# replacements in the tableparser?
@@ -674,17 +678,21 @@
Example:
+ >>> from docutils.utils import normalize_language_tag
>>> normalize_language_tag('de_AT-1901')
['de-at-1901', 'de-at', 'de-1901', 'de']
+ >>> normalize_language_tag('de-CH-x_altquot')
+ ['de-ch-x-altquot', 'de-ch', 'de-x-altquot', 'de']
+
"""
# normalize:
- tag = tag.lower().replace('_','-')
+ tag = tag.lower().replace('-','_')
# split (except singletons, which mark the following tag as non-standard):
- tag = re.sub(r'-([a-zA-Z0-9])-', r'-\1_', tag)
- taglist = []
- subtags = [subtag.replace('_', '-') for subtag in tag.split('-')]
+ tag = re.sub(r'_([a-zA-Z0-9])_', r'_\1-', tag)
+ subtags = [subtag for subtag in tag.split('_')]
base_tag = [subtags.pop(0)]
# find all combinations of subtags
+ taglist = []
for n in range(len(subtags), 0, -1):
for tags in unique_combinations(subtags, n):
taglist.append('-'.join(base_tag+tags))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gr...@us...> - 2017-05-27 09:34:43
|
Revision: 8076
http://sourceforge.net/p/docutils/code/8076
Author: grubert
Date: 2017-05-27 09:34:40 +0000 (Sat, 27 May 2017)
Log Message:
-----------
set version to "prerelease 0.14.0a"
Modified Paths:
--------------
trunk/docutils/docutils/__init__.py
trunk/docutils/setup.py
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/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.xhtml
trunk/docutils/test/functional/expected/misc_rst_html4css1.html
trunk/docutils/test/functional/expected/pep_html.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_s5_html_1.html
trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py 2017-05-26 16:53:16 UTC (rev 8075)
+++ trunk/docutils/docutils/__init__.py 2017-05-27 09:34:40 UTC (rev 8076)
@@ -52,7 +52,7 @@
__docformat__ = 'reStructuredText'
-__version__ = '0.13.2a'
+__version__ = '0.14.0a'
"""``major.minor.micro`` version number. The micro number is bumped for API
changes, for new functionality, and for interim project releases. The minor
number is bumped whenever there is a significant project release. The major
@@ -59,9 +59,9 @@
number will be bumped when the project is feature-complete, and perhaps if
there is a major change in the design."""
-__version_details__ = 'repository'
+__version_details__ = 'prerelease'
"""Extra version details (e.g. 'snapshot 2005-05-29, r3410', 'repository',
-'release'), modified automatically & manually."""
+'prerelease', 'release'), modified automatically & manually."""
import sys
Modified: trunk/docutils/setup.py
===================================================================
--- trunk/docutils/setup.py 2017-05-26 16:53:16 UTC (rev 8075)
+++ trunk/docutils/setup.py 2017-05-27 09:34:40 UTC (rev 8076)
@@ -113,7 +113,7 @@
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.13.2a',
+ 'version': '0.14.0a',
'author': 'David Goodger',
'author_email': 'go...@py...',
'maintainer': 'docutils-develop list',
Modified: trunk/docutils/test/functional/expected/compact_lists.html
===================================================================
--- trunk/docutils/test/functional/expected/compact_lists.html 2017-05-26 16:53:16 UTC (rev 8075)
+++ trunk/docutils/test/functional/expected/compact_lists.html 2017-05-27 09:34:40 UTC (rev 8076)
@@ -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.13.2a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14.0a: http://docutils.sourceforge.net/" />
<title>compact_lists.txt</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 2017-05-26 16:53:16 UTC (rev 8075)
+++ trunk/docutils/test/functional/expected/dangerous.html 2017-05-27 09:34:40 UTC (rev 8076)
@@ -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.13.2a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14.0a: http://docutils.sourceforge.net/" />
<title>dangerous.txt</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 2017-05-26 16:53:16 UTC (rev 8075)
+++ trunk/docutils/test/functional/expected/field_name_limit.html 2017-05-27 09:34:40 UTC (rev 8076)
@@ -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.13.2a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14.0a: http://docutils.sourceforge.net/" />
<title>field_list.txt</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 2017-05-26 16:53:16 UTC (rev 8075)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html 2017-05-27 09:34:40 UTC (rev 8076)
@@ -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.13.2a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14.0a: 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/plain.css" type="text/css" />
Modified: trunk/docutils/test/functional/expected/math_output_html.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_html.html 2017-05-26 16:53:16 UTC (rev 8075)
+++ trunk/docutils/test/functional/expected/math_output_html.html 2017-05-27 09:34:40 UTC (rev 8076)
@@ -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.13.2a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14.0a: 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" />
Modified: trunk/docutils/test/functional/expected/math_output_latex.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_latex.html 2017-05-26 16:53:16 UTC (rev 8075)
+++ trunk/docutils/test/functional/expected/math_output_latex.html 2017-05-27 09:34:40 UTC (rev 8076)
@@ -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.13.2a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14.0a: http://docutils.sourceforge.net/" />
<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 2017-05-26 16:53:16 UTC (rev 8075)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html 2017-05-27 09:34:40 UTC (rev 8076)
@@ -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.13.2a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14.0a: http://docutils.sourceforge.net/" />
<title>Mathematics</title>
<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/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.xhtml
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-05-26 16:53:16 UTC (rev 8075)
+++ trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-05-27 09:34:40 UTC (rev 8076)
@@ -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.13.2a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14.0a: 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" />
Modified: trunk/docutils/test/functional/expected/misc_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-05-26 16:53:16 UTC (rev 8075)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-05-27 09:34:40 UTC (rev 8076)
@@ -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.13.2a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14.0a: http://docutils.sourceforge.net/" />
<title>link_in_substitution.txt</title>
<link rel="stylesheet" href="foo&bar.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/pep_html.html
===================================================================
--- trunk/docutils/test/functional/expected/pep_html.html 2017-05-26 16:53:16 UTC (rev 8075)
+++ trunk/docutils/test/functional/expected/pep_html.html 2017-05-27 09:34:40 UTC (rev 8076)
@@ -8,7 +8,7 @@
-->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.13.2a: http://docutils.sourceforge.net/" />
+ <meta name="generator" content="Docutils 0.14.0a: http://docutils.sourceforge.net/" />
<title>PEP 100 -- Test PEP</title>
<link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-05-26 16:53:16 UTC (rev 8075)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-05-27 09:34:40 UTC (rev 8076)
@@ -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.13.2a -->
+<!-- Generated by Docutils 0.14.0a -->
<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>
Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-05-26 16:53:16 UTC (rev 8075)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-05-27 09:34:40 UTC (rev 8076)
@@ -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.13.2a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14.0a: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta name="authors" content="Me Myself I" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-05-26 16:53:16 UTC (rev 8075)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-05-27 09:34:40 UTC (rev 8076)
@@ -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.13.2a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14.0a: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta content="reStructuredText, test, parser" name="keywords" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-05-26 16:53:16 UTC (rev 8075)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-05-27 09:34:40 UTC (rev 8076)
@@ -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.13.2a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14.0a: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-05-26 16:53:16 UTC (rev 8075)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-05-27 09:34:40 UTC (rev 8076)
@@ -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.13.2a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14.0a: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gr...@us...> - 2017-05-27 09:46:27
|
Revision: 8077
http://sourceforge.net/p/docutils/code/8077
Author: grubert
Date: 2017-05-27 09:46:25 +0000 (Sat, 27 May 2017)
Log Message:
-----------
change headings
Modified Paths:
--------------
trunk/docutils/HISTORY.txt
trunk/docutils/RELEASE-NOTES.txt
Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt 2017-05-27 09:34:40 UTC (rev 8076)
+++ trunk/docutils/HISTORY.txt 2017-05-27 09:46:25 UTC (rev 8077)
@@ -14,8 +14,8 @@
.. contents::
-Changes Since 0.13.1
-====================
+Release 0.14.0a (2017-05-27)
+============================
* docutils/docs/ref/docutils.dtd:
Modified: trunk/docutils/RELEASE-NOTES.txt
===================================================================
--- trunk/docutils/RELEASE-NOTES.txt 2017-05-27 09:34:40 UTC (rev 8076)
+++ trunk/docutils/RELEASE-NOTES.txt 2017-05-27 09:46:25 UTC (rev 8077)
@@ -48,8 +48,8 @@
.. _rst2html.py: docs/user/tools.html#rst2html-py
-Changes Since 0.13.1
-====================
+Release 0.14.0a (2017-05-27)
+============================
* docutils/docs/ref/docutils.dtd:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gr...@us...> - 2017-05-27 12:01:19
|
Revision: 8081
http://sourceforge.net/p/docutils/code/8081
Author: grubert
Date: 2017-05-27 12:01:16 +0000 (Sat, 27 May 2017)
Log Message:
-----------
FIX version number: to 0.14a0
Modified Paths:
--------------
trunk/docutils/HISTORY.txt
trunk/docutils/RELEASE-NOTES.txt
trunk/docutils/docutils/__init__.py
trunk/docutils/setup.py
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/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.xhtml
trunk/docutils/test/functional/expected/misc_rst_html4css1.html
trunk/docutils/test/functional/expected/pep_html.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_s5_html_1.html
trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/HISTORY.txt 2017-05-27 12:01:16 UTC (rev 8081)
@@ -14,8 +14,8 @@
.. contents::
-Release 0.14.0a (2017-05-27)
-============================
+Prerelease 0.14a0 (2017-05-27)
+==============================
* docutils/docs/ref/docutils.dtd:
Modified: trunk/docutils/RELEASE-NOTES.txt
===================================================================
--- trunk/docutils/RELEASE-NOTES.txt 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/RELEASE-NOTES.txt 2017-05-27 12:01:16 UTC (rev 8081)
@@ -48,8 +48,8 @@
.. _rst2html.py: docs/user/tools.html#rst2html-py
-Release 0.14.0a (2017-05-27)
-============================
+Prerelease 0.14a0 (2017-05-27)
+==============================
* docutils/docs/ref/docutils.dtd:
Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/docutils/__init__.py 2017-05-27 12:01:16 UTC (rev 8081)
@@ -52,7 +52,7 @@
__docformat__ = 'reStructuredText'
-__version__ = '0.14.0a'
+__version__ = '0.14a0'
"""``major.minor.micro`` version number. The micro number is bumped for API
changes, for new functionality, and for interim project releases. The minor
number is bumped whenever there is a significant project release. The major
Modified: trunk/docutils/setup.py
===================================================================
--- trunk/docutils/setup.py 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/setup.py 2017-05-27 12:01:16 UTC (rev 8081)
@@ -113,7 +113,7 @@
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.14.0a',
+ 'version': '0.14a0',
'author': 'David Goodger',
'author_email': 'go...@py...',
'maintainer': 'docutils-develop list',
Modified: trunk/docutils/test/functional/expected/compact_lists.html
===================================================================
--- trunk/docutils/test/functional/expected/compact_lists.html 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/test/functional/expected/compact_lists.html 2017-05-27 12:01:16 UTC (rev 8081)
@@ -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.14.0a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14a0: http://docutils.sourceforge.net/" />
<title>compact_lists.txt</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 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/test/functional/expected/dangerous.html 2017-05-27 12:01:16 UTC (rev 8081)
@@ -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.14.0a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14a0: http://docutils.sourceforge.net/" />
<title>dangerous.txt</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 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/test/functional/expected/field_name_limit.html 2017-05-27 12:01:16 UTC (rev 8081)
@@ -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.14.0a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14a0: http://docutils.sourceforge.net/" />
<title>field_list.txt</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 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html 2017-05-27 12:01:16 UTC (rev 8081)
@@ -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.14.0a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14a0: 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/plain.css" type="text/css" />
Modified: trunk/docutils/test/functional/expected/math_output_html.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_html.html 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/test/functional/expected/math_output_html.html 2017-05-27 12:01:16 UTC (rev 8081)
@@ -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.14.0a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14a0: 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" />
Modified: trunk/docutils/test/functional/expected/math_output_latex.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_latex.html 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/test/functional/expected/math_output_latex.html 2017-05-27 12:01:16 UTC (rev 8081)
@@ -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.14.0a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14a0: http://docutils.sourceforge.net/" />
<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 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html 2017-05-27 12:01:16 UTC (rev 8081)
@@ -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.14.0a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14a0: http://docutils.sourceforge.net/" />
<title>Mathematics</title>
<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/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.xhtml
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-05-27 12:01:16 UTC (rev 8081)
@@ -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.14.0a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14a0: 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" />
Modified: trunk/docutils/test/functional/expected/misc_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-05-27 12:01:16 UTC (rev 8081)
@@ -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.14.0a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14a0: http://docutils.sourceforge.net/" />
<title>link_in_substitution.txt</title>
<link rel="stylesheet" href="foo&bar.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/pep_html.html
===================================================================
--- trunk/docutils/test/functional/expected/pep_html.html 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/test/functional/expected/pep_html.html 2017-05-27 12:01:16 UTC (rev 8081)
@@ -8,7 +8,7 @@
-->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.14.0a: http://docutils.sourceforge.net/" />
+ <meta name="generator" content="Docutils 0.14a0: http://docutils.sourceforge.net/" />
<title>PEP 100 -- Test PEP</title>
<link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-05-27 12:01:16 UTC (rev 8081)
@@ -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.14.0a -->
+<!-- Generated by Docutils 0.14a0 -->
<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>
Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-05-27 12:01:16 UTC (rev 8081)
@@ -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.14.0a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14a0: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta name="authors" content="Me Myself I" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-05-27 12:01:16 UTC (rev 8081)
@@ -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.14.0a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14a0: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta content="reStructuredText, test, parser" name="keywords" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-05-27 12:01:16 UTC (rev 8081)
@@ -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.14.0a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14a0: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-05-27 10:51:15 UTC (rev 8080)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-05-27 12:01:16 UTC (rev 8081)
@@ -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.14.0a: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14a0: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gr...@us...> - 2017-05-27 15:34:42
|
Revision: 8087
http://sourceforge.net/p/docutils/code/8087
Author: grubert
Date: 2017-05-27 15:34:39 +0000 (Sat, 27 May 2017)
Log Message:
-----------
Bug fix 0.14rc1
Modified Paths:
--------------
trunk/docutils/HISTORY.txt
trunk/docutils/RELEASE-NOTES.txt
trunk/docutils/docutils/__init__.py
trunk/docutils/setup.py
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/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.xhtml
trunk/docutils/test/functional/expected/misc_rst_html4css1.html
trunk/docutils/test/functional/expected/pep_html.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_s5_html_1.html
trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/HISTORY.txt 2017-05-27 15:34:39 UTC (rev 8087)
@@ -14,9 +14,13 @@
.. contents::
-Prerelease 0.14a0 (2017-05-27)
-==============================
+Prerelease 0.14rc1 (2017-05-27)
+===============================
+* docutils/docutils/transforms/universal.py
+
+ Fix: warn only once if language is unsupported
+
* docutils/docs/ref/docutils.dtd:
- Enable validation of Docutils XML documents against the DTD:
Modified: trunk/docutils/RELEASE-NOTES.txt
===================================================================
--- trunk/docutils/RELEASE-NOTES.txt 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/RELEASE-NOTES.txt 2017-05-27 15:34:39 UTC (rev 8087)
@@ -48,9 +48,13 @@
.. _rst2html.py: docs/user/tools.html#rst2html-py
-Prerelease 0.14a0 (2017-05-27)
-==============================
+Prerelease 0.14rc1 (2017-05-27)
+===============================
+* docutils/docutils/transforms/universal.py
+
+ Fix: warn only once if language is unsupported
+
* docutils/docs/ref/docutils.dtd:
- Enable validation of Docutils XML documents against the DTD:
Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/docutils/__init__.py 2017-05-27 15:34:39 UTC (rev 8087)
@@ -52,7 +52,7 @@
__docformat__ = 'reStructuredText'
-__version__ = '0.14a0'
+__version__ = '0.14rc1'
"""``major.minor.micro`` version number.
The major number will be bumped when the project is feature-complete, and
later if there is a major change in the design or API.
Modified: trunk/docutils/setup.py
===================================================================
--- trunk/docutils/setup.py 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/setup.py 2017-05-27 15:34:39 UTC (rev 8087)
@@ -113,7 +113,7 @@
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.14a0',
+ 'version': '0.14rc1',
'author': 'David Goodger',
'author_email': 'go...@py...',
'maintainer': 'docutils-develop list',
Modified: trunk/docutils/test/functional/expected/compact_lists.html
===================================================================
--- trunk/docutils/test/functional/expected/compact_lists.html 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/test/functional/expected/compact_lists.html 2017-05-27 15:34:39 UTC (rev 8087)
@@ -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.14a0: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc1: http://docutils.sourceforge.net/" />
<title>compact_lists.txt</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 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/test/functional/expected/dangerous.html 2017-05-27 15:34:39 UTC (rev 8087)
@@ -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.14a0: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc1: http://docutils.sourceforge.net/" />
<title>dangerous.txt</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 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/test/functional/expected/field_name_limit.html 2017-05-27 15:34:39 UTC (rev 8087)
@@ -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.14a0: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc1: http://docutils.sourceforge.net/" />
<title>field_list.txt</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 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html 2017-05-27 15:34:39 UTC (rev 8087)
@@ -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.14a0: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc1: 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/plain.css" type="text/css" />
Modified: trunk/docutils/test/functional/expected/math_output_html.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_html.html 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/test/functional/expected/math_output_html.html 2017-05-27 15:34:39 UTC (rev 8087)
@@ -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.14a0: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc1: 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" />
Modified: trunk/docutils/test/functional/expected/math_output_latex.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_latex.html 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/test/functional/expected/math_output_latex.html 2017-05-27 15:34:39 UTC (rev 8087)
@@ -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.14a0: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc1: http://docutils.sourceforge.net/" />
<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 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html 2017-05-27 15:34:39 UTC (rev 8087)
@@ -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.14a0: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc1: http://docutils.sourceforge.net/" />
<title>Mathematics</title>
<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/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.xhtml
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-05-27 15:34:39 UTC (rev 8087)
@@ -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.14a0: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc1: 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" />
Modified: trunk/docutils/test/functional/expected/misc_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-05-27 15:34:39 UTC (rev 8087)
@@ -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.14a0: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc1: http://docutils.sourceforge.net/" />
<title>link_in_substitution.txt</title>
<link rel="stylesheet" href="foo&bar.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/pep_html.html
===================================================================
--- trunk/docutils/test/functional/expected/pep_html.html 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/test/functional/expected/pep_html.html 2017-05-27 15:34:39 UTC (rev 8087)
@@ -8,7 +8,7 @@
-->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.14a0: http://docutils.sourceforge.net/" />
+ <meta name="generator" content="Docutils 0.14rc1: http://docutils.sourceforge.net/" />
<title>PEP 100 -- Test PEP</title>
<link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-05-27 15:34:39 UTC (rev 8087)
@@ -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.14a0 -->
+<!-- Generated by Docutils 0.14rc1 -->
<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>
Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-05-27 15:34:39 UTC (rev 8087)
@@ -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.14a0: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc1: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta name="authors" content="Me Myself I" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-05-27 15:34:39 UTC (rev 8087)
@@ -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.14a0: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc1: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta content="reStructuredText, test, parser" name="keywords" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-05-27 15:34:39 UTC (rev 8087)
@@ -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.14a0: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc1: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-05-27 15:17:06 UTC (rev 8086)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-05-27 15:34:39 UTC (rev 8087)
@@ -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.14a0: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc1: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gr...@us...> - 2017-05-27 15:46:58
|
Revision: 8089
http://sourceforge.net/p/docutils/code/8089
Author: grubert
Date: 2017-05-27 15:46:55 +0000 (Sat, 27 May 2017)
Log Message:
-----------
set version: repository 0.14rc2
Modified Paths:
--------------
trunk/docutils/docutils/__init__.py
trunk/docutils/setup.py
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/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.xhtml
trunk/docutils/test/functional/expected/misc_rst_html4css1.html
trunk/docutils/test/functional/expected/pep_html.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_s5_html_1.html
trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py 2017-05-27 15:40:04 UTC (rev 8088)
+++ trunk/docutils/docutils/__init__.py 2017-05-27 15:46:55 UTC (rev 8089)
@@ -52,7 +52,7 @@
__docformat__ = 'reStructuredText'
-__version__ = '0.14rc1'
+__version__ = '0.14rc2'
"""``major.minor.micro`` version number.
The major number will be bumped when the project is feature-complete, and
later if there is a major change in the design or API.
@@ -60,7 +60,7 @@
The micro number is bumped for bug-fix releases.
"""
-__version_details__ = 'prerelease'
+__version_details__ = 'repository'
"""Extra version details (e.g. 'snapshot 2005-05-29, r3410', 'repository',
'prerelease', 'release'), modified automatically & manually."""
Modified: trunk/docutils/setup.py
===================================================================
--- trunk/docutils/setup.py 2017-05-27 15:40:04 UTC (rev 8088)
+++ trunk/docutils/setup.py 2017-05-27 15:46:55 UTC (rev 8089)
@@ -113,7 +113,7 @@
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.14rc1',
+ 'version': '0.14rc2',
'author': 'David Goodger',
'author_email': 'go...@py...',
'maintainer': 'docutils-develop list',
Modified: trunk/docutils/test/functional/expected/compact_lists.html
===================================================================
--- trunk/docutils/test/functional/expected/compact_lists.html 2017-05-27 15:40:04 UTC (rev 8088)
+++ trunk/docutils/test/functional/expected/compact_lists.html 2017-05-27 15:46:55 UTC (rev 8089)
@@ -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.14rc1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<title>compact_lists.txt</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 2017-05-27 15:40:04 UTC (rev 8088)
+++ trunk/docutils/test/functional/expected/dangerous.html 2017-05-27 15:46:55 UTC (rev 8089)
@@ -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.14rc1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<title>dangerous.txt</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 2017-05-27 15:40:04 UTC (rev 8088)
+++ trunk/docutils/test/functional/expected/field_name_limit.html 2017-05-27 15:46:55 UTC (rev 8089)
@@ -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.14rc1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<title>field_list.txt</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 2017-05-27 15:40:04 UTC (rev 8088)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html 2017-05-27 15:46:55 UTC (rev 8089)
@@ -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.14rc1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: 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/plain.css" type="text/css" />
Modified: trunk/docutils/test/functional/expected/math_output_html.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_html.html 2017-05-27 15:40:04 UTC (rev 8088)
+++ trunk/docutils/test/functional/expected/math_output_html.html 2017-05-27 15:46:55 UTC (rev 8089)
@@ -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.14rc1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: 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" />
Modified: trunk/docutils/test/functional/expected/math_output_latex.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_latex.html 2017-05-27 15:40:04 UTC (rev 8088)
+++ trunk/docutils/test/functional/expected/math_output_latex.html 2017-05-27 15:46:55 UTC (rev 8089)
@@ -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.14rc1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<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 2017-05-27 15:40:04 UTC (rev 8088)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html 2017-05-27 15:46:55 UTC (rev 8089)
@@ -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.14rc1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<title>Mathematics</title>
<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/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.xhtml
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-05-27 15:40:04 UTC (rev 8088)
+++ trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-05-27 15:46:55 UTC (rev 8089)
@@ -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.14rc1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: 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" />
Modified: trunk/docutils/test/functional/expected/misc_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-05-27 15:40:04 UTC (rev 8088)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-05-27 15:46:55 UTC (rev 8089)
@@ -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.14rc1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<title>link_in_substitution.txt</title>
<link rel="stylesheet" href="foo&bar.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/pep_html.html
===================================================================
--- trunk/docutils/test/functional/expected/pep_html.html 2017-05-27 15:40:04 UTC (rev 8088)
+++ trunk/docutils/test/functional/expected/pep_html.html 2017-05-27 15:46:55 UTC (rev 8089)
@@ -8,7 +8,7 @@
-->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.14rc1: http://docutils.sourceforge.net/" />
+ <meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<title>PEP 100 -- Test PEP</title>
<link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-05-27 15:40:04 UTC (rev 8088)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-05-27 15:46:55 UTC (rev 8089)
@@ -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.14rc1 -->
+<!-- Generated by Docutils 0.14rc2 -->
<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>
Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-05-27 15:40:04 UTC (rev 8088)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-05-27 15:46:55 UTC (rev 8089)
@@ -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.14rc1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta name="authors" content="Me Myself I" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-05-27 15:40:04 UTC (rev 8088)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-05-27 15:46:55 UTC (rev 8089)
@@ -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.14rc1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta content="reStructuredText, test, parser" name="keywords" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-05-27 15:40:04 UTC (rev 8088)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-05-27 15:46:55 UTC (rev 8089)
@@ -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.14rc1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-05-27 15:40:04 UTC (rev 8088)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-05-27 15:46:55 UTC (rev 8089)
@@ -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.14rc1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gr...@us...> - 2017-05-30 11:24:50
|
Revision: 8091
http://sourceforge.net/p/docutils/code/8091
Author: grubert
Date: 2017-05-30 11:24:47 +0000 (Tue, 30 May 2017)
Log Message:
-----------
change version number from 0.14rc2 to 0.14rc2.dev
Modified Paths:
--------------
trunk/docutils/docutils/__init__.py
trunk/docutils/setup.py
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/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.xhtml
trunk/docutils/test/functional/expected/misc_rst_html4css1.html
trunk/docutils/test/functional/expected/pep_html.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_s5_html_1.html
trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py 2017-05-27 15:47:25 UTC (rev 8090)
+++ trunk/docutils/docutils/__init__.py 2017-05-30 11:24:47 UTC (rev 8091)
@@ -52,7 +52,7 @@
__docformat__ = 'reStructuredText'
-__version__ = '0.14rc2'
+__version__ = '0.14rc2.dev'
"""``major.minor.micro`` version number.
The major number will be bumped when the project is feature-complete, and
later if there is a major change in the design or API.
Modified: trunk/docutils/setup.py
===================================================================
--- trunk/docutils/setup.py 2017-05-27 15:47:25 UTC (rev 8090)
+++ trunk/docutils/setup.py 2017-05-30 11:24:47 UTC (rev 8091)
@@ -113,7 +113,7 @@
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.14rc2',
+ 'version': '0.14rc2.dev',
'author': 'David Goodger',
'author_email': 'go...@py...',
'maintainer': 'docutils-develop list',
Modified: trunk/docutils/test/functional/expected/compact_lists.html
===================================================================
--- trunk/docutils/test/functional/expected/compact_lists.html 2017-05-27 15:47:25 UTC (rev 8090)
+++ trunk/docutils/test/functional/expected/compact_lists.html 2017-05-30 11:24:47 UTC (rev 8091)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
<title>compact_lists.txt</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 2017-05-27 15:47:25 UTC (rev 8090)
+++ trunk/docutils/test/functional/expected/dangerous.html 2017-05-30 11:24:47 UTC (rev 8091)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
<title>dangerous.txt</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 2017-05-27 15:47:25 UTC (rev 8090)
+++ trunk/docutils/test/functional/expected/field_name_limit.html 2017-05-30 11:24:47 UTC (rev 8091)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
<title>field_list.txt</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 2017-05-27 15:47:25 UTC (rev 8090)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html 2017-05-30 11:24:47 UTC (rev 8091)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2.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/plain.css" type="text/css" />
Modified: trunk/docutils/test/functional/expected/math_output_html.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_html.html 2017-05-27 15:47:25 UTC (rev 8090)
+++ trunk/docutils/test/functional/expected/math_output_html.html 2017-05-30 11:24:47 UTC (rev 8091)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2.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" />
Modified: trunk/docutils/test/functional/expected/math_output_latex.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_latex.html 2017-05-27 15:47:25 UTC (rev 8090)
+++ trunk/docutils/test/functional/expected/math_output_latex.html 2017-05-30 11:24:47 UTC (rev 8091)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
<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 2017-05-27 15:47:25 UTC (rev 8090)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html 2017-05-30 11:24:47 UTC (rev 8091)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
<title>Mathematics</title>
<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/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.xhtml
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-05-27 15:47:25 UTC (rev 8090)
+++ trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-05-30 11:24:47 UTC (rev 8091)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2.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" />
Modified: trunk/docutils/test/functional/expected/misc_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-05-27 15:47:25 UTC (rev 8090)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-05-30 11:24:47 UTC (rev 8091)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
<title>link_in_substitution.txt</title>
<link rel="stylesheet" href="foo&bar.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/pep_html.html
===================================================================
--- trunk/docutils/test/functional/expected/pep_html.html 2017-05-27 15:47:25 UTC (rev 8090)
+++ trunk/docutils/test/functional/expected/pep_html.html 2017-05-30 11:24:47 UTC (rev 8091)
@@ -8,7 +8,7 @@
-->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
+ <meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
<title>PEP 100 -- Test PEP</title>
<link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-05-27 15:47:25 UTC (rev 8090)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-05-30 11:24:47 UTC (rev 8091)
@@ -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.14rc2 -->
+<!-- Generated by Docutils 0.14rc2.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>
Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-05-27 15:47:25 UTC (rev 8090)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-05-30 11:24:47 UTC (rev 8091)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta name="authors" content="Me Myself I" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-05-27 15:47:25 UTC (rev 8090)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-05-30 11:24:47 UTC (rev 8091)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta content="reStructuredText, test, parser" name="keywords" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-05-27 15:47:25 UTC (rev 8090)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-05-30 11:24:47 UTC (rev 8091)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-05-27 15:47:25 UTC (rev 8090)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-05-30 11:24:47 UTC (rev 8091)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2017-05-30 21:10:03
|
Revision: 8097
http://sourceforge.net/p/docutils/code/8097
Author: milde
Date: 2017-05-30 21:10:00 +0000 (Tue, 30 May 2017)
Log Message:
-----------
Minor documentation edit: sort and shorten.
(The Release Notes contain only important changes.)
Modified Paths:
--------------
trunk/docutils/HISTORY.txt
trunk/docutils/RELEASE-NOTES.txt
Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt 2017-05-30 21:08:07 UTC (rev 8096)
+++ trunk/docutils/HISTORY.txt 2017-05-30 21:10:00 UTC (rev 8097)
@@ -17,12 +17,8 @@
Prerelease 0.14rc1 (2017-05-27)
===============================
-* docutils/docutils/transforms/universal.py
+* docs/ref/docutils.dtd:
- Fix: warn only once if language is unsupported
-
-* docutils/docs/ref/docutils.dtd:
-
- Enable validation of Docutils XML documents against the DTD:
Use attribute type NMTOKEN instead of REFID for the `refid` attribute
@@ -57,6 +53,10 @@
- Don't add a second ID to problematic references.
+* docutils/transforms/universal.py
+
+ Fix SmartQuotes: warn only once if language is unsupported
+
* docutils/utils/__init__.py:
- Added ``split_escaped_whitespace`` function, support for escaped
Modified: trunk/docutils/RELEASE-NOTES.txt
===================================================================
--- trunk/docutils/RELEASE-NOTES.txt 2017-05-30 21:08:07 UTC (rev 8096)
+++ trunk/docutils/RELEASE-NOTES.txt 2017-05-30 21:10:00 UTC (rev 8097)
@@ -51,10 +51,6 @@
Prerelease 0.14rc1 (2017-05-27)
===============================
-* docutils/docutils/transforms/universal.py
-
- Fix: warn only once if language is unsupported
-
* docutils/docs/ref/docutils.dtd:
- Enable validation of Docutils XML documents against the DTD:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2017-06-09 11:02:38
|
Revision: 8103
http://sourceforge.net/p/docutils/code/8103
Author: milde
Date: 2017-06-09 11:02:35 +0000 (Fri, 09 Jun 2017)
Log Message:
-----------
Remove dead links to the Gmane web interface.
The mail to news interface and mail archive "Gmane" went down 2016 and is
only partially restored. http://home.gmane.org/2016/08/29/next-steps-gmane/
Remove dead links to the web interface and add links to the
mail archives at Sourceforge.
TODO: There are still dead links to specific messags in
Bugs.txt, todo.txt and alternatives.txt
Thanks to Luke Plant for reporting the issue.
Modified Paths:
--------------
trunk/docutils/BUGS.txt
trunk/docutils/README.txt
trunk/docutils/docs/user/mailing-lists.txt
Modified: trunk/docutils/BUGS.txt
===================================================================
--- trunk/docutils/BUGS.txt 2017-06-03 10:49:13 UTC (rev 8102)
+++ trunk/docutils/BUGS.txt 2017-06-09 11:02:35 UTC (rev 8103)
@@ -152,8 +152,10 @@
``href="C:/test/foo.css"`` instead of
``href="file:///C:/test/foo.css"``.
- For details, see `this posting by Alan G. Isaac
- <http://article.gmane.org/gmane.text.docutils.user/1569>`_.
+ .. gmane web interface is down.
+ TODO: find this article in the Sourceforge mail archives
+ For details, see `this posting by Alan G. Isaac
+ <http://article.gmane.org/gmane.text.docutils.user/1569>`_.
* Footnote label "5" should be "4" when processing the following
input::
Modified: trunk/docutils/README.txt
===================================================================
--- trunk/docutils/README.txt 2017-06-03 10:49:13 UTC (rev 8102)
+++ trunk/docutils/README.txt 2017-06-09 11:02:35 UTC (rev 8103)
@@ -31,7 +31,7 @@
3. Unpack the tarball in a temporary directory (**not** directly in
Python's ``site-packages``), go to the directory created by expanding
- the archive, and run ``setup.py install`` with admin rights. On
+ the archive, and run ``setup.py install``. On
Windows systems it may be sufficient to double-click ``install.py``.
See Installation_ below for details.
@@ -79,18 +79,19 @@
====================
While we are trying to follow a "release early & often" policy,
-features are added very frequently. Since the code in the Subversion
+features are added frequently. Since the code in the Subversion
repository is usually in a bug-free state, we recommend that you use
-the current snapshot (which is usually updated within an hour of
-changes being committed to the repository):
+a current snapshot.
-* Snapshot of Docutils code, documentation, front-end tools, and
- tests:
- http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/docutils/?view=tar
+To get a snapshot, go to the code page and click the download snapshot
+button:
-* Snapshot of the Sandbox (experimental, contributed code):
- http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/sandbox/?view=tar
+* Docutils code, documentation, front-end tools, and tests:
+ https://sourceforge.net/p/docutils/code/HEAD/tree/trunk/docutils/
+* Sandbox (experimental, contributed code):
+ https://sourceforge.net/p/docutils/code/HEAD/tree/trunk/sandbox/
+
To keep up to date on the latest developments, download fresh copies of
the snapshots regularly or use a working copy of the
`Subversion repository`_.
@@ -350,8 +351,8 @@
two times represents the time required to set up the tests (import
modules, create data structures, etc.).
-If any of the tests fail, please `open a bug report`_, `send email`_,
-or post a message via the `web interface`_ (see `Bugs <BUGS.html>`_).
+If any of the tests fail, please `open a bug report`_ or `send an email`_
+(see `Bugs <BUGS.html>`_).
Please include all relevant output, information about your operating
system, Python version, and Docutils version. To see the Docutils
version, use one of the ``rst2*`` front ends or ``tools/quicktest.py``
@@ -369,10 +370,8 @@
.. _Docutils Testing: http://docutils.sourceforge.net/docs/dev/testing.html
.. _open a bug report:
http://sourceforge.net/p/docutils/bugs/
-.. _send email: mailto:doc...@li...
+.. _send an email: mailto:doc...@li...
?subject=Test%20suite%20failure
-.. _web interface: http://post.gmane.org/post.php
- ?group=gmane.text.docutils.user&subject=Test+suite+failure
Getting Help
Modified: trunk/docutils/docs/user/mailing-lists.txt
===================================================================
--- trunk/docutils/docs/user/mailing-lists.txt 2017-06-03 10:49:13 UTC (rev 8102)
+++ trunk/docutils/docs/user/mailing-lists.txt 2017-06-09 11:02:35 UTC (rev 8103)
@@ -9,8 +9,11 @@
:Copyright: This document has been placed in the public domain.
-.. raw:: html
+.. Gmane went down 2016 and is only partially restored.
+ http://home.gmane.org/2016/08/29/next-steps-gmane/
+ .. raw:: html
+
<div class="sidebar">
<p class="first sidebar-title">Search the list archives on Gmane</p>
<form method="get" action="http://search.gmane.org/">
@@ -39,19 +42,19 @@
Docutils-users
--------------
-The Docutils-users mailing list is a place to discuss any issues
+The `Docutils-users mailing list`_ is a place to discuss any issues
related to the usage of Docutils and reStructuredText. (Please be
sure to check the FAQ_ first.)
-There are three possibilities to **read and post** messages on the
+There are several possibilities to **read and post** messages on the
mailing lists; use the one you feel most comfortable with.
* Using an `email subscription`__. This is the traditional way; you
will receive all messages sent to the mailing list via email.
- __ http://lists.sourceforge.net/lists/listinfo/docutils-users
+ __ `docutils-users mailing list`_
-* Using Gmane's `web interface`__. To post a message, click "post" or
+.. * Using Gmane's `web interface`__. To post a message, click "post" or
"followup" in the drop-down menu on the right. (Gmane also has a
complete **archive** of the mailing list; use the search form at the
top of this page to search it.)
@@ -58,48 +61,54 @@
__ http://news.gmane.org/gmane.text.docutils.user
-* If you prefer to use a newsreader, you can also use Gmane's `NNTP
- interface`__ (gmane.text.docutils.user on news.gmane.org).
+* Use a newsreader with Gmane's `NNTP interface`__
+ (gmane.text.docutils.user on news.gmane.org).
__ nntp://news.gmane.org/gmane.text.docutils.user
-**If you do not wish to subscribe,** you can also just send an email
-message with your question or comment to
-Doc...@li.... Please note in your message
-that you are not subscribed (to make sure that you receive copies
-[CCs] of any replies).
+* **If you do not wish to subscribe,** you can also just send an email
+ message with your question or comment to
+ Doc...@li....
+ Note in your message that you are not subscribed (to make sure that you
+ receive copies [CCs] of any replies) or check for answers in the
+ `Docutils-users Archives`_.
+
The first time you post a message without being subscribed (also when
-posting via Gmane), you will receive an automatic response with the
-subject "Your message to Docutils-users awaits moderator approval";
-this is done to prevent spam to the mailing lists. Your message will
-usually be approved within a few hours. To avoid duplicates, please
-do not resend your message using a different email address. After
-your first message has been approved, your email address will be added
-to the whitelist and future messages will be posted to the mailing
-list without moderation.
+posting via Gmane), you will receive an automatic response with the subject
+"Your message to Docutils-users awaits moderator approval"; this is done to
+prevent spam to the mailing lists. Your message will usually be approved
+within a few hours. To avoid duplicates, please do not resend your message
+using a different email address. After your first message has been
+approved, your email address will be added to the whitelist and future
+messages will be posted to the mailing list without moderation.
+To see the collection of prior postings to the list, visit the
+`Docutils-users Archives`_.
+
Docutils-develop
----------------
Discussions about developing and extending Docutils take place on the
-Docutils-develop mailing list.
+`Docutils-develop mailing list`_.
-You can access this list via `email subscription`__, web__ or news__
+You can access this list via `email subscription`__ or news__
(gmane.text.docutils.devel); the posting address is
Doc...@li....
-__ http://lists.sourceforge.net/lists/listinfo/docutils-develop
-__ http://news.gmane.org/gmane.text.docutils.devel
+To see the collection of prior postings to the list, visit the
+`Docutils-develop Archives`__.
+
+__ `Docutils-develop mailing list`_
__ nntp://news.gmane.org/gmane.text.docutils.devel
+__ http://sourceforge.net/mailarchive/forum.php?forum_name=docutils-develop
-
Docutils-checkins
-----------------
All check-ins to the `Subversion repository`_ cause a "check-in email"
-to the Docutils-checkins list. In order to stay informed about
+to the `Docutils-checkins list`_. In order to stay informed about
current development, developers are advised to monitor this mailing
list.
@@ -107,7 +116,7 @@
about the check-ins to Docutils-develop. (For your convenience, the
Reply-To header of all check-in emails points to Docutils-develop.)
-This mailing list is accessible via `email subscription`__, web__ or
+This mailing list is accessible via `email subscription`__ or
news__ (gmane.text.docutils.cvs) as well.
If you are using an email subscription and you would prefer to only
@@ -115,8 +124,7 @@
distribution (i.e. ``trunk/docutils/*``), go to the `list options`_
page and select the "Docutils core" topic.
-__ http://lists.sourceforge.net/lists/listinfo/docutils-checkins
-__ http://news.gmane.org/gmane.text.docutils.cvs
+__ `Docutils-checkins list`_
__ nntp://news.gmane.org/gmane.text.docutils.cvs
.. _list options: http://lists.sf.net/lists/options/docutils-checkins
@@ -123,19 +131,31 @@
Doc-SIG
-------
-The "Python Documentation Special Interest Group" (Doc-SIG) mailing
-list is occasionally used to discuss the usage of Docutils for Python
+The "Python Documentation Special Interest Group" (`Doc-SIG`_) mailing list
+is occasionally used to discuss the usage of Docutils for Python
documentation.
-This mailing list can be accessed via `email subscription`__, web__ or
+This mailing list can be accessed via `email subscription`__ or
news__ (gmane.comp.python.documentation) as well. You must be
subscribed in order to post messages to this mailing list.
-__ http://mail.python.org/mailman/listinfo/doc-sig
-__ http://news.gmane.org/gmane.comp.python.documentation
+__ `Doc-SIG`_
__ nntp://news.gmane.org/gmane.comp.python.documentation
+.. _Docutils-users mailing list:
+ http://lists.sourceforge.net/lists/listinfo/docutils-users
+.. _Docutils-users Archives:
+ http://sourceforge.net/mailarchive/forum.php?forum_name=docutils-users
+.. _Docutils-develop mailing list:
+ http://lists.sourceforge.net/lists/listinfo/docutils-develop
+.. _Docutils-develop Archives:
+ http://sourceforge.net/mailarchive/forum.php?forum_name=docutils-develop
+.. _Docutils-checkins list:
+ http://lists.sourceforge.net/lists/listinfo/docutils-checkins
+.. _Doc-SIG:
+ http://mail.python.org/mailman/listinfo/doc-sig
+
.. _Subversion repository: ../dev/repository.html
.. _Docutils: http://docutils.sourceforge.net/
.. _FAQ: ../../FAQ.html
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2017-06-14 14:20:22
|
Revision: 8112
http://sourceforge.net/p/docutils/code/8112
Author: milde
Date: 2017-06-14 14:20:20 +0000 (Wed, 14 Jun 2017)
Log Message:
-----------
small documentation fixes
Modified Paths:
--------------
trunk/docutils/docs/dev/release.txt
trunk/docutils/docs/user/smartquotes.txt
trunk/docutils/setup.py
Modified: trunk/docutils/docs/dev/release.txt
===================================================================
--- trunk/docutils/docs/dev/release.txt 2017-06-10 20:35:01 UTC (rev 8111)
+++ trunk/docutils/docs/dev/release.txt 2017-06-14 14:20:20 UTC (rev 8112)
@@ -253,9 +253,11 @@
`Upload the wheels to PyPI`_.
- Question: Can we have an tar.gz (distutil) and a py2-wheel and a py3-wheel
- on pypi and will installers select the correct files ?
+ Question:
+ Can we have an tar.gz (distutil) and a py2-wheel and a py3-wheel
+ on pypi and will installers select the correct files?
+ 2017-06-09 it seems to according to experience with 0.13.1.
.. _wheels: https://packaging.python.org/en/latest/distributing.html#wheels
.. _pure Python wheels:
@@ -271,9 +273,10 @@
* do...@py...
* pyt...@py...
-* **Add a SourceForge News item, with title "Docutils X.Y.Z released"
- and containing the release tarball's download URL.**
+* **Add a `SourceForge News item`__, with title "Docutils X.Y.Z released"**
+ __ https://sourceforge.net/p/docutils/news
+
**Mark as default download for all platforms.**
* **Register with freecode.** Add a new release for the
Modified: trunk/docutils/docs/user/smartquotes.txt
===================================================================
--- trunk/docutils/docs/user/smartquotes.txt 2017-06-10 20:35:01 UTC (rev 8111)
+++ trunk/docutils/docs/user/smartquotes.txt 2017-06-14 14:20:20 UTC (rev 8112)
@@ -403,7 +403,7 @@
------------------------
The ASCII character (u0027 APOSTROPHE) is used for apostrophe and single
-quotes. If use inside a word, it is converted into an apostrophe:
+quotes. If used inside a word, it is converted into an apostrophe:
.. class:: language-fr
Modified: trunk/docutils/setup.py
===================================================================
--- trunk/docutils/setup.py 2017-06-10 20:35:01 UTC (rev 8111)
+++ trunk/docutils/setup.py 2017-06-14 14:20:20 UTC (rev 8112)
@@ -223,7 +223,7 @@
'Natural Language :: Spanish',
'Natural Language :: Swedish',
]
-# BUG pypi did not like fllowing languages
+# BUG pypi did not like following languages
# 'Natural Language :: Lithuanian',
"""Trove classifiers for the Distutils "register" command."""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <go...@us...> - 2017-06-15 22:38:32
|
Revision: 8113
http://sourceforge.net/p/docutils/code/8113
Author: goodger
Date: 2017-06-15 22:38:30 +0000 (Thu, 15 Jun 2017)
Log Message:
-----------
Simplified docutils.__version_info__; documented dropping compatibility with Python 2.4 & 2.5 in release after 0.14.
Modified Paths:
--------------
trunk/docutils/RELEASE-NOTES.txt
trunk/docutils/docutils/__init__.py
Modified: trunk/docutils/RELEASE-NOTES.txt
===================================================================
--- trunk/docutils/RELEASE-NOTES.txt 2017-06-14 14:20:20 UTC (rev 8112)
+++ trunk/docutils/RELEASE-NOTES.txt 2017-06-15 22:38:30 UTC (rev 8113)
@@ -22,19 +22,11 @@
Future changes
==============
+* Drop support for Python 2.4 and 2.5 immediately after the 0.14 release.
+
* Remove the `handle_io_errors` option from io.FileInput/Output.
Used by Sphinx up to version 1.3.1, fixed in 1.3.2 (Nov 29, 2015).
-* Drop support for Python 2.4 and 2.5.
-
-* »Prune« the doctree (no change to the reST input syntax):
-
- - "doctest" element -> literal block with "pycon" (python-console)
- class argument and syntax highlight (like the "code" directive),
- - special admonitions (note, hint, warning, ...) -> generic "admonition"
- element with class attribute and auto-generated title.
-
-
* The default HTML writer "html" with frontend ``rst2html.py`` may change
from "html4css1" to "html5".
@@ -103,12 +95,12 @@
- New HTML writer generating `HTML 5`_.
+ .. _HTML 5: http://www.w3.org/TR/html5/
+
* tools/
- New front-end ``rst2html5.py``.
-.. _HTML 5: http://www.w3.org/TR/html5/
-
* languages: persian/farsi (fa) and latvian (la) mappings.
* change default base url for :rfc: to http://tools.ietf.org/html/
@@ -116,7 +108,7 @@
* tables accept widths, a list and align
* latex2e: Fix admonition width, remove deprecated options,
- better tablewidth auto, ...
+ better tablewidth auto, ...
* rst.el: The problem with ``electric-indent-mode`` has been fixed.
Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py 2017-06-14 14:20:20 UTC (rev 8112)
+++ trunk/docutils/docutils/__init__.py 2017-06-15 22:38:30 UTC (rev 8113)
@@ -52,46 +52,26 @@
import sys
-try:
- # Python 2.6 required:
- from collections import namedtuple
-except ImportError:
- namedtuple = None
-
__docformat__ = 'reStructuredText'
-# workaround for Python < 2.6:
-__version_info__ = (0, 14, 0, 'rc', 2, True)
-if namedtuple:
- __version_info__ = (
- namedtuple(
- 'version_info',
- ['major', 'minor', 'micro', 'releaselevel', 'serial', 'development'])
- (*__version_info__))
-
-__version__ = '%s.%s%s%s%s%s' % (
- __version_info__[0], # major
- __version_info__[1], # minor
- ('.%s' % __version_info__[2]) if __version_info__[2] else '', # micro
- __version_info__[3], # releaselevel
- __version_info__[4] if __version_info__[4] else '', # serial
- '.dev' if __version_info__[5] else '') # development
+__version__ = '0.14rc2.dev'
"""The Docutils version number (complies with PEP 440)::
- major.minor[.micro][{releaselevel}serial][.dev]
+ major.minor[.micro][releaselevel[serial]][.dev]
* The major number will be bumped when the project is feature-complete, and
later if there is a major change in the design or API.
* The minor number is bumped whenever there are new features.
-* The micro number is bumped for bug-fix releases. Omitted for micro=0.
-* The releaselevel string is used for pre-releases, one of 'a' (alpha),
- 'b' (beta), or 'rc' (release candidate). Omitted for final releases.
-* The serial number is used when
-* The '.dev' suffix indicates active development, unreleased, before the
+* The micro number is bumped for bug-fix releases. Omitted if micro=0.
+* The releaselevel abbreviation string is used for pre-releases, one of 'a'
+ (alpha), 'b' (beta), or 'rc' (release 'candidate'). Omitted for final
+ releases.
+* The serial release number identifies prereleases; omitted if 0.
+* The '.dev' suffix indicates active development, not a release, before the
version indicated.
-Rather than parsing the `__version__` text, use `__version_info__`.
+Rather than parsing the text of `__version__`, use `__version_info__`.
"""
__version_details__ = 'repository'
@@ -98,7 +78,25 @@
"""Extra version details (e.g. 'snapshot 2005-05-29, r3410', 'repository',
'prerelease', 'release'), modified automatically & manually."""
+# workaround for Python < 2.6:
+__version_info__ = (0, 14, 0, 'candidate', 2, False)
+# To add in Docutils 0.15, replacing the line above:
+"""
+from collections import namedtuple
+VersionInfo = namedtuple(
+ 'VersionInfo', 'major minor micro releaselevel serial release')
+__version_info__ = VersionInfo(
+ major=0,
+ minor=14,
+ micro=0,
+ # one of 'alpha', 'beta', 'candidate', 'final':
+ releaselevel='candidate',
+ # 0 for the in-development stage before a release is planned:
+ serial=2,
+ release=False)
+"""
+
class ApplicationError(StandardError):
# Workaround:
# In Python < 2.6, unicode(<exception instance>) calls `str` on the
@@ -108,6 +106,7 @@
def __unicode__(self):
return u', '.join(self.args)
+
class DataError(ApplicationError): pass
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2017-06-16 20:50:50
|
Revision: 8115
http://sourceforge.net/p/docutils/code/8115
Author: milde
Date: 2017-06-16 20:50:47 +0000 (Fri, 16 Jun 2017)
Log Message:
-----------
Fix [ 319 ] MathJax CDN shut down on April 30, 2017.
For security reasons, we do not use a third party public installation as
default. Instead, if warn if math-output_ is set to MathJax without URL
and use a local MathJax installation on the client machine as fallback.
Modified Paths:
--------------
trunk/docutils/HISTORY.txt
trunk/docutils/RELEASE-NOTES.txt
trunk/docutils/docs/user/config.txt
trunk/docutils/docutils/writers/_html_base.py
trunk/docutils/test/functional/expected/math_output_mathjax.html
trunk/docutils/test/functional/tests/math_output_mathjax.py
trunk/docutils/test/test_writers/test_html4css1_misc.py
trunk/docutils/test/test_writers/test_html5_polyglot_misc.py
Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt 2017-06-16 09:01:13 UTC (rev 8114)
+++ trunk/docutils/HISTORY.txt 2017-06-16 20:50:47 UTC (rev 8115)
@@ -14,7 +14,7 @@
.. contents::
-Prerelease 0.14rc1 (2017-05-27)
+Prerelease 0.14rc2
===============================
* docs/ref/docutils.dtd:
@@ -75,6 +75,9 @@
- Provide default title in metadata (required by HTML5).
- Fix [ 312 ] HTML writer generates invalid HTML if the table has two tags.
+ - Fix [ 319 ] The MathJax CDN shut down on April 30, 2017. For security
+ reasons, we don't use a third party public installation as default but
+ warn if math-output_ is set to MathJax without URL.
* docutils/writers/html4css1/__init__.py
@@ -86,7 +89,7 @@
in a "DUclass" environment. This replaces the special handling for
"epigraph" and "topic" elements.
-* docutils/writers/odf_ odt/__init__.py:
+* docutils/writers/odf_odt/__init__.py:
- Command setting ``language`` now sets the default language
of the generated ODF document.
Modified: trunk/docutils/RELEASE-NOTES.txt
===================================================================
--- trunk/docutils/RELEASE-NOTES.txt 2017-06-16 09:01:13 UTC (rev 8114)
+++ trunk/docutils/RELEASE-NOTES.txt 2017-06-16 20:50:47 UTC (rev 8115)
@@ -40,7 +40,7 @@
.. _rst2html.py: docs/user/tools.html#rst2html-py
-Prerelease 0.14rc1 (2017-05-27)
+Prerelease 0.14rc2
===============================
* docutils/docs/ref/docutils.dtd:
@@ -52,21 +52,22 @@
- Added functionality: escaped whitespace in URI contexts.
- Consistent handling of all whitespace characters in inline markup
recognition. (May break documents that relied on some whitespace
- characters (NBSP, ...) not to be recognized as whitespace.)
+ characters (NBSP, ...) *not* to be recognized as whitespace.)
* docutils/utils/smartquotes.py:
- Update quote definitions for et, fi, fr, ro, sv, tr, uk.
- Add quote definitions for hr, hsb, hu, lv, sh, sl, sr.
- - Fix [ 313 ] Differentiate apostrophe from closing single quote
- (if possible).
- - Fix [ 317 ] Extra space inserted with French smartquotes.
+ - Differentiate apostrophe from closing single quote (if possible).
- Add command line interface for stand-alone use (requires 2.7).
* docutils/writers/_html_base:
- Provide default title in metadata.
- - Fix [ 312 ] HTML writer generates invalid HTML if the table has two tags.
+ - The MathJax CDN shut down on April 30, 2017. For security reasons, we
+ don't use a third party public installation as default but warn
+ if `math-output` is set to MathJax without specifying a URL.
+ See math-output_ for details.
* docutils/writers/html4css1:
@@ -78,10 +79,10 @@
in a "DUclass" environment. This replaces the special handling for
"epigraph" and "topic" elements.
-* docutils/writers/odf_ odt:
+* docutils/writers/odf_odt:
- Language option sets ODF document's default language
- - Image width, scale, ... set image size in generated ODF.
+ - Image width, scale, ... set image size in generated ODF.
* tools/
Modified: trunk/docutils/docs/user/config.txt
===================================================================
--- trunk/docutils/docs/user/config.txt 2017-06-16 09:01:13 UTC (rev 8114)
+++ trunk/docutils/docs/user/config.txt 2017-06-16 20:50:47 UTC (rev 8115)
@@ -990,13 +990,11 @@
(i.e. if there is mathematical content in the document).
:MathJax:
- Format math for display with MathJax_, a JavaScript-based math
- rendering engine that uses HTML/CSS, JavaScript, and unicode
- fonts for high-quality typesetting that is scalable and prints
- at full resolution.
+ Format math for display with MathJax_, a JavaScript-based math rendering
+ engine.
Pro:
- Works 'out of the box' across multiple browsers and platforms.
+ Works across multiple browsers and platforms.
Large set of `supported LaTeX math commands and constructs`__
@@ -1003,17 +1001,42 @@
__ http://docs.mathjax.org/en/latest/tex.html#supported-latex-commands
Con:
- Requires an Internet connection or a local MathJax
- installation and configuration.
+ Rendering requires JavaScript and an Internet connection or local
+ MathJax installation.
- Downloads JavaScript code from a third-party site.
+ A URL pointing to a MathJax library should be appended after whitespace.
+ A warning is given if this is missing.
- A custom URI can be appended after whitespace,
- for example a local installation ::
+ * It is recommended to install__ the MathJax library on the same
+ server as the rest of the deployed site files.
- math-output: MathJax file:/usr/share/javascript/mathjax/MathJax.js
+ __ http://docs.mathjax.org/en/latest/installation.html
+ Example: Install the library at the top level of the web
+ server’s hierarchy in the directory ``MathJax`` and set::
+ math-output: mathjax /MathJax/MathJax.js
+
+ * The easiest way to use MathJax is to link directly to a public
+ installation. In that case, there is no need to install MathJax locally.
+
+ Downside: Downloads JavaScript code from a third-party site --- opens
+ the door to cross-site scripting attacs!
+
+ Example: MathJax.org recommends ``cdnjs.cloudflare.com``::
+
+ math-output: mathjax
+ https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js
+
+ See https://cdnjs.com/about and https://www.cloudflare.com/terms/ for
+ details and terms of use.
+
+ * Use a local MathJax installation on the *client* machine, e.g.::
+
+ math-output: MathJax file:/usr/share/javascript/mathjax/MathJax.js
+
+ This is the fallback if no URL is specified.
+
:MathML:
Embed math content as presentational MathML_.
@@ -1027,31 +1050,28 @@
subset of LaTeX syntax.
With the "html4css1" writer, the resulting HTML document does
- not validate, as there is no DTD for MathML + XHTML
- Transitional. However, MathML-enabled browsers will render it
- fine.
+ not validate, as there is no DTD for `MathML + XHTML Transitional`.
+ However, MathML-enabled browsers will render it fine.
- An external converter can be appended after whitespace:
+ An external converter can be appended after whitespace, e.g.,
+ ``--math-output="MathML latexml"``:
- * ``math-output: MathML blahtexml``
+ blahtexml_
+ Fast conversion, support for many symbols and environments, but no
+ "align" (or other equation-aligning) environment. (C++)
- blahtexml_ (C++) Fast conversion, support for many symbols and
- environments, but no "align" (or other equation-aligning) environment.
+ LaTeXML_
+ Comprehensive macro support but very slow. (Perl)
- * ``--math-output=MathML latexml``.
+ TtM_
+ No "matrix", "align" and "cases" environments. Support may be removed.
- LaTeXML_ (Perl) Comprehensive macro support but very slow
-
- * ``--math-output=MathML ttm``, support may be removed.
-
- No "matrix", "align" and "cases" environments.
-
:LaTeX:
Include literal LaTeX code.
The failsave fallback.
-Default: "HTML math.css" (MathML for the xhtml11 writer).
+Default: "HTML math.css" (The `[html5 writer]`_ defaults to "MathML").
Option: ``--math-output``.
New in Docutils 0.8.
@@ -1062,7 +1082,7 @@
.. _MathML: http://www.w3.org/TR/MathML/
.. _blahtexml: http://gva.noekeon.org/blahtexml/
.. _LaTeXML: http://dlmf.nist.gov/LaTeXML/
-.. _ttm: http://hutchinson.belmont.ma.us/tth/mml/
+.. _TtM: http://hutchinson.belmont.ma.us/tth/mml/
option_limit
~~~~~~~~~~~~
@@ -1315,6 +1335,9 @@
Different default for:
+`math_output`_
+ Default: "MathML"
+
`stylesheet_path <stylesheet_path [html4css1 writer]_>`_:
Default: "minimal.css,plain.css"
Modified: trunk/docutils/docutils/writers/_html_base.py
===================================================================
--- trunk/docutils/docutils/writers/_html_base.py 2017-06-16 09:01:13 UTC (rev 8114)
+++ trunk/docutils/docutils/writers/_html_base.py 2017-06-16 20:50:47 UTC (rev 8115)
@@ -94,7 +94,8 @@
class HTMLTranslator(nodes.NodeVisitor):
- """Generic Docutils to HTML translator.
+ """
+ Generic Docutils to HTML translator.
See the `html4css1` and `html5_polyglot` writers for full featured
HTML writers.
@@ -113,13 +114,13 @@
def visit_field_list(self, node):
if foo:
- self.body.append('<div class="foo">\n')
+ self.body.append('<div class="foo">')
html4css1.HTMLTranslator.visit_field_list(self, node)
def depart_field_list(self, node):
html4css1.HTMLTranslator.depart_field_list(self, node)
if foo:
- self.body.append('</div>\n')
+ self.body.append('</div>')
c) Overwrite both, call the parent functions under the same
conditions::
@@ -141,7 +142,7 @@
def depart_field_list(self, node):
html4css1.HTMLTranslator.depart_field_list(self, node)
if 'rfc2822' in node['classes']:
- self.body.append('<hr />\n')
+ self.body.append('<hr />')
This way, changes in stack use will not bite you.
"""
@@ -158,13 +159,22 @@
# Template for the MathJax script in the header:
mathjax_script = '<script type="text/javascript" src="%s"></script>\n'
- # The latest version of MathJax from the distributed server:
- # avaliable to the public under the `MathJax CDN Terms of Service`__
- # __http://www.mathjax.org/download/mathjax-cdn-terms-of-service/
- # may be overwritten by custom URL appended to "mathjax"
- mathjax_url = ('https://cdn.mathjax.org/mathjax/latest/MathJax.js?'
- 'config=TeX-AMS_CHTML')
+ mathjax_url = 'file:/usr/share/javascript/mathjax/MathJax.js'
+ """
+ URL of the MathJax javascript library.
+
+ The MathJax library ought to be installed on the same
+ server as the rest of the deployed site files and specified
+ in the `math-output` setting appended to "mathjax".
+ See `Docutils Configuration`__.
+
+ __ http://docutils.sourceforge.net/docs/user/config.html#math-output
+
+ The fallback tries a local MathJax installation at
+ ``/usr/share/javascript/mathjax/MathJax.js``.
+ """
+
stylesheet_link = '<link rel="stylesheet" href="%s" type="text/css" />\n'
embedded_stylesheet = '<style type="text/css">\n\n%s\n</style>\n'
words_and_spaces = re.compile(r'\S+| +|\n')
@@ -1099,8 +1109,15 @@
if self.math_output in ('latex', 'mathjax'):
math_code = self.encode(math_code)
if self.math_output == 'mathjax' and not self.math_header:
- if self.math_output_options:
+ try:
self.mathjax_url = self.math_output_options[0]
+ except IndexError:
+ self.document.reporter.warning('No MathJax URL specified, '
+ 'using local fallback (see config.html)')
+ # append configuration, if not already present in the URL:
+ # input LaTeX with AMS, output common HTML
+ if '?' not in self.mathjax_url:
+ self.mathjax_url += '?config=TeX-AMS_CHTML'
self.math_header = [self.mathjax_script % self.mathjax_url]
elif self.math_output == 'html':
if self.math_output_options and not self.math_header:
Modified: trunk/docutils/test/functional/expected/math_output_mathjax.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathjax.html 2017-06-16 09:01:13 UTC (rev 8114)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html 2017-06-16 20:50:47 UTC (rev 8115)
@@ -5,7 +5,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
<title>Mathematics</title>
-<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_CHTML"></script>
+<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" />
</head>
<body>
Modified: trunk/docutils/test/functional/tests/math_output_mathjax.py
===================================================================
--- trunk/docutils/test/functional/tests/math_output_mathjax.py 2017-06-16 09:01:13 UTC (rev 8114)
+++ trunk/docutils/test/functional/tests/math_output_mathjax.py 2017-06-16 20:50:47 UTC (rev 8115)
@@ -8,8 +8,7 @@
writer_name = "html"
# Settings
-settings_overrides['math_output'] = 'MathJax'
+settings_overrides['math_output'] = 'MathJax /usr/share/javascript/mathjax/MathJax.js'
# local copy of default stylesheet:
-settings_overrides['stylesheet_path'] = (
+settings_overrides['stylesheet_path'] = (
'functional/input/data/html4css1.css')
-
Modified: trunk/docutils/test/test_writers/test_html4css1_misc.py
===================================================================
--- trunk/docutils/test/test_writers/test_html4css1_misc.py 2017-06-16 09:01:13 UTC (rev 8114)
+++ trunk/docutils/test/test_writers/test_html4css1_misc.py 2017-06-16 20:50:47 UTC (rev 8115)
@@ -141,10 +141,9 @@
which is open to change in future Docutils releases. """
mathjax_script = '<script type="text/javascript" src="%s">'
- default_mathjax_url = ('https://cdn.mathjax.org/mathjax/latest/MathJax.js'
+ default_mathjax_url = ('file:/usr/share/javascript/mathjax/MathJax.js'
'?config=TeX-AMS_CHTML')
- custom_mathjax_url = ('file:///usr/share/javascript/mathjax/MathJax.js'
- '?config=TeX-AMS-MML_HTMLorMML')
+ custom_mathjax_url = ('/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML')
data = ':math:`42`'
def test_math_output_default(self):
@@ -158,6 +157,7 @@
# Explicitly specifying math_output=MathJax, case insensitively
# use default MathJax URL
mysettings = {'_disable_config': True,
+ 'report_level': 3,
'math_output': 'MathJax'}
head = core.publish_parts(self.data, writer_name='html4css1',
settings_overrides=mysettings)['head']
Modified: trunk/docutils/test/test_writers/test_html5_polyglot_misc.py
===================================================================
--- trunk/docutils/test/test_writers/test_html5_polyglot_misc.py 2017-06-16 09:01:13 UTC (rev 8114)
+++ trunk/docutils/test/test_writers/test_html5_polyglot_misc.py 2017-06-16 20:50:47 UTC (rev 8115)
@@ -141,10 +141,9 @@
which is open to change in future Docutils releases. """
mathjax_script = '<script type="text/javascript" src="%s">'
- default_mathjax_url = ('https://cdn.mathjax.org/mathjax/latest/MathJax.js'
+ default_mathjax_url = ('file:/usr/share/javascript/mathjax/MathJax.js'
'?config=TeX-AMS_CHTML')
- custom_mathjax_url = ('file:///usr/share/javascript/mathjax/MathJax.js'
- '?config=TeX-AMS-MML_HTMLorMML')
+ custom_mathjax_url = ('/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML')
data = ':math:`42`'
def test_math_output_default(self):
@@ -158,6 +157,7 @@
# Explicitly specifying math_output=MathJax, case insensitively
# use default MathJax URL
mysettings = {'_disable_config': True,
+ 'report_level': 3,
'math_output': 'MathJax'}
head = core.publish_parts(self.data, writer_name='html5_polyglot',
settings_overrides=mysettings)['head']
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2017-06-18 19:09:42
|
Revision: 8116
http://sourceforge.net/p/docutils/code/8116
Author: milde
Date: 2017-06-18 19:09:40 +0000 (Sun, 18 Jun 2017)
Log Message:
-----------
Apply [ 141 ] Handling inline in manpage writer.
Thanks to Masatake YAMATO for report and patch.
Modified Paths:
--------------
trunk/docutils/HISTORY.txt
trunk/docutils/docutils/writers/manpage.py
Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt 2017-06-16 20:50:47 UTC (rev 8115)
+++ trunk/docutils/HISTORY.txt 2017-06-18 19:09:40 UTC (rev 8116)
@@ -77,7 +77,7 @@
- Fix [ 312 ] HTML writer generates invalid HTML if the table has two tags.
- Fix [ 319 ] The MathJax CDN shut down on April 30, 2017. For security
reasons, we don't use a third party public installation as default but
- warn if math-output_ is set to MathJax without URL.
+ warn if math-output_ is set to MathJax without specifying a URL.
* docutils/writers/html4css1/__init__.py
@@ -89,6 +89,10 @@
in a "DUclass" environment. This replaces the special handling for
"epigraph" and "topic" elements.
+* docutils/writers/manpage.py
+
+ - Apply [ 141 ] Handling inline in manpage writer.
+
* docutils/writers/odf_odt/__init__.py:
- Command setting ``language`` now sets the default language
Modified: trunk/docutils/docutils/writers/manpage.py
===================================================================
--- trunk/docutils/docutils/writers/manpage.py 2017-06-16 20:50:47 UTC (rev 8115)
+++ trunk/docutils/docutils/writers/manpage.py 2017-06-18 19:09:40 UTC (rev 8116)
@@ -403,7 +403,7 @@
self.defs['strong'][0],
self.language.labels.get(name, name).upper(),
self.defs['strong'][1],
- )
+ )
self.body.append(name)
self.visit_block_quote(node)
@@ -755,6 +755,12 @@
depart_important = depart_admonition
+ def visit_inline(self, node):
+ pass
+
+ def depart_inline(self, node):
+ pass
+
def visit_label(self, node):
# footnote and citation
if (isinstance(node.parent, nodes.footnote)
@@ -818,7 +824,7 @@
# BUG/HACK: indent alway uses the _last_ indention,
# thus we need two of them.
self.indent(LITERAL_BLOCK_INDENT)
- self.indent(0)
+ self.indent(0)
self.body.append(self.defs['literal_block'][0])
self._in_literal = True
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2017-06-18 23:38:21
|
Revision: 8117
http://sourceforge.net/p/docutils/code/8117
Author: milde
Date: 2017-06-18 23:38:18 +0000 (Sun, 18 Jun 2017)
Log Message:
-----------
Fix [ 320 ] Russian docinfo fields not recognized.
Modified Paths:
--------------
trunk/docutils/HISTORY.txt
trunk/docutils/docutils/transforms/frontmatter.py
trunk/docutils/test/test_transforms/test_docinfo.py
Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt 2017-06-18 19:09:40 UTC (rev 8116)
+++ trunk/docutils/HISTORY.txt 2017-06-18 23:38:18 UTC (rev 8117)
@@ -49,6 +49,10 @@
- Rework patch [ 120 ] (revert change to ``Table.get_column_widths()``
that led to problems in an application with a custom table directive).
+* docutils/transforms/frontmatter.py
+
+ - Fix [ 320 ] Russian docinfo fields not recognized.
+
* docutils/transforms/references.py
- Don't add a second ID to problematic references.
Modified: trunk/docutils/docutils/transforms/frontmatter.py
===================================================================
--- trunk/docutils/docutils/transforms/frontmatter.py 2017-06-18 19:09:40 UTC (rev 8116)
+++ trunk/docutils/docutils/transforms/frontmatter.py 2017-06-18 23:38:18 UTC (rev 8117)
@@ -403,7 +403,7 @@
for field in field_list:
try:
name = field[0][0].astext()
- normedname = nodes.make_id(name)
+ normedname = nodes.fully_normalize_name(name)
if not (len(field) == 2 and normedname in bibliofields
and self.check_empty_biblio_field(field, name)):
raise TransformError
@@ -433,8 +433,10 @@
and isinstance(field[-1][0], nodes.paragraph):
utils.clean_rcs_keywords(
field[-1][0], self.rcs_keyword_substitutions)
- if normedname and normedname not in bibliofields:
- field['classes'].append(normedname)
+ if normedname not in bibliofields:
+ classvalue = nodes.make_id(normedname)
+ if classvalue:
+ field['classes'].append(classvalue)
docinfo.append(field)
nodelist = []
if len(docinfo) != 0:
Modified: trunk/docutils/test/test_transforms/test_docinfo.py
===================================================================
--- trunk/docutils/test/test_transforms/test_docinfo.py 2017-06-18 19:09:40 UTC (rev 8116)
+++ trunk/docutils/test/test_transforms/test_docinfo.py 2017-06-18 23:38:18 UTC (rev 8117)
@@ -1,4 +1,5 @@
#! /usr/bin/env python
+# -*- coding: utf-8 -*-
# $Id$
# Author: David Goodger <go...@py...>
@@ -15,11 +16,19 @@
def suite():
parser = Parser()
- s = DocutilsTestSupport.TransformTestSuite(parser)
+ settings = {'language_code': 'en'}
+ s = DocutilsTestSupport.TransformTestSuite(
+ parser, suite_settings=settings)
s.generateTests(totest)
+ settings['language_code'] = 'de'
+ s.generateTests(totest_de)
+ settings['language_code'] = 'ru'
+ s.generateTests(totest_ru)
return s
totest = {}
+totest_de = {}
+totest_ru = {}
totest['bibliographic_field_lists'] = ((DocInfo,), [
["""\
@@ -326,7 +335,93 @@
"""],
])
+totest_de['bibliographic_field_lists'] = ((DocInfo,), [
+[u"""\
+.. Bibliographic element extraction for a German document.
+:Zusammenfassung: Abstract 1.
+:Autor: Me
+:Adresse: 123 My Street
+ Example, EX
+:Kontakt: me...@my...
+:Version: 1
+:Datum: 2001-08-11
+:Parameter i: integer
+""",
+u"""\
+<document source="test data">
+ <docinfo>
+ <author>
+ Me
+ <address xml:space="preserve">
+ 123 My Street
+ Example, EX
+ <contact>
+ <reference refuri="mailto:me...@my...">
+ me...@my...
+ <version>
+ 1
+ <date>
+ 2001-08-11
+ <field classes="parameter-i">
+ <field_name>
+ Parameter i
+ <field_body>
+ <paragraph>
+ integer
+ <topic classes="abstract">
+ <title>
+ Zusammenfassung
+ <paragraph>
+ Abstract 1.
+ <comment xml:space="preserve">
+ Bibliographic element extraction for a German document.
+"""],])
+
+totest_ru['bibliographic_field_lists'] = ((DocInfo,), [
+[u"""\
+.. Bibliographic element extraction for a Russian document.
+
+:аннотация: Abstract 1.
+:автор: Me
+:адрес: 123 My Street
+ Example, EX
+:контакт: me...@my...
+:версия: 1
+:дата: 2001-08-11
+:Parameter i: integer
+""",
+u"""\
+<document source="test data">
+ <docinfo>
+ <author>
+ Me
+ <address xml:space="preserve">
+ 123 My Street
+ Example, EX
+ <contact>
+ <reference refuri="mailto:me...@my...">
+ me...@my...
+ <version>
+ 1
+ <date>
+ 2001-08-11
+ <field classes="parameter-i">
+ <field_name>
+ Parameter i
+ <field_body>
+ <paragraph>
+ integer
+ <topic classes="abstract">
+ <title>
+ Аннотация
+ <paragraph>
+ Abstract 1.
+ <comment xml:space="preserve">
+ Bibliographic element extraction for a Russian document.
+"""],])
+
+
if __name__ == '__main__':
import unittest
unittest.main(defaultTest='suite')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2017-06-22 20:59:22
|
Revision: 8119
http://sourceforge.net/p/docutils/code/8119
Author: milde
Date: 2017-06-22 20:59:19 +0000 (Thu, 22 Jun 2017)
Log Message:
-----------
Fix [ 321 ] Import block might cause name error.
Modified Paths:
--------------
trunk/docutils/HISTORY.txt
trunk/docutils/docutils/utils/error_reporting.py
Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt 2017-06-22 20:25:22 UTC (rev 8118)
+++ trunk/docutils/HISTORY.txt 2017-06-22 20:59:19 UTC (rev 8119)
@@ -66,6 +66,10 @@
- Added ``split_escaped_whitespace`` function, support for escaped
whitespace in URI contexts.
+* docutils/utils/error_reporting.py
+
+ - Fix [ 321 ] Import block might cause name error.
+
* docutils/utils/smartquotes.py:
- Update quote definitions for languages et, fi, fr, ro, sv, tr, uk.
Modified: trunk/docutils/docutils/utils/error_reporting.py
===================================================================
--- trunk/docutils/docutils/utils/error_reporting.py 2017-06-22 20:25:22 UTC (rev 8118)
+++ trunk/docutils/docutils/utils/error_reporting.py 2017-06-22 20:59:19 UTC (rev 8119)
@@ -54,6 +54,8 @@
# and https://sourceforge.net/p/docutils/bugs/298/
if "unknown locale: UTF-8" in error.args:
locale_encoding = "UTF-8"
+ else:
+ locale_encoding = None
except: # any other problems determining the locale -> use None
locale_encoding = None
try:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2017-06-23 09:34:31
|
Revision: 8126
http://sourceforge.net/p/docutils/code/8126
Author: milde
Date: 2017-06-23 09:34:28 +0000 (Fri, 23 Jun 2017)
Log Message:
-----------
Add test for __version_info__, fix output of optional __version_details__.
Modified Paths:
--------------
trunk/docutils/docutils/core.py
trunk/docutils/docutils/frontend.py
trunk/docutils/test/test__init__.py
trunk/docutils/tools/quicktest.py
Modified: trunk/docutils/docutils/core.py
===================================================================
--- trunk/docutils/docutils/core.py 2017-06-23 06:41:27 UTC (rev 8125)
+++ trunk/docutils/docutils/core.py 2017-06-23 09:34:28 UTC (rev 8126)
@@ -279,9 +279,11 @@
print >>self._stderr, ("""\
Exiting due to error. Use "--traceback" to diagnose.
Please report errors to <doc...@li...>.
-Include "--traceback" output, Docutils version (%s [%s]),
+Include "--traceback" output, Docutils version (%s%s),
Python version (%s), your OS type & version, and the
-command line used.""" % (__version__, __version_details__,
+command line used.""" % (__version__,
+ docutils.__version_details__ and
+ ' [%s]'%docutils.__version_details__ or '',
sys.version.split()[0]))
def report_SystemMessage(self, error):
Modified: trunk/docutils/docutils/frontend.py
===================================================================
--- trunk/docutils/docutils/frontend.py 2017-06-23 06:41:27 UTC (rev 8125)
+++ trunk/docutils/docutils/frontend.py 2017-06-23 09:34:28 UTC (rev 8126)
@@ -570,8 +570,10 @@
config_section = 'general'
- version_template = ('%%prog (Docutils %s [%s], Python %s, on %s)'
- % (docutils.__version__, docutils.__version_details__,
+ version_template = ('%%prog (Docutils %s%s, Python %s, on %s)'
+ % (docutils.__version__,
+ docutils.__version_details__ and
+ ' [%s]'%docutils.__version_details__ or '',
sys.version.split()[0], sys.platform))
"""Default version message."""
Modified: trunk/docutils/test/test__init__.py
===================================================================
--- trunk/docutils/test/test__init__.py 2017-06-23 06:41:27 UTC (rev 8125)
+++ trunk/docutils/test/test__init__.py 2017-06-23 09:34:28 UTC (rev 8126)
@@ -23,6 +23,16 @@
err = docutils.ApplicationError(u'\u0169')
self.assertEqual(unicode(err), u'\u0169')
+class VersionInfoTests(unittest.TestCase):
+ def test_version_info(self):
+ self.assertEqual(len(docutils.__version_info__), 6)
+ # self.assertEqual(type(docutils.__version_info__.major), int)
+ # self.assertEqual(type(docutils.__version_info__.minor), int)
+ # self.assertEqual(type(docutils.__version_info__.micro), int)
+ # self.assertEqual(type(docutils.__version_info__.releaselevel), str)
+ # self.assertEqual(type(docutils.__version_info__.serial), int)
+ # self.assertEqual(type(docutils.__version_info__.release), bool)
+
if __name__ == '__main__':
unittest.main()
Modified: trunk/docutils/tools/quicktest.py
===================================================================
--- trunk/docutils/tools/quicktest.py 2017-06-23 06:41:27 UTC (rev 8125)
+++ trunk/docutils/tools/quicktest.py 2017-06-23 09:34:28 UTC (rev 8126)
@@ -142,9 +142,10 @@
usage()
sys.exit()
elif o in ['-V', '--version']:
- sys.stderr.write('quicktest.py (Docutils %s [%s])\n' %
- (docutils.__version__,
- docutils.__version_details__))
+ sys.stderr.write('quicktest.py (Docutils %s%s)\n' %
+ (docutils.__version__,
+ docutils.__version_details__ and
+ ' [%s]'%docutils.__version_details__ or ''))
sys.exit()
elif o in ['-r', '--rawxml']:
outputFormat = 'rawxml'
@@ -180,7 +181,7 @@
EasyDialogs.Message("""\
Use the next dialog to build a command line:
-1. Choose an output format from the [Option] list
+1. Choose an output format from the [Option] list
2. Click [Add]
3. Choose an input file: [Add existing file...]
4. Save the output: [Add new file...]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gr...@us...> - 2017-07-08 09:36:30
|
Revision: 8134
http://sourceforge.net/p/docutils/code/8134
Author: grubert
Date: 2017-07-08 09:36:27 +0000 (Sat, 08 Jul 2017)
Log Message:
-----------
0.14rc2 release
Modified Paths:
--------------
trunk/docutils/docutils/__init__.py
trunk/docutils/setup.py
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/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.xhtml
trunk/docutils/test/functional/expected/misc_rst_html4css1.html
trunk/docutils/test/functional/expected/pep_html.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_s5_html_1.html
trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py 2017-07-05 14:33:33 UTC (rev 8133)
+++ trunk/docutils/docutils/__init__.py 2017-07-08 09:36:27 UTC (rev 8134)
@@ -55,7 +55,7 @@
__docformat__ = 'reStructuredText'
-__version__ = '0.14rc2.dev'
+__version__ = '0.14rc2'
"""Docutils version identifier (complies with PEP 440)::
major.minor[.micro][releaselevel[serial]][.dev]
@@ -75,7 +75,7 @@
"""
# workaround for Python < 2.6:
-__version_info__ = (0, 14, 0, 'candidate', 2, False)
+__version_info__ = (0, 14, 0, 'candidate', 2, True)
# To add in Docutils 0.15, replacing the line above:
"""
from collections import namedtuple
Modified: trunk/docutils/setup.py
===================================================================
--- trunk/docutils/setup.py 2017-07-05 14:33:33 UTC (rev 8133)
+++ trunk/docutils/setup.py 2017-07-08 09:36:27 UTC (rev 8134)
@@ -115,7 +115,7 @@
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.14rc2.dev',
+ 'version': '0.14rc2',
'author': 'David Goodger',
'author_email': 'go...@py...',
'maintainer': 'docutils-develop list',
Modified: trunk/docutils/test/functional/expected/compact_lists.html
===================================================================
--- trunk/docutils/test/functional/expected/compact_lists.html 2017-07-05 14:33:33 UTC (rev 8133)
+++ trunk/docutils/test/functional/expected/compact_lists.html 2017-07-08 09:36:27 UTC (rev 8134)
@@ -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.14rc2.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<title>compact_lists.txt</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 2017-07-05 14:33:33 UTC (rev 8133)
+++ trunk/docutils/test/functional/expected/dangerous.html 2017-07-08 09:36:27 UTC (rev 8134)
@@ -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.14rc2.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<title>dangerous.txt</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 2017-07-05 14:33:33 UTC (rev 8133)
+++ trunk/docutils/test/functional/expected/field_name_limit.html 2017-07-08 09:36:27 UTC (rev 8134)
@@ -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.14rc2.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<title>field_list.txt</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 2017-07-05 14:33:33 UTC (rev 8133)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html 2017-07-08 09:36:27 UTC (rev 8134)
@@ -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.14rc2.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: 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/plain.css" type="text/css" />
Modified: trunk/docutils/test/functional/expected/math_output_html.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_html.html 2017-07-05 14:33:33 UTC (rev 8133)
+++ trunk/docutils/test/functional/expected/math_output_html.html 2017-07-08 09:36:27 UTC (rev 8134)
@@ -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.14rc2.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: 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" />
Modified: trunk/docutils/test/functional/expected/math_output_latex.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_latex.html 2017-07-05 14:33:33 UTC (rev 8133)
+++ trunk/docutils/test/functional/expected/math_output_latex.html 2017-07-08 09:36:27 UTC (rev 8134)
@@ -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.14rc2.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<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 2017-07-05 14:33:33 UTC (rev 8133)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html 2017-07-08 09:36:27 UTC (rev 8134)
@@ -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.14rc2.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: 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" />
Modified: trunk/docutils/test/functional/expected/math_output_mathml.xhtml
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-07-05 14:33:33 UTC (rev 8133)
+++ trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-07-08 09:36:27 UTC (rev 8134)
@@ -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.14rc2.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: 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" />
Modified: trunk/docutils/test/functional/expected/misc_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-07-05 14:33:33 UTC (rev 8133)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-07-08 09:36:27 UTC (rev 8134)
@@ -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.14rc2.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<title>link_in_substitution.txt</title>
<link rel="stylesheet" href="foo&bar.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/pep_html.html
===================================================================
--- trunk/docutils/test/functional/expected/pep_html.html 2017-07-05 14:33:33 UTC (rev 8133)
+++ trunk/docutils/test/functional/expected/pep_html.html 2017-07-08 09:36:27 UTC (rev 8134)
@@ -8,7 +8,7 @@
-->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
+ <meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<title>PEP 100 -- Test PEP</title>
<link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-07-05 14:33:33 UTC (rev 8133)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-07-08 09:36:27 UTC (rev 8134)
@@ -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.14rc2.dev -->
+<!-- Generated by Docutils 0.14rc2 -->
<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>
Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-07-05 14:33:33 UTC (rev 8133)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-07-08 09:36:27 UTC (rev 8134)
@@ -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.14rc2.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta name="authors" content="Me Myself I" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-07-05 14:33:33 UTC (rev 8133)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-07-08 09:36:27 UTC (rev 8134)
@@ -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.14rc2.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta content="reStructuredText, test, parser" name="keywords" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-07-05 14:33:33 UTC (rev 8133)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-07-08 09:36:27 UTC (rev 8134)
@@ -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.14rc2.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-07-05 14:33:33 UTC (rev 8133)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-07-08 09:36:27 UTC (rev 8134)
@@ -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.14rc2.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gr...@us...> - 2017-07-08 09:38:33
|
Revision: 8135
http://sourceforge.net/p/docutils/code/8135
Author: grubert
Date: 2017-07-08 09:38:30 +0000 (Sat, 08 Jul 2017)
Log Message:
-----------
0.14rc2 release info
Modified Paths:
--------------
trunk/docutils/HISTORY.txt
trunk/docutils/RELEASE-NOTES.txt
Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt 2017-07-08 09:36:27 UTC (rev 8134)
+++ trunk/docutils/HISTORY.txt 2017-07-08 09:38:30 UTC (rev 8135)
@@ -14,8 +14,8 @@
.. contents::
-Prerelease 0.14rc2
-===============================
+Release 0.14rc2 (2017-07-08)
+============================
* docs/ref/docutils.dtd:
Modified: trunk/docutils/RELEASE-NOTES.txt
===================================================================
--- trunk/docutils/RELEASE-NOTES.txt 2017-07-08 09:36:27 UTC (rev 8134)
+++ trunk/docutils/RELEASE-NOTES.txt 2017-07-08 09:38:30 UTC (rev 8135)
@@ -40,8 +40,8 @@
.. _rst2html.py: docs/user/tools.html#rst2html-py
-Prerelease 0.14rc2
-===============================
+Release 0.14rc2 (2017-07-08)
+============================
* docutils/docs/ref/docutils.dtd:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gr...@us...> - 2017-07-08 10:51:11
|
Revision: 8139
http://sourceforge.net/p/docutils/code/8139
Author: grubert
Date: 2017-07-08 10:51:07 +0000 (Sat, 08 Jul 2017)
Log Message:
-----------
set version to 0.14rc3.dev
Modified Paths:
--------------
trunk/docutils/docutils/__init__.py
trunk/docutils/setup.py
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/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.xhtml
trunk/docutils/test/functional/expected/misc_rst_html4css1.html
trunk/docutils/test/functional/expected/pep_html.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_s5_html_1.html
trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py 2017-07-08 10:47:02 UTC (rev 8138)
+++ trunk/docutils/docutils/__init__.py 2017-07-08 10:51:07 UTC (rev 8139)
@@ -55,7 +55,7 @@
__docformat__ = 'reStructuredText'
-__version__ = '0.14rc2'
+__version__ = '0.14rc3.dev'
"""Docutils version identifier (complies with PEP 440)::
major.minor[.micro][releaselevel[serial]][.dev]
Modified: trunk/docutils/setup.py
===================================================================
--- trunk/docutils/setup.py 2017-07-08 10:47:02 UTC (rev 8138)
+++ trunk/docutils/setup.py 2017-07-08 10:51:07 UTC (rev 8139)
@@ -115,7 +115,7 @@
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.14rc2',
+ 'version': '0.14rc3.dev',
'author': 'David Goodger',
'author_email': 'go...@py...',
'maintainer': 'docutils-develop list',
Modified: trunk/docutils/test/functional/expected/compact_lists.html
===================================================================
--- trunk/docutils/test/functional/expected/compact_lists.html 2017-07-08 10:47:02 UTC (rev 8138)
+++ trunk/docutils/test/functional/expected/compact_lists.html 2017-07-08 10:51:07 UTC (rev 8139)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc3.dev: http://docutils.sourceforge.net/" />
<title>compact_lists.txt</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 2017-07-08 10:47:02 UTC (rev 8138)
+++ trunk/docutils/test/functional/expected/dangerous.html 2017-07-08 10:51:07 UTC (rev 8139)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc3.dev: http://docutils.sourceforge.net/" />
<title>dangerous.txt</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 2017-07-08 10:47:02 UTC (rev 8138)
+++ trunk/docutils/test/functional/expected/field_name_limit.html 2017-07-08 10:51:07 UTC (rev 8139)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc3.dev: http://docutils.sourceforge.net/" />
<title>field_list.txt</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 2017-07-08 10:47:02 UTC (rev 8138)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html 2017-07-08 10:51:07 UTC (rev 8139)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc3.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/plain.css" type="text/css" />
Modified: trunk/docutils/test/functional/expected/math_output_html.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_html.html 2017-07-08 10:47:02 UTC (rev 8138)
+++ trunk/docutils/test/functional/expected/math_output_html.html 2017-07-08 10:51:07 UTC (rev 8139)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc3.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" />
Modified: trunk/docutils/test/functional/expected/math_output_latex.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_latex.html 2017-07-08 10:47:02 UTC (rev 8138)
+++ trunk/docutils/test/functional/expected/math_output_latex.html 2017-07-08 10:51:07 UTC (rev 8139)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc3.dev: http://docutils.sourceforge.net/" />
<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 2017-07-08 10:47:02 UTC (rev 8138)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html 2017-07-08 10:51:07 UTC (rev 8139)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc3.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" />
Modified: trunk/docutils/test/functional/expected/math_output_mathml.xhtml
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-07-08 10:47:02 UTC (rev 8138)
+++ trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-07-08 10:51:07 UTC (rev 8139)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc3.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" />
Modified: trunk/docutils/test/functional/expected/misc_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-07-08 10:47:02 UTC (rev 8138)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-07-08 10:51:07 UTC (rev 8139)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc3.dev: http://docutils.sourceforge.net/" />
<title>link_in_substitution.txt</title>
<link rel="stylesheet" href="foo&bar.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/pep_html.html
===================================================================
--- trunk/docutils/test/functional/expected/pep_html.html 2017-07-08 10:47:02 UTC (rev 8138)
+++ trunk/docutils/test/functional/expected/pep_html.html 2017-07-08 10:51:07 UTC (rev 8139)
@@ -8,7 +8,7 @@
-->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.14rc2: http://docutils.sourceforge.net/" />
+ <meta name="generator" content="Docutils 0.14rc3.dev: http://docutils.sourceforge.net/" />
<title>PEP 100 -- Test PEP</title>
<link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-07-08 10:47:02 UTC (rev 8138)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-07-08 10:51:07 UTC (rev 8139)
@@ -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.14rc2 -->
+<!-- Generated by Docutils 0.14rc3.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>
Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-07-08 10:47:02 UTC (rev 8138)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-07-08 10:51:07 UTC (rev 8139)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc3.dev: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta name="authors" content="Me Myself I" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-07-08 10:47:02 UTC (rev 8138)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-07-08 10:51:07 UTC (rev 8139)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc3.dev: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta content="reStructuredText, test, parser" name="keywords" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-07-08 10:47:02 UTC (rev 8138)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-07-08 10:51:07 UTC (rev 8139)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc3.dev: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-07-08 10:47:02 UTC (rev 8138)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-07-08 10:51:07 UTC (rev 8139)
@@ -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.14rc2: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc3.dev: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <go...@us...> - 2017-07-08 17:05:23
|
Revision: 8141
http://sourceforge.net/p/docutils/code/8141
Author: goodger
Date: 2017-07-08 17:05:18 +0000 (Sat, 08 Jul 2017)
Log Message:
-----------
added docutils.utils.version_identifier() and a test
Modified Paths:
--------------
trunk/docutils/docutils/utils/__init__.py
trunk/docutils/test/test_utils.py
Modified: trunk/docutils/docutils/utils/__init__.py
===================================================================
--- trunk/docutils/docutils/utils/__init__.py 2017-07-08 16:31:03 UTC (rev 8140)
+++ trunk/docutils/docutils/utils/__init__.py 2017-07-08 17:05:18 UTC (rev 8141)
@@ -16,7 +16,7 @@
import itertools
import warnings
import unicodedata
-from docutils import ApplicationError, DataError
+from docutils import ApplicationError, DataError, __version_info__
from docutils import nodes
import docutils.io
from docutils.utils.error_reporting import ErrorOutput, SafeString
@@ -766,3 +766,42 @@
except AttributeError:
output_file = None
return '%s(%r, %s)' % (self.__class__.__name__, output_file, self.list)
+
+
+release_level_abbreviations = {
+ 'alpha': 'a',
+ 'beta': 'b',
+ 'candidate': 'rc',
+ 'final': '',}
+
+def version_identifier(version_info=None):
+ # to add in Docutils 0.15:
+ # version_info is a namedtuple, an instance of Docutils.VersionInfo.
+ """
+ Given a `version_info` tuple (default is docutils.__version_info__),
+ build & return a version identifier string.
+ """
+ if version_info is None:
+ version_info = __version_info__
+ if version_info[2]: # version_info.micro
+ micro = '.%s' % version_info[2]
+ else:
+ micro = ''
+ releaselevel = release_level_abbreviations[
+ version_info[3]] # version_info.releaselevel
+ if version_info[4]: # version_info.serial
+ serial = version_info[4]
+ else:
+ serial = ''
+ if version_info[5]: # version_info.release
+ dev = ''
+ else:
+ dev = '.dev'
+ version = '%s.%s%s%s%s%s' % (
+ version_info[0], # version_info.major
+ version_info[1], # version_info.minor
+ micro,
+ releaselevel,
+ serial,
+ dev)
+ return version
Modified: trunk/docutils/test/test_utils.py
===================================================================
--- trunk/docutils/test/test_utils.py 2017-07-08 16:31:03 UTC (rev 8140)
+++ trunk/docutils/test/test_utils.py 2017-07-08 17:05:18 UTC (rev 8141)
@@ -12,7 +12,7 @@
import unittest
import sys
import os
-from DocutilsTestSupport import utils, nodes
+from DocutilsTestSupport import docutils, utils, nodes
try:
from io import StringIO
except ImportError: # io is new in Python 2.6
@@ -237,6 +237,14 @@
class HelperFunctionsTests(unittest.TestCase):
+ def test_version_identifier(self):
+ """
+ docutils.utils.version_identifier() depends on
+ docutils.__version_info__, so this also tests that
+ docutils.__version__ is equivalent to docutils.__version_info__.
+ """
+ self.assertEqual(utils.version_identifier(), docutils.__version__)
+
def test_normalize_language_tag(self):
self.assertEqual(utils.normalize_language_tag('de'), ['de'])
self.assertEqual(utils.normalize_language_tag('de-AT'),
@@ -304,6 +312,5 @@
'gibts/nicht.txt')
-
if __name__ == '__main__':
unittest.main()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2017-07-26 21:25:10
|
Revision: 8144
http://sourceforge.net/p/docutils/code/8144
Author: milde
Date: 2017-07-26 21:25:08 +0000 (Wed, 26 Jul 2017)
Log Message:
-----------
smartquotes transform: Keep "rawsource" when "educating" quotes.
Thanks to Matthew Brett for report and patch.
Modified Paths:
--------------
trunk/docutils/HISTORY.txt
trunk/docutils/docutils/transforms/universal.py
Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt 2017-07-17 10:43:39 UTC (rev 8143)
+++ trunk/docutils/HISTORY.txt 2017-07-26 21:25:08 UTC (rev 8144)
@@ -59,7 +59,8 @@
* docutils/transforms/universal.py
- Fix SmartQuotes: warn only once if language is unsupported
+ Fix SmartQuotes: warn only once if language is unsupported,
+ keep "rawsource" when "educating" quotes.
* docutils/utils/__init__.py:
Modified: trunk/docutils/docutils/transforms/universal.py
===================================================================
--- trunk/docutils/docutils/transforms/universal.py 2017-07-17 10:43:39 UTC (rev 8143)
+++ trunk/docutils/docutils/transforms/universal.py 2017-07-26 21:25:08 UTC (rev 8144)
@@ -208,6 +208,7 @@
if class_value in self.strip_elements:
return 1
+
class SmartQuotes(Transform):
"""
@@ -304,6 +305,7 @@
attr=self.smartquotes_action, language=lang)
for txtnode, newtext in zip(txtnodes, teacher):
- txtnode.parent.replace(txtnode, nodes.Text(newtext))
+ txtnode.parent.replace(txtnode, nodes.Text(newtext,
+ rawsource=txtnode.rawsource))
self.unsupported_languages = set() # reset
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gr...@us...> - 2017-08-03 09:01:19
|
Revision: 8147
http://sourceforge.net/p/docutils/code/8147
Author: grubert
Date: 2017-08-03 09:01:16 +0000 (Thu, 03 Aug 2017)
Log Message:
-----------
set version 0.14 final
Modified Paths:
--------------
trunk/docutils/HISTORY.txt
trunk/docutils/RELEASE-NOTES.txt
trunk/docutils/docutils/__init__.py
trunk/docutils/setup.py
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/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.xhtml
trunk/docutils/test/functional/expected/misc_rst_html4css1.html
trunk/docutils/test/functional/expected/pep_html.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_s5_html_1.html
trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/HISTORY.txt 2017-08-03 09:01:16 UTC (rev 8147)
@@ -14,9 +14,11 @@
.. contents::
-Release 0.14rc2 (2017-07-08)
-============================
+Release 0.14 (2017-08-03)
+=========================
+As rc2.
+
* docs/ref/docutils.dtd:
- Enable validation of Docutils XML documents against the DTD:
Modified: trunk/docutils/RELEASE-NOTES.txt
===================================================================
--- trunk/docutils/RELEASE-NOTES.txt 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/RELEASE-NOTES.txt 2017-08-03 09:01:16 UTC (rev 8147)
@@ -41,9 +41,11 @@
.. _rst2html.py: docs/user/tools.html#rst2html-py
-Release 0.14rc2 (2017-07-08)
-============================
+Release 0.14 (2017-08-03)
+=========================
+As rc2.
+
* docutils/docs/ref/docutils.dtd:
- Enable validation of Docutils XML documents against the DTD:
Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/docutils/__init__.py 2017-08-03 09:01:16 UTC (rev 8147)
@@ -55,7 +55,7 @@
__docformat__ = 'reStructuredText'
-__version__ = '0.14rc3.dev'
+__version__ = '0.14'
"""Docutils version identifier (complies with PEP 440)::
major.minor[.micro][releaselevel[serial]][.dev]
@@ -75,7 +75,7 @@
"""
# workaround for Python < 2.6:
-__version_info__ = (0, 14, 0, 'candidate', 3, False)
+__version_info__ = (0, 14, 0, 'final', 0, True)
# To add in Docutils 0.15, replacing the line above:
"""
from collections import namedtuple
Modified: trunk/docutils/setup.py
===================================================================
--- trunk/docutils/setup.py 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/setup.py 2017-08-03 09:01:16 UTC (rev 8147)
@@ -115,7 +115,7 @@
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.14rc3.dev',
+ 'version': '0.14',
'author': 'David Goodger',
'author_email': 'go...@py...',
'maintainer': 'docutils-develop list',
Modified: trunk/docutils/test/functional/expected/compact_lists.html
===================================================================
--- trunk/docutils/test/functional/expected/compact_lists.html 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/test/functional/expected/compact_lists.html 2017-08-03 09:01:16 UTC (rev 8147)
@@ -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.14rc3.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
<title>compact_lists.txt</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 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/test/functional/expected/dangerous.html 2017-08-03 09:01:16 UTC (rev 8147)
@@ -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.14rc3.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
<title>dangerous.txt</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 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/test/functional/expected/field_name_limit.html 2017-08-03 09:01:16 UTC (rev 8147)
@@ -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.14rc3.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
<title>field_list.txt</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 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html 2017-08-03 09:01:16 UTC (rev 8147)
@@ -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.14rc3.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: 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/plain.css" type="text/css" />
Modified: trunk/docutils/test/functional/expected/math_output_html.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_html.html 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/test/functional/expected/math_output_html.html 2017-08-03 09:01:16 UTC (rev 8147)
@@ -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.14rc3.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: 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" />
Modified: trunk/docutils/test/functional/expected/math_output_latex.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_latex.html 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/test/functional/expected/math_output_latex.html 2017-08-03 09:01:16 UTC (rev 8147)
@@ -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.14rc3.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
<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 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html 2017-08-03 09:01:16 UTC (rev 8147)
@@ -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.14rc3.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: 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" />
Modified: trunk/docutils/test/functional/expected/math_output_mathml.xhtml
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-08-03 09:01:16 UTC (rev 8147)
@@ -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.14rc3.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: 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" />
Modified: trunk/docutils/test/functional/expected/misc_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-08-03 09:01:16 UTC (rev 8147)
@@ -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.14rc3.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
<title>link_in_substitution.txt</title>
<link rel="stylesheet" href="foo&bar.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/pep_html.html
===================================================================
--- trunk/docutils/test/functional/expected/pep_html.html 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/test/functional/expected/pep_html.html 2017-08-03 09:01:16 UTC (rev 8147)
@@ -8,7 +8,7 @@
-->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.14rc3.dev: http://docutils.sourceforge.net/" />
+ <meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
<title>PEP 100 -- Test PEP</title>
<link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-08-03 09:01:16 UTC (rev 8147)
@@ -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.14rc3.dev -->
+<!-- Generated by Docutils 0.14 -->
<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>
Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-08-03 09:01:16 UTC (rev 8147)
@@ -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.14rc3.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta name="authors" content="Me Myself I" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-08-03 09:01:16 UTC (rev 8147)
@@ -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.14rc3.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta content="reStructuredText, test, parser" name="keywords" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-08-03 09:01:16 UTC (rev 8147)
@@ -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.14rc3.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-08-03 09:00:21 UTC (rev 8146)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-08-03 09:01:16 UTC (rev 8147)
@@ -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.14rc3.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gr...@us...> - 2017-08-03 10:47:12
|
Revision: 8157
http://sourceforge.net/p/docutils/code/8157
Author: grubert
Date: 2017-08-03 10:47:09 +0000 (Thu, 03 Aug 2017)
Log Message:
-----------
version to 0.15.dev
Modified Paths:
--------------
trunk/docutils/HISTORY.txt
trunk/docutils/docutils/__init__.py
trunk/docutils/setup.py
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/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.xhtml
trunk/docutils/test/functional/expected/misc_rst_html4css1.html
trunk/docutils/test/functional/expected/pep_html.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_s5_html_1.html
trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/HISTORY.txt 2017-08-03 10:47:09 UTC (rev 8157)
@@ -13,7 +13,11 @@
.. contents::
+Changes Since 0.14
+==================
+* infrastructure automatisms
+
Release 0.14 (2017-08-03)
=========================
Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/docutils/__init__.py 2017-08-03 10:47:09 UTC (rev 8157)
@@ -55,7 +55,7 @@
__docformat__ = 'reStructuredText'
-__version__ = '0.14'
+__version__ = '0.15.dev'
"""Docutils version identifier (complies with PEP 440)::
major.minor[.micro][releaselevel[serial]][.dev]
@@ -75,7 +75,8 @@
"""
# workaround for Python < 2.6:
-__version_info__ = (0, 14, 0, 'final', 0, True)
+__version_info__ = (0, 15, 0, 'final', 0, False)
+# NOTE: (0, 15, 0, 'final', 0, False) means 0.15.dev
# To add in Docutils 0.15, replacing the line above:
"""
from collections import namedtuple
Modified: trunk/docutils/setup.py
===================================================================
--- trunk/docutils/setup.py 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/setup.py 2017-08-03 10:47:09 UTC (rev 8157)
@@ -115,7 +115,7 @@
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.14',
+ 'version': '0.15.dev',
'author': 'David Goodger',
'author_email': 'go...@py...',
'maintainer': 'docutils-develop list',
Modified: trunk/docutils/test/functional/expected/compact_lists.html
===================================================================
--- trunk/docutils/test/functional/expected/compact_lists.html 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/test/functional/expected/compact_lists.html 2017-08-03 10:47:09 UTC (rev 8157)
@@ -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.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.dev: http://docutils.sourceforge.net/" />
<title>compact_lists.txt</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 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/test/functional/expected/dangerous.html 2017-08-03 10:47:09 UTC (rev 8157)
@@ -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.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.dev: http://docutils.sourceforge.net/" />
<title>dangerous.txt</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 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/test/functional/expected/field_name_limit.html 2017-08-03 10:47:09 UTC (rev 8157)
@@ -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.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.dev: http://docutils.sourceforge.net/" />
<title>field_list.txt</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 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/test/functional/expected/footnotes_html5.html 2017-08-03 10:47:09 UTC (rev 8157)
@@ -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.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.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/plain.css" type="text/css" />
Modified: trunk/docutils/test/functional/expected/math_output_html.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_html.html 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/test/functional/expected/math_output_html.html 2017-08-03 10:47:09 UTC (rev 8157)
@@ -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.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.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" />
Modified: trunk/docutils/test/functional/expected/math_output_latex.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_latex.html 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/test/functional/expected/math_output_latex.html 2017-08-03 10:47:09 UTC (rev 8157)
@@ -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.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.dev: http://docutils.sourceforge.net/" />
<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 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html 2017-08-03 10:47:09 UTC (rev 8157)
@@ -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.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.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" />
Modified: trunk/docutils/test/functional/expected/math_output_mathml.xhtml
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/test/functional/expected/math_output_mathml.xhtml 2017-08-03 10:47:09 UTC (rev 8157)
@@ -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.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.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" />
Modified: trunk/docutils/test/functional/expected/misc_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html 2017-08-03 10:47:09 UTC (rev 8157)
@@ -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.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.dev: http://docutils.sourceforge.net/" />
<title>link_in_substitution.txt</title>
<link rel="stylesheet" href="foo&bar.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/pep_html.html
===================================================================
--- trunk/docutils/test/functional/expected/pep_html.html 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/test/functional/expected/pep_html.html 2017-08-03 10:47:09 UTC (rev 8157)
@@ -8,7 +8,7 @@
-->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
+ <meta name="generator" content="Docutils 0.15.dev: http://docutils.sourceforge.net/" />
<title>PEP 100 -- Test PEP</title>
<link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
</head>
Modified: trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/test/functional/expected/standalone_rst_docutils_xml.xml 2017-08-03 10:47:09 UTC (rev 8157)
@@ -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.14 -->
+<!-- Generated by Docutils 0.15.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>
Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2017-08-03 10:47:09 UTC (rev 8157)
@@ -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.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.dev: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta name="authors" content="Me Myself I" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html 2017-08-03 10:47:09 UTC (rev 8157)
@@ -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.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.dev: http://docutils.sourceforge.net/" />
<title>reStructuredText Test Document</title>
<meta name="author" content="David Goodger" />
<meta content="reStructuredText, test, parser" name="keywords" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html 2017-08-03 10:47:09 UTC (rev 8157)
@@ -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.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.dev: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-08-03 10:27:46 UTC (rev 8156)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html 2017-08-03 10:47:09 UTC (rev 8157)
@@ -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.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.dev: http://docutils.sourceforge.net/" />
<meta name="version" content="S5 1.1" />
<title>Slide Shows</title>
<meta name="author" content="David Goodger" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|