From e7533e0038f3c41d7cb7039639d6afbf7cbb6756 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 31 Oct 2009 03:00:27 +0000 Subject: Update to 0.6: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * General: - Docutils is now compatible with Python versions from 2.3 up to 2.6 and convertible to 3.1 code. + Node.__nonzero__ returns True instead of 1. + use os.walk instead os.path.walk. + minimize "types" module where possible. + Backwards-compatible changes to remove python2.6 -3 deprecation warnings + Text nodes now subclass unicode rather than UserString (which is gone in python 3.0). + 3.0 compatibility module docutils._compat + Drop 2.2 compatibility workarounds. + Drop extras/optparse.py and extras/textwrap.py (stdlib modules since 2.3). - OpenOffice export: ODT writer moved from sandbox to Doctutils core. - Unix man page export: manpage writer moved from sandbox to Doctutils core. - Apply [ 1719345 ] Galician translation - Apply [ 1905741 ] Polish translation - Apply [ 1878977 ] make_id(): deaccent characters. - Apply [ 2029251 ] return nonzero when tests fail. - Fix [ 1692788 ] allow UTF-8 in style sheets. - Fix [ 2781629 ] support non-ASCII chars in file names. - Apply [ 2845002 ] let ``--no-raw`` disable raw *roles* too. - Fix [ 2831643 ] by renaming DirectiveError.message to DirectiveError.msg - Fix [ 2821266 ] --strict option works now like --halt=info. - Fix [ 2788716 ] DirectiveError now correctly reports source and line. - Fix [ 1627229 ] hyperlink references in substitutions. - The "newlatex" writer is orphaned. * reStructuredText: - Documented Unicode characters allowed as inline markup openers, closers, and delimiters. - Allow units for all length specifications. - Allow percent sign in "scale" argument of "figure" and "image" directives. - Bugfix: The "figalign" argument of a figure now works as intended (aligning the figure, not its contents). - Align images with class "align-[right|center|left]" (allows setting the alignment of an image in a figure). * docutils/nodes.py: - Added ``Element.__contains__`` method, for the in-operator. * docutils/parsers/rst/states.py: - Apply [ 1994493 ] Patch to support all kinds of quotes in inline markup. - Added support for Unicode inline markup delimiters "‐ ‑ ‒ – —" and " " (non-breaking space), and "¡ ¿" openers. * docutils/parsers/directives/misc.py: - Added ``start-line`` and ``end-line`` options to "include" directive to select a range of lines. - Hard tabs in literal inclusions are replaced by spaces. This is configurable via the new ``tab-width`` option of the "include" directive (a negative tab-width prevents tab expansion). * docutils/utils.py: - Add ``get_stylesheet_list`` function. - Apply [ 2834836 ] print info at halt * docutils/transforms/universal.py: - Raise default priority of StripClasses to exclude stripped classes from the ToC. * docutils/writers/html4css1/__init__.py: - ``--stylesheet`` and ``--stylesheet-path`` options support a comma separated list of stylesheets. - Address [ 1938891 ] Inline literal text creates "pre" span only when needed to prevent inter-word line wraps. - Use `translate` method instead of repeated `replace` calls. - Fix [ 1757105 ] New ``table-style`` option. Added to standard table classes to allow CSS styling that does not interfere with other table-using constructs (field lists, citations, ...). * docutils/writers/newlatex2e/__init__.py: - Apply [ 1612821 ] Double quotes in literal text in Italian/German * docutils/writers/latex2e/__init__.py (see also ``__) : - Add ``--embed-stylesheet`` option. - Apply [ 1474017 ] image vertical alignment is reversed. - Apply [ 2051599 ] multi-page tables in latex writer (from pabigot). - Change: has_key for dictionaries (not Nodes) to in-operator. - Merge adjacent citations into one latex cite command. - Failsave implementation of custom roles. LaTeX compilation now ignores unknown classes instead of aborting with an error. - Support custom roles based on standard roles. - LaTeX packages can be used as ``--stylesheet`` arguments without restriction. (A style sheet is now referenced with the ``\usepackage`` command, if it ends with ``.sty`` or has no extension.) - Add ``bp`` to lenghts without unit (prevents LaTex errors). - Correctly write length unit ``pt`` as ``bp`` in LaTeX. - Do not convert ``px`` to ``pt`` (``px`` is supported by pdfTeX since 2005-02-04 as a configurable length unit). - Do not use fontenc, nor the obsolete 'ae' and 'aeguill' packages if font-encoding is set to ''. LaTeX defaults to OT1 then. - Set sub- and superscript role argument in text mode not as math. Use a custom role based on sub-/superscript if you want italic shape. - Shorter preamble and less dependencies: Load packages and define macros only if required in the document. - Use the name prefix ``DU`` for all Docutils specific LaTeX macros. - New custom environments and commands with optional "classes" argument. - Simpler LaTeX encoding, e.g. "\%" instead of "{\%}". - Better conformance to Docutils specifications with ``--use-latex-toc``. Support for LaTeX generated ToC also with unnumbered sections. - If 'sectnum_xform' is False, the 'sectnum' directive triggers section numbering by LaTeX. - Use default font in admonitions and sidebar. - Align of image in a figure defaults to 'center'. - Bugfix: Newlines around targets and references prevent run-together paragraphs. - Fix internal hyperlinks. - Use class defaults for page margins ('typearea' now optional). - Float placement made configurable, default changed to "here definitely". - Typeset generic topic as "quote block with title". - Use template (file and configuration option). - In the default template, load cmap.sty (fix text extraction in PDF) and fixltx2e.sty (LaTeX patches, \textsubscript). - Render doctest blocks as literal blocks (fixes [ 1586058 ]). - Use `translate` instead of repeated `replace` calls for text encoding. - Hyperlinked footnotes and support for symbol footnotes and ``--footnote-references=brackets`` with ``--use-latex-footnotes``. - Complete pairs of binary options (``--figure-footnotes, --figure-citations, --link-stylesheet``, ``--use-docutils-toc, --use-docutils-docinfo, --topic-abstract``) - New defaults: - font-encoding: "T1" (formerly implicitely set by 'ae'). - use-latex-toc: true (ToC with page numbers). - use-latex-footnotes: true (no mixup with figures). * docutils/writers/manpage.py - Do not print version at document end, this is done by the viewer. - Do not print date at document end, this is done by the viewer. - Fix storage of docinfo fields for none standard fields. * docutils/tools/rst2man.py --- textproc/py-docutils/Makefile | 4 ++-- textproc/py-docutils/PLIST | 42 ++++++++++++++++++++++++++++------- textproc/py-docutils/distinfo | 9 ++++---- textproc/py-docutils/patches/patch-aa | 22 ------------------ 4 files changed, 40 insertions(+), 37 deletions(-) delete mode 100644 textproc/py-docutils/patches/patch-aa diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile index 38eb6740936..744d643d339 100644 --- a/textproc/py-docutils/Makefile +++ b/textproc/py-docutils/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.29 2009/09/07 19:02:14 joerg Exp $ +# $NetBSD: Makefile,v 1.30 2009/10/31 03:00:27 wiz Exp $ -DISTNAME= docutils-0.5 +DISTNAME= docutils-0.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= textproc python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=docutils/} diff --git a/textproc/py-docutils/PLIST b/textproc/py-docutils/PLIST index 9fe71f34224..561856409b0 100644 --- a/textproc/py-docutils/PLIST +++ b/textproc/py-docutils/PLIST @@ -1,7 +1,10 @@ -@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:17:24 joerg Exp $ +@comment $NetBSD: PLIST,v 1.14 2009/10/31 03:00:27 wiz Exp $ bin/rst2html.py bin/rst2latex.py +bin/rst2man.py bin/rst2newlatex.py +bin/rst2odt.py +bin/rst2odt_prepstyles.py bin/rst2pseudoxml.py bin/rst2s5.py bin/rst2xml.py @@ -9,6 +12,12 @@ bin/rstpep2html.py ${PYSITELIB}/docutils/__init__.py ${PYSITELIB}/docutils/__init__.pyc ${PYSITELIB}/docutils/__init__.pyo +${PYSITELIB}/docutils/_compat.py +${PYSITELIB}/docutils/_compat.pyc +${PYSITELIB}/docutils/_compat.pyo +${PYSITELIB}/docutils/_string_template_compat.py +${PYSITELIB}/docutils/_string_template_compat.pyc +${PYSITELIB}/docutils/_string_template_compat.pyo ${PYSITELIB}/docutils/core.py ${PYSITELIB}/docutils/core.pyc ${PYSITELIB}/docutils/core.pyo @@ -51,6 +60,9 @@ ${PYSITELIB}/docutils/languages/fi.pyo ${PYSITELIB}/docutils/languages/fr.py ${PYSITELIB}/docutils/languages/fr.pyc ${PYSITELIB}/docutils/languages/fr.pyo +${PYSITELIB}/docutils/languages/gl.py +${PYSITELIB}/docutils/languages/gl.pyc +${PYSITELIB}/docutils/languages/gl.pyo ${PYSITELIB}/docutils/languages/he.py ${PYSITELIB}/docutils/languages/he.pyc ${PYSITELIB}/docutils/languages/he.pyo @@ -63,6 +75,9 @@ ${PYSITELIB}/docutils/languages/ja.pyo ${PYSITELIB}/docutils/languages/nl.py ${PYSITELIB}/docutils/languages/nl.pyc ${PYSITELIB}/docutils/languages/nl.pyo +${PYSITELIB}/docutils/languages/pl.py +${PYSITELIB}/docutils/languages/pl.pyc +${PYSITELIB}/docutils/languages/pl.pyo ${PYSITELIB}/docutils/languages/pt_br.py ${PYSITELIB}/docutils/languages/pt_br.pyc ${PYSITELIB}/docutils/languages/pt_br.pyo @@ -184,6 +199,9 @@ ${PYSITELIB}/docutils/parsers/rst/languages/fi.pyo ${PYSITELIB}/docutils/parsers/rst/languages/fr.py ${PYSITELIB}/docutils/parsers/rst/languages/fr.pyc ${PYSITELIB}/docutils/parsers/rst/languages/fr.pyo +${PYSITELIB}/docutils/parsers/rst/languages/gl.py +${PYSITELIB}/docutils/parsers/rst/languages/gl.pyc +${PYSITELIB}/docutils/parsers/rst/languages/gl.pyo ${PYSITELIB}/docutils/parsers/rst/languages/he.py ${PYSITELIB}/docutils/parsers/rst/languages/he.pyc ${PYSITELIB}/docutils/parsers/rst/languages/he.pyo @@ -196,6 +214,9 @@ ${PYSITELIB}/docutils/parsers/rst/languages/ja.pyo ${PYSITELIB}/docutils/parsers/rst/languages/nl.py ${PYSITELIB}/docutils/parsers/rst/languages/nl.pyc ${PYSITELIB}/docutils/parsers/rst/languages/nl.pyo +${PYSITELIB}/docutils/parsers/rst/languages/pl.py +${PYSITELIB}/docutils/parsers/rst/languages/pl.pyc +${PYSITELIB}/docutils/parsers/rst/languages/pl.pyo ${PYSITELIB}/docutils/parsers/rst/languages/pt_br.py ${PYSITELIB}/docutils/parsers/rst/languages/pt_br.pyc ${PYSITELIB}/docutils/parsers/rst/languages/pt_br.pyo @@ -294,7 +315,11 @@ ${PYSITELIB}/docutils/writers/html4css1/template.txt ${PYSITELIB}/docutils/writers/latex2e/__init__.py ${PYSITELIB}/docutils/writers/latex2e/__init__.pyc ${PYSITELIB}/docutils/writers/latex2e/__init__.pyo -${PYSITELIB}/docutils/writers/latex2e/latex2e.tex +${PYSITELIB}/docutils/writers/latex2e/default.tex +${PYSITELIB}/docutils/writers/latex2e/titlepage.tex +${PYSITELIB}/docutils/writers/manpage.py +${PYSITELIB}/docutils/writers/manpage.pyc +${PYSITELIB}/docutils/writers/manpage.pyo ${PYSITELIB}/docutils/writers/newlatex2e/__init__.py ${PYSITELIB}/docutils/writers/newlatex2e/__init__.pyc ${PYSITELIB}/docutils/writers/newlatex2e/__init__.pyo @@ -305,6 +330,13 @@ ${PYSITELIB}/docutils/writers/newlatex2e/unicode_map.pyo ${PYSITELIB}/docutils/writers/null.py ${PYSITELIB}/docutils/writers/null.pyc ${PYSITELIB}/docutils/writers/null.pyo +${PYSITELIB}/docutils/writers/odf_odt/__init__.py +${PYSITELIB}/docutils/writers/odf_odt/__init__.pyc +${PYSITELIB}/docutils/writers/odf_odt/__init__.pyo +${PYSITELIB}/docutils/writers/odf_odt/pygmentsformatter.py +${PYSITELIB}/docutils/writers/odf_odt/pygmentsformatter.pyc +${PYSITELIB}/docutils/writers/odf_odt/pygmentsformatter.pyo +${PYSITELIB}/docutils/writers/odf_odt/styles.odt ${PYSITELIB}/docutils/writers/pep_html/__init__.py ${PYSITELIB}/docutils/writers/pep_html/__init__.pyc ${PYSITELIB}/docutils/writers/pep_html/__init__.pyo @@ -340,12 +372,6 @@ ${PYSITELIB}/docutils/writers/s5_html/themes/small-black/__base__ ${PYSITELIB}/docutils/writers/s5_html/themes/small-black/pretty.css ${PYSITELIB}/docutils/writers/s5_html/themes/small-white/framing.css ${PYSITELIB}/docutils/writers/s5_html/themes/small-white/pretty.css -${PLIST.std}${PYSITELIB}/optparse.py -${PLIST.std}${PYSITELIB}/optparse.pyc -${PLIST.std}${PYSITELIB}/optparse.pyo ${PYSITELIB}/roman.py ${PYSITELIB}/roman.pyc ${PYSITELIB}/roman.pyo -${PLIST.std}${PYSITELIB}/textwrap.py -${PLIST.std}${PYSITELIB}/textwrap.pyc -${PLIST.std}${PYSITELIB}/textwrap.pyo diff --git a/textproc/py-docutils/distinfo b/textproc/py-docutils/distinfo index 61ed3914a60..0ab46a44441 100644 --- a/textproc/py-docutils/distinfo +++ b/textproc/py-docutils/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.9 2009/06/17 14:07:35 tnn Exp $ +$NetBSD: distinfo,v 1.10 2009/10/31 03:00:27 wiz Exp $ -SHA1 (docutils-0.5.tar.gz) = 70ca2dd94969ddf76217e5fe907b0b23f16cc199 -RMD160 (docutils-0.5.tar.gz) = 3e8dfd2923528bbeac0ca33ccfe6f576c74f1886 -Size (docutils-0.5.tar.gz) = 1271981 bytes -SHA1 (patch-aa) = 3a9a8d897ad74edcc8b3e01e0247af62ceef6bfb +SHA1 (docutils-0.6.tar.gz) = 1b3bfc3bdf285c208dd0c29427fd6b096569aa92 +RMD160 (docutils-0.6.tar.gz) = 627665526f25d93277b977c6bfdb1b3f0554d69a +Size (docutils-0.6.tar.gz) = 1368354 bytes diff --git a/textproc/py-docutils/patches/patch-aa b/textproc/py-docutils/patches/patch-aa deleted file mode 100644 index 0b41e8fcb96..00000000000 --- a/textproc/py-docutils/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2009/06/17 14:07:35 tnn Exp $ - ---- setup.py.orig 2007-03-22 00:00:23.000000000 +0100 -+++ setup.py -@@ -148,14 +148,13 @@ classifiers = [ - Python 2.3 and up.""" - - extra_modules = [('optparse', '1.4.1', None), -- ('textwrap', None, None), -- ('roman', '1.4', ['toRoman', 'fromRoman', -- 'InvalidRomanNumeralError'])] -+ ('textwrap', None, None)] -+ - """Third-party modules to install if they're not already present. - List of (module name, minimum __version__ string, [attribute names]).""" - - def get_extras(): -- extras = [] -+ extras = ['roman'] - for module_name, version, attributes in extra_modules: - try: - module = __import__(module_name) -- cgit v1.2.3