Author: jpages Date: 2012-05-04 10:52:38 +0200 (Fri, 04 May 2012) New Revision: 655 Url: http://nuiton.org/repositories/revision/jrst/655 Log: Use the new version of Docutils (v0.9 released on 2012-05-02 ) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/BUGS.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/COPYING.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/FAQ.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/HISTORY.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/PKG-INFO branches/jrst-docutils-jython/docutils/src/main/resources/docutils/README.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/RELEASE-NOTES.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/__run__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/_compat.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/core.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/error_reporting.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/examples.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/frontend.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/io.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/languages/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/languages/ru.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/math/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/math/latex2mathml.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/nodes.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/body.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/html.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/images.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/misc.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/parts.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/tables.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/af.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/ca.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/cs.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/de.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/en.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/eo.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/es.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/fi.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/fr.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/gl.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/he.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/it.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/ja.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/lt.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/nl.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/pl.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/pt_br.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/ru.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/sk.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/sv.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/zh_cn.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/zh_tw.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/roles.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/states.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/tableparser.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/readers/pep.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/statemachine.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/transforms/references.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/transforms/writer_aux.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/docutils_xml.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/html4css1/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/latex2e/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/manpage.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/odf_odt/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/pseudoxml.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/s5_html/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/xetex/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/api/cmdline-tool.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/api/publisher.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/api/runtime-settings.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/distributing.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/enthought-plan.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/hacking.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/policies.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/pysource.dtd branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/pysource.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/release.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/repository.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/rst/alternatives.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/rst/problems.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/semantics.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/testing.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/todo.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/website.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/html-stylesheets.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/i18n.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/rst-directives.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/rst-roles.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/security.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/index.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/doctree.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/docutils.dtd branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/definitions.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/directives.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/introduction.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/restructuredtext.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/roles.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/transforms.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/config.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/docutils-05-compat.sty.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/latex.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/links.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/mailing-lists.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/manpage.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/odt.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/rst/demo.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/tools.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/_compat.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/core.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/error_reporting.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/examples.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/frontend.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/io.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/languages/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/languages/ru.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/math/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/math/latex2mathml.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/nodes.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/body.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/html.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/images.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/misc.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/parts.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/tables.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/af.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/ca.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/cs.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/de.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/en.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/eo.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/es.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/fi.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/fr.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/gl.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/he.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/it.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/ja.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/lt.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/nl.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/pl.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/pt_br.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/ru.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/sk.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/sv.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/zh_cn.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/zh_tw.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/roles.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/states.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/tableparser.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/readers/pep.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/statemachine.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/transforms/references.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/transforms/writer_aux.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/docutils_xml.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/html4css1/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/latex2e/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/latex2e/docutils-05-compat.sty branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/manpage.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/odf_odt/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/pseudoxml.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/s5_html/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/xetex/__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/setup.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/DocutilsTestSupport.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/data/config_list.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/data/config_list_2.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/data/dependencies.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/compact_lists.html branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/cyrillic.tex branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/dangerous.html branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/field_name_limit.html branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/math_output_html.html branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/math_output_latex.html branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/math_output_mathjax.html branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/math_output_mathml.xhtml branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/misc_rst_html4css1.html branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/pep_html.html branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_html4css1.html branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_latex.tex branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_manpage.man branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_pseudoxml.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_s5_html_1.html branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_s5_html_2.html branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_xetex.tex branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/xetex-cyrillic.tex branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/data/math.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/data/standard.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/data/urls.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/standalone_rst_latex.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/standalone_rst_xetex.txt branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/_default.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/_standalone_rst_defaults.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/dangerous.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/field_name_limit.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/misc_rst_html4css1.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/standalone_rst_pseudoxml.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/standalone_rst_s5_html_1.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/package_unittest.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test__init__.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_command_line.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_dependencies.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_error_reporting.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_functional.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_io.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_nodes.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_SimpleTableParser.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_TableParser.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_admonitions.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_images.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_include.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_raw.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_tables.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_east_asian_text.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_functions.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_inline_markup.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_interpreted.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_option_lists.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_tables.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_pickle.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_publisher.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_settings.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_statemachine.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_traversals.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_utils.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_viewlist.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_docutils_xml.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_html4css1_misc.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_latex2e.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_manpage.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_odt.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/buildhtml.py branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/editors/emacs/IDEAS.rst branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/editors/emacs/rst.el branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/editors/emacs/tests/font-lock.el branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/editors/emacs/tests/re.el branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/BUGS.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/BUGS.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/BUGS.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -4,8 +4,8 @@ :Author: David Goodger; open to all Docutils developers :Contact: goodger@python.org -:Date: $Date: 2010-10-11 14:32:33 +0200 (Mon, 11 Okt 2010) $ -:Revision: $Revision: 6443 $ +:Date: $Date: 2012-01-04 15:20:52 +0100 (Mit, 04 Jän 2012) $ +:Revision: $Revision: 7304 $ :Copyright: This document has been placed in the public domain. .. _Docutils: http://docutils.sourceforge.net/ @@ -114,7 +114,6 @@ __ http://subversion.tigris.org/ __ http://svn.collab.net/viewcvs/svn/trunk/BUGS?view=markup -.. _CVS: http://sourceforge.net/cvs/?group_id=38414 .. _repository: docs/dev/repository.html .. _snapshot: http://docutils.sourceforge.net/#download .. _documentation: docs/ Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/COPYING.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/COPYING.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/COPYING.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -4,7 +4,7 @@ :Author: David Goodger :Contact: goodger@python.org -:Date: $Date: 2011-08-22 21:33:48 +0200 (Mon, 22 Aug 2011) $ +:Date: $Date: 2011-12-31 15:22:16 +0100 (Sam, 31 Dez 2011) $ :Web site: http://docutils.sourceforge.net/ :Copyright: This document has been placed in the public domain. @@ -28,9 +28,9 @@ The primary repository for the Work is the Internet World Wide Web site <http://docutils.sourceforge.net/>. The Work consists of the files within the "docutils" module of the Docutils project Subversion -repository (Internet host svn.berlios.de, filesystem path -/svnroot/repos/docutils), whose Internet web interface is located at -<http://svn.berlios.de/viewcvs/docutils/>. Files dedicated to the +repository (Internet host docutils.svn.sourceforge.net, filesystem path +/svnroot/docutils), whose Internet web interface is located at +<http://docutils.svn.sourceforge.net/viewvc/docutils/>. Files dedicated to the public domain may be identified by the inclusion, near the beginning of each file, of a declaration of the form:: @@ -107,7 +107,7 @@ Inc., released under the `GNU General Public License`_ version 3 or later (`local copy`__). - __ licenses/gpl-3.0.txt + __ licenses/gpl-3-0.txt The `2-Clause BSD license`_ and the Python licenses are OSI-approved_ and GPL-compatible_. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/FAQ.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/FAQ.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/FAQ.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -9,8 +9,8 @@ Docutils FAQ (Frequently Asked Questions) =========================================== -:Date: $Date: 2008-01-05 03:23:54 +0100 (Sam, 05 Jän 2008) $ -:Revision: $Revision: 5495 $ +:Date: $Date: 2012-02-16 18:15:55 +0100 (Don, 16 Feb 2012) $ +:Revision: $Revision: 7361 $ :Web site: http://docutils.sourceforge.net/ :Copyright: This document has been placed in the public domain. @@ -443,7 +443,6 @@ order: * `Firedrop <http://www.voidspace.org.uk/python/firedrop2/>`__ -* `Python Desktop Server <http://pyds.muensterland.org/>`__ * `PyBloxsom <http://pyblosxom.sourceforge.net/>`__ * `Lino WebMan <http://lino.sourceforge.net/webman.html>`__ Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/HISTORY.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/HISTORY.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/HISTORY.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -6,25 +6,114 @@ :Author: David Goodger; open to all Docutils developers :Contact: goodger@python.org -:Date: $Date: 2011-08-30 09:03:01 +0200 (Die, 30 Aug 2011) $ -:Revision: $Revision: 7107 $ +:Date: $Date: 2012-05-02 19:13:41 +0200 (Mit, 02 Mai 2012) $ +:Revision: $Revision: 7410 $ :Web site: http://docutils.sourceforge.net/ :Copyright: This document has been placed in the public domain. .. contents:: +Release 0.9 (2012-05-02) +======================== +* General: + + - New reStructuredText "code" role and directive and "code" option + of the "include" directive with syntax highlighting by Pygments_. + - Fix parse_option_marker for option arguments containing ``=``. + +.. _Pygments: http://pygments.org/ + +* setup.py + + - Fix [ 2971827 ] and [ 3442827 ] + extras/roman.py moved to docutils/utils/roman.py + +* docutils/frontend.py + + - Fix [ 3481980 ] Use os.getcwdu() in make_paths_absolute(). + +* docutils/io.py + + - Fix [ 3395948 ] (Work around encoding problems in Py3k). + - `mode` argument for FileOutput avoids code replication in + BinaryFileOutput. + - New exceptions InputError and OutputError for IO errors in + FileInput/FileOutput. + +* docutils/core.py: + + - No "hard" system exit on file IO errors: catch and report them in + `Publisher.reportException` instead. Allows handling by a calling + application if the configuration setting `traceback` is True. + +* docutils/utils.py -> docutils/utils/__init__.py + + - docutils.utils is now a package (providing a place for sub-modules) + + .. note:: docutils/math, docutils/error_reporting.py, and + docutils/urischemes.py will move to the utils package in the next + release, too. See RELEASE-NOTES__ + + __ RELEASE-NOTES.html + + - DependencyList uses io.FileOutput and 'utf8' encoding to prevent + errors recording non-ASCII filenames (fixes [ 3434355 ]). + + - Fix relative_path() with source=None and `unicode` target. + +* docutils/parsers/rst/states.py + + - Fix [ 3402314 ] allow non-ASCII whitespace, punctuation + characters and "international" quotes around inline markup. + - Use `field_marker` pattern to look for start of a + directive option block (fixes [ 3484857 ]). + +* docutils/parsers/rst/tableparser.py + + - Fix [ 2926161 ] for simple tables. + (Combining chars in grid tables still contribute to cell width.) + +* docutils/writers/latex2e/__init__.py + + - Support the `abbreviation` and `acronym` standard roles. + - Record only files required to generate the LaTeX source as dependencies. + - Fix handling of missing stylesheets. + - Use ``\setcounter{secnumdepth}{0}`` instead of ``*``-versions + when suppressing LaTeX section numbering. + - Use ``\DUtitle`` for unsupported section levels + - Apply [ 3512791 ] do not compare string literals with "is" + +* docutils/writers/xetex/__init__.py + + - Avoid code duplication with latex2e writer (solves [ 3512728 ]). + +* docutils/writers/html4css1/__init__.py + + - Change default for `math-output` setting to MathJax. + - Fix handling of missing stylesheets. + +* docutils/writers/docutils_xml.py + + - Use the visitor pattern with default_visit()/default_depart() methods + instead of minidom to facilitate special handling of selected nodes. + - Support raw XML (inserted as-is inside a <raw></raw> node). + +* docutils/writers/manpage.py + + - Do not emit comment line with trailing blank. Problematic for VCS. + Release 0.8.1 (2011-08-30) ========================== * General: - Fix [ 3364658 ] (Change last file with Apache license to BSD-2-Clause) - and [ 3395920 ] (correct copyright info for rst.el). - + and [ 3395920 ] (correct copyright info for rst.el). + * docutils/test/ - - Apply [ 3303733 ] and [ 3365041 ] to fix tests under py3k. + - Apply [ 3303733 ] and [ 3365041 ] to fix tests under py3k. * docutils/writers/latex2e/__init__.py @@ -55,7 +144,7 @@ - Most directives now support a "name" option that attaches a reference name. - + - Directive content may start on the first line also when the directive type accepts options. @@ -114,7 +203,7 @@ * docutils/utils.py: - strip whitespace from stylesheet arguments - - exclude combining chars from column_width + - exclude combining chars from column_width() (partial fix for [ 2926161 ]) * docutils/parsers/rst/directives/misc.py: Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/PKG-INFO =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/PKG-INFO 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/PKG-INFO 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: docutils -Version: 0.8.1 +Version: 0.9 Summary: Docutils -- Python Documentation Utilities Home-page: http://docutils.sourceforge.net/ Author: David Goodger @@ -28,11 +28,22 @@ Classifier: Topic :: Text Processing Classifier: Natural Language :: English Classifier: Natural Language :: Afrikaans +Classifier: Natural Language :: Brazilian Portuguese +Classifier: Natural Language :: Catalan +Classifier: Natural Language :: Czech +Classifier: Natural Language :: Dutch Classifier: Natural Language :: Esperanto +Classifier: Natural Language :: Finnish Classifier: Natural Language :: French +Classifier: Natural Language :: Galician Classifier: Natural Language :: German Classifier: Natural Language :: Italian +Classifier: Natural Language :: Japanese +Classifier: Natural Language :: Lithuanian +Classifier: Natural Language :: Polish Classifier: Natural Language :: Russian +Classifier: Natural Language :: Simplified Chinese Classifier: Natural Language :: Slovak Classifier: Natural Language :: Spanish Classifier: Natural Language :: Swedish +Classifier: Natural Language :: Traditional Chinese Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/README.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/README.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/README.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -4,7 +4,7 @@ :Author: David Goodger :Contact: goodger@python.org -:Date: $Date: 2011-07-08 14:24:19 +0200 (Fre, 08 Jul 2011) $ +:Date: $Date: 2012-02-28 17:39:05 +0100 (Die, 28 Feb 2012) $ :Web site: http://docutils.sourceforge.net/ :Copyright: This document has been placed in the public domain. @@ -28,7 +28,7 @@ 2. Use the latest Docutils code. Get the code from Subversion or from the snapshot: - http://docutils.sf.net/docutils-snapshot.tgz + http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/docutils/?view=tar See `Releases & Snapshots`_ below for details. @@ -97,10 +97,11 @@ changes being committed to the repository): * Snapshot of Docutils code, documentation, front-end tools, and - tests: http://docutils.sf.net/docutils-snapshot.tgz + tests: + http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/docutils/?view=tar * Snapshot of the Sandbox (experimental, contributed code): - http://docutils.sf.net/docutils-sandbox-snapshot.tgz + http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/sandbox/?view=tar To keep up to date on the latest developments, download fresh copies of the snapshots regularly. New functionality is being added weekly, Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/RELEASE-NOTES.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/RELEASE-NOTES.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/RELEASE-NOTES.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -2,10 +2,9 @@ Docutils Release Notes ======================== -:Author: Lea Wiemann -:Contact: LeWiemann@gmail.com -:Date: $Date: 2011-08-30 09:03:01 +0200 (Die, 30 Aug 2011) $ -:Revision: $Revision: 7107 $ +:Contact: grubert@users.sourceforge.net +:Date: $Date: 2012-05-02 19:13:41 +0200 (Mit, 02 Mai 2012) $ +:Revision: $Revision: 7410 $ :Web site: http://docutils.sourceforge.net/ :Copyright: This document has been placed in the public domain. @@ -17,11 +16,85 @@ .. contents:: +Future changes +============== +* docutils/math, docutils/error_reporting.py, and + docutils/urischemes.py will move to the utils package + Code importing these modules needs to adapt, e.g.:: + + try: + import docutils.math as math + except ImportError: + import docutils.utils.math as math + +* docutils.io.FileInput/FileOutput will no longer do a + system-exit on IOError by default. + + Roadmap: + + :0.10: change of default behaviour to the equivalent of + ``handle_io_errors=False`` and deprecation of the + `handle_io_errors` option, + :0.11: deprecation warning to stderr if FileInput/FileOutput + is called with `handle_io_errors`, + :0.12: ignore ``handle_io_errors=True``, + :0.13: remove the `handle_io_errors` option. + + +Release 0.9 (2012-05-02) +========================= + +* General: + + - reStructuredText "code" role and directive with syntax highlighting + by Pygments_. + - "code" option of the "include" directive. + + .. _Pygments: http://pygments.org/ + + - Fix [ 3402314 ] allow non-ASCII whitespace, punctuation + characters and "international" quotes around inline markup. + + - Fix handling of missing stylesheets. + +* setup.py + + - Fix [ 2971827 ] and [ 3442827 ] + extras/roman.py moved to docutils/utils/roman.py + +* docutils/utils.py -> docutils/utils/__init__.py + + - docutils.utils is now a package (providing a place for sub-modules) + +* docutils/writers/html4css1/__init__.py + + - change default for `math-output` setting to MathJax + +* docutils/writers/latex2e/__init__.py + + - Support the `abbreviation` and `acronym` standard roles. + - Record only files required to generate the LaTeX source as dependencies. + - Use ``\setcounter{secnumdepth}{0}`` instead of ``*``-versions + when suppressing LaTeX section numbering. + + Release 0.8.1 (2011-08-30) ========================== +* General: + - Fix [ 3364658 ] (Change last file with Apache license to BSD-2-Clause) + and [ 3395920 ] (correct copyright info for rst.el). + +* docutils/test/ + + - Apply [ 3303733 ] and [ 3365041 ] to fix tests under py3k. + +* docutils/writers/latex2e/__init__.py + + - Clean up Babel language setting. Restores Sphinx compatibility. + Release 0.8 (2011-07-07) ======================== @@ -74,11 +147,11 @@ * XeTeX writer: - New writer generating LaTeX code for compiling with ``xelatex``. - + XeTeX uses unicode and modern font technologies. * and fixes and enhancements here and there. - + Release 0.7 (2010-07-07) ======================== Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/__run__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/__run__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/__run__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -4,66 +4,74 @@ import __builtin__, os, sys, string from java.io import File, InputStream from java.net import URL, JarURLConnection -from java.util.zip import ZipFile -# Save the path of __run__.py -pathname = os.path.abspath(os.path.dirname(sys.argv[0])) +def init_docutils(namefile, filepath): + # Save the path of __run__.py + pathname = os.path.abspath(os.path.dirname(namefile)) #sys.argv[0] -# Add the lib path to sys.path -lib_path = os.path.dirname(sys.argv[1]) -sys.path.append(lib_path) + # Add the lib path to sys.path + lib_path = os.path.dirname(filepath) #sys.argv[1] + sys.path.append(lib_path) -# Check if the new open function doesn't exist -if "openlegacy" not in __builtin__.__dict__: - - # Define the function jaropen which will be able to read into the jar. - def jaropen(jarpath, mode, bufsize=-1): - if "__pyclasspath__" in jarpath: - filepath = "jar:file:" + lib_path + "!" - jarpath = string.replace(jarpath, "__pyclasspath__", filepath) - url = URL(jarpath) - inStream = url.openStream() - print "jarpath : " + jarpath - f = __builtin__.openlegacy(inStream, bufsize) - else: - f = __builtin__.openlegacy(jarpath, mode, bufsize) - return f - - # Replace in the dictionnary the old open function by the new one - __builtin__.__dict__["openlegacy"] = __builtin__.__dict__["open"] - __builtin__.__dict__["open"] = jaropen + # Check if the new open function doesn't exist + if "openlegacy" not in __builtin__.__dict__: + + # Define the function jaropen which will be able to read into the jar. + # TODO : Mettre des exemples et expliquer le code suivant pour ceux qui prendront le projet ensuite + # TODO : Modifier pour que cela fonctionne avec pour la génération de site + def jaropen(jarpath, mode, bufsize=-1): + print "jarpath " + jarpath + if "__pyclasspath__" in jarpath: + filepath = "jar:file:" + lib_path + "!" + jarpath = string.replace(jarpath, "__pyclasspath__", filepath) + url = URL(jarpath) + inStream = url.openStream() + print "new jarpath : " + jarpath + f = __builtin__.openlegacy(inStream, bufsize) + else: + f = __builtin__.openlegacy(jarpath, mode, bufsize) + return f + + # Replace in the dictionnary the old open function by the new one + __builtin__.__dict__["openlegacy"] = __builtin__.__dict__["open"] + __builtin__.__dict__["open"] = jaropen -# Add the lib path to sys.path -lib_path = os.path.dirname(sys.argv[1]) -sys.path.append(lib_path) +def exec_docutils (filepath, typeOutput, filein, fileout): + # Add the lib path to sys.path + lib_path = os.path.dirname(filepath) + sys.path.append(lib_path) -# Add the scripts path to sys.path -scriptpath = lib_path + '/build/scripts-2.7' -sys.path.append(scriptpath) + # Add the scripts path to sys.path + scriptpath = lib_path + '/build/scripts-2.7' + sys.path.append(scriptpath) -# Call publish_file with the good arguments -typeOutput = sys.argv[2].lower() -filein = sys.argv[3] -fileout = sys.argv[4] + # Call publish_file with the good arguments + typeOutput = typeOutput.lower() -print "filein : " + filein -print "fileout : " + fileout -print "writer_name" + typeOutput + print "filein : " + filein + print "fileout : " + fileout + print "writer_name : " + typeOutput -# If Docutils can manage this output format, we call it -from docutils.core import publish_file + # If Docutils can manage this output format, we call it + from docutils.core import publish_file -listType = ["xml", "html", "odt", "latex", "man", "s5", "xetex"] -if typeOutput in listType: - import subprocess - if typeOutput == "odt": - subprocess.call(['rst2odt.py', filein, fileout]) - elif typeOutput == "man": - subprocess.call(['rst2man.py', filein, fileout]) - elif typeOutput == "s5": - subprocess.call(['rst2s5.py', filein, fileout]) + listType = ["xml", "html", "odt", "latex", "man", "s5", "xetex"] + if typeOutput in listType: + import subprocess + if typeOutput == "odt": + subprocess.call(['rst2odt.py', filein, fileout]) + elif typeOutput == "man": + subprocess.call(['rst2man.py', filein, fileout]) + elif typeOutput == "s5": + subprocess.call(['rst2s5.py', filein, fileout]) + else: + print publish_file( source_path=filein, destination_path=fileout, + writer_name=typeOutput ) else: - print publish_file( source_path=filein, destination_path=fileout, - writer_name=typeOutput ) -else: - print "Wrong output format" + print "Wrong output format" + + +#if __name__ == "__main__": +# exec_docutils(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4]) +#elif __name__ == "__runpy__": +# exec_docutils(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4]) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: __init__.py 7106 2011-08-30 07:02:28Z grubert $ +# $Id: __init__.py 7409 2012-05-02 17:06:37Z grubert $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -29,9 +29,6 @@ - urischemes.py: Contains a complete mapping of known URI addressing scheme names to descriptions. -- utils.py: Contains the ``Reporter`` system warning class and miscellaneous - utilities. - Subpackages: - languages: Language-specific mappings of terms. @@ -44,12 +41,15 @@ - transforms: Modules used by readers and writers to modify DPS doctrees. +- utils: Contains the ``Reporter`` system warning class and miscellaneous + utilities used by readers, writers, and transforms. + - writers: Format-specific output translators. """ __docformat__ = 'reStructuredText' -__version__ = '0.8.1' +__version__ = '0.9' """``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: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/_compat.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/_compat.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/_compat.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: _compat.py 5908 2009-04-21 13:43:23Z goodger $ +# $Id: _compat.py 7316 2012-01-19 11:31:58Z milde $ # Author: Georg Brandl <georg@python.org> # Copyright: This module has been placed in the public domain. @@ -10,7 +10,8 @@ * bytes (name of byte string type; str in 2.x, bytes in 3.x) * b (function converting a string literal to an ASCII byte string; can be also used to convert a Unicode string into a byte string) -* u_prefix (unicode repr prefix, 'u' in 2.x, nothing in 3.x) +* u_prefix (unicode repr prefix: 'u' in 2.x, '' in 3.x) + (Required in docutils/test/test_publisher.py) * BytesIO (a StringIO class that works with bytestrings) """ Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/core.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/core.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/core.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: core.py 7070 2011-07-05 10:13:17Z milde $ +# $Id: core.py 7384 2012-03-19 22:59:09Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -111,7 +111,7 @@ #@@@ Add self.source & self.destination to components in future? option_parser = OptionParser( components=(self.parser, self.reader, self.writer, settings_spec), - defaults=defaults, read_config_files=1, + defaults=defaults, read_config_files=True, usage=usage, description=description) return option_parser @@ -135,7 +135,7 @@ if self.settings is None: defaults = (settings_overrides or {}).copy() # Propagate exceptions by default when used programmatically: - defaults.setdefault('traceback', 1) + defaults.setdefault('traceback', True) self.get_settings(settings_spec=settings_spec, config_section=config_section, **defaults) @@ -155,9 +155,8 @@ argv = sys.argv[1:] # converting to Unicode (Python 3 does this automatically): if sys.version_info < (3,0): - # TODO: make this failsafe and reversible - argv_encoding = (sys.stdin.encoding or - frontend.locale_encoding or 'ascii') + # TODO: make this failsafe and reversible? + argv_encoding = (frontend.locale_encoding or 'ascii') argv = [a.decode(argv_encoding) for a in argv] self.settings = option_parser.parse_args(argv) @@ -172,9 +171,17 @@ source_path = self.settings._source else: self.settings._source = source_path - self.source = self.source_class( - source=source, source_path=source_path, - encoding=self.settings.input_encoding) + # Raise IOError instead of system exit with `tracback == True` + # TODO: change io.FileInput's default behaviour and remove this hack + try: + self.source = self.source_class( + source=source, source_path=source_path, + encoding=self.settings.input_encoding, + handle_io_errors=False) + except TypeError: + self.source = self.source_class( + source=source, source_path=source_path, + encoding=self.settings.input_encoding) def set_destination(self, destination=None, destination_path=None): if destination_path is None: @@ -185,6 +192,9 @@ destination=destination, destination_path=destination_path, encoding=self.settings.output_encoding, error_handler=self.settings.output_encoding_error_handler) + # Raise IOError instead of system exit with `tracback == True` + # TODO: change io.FileInput's default behaviour and remove this hack + self.destination.handle_io_errors=False def apply_transforms(self): self.document.transformer.populate_from_components( @@ -194,7 +204,7 @@ def publish(self, argv=None, usage=None, description=None, settings_spec=None, settings_overrides=None, - config_section=None, enable_exit_status=None): + config_section=None, enable_exit_status=False): """ Process command line options and arguments (if `self.settings` not already set), run `self.reader` and then `self.writer`. Return @@ -222,7 +232,7 @@ self.debugging_dumps() raise self.report_Exception(error) - exit = 1 + exit = True exit_status = 1 self.debugging_dumps() if (enable_exit_status and self.document @@ -261,6 +271,13 @@ self.report_SystemMessage(error) elif isinstance(error, UnicodeEncodeError): self.report_UnicodeError(error) + elif isinstance(error, io.InputError): + self._stderr.write(u'Unable to open source file for reading:\n' + u' %s\n' % ErrorString(error)) + elif isinstance(error, io.OutputError): + self._stderr.write( + u'Unable to open destination file for writing:\n' + u' %s\n' % ErrorString(error)) else: print >>self._stderr, u'%s' % ErrorString(error) print >>self._stderr, ("""\ @@ -317,7 +334,7 @@ writer=None, writer_name='pseudoxml', settings=None, settings_spec=None, settings_overrides=None, config_section=None, - enable_exit_status=1, argv=None, + enable_exit_status=True, argv=None, usage=default_usage, description=default_description): """ Set up & run a `Publisher` for command-line-based file I/O (input and @@ -345,7 +362,7 @@ parser=None, parser_name='restructuredtext', writer=None, writer_name='pseudoxml', settings=None, settings_spec=None, settings_overrides=None, - config_section=None, enable_exit_status=None): + config_section=None, enable_exit_status=False): """ Set up & run a `Publisher` for programmatic use with file-like I/O. Return the encoded string output also. @@ -371,7 +388,7 @@ writer=None, writer_name='pseudoxml', settings=None, settings_spec=None, settings_overrides=None, config_section=None, - enable_exit_status=None): + enable_exit_status=False): """ Set up & run a `Publisher` for programmatic use with string I/O. Return the encoded string or Unicode string output. @@ -408,7 +425,7 @@ writer=None, writer_name='pseudoxml', settings=None, settings_spec=None, settings_overrides=None, config_section=None, - enable_exit_status=None): + enable_exit_status=False): """ Set up & run a `Publisher`, and return a dictionary of document parts. Dictionary keys are the names of parts, and values are Unicode strings; @@ -441,7 +458,7 @@ parser=None, parser_name='restructuredtext', settings=None, settings_spec=None, settings_overrides=None, config_section=None, - enable_exit_status=None): + enable_exit_status=False): """ Set up & run a `Publisher` for programmatic use with string I/O. Return the document tree. @@ -470,7 +487,7 @@ writer=None, writer_name='pseudoxml', settings=None, settings_spec=None, settings_overrides=None, config_section=None, - enable_exit_status=None): + enable_exit_status=False): """ Set up & run a `Publisher` to render from an existing document tree data structure, for programmatic use with string I/O. Return @@ -510,7 +527,7 @@ writer=None, writer_name='pseudoxml', settings=None, settings_spec=None, settings_overrides=None, config_section=None, - enable_exit_status=1, argv=None, + enable_exit_status=True, argv=None, usage=default_usage, description=default_description, destination=None, destination_class=io.BinaryFileOutput ): Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/error_reporting.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/error_reporting.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/error_reporting.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,15 +1,15 @@ #!/usr/bin/env python # -*- coding: utf8 -*- -# :Id: $Id: error_reporting.py 7073 2011-07-07 06:49:19Z milde $ +# :Id: $Id: error_reporting.py 7316 2012-01-19 11:31:58Z milde $ # :Copyright: © 2011 Günter Milde. # :License: Released under the terms of the `2-Clause BSD license`_, in short: -# +# # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright # notice and this notice are preserved. # This file is offered as-is, without any warranty. -# +# # .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause """ @@ -95,14 +95,17 @@ * else decode with `self.encoding` and `self.decoding_errors`. """ try: - return unicode(self.data) + u = unicode(self.data) + if isinstance(self.data, EnvironmentError): + u = u.replace(": u'", ": '") # normalize filename quoting + return u except UnicodeError, error: # catch ..Encode.. and ..Decode.. errors if isinstance(self.data, EnvironmentError): return u"[Errno %s] %s: '%s'" % (self.data.errno, SafeString(self.data.strerror, self.encoding, - self.decoding_errors), + self.decoding_errors), SafeString(self.data.filename, self.encoding, - self.decoding_errors)) + self.decoding_errors)) if isinstance(self.data, Exception): args = [unicode(SafeString(arg, self.encoding, decoding_errors=self.decoding_errors)) @@ -184,13 +187,17 @@ except UnicodeEncodeError: self.stream.write(data.encode(self.encoding, self.encoding_errors)) except TypeError: # in Python 3, stderr expects unicode - self.stream.write(unicode(data, self.encoding, self.decoding_errors)) + if self.stream in (sys.stderr, sys.stdout): + self.stream.buffer.write(data) # write bytes to raw stream + else: + self.stream.write(unicode(data, self.encoding, + self.decoding_errors)) def close(self): """ Close the error-output stream. - Ignored if the stream is` sys.stderr` or `sys.stdout` or has no + Ignored if the stream is` sys.stderr` or `sys.stdout` or has no close() method. """ if self.stream in (sys.stdout, sys.stderr): @@ -199,4 +206,3 @@ self.stream.close() except AttributeError: pass - Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/examples.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/examples.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/examples.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: examples.py 4800 2006-11-12 18:02:01Z goodger $ +# $Id: examples.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -15,7 +15,8 @@ def html_parts(input_string, source_path=None, destination_path=None, - input_encoding='unicode', doctitle=1, initial_header_level=1): + input_encoding='unicode', doctitle=True, + initial_header_level=1): """ Given an input string, returns a dictionary of HTML document parts. @@ -50,7 +51,7 @@ def html_body(input_string, source_path=None, destination_path=None, input_encoding='unicode', output_encoding='unicode', - doctitle=1, initial_header_level=1): + doctitle=True, initial_header_level=1): """ Given an input string, returns an HTML fragment as a string. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/frontend.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/frontend.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/frontend.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: frontend.py 7071 2011-07-05 10:13:46Z milde $ +# $Id: frontend.py 7339 2012-02-03 12:23:27Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -38,7 +38,7 @@ import docutils import docutils.utils import docutils.nodes -from docutils.error_reporting import locale_encoding, ErrorOutput +from docutils.error_reporting import locale_encoding, ErrorOutput, ErrorString def store_multiple(option, opt, value, parser, *args, **kwargs): @@ -163,15 +163,17 @@ def validate_strip_class(setting, value, option_parser, config_parser=None, config_section=None): - if config_parser: # validate all values - class_values = value - else: # just validate the latest value - class_values = [value[-1]] + # convert to list: + if isinstance(value, unicode): + value = [value] + class_values = filter(None, [v.strip() for v in value.pop().split(',')]) + # validate: for class_value in class_values: normalized = docutils.nodes.make_id(class_value) if class_value != normalized: raise ValueError('invalid class value %r (perhaps %r?)' % (class_value, normalized)) + value.extend(class_values) return value def make_paths_absolute(pathdict, keys, base_path=None): @@ -182,7 +184,8 @@ `OptionParser.relative_path_settings`. """ if base_path is None: - base_path = os.getcwd() + base_path = os.getcwdu() # type(base_path) == unicode + # to allow combining non-ASCII cwd with unicode values in `pathdict` for key in keys: if key in pathdict: value = pathdict[key] @@ -616,8 +619,7 @@ def check_values(self, values, args): """Store positional arguments as runtime settings.""" values._source, values._destination = self.check_args(args) - make_paths_absolute(values.__dict__, self.relative_path_settings, - os.getcwd()) + make_paths_absolute(values.__dict__, self.relative_path_settings) values._config_files = self.config_files return values Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/io.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/io.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/io.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: io.py 7073 2011-07-07 06:49:19Z milde $ +# $Id: io.py 7384 2012-03-19 22:59:09Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -10,12 +10,18 @@ __docformat__ = 'reStructuredText' import sys +import os import re import codecs from docutils import TransformSpec from docutils._compat import b from docutils.error_reporting import locale_encoding, ErrorString, ErrorOutput + +class InputError(IOError): pass +class OutputError(IOError): pass + + class Input(TransformSpec): """ @@ -84,10 +90,9 @@ # Apply heuristics only if no encoding is explicitly given and # no BOM found. Start with UTF-8, because that only matches # data that *IS* UTF-8: - encodings = [enc for enc in ('utf-8', - locale_encoding, # can be None - 'latin-1') # fallback encoding - if enc] + encodings = ['utf-8', 'latin-1'] + if locale_encoding: + encodings.insert(1, locale_encoding) for enc in encodings: try: decoded = unicode(data, enc, self.error_handler) @@ -105,7 +110,7 @@ coding_slug = re.compile(b("coding[:=]\s*([-\w.]+)")) """Encoding declaration pattern.""" - byte_order_marks = ((codecs.BOM_UTF8, 'utf-8'), # actually 'utf-8-sig' + byte_order_marks = ((codecs.BOM_UTF8, 'utf-8'), # 'utf-8-sig' new in v2.5 (codecs.BOM_UTF16_BE, 'utf-16-be'), (codecs.BOM_UTF16_LE, 'utf-16-le'),) """Sequence of (start_bytes, encoding) tuples for encoding detection. @@ -216,14 +221,24 @@ try: self.source = open(source_path, mode, **kwargs) except IOError, error: - if not handle_io_errors: - raise - print >>self._stderr, ErrorString(error) - print >>self._stderr, (u'Unable to open source' - u" file for reading ('%s'). Exiting." % source_path) - sys.exit(1) + if handle_io_errors: + print >>self._stderr, ErrorString(error) + print >>self._stderr, ( + u'Unable to open source file for reading ("%s").' + u'Exiting.' % source_path) + sys.exit(1) + raise InputError(error.errno, error.strerror, source_path) else: self.source = sys.stdin + elif (sys.version_info >= (3,0) and + self.encoding and hasattr(self.source, 'encoding') and + self.encoding != self.source.encoding and + codecs.lookup(self.encoding) != + codecs.lookup(self.source.encoding)): + # TODO: re-open, warn or raise error? + raise UnicodeError('Encoding clash: encoding given is "%s" ' + 'but source is opened with encoding "%s".' % + (self.encoding, self.source.encoding)) if not source_path: try: self.source_path = self.source.name @@ -234,8 +249,25 @@ """ Read and decode a single file and return the data (Unicode string). """ - try: - data = self.source.read() + try: # In Python < 2.5, try...except has to be nested in try...finally. + try: + if self.source is sys.stdin and sys.version_info >= (3,0): + # read as binary data to circumvent auto-decoding + data = self.source.buffer.read() + # normalize newlines + data = b('\n').join(data.splitlines()) + b('\n') + else: + data = self.source.read() + except (UnicodeError, LookupError), err: # (in Py3k read() decodes) + if not self.encoding and self.source_path: + # re-read in binary mode and decode with heuristics + b_source = open(self.source_path, 'rb') + data = b_source.read() + b_source.close() + # normalize newlines + data = b('\n').join(data.splitlines()) + b('\n') + else: + raise finally: if self.autoclose: self.close() @@ -245,12 +277,7 @@ """ Return lines of a single file as list of Unicode strings. """ - try: - lines = self.source.readlines() - finally: - if self.autoclose: - self.close() - return [self.decode(line) for line in lines] + return self.read().splitlines(True) def close(self): if self.source is not sys.stdin: @@ -263,9 +290,15 @@ Output for single, simple file-like objects. """ + mode = 'w' + """The mode argument for `open()`.""" + # 'wb' for binary (e.g. OpenOffice) files. + # (Do not use binary mode ('wb') for text files, as this prevents the + # conversion of newlines to the system specific default.) + def __init__(self, destination=None, destination_path=None, encoding=None, error_handler='strict', autoclose=True, - handle_io_errors=True): + handle_io_errors=True, mode=None): """ :Parameters: - `destination`: either a file-like object (which is written @@ -273,14 +306,22 @@ `destination_path` given). - `destination_path`: a path to a file, which is opened and then written. + - `encoding`: the text encoding of the output file. + - `error_handler`: the encoding error handler to use. - `autoclose`: close automatically after write (except when `sys.stdout` or `sys.stderr` is the destination). + - `handle_io_errors`: summarize I/O errors here, and exit? + - `mode`: how the file is to be opened (see standard function + `open`). The default is 'w', providing universal newline + support for text files. """ Output.__init__(self, destination, destination_path, encoding, error_handler) self.opened = True self.autoclose = autoclose self.handle_io_errors = handle_io_errors + if mode is not None: + self.mode = mode self._stderr = ErrorOutput() if destination is None: if destination_path: @@ -295,42 +336,54 @@ def open(self): # Specify encoding in Python 3. - # (Do not use binary mode ('wb') as this prevents the - # conversion of newlines to the system specific default.) if sys.version_info >= (3,0): kwargs = {'encoding': self.encoding, 'errors': self.error_handler} else: kwargs = {} - try: - self.destination = open(self.destination_path, 'w', **kwargs) + self.destination = open(self.destination_path, self.mode, **kwargs) except IOError, error: - if not self.handle_io_errors: - raise - print >>self._stderr, ErrorString(error) - print >>self._stderr, (u'Unable to open destination file' - u" for writing ('%s'). Exiting." % self.destination_path) - sys.exit(1) + if self.handle_io_errors: + print >>self._stderr, ErrorString(error) + print >>self._stderr, (u'Unable to open destination file' + u" for writing ('%s'). Exiting." % self.destination_path) + sys.exit(1) + raise OutputError(error.errno, error.strerror, + self.destination_path) self.opened = True def write(self, data): """Encode `data`, write it to a single file, and return it. - In Python 3, a (unicode) string is returned. + In Python 3, `data` is returned unchanged. """ - if sys.version_info >= (3,0): - output = data # in py3k, write expects a (Unicode) string - else: - output = self.encode(data) + if sys.version_info < (3,0): + data = self.encode(data) if not self.opened: self.open() - try: - self.destination.write(output) + try: # In Python < 2.5, try...except has to be nested in try...finally. + try: + if (sys.version_info >= (3,0) and self.encoding and + hasattr(self.destination,'encoding') and + self.encoding != self.destination.encoding and + codecs.lookup(self.encoding) != + codecs.lookup(self.destination.encoding)): + # encode self, write bytes + bdata = self.encode(data) + if os.linesep != '\n': + bdata = bdata.replace('\n', os.linesep) + sys.stdout.buffer.write(bdata) + else: + self.destination.write(data) + except (UnicodeError, LookupError), err: # can only happen in py3k + raise UnicodeError( + 'Unable to encode output data. output-encoding is: ' + '%s.\n(%s)' % (self.encoding, ErrorString(err))) finally: if self.autoclose: self.close() - return output + return data def close(self): if self.destination not in (sys.stdout, sys.stderr): @@ -342,17 +395,9 @@ """ A version of docutils.io.FileOutput which writes to a binary file. """ - def open(self): - try: - self.destination = open(self.destination_path, 'wb') - except IOError, error: - if not self.handle_io_errors: - raise - print >>self._stderr, ErrorString(error) - print >>self._stderr, (u'Unable to open destination file' - u" for writing ('%s'). Exiting." % self.destination_path) - sys.exit(1) - self.opened = True + # Used by core.publish_cmdline_to_binary() which in turn is used by + # rst2odt (OpenOffice writer) + mode = 'wb' class StringInput(Input): Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/languages/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/languages/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/languages/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: __init__.py 6433 2010-09-28 08:21:25Z milde $ +# $Id: __init__.py 7126 2011-09-16 19:24:51Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -15,7 +15,7 @@ _languages = {} -def get_language(language_code, reporter): +def get_language(language_code, reporter=None): """Return module with language localizations. `language_code` is a "BCP 47" language tag. @@ -31,9 +31,10 @@ continue _languages[tag] = module return module - reporter.warning( - 'language "%s" not supported: ' % language_code + - 'Docutils-generated text will be in English.') + if reporter is not None: + reporter.warning( + 'language "%s" not supported: ' % language_code + + 'Docutils-generated text will be in English.') module = __import__('en', globals(), locals()) _languages[tag] = module # warn only one time! return module Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/languages/ru.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/languages/ru.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/languages/ru.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,5 @@ -# $Id: ru.py 4564 2006-05-21 20:44:42Z wiemann $ +# -*- coding: utf-8 -*- +# $Id: ru.py 7125 2011-09-16 18:36:18Z milde $ # Author: Roman Suzi <rnd@onego.ru> # Copyright: This module has been placed in the public domain. @@ -14,51 +15,43 @@ __docformat__ = 'reStructuredText' labels = { - u'abstract': u'\u0410\u043d\u043d\u043e\u0442\u0430\u0446\u0438\u044f', - u'address': u'\u0410\u0434\u0440\u0435\u0441', - u'attention': u'\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435!', - u'author': u'\u0410\u0432\u0442\u043e\u0440', - u'authors': u'\u0410\u0432\u0442\u043e\u0440\u044b', - u'caution': u'\u041e\u0441\u0442\u043e\u0440\u043e\u0436\u043d\u043e!', - u'contact': u'\u041a\u043e\u043d\u0442\u0430\u043a\u0442', - u'contents': - u'\u0421\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435', - u'copyright': u'\u041f\u0440\u0430\u0432\u0430 ' - u'\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f', - u'danger': u'\u041e\u041f\u0410\u0421\u041d\u041e!', - u'date': u'\u0414\u0430\u0442\u0430', - u'dedication': - u'\u041f\u043e\u0441\u0432\u044f\u0449\u0435\u043d\u0438\u0435', - u'error': u'\u041e\u0448\u0438\u0431\u043a\u0430', - u'hint': u'\u0421\u043e\u0432\u0435\u0442', - u'important': u'\u0412\u0430\u0436\u043d\u043e', - u'note': u'\u041f\u0440\u0438\u043c\u0435\u0447\u0430\u043d\u0438\u0435', - u'organization': - u'\u041e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f', - u'revision': u'\u0420\u0435\u0434\u0430\u043a\u0446\u0438\u044f', - u'status': u'\u0421\u0442\u0430\u0442\u0443\u0441', - u'tip': u'\u041f\u043e\u0434\u0441\u043a\u0430\u0437\u043a\u0430', - u'version': u'\u0412\u0435\u0440\u0441\u0438\u044f', - u'warning': u'\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436' - u'\u0434\u0435\u043d\u0438\u0435'} + u'abstract': u'Аннотация', + u'address': u'Адрес', + u'attention': u'Внимание!', + u'author': u'Автор', + u'authors': u'Авторы', + u'caution': u'Осторожно!', + u'contact': u'Контакт', + u'contents': u'Содержание', + u'copyright': u'Права копирования', + u'danger': u'ОПАСНО!', + u'date': u'Дата', + u'dedication': u'Посвящение', + u'error': u'Ошибка', + u'hint': u'Совет', + u'important': u'Важно', + u'note': u'Примечание', + u'organization': u'Организация', + u'revision': u'Редакция', + u'status': u'Статус', + u'tip': u'Подсказка', + u'version': u'Версия', + u'warning': u'Предупреждение'} """Mapping of node class name to label text.""" bibliographic_fields = { - u'\u0430\u043d\u043d\u043e\u0442\u0430\u0446\u0438\u044f': u'abstract', - u'\u0430\u0434\u0440\u0435\u0441': u'address', - u'\u0430\u0432\u0442\u043e\u0440': u'author', - u'\u0430\u0432\u0442\u043e\u0440\u044b': u'authors', - u'\u043a\u043e\u043d\u0442\u0430\u043a\u0442': u'contact', - u'\u043f\u0440\u0430\u0432\u0430 \u043a\u043e\u043f\u0438\u0440\u043e' - u'\u0432\u0430\u043d\u0438\u044f': u'copyright', - u'\u0434\u0430\u0442\u0430': u'date', - u'\u043f\u043e\u0441\u0432\u044f\u0449\u0435\u043d\u0438\u0435': - u'dedication', - u'\u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f': - u'organization', - u'\u0440\u0435\u0434\u0430\u043a\u0446\u0438\u044f': u'revision', - u'\u0441\u0442\u0430\u0442\u0443\u0441': u'status', - u'\u0432\u0435\u0440\u0441\u0438\u044f': u'version'} + u'аннотация': u'abstract', + u'адрес': u'address', + u'автор': u'author', + u'авторы': u'authors', + u'контакт': u'contact', + u'права копирования': u'copyright', + u'дата': u'date', + u'посвящение': u'dedication', + u'организация': u'organization', + u'редакция': u'revision', + u'статус': u'status', + u'версия': u'version'} """Russian (lowcased) to canonical name mapping for bibliographic fields.""" author_separators = [';', ','] Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/math/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/math/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/math/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# :Id: $Id: __init__.py 7059 2011-06-27 20:54:13Z milde $ +# :Id: $Id: __init__.py 7218 2011-11-08 17:42:40Z milde $ # :Author: Guenter Milde. # :License: Released under the terms of the `2-Clause BSD license`_, in short: # @@ -17,11 +17,9 @@ :math2html: LaTeX math -> HTML conversion from eLyXer :latex2mathml: LaTeX math -> presentational MathML -:unimathsymbols2tex: Unicode symbol to LaTeX math translation table +:unichar2tex: Unicode character to LaTeX math translation table +:tex2unichar: LaTeX math to Unicode character translation dictionaries """ -__all__ = ['math2html', - 'latex2mathml', - 'unimathsymbols2tex'] # helpers for Docutils math support # ================================= Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/math/latex2mathml.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/math/latex2mathml.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/math/latex2mathml.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf8 -*- -# :Id: $Id: latex2mathml.py 7058 2011-06-27 11:38:56Z milde $ +# :Id: $Id: latex2mathml.py 7218 2011-11-08 17:42:40Z milde $ # :Copyright: © 2010 Günter Milde. # Based on rst2mathml.py from the latex_math sandbox project # © 2005 Jens Jørgen Mortensen @@ -19,7 +19,141 @@ # Based on the `latex_math` sandbox project by Jens Jørgen Mortensen +import docutils.math.tex2unichar as tex2unichar +# TeX spacing combining +over = {'acute': u'\u00B4', # u'\u0301', + 'bar': u'\u00AF', # u'\u0304', + 'breve': u'\u02D8', # u'\u0306', + 'check': u'\u02C7', # u'\u030C', + 'dot': u'\u02D9', # u'\u0307', + 'ddot': u'\u00A8', # u'\u0308', + 'dddot': u'\u20DB', + 'grave': u'`', # u'\u0300', + 'hat': u'^', # u'\u0302', + 'mathring': u'\u02DA', # u'\u030A', + 'overleftrightarrow': u'\u20e1', + # 'overline': # u'\u0305', + 'tilde': u'\u02DC', # u'\u0303', + 'vec': u'\u20D7'} + +Greek = { # Capital Greek letters: (upright in TeX style) + 'Phi':u'\u03a6', 'Xi':u'\u039e', 'Sigma':u'\u03a3', + 'Psi':u'\u03a8', 'Delta':u'\u0394', 'Theta':u'\u0398', + 'Upsilon':u'\u03d2', 'Pi':u'\u03a0', 'Omega':u'\u03a9', + 'Gamma':u'\u0393', 'Lambda':u'\u039b'} + +letters = tex2unichar.mathalpha + +special = tex2unichar.mathbin # Binary symbols +special.update(tex2unichar.mathrel) # Relation symbols, arrow symbols +special.update(tex2unichar.mathord) # Miscellaneous symbols +special.update(tex2unichar.mathop) # Variable-sized symbols +special.update(tex2unichar.mathopen) # Braces +special.update(tex2unichar.mathclose) # Braces +special.update(tex2unichar.mathfence) + +sumintprod = ''.join([special[symbol] for symbol in + ['sum', 'int', 'oint', 'prod']]) + +functions = ['arccos', 'arcsin', 'arctan', 'arg', 'cos', 'cosh', + 'cot', 'coth', 'csc', 'deg', 'det', 'dim', + 'exp', 'gcd', 'hom', 'inf', 'ker', 'lg', + 'lim', 'liminf', 'limsup', 'ln', 'log', 'max', + 'min', 'Pr', 'sec', 'sin', 'sinh', 'sup', + 'tan', 'tanh', + 'injlim', 'varinjlim', 'varlimsup', + 'projlim', 'varliminf', 'varprojlim'] + + +mathbb = { + 'A': u'\U0001D538', + 'B': u'\U0001D539', + 'C': u'\u2102', + 'D': u'\U0001D53B', + 'E': u'\U0001D53C', + 'F': u'\U0001D53D', + 'G': u'\U0001D53E', + 'H': u'\u210D', + 'I': u'\U0001D540', + 'J': u'\U0001D541', + 'K': u'\U0001D542', + 'L': u'\U0001D543', + 'M': u'\U0001D544', + 'N': u'\u2115', + 'O': u'\U0001D546', + 'P': u'\u2119', + 'Q': u'\u211A', + 'R': u'\u211D', + 'S': u'\U0001D54A', + 'T': u'\U0001D54B', + 'U': u'\U0001D54C', + 'V': u'\U0001D54D', + 'W': u'\U0001D54E', + 'X': u'\U0001D54F', + 'Y': u'\U0001D550', + 'Z': u'\u2124', + } + +mathscr = { + 'A': u'\U0001D49C', + 'B': u'\u212C', # bernoulli function + 'C': u'\U0001D49E', + 'D': u'\U0001D49F', + 'E': u'\u2130', + 'F': u'\u2131', + 'G': u'\U0001D4A2', + 'H': u'\u210B', # hamiltonian + 'I': u'\u2110', + 'J': u'\U0001D4A5', + 'K': u'\U0001D4A6', + 'L': u'\u2112', # lagrangian + 'M': u'\u2133', # physics m-matrix + 'N': u'\U0001D4A9', + 'O': u'\U0001D4AA', + 'P': u'\U0001D4AB', + 'Q': u'\U0001D4AC', + 'R': u'\u211B', + 'S': u'\U0001D4AE', + 'T': u'\U0001D4AF', + 'U': u'\U0001D4B0', + 'V': u'\U0001D4B1', + 'W': u'\U0001D4B2', + 'X': u'\U0001D4B3', + 'Y': u'\U0001D4B4', + 'Z': u'\U0001D4B5', + 'a': u'\U0001D4B6', + 'b': u'\U0001D4B7', + 'c': u'\U0001D4B8', + 'd': u'\U0001D4B9', + 'e': u'\u212F', + 'f': u'\U0001D4BB', + 'g': u'\u210A', + 'h': u'\U0001D4BD', + 'i': u'\U0001D4BE', + 'j': u'\U0001D4BF', + 'k': u'\U0001D4C0', + 'l': u'\U0001D4C1', + 'm': u'\U0001D4C2', + 'n': u'\U0001D4C3', + 'o': u'\u2134', # order of + 'p': u'\U0001D4C5', + 'q': u'\U0001D4C6', + 'r': u'\U0001D4C7', + 's': u'\U0001D4C8', + 't': u'\U0001D4C9', + 'u': u'\U0001D4CA', + 'v': u'\U0001D4CB', + 'w': u'\U0001D4CC', + 'x': u'\U0001D4CD', + 'y': u'\U0001D4CE', + 'z': u'\U0001D4CF', + } + +negatables = {'=': u'\u2260', + '\in': u'\u2209', + '\equiv': u'\u2262'} + # LaTeX to MathML translation stuff: class math: """Base class for MathML elements.""" @@ -224,116 +358,6 @@ def xml_body(self): return [self.text] -# TeX spacing combining -over = {'acute': u'\u00B4', # u'\u0301', - 'bar': u'\u00AF', # u'\u0304', - 'breve': u'\u02D8', # u'\u0306', - 'check': u'\u02C7', # u'\u030C', - 'dot': u'\u02D9', # u'\u0307', - 'ddot': u'\u00A8', # u'\u0308', - 'dddot': u'\u20DB', - 'grave': u'`', # u'\u0300', - 'hat': u'^', # u'\u0302', - 'tilde': u'\u02DC', # u'\u0303', - # 'overline': # u'\u0305', - 'vec': u'\u20D7'} - -Greek = { # Upper case greek letters: - 'Phi':u'\u03a6', 'Xi':u'\u039e', 'Sigma':u'\u03a3', - 'Psi':u'\u03a8', 'Delta':u'\u0394', 'Theta':u'\u0398', - 'Upsilon':u'\u03d2', 'Pi':u'\u03a0', 'Omega':u'\u03a9', - 'Gamma':u'\u0393', 'Lambda':u'\u039b'} - -letters = { # Lower case greek letters (and dotless i, j): - # 'imath':u'i', 'jmath':u'i', # when used with combining accents - 'imath':u'\u0131', 'jmath':u'\u0237', - 'tau':u'\u03c4', 'phi':u'\u03d5', 'xi':u'\u03be', 'iota':u'\u03b9', - 'epsilon':u'\u03f5', 'varrho':u'\u03f1', 'varsigma':u'\u03c2', - 'beta':u'\u03b2', 'psi':u'\u03c8', 'rho':u'\u03c1', - 'delta':u'\u03b4', 'alpha':u'\u03b1', 'zeta':u'\u03b6', - 'omega':u'\u03c9', 'varepsilon':u'\u03b5', 'kappa':u'\u03ba', - 'vartheta':u'\u03d1', 'chi':u'\u03c7', 'upsilon':u'\u03c5', - 'sigma':u'\u03c3', 'varphi':u'\u03c6', 'varpi':u'\u03d6', - 'mu':u'\u03bc', 'eta':u'\u03b7', 'theta':u'\u03b8', 'pi':u'\u03c0', - 'varkappa':u'\u03f0', 'nu':u'\u03bd', 'gamma':u'\u03b3', - 'lambda':u'\u03bb'} - -special = { - # Binary operation symbols: - 'wedge':u'\u2227', 'diamond':u'\u22c4', 'star':u'\u22c6', - 'amalg':u'\u2a3f', 'ast':u'\u2217', 'odot':u'\u2299', - 'triangleleft':u'\u25c1', 'bigtriangleup':u'\u25b3', - 'ominus':u'\u2296', 'ddagger':u'\u2021', 'wr':u'\u2240', - 'otimes':u'\u2297', 'sqcup':u'\u2294', 'oplus':u'\u2295', - 'bigcirc':u'\u25cb', 'oslash':u'\u2298', 'sqcap':u'\u2293', - 'bullet':u'\u2219', 'cup':u'\u222a', 'cdot':u'\u22c5', - 'cap':u'\u2229', 'bigtriangledown':u'\u25bd', 'times':u'\xd7', - 'setminus':u'\u2216', 'circ':u'\u2218', 'vee':u'\u2228', - 'uplus':u'\u228e', 'mp':u'\u2213', 'dagger':u'\u2020', - 'triangleright':u'\u25b7', 'div':u'\xf7', 'pm':u'\xb1', - # Relation symbols: - 'subset':u'\u2282', 'propto':u'\u221d', 'geq':u'\u2265', - 'ge':u'\u2265', 'sqsubset':u'\u228f', 'Join':u'\u2a1d', - 'frown':u'\u2322', 'models':u'\u22a7', 'supset':u'\u2283', - 'in':u'\u2208', 'doteq':u'\u2250', 'dashv':u'\u22a3', - 'gg':u'\u226b', 'leq':u'\u2264', 'succ':u'\u227b', - 'vdash':u'\u22a2', 'cong':u'\u2245', 'simeq':u'\u2243', - 'subseteq':u'\u2286', 'parallel':u'\u2225', 'equiv':u'\u2261', - 'ni':u'\u220b', 'le':u'\u2264', 'approx':u'\u2248', - 'precsim':u'\u227e', 'sqsupset':u'\u2290', 'll':u'\u226a', - 'sqsupseteq':u'\u2292', 'mid':u'\u2223', 'prec':u'\u227a', - 'succsim':u'\u227f', 'bowtie':u'\u22c8', 'perp':u'\u27c2', - 'sqsubseteq':u'\u2291', 'asymp':u'\u224d', 'smile':u'\u2323', - 'supseteq':u'\u2287', 'sim':u'\u223c', 'neq':u'\u2260', - # Arrow symbols: - 'searrow':u'\u2198', 'updownarrow':u'\u2195', 'Uparrow':u'\u21d1', - 'longleftrightarrow':u'\u27f7', 'Leftarrow':u'\u21d0', - 'longmapsto':u'\u27fc', 'Longleftarrow':u'\u27f8', - 'nearrow':u'\u2197', 'hookleftarrow':u'\u21a9', - 'downarrow':u'\u2193', 'Leftrightarrow':u'\u21d4', - 'longrightarrow':u'\u27f6', 'rightharpoondown':u'\u21c1', - 'longleftarrow':u'\u27f5', 'rightarrow':u'\u2192', - 'Updownarrow':u'\u21d5', 'rightharpoonup':u'\u21c0', - 'Longleftrightarrow':u'\u27fa', 'leftarrow':u'\u2190', - 'mapsto':u'\u21a6', 'nwarrow':u'\u2196', 'uparrow':u'\u2191', - 'leftharpoonup':u'\u21bc', 'leftharpoondown':u'\u21bd', - 'Downarrow':u'\u21d3', 'leftrightarrow':u'\u2194', - 'Longrightarrow':u'\u27f9', 'swarrow':u'\u2199', - 'hookrightarrow':u'\u21aa', 'Rightarrow':u'\u21d2', - 'to':u'\u2192', - # Miscellaneous symbols: - 'infty':u'\u221e', 'surd':u'\u221a', - 'partial':u'\u2202', 'ddots':u'\u22f1', 'exists':u'\u2203', - 'flat':u'\u266d', 'diamondsuit':u'\u2662', 'wp':u'\u2118', - 'spadesuit':u'\u2660', 'Re':u'\u211c', 'vdots':u'\u22ee', - 'aleph':u'\u2135', 'clubsuit':u'\u2663', 'sharp':u'\u266f', - 'angle':u'\u2220', 'prime':u'\u2032', 'natural':u'\u266e', - 'ell':u'\u2113', 'neg':u'\xac', 'top':u'\u22a4', 'nabla':u'\u2207', - 'bot':u'\u22a5', 'heartsuit':u'\u2661', 'cdots':u'\u22ef', - 'Im':u'\u2111', 'forall':u'\u2200', - 'hbar':u'\u210f', 'emptyset':u'\u2205', - # Variable-sized symbols: - 'bigotimes':u'\u2a02', 'coprod':u'\u2210', 'int':u'\u222b', - 'sum':u'\u2211', 'bigodot':u'\u2a00', 'bigcup':u'\u22c3', - 'biguplus':u'\u2a04', 'bigcap':u'\u22c2', 'bigoplus':u'\u2a01', - 'oint':u'\u222e', 'bigvee':u'\u22c1', 'bigwedge':u'\u22c0', - 'prod':u'\u220f', - # Braces: - 'langle':u'\u2329', 'rangle':u'\u232A'} - -sumintprod = ''.join([special[symbol] for symbol in - ['sum', 'int', 'oint', 'prod']]) - -functions = ['arccos', 'arcsin', 'arctan', 'arg', 'cos', 'cosh', - 'cot', 'coth', 'csc', 'deg', 'det', 'dim', - 'exp', 'gcd', 'hom', 'inf', 'ker', 'lg', - 'lim', 'liminf', 'limsup', 'ln', 'log', 'max', - 'min', 'Pr', 'sec', 'sin', 'sinh', 'sup', - 'tan', 'tanh', - 'injlim', 'varinjlim', 'varlimsup', - 'projlim', 'varliminf', 'varprojlim'] - - def parse_latex_math(string, inline=True): """parse_latex_math(string [,inline]) -> MathML-tree @@ -435,95 +459,6 @@ return tree -mathbb = { - 'A': u'\U0001D538', - 'B': u'\U0001D539', - 'C': u'\u2102', - 'D': u'\U0001D53B', - 'E': u'\U0001D53C', - 'F': u'\U0001D53D', - 'G': u'\U0001D53E', - 'H': u'\u210D', - 'I': u'\U0001D540', - 'J': u'\U0001D541', - 'K': u'\U0001D542', - 'L': u'\U0001D543', - 'M': u'\U0001D544', - 'N': u'\u2115', - 'O': u'\U0001D546', - 'P': u'\u2119', - 'Q': u'\u211A', - 'R': u'\u211D', - 'S': u'\U0001D54A', - 'T': u'\U0001D54B', - 'U': u'\U0001D54C', - 'V': u'\U0001D54D', - 'W': u'\U0001D54E', - 'X': u'\U0001D54F', - 'Y': u'\U0001D550', - 'Z': u'\u2124', - } - -mathscr = { - 'A': u'\U0001D49C', - 'B': u'\u212C', # bernoulli function - 'C': u'\U0001D49E', - 'D': u'\U0001D49F', - 'E': u'\u2130', - 'F': u'\u2131', - 'G': u'\U0001D4A2', - 'H': u'\u210B', # hamiltonian - 'I': u'\u2110', - 'J': u'\U0001D4A5', - 'K': u'\U0001D4A6', - 'L': u'\u2112', # lagrangian - 'M': u'\u2133', # physics m-matrix - 'N': u'\U0001D4A9', - 'O': u'\U0001D4AA', - 'P': u'\U0001D4AB', - 'Q': u'\U0001D4AC', - 'R': u'\u211B', - 'S': u'\U0001D4AE', - 'T': u'\U0001D4AF', - 'U': u'\U0001D4B0', - 'V': u'\U0001D4B1', - 'W': u'\U0001D4B2', - 'X': u'\U0001D4B3', - 'Y': u'\U0001D4B4', - 'Z': u'\U0001D4B5', - 'a': u'\U0001D4B6', - 'b': u'\U0001D4B7', - 'c': u'\U0001D4B8', - 'd': u'\U0001D4B9', - 'e': u'\u212F', - 'f': u'\U0001D4BB', - 'g': u'\u210A', - 'h': u'\U0001D4BD', - 'i': u'\U0001D4BE', - 'j': u'\U0001D4BF', - 'k': u'\U0001D4C0', - 'l': u'\U0001D4C1', - 'm': u'\U0001D4C2', - 'n': u'\U0001D4C3', - 'o': u'\u2134', # order of - 'p': u'\U0001D4C5', - 'q': u'\U0001D4C6', - 'r': u'\U0001D4C7', - 's': u'\U0001D4C8', - 't': u'\U0001D4C9', - 'u': u'\U0001D4CA', - 'v': u'\U0001D4CB', - 'w': u'\U0001D4CC', - 'x': u'\U0001D4CD', - 'y': u'\U0001D4CE', - 'z': u'\U0001D4CF', - } - -negatables = {'=': u'\u2260', - '\in': u'\u2209', - '\equiv': u'\u2262'} - - def handle_keyword(name, node, string): skip = 0 if len(string) > 0 and string[0] == ' ': @@ -605,21 +540,21 @@ skip += 3 elif name == 'colon': # "normal" colon, not binary operator node = node.append(mo(':')) # TODO: add ``lspace="0pt"`` + elif name in Greek: # Greek capitals (upright in "TeX style") + node = node.append(mo(Greek[name])) + # TODO: "ISO style" sets them italic. Could we use a class argument + # to enable styling via CSS? elif name in letters: node = node.append(mi(letters[name])) - elif name in Greek: - node = node.append(mo(Greek[name])) elif name in special: node = node.append(mo(special[name])) elif name in functions: node = node.append(mo(name)) + elif name in over: + ovr = mover(mo(over[name]), reversed=True) + node.append(ovr) + node = ovr else: - chr = over.get(name) - if chr is not None: - ovr = mover(mo(chr), reversed=True) - node.append(ovr) - node = ovr - else: - raise SyntaxError(u'Unknown LaTeX command: ' + name) + raise SyntaxError(u'Unknown LaTeX command: ' + name) return node, skip Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/nodes.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/nodes.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/nodes.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: nodes.py 7054 2011-06-07 15:05:58Z milde $ +# $Id: nodes.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -120,7 +120,7 @@ Return true if we should stop the traversal. """ - stop = 0 + stop = False visitor.document.reporter.debug( 'docutils.nodes.Node.walk calling dispatch_visit for %s' % self.__class__.__name__) @@ -135,12 +135,12 @@ try: for child in children[:]: if child.walk(visitor): - stop = 1 + stop = True break except SkipSiblings: pass except StopTraversal: - stop = 1 + stop = True return stop def walkabout(self, visitor): @@ -155,8 +155,8 @@ Return true if we should stop the traversal. """ - call_depart = 1 - stop = 0 + call_depart = True + stop = False visitor.document.reporter.debug( 'docutils.nodes.Node.walkabout calling dispatch_visit for %s' % self.__class__.__name__) @@ -166,19 +166,19 @@ except SkipNode: return stop except SkipDeparture: - call_depart = 0 + call_depart = False children = self.children try: for child in children[:]: if child.walkabout(visitor): - stop = 1 + stop = True break except SkipSiblings: pass except SkipChildren: pass except StopTraversal: - stop = 1 + stop = True if call_depart: visitor.document.reporter.debug( 'docutils.nodes.Node.walkabout calling dispatch_departure ' @@ -203,8 +203,8 @@ result.extend(child._all_traverse()) return result - def traverse(self, condition=None, - include_self=1, descend=1, siblings=0, ascend=0): + def traverse(self, condition=None, include_self=True, descend=True, + siblings=False, ascend=False): """ Return an iterable containing @@ -236,12 +236,12 @@ [<emphasis>, <strong>, <#text: Foo>, <#text: Bar>] - and list(strong.traverse(ascend=1)) equals :: + and list(strong.traverse(ascend=True)) equals :: [<strong>, <#text: Foo>, <#text: Bar>, <reference>, <#text: Baz>] """ if ascend: - siblings=1 + siblings=True # Check for special argument combinations that allow using an # optimized version of traverse() if include_self and descend and not siblings: @@ -260,16 +260,17 @@ r.append(self) if descend and len(self.children): for child in self: - r.extend(child.traverse( - include_self=1, descend=1, siblings=0, ascend=0, - condition=condition)) + r.extend(child.traverse(include_self=True, descend=True, + siblings=False, ascend=False, + condition=condition)) if siblings or ascend: node = self while node.parent: index = node.parent.index(node) for sibling in node.parent[index+1:]: - r.extend(sibling.traverse(include_self=1, descend=descend, - siblings=0, ascend=0, + r.extend(sibling.traverse(include_self=True, + descend=descend, + siblings=False, ascend=False, condition=condition)) if not ascend: break @@ -277,8 +278,8 @@ node = node.parent return r - def next_node(self, condition=None, - include_self=0, descend=1, siblings=0, ascend=0): + def next_node(self, condition=None, include_self=False, descend=True, + siblings=False, ascend=False): """ Return the first node in the iterable returned by traverse(), or None if the iterable is empty. @@ -499,23 +500,29 @@ # 2to3 doesn't convert __unicode__ to __str__ __str__ = __unicode__ - def starttag(self): + def starttag(self, quoteattr=None): + # the optional arg is used by the docutils_xml writer + if quoteattr is None: + quoteattr = pseudo_quoteattr parts = [self.tagname] for name, value in self.attlist(): if value is None: # boolean attribute parts.append(name) - elif isinstance(value, list): + continue + if isinstance(value, list): values = [serial_escape('%s' % (v,)) for v in value] - parts.append('%s="%s"' % (name, ' '.join(values))) + value = ' '.join(values) else: - parts.append('%s="%s"' % (name, value)) - return '<%s>' % ' '.join(parts) + value = unicode(value) + value = quoteattr(value) + parts.append(u'%s=%s' % (name, value)) + return u'<%s>' % u' '.join(parts) def endtag(self): return '</%s>' % self.tagname def emptytag(self): - return u'<%s/>' % ' '.join([self.tagname] + + return u'<%s/>' % u' '.join([self.tagname] + ['%s="%s"' % (n, v) for n, v in self.attlist()]) @@ -1106,7 +1113,7 @@ def note_explicit_target(self, target, msgnode=None): id = self.set_id(target, msgnode) - self.set_name_id_map(target, id, msgnode, explicit=1) + self.set_name_id_map(target, id, msgnode, explicit=True) def note_refname(self, node): self.refnames.setdefault(node['refname'], []).append(node) @@ -1913,6 +1920,10 @@ """Escape string values that are elements of a list, for serialization.""" return value.replace('\\', r'\\').replace(' ', r'\ ') +def pseudo_quoteattr(value): + """Quote attributes for pseudo-xml""" + return '"%s"' % value + #  # # Local Variables: Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: __init__.py 7062 2011-06-30 22:14:29Z milde $ +# $Id: __init__.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -49,12 +49,12 @@ of customizability hasn't been implemented yet. Patches welcome! When instantiating an object of the `Parser` class, two parameters may be -passed: ``rfc2822`` and ``inliner``. Pass ``rfc2822=1`` to enable an initial -RFC-2822 style header block, parsed as a "field_list" element (with "class" -attribute set to "rfc2822"). Currently this is the only body-level element -which is customizable without subclassing. (Tip: subclass `Parser` and change -its "state_classes" and "initial_state" attributes to refer to new classes. -Contact the author if you need more details.) +passed: ``rfc2822`` and ``inliner``. Pass ``rfc2822=True`` to enable an +initial RFC-2822 style header block, parsed as a "field_list" element (with +"class" attribute set to "rfc2822"). Currently this is the only body-level +element which is customizable without subclassing. (Tip: subclass `Parser` +and change its "state_classes" and "initial_state" attributes to refer to new +classes. Contact the author if you need more details.) The ``inliner`` parameter takes an instance of `states.Inliner` or a subclass. It handles inline markup recognition. A common extension is the addition of @@ -131,12 +131,17 @@ 'validator': frontend.validate_boolean}), ('Enable the "raw" directive. Enabled by default.', ['--raw-enabled'], - {'action': 'store_true'}),)) + {'action': 'store_true'}), + ('Token name set for parsing code with Pygments: one of ' + '"long", "short", or "none (no parsing)". Default is "short".', + ['--syntax-highlight'], + {'choices': ['long', 'short', 'none'], + 'default': 'short', 'metavar': '<format>'}),)) config_section = 'restructuredtext parser' config_section_dependencies = ('parsers',) - def __init__(self, rfc2822=None, inliner=None): + def __init__(self, rfc2822=False, inliner=None): if rfc2822: self.initial_state = 'RFC2822Body' else: @@ -153,7 +158,7 @@ debug=document.reporter.debug_flag) inputlines = docutils.statemachine.string2lines( inputstring, tab_width=document.settings.tab_width, - convert_whitespace=1) + convert_whitespace=True) self.statemachine.run(inputlines, document, inliner=self.inliner) self.finish_parse() @@ -300,7 +305,6 @@ self.block_text = block_text self.state = state self.state_machine = state_machine - self.src, self.srcline = state_machine.get_source_and_line(lineno) def run(self): raise NotImplementedError('Must override run() is subclass.') @@ -316,8 +320,9 @@ at level `level`, which automatically gets the directive block and the line number added. - You'd often use self.error(message) instead, which will - generate an ERROR-level directive error. + Preferably use the `debug`, `info`, `warning`, `error`, or `severe` + wrapper methods, e.g. ``self.error(message)`` to generate an + ERROR-level directive error. """ return DirectiveError(level, message) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: __init__.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: __init__.py 7119 2011-09-02 13:00:23Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -17,6 +17,7 @@ _directive_registry = { 'attention': ('admonitions', 'Attention'), 'caution': ('admonitions', 'Caution'), + 'code': ('body', 'CodeBlock'), 'danger': ('admonitions', 'Danger'), 'error': ('admonitions', 'Error'), 'important': ('admonitions', 'Important'), @@ -222,7 +223,7 @@ Check for a positive argument of one of the units and return a normalized string of the form "<value><unit>" (without space in between). - + To be called from directive option conversion functions. """ match = re.match(r'^([0-9.]+) *(%s)$' % '|'.join(units), argument) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/body.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/body.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/body.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: body.py 7072 2011-07-06 15:52:30Z milde $ +# $Id: body.py 7267 2011-12-20 14:14:21Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -16,8 +16,8 @@ from docutils.parsers.rst import Directive from docutils.parsers.rst import directives from docutils.parsers.rst.roles import set_classes +from docutils.utils.code_analyzer import Lexer, LexerError, NumberLines - class BasePseudoSection(Directive): required_arguments = 1 @@ -115,6 +115,68 @@ return [node] + messages +class CodeBlock(Directive): + """Parse and mark up content of a code block. + + Configuration setting: syntax_highlight + Highlight Code content with Pygments? + Possible values: ('long', 'short', 'none') + + """ + optional_arguments = 1 + option_spec = {'class': directives.class_option, + 'name': directives.unchanged, + 'number-lines': directives.unchanged # integer or None + } + has_content = True + + def run(self): + self.assert_has_content() + if self.arguments: + language = self.arguments[0] + else: + language = '' + set_classes(self.options) + classes = ['code'] + if language: + classes.append(language) + if 'classes' in self.options: + classes.extend(self.options['classes']) + + # set up lexical analyzer + try: + tokens = Lexer(u'\n'.join(self.content), language, + self.state.document.settings.syntax_highlight) + except LexerError, error: + raise self.warning(error) + + if 'number-lines' in self.options: + # optional argument `startline`, defaults to 1 + try: + startline = int(self.options['number-lines'] or 1) + except ValueError: + raise self.error(':number-lines: with non-integer start value') + endline = startline + len(self.content) + # add linenumber filter: + tokens = NumberLines(tokens, startline, endline) + + node = nodes.literal_block('\n'.join(self.content), classes=classes) + self.add_name(node) + # if called from "include", set the source + if 'source' in self.options: + node.attributes['source'] = self.options['source'] + # analyze content and add nodes for every token + for classes, value in tokens: + # print (classes, value) + if classes: + node += nodes.inline(value, value, classes=classes) + else: + # insert as Text to decrease the verbosity of the output + node += nodes.Text(value, value) + + return [node] + + class MathBlock(Directive): option_spec = {'class': directives.class_option, Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/html.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/html.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/html.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: html.py 4667 2006-07-12 21:40:56Z wiemann $ +# $Id: html.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -41,8 +41,7 @@ line = self.state_machine.line msg = self.reporter.info( 'No content for meta tag "%s".' % name, - nodes.literal_block(line, line), - line=self.state_machine.abs_line_number()) + nodes.literal_block(line, line)) return msg, blank_finish tokens = name.split() try: @@ -58,8 +57,7 @@ line = self.state_machine.line msg = self.reporter.error( 'Error parsing meta tag attribute "%s": %s.' - % (token, detail), nodes.literal_block(line, line), - line=self.state_machine.abs_line_number()) + % (token, detail), nodes.literal_block(line, line)) return msg, blank_finish self.document.note_pending(pending) return pending, blank_finish @@ -76,7 +74,7 @@ node = nodes.Element() new_line_offset, blank_finish = self.state.nested_list_parse( self.content, self.content_offset, node, - initial_state='MetaBody', blank_finish=1, + initial_state='MetaBody', blank_finish=True, state_machine_kwargs=self.SMkwargs) if (new_line_offset - self.content_offset) != len(self.content): # incomplete parse of block? Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/images.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/images.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/images.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: images.py 7062 2011-06-30 22:14:29Z milde $ +# $Id: images.py 7256 2011-12-14 23:53:38Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -10,18 +10,22 @@ import sys +import urllib from docutils import nodes, utils from docutils.parsers.rst import Directive from docutils.parsers.rst import directives, states from docutils.nodes import fully_normalize_name, whitespace_normalize_name from docutils.parsers.rst.roles import set_classes - -try: - import Image as PIL # PIL +try: # check for the Python Imaging Library + import PIL except ImportError: - PIL = None + try: # sometimes PIL modules are put in PYTHONPATH's root + import Image + class PIL(object): pass # dummy wrapper + PIL.Image = Image + except ImportError: + PIL = None - class Image(Directive): align_h_values = ('left', 'center', 'right') @@ -121,15 +125,17 @@ figure_node = nodes.figure('', image_node) if figwidth == 'image': if PIL and self.state.document.settings.file_insertion_enabled: - # PIL doesn't like Unicode paths: + imagepath = urllib.url2pathname(image_node['uri']) try: - i = PIL.open(str(image_node['uri'])) - except (IOError, UnicodeError): - pass + img = PIL.Image.open( + imagepath.encode(sys.getfilesystemencoding())) + except (IOError, UnicodeEncodeError): + pass # TODO: warn? else: self.state.document.settings.record_dependencies.add( - image_node['uri']) - figure_node['width'] = i.size[0] + imagepath.replace('\\', '/')) + figure_node['width'] = img.size[0] + del img elif figwidth is not None: figure_node['width'] = figwidth if figclasses: Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/misc.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/misc.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/misc.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: misc.py 7072 2011-07-06 15:52:30Z milde $ +# $Id: misc.py 7328 2012-01-27 08:41:35Z milde $ # Authors: David Goodger <goodger@python.org>; Dethe Elza # Copyright: This module has been placed in the public domain. @@ -14,6 +14,8 @@ from docutils.error_reporting import SafeString, ErrorString from docutils.parsers.rst import Directive, convert_directive_function from docutils.parsers.rst import directives, roles, states +from docutils.parsers.rst.directives.body import CodeBlock, NumberLines +from docutils.parsers.rst.roles import set_classes from docutils.transforms import misc class Include(Directive): @@ -32,18 +34,23 @@ optional_arguments = 0 final_argument_whitespace = True option_spec = {'literal': directives.flag, + 'code': directives.unchanged, 'encoding': directives.encoding, 'tab-width': int, 'start-line': int, 'end-line': int, 'start-after': directives.unchanged_required, - 'end-before': directives.unchanged_required} + 'end-before': directives.unchanged_required, + # ignored except for 'literal' or 'code': + 'number-lines': directives.unchanged, # integer or None + 'class': directives.class_option, + 'name': directives.unchanged} standard_include_path = os.path.join(os.path.dirname(states.__file__), 'include') def run(self): - """Include a reST file as part of the content of this reST file.""" + """Include a file as part of the content of this reST file.""" if not self.state.document.settings.file_insertion_enabled: raise self.warning('"%s" directive disabled.' % self.name) source = self.state_machine.input_lines.source( @@ -98,20 +105,52 @@ raise self.severe('Problem with "end-before" option of "%s" ' 'directive:\nText not found.' % self.name) rawtext = rawtext[:before_index] + + include_lines = statemachine.string2lines(rawtext, tab_width, + convert_whitespace=True) if 'literal' in self.options: # Convert tabs to spaces, if `tab_width` is positive. if tab_width >= 0: text = rawtext.expandtabs(tab_width) else: text = rawtext - literal_block = nodes.literal_block(rawtext, text, source=path) + literal_block = nodes.literal_block(rawtext, source=path, + classes=self.options.get('class', [])) literal_block.line = 1 + self.add_name(literal_block) + if 'number-lines' in self.options: + try: + startline = int(self.options['number-lines'] or 1) + except ValueError: + raise self.error(':number-lines: with non-integer ' + 'start value') + endline = startline + len(include_lines) + if text.endswith('\n'): + text = text[:-1] + tokens = NumberLines([([], text)], startline, endline) + for classes, value in tokens: + if classes: + literal_block += nodes.inline(value, value, + classes=classes) + else: + literal_block += nodes.Text(value, value) + else: + literal_block += nodes.Text(text, text) return [literal_block] - else: - include_lines = statemachine.string2lines( - rawtext, tab_width, convert_whitespace=1) - self.state_machine.insert_input(include_lines, path) - return [] + if 'code' in self.options: + self.options['source'] = path + codeblock = CodeBlock(self.name, + [self.options.pop('code')], # arguments + self.options, + include_lines, # content + self.lineno, + self.content_offset, + self.block_text, + self.state, + self.state_machine) + return codeblock.run() + self.state_machine.insert_input(include_lines, path) + return [] class Raw(Directive): @@ -159,12 +198,14 @@ self.options['file'])) path = utils.relative_path(None, path) try: - self.state.document.settings.record_dependencies.add(path) raw_file = io.FileInput( source_path=path, encoding=encoding, error_handler=(self.state.document.settings.\ input_encoding_error_handler), handle_io_errors=None) + # TODO: currently, raw input files are recorded as + # dependencies even if not used for the chosen output format. + self.state.document.settings.record_dependencies.add(path) except IOError, error: raise self.severe(u'Problems with "%s" directive path:\n%s.' % (self.name, ErrorString(error))) @@ -199,6 +240,8 @@ # This will always fail because there is no content. self.assert_has_content() raw_node = nodes.raw('', text, **attributes) + (raw_node.source, + raw_node.line) = self.state_machine.get_source_and_line(self.lineno) return [raw_node] Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/parts.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/parts.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/parts.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: parts.py 7072 2011-07-06 15:52:30Z milde $ +# $Id: parts.py 7308 2012-01-06 12:08:43Z milde $ # Authors: David Goodger <goodger@python.org>; Dmitry Jemerov # Copyright: This module has been placed in the public domain. @@ -64,9 +64,8 @@ topic = nodes.topic(classes=['contents']) topic['classes'] += self.options.get('class', []) # the latex2e writer needs source and line for a warning: - src, srcline = self.state_machine.get_source_and_line() - topic.source = src - topic.line = srcline - 1 + topic.source, topic.line = self.state_machine.get_source_and_line() + topic.line -= 1 if 'local' in self.options: topic['classes'].append('local') if title: Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/tables.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/tables.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/directives/tables.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: tables.py 7072 2011-07-06 15:52:30Z milde $ +# $Id: tables.py 7328 2012-01-27 08:41:35Z milde $ # Authors: David Goodger <goodger@python.org>; David Priest # Copyright: This module has been placed in the public domain. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/af.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/af.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/af.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: af.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: af.py 7119 2011-09-02 13:00:23Z milde $ # Author: Jannie Hofmeyr <jhsh@sun.ac.za> # Copyright: This module has been placed in the public domain. @@ -18,6 +18,7 @@ directives = { 'aandag': 'attention', 'versigtig': 'caution', + 'code (translation required)': 'code', 'gevaar': 'danger', 'fout': 'error', 'wenk': 'hint', @@ -73,6 +74,7 @@ 'ab': 'abbreviation', 'akroniem': 'acronym', 'ac': 'acronym', + u'code (translation required)': 'code', 'indeks': 'index', 'i': 'index', 'voetskrif': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/ca.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/ca.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/ca.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: ca.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: ca.py 7119 2011-09-02 13:00:23Z milde $ # Author: Ivan Vilata i Balaguer <ivan@selidor.net> # Copyright: This module has been placed in the public domain. @@ -19,6 +19,7 @@ # language-dependent: fixed u'atenci\u00F3': 'attention', u'compte': 'caution', + u'code (translation required)': 'code', u'perill': 'danger', u'error': 'error', u'suggeriment': 'hint', @@ -84,6 +85,7 @@ u'ab': 'abbreviation', u'acr\u00F2nim': 'acronym', u'ac': 'acronym', + u'code (translation required)': 'code', u'\u00EDndex': 'index', u'i': 'index', u'sub\u00EDndex': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/cs.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/cs.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/cs.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: cs.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: cs.py 7119 2011-09-02 13:00:23Z milde $ # Author: Marek Blaha <mb@dat.cz> # Copyright: This module has been placed in the public domain. @@ -19,6 +19,7 @@ # language-dependent: fixed u'pozor': 'attention', u'caution (translation required)': 'caution', # jak rozlisit caution a warning? + u'code (translation required)': 'code', u'nebezpe\u010D\u00ED': 'danger', u'chyba': 'error', u'rada': 'hint', @@ -75,6 +76,7 @@ u'ab (translation required)': 'abbreviation', u'acronym (translation required)': 'acronym', u'ac (translation required)': 'acronym', + u'code (translation required)': 'code', u'index (translation required)': 'index', u'i (translation required)': 'index', u'subscript (translation required)': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/de.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/de.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/de.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,5 @@ -# $Id: de.py 6460 2010-10-29 22:18:44Z milde $ +# -*- coding: utf-8 -*- +# $Id: de.py 7223 2011-11-21 16:43:06Z milde $ # Authors: Engelbert Gruber <grubert@users.sourceforge.net>; # Lea Wiemann <LeWiemann@gmail.com> # Copyright: This module has been placed in the public domain. @@ -19,6 +20,7 @@ directives = { 'achtung': 'attention', 'vorsicht': 'caution', + 'code': 'code', 'gefahr': 'danger', 'fehler': 'error', 'hinweis': 'hint', @@ -35,7 +37,8 @@ 'rubrik': 'rubric', 'epigraph': 'epigraph', 'highlights (translation required)': 'highlights', - 'pull-quote (translation required)': 'pull-quote', # kasten too ? + u'pull-quote': 'pull-quote', # commonly used in German too + u'seitenansprache': 'pull-quote', # cf. http://www.typografie.info/2/wiki.php?title=Seitenansprache 'zusammengesetzt': 'compound', 'verbund': 'compound', u'container': 'container', @@ -44,13 +47,14 @@ 'csv-tabelle': 'csv-table', 'list-table (translation required)': 'list-table', u'mathe': 'math', + u'formel': 'math', 'meta': 'meta', #'imagemap': 'imagemap', 'bild': 'image', 'abbildung': 'figure', - u'unver\xe4ndert': 'raw', + u'unverändert': 'raw', u'roh': 'raw', - u'einf\xfcgen': 'include', + u'einfügen': 'include', 'ersetzung': 'replace', 'ersetzen': 'replace', 'ersetze': 'replace', @@ -63,18 +67,19 @@ 'inhalt': 'contents', 'kapitel-nummerierung': 'sectnum', 'abschnitts-nummerierung': 'sectnum', - u'linkziel-fu\xdfnoten': 'target-notes', + u'linkziel-fußfnoten': 'target-notes', u'header (translation required)': 'header', u'footer (translation required)': 'footer', - #u'fu\xdfnoten': 'footnotes', + #u'fußfnoten': 'footnotes', #'zitate': 'citations', } """German name to registered (in directives/__init__.py) directive name mapping.""" roles = { - u'abk\xfcrzung': 'abbreviation', + u'abkürzung': 'abbreviation', 'akronym': 'acronym', + u'code': 'code', 'index': 'index', 'tiefgestellt': 'subscript', 'hochgestellt': 'superscript', @@ -83,16 +88,16 @@ 'rfc-referenz': 'rfc-reference', 'betonung': 'emphasis', 'fett': 'strong', - u'w\xf6rtlich': 'literal', + u'wörtlich': 'literal', u'mathe': 'math', 'benannte-referenz': 'named-reference', 'unbenannte-referenz': 'anonymous-reference', - u'fu\xdfnoten-referenz': 'footnote-reference', + u'fußfnoten-referenz': 'footnote-reference', 'zitat-referenz': 'citation-reference', 'ersetzungs-referenz': 'substitution-reference', 'ziel': 'target', 'uri-referenz': 'uri-reference', - u'unver\xe4ndert': 'raw', + u'unverändert': 'raw', u'roh': 'raw',} """Mapping of German role names to canonical role names for interpreted text. """ Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/en.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/en.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/en.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: en.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: en.py 7179 2011-10-15 22:06:45Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -19,6 +19,9 @@ # language-dependent: fixed 'attention': 'attention', 'caution': 'caution', + 'code': 'code', + 'code-block': 'code', + 'sourcecode': 'code', 'danger': 'danger', 'error': 'error', 'hint': 'hint', @@ -75,6 +78,7 @@ 'ab': 'abbreviation', 'acronym': 'acronym', 'ac': 'acronym', + 'code': 'code', 'index': 'index', 'i': 'index', 'subscript': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/eo.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/eo.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/eo.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: eo.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: eo.py 7119 2011-09-02 13:00:23Z milde $ # Author: Marcelo Huerta San Martin <richieadler@users.sourceforge.net> # Copyright: This module has been placed in the public domain. @@ -19,6 +19,7 @@ # language-dependent: fixed u'atentu': 'attention', u'zorgu': 'caution', + u'code (translation required)': 'code', u'dangxero': 'danger', u'dan\u011dero': 'danger', u'eraro': 'error', @@ -82,6 +83,7 @@ u'mall': 'abbreviation', u'komenclitero': 'acronym', u'kl': 'acronym', + u'code (translation required)': 'code', u'indekso': 'index', u'i': 'index', u'subskribo': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/es.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/es.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/es.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# $Id: es.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: es.py 7119 2011-09-02 13:00:23Z milde $ # Author: Marcelo Huerta San Martín <richieadler@users.sourceforge.net> # Copyright: This module has been placed in the public domain. @@ -20,6 +20,7 @@ u'atenci\u00f3n': 'attention', u'atencion': 'attention', u'precauci\u00f3n': 'caution', + u'code (translation required)': 'code', u'precaucion': 'caution', u'peligro': 'danger', u'error': 'error', @@ -87,6 +88,7 @@ u'acronimo': 'acronym', u'acronimo': 'acronym', u'ac': 'acronym', + u'code (translation required)': 'code', u'indice': 'index', u'i': 'index', u'subindice': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/fi.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/fi.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/fi.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,5 @@ -# $Id: fi.py 6460 2010-10-29 22:18:44Z milde $ +# -*- coding: utf-8 -*- +# $Id: fi.py 7119 2011-09-02 13:00:23Z milde $ # Author: Asko Soukka <asko.soukka@iki.fi> # Copyright: This module has been placed in the public domain. @@ -19,6 +20,7 @@ # language-dependent: fixed u'huomio': u'attention', u'varo': u'caution', + u'code (translation required)': 'code', u'vaara': u'danger', u'virhe': u'error', u'vihje': u'hint', @@ -70,6 +72,7 @@ u'lyhennys': u'abbreviation', u'akronyymi': u'acronym', u'kirjainsana': u'acronym', + u'code (translation required)': 'code', u'hakemisto': u'index', u'luettelo': u'index', u'alaindeksi': u'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/fr.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/fr.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/fr.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: fr.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: fr.py 7119 2011-09-02 13:00:23Z milde $ # Authors: David Goodger <goodger@python.org>; William Dode # Copyright: This module has been placed in the public domain. @@ -18,6 +18,7 @@ directives = { u'attention': 'attention', u'pr\u00E9caution': 'caution', + u'code': 'code', u'danger': 'danger', u'erreur': 'error', u'conseil': 'hint', @@ -76,6 +77,7 @@ u'abr\u00E9viation': 'abbreviation', u'acronyme': 'acronym', u'sigle': 'acronym', + u'code': 'code', u'index': 'index', u'indice': 'subscript', u'ind': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/gl.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/gl.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/gl.py 2012-05-04 08:52:38 UTC (rev 655) @@ -22,6 +22,7 @@ # language-dependent: fixed u'atenci\u00f3n': 'attention', u'advertencia': 'caution', + u'code (translation required)': 'code', u'perigo': 'danger', u'erro': 'error', u'pista': 'hint', @@ -78,6 +79,7 @@ u'ab': 'abbreviation', u'acr\u00f3nimo': 'acronym', u'ac': 'acronym', + u'code (translation required)': 'code', u'\u00edndice': 'index', u'i': 'index', u'sub\u00edndice': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/he.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/he.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/he.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,5 @@ # Author: Meir Kriheli -# Id: $Id: he.py 6460 2010-10-29 22:18:44Z milde $ +# Id: $Id: he.py 7119 2011-09-02 13:00:23Z milde $ # Copyright: This module has been placed in the public domain. # New language mappings are welcome. Before doing a new translation, please @@ -19,6 +19,7 @@ # language-dependent: fixed u'\u05ea\u05e9\u05d5\u05de\u05ea \u05dc\u05d1': 'attention', u'\u05d6\u05d4\u05d9\u05e8\u05d5\u05ea': 'caution', + u'code (translation required)': 'code', u'\u05e1\u05db\u05e0\u05d4': 'danger', u'\u05e9\u05d2\u05d9\u05d0\u05d4' : 'error', u'\u05e8\u05de\u05d6': 'hint', @@ -75,6 +76,7 @@ 'ab': 'abbreviation', 'acronym': 'acronym', 'ac': 'acronym', + u'code (translation required)': 'code', 'index': 'index', 'i': 'index', u'\u05ea\u05d7\u05ea\u05d9': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/it.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/it.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/it.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: it.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: it.py 7119 2011-09-02 13:00:23Z milde $ # Authors: Nicola Larosa <docutils@tekNico.net>; # Lele Gaifax <lele@seldati.it> # Copyright: This module has been placed in the public domain. @@ -19,6 +19,7 @@ directives = { 'attenzione': 'attention', 'cautela': 'caution', + 'code (translation required)': 'code', 'pericolo': 'danger', 'errore': 'error', 'suggerimento': 'hint', @@ -73,6 +74,7 @@ roles = { 'abbreviazione': 'abbreviation', 'acronimo': 'acronym', + u'code (translation required)': 'code', 'indice': 'index', 'deponente': 'subscript', 'esponente': 'superscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/ja.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/ja.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/ja.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# $Id: ja.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: ja.py 7119 2011-09-02 13:00:23Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -22,6 +22,7 @@ # language-dependent: fixed u'注目': 'attention', u'注意': 'caution', + u'code (translation required)': 'code', u'危険': 'danger', u'エラー': 'error', u'ヒント': 'hint', @@ -88,6 +89,7 @@ # language-dependent: fixed u'略': 'abbreviation', u'頭字語': 'acronym', + u'code (translation required)': 'code', u'インデックス': 'index', u'索引': 'index', u'添字': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/lt.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/lt.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/lt.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,5 @@ # -*- coding: utf8 -*- -# $Id: lt.py 6459 2010-10-29 22:07:34Z milde $ +# $Id: lt.py 7119 2011-09-02 13:00:23Z milde $ # Author: Dalius Dobravolskas <dalius.do...@gmail.com> # Copyright: This module has been placed in the public domain. @@ -20,6 +20,7 @@ # language-dependent: fixed u'dėmesio': 'attention', u'atsargiai': 'caution', + u'code (translation required)': 'code', u'pavojinga': 'danger', u'klaida': 'error', u'užuomina': 'hint', @@ -76,6 +77,7 @@ 'sa': 'abbreviation', 'akronimas': 'acronym', 'ak': 'acronym', + u'code (translation required)': 'code', 'indeksas': 'index', 'i': 'index', u'apatinis-indeksas': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/nl.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/nl.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/nl.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: nl.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: nl.py 7119 2011-09-02 13:00:23Z milde $ # Author: Martijn Pieters <mjpieters@users.sourceforge.net> # Copyright: This module has been placed in the public domain. @@ -19,6 +19,7 @@ # language-dependent: fixed 'attentie': 'attention', 'let-op': 'caution', + 'code (translation required)': 'code', 'gevaar': 'danger', 'fout': 'error', 'hint': 'hint', @@ -77,6 +78,7 @@ # 'ab': 'abbreviation', 'acroniem': 'acronym', 'ac': 'acronym', + u'code (translation required)': 'code', 'index': 'index', 'i': 'index', 'inferieur': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/pl.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/pl.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/pl.py 2012-05-04 08:52:38 UTC (rev 655) @@ -19,6 +19,7 @@ # language-dependent: fixed u'uwaga': 'attention', u'ostro\u017cnie': 'caution', + u'code (translation required)': 'code', u'niebezpiecze\u0144stwo': 'danger', u'b\u0142\u0105d': 'error', u'wskaz\u00f3wka': 'hint', @@ -73,6 +74,7 @@ # language-dependent: fixed u'skr\u00f3t': 'abbreviation', u'akronim': 'acronym', + u'code (translation required)': 'code', u'indeks': 'index', u'indeks-dolny': 'subscript', u'indeks-g\u00f3rny': 'superscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/pt_br.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/pt_br.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/pt_br.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: pt_br.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: pt_br.py 7119 2011-09-02 13:00:23Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -19,6 +19,7 @@ # language-dependent: fixed u'aten\u00E7\u00E3o': 'attention', 'cuidado': 'caution', + u'code (translation required)': 'code', 'perigo': 'danger', 'erro': 'error', u'sugest\u00E3o': 'hint', @@ -75,6 +76,7 @@ 'ab': 'abbreviation', u'acr\u00F4nimo': 'acronym', 'ac': 'acronym', + u'code (translation required)': 'code', u'\u00EDndice-remissivo': 'index', 'i': 'index', 'subscrito': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/ru.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/ru.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/ru.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,5 @@ -# $Id: ru.py 6460 2010-10-29 22:18:44Z milde $ +# -*- coding: utf-8 -*- +# $Id: ru.py 7123 2011-09-12 08:28:31Z milde $ # Author: Roman Suzi <rnd@onego.ru> # Copyright: This module has been placed in the public domain. @@ -15,91 +16,74 @@ __docformat__ = 'reStructuredText' directives = { - u'\u0431\u043b\u043e\u043a-\u0441\u0442\u0440\u043e\u043a': u'line-block', + u'блок-строк': u'line-block', u'meta': u'meta', - 'math (translation required)': 'math', - u'\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0430\u043d\u043d\u044b\u0439-\u043b\u0438\u0442\u0435\u0440\u0430\u043b': - u'parsed-literal', - u'\u0432\u044b\u0434\u0435\u043b\u0435\u043d\u043d\u0430\u044f-\u0446\u0438\u0442\u0430\u0442\u0430': - u'pull-quote', + u'математика': 'math', + u'обработанный-литерал': u'parsed-literal', + u'выделенная-цитата': u'pull-quote', + u'код': 'code', u'compound (translation required)': 'compound', - u'container (translation required)': 'container', - u'table (translation required)': 'table', + u'контейнер': 'container', + u'таблица': 'table', u'csv-table (translation required)': 'csv-table', u'list-table (translation required)': 'list-table', - u'\u0441\u044b\u0440\u043e\u0439': u'raw', - u'\u0437\u0430\u043c\u0435\u043d\u0430': u'replace', - u'\u0442\u0435\u0441\u0442\u043e\u0432\u0430\u044f-\u0434\u0438\u0440\u0435\u043a\u0442\u0438\u0432\u0430-restructuredtext': - u'restructuredtext-test-directive', - u'\u0446\u0435\u043b\u0435\u0432\u044b\u0435-\u0441\u043d\u043e\u0441\u043a\u0438': - u'target-notes', + u'сырой': u'raw', + u'замена': u'replace', + u'тестовая-директива-restructuredtext': u'restructuredtext-test-directive', + u'целевые-сноски': u'target-notes', u'unicode': u'unicode', - u'\u0434\u0430\u0442\u0430': u'date', - u'\u0431\u043e\u043a\u043e\u0432\u0430\u044f-\u043f\u043e\u043b\u043e\u0441\u0430': - u'sidebar', - u'\u0432\u0430\u0436\u043d\u043e': u'important', - u'\u0432\u043a\u043b\u044e\u0447\u0430\u0442\u044c': u'include', - u'\u0432\u043d\u0438\u043c\u0430\u043d\u0438\u0435': u'attention', - u'\u0432\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u0435': u'highlights', - u'\u0437\u0430\u043c\u0435\u0447\u0430\u043d\u0438\u0435': u'admonition', - u'\u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435': - u'image', - u'\u043a\u043b\u0430\u0441\u0441': u'class', - u'role (translation required)': 'role', + u'дата': u'date', + u'боковая-полоса': u'sidebar', + u'важно': u'important', + u'включать': u'include', + u'внимание': u'attention', + u'выделение': u'highlights', + u'замечание': u'admonition', + u'изображение': u'image', + u'класс': u'class', + u'роль': 'role', u'default-role (translation required)': 'default-role', - u'title (translation required)': 'title', - u'\u043d\u043e\u043c\u0435\u0440-\u0440\u0430\u0437\u0434\u0435\u043b\u0430': - u'sectnum', - u'\u043d\u0443\u043c\u0435\u0440\u0430\u0446\u0438\u044f-\u0440\u0430\u0437' - u'\u0434\u0435\u043b\u043e\u0432': u'sectnum', - u'\u043e\u043f\u0430\u0441\u043d\u043e': u'danger', - u'\u043e\u0441\u0442\u043e\u0440\u043e\u0436\u043d\u043e': u'caution', - u'\u043e\u0448\u0438\u0431\u043a\u0430': u'error', - u'\u043f\u043e\u0434\u0441\u043a\u0430\u0437\u043a\u0430': u'tip', - u'\u043f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d' - u'\u0438\u0435': u'warning', - u'\u043f\u0440\u0438\u043c\u0435\u0447\u0430\u043d\u0438\u0435': u'note', - u'\u0440\u0438\u0441\u0443\u043d\u043e\u043a': u'figure', - u'\u0440\u0443\u0431\u0440\u0438\u043a\u0430': u'rubric', - u'\u0441\u043e\u0432\u0435\u0442': u'hint', - u'\u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435': u'contents', - u'\u0442\u0435\u043c\u0430': u'topic', - u'\u044d\u043f\u0438\u0433\u0440\u0430\u0444': u'epigraph', + u'титул': 'title', + u'номер-раздела': u'sectnum', + u'нумерация-разделов': u'sectnum', + u'опасно': u'danger', + u'осторожно': u'caution', + u'ошибка': u'error', + u'подсказка': u'tip', + u'предупреждение': u'warning', + u'примечание': u'note', + u'рисунок': u'figure', + u'рубрика': u'rubric', + u'совет': u'hint', + u'содержание': u'contents', + u'тема': u'topic', + u'эпиграф': u'epigraph', u'header (translation required)': 'header', u'footer (translation required)': 'footer',} """Russian name to registered (in directives/__init__.py) directive name mapping.""" roles = { - u'\u0430\u043a\u0440\u043e\u043d\u0438\u043c': 'acronym', - u'\u0430\u043d\u043e\u043d\u0438\u043c\u043d\u0430\u044f-\u0441\u0441\u044b\u043b\u043a\u0430': - 'anonymous-reference', - u'\u0431\u0443\u043a\u0432\u0430\u043b\u044c\u043d\u043e': 'literal', - 'math (translation required)': 'math', - u'\u0432\u0435\u0440\u0445\u043d\u0438\u0439-\u0438\u043d\u0434\u0435\u043a\u0441': - 'superscript', - u'\u0432\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u0435': 'emphasis', - u'\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u043d\u0430\u044f-\u0441\u0441\u044b\u043b\u043a\u0430': - 'named-reference', - u'\u0438\u043d\u0434\u0435\u043a\u0441': 'index', - u'\u043d\u0438\u0436\u043d\u0438\u0439-\u0438\u043d\u0434\u0435\u043a\u0441': - 'subscript', - u'\u0441\u0438\u043b\u044c\u043d\u043e\u0435-\u0432\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u0435': - 'strong', - u'\u0441\u043e\u043a\u0440\u0430\u0449\u0435\u043d\u0438\u0435': - 'abbreviation', - u'\u0441\u0441\u044b\u043b\u043a\u0430-\u0437\u0430\u043c\u0435\u043d\u0430': - 'substitution-reference', - u'\u0441\u0441\u044b\u043b\u043a\u0430-\u043d\u0430-pep': 'pep-reference', - u'\u0441\u0441\u044b\u043b\u043a\u0430-\u043d\u0430-rfc': 'rfc-reference', - u'\u0441\u0441\u044b\u043b\u043a\u0430-\u043d\u0430-uri': 'uri-reference', - u'\u0441\u0441\u044b\u043b\u043a\u0430-\u043d\u0430-\u0437\u0430\u0433\u043b\u0430\u0432\u0438\u0435': - 'title-reference', - u'\u0441\u0441\u044b\u043b\u043a\u0430-\u043d\u0430-\u0441\u043d\u043e\u0441\u043a\u0443': - 'footnote-reference', - u'\u0446\u0438\u0442\u0430\u0442\u043d\u0430\u044f-\u0441\u0441\u044b\u043b\u043a\u0430': - 'citation-reference', - u'\u0446\u0435\u043b\u044c': 'target', - u'raw (translation required)': 'raw',} + u'акроним': 'acronym', + u'код': 'code', + u'анонимная-ссылка': 'anonymous-reference', + u'буквально': 'literal', + u'математика': 'math', + u'верхний-индекс': 'superscript', + u'выделение': 'emphasis', + u'именованная-ссылка': 'named-reference', + u'индекс': 'index', + u'нижний-индекс': 'subscript', + u'сильное-выделение': 'strong', + u'сокращение': 'abbreviation', + u'ссылка-замена': 'substitution-reference', + u'ссылка-на-pep': 'pep-reference', + u'ссылка-на-rfc': 'rfc-reference', + u'ссылка-на-uri': 'uri-reference', + u'ссылка-на-заглавие': 'title-reference', + u'ссылка-на-сноску': 'footnote-reference', + u'цитатная-ссылка': 'citation-reference', + u'цель': 'target', + u'сырой': 'raw',} """Mapping of Russian role names to canonical role names for interpreted text. """ Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/sk.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/sk.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/sk.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: sk.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: sk.py 7119 2011-09-02 13:00:23Z milde $ # Author: Miroslav Vasko <zemiak@zoznam.sk> # Copyright: This module has been placed in the public domain. @@ -18,6 +18,7 @@ directives = { u'pozor': 'attention', u'opatrne': 'caution', + u'code (translation required)': 'code', u'nebezpe\xe8enstvo': 'danger', u'chyba': 'error', u'rada': 'hint', @@ -71,6 +72,7 @@ roles = { u'abbreviation (translation required)': 'abbreviation', u'acronym (translation required)': 'acronym', + u'code (translation required)': 'code', u'index (translation required)': 'index', u'subscript (translation required)': 'subscript', u'superscript (translation required)': 'superscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/sv.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/sv.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/sv.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: sv.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: sv.py 7119 2011-09-02 13:00:23Z milde $ # Author: Adam Chodorowski <chodorowski@users.sourceforge.net> # Copyright: This module has been placed in the public domain. @@ -17,6 +17,7 @@ directives = { u'observera': 'attention', u'caution (translation required)': 'caution', + u'code (translation required)': 'code', u'fara': 'danger', u'fel': 'error', u'v\u00e4gledning': 'hint', @@ -70,6 +71,7 @@ roles = { u'abbreviation (translation required)': 'abbreviation', u'acronym (translation required)': 'acronym', + u'code (translation required)': 'code', u'index (translation required)': 'index', u'subscript (translation required)': 'subscript', u'superscript (translation required)': 'superscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/zh_cn.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/zh_cn.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/zh_cn.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# $Id: zh_cn.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: zh_cn.py 7119 2011-09-02 13:00:23Z milde $ # Author: Panjunyong <panjy@zopechina.com> # Copyright: This module has been placed in the public domain. @@ -20,6 +20,7 @@ # language-dependent: fixed u'注意': 'attention', u'小心': 'caution', + u'code (translation required)': 'code', u'危险': 'danger', u'错误': 'error', u'提示': 'hint', @@ -73,6 +74,7 @@ # language-dependent: fixed u'缩写': 'abbreviation', u'简称': 'acronym', + u'code (translation required)': 'code', u'index (translation required)': 'index', u'i (translation required)': 'index', u'下标': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/zh_tw.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/zh_tw.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/languages/zh_tw.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# $Id: zh_tw.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: zh_tw.py 7119 2011-09-02 13:00:23Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -20,6 +20,7 @@ # language-dependent: fixed 'attention (translation required)': 'attention', 'caution (translation required)': 'caution', + 'code (translation required)': 'code', 'danger (translation required)': 'danger', 'error (translation required)': 'error', 'hint (translation required)': 'hint', @@ -76,6 +77,7 @@ 'ab (translation required)': 'abbreviation', 'acronym (translation required)': 'acronym', 'ac (translation required)': 'acronym', + u'code (translation required)': 'code', 'index (translation required)': 'index', 'i (translation required)': 'index', 'subscript (translation required)': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/roles.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/roles.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/roles.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: roles.py 6451 2010-10-25 08:02:43Z milde $ +# $Id: roles.py 7310 2012-01-09 15:01:15Z milde $ # Author: Edward Loper <edloper@gradient.cis.upenn.edu> # Copyright: This module has been placed in the public domain. @@ -75,6 +75,7 @@ from docutils import nodes, utils from docutils.parsers.rst import directives from docutils.parsers.rst.languages import en as _fallback_language_module +from docutils.utils.code_analyzer import Lexer, LexerError DEFAULT_INTERPRETED_ROLE = 'title-reference' """ @@ -308,12 +309,48 @@ return [prb], [msg] set_classes(options) node = nodes.raw(rawtext, utils.unescape(text, 1), **options) + node.source, node.line = inliner.reporter.get_source_and_line(lineno) return [node], [] raw_role.options = {'format': directives.unchanged} register_canonical_role('raw', raw_role) +def code_role(role, rawtext, text, lineno, inliner, options={}, content=[]): + set_classes(options) + language = options.get('language', '') + classes = ['code'] + if language: + classes.append(language) + if 'classes' in options: + classes.extend(options['classes']) + + try: + tokens = Lexer(utils.unescape(text, 1), language, + inliner.document.settings.syntax_highlight) + except LexerError, error: + msg = inliner.reporter.warning(error) + prb = inliner.problematic(rawtext, rawtext, msg) + return [prb], [msg] + + node = nodes.literal(rawtext, '', classes=classes) + + # analyze content and add nodes for every token + for classes, value in tokens: + # print (classes, value) + if classes: + node += nodes.inline(value, value, classes=classes) + else: + # insert as Text to decrease the verbosity of the output + node += nodes.Text(value, value) + + return [node], [] + +code_role.options = {'class': directives.class_option, + 'language': directives.unchanged} + +register_canonical_role('code', code_role) + def math_role(role, rawtext, text, lineno, inliner, options={}, content=[]): i = rawtext.find('`') text = rawtext.split('`')[1] Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/states.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/states.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/states.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: states.py 7072 2011-07-06 15:52:30Z milde $ +# $Id: states.py 7363 2012-02-20 21:31:48Z goodger $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -105,19 +105,23 @@ import sys import re -import roman +try: + import roman +except ImportError: + import docutils.utils.roman as roman from types import FunctionType, MethodType + from docutils import nodes, statemachine, utils, urischemes from docutils import ApplicationError, DataError from docutils.statemachine import StateMachineWS, StateWS from docutils.nodes import fully_normalize_name as normalize_name from docutils.nodes import whitespace_normalize_name -from docutils.utils import escape2null, unescape, column_width import docutils.parsers.rst from docutils.parsers.rst import directives, languages, tableparser, roles from docutils.parsers.rst.languages import en as _fallback_language_module +from docutils.utils import escape2null, unescape, column_width +from docutils.utils import punctuation_chars - class MarkupError(DataError): pass class UnknownInterpretedRoleError(DataError): pass class InterpretedRoleNotImplementedError(DataError): pass @@ -141,7 +145,7 @@ The entry point to reStructuredText parsing is the `run()` method. """ - def run(self, input_lines, document, input_offset=0, match_titles=1, + def run(self, input_lines, document, input_offset=0, match_titles=True, inliner=None): """ Parse `input_lines` and modify the `document` node in place. @@ -160,7 +164,7 @@ language=self.language, title_styles=[], section_level=0, - section_bubble_up_kludge=0, + section_bubble_up_kludge=False, inliner=inliner) self.document = document self.attach_observer(document.note_source) @@ -179,7 +183,7 @@ document structures. """ - def run(self, input_lines, input_offset, memo, node, match_titles=1): + def run(self, input_lines, input_offset, memo, node, match_titles=True): """ Parse `input_lines` and populate a `docutils.nodes.document` instance. @@ -209,7 +213,7 @@ nested_sm = NestedStateMachine nested_sm_cache = [] - def __init__(self, state_machine, debug=0): + def __init__(self, state_machine, debug=False): self.nested_sm_kwargs = {'state_classes': state_classes, 'initial_state': 'Body'} StateWS.__init__(self, state_machine, debug) @@ -223,9 +227,9 @@ self.document = memo.document self.parent = self.state_machine.node # enable the reporter to determine source and source-line - if not hasattr(self.reporter, 'locator'): - self.reporter.locator = self.state_machine.get_source_and_line - # print "adding locator to reporter", self.state_machine.input_offset + if not hasattr(self.reporter, 'get_source_and_line'): + self.reporter.get_source_and_line = self.state_machine.get_source_and_line + # print "adding get_source_and_line to reporter", self.state_machine.input_offset def goto_line(self, abs_line_offset): @@ -243,20 +247,18 @@ This code should never be run. """ - src, srcline = self.state_machine.get_source_and_line() self.reporter.severe( 'Internal error: no transition pattern match. State: "%s"; ' 'transitions: %s; context: %s; current line: %r.' % (self.__class__.__name__, transitions, context, - self.state_machine.line), - source=src, line=srcline) + self.state_machine.line)) return context, None, [] def bof(self, context): """Called at beginning of file.""" return [], [] - def nested_parse(self, block, input_offset, node, match_titles=0, + def nested_parse(self, block, input_offset, node, match_titles=False, state_machine_class=None, state_machine_kwargs=None): """ Create a new StateMachine rooted at `node` and run it over the input @@ -297,7 +299,7 @@ blank_finish, blank_finish_state=None, extra_settings={}, - match_titles=0, + match_titles=False, state_machine_class=None, state_machine_kwargs=None): """ @@ -359,7 +361,7 @@ if level <= mylevel: # sibling or supersection memo.section_level = level # bubble up to parent section if len(style) == 2: - memo.section_bubble_up_kludge = 1 + memo.section_bubble_up_kludge = True # back up 2 lines for underline title, 3 for overline title self.state_machine.previous_line(len(style) + 1) raise EOFError # let parent section re-evaluate @@ -370,10 +372,9 @@ return None def title_inconsistent(self, sourcetext, lineno): - src, srcline = self.state_machine.get_source_and_line(lineno) error = self.reporter.severe( 'Title level inconsistent:', nodes.literal_block('', sourcetext), - source=src, line=srcline) + line=lineno) return error def new_subsection(self, title, lineno, messages): @@ -395,7 +396,7 @@ absoffset = self.state_machine.abs_line_offset() + 1 newabsoffset = self.nested_parse( self.state_machine.input_lines[offset:], input_offset=absoffset, - node=section_node, match_titles=1) + node=section_node, match_titles=True) self.goto_line(newabsoffset) if memo.section_level <= mylevel: # can't handle next section? raise EOFError # bubble up to supersection @@ -431,13 +432,13 @@ def unindent_warning(self, node_name): # the actual problem is one line below the current line - src, srcline = self.state_machine.get_source_and_line() + lineno = self.state_machine.abs_line_number()+1 return self.reporter.warning('%s ends without a blank line; ' 'unexpected unindent.' % node_name, - source=src, line=srcline+1) + line=lineno) -def build_regexp(definition, compile=1): +def build_regexp(definition, compile=True): """ Build, compile and return a regular expression based on `definition`. @@ -528,15 +529,18 @@ processed += self.implicit_inline(remaining, lineno) return processed, messages - openers = u'\'"([{<\u2018\u201c\xab\u00a1\u00bf' # see quoted_start below - closers = u'\'")]}>\u2019\u201d\xbb!?' - unicode_delimiters = u'\u2010\u2011\u2012\u2013\u2014\u00a0' - start_string_prefix = (u'((?<=^)|(?<=[-/: \\n\u2019%s%s]))' - % (re.escape(unicode_delimiters), - re.escape(openers))) - end_string_suffix = (r'((?=$)|(?=[-/:.,; \n\x00%s%s]))' - % (re.escape(unicode_delimiters), - re.escape(closers))) + # Inline object recognition + # ------------------------- + # lookahead and look-behind expressions for inline markup rules + start_string_prefix = (u'(^|(?<=\\s|[%s%s]))' % + (punctuation_chars.openers, + punctuation_chars.delimiters)) + end_string_suffix = (u'($|(?=\\s|[\x00%s%s%s]))' % + (punctuation_chars.closing_delimiters, + punctuation_chars.delimiters, + punctuation_chars.closers)) + # print start_string_prefix.encode('utf8') + # TODO: support non-ASCII whitespace in the following 4 patterns? non_whitespace_before = r'(?<![ \n])' non_whitespace_escape_before = r'(?<![ \n\x00])' non_unescaped_whitespace_escape_before = r'(?<!(?<!\x00)[ \n\x00])' @@ -589,9 +593,9 @@ patterns = Struct( initial=build_regexp(parts), emphasis=re.compile(non_whitespace_escape_before - + r'(\*)' + end_string_suffix), + + r'(\*)' + end_string_suffix, re.UNICODE), strong=re.compile(non_whitespace_escape_before - + r'(\*\*)' + end_string_suffix), + + r'(\*\*)' + end_string_suffix, re.UNICODE), interpreted_or_phrase_ref=re.compile( r""" %(non_unescaped_whitespace_escape_before)s @@ -615,7 +619,7 @@ > # close bracket w/o whitespace before ) $ # end of string - """ % locals(), re.VERBOSE), + """ % locals(), re.VERBOSE | re.UNICODE), literal=re.compile(non_whitespace_before + '(``)' + end_string_suffix), target=re.compile(non_whitespace_escape_before @@ -623,7 +627,8 @@ substitution_ref=re.compile(non_whitespace_escape_before + r'(\|_{0,2})' + end_string_suffix), - email=re.compile(email_pattern % locals() + '$', re.VERBOSE), + email=re.compile(email_pattern % locals() + '$', + re.VERBOSE | re.UNICODE), uri=re.compile( (r""" %(start_string_prefix)s @@ -655,7 +660,7 @@ ) ) %(end_string_suffix)s - """) % locals(), re.VERBOSE), + """) % locals(), re.VERBOSE | re.UNICODE), pep=re.compile( r""" %(start_string_prefix)s @@ -664,34 +669,33 @@ | (PEP\s+(?P<pepnum2>\d+)) # reference by name ) - %(end_string_suffix)s""" % locals(), re.VERBOSE), + %(end_string_suffix)s""" % locals(), re.VERBOSE | re.UNICODE), rfc=re.compile( r""" %(start_string_prefix)s (RFC(-|\s+)?(?P<rfcnum>\d+)) - %(end_string_suffix)s""" % locals(), re.VERBOSE)) + %(end_string_suffix)s""" % locals(), re.VERBOSE | re.UNICODE)) def quoted_start(self, match): - """Return 1 if inline markup start-string is 'quoted', 0 if not.""" + """Test if inline markup start-string is 'quoted'. + + 'Quoted' in this context means the start-string is enclosed in a pair + of matching opening/closing delimiters (not necessarily quotes) + or at the end of the match. + """ string = match.string start = match.start() - end = match.end() if start == 0: # start-string at beginning of text - return 0 + return False prestart = string[start - 1] try: - poststart = string[end] - if self.openers.index(prestart) \ - == self.closers.index(poststart): # quoted - return 1 - except IndexError: # start-string at end of text - return 1 - except ValueError: # not quoted - pass - return 0 + poststart = string[match.end()] + except IndexError: # start-string at end of text + return True # not "quoted" but no markup start-string either + return punctuation_chars.match_chars(prestart, poststart) def inline_obj(self, match, lineno, end_pattern, nodeclass, - restore_backslashes=0): + restore_backslashes=False): string = match.string matchstart = match.start('start') matchend = match.end('start') @@ -791,6 +795,7 @@ uri = self.adjust_uri(uri) if uri: target = nodes.target(match.group(1), refuri=uri) + target.referenced = 1 else: raise ApplicationError('problem with URI: %r' % uri_text) if not text: @@ -840,7 +845,7 @@ def literal(self, match, lineno): before, inlines, remaining, sysmessages, endstring = self.inline_obj( match, lineno, self.patterns.literal, nodes.literal, - restore_backslashes=1) + restore_backslashes=True) return before, inlines, remaining, sysmessages def inline_internal_target(self, match, lineno): @@ -910,7 +915,7 @@ before = before.rstrip() return (before, [refnode], remaining, []) - def reference(self, match, lineno, anonymous=None): + def reference(self, match, lineno, anonymous=False): referencename = match.group('refname') refname = normalize_name(referencename) referencenode = nodes.reference( @@ -1044,7 +1049,7 @@ enum.sequenceregexps = {} for sequence in enum.sequences: enum.sequenceregexps[sequence] = re.compile( - enum.sequencepats[sequence] + '$') + enum.sequencepats[sequence] + '$', re.UNICODE) grid_table_top_pat = re.compile(r'\+-[-+]+-\+ *$') """Matches the top (& bottom) of a full table).""" @@ -1136,7 +1141,8 @@ return elements # U+2014 is an em-dash: - attribution_pattern = re.compile(u'(---?(?!-)|\u2014) *(?=[^ \\n])') + attribution_pattern = re.compile(u'(---?(?!-)|\u2014) *(?=[^ \\n])', + re.UNICODE) def split_attribution(self, indented, line_offset): """ @@ -1198,10 +1204,7 @@ lineno = self.state_machine.abs_line_number() + line_offset textnodes, messages = self.inline_text(text, lineno) node = nodes.attribution(text, '', *textnodes) - node.line = lineno - # report with source and source-line results in - # ``IndexError: list index out of range`` - # node.source, node.line = self.state_machine.get_source_and_line(lineno) + node.source, node.line = self.state_machine.get_source_and_line(lineno) return node, messages def bullet(self, match, context, next_state): @@ -1250,10 +1253,9 @@ enumlist['suffix'] = self.enum.formatinfo[format].suffix if ordinal != 1: enumlist['start'] = ordinal - src, srcline = self.state_machine.get_source_and_line() msg = self.reporter.info( 'Enumerated list start value not ordinal-1: "%s" (ordinal %s)' - % (text, ordinal), source=src, line=srcline) + % (text, ordinal)) self.parent += msg listitem, blank_finish = self.list_item(match.end()) enumlist += listitem @@ -1442,9 +1444,8 @@ listitem, blank_finish = self.option_list_item(match) except MarkupError, error: # This shouldn't happen; pattern won't match. - src, srcline = self.state_machine.get_source_and_line() msg = self.reporter.error(u'Invalid option list marker: %s' % - error, source=src, line=srcline) + error) self.parent += msg indented, indent, line_offset, blank_finish = \ self.state_machine.get_first_known_indented(match.end()) @@ -1495,7 +1496,7 @@ for optionstring in optionstrings: tokens = optionstring.split() delimiter = ' ' - firstopt = tokens[0].split('=') + firstopt = tokens[0].split('=', 1) if len(firstopt) > 1: # "--opt=value" form tokens[:1] = firstopt @@ -1546,10 +1547,9 @@ blank_finish=0) self.goto_line(new_line_offset) if not blank_finish: - src, srcline = self.state_machine.get_source_and_line() self.parent += self.reporter.warning( 'Line block ends without a blank line.', - source=src, line=srcline+1) + line=lineno+1) if len(block): if block[0].indent is None: block[0].indent = 0 @@ -1559,8 +1559,8 @@ def line_block_line(self, match, lineno): """Return one line element of a line_block.""" indented, indent, line_offset, blank_finish = \ - self.state_machine.get_first_known_indented(match.end(), - until_blank=1) + self.state_machine.get_first_known_indented(match.end(), + until_blank=True) text = u'\n'.join(indented) text_nodes, messages = self.inline_text(text, lineno) line = nodes.line(text, '', *text_nodes) @@ -1611,10 +1611,9 @@ nodelist, blank_finish = self.table(isolate_function, parser_class) self.parent += nodelist if not blank_finish: - src, srcline = self.state_machine.get_source_and_line() msg = self.reporter.warning( 'Blank line required after table.', - source=src, line=srcline+1) + line=self.state_machine.abs_line_number()+1) self.parent += msg return [], next_state, [] @@ -1629,9 +1628,9 @@ + 1) table = self.build_table(tabledata, tableline) nodelist = [table] + messages - except tableparser.TableMarkupError, detail: - nodelist = self.malformed_table( - block, ' '.join(detail.args)) + messages + except tableparser.TableMarkupError, err: + nodelist = self.malformed_table(block, ' '.join(err.args), + offset=err.offset) + messages else: nodelist = messages return nodelist, blank_finish @@ -1640,9 +1639,9 @@ messages = [] blank_finish = 1 try: - block = self.state_machine.get_text_block(flush_left=1) - except statemachine.UnexpectedIndentationError, instance: - block, src, srcline = instance.args + block = self.state_machine.get_text_block(flush_left=True) + except statemachine.UnexpectedIndentationError, err: + block, src, srcline = err.args messages.append(self.reporter.error('Unexpected indentation.', source=src, line=srcline)) blank_finish = 0 @@ -1717,16 +1716,15 @@ block.pad_double_width(self.double_width_pad_char) return block, [], end == limit or not lines[end+1].strip() - def malformed_table(self, block, detail=''): + def malformed_table(self, block, detail='', offset=0): block.replace(self.double_width_pad_char, '') data = '\n'.join(block) message = 'Malformed table.' startline = self.state_machine.abs_line_number() - len(block) + 1 - src, srcline = self.state_machine.get_source_and_line(startline) if detail: message += '\n' + detail error = self.reporter.error(message, nodes.literal_block(data, data), - source=src, line=srcline) + line=startline+offset) return [error] def build_table(self, tabledata, tableline, stub_columns=0): @@ -1793,7 +1791,7 @@ [ ]? # optional space : # end of reference name ([ ]+|$) # followed by whitespace - """ % vars(Inliner), re.VERBOSE), + """ % vars(Inliner), re.VERBOSE | re.UNICODE), reference=re.compile(r""" ( (?P<simple>%(simplename)s)_ @@ -1815,7 +1813,8 @@ \| # close delimiter ) ([ ]+|$) # followed by whitespace - """ % vars(Inliner), re.VERBOSE),) + """ % vars(Inliner), + re.VERBOSE | re.UNICODE),) def footnote(self, match): src, srcline = self.state_machine.get_source_and_line() @@ -1868,15 +1867,14 @@ def hyperlink_target(self, match): pattern = self.explicit.patterns.target lineno = self.state_machine.abs_line_number() - src, srcline = self.state_machine.get_source_and_line() block, indent, offset, blank_finish = \ self.state_machine.get_first_known_indented( - match.end(), until_blank=1, strip_indent=0) + match.end(), until_blank=True, strip_indent=False) blocktext = match.string[:match.end()] + '\n'.join(block) block = [escape2null(line) for line in block] escaped = block[0] blockindex = 0 - while 1: + while True: targetmatch = pattern.match(escaped) if targetmatch: break @@ -1954,12 +1952,12 @@ src, srcline = self.state_machine.get_source_and_line() block, indent, offset, blank_finish = \ self.state_machine.get_first_known_indented(match.end(), - strip_indent=0) + strip_indent=False) blocktext = (match.string[:match.end()] + '\n'.join(block)) block.disconnect() escaped = escape2null(block[0].rstrip()) blockindex = 0 - while 1: + while True: subdefmatch = pattern.match(escaped) if subdefmatch: break @@ -2062,7 +2060,6 @@ from docutils.parsers.rst import convert_directive_function directive = convert_directive_function(directive) lineno = self.state_machine.abs_line_number() - src, srcline = self.state_machine.get_source_and_line() initial_line_offset = self.state_machine.line_offset indented, indent, line_offset, blank_finish \ = self.state_machine.get_first_known_indented(match.end(), @@ -2077,8 +2074,7 @@ error = self.reporter.error( 'Error in "%s" directive:\n%s.' % (type_name, ' '.join(detail.args)), - nodes.literal_block(block_text, block_text), - source=src, line=srcline) + nodes.literal_block(block_text, block_text), line=lineno) return [error], blank_finish directive_instance = directive( type_name, arguments, options, content, lineno, @@ -2087,7 +2083,7 @@ result = directive_instance.run() except docutils.parsers.rst.DirectiveError, error: msg_node = self.reporter.system_message(error.level, error.msg, - source=src, line=srcline) + line=lineno) msg_node += nodes.literal_block(block_text, block_text) result = [msg_node] assert isinstance(result, list), \ @@ -2147,8 +2143,8 @@ def parse_directive_options(self, option_presets, option_spec, arg_block): options = option_presets.copy() - for i in range(len(arg_block)): - if arg_block[i][:1] == ':': + for i, line in enumerate(arg_block): + if re.match(Body.patterns['field_marker'], line): opt_block = arg_block[i:] arg_block = arg_block[:i] break @@ -2197,7 +2193,7 @@ node = nodes.field_list() newline_offset, blank_finish = self.nested_list_parse( datalines, 0, node, initial_state='ExtensionOptions', - blank_finish=1) + blank_finish=True) if newline_offset != len(datalines): # incomplete parse of block return 0, 'invalid option block' try: @@ -2214,13 +2210,13 @@ return 0, 'option data incompletely parsed' def unknown_directive(self, type_name): - src, srcline = self.state_machine.get_source_and_line() + lineno = self.state_machine.abs_line_number() indented, indent, offset, blank_finish = \ - self.state_machine.get_first_known_indented(0, strip_indent=0) + self.state_machine.get_first_known_indented(0, strip_indent=False) text = '\n'.join(indented) error = self.reporter.error( 'Unknown directive type "%s".' % type_name, - nodes.literal_block(text, text), source=src, line=srcline) + nodes.literal_block(text, text), line=lineno) return [error], blank_finish def comment(self, match): @@ -2262,13 +2258,13 @@ \.\.[ ]+ # explicit markup start _ # target indicator (?![ ]|$) # first char. not space or EOL - """, re.VERBOSE)), + """, re.VERBOSE | re.UNICODE)), (substitution_def, re.compile(r""" \.\.[ ]+ # explicit markup start \| # substitution indicator (?![ ]|$) # first char. not space or EOL - """, re.VERBOSE)), + """, re.VERBOSE | re.UNICODE)), (directive, re.compile(r""" \.\.[ ]+ # explicit markup start @@ -2293,11 +2289,10 @@ if expmatch: try: return method(self, expmatch) - except MarkupError, error: # never reached? + except MarkupError, error: + lineno = self.state_machine.abs_line_number() message = ' '.join(error.args) - src, srcline = self.state_machine.get_source_and_line() - errors.append(self.reporter.warning( - message, source=src, line=srcline)) + errors.append(self.reporter.warning(message, line=lineno)) break nodelist, blank_finish = self.comment(match) return nodelist + errors, blank_finish @@ -2328,8 +2323,8 @@ def anonymous_target(self, match): lineno = self.state_machine.abs_line_number() block, indent, offset, blank_finish \ - = self.state_machine.get_first_known_indented(match.end(), - until_blank=1) + = self.state_machine.get_first_known_indented(match.end(), + until_blank=True) blocktext = match.string[:match.end()] + '\n'.join(block) block = [escape2null(line) for line in block] target = self.make_target(block, blocktext, lineno, '') @@ -2397,7 +2392,7 @@ name = match.string[:match.string.find(':')] indented, indent, line_offset, blank_finish = \ self.state_machine.get_first_known_indented(match.end(), - until_blank=1) + until_blank=True) fieldnode = nodes.field() fieldnode += nodes.field_name(name, name) fieldbody = nodes.field_body('\n'.join(indented)) @@ -2674,7 +2669,6 @@ def underline(self, match, context, next_state): """Section title.""" lineno = self.state_machine.abs_line_number() - src, srcline = self.state_machine.get_source_and_line() title = context[0].rstrip() underline = match.string.rstrip() source = title + '\n' + underline @@ -2685,20 +2679,23 @@ msg = self.reporter.info( 'Possible title underline, too short for the title.\n' "Treating it as ordinary text because it's so short.", - source=src, line=srcline) + line=lineno) self.parent += msg raise statemachine.TransitionCorrection('text') else: blocktext = context[0] + '\n' + self.state_machine.line - msg = self.reporter.warning( - 'Title underline too short.', - nodes.literal_block(blocktext, blocktext), - source=src, line=srcline) + msg = self.reporter.warning('Title underline too short.', + nodes.literal_block(blocktext, blocktext), line=lineno) messages.append(msg) if not self.state_machine.match_titles: blocktext = context[0] + '\n' + self.state_machine.line - msg = self.reporter.severe( - 'Unexpected section title.', + # We need get_source_and_line() here to report correctly + src, srcline = self.state_machine.get_source_and_line() + # TODO: why is abs_line_number() == srcline+1 + # if the error is in a table (try with test_tables.py)? + # print "get_source_and_line", srcline + # print "abs_line_number", self.state_machine.abs_line_number() + msg = self.reporter.severe('Unexpected section title.', nodes.literal_block(blocktext, blocktext), source=src, line=srcline) self.parent += messages @@ -2714,9 +2711,9 @@ startline = self.state_machine.abs_line_number() - 1 msg = None try: - block = self.state_machine.get_text_block(flush_left=1) - except statemachine.UnexpectedIndentationError, instance: - block, src, srcline = instance.args + block = self.state_machine.get_text_block(flush_left=True) + except statemachine.UnexpectedIndentationError, err: + block, src, srcline = err.args msg = self.reporter.error('Unexpected indentation.', source=src, line=srcline) lines = context + list(block) @@ -2753,7 +2750,7 @@ parent_node = nodes.Element() new_abs_offset = self.nested_parse( self.state_machine.input_lines[offset:], - input_offset=abs_line_offset, node=parent_node, match_titles=0, + input_offset=abs_line_offset, node=parent_node, match_titles=False, state_machine_kwargs={'state_classes': (QuotedLiteralBlock,), 'initial_state': 'QuotedLiteralBlock'}) self.goto_line(new_abs_offset) @@ -2762,23 +2759,22 @@ def definition_list_item(self, termline): indented, indent, line_offset, blank_finish = \ self.state_machine.get_indented() - definitionlistitem = nodes.definition_list_item( + itemnode = nodes.definition_list_item( '\n'.join(termline + list(indented))) lineno = self.state_machine.abs_line_number() - 1 - src, srcline = self.state_machine.get_source_and_line() - definitionlistitem.source = src - definitionlistitem.line = srcline - 1 + (itemnode.source, + itemnode.line) = self.state_machine.get_source_and_line(lineno) termlist, messages = self.term(termline, lineno) - definitionlistitem += termlist + itemnode += termlist definition = nodes.definition('', *messages) - definitionlistitem += definition + itemnode += definition if termline[0][-2:] == '::': definition += self.reporter.info( 'Blank line missing before literal block (after the "::")? ' 'Interpreted as a definition list item.', - source=src, line=srcline) + line=lineno+1) self.nested_parse(indented, input_offset=line_offset, node=definition) - return definitionlistitem, blank_finish + return itemnode, blank_finish classifier_delimiter = re.compile(' +: +') @@ -2839,8 +2835,8 @@ def indent(self, match, context, next_state): """Definition list item.""" - definitionlistitem, blank_finish = self.definition_list_item(context) - self.parent += definitionlistitem + itemnode, blank_finish = self.definition_list_item(context) + self.parent += itemnode self.blank_finish = blank_finish return [], 'DefinitionList', [] @@ -2858,7 +2854,7 @@ """Transition marker at end of section or document.""" marker = context[0].strip() if self.memo.section_bubble_up_kludge: - self.memo.section_bubble_up_kludge = 0 + self.memo.section_bubble_up_kludge = False elif len(marker) < 4: self.state_correction(context) if self.eofcheck: # ignore EOFError with sections @@ -2884,7 +2880,6 @@ def text(self, match, context, next_state): """Potential over- & underlined title.""" lineno = self.state_machine.abs_line_number() - 1 - src, srcline = self.state_machine.get_source_and_line() overline = context[0] title = match.string underline = '' @@ -2898,7 +2893,7 @@ msg = self.reporter.severe( 'Incomplete section title.', nodes.literal_block(blocktext, blocktext), - source=src, line=srcline-1) + line=lineno) self.parent += msg return [], 'Body', [] source = '%s\n%s\n%s' % (overline, title, underline) @@ -2912,7 +2907,7 @@ msg = self.reporter.severe( 'Missing matching underline for section title overline.', nodes.literal_block(source, source), - source=src, line=srcline-1) + line=lineno) self.parent += msg return [], 'Body', [] elif overline != underline: @@ -2923,7 +2918,7 @@ msg = self.reporter.severe( 'Title overline & underline mismatch.', nodes.literal_block(source, source), - source=src, line=srcline-1) + line=lineno) self.parent += msg return [], 'Body', [] title = title.rstrip() @@ -2936,7 +2931,7 @@ msg = self.reporter.warning( 'Title overline too short.', nodes.literal_block(source, source), - source=src, line=srcline-1) + line=lineno) messages.append(msg) style = (overline[0], underline[0]) self.eofcheck = 0 # @@@ not sure this is correct @@ -2950,22 +2945,20 @@ overline = context[0] blocktext = overline + '\n' + self.state_machine.line lineno = self.state_machine.abs_line_number() - 1 - src, srcline = self.state_machine.get_source_and_line() if len(overline.rstrip()) < 4: self.short_overline(context, blocktext, lineno, 1) msg = self.reporter.error( 'Invalid section title or transition marker.', nodes.literal_block(blocktext, blocktext), - source=src, line=srcline-1) + line=lineno) self.parent += msg return [], 'Body', [] def short_overline(self, context, blocktext, lineno, lines=1): - src, srcline = self.state_machine.get_source_and_line(lineno) msg = self.reporter.info( 'Possible incomplete section title.\nTreating the overline as ' "ordinary text because it's so short.", - source=src, line=srcline) + line=lineno) self.parent += msg self.state_correction(context, lines) @@ -2987,7 +2980,7 @@ 'text': r''} initial_transitions = ('initial_quoted', 'text') - def __init__(self, state_machine, debug=0): + def __init__(self, state_machine, debug=False): RSTState.__init__(self, state_machine, debug) self.messages = [] self.initial_lineno = None @@ -3029,7 +3022,7 @@ """Match arbitrary quote character on the first line only.""" self.remove_transition('initial_quoted') quote = match.string[0] - pattern = re.compile(re.escape(quote)) + pattern = re.compile(re.escape(quote), re.UNICODE) # New transition matches consistent quotes only: self.add_transition('quoted', (pattern, self.quoted, self.__class__.__name__)) @@ -3043,10 +3036,9 @@ def text(self, match, context, next_state): if context: - src, srcline = self.state_machine.get_source_and_line() self.messages.append( self.reporter.error('Inconsistent literal block quoting.', - source=src, line=srcline)) + line=self.state_machine.abs_line_number())) self.state_machine.previous_line() raise EOFError Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/tableparser.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/tableparser.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/parsers/rst/tableparser.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: tableparser.py 4564 2006-05-21 20:44:42Z wiemann $ +# $Id: tableparser.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -23,11 +23,23 @@ import re import sys from docutils import DataError +from docutils.utils import strip_combining_chars -class TableMarkupError(DataError): pass +class TableMarkupError(DataError): + """ + Raise if there is any problem with table markup. + The keyword argument `offset` denotes the offset of the problem + from the table's start line. + """ + + def __init__(self, *args, **kwargs): + self.offset = kwargs.pop('offset', 0) + DataError.__init__(self, *args) + + class TableParser: """ @@ -63,16 +75,17 @@ if self.head_body_separator_pat.match(line): if self.head_body_sep: raise TableMarkupError( - 'Multiple head/body row separators in table (at line ' - 'offset %s and %s); only one allowed.' - % (self.head_body_sep, i)) + 'Multiple head/body row separators ' + '(table lines %s and %s); only one allowed.' + % (self.head_body_sep+1, i+1), offset=i) else: self.head_body_sep = i self.block[i] = line.replace('=', '-') if self.head_body_sep == 0 or self.head_body_sep == (len(self.block) - 1): raise TableMarkupError('The head/body row separator may not be ' - 'the first or last line of the table.') + 'the first or last line of the table.', + offset=i) class GridTableParser(TableParser): @@ -190,8 +203,8 @@ last = self.bottom - 1 for col in range(self.right): if self.done[col] != last: - return None - return 1 + return False + return True def scan_cell(self, top, left): """Starting at the top-left corner, start tracing out a cell.""" @@ -414,7 +427,7 @@ """ cols = [] end = 0 - while 1: + while True: begin = line.find('-', end) end = line.find(' ', begin) if begin < 0: @@ -424,8 +437,9 @@ cols.append((begin, end)) if self.columns: if cols[-1][1] != self.border_end: - raise TableMarkupError('Column span incomplete at line ' - 'offset %s.' % offset) + raise TableMarkupError('Column span incomplete in table ' + 'line %s.' % (offset+1), + offset=offset) # Allow for an unbounded rightmost column: cols[-1] = (cols[-1][0], self.columns[-1][1]) return cols @@ -441,8 +455,9 @@ i += 1 morecols += 1 except (AssertionError, IndexError): - raise TableMarkupError('Column span alignment problem at ' - 'line offset %s.' % (offset + 1)) + raise TableMarkupError('Column span alignment problem ' + 'in table line %s.' % (offset+2), + offset=offset+1) cells.append([0, morecols, offset, []]) i += 1 return cells @@ -454,7 +469,7 @@ The row is parsed according to the current column spec (either `spanline` if provided or `self.columns`). For each column, extract text from each line, and check for text in column margins. Finally, - adjust for insigificant whitespace. + adjust for insignificant whitespace. """ if not (lines or spanline): # No new row, just blank lines. @@ -485,6 +500,9 @@ # check for text overflow: columns.append((sys.maxint, None)) lastcol = len(columns) - 2 + # combining characters do not contribute to the column width + lines = [strip_combining_chars(line) for line in lines] + for i in range(len(columns) - 1): start, end = columns[i] nextstart = columns[i+1][0] @@ -498,8 +516,9 @@ if new_end > main_end: self.columns[-1] = (main_start, new_end) elif line[end:nextstart].strip(): - raise TableMarkupError('Text in column margin at line ' - 'offset %s.' % (first_line + offset)) + raise TableMarkupError('Text in column margin ' + 'in table line %s.' % (first_line+offset+1), + offset=first_line+offset) offset += 1 columns.pop() Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/readers/pep.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/readers/pep.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/readers/pep.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: pep.py 4564 2006-05-21 20:44:42Z wiemann $ +# $Id: pep.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -44,5 +44,5 @@ def __init__(self, parser=None, parser_name=None): """`parser` should be ``None``.""" if parser is None: - parser = rst.Parser(rfc2822=1, inliner=self.inliner_class()) + parser = rst.Parser(rfc2822=True, inliner=self.inliner_class()) standalone.Reader.__init__(self, parser, '') Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/statemachine.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/statemachine.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/statemachine.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ - # $Id: statemachine.py 7037 2011-05-19 08:56:27Z milde $ + # $Id: statemachine.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -110,8 +110,10 @@ import re import types import unicodedata +from docutils import utils from docutils.error_reporting import ErrorOutput + class StateMachine: """ @@ -126,7 +128,7 @@ results of processing in a list. """ - def __init__(self, state_classes, initial_state, debug=0): + def __init__(self, state_classes, initial_state, debug=False): """ Initialize a `StateMachine` object; add state objects. @@ -222,7 +224,7 @@ print >>self._stderr, '\nStateMachine.run: bof transition' context, result = state.bof(context) results.extend(result) - while 1: + while True: try: try: self.next_line() @@ -401,7 +403,7 @@ self.input_lines.insert(self.line_offset + 2, StringList(input_lines, source)) - def get_text_block(self, flush_left=0): + def get_text_block(self, flush_left=False): """ Return a contiguous block of text. @@ -414,8 +416,8 @@ flush_left) self.next_line(len(block) - 1) return block - except UnexpectedIndentationError, error: - block, source, lineno = error.args + except UnexpectedIndentationError, err: + block = err.args[0] self.next_line(len(block) - 1) # advance to last line of block raise @@ -593,14 +595,14 @@ defaults. """ - def __init__(self, state_machine, debug=0): + def __init__(self, state_machine, debug=False): """ Initialize a `State` object; make & add initial transitions. Parameters: - `statemachine`: the controlling `StateMachine` object. - - `debug`: a boolean; produce verbose output if true (nonzero). + - `debug`: a boolean; produce verbose output if true. """ self.transition_order = [] @@ -801,17 +803,15 @@ known. """ - def get_indented(self, until_blank=0, strip_indent=1): + def get_indented(self, until_blank=False, strip_indent=True): """ Return a block of indented lines of text, and info. Extract an indented block where the indent is unknown for all lines. :Parameters: - - `until_blank`: Stop collecting at the first blank line if true - (1). - - `strip_indent`: Strip common leading indent if true (1, - default). + - `until_blank`: Stop collecting at the first blank line if true. + - `strip_indent`: Strip common leading indent if true (default). :Return: - the indented block (a list of lines of text), @@ -829,7 +829,7 @@ offset += 1 return indented, indent, offset, blank_finish - def get_known_indented(self, indent, until_blank=0, strip_indent=1): + def get_known_indented(self, indent, until_blank=False, strip_indent=True): """ Return an indented block and info. @@ -840,10 +840,9 @@ :Parameters: - `indent`: The number of indent columns/characters. - - `until_blank`: Stop collecting at the first blank line if true - (1). + - `until_blank`: Stop collecting at the first blank line if true. - `strip_indent`: Strip `indent` characters of indentation if true - (1, default). + (default). :Return: - the indented block, @@ -860,8 +859,8 @@ offset += 1 return indented, offset, blank_finish - def get_first_known_indented(self, indent, until_blank=0, strip_indent=1, - strip_top=1): + def get_first_known_indented(self, indent, until_blank=False, + strip_indent=True, strip_top=True): """ Return an indented block and info. @@ -955,7 +954,7 @@ """Default initial whitespace transitions, added before those listed in `State.initial_transitions`. May be overridden in subclasses.""" - def __init__(self, state_machine, debug=0): + def __init__(self, state_machine, debug=False): """ Initialize a `StateSM` object; extends `State.__init__()`. @@ -1346,7 +1345,7 @@ self.data[start:end] = [line[length:] for line in self.data[start:end]] - def get_text_block(self, start, flush_left=0): + def get_text_block(self, start, flush_left=False): """ Return a contiguous block of text. @@ -1367,7 +1366,7 @@ end += 1 return self[start:end] - def get_indented(self, start=0, until_blank=0, strip_indent=1, + def get_indented(self, start=0, until_blank=False, strip_indent=True, block_indent=None, first_indent=None): """ Extract and return a StringList of indented lines of text. @@ -1427,10 +1426,20 @@ block.trim_left(indent, start=(first_indent is not None)) return block, indent or 0, blank_finish - def get_2D_block(self, top, left, bottom, right, strip_indent=1): + def get_2D_block(self, top, left, bottom, right, strip_indent=True): block = self[top:bottom] indent = right for i in range(len(block.data)): + # get slice from line, care for combining characters + ci = utils.column_indices(block.data[i]) + try: + left = ci[left] + except IndexError: + left += len(block.data[i]) - len(ci) + try: + right = ci[right] + except IndexError: + right += len(block.data[i]) - len(ci) block.data[i] = line = block.data[i][left:right].rstrip() if line: indent = min(indent, len(line) - len(line.lstrip())) @@ -1492,7 +1501,7 @@ """ -def string2lines(astring, tab_width=8, convert_whitespace=0, +def string2lines(astring, tab_width=8, convert_whitespace=False, whitespace=re.compile('[\v\f]')): """ Return a list of one-line strings with tabs expanded, no newlines, and Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/transforms/references.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/transforms/references.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/transforms/references.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: references.py 6167 2009-10-11 14:51:42Z grubert $ +# $Id: references.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -47,7 +47,7 @@ target.hasattr('refname'))): continue assert len(target) == 0, 'error: block-level target has children' - next_node = target.next_node(ascend=1) + next_node = target.next_node(ascend=True) # Do not move names and ids into Invisibles (we'd lose the # attributes) or different Targetables (e.g. footnotes). if (next_node is not None and @@ -136,7 +136,7 @@ return for ref, target in zip(anonymous_refs, anonymous_targets): target.referenced = 1 - while 1: + while True: if target.hasattr('refuri'): ref['refuri'] = target['refuri'] ref.resolved = 1 @@ -502,7 +502,7 @@ corresponding footnote references. """ for footnote in self.document.autofootnotes: - while 1: + while True: label = str(startnum) startnum += 1 if label not in self.document.nameids: @@ -808,8 +808,7 @@ for ref in refs: if isinstance(ref, nodes.target): continue - refnode = nodes.footnote_reference( - refname=footnote_name, auto=1) + refnode = nodes.footnote_reference(refname=footnote_name, auto=1) refnode['classes'] += self.classes self.document.note_autofootnote_ref(refnode) self.document.note_footnote_ref(refnode) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/transforms/writer_aux.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/transforms/writer_aux.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/transforms/writer_aux.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: writer_aux.py 6433 2010-09-28 08:21:25Z milde $ +# $Id: writer_aux.py 7320 2012-01-19 22:33:02Z milde $ # Author: Lea Wiemann <LeWiemann@gmail.com> # Copyright: This module has been placed in the public domain. @@ -39,11 +39,11 @@ def apply(self): for compound in self.document.traverse(nodes.compound): - first_child = 1 + first_child = True for child in compound: if first_child: if not isinstance(child, nodes.Invisible): - first_child = 0 + first_child = False else: child['classes'].append('continued') # Substitute children for compound. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: __init__.py 6433 2010-09-28 08:21:25Z milde $ +# $Id: __init__.py 7317 2012-01-19 11:55:26Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -52,7 +52,7 @@ def __init__(self): - # Used by HTML and LaTex writer for output fragments: + # Used by HTML and LaTeX writer for output fragments: self.parts = {} """Mapping of document part names to fragments of `self.output`. Values are Unicode strings; encoding is up to the client. The 'whole' Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/docutils_xml.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/docutils_xml.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/docutils_xml.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,18 +1,26 @@ -# $Id: docutils_xml.py 4564 2006-05-21 20:44:42Z wiemann $ -# Author: David Goodger <goodger@python.org> +# $Id: docutils_xml.py 7315 2012-01-18 10:16:20Z milde $ +# Author: David Goodger, Paul Tremblay, Guenter Milde +# Maintainer: docutils-develop@lists.sourceforge.net # Copyright: This module has been placed in the public domain. """ -Simple internal document tree Writer, writes Docutils XML. +Simple document tree Writer, writes Docutils XML according to +http://docutils.sourceforge.net/docs/ref/docutils.dtd. """ __docformat__ = 'reStructuredText' +import sys +import xml.sax.saxutils +from StringIO import StringIO import docutils -from docutils import frontend, writers +from docutils import frontend, writers, nodes +class RawXmlError(docutils.ApplicationError): pass + + class Writer(writers.Writer): supported = ('xml',) @@ -20,8 +28,7 @@ settings_spec = ( '"Docutils XML" Writer Options', - 'Warning: the --newlines and --indents options may adversely affect ' - 'whitespace; use them only for reading convenience.', + None, (('Generate XML with newlines before and after tags.', ['--newlines'], {'action': 'store_true', 'validator': frontend.validate_boolean}), @@ -45,7 +52,20 @@ output = None """Final translated form of `document`.""" + def __init__(self): + writers.Writer.__init__(self) + self.translator_class = XMLTranslator + + def translate(self): + self.visitor = visitor = self.translator_class(self.document) + self.document.walkabout(visitor) + self.output = ''.join(visitor.output) + + +class XMLTranslator(nodes.GenericNodeVisitor): + xml_declaration = '<?xml version="1.0" encoding="%s"?>\n' + # TODO: add stylesheet options similar to HTML and LaTeX writers? #xml_stylesheet = '<?xml-stylesheet type="text/xsl" href="%s"?>\n' doctype = ( '<!DOCTYPE document PUBLIC' @@ -53,21 +73,107 @@ ' "http://docutils.sourceforge.net/docs/ref/docutils.dtd">\n') generator = '<!-- Generated by Docutils %s -->\n' - def translate(self): - settings = self.document.settings - indent = newline = '' + xmlparser = xml.sax.make_parser() + """SAX parser instance to check/exctract raw XML.""" + xmlparser.setFeature( + "http://xml.org/sax/features/external-general-entities", True) + + def __init__(self, document): + nodes.NodeVisitor.__init__(self, document) + + # Reporter + self.warn = self.document.reporter.warning + self.error = self.document.reporter.error + + # Settings + self.settings = settings = document.settings + self.indent = self.newline = '' if settings.newlines: - newline = '\n' + self.newline = '\n' if settings.indents: - newline = '\n' - indent = ' ' - output_prefix = [] + self.newline = '\n' + self.indent = ' ' + self.level = 0 # indentation level + self.in_simple = 0 # level of nesting inside mixed-content elements + + # Output + self.output = [] if settings.xml_declaration: - output_prefix.append( + self.output.append( self.xml_declaration % settings.output_encoding) if settings.doctype_declaration: - output_prefix.append(self.doctype) - output_prefix.append(self.generator % docutils.__version__) - docnode = self.document.asdom().childNodes[0] - self.output = (''.join(output_prefix) - + docnode.toprettyxml(indent, newline)) + self.output.append(self.doctype) + self.output.append(self.generator % docutils.__version__) + + # initialize XML parser + self.the_handle=TestXml() + self.xmlparser.setContentHandler(self.the_handle) + + # generic visit and depart methods + # -------------------------------- + + def default_visit(self, node): + """Default node visit method.""" + if not self.in_simple: + self.output.append(self.indent*self.level) + self.output.append(node.starttag(xml.sax.saxutils.quoteattr)) + self.level += 1 + if isinstance(node, nodes.TextElement): + self.in_simple += 1 + if not self.in_simple: + self.output.append(self.newline) + + def default_departure(self, node): + """Default node depart method.""" + self.level -= 1 + if not self.in_simple: + self.output.append(self.indent*self.level) + self.output.append(node.endtag()) + if isinstance(node, nodes.TextElement): + self.in_simple -= 1 + if not self.in_simple: + self.output.append(self.newline) + + + # specific visit and depart methods + # --------------------------------- + + def visit_Text(self, node): + text = xml.sax.saxutils.escape(node.astext()) + self.output.append(text) + + def depart_Text(self, node): + pass + + def visit_raw(self, node): + if 'xml' not in node.get('format', '').split(): + # skip other raw content? + # raise nodes.SkipNode + self.default_visit(node) + return + # wrap in <raw> element + self.default_visit(node) # or not? + xml_string = node.astext() + self.output.append(xml_string) + self.default_departure(node) # or not? + # Check validity of raw XML: + if isinstance(xml_string, unicode) and sys.version_info < (3,): + xml_string = xml_string.encode('utf8') + try: + self.xmlparser.parse(StringIO(xml_string)) + except xml.sax._exceptions.SAXParseException, error: + col_num = self.the_handle.locator.getColumnNumber() + line_num = self.the_handle.locator.getLineNumber() + srcline = node.line + if not isinstance(node.parent, nodes.TextElement): + srcline += 2 # directive content start line + msg = 'Invalid raw XML in column %d, line offset %d:\n%s' % ( + col_num, line_num, node.astext()) + self.warn(msg, source=node.source, line=srcline+line_num-1) + raise nodes.SkipNode # content already processed + + +class TestXml(xml.sax.ContentHandler): + + def setDocumentLocator(self, locator): + self.locator = locator Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/html4css1/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/html4css1/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/html4css1/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,6 @@ -# $Id: __init__.py 7061 2011-06-29 16:24:09Z milde $ -# Author: David Goodger <goodger@python.org> +# $Id: __init__.py 7328 2012-01-27 08:41:35Z milde $ +# Author: David Goodger +# Maintainer: docutils-develop@lists.sourceforge.net # Copyright: This module has been placed in the public domain. """ @@ -19,14 +20,21 @@ import os.path import time import re -try: - import Image # check for the Python Imaging Library +import urllib +try: # check for the Python Imaging Library + import PIL except ImportError: - Image = None + try: # sometimes PIL modules are put in PYTHONPATH's root + import Image + class PIL(object): pass # dummy wrapper + PIL.Image = Image + except ImportError: + PIL = None import docutils from docutils import frontend, nodes, utils, writers, languages, io +from docutils.error_reporting import SafeString from docutils.transforms import writer_aux -from docutils.math import unimathsymbols2tex, pick_math_environment +from docutils.math import unichar2tex, pick_math_environment from docutils.math.latex2mathml import parse_latex_math from docutils.math.math2html import math2html @@ -125,9 +133,9 @@ ['--table-style'], {'default': ''}), ('Math output format, one of "MathML", "HTML", "MathJax" ' - 'or "LaTeX". Default: "MathML"', + 'or "LaTeX". Default: "MathJax"', ['--math-output'], - {'default': 'MathML'}), + {'default': 'MathJax'}), ('Omit the XML declaration. Use with caution.', ['--no-xml-declaration'], {'dest': 'xml_declaration', 'default': 1, 'action': 'store_false', @@ -280,19 +288,8 @@ # encoding not interpolated: self.html_prolog.append(self.xml_declaration) self.head = self.meta[:] - # stylesheets - styles = utils.get_stylesheet_list(settings) - if settings.stylesheet_path and not(settings.embed_stylesheet): - styles = [utils.relative_path(settings._destination, sheet) - for sheet in styles] - if settings.embed_stylesheet: - settings.record_dependencies.add(*styles) - self.stylesheet = [self.embedded_stylesheet % - io.FileInput(source_path=sheet, encoding='utf-8').read() - for sheet in styles] - else: # link to stylesheets - self.stylesheet = [self.stylesheet_link % self.encode(stylesheet) - for stylesheet in styles] + self.stylesheet = [self.stylesheet_call(path) + for path in utils.get_stylesheet_list(settings)] self.body_prefix = ['</head>\n<body>\n'] # document title, subtitle display self.body_pre_docinfo = [] @@ -310,10 +307,10 @@ self.topic_classes = [] self.colspecs = [] self.compact_p = 1 - self.compact_simple = None - self.compact_field_list = None - self.in_docinfo = None - self.in_sidebar = None + self.compact_simple = False + self.compact_field_list = False + self.in_docinfo = False + self.in_sidebar = False self.title = [] self.subtitle = [] self.header = [] @@ -322,9 +319,9 @@ self.html_title = [] self.html_subtitle = [] self.html_body = [] - self.in_document_title = 0 - self.in_mailto = 0 - self.author_in_authors = None + self.in_document_title = 0 # len(self.body) or 0 + self.in_mailto = False + self.author_in_authors = False self.math_header = '' def astext(self): @@ -371,7 +368,27 @@ encoded = encoded.replace('.', '.') return encoded - def starttag(self, node, tagname, suffix='\n', empty=0, **attributes): + def stylesheet_call(self, path): + """Return code to reference or embed stylesheet file `path`""" + if self.settings.embed_stylesheet: + try: + content = io.FileInput(source_path=path, + encoding='utf-8', + handle_io_errors=False).read() + self.settings.record_dependencies.add(path) + except IOError, err: + msg = u"Cannot embed stylesheet '%s': %s." % ( + path, SafeString(err.strerror)) + self.document.reporter.error(msg) + return '<--- %s --->\n' % msg + return self.embedded_stylesheet % content + # else link to style file: + if self.settings.stylesheet_path: + # adapt path relative to output (cf. config.html#stylesheet-path) + path = utils.relative_path(self.settings._destination, path) + return self.stylesheet_link % self.encode(path) + + def starttag(self, node, tagname, suffix='\n', empty=False, **attributes): """ Construct and return a start tag given a node (id & class attributes are extracted), tag name, and optional attributes. @@ -437,7 +454,7 @@ def emptytag(self, node, tagname, suffix='\n', **attributes): """Construct and return an XML-compatible empty tag.""" - return self.starttag(node, tagname, suffix, empty=1, **attributes) + return self.starttag(node, tagname, suffix, empty=True, **attributes) def set_class_on_child(self, node, class_, index=0): """ @@ -480,7 +497,7 @@ self.body.append('</acronym>') def visit_address(self, node): - self.visit_docinfo_item(node, 'address', meta=None) + self.visit_docinfo_item(node, 'address', meta=False) self.body.append(self.starttag(node, 'pre', CLASS='address')) def depart_address(self, node): @@ -517,17 +534,16 @@ def depart_author(self, node): if isinstance(node.parent, nodes.authors): - self.author_in_authors += 1 + self.author_in_authors = True else: self.depart_docinfo_item() def visit_authors(self, node): self.visit_docinfo_item(node, 'authors') - self.author_in_authors = 0 # initialize counter + self.author_in_authors = False # initialize def depart_authors(self, node): self.depart_docinfo_item() - self.author_in_authors = None def visit_block_quote(self, node): self.body.append(self.starttag(node, 'blockquote')) @@ -644,7 +660,7 @@ self.body.append('</div>\n') def visit_contact(self, node): - self.visit_docinfo_item(node, 'contact', meta=None) + self.visit_docinfo_item(node, 'contact', meta=False) def depart_contact(self, node): self.depart_docinfo_item() @@ -702,16 +718,16 @@ self.body.append('<col class="docinfo-name" />\n' '<col class="docinfo-content" />\n' '<tbody valign="top">\n') - self.in_docinfo = 1 + self.in_docinfo = True def depart_docinfo(self, node): self.body.append('</tbody>\n</table>\n') - self.in_docinfo = None + self.in_docinfo = False start = self.context.pop() self.docinfo = self.body[start:] self.body = [] - def visit_docinfo_item(self, node, name, meta=1): + def visit_docinfo_item(self, node, name, meta=True): if meta: meta_tag = '<meta name="%s" content="%s" />\n' \ % (name, self.attval(node.astext())) @@ -841,10 +857,10 @@ self.context.append((self.compact_field_list, self.compact_p)) self.compact_p = None if 'compact' in node['classes']: - self.compact_field_list = 1 + self.compact_field_list = True elif (self.settings.compact_field_lists and 'open' not in node['classes']): - self.compact_field_list = 1 + self.compact_field_list = True if self.compact_field_list: for field in node: field_body = field[-1] @@ -855,7 +871,7 @@ len(children) == 1 and isinstance(children[0], (nodes.paragraph, nodes.line_block))): - self.compact_field_list = 0 + self.compact_field_list = False break self.body.append(self.starttag(node, 'table', frame='void', rules='none', @@ -1006,18 +1022,22 @@ if 'height' in node: atts['height'] = node['height'] if 'scale' in node: - if Image and not ('width' in node and 'height' in node): + if (PIL and not ('width' in node and 'height' in node) + and self.settings.file_insertion_enabled): + imagepath = urllib.url2pathname(uri) try: - im = Image.open(str(uri)) - except (IOError, # Source image can't be found or opened - UnicodeError): # PIL doesn't like Unicode paths. - pass + img = PIL.Image.open( + imagepath.encode(sys.getfilesystemencoding())) + except (IOError, UnicodeEncodeError): + pass # TODO: warn? else: + self.settings.record_dependencies.add( + imagepath.replace('\\', '/')) if 'width' not in atts: - atts['width'] = str(im.size[0]) + atts['width'] = str(img.size[0]) if 'height' not in atts: - atts['height'] = str(im.size[1]) - del im + atts['height'] = str(img.size[1]) + del img for att_name in 'width', 'height': if att_name in atts: match = re.match(r'([0-9.]+)(\S*)$', atts[att_name]) @@ -1152,7 +1172,7 @@ } wrapper = wrappers[self.math_output][math_env != ''] # get and wrap content - math_code = node.astext().translate(unimathsymbols2tex.uni2tex_table) + math_code = node.astext().translate(unichar2tex.uni2tex_table) if wrapper and math_env: math_code = wrapper % (math_env, math_code, math_env) elif wrapper: @@ -1197,6 +1217,7 @@ pass # never reached def visit_math_block(self, node): + # print node.astext().encode('utf8') math_env = pick_math_environment(node.astext()) self.visit_math(node, math_env=math_env) @@ -1347,7 +1368,7 @@ if ( self.settings.cloak_email_addresses and atts['href'].startswith('mailto:')): atts['href'] = self.cloak_mailto(atts['href']) - self.in_mailto = 1 + self.in_mailto = True atts['class'] += ' external' else: assert 'refid' in node, \ @@ -1363,10 +1384,10 @@ self.body.append('</a>') if not isinstance(node.parent, nodes.TextElement): self.body.append('\n') - self.in_mailto = 0 + self.in_mailto = False def visit_revision(self, node): - self.visit_docinfo_item(node, 'revision', meta=None) + self.visit_docinfo_item(node, 'revision', meta=False) def depart_revision(self, node): self.depart_docinfo_item() @@ -1397,14 +1418,14 @@ self.body.append( self.starttag(node, 'div', CLASS='sidebar')) self.set_first_last(node) - self.in_sidebar = 1 + self.in_sidebar = True def depart_sidebar(self, node): self.body.append('</div>\n') - self.in_sidebar = None + self.in_sidebar = False def visit_status(self, node): - self.visit_docinfo_item(node, 'status', meta=None) + self.visit_docinfo_item(node, 'status', meta=False) def depart_status(self, node): self.depart_docinfo_item() @@ -1547,7 +1568,7 @@ def visit_title(self, node): """Only 6 section levels are supported by HTML.""" - check_id = 0 + check_id = 0 # TODO: is this a bool (False) or a counter? close_tag = '</p>\n' if isinstance(node.parent, nodes.topic): self.body.append( @@ -1616,7 +1637,7 @@ pass def visit_version(self, node): - self.visit_docinfo_item(node, 'version', meta=None) + self.visit_docinfo_item(node, 'version', meta=False) def depart_version(self, node): self.depart_docinfo_item() Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/latex2e/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/latex2e/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/latex2e/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,7 @@ # .. coding: utf8 -# $Id: __init__.py 7102 2011-08-24 13:36:28Z milde $ -# Author: Engelbert Gruber <grubert@users.sourceforge.net> +# $Id: __init__.py 7389 2012-03-30 11:58:21Z milde $ +# Author: Engelbert Gruber, Günter Milde +# Maintainer: docutils-develop@lists.sourceforge.net # Copyright: This module has been placed in the public domain. """LaTeX2e document tree Writer.""" @@ -18,9 +19,14 @@ import re import string import urllib +try: + import roman +except ImportError: + import docutils.utils.roman as roman from docutils import frontend, nodes, languages, writers, utils, io +from docutils.error_reporting import SafeString from docutils.transforms import writer_aux -from docutils.math import unimathsymbols2tex, pick_math_environment +from docutils.math import pick_math_environment, unichar2tex # compatibility module for Python 2.3 if not hasattr(string, 'Template'): @@ -386,7 +392,7 @@ self.setup.append( r'\addto\shorthandsspanish{\spanishdeactivate{."~<>}}') # or prepend r'\def\spanishoptions{es-noshorthands}' - if (languages[-1] is 'english' and + if (languages[-1] == 'english' and 'french' in self.otherlanguages.keys()): self.setup += ['% Prevent side-effects if French hyphenation ' 'patterns are not loaded:', @@ -492,11 +498,6 @@ \DUprovidelength{\DUdocinfowidth}{0.9\textwidth}""" # PreambleCmds.docinfo._depends = 'providelength' -PreambleCmds.embedded_package_wrapper = r"""\makeatletter -%% embedded stylesheet: %s -%s -\makeatother""" - PreambleCmds.dedication = r""" % dedication topic \providecommand{\DUtopicdedication}[1]{\begin{center}#1\end{center}}""" @@ -651,7 +652,7 @@ \providecommand*{\DUroletitlereference}[1]{\textsl{#1}}""" PreambleCmds.title = r""" -% title for topics, admonitions and sidebar +% title for topics, admonitions, unsupported section levels, and sidebar \providecommand*{\DUtitle}[2][class-arg]{% % call \DUtitle#1{#2} if it exists: \ifcsname DUtitle#1\endcsname% @@ -679,6 +680,161 @@ }""" +# LaTeX encoding maps +# ------------------- +# :: + +class CharMaps(object): + """LaTeX representations for active and Unicode characters.""" + + # characters that always need escaping: + special = { + ord('#'): ur'\#', + ord('$'): ur'\$', + ord('%'): ur'\%', + ord('&'): ur'\&', + ord('~'): ur'\textasciitilde{}', + ord('_'): ur'\_', + ord('^'): ur'\textasciicircum{}', + ord('\\'): ur'\textbackslash{}', + ord('{'): ur'\{', + ord('}'): ur'\}', + # Square brackets are ordinary chars and cannot be escaped with '\', + # so we put them in a group '{[}'. (Alternative: ensure that all + # macros with optional arguments are terminated with {} and text + # inside any optional argument is put in a group ``[{text}]``). + # Commands with optional args inside an optional arg must be put in a + # group, e.g. ``\item[{\hyperref[label]{text}}]``. + ord('['): ur'{[}', + ord(']'): ur'{]}', + # the soft hyphen is unknown in 8-bit text and not properly handled by XeTeX + 0x00AD: ur'\-', # SOFT HYPHEN + } + # Unicode chars that are not recognized by LaTeX's utf8 encoding + unsupported_unicode = { + 0x00A0: ur'~', # NO-BREAK SPACE + # TODO: ensure white space also at the beginning of a line? + # 0x00A0: ur'\leavevmode\nobreak\vadjust{}~' + 0x2008: ur'\,', # PUNCTUATION SPACE    + 0x2011: ur'\hbox{-}', # NON-BREAKING HYPHEN + 0x202F: ur'\,', # NARROW NO-BREAK SPACE + 0x21d4: ur'$\Leftrightarrow$', + # Docutils footnote symbols: + 0x2660: ur'$\spadesuit$', + 0x2663: ur'$\clubsuit$', + } + # Unicode chars that are recognized by LaTeX's utf8 encoding + utf8_supported_unicode = { + 0x200C: ur'\textcompwordmark', # ZERO WIDTH NON-JOINER + 0x2013: ur'\textendash{}', + 0x2014: ur'\textemdash{}', + 0x2018: ur'\textquoteleft{}', + 0x2019: ur'\textquoteright{}', + 0x201A: ur'\quotesinglbase{}', # SINGLE LOW-9 QUOTATION MARK + 0x201C: ur'\textquotedblleft{}', + 0x201D: ur'\textquotedblright{}', + 0x201E: ur'\quotedblbase{}', # DOUBLE LOW-9 QUOTATION MARK + 0x2030: ur'\textperthousand{}', # PER MILLE SIGN + 0x2031: ur'\textpertenthousand{}', # PER TEN THOUSAND SIGN + 0x2039: ur'\guilsinglleft{}', + 0x203A: ur'\guilsinglright{}', + 0x2423: ur'\textvisiblespace{}', # OPEN BOX + 0x2020: ur'\dag{}', + 0x2021: ur'\ddag{}', + 0x2026: ur'\dots{}', + 0x2122: ur'\texttrademark{}', + } + # recognized with 'utf8', if textcomp is loaded + textcomp = { + # Latin-1 Supplement + 0x00a2: ur'\textcent{}', # ¢ CENT SIGN + 0x00a4: ur'\textcurrency{}', # ¤ CURRENCY SYMBOL + 0x00a5: ur'\textyen{}', # ¥ YEN SIGN + 0x00a6: ur'\textbrokenbar{}', # ¦ BROKEN BAR + 0x00a7: ur'\textsection{}', # § SECTION SIGN + 0x00a8: ur'\textasciidieresis{}', # ¨ DIAERESIS + 0x00a9: ur'\textcopyright{}', # © COPYRIGHT SIGN + 0x00aa: ur'\textordfeminine{}', # ª FEMININE ORDINAL INDICATOR + 0x00ac: ur'\textlnot{}', # ¬ NOT SIGN + 0x00ae: ur'\textregistered{}', # ® REGISTERED SIGN + 0x00af: ur'\textasciimacron{}', # ¯ MACRON + 0x00b0: ur'\textdegree{}', # ° DEGREE SIGN + 0x00b1: ur'\textpm{}', # ± PLUS-MINUS SIGN + 0x00b2: ur'\texttwosuperior{}', # ² SUPERSCRIPT TWO + 0x00b3: ur'\textthreesuperior{}', # ³ SUPERSCRIPT THREE + 0x00b4: ur'\textasciiacute{}', # ´ ACUTE ACCENT + 0x00b5: ur'\textmu{}', # µ MICRO SIGN + 0x00b6: ur'\textparagraph{}', # ¶ PILCROW SIGN # not equal to \textpilcrow + 0x00b9: ur'\textonesuperior{}', # ¹ SUPERSCRIPT ONE + 0x00ba: ur'\textordmasculine{}', # º MASCULINE ORDINAL INDICATOR + 0x00bc: ur'\textonequarter{}', # 1/4 FRACTION + 0x00bd: ur'\textonehalf{}', # 1/2 FRACTION + 0x00be: ur'\textthreequarters{}', # 3/4 FRACTION + 0x00d7: ur'\texttimes{}', # × MULTIPLICATION SIGN + 0x00f7: ur'\textdiv{}', # ÷ DIVISION SIGN + # + 0x0192: ur'\textflorin{}', # LATIN SMALL LETTER F WITH HOOK + 0x02b9: ur'\textasciiacute{}', # MODIFIER LETTER PRIME + 0x02ba: ur'\textacutedbl{}', # MODIFIER LETTER DOUBLE PRIME + 0x2016: ur'\textbardbl{}', # DOUBLE VERTICAL LINE + 0x2022: ur'\textbullet{}', # BULLET + 0x2032: ur'\textasciiacute{}', # PRIME + 0x2033: ur'\textacutedbl{}', # DOUBLE PRIME + 0x2035: ur'\textasciigrave{}', # REVERSED PRIME + 0x2036: ur'\textgravedbl{}', # REVERSED DOUBLE PRIME + 0x203b: ur'\textreferencemark{}', # REFERENCE MARK + 0x203d: ur'\textinterrobang{}', # INTERROBANG + 0x2044: ur'\textfractionsolidus{}', # FRACTION SLASH + 0x2045: ur'\textlquill{}', # LEFT SQUARE BRACKET WITH QUILL + 0x2046: ur'\textrquill{}', # RIGHT SQUARE BRACKET WITH QUILL + 0x2052: ur'\textdiscount{}', # COMMERCIAL MINUS SIGN + 0x20a1: ur'\textcolonmonetary{}', # COLON SIGN + 0x20a3: ur'\textfrenchfranc{}', # FRENCH FRANC SIGN + 0x20a4: ur'\textlira{}', # LIRA SIGN + 0x20a6: ur'\textnaira{}', # NAIRA SIGN + 0x20a9: ur'\textwon{}', # WON SIGN + 0x20ab: ur'\textdong{}', # DONG SIGN + 0x20ac: ur'\texteuro{}', # EURO SIGN + 0x20b1: ur'\textpeso{}', # PESO SIGN + 0x20b2: ur'\textguarani{}', # GUARANI SIGN + 0x2103: ur'\textcelsius{}', # DEGREE CELSIUS + 0x2116: ur'\textnumero{}', # NUMERO SIGN + 0x2117: ur'\textcircledP{}', # SOUND RECORDING COYRIGHT + 0x211e: ur'\textrecipe{}', # PRESCRIPTION TAKE + 0x2120: ur'\textservicemark{}', # SERVICE MARK + 0x2122: ur'\texttrademark{}', # TRADE MARK SIGN + 0x2126: ur'\textohm{}', # OHM SIGN + 0x2127: ur'\textmho{}', # INVERTED OHM SIGN + 0x212e: ur'\textestimated{}', # ESTIMATED SYMBOL + 0x2190: ur'\textleftarrow{}', # LEFTWARDS ARROW + 0x2191: ur'\textuparrow{}', # UPWARDS ARROW + 0x2192: ur'\textrightarrow{}', # RIGHTWARDS ARROW + 0x2193: ur'\textdownarrow{}', # DOWNWARDS ARROW + 0x2212: ur'\textminus{}', # MINUS SIGN + 0x2217: ur'\textasteriskcentered{}', # ASTERISK OPERATOR + 0x221a: ur'\textsurd{}', # SQUARE ROOT + 0x2422: ur'\textblank{}', # BLANK SYMBOL + 0x25e6: ur'\textopenbullet{}', # WHITE BULLET + 0x25ef: ur'\textbigcircle{}', # LARGE CIRCLE + 0x266a: ur'\textmusicalnote{}', # EIGHTH NOTE + 0x26ad: ur'\textmarried{}', # MARRIAGE SYMBOL + 0x26ae: ur'\textdivorced{}', # DIVORCE SYMBOL + 0x27e8: ur'\textlangle{}', # MATHEMATICAL LEFT ANGLE BRACKET + 0x27e9: ur'\textrangle{}', # MATHEMATICAL RIGHT ANGLE BRACKET + } + # Unicode chars that require a feature/package to render + pifont = { + 0x2665: ur'\ding{170}', # black heartsuit + 0x2666: ur'\ding{169}', # black diamondsuit + 0x2713: ur'\ding{51}', # check mark + 0x2717: ur'\ding{55}', # check mark + } + # TODO: greek alphabet ... ? + # see also LaTeX codec + # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/252124 + # and unimap.py from TeXML + + class DocumentClass(object): """Details of a LaTeX document class.""" @@ -699,13 +855,11 @@ The name depends on the specific document class. Level is 1,2,3..., as level 0 is the title. """ - if level <= len(self.sections): return self.sections[level-1] - else: - return self.sections[-1] + else: # unsupported levels + return 'DUtitle[section%s]' % roman.toRoman(level) - class Table(object): """Manage a table while traversing. @@ -723,7 +877,7 @@ self._translator = translator self._latex_type = latex_type self._table_style = table_style - self._open = 0 + self._open = False # miscellaneous attributes self._attrs = {} self._col_width = [] @@ -853,6 +1007,7 @@ elif self._table_style == 'booktabs': return ['\\toprule\n'] return [] + def depart_thead(self): a = [] #if self._table_style == 'standard': @@ -888,7 +1043,7 @@ cline = '' rowspans.reverse() # TODO merge clines - while 1: + while True: try: c_start = rowspans.pop() except: @@ -923,6 +1078,10 @@ # to other packages, as done with babel. # Dummy settings might be taken from document settings + # Write code for typesetting with 8-bit tex/pdftex (vs. xetex/luatex) engine + # overwritten by the XeTeX writer + is_xetex = False + # Config setting defaults # ----------------------- @@ -931,10 +1090,10 @@ ## use_optionlist_for_docinfo = False # TODO: NOT YET IN USE # Use compound enumerations (1.A.1.) - compound_enumerators = 0 + compound_enumerators = False # If using compound enumerations, include section information. - section_prefix_for_enumerators = 0 + section_prefix_for_enumerators = False # This is the character that separates the section ("." subsection ...) # prefix from the regular list enumerator. @@ -970,7 +1129,6 @@ self.use_latex_toc = settings.use_latex_toc self.use_latex_docinfo = settings.use_latex_docinfo self._use_latex_citations = settings.use_latex_citations - self.embed_stylesheet = settings.embed_stylesheet self._reference_label = settings.reference_label self.hyperlink_color = settings.hyperlink_color self.compound_enumerators = settings.compound_enumerators @@ -1037,7 +1195,6 @@ self.requirements = SortableDict() # made a list in depart_document() self.requirements['__static'] = r'\usepackage{ifthen}' self.latex_preamble = [settings.latex_preamble] - self.stylesheet = [] self.fallbacks = SortableDict() # made a list in depart_document() self.pdfsetup = [] # PDF properties (hyperref package) self.title = [] @@ -1099,7 +1256,7 @@ self.requirements['_inputenc'] = (r'\usepackage[%s]{inputenc}' % self.latex_encoding) # TeX font encoding - if self.font_encoding: + if self.font_encoding and not self.is_xetex: self.requirements['_fontenc'] = (r'\usepackage[%s]{fontenc}' % self.font_encoding) # page layout with typearea (if there are relevant document options) @@ -1109,30 +1266,10 @@ self.requirements['typearea'] = r'\usepackage{typearea}' # Stylesheets - # get list of style sheets from settings - styles = utils.get_stylesheet_list(settings) - # adapt path if --stylesheet_path is used - if settings.stylesheet_path and not(self.embed_stylesheet): - styles = [utils.relative_path(settings._destination, sheet) - for sheet in styles] - for sheet in styles: - (base, ext) = os.path.splitext(sheet) - is_package = ext in ['.sty', ''] - if self.embed_stylesheet: - if is_package: - sheet = base + '.sty' # adapt package name - # wrap in \makeatletter, \makeatother - wrapper = PreambleCmds.embedded_package_wrapper - else: - wrapper = '%% embedded stylesheet: %s\n%s' - settings.record_dependencies.add(sheet) - self.stylesheet.append(wrapper % - (sheet, io.FileInput(source_path=sheet, encoding='utf-8').read())) - else: # link to style sheet - if is_package: - self.stylesheet.append(r'\usepackage{%s}' % base) - else: - self.stylesheet.append(r'\input{%s}' % sheet) + # (the name `self.stylesheet` is singular because only one + # stylesheet was supported before Docutils 0.6). + self.stylesheet = [self.stylesheet_call(path) + for path in utils.get_stylesheet_list(settings)] # PDF setup if self.hyperlink_color in ('0', 'false', 'False', ''): @@ -1150,44 +1287,81 @@ ## self.requirements['tocdepth'] = (r'\setcounter{tocdepth}{%d}' % ## len(self.d_class.sections)) - # LaTeX section numbering - if not self.settings.sectnum_xform: # section numbering by LaTeX: - # sectnum_depth: - # None "sectnum" directive without depth arg -> LaTeX default - # 0 no "sectnum" directive -> no section numbers - # else value of the "depth" argument: translate to LaTeX level - # -1 part (0 with "article" document class) - # 0 chapter (missing in "article" document class) - # 1 section - # 2 subsection - # 3 subsubsection - # 4 paragraph - # 5 subparagraph - if settings.sectnum_depth is not None: + # Section numbering + if not self.settings.sectnum_xform: # section numbering by Docutils + PreambleCmds.secnumdepth = r'\setcounter{secnumdepth}{0}' + else: # section numbering by LaTeX: + secnumdepth = settings.sectnum_depth + # Possible values of settings.sectnum_depth: + # None "sectnum" directive without depth arg -> LaTeX default + # 0 no "sectnum" directive -> no section numbers + # >0 value of "depth" argument -> translate to LaTeX levels: + # -1 part (0 with "article" document class) + # 0 chapter (missing in "article" document class) + # 1 section + # 2 subsection + # 3 subsubsection + # 4 paragraph + # 5 subparagraph + if secnumdepth is not None: # limit to supported levels - sectnum_depth = min(settings.sectnum_depth, - len(self.d_class.sections)) + secnumdepth = min(secnumdepth, len(self.d_class.sections)) # adjust to document class and use_part_section settings if 'chapter' in self.d_class.sections: - sectnum_depth -= 1 + secnumdepth -= 1 if self.d_class.sections[0] == 'part': - sectnum_depth -= 1 - self.requirements['sectnum_depth'] = ( - r'\setcounter{secnumdepth}{%d}' % sectnum_depth) + secnumdepth -= 1 + PreambleCmds.secnumdepth = \ + r'\setcounter{secnumdepth}{%d}' % secnumdepth + # start with specified number: if (hasattr(settings, 'sectnum_start') and settings.sectnum_start != 1): self.requirements['sectnum_start'] = ( r'\setcounter{%s}{%d}' % (self.d_class.sections[0], settings.sectnum_start-1)) - # currently ignored (configure in a stylesheet): + # TODO: currently ignored (configure in a stylesheet): ## settings.sectnum_prefix ## settings.sectnum_suffix - # Auxiliary Methods # ----------------- + def stylesheet_call(self, path): + """Return code to reference or embed stylesheet file `path`""" + # is it a package (no extension or *.sty) or "normal" tex code: + (base, ext) = os.path.splitext(path) + is_package = ext in ['.sty', ''] + # Embed content of style file: + if self.settings.embed_stylesheet: + if is_package: + path = base + '.sty' # ensure extension + try: + content = io.FileInput(source_path=path, + encoding='utf-8', + handle_io_errors=False).read() + self.settings.record_dependencies.add(path) + except IOError, err: + msg = u"Cannot embed stylesheet '%s':\n %s." % ( + path, SafeString(err.strerror)) + self.document.reporter.error(msg) + return '% ' + msg.replace('\n', '\n% ') + if is_package: + content = '\n'.join([r'\makeatletter', + content, + r'\makeatother']) + return '%% embedded stylesheet: %s\n%s' % (path, content) + # Link to style file: + if is_package: + path = base # drop extension + cmd = r'\usepackage{%s}' + else: + cmd = r'\input{%s}' + if self.settings.stylesheet_path: + # adapt path relative to output (cf. config.html#stylesheet-path) + path = utils.relative_path(self.settings._destination, path) + return cmd % path + def to_latex_encoding(self,docutils_encoding): """Translate docutils encoding name into LaTeX's. @@ -1224,7 +1398,7 @@ encoding = docutils_encoding.lower() if encoding in tr: return tr[encoding] - # convert: latin-1, latin_1, utf-8 and similar things + # drop hyphen or low-line from "latin-1", "latin_1", "utf-8" and similar encoding = encoding.replace('_', '').replace('-', '') # strip the error handler return encoding.split(':')[0] @@ -1232,186 +1406,24 @@ def language_label(self, docutil_label): return self.language_module.labels[docutil_label] - def ensure_math(self, text): - if not hasattr(self, 'ensure_math_re'): - chars = { # lnot,pm,twosuperior,threesuperior,mu,onesuperior,times,div - 'latin1' : '\xac\xb1\xb2\xb3\xb5\xb9\xd7\xf7' , # ¬±²³µ¹×÷ - # TODO?: use texcomp instead. - } - self.ensure_math_re = re.compile('([%s])' % chars['latin1']) - text = self.ensure_math_re.sub(r'\\ensuremath{\1}', text) - return text - def encode(self, text): """Return text with 'problematic' characters escaped. - Escape the ten special printing characters ``# $ % & ~ _ ^ \ { }``, - square brackets ``[ ]``, double quotes and (in OT1) ``< | >``. - - Separate ``-`` (and more in literal text) to prevent input ligatures. - - Translate non-supported Unicode characters. + * Escape the ten special printing characters ``# $ % & ~ _ ^ \ { }``, + square brackets ``[ ]``, double quotes and (in OT1) ``< | >``. + * Translate non-supported Unicode characters. + * Separate ``-`` (and more in literal text) to prevent input ligatures. """ if self.verbatim: return text - # Separate compound characters, e.g. '--' to '-{}-'. - separate_chars = '-' - # In monospace-font, we also separate ',,', '``' and "''" and some - # other characters which can't occur in non-literal text. - if self.literal: - separate_chars += ',`\'"<>' - # LaTeX encoding maps: - special_chars = { - ord('#'): ur'\#', - ord('$'): ur'\$', - ord('%'): ur'\%', - ord('&'): ur'\&', - ord('~'): ur'\textasciitilde{}', - ord('_'): ur'\_', - ord('^'): ur'\textasciicircum{}', - ord('\\'): ur'\textbackslash{}', - ord('{'): ur'\{', - ord('}'): ur'\}', - # Square brackets are ordinary chars and cannot be escaped with '\', - # so we put them in a group '{[}'. (Alternative: ensure that all - # macros with optional arguments are terminated with {} and text - # inside any optional argument is put in a group ``[{text}]``). - # Commands with optional args inside an optional arg must be put - # in a group, e.g. ``\item[{\hyperref[label]{text}}]``. - ord('['): ur'{[}', - ord(']'): ur'{]}' - } - # Unicode chars that are not recognized by LaTeX's utf8 encoding - unsupported_unicode_chars = { - 0x00A0: ur'~', # NO-BREAK SPACE - 0x00AD: ur'\-', # SOFT HYPHEN - # - 0x2008: ur'\,', # PUNCTUATION SPACE    - 0x2011: ur'\hbox{-}', # NON-BREAKING HYPHEN - 0x202F: ur'\,', # NARROW NO-BREAK SPACE - 0x21d4: ur'$\Leftrightarrow$', - # Docutils footnote symbols: - 0x2660: ur'$\spadesuit$', - 0x2663: ur'$\clubsuit$', - } - # Unicode chars that are recognized by LaTeX's utf8 encoding - unicode_chars = { - 0x200C: ur'\textcompwordmark', # ZERO WIDTH NON-JOINER - 0x2013: ur'\textendash{}', - 0x2014: ur'\textemdash{}', - 0x2018: ur'\textquoteleft{}', - 0x2019: ur'\textquoteright{}', - 0x201A: ur'\quotesinglbase{}', # SINGLE LOW-9 QUOTATION MARK - 0x201C: ur'\textquotedblleft{}', - 0x201D: ur'\textquotedblright{}', - 0x201E: ur'\quotedblbase{}', # DOUBLE LOW-9 QUOTATION MARK - 0x2030: ur'\textperthousand{}', # PER MILLE SIGN - 0x2031: ur'\textpertenthousand{}', # PER TEN THOUSAND SIGN - 0x2039: ur'\guilsinglleft{}', - 0x203A: ur'\guilsinglright{}', - 0x2423: ur'\textvisiblespace{}', # OPEN BOX - 0x2020: ur'\dag{}', - 0x2021: ur'\ddag{}', - 0x2026: ur'\dots{}', - 0x2122: ur'\texttrademark{}', - } - # Unicode chars that require a feature/package to render - pifont_chars = { - 0x2665: ur'\ding{170}', # black heartsuit - 0x2666: ur'\ding{169}', # black diamondsuit - 0x2713: ur'\ding{51}', # check mark - 0x2717: ur'\ding{55}', # check mark - } - # recognized with 'utf8', if textcomp is loaded - textcomp_chars = { - # Latin-1 Supplement - 0x00a2: ur'\textcent{}', # ¢ CENT SIGN - 0x00a4: ur'\textcurrency{}', # ¤ CURRENCY SYMBOL - 0x00a5: ur'\textyen{}', # ¥ YEN SIGN - 0x00a6: ur'\textbrokenbar{}', # ¦ BROKEN BAR - 0x00a7: ur'\textsection{}', # § SECTION SIGN - 0x00a8: ur'\textasciidieresis{}', # ¨ DIAERESIS - 0x00a9: ur'\textcopyright{}', # © COPYRIGHT SIGN - 0x00aa: ur'\textordfeminine{}', # ª FEMININE ORDINAL INDICATOR - 0x00ac: ur'\textlnot{}', # ¬ NOT SIGN - 0x00ae: ur'\textregistered{}', # ® REGISTERED SIGN - 0x00af: ur'\textasciimacron{}', # ¯ MACRON - 0x00b0: ur'\textdegree{}', # ° DEGREE SIGN - 0x00b1: ur'\textpm{}', # ± PLUS-MINUS SIGN - 0x00b2: ur'\texttwosuperior{}', # ² SUPERSCRIPT TWO - 0x00b3: ur'\textthreesuperior{}', # ³ SUPERSCRIPT THREE - 0x00b4: ur'\textasciiacute{}', # ´ ACUTE ACCENT - 0x00b5: ur'\textmu{}', # µ MICRO SIGN - 0x00b6: ur'\textparagraph{}', # ¶ PILCROW SIGN # not equal to \textpilcrow - 0x00b9: ur'\textonesuperior{}', # ¹ SUPERSCRIPT ONE - 0x00ba: ur'\textordmasculine{}', # º MASCULINE ORDINAL INDICATOR - 0x00bc: ur'\textonequarter{}', # 1/4 FRACTION - 0x00bd: ur'\textonehalf{}', # 1/2 FRACTION - 0x00be: ur'\textthreequarters{}', # 3/4 FRACTION - 0x00d7: ur'\texttimes{}', # × MULTIPLICATION SIGN - 0x00f7: ur'\textdiv{}', # ÷ DIVISION SIGN - # - 0x0192: ur'\textflorin{}', # LATIN SMALL LETTER F WITH HOOK - 0x02b9: ur'\textasciiacute{}', # MODIFIER LETTER PRIME - 0x02ba: ur'\textacutedbl{}', # MODIFIER LETTER DOUBLE PRIME - 0x2016: ur'\textbardbl{}', # DOUBLE VERTICAL LINE - 0x2022: ur'\textbullet{}', # BULLET - 0x2032: ur'\textasciiacute{}', # PRIME - 0x2033: ur'\textacutedbl{}', # DOUBLE PRIME - 0x2035: ur'\textasciigrave{}', # REVERSED PRIME - 0x2036: ur'\textgravedbl{}', # REVERSED DOUBLE PRIME - 0x203b: ur'\textreferencemark{}', # REFERENCE MARK - 0x203d: ur'\textinterrobang{}', # INTERROBANG - 0x2044: ur'\textfractionsolidus{}', # FRACTION SLASH - 0x2045: ur'\textlquill{}', # LEFT SQUARE BRACKET WITH QUILL - 0x2046: ur'\textrquill{}', # RIGHT SQUARE BRACKET WITH QUILL - 0x2052: ur'\textdiscount{}', # COMMERCIAL MINUS SIGN - 0x20a1: ur'\textcolonmonetary{}', # COLON SIGN - 0x20a3: ur'\textfrenchfranc{}', # FRENCH FRANC SIGN - 0x20a4: ur'\textlira{}', # LIRA SIGN - 0x20a6: ur'\textnaira{}', # NAIRA SIGN - 0x20a9: ur'\textwon{}', # WON SIGN - 0x20ab: ur'\textdong{}', # DONG SIGN - 0x20ac: ur'\texteuro{}', # EURO SIGN - 0x20b1: ur'\textpeso{}', # PESO SIGN - 0x20b2: ur'\textguarani{}', # GUARANI SIGN - 0x2103: ur'\textcelsius{}', # DEGREE CELSIUS - 0x2116: ur'\textnumero{}', # NUMERO SIGN - 0x2117: ur'\textcircledP{}', # SOUND RECORDING COYRIGHT - 0x211e: ur'\textrecipe{}', # PRESCRIPTION TAKE - 0x2120: ur'\textservicemark{}', # SERVICE MARK - 0x2122: ur'\texttrademark{}', # TRADE MARK SIGN - 0x2126: ur'\textohm{}', # OHM SIGN - 0x2127: ur'\textmho{}', # INVERTED OHM SIGN - 0x212e: ur'\textestimated{}', # ESTIMATED SYMBOL - 0x2190: ur'\textleftarrow{}', # LEFTWARDS ARROW - 0x2191: ur'\textuparrow{}', # UPWARDS ARROW - 0x2192: ur'\textrightarrow{}', # RIGHTWARDS ARROW - 0x2193: ur'\textdownarrow{}', # DOWNWARDS ARROW - 0x2212: ur'\textminus{}', # MINUS SIGN - 0x2217: ur'\textasteriskcentered{}', # ASTERISK OPERATOR - 0x221a: ur'\textsurd{}', # SQUARE ROOT - 0x2422: ur'\textblank{}', # BLANK SYMBOL - 0x25e6: ur'\textopenbullet{}', # WHITE BULLET - 0x25ef: ur'\textbigcircle{}', # LARGE CIRCLE - 0x266a: ur'\textmusicalnote{}', # EIGHTH NOTE - 0x26ad: ur'\textmarried{}', # MARRIAGE SYMBOL - 0x26ae: ur'\textdivorced{}', # DIVORCE SYMBOL - 0x27e8: ur'\textlangle{}', # MATHEMATICAL LEFT ANGLE BRACKET - 0x27e9: ur'\textrangle{}', # MATHEMATICAL RIGHT ANGLE BRACKET - } - # TODO: greek alphabet ... ? - # see also LaTeX codec - # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/252124 - # and unimap.py from TeXML - # set up the translation table: - table = special_chars + # Set up the translation table: + table = CharMaps.special.copy() # keep the underscore in citation references if self.inside_citation_reference_label: del(table[ord('_')]) # Workarounds for OT1 font-encoding - if self.font_encoding in ['OT1', '']: + if self.font_encoding in ['OT1', ''] and not self.is_xetex: # * out-of-order characters in cmtt if self.literal: # replace underscore by underlined blank, @@ -1432,41 +1444,47 @@ # double quotes are 'active' in some languages # TODO: use \textquotedbl if font encoding starts with T? table[ord('"')] = self.babel.literal_double_quote - # Unicode chars: - table.update(unsupported_unicode_chars) - table.update(pifont_chars) - if not self.latex_encoding.startswith('utf8'): - table.update(unicode_chars) - table.update(textcomp_chars) - # Characters that require a feature/package to render - for ch in text: - if ord(ch) in pifont_chars: - self.requirements['pifont'] = '\\usepackage{pifont}' - if ord(ch) in textcomp_chars: + # Unicode replacements for 8-bit tex engines (not required with XeTeX/LuaTeX): + if not self.is_xetex: + table.update(CharMaps.unsupported_unicode) + if not self.latex_encoding.startswith('utf8'): + table.update(CharMaps.utf8_supported_unicode) + table.update(CharMaps.textcomp) + table.update(CharMaps.pifont) + # Characters that require a feature/package to render + if [True for ch in text if ord(ch) in CharMaps.textcomp]: self.requirements['textcomp'] = PreambleCmds.textcomp + if [True for ch in text if ord(ch) in CharMaps.pifont]: + self.requirements['pifont'] = '\\usepackage{pifont}' text = text.translate(table) - # Break up input ligatures - for char in separate_chars * 2: - # Do it twice ("* 2") because otherwise we would replace - # '---' by '-{}--'. - text = text.replace(char + char, char + '{}' + char) + # Break up input ligatures e.g. '--' to '-{}-'. + if not self.is_xetex: # Not required with xetex/luatex + separate_chars = '-' + # In monospace-font, we also separate ',,', '``' and "''" and some + # other characters which can't occur in non-literal text. + if self.literal: + separate_chars += ',`\'"<>' + for char in separate_chars * 2: + # Do it twice ("* 2") because otherwise we would replace + # '---' by '-{}--'. + text = text.replace(char + char, char + '{}' + char) + # Literal line breaks (in address or literal blocks): if self.insert_newline: lines = text.split('\n') - # for blank lines, insert a protected space, to avoid - # ! LaTeX Error: There's no line here to end. - lines = [line + '~'*(not line.lstrip()) - for line in lines[:-1]] + lines[-1:] - text = '\\\\\n'.join(lines) + # Add a protected space to blank lines (except the last) + # to avoid ``! LaTeX Error: There's no line here to end.`` + for i, line in enumerate(lines[:-1]): + if not line.lstrip(): + lines[i] += '~' + text = (r'\\' + '\n').join(lines) if not self.literal: text = self.babel.quote_quotes(text) if self.literal and not self.insert_non_breaking_blanks: # preserve runs of spaces but allow wrapping text = text.replace(' ', ' ~') - if not self.latex_encoding.startswith('utf8'): - text = self.ensure_math(text) return text def attval(self, text, @@ -1518,6 +1536,20 @@ def depart_Text(self, node): pass + def visit_abbreviation(self, node): + node['classes'].insert(0, 'abbreviation') + self.visit_inline(node) + + def depart_abbreviation(self, node): + self.depart_inline(node) + + def visit_acronym(self, node): + node['classes'].insert(0, 'acronym') + self.visit_inline(node) + + def depart_acronym(self, node): + self.depart_inline(node) + def visit_address(self, node): self.visit_docinfo_item(node, 'address') @@ -1648,8 +1680,8 @@ if self._use_latex_citations: followup_citation = False # check for a following citation separated by a space or newline - next_siblings = node.traverse(descend=0, siblings=1, - include_self=0) + next_siblings = node.traverse(descend=False, siblings=True, + include_self=False) if len(next_siblings) > 1: next = next_siblings[0] if (isinstance(next, nodes.Text) and @@ -2187,9 +2219,12 @@ self.requirements['~header'] = ''.join(self.out) self.pop_output_collector() - def to_latex_length(self, length_str, pxunit='px'): + def to_latex_length(self, length_str, pxunit=None): """Convert `length_str` with rst lenght to LaTeX length """ + if pxunit is not None: + sys.stderr.write('deprecation warning: LaTeXTranslator.to_latex_length()' + ' option `pxunit` will be removed.') match = re.match('(\d*\.?\d*)\s*(\S*)', length_str) if not match: return length_str @@ -2200,20 +2235,20 @@ # percentage: relate to current line width elif unit == '%': length_str = '%.3f\\linewidth' % (float(value)/100.0) - elif (unit == 'px') and (pxunit != 'px'): - # length unit px not defined in some tex variants (e.g. XeTeX) + elif self.is_xetex and unit == 'px': + # XeTeX does not know the length unit px. + # Use \pdfpxdimen, the macro to set the value of 1 px in pdftex. + # This way, configuring works the same for pdftex and xetex. self.fallbacks['_providelength'] = PreambleCmds.providelength - self.fallbacks['px'] = '\n\\DUprovidelength{%s}{1bp}\n' % pxunit - length_str = '%s%s' % (value, pxunit) - + self.fallbacks['px'] = '\n\\DUprovidelength{\\pdfpxdimen}{1bp}\n' + length_str = r'%s\pdfpxdimen' % value return length_str def visit_image(self, node): self.requirements['graphicx'] = self.graphicx_package attrs = node.attributes - # Convert image URI to a local file path and add to dependency list + # Convert image URI to a local file path imagepath = urllib.url2pathname(attrs['uri']).replace('\\', '/') - self.settings.record_dependencies.add(imagepath) # alignment defaults: if not 'align' in attrs: # Set default align of image in a figure to 'center' @@ -2432,7 +2467,7 @@ if node['classes']: self.visit_inline(node) self.requirements['amsmath'] = r'\usepackage{amsmath}' - math_code = node.astext().translate(unimathsymbols2tex.uni2tex_table) + math_code = node.astext().translate(unichar2tex.uni2tex_table) if node.get('ids'): math_code = '\n'.join([math_code] + self.ids_to_labels(node)) if math_env == '$': @@ -2820,18 +2855,6 @@ node.walkabout(self) self._thead_depth -= 1 - def bookmark(self, node): - """Return label and pdfbookmark string for titles.""" - result = [''] - if self.settings.sectnum_xform: # "starred" section cmd - # add to the toc and pdfbookmarks - section_name = self.d_class.section(max(self.section_level, 1)) - section_title = self.encode(node.astext()) - result.append(r'\addcontentsline{toc}{%s}{%s}' % - (section_name, section_title)) - result += self.ids_to_labels(node.parent, set_anchor=False) - return '%\n '.join(result) + '%\n' - def visit_title(self, node): """Append section and other titles.""" # Document title @@ -2856,26 +2879,31 @@ self.context.append('') # Section title else: + self.requirements['secnumdepth'] = PreambleCmds.secnumdepth + section_name = self.d_class.section(self.section_level) self.out.append('\n\n') - self.out.append('%' + '_' * 75) - self.out.append('\n\n') - # - section_name = self.d_class.section(self.section_level) - section_star = '' - pdfanchor = '' - # number sections? - if (self.settings.sectnum_xform # numbering by Docutils - or (self.section_level > len(self.d_class.sections))): - section_star = '*' - pdfanchor = '\\phantomsection%\n ' - self.out.append(r'\%s%s{%s' % - (section_name, section_star, pdfanchor)) # System messages heading in red: if ('system-messages' in node.parent['classes']): self.requirements['color'] = PreambleCmds.color - self.out.append('\color{red}') + section_title = self.encode(node.astext()) + self.out.append(r'\%s[%s]{\color{red}' % ( + section_name,section_title)) + else: + self.out.append(r'\%s{' % section_name) + if self.section_level > len(self.d_class.sections): + # section level not supported by LaTeX + self.fallbacks['title'] = PreambleCmds.title + # self.out.append('\\phantomsection%\n ') # label and ToC entry: - self.context.append(self.bookmark(node) + '}\n') + bookmark = [''] + # add sections with unsupported level to toc and pdfbookmarks? + ## if self.section_level > len(self.d_class.sections): + ## section_title = self.encode(node.astext()) + ## bookmark.append(r'\addcontentsline{toc}{%s}{%s}' % + ## (section_name, section_title)) + bookmark += self.ids_to_labels(node.parent, set_anchor=False) + self.context.append('%\n '.join(bookmark) + '%\n}\n') + # MAYBE postfix paragraph and subparagraph with \leavemode to # ensure floats stay in the section and text starts on a new line. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/manpage.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/manpage.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/manpage.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# $Id: manpage.py 7048 2011-06-04 12:35:19Z grubert $ +# $Id: manpage.py 7321 2012-01-20 06:50:44Z grubert $ # Author: Engelbert Gruber <grubert@users.sourceforge.net> # Copyright: This module is put into the public domain. @@ -48,7 +48,10 @@ import docutils from docutils import nodes, writers, languages -import roman +try: + import roman +except ImportError: + import docutils.utils.roman as roman FIELD_LIST_INDENT = 7 DEFINITION_LIST_INDENT = 7 @@ -156,7 +159,7 @@ words_and_spaces = re.compile(r'\S+| +|\n') possibly_a_roff_command = re.compile(r'\.\w') - document_start = """Man page generated from reStructeredText.""" + document_start = """Man page generated from reStructuredText.""" def __init__(self, document): nodes.NodeVisitor.__init__(self, document) @@ -585,7 +588,7 @@ self.body.append('.SH COPYRIGHT\n%s\n' % self._docinfo['copyright']) self.body.append(self.comment( - 'Generated by docutils manpage writer.\n')) + 'Generated by docutils manpage writer.')) def visit_emphasis(self, node): self.body.append(self.defs['emphasis'][0]) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/odf_odt/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/odf_odt/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/odf_odt/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: __init__.py 7057 2011-06-27 05:39:48Z dkuhlman $ +# $Id: __init__.py 7385 2012-03-20 00:22:38Z dkuhlman $ # Author: Dave Kuhlman <dkuhlman@rexx.com> # Copyright: This module has been placed in the public domain. @@ -800,7 +800,7 @@ self.document.reporter.warning( 'Style "%s" is not a style used by odtwriter.' % ( rststyle, )) - self.format_map[rststyle] = format + self.format_map[rststyle] = format.decode('utf-8') self.section_level = 0 self.section_count = 0 # Create ElementTree content and styles documents. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/pseudoxml.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/pseudoxml.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/pseudoxml.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: pseudoxml.py 4564 2006-05-21 20:44:42Z wiemann $ +# $Id: pseudoxml.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -28,4 +28,4 @@ def supports(self, format): """This writer supports all format-specific elements.""" - return 1 + return True Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/s5_html/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/s5_html/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/s5_html/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: __init__.py 7025 2011-05-05 23:19:51Z milde $ +# $Id: __init__.py 7320 2012-01-19 22:33:02Z milde $ # Authors: Chris Liechti <cliechti@gmx.net>; # David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -202,7 +202,7 @@ else: # no destination, so we can't copy the theme return - default = 0 + default = False while path: for f in os.listdir(path): # copy all files from each theme if f == self.base_theme_file: @@ -233,7 +233,7 @@ if not path: path = find_theme(self.default_theme) theme_paths.append(path) - default = 1 + default = True if len(required_files_copied) != len(self.required_theme_files): # Some required files weren't found & couldn't be copied. required = list(self.required_theme_files) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/xetex/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/xetex/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/build/lib/docutils/writers/xetex/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -2,8 +2,8 @@ # -*- coding: utf8 -*- # :Author: Günter Milde <milde@users.sourceforge.net> -# :Revision: $Revision: 7102 $ -# :Date: $Date: 2011-08-24 15:36:28 +0200 (Mit, 24 Aug 2011) $ +# :Revision: $Revision: 7389 $ +# :Date: $Date: 2012-03-30 13:58:21 +0200 (Fre, 30 Mär 2012) $ # :Copyright: © 2010 Günter Milde. # :License: Released under the terms of the `2-Clause BSD license`_, in short: # @@ -61,7 +61,7 @@ def __init__(self): latex2e.Writer.__init__(self) - self.settings_defaults.update({'fontencoding': ''}) # use default (EU1) + self.settings_defaults.update({'fontencoding': ''}) # use default (EU1 or EU2) self.translator_class = XeLaTeXTranslator @@ -125,79 +125,10 @@ class XeLaTeXTranslator(latex2e.LaTeXTranslator): def __init__(self, document): + self.is_xetex = True # typeset with XeTeX or LuaTeX engine latex2e.LaTeXTranslator.__init__(self, document, Babel) if self.latex_encoding == 'utf8': self.requirements.pop('_inputenc', None) else: self.requirements['_inputenc'] = (r'\XeTeXinputencoding %s ' % self.latex_encoding) - - # XeTeX does not know the length unit px. - # Use \pdfpxdimen, the macro to set the value of 1 px in pdftex. - # This way, configuring works the same for pdftex and xetex. - def to_latex_length(self, length_str, px=r'\pdfpxdimen'): - """Convert string with rst lenght to LaTeX length""" - return latex2e.LaTeXTranslator.to_latex_length(self, length_str, px) - - # Simpler variant of encode, as XeTeX understands utf8 Unicode: - def encode(self, text): - """Return text with 'problematic' characters escaped. - - Escape the ten special printing characters ``# $ % & ~ _ ^ \ { }``, - square brackets ``[ ]``, double quotes and (in OT1) ``< | >``. - """ - if self.verbatim: - return text - # LaTeX encoding maps: - special_chars = { - ord('#'): ur'\#', - ord('$'): ur'\$', - ord('%'): ur'\%', - ord('&'): ur'\&', - ord('~'): ur'\textasciitilde{}', - ord('_'): ur'\_', - ord('^'): ur'\textasciicircum{}', - ord('\\'): ur'\textbackslash{}', - ord('{'): ur'\{', - ord('}'): ur'\}', - # Square brackets are ordinary chars and cannot be escaped with '\', - # so we put them in a group '{[}'. (Alternative: ensure that all - # macros with optional arguments are terminated with {} and text - # inside any optional argument is put in a group ``[{text}]``). - # Commands with optional args inside an optional arg must be put - # in a group, e.g. ``\item[{\hyperref[label]{text}}]``. - ord('['): ur'{[}', - ord(']'): ur'{]}' - } - # Unicode chars that are not properly handled by XeTeX - unsupported_unicode_chars = { - 0x00AD: ur'\-', # SOFT HYPHEN - } - # set up the translation table: - table = special_chars - # keep the underscore in citation references - if self.inside_citation_reference_label: - del(table[ord('_')]) - if self.insert_non_breaking_blanks: - table[ord(' ')] = ur'~' - if self.literal: - # double quotes are 'active' in some languages - table[ord('"')] = self.babel.literal_double_quote - else: - text = self.babel.quote_quotes(text) - # Unicode chars: - table.update(unsupported_unicode_chars) - - text = text.translate(table) - - # Literal line breaks (in address or literal blocks): - if self.insert_newline: - # for blank lines, insert a protected space, to avoid - # ! LaTeX Error: There's no line here to end. - textlines = [line + '~'*(not line.lstrip()) - for line in text.split('\n')] - text = '\\\\\n'.join(textlines) - if self.literal and not self.insert_non_breaking_blanks: - # preserve runs of spaces but allow wrapping - text = text.replace(' ', ' ~') - return text Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/api/cmdline-tool.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/api/cmdline-tool.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/api/cmdline-tool.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ =============================================== :Author: David Goodger -:Contact: goodger@python.org -:Date: $Date: 2008-05-07 14:54:18 +0200 (Mit, 07 Mai 2008) $ -:Revision: $Revision: 5546 $ +:Contact: docutils-develop@lists.sourceforge.net +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ +:Revision: $Revision: 7302 $ :Copyright: This document has been placed in the public domain. `The Docutils Publisher`_ class was set up to make building @@ -25,7 +25,7 @@ Next are some comments providing metadata:: - # $Id: cmdline-tool.txt 5546 2008-05-07 12:54:18Z goodger $ + # $Id: cmdline-tool.txt 7302 2012-01-03 19:23:53Z grubert $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/api/publisher.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/api/publisher.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/api/publisher.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ ======================== :Author: David Goodger -:Contact: goodger@python.org -:Date: $Date: 2010-09-15 13:09:45 +0200 (Mit, 15 Sep 2010) $ -:Revision: $Revision: 6416 $ +:Contact: docutils-develop@lists.sourceforge.net +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ +:Revision: $Revision: 7302 $ :Copyright: This document has been placed in the public domain. .. contents:: Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/api/runtime-settings.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/api/runtime-settings.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/api/runtime-settings.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ =========================== :Author: David Goodger -:Contact: goodger@python.org -:Date: $Date: 2005-05-28 03:22:12 +0200 (Sam, 28 Mai 2005) $ -:Revision: $Revision: 3398 $ +:Contact: docutils-develop@lists.sourceforge.net +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ +:Revision: $Revision: 7302 $ :Copyright: This document has been placed in the public domain. .. contents:: Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/distributing.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/distributing.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/distributing.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ =============================== :Author: Lea Wiemann -:Contact: LeWiemann@gmail.com -:Revision: $Revision: 6154 $ -:Date: $Date: 2009-10-05 21:08:10 +0200 (Mon, 05 Okt 2009) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: This document has been placed in the public domain. .. _Docutils: http://docutils.sourceforge.net/ Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/enthought-plan.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/enthought-plan.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/enthought-plan.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ =========================================== :Author: David Goodger -:Contact: goodger@python.org -:Date: $Date: 2005-05-26 01:41:17 +0200 (Don, 26 Mai 2005) $ -:Revision: $Revision: 3363 $ +:Contact: docutils-develop@lists.sourceforge.net +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ +:Revision: $Revision: 7302 $ :Copyright: 2004 by `Enthought, Inc. <http://www.enthought.com>`_ :License: `Enthought License`_ (BSD-style) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/hacking.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/hacking.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/hacking.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ ========================== :Author: Lea Wiemann -:Contact: LeWiemann@gmail.com -:Revision: $Revision: 5174 $ -:Date: $Date: 2007-05-31 02:01:52 +0200 (Don, 31 Mai 2007) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: This document has been placed in the public domain. :Abstract: This is the introduction to Docutils for all persons who Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/policies.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/policies.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/policies.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ =========================== :Author: David Goodger; open to all Docutils developers -:Contact: goodger@python.org -:Date: $Date: 2011-06-27 13:38:56 +0200 (Mon, 27 Jun 2011) $ -:Revision: $Revision: 7058 $ +:Contact: docutils-develop@lists.sourceforge.net +:Date: $Date: 2012-03-10 23:46:07 +0100 (Sam, 10 Mär 2012) $ +:Revision: $Revision: 7380 $ :Copyright: This document has been placed in the public domain. .. contents:: @@ -48,6 +48,65 @@ http://www.catb.org/~esr/writings/magic-cauldron/ +How to get a new feature into Docutils +======================================== + +Question: + I would very much like to have this new feature in the Docutils core. + What exactly do I have to do to make this possible? + +* Present your idea at the Docutils-develop_ mailing list, + + +1 usually triggers a fast response, + -1 may be forgotten later, + + and/or file a feature request at the `docutils tracker`_ + + +1 there is a permanent record, + -1 it may stay forgotten among all the other feature requests. + + +* Convince a Docutils developer that this is a valuable addition worth the + effort. + +* Contribute. The developers will make sure that the contribution fits + nicely into Docutils (cf. the `review criteria`_). This might involve + discussing (and compromising on) design and implementation details. It + might also lead to the conclusion that the addition fits better in `the + sandbox`_ than in the Docutils core. + +* Be patient, and be persistent. None of us are paid to do this, + it's all in our spare time -- which is precious and rare. + +How to make code contributions that are easily accepted: + +* Have a look at the `Python coding conventions`_ and `documentation + conventions`_ below. + +* **Prepare test cases.** This vastly helps when integrating new code. Test + cases are also examples and showcases for new features. See `Docutils + Testing`_ for a description of the test suite in ``docutils/test/``. + + Ensure the addition works with all supported Python versions + (2.3 ... 3.2). + +* Look at the Docutils sources to see how similar features are implemented, + learn to do it "the Docutils way". + +* Prepare the a patch or an addition to the existing documentation. + Include links. + +* If you are familiar with version control, consider creating a `feature + branch`_ in a Docutils repository_ checkout. (Working with branches is + *much* easier with git_. You can get a git clone of the repository from + http://repo.or.cz/w/docutils.git or with git-svn.) + +.. _docutils-develop: ../user/mailing-lists.html#docutils-develop +.. _docutils tracker: http://sourceforge.net/tracker/?group_id=38414 +.. _git: http://git-scm.com/ +.. _Docutils testing: testing.html + + Python Coding Conventions ========================= @@ -217,9 +276,11 @@ .. _pypi: http://pypi.python.org/pypi?:action=browse&c=54 -Subversion Repository -===================== +.. _Subversion Repository: +Repository +========== + Please see the `repository documentation`_ for details on how to access Docutils' Subversion repository. Anyone can access the repository anonymously. Only project developers can make changes. @@ -256,6 +317,9 @@ but they may be used. It is up to the discretion of project developers to decide which mechanism to use for each case. +.. _feature branches: +.. _feature branch: + Feature additions and API changes will be done in **feature branches**. Feature branches will not be managed in any way. Frequent small checkins are encouraged here. Feature branches must be @@ -290,9 +354,7 @@ & brains sees the code before it enters the core. In addition to the above, the general `Check-ins`_ policy (below) also applies. -.. _Docutils Testing: testing.html - Check-ins --------- @@ -387,9 +449,9 @@ bug fixes and new features. .. _Docutils core: - http://svn.berlios.de/viewcvs/docutils/trunk/docutils/ + http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/docutils/ .. _maintenance branches: - http://svn.berlios.de/viewcvs/docutils/branches/ + http://docutils.svn.sourceforge.net/viewvc/docutils/branches/ Snapshots @@ -427,7 +489,7 @@ We'll assume that the Docutils trunk is checked out under your ~/projects/ directory as follows:: - svn co svn+ssh://<user>@svn.berlios.de/svnroot/repos/docutils/trunk \ + svn co https://<user>@docutils.svn.sourceforge.net/svnroot/docutils/trunk \ docutils For the bash shell, add this to your ``~/.profile``:: @@ -542,7 +604,7 @@ .. _sandbox README: http://docutils.sf.net/sandbox/README.html .. _sandbox directory: - http://svn.berlios.de/viewcvs/docutils/trunk/sandbox/ + http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/sandbox/ .. _parallel project: Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/pysource.dtd =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/pysource.dtd 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/pysource.dtd 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ Docutils Python Source DTD ====================================================================== :Author: David Goodger -:Contact: goodger@python.org -:Revision: $Revision: 4564 $ -:Date: $Date: 2006-05-21 22:44:42 +0200 (Son, 21 Mai 2006) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: This DTD has been placed in the public domain. :Filename: pysource.dtd Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/pysource.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/pysource.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/pysource.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -2,9 +2,9 @@ Python Source Reader ====================== :Author: David Goodger -:Contact: goodger@python.org -:Revision: $Revision: 4564 $ -:Date: $Date: 2006-05-21 22:44:42 +0200 (Son, 21 Mai 2006) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: This document has been placed in the public domain. This document explores issues around extracting and processing Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/release.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/release.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/release.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,13 +3,14 @@ ============================= :Authors: David Goodger; Lea Wiemann; open to all Docutils developers -:Contact: goodger@python.org -:Date: $Date: 2011-07-08 13:26:43 +0200 (Fre, 08 Jul 2011) $ -:Revision: $Revision: 7086 $ +:Contact: docutils-develop@lists.sourceforge.net +:Date: $Date: 2012-05-02 09:22:20 +0200 (Mit, 02 Mai 2012) $ +:Revision: $Revision: 7406 $ :Copyright: This document has been placed in the public domain. .. _Docutils: http://docutils.sourceforge.net/ +REWORK FOR SOURCEFORGE REPO Steps in boldface text are *not* covered by the release script at sandbox/infrastructure/release.sh. "Not covered" means that you aren't even @@ -37,6 +38,11 @@ ``new_version`` is the current version, status will change from ``repository`` to ``release``. ``svn_version`` is the version after release. +.. Note:: *BUG* The script requires that all supported python2-versions are installed. + +.. Note:: *BUG* test tarball requires root password, but it is possible to skip + this stage interactively, and testing should be done before release. + * Change ``__version_details__`` in docutils/docutils/__init__.py to "release" (from "repository"). @@ -111,41 +117,19 @@ tar -xjvf ~/docutils-docs.tar.bz2 rm ~/docutils-docs.tar.bz2 -* Upload the release tarball:: +* Upload the release tarball, release.sh tries with scp. - $ ftp upload.sourceforge.net - Connected to osdn.dl.sourceforge.net. - ... - Name (upload.sourceforge.net:david): anonymous - 331 Anonymous login ok, send your complete e-mail address as password. - Password: - ... - 230 Anonymous access granted, restrictions apply. - ftp> bin - 200 Type set to I. - ftp> cd /incoming - 250 CWD command successful. - ftp> put docutils-X.Y.Z.tar.gz - * Access the _`file release system` on SourceForge (Admin interface). - Not found 2009-10-11 for release 0.6. + ``https://sourceforge.net/projects/docutils/files/docutils/`` + + * change into the released version's directory + * click ``(i)`` button of the tar.gz-file + * select as default download for all operating systems. - Fill in the fields: +* Submit a notification on project news. - :Package ID: docutils - :Release Name: <use release number only, e.g. 0.3> - :Release Date: <today's date> - :Status: Active - :File Name: <select the file just uploaded> - :File Type: Source .gz - :Processor Type: Platform-Independent - :Release Notes: <insert README.txt file here> - :Change Log: <insert current release notes here> - - Also check the "Preserve my pre-formatted text" box. - * For verifying the integrity of the release, download the release tarball (you may need to wait up to 30 minutes), install_ it, and re-run the `test suite`_. @@ -178,10 +162,10 @@ BUG: not found 2009-10-12. -* **Register with FreshMeat.** (Add a new release for the - `Docutils project`__). +* **Register with freecode.** Add a new release for the + `Docutils project`__. (freecode is freshmeat.net's new name) - __ http://freshmeat.net/projects/docutils/ + __ http://freecode.com/projects/docutils/  Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/repository.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/repository.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/repository.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ ===================================== :Author: Lea Wiemann -:Contact: LeWiemann@gmail.com -:Revision: $Revision: 6349 $ -:Date: $Date: 2010-07-02 17:56:17 +0200 (Fre, 02 Jul 2010) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7324 $ +:Date: $Date: 2012-01-26 10:57:04 +0100 (Don, 26 Jän 2012) $ :Copyright: This document has been placed in the public domain. .. _Docutils: http://docutils.sourceforge.net/ @@ -15,24 +15,23 @@ To get a checkout of the Docutils source tree (without the sandboxes), type :: - svn checkout http://svn.berlios.de/svnroot/repos/docutils/trunk/docutils + svn checkout http://docutils.svn.sourceforge.net/svnroot/docutils/trunk/docutils If you are going to commit changes to the repository, please read the **whole document**, especially the section "`Information for Developers`_"! -Docutils uses a Subversion_ repository located at ``svn.berlios.de``. -Subversion is exhaustively documented in the `Subversion Book`_ -(svnbook). +Docutils uses a Subversion_ repository located at +``docutils.svn.sourceforge.net``. +Subversion is exhaustively documented in the `Subversion Book`_ (svnbook). While Unix and Mac OS X users will probably prefer the standard Subversion command line interface, Windows user may want to try TortoiseSVN_, a convenient explorer extension. The instructions apply analogously. -Note that while the repository and the snapshots reside at BerliOS_, -all other project data (web site, releases, mailing lists, trackers) -is hosted by SourceForge.net_. +There is a git_ mirror at http://repo.or.cz/w/docutils.git providing +`web access`_ and the base for `creating a local git clone`_. For the project policy on repository use (check-in requirements, branching, etc.), please see the `Docutils Project Policies`__. @@ -42,8 +41,8 @@ .. _Subversion: http://subversion.tigris.org/ .. _Subversion Book: http://svnbook.red-bean.com/ .. _TortoiseSVN: http://tortoisesvn.tigris.org/ -.. _BerliOS: http://developer.berlios.de/ .. _SourceForge.net: http://sourceforge.net/ +.. _git: http://git-scm.com/ .. contents:: @@ -58,21 +57,25 @@ ~~~~~~~~~~ The repository can be browsed and examined via the web at -http://svn.berlios.de/viewvc/docutils/. +http://docutils.svn.sourceforge.net/viewvc/docutils/. +Alternatively, use the web interface of the git mirror at +http://repo.or.cz/w/docutils.git. Repository Access Methods ~~~~~~~~~~~~~~~~~~~~~~~~~ To get a checkout of the Docutils repository, first determine the root -of the repository depending on your preferred protocol:: +of the repository depending on your preferred protocol: - svn://svn.berlios.de/docutils (anonymous) - http://svn.berlios.de/svnroot/repos/docutils (anonymous + developers) - https://svn.berlios.de/svnroot/repos/docutils (anonymous + developers) - svn+ssh://<username>@svn.berlios.de/svnroot/repos/docutils - (developers only) +anonymous access: (read only) + ``https://docutils.svn.sourceforge.net/svnroot/docutils`` + +`developer access`_: (read and write) + ``https://<username>@docutils.svn.sourceforge.net/svnroot/docutils`` +git clone: (read only) + ``git clone git://repo.or.cz/docutils.git`` Checking Out the Repository ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -99,7 +102,17 @@ svn update +Creating a local git clone +~~~~~~~~~~~~~~~~~~~~~~~~~~ +Users of git_ can clone a mirror of the docutils repository with :: + + git clone git://repo.or.cz/docutils.git + +and proceed according to the `git documentation`_. + +.. _git documentation: http://git-scm.com/documentation + Switching the Repository Root ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -108,17 +121,22 @@ svn switch --relocate OLDROOT NEWROOT +.. _developer access: Information for Developers -------------------------- If you would like to have write access to the repository, register -with SourceForge.net_ and BerliOS_, and send your SourceForge.net and -BerliOS user names to docutils-develop@lists.sourceforge.net. +with SourceForge.net_ and send your SourceForge.net +user names to docutils-develop@lists.sourceforge.net. (Note that there may be a delay of several hours until you can commit changes to the repository.) +Sourceforge subversion access is documented `here`__ +__ http://sourceforge.net/apps/trac/sourceforge/wiki/Subversion + + Setting Up Your Subversion Client For Development ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -147,31 +165,6 @@ *.gif = svn:mime-type=image/gif -Setting Up SSH Keys -~~~~~~~~~~~~~~~~~~~ - -If you are a developer and you are using the svn+ssh access method -instead of https or http, you may want to set a public & private key -pair, so that you can access the shell and Subversion servers without -having to enter your password. - -To do this, log in on BerliOS_ and copy and paste your SSH public key -into the edit box on the "`CVS/SVN/SSH Shared Keys`__" page. Further -instructions are available on this page. - -__ https://developer.berlios.de/account/editsshkeys.php - - -Migration from SourceForge.net -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Developers who had write-access for Docutils' CVS repository on -SourceForge.net should `register with BerliOS`__ and send a message -with their BerliOS user name to docutils-develop@lists.sourceforge.net. - -__ https://developer.berlios.de/account/register.php - - Repository Layout ================= Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/rst/alternatives.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/rst/alternatives.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/rst/alternatives.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ ================================================== :Author: David Goodger -:Contact: goodger@python.org -:Revision: $Revision: 7062 $ -:Date: $Date: 2011-07-01 00:14:29 +0200 (Fre, 01 Jul 2011) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7383 $ +:Date: $Date: 2012-03-19 18:04:49 +0100 (Mon, 19 Mär 2012) $ :Copyright: This document has been placed in the public domain. The following are ideas, alternatives, and justifications that were @@ -1847,6 +1847,48 @@ transforming it into ``\cite{cite1,cite2}``.) +Inline markup recognition +========================= + +Implemented 2011-12-05 (version 0.9): +Extended `inline markup recognition rules`_. + +Non-ASCII whitespace, punctuation characters and "international" quotes are +allowed around inline markup (based on `Unicode categories`_). The rules for +ASCII characters were not changed. + +Rejected alternatives: + +a) Use `Unicode categories`_ for all chars (ASCII or not) + + +1 comprehensible, standards based, + -1 many "false positives" need escaping, + -1 not backwards compatible. + +b) full backwards compatibility + + :Pi: only before start-string + :Pf: only behind end-string + :Po: "conservative" sorting of other punctuation: + + :``.,;!?\\``: Close + :``¡¿``: Open + + +1 backwards compatible, + +1 logical extension of the existing rules, + -1 exception list for "other" punctuation needed, + -1 rules even more complicated, + -1 not clear how to sort "other" punctuation that is currently not + recognized, + -2 international quoting convention like + »German ›angular‹ quotes« not recognized. + +.. _Inline markup recognition rules: + ../../ref/rst/restructuredtext.html#inline-markup-recognition-rules +.. _Unicode categories: + http://www.unicode.org/Public/5.1.0/ucd/UCD.html#General_Category_Values + + ----------------- Not Implemented ----------------- Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/rst/problems.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/rst/problems.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/rst/problems.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -2,9 +2,9 @@ Problems With StructuredText ============================== :Author: David Goodger -:Contact: goodger@python.org -:Revision: $Revision: 4564 $ -:Date: $Date: 2006-05-21 22:44:42 +0200 (Son, 21 Mai 2006) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: This document has been placed in the public domain. There are several problems, unresolved issues, and areas of Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/semantics.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/semantics.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/semantics.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -2,9 +2,9 @@ Docstring Semantics ===================== :Author: David Goodger -:Contact: goodger@python.org -:Revision: $Revision: 4564 $ -:Date: $Date: 2006-05-21 22:44:42 +0200 (Son, 21 Mai 2006) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: This document has been placed in the public domain. These are notes for a possible future PEP providing the final piece of Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/testing.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/testing.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/testing.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -4,8 +4,8 @@ :Authors: Lea Wiemann <LeWiemann@gmail.com>; David Goodger <goodger@python.org> -:Revision: $Revision: 6159 $ -:Date: $Date: 2009-10-09 09:17:59 +0200 (Fre, 09 Okt 2009) $ +:Revision: $Revision: 7233 $ +:Date: $Date: 2011-12-02 01:43:32 +0100 (Fre, 02 Dez 2011) $ :Copyright: This document has been placed in the public domain. .. _Docutils: http://docutils.sourceforge.net/ @@ -57,7 +57,7 @@ .. _Python Check-in Policies: http://www.python.org/dev/tools.html .. _sandbox directory: - http://svn.berlios.de/viewcvs/docutils/trunk/sandbox/ + http://docutils.svn.sourceforge.net/svnroot/docutils/trunk/sandbox/ .. _nightly repository tarball: http://svn.berlios.de/svndumps/docutils-repos.gz @@ -91,7 +91,7 @@ #! /usr/bin/env python - # $Id: testing.txt 6159 2009-10-09 07:17:59Z milde $ + # $Id: testing.txt 7233 2011-12-02 00:43:32Z grubert $ # Author: Your Name <your_email_address@example.org> # Copyright: This module has been placed in the public domain. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/todo.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/todo.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/todo.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -4,9 +4,9 @@ :Author: David Goodger (with input from many); open to all Docutils developers -:Contact: goodger@python.org -:Date: $Date: 2011-07-01 00:14:29 +0200 (Fre, 01 Jul 2011) $ -:Revision: $Revision: 7062 $ +:Contact: docutils-develop@lists.sourceforge.net +:Date: $Date: 2012-02-27 12:15:38 +0100 (Mon, 27 Feb 2012) $ +:Revision: $Revision: 7372 $ :Copyright: This document has been placed in the public domain. .. _Docutils: http://docutils.sourceforge.net/ @@ -430,7 +430,8 @@ [dest_file index.html] ... - Or rather allow settings configuration from the rst source file? + Or rather allow settings configuration from the rst source file + (see misc.settings_ directive)? * The "validator" support added to OptionParser is very similar to "traits_" in SciPy_. Perhaps something could be done with them? @@ -515,6 +516,11 @@ .. figure:: image.png :name: figure name + Improve the mapping of "phrase references" to IDs/labels with + Literal transcription (i.e. ü -> ue, ß -> ss, å -> aa) instead of just + stripping the accents and other non-ASCII chars. + Use http://pypi.python.org/pypi/Unidecode? + A "table" directive has been implemented, supporting table titles. Perhaps the name could derive from the title/caption? @@ -750,8 +756,8 @@ __ rst/alternatives.html#or-not-to-do -* Recognize unicode whitespace and punctuation. See - <http://thread.gmane.org/gmane.text.docutils.user/2765>. +Misc +---- * Allow embedded references and not only embedded URIs: ```link text <reference_>`_``; see the second half of @@ -820,10 +826,6 @@ See <http://thread.gmane.org/gmane.text.docutils.user/2499>. -* Change the specification so that more punctuation is allowed - before/after inline markup start/end string - (http://article.gmane.org/gmane.text.docutils.cvs/3824). - * Complain about bad URI characters (http://article.gmane.org/gmane.text.docutils.user/2046) and disallow internal whitespace @@ -1121,55 +1123,70 @@ * Generalize docinfo contents (bibliographic fields): remove specific fields, and have only a single generic "field"? - Math Markup ----------- -Using a standard, such as MathML_, would be best. (For an overview of -MathML implementations and tests, see e.g. the `mathweb wiki`_ or -the `ConTeXT MathML page`_.) +Since Docutils 0.8, a "math" role and directive using LaTeX math +syntax as input format is part of reStructuredText. -.. _MathML: http://www.w3.org/TR/MathML2/ -.. _mathweb wiki: http://www.mathweb.org/wiki/MathML -.. _ConTeXT MathML page: http://wiki.contextgarden.net/MathML +Open issues: -However, +* Use a "Transform" for math format conversions as extensively discussed in + the "math directive issues" thread in May 2008 + (http://osdir.com/ml/text.docutils.devel/2008-05/threads.html)? - MathML in its full XML form was never thought to be usable as an - input format: for a start it is far too verbose as necessitated by - its intention to be expressive. +* Generic "math-output" option (currently specific to HTML). + (List of math-output preferences?) - -- http://www.w3.org/Math/Roadmap/ +* Try to be compatible with `Math support in Sphinx`_? -Hence, with MathML, a different input format is needed. OTOH, LaTeX -math syntax can be used for both, input and internal storage. + * The ``:label:`` option selects a label for the equation, by which it + can be cross-referenced, and causes an equation number to be issued. + In Docutils, the option ``:name:`` sets the label. + Equation numbering is not implemented yet. -Input formats -````````````` + * Option ``:nowrap:`` prevents wrapping of the given math in a + math environment (you have to specify the math environment in the + content). -LaTeX math syntax - * intended for input by a human, widely used, and well documented. +.. _Math support in Sphinx: http://sphinx.pocoo.org/ext/math.html - * convertible to all supported output formats (building on - existing extensions like `latex_math`_ (LaTeX2MathML) or the `math - support in Sphinx`_ (see below for `HTML output`_). +* Equation numbering and references. (Should be handled in a unified way + with other numbered entities like formal tables and images.) - * Used for input and storage by the `Math support in Sphinx`_. +alternative input formats +````````````````````````` - * Unicode input similar to the "unicode-math" package for - XeTeX/LuaTeX provides for improved readability of the source. +Use a directive option to specify an alternative input format, e.g. (but not +limited to): - * The backtick (GRAVE ACCENT, 0x60) cannot be used in a math role. - Fortunately, it is not required in LaTeX math mode, as the - ``\grave`` macro is used instead of ``\```. +MathML_ + Not for hand-written code but maybe usefull when pasted in (or included + from a file) -ASCIIMathML_ - Used, e.g., by MultiMarkdown__ + For an overview of MathML implementations and tests, see, e.g., + the `mathweb wiki`_ or the `ConTeXT MathML page`_. - .. _ASCIIMathML: http://www1.chapman.edu/~jipsen/mathml/asciimath.html - __ http://fletcherpenney.net/multimarkdown/ + .. _MathML: http://www.w3.org/TR/MathML2/ + .. _mathweb wiki: http://www.mathweb.org/wiki/MathML + .. _ConTeXT MathML page: http://wiki.contextgarden.net/MathML +ASCIIMath_ + Simple, ASCII based math input language (see also `ASCIIMath tutorial`_). + + * The Python module ASCIIMathML_ translates a string with ASCIIMath into a + MathML tree. Used, e.g., by MultiMarkdown__. + + * For conversion to LaTeX, there is a JavaScript script at + http://dlippman.imathas.com/asciimathtex/ASCIIMath2TeX.js + + .. _ASCIIMath: http://www1.chapman.edu/~jipsen/mathml/asciimath.html + .. _ASCIIMath tutorial: + http://www.wjagray.co.uk/maths/ASCIIMathTutorial.html + .. _ASCIIMathML: http://pypi.python.org/pypi/asciimathml/ + __ http://fletcherpenney.net/multimarkdown/ + `Unicode Nearly Plain Text Encoding of Mathematics`_ format for lightly marked-up representation of mathematical expressions in Unicode. @@ -1181,22 +1198,12 @@ .. _Unicode Nearly Plain Text Encoding of Mathematics: http://www.unicode.org/notes/tn28/ -See `the culmination of a relevant discussion -<http://article.gmane.org/gmane.text.docutils.user/118>`__. +itex + See `the culmination of a relevant discussion in 2003 + <http://article.gmane.org/gmane.text.docutils.user/118>`__. -Try to be compatible with `Math support in Sphinx`_? -* The ``:label:`` option selects a label for the equation, by which it - can be cross-referenced, and causes an equation number to be issued. - -* Option ``:nowrap:`` prevents wrapping of the given math in a - math environment (you have to specify the math environment in the - content). - -.. _Math support in Sphinx: http://sphinx.pocoo.org/ext/math.html - - LaTeX output ```````````` @@ -1219,9 +1226,9 @@ + Sphinx math also supports `gather` (checking for blank lines in the content). Docutils puts content blocks separated by blank - lines in separate math-block doctree nodes. (The difference of - `gather` to two consecutive "normal" environments is that - line-breaks between the two are prevented.) + lines in separate math-block doctree nodes. (The only difference of + `gather` to two consecutive "normal" environments seems to be that + page-breaks between the two are prevented.) See http://www.math.uiuc.edu/~hildebr/tex/displays.html. @@ -1255,6 +1262,7 @@ __ http://msevior.livejournal.com/26377.html __ http://hutchinson.belmont.ma.us/tth/mml/ttmmozform.html + .. _MathML: http://www.w3.org/TR/MathML2/ .. _latex_math: ../../../sandbox/jensj/latex_math/ .. _latex2mathml: ../../docutils/math/latex2mathml.py .. _Blahtex: http://gva.noekeon.org/blahtexml/ @@ -1329,9 +1337,6 @@ directive function. The "module." is not part of the directive name when used in a document. -* Make the _`directive interface` object-oriented - (http://article.gmane.org/gmane.text.docutils.user/1871). - * Allow for field lists in list tables. See <http://thread.gmane.org/gmane.text.docutils.devel/3392>. @@ -1347,14 +1352,8 @@ * Add "substitution_only" and "substitution_ok" function attributes, and automate context checking? -* Change directive functions to directive classes? Superclass' - ``__init__()`` could handle all the bookkeeping. - * Implement options or features on existing directives: - - Add a "name" option to directives, to set an author-supplied - identifier? - - All directives that produce titled elements should grow implicit reference names based on the titles. @@ -1363,7 +1362,7 @@ .. _unicode: ../ref/rst/directives.html#unicode-character-codes - - Add the "class" option to the unicode directive. For example, you + - Add the "class" option to the unicode_ directive. For example, you might want to get characters or strings with borders around them. - _`images.figure`: "title" and "number", to indicate a formal @@ -1471,8 +1470,21 @@ - _`parts.citations`: See `Footnote & Citation Gathering`_. - _`misc.language`: Specify (= change) the language of a document at - parse time. + parse time? + * The misc.settings_ directive suggested below offers a more generic + approach. + + * The language of document parts can be indicated by the "special class + value" ``"language-"`` + `BCP 47`_ language code. Class arguments to + the title are attached to the document's base node - hence titled + documents can be given a different language at parse time. However, + "language by class attribute" does not change parsing (localized + directives etc.), only supporting writers. + + .. _BCP 47: http://www.rfc-editor.org/rfc/bcp/bcp47.txt + + - _`misc.settings`: Set any(?) Docutils runtime setting from within a document? Needs much thought and discussion. @@ -1485,7 +1497,8 @@ <http://thread.gmane.org/gmane.text.docutils.user/3620/focus=3649> - _`misc.gather`: Gather (move, or copy) all instances of a specific - element. A generalization of the "endnotes" & "citations" ideas. + element. A generalization of the `Footnote & Citation Gathering`_ + ideas. - Add a custom "directive" directive, equivalent to "role"? For example:: @@ -1520,10 +1533,15 @@ - .. _conditional directives: + .. note:: See also the implementation in Sphinx_. + Docutils already has the ability to say "use this content for - Writer X" (via the "raw" directive), but it doesn't have the - ability to say "use this content for any Writer other than X". It - wouldn't be difficult to add this ability though. + Writer X" via the "raw" directive. It also does have the ability + to say "use this content for any Writer other than X" via the + "strip-elements with class" config value. However, using "raw" + input just to select a special writer is inconvenient in many + cases. + It wouldn't be difficult to get more straightforward support, though. My first idea would be to add a set of conditional directives. Let's call them "writer-is" and "writer-is-not" for discussion @@ -1606,64 +1624,6 @@ - _`body.listing`: Code listing with title (to be numbered eventually), equivalent of "figure" and "table" directives. - - _`colorize.python`: Colorize Python code. Fine for HTML output, - but what about other formats? Revert to a literal block? Do we - need some kind of "alternate" mechanism? Perhaps use a "pending" - transform, which could switch its output based on the "format" in - use. Use a factory function "transformFF()" which returns either - "HTMLTransform()" instance or "GenericTransform" instance? - - If we take a Python-to-HTML pretty-printer and make it output a - Docutils internal doctree (as per nodes.py) instead of HTML, then - each output format's stylesheet (or equivalent) mechanism could - take care of the rest. The pretty-printer code could turn this - doctree fragment:: - - <literal_block xml:space="preserve"> - print 'This is Python code.' - for i in range(10): - print i - </literal_block> - - into something like this ("</>" is end-tag shorthand):: - - <literal_block xml:space="preserve" class="python"> - <keyword>print</> <string>'This is Python code.'</> - <keyword>for</> <identifier>i</> <keyword - >in</> <expression>range(10)</>: - <keyword>print</> <expression>i</> - </literal_block> - - But I'm leaning toward adding a single new general-purpose - element, "phrase", equivalent to HTML's <span>. Here's the - example rewritten using the generic "phrase":: - - <literal_block xml:space="preserve" class="python"> - <phrase class="keyword">print</> <phrase - class="string">'This is Python code.'</> - <phrase class="keyword">for</> <phrase - class="identifier">i</> <phrase class="keyword">in</> <phrase - class="expression">range(10)</>: - <phrase class="keyword">print</> <phrase - class="expression">i</> - </literal_block> - - It's more verbose but more easily extensible and more appropriate - for the case at hand. It allows us to edit style sheets to add - support for new formats, not the Docutils code itself. - - Perhaps a single directive with a format parameter would be - better:: - - .. colorize:: python - - print 'This is Python code.' - for i in range(10): - print i - - But directives can have synonyms for convenience. "format:: - python" was suggested, but "format" seems too generic. - - _`pysource.usage`: Extract a usage message from the program, either by running it at the command line with a ``--help`` option or through an exposed API. [Suggestion for Optik.] @@ -1853,9 +1813,9 @@ literal blocks with a class attribute. The syntax could be left in reST (for a set period of time?). -* Always use _`transforms.writer_aux.Admonitions` to "normalize" special - admonitions (note, hint, warning, ...). There is no need to keep them in - the doctree specification. +* "Normalize" special admonitions (note, hint, warning, ...) during parsing + (similar to _`transforms.writer_aux.Admonitions`). There is no need to + keep them as distinct elements in the doctree specification. Keep the special admonition directives in reStructuredText syntax? @@ -1962,6 +1922,13 @@ * full Unicode support. * Write to TeX, HTML and plain text. + * `Zotero plain <http://e6h.org/%7Eegh/hg/zotero-plain/>`__ + supports Zotero databases and CSL_ styles with Docutils with an + ``xcite`` role. + + .. _CSL: http://www.citationstyles.org/ + + * Automatically insert a "References" heading? .. _CrossTeX: http://www.cs.cornell.edu/people/egs/crosstex/ @@ -2063,6 +2030,17 @@ Write a generic version that uses Unicode chars (let the writer replace these if required). + Some arguments for "smart quotes" are collected in a `mail to + docutils-user by Jörg W. Mittag from 2006-03-13`__. + + Also see the "... Or Not To Do?" list entry for + `Character Processing`_ + +__ http://article.gmane.org/gmane.text.docutils.user/2765 + +.. _Character Processing: rst/alternatives.html#character-processing + + HTML Writer =========== Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/website.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/website.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/dev/website.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ =================== :Author: David Goodger; open to all Docutils developers -:Contact: goodger@python.org -:Date: $Date: 2009-04-06 10:52:24 +0200 (Mon, 06 Apr 2009) $ -:Revision: $Revision: 5899 $ +:Contact: docutils-develop@lists.sourceforge.net +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ +:Revision: $Revision: 7302 $ :Copyright: This document has been placed in the public domain. The Docutils web site, <http://docutils.sourceforge.net/>, is Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/html-stylesheets.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/html-stylesheets.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/html-stylesheets.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ ============================================== :Author: Lea Wiemann -:Contact: LeWiemann@gmail.com -:Date: $Date: 2008-12-10 15:07:36 +0100 (Mit, 10 Dez 2008) $ -:Revision: $Revision: 5818 $ +:Contact: docutils-develop@lists.sourceforge.net +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ +:Revision: $Revision: 7302 $ :Copyright: This document has been placed in the public domain. .. _Docutils: http://docutils.sourceforge.net/ Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/i18n.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/i18n.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/i18n.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ ================================ :Author: David Goodger -:Contact: goodger@python.org -:Date: $Date: 2010-09-17 23:38:29 +0200 (Fre, 17 Sep 2010) $ -:Revision: $Revision: 6423 $ +:Contact: docutils-develop@lists.sourceforge.net +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ +:Revision: $Revision: 7302 $ :Copyright: This document has been placed in the public domain. @@ -66,7 +66,7 @@ .. _language tags: http://www.w3.org/International/articles/language-tags/ .. _BCP 47: http://www.rfc-editor.org/rfc/bcp/bcp47.txt -.. _ISO 639: http://www.loc.gov/standards/iso639-2/englangn.html +.. _ISO 639: http://www.loc.gov/standards/iso639-2/php/English_list.php .. _ISO 3166: http://www.iso.ch/iso/en/prods-services/iso3166ma/ 02iso-3166-code-lists/index.html @@ -74,18 +74,16 @@ Python Code =========== -All Python code in Docutils will be ASCII-only. In language modules, -Unicode-escapes will have to be used for non-ASCII characters. -Although it may be possible for some developers to store non-ASCII -characters directly in strings, it will cause problems for other -developers whose locales are set up differently. +Generally Python code in Docutils is ASCII-only. In language modules, +Unicode-escapes can be used for non-ASCII characters. `PEP 263`_ introduces source code encodings to Python modules, -implemented beginning in Python 2.3. Until PEP 263 is fully -implemented as a well-established convention, proven robust in daily -use, and the tools (editors, CVS, email, etc.) recognize this -convention, Docutils shall remain conservative. +implemented beginning in Python 2.3. Especially for languages with +non-Latin scripts, using UTF-8 encoded literal Unicode strings increases the +readability. Start the source code file with the magic comment:: + # -*- coding: utf-8 -*- + As mentioned in the note above, developers are invited to explore "gettext" and other i18n technologies. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/rst-directives.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/rst-directives.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/rst-directives.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,10 +3,9 @@ ======================================= :Authors: Dethe Elza, David Goodger, Lea Wiemann -:Contact: delza@enfoldingsystems.com, goodger@python.org, - LeWiemann@gmail.com -:Date: $Date: 2009-11-20 03:13:17 +0100 (Fre, 20 Nov 2009) $ -:Revision: $Revision: 6199 $ +:Contact: docutils-develop@lists.sourceforge.net +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ +:Revision: $Revision: 7302 $ :Copyright: This document has been placed in the public domain. .. _reStructuredText: http://docutils.sourceforge.net/rst.html Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/rst-roles.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/rst-roles.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/rst-roles.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ ================================================== :Authors: David Goodger -:Contact: goodger@python.org -:Date: $Date: 2005-05-28 01:30:32 +0200 (Sam, 28 Mai 2005) $ -:Revision: $Revision: 3394 $ +:Contact: docutils-develop@lists.sourceforge.net +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ +:Revision: $Revision: 7302 $ :Copyright: This document has been placed in the public domain. Interpreted text roles are an extension mechanism for inline markup in Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/security.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/security.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/howto/security.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ ============================= :Author: David Goodger -:Contact: goodger@python.org -:Date: $Date: 2006-11-13 00:29:04 +0100 (Mon, 13 Nov 2006) $ -:Revision: $Revision: 4808 $ +:Contact: docutils-develop@lists.sourceforge.net +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ +:Revision: $Revision: 7302 $ :Copyright: This document has been placed in the public domain. .. contents:: @@ -49,7 +49,7 @@ .. _reStructuredText directives: ../ref/rst/directives.html .. _include: ../ref/rst/directives.html#include -.. _raw: ../ref/rst/directives.html#raw +.. _raw: ../ref/rst/directives.html#raw-directive .. _csv-table: ../ref/rst/directives.html#csv-table .. _file_insertion_enabled: ../user/config.html#file-insertion-enabled Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/index.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/index.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/index.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ ========================================== :Author: David Goodger -:Contact: goodger@python.org -:Date: $Date: 2008-12-26 23:36:46 +0100 (Fre, 26 Dez 2008) $ -:Revision: $Revision: 5834 $ +:Contact: docutils-develop@lists.sourceforge.net +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ +:Revision: $Revision: 7302 $ :Copyright: This document has been placed in the public domain. The latest working documents may be accessed individually below, or Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/doctree.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/doctree.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/doctree.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -6,9 +6,9 @@ *************************** :Author: David Goodger -:Contact: goodger@python.org -:Revision: $Revision: 6471 $ -:Date: $Date: 2010-11-05 23:09:32 +0100 (Fre, 05 Nov 2010) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: This document has been placed in the public domain. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/docutils.dtd =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/docutils.dtd 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/docutils.dtd 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ Docutils Generic DTD ====================================================================== :Author: David Goodger -:Contact: goodger@python.org -:Revision: $Revision: 4564 $ -:Date: $Date: 2006-05-21 22:44:42 +0200 (Son, 21 Mai 2006) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: This DTD has been placed in the public domain. :Filename: docutils.dtd Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/definitions.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/definitions.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/definitions.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -2,9 +2,9 @@ reStructuredText Standard Definition Files ============================================ :Author: David Goodger -:Contact: goodger@python.org -:Revision: $Revision: 4156 $ -:Date: $Date: 2005-12-08 05:43:13 +0100 (Don, 08 Dez 2005) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: This document has been placed in the public domain. .. contents:: Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/directives.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/directives.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/directives.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -2,9 +2,9 @@ reStructuredText Directives ============================= :Author: David Goodger -:Contact: goodger@python.org -:Revision: $Revision: 7076 $ -:Date: $Date: 2011-07-07 08:58:23 +0200 (Don, 07 Jul 2011) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7307 $ +:Date: $Date: 2012-01-06 12:11:51 +0100 (Fre, 06 Jän 2012) $ :Copyright: This document has been placed in the public domain. .. contents:: @@ -64,7 +64,7 @@ :Directive Types: "attention", "caution", "danger", "error", "hint", "important", "note", "tip", "warning", "admonition" :Doctree Elements: attention, caution, danger, error, hint, important, - note, tip, warning, admonition, title + note, tip, warning, admonition_, title :Directive Arguments: None. :Directive Options: `:class:`_, `:name:`_ :Directive Content: Interpreted as body elements. @@ -112,13 +112,11 @@ - It includes this bullet list. -.. _admonition: - Generic Admonition ================== :Directive Type: "admonition" -:Doctree Elements: admonition, title +:Doctree Elements: admonition_, title :Directive Arguments: One, required (admonition title) :Directive Options: Possible, see below. :Directive Content: Interpreted as body elements. @@ -164,7 +162,7 @@ ===== :Directive Type: "image" -:Doctree Element: image +:Doctree Element: image_ :Directive Arguments: One, required (image URI). :Directive Options: Possible. :Directive Content: None. @@ -242,7 +240,7 @@ ====== :Directive Type: "figure" -:Doctree Elements: figure, image, caption, legend +:Doctree Elements: figure_, image_, caption_, legend_ :Directive Arguments: One, required (image URI). :Directive Options: Possible. :Directive Content: Interpreted as the figure caption and an optional @@ -332,7 +330,7 @@ ===== :Directive Type: "topic" -:Doctree Element: topic +:Doctree Element: topic_ :Directive Arguments: 1, required (topic title). :Directive Options: `:class:`_, `:name:`_ :Directive Content: Interpreted as the topic body. @@ -358,7 +356,7 @@ ======= :Directive Type: "sidebar" -:Doctree Element: sidebar +:Doctree Element: sidebar_ :Directive Arguments: One, required (sidebar title). :Directive Options: Possible (see below). :Directive Content: Interpreted as the sidebar body. @@ -404,7 +402,7 @@ .. _line block syntax: restructuredtext.html#line-blocks :Directive Type: "line-block" -:Doctree Element: line_block +:Doctree Element: line_block_ :Directive Arguments: None. :Directive Options: `:class:`_, `:name:`_ :Directive Content: Becomes the body of the line block. @@ -438,7 +436,7 @@ ==================== :Directive Type: "parsed-literal" -:Doctree Element: literal_block +:Doctree Element: literal_block_ :Directive Arguments: None. :Directive Options: `:class:`_, `:name:`_ :Directive Content: Becomes the body of the literal block. @@ -466,18 +464,70 @@ (docinfo_, transition_?)?, `%structure.model;`_ ) +Code +==== +:Directive Type: "code" +:Doctree Element: literal_block_, `inline elements`_ +:Directive Arguments: One, optional (formal language). +:Directive Options: name, class, number-lines. +:Directive Content: Becomes the body of the literal block. +:Configuration Setting: syntax_highlight_. + +(New in Docutils 0.9) + +The "code" directive constructs a literal block. If the code language is +specified, the content is parsed by the Pygments_ syntax highlighter and +tokens are stored in nested `inline elements`_ with class arguments +according to their syntactic category. The actual highlighting depends on a +style-sheet (e.g. one `generated by Pygments`__). + +The parsing can be turned off with the syntax_highlight_ configuration +setting and command line option or by specifying the language as `:class:`_ +option (leaveing the directive argument empty). This also avoids warnings +when Pygments_ is not installed or the language is not amongst the +`supported languages and markup formats`_. + +__ http://pygments.org/docs/cmdline/#generating-styles +.. _Pygments: http://pygments.org/ +.. _syntax_highlight: ../../user/config.html#syntax-highlight +.. _supported languages and markup formats: http://pygments.org/languages/ + + +The following options are recognized: + +``number-lines`` : [start line number] + Precede every line with a line number. + The optional argument is the number of the first line (defaut 1). + +and the common options `:class:`_ and `:name:`_. + +Example:: + The content of the following directive :: + + .. code:: python + + def my_function(): + "just a test" + print 8/2 + + is parsed and marked up as Python source code. + + Math ==== :Directive Type: "math" -:Doctree Element: math-block +:Doctree Element: math_block_ :Directive Arguments: One, optional: prepended to content. :Directive Options: `:class:`_, `:name:`_ :Directive Content: Interpreted as math block(s). Content blocks separated by a blank line are put in separate math-block doctree elements. +:Configuration Setting: math_output_ +(New in Docutils 0.8) + The "math" directive inserts block(s) with mathematical content (display formulas, equations) into the document. The input format is *LaTeX math syntax* (see, e.g. the `Short Math Guide`_) with support @@ -487,7 +537,7 @@ α_t(i) = P(O_1, O_2, … O_t, q_t = S_i λ) -For inline math, use the `math role`_. +For inline math, use the `"math" role`_. Support for math may be limited by the output format. If a writer does not support math typesetting, the content is inserted verbatim. @@ -495,17 +545,15 @@ configuration setting (or the corresponding ``--math-output`` command line option). -New in Docutils 0.8. - .. _Short Math Guide: ftp://ftp.ams.org/ams/doc/amsmath/short-math-guide.pdf -.. _math role: roles.html#math +.. _"math" role: roles.html#math .. _math_output: ../../user/config.html#math-output Rubric ====== :Directive Type: "rubric" -:Doctree Element: rubric +:Doctree Element: rubric_ :Directive Arguments: 1, required (rubric text). :Directive Options: `:class:`_, `:name:`_ :Directive Content: None. @@ -527,7 +575,7 @@ ======== :Directive Type: "epigraph" -:Doctree Element: block_quote +:Doctree Element: block_quote_ :Directive Arguments: None. :Directive Options: None. :Directive Content: Interpreted as the body of the block quote. @@ -558,7 +606,7 @@ ========== :Directive Type: "highlights" -:Doctree Element: block_quote +:Doctree Element: block_quote_ :Directive Arguments: None. :Directive Options: None. :Directive Content: Interpreted as the body of the block quote. @@ -574,7 +622,7 @@ ========== :Directive Type: "pull-quote" -:Doctree Element: block_quote +:Doctree Element: block_quote_ :Directive Arguments: None. :Directive Options: None. :Directive Content: Interpreted as the body of the block quote. @@ -587,13 +635,11 @@ See Epigraph_ above for an analogous example. -.. _compound: - Compound Paragraph ================== :Directive Type: "compound" -:Doctree Element: compound +:Doctree Element: compound_ :Directive Arguments: None. :Directive Options: `:class:`_, `:name:`_ :Directive Content: Interpreted as body elements. @@ -643,7 +689,7 @@ ========= :Directive Type: "container" -:Doctree Element: container +:Doctree Element: container_ :Directive Arguments: One or more, optional (class names). :Directive Options: `:name:`_ :Directive Content: Interpreted as body elements. @@ -686,7 +732,7 @@ ===== :Directive Type: "table" -:Doctree Element: table +:Doctree Element: table_ :Directive Arguments: 1, optional (table title). :Directive Options: `:class:`_, `:name:`_ :Directive Content: A normal reStructuredText table. @@ -712,7 +758,7 @@ ========= :Directive Type: "csv-table" -:Doctree Element: table +:Doctree Element: table_ :Directive Arguments: 1, optional (table title). :Directive Options: Possible (see below). :Directive Content: A CSV (comma-separated values) table. @@ -818,7 +864,7 @@ ========== :Directive Type: "list-table" -:Doctree Element: table +:Doctree Element: table_ :Directive Arguments: 1, optional (table title). :Directive Options: Possible (see below). :Directive Content: A uniform two-level bullet list. @@ -879,7 +925,7 @@ ================= :Directive Type: "contents" -:Doctree Elements: pending, topic +:Doctree Elements: pending_, topic_ :Directive Arguments: One, optional: title. :Directive Options: Possible. :Directive Content: None. @@ -942,10 +988,11 @@ =========================== :Directive Type: "sectnum" or "section-autonumbering" (synonyms) -:Doctree Elements: pending, generated +:Doctree Elements: pending_, generated_ :Directive Arguments: None. :Directive Options: Possible. :Directive Content: None. +:Configuration Setting: sectnum_xform_ The "sectnum" (or "section-autonumbering") directive automatically numbers sections and subsections in a document (if not disabled by the @@ -997,7 +1044,7 @@ ======================== :Directive Types: "header" and "footer" -:Doctree Elements: decoration, header, footer +:Doctree Elements: decoration_, header, footer :Directive Arguments: None. :Directive Options: None. :Directive Content: Interpreted as body elements. @@ -1048,7 +1095,7 @@ ================ :Directive Type: "target-notes" -:Doctree Elements: pending, footnote, footnote_reference +:Doctree Elements: pending_, footnote_, footnote_reference_ :Directive Arguments: None. :Directive Options: `:class:`_, `:name:`_ :Directive Options: Possible. @@ -1067,7 +1114,7 @@ **NOT IMPLEMENTED YET** :Directive Type: "footnotes" -:Doctree Elements: pending, topic +:Doctree Elements: pending_, topic_ :Directive Arguments: None? :Directive Options: Possible? :Directive Content: None. @@ -1081,7 +1128,7 @@ **NOT IMPLEMENTED YET** :Directive Type: "citations" -:Doctree Elements: pending, topic +:Doctree Elements: pending_, topic_ :Directive Arguments: None? :Directive Options: Possible? :Directive Content: None. @@ -1173,7 +1220,7 @@ ================ :Directive Type: "replace" -:Doctree Element: Text & inline elements +:Doctree Element: Text & `inline elements`_ :Directive Arguments: None. :Directive Options: None. :Directive Content: A single paragraph; may contain inline markup. @@ -1301,10 +1348,12 @@ ======================================= :Directive Type: "include" -:Doctree Elements: depend on data being included +:Doctree Elements: Depend on data being included + (literal_block_ with ``code`` or ``literal`` option). :Directive Arguments: One, required (path to the file to include). :Directive Options: Possible. :Directive Content: None. +:Configuration Setting: file_insertion_enabled_ .. WARNING:: @@ -1313,11 +1362,11 @@ .. _file_insertion_enabled: ../../user/config.html#file-insertion-enabled -The "include" directive reads a reStructuredText-formatted text file -and parses it in the current document's context at the point of the -directive. The directive argument is the path to the file to be -included, relative to the document containing the directive. For -example:: +The "include" directive reads a text file. The directive argument is +the path to the file to be included, relative to the document +containing the directive. Unless the options ``literal`` or ``code`` +are given, the file is parsed in the current document's context at the +point of the directive. For example:: This first example will be parsed at the document level, and can thus contain any construct, including section headers. @@ -1344,10 +1393,10 @@ .. include:: <isonum.txt> The current set of standard "include" data files consists of sets of -substitution definitions. See `reStructuredText Standard Substitution -Definition Sets`__ for details of the available standard data files. +substitution definitions. See `reStructuredText Standard Definition +Files`__ for details. -__ substitutions.html +__ definitions.html The following options are recognized: @@ -1369,8 +1418,19 @@ ``literal`` : flag (empty) The entire included text is inserted into the document as a single - literal block (useful for program listings). + literal block. +``code`` : formal language (optional) + The argument and the content of the included file are passed to + the code_ directive (useful for program listings). + (New in Docutils 0.9) + +``number-lines`` : [start line number] + Precede every code line with a line number. + The optional argument is the number of the first line (defaut 1). + Works only with ``code`` or ``literal``. + (New in Docutils 0.9) + ``encoding`` : name of text encoding The text encoding of the external data file. Defaults to the document's input_encoding_. @@ -1385,22 +1445,25 @@ .. _tab_width: ../../user/config.html#tab-width +With ``code`` or ``literal`` the common options `:class:`_ and +`:name:`_ are recognized as well. + Combining ``start/end-line`` and ``start-after/end-before`` is possible. The text markers will be searched in the specified lines (further limiting the included content). +.. _raw-directive: -.. _raw: - Raw Data Pass-Through ===================== :Directive Type: "raw" -:Doctree Element: raw +:Doctree Element: raw_ :Directive Arguments: One or more, required (output format types). :Directive Options: Possible. :Directive Content: Stored verbatim, uninterpreted. None (empty) if a "file" or "url" option given. +:Configuration Setting: raw_enabled_ .. WARNING:: @@ -1452,6 +1515,9 @@ .. raw:: html :file: inclusion.html +Inline equivalents of the "raw" directive can be defined via +`custom interpreted text roles`_ derived from the `"raw" role`_. + The following options are recognized: ``file`` : string (newlines removed) @@ -1464,14 +1530,16 @@ The text encoding of the external raw data (file or URL). Defaults to the document's encoding (if specified). +.. _"raw" role: roles.html#raw + .. _classes: Class ===== :Directive Type: "class" -:Doctree Element: pending +:Doctree Element: pending_ :Directive Arguments: One or more, required (class names / attribute values). :Directive Options: None. @@ -1628,6 +1696,14 @@ <emphasis classes="custom"> text +A special case is the `"raw" role`_: derived roles enable +inline `raw data pass-through`_, e.g.:: + + .. role:: raw-role(raw) + :format: html latex + + :raw-role:`raw text` + If no base role is explicitly specified, a generic custom role is automatically used. Subsequent interpreted text will produce an "inline" element with a `"classes"`_ attribute, as in the first example @@ -1709,8 +1785,6 @@ parser is "title-reference". -.. _title: - Metadata Document Title ======================= @@ -1756,19 +1830,19 @@ Add `text` to the `"names"`_ attribute of the doctree element generated by the directive. This allows `hyperlink references`_ to the element using `text` as `reference name`_. - + Specifying the `name` option of a directive, e.g., :: - + .. image:: bild.png :name: my picture - + is a concise syntax alternative to preceding it with a `hyperlink target`_ :: - + .. _my picture: - + .. image:: bild.png - + New in Docutils 0.8. @@ -1777,7 +1851,31 @@ .. _hyperlink references: restructuredtext.html#hyperlink-references .. _"classes": ../doctree.html#classes .. _"names": ../doctree.html#names +.. _admonition: ../doctree.html#admonition +.. _block_quote: ../doctree.html#block-quote +.. _caption: ../doctree.html#caption +.. _compound: ../doctree.html#compound +.. _container: ../doctree.html#container +.. _decoration: ../doctree.html#decoration +.. _figure: ../doctree.html#figure +.. _footnote: ../doctree.html#footnote +.. _footnote_reference: ../doctree.html#footnote-reference +.. _generated: ../doctree.html#generated +.. _image: ../doctree.html#image +.. _inline elements: ../doctree.html#inline-elements +.. _literal_block: ../doctree.html#literal-block +.. _legend: ../doctree.html#legend +.. _line_block: ../doctree.html#line-block +.. _math_block: ../doctree.html#math-block +.. _pending: ../doctree.html#pending +.. _raw: ../doctree.html#raw +.. _rubric: ../doctree.html#rubric +.. _sidebar: ../doctree.html#sidebar +.. _table: ../doctree.html#table +.. _title: ../doctree.html#title +.. _topic: ../doctree.html#topic +  .. Local Variables: Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/introduction.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/introduction.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/introduction.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -2,9 +2,9 @@ An Introduction to reStructuredText ===================================== :Author: David Goodger -:Contact: goodger@python.org -:Revision: $Revision: 4564 $ -:Date: $Date: 2006-05-21 22:44:42 +0200 (Son, 21 Mai 2006) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: This document has been placed in the public domain. reStructuredText_ is an easy-to-read, what-you-see-is-what-you-get Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/restructuredtext.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/restructuredtext.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/restructuredtext.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -5,9 +5,9 @@ ======================================= :Author: David Goodger -:Contact: goodger@python.org -:Revision: $Revision: 6994 $ -:Date: $Date: 2011-03-21 12:44:27 +0100 (Mon, 21 Mär 2011) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: This document has been placed in the public domain. .. Note:: @@ -2368,43 +2368,24 @@ `Standalone hyperlinks`_ are recognized implicitly, and use no extra markup. -The inline markup start-string and end-string recognition rules are as -follows. If any of the conditions are not met, the start-string or -end-string will not be recognized or processed. +Inline markup recognition rules +------------------------------- +Inline markup start-strings and end-strings are only recognized if all of +the following conditions are met: + 1. Inline markup start-strings must start a text block or be - immediately preceded by whitespace or one of the following ASCII - characters:: + immediately preceded by - ' " ( [ { < - / : + * whitespace, + * one of the ASCII characters ``- : / ' " < ( [ {`` or + * a non-ASCII punctuation character with `Unicode category`_ + `Pd` (Dash), + `Po` (Other), + `Ps` (Open), + `Pi` (Initial quote), or + `Pf` (Final quote) [#PiPf]_. - The following Unicode characters may also precede inline markup: - - .. class:: borderless - - === ========================================================== - ‘ (U+2018, left single-quote) - “ (U+201C, left double-quote) - ’ (U+2019, apostrophe) - « (U+00AB, left guillemet, or double angle quotation mark) - ¡ (U+00A1, inverted exclamation mark) - ¿ (U+00BF, inverted question mark) - === ========================================================== - - *Delimiters:* The following Unicode characters are delimiters; they - may precede or follow inline markup: - - .. class:: borderless - - === ========================================================== - ‐ (U+2010, hyphen) - ‑ (U+2011, non-breaking hyphen) - ‒ (U+2012, figure dash) - – (U+2013, en dash) - — (U+2014, em dash) - " " (U+00A0, non-breaking space [between the quotes]) - === ========================================================== - 2. Inline markup start-strings must be immediately followed by non-whitespace. @@ -2412,28 +2393,23 @@ non-whitespace. 4. Inline markup end-strings must end a text block or be immediately - followed by whitespace or one of the following ASCII characters:: + followed by - ' " ) ] } > - / : . , ; ! ? \ + * whitespace, + * one of the ASCII characters ``- . , : ; ! ? \ / ' " ) ] } >`` or + * a non-ASCII punctuation character with `Unicode category`_ + `Pd` (Dash), + `Po` (Other), + `Pe` (Close), + `Pf` (Final quote), or + `Pi` (Initial quote) [#PiPf]_. - The following Unicode characters may also follow inline markup: +5. If an inline markup start-string is immediately preceded by one of the + ASCII characters ``' " < ( [ {``, or a character with Unicode character + category `Ps`, `Pi`, or `Pf`, it must not be followed by the + corresponding [#corresponding-quotes]_ closing character from + ``' " ) ] } >`` or the categories `Pe`, `Pf`, or `Pi`. - .. class:: borderless - - === ========================================================== - ’ (U+2019, right single-quote, or apostrophe) - ” (U+201D, right double-quote) - » (U+00BB, right guillemet, or double angle quotation mark) - === ========================================================== - - The Unicode character *delimiters* listed in (1) above may precede - or follow inline markup. - -5. If an inline markup start-string is immediately preceded by a - single or double quote, "(", "[", "{", or "<", it must not be - immediately followed by the corresponding single or double quote, - ")", "]", "}", or ">". - 6. An inline markup end-string must be separated by at least one character from the start-string. @@ -2441,32 +2417,52 @@ disable markup recognition, except for the end-string of `inline literals`_. See `Escaping Mechanism`_ above for details. -For example, none of the following are recognized as containing inline -markup start-strings: +.. [#PiPf] `Pi` (Punctuation, Initial quote) characters are "usually + closing, sometimes opening". `Pf` (Punctuation, Final quote) + characters are "usually closing, sometimes opening". -- asterisks: * "*" '*' (*) (* [*] {*} 1*x BOM32_* -- double asterisks: ** a**b O(N**2) etc. -- backquotes: ` `` etc. -- underscores: _ __ __init__ __init__() etc. -- vertical bars: | || etc. +.. [#corresponding-quotes] For quotes, corresponding characters can be + any of the `quotation marks in international usage`_ -It may be desirable to use inline literals for some of these anyhow, +.. _Unicode category: + http://www.unicode.org/Public/5.1.0/ucd/UCD.html#General_Category_Values + +.. _quotation marks in international usage: + http://en.wikipedia.org/wiki/Quotation_mark,_non-English_usage + +The inline markup recognition rules were devised to allow 90% of non-markup +uses of "*", "`", "_", and "|" without escaping. For example, none of the +following terms are recognized as containing inline markup strings: + +- 2*x a**b O(N**2) e**(x*y) f(x)*f(y) a|b file*.* (breaks 1) +- 2 * x a ** b (* BOM32_* ` `` _ __ | (breaks 2) +- "*" '|' (*) [*] {*} <*> + ‘*’ ‚*‘ ‘*‚ ’*’ ‚*’ + “*” „*“ “*„ ”*” „*” + »*« ›*‹ «*» »*» ›*› (breaks 5) +- || (breaks 6) +- __init__ __init__() + +No escaping is required inside the following inline markup examples: + +- *2 * x *a **b *.txt* (breaks 3) +- *2*x a**b O(N**2) e**(x*y) f(x)*f(y) a*(1+2)* (breaks 4) + +It may be desirable to use `inline literals`_ for some of these anyhow, especially if they represent code snippets. It's a judgment call. These cases *do* require either literal-quoting or escaping to avoid -misinterpretation:: +misinterpretation: - *4, class_, *args, **kwargs, `TeX-quoted', *ML, *.txt + \*4, class\_, \*args, \**kwargs, \`TeX-quoted', \*ML, \*.txt -The inline markup recognition rules were devised intentionally to -allow 90% of non-markup uses of "*", "`", "_", and "|" *without* -resorting to backslashes. For 9 of the remaining 10%, use inline -literals or literal blocks:: +In most use cases, `inline literals`_ or `literal blocks`_ are the best +choice (by default, this also selects a monospaced font):: - "``\*``" -> "\*" (possibly in another font or quoted) + *4, class_, *args, **kwargs, `TeX-quoted', *ML, *.txt -Only those who understand the escaping and inline markup rules should -attempt the remaining 1%. ;-) +Recognition order +----------------- Inline markup delimiter characters are used for multiple constructs, so to avoid ambiguity there must be a specific recognition order for Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/roles.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/roles.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/rst/roles.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ ========================================= :Author: David Goodger -:Contact: goodger@python.org -:Revision: $Revision: 7053 $ -:Date: $Date: 2011-06-07 14:28:43 +0200 (Die, 07 Jun 2011) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7307 $ +:Date: $Date: 2012-01-06 12:11:51 +0100 (Fre, 06 Jän 2012) $ :Copyright: This document has been placed in the public domain. This document describes the interpreted text roles implemented in the @@ -104,6 +104,43 @@ spaces. +``:code:`` +========== + +:Aliases: None +:DTD Element: literal +:Customization: + :Options: class_, language + :Content: None. + +(New in Docutils 0.9.) + +The ``code`` role marks its content as code in a formal language. + +For syntax highlight of inline code, the `"role" directive`_ can be used to +build custom roles with the code language specified in the "language" +option. + +For example, the following creates a LaTeX-specific "latex" role:: + + .. role:: latex(code) + :language: latex + +Content of the new role is parsed and tagged by the Pygments_ syntax +highlighter. See the `code directive`_ for more info on parsing and display +of code in reStructuredText. + +In addition to "class_", the following option is recognized: + +``language`` : text + Name of the code's language. + See `supported languages and markup formats`_ for recognized values. + +.. _code directive: directives.html#code +.. _Pygments: http://pygments.org/ +.. _supported languages and markup formats: http://pygments.org/languages/ + + ``:math:`` ========== @@ -113,6 +150,8 @@ :Options: class_ :Content: None. +(New in Docutils 0.8.) + The ``math`` role marks its content as mathematical notation (inline formula). @@ -124,8 +163,6 @@ See the `math directive`_ (producing display formulas) for more info on mathematical notation in reStructuredText. -New in Docutils 0.8. - .. _math directive: directives.html#math @@ -314,7 +351,7 @@ `"raw" directive`_; see its documentation for details on the semantics. -.. _"raw" directive: directives.html#raw +.. _"raw" directive: directives.html#raw-directive The "raw" role cannot be used directly. The `"role" directive`_ must first be used to build custom roles based on the "raw" role. One or Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/transforms.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/transforms.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/ref/transforms.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ ===================== :Author: David Goodger -:Contact: goodger@python.org -:Revision: $Revision: 6112 $ -:Date: $Date: 2009-09-03 09:27:59 +0200 (Don, 03 Sep 2009) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: This document has been placed in the public domain. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/config.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/config.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/config.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ ======================== :Author: David Goodger -:Contact: goodger@python.org -:Revision: $Revision: 7061 $ -:Date: $Date: 2011-06-29 18:24:09 +0200 (Mit, 29 Jun 2011) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7367 $ +:Date: $Date: 2012-02-26 20:13:26 +0100 (Son, 26 Feb 2012) $ :Copyright: This document has been placed in the public domain. .. sidebar:: Docutils Security for Web Applications @@ -89,10 +89,25 @@ For on/off switch settings (booleans), the following values are recognized: -* On: "true", "yes", "on", "1" -* Off: "false", "no", "off", "0", "" (no value) +:On: "true", "yes", "on", "1" +:Off: "false", "no", "off", "0", "" (no value) +List values are comma-delimited. Whitespace around list values is +stripped. :: + strip-classes: ham,eggs, + strip-elements-with-classes: sugar, salt, flour + stylesheet: html4css1.css, + math.css, + style with spaces.css + stylesheet-path: ../styles/my.css, ../styles/funny.css + +expose_internals_ and prune_ use the colon as delimiter and do not strip +whitespace:: + + expose_internals: b:c:d + + Example ======= @@ -372,20 +387,35 @@ --output-encoding, -o``. _`record_dependencies` - Path to a file where Docutils will write a list of files that the - input and output depend on [#dependencies]_, e.g. due to file - inclusion. [#pwd]_ The format is one filename per line. This - option is particularly useful in conjunction with programs like - ``make``. + Path to a file where Docutils will write a list of files that were + required to generate the output, e.g. included files or embedded + stylesheets [#dependencies]_. [#pwd]_ The format is one path per + line with forward slashes as separator, the encoding is ``utf8``. Set to ``-`` in order to write dependencies to stdout. + This option is particularly useful in conjunction with programs like + ``make`` using ``Makefile`` rules like:: + + ham.html: ham.txt $(shell cat hamdeps.txt) + rst2html.py --record-dependencies=hamdeps.txt ham.txt ham.html + + If the filesystem encoding differs from utf8, replace the ``cat`` + command with a call to a converter, e.g.:: + + $(shell iconv -f utf8 -t latin1 hamdeps.txt) + Default: None. Option: ``--record-dependencies``. _`report_level` - Verbosity threshold at or above which system messages are - reported. + Report system messages at or higher than <level>: + 1 info + 2 warning + 3 error + 4 severe + 5 none + Default: warning (2). Options: ``--report, -r, --verbose, -v, --quiet, -q``. @@ -424,8 +454,9 @@ for development use only). _`strip_classes` - List of "classes" attribute values to remove from all elements in - the document tree. + Comma-separated list of "classes" attribute values to remove from + all elements in the document tree. + The command line option may be used more than once. .. WARNING:: Potentially dangerous; use with caution. @@ -438,8 +469,9 @@ ``--leave-comments``. _`strip_elements_with_classes` - List of "classes" attribute values; matching elements to be - removed from the document tree. + Comma-separated list of "classes" attribute values; + matching elements are removed from the document tree. + The command line option may be used more than once. .. WARNING:: Potentially dangerous; use with caution. @@ -553,6 +585,30 @@ __ `footnote_references [latex2e writer]`_ +_`syntax_highlight` + + Token type names used by Pygments_ when parsing contents of the code_ + directive and role. + + Supported values: + + long + Use hierarchy of long token type names. + short + Use short token type names. (For use with + `Pygments-generated stylesheets`_.) + none + No code parsing. Use this to avoid the "Pygments not + found" warning when Pygments is not installed. + + Default: "short". Option: ``--syntax-highlight``. + +.. _Pygments: http://pygments.org/ +.. _code: ../ref/rst/directives.html#code +.. _Pygments-generated stylesheets: + http://pygments.org/docs/cmdline/#generating-styles + + [readers] --------- @@ -601,6 +657,15 @@ [docutils_xml writer] ````````````````````` +.. Caution:: + + * In versions older than 2.7.3 and 3.2.3, the newlines_ and indents_ + options may adversely affect whitespace; use them only for reading + convenience (see http://bugs.python.org/issue4147). + + * The XML declaration carries text encoding information, without which + standard tools may be unable to read the generated XML. + _`doctype_declaration` Generate XML with a DOCTYPE declaration. @@ -622,10 +687,6 @@ Generate XML with an XML declaration. Also defined for the `HTML Writer`__. - .. Caution:: The XML declaration carries text encoding - information, without which standard tools may be unable to read - the generated XML. - Default: do (1). Options: ``--no-xml-declaration``. __ `xml_declaration [html4css1 writer]`_ @@ -726,7 +787,7 @@ _`math_output` The format of mathematical content (`math directive`_ and role) in - the output document. Supported values are: + the output document. Supported values are (case insensitive): :MathJax: Format math for display with MathJax_, a JavaScript-based math @@ -748,9 +809,10 @@ Format math in standard HTML enhanced by CSS rules Requires the ``math.css`` stylesheet (stored in the same - installation-dependent directory as the `default stylesheet - <stylesheet_path [html4css1 writer]>`__ + installation-dependent directory as the `default stylesheet`__). + .. __: `stylesheet_path [html4css1 writer]`_ + :MathML: Embed math content as presentational MathML_. @@ -773,12 +835,14 @@ The failsave fallback. + Default: MathJax Option: ``--math-output``. + New in Docutils 0.8. .. _math directive: ../ref/rst/directives.html#math .. _MathJax: http://www.mathjax.org/ .. _MathPlayer: http://www.dessci.com/en/products/mathplayer/ - .. _MathML: http://www.mathweb.org/wiki/MathML + .. _MathML: http://www.w3.org/TR/MathML/ _`option_limit` The maximum width (in characters) for options in option lists. @@ -798,8 +862,8 @@ Default: None. Options: ``--stylesheet``. + __ `stylesheet [latex2e writer]`_ __ `stylesheet_path [html4css1 writer]`_ - __ `stylesheet [latex2e writer]`_ .. _stylesheet_path [html4css1 writer]: @@ -1278,19 +1342,22 @@ ``````````````````````` _`ignore` - List of wildcard (shell globing) patterns to silently ignore. To - specify multiple patterns in configuration files, use - colon-separated patterns; on the command line, the option may be - used more than once. + List of wildcard (shell globing) patterns, specifying files to + silently ignore. To specify multiple patterns, use + colon-separated patterns (in configuration files or on the command + line); on the command line, the option may also be used more than + once. - Default: ['.svn', 'CVS']. Options: ``--ignore``. + Default: none ([]). Options: ``--ignore``. _`prune` List of directories not to process. To specify multiple - directories in configuration files, use colon-separated paths; on - the command line, the option may be used more than once. + directories, use colon-separated paths (in configuration files or + on the command line); on the command line, the option may also be + used more than once. - Default: none ([]). Options: ``--prune``. + Default: ['.hg', '.bzr', '.git', '.svn', 'CVS']. Options: + ``--prune``. _`recurse` Recursively scan subdirectories, or ignore subdirectories. @@ -1383,20 +1450,9 @@ do the overriding explicitly, by assigning ``None`` to the other settings. -.. [#dependencies] Some notes on the dependency recorder: +.. [#dependencies] Images are only added to the dependency list if the + reStructuredText parser extracted image dimensions from the file. - * Images are only added to the dependency list if the - reStructuredText parser extracted image dimensions from the file. - - * Stylesheets are only added if they are embedded. - - * For practical reasons, the output of the LaTeX writer is - considered merely an *intermediate* processing stage. The - dependency recorder records all files the *rendered* file - (e.g. in PDF or DVI format) depends on. Thus, images and - stylesheets are both unconditionally recorded as dependencies - when using the LaTeX writer. - .. [#footnote_space] The footnote space is trimmed if the reference style is "superscript", and it is left if the reference style is "brackets". Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/docutils-05-compat.sty.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/docutils-05-compat.sty.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/docutils-05-compat.sty.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -6,11 +6,11 @@ ************************************* :Author: Guenter Milde -:Contact: milde@users.berlios.de -:Revision: $Revision: 7096 $ -:Date: $Date: 2011-07-20 22:39:57 +0200 (Mit, 20 Jul 2011) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: © 2009 Günter Milde, -:License: Released under the terms of the `2-Clause BSD license`_, in short: +:License: Released under the terms of the `2-Clause BSD license`_, in short: Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/latex.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/latex.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/latex.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ ================================ :Author: Engelbert Gruber, Guenter Milde -:Contact: docutils-users@lists.sourceforge.net -:Revision: $Revision: 6996 $ -:Date: $Date: 2011-03-28 21:31:45 +0200 (Mon, 28 Mär 2011) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: This document has been placed in the public domain. .. contents:: Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/links.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/links.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/links.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ ===================== :Author: Lea Wiemann -:Contact: LeWiemann@gmail.com -:Revision: $Revision: 7056 $ -:Date: $Date: 2011-06-17 12:50:48 +0200 (Fre, 17 Jun 2011) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7350 $ +:Date: $Date: 2012-02-13 17:55:05 +0100 (Mon, 13 Feb 2012) $ :Copyright: This document has been placed in the public domain. .. title:: Docutils Links @@ -24,32 +24,44 @@ Editors ------- -Editors with reStructuredText support and docutils GUIs: +Advanced text editors with reStructuredText support, IDEs, and docutils GUIs: * Emacs `rst mode <http://docutils.sf.net/docutils/tools/editors/emacs>`__. -* `reStructuredText syntax highlighting mode - <http://www.vim.org/scripts/script.php?script_id=973>`__ for vim. +* `Vim <http://www.vim.org/index.php>`__: -* `VST <http://skawina.eu.org/mikolaj/vst.html>`__ (Vim reStructured Text) - is a plugin for Vim7 with folding. + - `reStructuredText syntax highlighting mode + <http://www.vim.org/scripts/script.php?script_id=973>`__, -* `VOoM <http://www.vim.org/scripts/script.php?script_id=2657>`__ - is a plugin for Vim that emulates two-pane outliner. - Version 4.0b2 added support for reStructuredText. + - `VST <http://skawina.eu.org/mikolaj/vst.html>`__ (Vim reStructured Text) + plugin for Vim7 with folding. -* `rst mode <http://jedmodes.sf.net/mode/rst/>`__ for the - `JED <http://www.jedsoft.org/jed/>`__ programmers editor. + - `VOoM <http://www.vim.org/scripts/script.php?script_id=2657>`__ + plugin for Vim that emulates two-pane outliner with + support for reStructuredText (since version 4.0b2). -* `reStructuredText editor plug-in for Eclipse - <http://resteditor.sf.net/>`__ +* `JED <http://www.jedsoft.org/jed/>`__ programmers editor with + `rst mode <http://jedmodes.sf.net/mode/rst/>`__ +* `reStructuredText editor plug-in for Eclipse`__ + + __ http://resteditor.sf.net/ + * Gunnar Schwant's DocFactory_ is a wxPython GUI application for Docutils. + .. _DocFactory: http://docutils.sf.net/sandbox/gschwant/docfactory/doc/ + * ReSTedit_ by Bill Bumgarner is a Docutils GUI for Mac OS X. +* Leo_ is an outliner_, written in Python using PyQt. It can be used as IDE + for literal programming, as a filing cabinet holding any kind of data and + as `document editor`__ with outlines containing reStructuredText markup. + .. _Leo: http://webpages.charter.net/edreamleo/ + .. _outliner: http://en.wikipedia.org/wiki/Outliner + __ http://webpages.charter.net/edreamleo/rstplugin3.html + Export ------ @@ -136,8 +148,6 @@ * An `XSLT script`_ by Ladislav Lhotka enables reStructuredText annotations to be included in RELAG NG XML schemas. -* `ManPage Writer`_ by Engelbert Gruber. - * `DocBook Writer`_ by Oliver Rutherfurd. * Nabu_, written by Martin Blais, is a publishing system which @@ -149,13 +159,15 @@ * The `pickle writer`_ by Martin Blais pickles the document tree to a binary string. Later unpickling will allow you to publish with other Writers. - * The `Texinfo Writer`_, by Jon Waltman converts reStructuredText to Texinfo, the documentation format used by the GNU project and the Emacs text editor. Texinfo can be used to produce multiple output formats, including HTML, PDF, and Info. +* For `confluence CMS`_ see https://github.com/cweiske/rst2confluence. +* Deploying into wikis might be aided by https://github.com/netresearch/deploy-rst. + Import ------ @@ -192,7 +204,7 @@ * Jens J. Mortensen developed `LaTeX math for reST`_, which writes to LaTeX or to MathML. It's included with Docutils since 0.8 (2010-11-05). -* BENI Cherniavsky has written a generic `preprocessing module`_ for +* Beni Cherniavsky has written a generic `preprocessing module`_ for roles and/or directives and built preprocessors for TeX math for both LaTeX and HTML output on top of it. @@ -205,7 +217,12 @@ embedded as ASCII art in the reST source and still look nice when converted to e.g. HTML +* zot4rst_ by Erik Hetzner is an extension that allows users to write reST + documents using citations from a Zotero_ library. +* Quick and easy publishing reStructuredText source files as blog posts + on blogger.com is possible with `rst2blogger`_ . + Related Applications -------------------- @@ -287,7 +304,6 @@ .. _Manpage Writer: http://docutils.sf.net/sandbox/manpage-writer/ .. _ReportLabs/PDF Writer: http://docutils.sf.net/sandbox/dreamcatcher/rlpdf/ .. _DocBook Writer: http://docutils.sf.net/sandbox/oliverr/docbook/ -.. _DocFactory: http://docutils.sf.net/sandbox/gschwant/docfactory/doc/ .. _odtwriter: http://docutils.sf.net/docs/user/odt.html .. _simple HTML writer: http://docutils.sf.net/sandbox/bbum/DocArticle/ .. _preprocessing module: http://docutils.sf.net/sandbox/cben/rolehack/ @@ -303,5 +319,9 @@ .. _rst2qhc: http://rst2qhc.googlecode.com .. _Plone: http://plone.org/ .. _Zope: http://www.zope.org/ +.. _Zotero: http://www.zotero.org/ +.. _zot4rst: http://e6h.org/~egh/hg/zotero-plain .. _Trac: http://trac.edgewall.org/ .. _Texinfo Writer: http://docutils.sf.net/sandbox/texinfo-writer/README.html +.. _confluence CMS: http://www.atlassian.com/software/confluence +.. _rst2blogger: https://github.com/dhellmann/rst2blogger#readme Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/mailing-lists.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/mailing-lists.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/mailing-lists.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ ========================= :Author: Lea Wiemann -:Contact: LeWiemann@gmail.com -:Revision: $Revision: 5174 $ -:Date: $Date: 2007-05-31 02:01:52 +0200 (Don, 31 Mai 2007) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: This document has been placed in the public domain. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/manpage.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/manpage.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/manpage.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -2,9 +2,10 @@ manpage writer for Docutils_ ============================== -:Contact: grubert@users.sourceforge.net -:Revision: $Revision: 6106 $ -:Date: $Date: 2009-08-31 04:26:52 +0200 (Mon, 31 Aug 2009) $ +:Author: Engelbert Gruber +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: This document has been placed in the public domain. This tries to explore the posibilities to generate man-pages from Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/odt.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/odt.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/odt.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ ======================= :Author: Dave Kuhlman -:Contact: dkuhlman@rexx.com -:Revision: $Revision: 6381 $ -:Date: $Date: 2010-07-26 21:26:14 +0200 (Mon, 26 Jul 2010) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: This document has been placed in the public domain. :abstract: This document describes the Docutils odtwriter Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/rst/demo.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/rst/demo.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/rst/demo.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -18,12 +18,12 @@ :Address: 123 Example Street Example, EX Canada A1B 2C3 -:Contact: goodger@python.org +:Contact: docutils-develop@lists.sourceforge.net :Authors: Me; Myself; I :organization: humankind -:date: $Date: 2006-05-21 22:44:42 +0200 (Son, 21 Mai 2006) $ +:date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :status: This is a "work in progress" -:revision: $Revision: 4564 $ +:revision: $Revision: 7302 $ :version: 1 :copyright: This document has been placed in the public domain. You may do with it as you wish. You may copy, modify, Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/tools.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/tools.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docs/user/tools.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,9 +3,9 @@ ========================== :Author: David Goodger -:Contact: goodger@python.org -:Revision: $Revision: 6206 $ -:Date: $Date: 2009-11-30 09:11:39 +0100 (Mon, 30 Nov 2009) $ +:Contact: docutils-develop@lists.sourceforge.net +:Revision: $Revision: 7302 $ +:Date: $Date: 2012-01-03 20:23:53 +0100 (Die, 03 Jän 2012) $ :Copyright: This document has been placed in the public domain. .. contents:: Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: __init__.py 7106 2011-08-30 07:02:28Z grubert $ +# $Id: __init__.py 7409 2012-05-02 17:06:37Z grubert $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -29,9 +29,6 @@ - urischemes.py: Contains a complete mapping of known URI addressing scheme names to descriptions. -- utils.py: Contains the ``Reporter`` system warning class and miscellaneous - utilities. - Subpackages: - languages: Language-specific mappings of terms. @@ -44,12 +41,15 @@ - transforms: Modules used by readers and writers to modify DPS doctrees. +- utils: Contains the ``Reporter`` system warning class and miscellaneous + utilities used by readers, writers, and transforms. + - writers: Format-specific output translators. """ __docformat__ = 'reStructuredText' -__version__ = '0.8.1' +__version__ = '0.9' """``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: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/_compat.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/_compat.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/_compat.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: _compat.py 5908 2009-04-21 13:43:23Z goodger $ +# $Id: _compat.py 7316 2012-01-19 11:31:58Z milde $ # Author: Georg Brandl <georg@python.org> # Copyright: This module has been placed in the public domain. @@ -10,7 +10,8 @@ * bytes (name of byte string type; str in 2.x, bytes in 3.x) * b (function converting a string literal to an ASCII byte string; can be also used to convert a Unicode string into a byte string) -* u_prefix (unicode repr prefix, 'u' in 2.x, nothing in 3.x) +* u_prefix (unicode repr prefix: 'u' in 2.x, '' in 3.x) + (Required in docutils/test/test_publisher.py) * BytesIO (a StringIO class that works with bytestrings) """ Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/core.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/core.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/core.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: core.py 7070 2011-07-05 10:13:17Z milde $ +# $Id: core.py 7384 2012-03-19 22:59:09Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -111,7 +111,7 @@ #@@@ Add self.source & self.destination to components in future? option_parser = OptionParser( components=(self.parser, self.reader, self.writer, settings_spec), - defaults=defaults, read_config_files=1, + defaults=defaults, read_config_files=True, usage=usage, description=description) return option_parser @@ -135,7 +135,7 @@ if self.settings is None: defaults = (settings_overrides or {}).copy() # Propagate exceptions by default when used programmatically: - defaults.setdefault('traceback', 1) + defaults.setdefault('traceback', True) self.get_settings(settings_spec=settings_spec, config_section=config_section, **defaults) @@ -155,9 +155,8 @@ argv = sys.argv[1:] # converting to Unicode (Python 3 does this automatically): if sys.version_info < (3,0): - # TODO: make this failsafe and reversible - argv_encoding = (sys.stdin.encoding or - frontend.locale_encoding or 'ascii') + # TODO: make this failsafe and reversible? + argv_encoding = (frontend.locale_encoding or 'ascii') argv = [a.decode(argv_encoding) for a in argv] self.settings = option_parser.parse_args(argv) @@ -172,9 +171,17 @@ source_path = self.settings._source else: self.settings._source = source_path - self.source = self.source_class( - source=source, source_path=source_path, - encoding=self.settings.input_encoding) + # Raise IOError instead of system exit with `tracback == True` + # TODO: change io.FileInput's default behaviour and remove this hack + try: + self.source = self.source_class( + source=source, source_path=source_path, + encoding=self.settings.input_encoding, + handle_io_errors=False) + except TypeError: + self.source = self.source_class( + source=source, source_path=source_path, + encoding=self.settings.input_encoding) def set_destination(self, destination=None, destination_path=None): if destination_path is None: @@ -185,6 +192,9 @@ destination=destination, destination_path=destination_path, encoding=self.settings.output_encoding, error_handler=self.settings.output_encoding_error_handler) + # Raise IOError instead of system exit with `tracback == True` + # TODO: change io.FileInput's default behaviour and remove this hack + self.destination.handle_io_errors=False def apply_transforms(self): self.document.transformer.populate_from_components( @@ -194,7 +204,7 @@ def publish(self, argv=None, usage=None, description=None, settings_spec=None, settings_overrides=None, - config_section=None, enable_exit_status=None): + config_section=None, enable_exit_status=False): """ Process command line options and arguments (if `self.settings` not already set), run `self.reader` and then `self.writer`. Return @@ -222,7 +232,7 @@ self.debugging_dumps() raise self.report_Exception(error) - exit = 1 + exit = True exit_status = 1 self.debugging_dumps() if (enable_exit_status and self.document @@ -261,6 +271,13 @@ self.report_SystemMessage(error) elif isinstance(error, UnicodeEncodeError): self.report_UnicodeError(error) + elif isinstance(error, io.InputError): + self._stderr.write(u'Unable to open source file for reading:\n' + u' %s\n' % ErrorString(error)) + elif isinstance(error, io.OutputError): + self._stderr.write( + u'Unable to open destination file for writing:\n' + u' %s\n' % ErrorString(error)) else: print >>self._stderr, u'%s' % ErrorString(error) print >>self._stderr, ("""\ @@ -317,7 +334,7 @@ writer=None, writer_name='pseudoxml', settings=None, settings_spec=None, settings_overrides=None, config_section=None, - enable_exit_status=1, argv=None, + enable_exit_status=True, argv=None, usage=default_usage, description=default_description): """ Set up & run a `Publisher` for command-line-based file I/O (input and @@ -345,7 +362,7 @@ parser=None, parser_name='restructuredtext', writer=None, writer_name='pseudoxml', settings=None, settings_spec=None, settings_overrides=None, - config_section=None, enable_exit_status=None): + config_section=None, enable_exit_status=False): """ Set up & run a `Publisher` for programmatic use with file-like I/O. Return the encoded string output also. @@ -371,7 +388,7 @@ writer=None, writer_name='pseudoxml', settings=None, settings_spec=None, settings_overrides=None, config_section=None, - enable_exit_status=None): + enable_exit_status=False): """ Set up & run a `Publisher` for programmatic use with string I/O. Return the encoded string or Unicode string output. @@ -408,7 +425,7 @@ writer=None, writer_name='pseudoxml', settings=None, settings_spec=None, settings_overrides=None, config_section=None, - enable_exit_status=None): + enable_exit_status=False): """ Set up & run a `Publisher`, and return a dictionary of document parts. Dictionary keys are the names of parts, and values are Unicode strings; @@ -441,7 +458,7 @@ parser=None, parser_name='restructuredtext', settings=None, settings_spec=None, settings_overrides=None, config_section=None, - enable_exit_status=None): + enable_exit_status=False): """ Set up & run a `Publisher` for programmatic use with string I/O. Return the document tree. @@ -470,7 +487,7 @@ writer=None, writer_name='pseudoxml', settings=None, settings_spec=None, settings_overrides=None, config_section=None, - enable_exit_status=None): + enable_exit_status=False): """ Set up & run a `Publisher` to render from an existing document tree data structure, for programmatic use with string I/O. Return @@ -510,7 +527,7 @@ writer=None, writer_name='pseudoxml', settings=None, settings_spec=None, settings_overrides=None, config_section=None, - enable_exit_status=1, argv=None, + enable_exit_status=True, argv=None, usage=default_usage, description=default_description, destination=None, destination_class=io.BinaryFileOutput ): Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/error_reporting.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/error_reporting.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/error_reporting.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,15 +1,15 @@ #!/usr/bin/env python # -*- coding: utf8 -*- -# :Id: $Id: error_reporting.py 7073 2011-07-07 06:49:19Z milde $ +# :Id: $Id: error_reporting.py 7316 2012-01-19 11:31:58Z milde $ # :Copyright: © 2011 Günter Milde. # :License: Released under the terms of the `2-Clause BSD license`_, in short: -# +# # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright # notice and this notice are preserved. # This file is offered as-is, without any warranty. -# +# # .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause """ @@ -95,14 +95,17 @@ * else decode with `self.encoding` and `self.decoding_errors`. """ try: - return unicode(self.data) + u = unicode(self.data) + if isinstance(self.data, EnvironmentError): + u = u.replace(": u'", ": '") # normalize filename quoting + return u except UnicodeError, error: # catch ..Encode.. and ..Decode.. errors if isinstance(self.data, EnvironmentError): return u"[Errno %s] %s: '%s'" % (self.data.errno, SafeString(self.data.strerror, self.encoding, - self.decoding_errors), + self.decoding_errors), SafeString(self.data.filename, self.encoding, - self.decoding_errors)) + self.decoding_errors)) if isinstance(self.data, Exception): args = [unicode(SafeString(arg, self.encoding, decoding_errors=self.decoding_errors)) @@ -184,13 +187,17 @@ except UnicodeEncodeError: self.stream.write(data.encode(self.encoding, self.encoding_errors)) except TypeError: # in Python 3, stderr expects unicode - self.stream.write(unicode(data, self.encoding, self.decoding_errors)) + if self.stream in (sys.stderr, sys.stdout): + self.stream.buffer.write(data) # write bytes to raw stream + else: + self.stream.write(unicode(data, self.encoding, + self.decoding_errors)) def close(self): """ Close the error-output stream. - Ignored if the stream is` sys.stderr` or `sys.stdout` or has no + Ignored if the stream is` sys.stderr` or `sys.stdout` or has no close() method. """ if self.stream in (sys.stdout, sys.stderr): @@ -199,4 +206,3 @@ self.stream.close() except AttributeError: pass - Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/examples.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/examples.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/examples.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: examples.py 4800 2006-11-12 18:02:01Z goodger $ +# $Id: examples.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -15,7 +15,8 @@ def html_parts(input_string, source_path=None, destination_path=None, - input_encoding='unicode', doctitle=1, initial_header_level=1): + input_encoding='unicode', doctitle=True, + initial_header_level=1): """ Given an input string, returns a dictionary of HTML document parts. @@ -50,7 +51,7 @@ def html_body(input_string, source_path=None, destination_path=None, input_encoding='unicode', output_encoding='unicode', - doctitle=1, initial_header_level=1): + doctitle=True, initial_header_level=1): """ Given an input string, returns an HTML fragment as a string. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/frontend.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/frontend.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/frontend.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: frontend.py 7071 2011-07-05 10:13:46Z milde $ +# $Id: frontend.py 7339 2012-02-03 12:23:27Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -38,7 +38,7 @@ import docutils import docutils.utils import docutils.nodes -from docutils.error_reporting import locale_encoding, ErrorOutput +from docutils.error_reporting import locale_encoding, ErrorOutput, ErrorString def store_multiple(option, opt, value, parser, *args, **kwargs): @@ -163,15 +163,17 @@ def validate_strip_class(setting, value, option_parser, config_parser=None, config_section=None): - if config_parser: # validate all values - class_values = value - else: # just validate the latest value - class_values = [value[-1]] + # convert to list: + if isinstance(value, unicode): + value = [value] + class_values = filter(None, [v.strip() for v in value.pop().split(',')]) + # validate: for class_value in class_values: normalized = docutils.nodes.make_id(class_value) if class_value != normalized: raise ValueError('invalid class value %r (perhaps %r?)' % (class_value, normalized)) + value.extend(class_values) return value def make_paths_absolute(pathdict, keys, base_path=None): @@ -182,7 +184,8 @@ `OptionParser.relative_path_settings`. """ if base_path is None: - base_path = os.getcwd() + base_path = os.getcwdu() # type(base_path) == unicode + # to allow combining non-ASCII cwd with unicode values in `pathdict` for key in keys: if key in pathdict: value = pathdict[key] @@ -616,8 +619,7 @@ def check_values(self, values, args): """Store positional arguments as runtime settings.""" values._source, values._destination = self.check_args(args) - make_paths_absolute(values.__dict__, self.relative_path_settings, - os.getcwd()) + make_paths_absolute(values.__dict__, self.relative_path_settings) values._config_files = self.config_files return values Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/io.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/io.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/io.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: io.py 7073 2011-07-07 06:49:19Z milde $ +# $Id: io.py 7384 2012-03-19 22:59:09Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -10,12 +10,18 @@ __docformat__ = 'reStructuredText' import sys +import os import re import codecs from docutils import TransformSpec from docutils._compat import b from docutils.error_reporting import locale_encoding, ErrorString, ErrorOutput + +class InputError(IOError): pass +class OutputError(IOError): pass + + class Input(TransformSpec): """ @@ -84,10 +90,9 @@ # Apply heuristics only if no encoding is explicitly given and # no BOM found. Start with UTF-8, because that only matches # data that *IS* UTF-8: - encodings = [enc for enc in ('utf-8', - locale_encoding, # can be None - 'latin-1') # fallback encoding - if enc] + encodings = ['utf-8', 'latin-1'] + if locale_encoding: + encodings.insert(1, locale_encoding) for enc in encodings: try: decoded = unicode(data, enc, self.error_handler) @@ -105,7 +110,7 @@ coding_slug = re.compile(b("coding[:=]\s*([-\w.]+)")) """Encoding declaration pattern.""" - byte_order_marks = ((codecs.BOM_UTF8, 'utf-8'), # actually 'utf-8-sig' + byte_order_marks = ((codecs.BOM_UTF8, 'utf-8'), # 'utf-8-sig' new in v2.5 (codecs.BOM_UTF16_BE, 'utf-16-be'), (codecs.BOM_UTF16_LE, 'utf-16-le'),) """Sequence of (start_bytes, encoding) tuples for encoding detection. @@ -216,14 +221,24 @@ try: self.source = open(source_path, mode, **kwargs) except IOError, error: - if not handle_io_errors: - raise - print >>self._stderr, ErrorString(error) - print >>self._stderr, (u'Unable to open source' - u" file for reading ('%s'). Exiting." % source_path) - sys.exit(1) + if handle_io_errors: + print >>self._stderr, ErrorString(error) + print >>self._stderr, ( + u'Unable to open source file for reading ("%s").' + u'Exiting.' % source_path) + sys.exit(1) + raise InputError(error.errno, error.strerror, source_path) else: self.source = sys.stdin + elif (sys.version_info >= (3,0) and + self.encoding and hasattr(self.source, 'encoding') and + self.encoding != self.source.encoding and + codecs.lookup(self.encoding) != + codecs.lookup(self.source.encoding)): + # TODO: re-open, warn or raise error? + raise UnicodeError('Encoding clash: encoding given is "%s" ' + 'but source is opened with encoding "%s".' % + (self.encoding, self.source.encoding)) if not source_path: try: self.source_path = self.source.name @@ -234,8 +249,25 @@ """ Read and decode a single file and return the data (Unicode string). """ - try: - data = self.source.read() + try: # In Python < 2.5, try...except has to be nested in try...finally. + try: + if self.source is sys.stdin and sys.version_info >= (3,0): + # read as binary data to circumvent auto-decoding + data = self.source.buffer.read() + # normalize newlines + data = b('\n').join(data.splitlines()) + b('\n') + else: + data = self.source.read() + except (UnicodeError, LookupError), err: # (in Py3k read() decodes) + if not self.encoding and self.source_path: + # re-read in binary mode and decode with heuristics + b_source = open(self.source_path, 'rb') + data = b_source.read() + b_source.close() + # normalize newlines + data = b('\n').join(data.splitlines()) + b('\n') + else: + raise finally: if self.autoclose: self.close() @@ -245,12 +277,7 @@ """ Return lines of a single file as list of Unicode strings. """ - try: - lines = self.source.readlines() - finally: - if self.autoclose: - self.close() - return [self.decode(line) for line in lines] + return self.read().splitlines(True) def close(self): if self.source is not sys.stdin: @@ -263,9 +290,15 @@ Output for single, simple file-like objects. """ + mode = 'w' + """The mode argument for `open()`.""" + # 'wb' for binary (e.g. OpenOffice) files. + # (Do not use binary mode ('wb') for text files, as this prevents the + # conversion of newlines to the system specific default.) + def __init__(self, destination=None, destination_path=None, encoding=None, error_handler='strict', autoclose=True, - handle_io_errors=True): + handle_io_errors=True, mode=None): """ :Parameters: - `destination`: either a file-like object (which is written @@ -273,14 +306,22 @@ `destination_path` given). - `destination_path`: a path to a file, which is opened and then written. + - `encoding`: the text encoding of the output file. + - `error_handler`: the encoding error handler to use. - `autoclose`: close automatically after write (except when `sys.stdout` or `sys.stderr` is the destination). + - `handle_io_errors`: summarize I/O errors here, and exit? + - `mode`: how the file is to be opened (see standard function + `open`). The default is 'w', providing universal newline + support for text files. """ Output.__init__(self, destination, destination_path, encoding, error_handler) self.opened = True self.autoclose = autoclose self.handle_io_errors = handle_io_errors + if mode is not None: + self.mode = mode self._stderr = ErrorOutput() if destination is None: if destination_path: @@ -295,42 +336,54 @@ def open(self): # Specify encoding in Python 3. - # (Do not use binary mode ('wb') as this prevents the - # conversion of newlines to the system specific default.) if sys.version_info >= (3,0): kwargs = {'encoding': self.encoding, 'errors': self.error_handler} else: kwargs = {} - try: - self.destination = open(self.destination_path, 'w', **kwargs) + self.destination = open(self.destination_path, self.mode, **kwargs) except IOError, error: - if not self.handle_io_errors: - raise - print >>self._stderr, ErrorString(error) - print >>self._stderr, (u'Unable to open destination file' - u" for writing ('%s'). Exiting." % self.destination_path) - sys.exit(1) + if self.handle_io_errors: + print >>self._stderr, ErrorString(error) + print >>self._stderr, (u'Unable to open destination file' + u" for writing ('%s'). Exiting." % self.destination_path) + sys.exit(1) + raise OutputError(error.errno, error.strerror, + self.destination_path) self.opened = True def write(self, data): """Encode `data`, write it to a single file, and return it. - In Python 3, a (unicode) string is returned. + In Python 3, `data` is returned unchanged. """ - if sys.version_info >= (3,0): - output = data # in py3k, write expects a (Unicode) string - else: - output = self.encode(data) + if sys.version_info < (3,0): + data = self.encode(data) if not self.opened: self.open() - try: - self.destination.write(output) + try: # In Python < 2.5, try...except has to be nested in try...finally. + try: + if (sys.version_info >= (3,0) and self.encoding and + hasattr(self.destination,'encoding') and + self.encoding != self.destination.encoding and + codecs.lookup(self.encoding) != + codecs.lookup(self.destination.encoding)): + # encode self, write bytes + bdata = self.encode(data) + if os.linesep != '\n': + bdata = bdata.replace('\n', os.linesep) + sys.stdout.buffer.write(bdata) + else: + self.destination.write(data) + except (UnicodeError, LookupError), err: # can only happen in py3k + raise UnicodeError( + 'Unable to encode output data. output-encoding is: ' + '%s.\n(%s)' % (self.encoding, ErrorString(err))) finally: if self.autoclose: self.close() - return output + return data def close(self): if self.destination not in (sys.stdout, sys.stderr): @@ -342,17 +395,9 @@ """ A version of docutils.io.FileOutput which writes to a binary file. """ - def open(self): - try: - self.destination = open(self.destination_path, 'wb') - except IOError, error: - if not self.handle_io_errors: - raise - print >>self._stderr, ErrorString(error) - print >>self._stderr, (u'Unable to open destination file' - u" for writing ('%s'). Exiting." % self.destination_path) - sys.exit(1) - self.opened = True + # Used by core.publish_cmdline_to_binary() which in turn is used by + # rst2odt (OpenOffice writer) + mode = 'wb' class StringInput(Input): Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/languages/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/languages/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/languages/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: __init__.py 6433 2010-09-28 08:21:25Z milde $ +# $Id: __init__.py 7126 2011-09-16 19:24:51Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -15,7 +15,7 @@ _languages = {} -def get_language(language_code, reporter): +def get_language(language_code, reporter=None): """Return module with language localizations. `language_code` is a "BCP 47" language tag. @@ -31,9 +31,10 @@ continue _languages[tag] = module return module - reporter.warning( - 'language "%s" not supported: ' % language_code + - 'Docutils-generated text will be in English.') + if reporter is not None: + reporter.warning( + 'language "%s" not supported: ' % language_code + + 'Docutils-generated text will be in English.') module = __import__('en', globals(), locals()) _languages[tag] = module # warn only one time! return module Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/languages/ru.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/languages/ru.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/languages/ru.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,5 @@ -# $Id: ru.py 4564 2006-05-21 20:44:42Z wiemann $ +# -*- coding: utf-8 -*- +# $Id: ru.py 7125 2011-09-16 18:36:18Z milde $ # Author: Roman Suzi <rnd@onego.ru> # Copyright: This module has been placed in the public domain. @@ -14,51 +15,43 @@ __docformat__ = 'reStructuredText' labels = { - u'abstract': u'\u0410\u043d\u043d\u043e\u0442\u0430\u0446\u0438\u044f', - u'address': u'\u0410\u0434\u0440\u0435\u0441', - u'attention': u'\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435!', - u'author': u'\u0410\u0432\u0442\u043e\u0440', - u'authors': u'\u0410\u0432\u0442\u043e\u0440\u044b', - u'caution': u'\u041e\u0441\u0442\u043e\u0440\u043e\u0436\u043d\u043e!', - u'contact': u'\u041a\u043e\u043d\u0442\u0430\u043a\u0442', - u'contents': - u'\u0421\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435', - u'copyright': u'\u041f\u0440\u0430\u0432\u0430 ' - u'\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f', - u'danger': u'\u041e\u041f\u0410\u0421\u041d\u041e!', - u'date': u'\u0414\u0430\u0442\u0430', - u'dedication': - u'\u041f\u043e\u0441\u0432\u044f\u0449\u0435\u043d\u0438\u0435', - u'error': u'\u041e\u0448\u0438\u0431\u043a\u0430', - u'hint': u'\u0421\u043e\u0432\u0435\u0442', - u'important': u'\u0412\u0430\u0436\u043d\u043e', - u'note': u'\u041f\u0440\u0438\u043c\u0435\u0447\u0430\u043d\u0438\u0435', - u'organization': - u'\u041e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f', - u'revision': u'\u0420\u0435\u0434\u0430\u043a\u0446\u0438\u044f', - u'status': u'\u0421\u0442\u0430\u0442\u0443\u0441', - u'tip': u'\u041f\u043e\u0434\u0441\u043a\u0430\u0437\u043a\u0430', - u'version': u'\u0412\u0435\u0440\u0441\u0438\u044f', - u'warning': u'\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436' - u'\u0434\u0435\u043d\u0438\u0435'} + u'abstract': u'Аннотация', + u'address': u'Адрес', + u'attention': u'Внимание!', + u'author': u'Автор', + u'authors': u'Авторы', + u'caution': u'Осторожно!', + u'contact': u'Контакт', + u'contents': u'Содержание', + u'copyright': u'Права копирования', + u'danger': u'ОПАСНО!', + u'date': u'Дата', + u'dedication': u'Посвящение', + u'error': u'Ошибка', + u'hint': u'Совет', + u'important': u'Важно', + u'note': u'Примечание', + u'organization': u'Организация', + u'revision': u'Редакция', + u'status': u'Статус', + u'tip': u'Подсказка', + u'version': u'Версия', + u'warning': u'Предупреждение'} """Mapping of node class name to label text.""" bibliographic_fields = { - u'\u0430\u043d\u043d\u043e\u0442\u0430\u0446\u0438\u044f': u'abstract', - u'\u0430\u0434\u0440\u0435\u0441': u'address', - u'\u0430\u0432\u0442\u043e\u0440': u'author', - u'\u0430\u0432\u0442\u043e\u0440\u044b': u'authors', - u'\u043a\u043e\u043d\u0442\u0430\u043a\u0442': u'contact', - u'\u043f\u0440\u0430\u0432\u0430 \u043a\u043e\u043f\u0438\u0440\u043e' - u'\u0432\u0430\u043d\u0438\u044f': u'copyright', - u'\u0434\u0430\u0442\u0430': u'date', - u'\u043f\u043e\u0441\u0432\u044f\u0449\u0435\u043d\u0438\u0435': - u'dedication', - u'\u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f': - u'organization', - u'\u0440\u0435\u0434\u0430\u043a\u0446\u0438\u044f': u'revision', - u'\u0441\u0442\u0430\u0442\u0443\u0441': u'status', - u'\u0432\u0435\u0440\u0441\u0438\u044f': u'version'} + u'аннотация': u'abstract', + u'адрес': u'address', + u'автор': u'author', + u'авторы': u'authors', + u'контакт': u'contact', + u'права копирования': u'copyright', + u'дата': u'date', + u'посвящение': u'dedication', + u'организация': u'organization', + u'редакция': u'revision', + u'статус': u'status', + u'версия': u'version'} """Russian (lowcased) to canonical name mapping for bibliographic fields.""" author_separators = [';', ','] Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/math/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/math/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/math/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# :Id: $Id: __init__.py 7059 2011-06-27 20:54:13Z milde $ +# :Id: $Id: __init__.py 7218 2011-11-08 17:42:40Z milde $ # :Author: Guenter Milde. # :License: Released under the terms of the `2-Clause BSD license`_, in short: # @@ -17,11 +17,9 @@ :math2html: LaTeX math -> HTML conversion from eLyXer :latex2mathml: LaTeX math -> presentational MathML -:unimathsymbols2tex: Unicode symbol to LaTeX math translation table +:unichar2tex: Unicode character to LaTeX math translation table +:tex2unichar: LaTeX math to Unicode character translation dictionaries """ -__all__ = ['math2html', - 'latex2mathml', - 'unimathsymbols2tex'] # helpers for Docutils math support # ================================= Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/math/latex2mathml.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/math/latex2mathml.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/math/latex2mathml.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf8 -*- -# :Id: $Id: latex2mathml.py 7058 2011-06-27 11:38:56Z milde $ +# :Id: $Id: latex2mathml.py 7218 2011-11-08 17:42:40Z milde $ # :Copyright: © 2010 Günter Milde. # Based on rst2mathml.py from the latex_math sandbox project # © 2005 Jens Jørgen Mortensen @@ -19,7 +19,141 @@ # Based on the `latex_math` sandbox project by Jens Jørgen Mortensen +import docutils.math.tex2unichar as tex2unichar +# TeX spacing combining +over = {'acute': u'\u00B4', # u'\u0301', + 'bar': u'\u00AF', # u'\u0304', + 'breve': u'\u02D8', # u'\u0306', + 'check': u'\u02C7', # u'\u030C', + 'dot': u'\u02D9', # u'\u0307', + 'ddot': u'\u00A8', # u'\u0308', + 'dddot': u'\u20DB', + 'grave': u'`', # u'\u0300', + 'hat': u'^', # u'\u0302', + 'mathring': u'\u02DA', # u'\u030A', + 'overleftrightarrow': u'\u20e1', + # 'overline': # u'\u0305', + 'tilde': u'\u02DC', # u'\u0303', + 'vec': u'\u20D7'} + +Greek = { # Capital Greek letters: (upright in TeX style) + 'Phi':u'\u03a6', 'Xi':u'\u039e', 'Sigma':u'\u03a3', + 'Psi':u'\u03a8', 'Delta':u'\u0394', 'Theta':u'\u0398', + 'Upsilon':u'\u03d2', 'Pi':u'\u03a0', 'Omega':u'\u03a9', + 'Gamma':u'\u0393', 'Lambda':u'\u039b'} + +letters = tex2unichar.mathalpha + +special = tex2unichar.mathbin # Binary symbols +special.update(tex2unichar.mathrel) # Relation symbols, arrow symbols +special.update(tex2unichar.mathord) # Miscellaneous symbols +special.update(tex2unichar.mathop) # Variable-sized symbols +special.update(tex2unichar.mathopen) # Braces +special.update(tex2unichar.mathclose) # Braces +special.update(tex2unichar.mathfence) + +sumintprod = ''.join([special[symbol] for symbol in + ['sum', 'int', 'oint', 'prod']]) + +functions = ['arccos', 'arcsin', 'arctan', 'arg', 'cos', 'cosh', + 'cot', 'coth', 'csc', 'deg', 'det', 'dim', + 'exp', 'gcd', 'hom', 'inf', 'ker', 'lg', + 'lim', 'liminf', 'limsup', 'ln', 'log', 'max', + 'min', 'Pr', 'sec', 'sin', 'sinh', 'sup', + 'tan', 'tanh', + 'injlim', 'varinjlim', 'varlimsup', + 'projlim', 'varliminf', 'varprojlim'] + + +mathbb = { + 'A': u'\U0001D538', + 'B': u'\U0001D539', + 'C': u'\u2102', + 'D': u'\U0001D53B', + 'E': u'\U0001D53C', + 'F': u'\U0001D53D', + 'G': u'\U0001D53E', + 'H': u'\u210D', + 'I': u'\U0001D540', + 'J': u'\U0001D541', + 'K': u'\U0001D542', + 'L': u'\U0001D543', + 'M': u'\U0001D544', + 'N': u'\u2115', + 'O': u'\U0001D546', + 'P': u'\u2119', + 'Q': u'\u211A', + 'R': u'\u211D', + 'S': u'\U0001D54A', + 'T': u'\U0001D54B', + 'U': u'\U0001D54C', + 'V': u'\U0001D54D', + 'W': u'\U0001D54E', + 'X': u'\U0001D54F', + 'Y': u'\U0001D550', + 'Z': u'\u2124', + } + +mathscr = { + 'A': u'\U0001D49C', + 'B': u'\u212C', # bernoulli function + 'C': u'\U0001D49E', + 'D': u'\U0001D49F', + 'E': u'\u2130', + 'F': u'\u2131', + 'G': u'\U0001D4A2', + 'H': u'\u210B', # hamiltonian + 'I': u'\u2110', + 'J': u'\U0001D4A5', + 'K': u'\U0001D4A6', + 'L': u'\u2112', # lagrangian + 'M': u'\u2133', # physics m-matrix + 'N': u'\U0001D4A9', + 'O': u'\U0001D4AA', + 'P': u'\U0001D4AB', + 'Q': u'\U0001D4AC', + 'R': u'\u211B', + 'S': u'\U0001D4AE', + 'T': u'\U0001D4AF', + 'U': u'\U0001D4B0', + 'V': u'\U0001D4B1', + 'W': u'\U0001D4B2', + 'X': u'\U0001D4B3', + 'Y': u'\U0001D4B4', + 'Z': u'\U0001D4B5', + 'a': u'\U0001D4B6', + 'b': u'\U0001D4B7', + 'c': u'\U0001D4B8', + 'd': u'\U0001D4B9', + 'e': u'\u212F', + 'f': u'\U0001D4BB', + 'g': u'\u210A', + 'h': u'\U0001D4BD', + 'i': u'\U0001D4BE', + 'j': u'\U0001D4BF', + 'k': u'\U0001D4C0', + 'l': u'\U0001D4C1', + 'm': u'\U0001D4C2', + 'n': u'\U0001D4C3', + 'o': u'\u2134', # order of + 'p': u'\U0001D4C5', + 'q': u'\U0001D4C6', + 'r': u'\U0001D4C7', + 's': u'\U0001D4C8', + 't': u'\U0001D4C9', + 'u': u'\U0001D4CA', + 'v': u'\U0001D4CB', + 'w': u'\U0001D4CC', + 'x': u'\U0001D4CD', + 'y': u'\U0001D4CE', + 'z': u'\U0001D4CF', + } + +negatables = {'=': u'\u2260', + '\in': u'\u2209', + '\equiv': u'\u2262'} + # LaTeX to MathML translation stuff: class math: """Base class for MathML elements.""" @@ -224,116 +358,6 @@ def xml_body(self): return [self.text] -# TeX spacing combining -over = {'acute': u'\u00B4', # u'\u0301', - 'bar': u'\u00AF', # u'\u0304', - 'breve': u'\u02D8', # u'\u0306', - 'check': u'\u02C7', # u'\u030C', - 'dot': u'\u02D9', # u'\u0307', - 'ddot': u'\u00A8', # u'\u0308', - 'dddot': u'\u20DB', - 'grave': u'`', # u'\u0300', - 'hat': u'^', # u'\u0302', - 'tilde': u'\u02DC', # u'\u0303', - # 'overline': # u'\u0305', - 'vec': u'\u20D7'} - -Greek = { # Upper case greek letters: - 'Phi':u'\u03a6', 'Xi':u'\u039e', 'Sigma':u'\u03a3', - 'Psi':u'\u03a8', 'Delta':u'\u0394', 'Theta':u'\u0398', - 'Upsilon':u'\u03d2', 'Pi':u'\u03a0', 'Omega':u'\u03a9', - 'Gamma':u'\u0393', 'Lambda':u'\u039b'} - -letters = { # Lower case greek letters (and dotless i, j): - # 'imath':u'i', 'jmath':u'i', # when used with combining accents - 'imath':u'\u0131', 'jmath':u'\u0237', - 'tau':u'\u03c4', 'phi':u'\u03d5', 'xi':u'\u03be', 'iota':u'\u03b9', - 'epsilon':u'\u03f5', 'varrho':u'\u03f1', 'varsigma':u'\u03c2', - 'beta':u'\u03b2', 'psi':u'\u03c8', 'rho':u'\u03c1', - 'delta':u'\u03b4', 'alpha':u'\u03b1', 'zeta':u'\u03b6', - 'omega':u'\u03c9', 'varepsilon':u'\u03b5', 'kappa':u'\u03ba', - 'vartheta':u'\u03d1', 'chi':u'\u03c7', 'upsilon':u'\u03c5', - 'sigma':u'\u03c3', 'varphi':u'\u03c6', 'varpi':u'\u03d6', - 'mu':u'\u03bc', 'eta':u'\u03b7', 'theta':u'\u03b8', 'pi':u'\u03c0', - 'varkappa':u'\u03f0', 'nu':u'\u03bd', 'gamma':u'\u03b3', - 'lambda':u'\u03bb'} - -special = { - # Binary operation symbols: - 'wedge':u'\u2227', 'diamond':u'\u22c4', 'star':u'\u22c6', - 'amalg':u'\u2a3f', 'ast':u'\u2217', 'odot':u'\u2299', - 'triangleleft':u'\u25c1', 'bigtriangleup':u'\u25b3', - 'ominus':u'\u2296', 'ddagger':u'\u2021', 'wr':u'\u2240', - 'otimes':u'\u2297', 'sqcup':u'\u2294', 'oplus':u'\u2295', - 'bigcirc':u'\u25cb', 'oslash':u'\u2298', 'sqcap':u'\u2293', - 'bullet':u'\u2219', 'cup':u'\u222a', 'cdot':u'\u22c5', - 'cap':u'\u2229', 'bigtriangledown':u'\u25bd', 'times':u'\xd7', - 'setminus':u'\u2216', 'circ':u'\u2218', 'vee':u'\u2228', - 'uplus':u'\u228e', 'mp':u'\u2213', 'dagger':u'\u2020', - 'triangleright':u'\u25b7', 'div':u'\xf7', 'pm':u'\xb1', - # Relation symbols: - 'subset':u'\u2282', 'propto':u'\u221d', 'geq':u'\u2265', - 'ge':u'\u2265', 'sqsubset':u'\u228f', 'Join':u'\u2a1d', - 'frown':u'\u2322', 'models':u'\u22a7', 'supset':u'\u2283', - 'in':u'\u2208', 'doteq':u'\u2250', 'dashv':u'\u22a3', - 'gg':u'\u226b', 'leq':u'\u2264', 'succ':u'\u227b', - 'vdash':u'\u22a2', 'cong':u'\u2245', 'simeq':u'\u2243', - 'subseteq':u'\u2286', 'parallel':u'\u2225', 'equiv':u'\u2261', - 'ni':u'\u220b', 'le':u'\u2264', 'approx':u'\u2248', - 'precsim':u'\u227e', 'sqsupset':u'\u2290', 'll':u'\u226a', - 'sqsupseteq':u'\u2292', 'mid':u'\u2223', 'prec':u'\u227a', - 'succsim':u'\u227f', 'bowtie':u'\u22c8', 'perp':u'\u27c2', - 'sqsubseteq':u'\u2291', 'asymp':u'\u224d', 'smile':u'\u2323', - 'supseteq':u'\u2287', 'sim':u'\u223c', 'neq':u'\u2260', - # Arrow symbols: - 'searrow':u'\u2198', 'updownarrow':u'\u2195', 'Uparrow':u'\u21d1', - 'longleftrightarrow':u'\u27f7', 'Leftarrow':u'\u21d0', - 'longmapsto':u'\u27fc', 'Longleftarrow':u'\u27f8', - 'nearrow':u'\u2197', 'hookleftarrow':u'\u21a9', - 'downarrow':u'\u2193', 'Leftrightarrow':u'\u21d4', - 'longrightarrow':u'\u27f6', 'rightharpoondown':u'\u21c1', - 'longleftarrow':u'\u27f5', 'rightarrow':u'\u2192', - 'Updownarrow':u'\u21d5', 'rightharpoonup':u'\u21c0', - 'Longleftrightarrow':u'\u27fa', 'leftarrow':u'\u2190', - 'mapsto':u'\u21a6', 'nwarrow':u'\u2196', 'uparrow':u'\u2191', - 'leftharpoonup':u'\u21bc', 'leftharpoondown':u'\u21bd', - 'Downarrow':u'\u21d3', 'leftrightarrow':u'\u2194', - 'Longrightarrow':u'\u27f9', 'swarrow':u'\u2199', - 'hookrightarrow':u'\u21aa', 'Rightarrow':u'\u21d2', - 'to':u'\u2192', - # Miscellaneous symbols: - 'infty':u'\u221e', 'surd':u'\u221a', - 'partial':u'\u2202', 'ddots':u'\u22f1', 'exists':u'\u2203', - 'flat':u'\u266d', 'diamondsuit':u'\u2662', 'wp':u'\u2118', - 'spadesuit':u'\u2660', 'Re':u'\u211c', 'vdots':u'\u22ee', - 'aleph':u'\u2135', 'clubsuit':u'\u2663', 'sharp':u'\u266f', - 'angle':u'\u2220', 'prime':u'\u2032', 'natural':u'\u266e', - 'ell':u'\u2113', 'neg':u'\xac', 'top':u'\u22a4', 'nabla':u'\u2207', - 'bot':u'\u22a5', 'heartsuit':u'\u2661', 'cdots':u'\u22ef', - 'Im':u'\u2111', 'forall':u'\u2200', - 'hbar':u'\u210f', 'emptyset':u'\u2205', - # Variable-sized symbols: - 'bigotimes':u'\u2a02', 'coprod':u'\u2210', 'int':u'\u222b', - 'sum':u'\u2211', 'bigodot':u'\u2a00', 'bigcup':u'\u22c3', - 'biguplus':u'\u2a04', 'bigcap':u'\u22c2', 'bigoplus':u'\u2a01', - 'oint':u'\u222e', 'bigvee':u'\u22c1', 'bigwedge':u'\u22c0', - 'prod':u'\u220f', - # Braces: - 'langle':u'\u2329', 'rangle':u'\u232A'} - -sumintprod = ''.join([special[symbol] for symbol in - ['sum', 'int', 'oint', 'prod']]) - -functions = ['arccos', 'arcsin', 'arctan', 'arg', 'cos', 'cosh', - 'cot', 'coth', 'csc', 'deg', 'det', 'dim', - 'exp', 'gcd', 'hom', 'inf', 'ker', 'lg', - 'lim', 'liminf', 'limsup', 'ln', 'log', 'max', - 'min', 'Pr', 'sec', 'sin', 'sinh', 'sup', - 'tan', 'tanh', - 'injlim', 'varinjlim', 'varlimsup', - 'projlim', 'varliminf', 'varprojlim'] - - def parse_latex_math(string, inline=True): """parse_latex_math(string [,inline]) -> MathML-tree @@ -435,95 +459,6 @@ return tree -mathbb = { - 'A': u'\U0001D538', - 'B': u'\U0001D539', - 'C': u'\u2102', - 'D': u'\U0001D53B', - 'E': u'\U0001D53C', - 'F': u'\U0001D53D', - 'G': u'\U0001D53E', - 'H': u'\u210D', - 'I': u'\U0001D540', - 'J': u'\U0001D541', - 'K': u'\U0001D542', - 'L': u'\U0001D543', - 'M': u'\U0001D544', - 'N': u'\u2115', - 'O': u'\U0001D546', - 'P': u'\u2119', - 'Q': u'\u211A', - 'R': u'\u211D', - 'S': u'\U0001D54A', - 'T': u'\U0001D54B', - 'U': u'\U0001D54C', - 'V': u'\U0001D54D', - 'W': u'\U0001D54E', - 'X': u'\U0001D54F', - 'Y': u'\U0001D550', - 'Z': u'\u2124', - } - -mathscr = { - 'A': u'\U0001D49C', - 'B': u'\u212C', # bernoulli function - 'C': u'\U0001D49E', - 'D': u'\U0001D49F', - 'E': u'\u2130', - 'F': u'\u2131', - 'G': u'\U0001D4A2', - 'H': u'\u210B', # hamiltonian - 'I': u'\u2110', - 'J': u'\U0001D4A5', - 'K': u'\U0001D4A6', - 'L': u'\u2112', # lagrangian - 'M': u'\u2133', # physics m-matrix - 'N': u'\U0001D4A9', - 'O': u'\U0001D4AA', - 'P': u'\U0001D4AB', - 'Q': u'\U0001D4AC', - 'R': u'\u211B', - 'S': u'\U0001D4AE', - 'T': u'\U0001D4AF', - 'U': u'\U0001D4B0', - 'V': u'\U0001D4B1', - 'W': u'\U0001D4B2', - 'X': u'\U0001D4B3', - 'Y': u'\U0001D4B4', - 'Z': u'\U0001D4B5', - 'a': u'\U0001D4B6', - 'b': u'\U0001D4B7', - 'c': u'\U0001D4B8', - 'd': u'\U0001D4B9', - 'e': u'\u212F', - 'f': u'\U0001D4BB', - 'g': u'\u210A', - 'h': u'\U0001D4BD', - 'i': u'\U0001D4BE', - 'j': u'\U0001D4BF', - 'k': u'\U0001D4C0', - 'l': u'\U0001D4C1', - 'm': u'\U0001D4C2', - 'n': u'\U0001D4C3', - 'o': u'\u2134', # order of - 'p': u'\U0001D4C5', - 'q': u'\U0001D4C6', - 'r': u'\U0001D4C7', - 's': u'\U0001D4C8', - 't': u'\U0001D4C9', - 'u': u'\U0001D4CA', - 'v': u'\U0001D4CB', - 'w': u'\U0001D4CC', - 'x': u'\U0001D4CD', - 'y': u'\U0001D4CE', - 'z': u'\U0001D4CF', - } - -negatables = {'=': u'\u2260', - '\in': u'\u2209', - '\equiv': u'\u2262'} - - def handle_keyword(name, node, string): skip = 0 if len(string) > 0 and string[0] == ' ': @@ -605,21 +540,21 @@ skip += 3 elif name == 'colon': # "normal" colon, not binary operator node = node.append(mo(':')) # TODO: add ``lspace="0pt"`` + elif name in Greek: # Greek capitals (upright in "TeX style") + node = node.append(mo(Greek[name])) + # TODO: "ISO style" sets them italic. Could we use a class argument + # to enable styling via CSS? elif name in letters: node = node.append(mi(letters[name])) - elif name in Greek: - node = node.append(mo(Greek[name])) elif name in special: node = node.append(mo(special[name])) elif name in functions: node = node.append(mo(name)) + elif name in over: + ovr = mover(mo(over[name]), reversed=True) + node.append(ovr) + node = ovr else: - chr = over.get(name) - if chr is not None: - ovr = mover(mo(chr), reversed=True) - node.append(ovr) - node = ovr - else: - raise SyntaxError(u'Unknown LaTeX command: ' + name) + raise SyntaxError(u'Unknown LaTeX command: ' + name) return node, skip Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/nodes.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/nodes.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/nodes.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: nodes.py 7054 2011-06-07 15:05:58Z milde $ +# $Id: nodes.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -120,7 +120,7 @@ Return true if we should stop the traversal. """ - stop = 0 + stop = False visitor.document.reporter.debug( 'docutils.nodes.Node.walk calling dispatch_visit for %s' % self.__class__.__name__) @@ -135,12 +135,12 @@ try: for child in children[:]: if child.walk(visitor): - stop = 1 + stop = True break except SkipSiblings: pass except StopTraversal: - stop = 1 + stop = True return stop def walkabout(self, visitor): @@ -155,8 +155,8 @@ Return true if we should stop the traversal. """ - call_depart = 1 - stop = 0 + call_depart = True + stop = False visitor.document.reporter.debug( 'docutils.nodes.Node.walkabout calling dispatch_visit for %s' % self.__class__.__name__) @@ -166,19 +166,19 @@ except SkipNode: return stop except SkipDeparture: - call_depart = 0 + call_depart = False children = self.children try: for child in children[:]: if child.walkabout(visitor): - stop = 1 + stop = True break except SkipSiblings: pass except SkipChildren: pass except StopTraversal: - stop = 1 + stop = True if call_depart: visitor.document.reporter.debug( 'docutils.nodes.Node.walkabout calling dispatch_departure ' @@ -203,8 +203,8 @@ result.extend(child._all_traverse()) return result - def traverse(self, condition=None, - include_self=1, descend=1, siblings=0, ascend=0): + def traverse(self, condition=None, include_self=True, descend=True, + siblings=False, ascend=False): """ Return an iterable containing @@ -236,12 +236,12 @@ [<emphasis>, <strong>, <#text: Foo>, <#text: Bar>] - and list(strong.traverse(ascend=1)) equals :: + and list(strong.traverse(ascend=True)) equals :: [<strong>, <#text: Foo>, <#text: Bar>, <reference>, <#text: Baz>] """ if ascend: - siblings=1 + siblings=True # Check for special argument combinations that allow using an # optimized version of traverse() if include_self and descend and not siblings: @@ -260,16 +260,17 @@ r.append(self) if descend and len(self.children): for child in self: - r.extend(child.traverse( - include_self=1, descend=1, siblings=0, ascend=0, - condition=condition)) + r.extend(child.traverse(include_self=True, descend=True, + siblings=False, ascend=False, + condition=condition)) if siblings or ascend: node = self while node.parent: index = node.parent.index(node) for sibling in node.parent[index+1:]: - r.extend(sibling.traverse(include_self=1, descend=descend, - siblings=0, ascend=0, + r.extend(sibling.traverse(include_self=True, + descend=descend, + siblings=False, ascend=False, condition=condition)) if not ascend: break @@ -277,8 +278,8 @@ node = node.parent return r - def next_node(self, condition=None, - include_self=0, descend=1, siblings=0, ascend=0): + def next_node(self, condition=None, include_self=False, descend=True, + siblings=False, ascend=False): """ Return the first node in the iterable returned by traverse(), or None if the iterable is empty. @@ -499,23 +500,29 @@ # 2to3 doesn't convert __unicode__ to __str__ __str__ = __unicode__ - def starttag(self): + def starttag(self, quoteattr=None): + # the optional arg is used by the docutils_xml writer + if quoteattr is None: + quoteattr = pseudo_quoteattr parts = [self.tagname] for name, value in self.attlist(): if value is None: # boolean attribute parts.append(name) - elif isinstance(value, list): + continue + if isinstance(value, list): values = [serial_escape('%s' % (v,)) for v in value] - parts.append('%s="%s"' % (name, ' '.join(values))) + value = ' '.join(values) else: - parts.append('%s="%s"' % (name, value)) - return '<%s>' % ' '.join(parts) + value = unicode(value) + value = quoteattr(value) + parts.append(u'%s=%s' % (name, value)) + return u'<%s>' % u' '.join(parts) def endtag(self): return '</%s>' % self.tagname def emptytag(self): - return u'<%s/>' % ' '.join([self.tagname] + + return u'<%s/>' % u' '.join([self.tagname] + ['%s="%s"' % (n, v) for n, v in self.attlist()]) @@ -1106,7 +1113,7 @@ def note_explicit_target(self, target, msgnode=None): id = self.set_id(target, msgnode) - self.set_name_id_map(target, id, msgnode, explicit=1) + self.set_name_id_map(target, id, msgnode, explicit=True) def note_refname(self, node): self.refnames.setdefault(node['refname'], []).append(node) @@ -1913,6 +1920,10 @@ """Escape string values that are elements of a list, for serialization.""" return value.replace('\\', r'\\').replace(' ', r'\ ') +def pseudo_quoteattr(value): + """Quote attributes for pseudo-xml""" + return '"%s"' % value + #  # # Local Variables: Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: __init__.py 7062 2011-06-30 22:14:29Z milde $ +# $Id: __init__.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -49,12 +49,12 @@ of customizability hasn't been implemented yet. Patches welcome! When instantiating an object of the `Parser` class, two parameters may be -passed: ``rfc2822`` and ``inliner``. Pass ``rfc2822=1`` to enable an initial -RFC-2822 style header block, parsed as a "field_list" element (with "class" -attribute set to "rfc2822"). Currently this is the only body-level element -which is customizable without subclassing. (Tip: subclass `Parser` and change -its "state_classes" and "initial_state" attributes to refer to new classes. -Contact the author if you need more details.) +passed: ``rfc2822`` and ``inliner``. Pass ``rfc2822=True`` to enable an +initial RFC-2822 style header block, parsed as a "field_list" element (with +"class" attribute set to "rfc2822"). Currently this is the only body-level +element which is customizable without subclassing. (Tip: subclass `Parser` +and change its "state_classes" and "initial_state" attributes to refer to new +classes. Contact the author if you need more details.) The ``inliner`` parameter takes an instance of `states.Inliner` or a subclass. It handles inline markup recognition. A common extension is the addition of @@ -131,12 +131,17 @@ 'validator': frontend.validate_boolean}), ('Enable the "raw" directive. Enabled by default.', ['--raw-enabled'], - {'action': 'store_true'}),)) + {'action': 'store_true'}), + ('Token name set for parsing code with Pygments: one of ' + '"long", "short", or "none (no parsing)". Default is "short".', + ['--syntax-highlight'], + {'choices': ['long', 'short', 'none'], + 'default': 'short', 'metavar': '<format>'}),)) config_section = 'restructuredtext parser' config_section_dependencies = ('parsers',) - def __init__(self, rfc2822=None, inliner=None): + def __init__(self, rfc2822=False, inliner=None): if rfc2822: self.initial_state = 'RFC2822Body' else: @@ -153,7 +158,7 @@ debug=document.reporter.debug_flag) inputlines = docutils.statemachine.string2lines( inputstring, tab_width=document.settings.tab_width, - convert_whitespace=1) + convert_whitespace=True) self.statemachine.run(inputlines, document, inliner=self.inliner) self.finish_parse() @@ -300,7 +305,6 @@ self.block_text = block_text self.state = state self.state_machine = state_machine - self.src, self.srcline = state_machine.get_source_and_line(lineno) def run(self): raise NotImplementedError('Must override run() is subclass.') @@ -316,8 +320,9 @@ at level `level`, which automatically gets the directive block and the line number added. - You'd often use self.error(message) instead, which will - generate an ERROR-level directive error. + Preferably use the `debug`, `info`, `warning`, `error`, or `severe` + wrapper methods, e.g. ``self.error(message)`` to generate an + ERROR-level directive error. """ return DirectiveError(level, message) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: __init__.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: __init__.py 7119 2011-09-02 13:00:23Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -17,6 +17,7 @@ _directive_registry = { 'attention': ('admonitions', 'Attention'), 'caution': ('admonitions', 'Caution'), + 'code': ('body', 'CodeBlock'), 'danger': ('admonitions', 'Danger'), 'error': ('admonitions', 'Error'), 'important': ('admonitions', 'Important'), @@ -222,7 +223,7 @@ Check for a positive argument of one of the units and return a normalized string of the form "<value><unit>" (without space in between). - + To be called from directive option conversion functions. """ match = re.match(r'^([0-9.]+) *(%s)$' % '|'.join(units), argument) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/body.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/body.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/body.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: body.py 7072 2011-07-06 15:52:30Z milde $ +# $Id: body.py 7267 2011-12-20 14:14:21Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -16,8 +16,8 @@ from docutils.parsers.rst import Directive from docutils.parsers.rst import directives from docutils.parsers.rst.roles import set_classes +from docutils.utils.code_analyzer import Lexer, LexerError, NumberLines - class BasePseudoSection(Directive): required_arguments = 1 @@ -115,6 +115,68 @@ return [node] + messages +class CodeBlock(Directive): + """Parse and mark up content of a code block. + + Configuration setting: syntax_highlight + Highlight Code content with Pygments? + Possible values: ('long', 'short', 'none') + + """ + optional_arguments = 1 + option_spec = {'class': directives.class_option, + 'name': directives.unchanged, + 'number-lines': directives.unchanged # integer or None + } + has_content = True + + def run(self): + self.assert_has_content() + if self.arguments: + language = self.arguments[0] + else: + language = '' + set_classes(self.options) + classes = ['code'] + if language: + classes.append(language) + if 'classes' in self.options: + classes.extend(self.options['classes']) + + # set up lexical analyzer + try: + tokens = Lexer(u'\n'.join(self.content), language, + self.state.document.settings.syntax_highlight) + except LexerError, error: + raise self.warning(error) + + if 'number-lines' in self.options: + # optional argument `startline`, defaults to 1 + try: + startline = int(self.options['number-lines'] or 1) + except ValueError: + raise self.error(':number-lines: with non-integer start value') + endline = startline + len(self.content) + # add linenumber filter: + tokens = NumberLines(tokens, startline, endline) + + node = nodes.literal_block('\n'.join(self.content), classes=classes) + self.add_name(node) + # if called from "include", set the source + if 'source' in self.options: + node.attributes['source'] = self.options['source'] + # analyze content and add nodes for every token + for classes, value in tokens: + # print (classes, value) + if classes: + node += nodes.inline(value, value, classes=classes) + else: + # insert as Text to decrease the verbosity of the output + node += nodes.Text(value, value) + + return [node] + + class MathBlock(Directive): option_spec = {'class': directives.class_option, Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/html.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/html.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/html.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: html.py 4667 2006-07-12 21:40:56Z wiemann $ +# $Id: html.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -41,8 +41,7 @@ line = self.state_machine.line msg = self.reporter.info( 'No content for meta tag "%s".' % name, - nodes.literal_block(line, line), - line=self.state_machine.abs_line_number()) + nodes.literal_block(line, line)) return msg, blank_finish tokens = name.split() try: @@ -58,8 +57,7 @@ line = self.state_machine.line msg = self.reporter.error( 'Error parsing meta tag attribute "%s": %s.' - % (token, detail), nodes.literal_block(line, line), - line=self.state_machine.abs_line_number()) + % (token, detail), nodes.literal_block(line, line)) return msg, blank_finish self.document.note_pending(pending) return pending, blank_finish @@ -76,7 +74,7 @@ node = nodes.Element() new_line_offset, blank_finish = self.state.nested_list_parse( self.content, self.content_offset, node, - initial_state='MetaBody', blank_finish=1, + initial_state='MetaBody', blank_finish=True, state_machine_kwargs=self.SMkwargs) if (new_line_offset - self.content_offset) != len(self.content): # incomplete parse of block? Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/images.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/images.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/images.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: images.py 7062 2011-06-30 22:14:29Z milde $ +# $Id: images.py 7256 2011-12-14 23:53:38Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -10,18 +10,22 @@ import sys +import urllib from docutils import nodes, utils from docutils.parsers.rst import Directive from docutils.parsers.rst import directives, states from docutils.nodes import fully_normalize_name, whitespace_normalize_name from docutils.parsers.rst.roles import set_classes - -try: - import Image as PIL # PIL +try: # check for the Python Imaging Library + import PIL except ImportError: - PIL = None + try: # sometimes PIL modules are put in PYTHONPATH's root + import Image + class PIL(object): pass # dummy wrapper + PIL.Image = Image + except ImportError: + PIL = None - class Image(Directive): align_h_values = ('left', 'center', 'right') @@ -121,15 +125,17 @@ figure_node = nodes.figure('', image_node) if figwidth == 'image': if PIL and self.state.document.settings.file_insertion_enabled: - # PIL doesn't like Unicode paths: + imagepath = urllib.url2pathname(image_node['uri']) try: - i = PIL.open(str(image_node['uri'])) - except (IOError, UnicodeError): - pass + img = PIL.Image.open( + imagepath.encode(sys.getfilesystemencoding())) + except (IOError, UnicodeEncodeError): + pass # TODO: warn? else: self.state.document.settings.record_dependencies.add( - image_node['uri']) - figure_node['width'] = i.size[0] + imagepath.replace('\\', '/')) + figure_node['width'] = img.size[0] + del img elif figwidth is not None: figure_node['width'] = figwidth if figclasses: Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/misc.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/misc.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/misc.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: misc.py 7072 2011-07-06 15:52:30Z milde $ +# $Id: misc.py 7328 2012-01-27 08:41:35Z milde $ # Authors: David Goodger <goodger@python.org>; Dethe Elza # Copyright: This module has been placed in the public domain. @@ -14,6 +14,8 @@ from docutils.error_reporting import SafeString, ErrorString from docutils.parsers.rst import Directive, convert_directive_function from docutils.parsers.rst import directives, roles, states +from docutils.parsers.rst.directives.body import CodeBlock, NumberLines +from docutils.parsers.rst.roles import set_classes from docutils.transforms import misc class Include(Directive): @@ -32,18 +34,23 @@ optional_arguments = 0 final_argument_whitespace = True option_spec = {'literal': directives.flag, + 'code': directives.unchanged, 'encoding': directives.encoding, 'tab-width': int, 'start-line': int, 'end-line': int, 'start-after': directives.unchanged_required, - 'end-before': directives.unchanged_required} + 'end-before': directives.unchanged_required, + # ignored except for 'literal' or 'code': + 'number-lines': directives.unchanged, # integer or None + 'class': directives.class_option, + 'name': directives.unchanged} standard_include_path = os.path.join(os.path.dirname(states.__file__), 'include') def run(self): - """Include a reST file as part of the content of this reST file.""" + """Include a file as part of the content of this reST file.""" if not self.state.document.settings.file_insertion_enabled: raise self.warning('"%s" directive disabled.' % self.name) source = self.state_machine.input_lines.source( @@ -98,20 +105,52 @@ raise self.severe('Problem with "end-before" option of "%s" ' 'directive:\nText not found.' % self.name) rawtext = rawtext[:before_index] + + include_lines = statemachine.string2lines(rawtext, tab_width, + convert_whitespace=True) if 'literal' in self.options: # Convert tabs to spaces, if `tab_width` is positive. if tab_width >= 0: text = rawtext.expandtabs(tab_width) else: text = rawtext - literal_block = nodes.literal_block(rawtext, text, source=path) + literal_block = nodes.literal_block(rawtext, source=path, + classes=self.options.get('class', [])) literal_block.line = 1 + self.add_name(literal_block) + if 'number-lines' in self.options: + try: + startline = int(self.options['number-lines'] or 1) + except ValueError: + raise self.error(':number-lines: with non-integer ' + 'start value') + endline = startline + len(include_lines) + if text.endswith('\n'): + text = text[:-1] + tokens = NumberLines([([], text)], startline, endline) + for classes, value in tokens: + if classes: + literal_block += nodes.inline(value, value, + classes=classes) + else: + literal_block += nodes.Text(value, value) + else: + literal_block += nodes.Text(text, text) return [literal_block] - else: - include_lines = statemachine.string2lines( - rawtext, tab_width, convert_whitespace=1) - self.state_machine.insert_input(include_lines, path) - return [] + if 'code' in self.options: + self.options['source'] = path + codeblock = CodeBlock(self.name, + [self.options.pop('code')], # arguments + self.options, + include_lines, # content + self.lineno, + self.content_offset, + self.block_text, + self.state, + self.state_machine) + return codeblock.run() + self.state_machine.insert_input(include_lines, path) + return [] class Raw(Directive): @@ -159,12 +198,14 @@ self.options['file'])) path = utils.relative_path(None, path) try: - self.state.document.settings.record_dependencies.add(path) raw_file = io.FileInput( source_path=path, encoding=encoding, error_handler=(self.state.document.settings.\ input_encoding_error_handler), handle_io_errors=None) + # TODO: currently, raw input files are recorded as + # dependencies even if not used for the chosen output format. + self.state.document.settings.record_dependencies.add(path) except IOError, error: raise self.severe(u'Problems with "%s" directive path:\n%s.' % (self.name, ErrorString(error))) @@ -199,6 +240,8 @@ # This will always fail because there is no content. self.assert_has_content() raw_node = nodes.raw('', text, **attributes) + (raw_node.source, + raw_node.line) = self.state_machine.get_source_and_line(self.lineno) return [raw_node] Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/parts.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/parts.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/parts.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: parts.py 7072 2011-07-06 15:52:30Z milde $ +# $Id: parts.py 7308 2012-01-06 12:08:43Z milde $ # Authors: David Goodger <goodger@python.org>; Dmitry Jemerov # Copyright: This module has been placed in the public domain. @@ -64,9 +64,8 @@ topic = nodes.topic(classes=['contents']) topic['classes'] += self.options.get('class', []) # the latex2e writer needs source and line for a warning: - src, srcline = self.state_machine.get_source_and_line() - topic.source = src - topic.line = srcline - 1 + topic.source, topic.line = self.state_machine.get_source_and_line() + topic.line -= 1 if 'local' in self.options: topic['classes'].append('local') if title: Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/tables.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/tables.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/directives/tables.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: tables.py 7072 2011-07-06 15:52:30Z milde $ +# $Id: tables.py 7328 2012-01-27 08:41:35Z milde $ # Authors: David Goodger <goodger@python.org>; David Priest # Copyright: This module has been placed in the public domain. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/af.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/af.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/af.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: af.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: af.py 7119 2011-09-02 13:00:23Z milde $ # Author: Jannie Hofmeyr <jhsh@sun.ac.za> # Copyright: This module has been placed in the public domain. @@ -18,6 +18,7 @@ directives = { 'aandag': 'attention', 'versigtig': 'caution', + 'code (translation required)': 'code', 'gevaar': 'danger', 'fout': 'error', 'wenk': 'hint', @@ -73,6 +74,7 @@ 'ab': 'abbreviation', 'akroniem': 'acronym', 'ac': 'acronym', + u'code (translation required)': 'code', 'indeks': 'index', 'i': 'index', 'voetskrif': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/ca.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/ca.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/ca.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: ca.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: ca.py 7119 2011-09-02 13:00:23Z milde $ # Author: Ivan Vilata i Balaguer <ivan@selidor.net> # Copyright: This module has been placed in the public domain. @@ -19,6 +19,7 @@ # language-dependent: fixed u'atenci\u00F3': 'attention', u'compte': 'caution', + u'code (translation required)': 'code', u'perill': 'danger', u'error': 'error', u'suggeriment': 'hint', @@ -84,6 +85,7 @@ u'ab': 'abbreviation', u'acr\u00F2nim': 'acronym', u'ac': 'acronym', + u'code (translation required)': 'code', u'\u00EDndex': 'index', u'i': 'index', u'sub\u00EDndex': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/cs.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/cs.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/cs.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: cs.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: cs.py 7119 2011-09-02 13:00:23Z milde $ # Author: Marek Blaha <mb@dat.cz> # Copyright: This module has been placed in the public domain. @@ -19,6 +19,7 @@ # language-dependent: fixed u'pozor': 'attention', u'caution (translation required)': 'caution', # jak rozlisit caution a warning? + u'code (translation required)': 'code', u'nebezpe\u010D\u00ED': 'danger', u'chyba': 'error', u'rada': 'hint', @@ -75,6 +76,7 @@ u'ab (translation required)': 'abbreviation', u'acronym (translation required)': 'acronym', u'ac (translation required)': 'acronym', + u'code (translation required)': 'code', u'index (translation required)': 'index', u'i (translation required)': 'index', u'subscript (translation required)': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/de.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/de.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/de.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,5 @@ -# $Id: de.py 6460 2010-10-29 22:18:44Z milde $ +# -*- coding: utf-8 -*- +# $Id: de.py 7223 2011-11-21 16:43:06Z milde $ # Authors: Engelbert Gruber <grubert@users.sourceforge.net>; # Lea Wiemann <LeWiemann@gmail.com> # Copyright: This module has been placed in the public domain. @@ -19,6 +20,7 @@ directives = { 'achtung': 'attention', 'vorsicht': 'caution', + 'code': 'code', 'gefahr': 'danger', 'fehler': 'error', 'hinweis': 'hint', @@ -35,7 +37,8 @@ 'rubrik': 'rubric', 'epigraph': 'epigraph', 'highlights (translation required)': 'highlights', - 'pull-quote (translation required)': 'pull-quote', # kasten too ? + u'pull-quote': 'pull-quote', # commonly used in German too + u'seitenansprache': 'pull-quote', # cf. http://www.typografie.info/2/wiki.php?title=Seitenansprache 'zusammengesetzt': 'compound', 'verbund': 'compound', u'container': 'container', @@ -44,13 +47,14 @@ 'csv-tabelle': 'csv-table', 'list-table (translation required)': 'list-table', u'mathe': 'math', + u'formel': 'math', 'meta': 'meta', #'imagemap': 'imagemap', 'bild': 'image', 'abbildung': 'figure', - u'unver\xe4ndert': 'raw', + u'unverändert': 'raw', u'roh': 'raw', - u'einf\xfcgen': 'include', + u'einfügen': 'include', 'ersetzung': 'replace', 'ersetzen': 'replace', 'ersetze': 'replace', @@ -63,18 +67,19 @@ 'inhalt': 'contents', 'kapitel-nummerierung': 'sectnum', 'abschnitts-nummerierung': 'sectnum', - u'linkziel-fu\xdfnoten': 'target-notes', + u'linkziel-fußfnoten': 'target-notes', u'header (translation required)': 'header', u'footer (translation required)': 'footer', - #u'fu\xdfnoten': 'footnotes', + #u'fußfnoten': 'footnotes', #'zitate': 'citations', } """German name to registered (in directives/__init__.py) directive name mapping.""" roles = { - u'abk\xfcrzung': 'abbreviation', + u'abkürzung': 'abbreviation', 'akronym': 'acronym', + u'code': 'code', 'index': 'index', 'tiefgestellt': 'subscript', 'hochgestellt': 'superscript', @@ -83,16 +88,16 @@ 'rfc-referenz': 'rfc-reference', 'betonung': 'emphasis', 'fett': 'strong', - u'w\xf6rtlich': 'literal', + u'wörtlich': 'literal', u'mathe': 'math', 'benannte-referenz': 'named-reference', 'unbenannte-referenz': 'anonymous-reference', - u'fu\xdfnoten-referenz': 'footnote-reference', + u'fußfnoten-referenz': 'footnote-reference', 'zitat-referenz': 'citation-reference', 'ersetzungs-referenz': 'substitution-reference', 'ziel': 'target', 'uri-referenz': 'uri-reference', - u'unver\xe4ndert': 'raw', + u'unverändert': 'raw', u'roh': 'raw',} """Mapping of German role names to canonical role names for interpreted text. """ Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/en.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/en.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/en.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: en.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: en.py 7179 2011-10-15 22:06:45Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -19,6 +19,9 @@ # language-dependent: fixed 'attention': 'attention', 'caution': 'caution', + 'code': 'code', + 'code-block': 'code', + 'sourcecode': 'code', 'danger': 'danger', 'error': 'error', 'hint': 'hint', @@ -75,6 +78,7 @@ 'ab': 'abbreviation', 'acronym': 'acronym', 'ac': 'acronym', + 'code': 'code', 'index': 'index', 'i': 'index', 'subscript': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/eo.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/eo.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/eo.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: eo.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: eo.py 7119 2011-09-02 13:00:23Z milde $ # Author: Marcelo Huerta San Martin <richieadler@users.sourceforge.net> # Copyright: This module has been placed in the public domain. @@ -19,6 +19,7 @@ # language-dependent: fixed u'atentu': 'attention', u'zorgu': 'caution', + u'code (translation required)': 'code', u'dangxero': 'danger', u'dan\u011dero': 'danger', u'eraro': 'error', @@ -82,6 +83,7 @@ u'mall': 'abbreviation', u'komenclitero': 'acronym', u'kl': 'acronym', + u'code (translation required)': 'code', u'indekso': 'index', u'i': 'index', u'subskribo': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/es.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/es.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/es.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# $Id: es.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: es.py 7119 2011-09-02 13:00:23Z milde $ # Author: Marcelo Huerta San Martín <richieadler@users.sourceforge.net> # Copyright: This module has been placed in the public domain. @@ -20,6 +20,7 @@ u'atenci\u00f3n': 'attention', u'atencion': 'attention', u'precauci\u00f3n': 'caution', + u'code (translation required)': 'code', u'precaucion': 'caution', u'peligro': 'danger', u'error': 'error', @@ -87,6 +88,7 @@ u'acronimo': 'acronym', u'acronimo': 'acronym', u'ac': 'acronym', + u'code (translation required)': 'code', u'indice': 'index', u'i': 'index', u'subindice': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/fi.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/fi.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/fi.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,5 @@ -# $Id: fi.py 6460 2010-10-29 22:18:44Z milde $ +# -*- coding: utf-8 -*- +# $Id: fi.py 7119 2011-09-02 13:00:23Z milde $ # Author: Asko Soukka <asko.soukka@iki.fi> # Copyright: This module has been placed in the public domain. @@ -19,6 +20,7 @@ # language-dependent: fixed u'huomio': u'attention', u'varo': u'caution', + u'code (translation required)': 'code', u'vaara': u'danger', u'virhe': u'error', u'vihje': u'hint', @@ -70,6 +72,7 @@ u'lyhennys': u'abbreviation', u'akronyymi': u'acronym', u'kirjainsana': u'acronym', + u'code (translation required)': 'code', u'hakemisto': u'index', u'luettelo': u'index', u'alaindeksi': u'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/fr.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/fr.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/fr.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: fr.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: fr.py 7119 2011-09-02 13:00:23Z milde $ # Authors: David Goodger <goodger@python.org>; William Dode # Copyright: This module has been placed in the public domain. @@ -18,6 +18,7 @@ directives = { u'attention': 'attention', u'pr\u00E9caution': 'caution', + u'code': 'code', u'danger': 'danger', u'erreur': 'error', u'conseil': 'hint', @@ -76,6 +77,7 @@ u'abr\u00E9viation': 'abbreviation', u'acronyme': 'acronym', u'sigle': 'acronym', + u'code': 'code', u'index': 'index', u'indice': 'subscript', u'ind': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/gl.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/gl.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/gl.py 2012-05-04 08:52:38 UTC (rev 655) @@ -22,6 +22,7 @@ # language-dependent: fixed u'atenci\u00f3n': 'attention', u'advertencia': 'caution', + u'code (translation required)': 'code', u'perigo': 'danger', u'erro': 'error', u'pista': 'hint', @@ -78,6 +79,7 @@ u'ab': 'abbreviation', u'acr\u00f3nimo': 'acronym', u'ac': 'acronym', + u'code (translation required)': 'code', u'\u00edndice': 'index', u'i': 'index', u'sub\u00edndice': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/he.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/he.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/he.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,5 @@ # Author: Meir Kriheli -# Id: $Id: he.py 6460 2010-10-29 22:18:44Z milde $ +# Id: $Id: he.py 7119 2011-09-02 13:00:23Z milde $ # Copyright: This module has been placed in the public domain. # New language mappings are welcome. Before doing a new translation, please @@ -19,6 +19,7 @@ # language-dependent: fixed u'\u05ea\u05e9\u05d5\u05de\u05ea \u05dc\u05d1': 'attention', u'\u05d6\u05d4\u05d9\u05e8\u05d5\u05ea': 'caution', + u'code (translation required)': 'code', u'\u05e1\u05db\u05e0\u05d4': 'danger', u'\u05e9\u05d2\u05d9\u05d0\u05d4' : 'error', u'\u05e8\u05de\u05d6': 'hint', @@ -75,6 +76,7 @@ 'ab': 'abbreviation', 'acronym': 'acronym', 'ac': 'acronym', + u'code (translation required)': 'code', 'index': 'index', 'i': 'index', u'\u05ea\u05d7\u05ea\u05d9': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/it.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/it.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/it.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: it.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: it.py 7119 2011-09-02 13:00:23Z milde $ # Authors: Nicola Larosa <docutils@tekNico.net>; # Lele Gaifax <lele@seldati.it> # Copyright: This module has been placed in the public domain. @@ -19,6 +19,7 @@ directives = { 'attenzione': 'attention', 'cautela': 'caution', + 'code (translation required)': 'code', 'pericolo': 'danger', 'errore': 'error', 'suggerimento': 'hint', @@ -73,6 +74,7 @@ roles = { 'abbreviazione': 'abbreviation', 'acronimo': 'acronym', + u'code (translation required)': 'code', 'indice': 'index', 'deponente': 'subscript', 'esponente': 'superscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/ja.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/ja.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/ja.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# $Id: ja.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: ja.py 7119 2011-09-02 13:00:23Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -22,6 +22,7 @@ # language-dependent: fixed u'注目': 'attention', u'注意': 'caution', + u'code (translation required)': 'code', u'危険': 'danger', u'エラー': 'error', u'ヒント': 'hint', @@ -88,6 +89,7 @@ # language-dependent: fixed u'略': 'abbreviation', u'頭字語': 'acronym', + u'code (translation required)': 'code', u'インデックス': 'index', u'索引': 'index', u'添字': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/lt.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/lt.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/lt.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,5 @@ # -*- coding: utf8 -*- -# $Id: lt.py 6459 2010-10-29 22:07:34Z milde $ +# $Id: lt.py 7119 2011-09-02 13:00:23Z milde $ # Author: Dalius Dobravolskas <dalius.do...@gmail.com> # Copyright: This module has been placed in the public domain. @@ -20,6 +20,7 @@ # language-dependent: fixed u'dėmesio': 'attention', u'atsargiai': 'caution', + u'code (translation required)': 'code', u'pavojinga': 'danger', u'klaida': 'error', u'užuomina': 'hint', @@ -76,6 +77,7 @@ 'sa': 'abbreviation', 'akronimas': 'acronym', 'ak': 'acronym', + u'code (translation required)': 'code', 'indeksas': 'index', 'i': 'index', u'apatinis-indeksas': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/nl.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/nl.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/nl.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: nl.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: nl.py 7119 2011-09-02 13:00:23Z milde $ # Author: Martijn Pieters <mjpieters@users.sourceforge.net> # Copyright: This module has been placed in the public domain. @@ -19,6 +19,7 @@ # language-dependent: fixed 'attentie': 'attention', 'let-op': 'caution', + 'code (translation required)': 'code', 'gevaar': 'danger', 'fout': 'error', 'hint': 'hint', @@ -77,6 +78,7 @@ # 'ab': 'abbreviation', 'acroniem': 'acronym', 'ac': 'acronym', + u'code (translation required)': 'code', 'index': 'index', 'i': 'index', 'inferieur': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/pl.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/pl.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/pl.py 2012-05-04 08:52:38 UTC (rev 655) @@ -19,6 +19,7 @@ # language-dependent: fixed u'uwaga': 'attention', u'ostro\u017cnie': 'caution', + u'code (translation required)': 'code', u'niebezpiecze\u0144stwo': 'danger', u'b\u0142\u0105d': 'error', u'wskaz\u00f3wka': 'hint', @@ -73,6 +74,7 @@ # language-dependent: fixed u'skr\u00f3t': 'abbreviation', u'akronim': 'acronym', + u'code (translation required)': 'code', u'indeks': 'index', u'indeks-dolny': 'subscript', u'indeks-g\u00f3rny': 'superscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/pt_br.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/pt_br.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/pt_br.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: pt_br.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: pt_br.py 7119 2011-09-02 13:00:23Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -19,6 +19,7 @@ # language-dependent: fixed u'aten\u00E7\u00E3o': 'attention', 'cuidado': 'caution', + u'code (translation required)': 'code', 'perigo': 'danger', 'erro': 'error', u'sugest\u00E3o': 'hint', @@ -75,6 +76,7 @@ 'ab': 'abbreviation', u'acr\u00F4nimo': 'acronym', 'ac': 'acronym', + u'code (translation required)': 'code', u'\u00EDndice-remissivo': 'index', 'i': 'index', 'subscrito': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/ru.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/ru.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/ru.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,5 @@ -# $Id: ru.py 6460 2010-10-29 22:18:44Z milde $ +# -*- coding: utf-8 -*- +# $Id: ru.py 7123 2011-09-12 08:28:31Z milde $ # Author: Roman Suzi <rnd@onego.ru> # Copyright: This module has been placed in the public domain. @@ -15,91 +16,74 @@ __docformat__ = 'reStructuredText' directives = { - u'\u0431\u043b\u043e\u043a-\u0441\u0442\u0440\u043e\u043a': u'line-block', + u'блок-строк': u'line-block', u'meta': u'meta', - 'math (translation required)': 'math', - u'\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0430\u043d\u043d\u044b\u0439-\u043b\u0438\u0442\u0435\u0440\u0430\u043b': - u'parsed-literal', - u'\u0432\u044b\u0434\u0435\u043b\u0435\u043d\u043d\u0430\u044f-\u0446\u0438\u0442\u0430\u0442\u0430': - u'pull-quote', + u'математика': 'math', + u'обработанный-литерал': u'parsed-literal', + u'выделенная-цитата': u'pull-quote', + u'код': 'code', u'compound (translation required)': 'compound', - u'container (translation required)': 'container', - u'table (translation required)': 'table', + u'контейнер': 'container', + u'таблица': 'table', u'csv-table (translation required)': 'csv-table', u'list-table (translation required)': 'list-table', - u'\u0441\u044b\u0440\u043e\u0439': u'raw', - u'\u0437\u0430\u043c\u0435\u043d\u0430': u'replace', - u'\u0442\u0435\u0441\u0442\u043e\u0432\u0430\u044f-\u0434\u0438\u0440\u0435\u043a\u0442\u0438\u0432\u0430-restructuredtext': - u'restructuredtext-test-directive', - u'\u0446\u0435\u043b\u0435\u0432\u044b\u0435-\u0441\u043d\u043e\u0441\u043a\u0438': - u'target-notes', + u'сырой': u'raw', + u'замена': u'replace', + u'тестовая-директива-restructuredtext': u'restructuredtext-test-directive', + u'целевые-сноски': u'target-notes', u'unicode': u'unicode', - u'\u0434\u0430\u0442\u0430': u'date', - u'\u0431\u043e\u043a\u043e\u0432\u0430\u044f-\u043f\u043e\u043b\u043e\u0441\u0430': - u'sidebar', - u'\u0432\u0430\u0436\u043d\u043e': u'important', - u'\u0432\u043a\u043b\u044e\u0447\u0430\u0442\u044c': u'include', - u'\u0432\u043d\u0438\u043c\u0430\u043d\u0438\u0435': u'attention', - u'\u0432\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u0435': u'highlights', - u'\u0437\u0430\u043c\u0435\u0447\u0430\u043d\u0438\u0435': u'admonition', - u'\u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435': - u'image', - u'\u043a\u043b\u0430\u0441\u0441': u'class', - u'role (translation required)': 'role', + u'дата': u'date', + u'боковая-полоса': u'sidebar', + u'важно': u'important', + u'включать': u'include', + u'внимание': u'attention', + u'выделение': u'highlights', + u'замечание': u'admonition', + u'изображение': u'image', + u'класс': u'class', + u'роль': 'role', u'default-role (translation required)': 'default-role', - u'title (translation required)': 'title', - u'\u043d\u043e\u043c\u0435\u0440-\u0440\u0430\u0437\u0434\u0435\u043b\u0430': - u'sectnum', - u'\u043d\u0443\u043c\u0435\u0440\u0430\u0446\u0438\u044f-\u0440\u0430\u0437' - u'\u0434\u0435\u043b\u043e\u0432': u'sectnum', - u'\u043e\u043f\u0430\u0441\u043d\u043e': u'danger', - u'\u043e\u0441\u0442\u043e\u0440\u043e\u0436\u043d\u043e': u'caution', - u'\u043e\u0448\u0438\u0431\u043a\u0430': u'error', - u'\u043f\u043e\u0434\u0441\u043a\u0430\u0437\u043a\u0430': u'tip', - u'\u043f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d' - u'\u0438\u0435': u'warning', - u'\u043f\u0440\u0438\u043c\u0435\u0447\u0430\u043d\u0438\u0435': u'note', - u'\u0440\u0438\u0441\u0443\u043d\u043e\u043a': u'figure', - u'\u0440\u0443\u0431\u0440\u0438\u043a\u0430': u'rubric', - u'\u0441\u043e\u0432\u0435\u0442': u'hint', - u'\u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435': u'contents', - u'\u0442\u0435\u043c\u0430': u'topic', - u'\u044d\u043f\u0438\u0433\u0440\u0430\u0444': u'epigraph', + u'титул': 'title', + u'номер-раздела': u'sectnum', + u'нумерация-разделов': u'sectnum', + u'опасно': u'danger', + u'осторожно': u'caution', + u'ошибка': u'error', + u'подсказка': u'tip', + u'предупреждение': u'warning', + u'примечание': u'note', + u'рисунок': u'figure', + u'рубрика': u'rubric', + u'совет': u'hint', + u'содержание': u'contents', + u'тема': u'topic', + u'эпиграф': u'epigraph', u'header (translation required)': 'header', u'footer (translation required)': 'footer',} """Russian name to registered (in directives/__init__.py) directive name mapping.""" roles = { - u'\u0430\u043a\u0440\u043e\u043d\u0438\u043c': 'acronym', - u'\u0430\u043d\u043e\u043d\u0438\u043c\u043d\u0430\u044f-\u0441\u0441\u044b\u043b\u043a\u0430': - 'anonymous-reference', - u'\u0431\u0443\u043a\u0432\u0430\u043b\u044c\u043d\u043e': 'literal', - 'math (translation required)': 'math', - u'\u0432\u0435\u0440\u0445\u043d\u0438\u0439-\u0438\u043d\u0434\u0435\u043a\u0441': - 'superscript', - u'\u0432\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u0435': 'emphasis', - u'\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u043d\u0430\u044f-\u0441\u0441\u044b\u043b\u043a\u0430': - 'named-reference', - u'\u0438\u043d\u0434\u0435\u043a\u0441': 'index', - u'\u043d\u0438\u0436\u043d\u0438\u0439-\u0438\u043d\u0434\u0435\u043a\u0441': - 'subscript', - u'\u0441\u0438\u043b\u044c\u043d\u043e\u0435-\u0432\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u0435': - 'strong', - u'\u0441\u043e\u043a\u0440\u0430\u0449\u0435\u043d\u0438\u0435': - 'abbreviation', - u'\u0441\u0441\u044b\u043b\u043a\u0430-\u0437\u0430\u043c\u0435\u043d\u0430': - 'substitution-reference', - u'\u0441\u0441\u044b\u043b\u043a\u0430-\u043d\u0430-pep': 'pep-reference', - u'\u0441\u0441\u044b\u043b\u043a\u0430-\u043d\u0430-rfc': 'rfc-reference', - u'\u0441\u0441\u044b\u043b\u043a\u0430-\u043d\u0430-uri': 'uri-reference', - u'\u0441\u0441\u044b\u043b\u043a\u0430-\u043d\u0430-\u0437\u0430\u0433\u043b\u0430\u0432\u0438\u0435': - 'title-reference', - u'\u0441\u0441\u044b\u043b\u043a\u0430-\u043d\u0430-\u0441\u043d\u043e\u0441\u043a\u0443': - 'footnote-reference', - u'\u0446\u0438\u0442\u0430\u0442\u043d\u0430\u044f-\u0441\u0441\u044b\u043b\u043a\u0430': - 'citation-reference', - u'\u0446\u0435\u043b\u044c': 'target', - u'raw (translation required)': 'raw',} + u'акроним': 'acronym', + u'код': 'code', + u'анонимная-ссылка': 'anonymous-reference', + u'буквально': 'literal', + u'математика': 'math', + u'верхний-индекс': 'superscript', + u'выделение': 'emphasis', + u'именованная-ссылка': 'named-reference', + u'индекс': 'index', + u'нижний-индекс': 'subscript', + u'сильное-выделение': 'strong', + u'сокращение': 'abbreviation', + u'ссылка-замена': 'substitution-reference', + u'ссылка-на-pep': 'pep-reference', + u'ссылка-на-rfc': 'rfc-reference', + u'ссылка-на-uri': 'uri-reference', + u'ссылка-на-заглавие': 'title-reference', + u'ссылка-на-сноску': 'footnote-reference', + u'цитатная-ссылка': 'citation-reference', + u'цель': 'target', + u'сырой': 'raw',} """Mapping of Russian role names to canonical role names for interpreted text. """ Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/sk.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/sk.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/sk.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: sk.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: sk.py 7119 2011-09-02 13:00:23Z milde $ # Author: Miroslav Vasko <zemiak@zoznam.sk> # Copyright: This module has been placed in the public domain. @@ -18,6 +18,7 @@ directives = { u'pozor': 'attention', u'opatrne': 'caution', + u'code (translation required)': 'code', u'nebezpe\xe8enstvo': 'danger', u'chyba': 'error', u'rada': 'hint', @@ -71,6 +72,7 @@ roles = { u'abbreviation (translation required)': 'abbreviation', u'acronym (translation required)': 'acronym', + u'code (translation required)': 'code', u'index (translation required)': 'index', u'subscript (translation required)': 'subscript', u'superscript (translation required)': 'superscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/sv.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/sv.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/sv.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: sv.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: sv.py 7119 2011-09-02 13:00:23Z milde $ # Author: Adam Chodorowski <chodorowski@users.sourceforge.net> # Copyright: This module has been placed in the public domain. @@ -17,6 +17,7 @@ directives = { u'observera': 'attention', u'caution (translation required)': 'caution', + u'code (translation required)': 'code', u'fara': 'danger', u'fel': 'error', u'v\u00e4gledning': 'hint', @@ -70,6 +71,7 @@ roles = { u'abbreviation (translation required)': 'abbreviation', u'acronym (translation required)': 'acronym', + u'code (translation required)': 'code', u'index (translation required)': 'index', u'subscript (translation required)': 'subscript', u'superscript (translation required)': 'superscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/zh_cn.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/zh_cn.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/zh_cn.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# $Id: zh_cn.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: zh_cn.py 7119 2011-09-02 13:00:23Z milde $ # Author: Panjunyong <panjy@zopechina.com> # Copyright: This module has been placed in the public domain. @@ -20,6 +20,7 @@ # language-dependent: fixed u'注意': 'attention', u'小心': 'caution', + u'code (translation required)': 'code', u'危险': 'danger', u'错误': 'error', u'提示': 'hint', @@ -73,6 +74,7 @@ # language-dependent: fixed u'缩写': 'abbreviation', u'简称': 'acronym', + u'code (translation required)': 'code', u'index (translation required)': 'index', u'i (translation required)': 'index', u'下标': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/zh_tw.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/zh_tw.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/languages/zh_tw.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# $Id: zh_tw.py 6460 2010-10-29 22:18:44Z milde $ +# $Id: zh_tw.py 7119 2011-09-02 13:00:23Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -20,6 +20,7 @@ # language-dependent: fixed 'attention (translation required)': 'attention', 'caution (translation required)': 'caution', + 'code (translation required)': 'code', 'danger (translation required)': 'danger', 'error (translation required)': 'error', 'hint (translation required)': 'hint', @@ -76,6 +77,7 @@ 'ab (translation required)': 'abbreviation', 'acronym (translation required)': 'acronym', 'ac (translation required)': 'acronym', + u'code (translation required)': 'code', 'index (translation required)': 'index', 'i (translation required)': 'index', 'subscript (translation required)': 'subscript', Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/roles.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/roles.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/roles.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: roles.py 6451 2010-10-25 08:02:43Z milde $ +# $Id: roles.py 7310 2012-01-09 15:01:15Z milde $ # Author: Edward Loper <edloper@gradient.cis.upenn.edu> # Copyright: This module has been placed in the public domain. @@ -75,6 +75,7 @@ from docutils import nodes, utils from docutils.parsers.rst import directives from docutils.parsers.rst.languages import en as _fallback_language_module +from docutils.utils.code_analyzer import Lexer, LexerError DEFAULT_INTERPRETED_ROLE = 'title-reference' """ @@ -308,12 +309,48 @@ return [prb], [msg] set_classes(options) node = nodes.raw(rawtext, utils.unescape(text, 1), **options) + node.source, node.line = inliner.reporter.get_source_and_line(lineno) return [node], [] raw_role.options = {'format': directives.unchanged} register_canonical_role('raw', raw_role) +def code_role(role, rawtext, text, lineno, inliner, options={}, content=[]): + set_classes(options) + language = options.get('language', '') + classes = ['code'] + if language: + classes.append(language) + if 'classes' in options: + classes.extend(options['classes']) + + try: + tokens = Lexer(utils.unescape(text, 1), language, + inliner.document.settings.syntax_highlight) + except LexerError, error: + msg = inliner.reporter.warning(error) + prb = inliner.problematic(rawtext, rawtext, msg) + return [prb], [msg] + + node = nodes.literal(rawtext, '', classes=classes) + + # analyze content and add nodes for every token + for classes, value in tokens: + # print (classes, value) + if classes: + node += nodes.inline(value, value, classes=classes) + else: + # insert as Text to decrease the verbosity of the output + node += nodes.Text(value, value) + + return [node], [] + +code_role.options = {'class': directives.class_option, + 'language': directives.unchanged} + +register_canonical_role('code', code_role) + def math_role(role, rawtext, text, lineno, inliner, options={}, content=[]): i = rawtext.find('`') text = rawtext.split('`')[1] Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/states.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/states.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/states.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: states.py 7072 2011-07-06 15:52:30Z milde $ +# $Id: states.py 7363 2012-02-20 21:31:48Z goodger $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -105,19 +105,23 @@ import sys import re -import roman +try: + import roman +except ImportError: + import docutils.utils.roman as roman from types import FunctionType, MethodType + from docutils import nodes, statemachine, utils, urischemes from docutils import ApplicationError, DataError from docutils.statemachine import StateMachineWS, StateWS from docutils.nodes import fully_normalize_name as normalize_name from docutils.nodes import whitespace_normalize_name -from docutils.utils import escape2null, unescape, column_width import docutils.parsers.rst from docutils.parsers.rst import directives, languages, tableparser, roles from docutils.parsers.rst.languages import en as _fallback_language_module +from docutils.utils import escape2null, unescape, column_width +from docutils.utils import punctuation_chars - class MarkupError(DataError): pass class UnknownInterpretedRoleError(DataError): pass class InterpretedRoleNotImplementedError(DataError): pass @@ -141,7 +145,7 @@ The entry point to reStructuredText parsing is the `run()` method. """ - def run(self, input_lines, document, input_offset=0, match_titles=1, + def run(self, input_lines, document, input_offset=0, match_titles=True, inliner=None): """ Parse `input_lines` and modify the `document` node in place. @@ -160,7 +164,7 @@ language=self.language, title_styles=[], section_level=0, - section_bubble_up_kludge=0, + section_bubble_up_kludge=False, inliner=inliner) self.document = document self.attach_observer(document.note_source) @@ -179,7 +183,7 @@ document structures. """ - def run(self, input_lines, input_offset, memo, node, match_titles=1): + def run(self, input_lines, input_offset, memo, node, match_titles=True): """ Parse `input_lines` and populate a `docutils.nodes.document` instance. @@ -209,7 +213,7 @@ nested_sm = NestedStateMachine nested_sm_cache = [] - def __init__(self, state_machine, debug=0): + def __init__(self, state_machine, debug=False): self.nested_sm_kwargs = {'state_classes': state_classes, 'initial_state': 'Body'} StateWS.__init__(self, state_machine, debug) @@ -223,9 +227,9 @@ self.document = memo.document self.parent = self.state_machine.node # enable the reporter to determine source and source-line - if not hasattr(self.reporter, 'locator'): - self.reporter.locator = self.state_machine.get_source_and_line - # print "adding locator to reporter", self.state_machine.input_offset + if not hasattr(self.reporter, 'get_source_and_line'): + self.reporter.get_source_and_line = self.state_machine.get_source_and_line + # print "adding get_source_and_line to reporter", self.state_machine.input_offset def goto_line(self, abs_line_offset): @@ -243,20 +247,18 @@ This code should never be run. """ - src, srcline = self.state_machine.get_source_and_line() self.reporter.severe( 'Internal error: no transition pattern match. State: "%s"; ' 'transitions: %s; context: %s; current line: %r.' % (self.__class__.__name__, transitions, context, - self.state_machine.line), - source=src, line=srcline) + self.state_machine.line)) return context, None, [] def bof(self, context): """Called at beginning of file.""" return [], [] - def nested_parse(self, block, input_offset, node, match_titles=0, + def nested_parse(self, block, input_offset, node, match_titles=False, state_machine_class=None, state_machine_kwargs=None): """ Create a new StateMachine rooted at `node` and run it over the input @@ -297,7 +299,7 @@ blank_finish, blank_finish_state=None, extra_settings={}, - match_titles=0, + match_titles=False, state_machine_class=None, state_machine_kwargs=None): """ @@ -359,7 +361,7 @@ if level <= mylevel: # sibling or supersection memo.section_level = level # bubble up to parent section if len(style) == 2: - memo.section_bubble_up_kludge = 1 + memo.section_bubble_up_kludge = True # back up 2 lines for underline title, 3 for overline title self.state_machine.previous_line(len(style) + 1) raise EOFError # let parent section re-evaluate @@ -370,10 +372,9 @@ return None def title_inconsistent(self, sourcetext, lineno): - src, srcline = self.state_machine.get_source_and_line(lineno) error = self.reporter.severe( 'Title level inconsistent:', nodes.literal_block('', sourcetext), - source=src, line=srcline) + line=lineno) return error def new_subsection(self, title, lineno, messages): @@ -395,7 +396,7 @@ absoffset = self.state_machine.abs_line_offset() + 1 newabsoffset = self.nested_parse( self.state_machine.input_lines[offset:], input_offset=absoffset, - node=section_node, match_titles=1) + node=section_node, match_titles=True) self.goto_line(newabsoffset) if memo.section_level <= mylevel: # can't handle next section? raise EOFError # bubble up to supersection @@ -431,13 +432,13 @@ def unindent_warning(self, node_name): # the actual problem is one line below the current line - src, srcline = self.state_machine.get_source_and_line() + lineno = self.state_machine.abs_line_number()+1 return self.reporter.warning('%s ends without a blank line; ' 'unexpected unindent.' % node_name, - source=src, line=srcline+1) + line=lineno) -def build_regexp(definition, compile=1): +def build_regexp(definition, compile=True): """ Build, compile and return a regular expression based on `definition`. @@ -528,15 +529,18 @@ processed += self.implicit_inline(remaining, lineno) return processed, messages - openers = u'\'"([{<\u2018\u201c\xab\u00a1\u00bf' # see quoted_start below - closers = u'\'")]}>\u2019\u201d\xbb!?' - unicode_delimiters = u'\u2010\u2011\u2012\u2013\u2014\u00a0' - start_string_prefix = (u'((?<=^)|(?<=[-/: \\n\u2019%s%s]))' - % (re.escape(unicode_delimiters), - re.escape(openers))) - end_string_suffix = (r'((?=$)|(?=[-/:.,; \n\x00%s%s]))' - % (re.escape(unicode_delimiters), - re.escape(closers))) + # Inline object recognition + # ------------------------- + # lookahead and look-behind expressions for inline markup rules + start_string_prefix = (u'(^|(?<=\\s|[%s%s]))' % + (punctuation_chars.openers, + punctuation_chars.delimiters)) + end_string_suffix = (u'($|(?=\\s|[\x00%s%s%s]))' % + (punctuation_chars.closing_delimiters, + punctuation_chars.delimiters, + punctuation_chars.closers)) + # print start_string_prefix.encode('utf8') + # TODO: support non-ASCII whitespace in the following 4 patterns? non_whitespace_before = r'(?<![ \n])' non_whitespace_escape_before = r'(?<![ \n\x00])' non_unescaped_whitespace_escape_before = r'(?<!(?<!\x00)[ \n\x00])' @@ -589,9 +593,9 @@ patterns = Struct( initial=build_regexp(parts), emphasis=re.compile(non_whitespace_escape_before - + r'(\*)' + end_string_suffix), + + r'(\*)' + end_string_suffix, re.UNICODE), strong=re.compile(non_whitespace_escape_before - + r'(\*\*)' + end_string_suffix), + + r'(\*\*)' + end_string_suffix, re.UNICODE), interpreted_or_phrase_ref=re.compile( r""" %(non_unescaped_whitespace_escape_before)s @@ -615,7 +619,7 @@ > # close bracket w/o whitespace before ) $ # end of string - """ % locals(), re.VERBOSE), + """ % locals(), re.VERBOSE | re.UNICODE), literal=re.compile(non_whitespace_before + '(``)' + end_string_suffix), target=re.compile(non_whitespace_escape_before @@ -623,7 +627,8 @@ substitution_ref=re.compile(non_whitespace_escape_before + r'(\|_{0,2})' + end_string_suffix), - email=re.compile(email_pattern % locals() + '$', re.VERBOSE), + email=re.compile(email_pattern % locals() + '$', + re.VERBOSE | re.UNICODE), uri=re.compile( (r""" %(start_string_prefix)s @@ -655,7 +660,7 @@ ) ) %(end_string_suffix)s - """) % locals(), re.VERBOSE), + """) % locals(), re.VERBOSE | re.UNICODE), pep=re.compile( r""" %(start_string_prefix)s @@ -664,34 +669,33 @@ | (PEP\s+(?P<pepnum2>\d+)) # reference by name ) - %(end_string_suffix)s""" % locals(), re.VERBOSE), + %(end_string_suffix)s""" % locals(), re.VERBOSE | re.UNICODE), rfc=re.compile( r""" %(start_string_prefix)s (RFC(-|\s+)?(?P<rfcnum>\d+)) - %(end_string_suffix)s""" % locals(), re.VERBOSE)) + %(end_string_suffix)s""" % locals(), re.VERBOSE | re.UNICODE)) def quoted_start(self, match): - """Return 1 if inline markup start-string is 'quoted', 0 if not.""" + """Test if inline markup start-string is 'quoted'. + + 'Quoted' in this context means the start-string is enclosed in a pair + of matching opening/closing delimiters (not necessarily quotes) + or at the end of the match. + """ string = match.string start = match.start() - end = match.end() if start == 0: # start-string at beginning of text - return 0 + return False prestart = string[start - 1] try: - poststart = string[end] - if self.openers.index(prestart) \ - == self.closers.index(poststart): # quoted - return 1 - except IndexError: # start-string at end of text - return 1 - except ValueError: # not quoted - pass - return 0 + poststart = string[match.end()] + except IndexError: # start-string at end of text + return True # not "quoted" but no markup start-string either + return punctuation_chars.match_chars(prestart, poststart) def inline_obj(self, match, lineno, end_pattern, nodeclass, - restore_backslashes=0): + restore_backslashes=False): string = match.string matchstart = match.start('start') matchend = match.end('start') @@ -791,6 +795,7 @@ uri = self.adjust_uri(uri) if uri: target = nodes.target(match.group(1), refuri=uri) + target.referenced = 1 else: raise ApplicationError('problem with URI: %r' % uri_text) if not text: @@ -840,7 +845,7 @@ def literal(self, match, lineno): before, inlines, remaining, sysmessages, endstring = self.inline_obj( match, lineno, self.patterns.literal, nodes.literal, - restore_backslashes=1) + restore_backslashes=True) return before, inlines, remaining, sysmessages def inline_internal_target(self, match, lineno): @@ -910,7 +915,7 @@ before = before.rstrip() return (before, [refnode], remaining, []) - def reference(self, match, lineno, anonymous=None): + def reference(self, match, lineno, anonymous=False): referencename = match.group('refname') refname = normalize_name(referencename) referencenode = nodes.reference( @@ -1044,7 +1049,7 @@ enum.sequenceregexps = {} for sequence in enum.sequences: enum.sequenceregexps[sequence] = re.compile( - enum.sequencepats[sequence] + '$') + enum.sequencepats[sequence] + '$', re.UNICODE) grid_table_top_pat = re.compile(r'\+-[-+]+-\+ *$') """Matches the top (& bottom) of a full table).""" @@ -1136,7 +1141,8 @@ return elements # U+2014 is an em-dash: - attribution_pattern = re.compile(u'(---?(?!-)|\u2014) *(?=[^ \\n])') + attribution_pattern = re.compile(u'(---?(?!-)|\u2014) *(?=[^ \\n])', + re.UNICODE) def split_attribution(self, indented, line_offset): """ @@ -1198,10 +1204,7 @@ lineno = self.state_machine.abs_line_number() + line_offset textnodes, messages = self.inline_text(text, lineno) node = nodes.attribution(text, '', *textnodes) - node.line = lineno - # report with source and source-line results in - # ``IndexError: list index out of range`` - # node.source, node.line = self.state_machine.get_source_and_line(lineno) + node.source, node.line = self.state_machine.get_source_and_line(lineno) return node, messages def bullet(self, match, context, next_state): @@ -1250,10 +1253,9 @@ enumlist['suffix'] = self.enum.formatinfo[format].suffix if ordinal != 1: enumlist['start'] = ordinal - src, srcline = self.state_machine.get_source_and_line() msg = self.reporter.info( 'Enumerated list start value not ordinal-1: "%s" (ordinal %s)' - % (text, ordinal), source=src, line=srcline) + % (text, ordinal)) self.parent += msg listitem, blank_finish = self.list_item(match.end()) enumlist += listitem @@ -1442,9 +1444,8 @@ listitem, blank_finish = self.option_list_item(match) except MarkupError, error: # This shouldn't happen; pattern won't match. - src, srcline = self.state_machine.get_source_and_line() msg = self.reporter.error(u'Invalid option list marker: %s' % - error, source=src, line=srcline) + error) self.parent += msg indented, indent, line_offset, blank_finish = \ self.state_machine.get_first_known_indented(match.end()) @@ -1495,7 +1496,7 @@ for optionstring in optionstrings: tokens = optionstring.split() delimiter = ' ' - firstopt = tokens[0].split('=') + firstopt = tokens[0].split('=', 1) if len(firstopt) > 1: # "--opt=value" form tokens[:1] = firstopt @@ -1546,10 +1547,9 @@ blank_finish=0) self.goto_line(new_line_offset) if not blank_finish: - src, srcline = self.state_machine.get_source_and_line() self.parent += self.reporter.warning( 'Line block ends without a blank line.', - source=src, line=srcline+1) + line=lineno+1) if len(block): if block[0].indent is None: block[0].indent = 0 @@ -1559,8 +1559,8 @@ def line_block_line(self, match, lineno): """Return one line element of a line_block.""" indented, indent, line_offset, blank_finish = \ - self.state_machine.get_first_known_indented(match.end(), - until_blank=1) + self.state_machine.get_first_known_indented(match.end(), + until_blank=True) text = u'\n'.join(indented) text_nodes, messages = self.inline_text(text, lineno) line = nodes.line(text, '', *text_nodes) @@ -1611,10 +1611,9 @@ nodelist, blank_finish = self.table(isolate_function, parser_class) self.parent += nodelist if not blank_finish: - src, srcline = self.state_machine.get_source_and_line() msg = self.reporter.warning( 'Blank line required after table.', - source=src, line=srcline+1) + line=self.state_machine.abs_line_number()+1) self.parent += msg return [], next_state, [] @@ -1629,9 +1628,9 @@ + 1) table = self.build_table(tabledata, tableline) nodelist = [table] + messages - except tableparser.TableMarkupError, detail: - nodelist = self.malformed_table( - block, ' '.join(detail.args)) + messages + except tableparser.TableMarkupError, err: + nodelist = self.malformed_table(block, ' '.join(err.args), + offset=err.offset) + messages else: nodelist = messages return nodelist, blank_finish @@ -1640,9 +1639,9 @@ messages = [] blank_finish = 1 try: - block = self.state_machine.get_text_block(flush_left=1) - except statemachine.UnexpectedIndentationError, instance: - block, src, srcline = instance.args + block = self.state_machine.get_text_block(flush_left=True) + except statemachine.UnexpectedIndentationError, err: + block, src, srcline = err.args messages.append(self.reporter.error('Unexpected indentation.', source=src, line=srcline)) blank_finish = 0 @@ -1717,16 +1716,15 @@ block.pad_double_width(self.double_width_pad_char) return block, [], end == limit or not lines[end+1].strip() - def malformed_table(self, block, detail=''): + def malformed_table(self, block, detail='', offset=0): block.replace(self.double_width_pad_char, '') data = '\n'.join(block) message = 'Malformed table.' startline = self.state_machine.abs_line_number() - len(block) + 1 - src, srcline = self.state_machine.get_source_and_line(startline) if detail: message += '\n' + detail error = self.reporter.error(message, nodes.literal_block(data, data), - source=src, line=srcline) + line=startline+offset) return [error] def build_table(self, tabledata, tableline, stub_columns=0): @@ -1793,7 +1791,7 @@ [ ]? # optional space : # end of reference name ([ ]+|$) # followed by whitespace - """ % vars(Inliner), re.VERBOSE), + """ % vars(Inliner), re.VERBOSE | re.UNICODE), reference=re.compile(r""" ( (?P<simple>%(simplename)s)_ @@ -1815,7 +1813,8 @@ \| # close delimiter ) ([ ]+|$) # followed by whitespace - """ % vars(Inliner), re.VERBOSE),) + """ % vars(Inliner), + re.VERBOSE | re.UNICODE),) def footnote(self, match): src, srcline = self.state_machine.get_source_and_line() @@ -1868,15 +1867,14 @@ def hyperlink_target(self, match): pattern = self.explicit.patterns.target lineno = self.state_machine.abs_line_number() - src, srcline = self.state_machine.get_source_and_line() block, indent, offset, blank_finish = \ self.state_machine.get_first_known_indented( - match.end(), until_blank=1, strip_indent=0) + match.end(), until_blank=True, strip_indent=False) blocktext = match.string[:match.end()] + '\n'.join(block) block = [escape2null(line) for line in block] escaped = block[0] blockindex = 0 - while 1: + while True: targetmatch = pattern.match(escaped) if targetmatch: break @@ -1954,12 +1952,12 @@ src, srcline = self.state_machine.get_source_and_line() block, indent, offset, blank_finish = \ self.state_machine.get_first_known_indented(match.end(), - strip_indent=0) + strip_indent=False) blocktext = (match.string[:match.end()] + '\n'.join(block)) block.disconnect() escaped = escape2null(block[0].rstrip()) blockindex = 0 - while 1: + while True: subdefmatch = pattern.match(escaped) if subdefmatch: break @@ -2062,7 +2060,6 @@ from docutils.parsers.rst import convert_directive_function directive = convert_directive_function(directive) lineno = self.state_machine.abs_line_number() - src, srcline = self.state_machine.get_source_and_line() initial_line_offset = self.state_machine.line_offset indented, indent, line_offset, blank_finish \ = self.state_machine.get_first_known_indented(match.end(), @@ -2077,8 +2074,7 @@ error = self.reporter.error( 'Error in "%s" directive:\n%s.' % (type_name, ' '.join(detail.args)), - nodes.literal_block(block_text, block_text), - source=src, line=srcline) + nodes.literal_block(block_text, block_text), line=lineno) return [error], blank_finish directive_instance = directive( type_name, arguments, options, content, lineno, @@ -2087,7 +2083,7 @@ result = directive_instance.run() except docutils.parsers.rst.DirectiveError, error: msg_node = self.reporter.system_message(error.level, error.msg, - source=src, line=srcline) + line=lineno) msg_node += nodes.literal_block(block_text, block_text) result = [msg_node] assert isinstance(result, list), \ @@ -2147,8 +2143,8 @@ def parse_directive_options(self, option_presets, option_spec, arg_block): options = option_presets.copy() - for i in range(len(arg_block)): - if arg_block[i][:1] == ':': + for i, line in enumerate(arg_block): + if re.match(Body.patterns['field_marker'], line): opt_block = arg_block[i:] arg_block = arg_block[:i] break @@ -2197,7 +2193,7 @@ node = nodes.field_list() newline_offset, blank_finish = self.nested_list_parse( datalines, 0, node, initial_state='ExtensionOptions', - blank_finish=1) + blank_finish=True) if newline_offset != len(datalines): # incomplete parse of block return 0, 'invalid option block' try: @@ -2214,13 +2210,13 @@ return 0, 'option data incompletely parsed' def unknown_directive(self, type_name): - src, srcline = self.state_machine.get_source_and_line() + lineno = self.state_machine.abs_line_number() indented, indent, offset, blank_finish = \ - self.state_machine.get_first_known_indented(0, strip_indent=0) + self.state_machine.get_first_known_indented(0, strip_indent=False) text = '\n'.join(indented) error = self.reporter.error( 'Unknown directive type "%s".' % type_name, - nodes.literal_block(text, text), source=src, line=srcline) + nodes.literal_block(text, text), line=lineno) return [error], blank_finish def comment(self, match): @@ -2262,13 +2258,13 @@ \.\.[ ]+ # explicit markup start _ # target indicator (?![ ]|$) # first char. not space or EOL - """, re.VERBOSE)), + """, re.VERBOSE | re.UNICODE)), (substitution_def, re.compile(r""" \.\.[ ]+ # explicit markup start \| # substitution indicator (?![ ]|$) # first char. not space or EOL - """, re.VERBOSE)), + """, re.VERBOSE | re.UNICODE)), (directive, re.compile(r""" \.\.[ ]+ # explicit markup start @@ -2293,11 +2289,10 @@ if expmatch: try: return method(self, expmatch) - except MarkupError, error: # never reached? + except MarkupError, error: + lineno = self.state_machine.abs_line_number() message = ' '.join(error.args) - src, srcline = self.state_machine.get_source_and_line() - errors.append(self.reporter.warning( - message, source=src, line=srcline)) + errors.append(self.reporter.warning(message, line=lineno)) break nodelist, blank_finish = self.comment(match) return nodelist + errors, blank_finish @@ -2328,8 +2323,8 @@ def anonymous_target(self, match): lineno = self.state_machine.abs_line_number() block, indent, offset, blank_finish \ - = self.state_machine.get_first_known_indented(match.end(), - until_blank=1) + = self.state_machine.get_first_known_indented(match.end(), + until_blank=True) blocktext = match.string[:match.end()] + '\n'.join(block) block = [escape2null(line) for line in block] target = self.make_target(block, blocktext, lineno, '') @@ -2397,7 +2392,7 @@ name = match.string[:match.string.find(':')] indented, indent, line_offset, blank_finish = \ self.state_machine.get_first_known_indented(match.end(), - until_blank=1) + until_blank=True) fieldnode = nodes.field() fieldnode += nodes.field_name(name, name) fieldbody = nodes.field_body('\n'.join(indented)) @@ -2674,7 +2669,6 @@ def underline(self, match, context, next_state): """Section title.""" lineno = self.state_machine.abs_line_number() - src, srcline = self.state_machine.get_source_and_line() title = context[0].rstrip() underline = match.string.rstrip() source = title + '\n' + underline @@ -2685,20 +2679,23 @@ msg = self.reporter.info( 'Possible title underline, too short for the title.\n' "Treating it as ordinary text because it's so short.", - source=src, line=srcline) + line=lineno) self.parent += msg raise statemachine.TransitionCorrection('text') else: blocktext = context[0] + '\n' + self.state_machine.line - msg = self.reporter.warning( - 'Title underline too short.', - nodes.literal_block(blocktext, blocktext), - source=src, line=srcline) + msg = self.reporter.warning('Title underline too short.', + nodes.literal_block(blocktext, blocktext), line=lineno) messages.append(msg) if not self.state_machine.match_titles: blocktext = context[0] + '\n' + self.state_machine.line - msg = self.reporter.severe( - 'Unexpected section title.', + # We need get_source_and_line() here to report correctly + src, srcline = self.state_machine.get_source_and_line() + # TODO: why is abs_line_number() == srcline+1 + # if the error is in a table (try with test_tables.py)? + # print "get_source_and_line", srcline + # print "abs_line_number", self.state_machine.abs_line_number() + msg = self.reporter.severe('Unexpected section title.', nodes.literal_block(blocktext, blocktext), source=src, line=srcline) self.parent += messages @@ -2714,9 +2711,9 @@ startline = self.state_machine.abs_line_number() - 1 msg = None try: - block = self.state_machine.get_text_block(flush_left=1) - except statemachine.UnexpectedIndentationError, instance: - block, src, srcline = instance.args + block = self.state_machine.get_text_block(flush_left=True) + except statemachine.UnexpectedIndentationError, err: + block, src, srcline = err.args msg = self.reporter.error('Unexpected indentation.', source=src, line=srcline) lines = context + list(block) @@ -2753,7 +2750,7 @@ parent_node = nodes.Element() new_abs_offset = self.nested_parse( self.state_machine.input_lines[offset:], - input_offset=abs_line_offset, node=parent_node, match_titles=0, + input_offset=abs_line_offset, node=parent_node, match_titles=False, state_machine_kwargs={'state_classes': (QuotedLiteralBlock,), 'initial_state': 'QuotedLiteralBlock'}) self.goto_line(new_abs_offset) @@ -2762,23 +2759,22 @@ def definition_list_item(self, termline): indented, indent, line_offset, blank_finish = \ self.state_machine.get_indented() - definitionlistitem = nodes.definition_list_item( + itemnode = nodes.definition_list_item( '\n'.join(termline + list(indented))) lineno = self.state_machine.abs_line_number() - 1 - src, srcline = self.state_machine.get_source_and_line() - definitionlistitem.source = src - definitionlistitem.line = srcline - 1 + (itemnode.source, + itemnode.line) = self.state_machine.get_source_and_line(lineno) termlist, messages = self.term(termline, lineno) - definitionlistitem += termlist + itemnode += termlist definition = nodes.definition('', *messages) - definitionlistitem += definition + itemnode += definition if termline[0][-2:] == '::': definition += self.reporter.info( 'Blank line missing before literal block (after the "::")? ' 'Interpreted as a definition list item.', - source=src, line=srcline) + line=lineno+1) self.nested_parse(indented, input_offset=line_offset, node=definition) - return definitionlistitem, blank_finish + return itemnode, blank_finish classifier_delimiter = re.compile(' +: +') @@ -2839,8 +2835,8 @@ def indent(self, match, context, next_state): """Definition list item.""" - definitionlistitem, blank_finish = self.definition_list_item(context) - self.parent += definitionlistitem + itemnode, blank_finish = self.definition_list_item(context) + self.parent += itemnode self.blank_finish = blank_finish return [], 'DefinitionList', [] @@ -2858,7 +2854,7 @@ """Transition marker at end of section or document.""" marker = context[0].strip() if self.memo.section_bubble_up_kludge: - self.memo.section_bubble_up_kludge = 0 + self.memo.section_bubble_up_kludge = False elif len(marker) < 4: self.state_correction(context) if self.eofcheck: # ignore EOFError with sections @@ -2884,7 +2880,6 @@ def text(self, match, context, next_state): """Potential over- & underlined title.""" lineno = self.state_machine.abs_line_number() - 1 - src, srcline = self.state_machine.get_source_and_line() overline = context[0] title = match.string underline = '' @@ -2898,7 +2893,7 @@ msg = self.reporter.severe( 'Incomplete section title.', nodes.literal_block(blocktext, blocktext), - source=src, line=srcline-1) + line=lineno) self.parent += msg return [], 'Body', [] source = '%s\n%s\n%s' % (overline, title, underline) @@ -2912,7 +2907,7 @@ msg = self.reporter.severe( 'Missing matching underline for section title overline.', nodes.literal_block(source, source), - source=src, line=srcline-1) + line=lineno) self.parent += msg return [], 'Body', [] elif overline != underline: @@ -2923,7 +2918,7 @@ msg = self.reporter.severe( 'Title overline & underline mismatch.', nodes.literal_block(source, source), - source=src, line=srcline-1) + line=lineno) self.parent += msg return [], 'Body', [] title = title.rstrip() @@ -2936,7 +2931,7 @@ msg = self.reporter.warning( 'Title overline too short.', nodes.literal_block(source, source), - source=src, line=srcline-1) + line=lineno) messages.append(msg) style = (overline[0], underline[0]) self.eofcheck = 0 # @@@ not sure this is correct @@ -2950,22 +2945,20 @@ overline = context[0] blocktext = overline + '\n' + self.state_machine.line lineno = self.state_machine.abs_line_number() - 1 - src, srcline = self.state_machine.get_source_and_line() if len(overline.rstrip()) < 4: self.short_overline(context, blocktext, lineno, 1) msg = self.reporter.error( 'Invalid section title or transition marker.', nodes.literal_block(blocktext, blocktext), - source=src, line=srcline-1) + line=lineno) self.parent += msg return [], 'Body', [] def short_overline(self, context, blocktext, lineno, lines=1): - src, srcline = self.state_machine.get_source_and_line(lineno) msg = self.reporter.info( 'Possible incomplete section title.\nTreating the overline as ' "ordinary text because it's so short.", - source=src, line=srcline) + line=lineno) self.parent += msg self.state_correction(context, lines) @@ -2987,7 +2980,7 @@ 'text': r''} initial_transitions = ('initial_quoted', 'text') - def __init__(self, state_machine, debug=0): + def __init__(self, state_machine, debug=False): RSTState.__init__(self, state_machine, debug) self.messages = [] self.initial_lineno = None @@ -3029,7 +3022,7 @@ """Match arbitrary quote character on the first line only.""" self.remove_transition('initial_quoted') quote = match.string[0] - pattern = re.compile(re.escape(quote)) + pattern = re.compile(re.escape(quote), re.UNICODE) # New transition matches consistent quotes only: self.add_transition('quoted', (pattern, self.quoted, self.__class__.__name__)) @@ -3043,10 +3036,9 @@ def text(self, match, context, next_state): if context: - src, srcline = self.state_machine.get_source_and_line() self.messages.append( self.reporter.error('Inconsistent literal block quoting.', - source=src, line=srcline)) + line=self.state_machine.abs_line_number())) self.state_machine.previous_line() raise EOFError Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/tableparser.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/tableparser.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/parsers/rst/tableparser.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: tableparser.py 4564 2006-05-21 20:44:42Z wiemann $ +# $Id: tableparser.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -23,11 +23,23 @@ import re import sys from docutils import DataError +from docutils.utils import strip_combining_chars -class TableMarkupError(DataError): pass +class TableMarkupError(DataError): + """ + Raise if there is any problem with table markup. + The keyword argument `offset` denotes the offset of the problem + from the table's start line. + """ + + def __init__(self, *args, **kwargs): + self.offset = kwargs.pop('offset', 0) + DataError.__init__(self, *args) + + class TableParser: """ @@ -63,16 +75,17 @@ if self.head_body_separator_pat.match(line): if self.head_body_sep: raise TableMarkupError( - 'Multiple head/body row separators in table (at line ' - 'offset %s and %s); only one allowed.' - % (self.head_body_sep, i)) + 'Multiple head/body row separators ' + '(table lines %s and %s); only one allowed.' + % (self.head_body_sep+1, i+1), offset=i) else: self.head_body_sep = i self.block[i] = line.replace('=', '-') if self.head_body_sep == 0 or self.head_body_sep == (len(self.block) - 1): raise TableMarkupError('The head/body row separator may not be ' - 'the first or last line of the table.') + 'the first or last line of the table.', + offset=i) class GridTableParser(TableParser): @@ -190,8 +203,8 @@ last = self.bottom - 1 for col in range(self.right): if self.done[col] != last: - return None - return 1 + return False + return True def scan_cell(self, top, left): """Starting at the top-left corner, start tracing out a cell.""" @@ -414,7 +427,7 @@ """ cols = [] end = 0 - while 1: + while True: begin = line.find('-', end) end = line.find(' ', begin) if begin < 0: @@ -424,8 +437,9 @@ cols.append((begin, end)) if self.columns: if cols[-1][1] != self.border_end: - raise TableMarkupError('Column span incomplete at line ' - 'offset %s.' % offset) + raise TableMarkupError('Column span incomplete in table ' + 'line %s.' % (offset+1), + offset=offset) # Allow for an unbounded rightmost column: cols[-1] = (cols[-1][0], self.columns[-1][1]) return cols @@ -441,8 +455,9 @@ i += 1 morecols += 1 except (AssertionError, IndexError): - raise TableMarkupError('Column span alignment problem at ' - 'line offset %s.' % (offset + 1)) + raise TableMarkupError('Column span alignment problem ' + 'in table line %s.' % (offset+2), + offset=offset+1) cells.append([0, morecols, offset, []]) i += 1 return cells @@ -454,7 +469,7 @@ The row is parsed according to the current column spec (either `spanline` if provided or `self.columns`). For each column, extract text from each line, and check for text in column margins. Finally, - adjust for insigificant whitespace. + adjust for insignificant whitespace. """ if not (lines or spanline): # No new row, just blank lines. @@ -485,6 +500,9 @@ # check for text overflow: columns.append((sys.maxint, None)) lastcol = len(columns) - 2 + # combining characters do not contribute to the column width + lines = [strip_combining_chars(line) for line in lines] + for i in range(len(columns) - 1): start, end = columns[i] nextstart = columns[i+1][0] @@ -498,8 +516,9 @@ if new_end > main_end: self.columns[-1] = (main_start, new_end) elif line[end:nextstart].strip(): - raise TableMarkupError('Text in column margin at line ' - 'offset %s.' % (first_line + offset)) + raise TableMarkupError('Text in column margin ' + 'in table line %s.' % (first_line+offset+1), + offset=first_line+offset) offset += 1 columns.pop() Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/readers/pep.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/readers/pep.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/readers/pep.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: pep.py 4564 2006-05-21 20:44:42Z wiemann $ +# $Id: pep.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -44,5 +44,5 @@ def __init__(self, parser=None, parser_name=None): """`parser` should be ``None``.""" if parser is None: - parser = rst.Parser(rfc2822=1, inliner=self.inliner_class()) + parser = rst.Parser(rfc2822=True, inliner=self.inliner_class()) standalone.Reader.__init__(self, parser, '') Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/statemachine.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/statemachine.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/statemachine.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ - # $Id: statemachine.py 7037 2011-05-19 08:56:27Z milde $ + # $Id: statemachine.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -110,8 +110,10 @@ import re import types import unicodedata +from docutils import utils from docutils.error_reporting import ErrorOutput + class StateMachine: """ @@ -126,7 +128,7 @@ results of processing in a list. """ - def __init__(self, state_classes, initial_state, debug=0): + def __init__(self, state_classes, initial_state, debug=False): """ Initialize a `StateMachine` object; add state objects. @@ -222,7 +224,7 @@ print >>self._stderr, '\nStateMachine.run: bof transition' context, result = state.bof(context) results.extend(result) - while 1: + while True: try: try: self.next_line() @@ -401,7 +403,7 @@ self.input_lines.insert(self.line_offset + 2, StringList(input_lines, source)) - def get_text_block(self, flush_left=0): + def get_text_block(self, flush_left=False): """ Return a contiguous block of text. @@ -414,8 +416,8 @@ flush_left) self.next_line(len(block) - 1) return block - except UnexpectedIndentationError, error: - block, source, lineno = error.args + except UnexpectedIndentationError, err: + block = err.args[0] self.next_line(len(block) - 1) # advance to last line of block raise @@ -593,14 +595,14 @@ defaults. """ - def __init__(self, state_machine, debug=0): + def __init__(self, state_machine, debug=False): """ Initialize a `State` object; make & add initial transitions. Parameters: - `statemachine`: the controlling `StateMachine` object. - - `debug`: a boolean; produce verbose output if true (nonzero). + - `debug`: a boolean; produce verbose output if true. """ self.transition_order = [] @@ -801,17 +803,15 @@ known. """ - def get_indented(self, until_blank=0, strip_indent=1): + def get_indented(self, until_blank=False, strip_indent=True): """ Return a block of indented lines of text, and info. Extract an indented block where the indent is unknown for all lines. :Parameters: - - `until_blank`: Stop collecting at the first blank line if true - (1). - - `strip_indent`: Strip common leading indent if true (1, - default). + - `until_blank`: Stop collecting at the first blank line if true. + - `strip_indent`: Strip common leading indent if true (default). :Return: - the indented block (a list of lines of text), @@ -829,7 +829,7 @@ offset += 1 return indented, indent, offset, blank_finish - def get_known_indented(self, indent, until_blank=0, strip_indent=1): + def get_known_indented(self, indent, until_blank=False, strip_indent=True): """ Return an indented block and info. @@ -840,10 +840,9 @@ :Parameters: - `indent`: The number of indent columns/characters. - - `until_blank`: Stop collecting at the first blank line if true - (1). + - `until_blank`: Stop collecting at the first blank line if true. - `strip_indent`: Strip `indent` characters of indentation if true - (1, default). + (default). :Return: - the indented block, @@ -860,8 +859,8 @@ offset += 1 return indented, offset, blank_finish - def get_first_known_indented(self, indent, until_blank=0, strip_indent=1, - strip_top=1): + def get_first_known_indented(self, indent, until_blank=False, + strip_indent=True, strip_top=True): """ Return an indented block and info. @@ -955,7 +954,7 @@ """Default initial whitespace transitions, added before those listed in `State.initial_transitions`. May be overridden in subclasses.""" - def __init__(self, state_machine, debug=0): + def __init__(self, state_machine, debug=False): """ Initialize a `StateSM` object; extends `State.__init__()`. @@ -1346,7 +1345,7 @@ self.data[start:end] = [line[length:] for line in self.data[start:end]] - def get_text_block(self, start, flush_left=0): + def get_text_block(self, start, flush_left=False): """ Return a contiguous block of text. @@ -1367,7 +1366,7 @@ end += 1 return self[start:end] - def get_indented(self, start=0, until_blank=0, strip_indent=1, + def get_indented(self, start=0, until_blank=False, strip_indent=True, block_indent=None, first_indent=None): """ Extract and return a StringList of indented lines of text. @@ -1427,10 +1426,20 @@ block.trim_left(indent, start=(first_indent is not None)) return block, indent or 0, blank_finish - def get_2D_block(self, top, left, bottom, right, strip_indent=1): + def get_2D_block(self, top, left, bottom, right, strip_indent=True): block = self[top:bottom] indent = right for i in range(len(block.data)): + # get slice from line, care for combining characters + ci = utils.column_indices(block.data[i]) + try: + left = ci[left] + except IndexError: + left += len(block.data[i]) - len(ci) + try: + right = ci[right] + except IndexError: + right += len(block.data[i]) - len(ci) block.data[i] = line = block.data[i][left:right].rstrip() if line: indent = min(indent, len(line) - len(line.lstrip())) @@ -1492,7 +1501,7 @@ """ -def string2lines(astring, tab_width=8, convert_whitespace=0, +def string2lines(astring, tab_width=8, convert_whitespace=False, whitespace=re.compile('[\v\f]')): """ Return a list of one-line strings with tabs expanded, no newlines, and Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/transforms/references.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/transforms/references.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/transforms/references.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: references.py 6167 2009-10-11 14:51:42Z grubert $ +# $Id: references.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -47,7 +47,7 @@ target.hasattr('refname'))): continue assert len(target) == 0, 'error: block-level target has children' - next_node = target.next_node(ascend=1) + next_node = target.next_node(ascend=True) # Do not move names and ids into Invisibles (we'd lose the # attributes) or different Targetables (e.g. footnotes). if (next_node is not None and @@ -136,7 +136,7 @@ return for ref, target in zip(anonymous_refs, anonymous_targets): target.referenced = 1 - while 1: + while True: if target.hasattr('refuri'): ref['refuri'] = target['refuri'] ref.resolved = 1 @@ -502,7 +502,7 @@ corresponding footnote references. """ for footnote in self.document.autofootnotes: - while 1: + while True: label = str(startnum) startnum += 1 if label not in self.document.nameids: @@ -808,8 +808,7 @@ for ref in refs: if isinstance(ref, nodes.target): continue - refnode = nodes.footnote_reference( - refname=footnote_name, auto=1) + refnode = nodes.footnote_reference(refname=footnote_name, auto=1) refnode['classes'] += self.classes self.document.note_autofootnote_ref(refnode) self.document.note_footnote_ref(refnode) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/transforms/writer_aux.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/transforms/writer_aux.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/transforms/writer_aux.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: writer_aux.py 6433 2010-09-28 08:21:25Z milde $ +# $Id: writer_aux.py 7320 2012-01-19 22:33:02Z milde $ # Author: Lea Wiemann <LeWiemann@gmail.com> # Copyright: This module has been placed in the public domain. @@ -39,11 +39,11 @@ def apply(self): for compound in self.document.traverse(nodes.compound): - first_child = 1 + first_child = True for child in compound: if first_child: if not isinstance(child, nodes.Invisible): - first_child = 0 + first_child = False else: child['classes'].append('continued') # Substitute children for compound. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: __init__.py 6433 2010-09-28 08:21:25Z milde $ +# $Id: __init__.py 7317 2012-01-19 11:55:26Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -52,7 +52,7 @@ def __init__(self): - # Used by HTML and LaTex writer for output fragments: + # Used by HTML and LaTeX writer for output fragments: self.parts = {} """Mapping of document part names to fragments of `self.output`. Values are Unicode strings; encoding is up to the client. The 'whole' Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/docutils_xml.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/docutils_xml.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/docutils_xml.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,18 +1,26 @@ -# $Id: docutils_xml.py 4564 2006-05-21 20:44:42Z wiemann $ -# Author: David Goodger <goodger@python.org> +# $Id: docutils_xml.py 7315 2012-01-18 10:16:20Z milde $ +# Author: David Goodger, Paul Tremblay, Guenter Milde +# Maintainer: docutils-develop@lists.sourceforge.net # Copyright: This module has been placed in the public domain. """ -Simple internal document tree Writer, writes Docutils XML. +Simple document tree Writer, writes Docutils XML according to +http://docutils.sourceforge.net/docs/ref/docutils.dtd. """ __docformat__ = 'reStructuredText' +import sys +import xml.sax.saxutils +from StringIO import StringIO import docutils -from docutils import frontend, writers +from docutils import frontend, writers, nodes +class RawXmlError(docutils.ApplicationError): pass + + class Writer(writers.Writer): supported = ('xml',) @@ -20,8 +28,7 @@ settings_spec = ( '"Docutils XML" Writer Options', - 'Warning: the --newlines and --indents options may adversely affect ' - 'whitespace; use them only for reading convenience.', + None, (('Generate XML with newlines before and after tags.', ['--newlines'], {'action': 'store_true', 'validator': frontend.validate_boolean}), @@ -45,7 +52,20 @@ output = None """Final translated form of `document`.""" + def __init__(self): + writers.Writer.__init__(self) + self.translator_class = XMLTranslator + + def translate(self): + self.visitor = visitor = self.translator_class(self.document) + self.document.walkabout(visitor) + self.output = ''.join(visitor.output) + + +class XMLTranslator(nodes.GenericNodeVisitor): + xml_declaration = '<?xml version="1.0" encoding="%s"?>\n' + # TODO: add stylesheet options similar to HTML and LaTeX writers? #xml_stylesheet = '<?xml-stylesheet type="text/xsl" href="%s"?>\n' doctype = ( '<!DOCTYPE document PUBLIC' @@ -53,21 +73,107 @@ ' "http://docutils.sourceforge.net/docs/ref/docutils.dtd">\n') generator = '<!-- Generated by Docutils %s -->\n' - def translate(self): - settings = self.document.settings - indent = newline = '' + xmlparser = xml.sax.make_parser() + """SAX parser instance to check/exctract raw XML.""" + xmlparser.setFeature( + "http://xml.org/sax/features/external-general-entities", True) + + def __init__(self, document): + nodes.NodeVisitor.__init__(self, document) + + # Reporter + self.warn = self.document.reporter.warning + self.error = self.document.reporter.error + + # Settings + self.settings = settings = document.settings + self.indent = self.newline = '' if settings.newlines: - newline = '\n' + self.newline = '\n' if settings.indents: - newline = '\n' - indent = ' ' - output_prefix = [] + self.newline = '\n' + self.indent = ' ' + self.level = 0 # indentation level + self.in_simple = 0 # level of nesting inside mixed-content elements + + # Output + self.output = [] if settings.xml_declaration: - output_prefix.append( + self.output.append( self.xml_declaration % settings.output_encoding) if settings.doctype_declaration: - output_prefix.append(self.doctype) - output_prefix.append(self.generator % docutils.__version__) - docnode = self.document.asdom().childNodes[0] - self.output = (''.join(output_prefix) - + docnode.toprettyxml(indent, newline)) + self.output.append(self.doctype) + self.output.append(self.generator % docutils.__version__) + + # initialize XML parser + self.the_handle=TestXml() + self.xmlparser.setContentHandler(self.the_handle) + + # generic visit and depart methods + # -------------------------------- + + def default_visit(self, node): + """Default node visit method.""" + if not self.in_simple: + self.output.append(self.indent*self.level) + self.output.append(node.starttag(xml.sax.saxutils.quoteattr)) + self.level += 1 + if isinstance(node, nodes.TextElement): + self.in_simple += 1 + if not self.in_simple: + self.output.append(self.newline) + + def default_departure(self, node): + """Default node depart method.""" + self.level -= 1 + if not self.in_simple: + self.output.append(self.indent*self.level) + self.output.append(node.endtag()) + if isinstance(node, nodes.TextElement): + self.in_simple -= 1 + if not self.in_simple: + self.output.append(self.newline) + + + # specific visit and depart methods + # --------------------------------- + + def visit_Text(self, node): + text = xml.sax.saxutils.escape(node.astext()) + self.output.append(text) + + def depart_Text(self, node): + pass + + def visit_raw(self, node): + if 'xml' not in node.get('format', '').split(): + # skip other raw content? + # raise nodes.SkipNode + self.default_visit(node) + return + # wrap in <raw> element + self.default_visit(node) # or not? + xml_string = node.astext() + self.output.append(xml_string) + self.default_departure(node) # or not? + # Check validity of raw XML: + if isinstance(xml_string, unicode) and sys.version_info < (3,): + xml_string = xml_string.encode('utf8') + try: + self.xmlparser.parse(StringIO(xml_string)) + except xml.sax._exceptions.SAXParseException, error: + col_num = self.the_handle.locator.getColumnNumber() + line_num = self.the_handle.locator.getLineNumber() + srcline = node.line + if not isinstance(node.parent, nodes.TextElement): + srcline += 2 # directive content start line + msg = 'Invalid raw XML in column %d, line offset %d:\n%s' % ( + col_num, line_num, node.astext()) + self.warn(msg, source=node.source, line=srcline+line_num-1) + raise nodes.SkipNode # content already processed + + +class TestXml(xml.sax.ContentHandler): + + def setDocumentLocator(self, locator): + self.locator = locator Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/html4css1/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/html4css1/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/html4css1/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,6 @@ -# $Id: __init__.py 7061 2011-06-29 16:24:09Z milde $ -# Author: David Goodger <goodger@python.org> +# $Id: __init__.py 7328 2012-01-27 08:41:35Z milde $ +# Author: David Goodger +# Maintainer: docutils-develop@lists.sourceforge.net # Copyright: This module has been placed in the public domain. """ @@ -19,14 +20,21 @@ import os.path import time import re -try: - import Image # check for the Python Imaging Library +import urllib +try: # check for the Python Imaging Library + import PIL except ImportError: - Image = None + try: # sometimes PIL modules are put in PYTHONPATH's root + import Image + class PIL(object): pass # dummy wrapper + PIL.Image = Image + except ImportError: + PIL = None import docutils from docutils import frontend, nodes, utils, writers, languages, io +from docutils.error_reporting import SafeString from docutils.transforms import writer_aux -from docutils.math import unimathsymbols2tex, pick_math_environment +from docutils.math import unichar2tex, pick_math_environment from docutils.math.latex2mathml import parse_latex_math from docutils.math.math2html import math2html @@ -125,9 +133,9 @@ ['--table-style'], {'default': ''}), ('Math output format, one of "MathML", "HTML", "MathJax" ' - 'or "LaTeX". Default: "MathML"', + 'or "LaTeX". Default: "MathJax"', ['--math-output'], - {'default': 'MathML'}), + {'default': 'MathJax'}), ('Omit the XML declaration. Use with caution.', ['--no-xml-declaration'], {'dest': 'xml_declaration', 'default': 1, 'action': 'store_false', @@ -280,19 +288,8 @@ # encoding not interpolated: self.html_prolog.append(self.xml_declaration) self.head = self.meta[:] - # stylesheets - styles = utils.get_stylesheet_list(settings) - if settings.stylesheet_path and not(settings.embed_stylesheet): - styles = [utils.relative_path(settings._destination, sheet) - for sheet in styles] - if settings.embed_stylesheet: - settings.record_dependencies.add(*styles) - self.stylesheet = [self.embedded_stylesheet % - io.FileInput(source_path=sheet, encoding='utf-8').read() - for sheet in styles] - else: # link to stylesheets - self.stylesheet = [self.stylesheet_link % self.encode(stylesheet) - for stylesheet in styles] + self.stylesheet = [self.stylesheet_call(path) + for path in utils.get_stylesheet_list(settings)] self.body_prefix = ['</head>\n<body>\n'] # document title, subtitle display self.body_pre_docinfo = [] @@ -310,10 +307,10 @@ self.topic_classes = [] self.colspecs = [] self.compact_p = 1 - self.compact_simple = None - self.compact_field_list = None - self.in_docinfo = None - self.in_sidebar = None + self.compact_simple = False + self.compact_field_list = False + self.in_docinfo = False + self.in_sidebar = False self.title = [] self.subtitle = [] self.header = [] @@ -322,9 +319,9 @@ self.html_title = [] self.html_subtitle = [] self.html_body = [] - self.in_document_title = 0 - self.in_mailto = 0 - self.author_in_authors = None + self.in_document_title = 0 # len(self.body) or 0 + self.in_mailto = False + self.author_in_authors = False self.math_header = '' def astext(self): @@ -371,7 +368,27 @@ encoded = encoded.replace('.', '.') return encoded - def starttag(self, node, tagname, suffix='\n', empty=0, **attributes): + def stylesheet_call(self, path): + """Return code to reference or embed stylesheet file `path`""" + if self.settings.embed_stylesheet: + try: + content = io.FileInput(source_path=path, + encoding='utf-8', + handle_io_errors=False).read() + self.settings.record_dependencies.add(path) + except IOError, err: + msg = u"Cannot embed stylesheet '%s': %s." % ( + path, SafeString(err.strerror)) + self.document.reporter.error(msg) + return '<--- %s --->\n' % msg + return self.embedded_stylesheet % content + # else link to style file: + if self.settings.stylesheet_path: + # adapt path relative to output (cf. config.html#stylesheet-path) + path = utils.relative_path(self.settings._destination, path) + return self.stylesheet_link % self.encode(path) + + def starttag(self, node, tagname, suffix='\n', empty=False, **attributes): """ Construct and return a start tag given a node (id & class attributes are extracted), tag name, and optional attributes. @@ -437,7 +454,7 @@ def emptytag(self, node, tagname, suffix='\n', **attributes): """Construct and return an XML-compatible empty tag.""" - return self.starttag(node, tagname, suffix, empty=1, **attributes) + return self.starttag(node, tagname, suffix, empty=True, **attributes) def set_class_on_child(self, node, class_, index=0): """ @@ -480,7 +497,7 @@ self.body.append('</acronym>') def visit_address(self, node): - self.visit_docinfo_item(node, 'address', meta=None) + self.visit_docinfo_item(node, 'address', meta=False) self.body.append(self.starttag(node, 'pre', CLASS='address')) def depart_address(self, node): @@ -517,17 +534,16 @@ def depart_author(self, node): if isinstance(node.parent, nodes.authors): - self.author_in_authors += 1 + self.author_in_authors = True else: self.depart_docinfo_item() def visit_authors(self, node): self.visit_docinfo_item(node, 'authors') - self.author_in_authors = 0 # initialize counter + self.author_in_authors = False # initialize def depart_authors(self, node): self.depart_docinfo_item() - self.author_in_authors = None def visit_block_quote(self, node): self.body.append(self.starttag(node, 'blockquote')) @@ -644,7 +660,7 @@ self.body.append('</div>\n') def visit_contact(self, node): - self.visit_docinfo_item(node, 'contact', meta=None) + self.visit_docinfo_item(node, 'contact', meta=False) def depart_contact(self, node): self.depart_docinfo_item() @@ -702,16 +718,16 @@ self.body.append('<col class="docinfo-name" />\n' '<col class="docinfo-content" />\n' '<tbody valign="top">\n') - self.in_docinfo = 1 + self.in_docinfo = True def depart_docinfo(self, node): self.body.append('</tbody>\n</table>\n') - self.in_docinfo = None + self.in_docinfo = False start = self.context.pop() self.docinfo = self.body[start:] self.body = [] - def visit_docinfo_item(self, node, name, meta=1): + def visit_docinfo_item(self, node, name, meta=True): if meta: meta_tag = '<meta name="%s" content="%s" />\n' \ % (name, self.attval(node.astext())) @@ -841,10 +857,10 @@ self.context.append((self.compact_field_list, self.compact_p)) self.compact_p = None if 'compact' in node['classes']: - self.compact_field_list = 1 + self.compact_field_list = True elif (self.settings.compact_field_lists and 'open' not in node['classes']): - self.compact_field_list = 1 + self.compact_field_list = True if self.compact_field_list: for field in node: field_body = field[-1] @@ -855,7 +871,7 @@ len(children) == 1 and isinstance(children[0], (nodes.paragraph, nodes.line_block))): - self.compact_field_list = 0 + self.compact_field_list = False break self.body.append(self.starttag(node, 'table', frame='void', rules='none', @@ -1006,18 +1022,22 @@ if 'height' in node: atts['height'] = node['height'] if 'scale' in node: - if Image and not ('width' in node and 'height' in node): + if (PIL and not ('width' in node and 'height' in node) + and self.settings.file_insertion_enabled): + imagepath = urllib.url2pathname(uri) try: - im = Image.open(str(uri)) - except (IOError, # Source image can't be found or opened - UnicodeError): # PIL doesn't like Unicode paths. - pass + img = PIL.Image.open( + imagepath.encode(sys.getfilesystemencoding())) + except (IOError, UnicodeEncodeError): + pass # TODO: warn? else: + self.settings.record_dependencies.add( + imagepath.replace('\\', '/')) if 'width' not in atts: - atts['width'] = str(im.size[0]) + atts['width'] = str(img.size[0]) if 'height' not in atts: - atts['height'] = str(im.size[1]) - del im + atts['height'] = str(img.size[1]) + del img for att_name in 'width', 'height': if att_name in atts: match = re.match(r'([0-9.]+)(\S*)$', atts[att_name]) @@ -1152,7 +1172,7 @@ } wrapper = wrappers[self.math_output][math_env != ''] # get and wrap content - math_code = node.astext().translate(unimathsymbols2tex.uni2tex_table) + math_code = node.astext().translate(unichar2tex.uni2tex_table) if wrapper and math_env: math_code = wrapper % (math_env, math_code, math_env) elif wrapper: @@ -1197,6 +1217,7 @@ pass # never reached def visit_math_block(self, node): + # print node.astext().encode('utf8') math_env = pick_math_environment(node.astext()) self.visit_math(node, math_env=math_env) @@ -1347,7 +1368,7 @@ if ( self.settings.cloak_email_addresses and atts['href'].startswith('mailto:')): atts['href'] = self.cloak_mailto(atts['href']) - self.in_mailto = 1 + self.in_mailto = True atts['class'] += ' external' else: assert 'refid' in node, \ @@ -1363,10 +1384,10 @@ self.body.append('</a>') if not isinstance(node.parent, nodes.TextElement): self.body.append('\n') - self.in_mailto = 0 + self.in_mailto = False def visit_revision(self, node): - self.visit_docinfo_item(node, 'revision', meta=None) + self.visit_docinfo_item(node, 'revision', meta=False) def depart_revision(self, node): self.depart_docinfo_item() @@ -1397,14 +1418,14 @@ self.body.append( self.starttag(node, 'div', CLASS='sidebar')) self.set_first_last(node) - self.in_sidebar = 1 + self.in_sidebar = True def depart_sidebar(self, node): self.body.append('</div>\n') - self.in_sidebar = None + self.in_sidebar = False def visit_status(self, node): - self.visit_docinfo_item(node, 'status', meta=None) + self.visit_docinfo_item(node, 'status', meta=False) def depart_status(self, node): self.depart_docinfo_item() @@ -1547,7 +1568,7 @@ def visit_title(self, node): """Only 6 section levels are supported by HTML.""" - check_id = 0 + check_id = 0 # TODO: is this a bool (False) or a counter? close_tag = '</p>\n' if isinstance(node.parent, nodes.topic): self.body.append( @@ -1616,7 +1637,7 @@ pass def visit_version(self, node): - self.visit_docinfo_item(node, 'version', meta=None) + self.visit_docinfo_item(node, 'version', meta=False) def depart_version(self, node): self.depart_docinfo_item() Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/latex2e/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/latex2e/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/latex2e/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,7 @@ # .. coding: utf8 -# $Id: __init__.py 7102 2011-08-24 13:36:28Z milde $ -# Author: Engelbert Gruber <grubert@users.sourceforge.net> +# $Id: __init__.py 7389 2012-03-30 11:58:21Z milde $ +# Author: Engelbert Gruber, Günter Milde +# Maintainer: docutils-develop@lists.sourceforge.net # Copyright: This module has been placed in the public domain. """LaTeX2e document tree Writer.""" @@ -18,9 +19,14 @@ import re import string import urllib +try: + import roman +except ImportError: + import docutils.utils.roman as roman from docutils import frontend, nodes, languages, writers, utils, io +from docutils.error_reporting import SafeString from docutils.transforms import writer_aux -from docutils.math import unimathsymbols2tex, pick_math_environment +from docutils.math import pick_math_environment, unichar2tex # compatibility module for Python 2.3 if not hasattr(string, 'Template'): @@ -386,7 +392,7 @@ self.setup.append( r'\addto\shorthandsspanish{\spanishdeactivate{."~<>}}') # or prepend r'\def\spanishoptions{es-noshorthands}' - if (languages[-1] is 'english' and + if (languages[-1] == 'english' and 'french' in self.otherlanguages.keys()): self.setup += ['% Prevent side-effects if French hyphenation ' 'patterns are not loaded:', @@ -492,11 +498,6 @@ \DUprovidelength{\DUdocinfowidth}{0.9\textwidth}""" # PreambleCmds.docinfo._depends = 'providelength' -PreambleCmds.embedded_package_wrapper = r"""\makeatletter -%% embedded stylesheet: %s -%s -\makeatother""" - PreambleCmds.dedication = r""" % dedication topic \providecommand{\DUtopicdedication}[1]{\begin{center}#1\end{center}}""" @@ -651,7 +652,7 @@ \providecommand*{\DUroletitlereference}[1]{\textsl{#1}}""" PreambleCmds.title = r""" -% title for topics, admonitions and sidebar +% title for topics, admonitions, unsupported section levels, and sidebar \providecommand*{\DUtitle}[2][class-arg]{% % call \DUtitle#1{#2} if it exists: \ifcsname DUtitle#1\endcsname% @@ -679,6 +680,161 @@ }""" +# LaTeX encoding maps +# ------------------- +# :: + +class CharMaps(object): + """LaTeX representations for active and Unicode characters.""" + + # characters that always need escaping: + special = { + ord('#'): ur'\#', + ord('$'): ur'\$', + ord('%'): ur'\%', + ord('&'): ur'\&', + ord('~'): ur'\textasciitilde{}', + ord('_'): ur'\_', + ord('^'): ur'\textasciicircum{}', + ord('\\'): ur'\textbackslash{}', + ord('{'): ur'\{', + ord('}'): ur'\}', + # Square brackets are ordinary chars and cannot be escaped with '\', + # so we put them in a group '{[}'. (Alternative: ensure that all + # macros with optional arguments are terminated with {} and text + # inside any optional argument is put in a group ``[{text}]``). + # Commands with optional args inside an optional arg must be put in a + # group, e.g. ``\item[{\hyperref[label]{text}}]``. + ord('['): ur'{[}', + ord(']'): ur'{]}', + # the soft hyphen is unknown in 8-bit text and not properly handled by XeTeX + 0x00AD: ur'\-', # SOFT HYPHEN + } + # Unicode chars that are not recognized by LaTeX's utf8 encoding + unsupported_unicode = { + 0x00A0: ur'~', # NO-BREAK SPACE + # TODO: ensure white space also at the beginning of a line? + # 0x00A0: ur'\leavevmode\nobreak\vadjust{}~' + 0x2008: ur'\,', # PUNCTUATION SPACE    + 0x2011: ur'\hbox{-}', # NON-BREAKING HYPHEN + 0x202F: ur'\,', # NARROW NO-BREAK SPACE + 0x21d4: ur'$\Leftrightarrow$', + # Docutils footnote symbols: + 0x2660: ur'$\spadesuit$', + 0x2663: ur'$\clubsuit$', + } + # Unicode chars that are recognized by LaTeX's utf8 encoding + utf8_supported_unicode = { + 0x200C: ur'\textcompwordmark', # ZERO WIDTH NON-JOINER + 0x2013: ur'\textendash{}', + 0x2014: ur'\textemdash{}', + 0x2018: ur'\textquoteleft{}', + 0x2019: ur'\textquoteright{}', + 0x201A: ur'\quotesinglbase{}', # SINGLE LOW-9 QUOTATION MARK + 0x201C: ur'\textquotedblleft{}', + 0x201D: ur'\textquotedblright{}', + 0x201E: ur'\quotedblbase{}', # DOUBLE LOW-9 QUOTATION MARK + 0x2030: ur'\textperthousand{}', # PER MILLE SIGN + 0x2031: ur'\textpertenthousand{}', # PER TEN THOUSAND SIGN + 0x2039: ur'\guilsinglleft{}', + 0x203A: ur'\guilsinglright{}', + 0x2423: ur'\textvisiblespace{}', # OPEN BOX + 0x2020: ur'\dag{}', + 0x2021: ur'\ddag{}', + 0x2026: ur'\dots{}', + 0x2122: ur'\texttrademark{}', + } + # recognized with 'utf8', if textcomp is loaded + textcomp = { + # Latin-1 Supplement + 0x00a2: ur'\textcent{}', # ¢ CENT SIGN + 0x00a4: ur'\textcurrency{}', # ¤ CURRENCY SYMBOL + 0x00a5: ur'\textyen{}', # ¥ YEN SIGN + 0x00a6: ur'\textbrokenbar{}', # ¦ BROKEN BAR + 0x00a7: ur'\textsection{}', # § SECTION SIGN + 0x00a8: ur'\textasciidieresis{}', # ¨ DIAERESIS + 0x00a9: ur'\textcopyright{}', # © COPYRIGHT SIGN + 0x00aa: ur'\textordfeminine{}', # ª FEMININE ORDINAL INDICATOR + 0x00ac: ur'\textlnot{}', # ¬ NOT SIGN + 0x00ae: ur'\textregistered{}', # ® REGISTERED SIGN + 0x00af: ur'\textasciimacron{}', # ¯ MACRON + 0x00b0: ur'\textdegree{}', # ° DEGREE SIGN + 0x00b1: ur'\textpm{}', # ± PLUS-MINUS SIGN + 0x00b2: ur'\texttwosuperior{}', # ² SUPERSCRIPT TWO + 0x00b3: ur'\textthreesuperior{}', # ³ SUPERSCRIPT THREE + 0x00b4: ur'\textasciiacute{}', # ´ ACUTE ACCENT + 0x00b5: ur'\textmu{}', # µ MICRO SIGN + 0x00b6: ur'\textparagraph{}', # ¶ PILCROW SIGN # not equal to \textpilcrow + 0x00b9: ur'\textonesuperior{}', # ¹ SUPERSCRIPT ONE + 0x00ba: ur'\textordmasculine{}', # º MASCULINE ORDINAL INDICATOR + 0x00bc: ur'\textonequarter{}', # 1/4 FRACTION + 0x00bd: ur'\textonehalf{}', # 1/2 FRACTION + 0x00be: ur'\textthreequarters{}', # 3/4 FRACTION + 0x00d7: ur'\texttimes{}', # × MULTIPLICATION SIGN + 0x00f7: ur'\textdiv{}', # ÷ DIVISION SIGN + # + 0x0192: ur'\textflorin{}', # LATIN SMALL LETTER F WITH HOOK + 0x02b9: ur'\textasciiacute{}', # MODIFIER LETTER PRIME + 0x02ba: ur'\textacutedbl{}', # MODIFIER LETTER DOUBLE PRIME + 0x2016: ur'\textbardbl{}', # DOUBLE VERTICAL LINE + 0x2022: ur'\textbullet{}', # BULLET + 0x2032: ur'\textasciiacute{}', # PRIME + 0x2033: ur'\textacutedbl{}', # DOUBLE PRIME + 0x2035: ur'\textasciigrave{}', # REVERSED PRIME + 0x2036: ur'\textgravedbl{}', # REVERSED DOUBLE PRIME + 0x203b: ur'\textreferencemark{}', # REFERENCE MARK + 0x203d: ur'\textinterrobang{}', # INTERROBANG + 0x2044: ur'\textfractionsolidus{}', # FRACTION SLASH + 0x2045: ur'\textlquill{}', # LEFT SQUARE BRACKET WITH QUILL + 0x2046: ur'\textrquill{}', # RIGHT SQUARE BRACKET WITH QUILL + 0x2052: ur'\textdiscount{}', # COMMERCIAL MINUS SIGN + 0x20a1: ur'\textcolonmonetary{}', # COLON SIGN + 0x20a3: ur'\textfrenchfranc{}', # FRENCH FRANC SIGN + 0x20a4: ur'\textlira{}', # LIRA SIGN + 0x20a6: ur'\textnaira{}', # NAIRA SIGN + 0x20a9: ur'\textwon{}', # WON SIGN + 0x20ab: ur'\textdong{}', # DONG SIGN + 0x20ac: ur'\texteuro{}', # EURO SIGN + 0x20b1: ur'\textpeso{}', # PESO SIGN + 0x20b2: ur'\textguarani{}', # GUARANI SIGN + 0x2103: ur'\textcelsius{}', # DEGREE CELSIUS + 0x2116: ur'\textnumero{}', # NUMERO SIGN + 0x2117: ur'\textcircledP{}', # SOUND RECORDING COYRIGHT + 0x211e: ur'\textrecipe{}', # PRESCRIPTION TAKE + 0x2120: ur'\textservicemark{}', # SERVICE MARK + 0x2122: ur'\texttrademark{}', # TRADE MARK SIGN + 0x2126: ur'\textohm{}', # OHM SIGN + 0x2127: ur'\textmho{}', # INVERTED OHM SIGN + 0x212e: ur'\textestimated{}', # ESTIMATED SYMBOL + 0x2190: ur'\textleftarrow{}', # LEFTWARDS ARROW + 0x2191: ur'\textuparrow{}', # UPWARDS ARROW + 0x2192: ur'\textrightarrow{}', # RIGHTWARDS ARROW + 0x2193: ur'\textdownarrow{}', # DOWNWARDS ARROW + 0x2212: ur'\textminus{}', # MINUS SIGN + 0x2217: ur'\textasteriskcentered{}', # ASTERISK OPERATOR + 0x221a: ur'\textsurd{}', # SQUARE ROOT + 0x2422: ur'\textblank{}', # BLANK SYMBOL + 0x25e6: ur'\textopenbullet{}', # WHITE BULLET + 0x25ef: ur'\textbigcircle{}', # LARGE CIRCLE + 0x266a: ur'\textmusicalnote{}', # EIGHTH NOTE + 0x26ad: ur'\textmarried{}', # MARRIAGE SYMBOL + 0x26ae: ur'\textdivorced{}', # DIVORCE SYMBOL + 0x27e8: ur'\textlangle{}', # MATHEMATICAL LEFT ANGLE BRACKET + 0x27e9: ur'\textrangle{}', # MATHEMATICAL RIGHT ANGLE BRACKET + } + # Unicode chars that require a feature/package to render + pifont = { + 0x2665: ur'\ding{170}', # black heartsuit + 0x2666: ur'\ding{169}', # black diamondsuit + 0x2713: ur'\ding{51}', # check mark + 0x2717: ur'\ding{55}', # check mark + } + # TODO: greek alphabet ... ? + # see also LaTeX codec + # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/252124 + # and unimap.py from TeXML + + class DocumentClass(object): """Details of a LaTeX document class.""" @@ -699,13 +855,11 @@ The name depends on the specific document class. Level is 1,2,3..., as level 0 is the title. """ - if level <= len(self.sections): return self.sections[level-1] - else: - return self.sections[-1] + else: # unsupported levels + return 'DUtitle[section%s]' % roman.toRoman(level) - class Table(object): """Manage a table while traversing. @@ -723,7 +877,7 @@ self._translator = translator self._latex_type = latex_type self._table_style = table_style - self._open = 0 + self._open = False # miscellaneous attributes self._attrs = {} self._col_width = [] @@ -853,6 +1007,7 @@ elif self._table_style == 'booktabs': return ['\\toprule\n'] return [] + def depart_thead(self): a = [] #if self._table_style == 'standard': @@ -888,7 +1043,7 @@ cline = '' rowspans.reverse() # TODO merge clines - while 1: + while True: try: c_start = rowspans.pop() except: @@ -923,6 +1078,10 @@ # to other packages, as done with babel. # Dummy settings might be taken from document settings + # Write code for typesetting with 8-bit tex/pdftex (vs. xetex/luatex) engine + # overwritten by the XeTeX writer + is_xetex = False + # Config setting defaults # ----------------------- @@ -931,10 +1090,10 @@ ## use_optionlist_for_docinfo = False # TODO: NOT YET IN USE # Use compound enumerations (1.A.1.) - compound_enumerators = 0 + compound_enumerators = False # If using compound enumerations, include section information. - section_prefix_for_enumerators = 0 + section_prefix_for_enumerators = False # This is the character that separates the section ("." subsection ...) # prefix from the regular list enumerator. @@ -970,7 +1129,6 @@ self.use_latex_toc = settings.use_latex_toc self.use_latex_docinfo = settings.use_latex_docinfo self._use_latex_citations = settings.use_latex_citations - self.embed_stylesheet = settings.embed_stylesheet self._reference_label = settings.reference_label self.hyperlink_color = settings.hyperlink_color self.compound_enumerators = settings.compound_enumerators @@ -1037,7 +1195,6 @@ self.requirements = SortableDict() # made a list in depart_document() self.requirements['__static'] = r'\usepackage{ifthen}' self.latex_preamble = [settings.latex_preamble] - self.stylesheet = [] self.fallbacks = SortableDict() # made a list in depart_document() self.pdfsetup = [] # PDF properties (hyperref package) self.title = [] @@ -1099,7 +1256,7 @@ self.requirements['_inputenc'] = (r'\usepackage[%s]{inputenc}' % self.latex_encoding) # TeX font encoding - if self.font_encoding: + if self.font_encoding and not self.is_xetex: self.requirements['_fontenc'] = (r'\usepackage[%s]{fontenc}' % self.font_encoding) # page layout with typearea (if there are relevant document options) @@ -1109,30 +1266,10 @@ self.requirements['typearea'] = r'\usepackage{typearea}' # Stylesheets - # get list of style sheets from settings - styles = utils.get_stylesheet_list(settings) - # adapt path if --stylesheet_path is used - if settings.stylesheet_path and not(self.embed_stylesheet): - styles = [utils.relative_path(settings._destination, sheet) - for sheet in styles] - for sheet in styles: - (base, ext) = os.path.splitext(sheet) - is_package = ext in ['.sty', ''] - if self.embed_stylesheet: - if is_package: - sheet = base + '.sty' # adapt package name - # wrap in \makeatletter, \makeatother - wrapper = PreambleCmds.embedded_package_wrapper - else: - wrapper = '%% embedded stylesheet: %s\n%s' - settings.record_dependencies.add(sheet) - self.stylesheet.append(wrapper % - (sheet, io.FileInput(source_path=sheet, encoding='utf-8').read())) - else: # link to style sheet - if is_package: - self.stylesheet.append(r'\usepackage{%s}' % base) - else: - self.stylesheet.append(r'\input{%s}' % sheet) + # (the name `self.stylesheet` is singular because only one + # stylesheet was supported before Docutils 0.6). + self.stylesheet = [self.stylesheet_call(path) + for path in utils.get_stylesheet_list(settings)] # PDF setup if self.hyperlink_color in ('0', 'false', 'False', ''): @@ -1150,44 +1287,81 @@ ## self.requirements['tocdepth'] = (r'\setcounter{tocdepth}{%d}' % ## len(self.d_class.sections)) - # LaTeX section numbering - if not self.settings.sectnum_xform: # section numbering by LaTeX: - # sectnum_depth: - # None "sectnum" directive without depth arg -> LaTeX default - # 0 no "sectnum" directive -> no section numbers - # else value of the "depth" argument: translate to LaTeX level - # -1 part (0 with "article" document class) - # 0 chapter (missing in "article" document class) - # 1 section - # 2 subsection - # 3 subsubsection - # 4 paragraph - # 5 subparagraph - if settings.sectnum_depth is not None: + # Section numbering + if not self.settings.sectnum_xform: # section numbering by Docutils + PreambleCmds.secnumdepth = r'\setcounter{secnumdepth}{0}' + else: # section numbering by LaTeX: + secnumdepth = settings.sectnum_depth + # Possible values of settings.sectnum_depth: + # None "sectnum" directive without depth arg -> LaTeX default + # 0 no "sectnum" directive -> no section numbers + # >0 value of "depth" argument -> translate to LaTeX levels: + # -1 part (0 with "article" document class) + # 0 chapter (missing in "article" document class) + # 1 section + # 2 subsection + # 3 subsubsection + # 4 paragraph + # 5 subparagraph + if secnumdepth is not None: # limit to supported levels - sectnum_depth = min(settings.sectnum_depth, - len(self.d_class.sections)) + secnumdepth = min(secnumdepth, len(self.d_class.sections)) # adjust to document class and use_part_section settings if 'chapter' in self.d_class.sections: - sectnum_depth -= 1 + secnumdepth -= 1 if self.d_class.sections[0] == 'part': - sectnum_depth -= 1 - self.requirements['sectnum_depth'] = ( - r'\setcounter{secnumdepth}{%d}' % sectnum_depth) + secnumdepth -= 1 + PreambleCmds.secnumdepth = \ + r'\setcounter{secnumdepth}{%d}' % secnumdepth + # start with specified number: if (hasattr(settings, 'sectnum_start') and settings.sectnum_start != 1): self.requirements['sectnum_start'] = ( r'\setcounter{%s}{%d}' % (self.d_class.sections[0], settings.sectnum_start-1)) - # currently ignored (configure in a stylesheet): + # TODO: currently ignored (configure in a stylesheet): ## settings.sectnum_prefix ## settings.sectnum_suffix - # Auxiliary Methods # ----------------- + def stylesheet_call(self, path): + """Return code to reference or embed stylesheet file `path`""" + # is it a package (no extension or *.sty) or "normal" tex code: + (base, ext) = os.path.splitext(path) + is_package = ext in ['.sty', ''] + # Embed content of style file: + if self.settings.embed_stylesheet: + if is_package: + path = base + '.sty' # ensure extension + try: + content = io.FileInput(source_path=path, + encoding='utf-8', + handle_io_errors=False).read() + self.settings.record_dependencies.add(path) + except IOError, err: + msg = u"Cannot embed stylesheet '%s':\n %s." % ( + path, SafeString(err.strerror)) + self.document.reporter.error(msg) + return '% ' + msg.replace('\n', '\n% ') + if is_package: + content = '\n'.join([r'\makeatletter', + content, + r'\makeatother']) + return '%% embedded stylesheet: %s\n%s' % (path, content) + # Link to style file: + if is_package: + path = base # drop extension + cmd = r'\usepackage{%s}' + else: + cmd = r'\input{%s}' + if self.settings.stylesheet_path: + # adapt path relative to output (cf. config.html#stylesheet-path) + path = utils.relative_path(self.settings._destination, path) + return cmd % path + def to_latex_encoding(self,docutils_encoding): """Translate docutils encoding name into LaTeX's. @@ -1224,7 +1398,7 @@ encoding = docutils_encoding.lower() if encoding in tr: return tr[encoding] - # convert: latin-1, latin_1, utf-8 and similar things + # drop hyphen or low-line from "latin-1", "latin_1", "utf-8" and similar encoding = encoding.replace('_', '').replace('-', '') # strip the error handler return encoding.split(':')[0] @@ -1232,186 +1406,24 @@ def language_label(self, docutil_label): return self.language_module.labels[docutil_label] - def ensure_math(self, text): - if not hasattr(self, 'ensure_math_re'): - chars = { # lnot,pm,twosuperior,threesuperior,mu,onesuperior,times,div - 'latin1' : '\xac\xb1\xb2\xb3\xb5\xb9\xd7\xf7' , # ¬±²³µ¹×÷ - # TODO?: use texcomp instead. - } - self.ensure_math_re = re.compile('([%s])' % chars['latin1']) - text = self.ensure_math_re.sub(r'\\ensuremath{\1}', text) - return text - def encode(self, text): """Return text with 'problematic' characters escaped. - Escape the ten special printing characters ``# $ % & ~ _ ^ \ { }``, - square brackets ``[ ]``, double quotes and (in OT1) ``< | >``. - - Separate ``-`` (and more in literal text) to prevent input ligatures. - - Translate non-supported Unicode characters. + * Escape the ten special printing characters ``# $ % & ~ _ ^ \ { }``, + square brackets ``[ ]``, double quotes and (in OT1) ``< | >``. + * Translate non-supported Unicode characters. + * Separate ``-`` (and more in literal text) to prevent input ligatures. """ if self.verbatim: return text - # Separate compound characters, e.g. '--' to '-{}-'. - separate_chars = '-' - # In monospace-font, we also separate ',,', '``' and "''" and some - # other characters which can't occur in non-literal text. - if self.literal: - separate_chars += ',`\'"<>' - # LaTeX encoding maps: - special_chars = { - ord('#'): ur'\#', - ord('$'): ur'\$', - ord('%'): ur'\%', - ord('&'): ur'\&', - ord('~'): ur'\textasciitilde{}', - ord('_'): ur'\_', - ord('^'): ur'\textasciicircum{}', - ord('\\'): ur'\textbackslash{}', - ord('{'): ur'\{', - ord('}'): ur'\}', - # Square brackets are ordinary chars and cannot be escaped with '\', - # so we put them in a group '{[}'. (Alternative: ensure that all - # macros with optional arguments are terminated with {} and text - # inside any optional argument is put in a group ``[{text}]``). - # Commands with optional args inside an optional arg must be put - # in a group, e.g. ``\item[{\hyperref[label]{text}}]``. - ord('['): ur'{[}', - ord(']'): ur'{]}' - } - # Unicode chars that are not recognized by LaTeX's utf8 encoding - unsupported_unicode_chars = { - 0x00A0: ur'~', # NO-BREAK SPACE - 0x00AD: ur'\-', # SOFT HYPHEN - # - 0x2008: ur'\,', # PUNCTUATION SPACE    - 0x2011: ur'\hbox{-}', # NON-BREAKING HYPHEN - 0x202F: ur'\,', # NARROW NO-BREAK SPACE - 0x21d4: ur'$\Leftrightarrow$', - # Docutils footnote symbols: - 0x2660: ur'$\spadesuit$', - 0x2663: ur'$\clubsuit$', - } - # Unicode chars that are recognized by LaTeX's utf8 encoding - unicode_chars = { - 0x200C: ur'\textcompwordmark', # ZERO WIDTH NON-JOINER - 0x2013: ur'\textendash{}', - 0x2014: ur'\textemdash{}', - 0x2018: ur'\textquoteleft{}', - 0x2019: ur'\textquoteright{}', - 0x201A: ur'\quotesinglbase{}', # SINGLE LOW-9 QUOTATION MARK - 0x201C: ur'\textquotedblleft{}', - 0x201D: ur'\textquotedblright{}', - 0x201E: ur'\quotedblbase{}', # DOUBLE LOW-9 QUOTATION MARK - 0x2030: ur'\textperthousand{}', # PER MILLE SIGN - 0x2031: ur'\textpertenthousand{}', # PER TEN THOUSAND SIGN - 0x2039: ur'\guilsinglleft{}', - 0x203A: ur'\guilsinglright{}', - 0x2423: ur'\textvisiblespace{}', # OPEN BOX - 0x2020: ur'\dag{}', - 0x2021: ur'\ddag{}', - 0x2026: ur'\dots{}', - 0x2122: ur'\texttrademark{}', - } - # Unicode chars that require a feature/package to render - pifont_chars = { - 0x2665: ur'\ding{170}', # black heartsuit - 0x2666: ur'\ding{169}', # black diamondsuit - 0x2713: ur'\ding{51}', # check mark - 0x2717: ur'\ding{55}', # check mark - } - # recognized with 'utf8', if textcomp is loaded - textcomp_chars = { - # Latin-1 Supplement - 0x00a2: ur'\textcent{}', # ¢ CENT SIGN - 0x00a4: ur'\textcurrency{}', # ¤ CURRENCY SYMBOL - 0x00a5: ur'\textyen{}', # ¥ YEN SIGN - 0x00a6: ur'\textbrokenbar{}', # ¦ BROKEN BAR - 0x00a7: ur'\textsection{}', # § SECTION SIGN - 0x00a8: ur'\textasciidieresis{}', # ¨ DIAERESIS - 0x00a9: ur'\textcopyright{}', # © COPYRIGHT SIGN - 0x00aa: ur'\textordfeminine{}', # ª FEMININE ORDINAL INDICATOR - 0x00ac: ur'\textlnot{}', # ¬ NOT SIGN - 0x00ae: ur'\textregistered{}', # ® REGISTERED SIGN - 0x00af: ur'\textasciimacron{}', # ¯ MACRON - 0x00b0: ur'\textdegree{}', # ° DEGREE SIGN - 0x00b1: ur'\textpm{}', # ± PLUS-MINUS SIGN - 0x00b2: ur'\texttwosuperior{}', # ² SUPERSCRIPT TWO - 0x00b3: ur'\textthreesuperior{}', # ³ SUPERSCRIPT THREE - 0x00b4: ur'\textasciiacute{}', # ´ ACUTE ACCENT - 0x00b5: ur'\textmu{}', # µ MICRO SIGN - 0x00b6: ur'\textparagraph{}', # ¶ PILCROW SIGN # not equal to \textpilcrow - 0x00b9: ur'\textonesuperior{}', # ¹ SUPERSCRIPT ONE - 0x00ba: ur'\textordmasculine{}', # º MASCULINE ORDINAL INDICATOR - 0x00bc: ur'\textonequarter{}', # 1/4 FRACTION - 0x00bd: ur'\textonehalf{}', # 1/2 FRACTION - 0x00be: ur'\textthreequarters{}', # 3/4 FRACTION - 0x00d7: ur'\texttimes{}', # × MULTIPLICATION SIGN - 0x00f7: ur'\textdiv{}', # ÷ DIVISION SIGN - # - 0x0192: ur'\textflorin{}', # LATIN SMALL LETTER F WITH HOOK - 0x02b9: ur'\textasciiacute{}', # MODIFIER LETTER PRIME - 0x02ba: ur'\textacutedbl{}', # MODIFIER LETTER DOUBLE PRIME - 0x2016: ur'\textbardbl{}', # DOUBLE VERTICAL LINE - 0x2022: ur'\textbullet{}', # BULLET - 0x2032: ur'\textasciiacute{}', # PRIME - 0x2033: ur'\textacutedbl{}', # DOUBLE PRIME - 0x2035: ur'\textasciigrave{}', # REVERSED PRIME - 0x2036: ur'\textgravedbl{}', # REVERSED DOUBLE PRIME - 0x203b: ur'\textreferencemark{}', # REFERENCE MARK - 0x203d: ur'\textinterrobang{}', # INTERROBANG - 0x2044: ur'\textfractionsolidus{}', # FRACTION SLASH - 0x2045: ur'\textlquill{}', # LEFT SQUARE BRACKET WITH QUILL - 0x2046: ur'\textrquill{}', # RIGHT SQUARE BRACKET WITH QUILL - 0x2052: ur'\textdiscount{}', # COMMERCIAL MINUS SIGN - 0x20a1: ur'\textcolonmonetary{}', # COLON SIGN - 0x20a3: ur'\textfrenchfranc{}', # FRENCH FRANC SIGN - 0x20a4: ur'\textlira{}', # LIRA SIGN - 0x20a6: ur'\textnaira{}', # NAIRA SIGN - 0x20a9: ur'\textwon{}', # WON SIGN - 0x20ab: ur'\textdong{}', # DONG SIGN - 0x20ac: ur'\texteuro{}', # EURO SIGN - 0x20b1: ur'\textpeso{}', # PESO SIGN - 0x20b2: ur'\textguarani{}', # GUARANI SIGN - 0x2103: ur'\textcelsius{}', # DEGREE CELSIUS - 0x2116: ur'\textnumero{}', # NUMERO SIGN - 0x2117: ur'\textcircledP{}', # SOUND RECORDING COYRIGHT - 0x211e: ur'\textrecipe{}', # PRESCRIPTION TAKE - 0x2120: ur'\textservicemark{}', # SERVICE MARK - 0x2122: ur'\texttrademark{}', # TRADE MARK SIGN - 0x2126: ur'\textohm{}', # OHM SIGN - 0x2127: ur'\textmho{}', # INVERTED OHM SIGN - 0x212e: ur'\textestimated{}', # ESTIMATED SYMBOL - 0x2190: ur'\textleftarrow{}', # LEFTWARDS ARROW - 0x2191: ur'\textuparrow{}', # UPWARDS ARROW - 0x2192: ur'\textrightarrow{}', # RIGHTWARDS ARROW - 0x2193: ur'\textdownarrow{}', # DOWNWARDS ARROW - 0x2212: ur'\textminus{}', # MINUS SIGN - 0x2217: ur'\textasteriskcentered{}', # ASTERISK OPERATOR - 0x221a: ur'\textsurd{}', # SQUARE ROOT - 0x2422: ur'\textblank{}', # BLANK SYMBOL - 0x25e6: ur'\textopenbullet{}', # WHITE BULLET - 0x25ef: ur'\textbigcircle{}', # LARGE CIRCLE - 0x266a: ur'\textmusicalnote{}', # EIGHTH NOTE - 0x26ad: ur'\textmarried{}', # MARRIAGE SYMBOL - 0x26ae: ur'\textdivorced{}', # DIVORCE SYMBOL - 0x27e8: ur'\textlangle{}', # MATHEMATICAL LEFT ANGLE BRACKET - 0x27e9: ur'\textrangle{}', # MATHEMATICAL RIGHT ANGLE BRACKET - } - # TODO: greek alphabet ... ? - # see also LaTeX codec - # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/252124 - # and unimap.py from TeXML - # set up the translation table: - table = special_chars + # Set up the translation table: + table = CharMaps.special.copy() # keep the underscore in citation references if self.inside_citation_reference_label: del(table[ord('_')]) # Workarounds for OT1 font-encoding - if self.font_encoding in ['OT1', '']: + if self.font_encoding in ['OT1', ''] and not self.is_xetex: # * out-of-order characters in cmtt if self.literal: # replace underscore by underlined blank, @@ -1432,41 +1444,47 @@ # double quotes are 'active' in some languages # TODO: use \textquotedbl if font encoding starts with T? table[ord('"')] = self.babel.literal_double_quote - # Unicode chars: - table.update(unsupported_unicode_chars) - table.update(pifont_chars) - if not self.latex_encoding.startswith('utf8'): - table.update(unicode_chars) - table.update(textcomp_chars) - # Characters that require a feature/package to render - for ch in text: - if ord(ch) in pifont_chars: - self.requirements['pifont'] = '\\usepackage{pifont}' - if ord(ch) in textcomp_chars: + # Unicode replacements for 8-bit tex engines (not required with XeTeX/LuaTeX): + if not self.is_xetex: + table.update(CharMaps.unsupported_unicode) + if not self.latex_encoding.startswith('utf8'): + table.update(CharMaps.utf8_supported_unicode) + table.update(CharMaps.textcomp) + table.update(CharMaps.pifont) + # Characters that require a feature/package to render + if [True for ch in text if ord(ch) in CharMaps.textcomp]: self.requirements['textcomp'] = PreambleCmds.textcomp + if [True for ch in text if ord(ch) in CharMaps.pifont]: + self.requirements['pifont'] = '\\usepackage{pifont}' text = text.translate(table) - # Break up input ligatures - for char in separate_chars * 2: - # Do it twice ("* 2") because otherwise we would replace - # '---' by '-{}--'. - text = text.replace(char + char, char + '{}' + char) + # Break up input ligatures e.g. '--' to '-{}-'. + if not self.is_xetex: # Not required with xetex/luatex + separate_chars = '-' + # In monospace-font, we also separate ',,', '``' and "''" and some + # other characters which can't occur in non-literal text. + if self.literal: + separate_chars += ',`\'"<>' + for char in separate_chars * 2: + # Do it twice ("* 2") because otherwise we would replace + # '---' by '-{}--'. + text = text.replace(char + char, char + '{}' + char) + # Literal line breaks (in address or literal blocks): if self.insert_newline: lines = text.split('\n') - # for blank lines, insert a protected space, to avoid - # ! LaTeX Error: There's no line here to end. - lines = [line + '~'*(not line.lstrip()) - for line in lines[:-1]] + lines[-1:] - text = '\\\\\n'.join(lines) + # Add a protected space to blank lines (except the last) + # to avoid ``! LaTeX Error: There's no line here to end.`` + for i, line in enumerate(lines[:-1]): + if not line.lstrip(): + lines[i] += '~' + text = (r'\\' + '\n').join(lines) if not self.literal: text = self.babel.quote_quotes(text) if self.literal and not self.insert_non_breaking_blanks: # preserve runs of spaces but allow wrapping text = text.replace(' ', ' ~') - if not self.latex_encoding.startswith('utf8'): - text = self.ensure_math(text) return text def attval(self, text, @@ -1518,6 +1536,20 @@ def depart_Text(self, node): pass + def visit_abbreviation(self, node): + node['classes'].insert(0, 'abbreviation') + self.visit_inline(node) + + def depart_abbreviation(self, node): + self.depart_inline(node) + + def visit_acronym(self, node): + node['classes'].insert(0, 'acronym') + self.visit_inline(node) + + def depart_acronym(self, node): + self.depart_inline(node) + def visit_address(self, node): self.visit_docinfo_item(node, 'address') @@ -1648,8 +1680,8 @@ if self._use_latex_citations: followup_citation = False # check for a following citation separated by a space or newline - next_siblings = node.traverse(descend=0, siblings=1, - include_self=0) + next_siblings = node.traverse(descend=False, siblings=True, + include_self=False) if len(next_siblings) > 1: next = next_siblings[0] if (isinstance(next, nodes.Text) and @@ -2187,9 +2219,12 @@ self.requirements['~header'] = ''.join(self.out) self.pop_output_collector() - def to_latex_length(self, length_str, pxunit='px'): + def to_latex_length(self, length_str, pxunit=None): """Convert `length_str` with rst lenght to LaTeX length """ + if pxunit is not None: + sys.stderr.write('deprecation warning: LaTeXTranslator.to_latex_length()' + ' option `pxunit` will be removed.') match = re.match('(\d*\.?\d*)\s*(\S*)', length_str) if not match: return length_str @@ -2200,20 +2235,20 @@ # percentage: relate to current line width elif unit == '%': length_str = '%.3f\\linewidth' % (float(value)/100.0) - elif (unit == 'px') and (pxunit != 'px'): - # length unit px not defined in some tex variants (e.g. XeTeX) + elif self.is_xetex and unit == 'px': + # XeTeX does not know the length unit px. + # Use \pdfpxdimen, the macro to set the value of 1 px in pdftex. + # This way, configuring works the same for pdftex and xetex. self.fallbacks['_providelength'] = PreambleCmds.providelength - self.fallbacks['px'] = '\n\\DUprovidelength{%s}{1bp}\n' % pxunit - length_str = '%s%s' % (value, pxunit) - + self.fallbacks['px'] = '\n\\DUprovidelength{\\pdfpxdimen}{1bp}\n' + length_str = r'%s\pdfpxdimen' % value return length_str def visit_image(self, node): self.requirements['graphicx'] = self.graphicx_package attrs = node.attributes - # Convert image URI to a local file path and add to dependency list + # Convert image URI to a local file path imagepath = urllib.url2pathname(attrs['uri']).replace('\\', '/') - self.settings.record_dependencies.add(imagepath) # alignment defaults: if not 'align' in attrs: # Set default align of image in a figure to 'center' @@ -2432,7 +2467,7 @@ if node['classes']: self.visit_inline(node) self.requirements['amsmath'] = r'\usepackage{amsmath}' - math_code = node.astext().translate(unimathsymbols2tex.uni2tex_table) + math_code = node.astext().translate(unichar2tex.uni2tex_table) if node.get('ids'): math_code = '\n'.join([math_code] + self.ids_to_labels(node)) if math_env == '$': @@ -2820,18 +2855,6 @@ node.walkabout(self) self._thead_depth -= 1 - def bookmark(self, node): - """Return label and pdfbookmark string for titles.""" - result = [''] - if self.settings.sectnum_xform: # "starred" section cmd - # add to the toc and pdfbookmarks - section_name = self.d_class.section(max(self.section_level, 1)) - section_title = self.encode(node.astext()) - result.append(r'\addcontentsline{toc}{%s}{%s}' % - (section_name, section_title)) - result += self.ids_to_labels(node.parent, set_anchor=False) - return '%\n '.join(result) + '%\n' - def visit_title(self, node): """Append section and other titles.""" # Document title @@ -2856,26 +2879,31 @@ self.context.append('') # Section title else: + self.requirements['secnumdepth'] = PreambleCmds.secnumdepth + section_name = self.d_class.section(self.section_level) self.out.append('\n\n') - self.out.append('%' + '_' * 75) - self.out.append('\n\n') - # - section_name = self.d_class.section(self.section_level) - section_star = '' - pdfanchor = '' - # number sections? - if (self.settings.sectnum_xform # numbering by Docutils - or (self.section_level > len(self.d_class.sections))): - section_star = '*' - pdfanchor = '\\phantomsection%\n ' - self.out.append(r'\%s%s{%s' % - (section_name, section_star, pdfanchor)) # System messages heading in red: if ('system-messages' in node.parent['classes']): self.requirements['color'] = PreambleCmds.color - self.out.append('\color{red}') + section_title = self.encode(node.astext()) + self.out.append(r'\%s[%s]{\color{red}' % ( + section_name,section_title)) + else: + self.out.append(r'\%s{' % section_name) + if self.section_level > len(self.d_class.sections): + # section level not supported by LaTeX + self.fallbacks['title'] = PreambleCmds.title + # self.out.append('\\phantomsection%\n ') # label and ToC entry: - self.context.append(self.bookmark(node) + '}\n') + bookmark = [''] + # add sections with unsupported level to toc and pdfbookmarks? + ## if self.section_level > len(self.d_class.sections): + ## section_title = self.encode(node.astext()) + ## bookmark.append(r'\addcontentsline{toc}{%s}{%s}' % + ## (section_name, section_title)) + bookmark += self.ids_to_labels(node.parent, set_anchor=False) + self.context.append('%\n '.join(bookmark) + '%\n}\n') + # MAYBE postfix paragraph and subparagraph with \leavemode to # ensure floats stay in the section and text starts on a new line. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/latex2e/docutils-05-compat.sty =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/latex2e/docutils-05-compat.sty 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/latex2e/docutils-05-compat.sty 2012-05-04 08:52:38 UTC (rev 655) @@ -6,7 +6,7 @@ % ************************************* % % :Author: Guenter Milde -% :Contact: milde@users.berlios.de +% :Contact: milde@users.sourceforge.net % :Revision: $Revision: 6156 $ % :Date: $Date: 2009-02-24 $ % :Copyright: © 2009 Günter Milde, Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/manpage.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/manpage.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/manpage.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# $Id: manpage.py 7048 2011-06-04 12:35:19Z grubert $ +# $Id: manpage.py 7321 2012-01-20 06:50:44Z grubert $ # Author: Engelbert Gruber <grubert@users.sourceforge.net> # Copyright: This module is put into the public domain. @@ -48,7 +48,10 @@ import docutils from docutils import nodes, writers, languages -import roman +try: + import roman +except ImportError: + import docutils.utils.roman as roman FIELD_LIST_INDENT = 7 DEFINITION_LIST_INDENT = 7 @@ -156,7 +159,7 @@ words_and_spaces = re.compile(r'\S+| +|\n') possibly_a_roff_command = re.compile(r'\.\w') - document_start = """Man page generated from reStructeredText.""" + document_start = """Man page generated from reStructuredText.""" def __init__(self, document): nodes.NodeVisitor.__init__(self, document) @@ -585,7 +588,7 @@ self.body.append('.SH COPYRIGHT\n%s\n' % self._docinfo['copyright']) self.body.append(self.comment( - 'Generated by docutils manpage writer.\n')) + 'Generated by docutils manpage writer.')) def visit_emphasis(self, node): self.body.append(self.defs['emphasis'][0]) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/odf_odt/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/odf_odt/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/odf_odt/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: __init__.py 7057 2011-06-27 05:39:48Z dkuhlman $ +# $Id: __init__.py 7385 2012-03-20 00:22:38Z dkuhlman $ # Author: Dave Kuhlman <dkuhlman@rexx.com> # Copyright: This module has been placed in the public domain. @@ -800,7 +800,7 @@ self.document.reporter.warning( 'Style "%s" is not a style used by odtwriter.' % ( rststyle, )) - self.format_map[rststyle] = format + self.format_map[rststyle] = format.decode('utf-8') self.section_level = 0 self.section_count = 0 # Create ElementTree content and styles documents. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/pseudoxml.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/pseudoxml.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/pseudoxml.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: pseudoxml.py 4564 2006-05-21 20:44:42Z wiemann $ +# $Id: pseudoxml.py 7320 2012-01-19 22:33:02Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -28,4 +28,4 @@ def supports(self, format): """This writer supports all format-specific elements.""" - return 1 + return True Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/s5_html/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/s5_html/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/s5_html/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: __init__.py 7025 2011-05-05 23:19:51Z milde $ +# $Id: __init__.py 7320 2012-01-19 22:33:02Z milde $ # Authors: Chris Liechti <cliechti@gmx.net>; # David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -202,7 +202,7 @@ else: # no destination, so we can't copy the theme return - default = 0 + default = False while path: for f in os.listdir(path): # copy all files from each theme if f == self.base_theme_file: @@ -233,7 +233,7 @@ if not path: path = find_theme(self.default_theme) theme_paths.append(path) - default = 1 + default = True if len(required_files_copied) != len(self.required_theme_files): # Some required files weren't found & couldn't be copied. required = list(self.required_theme_files) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/xetex/__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/xetex/__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/docutils/writers/xetex/__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -2,8 +2,8 @@ # -*- coding: utf8 -*- # :Author: Günter Milde <milde@users.sourceforge.net> -# :Revision: $Revision: 7102 $ -# :Date: $Date: 2011-08-24 15:36:28 +0200 (Mit, 24 Aug 2011) $ +# :Revision: $Revision: 7389 $ +# :Date: $Date: 2012-03-30 13:58:21 +0200 (Fre, 30 Mär 2012) $ # :Copyright: © 2010 Günter Milde. # :License: Released under the terms of the `2-Clause BSD license`_, in short: # @@ -61,7 +61,7 @@ def __init__(self): latex2e.Writer.__init__(self) - self.settings_defaults.update({'fontencoding': ''}) # use default (EU1) + self.settings_defaults.update({'fontencoding': ''}) # use default (EU1 or EU2) self.translator_class = XeLaTeXTranslator @@ -125,79 +125,10 @@ class XeLaTeXTranslator(latex2e.LaTeXTranslator): def __init__(self, document): + self.is_xetex = True # typeset with XeTeX or LuaTeX engine latex2e.LaTeXTranslator.__init__(self, document, Babel) if self.latex_encoding == 'utf8': self.requirements.pop('_inputenc', None) else: self.requirements['_inputenc'] = (r'\XeTeXinputencoding %s ' % self.latex_encoding) - - # XeTeX does not know the length unit px. - # Use \pdfpxdimen, the macro to set the value of 1 px in pdftex. - # This way, configuring works the same for pdftex and xetex. - def to_latex_length(self, length_str, px=r'\pdfpxdimen'): - """Convert string with rst lenght to LaTeX length""" - return latex2e.LaTeXTranslator.to_latex_length(self, length_str, px) - - # Simpler variant of encode, as XeTeX understands utf8 Unicode: - def encode(self, text): - """Return text with 'problematic' characters escaped. - - Escape the ten special printing characters ``# $ % & ~ _ ^ \ { }``, - square brackets ``[ ]``, double quotes and (in OT1) ``< | >``. - """ - if self.verbatim: - return text - # LaTeX encoding maps: - special_chars = { - ord('#'): ur'\#', - ord('$'): ur'\$', - ord('%'): ur'\%', - ord('&'): ur'\&', - ord('~'): ur'\textasciitilde{}', - ord('_'): ur'\_', - ord('^'): ur'\textasciicircum{}', - ord('\\'): ur'\textbackslash{}', - ord('{'): ur'\{', - ord('}'): ur'\}', - # Square brackets are ordinary chars and cannot be escaped with '\', - # so we put them in a group '{[}'. (Alternative: ensure that all - # macros with optional arguments are terminated with {} and text - # inside any optional argument is put in a group ``[{text}]``). - # Commands with optional args inside an optional arg must be put - # in a group, e.g. ``\item[{\hyperref[label]{text}}]``. - ord('['): ur'{[}', - ord(']'): ur'{]}' - } - # Unicode chars that are not properly handled by XeTeX - unsupported_unicode_chars = { - 0x00AD: ur'\-', # SOFT HYPHEN - } - # set up the translation table: - table = special_chars - # keep the underscore in citation references - if self.inside_citation_reference_label: - del(table[ord('_')]) - if self.insert_non_breaking_blanks: - table[ord(' ')] = ur'~' - if self.literal: - # double quotes are 'active' in some languages - table[ord('"')] = self.babel.literal_double_quote - else: - text = self.babel.quote_quotes(text) - # Unicode chars: - table.update(unsupported_unicode_chars) - - text = text.translate(table) - - # Literal line breaks (in address or literal blocks): - if self.insert_newline: - # for blank lines, insert a protected space, to avoid - # ! LaTeX Error: There's no line here to end. - textlines = [line + '~'*(not line.lstrip()) - for line in text.split('\n')] - text = '\\\\\n'.join(textlines) - if self.literal and not self.insert_non_breaking_blanks: - # preserve runs of spaces but allow wrapping - text = text.replace(' ', ' ~') - return text Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/setup.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/setup.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/setup.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,5 @@ #!/usr/bin/env python -# $Id: setup.py 7106 2011-08-30 07:02:28Z grubert $ +# $Id: setup.py 7268 2011-12-20 16:39:10Z milde $ # Copyright: This file has been placed in the public domain. import sys @@ -88,9 +88,6 @@ def do_setup(): kwargs = package_data.copy() - extras = get_extras() - if extras: - kwargs['py_modules'] = extras kwargs['classifiers'] = classifiers # Install data files properly. kwargs['cmdclass'] = {'build_data': build_data, @@ -118,13 +115,12 @@ 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.8.1', + 'version': '0.9', 'author': 'David Goodger', 'author_email': 'goodger@python.org', 'license': 'public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)', 'platforms': 'OS-independent', 'package_dir': {'docutils': 'docutils', - '': 'extras', 'docutils.tools': 'tools'}, 'packages': ['docutils', 'docutils.languages', @@ -135,6 +131,7 @@ 'docutils.readers', # 'docutils.readers.python', # in the sandbox since 0.8 'docutils.transforms', + 'docutils.utils', 'docutils.math', 'docutils.writers', 'docutils.writers.html4css1', @@ -155,8 +152,6 @@ ['docutils/writers/latex2e/default.tex', 'docutils/writers/latex2e/titlepage.tex', 'docutils/writers/latex2e/xelatex.tex',]), - # ('docutils/writers/newlatex2e', - # ['docutils/writers/newlatex2e/base.tex']), ('docutils/writers/pep_html', ['docutils/writers/pep_html/pep.css', 'docutils/writers/pep_html/template.txt']), @@ -169,7 +164,6 @@ 'scripts' : ['tools/rst2html.py', 'tools/rst2s5.py', 'tools/rst2latex.py', - # 'tools/rst2newlatex.py', 'tools/rst2xetex.py', 'tools/rst2man.py', 'tools/rst2xml.py', @@ -198,37 +192,28 @@ 'Topic :: Text Processing', 'Natural Language :: English', # main/default language, keep first 'Natural Language :: Afrikaans', + 'Natural Language :: Brazilian Portuguese', + 'Natural Language :: Catalan', + 'Natural Language :: Czech', + 'Natural Language :: Dutch', 'Natural Language :: Esperanto', + 'Natural Language :: Finnish', 'Natural Language :: French', + 'Natural Language :: Galician', 'Natural Language :: German', 'Natural Language :: Italian', + 'Natural Language :: Japanese', + 'Natural Language :: Lithuanian', + 'Natural Language :: Polish', 'Natural Language :: Russian', + 'Natural Language :: Simplified Chinese ', 'Natural Language :: Slovak', 'Natural Language :: Spanish', - 'Natural Language :: Swedish',] + 'Natural Language :: Swedish', + 'Natural Language :: Traditional Chinese ', + ] """Trove classifiers for the Distutils "register" command; Python 2.3 and up.""" -extra_modules = [('roman', '1.4', ['toRoman', 'fromRoman', - 'InvalidRomanNumeralError'])] -"""Third-party modules to install if they're not already present. -List of (module name, minimum __version__ string, [attribute names]).""" - -def get_extras(): - extras = [] - for module_name, version, attributes in extra_modules: - try: - module = __import__(module_name) - if version and module.__version__ < version: - raise ValueError - for attribute in attributes or []: - getattr(module, attribute) - print ('"%s" module already present; ignoring extras/%s.py.' - % (module_name, module_name)) - except (ImportError, AttributeError, ValueError): - extras.append(module_name) - return extras - - if __name__ == '__main__' : do_setup() Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/DocutilsTestSupport.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/DocutilsTestSupport.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/DocutilsTestSupport.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -# $Id: DocutilsTestSupport.py 6380 2010-07-21 16:07:39Z goodger $ +# $Id: DocutilsTestSupport.py 7400 2012-05-01 08:34:41Z grubert $ # Authors: David Goodger <goodger@python.org>; # Garth Kidd <garth@deadlybloodyserious.com> # Copyright: This module has been placed in the public domain. @@ -107,7 +107,7 @@ def setUp(self): os.chdir(testroot) - def failUnlessEqual(self, first, second, msg=None): + def assertEqual(self, first, second, msg=None): """Fail if the two objects are unequal as determined by the '==' operator. """ @@ -115,7 +115,7 @@ raise self.failureException, \ (msg or '%s != %s' % _format_str(first, second)) - def failIfEqual(self, first, second, msg=None): + def assertNotEqual(self, first, second, msg=None): """Fail if the two objects are equal as determined by the '==' operator. """ @@ -123,19 +123,23 @@ raise self.failureException, \ (msg or '%s == %s' % _format_str(first, second)) - # Synonyms for assertion methods + # python 2.3 + if not hasattr(unittest.TestCase, "assertTrue"): + assertTrue = unittest.TestCase.failUnless - assertEqual = assertEquals = failUnlessEqual + # aliases for assertion methods, deprecated since Python 2.7 - assertNotEqual = assertNotEquals = failIfEqual + failUnlessEqual = assertEquals = assertEqual + assertNotEquals = failIfEqual = assertNotEqual + class CustomTestCase(StandardTestCase): """ Helper class, providing extended functionality over unittest.TestCase. - The methods failUnlessEqual and failIfEqual have been overwritten + The methods assertEqual and assertNotEqual have been overwritten to provide better support for multi-line strings. Furthermore, see the compare_output method and the parameter list of __init__. """ @@ -143,8 +147,8 @@ compare = difflib.Differ().compare """Comparison method shared by all subclasses.""" - def __init__(self, method_name, input, expected, id, run_in_debugger=0, - suite_settings=None): + def __init__(self, method_name, input, expected, id, + run_in_debugger=True, suite_settings=None): """ Initialise the CustomTestCase. @@ -209,7 +213,7 @@ if output: output = '\n'.join(output.splitlines()) try: - self.assertEquals(output, expected) + self.assertEqual(output, expected) except AssertionError, error: print >>sys.stderr, '\n%s\ninput:' % (self,) print >>sys.stderr, input @@ -274,7 +278,7 @@ self.id = id def addTestCase(self, test_case_class, method_name, input, expected, - id=None, run_in_debugger=0, **kwargs): + id=None, run_in_debugger=False, **kwargs): """ Create a CustomTestCase in the CustomTestSuite. Also return it, just in case. @@ -405,7 +409,7 @@ for name, (transforms, cases) in dict.items(): for casenum in range(len(cases)): case = cases[casenum] - run_in_debugger = 0 + run_in_debugger = False if len(case)==3: # TODO: (maybe) change the 3rd argument to a dict, so it # can handle more cases by keyword ('disable', 'debug', @@ -413,7 +417,7 @@ # But there's also the method that # HtmlPublishPartsTestSuite uses <DJG> if case[2]: - run_in_debugger = 1 + run_in_debugger = True else: continue self.addTestCase( @@ -479,10 +483,10 @@ for name, cases in dict.items(): for casenum in range(len(cases)): case = cases[casenum] - run_in_debugger = 0 + run_in_debugger = False if len(case)==3: if case[2]: - run_in_debugger = 1 + run_in_debugger = True else: continue self.addTestCase( @@ -496,7 +500,7 @@ """PEP-specific parser test case.""" - parser = rst.Parser(rfc2822=1, inliner=rst.states.Inliner()) + parser = rst.Parser(rfc2822=True, inliner=rst.states.Inliner()) """Parser shared by all PEPParserTestCases.""" option_parser = frontend.OptionParser(components=(rst.Parser, pep.Reader)) @@ -564,10 +568,10 @@ for name, cases in dict.items(): for casenum in range(len(cases)): case = cases[casenum] - run_in_debugger = 0 + run_in_debugger = False if len(case) == 4: if case[-1]: - run_in_debugger = 1 + run_in_debugger = True else: continue self.addTestCase(self.test_case_class, 'test_parse_table', @@ -607,10 +611,10 @@ for name, cases in dict.items(): for casenum in range(len(cases)): case = cases[casenum] - run_in_debugger = 0 + run_in_debugger = False if len(case) == 3: if case[-1]: - run_in_debugger = 1 + run_in_debugger = True else: continue self.addTestCase(self.test_case_class, 'test_parse', @@ -668,10 +672,10 @@ for name, cases in dict.items(): for casenum in range(len(cases)): case = cases[casenum] - run_in_debugger = 0 + run_in_debugger = False if len(case)==3: if case[2]: - run_in_debugger = 1 + run_in_debugger = True else: continue self.addTestCase( @@ -724,10 +728,10 @@ for name, cases in dict.items(): for casenum in range(len(cases)): case = cases[casenum] - run_in_debugger = 0 + run_in_debugger = False if len(case)==3: if case[2]: - run_in_debugger = 1 + run_in_debugger = True else: continue self.addTestCase( @@ -747,10 +751,10 @@ settings.update(settings_overrides) for casenum in range(len(cases)): case = cases[casenum] - run_in_debugger = 0 + run_in_debugger = False if len(case)==3: if case[2]: - run_in_debugger = 1 + run_in_debugger = True else: continue self.addTestCase( Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/data/config_list.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/data/config_list.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/data/config_list.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -1,8 +1,15 @@ [general] expose_internals: a +strip-classes: spam +strip-elements-with-classes: sugar, flour [html4css1 writer] expose_internals: b:c:d +strip-classes: pan, + fun, +strip-elements-with-classes: milk [pep_html writer] expose_internals: e +strip-classes: parrot +strip-elements-with-classes: safran Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/data/config_list_2.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/data/config_list_2.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/data/config_list_2.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -1,2 +1,4 @@ [general] expose_internals: f +strip-classes: ham, eggs +strip-elements-with-classes: eggs,salt Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/data/dependencies.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/data/dependencies.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/data/dependencies.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -1,8 +1,29 @@ -.. image:: some_image.png +Test input for test_dependencies. +Docutils can write a list of files required to generate the output like +included files or embedded stylesheets. This is particularly useful in +conjunction with programs like ``make``. + +Included files are recorded: + .. include:: include.txt .. raw:: HTML :file: raw.txt +Dependencies are recorded only once: + .. include:: include.txt + +Image files are only recorded, if actually accessed +(to extract the size or if embedded in the output document): + +.. image:: test.jpg + +.. figure:: ../docs/user/rst/images/title.png + :figwidth: image + +Scaled images without given size are recorded by the html writer: + +.. image:: ../docs/user/rst/images/biohazard.png + :scale: 50 % Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/compact_lists.html =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/cyrillic.tex =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/cyrillic.tex 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/cyrillic.tex 2012-05-04 08:52:38 UTC (rev 655) @@ -6,6 +6,7 @@ \usepackage[T1,T2A]{fontenc} \usepackage[utf8]{inputenc} \usepackage[english,russian]{babel} +\setcounter{secnumdepth}{0} %%% Custom LaTeX preamble % PDF Standard Fonts @@ -32,33 +33,21 @@ \begin{document} -%___________________________________________________________________________ - -\section*{\phantomsection% - Заголовок% - \addcontentsline{toc}{section}{Заголовок}% +\section{Заголовок% \label{id1}% } первый пример: \glqq{}Здравствуй, мир!\grqq{} -%___________________________________________________________________________ - -\section*{\phantomsection% - Title% - \addcontentsline{toc}{section}{Title}% +\section{Title% \label{title}% } \otherlanguage{english}{first example: \glqq{}Hello world\grqq{}.} -%___________________________________________________________________________ - -\section*{\phantomsection% - Notes% - \addcontentsline{toc}{section}{Notes}% +\section{Notes% \label{notes}% } Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/dangerous.html =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/field_name_limit.html =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/math_output_html.html =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/math_output_latex.html =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/math_output_mathjax.html =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/math_output_mathml.xhtml =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/misc_rst_html4css1.html =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/pep_html.html =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_html4css1.html =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_latex.tex =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_latex.tex 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_latex.tex 2012-05-04 08:52:38 UTC (rev 655) @@ -16,6 +16,7 @@ \usepackage{graphicx} \usepackage{multirow} \usepackage{pifont} +\setcounter{secnumdepth}{0} \usepackage{longtable,ltcaption,array} \setlength{\extrarowheight}{2pt} \newlength{\DUtablewidth} % internal use in tables @@ -149,7 +150,7 @@ % subtitle (for topic/sidebar) \providecommand*{\DUsubtitle}[2][class-arg]{\par\emph{#2}\smallskip} -% title for topics, admonitions and sidebar +% title for topics, admonitions, unsupported section levels, and sidebar \providecommand*{\DUtitle}[2][class-arg]{% % call \DUtitle#1{#2} if it exists: \ifcsname DUtitle#1\endcsname% @@ -280,20 +281,12 @@ -%___________________________________________________________________________ - -\section*{\phantomsection% - 1~~~Structural Elements% - \addcontentsline{toc}{section}{1~~~Structural Elements}% +\section{1~~~Structural Elements% \label{structural-elements}% } -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 1.1~~~Section Title% - \addcontentsline{toc}{subsection}{1.1~~~Section Title}% +\subsection{1.1~~~Section Title% \label{section-title}% } \subsubsection*{Section Subtitle} @@ -303,20 +296,12 @@ \texttt{sectsubtitle-xform} configuration value. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 1.2~~~Empty Section% - \addcontentsline{toc}{subsection}{1.2~~~Empty Section}% +\subsection{1.2~~~Empty Section% \label{empty-section}% } -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 1.3~~~Transitions% - \addcontentsline{toc}{subsection}{1.3~~~Transitions}% +\subsection{1.3~~~Transitions% \label{transitions}% } @@ -335,31 +320,19 @@ -%___________________________________________________________________________ - -\section*{\phantomsection% - 2~~~Body Elements% - \addcontentsline{toc}{section}{2~~~Body Elements}% +\section{2~~~Body Elements% \label{body-elements}% } -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.1~~~Paragraphs% - \addcontentsline{toc}{subsection}{2.1~~~Paragraphs}% +\subsection{2.1~~~Paragraphs% \label{paragraphs}% } A paragraph. -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.1.1~~~Inline Markup% - \addcontentsline{toc}{subsubsection}{2.1.1~~~Inline Markup}% +\subsubsection{2.1.1~~~Inline Markup% \label{inline-markup}% } @@ -368,7 +341,7 @@ (\url{http://www.python.org}), external hyperlinks (\href{http://www.python.org/}{Python}\DUfootnotemark{id30}{id29}{5}), internal cross-references (\hyperref[example]{example}), external hyperlinks with embedded URIs (\href{http://www.python.org}{Python web site}), \href{http://www.python.org/}{anonymous hyperlink -references}\DUfootnotemark{id36}{id29}{5} (\href{http://docutils.sourceforge.net/}{a second reference}\DUfootnotemark{id38}{id37}{7}), footnote references (manually +references}\DUfootnotemark{id38}{id29}{5} (\href{http://docutils.sourceforge.net/}{a second reference}\DUfootnotemark{id40}{id39}{8}), footnote references (manually numbered\DUfootnotemark{id1}{id8}{1}, anonymous auto-numbered\DUfootnotemark{id2}{id12}{3}, labeled auto-numbered\DUfootnotemark{id3}{label}{2}, or symbolic\DUfootnotemark{id4}{id13}{*}), citation references (\hyperlink{cit2002}{[CIT2002]}), substitution references (\includegraphics{../../../docs/user/rst/images/biohazard.png}), and % \phantomsection\label{inline-hyperlink-targets}inline hyperlink targets @@ -380,9 +353,10 @@ The default role for interpreted text is \DUroletitlereference{Title Reference}. Here are some explicit interpreted text roles: a PEP reference (\href{http://www.python.org/dev/peps/pep-0287}{PEP 287}); an -RFC reference (\href{http://www.faqs.org/rfcs/rfc2822.html}{RFC 2822}); a \textsubscript{subscript}; a \textsuperscript{superscript}; -and explicit roles for \emph{standard} \textbf{inline} -\texttt{markup}. +RFC reference (\href{http://www.faqs.org/rfcs/rfc2822.html}{RFC 2822}); an abbreviation (\DUrole{abbreviation}{abb.}), an acronym +(\DUrole{acronym}{reST}), code (\texttt{\DUrole{code}{print "hello world"}}); a \textsubscript{subscript}; +a \textsuperscript{superscript} and explicit roles for \DUroletitlereference{Docutils}' +\emph{standard} \textbf{inline} \texttt{markup}. % DO NOT RE-WRAP THE FOLLOWING PARAGRAPH! @@ -397,11 +371,7 @@ live link to PEP 258 here. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.2~~~Bullet Lists% - \addcontentsline{toc}{subsection}{2.2~~~Bullet Lists}% +\subsection{2.2~~~Bullet Lists% \label{bullet-lists}% } % @@ -447,11 +417,7 @@ \end{itemize} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.3~~~Enumerated Lists% - \addcontentsline{toc}{subsection}{2.3~~~Enumerated Lists}% +\subsection{2.3~~~Enumerated Lists% \label{enumerated-lists}% } \newcounter{listcnt0} @@ -539,11 +505,7 @@ \end{list} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.4~~~Definition Lists% - \addcontentsline{toc}{subsection}{2.4~~~Definition Lists}% +\subsection{2.4~~~Definition Lists% \label{definition-lists}% } % @@ -568,11 +530,7 @@ \end{description} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.5~~~Field Lists% - \addcontentsline{toc}{subsection}{2.5~~~Field Lists}% +\subsection{2.5~~~Field Lists% \label{field-lists}% } % @@ -596,11 +554,7 @@ \end{DUfieldlist} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.6~~~Option Lists% - \addcontentsline{toc}{subsection}{2.6~~~Option Lists}% +\subsection{2.6~~~Option Lists% \label{option-lists}% } @@ -637,11 +591,7 @@ description. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.7~~~Literal Blocks% - \addcontentsline{toc}{subsection}{2.7~~~Literal Blocks}% +\subsection{2.7~~~Literal Blocks% \label{literal-blocks}% } @@ -666,11 +616,7 @@ \end{quote} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.8~~~Line Blocks% - \addcontentsline{toc}{subsection}{2.8~~~Line Blocks}% +\subsection{2.8~~~Line Blocks% \label{line-blocks}% } @@ -766,11 +712,7 @@ \end{DUlineblock} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.9~~~Block Quotes% - \addcontentsline{toc}{subsection}{2.9~~~Block Quotes}% +\subsection{2.9~~~Block Quotes% \label{block-quotes}% } @@ -802,11 +744,7 @@ \end{quote} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.10~~~Doctest Blocks% - \addcontentsline{toc}{subsection}{2.10~~~Doctest Blocks}% +\subsection{2.10~~~Doctest Blocks% \label{doctest-blocks}% } % @@ -819,11 +757,7 @@ \end{quote} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.11~~~Footnotes% - \addcontentsline{toc}{subsection}{2.11~~~Footnotes}% +\subsection{2.11~~~Footnotes% \label{footnotes}% } % @@ -862,16 +796,12 @@ \DUfootnotetext{id16}{id16}{4}{% Here's an unreferenced footnote, with a reference to a nonexistent footnote:% -\raisebox{1em}{\hypertarget{id44}{}}% -\raisebox{1em}{\hypertarget{id17}{}}\hyperlink{id43}{\textbf{\color{red}{[}5{]}\_}}. +\raisebox{1em}{\hypertarget{id46}{}}% +\raisebox{1em}{\hypertarget{id17}{}}\hyperlink{id45}{\textbf{\color{red}{[}5{]}\_}}. } -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.12~~~Citations% - \addcontentsline{toc}{subsection}{2.12~~~Citations}% +\subsection{2.12~~~Citations% \label{citations}% } \begin{figure}[b]\raisebox{1em}{\hypertarget{cit2002}{}}[CIT2002] @@ -880,16 +810,12 @@ \end{figure} Here's a reference to the above, \hyperlink{cit2002}{[CIT2002]}, and a % -\raisebox{1em}{\hypertarget{id46}{}}% -\raisebox{1em}{\hypertarget{id19}{}}\hyperlink{id45}{\textbf{\color{red}{[}nonexistent{]}\_}} +\raisebox{1em}{\hypertarget{id48}{}}% +\raisebox{1em}{\hypertarget{id19}{}}\hyperlink{id47}{\textbf{\color{red}{[}nonexistent{]}\_}} citation. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.13~~~Targets% - \addcontentsline{toc}{subsection}{2.13~~~Targets}% +\subsection{2.13~~~Targets% \label{targets}% \label{another-target}% } @@ -909,15 +835,11 @@ refer to the \hyperref[targets]{Targets} section. Here's a % -\raisebox{1em}{\hypertarget{id48}{}}\hyperlink{id47}{\textbf{\color{red}`hyperlink reference without a target`\_}}, which generates an +\raisebox{1em}{\hypertarget{id50}{}}\hyperlink{id49}{\textbf{\color{red}`hyperlink reference without a target`\_}}, which generates an error. -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.13.1~~~Duplicate Target Names% - \addcontentsline{toc}{subsubsection}{2.13.1~~~Duplicate Target Names}% +\subsubsection{2.13.1~~~Duplicate Target Names% \label{duplicate-target-names}% } @@ -926,25 +848,17 @@ explicit targets will generate ``warning'' (level-2) system messages. -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.13.2~~~Duplicate Target Names% - \addcontentsline{toc}{subsubsection}{2.13.2~~~Duplicate Target Names}% +\subsubsection{2.13.2~~~Duplicate Target Names% \label{id21}% } Since there are two ``Duplicate Target Names'' section headers, we cannot uniquely refer to either of them by name. If we try to (like this: % -\raisebox{1em}{\hypertarget{id50}{}}\hyperlink{id49}{\textbf{\color{red}`Duplicate Target Names`\_}}), an error is generated. +\raisebox{1em}{\hypertarget{id52}{}}\hyperlink{id51}{\textbf{\color{red}`Duplicate Target Names`\_}}), an error is generated. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.14~~~Directives% - \addcontentsline{toc}{subsection}{2.14~~~Directives}% +\subsection{2.14~~~Directives% \label{directives}% } @@ -954,11 +868,7 @@ \url{http://docutils.sourceforge.net/docs/ref/rst/directives.html}. -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.14.1~~~Document Parts% - \addcontentsline{toc}{subsubsection}{2.14.1~~~Document Parts}% +\subsubsection{2.14.1~~~Document Parts% \label{document-parts}% } @@ -967,11 +877,7 @@ document (a document-wide \hyperref[table-of-contents]{table of contents}). -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.14.2~~~Images and Figures% - \addcontentsline{toc}{subsubsection}{2.14.2~~~Images and Figures}% +\subsubsection{2.14.2~~~Images and Figures% \label{images-and-figures}% } @@ -1105,11 +1011,7 @@ upon the style sheet and the browser or rendering software used. -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.14.3~~~Admonitions% - \addcontentsline{toc}{subsubsection}{2.14.3~~~Admonitions}% +\subsubsection{2.14.3~~~Admonitions% \label{admonitions}% } @@ -1185,11 +1087,7 @@ } -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.14.4~~~Topics, Sidebars, and Rubrics% - \addcontentsline{toc}{subsubsection}{2.14.4~~~Topics, Sidebars, and Rubrics}% +\subsubsection{2.14.4~~~Topics, Sidebars, and Rubrics% \label{topics-sidebars-and-rubrics}% } @@ -1227,11 +1125,7 @@ allowed (e.g. inside a directive). -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.14.5~~~Target Footnotes% - \addcontentsline{toc}{subsubsection}{2.14.5~~~Target Footnotes}% +\subsubsection{2.14.5~~~Target Footnotes% \label{target-footnotes}% } % @@ -1240,34 +1134,30 @@ } % \DUfootnotetext{id33}{id34}{6}{% +\url{http://pygments.org/} +} +% +\DUfootnotetext{id35}{id36}{7}{% \url{ftp://ftp.ams.org/ams/doc/amsmath/short-math-guide.pdf} } % -\DUfootnotetext{id37}{id38}{7}{% +\DUfootnotetext{id39}{id40}{8}{% \url{http://docutils.sourceforge.net/} } % -\DUfootnotetext{id39}{id40}{8}{% +\DUfootnotetext{id41}{id42}{9}{% \url{A:DOS\\path\\} } -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.14.6~~~Replacement Text% - \addcontentsline{toc}{subsubsection}{2.14.6~~~Replacement Text}% +\subsubsection{2.14.6~~~Replacement Text% \label{replacement-text}% } I recommend you try \href{http://www.python.org/}{Python, \emph{the} best language around}\DUfootnotemark{id32}{id29}{5}. -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.14.7~~~Compound Paragraph% - \addcontentsline{toc}{subsubsection}{2.14.7~~~Compound Paragraph}% +\subsubsection{2.14.7~~~Compound Paragraph% \label{compound-paragraph}% } @@ -1344,11 +1234,7 @@ Compound 7, another paragraph. -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.14.8~~~Parsed Literal Blocks% - \addcontentsline{toc}{subsubsection}{2.14.8~~~Parsed Literal Blocks}% +\subsubsection{2.14.8~~~Parsed Literal Blocks% \label{parsed-literal-blocks}% } % @@ -1363,11 +1249,56 @@ \end{quote} -%___________________________________________________________________________ +\subsubsection{2.14.9~~~Code% + \label{code}% +} -\subsection*{\phantomsection% - 2.15~~~Substitution Definitions% - \addcontentsline{toc}{subsection}{2.15~~~Substitution Definitions}% +Blocks of source code can be set with the \DUroletitlereference{code} directive. If the code +language is specified, the content is parsed and tagged by the \href{http://pygments.org/}{Pygments}\DUfootnotemark{id34}{id33}{6} +syntax highlighter and can be formatted with a style sheet. (Code parsing +is turned off using the \texttt{syntax-highlight} config setting in the test +conversions in order to get identical results with/without installed +Pygments highlighter.) +% +\begin{quote}{\ttfamily \raggedright \noindent +print~'This~is~Python~code.' +} +\end{quote} + +The \texttt{:number-lines:} option (with optional start value) generates line +numbers: +% +\begin{quote}{\ttfamily \raggedright \noindent +\DUrole{ln}{~8~}\#~print~integers~from~0~to~9:\\ +\DUrole{ln}{~9~}for~i~in~range(10):\\ +\DUrole{ln}{10~}~~~~print~i +} +\end{quote} + +For inline code snippets, there is the \DUroletitlereference{code} role, which can be used +directly (the code will not be parsed/tagged, as the language is not +known) or as base for special code roles, e.g., + +% +% +\begin{quote} + +Docutils uses LaTeX syntax for math directives and roles: +\texttt{\DUrole{code}{\DUrole{latex}{\DUrole{tex}{\textbackslash{}alpha = f(x)}}}} prints $\alpha = f(x)$. + +\end{quote} + +The \texttt{:code:} option of the \DUroletitlereference{include} directive sets the included content +as a code block, here the rst file \texttt{header\_footer.txt} with line numbers: +% +\begin{quote}{\ttfamily \raggedright \noindent +\DUrole{ln}{1~}..~header::~Document~header\\ +\DUrole{ln}{2~}..~footer::~Document~footer +} +\end{quote} + + +\subsection{2.15~~~Substitution Definitions% \label{substitution-definitions}% } @@ -1376,11 +1307,7 @@ (Substitution definitions are not visible in the HTML source.) -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.16~~~Comments% - \addcontentsline{toc}{subsection}{2.16~~~Comments}% +\subsection{2.16~~~Comments% \label{comments}% } @@ -1397,11 +1324,7 @@ (View the HTML source to see the comment.) -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.17~~~Raw text% - \addcontentsline{toc}{subsection}{2.17~~~Raw text}% +\subsection{2.17~~~Raw text% \label{raw-text}% } @@ -1420,11 +1343,7 @@ Fifth test in LaTeX.\\Line two. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.18~~~Container% - \addcontentsline{toc}{subsection}{2.18~~~Container}% +\subsection{2.18~~~Container% \label{container}% } @@ -1436,11 +1355,7 @@ % .. include:: data/header_footer.txt -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.19~~~Colspanning tables% - \addcontentsline{toc}{subsection}{2.19~~~Colspanning tables}% +\subsection{2.19~~~Colspanning tables% \label{colspanning-tables}% } @@ -1518,11 +1433,7 @@ \end{longtable*} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.20~~~Rowspanning tables% - \addcontentsline{toc}{subsection}{2.20~~~Rowspanning tables}% +\subsection{2.20~~~Rowspanning tables% \label{rowspanning-tables}% } @@ -1581,11 +1492,7 @@ \end{longtable*} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.21~~~Custom Roles% - \addcontentsline{toc}{subsection}{2.21~~~Custom Roles}% +\subsection{2.21~~~Custom Roles% \label{custom-roles}% } % @@ -1630,11 +1537,7 @@ \end{itemize} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.22~~~Mathematics% - \addcontentsline{toc}{subsection}{2.22~~~Mathematics}% +\subsection{2.22~~~Mathematics% \label{mathematics}% } @@ -1735,7 +1638,7 @@ \right). \end{equation*} Math split over two lines: If a double backslash is detected outside a -\texttt{\textbackslash{}begin\{...\} \textbackslash{}end\{...\}} pair, the math code is wrapped in an \href{ftp://ftp.ams.org/ams/doc/amsmath/short-math-guide.pdf}{AMSmath}\DUfootnotemark{id34}{id33}{6} +\texttt{\textbackslash{}begin\{...\} \textbackslash{}end\{...\}} pair, the math code is wrapped in an \href{ftp://ftp.ams.org/ams/doc/amsmath/short-math-guide.pdf}{AMSmath}\DUfootnotemark{id36}{id35}{7} \texttt{align} environment: % \begin{align*} @@ -1750,7 +1653,7 @@ 1 & x>0 \end{matrix}\right. \end{equation*} -Cases with the \href{ftp://ftp.ams.org/ams/doc/amsmath/short-math-guide.pdf}{AMSmath}\DUfootnotemark{id35}{id33}{6} \texttt{cases} environment (not (yet) supported by +Cases with the \href{ftp://ftp.ams.org/ams/doc/amsmath/short-math-guide.pdf}{AMSmath}\DUfootnotemark{id37}{id35}{7} \texttt{cases} environment (not (yet) supported by HTML writers with \texttt{-{}-math-output=MathML}): % \begin{equation*} @@ -1760,11 +1663,7 @@ \end{cases} \end{equation*} -%___________________________________________________________________________ - -\section*{\phantomsection% - 3~~~Tests for the LaTeX writer% - \addcontentsline{toc}{section}{3~~~Tests for the LaTeX writer}% +\section{3~~~Tests for the LaTeX writer% \label{tests-for-the-latex-writer}% } @@ -1772,11 +1671,7 @@ not need to be tested with other writers (e.g. the HTML writer). -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 3.1~~~Custom Roles in LaTeX% - \addcontentsline{toc}{subsection}{3.1~~~Custom Roles in LaTeX}% +\subsection{3.1~~~Custom Roles in LaTeX% \label{custom-roles-in-latex}% } % @@ -1820,11 +1715,7 @@ \end{itemize} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 3.2~~~More Tables% - \addcontentsline{toc}{subsection}{3.2~~~More Tables}% +\subsection{3.2~~~More Tables% \label{more-tables}% } @@ -1888,11 +1779,7 @@ % This file is used by the standalone_rst_latex test. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 3.3~~~Option lists% - \addcontentsline{toc}{subsection}{3.3~~~Option lists}% +\subsection{3.3~~~Option lists% \label{id23}% } @@ -1928,11 +1815,7 @@ \end{description} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 3.4~~~Monospaced non-alphanumeric characters% - \addcontentsline{toc}{subsection}{3.4~~~Monospaced non-alphanumeric characters}% +\subsection{3.4~~~Monospaced non-alphanumeric characters% \label{monospaced-non-alphanumeric-characters}% } @@ -1948,11 +1831,7 @@ width as the third line. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 3.5~~~Non-ASCII characters% - \addcontentsline{toc}{subsection}{3.5~~~Non-ASCII characters}% +\subsection{3.5~~~Non-ASCII characters% \label{non-ascii-characters}% } @@ -2366,11 +2245,7 @@ \end{itemize} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 3.6~~~Encoding special chars% - \addcontentsline{toc}{subsection}{3.6~~~Encoding special chars}% +\subsection{3.6~~~Encoding special chars% \label{encoding-special-chars}% } @@ -2439,11 +2314,7 @@ \end{quote} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 3.7~~~Hyperlinks and -targets% - \addcontentsline{toc}{subsection}{3.7~~~Hyperlinks and -targets}% +\subsection{3.7~~~Hyperlinks and -targets% \label{hyperlinks-and-targets}% } @@ -2488,17 +2359,13 @@ \hyperref[image-label]{image label}. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 3.8~~~External references% - \addcontentsline{toc}{subsection}{3.8~~~External references}% +\subsection{3.8~~~External references% \label{external-references}% } Long URLs should be wrapped in the PDF. This can be achieved with the url command which is used by the LaTeX writer -wheneve the content (name) of a reference node equals the link URL. +whenever the content (name) of a reference node equals the link URL. % \begin{description} \item[{Example:}] \leavevmode @@ -2533,7 +2400,7 @@ \url{http://www.w3.org/XML/Schema\#dev} \item[] \href{http://www.w3.org/XML/Schema\%dev}{URL with \%} \url{http://example.org/Schema\%dev} -\item[] \href{A:DOS\\path\\}{file with DOS path}\DUfootnotemark{id40}{id39}{8} \url{A:DOS\\path\\}\DUfootnotemark{id41}{id39}{8} +\item[] \href{A:DOS\\path\\}{file with DOS path}\DUfootnotemark{id42}{id41}{9} \url{A:DOS\\path\\}\DUfootnotemark{id43}{id41}{9} \end{DUlineblock} \DUadmonition[note]{ @@ -2544,7 +2411,7 @@ \begin{DUlineblock}{0em} \item[] \url{http://www.w3.org/XML/Schema\#dev} \item[] \url{http://example.org/Schema\%dev} -\item[] \url{A:DOS\\path\\}\DUfootnotemark{id42}{id39}{8} +\item[] \url{A:DOS\\path\\}\DUfootnotemark{id44}{id41}{9} \end{DUlineblock} } @@ -2576,17 +2443,63 @@ \end{itemize} + +\subsection{3.9~~~Section titles with \hyperref[inline-markup]{inline markup}% + \label{section-titles-with-inline-markup}% +} + + +\subsubsection{3.9.1~~~\emph{emphasized}, H\textsubscript{2}O and $x^2$% + \label{emphasized-h2o-and-x-2}% +} + + +\subsubsection{3.9.2~~~Substitutions work% + \label{substitutions-fail}% +} + + +\subsection{3.10~~~Deeply nested sections% + \label{deeply-nested-sections}% +} + +In LaTeX and HTML, + + +\subsubsection{3.10.1~~~Level 3% + \label{level-3}% +} + +nested sections + + +\paragraph{3.10.1.1~~~level 4% + \label{level-4}% +} + +reach at some level + + +\subparagraph{3.10.1.1.1~~~level 5% + \label{level-5}% +} + +(depending on the document class) + + +\DUtitle[sectionVI]{3.10.1.1.1.1~~~level 6% + \label{level-6}% +} + +an unsupported level. + % unusual combinations (from newlatex, for interactive testing) % .. include:: data/latex.txt % Preface for System Messages: -%___________________________________________________________________________ - -\section*{\phantomsection% - 4~~~Error Handling% - \addcontentsline{toc}{section}{4~~~Error Handling}% +\section{4~~~Error Handling% \label{error-handling}% } @@ -2598,11 +2511,7 @@ % section should be added by Docutils automatically -%___________________________________________________________________________ - -\section*{\phantomsection% - \color{red}Docutils System Messages% - \addcontentsline{toc}{section}{Docutils System Messages}% +\section[Docutils System Messages]{\color{red}Docutils System Messages% } \DUadmonition[system-message]{ @@ -2617,41 +2526,41 @@ \DUadmonition[system-message]{ \DUtitle[system-message]{system-message} -\raisebox{1em}{\hypertarget{id43}{}} +\raisebox{1em}{\hypertarget{id45}{}} -{\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~390 +{\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~391 -\hyperlink{id44}{ +\hyperlink{id46}{ Unknown target name: ``5''. }} \DUadmonition[system-message]{ \DUtitle[system-message]{system-message} -\raisebox{1em}{\hypertarget{id45}{}} +\raisebox{1em}{\hypertarget{id47}{}} -{\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~399 +{\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~400 -\hyperlink{id46}{ +\hyperlink{id48}{ Unknown target name: ``nonexistent''. }} \DUadmonition[system-message]{ \DUtitle[system-message]{system-message} -\raisebox{1em}{\hypertarget{id47}{}} +\raisebox{1em}{\hypertarget{id49}{}} -{\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~426 +{\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~427 -\hyperlink{id48}{ +\hyperlink{id50}{ Unknown target name: ``hyperlink reference without a target''. }} \DUadmonition[system-message]{ \DUtitle[system-message]{system-message} -\raisebox{1em}{\hypertarget{id49}{}} +\raisebox{1em}{\hypertarget{id51}{}} -{\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~439 +{\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~440 -\hyperlink{id50}{ +\hyperlink{id52}{ Duplicate target name, cannot be used as a unique reference: ``duplicate target names''. }} Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_manpage.man =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_manpage.man 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_manpage.man 2012-05-04 08:52:38 UTC (rev 655) @@ -1,4 +1,4 @@ -.\" Man page generated from reStructeredText. +.\" Man page generated from reStructuredText. . .TH RST2MAN 1 "2006-10-22" "0.1" "text processing" .SH NAME @@ -102,5 +102,4 @@ .SH COPYRIGHT public domain .\" Generated by docutils manpage writer. -.\" . Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_pseudoxml.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_pseudoxml.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_pseudoxml.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -93,250 +93,256 @@ <bullet_list classes="auto-toc"> <list_item> <paragraph> - <reference ids="id32" refid="structural-elements"> + <reference ids="id34" refid="structural-elements"> <generated classes="sectnum"> 1    Structural Elements <bullet_list classes="auto-toc"> <list_item> <paragraph> - <reference ids="id33" refid="section-title"> + <reference ids="id35" refid="section-title"> <generated classes="sectnum"> 1.1    Section Title <list_item> <paragraph> - <reference ids="id34" refid="empty-section"> + <reference ids="id36" refid="empty-section"> <generated classes="sectnum"> 1.2    Empty Section <list_item> <paragraph> - <reference ids="id35" refid="transitions"> + <reference ids="id37" refid="transitions"> <generated classes="sectnum"> 1.3    Transitions <list_item> <paragraph> - <reference ids="id36" refid="body-elements"> + <reference ids="id38" refid="body-elements"> <generated classes="sectnum"> 2    Body Elements <bullet_list classes="auto-toc"> <list_item> <paragraph> - <reference ids="id37" refid="paragraphs"> + <reference ids="id39" refid="paragraphs"> <generated classes="sectnum"> 2.1    Paragraphs <bullet_list classes="auto-toc"> <list_item> <paragraph> - <reference ids="id38" refid="inline-markup"> + <reference ids="id40" refid="inline-markup"> <generated classes="sectnum"> 2.1.1    Inline Markup <list_item> <paragraph> - <reference ids="id39" refid="bullet-lists"> + <reference ids="id41" refid="bullet-lists"> <generated classes="sectnum"> 2.2    Bullet Lists <list_item> <paragraph> - <reference ids="id40" refid="enumerated-lists"> + <reference ids="id42" refid="enumerated-lists"> <generated classes="sectnum"> 2.3    Enumerated Lists <list_item> <paragraph> - <reference ids="id41" refid="definition-lists"> + <reference ids="id43" refid="definition-lists"> <generated classes="sectnum"> 2.4    Definition Lists <list_item> <paragraph> - <reference ids="id42" refid="field-lists"> + <reference ids="id44" refid="field-lists"> <generated classes="sectnum"> 2.5    Field Lists <list_item> <paragraph> - <reference ids="id43" refid="option-lists"> + <reference ids="id45" refid="option-lists"> <generated classes="sectnum"> 2.6    Option Lists <list_item> <paragraph> - <reference ids="id44" refid="literal-blocks"> + <reference ids="id46" refid="literal-blocks"> <generated classes="sectnum"> 2.7    Literal Blocks <list_item> <paragraph> - <reference ids="id45" refid="line-blocks"> + <reference ids="id47" refid="line-blocks"> <generated classes="sectnum"> 2.8    Line Blocks <list_item> <paragraph> - <reference ids="id46" refid="block-quotes"> + <reference ids="id48" refid="block-quotes"> <generated classes="sectnum"> 2.9    Block Quotes <list_item> <paragraph> - <reference ids="id47" refid="doctest-blocks"> + <reference ids="id49" refid="doctest-blocks"> <generated classes="sectnum"> 2.10    Doctest Blocks <list_item> <paragraph> - <reference ids="id48" refid="footnotes"> + <reference ids="id50" refid="footnotes"> <generated classes="sectnum"> 2.11    Footnotes <list_item> <paragraph> - <reference ids="id49" refid="citations"> + <reference ids="id51" refid="citations"> <generated classes="sectnum"> 2.12    Citations <list_item> <paragraph> - <reference ids="id50" refid="targets"> + <reference ids="id52" refid="targets"> <generated classes="sectnum"> 2.13    Targets <bullet_list classes="auto-toc"> <list_item> <paragraph> - <reference ids="id51" refid="duplicate-target-names"> + <reference ids="id53" refid="duplicate-target-names"> <generated classes="sectnum"> 2.13.1    Duplicate Target Names <list_item> <paragraph> - <reference ids="id52" refid="id21"> + <reference ids="id54" refid="id21"> <generated classes="sectnum"> 2.13.2    Duplicate Target Names <list_item> <paragraph> - <reference ids="id53" refid="directives"> + <reference ids="id55" refid="directives"> <generated classes="sectnum"> 2.14    Directives <bullet_list classes="auto-toc"> <list_item> <paragraph> - <reference ids="id54" refid="document-parts"> + <reference ids="id56" refid="document-parts"> <generated classes="sectnum"> 2.14.1    Document Parts <list_item> <paragraph> - <reference ids="id55" refid="images-and-figures"> + <reference ids="id57" refid="images-and-figures"> <generated classes="sectnum"> 2.14.2    Images and Figures <list_item> <paragraph> - <reference ids="id56" refid="admonitions"> + <reference ids="id58" refid="admonitions"> <generated classes="sectnum"> 2.14.3    Admonitions <list_item> <paragraph> - <reference ids="id57" refid="topics-sidebars-and-rubrics"> + <reference ids="id59" refid="topics-sidebars-and-rubrics"> <generated classes="sectnum"> 2.14.4    Topics, Sidebars, and Rubrics <list_item> <paragraph> - <reference ids="id58" refid="target-footnotes"> + <reference ids="id60" refid="target-footnotes"> <generated classes="sectnum"> 2.14.5    Target Footnotes <list_item> <paragraph> - <reference ids="id59" refid="replacement-text"> + <reference ids="id61" refid="replacement-text"> <generated classes="sectnum"> 2.14.6    Replacement Text <list_item> <paragraph> - <reference ids="id60" refid="compound-paragraph"> + <reference ids="id62" refid="compound-paragraph"> <generated classes="sectnum"> 2.14.7    Compound Paragraph <list_item> <paragraph> - <reference ids="id61" refid="parsed-literal-blocks"> + <reference ids="id63" refid="parsed-literal-blocks"> <generated classes="sectnum"> 2.14.8    Parsed Literal Blocks + <list_item> + <paragraph> + <reference ids="id64" refid="code"> + <generated classes="sectnum"> + 2.14.9    + Code <list_item> <paragraph> - <reference ids="id62" refid="substitution-definitions"> + <reference ids="id65" refid="substitution-definitions"> <generated classes="sectnum"> 2.15    Substitution Definitions <list_item> <paragraph> - <reference ids="id63" refid="comments"> + <reference ids="id66" refid="comments"> <generated classes="sectnum"> 2.16    Comments <list_item> <paragraph> - <reference ids="id64" refid="raw-text"> + <reference ids="id67" refid="raw-text"> <generated classes="sectnum"> 2.17    Raw text <list_item> <paragraph> - <reference ids="id65" refid="container"> + <reference ids="id68" refid="container"> <generated classes="sectnum"> 2.18    Container <list_item> <paragraph> - <reference ids="id66" refid="colspanning-tables"> + <reference ids="id69" refid="colspanning-tables"> <generated classes="sectnum"> 2.19    Colspanning tables <list_item> <paragraph> - <reference ids="id67" refid="rowspanning-tables"> + <reference ids="id70" refid="rowspanning-tables"> <generated classes="sectnum"> 2.20    Rowspanning tables <list_item> <paragraph> - <reference ids="id68" refid="complex-tables"> + <reference ids="id71" refid="complex-tables"> <generated classes="sectnum"> 2.21    Complex tables <list_item> <paragraph> - <reference ids="id69" refid="list-tables"> + <reference ids="id72" refid="list-tables"> <generated classes="sectnum"> 2.22    List Tables <list_item> <paragraph> - <reference ids="id70" refid="error-handling"> + <reference ids="id73" refid="error-handling"> <generated classes="sectnum"> 3    Error Handling <section ids="structural-elements" names="structural\ elements"> - <title auto="1" refid="id32"> + <title auto="1" refid="id34"> <generated classes="sectnum"> 1    Structural Elements <section ids="section-title" names="section\ title"> - <title auto="1" refid="id33"> + <title auto="1" refid="id35"> <generated classes="sectnum"> 1.1    Section Title @@ -352,12 +358,12 @@ sectsubtitle-xform configuration value. <section ids="empty-section" names="empty\ section"> - <title auto="1" refid="id34"> + <title auto="1" refid="id36"> <generated classes="sectnum"> 1.2    Empty Section <section ids="transitions" names="transitions"> - <title auto="1" refid="id35"> + <title auto="1" refid="id37"> <generated classes="sectnum"> 1.3    Transitions @@ -368,19 +374,19 @@ It divides the section. Transitions may also occur between sections: <transition> <section ids="body-elements" names="body\ elements"> - <title auto="1" refid="id36"> + <title auto="1" refid="id38"> <generated classes="sectnum"> 2    Body Elements <section ids="paragraphs" names="paragraphs"> - <title auto="1" refid="id37"> + <title auto="1" refid="id39"> <generated classes="sectnum"> 2.1    Paragraphs <paragraph> A paragraph. <section ids="inline-markup" names="inline\ markup"> - <title auto="1" refid="id38"> + <title auto="1" refid="id40"> <generated classes="sectnum"> 2.1.1    Inline Markup @@ -417,14 +423,14 @@ anonymous hyperlink references - <footnote_reference auto="1" ids="id29" refid="id25"> + <footnote_reference auto="1" ids="id31" refid="id25"> 5 ( <reference anonymous="1" name="a second reference" refuri="http://docutils.sourceforge.net/"> a second reference - <footnote_reference auto="1" ids="id31" refid="id30"> - 6 + <footnote_reference auto="1" ids="id33" refid="id32"> + 7 ), footnote references (manually numbered <footnote_reference ids="id1" refid="id8"> @@ -485,20 +491,33 @@ RFC reference ( <reference refuri="http://www.faqs.org/rfcs/rfc2822.html"> RFC 2822 + ); an abbreviation ( + <abbreviation> + abb. + ), an acronym + ( + <acronym> + reST + ), code ( + <literal classes="code"> + print "hello world" ); a <subscript> subscript - ; a + ; + a <superscript> superscript - ; - and explicit roles for + and explicit roles for + <title_reference> + Docutils + ' <emphasis> standard <strong> inline - + <literal> markup . @@ -519,7 +538,7 @@ option was supplied, there should be a live link to PEP 258 here. <section ids="bullet-lists" names="bullet\ lists"> - <title auto="1" refid="id39"> + <title auto="1" refid="id41"> <generated classes="sectnum"> 2.2    Bullet Lists @@ -563,7 +582,7 @@ <comment xml:space="preserve"> Even if this item contains a target and a comment. <section ids="enumerated-lists" names="enumerated\ lists"> - <title auto="1" refid="id40"> + <title auto="1" refid="id42"> <generated classes="sectnum"> 2.3    Enumerated Lists @@ -597,6 +616,9 @@ <list_item> <paragraph> Four + <system_message level="1" line="8" source="functional/input/data/standard.txt" type="INFO"> + <paragraph> + Enumerated list start value not ordinal-1: "3" (ordinal 3) <enumerated_list enumtype="upperalpha" prefix="" start="3" suffix="."> <list_item> <paragraph> @@ -604,6 +626,9 @@ <list_item> <paragraph> D + <system_message level="1" line="8" source="functional/input/data/standard.txt" type="INFO"> + <paragraph> + Enumerated list start value not ordinal-1: "C" (ordinal 3) <enumerated_list enumtype="lowerroman" prefix="" start="3" suffix="."> <list_item> <paragraph> @@ -611,8 +636,11 @@ <list_item> <paragraph> iv + <system_message level="1" line="8" source="functional/input/data/standard.txt" type="INFO"> + <paragraph> + Enumerated list start value not ordinal-1: "iii" (ordinal 3) <section ids="definition-lists" names="definition\ lists"> - <title auto="1" refid="id41"> + <title auto="1" refid="id43"> <generated classes="sectnum"> 2.4    Definition Lists @@ -650,7 +678,7 @@ <paragraph> Definition <section ids="field-lists" names="field\ lists"> - <title auto="1" refid="id42"> + <title auto="1" refid="id44"> <generated classes="sectnum"> 2.5    Field Lists @@ -684,7 +712,7 @@ about credits but just for ensuring that the class attribute doesn't get stripped away.) <section ids="option-lists" names="option\ lists"> - <title auto="1" refid="id43"> + <title auto="1" refid="id45"> <generated classes="sectnum"> 2.6    Option Lists @@ -797,7 +825,7 @@ There must be at least two spaces between the option and the description. <section ids="literal-blocks" names="literal\ blocks"> - <title auto="1" refid="id44"> + <title auto="1" refid="id46"> <generated classes="sectnum"> 2.7    Literal Blocks @@ -819,7 +847,7 @@ > > Why didn't I think of that? <section ids="line-blocks" names="line\ blocks"> - <title auto="1" refid="id45"> + <title auto="1" refid="id47"> <generated classes="sectnum"> 2.8    Line Blocks @@ -922,7 +950,7 @@ w. <line> <section ids="block-quotes" names="block\ quotes"> - <title auto="1" refid="id46"> + <title auto="1" refid="id48"> <generated classes="sectnum"> 2.9    Block Quotes @@ -946,7 +974,7 @@ ReStructuredText est un langage de balisage léger utilisé notamment dans la documentation du langage Python. <section ids="doctest-blocks" names="doctest\ blocks"> - <title auto="1" refid="id47"> + <title auto="1" refid="id49"> <generated classes="sectnum"> 2.10    Doctest Blocks @@ -956,7 +984,7 @@ >>> print '(cut and pasted from interactive Python sessions)' (cut and pasted from interactive Python sessions) <section ids="footnotes" names="footnotes"> - <title auto="1" refid="id48"> + <title auto="1" refid="id50"> <generated classes="sectnum"> 2.11    Footnotes @@ -1016,11 +1044,11 @@ <paragraph> Here's an unreferenced footnote, with a reference to a nonexistent footnote: - <problematic ids="id80 id17" refid="id79"> + <problematic ids="id84 id17" refid="id83"> [5]_ . <section ids="citations" names="citations"> - <title auto="1" refid="id49"> + <title auto="1" refid="id51"> <generated classes="sectnum"> 2.12    Citations @@ -1035,13 +1063,13 @@ <citation_reference ids="id18" refid="cit2002"> CIT2002 , and a - <problematic ids="id82 id19" refid="id81"> + <problematic ids="id86 id19" refid="id85"> [nonexistent]_ citation. <target refid="another-target"> <section ids="targets another-target" names="targets another\ target"> - <title auto="1" refid="id50"> + <title auto="1" refid="id52"> <generated classes="sectnum"> 2.13    Targets @@ -1086,12 +1114,12 @@ <target anonymous="1" ids="id20" refid="targets"> <paragraph> Here's a - <problematic ids="id84" refid="id83"> + <problematic ids="id88" refid="id87"> `hyperlink reference without a target`_ , which generates an error. <section dupnames="duplicate\ target\ names" ids="duplicate-target-names"> - <title auto="1" refid="id51"> + <title auto="1" refid="id53"> <generated classes="sectnum"> 2.13.1    Duplicate Target Names @@ -1100,19 +1128,22 @@ generate "info" (level-1) system messages. Duplicate names in explicit targets will generate "warning" (level-2) system messages. <section dupnames="duplicate\ target\ names" ids="id21"> - <title auto="1" refid="id52"> + <title auto="1" refid="id54"> <generated classes="sectnum"> 2.13.2    Duplicate Target Names + <system_message backrefs="id21" level="1" line="438" source="functional/input/data/standard.txt" type="INFO"> + <paragraph> + Duplicate implicit target name: "duplicate target names". <paragraph> Since there are two "Duplicate Target Names" section headers, we cannot uniquely refer to either of them by name. If we try to (like this: - <problematic ids="id86" refid="id85"> + <problematic ids="id90" refid="id89"> `Duplicate Target Names`_ ), an error is generated. <section ids="directives" names="directives"> - <title auto="1" refid="id53"> + <title auto="1" refid="id55"> <generated classes="sectnum"> 2.14    Directives @@ -1120,52 +1151,58 @@ <bullet_list classes="auto-toc"> <list_item> <paragraph> - <reference ids="id71" refid="document-parts"> + <reference ids="id74" refid="document-parts"> <generated classes="sectnum"> 2.14.1    Document Parts <list_item> <paragraph> - <reference ids="id72" refid="images-and-figures"> + <reference ids="id75" refid="images-and-figures"> <generated classes="sectnum"> 2.14.2    Images and Figures <list_item> <paragraph> - <reference ids="id73" refid="admonitions"> + <reference ids="id76" refid="admonitions"> <generated classes="sectnum"> 2.14.3    Admonitions <list_item> <paragraph> - <reference ids="id74" refid="topics-sidebars-and-rubrics"> + <reference ids="id77" refid="topics-sidebars-and-rubrics"> <generated classes="sectnum"> 2.14.4    Topics, Sidebars, and Rubrics <list_item> <paragraph> - <reference ids="id75" refid="target-footnotes"> + <reference ids="id78" refid="target-footnotes"> <generated classes="sectnum"> 2.14.5    Target Footnotes <list_item> <paragraph> - <reference ids="id76" refid="replacement-text"> + <reference ids="id79" refid="replacement-text"> <generated classes="sectnum"> 2.14.6    Replacement Text <list_item> <paragraph> - <reference ids="id77" refid="compound-paragraph"> + <reference ids="id80" refid="compound-paragraph"> <generated classes="sectnum"> 2.14.7    Compound Paragraph <list_item> <paragraph> - <reference ids="id78" refid="parsed-literal-blocks"> + <reference ids="id81" refid="parsed-literal-blocks"> <generated classes="sectnum"> 2.14.8    Parsed Literal Blocks + <list_item> + <paragraph> + <reference ids="id82" refid="code"> + <generated classes="sectnum"> + 2.14.9    + Code <paragraph> These are just a sample of the many reStructuredText Directives. For others, please see @@ -1173,7 +1210,7 @@ http://docutils.sourceforge.net/docs/ref/rst/directives.html . <section ids="document-parts" names="document\ parts"> - <title auto="1" refid="id71"> + <title auto="1" refid="id74"> <generated classes="sectnum"> 2.14.1    Document Parts @@ -1188,7 +1225,7 @@ table of contents ). <section ids="images-and-figures" names="images\ and\ figures"> - <title auto="1" refid="id72"> + <title auto="1" refid="id75"> <generated classes="sectnum"> 2.14.2    Images and Figures @@ -1325,7 +1362,7 @@ This paragraph might flow around the figure. The specific behavior depends upon the style sheet and the browser or rendering software used. <section ids="admonitions" names="admonitions"> - <title auto="1" refid="id73"> + <title auto="1" refid="id76"> <generated classes="sectnum"> 2.14.3    Admonitions @@ -1375,7 +1412,7 @@ You can make up your own admonition too. <target ids="docutils" names="docutils" refuri="http://docutils.sourceforge.net/"> <section ids="topics-sidebars-and-rubrics" names="topics,\ sidebars,\ and\ rubrics"> - <title auto="1" refid="id74"> + <title auto="1" refid="id77"> <generated classes="sectnum"> 2.14.4    Topics, Sidebars, and Rubrics @@ -1422,24 +1459,30 @@ is not allowed (e.g. inside a directive). <section ids="target-footnotes" names="target\ footnotes"> - <title auto="1" refid="id75"> + <title auto="1" refid="id78"> <generated classes="sectnum"> 2.14.5    Target Footnotes - <footnote auto="1" backrefs="id26 id27 id28 id29" ids="id25" names="TARGET_NOTE:\ id25"> + <footnote auto="1" backrefs="id26 id27 id28 id31" ids="id25" names="TARGET_NOTE:\ id25"> <label> 5 <paragraph> <reference refuri="http://www.python.org/"> http://www.python.org/ - <footnote auto="1" backrefs="id31" ids="id30" names="TARGET_NOTE:\ id30"> + <footnote auto="1" backrefs="id30" ids="id29" names="TARGET_NOTE:\ id29"> <label> 6 <paragraph> + <reference refuri="http://pygments.org/"> + http://pygments.org/ + <footnote auto="1" backrefs="id33" ids="id32" names="TARGET_NOTE:\ id32"> + <label> + 7 + <paragraph> <reference refuri="http://docutils.sourceforge.net/"> http://docutils.sourceforge.net/ <section ids="replacement-text" names="replacement\ text"> - <title auto="1" refid="id76"> + <title auto="1" refid="id79"> <generated classes="sectnum"> 2.14.6    Replacement Text @@ -1460,7 +1503,7 @@ the best language around <section ids="compound-paragraph" names="compound\ paragraph"> - <title auto="1" refid="id77"> + <title auto="1" refid="id80"> <generated classes="sectnum"> 2.14.7    Compound Paragraph @@ -1546,7 +1589,7 @@ <paragraph> Compound 7, another paragraph. <section ids="parsed-literal-blocks" names="parsed\ literal\ blocks"> - <title auto="1" refid="id78"> + <title auto="1" refid="id81"> <generated classes="sectnum"> 2.14.8    Parsed Literal Blocks @@ -1575,8 +1618,87 @@ references <target ids="references" names="references" refuri="http://www.python.org/"> . + <section ids="code" names="code"> + <title auto="1" refid="id82"> + <generated classes="sectnum"> + 2.14.9    + Code + <paragraph> + Blocks of source code can be set with the + <title_reference> + code + directive. If the code + language is specified, the content is parsed and tagged by the + <reference name="Pygments" refuri="http://pygments.org/"> + Pygments + + <footnote_reference auto="1" ids="id30" refid="id29"> + 6 + + syntax highlighter and can be formatted with a style sheet. (Code parsing + is turned off using the + <literal> + syntax-highlight + config setting in the test + conversions in order to get identical results with/without installed + Pygments highlighter.) + <literal_block classes="code python" xml:space="preserve"> + print 'This is Python code.' + <paragraph> + The + <literal> + :number-lines: + option (with optional start value) generates line + numbers: + <literal_block classes="code python" xml:space="preserve"> + <inline classes="ln"> + 8 + # print integers from 0 to 9: + <inline classes="ln"> + 9 + for i in range(10): + <inline classes="ln"> + 10 + print i + <paragraph> + For inline code snippets, there is the + <title_reference> + code + role, which can be used + directly (the code will not be parsed/tagged, as the language is not + known) or as base for special code roles, e.g., + <comment xml:space="preserve"> + <block_quote> + <paragraph> + Docutils uses LaTeX syntax for math directives and roles: + <literal classes="code latex tex"> + \alpha = f(x) + prints + <math> + \alpha = f(x) + . + <target ids="pygments" names="pygments" refuri="http://pygments.org/"> + <paragraph> + The + <literal> + :code: + option of the + <title_reference> + include + directive sets the included content + as a code block, here the rst file + <literal> + header_footer.txt + with line numbers: + <literal_block classes="code rst" source="functional/input/data/header_footer.txt" xml:space="preserve"> + <inline classes="ln"> + 1 + .. header:: Document header + <inline classes="ln"> + 2 + .. footer:: Document footer <section ids="substitution-definitions" names="substitution\ definitions"> - <title auto="1" refid="id62"> + <title auto="1" refid="id65"> <generated classes="sectnum"> 2.15    Substitution Definitions @@ -1589,7 +1711,7 @@ <paragraph> (Substitution definitions are not visible in the HTML source.) <section ids="comments" names="comments"> - <title auto="1" refid="id63"> + <title auto="1" refid="id66"> <generated classes="sectnum"> 2.16    Comments @@ -1606,7 +1728,7 @@ <paragraph> (View the HTML source to see the comment.) <section ids="raw-text" names="raw\ text"> - <title auto="1" refid="id64"> + <title auto="1" refid="id67"> <generated classes="sectnum"> 2.17    Raw text @@ -1630,7 +1752,7 @@ <raw format="latex" xml:space="preserve"> Fifth test in LaTeX.\\Line two. <section ids="container" names="container"> - <title auto="1" refid="id65"> + <title auto="1" refid="id68"> <generated classes="sectnum"> 2.18    Container @@ -1640,7 +1762,7 @@ <paragraph> paragraph 2 <section ids="colspanning-tables" names="colspanning\ tables"> - <title auto="1" refid="id66"> + <title auto="1" refid="id69"> <generated classes="sectnum"> 2.19    Colspanning tables @@ -1711,7 +1833,7 @@ <paragraph> True <section ids="rowspanning-tables" names="rowspanning\ tables"> - <title auto="1" refid="id67"> + <title auto="1" refid="id70"> <generated classes="sectnum"> 2.20    Rowspanning tables @@ -1763,7 +1885,7 @@ <paragraph> body row 3 <section ids="complex-tables" names="complex\ tables"> - <title auto="1" refid="id68"> + <title auto="1" refid="id71"> <generated classes="sectnum"> 2.21    Complex tables @@ -1848,7 +1970,7 @@ --> <entry> <section ids="list-tables" names="list\ tables"> - <title auto="1" refid="id69"> + <title auto="1" refid="id72"> <generated classes="sectnum"> 2.22    List Tables @@ -1905,7 +2027,7 @@ <paragraph> On a stick! <section ids="error-handling" names="error\ handling"> - <title auto="1" refid="id70"> + <title auto="1" refid="id73"> <generated classes="sectnum"> 3    Error Handling @@ -1922,15 +2044,36 @@ <system_message backrefs="id24" ids="id23" level="3" line="104" source="functional/input/data/standard.txt" type="ERROR"> <paragraph> Undefined substitution referenced: "problematic". - <system_message backrefs="id80" ids="id79" level="3" line="390" source="functional/input/data/standard.txt" type="ERROR"> + <system_message backrefs="id84" ids="id83" level="3" line="391" source="functional/input/data/standard.txt" type="ERROR"> <paragraph> Unknown target name: "5". - <system_message backrefs="id82" ids="id81" level="3" line="399" source="functional/input/data/standard.txt" type="ERROR"> + <system_message backrefs="id86" ids="id85" level="3" line="400" source="functional/input/data/standard.txt" type="ERROR"> <paragraph> Unknown target name: "nonexistent". - <system_message backrefs="id84" ids="id83" level="3" line="426" source="functional/input/data/standard.txt" type="ERROR"> + <system_message backrefs="id88" ids="id87" level="3" line="427" source="functional/input/data/standard.txt" type="ERROR"> <paragraph> Unknown target name: "hyperlink reference without a target". - <system_message backrefs="id86" ids="id85" level="3" line="439" source="functional/input/data/standard.txt" type="ERROR"> + <system_message backrefs="id90" ids="id89" level="3" line="440" source="functional/input/data/standard.txt" type="ERROR"> <paragraph> Duplicate target name, cannot be used as a unique reference: "duplicate target names". + <system_message level="1" line="163" source="functional/input/data/standard.txt" type="INFO"> + <paragraph> + Hyperlink target "target" is not referenced. + <system_message level="1" line="405" source="functional/input/data/standard.txt" type="INFO"> + <paragraph> + Hyperlink target "another-target" is not referenced. + <system_message level="1" line="473" source="functional/input/data/standard.txt" type="INFO"> + <paragraph> + Hyperlink target "image-target-1" is not referenced. + <system_message level="1" line="474" source="functional/input/data/standard.txt" type="INFO"> + <paragraph> + Hyperlink target "image-target-2" is not referenced. + <system_message level="1" line="475" source="functional/input/data/standard.txt" type="INFO"> + <paragraph> + Hyperlink target "image-target-3" is not referenced. + <system_message level="1" line="632" source="functional/input/data/standard.txt" type="INFO"> + <paragraph> + Hyperlink target "docutils" is not referenced. + <system_message level="1" line="753" source="functional/input/data/standard.txt" type="INFO"> + <paragraph> + Hyperlink target "hyperlink targets" is not referenced. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_s5_html_1.html =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_s5_html_2.html =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_xetex.tex =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_xetex.tex 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/standalone_rst_xetex.tex 2012-05-04 08:52:38 UTC (rev 655) @@ -4,6 +4,7 @@ \usepackage[no-sscript]{xltxtra} % loads fixltx2e, metalogo, xunicode, fontspec \defaultfontfeatures{Scale=MatchLowercase} \usepackage{ifthen} +\usepackage{amsmath} \usepackage{polyglossia} \setdefaultlanguage{english} \setotherlanguages{german,british,french} @@ -12,6 +13,7 @@ \floatplacement{figure}{H} % place figures here definitely \usepackage{graphicx} \usepackage{multirow} +\setcounter{secnumdepth}{0} \usepackage{longtable,ltcaption,array} \setlength{\extrarowheight}{2pt} \newlength{\DUtablewidth} % internal use in tables @@ -147,7 +149,7 @@ % subtitle (for topic/sidebar) \providecommand*{\DUsubtitle}[2][class-arg]{\par\emph{#2}\smallskip} -% title for topics, admonitions and sidebar +% title for topics, admonitions, unsupported section levels, and sidebar \providecommand*{\DUtitle}[2][class-arg]{% % call \DUtitle#1{#2} if it exists: \ifcsname DUtitle#1\endcsname% @@ -278,20 +280,12 @@ -%___________________________________________________________________________ - -\section*{\phantomsection% - 1   Structural Elements% - \addcontentsline{toc}{section}{1   Structural Elements}% +\section{1   Structural Elements% \label{structural-elements}% } -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 1.1   Section Title% - \addcontentsline{toc}{subsection}{1.1   Section Title}% +\subsection{1.1   Section Title% \label{section-title}% } \subsubsection*{Section Subtitle} @@ -301,20 +295,12 @@ \texttt{sectsubtitle-xform} configuration value. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 1.2   Empty Section% - \addcontentsline{toc}{subsection}{1.2   Empty Section}% +\subsection{1.2   Empty Section% \label{empty-section}% } -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 1.3   Transitions% - \addcontentsline{toc}{subsection}{1.3   Transitions}% +\subsection{1.3   Transitions% \label{transitions}% } @@ -333,31 +319,19 @@ -%___________________________________________________________________________ - -\section*{\phantomsection% - 2   Body Elements% - \addcontentsline{toc}{section}{2   Body Elements}% +\section{2   Body Elements% \label{body-elements}% } -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.1   Paragraphs% - \addcontentsline{toc}{subsection}{2.1   Paragraphs}% +\subsection{2.1   Paragraphs% \label{paragraphs}% } A paragraph. -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.1.1   Inline Markup% - \addcontentsline{toc}{subsubsection}{2.1.1   Inline Markup}% +\subsubsection{2.1.1   Inline Markup% \label{inline-markup}% } @@ -366,7 +340,7 @@ (\url{http://www.python.org}), external hyperlinks (\href{http://www.python.org/}{Python}\DUfootnotemark{id30}{id29}{5}), internal cross-references (\hyperref[example]{example}), external hyperlinks with embedded URIs (\href{http://www.python.org}{Python web site}), \href{http://www.python.org/}{anonymous hyperlink -references}\DUfootnotemark{id35}{id29}{5} (\href{http://docutils.sourceforge.net/}{a second reference}\DUfootnotemark{id37}{id36}{7}), footnote references (manually +references}\DUfootnotemark{id37}{id29}{5} (\href{http://docutils.sourceforge.net/}{a second reference}\DUfootnotemark{id39}{id38}{8}), footnote references (manually numbered\DUfootnotemark{id1}{id8}{1}, anonymous auto-numbered\DUfootnotemark{id2}{id12}{3}, labeled auto-numbered\DUfootnotemark{id3}{label}{2}, or symbolic\DUfootnotemark{id4}{id13}{*}), citation references (\hyperlink{cit2002}{[CIT2002]}), substitution references (\includegraphics{../../../docs/user/rst/images/biohazard.png}), and % \phantomsection\label{inline-hyperlink-targets}inline hyperlink targets @@ -378,9 +352,10 @@ The default role for interpreted text is \DUroletitlereference{Title Reference}. Here are some explicit interpreted text roles: a PEP reference (\href{http://www.python.org/dev/peps/pep-0287}{PEP 287}); an -RFC reference (\href{http://www.faqs.org/rfcs/rfc2822.html}{RFC 2822}); a \textsubscript{subscript}; a \textsuperscript{superscript}; -and explicit roles for \emph{standard} \textbf{inline} -\texttt{markup}. +RFC reference (\href{http://www.faqs.org/rfcs/rfc2822.html}{RFC 2822}); an abbreviation (\DUrole{abbreviation}{abb.}), an acronym +(\DUrole{acronym}{reST}), code (\texttt{\DUrole{code}{print "hello world"}}); a \textsubscript{subscript}; +a \textsuperscript{superscript} and explicit roles for \DUroletitlereference{Docutils}' +\emph{standard} \textbf{inline} \texttt{markup}. % DO NOT RE-WRAP THE FOLLOWING PARAGRAPH! @@ -395,11 +370,7 @@ live link to PEP 258 here. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.2   Bullet Lists% - \addcontentsline{toc}{subsection}{2.2   Bullet Lists}% +\subsection{2.2   Bullet Lists% \label{bullet-lists}% } % @@ -445,11 +416,7 @@ \end{itemize} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.3   Enumerated Lists% - \addcontentsline{toc}{subsection}{2.3   Enumerated Lists}% +\subsection{2.3   Enumerated Lists% \label{enumerated-lists}% } \newcounter{listcnt0} @@ -537,11 +504,7 @@ \end{list} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.4   Definition Lists% - \addcontentsline{toc}{subsection}{2.4   Definition Lists}% +\subsection{2.4   Definition Lists% \label{definition-lists}% } % @@ -566,11 +529,7 @@ \end{description} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.5   Field Lists% - \addcontentsline{toc}{subsection}{2.5   Field Lists}% +\subsection{2.5   Field Lists% \label{field-lists}% } % @@ -594,11 +553,7 @@ \end{DUfieldlist} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.6   Option Lists% - \addcontentsline{toc}{subsection}{2.6   Option Lists}% +\subsection{2.6   Option Lists% \label{option-lists}% } @@ -635,11 +590,7 @@ description. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.7   Literal Blocks% - \addcontentsline{toc}{subsection}{2.7   Literal Blocks}% +\subsection{2.7   Literal Blocks% \label{literal-blocks}% } @@ -664,11 +615,7 @@ \end{quote} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.8   Line Blocks% - \addcontentsline{toc}{subsection}{2.8   Line Blocks}% +\subsection{2.8   Line Blocks% \label{line-blocks}% } @@ -764,11 +711,7 @@ \end{DUlineblock} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.9   Block Quotes% - \addcontentsline{toc}{subsection}{2.9   Block Quotes}% +\subsection{2.9   Block Quotes% \label{block-quotes}% } @@ -800,11 +743,7 @@ \end{quote} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.10   Doctest Blocks% - \addcontentsline{toc}{subsection}{2.10   Doctest Blocks}% +\subsection{2.10   Doctest Blocks% \label{doctest-blocks}% } % @@ -817,11 +756,7 @@ \end{quote} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.11   Footnotes% - \addcontentsline{toc}{subsection}{2.11   Footnotes}% +\subsection{2.11   Footnotes% \label{footnotes}% } % @@ -860,16 +795,12 @@ \DUfootnotetext{id16}{id16}{4}{% Here's an unreferenced footnote, with a reference to a nonexistent footnote:% -\raisebox{1em}{\hypertarget{id43}{}}% -\raisebox{1em}{\hypertarget{id17}{}}\hyperlink{id42}{\textbf{\color{red}{[}5{]}\_}}. +\raisebox{1em}{\hypertarget{id45}{}}% +\raisebox{1em}{\hypertarget{id17}{}}\hyperlink{id44}{\textbf{\color{red}{[}5{]}\_}}. } -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.12   Citations% - \addcontentsline{toc}{subsection}{2.12   Citations}% +\subsection{2.12   Citations% \label{citations}% } \begin{figure}[b]\raisebox{1em}{\hypertarget{cit2002}{}}[CIT2002] @@ -878,16 +809,12 @@ \end{figure} Here's a reference to the above, \hyperlink{cit2002}{[CIT2002]}, and a % -\raisebox{1em}{\hypertarget{id45}{}}% -\raisebox{1em}{\hypertarget{id19}{}}\hyperlink{id44}{\textbf{\color{red}{[}nonexistent{]}\_}} +\raisebox{1em}{\hypertarget{id47}{}}% +\raisebox{1em}{\hypertarget{id19}{}}\hyperlink{id46}{\textbf{\color{red}{[}nonexistent{]}\_}} citation. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.13   Targets% - \addcontentsline{toc}{subsection}{2.13   Targets}% +\subsection{2.13   Targets% \label{targets}% \label{another-target}% } @@ -907,15 +834,11 @@ refer to the \hyperref[targets]{Targets} section. Here's a % -\raisebox{1em}{\hypertarget{id47}{}}\hyperlink{id46}{\textbf{\color{red}`hyperlink reference without a target`\_}}, which generates an +\raisebox{1em}{\hypertarget{id49}{}}\hyperlink{id48}{\textbf{\color{red}`hyperlink reference without a target`\_}}, which generates an error. -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.13.1   Duplicate Target Names% - \addcontentsline{toc}{subsubsection}{2.13.1   Duplicate Target Names}% +\subsubsection{2.13.1   Duplicate Target Names% \label{duplicate-target-names}% } @@ -924,25 +847,17 @@ explicit targets will generate "warning" (level-2) system messages. -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.13.2   Duplicate Target Names% - \addcontentsline{toc}{subsubsection}{2.13.2   Duplicate Target Names}% +\subsubsection{2.13.2   Duplicate Target Names% \label{id21}% } Since there are two "Duplicate Target Names" section headers, we cannot uniquely refer to either of them by name. If we try to (like this: % -\raisebox{1em}{\hypertarget{id49}{}}\hyperlink{id48}{\textbf{\color{red}`Duplicate Target Names`\_}}), an error is generated. +\raisebox{1em}{\hypertarget{id51}{}}\hyperlink{id50}{\textbf{\color{red}`Duplicate Target Names`\_}}), an error is generated. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.14   Directives% - \addcontentsline{toc}{subsection}{2.14   Directives}% +\subsection{2.14   Directives% \label{directives}% } @@ -952,11 +867,7 @@ \url{http://docutils.sourceforge.net/docs/ref/rst/directives.html}. -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.14.1   Document Parts% - \addcontentsline{toc}{subsubsection}{2.14.1   Document Parts}% +\subsubsection{2.14.1   Document Parts% \label{document-parts}% } @@ -965,11 +876,7 @@ document (a document-wide \hyperref[table-of-contents]{table of contents}). -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.14.2   Images and Figures% - \addcontentsline{toc}{subsubsection}{2.14.2   Images and Figures}% +\subsubsection{2.14.2   Images and Figures% \label{images-and-figures}% } @@ -1103,11 +1010,7 @@ upon the style sheet and the browser or rendering software used. -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.14.3   Admonitions% - \addcontentsline{toc}{subsubsection}{2.14.3   Admonitions}% +\subsubsection{2.14.3   Admonitions% \label{admonitions}% } @@ -1183,11 +1086,7 @@ } -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.14.4   Topics, Sidebars, and Rubrics% - \addcontentsline{toc}{subsubsection}{2.14.4   Topics, Sidebars, and Rubrics}% +\subsubsection{2.14.4   Topics, Sidebars, and Rubrics% \label{topics-sidebars-and-rubrics}% } @@ -1225,11 +1124,7 @@ allowed (e.g. inside a directive). -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.14.5   Target Footnotes% - \addcontentsline{toc}{subsubsection}{2.14.5   Target Footnotes}% +\subsubsection{2.14.5   Target Footnotes% \label{target-footnotes}% } % @@ -1238,34 +1133,30 @@ } % \DUfootnotetext{id33}{id34}{6}{% -\url{http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=polyglossia} +\url{http://pygments.org/} } % -\DUfootnotetext{id36}{id37}{7}{% -\url{http://docutils.sourceforge.net/} +\DUfootnotetext{id35}{id36}{7}{% +\url{http://ctan.org/pkg/polyglossia} } % \DUfootnotetext{id38}{id39}{8}{% +\url{http://docutils.sourceforge.net/} +} +% +\DUfootnotetext{id40}{id41}{9}{% \url{A:DOS\\path\\} } -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.14.6   Replacement Text% - \addcontentsline{toc}{subsubsection}{2.14.6   Replacement Text}% +\subsubsection{2.14.6   Replacement Text% \label{replacement-text}% } I recommend you try \href{http://www.python.org/}{Python, \emph{the} best language around}\DUfootnotemark{id32}{id29}{5}. -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.14.7   Compound Paragraph% - \addcontentsline{toc}{subsubsection}{2.14.7   Compound Paragraph}% +\subsubsection{2.14.7   Compound Paragraph% \label{compound-paragraph}% } @@ -1342,11 +1233,7 @@ Compound 7, another paragraph. -%___________________________________________________________________________ - -\subsubsection*{\phantomsection% - 2.14.8   Parsed Literal Blocks% - \addcontentsline{toc}{subsubsection}{2.14.8   Parsed Literal Blocks}% +\subsubsection{2.14.8   Parsed Literal Blocks% \label{parsed-literal-blocks}% } % @@ -1361,11 +1248,56 @@ \end{quote} -%___________________________________________________________________________ +\subsubsection{2.14.9   Code% + \label{code}% +} -\subsection*{\phantomsection% - 2.15   Substitution Definitions% - \addcontentsline{toc}{subsection}{2.15   Substitution Definitions}% +Blocks of source code can be set with the \DUroletitlereference{code} directive. If the code +language is specified, the content is parsed and tagged by the \href{http://pygments.org/}{Pygments}\DUfootnotemark{id34}{id33}{6} +syntax highlighter and can be formatted with a style sheet. (Code parsing +is turned off using the \texttt{syntax-highlight} config setting in the test +conversions in order to get identical results with/without installed +Pygments highlighter.) +% +\begin{quote}{\ttfamily \raggedright \noindent +print~'This~is~Python~code.' +} +\end{quote} + +The \texttt{:number-lines:} option (with optional start value) generates line +numbers: +% +\begin{quote}{\ttfamily \raggedright \noindent +\DUrole{ln}{~8~}\#~print~integers~from~0~to~9:\\ +\DUrole{ln}{~9~}for~i~in~range(10):\\ +\DUrole{ln}{10~}~~~~print~i +} +\end{quote} + +For inline code snippets, there is the \DUroletitlereference{code} role, which can be used +directly (the code will not be parsed/tagged, as the language is not +known) or as base for special code roles, e.g., + +% +% +\begin{quote} + +Docutils uses LaTeX syntax for math directives and roles: +\texttt{\DUrole{code}{\DUrole{latex}{\DUrole{tex}{\textbackslash{}alpha = f(x)}}}} prints $\alpha = f(x)$. + +\end{quote} + +The \texttt{:code:} option of the \DUroletitlereference{include} directive sets the included content +as a code block, here the rst file \texttt{header\_footer.txt} with line numbers: +% +\begin{quote}{\ttfamily \raggedright \noindent +\DUrole{ln}{1~}..~header::~Document~header\\ +\DUrole{ln}{2~}..~footer::~Document~footer +} +\end{quote} + + +\subsection{2.15   Substitution Definitions% \label{substitution-definitions}% } @@ -1374,11 +1306,7 @@ (Substitution definitions are not visible in the HTML source.) -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.16   Comments% - \addcontentsline{toc}{subsection}{2.16   Comments}% +\subsection{2.16   Comments% \label{comments}% } @@ -1395,11 +1323,7 @@ (View the HTML source to see the comment.) -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.17   Raw text% - \addcontentsline{toc}{subsection}{2.17   Raw text}% +\subsection{2.17   Raw text% \label{raw-text}% } @@ -1418,11 +1342,7 @@ Fifth test in LaTeX.\\Line two. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.18   Container% - \addcontentsline{toc}{subsection}{2.18   Container}% +\subsection{2.18   Container% \label{container}% } @@ -1434,11 +1354,7 @@ % .. include:: data/header_footer.txt -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.19   Colspanning tables% - \addcontentsline{toc}{subsection}{2.19   Colspanning tables}% +\subsection{2.19   Colspanning tables% \label{colspanning-tables}% } @@ -1516,11 +1432,7 @@ \end{longtable*} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.20   Rowspanning tables% - \addcontentsline{toc}{subsection}{2.20   Rowspanning tables}% +\subsection{2.20   Rowspanning tables% \label{rowspanning-tables}% } @@ -1579,11 +1491,7 @@ \end{longtable*} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 2.21   Custom Roles% - \addcontentsline{toc}{subsection}{2.21   Custom Roles}% +\subsection{2.21   Custom Roles% \label{custom-roles}% } % @@ -1628,11 +1536,7 @@ \end{itemize} -%___________________________________________________________________________ - -\section*{\phantomsection% - 3   Tests for the LaTeX writer% - \addcontentsline{toc}{section}{3   Tests for the LaTeX writer}% +\section{3   Tests for the LaTeX writer% \label{tests-for-the-latex-writer}% } @@ -1640,11 +1544,7 @@ not need to be tested with other writers (e.g. the HTML writer). -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 3.1   Custom Roles in LaTeX% - \addcontentsline{toc}{subsection}{3.1   Custom Roles in LaTeX}% +\subsection{3.1   Custom Roles in LaTeX% \label{custom-roles-in-latex}% } % @@ -1690,11 +1590,7 @@ % This file is used by the standalone_rst_latex test. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 3.2   Option lists% - \addcontentsline{toc}{subsection}{3.2   Option lists}% +\subsection{3.2   Option lists% \label{id23}% } @@ -1730,11 +1626,7 @@ \end{description} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 3.3   Monospaced non-alphanumeric characters% - \addcontentsline{toc}{subsection}{3.3   Monospaced non-alphanumeric characters}% +\subsection{3.3   Monospaced non-alphanumeric characters% \label{monospaced-non-alphanumeric-characters}% } @@ -1750,11 +1642,7 @@ width as the third line. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 3.4   Non-ASCII characters% - \addcontentsline{toc}{subsection}{3.4   Non-ASCII characters}% +\subsection{3.4   Non-ASCII characters% \label{non-ascii-characters}% } @@ -2168,11 +2056,7 @@ \end{itemize} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 3.5   Encoding special chars% - \addcontentsline{toc}{subsection}{3.5   Encoding special chars}% +\subsection{3.5   Encoding special chars% \label{encoding-special-chars}% } @@ -2241,11 +2125,7 @@ \end{quote} -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 3.6   Hyperlinks and -targets% - \addcontentsline{toc}{subsection}{3.6   Hyperlinks and -targets}% +\subsection{3.6   Hyperlinks and -targets% \label{hyperlinks-and-targets}% } @@ -2290,17 +2170,13 @@ \hyperref[image-label]{image label}. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - 3.7   External references% - \addcontentsline{toc}{subsection}{3.7   External references}% +\subsection{3.7   External references% \label{external-references}% } Long URLs should be wrapped in the PDF. This can be achieved with the url command which is used by the LaTeX writer -wheneve the content (name) of a reference node equals the link URL. +whenever the content (name) of a reference node equals the link URL. % \begin{description} \item[{Example:}] \leavevmode @@ -2335,7 +2211,7 @@ \url{http://www.w3.org/XML/Schema\#dev} \item[] \href{http://www.w3.org/XML/Schema\%dev}{URL with \%} \url{http://example.org/Schema\%dev} -\item[] \href{A:DOS\\path\\}{file with DOS path}\DUfootnotemark{id39}{id38}{8} \url{A:DOS\\path\\}\DUfootnotemark{id40}{id38}{8} +\item[] \href{A:DOS\\path\\}{file with DOS path}\DUfootnotemark{id41}{id40}{9} \url{A:DOS\\path\\}\DUfootnotemark{id42}{id40}{9} \end{DUlineblock} \DUadmonition[note]{ @@ -2346,7 +2222,7 @@ \begin{DUlineblock}{0em} \item[] \url{http://www.w3.org/XML/Schema\#dev} \item[] \url{http://example.org/Schema\%dev} -\item[] \url{A:DOS\\path\\}\DUfootnotemark{id41}{id38}{8} +\item[] \url{A:DOS\\path\\}\DUfootnotemark{id43}{id40}{9} \end{DUlineblock} } @@ -2379,11 +2255,57 @@ \end{itemize} -%___________________________________________________________________________ +\subsection{3.8   Section titles with \hyperref[inline-markup]{inline markup}% + \label{section-titles-with-inline-markup}% +} -\section*{\phantomsection% - 4   Tests for the XeTeX writer% - \addcontentsline{toc}{section}{4   Tests for the XeTeX writer}% + +\subsubsection{3.8.1   \emph{emphasized}, H\textsubscript{2}O and $x^2$% + \label{emphasized-h2o-and-x-2}% +} + + +\subsubsection{3.8.2   Substitutions work% + \label{substitutions-fail}% +} + + +\subsection{3.9   Deeply nested sections% + \label{deeply-nested-sections}% +} + +In LaTeX and HTML, + + +\subsubsection{3.9.1   Level 3% + \label{level-3}% +} + +nested sections + + +\paragraph{3.9.1.1   level 4% + \label{level-4}% +} + +reach at some level + + +\subparagraph{3.9.1.1.1   level 5% + \label{level-5}% +} + +(depending on the document class) + + +\DUtitle[sectionVI]{3.9.1.1.1.1   level 6% + \label{level-6}% +} + +an unsupported level. + + +\section{4   Tests for the XeTeX writer% \label{tests-for-the-xetex-writer}% } @@ -2395,16 +2317,12 @@ Русский, Slovenščina, Српски, Türkçe, Українська, Tiếng Việt, Volapük, Võro, ייִדיש , Žemaitėška. Currently, there is extended support for 28 languages in the -\href{http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=polyglossia}{polyglossia}\DUfootnotemark{id34}{id33}{6} package. +\href{http://ctan.org/pkg/polyglossia}{polyglossia}\DUfootnotemark{id36}{id35}{7} package. % System Messages: -%___________________________________________________________________________ - -\section*{\phantomsection% - 5   Error Handling% - \addcontentsline{toc}{section}{5   Error Handling}% +\section{5   Error Handling% \label{error-handling}% } @@ -2416,11 +2334,7 @@ % section should be added by Docutils automatically -%___________________________________________________________________________ - -\section*{\phantomsection% - \color{red}Docutils System Messages% - \addcontentsline{toc}{section}{Docutils System Messages}% +\section[Docutils System Messages]{\color{red}Docutils System Messages% } \DUadmonition[system-message]{ @@ -2435,41 +2349,41 @@ \DUadmonition[system-message]{ \DUtitle[system-message]{system-message} -\raisebox{1em}{\hypertarget{id42}{}} +\raisebox{1em}{\hypertarget{id44}{}} -{\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~390 +{\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~391 -\hyperlink{id43}{ +\hyperlink{id45}{ Unknown target name: "5". }} \DUadmonition[system-message]{ \DUtitle[system-message]{system-message} -\raisebox{1em}{\hypertarget{id44}{}} +\raisebox{1em}{\hypertarget{id46}{}} -{\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~399 +{\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~400 -\hyperlink{id45}{ +\hyperlink{id47}{ Unknown target name: "nonexistent". }} \DUadmonition[system-message]{ \DUtitle[system-message]{system-message} -\raisebox{1em}{\hypertarget{id46}{}} +\raisebox{1em}{\hypertarget{id48}{}} -{\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~426 +{\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~427 -\hyperlink{id47}{ +\hyperlink{id49}{ Unknown target name: "hyperlink reference without a target". }} \DUadmonition[system-message]{ \DUtitle[system-message]{system-message} -\raisebox{1em}{\hypertarget{id48}{}} +\raisebox{1em}{\hypertarget{id50}{}} -{\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~439 +{\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~440 -\hyperlink{id49}{ +\hyperlink{id51}{ Duplicate target name, cannot be used as a unique reference: "duplicate target names". }} Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/xetex-cyrillic.tex =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/xetex-cyrillic.tex 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/expected/xetex-cyrillic.tex 2012-05-04 08:52:38 UTC (rev 655) @@ -7,6 +7,7 @@ \usepackage{polyglossia} \setdefaultlanguage{russian} \setotherlanguages{english} +\setcounter{secnumdepth}{0} %%% Custom LaTeX preamble % Linux Libertine (free, wide coverage, not only for Linux) @@ -32,33 +33,21 @@ \begin{document} -%___________________________________________________________________________ - -\section*{\phantomsection% - Заголовок% - \addcontentsline{toc}{section}{Заголовок}% +\section{Заголовок% \label{id1}% } первый пример: "Здравствуй, мир!" -%___________________________________________________________________________ - -\section*{\phantomsection% - Title% - \addcontentsline{toc}{section}{Title}% +\section{Title% \label{title}% } \otherlanguage{english}{first example: "Hello world".} -%___________________________________________________________________________ - -\section*{\phantomsection% - Notes% - \addcontentsline{toc}{section}{Notes}% +\section{Notes% \label{notes}% } Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/data/math.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/data/math.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/data/math.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -42,7 +42,6 @@ .. math:: :name: eq:schrödinger i\hbar \frac{∂}{∂t}Ψ = \hat{H}Ψ, - with the *wave function* :math:`Ψ`, describes how the quantum state of a physical system changes in time. Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/data/standard.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/data/standard.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/data/standard.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -121,9 +121,10 @@ The default role for interpreted text is `Title Reference`. Here are some explicit interpreted text roles: a PEP reference (:PEP:`287`); an -RFC reference (:RFC:`2822`); a :sub:`subscript`; a :sup:`superscript`; -and explicit roles for :emphasis:`standard` :strong:`inline` -:literal:`markup`. +RFC reference (:RFC:`2822`); an abbreviation (:ab:`abb.`), an acronym +(:ac:`reST`), code (:code:`print "hello world"`); a :sub:`subscript`; +a :sup:`superscript` and explicit roles for :title:`Docutils`' +:emphasis:`standard` :strong:`inline` :literal:`markup`. .. DO NOT RE-WRAP THE FOLLOWING PARAGRAPH! @@ -754,6 +755,52 @@ text``, footnotes [1]_, _`hyperlink targets`, and `references <http://www.python.org/>`_. +Code +```` + +Blocks of source code can be set with the `code` directive. If the code +language is specified, the content is parsed and tagged by the Pygments_ +syntax highlighter and can be formatted with a style sheet. (Code parsing +is turned off using the ``syntax-highlight`` config setting in the test +conversions in order to get identical results with/without installed +Pygments highlighter.) + +.. code:: python + + print 'This is Python code.' + +The ``:number-lines:`` option (with optional start value) generates line +numbers: + +.. code:: python + :number-lines: 8 + + # print integers from 0 to 9: + for i in range(10): + print i + +For inline code snippets, there is the `code` role, which can be used +directly (the code will not be parsed/tagged, as the language is not +known) or as base for special code roles, e.g., + +.. role:: tex(code) + :language: latex + +.. + + Docutils uses LaTeX syntax for math directives and roles: + :tex:`\alpha = f(x)` prints :math:`\alpha = f(x)`. + +.. _Pygments: http://pygments.org/ + +The ``:code:`` option of the `include` directive sets the included content +as a code block, here the rst file ``header_footer.txt`` with line numbers: + +.. include:: header_footer.txt + :code: rst + :number-lines: + + Substitution Definitions ------------------------ Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/data/urls.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/data/urls.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/data/urls.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -3,7 +3,7 @@ Long URLs should be wrapped in the PDF. This can be achieved with the \url command which is used by the LaTeX writer -wheneve the content (name) of a reference node equals the link URL. +whenever the content (name) of a reference node equals the link URL. Example: a long URL that should wrap in the output Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/standalone_rst_latex.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/standalone_rst_latex.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/standalone_rst_latex.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -20,6 +20,7 @@ .. include:: data/latex_encoding.txt .. include:: data/hyperlinking.txt .. include:: data/urls.txt +.. include:: data/section_titles.txt .. unusual combinations (from newlatex, for interactive testing) .. include:: data/latex.txt Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/standalone_rst_xetex.txt =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/standalone_rst_xetex.txt 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/input/standalone_rst_xetex.txt 2012-05-04 08:52:38 UTC (rev 655) @@ -18,6 +18,7 @@ .. include:: data/latex_encoding.txt .. include:: data/hyperlinking.txt .. include:: data/urls.txt +.. include:: data/section_titles.txt Tests for the XeTeX writer ========================== @@ -32,8 +33,7 @@ Currently, there is extended support for 28 languages in the polyglossia_ package. -.. _polyglossia: - http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=polyglossia +.. _polyglossia: http://ctan.org/pkg/polyglossia .. System Messages: .. include:: data/errors.txt Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/_default.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/_default.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/_default.py 2012-05-04 08:52:38 UTC (rev 655) @@ -4,4 +4,4 @@ settings_overrides['halt_level'] = 5 settings_overrides['warning_stream'] = '' settings_overrides['input_encoding'] = 'utf-8' -settings_overrides['embed_stylesheet'] = 0 +settings_overrides['embed_stylesheet'] = False Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/_standalone_rst_defaults.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/_standalone_rst_defaults.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/_standalone_rst_defaults.py 2012-05-04 08:52:38 UTC (rev 655) @@ -4,3 +4,4 @@ # Settings. settings_overrides['sectsubtitle_xform'] = 1 +settings_overrides['syntax_highlight'] = 'none' Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/dangerous.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/dangerous.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/dangerous.py 2012-05-04 08:52:38 UTC (rev 655) @@ -8,5 +8,5 @@ writer_name = "html" # Settings -settings_overrides['file_insertion_enabled'] = 0 -settings_overrides['raw_enabled'] = 0 +settings_overrides['file_insertion_enabled'] = False +settings_overrides['raw_enabled'] = False Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/field_name_limit.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/field_name_limit.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/field_name_limit.py 2012-05-04 08:52:38 UTC (rev 655) @@ -9,4 +9,4 @@ # Settings settings_overrides['field_name_limit'] = 0 # no limit -settings_overrides['docinfo_xform'] = 0 +settings_overrides['docinfo_xform'] = False Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/misc_rst_html4css1.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/misc_rst_html4css1.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/misc_rst_html4css1.py 2012-05-04 08:52:38 UTC (rev 655) @@ -11,4 +11,4 @@ # test for encoded attribute value: settings_overrides['stylesheet'] = 'foo&bar.css' settings_overrides['stylesheet_path'] = '' -settings_overrides['embed_stylesheet'] = 0 +settings_overrides['embed_stylesheet'] = False Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/standalone_rst_pseudoxml.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/standalone_rst_pseudoxml.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/standalone_rst_pseudoxml.py 2012-05-04 08:52:38 UTC (rev 655) @@ -6,3 +6,7 @@ # Keyword parameters passed to publish_file. writer_name = "pseudoxml" + +# Settings +# enable INFO-level system messages in this test: +settings_overrides['report_level'] = 1 Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/standalone_rst_s5_html_1.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/standalone_rst_s5_html_1.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/functional/tests/standalone_rst_s5_html_1.py 2012-05-04 08:52:38 UTC (rev 655) @@ -41,7 +41,7 @@ if uniques: parts.append('The following paths are unique:') parts.extend(uniques) - test_case.assert_(not parts, '\n'.join(parts)) + test_case.assertTrue(not parts, '\n'.join(parts)) def _compare_directories(expected, output): dircmp = _filecmp.dircmp(expected, output, ['.svn', 'CVS']) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/package_unittest.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/package_unittest.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/package_unittest.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python -# $Id: package_unittest.py 6116 2009-09-03 15:36:30Z milde $ +# $Id: package_unittest.py 7320 2012-01-19 22:33:02Z milde $ # Author: Garth Kidd <garth@deadlybloodyserious.com> # Copyright: This module has been placed in the public domain. @@ -21,7 +21,7 @@ # So that individual test modules can share a bit of state, # `package_unittest` acts as an intermediary for the following # variables: -debug = 0 +debug = False verbosity = 1 USAGE = """\ Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test__init__.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test__init__.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test__init__.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python # .. coding: utf8 -# $Id: test__init__.py 7007 2011-04-12 09:10:57Z milde $ +# $Id: test__init__.py 7337 2012-02-03 08:16:53Z milde $ # Author: Günter Milde <milde@users.sourceforge.net> # Copyright: This module has been placed in the public domain. @@ -17,11 +17,11 @@ def test_message(self): err = docutils.ApplicationError('the message') - self.assertEquals(unicode(err), u'the message') + self.assertEqual(unicode(err), u'the message') def test_non_ASCII_message(self): err = docutils.ApplicationError(u'\u0169') - self.assertEquals(unicode(err), u'\u0169') + self.assertEqual(unicode(err), u'\u0169') if __name__ == '__main__': Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_command_line.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_command_line.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_command_line.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python # .. coding: utf8 -# $Id: test_command_line.py 7070 2011-07-05 10:13:17Z milde $ +# $Id: test_command_line.py 7247 2011-12-05 21:20:43Z milde $ # Author: Günter Milde <milde@users.sourceforge.net> # Copyright: This module has been placed in the public domain. @@ -9,31 +9,41 @@ """ import unittest -import sys -import DocutilsTestSupport # must be imported before docutils +import sys, codecs +import DocutilsTestSupport # must be imported before docutils import docutils.core +# determine/guess the encoding of the standard input: try: import locale # module missing in Jython - locale_encoding = locale.getdefaultlocale()[1] + locale_encoding = locale.getlocale()[1] or locale.getdefaultlocale()[1] except ImportError: locale_encoding = None +argv_encoding = locale_encoding or 'ascii' +try: + codecs.lookup(argv_encoding) +except LookupError: + argv_encoding = 'ascii' + + class CommandLineEncodingTests(unittest.TestCase): def test_sys_argv_decoding(self): - if locale_encoding in (None, 'ascii'): # cannot test + if argv_encoding == 'ascii': # cannot test return sys.argv.append('--source-url=test.txt') # pure ASCII argument if sys.version_info < (3,0): - sys.argv.append(u'--title=Dornröschen'.encode(locale_encoding)) + sys.argv.append(u'--title=Dornröschen'.encode(argv_encoding)) else: sys.argv.append(u'--title=Dornröschen') publisher = docutils.core.Publisher() publisher.process_command_line() self.assertEqual(publisher.settings.source_url, 'test.txt') self.assertEqual(publisher.settings.title, u'Dornröschen') - sys.argv.pop() + sys.argv.pop() # --title + sys.argv.pop() # --source-url + if __name__ == '__main__': unittest.main() Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_dependencies.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_dependencies.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_dependencies.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python -# $Id: test_dependencies.py 5720 2008-10-31 17:50:17Z goodger $ +# $Id: test_dependencies.py 7404 2012-05-01 16:07:54Z grubert $ # Author: Lea Wiemann <LeWiemann@gmail.com> # Copyright: This module has been placed in the public domain. @@ -14,74 +14,118 @@ import DocutilsTestSupport # must be imported before docutils import docutils.core import docutils.utils +import docutils.io +from docutils.parsers.rst.directives.images import PIL +# docutils.utils.DependencyList records POSIX paths, +# i.e. "/" as a path separator even on Windows (not os.path.join). +paths = {'include': u'data/include.txt', # included rst file + 'raw': u'data/raw.txt', # included raw "HTML file" + 'scaled-image': u'../docs/user/rst/images/biohazard.png', + 'figure-image': u'../docs/user/rst/images/title.png', + 'stylesheet': u'data/stylesheet.txt', + 'default-stylesheet': u'../docutils/writers/html4css1/html4css1.css', + } + class RecordDependenciesTests(unittest.TestCase): - # docutils.utils.DependencyList records relative URLs, not platform paths, - # so use "/" as a path separator even on Windows (not os.path.join). + # python 2.3 + if not hasattr(unittest.TestCase, "assertTrue"): + assertTrue = unittest.TestCase.failUnless def get_record(self, **settings): recordfile = 'record.txt' + recorder = docutils.utils.DependencyList(recordfile) + # (Re) create the record file by running a conversion: settings.setdefault('source_path', os.path.join('data', 'dependencies.txt')) settings.setdefault('settings_overrides', {}) - settings['settings_overrides'] = settings['settings_overrides'].copy() - settings['settings_overrides']['_disable_config'] = 1 - if 'record_dependencies' not in settings['settings_overrides']: - settings['settings_overrides']['record_dependencies'] = \ - docutils.utils.DependencyList(recordfile) + if sys.version_info < (2, 4): + # python 2.3 update() takes no keyword arguments + settings['settings_overrides'].update({"_disable_config":True, + "record_dependencies":recorder}) + else: + settings['settings_overrides'].update(_disable_config=True, + record_dependencies=recorder) docutils.core.publish_file(destination=DocutilsTestSupport.DevNull(), **settings) - settings['settings_overrides']['record_dependencies'].close() - return open(recordfile).read().splitlines() + recorder.close() + # Read the record file: + record = docutils.io.FileInput(source_path=recordfile, + encoding='utf8') + return record.read().splitlines() def test_dependencies(self): - self.assertEqual(self.get_record(), - ['data/include.txt', 'data/raw.txt']) - self.assertEqual(self.get_record(writer_name='latex'), - ['data/include.txt', - 'data/raw.txt', - # this is a URL, not a path: - 'some_image.png']) + # Note: currently, raw input files are read (and hence recorded) while + # parsing even if not used in the chosen output format. + # This should change (see parsers/rst/directives/misc.py). + keys = ['include', 'raw'] + if PIL: + keys += ['figure-image'] + expected = [paths[key] for key in keys] + record = self.get_record(writer_name='xml') + # the order of the files is arbitrary + record.sort() + expected.sort() + self.assertEqual(record, expected) + def test_dependencies_html(self): + keys = ['include', 'raw', 'default-stylesheet'] + if PIL: + keys += ['figure-image', 'scaled-image'] + expected = [paths[key] for key in keys] + record = self.get_record(writer_name='html') + # the order of the files is arbitrary + record.sort() + expected.sort() + self.assertEqual(record, expected) + + def test_dependencies_latex(self): + # since 0.9, the latex writer records only really accessed files, too + # Note: currently, raw input files are read (and hence recorded) while + # parsing even if not used in the chosen output format. + # This should change (see parsers/rst/directives/misc.py). + keys = ['include', 'raw'] + if PIL: + keys += ['figure-image'] + expected = [paths[key] for key in keys] + record = self.get_record(writer_name='latex') + # the order of the files is arbitrary + record.sort() + expected.sort() + self.assertEqual(record, expected) + def test_csv_dependencies(self): try: import csv - self.assertEqual( - self.get_record(source_path=os.path.join('data', - 'csv_dep.txt')), - ['data/csv_data.txt']) + csvsource = os.path.join('data', 'csv_dep.txt') + self.assertEqual(self.get_record(source_path=csvsource), + ['data/csv_data.txt']) except ImportError: pass def test_stylesheet_dependencies(self): - # Parameters to publish_file. - s = {'settings_overrides': {}} - so = s['settings_overrides'] - so['embed_stylesheet'] = 0 - # must use '/', not os.sep or os.path.join, because of URL handling - # (see docutils.utils.relative_path): - stylesheet_path = 'data/stylesheet.txt' - so['stylesheet_path'] = stylesheet_path - so['stylesheet'] = None - s['writer_name'] = 'html' - record = self.get_record(**s) - self.assert_(stylesheet_path not in record, - '%r should not be in %r' % (stylesheet_path, record)) - so['embed_stylesheet'] = 1 - record = self.get_record(**s) - self.assert_(stylesheet_path in record, - '%r should be in %r' % (stylesheet_path, record)) - s['writer_name'] = 'latex' - record = self.get_record(**s) - self.assert_(stylesheet_path in record, - '%r should be in %r' % (stylesheet_path, record)) - del so['embed_stylesheet'] - record = self.get_record(**s) - self.assert_(stylesheet_path not in record, - '%r should not be in %r' % (stylesheet_path, record)) + stylesheet = paths['stylesheet'] + so = {'stylesheet_path': paths['stylesheet'], + 'stylesheet': None} + so['embed_stylesheet'] = False + record = self.get_record(writer_name='html', settings_overrides=so) + self.assertTrue(stylesheet not in record, + '%r should not be in %r' % (stylesheet, record)) + record = self.get_record(writer_name='latex', settings_overrides=so) + self.assertTrue(stylesheet not in record, + '%r should not be in %r' % (stylesheet, record)) + so['embed_stylesheet'] = True + record = self.get_record(writer_name='html', settings_overrides=so) + self.assertTrue(stylesheet in record, + '%r should be in %r' % (stylesheet, record)) + record = self.get_record(writer_name='latex', settings_overrides=so) + self.assertTrue(stylesheet in record, + '%r should be in %r' % (stylesheet, record)) + + if __name__ == '__main__': unittest.main() Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_error_reporting.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_error_reporting.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_error_reporting.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python # .. coding: utf8 -# $Id: test_error_reporting.py 7097 2011-07-20 22:12:25Z milde $ +# $Id: test_error_reporting.py 7337 2012-02-03 08:16:53Z milde $ # Author: Günter Milde <milde@users.sourceforge.net> # Copyright: This module has been placed in the public domain. @@ -175,41 +175,41 @@ class ErrorOutputTests(unittest.TestCase): def test_defaults(self): e = ErrorOutput() - self.assertEquals(e.stream, sys.stderr) + self.assertEqual(e.stream, sys.stderr) def test_bbuf(self): buf = BBuf() # buffer storing byte string e = ErrorOutput(buf, encoding='ascii') # write byte-string as-is e.write(b('b\xfc')) - self.assertEquals(buf.getvalue(), b('b\xfc')) + self.assertEqual(buf.getvalue(), b('b\xfc')) # encode unicode data with backslashescape fallback replacement: e.write(u' u\xfc') - self.assertEquals(buf.getvalue(), b('b\xfc u\\xfc')) + self.assertEqual(buf.getvalue(), b('b\xfc u\\xfc')) # handle Exceptions with Unicode string args # unicode(Exception(u'e\xfc')) # fails in Python < 2.6 e.write(AttributeError(u' e\xfc')) - self.assertEquals(buf.getvalue(), b('b\xfc u\\xfc e\\xfc')) + self.assertEqual(buf.getvalue(), b('b\xfc u\\xfc e\\xfc')) # encode with `encoding` attribute e.encoding = 'utf8' e.write(u' u\xfc') - self.assertEquals(buf.getvalue(), b('b\xfc u\\xfc e\\xfc u\xc3\xbc')) + self.assertEqual(buf.getvalue(), b('b\xfc u\\xfc e\\xfc u\xc3\xbc')) def test_ubuf(self): buf = UBuf() # buffer only accepting unicode string # decode of binary strings e = ErrorOutput(buf, encoding='ascii') e.write(b('b\xfc')) - self.assertEquals(buf.getvalue(), u'b\ufffd') # use REPLACEMENT CHARACTER + self.assertEqual(buf.getvalue(), u'b\ufffd') # use REPLACEMENT CHARACTER # write Unicode string and Exceptions with Unicode args e.write(u' u\xfc') - self.assertEquals(buf.getvalue(), u'b\ufffd u\xfc') + self.assertEqual(buf.getvalue(), u'b\ufffd u\xfc') e.write(AttributeError(u' e\xfc')) - self.assertEquals(buf.getvalue(), u'b\ufffd u\xfc e\xfc') + self.assertEqual(buf.getvalue(), u'b\ufffd u\xfc e\xfc') # decode with `encoding` attribute e.encoding = 'latin1' e.write(b(' b\xfc')) - self.assertEquals(buf.getvalue(), u'b\ufffd u\xfc e\xfc b\xfc') + self.assertEqual(buf.getvalue(), u'b\ufffd u\xfc e\xfc b\xfc') Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_functional.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_functional.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_functional.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #!/usr/bin/env python -# $Id: test_functional.py 7097 2011-07-20 22:12:25Z milde $ +# $Id: test_functional.py 7337 2012-02-03 08:16:53Z milde $ # Author: Lea Wiemann <LeWiemann@gmail.com> # Copyright: This module has been placed in the public domain. @@ -170,7 +170,7 @@ # Get the expected output *after* writing the actual output. no_expected = self.no_expected_template % { 'exp': expected_path, 'out': params['destination_path']} - self.assert_(os.access(expected_path, os.R_OK), no_expected) + self.assertTrue(os.access(expected_path, os.R_OK), no_expected) if sys.version_info < (3,0): f = open(expected_path, 'r') else: # samples are UTF8 encoded. 'rb' leads to errors with Python 3! @@ -187,7 +187,7 @@ diff = self.expected_output_differs_template % { 'exp': expected_path, 'out': params['destination_path']} try: - self.assertEquals(output, expected, diff) + self.assertEqual(output, expected, diff) except AssertionError: diff = ''.join(difflib.unified_diff( expected.splitlines(True), output.splitlines(True), Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_io.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_io.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_io.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python -# $Id: test_io.py 7037 2011-05-19 08:56:27Z milde $ +# $Id: test_io.py 7400 2012-05-01 08:34:41Z grubert $ # Author: Lea Wiemann <LeWiemann@gmail.com> # Copyright: This module has been placed in the public domain. @@ -12,19 +12,23 @@ import DocutilsTestSupport # must be imported before docutils from docutils import io from docutils._compat import b, bytes +from docutils.error_reporting import locale_encoding - class InputTests(unittest.TestCase): + # python 2.3 + if not hasattr(unittest.TestCase, "assertTrue"): + assertTrue = unittest.TestCase.failUnless + def test_bom(self): input = io.StringInput(source=b('\xef\xbb\xbf foo \xef\xbb\xbf bar'), encoding='utf8') # Assert BOMs are gone. - self.assertEquals(input.read(), u' foo bar') + self.assertEqual(input.read(), u' foo bar') # With unicode input: input = io.StringInput(source=u'\ufeff foo \ufeff bar') # Assert BOMs are still there. - self.assertEquals(input.read(), u'\ufeff foo \ufeff bar') + self.assertEqual(input.read(), u'\ufeff foo \ufeff bar') def test_coding_slug(self): input = io.StringInput(source=b("""\ @@ -33,14 +37,14 @@ blah """)) data = input.read() - self.assertEquals(input.successful_encoding, 'ascii') + self.assertEqual(input.successful_encoding, 'ascii') input = io.StringInput(source=b("""\ #! python # -*- coding: ascii -*- print "hello world" """)) data = input.read() - self.assertEquals(input.successful_encoding, 'ascii') + self.assertEqual(input.successful_encoding, 'ascii') input = io.StringInput(source=b("""\ #! python # extraneous comment; prevents coding slug from being read @@ -48,20 +52,44 @@ print "hello world" """)) data = input.read() - self.assertNotEquals(input.successful_encoding, 'ascii') + self.assertNotEqual(input.successful_encoding, 'ascii') def test_bom_detection(self): source = u'\ufeffdata\nblah\n' input = io.StringInput(source=source.encode('utf-16-be')) data = input.read() - self.assertEquals(input.successful_encoding, 'utf-16-be') + self.assertEqual(input.successful_encoding, 'utf-16-be') input = io.StringInput(source=source.encode('utf-16-le')) data = input.read() - self.assertEquals(input.successful_encoding, 'utf-16-le') + self.assertEqual(input.successful_encoding, 'utf-16-le') input = io.StringInput(source=source.encode('utf-8')) data = input.read() - self.assertEquals(input.successful_encoding, 'utf-8') + self.assertEqual(input.successful_encoding, 'utf-8') + def test_readlines(self): + input = io.FileInput(source_path='data/include.txt') + data = input.readlines() + self.assertEqual(data, [u'Some include text.\n']) + def test_heuristics_utf8(self): + # if no encoding is given, try decoding with utf8: + input = io.FileInput(source_path='functional/input/cyrillic.txt') + data = input.read() + if sys.version_info < (3,0): + # in Py3k, the locale encoding is used without --input-encoding + # skipping the heuristic + self.assertEqual(input.successful_encoding, 'utf-8') + + def test_heuristics_no_utf8(self): + # if no encoding is given and decoding with utf8 fails, + # use either the locale encoding (if specified) or latin1: + input = io.FileInput(source_path='data/latin1.txt') + data = input.read() + self.assertTrue(input.successful_encoding in (locale_encoding, + 'latin-1')) + if input.successful_encoding == 'latin-1': + self.assertEqual(data, u'Gr\xfc\xdfe\n') + + if __name__ == '__main__': unittest.main() Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_nodes.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_nodes.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_nodes.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,7 +1,7 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# $Id: test_nodes.py 6351 2010-07-03 14:19:09Z gbrandl $ +# $Id: test_nodes.py 7400 2012-05-01 08:34:41Z grubert $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -16,8 +16,13 @@ from DocutilsTestSupport import nodes, utils from docutils._compat import b -debug = 0 +debug = False +# python 2.3 +if not hasattr(unittest.TestCase, "assertTrue"): + # HACK? this changes TestCase, fixes the problem for tests executing afterwards. + # this tests break if run alone + unittest.TestCase.assertTrue = unittest.TestCase.failUnless class TextTests(unittest.TestCase): @@ -30,22 +35,22 @@ 'lamb was sure to go.') def test_repr(self): - self.assertEquals(repr(self.text), r"<#text: 'Line 1.\nLine 2.'>") - self.assertEquals(self.text.shortrepr(), + self.assertEqual(repr(self.text), r"<#text: 'Line 1.\nLine 2.'>") + self.assertEqual(self.text.shortrepr(), r"<#text: 'Line 1.\nLine 2.'>") def test_str(self): - self.assertEquals(str(self.text), 'Line 1.\nLine 2.') + self.assertEqual(str(self.text), 'Line 1.\nLine 2.') def test_unicode(self): - self.assertEquals(unicode(self.unicode_text), u'Möhren') - self.assertEquals(str(self.unicode_text), 'M\xf6hren') + self.assertEqual(unicode(self.unicode_text), u'Möhren') + self.assertEqual(str(self.unicode_text), 'M\xf6hren') def test_astext(self): - self.assertEquals(self.text.astext(), 'Line 1.\nLine 2.') + self.assertEqual(self.text.astext(), 'Line 1.\nLine 2.') def test_pformat(self): - self.assertEquals(self.text.pformat(), 'Line 1.\nLine 2.\n') + self.assertEqual(self.text.pformat(), 'Line 1.\nLine 2.\n') def test_asciirestriction(self): if sys.version_info < (3,): @@ -56,93 +61,93 @@ self.assertRaises(TypeError, nodes.Text, b('hol')) def test_longrepr(self): - self.assertEquals(repr(self.longtext), r"<#text: 'Mary had a " + self.assertEqual(repr(self.longtext), r"<#text: 'Mary had a " r"little lamb whose fleece was white as snow " r"and everwh ...'>") - self.assertEquals(self.longtext.shortrepr(), + self.assertEqual(self.longtext.shortrepr(), r"<#text: 'Mary had a lit ...'>") class ElementTests(unittest.TestCase): def test_empty(self): element = nodes.Element() - self.assertEquals(repr(element), '<Element: >') - self.assertEquals(str(element), '<Element/>') + self.assertEqual(repr(element), '<Element: >') + self.assertEqual(str(element), '<Element/>') dom = element.asdom() - self.assertEquals(dom.toxml(), '<Element/>') + self.assertEqual(dom.toxml(), '<Element/>') dom.unlink() element['attr'] = '1' - self.assertEquals(repr(element), '<Element: >') - self.assertEquals(str(element), '<Element attr="1"/>') + self.assertEqual(repr(element), '<Element: >') + self.assertEqual(str(element), '<Element attr="1"/>') dom = element.asdom() - self.assertEquals(dom.toxml(), '<Element attr="1"/>') + self.assertEqual(dom.toxml(), '<Element attr="1"/>') dom.unlink() - self.assertEquals(element.pformat(), '<Element attr="1">\n') + self.assertEqual(element.pformat(), '<Element attr="1">\n') del element['attr'] element['mark'] = u'\u2022' - self.assertEquals(repr(element), '<Element: >') + self.assertEqual(repr(element), '<Element: >') if sys.version_info < (3,): - self.assertEquals(str(element), '<Element mark="\\u2022"/>') + self.assertEqual(str(element), '<Element mark="\\u2022"/>') else: - self.assertEquals(str(element), '<Element mark="\u2022"/>') + self.assertEqual(str(element), '<Element mark="\u2022"/>') dom = element.asdom() - self.assertEquals(dom.toxml(), u'<Element mark="\u2022"/>') + self.assertEqual(dom.toxml(), u'<Element mark="\u2022"/>') dom.unlink() def test_withtext(self): element = nodes.Element('text\nmore', nodes.Text('text\nmore')) - self.assertEquals(repr(element), r"<Element: <#text: 'text\nmore'>>") - self.assertEquals(str(element), '<Element>text\nmore</Element>') + self.assertEqual(repr(element), r"<Element: <#text: 'text\nmore'>>") + self.assertEqual(str(element), '<Element>text\nmore</Element>') dom = element.asdom() - self.assertEquals(dom.toxml(), '<Element>text\nmore</Element>') + self.assertEqual(dom.toxml(), '<Element>text\nmore</Element>') dom.unlink() element['attr'] = '1' - self.assertEquals(repr(element), r"<Element: <#text: 'text\nmore'>>") - self.assertEquals(str(element), + self.assertEqual(repr(element), r"<Element: <#text: 'text\nmore'>>") + self.assertEqual(str(element), '<Element attr="1">text\nmore</Element>') dom = element.asdom() - self.assertEquals(dom.toxml(), + self.assertEqual(dom.toxml(), '<Element attr="1">text\nmore</Element>') dom.unlink() - self.assertEquals(element.pformat(), + self.assertEqual(element.pformat(), '<Element attr="1">\n text\n more\n') def test_clear(self): element = nodes.Element() element += nodes.Element() - self.assert_(len(element)) + self.assertTrue(len(element)) element.clear() - self.assert_(not len(element)) + self.assertTrue(not len(element)) def test_normal_attributes(self): element = nodes.Element() - self.assert_('foo' not in element) + self.assertTrue('foo' not in element) self.assertRaises(KeyError, element.__getitem__, 'foo') element['foo'] = 'sometext' - self.assertEquals(element['foo'], 'sometext') + self.assertEqual(element['foo'], 'sometext') del element['foo'] self.assertRaises(KeyError, element.__getitem__, 'foo') def test_default_attributes(self): element = nodes.Element() - self.assertEquals(element['ids'], []) - self.assertEquals(element.non_default_attributes(), {}) - self.assert_(not element.is_not_default('ids')) - self.assert_(element['ids'] is not nodes.Element()['ids']) + self.assertEqual(element['ids'], []) + self.assertEqual(element.non_default_attributes(), {}) + self.assertTrue(not element.is_not_default('ids')) + self.assertTrue(element['ids'] is not nodes.Element()['ids']) element['ids'].append('someid') - self.assertEquals(element['ids'], ['someid']) - self.assertEquals(element.non_default_attributes(), + self.assertEqual(element['ids'], ['someid']) + self.assertEqual(element.non_default_attributes(), {'ids': ['someid']}) - self.assert_(element.is_not_default('ids')) + self.assertTrue(element.is_not_default('ids')) def test_update_basic_atts(self): element1 = nodes.Element(ids=['foo', 'bar'], test=['test1']) element2 = nodes.Element(ids=['baz', 'qux'], test=['test2']) element1.update_basic_atts(element2) # 'ids' are appended because 'ids' is a basic attribute. - self.assertEquals(element1['ids'], ['foo', 'bar', 'baz', 'qux']) + self.assertEqual(element1['ids'], ['foo', 'bar', 'baz', 'qux']) # 'test' is not overwritten because it is not a basic attribute. - self.assertEquals(element1['test'], ['test1']) + self.assertEqual(element1['test'], ['test1']) def test_replace_self(self): parent = nodes.Element(ids=['parent']) @@ -155,7 +160,7 @@ child3 = nodes.Element(ids=['child3']) child4 = nodes.Element(ids=['child4']) parent += [child1, child2, child3, child4] - self.assertEquals(parent.pformat(), """\ + self.assertEqual(parent.pformat(), """\ <Element ids="parent"> <Element ids="child1"> <Element ids="grandchild"> @@ -167,29 +172,29 @@ """) # Replace child1 with the grandchild. child1.replace_self(child1[0]) - self.assertEquals(parent[0], grandchild) + self.assertEqual(parent[0], grandchild) # Assert that 'ids' have been updated. - self.assertEquals(grandchild['ids'], ['grandchild', 'child1']) + self.assertEqual(grandchild['ids'], ['grandchild', 'child1']) # Replace child2 with its children. child2.replace_self(child2[:]) - self.assertEquals(parent[1:3], twins) + self.assertEqual(parent[1:3], twins) # Assert that 'ids' have been propagated to first child. - self.assertEquals(twins[0]['ids'], ['twin1', 'child2']) - self.assertEquals(twins[1]['ids'], ['twin2']) + self.assertEqual(twins[0]['ids'], ['twin1', 'child2']) + self.assertEqual(twins[1]['ids'], ['twin2']) # Replace child3 with new child. newchild = nodes.Element(ids=['newchild']) child3.replace_self(newchild) - self.assertEquals(parent[3], newchild) - self.assertEquals(newchild['ids'], ['newchild', 'child3']) + self.assertEqual(parent[3], newchild) + self.assertEqual(newchild['ids'], ['newchild', 'child3']) # Crazy but possible case: Substitute child4 for itself. child4.replace_self(child4) # Make sure the 'child4' ID hasn't been duplicated. - self.assertEquals(child4['ids'], ['child4']) - self.assertEquals(len(parent), 5) + self.assertEqual(child4['ids'], ['child4']) + self.assertEqual(len(parent), 5) def test_unicode(self): node = nodes.Element(u'Möhren', nodes.Text(u'Möhren', u'Möhren')) - self.assertEquals(unicode(node), u'<Element>Möhren</Element>') + self.assertEqual(unicode(node), u'<Element>Möhren</Element>') class MiscTests(unittest.TestCase): @@ -203,7 +208,7 @@ node_class_names.append(x) node_class_names.sort() nodes.node_class_names.sort() - self.assertEquals(node_class_names, nodes.node_class_names) + self.assertEqual(node_class_names, nodes.node_class_names) ids = [(u'a', 'a'), ('A', 'a'), ('', ''), ('a b \n c', 'a-b-c'), ('a.b.c', 'a-b-c'), (' - a - b - c - ', 'a-b-c'), (' - ', ''), @@ -397,33 +402,33 @@ e[0][1] += nodes.Text('some text') e += nodes.Element() e += nodes.Element() - self.assertEquals(list(e.traverse()), + self.assertEqual(list(e.traverse()), [e, e[0], e[0][0], e[0][1], e[0][1][0], e[1], e[2]]) - self.assertEquals(list(e.traverse(include_self=0)), + self.assertEqual(list(e.traverse(include_self=False)), [e[0], e[0][0], e[0][1], e[0][1][0], e[1], e[2]]) - self.assertEquals(list(e.traverse(descend=0)), + self.assertEqual(list(e.traverse(descend=False)), [e]) - self.assertEquals(list(e[0].traverse(descend=0, ascend=1)), + self.assertEqual(list(e[0].traverse(descend=False, ascend=True)), [e[0], e[1], e[2]]) - self.assertEquals(list(e[0][0].traverse(descend=0, ascend=1)), + self.assertEqual(list(e[0][0].traverse(descend=False, ascend=True)), [e[0][0], e[0][1], e[1], e[2]]) - self.assertEquals(list(e[0][0].traverse(descend=0, siblings=1)), + self.assertEqual(list(e[0][0].traverse(descend=False, siblings=True)), [e[0][0], e[0][1]]) self.testlist = e[0:2] - self.assertEquals(list(e.traverse(condition=self.not_in_testlist)), + self.assertEqual(list(e.traverse(condition=self.not_in_testlist)), [e, e[0][0], e[0][1], e[0][1][0], e[2]]) - # Return siblings despite siblings=0 because ascend is true. - self.assertEquals(list(e[1].traverse(ascend=1, siblings=0)), + # Return siblings despite siblings=False because ascend is true. + self.assertEqual(list(e[1].traverse(ascend=True, siblings=False)), [e[1], e[2]]) - self.assertEquals(list(e[0].traverse()), + self.assertEqual(list(e[0].traverse()), [e[0], e[0][0], e[0][1], e[0][1][0]]) self.testlist = [e[0][0], e[0][1]] - self.assertEquals(list(e[0].traverse(condition=self.not_in_testlist)), + self.assertEqual(list(e[0].traverse(condition=self.not_in_testlist)), [e[0], e[0][1][0]]) self.testlist.append(e[0][1][0]) - self.assertEquals(list(e[0].traverse(condition=self.not_in_testlist)), + self.assertEqual(list(e[0].traverse(condition=self.not_in_testlist)), [e[0]]) - self.assertEquals(list(e.traverse(nodes.TextElement)), [e[0][1]]) + self.assertEqual(list(e.traverse(nodes.TextElement)), [e[0][1]]) def test_next_node(self): e = nodes.Element() @@ -442,10 +447,10 @@ (e[1], e[2]), (e[2], None)] for node, next_node in compare: - self.assertEquals(node.next_node(self.not_in_testlist, ascend=1), + self.assertEqual(node.next_node(self.not_in_testlist, ascend=True), next_node) - self.assertEquals(e[0][0].next_node(ascend=1), e[0][1]) - self.assertEquals(e[2].next_node(), None) + self.assertEqual(e[0][0].next_node(ascend=True), e[0][1]) + self.assertEqual(e[2].next_node(), None) def not_in_testlist(self, x): return x not in self.testlist @@ -456,21 +461,21 @@ e = nodes.Element('rawsource', child, att='e') # Shallow copy: e_copy = e.copy() - self.assert_(e is not e_copy) + self.assertTrue(e is not e_copy) # Internal attributes (like `rawsource`) are also copied. - self.assertEquals(e.rawsource, 'rawsource') - self.assertEquals(e_copy.rawsource, e.rawsource) - self.assertEquals(e_copy['att'], 'e') + self.assertEqual(e.rawsource, 'rawsource') + self.assertEqual(e_copy.rawsource, e.rawsource) + self.assertEqual(e_copy['att'], 'e') # Children are not copied. - self.assertEquals(len(e_copy), 0) + self.assertEqual(len(e_copy), 0) # Deep copy: e_deepcopy = e.deepcopy() - self.assertEquals(e_deepcopy.rawsource, e.rawsource) - self.assertEquals(e_deepcopy['att'], 'e') + self.assertEqual(e_deepcopy.rawsource, e.rawsource) + self.assertEqual(e_deepcopy['att'], 'e') # Children are copied recursively. - self.assertEquals(e_deepcopy[0][0], grandchild) - self.assert_(e_deepcopy[0][0] is not grandchild) - self.assertEquals(e_deepcopy[0]['att'], 'child') + self.assertEqual(e_deepcopy[0][0], grandchild) + self.assertTrue(e_deepcopy[0][0] is not grandchild) + self.assertEqual(e_deepcopy[0]['att'], 'child') class TreeCopyVisitorTests(unittest.TestCase): @@ -488,9 +493,9 @@ self.document = document def compare_trees(self, one, two): - self.assertEquals(one.__class__, two.__class__) + self.assertEqual(one.__class__, two.__class__) self.assertNotEquals(id(one), id(two)) - self.assertEquals(len(one.children), len(two.children)) + self.assertEqual(len(one.children), len(two.children)) for i in range(len(one.children)): self.compare_trees(one.children[i], two.children[i]) @@ -498,7 +503,7 @@ visitor = nodes.TreeCopyVisitor(self.document) self.document.walkabout(visitor) newtree = visitor.get_tree_copy() - self.assertEquals(self.document.pformat(), newtree.pformat()) + self.assertEqual(self.document.pformat(), newtree.pformat()) self.compare_trees(self.document, newtree) @@ -511,7 +516,7 @@ def test_normalize_name(self): for input, output in self.names: normed = nodes.fully_normalize_name(input) - self.assertEquals(normed, output) + self.assertEqual(normed, output) def test_set_id_default(self): # Default prefixes. @@ -519,11 +524,11 @@ # From name. element = nodes.Element(names=['test']) document.set_id(element) - self.assertEquals(element['ids'], ['test']) + self.assertEqual(element['ids'], ['test']) # Auto-generated. element = nodes.Element() document.set_id(element) - self.assertEquals(element['ids'], ['id1']) + self.assertEqual(element['ids'], ['id1']) def test_set_id_custom(self): # Custom prefixes. @@ -534,11 +539,11 @@ # From name. element = nodes.Element(names=['test']) document.set_id(element) - self.assertEquals(element['ids'], ['prefixtest']) + self.assertEqual(element['ids'], ['prefixtest']) # Auto-generated. element = nodes.Element() document.set_id(element) - self.assertEquals(element['ids'], ['prefixauto1']) + self.assertEqual(element['ids'], ['prefixauto1']) if __name__ == '__main__': Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_SimpleTableParser.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_SimpleTableParser.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_SimpleTableParser.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,7 @@ #! /usr/bin/env python +# .. coding: utf-8 -# $Id: test_SimpleTableParser.py 7074 2011-07-07 06:54:37Z milde $ +# $Id: test_SimpleTableParser.py 7313 2012-01-11 20:28:57Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -27,6 +28,15 @@ [], [[[0, 0, 1, ['A table with']], [0, 0, 1, ['two columns.']]]])], +[u"""\ +============ =============== +A tāble w̅ith comb̲ining chars +============ =============== +""", +([12, 15], + [], + [[[0, 0, 1, [u'A ta\u0304ble w\u0305ith']], + [0, 0, 1, [u'comb\u0332ining chars']]]])], ["""\ ============ ============ A table with two columns @@ -72,14 +82,14 @@ cell 3 cell 4 ============ ====== """, -'TableMarkupError: Text in column margin at line offset 1.'], +'TableMarkupError: Text in column margin in table line 2.'], ["""\ ====== ===== ====== row one Another bad table ====== ===== ====== """, -'TableMarkupError: Text in column margin at line offset 2.'], +'TableMarkupError: Text in column margin in table line 3.'], ["""\ =========== ================ A table with two header rows, @@ -106,8 +116,8 @@ That's bad. ============ ============= """, -'TableMarkupError: Multiple head/body row separators in table ' -'(at line offset 2 and 4); only one allowed.'], +'TableMarkupError: Multiple head/body row separators ' +'(table lines 3 and 5); only one allowed.'], ["""\ ============ ============ ============ ============ Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_TableParser.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_TableParser.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_TableParser.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,7 @@ #! /usr/bin/env python +# coding: utf8 -# $Id: test_TableParser.py 4564 2006-05-21 20:44:42Z wiemann $ +# $Id: test_TableParser.py 7313 2012-01-11 20:28:57Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -38,6 +39,18 @@ [], [[(0, 0, 1, ['A table with']), (0, 0, 1, ['two columns.'])]])], +# Combining chars in grid tables still fail +# [u"""\ +# +--------------+------------------+ +# | A tāble w̅ith | comb̲ining chars. | +# +--------------+------------------+ +# """, +# [(0, 0, 2, 15, [u'A table with']), +# (0, 15, 2, 30, [u'combining chars.'])], +# ([14, 14], +# [], +# [[(0, 0, 1, [u'A table with']), +# (0, 0, 1, [u'combining chars.'])]])], ["""\ +--------------+-------------+ | A table with | two columns | @@ -184,10 +197,10 @@ | That's bad. | | +-------------+-----------------+ """, -'TableMarkupError: Multiple head/body row separators in table ' -'(at line offset 2 and 4); only one allowed.', -'TableMarkupError: Multiple head/body row separators in table ' -'(at line offset 2 and 4); only one allowed.'], +'TableMarkupError: Multiple head/body row separators ' +'(table lines 3 and 5); only one allowed.', +'TableMarkupError: Multiple head/body row separators ' +'(table lines 3 and 5); only one allowed.'], ["""\ +-------------------------------------+ | | Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_admonitions.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_admonitions.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_admonitions.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python -# $Id: test_admonitions.py 7072 2011-07-06 15:52:30Z milde $ +# $Id: test_admonitions.py 7348 2012-02-08 19:46:11Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -111,6 +111,35 @@ No blank lines in-between. """], ["""\ +.. note:: Content before options + is possible too. + :class: mynote + +.. note:: :strong:`a role is not an option`. + :name: role not option + +.. note:: a role is + :strong:`not an option`, even if its starts a line. +""", +"""\ +<document source="test data"> + <note classes="mynote"> + <paragraph> + Content before options + is possible too. + <note ids="role-not-option" names="role\ not\ option"> + <paragraph> + <strong> + a role is not an option + . + <note> + <paragraph> + a role is + <strong> + not an option + , even if its starts a line. +"""], +["""\ .. note:: """, """\ Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_images.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_images.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_images.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python -# $Id: test_images.py 7062 2011-06-30 22:14:29Z milde $ +# $Id: test_images.py 7348 2012-02-08 19:46:11Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -85,6 +85,8 @@ :width: 200 :scale: 50 """], +# If there are multiple lines in the link block, they are stripped of +# leading and trailing whitespace and joined together: ["""\ .. image:: a/very/long/path/to/ picture.png @@ -96,8 +98,36 @@ <document source="test data"> <image height="100" scale="50" uri="a/very/long/path/to/picture.png" width="200"> """], +# The following two misspellings were detected in Docutils <= 0.8 +# (the option block was started by any line starting with a colon +# which led to problems with named roles in other directives): ["""\ .. image:: picture.png + :scale 50 +""", +"""\ +<document source="test data"> + <image uri="picture.png:scale50"> +"""], +["""\ +.. image:: picture.png + :: 50 +""", +"""\ +<document source="test data"> + <image uri="picture.png::50"> +"""], +# a missing leading colon went undetected also in Docutils <= 0.8: +["""\ +.. image:: picture.png + scale: 50 +""", +"""\ +<document source="test data"> + <image uri="picture.pngscale:50"> +"""], +["""\ +.. image:: picture.png :width: 200px :height: 100 em """, @@ -175,6 +205,7 @@ """ % DocutilsTestSupport.exception_data(int, None)[1][0]], ["""\ .. image:: picture.png + :height: 100 :scale 50 """, """\ @@ -185,32 +216,11 @@ invalid option block. <literal_block xml:space="preserve"> .. image:: picture.png + :height: 100 :scale 50 """], ["""\ .. image:: picture.png - scale: 50 -""", -"""\ -<document source="test data"> - <image uri="picture.pngscale:50"> -"""], -["""\ -.. image:: picture.png - :: 50 -""", -"""\ -<document source="test data"> - <system_message level="3" line="1" source="test data" type="ERROR"> - <paragraph> - Error in "image" directive: - invalid option block. - <literal_block xml:space="preserve"> - .. image:: picture.png - :: 50 -"""], -["""\ -.. image:: picture.png :sale: 50 """, """\ Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_include.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_include.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_include.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python -# $Id: test_include.py 6314 2010-04-26 10:04:17Z milde $ +# $Id: test_include.py 7384 2012-03-19 22:59:09Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -13,28 +13,32 @@ from __init__ import DocutilsTestSupport from docutils.parsers.rst import states from docutils._compat import b +from docutils.utils.code_analyzer import with_pygments def suite(): s = DocutilsTestSupport.ParserTestSuite() + if not with_pygments: + del(totest['include-code']) s.generateTests(totest) return s -mydir = 'test_parsers/test_rst/test_directives/' -include1 = os.path.join(mydir, 'include1.txt') -include1rel = DocutilsTestSupport.utils.relative_path(None, include1) -include2 = os.path.join(mydir, 'include2.txt') -include3 = os.path.join(mydir, 'include3.txt') -include8 = os.path.join(mydir, 'include8.txt') -include10 = os.path.join(mydir, 'include10.txt') -include10rel = DocutilsTestSupport.utils.relative_path(None, include10) -include11 = os.path.join(mydir, 'include 11.txt') -include11rel = DocutilsTestSupport.utils.relative_path(None, include11) -include12 = os.path.join(mydir, 'include12.txt') -include13 = os.path.join(mydir, 'include13.txt') -include13rel = DocutilsTestSupport.utils.relative_path(None, include13) -include_literal = os.path.join(mydir, 'include_literal.txt') -utf_16_file = os.path.join(mydir, 'utf-16.csv') -utf_16_file_rel = DocutilsTestSupport.utils.relative_path(None, utf_16_file) +# prepend this directory (relative to the test root): +def mydir(path): + return os.path.join('test_parsers/test_rst/test_directives/', path) +# make `path` relative with utils.relative_path(): +def reldir(path): + return DocutilsTestSupport.utils.relative_path(None, path) + +include1 = mydir('include1.txt') +include2 = mydir('include2.txt') +include3 = mydir('include3.txt') +include8 = mydir('include8.txt') +include10 = mydir('include10.txt') +include11 = mydir('include 11.txt') +include12 = mydir('include12.txt') +include13 = mydir('include13.txt') +include_literal = mydir('include_literal.txt') +utf_16_file = mydir('utf-16.csv') utf_16_error_str = ("UnicodeDecodeError: 'ascii' codec can't decode byte 0xfe " "in position 0: ordinal not in range(128)") if sys.version_info < (3,0): @@ -79,6 +83,8 @@ .. include:: %s :literal: + :class: test + :name: my name A paragraph. """ % include1, @@ -87,15 +93,83 @@ <section ids="include-test" names="include\ test"> <title> Include Test - <literal_block source="%s" xml:space="preserve"> + <literal_block classes="test" ids="my-name" names="my\ name" source="%s" xml:space="preserve"> Inclusion 1 ----------- \n\ This file is used by ``test_include.py``. <paragraph> A paragraph. -""" % include1rel], +""" % reldir(include1)], ["""\ +Literal include, add line numbers + +.. include:: %s + :literal: + :number-lines: +""" % include1, +"""\ +<document source="test data"> + <paragraph> + Literal include, add line numbers + <literal_block source="%s" xml:space="preserve"> + <inline classes="ln"> + 1 \n\ + Inclusion 1 + <inline classes="ln"> + 2 \n\ + ----------- + <inline classes="ln"> + 3 \n\ + \n\ + <inline classes="ln"> + 4 \n\ + This file is used by ``test_include.py``. +""" % reldir(include1)], +["""\ +Include code + +.. include:: %s + :code: + :class: test + :name: my name +""" % include1, +"""\ +<document source="test data"> + <paragraph> + Include code + <literal_block classes="code test" ids="my-name" names="my\ name" source="%s" xml:space="preserve"> + Inclusion 1 + ----------- + \n\ + This file is used by ``test_include.py``. +""" % reldir(include1)], +["""\ +Include code, add line numbers + +.. include:: %s + :code: + :number-lines: +""" % include1, +"""\ +<document source="test data"> + <paragraph> + Include code, add line numbers + <literal_block classes="code" source="%s" xml:space="preserve"> + <inline classes="ln"> + 1 \n\ + Inclusion 1 + <inline classes="ln"> + 2 \n\ + ----------- + <inline classes="ln"> + 3 \n\ + \n\ + <inline classes="ln"> + 4 \n\ + This file is used by ``test_include.py``. +""" % reldir(include1)], +["""\ Let's test the parse context. This paragraph is in a block quote. @@ -138,7 +212,7 @@ <system_message level="4" line="4" source="test data" type="SEVERE"> <paragraph> Problems with "include" directive path: - IOError: [Errno 2] No such file or directory: 'nonexistent.txt'. + InputError: [Errno 2] No such file or directory: 'nonexistent.txt'. <literal_block xml:space="preserve"> .. include:: nonexistent.txt <paragraph> @@ -180,7 +254,7 @@ . <paragraph> A paragraph. -""" % include1rel], +""" % reldir(include1)], ["""\ Include Test ============ @@ -220,7 +294,7 @@ . <paragraph> A paragraph. -""" % include1rel], +""" % reldir(include1)], ["""\ In test data @@ -298,7 +372,7 @@ .. include:: %s :encoding: utf-16 -""" % utf_16_file_rel, +""" % reldir(utf_16_file), b("""\ <document source="test data"> <paragraph> @@ -315,7 +389,7 @@ .. include:: %s :encoding: ascii -""" % utf_16_file_rel, +""" % reldir(utf_16_file), """\ <document source="test data"> <paragraph> @@ -327,8 +401,23 @@ <literal_block xml:space="preserve"> .. include:: %s :encoding: ascii -""" % (utf_16_error_str, utf_16_file_rel)], -# @@@ BUG with errors reported with incorrect "source" & "line": +""" % (utf_16_error_str, reldir(utf_16_file))], +[u"""\ +cyrillic filename: + +.. include:: \u043c\u0438\u0440.txt +""", +u"""\ +<document source="test data"> + <paragraph> + cyrillic filename: + <system_message level="4" line="3" source="test data" type="SEVERE"> + <paragraph> + Problems with "include" directive path: + InputError: [Errno 2] No such file or directory: '\u043c\u0438\u0440.txt'. + <literal_block xml:space="preserve"> + .. include:: \u043c\u0438\u0440.txt +"""], ["""\ Testing errors in included file: @@ -369,7 +458,7 @@ <system_message level="4" line="12" source="%(source)s" type="SEVERE"> <paragraph> Problems with "include" directive path: - IOError: [Errno 2] No such file or directory: '%(nonexistent)s'. + InputError: [Errno 2] No such file or directory: '%(nonexistent)s'. <literal_block xml:space="preserve"> .. include:: <nonexistent> <system_message level="3" line="14" source="%(source)s" type="ERROR"> @@ -559,7 +648,7 @@ ============== ====== A simple table with no bottom border -""" % {'source': include10rel, 'nonexistent': nonexistent_rel, +""" % {'source': reldir(include10), 'nonexistent': reldir(nonexistent), 'unichr_exception': DocutilsTestSupport.exception_data(unichr, int("11111111", 16))[2] }], @@ -567,7 +656,7 @@ Include file with whitespace in the path: .. include:: %s -""" % include11rel, +""" % reldir(include11), """\ <document source="test data"> <paragraph> @@ -608,7 +697,7 @@ <system_message level="4" line="3" source="test data" type="SEVERE"> <paragraph> Problems with "include" directive path: - IOError: [Errno 2] No such file or directory: '%s'. + InputError: [Errno 2] No such file or directory: '%s'. <literal_block xml:space="preserve"> .. include:: <nonexistent> """ % nonexistent_rel], @@ -800,7 +889,64 @@ """ % include_literal], ] +totest['include-code'] = [ +["""\ +Included code +.. include:: %s + :code: rst +""" % include1, +"""\ +<document source="test data"> + <paragraph> + Included code + <literal_block classes="code rst" source="%s" xml:space="preserve"> + <inline classes="gh"> + Inclusion 1 + \n\ + <inline classes="gh"> + ----------- + \n\ + \n\ + This file is used by \n\ + <inline classes="s"> + ``test_include.py`` + . +""" % reldir(include1)], +["""\ +Included code + +.. include:: %s + :code: rst + :number-lines: +""" % include1, +"""\ +<document source="test data"> + <paragraph> + Included code + <literal_block classes="code rst" source="%s" xml:space="preserve"> + <inline classes="ln"> + 1 \n\ + <inline classes="gh"> + Inclusion 1 + \n\ + <inline classes="ln"> + 2 \n\ + <inline classes="gh"> + ----------- + \n\ + <inline classes="ln"> + 3 \n\ + \n\ + <inline classes="ln"> + 4 \n\ + This file is used by \n\ + <inline classes="s"> + ``test_include.py`` + . +""" % reldir(include1)], +] + if __name__ == '__main__': import unittest unittest.main(defaultTest='suite') Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_raw.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_raw.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_raw.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python -# $Id: test_raw.py 7037 2011-05-19 08:56:27Z milde $ +# $Id: test_raw.py 7384 2012-03-19 22:59:09Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -11,7 +11,7 @@ import os.path import sys from __init__ import DocutilsTestSupport -from docutils._compat import u_prefix, b +from docutils._compat import b def suite(): s = DocutilsTestSupport.ParserTestSuite() @@ -158,25 +158,14 @@ <system_message level="4" line="1" source="test data" type="SEVERE"> <paragraph> Problems with "raw" directive path: - IOError: [Errno 2] No such file or directory: %s'non-existent.file'. + InputError: [Errno 2] No such file or directory: 'non-existent.file'. <literal_block xml:space="preserve"> .. raw:: html :file: non-existent.file -""" % u_prefix], +"""], # note that this output is rewritten below for certain python versions ] -# Rewrite tests that depend on the output of IOError as it is -# platform-dependent before python 2.4 for a unicode path. -if sys.version_info < (2, 4): - # remove the unicode repr u except for py2.3 on windows: - if not sys.platform.startswith('win') or sys.version_info < (2, 3): - for i in range(len(totest['raw'])): - if totest['raw'][i][1].find("u'non-existent.file'") != -1: - totest['raw'][i][1] = totest['raw'][i][1].replace( - "u'non-existent.file'", "'non-existent.file'") - - if __name__ == '__main__': import unittest unittest.main(defaultTest='suite') Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_tables.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_tables.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_directives/test_tables.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python -# $Id: test_tables.py 7062 2011-06-30 22:14:29Z milde $ +# $Id: test_tables.py 7316 2012-01-19 11:31:58Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -12,7 +12,6 @@ import os import csv -from docutils._compat import u_prefix from docutils.parsers.rst.directives import tables @@ -558,11 +557,11 @@ <system_message level="4" line="1" source="test data" type="SEVERE"> <paragraph> Problems with "csv-table" directive path: - [Errno 2] No such file or directory: %s'bogus.csv'. + [Errno 2] No such file or directory: 'bogus.csv'. <literal_block xml:space="preserve"> .. csv-table:: no such file :file: bogus.csv -""" % u_prefix], +"""], # note that this output is rewritten below for certain python versions ["""\ .. csv-table:: bad URL Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_east_asian_text.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_east_asian_text.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_east_asian_text.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,7 +1,7 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# $Id: test_east_asian_text.py 5889 2009-04-01 20:00:21Z gbrandl $ +# $Id: test_east_asian_text.py 7313 2012-01-11 20:28:57Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -149,10 +149,10 @@ <entry> <paragraph> ダイ2ラン - <system_message level="3" line="5" source="test data" type="ERROR"> + <system_message level="3" line="6" source="test data" type="ERROR"> <paragraph> Malformed table. - Text in column margin at line offset 1. + Text in column margin in table line 2. <literal_block xml:space="preserve"> ======== ========= ダイ1ラン ダイ2ラン Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_functions.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_functions.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_functions.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python -# $Id: test_functions.py 4564 2006-05-21 20:44:42Z wiemann $ +# $Id: test_functions.py 7337 2012-02-03 08:16:53Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -21,15 +21,15 @@ def test_escape2null(self): nulled = states.escape2null(self.escaped) - self.assertEquals(nulled, self.nulled) + self.assertEqual(nulled, self.nulled) nulled = states.escape2null(self.escaped + '\\') - self.assertEquals(nulled, self.nulled + '\x00') + self.assertEqual(nulled, self.nulled + '\x00') def test_unescape(self): unescaped = states.unescape(self.nulled) - self.assertEquals(unescaped, self.unescaped) + self.assertEqual(unescaped, self.unescaped) restored = states.unescape(self.nulled, 1) - self.assertEquals(restored, self.escaped) + self.assertEqual(restored, self.escaped) if __name__ == '__main__': Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_inline_markup.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_inline_markup.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_inline_markup.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,7 @@ #! /usr/bin/env python +# -*- coding: utf8 -*- -# $Id: test_inline_markup.py 5642 2008-09-05 18:18:28Z goodger $ +# $Id: test_inline_markup.py 7243 2011-12-05 19:35:32Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -29,18 +30,26 @@ emphasis """], [u"""\ -l'*emphasis* and l\u2019*emphasis* with apostrophe +l'*emphasis* with the *emphasis*' apostrophe. +l\u2019*emphasis* with the *emphasis*\u2019 apostrophe. """, u"""\ <document source="test data"> <paragraph> - l' + l\' <emphasis> emphasis - and l\u2019 + with the \n\ <emphasis> emphasis - with apostrophe + \' apostrophe. + l\u2019 + <emphasis> + emphasis + with the \n\ + <emphasis> + emphasis + \u2019 apostrophe. """], ["""\ *emphasized sentence @@ -66,41 +75,64 @@ <paragraph> Inline emphasis start-string without end-string. """], -["""\ -'*emphasis*' and 1/*emphasis*/2 and 3-*emphasis*-4 and 5:*emphasis*:6 -but not '*' or '"*"' or x*2* or 2*x* or \\*args or * -or *the\\* *stars\\\\\\* *inside* +[r"""some punctuation is allowed around inline markup, e.g. +/*emphasis*/, -*emphasis*-, and :*emphasis*: (delimiters), +(*emphasis*), [*emphasis*], <*emphasis*>, {*emphasis*} (open/close pairs) -(however, '*args' will trigger a warning and may be problematic) +but not +)*emphasis*(, ]*emphasis*[, >*emphasis*>, }*emphasis*{ (close/open pairs) +(*), [*], '*' or '"*"' ("quoted" start-string), +x*2* or 2*x* (alphanumeric char before), +\*args or * (escaped, whitespace behind start-string) +or *the\* *stars\* *inside* (escaped, whitespace before end-string). +However, '*args' will trigger a warning and may be problematic. + what about *this**? """, """\ <document source="test data"> <paragraph> - ' + some punctuation is allowed around inline markup, e.g. + / <emphasis> emphasis - ' and 1/ + /, - <emphasis> emphasis - /2 and 3- + -, and : <emphasis> emphasis - -4 and 5: + : (delimiters), + ( <emphasis> emphasis - :6 - but not '*' or '"*"' or x*2* or 2*x* or *args or * + ), [ + <emphasis> + emphasis + ], < + <emphasis> + emphasis + >, { + <emphasis> + emphasis + } (open/close pairs) + <paragraph> + but not + )*emphasis*(, ]*emphasis*[, >*emphasis*>, }*emphasis*{ (close/open pairs) + (*), [*], '*' or '"*"' ("quoted" start-string), + x*2* or 2*x* (alphanumeric char before), + *args or * (escaped, whitespace behind start-string) or \n\ <emphasis> - the* *stars\* *inside + the* *stars* *inside + (escaped, whitespace before end-string). <paragraph> - (however, ' + However, ' <problematic ids="id2" refid="id1"> * - args' will trigger a warning and may be problematic) - <system_message backrefs="id2" ids="id1" level="2" line="5" source="test data" type="WARNING"> + args' will trigger a warning and may be problematic. + <system_message backrefs="id2" ids="id1" level="2" line="12" source="test data" type="WARNING"> <paragraph> Inline emphasis start-string without end-string. <paragraph> @@ -109,11 +141,130 @@ this* ? """], -["""\ -Emphasized asterisk: *\\** +[u"""\ +Quotes around inline markup: -Emphasized double asterisk: *\\*** +'*emphasis*' "*emphasis*" Straight, +‘*emphasis*’ “*emphasis*” English, ..., +« *emphasis* » ‹ *emphasis* › « *emphasis* » ‹ *emphasis* › +« *emphasis* » ‹ *emphasis* › French, +„*emphasis*“ ‚*emphasis*‘ »*emphasis*« ›*emphasis*‹ German, Czech, ..., +„*emphasis*” «*emphasis*» Romanian, +“*emphasis*„ ‘*emphasis*‚ Greek, +「*emphasis*」 『*emphasis*』traditional Chinese, +”*emphasis*” ’*emphasis*’ »*emphasis*» ›*emphasis*› Swedish, Finnish, +„*emphasis*” ‚*emphasis*’ Polish, +„*emphasis*” »*emphasis*« ’*emphasis*’ Hungarian, """, +u"""\ +<document source="test data"> + <paragraph> + Quotes around inline markup: + <paragraph> + \' + <emphasis> + emphasis + \' " + <emphasis> + emphasis + " Straight, + \u2018 + <emphasis> + emphasis + \u2019 \u201c + <emphasis> + emphasis + \u201d English, ..., + \xab\u202f + <emphasis> + emphasis + \u202f\xbb \u2039\u202f + <emphasis> + emphasis + \u202f\u203a \xab\xa0 + <emphasis> + emphasis + \xa0\xbb \u2039\xa0 + <emphasis> + emphasis + \xa0\u203a + \xab\u2005 + <emphasis> + emphasis + \u2005\xbb \u2039\u2005 + <emphasis> + emphasis + \u2005\u203a French, + \u201e + <emphasis> + emphasis + \u201c \u201a + <emphasis> + emphasis + \u2018 \xbb + <emphasis> + emphasis + \xab \u203a + <emphasis> + emphasis + \u2039 German, Czech, ..., + \u201e + <emphasis> + emphasis + \u201d \xab + <emphasis> + emphasis + \xbb Romanian, + \u201c + <emphasis> + emphasis + \u201e \u2018 + <emphasis> + emphasis + \u201a Greek, + \u300c + <emphasis> + emphasis + \u300d \u300e + <emphasis> + emphasis + \u300ftraditional Chinese, + \u201d + <emphasis> + emphasis + \u201d \u2019 + <emphasis> + emphasis + \u2019 \xbb + <emphasis> + emphasis + \xbb \u203a + <emphasis> + emphasis + \u203a Swedish, Finnish, + \u201e + <emphasis> + emphasis + \u201d \u201a + <emphasis> + emphasis + \u2019 Polish, + \u201e + <emphasis> + emphasis + \u201d \xbb + <emphasis> + emphasis + \xab \u2019 + <emphasis> + emphasis + \u2019 Hungarian, +"""], +[r""" +Emphasized asterisk: *\** + +Emphasized double asterisk: *\*** +""", """\ <document source="test data"> <paragraph> @@ -178,8 +329,8 @@ strong \xbb """], -["""\ -(**strong**) but not (**) or '(** ' or x**2 or \\**kwargs or ** +[r""" +(**strong**) but not (**) or '(** ' or x**2 or \**kwargs or ** (however, '**kwargs' will trigger a warning and may be problematic) """, @@ -195,7 +346,7 @@ <problematic ids="id2" refid="id1"> ** kwargs' will trigger a warning and may be problematic) - <system_message backrefs="id2" ids="id1" level="2" line="3" source="test data" type="WARNING"> + <system_message backrefs="id2" ids="id1" level="2" line="4" source="test data" type="WARNING"> <paragraph> Inline strong start-string without end-string. """], @@ -240,8 +391,8 @@ <literal> literal """], -["""\ -``\\literal`` +[r""" +``\literal`` """, """\ <document source="test data"> @@ -249,8 +400,8 @@ <literal> \\literal """], -["""\ -``lite\\ral`` +[r""" +``lite\ral`` """, """\ <document source="test data"> @@ -258,8 +409,8 @@ <literal> lite\\ral """], -["""\ -``literal\\`` +[r""" +``literal\`` """, """\ <document source="test data"> @@ -318,13 +469,13 @@ <paragraph> <literal> 'literal' - with quotes, + with quotes, \n\ <literal> "literal" with quotes, <literal> \u2018literal\u2019 - with quotes, + with quotes, \n\ <literal> \u201cliteral\u201d with quotes, @@ -332,8 +483,8 @@ \xabliteral\xbb with quotes """], -["""\ -``literal ``TeX quotes'' & \\backslash`` but not "``" or `` +[r""" +``literal ``TeX quotes'' & \backslash`` but not "``" or `` (however, ``standalone TeX quotes'' will trigger a warning and may be problematic) @@ -350,7 +501,7 @@ `` standalone TeX quotes'' will trigger a warning and may be problematic) - <system_message backrefs="id2" ids="id1" level="2" line="3" source="test data" type="WARNING"> + <system_message backrefs="id2" ids="id1" level="2" line="4" source="test data" type="WARNING"> <paragraph> Inline literal start-string without end-string. """], @@ -378,8 +529,8 @@ <paragraph> Inline literal start-string without end-string. """], -["""\ -Python ``list``\\s use square bracket syntax. +[r""" +Python ``list``\s use square bracket syntax. """, """\ <document source="test data"> @@ -590,7 +741,7 @@ <paragraph> <reference name="'phrase reference'" refname="'phrase reference'"> 'phrase reference' - with quotes, + with quotes, \n\ <reference name=""phrase reference"" refname=""phrase reference""> "phrase reference" with quotes, @@ -667,7 +818,7 @@ <paragraph> <reference anonymous="1" name="'anonymous reference'"> 'anonymous reference' - with quotes, + with quotes, \n\ <reference anonymous="1" name=""anonymous reference""> "anonymous reference" with quotes, @@ -832,7 +983,7 @@ <reference name="embedded email address broken across lines" refuri="mailto:jdoe@example.com"> embedded email address broken across lines """], -["""\ +[r""" `embedded URI with too much whitespace < http://example.com/ long/path /and /whitespace >`__ @@ -841,9 +992,9 @@ `embedded URI with no preceding whitespace<http://example.com>`__ -`escaped URI \\<http://example.com>`__ +`escaped URI \<http://example.com>`__ -See `HTML Anchors: \\<a>`_. +See `HTML Anchors: \<a>`_. """, """\ <document source="test data"> @@ -967,13 +1118,13 @@ <paragraph> <target ids="target1" names="'target1'"> 'target1' - with quotes, + with quotes, \n\ <target ids="target2" names=""target2""> "target2" with quotes, <target ids="target3" names="\u2018target3\u2019"> \u2018target3\u2019 - with quotes, + with quotes, \n\ <target ids="target4" names="\u201ctarget4\u201d"> \u201ctarget4\u201d with quotes, @@ -1246,12 +1397,12 @@ a.question.mark@end ?) """], -["""\ +[r""" Valid URLs with escaped markup characters: -http://example.com/\\*content\\*/whatever +http://example.com/\*content\*/whatever -http://example.com/\\*content*/whatever +http://example.com/\*content*/whatever """, """\ <document source="test data"> @@ -1312,7 +1463,7 @@ """], ] -totest['miscellaneous'] = [ +totest['markup recognition rules'] = [ ["""\ __This__ should be left alone. """, @@ -1342,35 +1493,8 @@ with backslash-escaped whitespace, including newlines. """], [u"""\ -quoted '*emphasis*', quoted "*emphasis*", -quoted \u2018*emphasis*\u2019, quoted \u201c*emphasis*\u201d, -quoted \xab*emphasis*\xbb -""", -u"""\ -<document source="test data"> - <paragraph> - quoted ' - <emphasis> - emphasis - ', quoted " - <emphasis> - emphasis - ", - quoted \u2018 - <emphasis> - emphasis - \u2019, quoted \u201c - <emphasis> - emphasis - \u201d, - quoted \xab - <emphasis> - emphasis - \xbb -"""], -[u"""\ text-*separated*\u2010*by*\u2011*various*\u2012*dashes*\u2013*and*\u2014*hyphens*. -\u00bf*punctuation*? \u00a1*examples*!\u00a0*too*. +\u00bf*punctuation*? \u00a1*examples*!\u00a0*\u00a0no-break-space\u00a0*. """, u"""\ <document source="test data"> @@ -1402,31 +1526,153 @@ examples !\xa0 <emphasis> - too + \u00a0no-break-space\u00a0 . """], +# Whitespace characters: +# \u180e*MONGOLIAN VOWEL SEPARATOR*\u180e, fails in Python 2.4 [u"""\ -None of these should be markup (matched openers & closers): +text separated by +*newline* +or *space* or one of +\xa0*NO-BREAK SPACE*\xa0, +\u1680*OGHAM SPACE MARK*\u1680, +\u2000*EN QUAD*\u2000, +\u2001*EM QUAD*\u2001, +\u2002*EN SPACE*\u2002, +\u2003*EM SPACE*\u2003, +\u2004*THREE-PER-EM SPACE*\u2004, +\u2005*FOUR-PER-EM SPACE*\u2005, +\u2006*SIX-PER-EM SPACE*\u2006, +\u2007*FIGURE SPACE*\u2007, +\u2008*PUNCTUATION SPACE*\u2008, +\u2009*THIN SPACE*\u2009, +\u200a*HAIR SPACE*\u200a, +\u202f*NARROW NO-BREAK SPACE*\u202f, +\u205f*MEDIUM MATHEMATICAL SPACE*\u205f, +\u3000*IDEOGRAPHIC SPACE*\u3000, +\u2028*LINE SEPARATOR*\u2028 +""", +u"""\ +<document source="test data"> + <paragraph> + text separated by + <emphasis> + newline + \n\ + or \n\ + <emphasis> + space + or one of + \xa0 + <emphasis> + NO-BREAK SPACE + \xa0, + \u1680 + <emphasis> + OGHAM SPACE MARK + \u1680, + \u2000 + <emphasis> + EN QUAD + \u2000, + \u2001 + <emphasis> + EM QUAD + \u2001, + \u2002 + <emphasis> + EN SPACE + \u2002, + \u2003 + <emphasis> + EM SPACE + \u2003, + \u2004 + <emphasis> + THREE-PER-EM SPACE + \u2004, + \u2005 + <emphasis> + FOUR-PER-EM SPACE + \u2005, + \u2006 + <emphasis> + SIX-PER-EM SPACE + \u2006, + \u2007 + <emphasis> + FIGURE SPACE + \u2007, + \u2008 + <emphasis> + PUNCTUATION SPACE + \u2008, + \u2009 + <emphasis> + THIN SPACE + \u2009, + \u200a + <emphasis> + HAIR SPACE + \u200a, + \u202f + <emphasis> + NARROW NO-BREAK SPACE + \u202f, + \u205f + <emphasis> + MEDIUM MATHEMATICAL SPACE + \u205f, + \u3000 + <emphasis> + IDEOGRAPHIC SPACE + \u3000, + <paragraph> + <emphasis> + LINE SEPARATOR +"""], +# « * » ‹ * › « * » ‹ * › « * » ‹ * › French, +[u"""\ +"Quoted" markup start-string (matched openers & closers) -> no markup: -\u2018*\u2019 \u201c*\u201d \xab*\xbb \u00bf*? \u00a1*! +'*' "*" (*) <*> [*] {*} +⁅*⁆ -But this should: +Some international quoting styles: +‘*’ “*” English, ..., +„*“ ‚*‘ »*« ›*‹ German, Czech, ..., +„*” «*» Romanian, +“*„ ‘*‚ Greek, +「*」 『*』traditional Chinese, +”*” ’*’ »*» ›*› Swedish, Finnish, +„*” ‚*’ Polish, +„*” »*« ’*’ Hungarian, -l\u2019*exception*. +But this is „*’ emphasized »*‹. """, u"""\ <document source="test data"> <paragraph> - None of these should be markup (matched openers & closers): + "Quoted" markup start-string (matched openers & closers) -> no markup: <paragraph> - \u2018*\u2019 \u201c*\u201d \xab*\xbb \xbf*? \xa1*! + '*' "*" (*) <*> [*] {*} + ⁅*⁆ <paragraph> - But this should: + Some international quoting styles: + ‘*’ “*” English, ..., + „*“ ‚*‘ »*« ›*‹ German, Czech, ..., + „*” «*» Romanian, + “*„ ‘*‚ Greek, + 「*」 『*』traditional Chinese, + ”*” ’*’ »*» ›*› Swedish, Finnish, + „*” ‚*’ Polish, + „*” »*« ’*’ Hungarian, <paragraph> - l\u2019 + But this is „ <emphasis> - exception - . + ’ emphasized » + ‹. """], ] Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_interpreted.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_interpreted.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_interpreted.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python -# $Id: test_interpreted.py 6424 2010-09-18 10:43:52Z smerten $ +# $Id: test_interpreted.py 7267 2011-12-20 14:14:21Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -9,9 +9,12 @@ """ from __init__ import DocutilsTestSupport +from docutils.utils.code_analyzer import with_pygments def suite(): s = DocutilsTestSupport.ParserTestSuite() + if not with_pygments: + del(totest['code-parsing']) s.generateTests(totest) return s @@ -214,6 +217,80 @@ """], ] +totest['code'] = [ +["""\ +Code role for inline code snippets: +:code:`$\alpha = \int_0^\infty f(x) dx$`. +""", +"""\ +<document source="test data"> + <paragraph> + Code role for inline code snippets: + <literal classes="code"> + $\x07lpha = \\int_0^\\infty f(x) dx$ + . +"""], +] + +totest['code-parsing'] = [ +["""\ +.. role:: tex(code) + :language: latex + +Custom role based on code role: +:tex:`$\alpha = f(x)$`. +""", +"""\ +<document source="test data"> + <paragraph> + Custom role based on code role: + <literal classes="code latex tex"> + <inline classes="s"> + $ + <inline classes="nb"> + \x07lpha \n\ + <inline classes="o"> + = + <inline classes="nb"> + f + <inline classes="o"> + ( + <inline classes="nb"> + x + <inline classes="o"> + ) + <inline classes="s"> + $ + . +"""], +["""\ +Custom role based on code role: + +.. role:: python(code) + :language: python + :class: testclass + +Python code :python:`print("The end")`. +""", +"""\ +<document source="test data"> + <paragraph> + Custom role based on code role: + <paragraph> + Python code \n\ + <literal classes="code python testclass"> + <inline classes="k"> + print + <inline classes="p"> + ( + <inline classes="s"> + "The end" + <inline classes="p"> + ) + . +"""], +] + totest['references'] = [ ["""\ :PEP:`0` Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_option_lists.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_option_lists.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_option_lists.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python -# $Id: test_option_lists.py 4564 2006-05-21 20:44:42Z wiemann $ +# $Id: test_option_lists.py 7128 2011-09-17 18:00:35Z grubert $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -681,6 +681,9 @@ --source-url=<URL> Use the supplied <URL> verbatim. --output-encoding=<name[:handler]>, -o<name[:handler]> Specify the text encoding for output. +--af=<filter1[=parameter1:parameter2:...],filter2,...> + Setup a chain of audio filters. + Option argument containing delimiter ``=``. -f <[path]filename> Send output to file. -d <src dest> Use diff from <src> to <dest>. --bogus=<x y z> Bogus 3D coordinates. @@ -719,6 +722,20 @@ <option_group> <option> <option_string> + --af + <option_argument delimiter="="> + <filter1[=parameter1:parameter2:...],filter2,...> + <description> + <paragraph> + Setup a chain of audio filters. + Option argument containing delimiter \n\ + <literal> + = + . + <option_list_item> + <option_group> + <option> + <option_string> -f <option_argument delimiter=" "> <[path]filename> Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_tables.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_tables.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_parsers/test_rst/test_tables.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python -# $Id: test_tables.py 6307 2010-04-15 14:45:41Z milde $ +# $Id: test_tables.py 7313 2012-01-11 20:28:57Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -896,10 +896,10 @@ """, """\ <document source="test data"> - <system_message level="3" line="1" source="test data" type="ERROR"> + <system_message level="3" line="4" source="test data" type="ERROR"> <paragraph> Malformed table. - Column span alignment problem at line offset 3. + Column span alignment problem in table line 4. <literal_block xml:space="preserve"> ============== ====== A bad table cell 2 @@ -914,10 +914,10 @@ """, """\ <document source="test data"> - <system_message level="3" line="1" source="test data" type="ERROR"> + <system_message level="3" line="2" source="test data" type="ERROR"> <paragraph> Malformed table. - Text in column margin at line offset 1. + Text in column margin in table line 2. <literal_block xml:space="preserve"> ======== ========= A bad table cell 2 @@ -1158,10 +1158,10 @@ """, """\ <document source="test data"> - <system_message level="3" line="1" source="test data" type="ERROR"> + <system_message level="3" line="4" source="test data" type="ERROR"> <paragraph> Malformed table. - Text in column margin at line offset 3. + Text in column margin in table line 4. <literal_block xml:space="preserve"> == =========== =========== 1 Span columns 2 & 3 @@ -1170,10 +1170,10 @@ ------------------------ 3 == =========== =========== - <system_message level="3" line="9" source="test data" type="ERROR"> + <system_message level="3" line="13" source="test data" type="ERROR"> <paragraph> Malformed table. - Column span incomplete at line offset 4. + Column span incomplete in table line 5. <literal_block xml:space="preserve"> == =========== =========== 1 Span cols 1&2 but not 3 Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_pickle.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_pickle.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_pickle.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,5 +1,5 @@ #! /usr/bin/env python -# $Id: test_pickle.py 4564 2006-05-21 20:44:42Z wiemann $ +# $Id: test_pickle.py 7337 2012-02-03 08:16:53Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -21,7 +21,7 @@ settings_overrides={'_disable_config': 1}) dill = pickle.dumps(doctree) reconstituted = pickle.loads(dill) - self.assertEquals(doctree.pformat(), reconstituted.pformat()) + self.assertEqual(doctree.pformat(), reconstituted.pformat()) if __name__ == '__main__': Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_publisher.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_publisher.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_publisher.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #!/usr/bin/env python -# $Id: test_publisher.py 5889 2009-04-01 20:00:21Z gbrandl $ +# $Id: test_publisher.py 7384 2012-03-19 22:59:09Z milde $ # Author: Martin Blais <blais@furius.ca> # Copyright: This module has been placed in the public domain. @@ -53,6 +53,29 @@ """ % u_prefix) +class PublisherTests(DocutilsTestSupport.StandardTestCase): + + def test_input_error_handling(self): + # core.publish_cmdline(argv=['nonexisting/path']) + # exits with a short message, if `traceback` is False, + + # pass IOErrors to calling application if `traceback` is True + try: + core.publish_cmdline(argv=['nonexisting/path'], + settings_overrides={'traceback': True}) + except IOError, e: + self.assertTrue(isinstance(e, io.InputError)) + + + def test_output_error_handling(self): + # pass IOErrors to calling application if `traceback` is True + try: + core.publish_cmdline(argv=['data/include.txt', 'nonexisting/path'], + settings_overrides={'traceback': True}) + except IOError, e: + self.assertTrue(isinstance(e, io.OutputError)) + + class PublishDoctreeTestCase(DocutilsTestSupport.StandardTestCase, docutils.SettingsSpec): settings_default_overrides = { @@ -69,14 +92,14 @@ settings_overrides={'expose_internals': ['refnames', 'do_not_expose'], 'report_level': 5}) - self.assert_(isinstance(doctree, nodes.document)) + self.assertTrue(isinstance(doctree, nodes.document)) # Confirm that transforms have been applied (in this case, the # DocTitle transform): - self.assert_(isinstance(doctree[0], nodes.title)) - self.assert_(isinstance(doctree[1], nodes.paragraph)) + self.assertTrue(isinstance(doctree[0], nodes.title)) + self.assertTrue(isinstance(doctree[1], nodes.paragraph)) # Confirm that the Messages transform has not yet been applied: - self.assertEquals(len(doctree), 2) + self.assertEqual(len(doctree), 2) # The `do_not_expose` attribute may not show up in the # pseudoxml output because the expose_internals transform may @@ -89,25 +112,25 @@ settings_overrides={'expose_internals': ['refnames', 'do_not_expose'], 'report_level': 1}) - self.assertEquals(output, exposed_pseudoxml_output) + self.assertEqual(output, exposed_pseudoxml_output) # Test publishing parts using document as the source. parts = core.publish_parts( reader_name='doctree', source_class=io.DocTreeInput, source=doctree, source_path='test', writer_name='html', settings_spec=self) - self.assert_(isinstance(parts, dict)) + self.assertTrue(isinstance(parts, dict)) def test_publish_pickle(self): # Test publishing a document tree with pickling and unpickling. - + # Produce the document tree. doctree = core.publish_doctree( source=test_document, reader_name='standalone', parser_name='restructuredtext', settings_spec=self) - self.assert_(isinstance(doctree, nodes.document)) + self.assertTrue(isinstance(doctree, nodes.document)) # Pickle the document. Note: if this fails, some unpickleable # reference has been added somewhere within the document tree. @@ -122,18 +145,18 @@ doctree.transformer = None doctree_pickled = pickle.dumps(doctree) - self.assert_(isinstance(doctree_pickled, bytes)) + self.assertTrue(isinstance(doctree_pickled, bytes)) del doctree # Unpickle the document. doctree_zombie = pickle.loads(doctree_pickled) - self.assert_(isinstance(doctree_zombie, nodes.document)) + self.assertTrue(isinstance(doctree_zombie, nodes.document)) # Write out the document: output = core.publish_from_doctree( doctree_zombie, writer_name='pseudoxml', settings_spec=self) - self.assertEquals(output, pseudoxml_output) + self.assertEqual(output, pseudoxml_output) if __name__ == '__main__': Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_settings.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_settings.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_settings.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #!/usr/bin/env python -# $Id: test_settings.py 6159 2009-10-09 07:17:59Z milde $ +# $Id: test_settings.py 7400 2012-05-01 08:34:41Z grubert $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -23,6 +23,12 @@ warnings.filterwarnings(action='ignore', category=frontend.ConfigDeprecationWarning) +# python 2.3 +if not hasattr(unittest.TestCase, "assertTrue"): + # HACK? this changes TestCase, fixes the problem for tests executing afterwards. + # this tests break if run alone + unittest.TestCase.assertTrue = unittest.TestCase.failUnless + def fixpath(path): return os.path.abspath(os.path.join(*(path.split('/')))) @@ -63,8 +69,16 @@ u'stylesheet': None, u'stylesheet_path': fixpath(u'data/test.css'), 'trim_footnote_reference_space': None}, - 'list': {u'expose_internals': [u'a', u'b', u'c', u'd', u'e']}, - 'list2': {u'expose_internals': [u'a', u'b', u'c', u'd', u'e', u'f']}, + 'list': {u'expose_internals': [u'a', u'b', u'c', u'd', u'e'], + u'strip_classes': [u'spam', u'pan', u'fun', u'parrot'], + u'strip_elements_with_classes': [u'sugar', u'flour', u'milk', + u'safran']}, + 'list2': {u'expose_internals': [u'a', u'b', u'c', u'd', u'e', u'f'], + u'strip_classes': [u'spam', u'pan', u'fun', u'parrot', + u'ham', u'eggs'], + u'strip_elements_with_classes': [u'sugar', u'flour', + u'milk', u'safran', + u'eggs', u'salt']}, 'error': {u'error_encoding': u'ascii', u'error_encoding_error_handler': u'strict'}, } @@ -91,14 +105,14 @@ def compare_output(self, result, expected): """`result` and `expected` should both be dicts.""" - self.assert_('record_dependencies' in result) + self.assertTrue('record_dependencies' in result) if 'record_dependencies' not in expected: # Delete it if we don't want to test it. del result['record_dependencies'] result = pprint.pformat(result) + '\n' expected = pprint.pformat(expected) + '\n' try: - self.assertEquals(result, expected) + self.assertEqual(result, expected) except AssertionError: print >>sys.stderr, '\n%s\n' % (self,) print >>sys.stderr, '-: expected\n+: result' @@ -161,5 +175,29 @@ os.environ = self.orig_environ +class HelperFunctionsTests(unittest.TestCase): + + pathdict = {'foo': 'hallo', 'ham': u'h\xE4m', 'spam': u'spam'} + keys = ['foo', 'ham'] + + def test_make_paths_absolute(self): + pathdict = self.pathdict.copy() + frontend.make_paths_absolute(pathdict, self.keys, base_path='base') + self.assertEqual(pathdict['foo'], os.path.abspath('base/hallo')) + self.assertEqual(pathdict['ham'], os.path.abspath(u'base/h\xE4m')) + # not touched, because key not in keys: + self.assertEqual(pathdict['spam'], u'spam') + + def test_make_paths_absolute_cwd(self): + # With base_path None, the cwd is used as base path. + # Settings values may-be `unicode` instances, therefore + # os.getcwdu() is used and the converted path is a unicode instance: + pathdict = self.pathdict.copy() + frontend.make_paths_absolute(pathdict, self.keys) + self.assertEqual(pathdict['foo'], os.path.abspath(u'hallo')) + self.assertEqual(pathdict['ham'], os.path.abspath(u'h\xE4m')) + # not touched, because key not in keys: + self.assertEqual(pathdict['spam'], u'spam') + if __name__ == '__main__': unittest.main() Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_statemachine.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_statemachine.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_statemachine.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python -# $Id: test_statemachine.py 4564 2006-05-21 20:44:42Z wiemann $ +# $Id: test_statemachine.py 7400 2012-05-01 08:34:41Z grubert $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -13,8 +13,13 @@ import re from DocutilsTestSupport import statemachine +# python 2.3 +if not hasattr(unittest.TestCase, "assertTrue"): + # HACK? this changes TestCase, fixes the problem for tests executing afterwards. + # this tests break if run alone + unittest.TestCase.assertTrue = unittest.TestCase.failUnless -debug = 0 +debug = False testtext = statemachine.string2lines("""\ First paragraph. @@ -109,11 +114,11 @@ def test_add_state(self): self.sm.add_state(statemachine.State) - self.assert_(len(self.sm.states) == 1) + self.assertTrue(len(self.sm.states) == 1) self.assertRaises(statemachine.DuplicateStateError, self.sm.add_state, statemachine.State) self.sm.add_state(statemachine.StateWS) - self.assert_(len(self.sm.states) == 2) + self.assertTrue(len(self.sm.states) == 2) def test_add_states(self): self.sm.add_states((statemachine.State, statemachine.StateWS)) @@ -124,9 +129,9 @@ self.sm.add_states((statemachine.State, statemachine.StateWS)) self.assertRaises(statemachine.UnknownStateError, self.sm.get_state, 'unknownState') - self.assert_(isinstance(self.sm.get_state('State'), + self.assertTrue(isinstance(self.sm.get_state('State'), statemachine.State)) - self.assert_(isinstance(self.sm.get_state('StateWS'), + self.assertTrue(isinstance(self.sm.get_state('StateWS'), statemachine.State)) self.assertEqual(self.sm.current_state, 'StateWS') @@ -151,56 +156,56 @@ self.sm.unlink() def test___init__(self): - self.assertEquals(self.sm.states.keys(), ['MockState']) - self.assertEquals(len(self.sm.states['MockState'].transitions), 4) + self.assertEqual(self.sm.states.keys(), ['MockState']) + self.assertEqual(len(self.sm.states['MockState'].transitions), 4) def test_get_indented(self): self.sm.input_lines = statemachine.StringList(testtext) self.sm.line_offset = -1 self.sm.next_line(3) indented, offset, good = self.sm.get_known_indented(2) - self.assertEquals(indented, item1) - self.assertEquals(offset, len(para1)) - self.failUnless(good) + self.assertEqual(indented, item1) + self.assertEqual(offset, len(para1)) + self.assertTrue(good) self.sm.next_line() indented, offset, good = self.sm.get_known_indented(2) - self.assertEquals(indented, item2) - self.assertEquals(offset, len(para1) + len(item1)) - self.failUnless(good) + self.assertEqual(indented, item2) + self.assertEqual(offset, len(para1) + len(item1)) + self.assertTrue(good) self.sm.previous_line(3) if self.sm.debug: print '\ntest_get_indented: self.sm.line:\n', self.sm.line indented, indent, offset, good = self.sm.get_indented() if self.sm.debug: print '\ntest_get_indented: indented:\n', indented - self.assertEquals(indent, lbindent) - self.assertEquals(indented, literalblock) - self.assertEquals(offset, (len(para1) + len(item1) + len(item2) + self.assertEqual(indent, lbindent) + self.assertEqual(indented, literalblock) + self.assertEqual(offset, (len(para1) + len(item1) + len(item2) - len(literalblock))) - self.failUnless(good) + self.assertTrue(good) def test_get_text_block(self): self.sm.input_lines = statemachine.StringList(testtext) self.sm.line_offset = -1 self.sm.next_line() textblock = self.sm.get_text_block() - self.assertEquals(textblock, testtext[:1]) + self.assertEqual(textblock, testtext[:1]) self.sm.next_line(2) textblock = self.sm.get_text_block() - self.assertEquals(textblock, testtext[2:4]) + self.assertEqual(textblock, testtext[2:4]) def test_get_text_block_flush_left(self): self.sm.input_lines = statemachine.StringList(testtext) self.sm.line_offset = -1 self.sm.next_line() textblock = self.sm.get_text_block(flush_left=1) - self.assertEquals(textblock, testtext[:1]) + self.assertEqual(textblock, testtext[:1]) self.sm.next_line(2) self.assertRaises(statemachine.UnexpectedIndentationError, self.sm.get_text_block, flush_left=1) def test_run(self): - self.assertEquals(self.sm.run(testtext), expected) + self.assertEqual(self.sm.run(testtext), expected) class EmptyClass: @@ -218,9 +223,9 @@ self.state.nop2 = self.state.nop3 = self.state.nop def test_add_transitions(self): - self.assertEquals(len(self.state.transitions), 0) + self.assertEqual(len(self.state.transitions), 0) self.state.add_transitions(['None'], {'None': None}) - self.assertEquals(len(self.state.transitions), 1) + self.assertEqual(len(self.state.transitions), 1) self.assertRaises(statemachine.UnknownTransitionError, self.state.add_transitions, ['bogus'], {}) self.assertRaises(statemachine.DuplicateTransitionError, @@ -228,26 +233,26 @@ {'None': None}) def test_add_transition(self): - self.assertEquals(len(self.state.transitions), 0) + self.assertEqual(len(self.state.transitions), 0) self.state.add_transition('None', None) - self.assertEquals(len(self.state.transitions), 1) + self.assertEqual(len(self.state.transitions), 1) self.assertRaises(statemachine.DuplicateTransitionError, self.state.add_transition, 'None', None) def test_remove_transition(self): - self.assertEquals(len(self.state.transitions), 0) + self.assertEqual(len(self.state.transitions), 0) self.state.add_transition('None', None) - self.assertEquals(len(self.state.transitions), 1) + self.assertEqual(len(self.state.transitions), 1) self.state.remove_transition('None') - self.assertEquals(len(self.state.transitions), 0) + self.assertEqual(len(self.state.transitions), 0) self.assertRaises(statemachine.UnknownTransitionError, self.state.remove_transition, 'None') def test_make_transition(self): dummy = re.compile('dummy') - self.assertEquals(self.state.make_transition('nop', 'bogus'), + self.assertEqual(self.state.make_transition('nop', 'bogus'), (dummy, self.state.nop, 'bogus')) - self.assertEquals(self.state.make_transition('nop'), + self.assertEqual(self.state.make_transition('nop'), (dummy, self.state.nop, self.state.__class__.__name__)) self.assertRaises(statemachine.TransitionPatternNotFound, @@ -257,7 +262,7 @@ def test_make_transitions(self): dummy = re.compile('dummy') - self.assertEquals(self.state.make_transitions(('nop', ['nop2'], + self.assertEqual(self.state.make_transitions(('nop', ['nop2'], ('nop3', 'bogus'))), (['nop', 'nop2', 'nop3'], {'nop': (dummy, self.state.nop, @@ -273,7 +278,7 @@ s2l_expected = ['hello there how are you?', " I'm fine thanks."] def test_string2lines(self): - self.assertEquals(statemachine.string2lines(self.s2l_string), + self.assertEqual(statemachine.string2lines(self.s2l_string), self.s2l_expected) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_traversals.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_traversals.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_traversals.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python -# $Id: test_traversals.py 4641 2006-06-28 16:27:55Z blais $ +# $Id: test_traversals.py 7400 2012-05-01 08:34:41Z grubert $ # Author: Martin Blais <blais@furius.ca> # Copyright: This module has been placed in the public domain. @@ -51,6 +51,11 @@ self.document.walk(visitor) class StopTraversalTests(unittest.TestCase, docutils.SettingsSpec): + + # python 2.3 + if not hasattr(unittest.TestCase, "assertTrue"): + assertTrue = unittest.TestCase.failUnless + """ Test interrupting the visitor during traversal. In this test we stop it when we reach an attention node. @@ -62,7 +67,7 @@ reader_name='standalone', parser_name='restructuredtext', settings_spec=self) - self.assert_(isinstance(doctree, nodes.document)) + self.assertTrue(isinstance(doctree, nodes.document)) parts = docutils.core.publish_parts( reader_name='doctree', source_class=docutils.io.DocTreeInput, Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_utils.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_utils.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_utils.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,16 +1,17 @@ # -*- coding: utf-8 -*- #! /usr/bin/env python -# $Id: test_utils.py 7007 2011-04-12 09:10:57Z milde $ +# $Id: test_utils.py 7338 2012-02-03 12:22:14Z milde $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. """ -Test module for utils.py. +Test module for utils/__init__.py. """ import unittest import sys +import os from DocutilsTestSupport import utils, nodes try: from io import StringIO @@ -29,53 +30,53 @@ def test_level0(self): sw = self.reporter.system_message(0, 'debug output') - self.assertEquals(sw.pformat(), """\ + self.assertEqual(sw.pformat(), """\ <system_message level="0" source="test data" type="DEBUG"> <paragraph> debug output """) - self.assertEquals(self.stream.getvalue(), + self.assertEqual(self.stream.getvalue(), 'test data:: (DEBUG/0) debug output\n') def test_level1(self): sw = self.reporter.system_message(1, 'a little reminder') - self.assertEquals(sw.pformat(), """\ + self.assertEqual(sw.pformat(), """\ <system_message level="1" source="test data" type="INFO"> <paragraph> a little reminder """) - self.assertEquals(self.stream.getvalue(), '') + self.assertEqual(self.stream.getvalue(), '') def test_level2(self): sw = self.reporter.system_message(2, 'a warning') - self.assertEquals(sw.pformat(), """\ + self.assertEqual(sw.pformat(), """\ <system_message level="2" source="test data" type="WARNING"> <paragraph> a warning """) - self.assertEquals(self.stream.getvalue(), + self.assertEqual(self.stream.getvalue(), 'test data:: (WARNING/2) a warning\n') def test_level3(self): sw = self.reporter.system_message(3, 'an error') - self.assertEquals(sw.pformat(), """\ + self.assertEqual(sw.pformat(), """\ <system_message level="3" source="test data" type="ERROR"> <paragraph> an error """) - self.assertEquals(self.stream.getvalue(), + self.assertEqual(self.stream.getvalue(), 'test data:: (ERROR/3) an error\n') def test_level4(self): self.assertRaises(utils.SystemMessage, self.reporter.system_message, 4, 'a severe error, raises an exception') - self.assertEquals(self.stream.getvalue(), 'test data:: (SEVERE/4) ' + self.assertEqual(self.stream.getvalue(), 'test data:: (SEVERE/4) ' 'a severe error, raises an exception\n') def test_unicode_message(self): sw = self.reporter.system_message(0, u'mesidʒ') - self.assertEquals(sw.pformat(), u"""\ + self.assertEqual(sw.pformat(), u"""\ <system_message level="0" source="test data" type="DEBUG"> <paragraph> mesidʒ @@ -89,7 +90,7 @@ raise Exception(u'mesidʒ') except Exception, err: sw = self.reporter.system_message(0, err) - self.assertEquals(sw.pformat(), u"""\ + self.assertEqual(sw.pformat(), u"""\ <system_message level="0" source="test data" type="DEBUG"> <paragraph> mesidʒ @@ -107,44 +108,44 @@ def test_debug(self): sw = self.reporter.debug('a debug message') # None because debug is disabled. - self.assertEquals(sw, None) - self.assertEquals(self.stream.getvalue(), '') + self.assertEqual(sw, None) + self.assertEqual(self.stream.getvalue(), '') def test_info(self): sw = self.reporter.info('an informational message') - self.assertEquals(sw.pformat(), """\ + self.assertEqual(sw.pformat(), """\ <system_message level="1" source="test data" type="INFO"> <paragraph> an informational message """) - self.assertEquals(self.stream.getvalue(), '') + self.assertEqual(self.stream.getvalue(), '') def test_warning(self): sw = self.reporter.warning('a warning') - self.assertEquals(sw.pformat(), """\ + self.assertEqual(sw.pformat(), """\ <system_message level="2" source="test data" type="WARNING"> <paragraph> a warning """) - self.assertEquals(self.stream.getvalue(), '') + self.assertEqual(self.stream.getvalue(), '') def test_error(self): sw = self.reporter.error('an error') - self.assertEquals(sw.pformat(), """\ + self.assertEqual(sw.pformat(), """\ <system_message level="3" source="test data" type="ERROR"> <paragraph> an error """) - self.assertEquals(self.stream.getvalue(), '') + self.assertEqual(self.stream.getvalue(), '') def test_severe(self): sw = self.reporter.severe('a severe error') - self.assertEquals(sw.pformat(), """\ + self.assertEqual(sw.pformat(), """\ <system_message level="4" source="test data" type="SEVERE"> <paragraph> a severe error """) - self.assertEquals(self.stream.getvalue(), '') + self.assertEqual(self.stream.getvalue(), '') class NameValueTests(unittest.TestCase): @@ -166,7 +167,7 @@ 'hello="something"else') output = utils.extract_name_value( """att1=val1 att2=val2 att3="value number '3'" att4=val4""") - self.assertEquals(output, [('att1', 'val1'), ('att2', 'val2'), + self.assertEqual(output, [('att1', 'val1'), ('att2', 'val2'), ('att3', "value number '3'"), ('att4', 'val4')]) @@ -178,7 +179,7 @@ def test_assemble_option_dict(self): input = utils.extract_name_value('a=1 bbb=2.0 cdef=hol%s' % chr(224)) - self.assertEquals( + self.assertEqual( utils.assemble_option_dict(input, self.optionspec), {'a': 1, 'bbb': 2.0, 'cdef': ('hol%s' % chr(224))}) input = utils.extract_name_value('a=1 b=2.0 c=hol%s' % chr(224)) @@ -201,7 +202,7 @@ nodes.field_body('', nodes.paragraph('', u'hol\u00e0'))) field_list += nodes.field( '', nodes.field_name('', 'empty'), nodes.field_body()) - self.assertEquals( + self.assertEqual( utils.extract_extension_options(field_list, self.optionspec), {'a': 1, 'bbb': 2.0, 'cdef': u'hol\u00e0', @@ -237,20 +238,52 @@ class HelperFunctionsTests(unittest.TestCase): def test_normalize_language_tag(self): - self.assertEquals(utils.normalize_language_tag('de'), ['de']) - self.assertEquals(utils.normalize_language_tag('de-AT'), + self.assertEqual(utils.normalize_language_tag('de'), ['de']) + self.assertEqual(utils.normalize_language_tag('de-AT'), ['de_at', 'de']) - self.assertEquals(utils.normalize_language_tag('de-AT-1901'), + self.assertEqual(utils.normalize_language_tag('de-AT-1901'), ['de_at_1901', 'de_at', 'de_1901', 'de']) - self.assertEquals(utils.normalize_language_tag('de-AT-1901-frak'), + self.assertEqual(utils.normalize_language_tag('de-AT-1901-frak'), ['de_at_1901_frak', 'de_at_1901', 'de_at_frak', 'de_1901_frak', 'de_at', 'de_1901', 'de_frak', 'de']) def test_column_width(self): - self.assertEquals(utils.column_width(u'de'), 2) - self.assertEquals(utils.column_width(u'dâ'), 2) # pre-composed - self.assertEquals(utils.column_width(u'dâ'), 2) # combining + self.assertEqual(utils.column_width(u'de'), 2) + self.assertEqual(utils.column_width(u'dâ'), 2) # pre-composed + self.assertEqual(utils.column_width(u'dâ'), 2) # combining + def test_relative_path(self): + # Build and return a path to `target`, relative to `source`: + # Use '/' as path sep in result. + self.assertEqual(utils.relative_path('spam', 'spam'), '') + source = os.path.join('h\xE4m', 'spam', 'fileA') + target = os.path.join('h\xE4m', 'spam', 'fileB') + self.assertEqual(utils.relative_path(source, target), 'fileB') + source = os.path.join('h\xE4m', 'spam', 'fileA') + target = os.path.join('h\xE4m', 'fileB') + self.assertEqual(utils.relative_path(source, target), '../fileB') + # if source is None, default to the cwd: + target = os.path.join('eggs', 'fileB') + self.assertEqual(utils.relative_path(None, target), 'eggs/fileB') + # If there is no common prefix, return the absolute path to `target`: + # source = '/foo/bar/fileA' # POSIX + # TODO: how to specify an absolute path independent of the OS? + # target = os.path.join('eggs', 'fileB') + # self.assertEqual(utils.relative_path(source, target), + # os.path.abspath('fileB')) + # Correctly process unicode instances: + self.assertEqual(utils.relative_path(u'spam', u'spam'), u'') + source = os.path.join(u'h\xE4m', u'spam', u'fileA') + target = os.path.join(u'h\xE4m', u'spam', u'fileB') + self.assertEqual(utils.relative_path(source, target), u'fileB') + source = os.path.join(u'h\xE4m', u'spam', u'fileA') + target = os.path.join(u'h\xE4m', u'fileB') + self.assertEqual(utils.relative_path(source, target), u'../fileB') + # if source is None, default to the cwd: + target = os.path.join(u'eggs', u'fileB') + self.assertEqual(utils.relative_path(None, target), u'eggs/fileB') + + if __name__ == '__main__': unittest.main() Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_viewlist.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_viewlist.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_viewlist.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #! /usr/bin/env python -# $Id: test_viewlist.py 6340 2010-06-11 10:31:18Z milde $ +# $Id: test_viewlist.py 7400 2012-05-01 08:34:41Z grubert $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -16,6 +16,10 @@ class ViewListTests(unittest.TestCase): + # python 2.3 + if not hasattr(unittest.TestCase, "assertTrue"): + assertTrue = unittest.TestCase.failUnless + a_list = list('abcdefg') b_list = list('AEIOU') c_list = list('XYZ') @@ -39,7 +43,7 @@ self.assertEqual(self.b, self.b_list) self.assertEqual(self.c, self.c_list) self.assertEqual(len(self.a), len(self.a_list)) - self.failUnless('d' in self.a) # __contains__ + self.assertTrue('d' in self.a) # __contains__ self.assertEqual([value for value in self.a], self.a_list) # get and set values self.assertEqual(self.a[2], self.a_list[2]) @@ -105,7 +109,7 @@ a_list.insert(2, 'Q') a_list[4:4] = self.b_list a = self.a[:] - self.assert_(isinstance(a, statemachine.ViewList)) + self.assertTrue(isinstance(a, statemachine.ViewList)) a.insert(2, 'Q', 'runtime') a.insert(4, self.b) self.assertEqual(a, a_list) @@ -151,11 +155,11 @@ a = statemachine.ViewList(self.a[:]) s = a[1:-1] s.trim_start(1) - self.assertEquals(a, self.a) - self.assertEquals(s, a[2:-1]) + self.assertEqual(a, self.a) + self.assertEqual(s, a[2:-1]) s.trim_end(1) - self.assertEquals(a, self.a) - self.assertEquals(s, a[2:-2]) + self.assertEqual(a, self.a) + self.assertEqual(s, a[2:-2]) def test_info(self): ab = self.a + self.b @@ -215,11 +219,11 @@ self.assertEqual(s, [line.lstrip() for line in self.a_list[3:5]]) def test_get_indented(self): - self.assertEquals(self.a.get_indented(), + self.assertEqual(self.a.get_indented(), ([], 0, 0)) block = statemachine.StringList( statemachine.string2lines(self.indented_string)) - self.assertEquals(block.get_indented(), + self.assertEqual(block.get_indented(), ([s[6:] for s in block], 6, 1)) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_docutils_xml.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_docutils_xml.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_docutils_xml.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,85 +1,204 @@ #!/usr/bin/env python -# $Id: test_docutils_xml.py 5889 2009-04-01 20:00:21Z gbrandl $ +# $Id: test_docutils_xml.py 7315 2012-01-18 10:16:20Z milde $ # Author: Lea Wiemann <LeWiemann@gmail.com> # Copyright: This module has been placed in the public domain. """ Test for docutils XML writer. + +.. Attention:: + While the tests compare the output on the string-level, no guarantee + is given against changes to identical XML representations like + ``<empty></empty>`` vs. ``<empty/>``. The sample strings in this test + module mirrors the current behaviour of the docutils_xml writer. """ -from __init__ import DocutilsTestSupport +from StringIO import StringIO +from __init__ import DocutilsTestSupport # must be imported before docutils import docutils import docutils.core -from docutils._compat import b +# sample strings +# -------------- -class DocutilsXMLTestCase(DocutilsTestSupport.StandardTestCase): - - input = b("""\ +source = u"""\ Test ---------- -Test. \xc3\xa4\xc3\xb6\xc3\xbc\xe2\x82\xac""") - xmldecl = b('<?xml version="1.0" encoding="iso-8859-1"?>\n') - doctypedecl = b('<!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">\n') - generatedby = b('<!-- Generated by Docutils %s -->\n' % docutils.__version__) - bodynormal = b('<document source="<string>"><paragraph>Test</paragraph><transition/><paragraph>Test. \xe4\xf6\xfc€</paragraph></document>') - bodynewlines = b("""\ +Test. \xe4\xf6\xfc\u20ac""" + +xmldecl = u"""<?xml version="1.0" encoding="iso-8859-1"?> +""" + +doctypedecl = u"""\ +<!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net\ +//DTD Docutils Generic//EN//XML"\ + "http://docutils.sourceforge.net/docs/ref/docutils.dtd"> +""" + +generatedby = u'<!-- Generated by Docutils %s -->\n' % docutils.__version__ + +bodynormal = u"""\ +<document source="<string>"><paragraph>Test</paragraph>\ +<transition></transition><paragraph>Test. \xe4\xf6\xfc€</paragraph>\ +</document>""" + +bodynewlines = u"""\ <document source="<string>"> -<paragraph> -Test -</paragraph> -<transition/> -<paragraph> -Test. \xe4\xf6\xfc€ -</paragraph> +<paragraph>Test</paragraph> +<transition> +</transition> +<paragraph>Test. \xe4\xf6\xfc€</paragraph> </document> -""") - bodyindents = b("""\ +""" + +bodyindents = u"""\ <document source="<string>"> - <paragraph> - Test - </paragraph> - <transition/> - <paragraph> - Test. \xe4\xf6\xfc€ - </paragraph> + <paragraph>Test</paragraph> + <transition> + </transition> + <paragraph>Test. \xe4\xf6\xfc€</paragraph> </document> -""") +""" +# raw XML +# """"""" + +raw_xml_source = u"""\ +.. raw:: xml + + <root> + <child>Test \xe4\xf6\xfc\u20ac</child> + > + < + + </root> + +.. role:: xml(raw) + :format: xml + +:xml:`<test>inline raw XML</test>`. +""" + +raw_xml = u"""\ +<document source="<string>"> +<raw format="xml" xml:space="preserve"><root> + <child>Test \xe4\xf6\xfc€</child> + > + < + +</root></raw> +<paragraph><raw classes="xml" format="xml" xml:space="preserve">\ +<test>inline raw XML</test></raw>.</paragraph> +</document> +""" + +invalid_raw_xml_source = u"""\ +.. raw:: xml + + <root> + <child>Test \xe4\xf6\xfc\u20ac</child> + </mismatch> + +.. role:: xml(raw) + :format: xml + +:xml:`<test>inline raw XML</test>`. +""" + +invalid_raw_xml = u"""\ +<document source="<string>"> +<raw format="xml" xml:space="preserve"><root> + <child>Test \xe4\xf6\xfc\u20ac</child> +</mismatch></raw> +<paragraph><raw classes="xml" format="xml" xml:space="preserve">\ +<test>inline raw XML</test></raw>.</paragraph> +</document> +""" + + +def publish_xml(settings, source): + return docutils.core.publish_string(source=source.encode('utf8'), + reader_name='standalone', + writer_name='docutils_xml', + settings_overrides=settings) + +# XML Test Case +# ------------- + +class DocutilsXMLTestCase(DocutilsTestSupport.StandardTestCase): + + settings = {'input_encoding': 'utf8', + 'output_encoding': 'iso-8859-1', + '_disable_config': True, + 'indents': False, + 'newlines': True, + 'xml_declaration': False, + 'doctype_declaration': False, + } + def test_publish(self): - settings = {'input_encoding': 'utf8', - 'output_encoding': 'iso-8859-1', - '_disable_config': 1} - for settings['newlines'] in 0, 1: - for settings['indents'] in 0, 1: - for settings['xml_declaration'] in 0, 1: - for settings['doctype_declaration'] in 0, 1: + settings = self.settings.copy() + settings['newlines'] = False + for settings['xml_declaration'] in True, False: + for settings['doctype_declaration'] in True, False: + expected = u'' + if settings['xml_declaration']: + expected += xmldecl + if settings['doctype_declaration']: + expected += doctypedecl + expected += generatedby + expected += bodynormal + result = publish_xml(settings, source) + self.assertEqual(result, expected.encode('latin1')) - expected = b('') - if settings['xml_declaration']: - expected += self.xmldecl - if settings['doctype_declaration']: - expected += self.doctypedecl - expected += self.generatedby - if settings['indents']: - expected += self.bodyindents - elif settings['newlines']: - expected += self.bodynewlines - else: - expected += self.bodynormal + def test_publish_indents(self): + settings = self.settings.copy() + settings['indents'] = True + result = publish_xml(settings, source) + expected = (generatedby + bodyindents).encode('latin1') + self.assertEqual(result, expected) - self.assertEqual(docutils.core.publish_string - (source=self.input, - reader_name='standalone', - writer_name='docutils_xml', - settings_overrides=settings), - expected) + def test_publish_newlines(self): + settings = self.settings.copy() + result = publish_xml(settings, source) + expected = (generatedby + bodynewlines).encode('latin1') + self.assertEqual(result, expected) + def test_raw_xml(self): + result = publish_xml(self.settings, raw_xml_source) + expected = (generatedby + + raw_xml).encode('latin1', 'xmlcharrefreplace') + self.assertEqual(result, expected) + def test_invalid_raw_xml(self): + warnings = StringIO() + settings = self.settings.copy() + settings['warning_stream'] = warnings + result = publish_xml(settings, invalid_raw_xml_source) + expected = (generatedby + + invalid_raw_xml).encode('latin1', 'xmlcharrefreplace') + self.assertEqual(result, expected) + warnings.seek(0) + self.assertEqual(warnings.readlines(), + [u'<string>:5: ' + u'(WARNING/2) Invalid raw XML in column 2, line offset 3:\n', + u'<root>\n', + u' <child>Test \xe4\xf6\xfc\u20ac</child>\n', + u'</mismatch>\n', + u'<string>:10: ' + u'(WARNING/2) Invalid raw XML in column 30, line offset 1:\n', + u'<test>inline raw XML</test>\n']) + # abort with SystemMessage if halt_level is "info": + settings['halt_level'] = 2 + settings['warning_stream'] = '' + self.assertRaises(docutils.utils.SystemMessage, + publish_xml, settings, invalid_raw_xml_source) + + if __name__ == '__main__': import unittest unittest.main() Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_html4css1_misc.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_html4css1_misc.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_html4css1_misc.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,7 +1,8 @@ #! /usr/bin/env python -# $Id: test_html4css1_misc.py 5889 2009-04-01 20:00:21Z gbrandl $ -# Author: Lea Wiemann <LeWiemann@gmail.com> +# $Id: test_html4css1_misc.py 7320 2012-01-19 22:33:02Z milde $ +# Author: Lea Wiemann +# Maintainer: docutils-develop@lists.sourceforge.net # Copyright: This module has been placed in the public domain. """ @@ -21,13 +22,13 @@ settings_overrides={ 'output_encoding': 'latin1', 'stylesheet': '', - '_disable_config': 1,} + '_disable_config': True,} result = core.publish_string( - b('EUR = \xe2\x82\xac'), writer_name='html4css1', + u'EUR = \u20ac', writer_name='html4css1', settings_overrides=settings_overrides) # Encoding a euro sign with latin1 doesn't work, so the # xmlcharrefreplace handler is used. - self.assert_(result.find(b('EUR = €')) != -1) + self.assertNotEqual(result.find(b('EUR = €')), -1) if __name__ == '__main__': Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_latex2e.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_latex2e.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_latex2e.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,7 +1,7 @@ # -*- coding: utf8 -*- #! /usr/bin/env python -# $Id: test_latex2e.py 6740 2011-02-02 23:47:33Z milde $ +# $Id: test_latex2e.py 7325 2012-01-26 13:08:04Z milde $ # Author: engelbert gruber <grubert@users.sourceforge.net> # Copyright: This module has been placed in the public domain. @@ -17,23 +17,22 @@ from __init__ import DocutilsTestSupport -from docutils._compat import b - def suite(): - settings = {'use_latex_toc': 0} + settings = {'use_latex_toc': False} s = DocutilsTestSupport.PublishTestSuite('latex', suite_settings=settings) s.generateTests(totest) - settings['use_latex_toc'] = 1 + settings['use_latex_toc'] = True s.generateTests(totest_latex_toc) - settings['use_latex_toc'] = 0 - settings['sectnum_xform'] = 0 + settings['use_latex_toc'] = False + settings['sectnum_xform'] = False s.generateTests(totest_latex_sectnum) - settings['sectnum_xform'] = 1 - settings['use_latex_citations'] = 1 + settings['sectnum_xform'] = True + settings['use_latex_citations'] = True s.generateTests(totest_latex_citations) settings['stylesheet_path'] = 'data/spam,data/ham.tex' s.generateTests(totest_stylesheet) - settings['embed_stylesheet'] = 1 + settings['embed_stylesheet'] = True + settings['warning_stream'] = '' s.generateTests(totest_stylesheet_embed) return s @@ -144,8 +143,10 @@ Paragraph 2. """, ## # expected output -head_template.substitute(dict(parts, fallbacks = r""" -% title for topics, admonitions and sidebar +head_template.substitute(dict(parts, + requirements=parts['requirements'] + '\\setcounter{secnumdepth}{0}\n', + fallbacks=r""" +% title for topics, admonitions, unsupported section levels, and sidebar \providecommand*{\DUtitle}[2][class-arg]{% % call \DUtitle#1{#2} if it exists: \ifcsname DUtitle#1\endcsname% @@ -172,22 +173,14 @@ \end{list} -%___________________________________________________________________________ - -\section*{\phantomsection% - Title 1% - \addcontentsline{toc}{section}{Title 1}% +\section{Title 1% \label{title-1}% } Paragraph 1. -%___________________________________________________________________________ - -\subsection*{\phantomsection% - Title 2% - \addcontentsline{toc}{subsection}{Title 2}% +\subsection{Title 2% \label{title-2}% } @@ -207,18 +200,16 @@ ------------- """, ## # expected output -head + r""" +head_template.substitute(dict(parts, + requirements=parts['requirements'] + '\\setcounter{secnumdepth}{0}\n' +)) + r""" \phantomsection\label{contents} \pdfbookmark[1]{Contents}{contents} \tableofcontents -%___________________________________________________________________________ - -\section*{\phantomsection% - first section% - \addcontentsline{toc}{section}{first section}% +\section{first section% \label{first-section}% } @@ -236,18 +227,16 @@ ------------- """, ## # expected output -head + r""" +head_template.substitute(dict(parts, + requirements=parts['requirements'] + '\\setcounter{secnumdepth}{0}\n' +)) + r""" \phantomsection\label{contents} \pdfbookmark[1]{Contents}{contents} \tableofcontents -%___________________________________________________________________________ - -\section*{\phantomsection% - 1~~~first section% - \addcontentsline{toc}{section}{1~~~first section}% +\section{1~~~first section% \label{first-section}% } @@ -271,8 +260,6 @@ some text -%___________________________________________________________________________ - \section{first section% \label{first-section}% } @@ -292,12 +279,12 @@ ------------- """, ## # expected output -head + r""" +head_template.substitute(dict(parts, + requirements=parts['requirements'] + '\\setcounter{secnumdepth}{0}\n' +)) + r""" some text -%___________________________________________________________________________ - \section{first section% \label{first-section}% } @@ -612,8 +599,9 @@ This is the *document*. """, -head_template.substitute( - dict(parts, pdfsetup=parts['pdfsetup'] + r"""\hypersetup{ +head_template.substitute(dict(parts, + requirements=parts['requirements'] + '\\setcounter{secnumdepth}{0}\n', + pdfsetup=parts['pdfsetup'] + r"""\hypersetup{ pdftitle={This is the Title}, } """, titledata=r"""%%% Title Data @@ -628,11 +616,7 @@ """)) + r"""\maketitle -%___________________________________________________________________________ - -\section*{\phantomsection% - This is a \emph{section title}% - \addcontentsline{toc}{section}{This is a section title}% +\section{This is a \emph{section title}% \label{this-is-a-section-title}% } @@ -659,13 +643,8 @@ # input ["""two stylesheets embedded in the header""", head_template.substitute(dict(parts, stylesheet = -r"""\makeatletter -% embedded stylesheet: data/spam.sty -\ProvidesPackage{spam} -[2008/12/09 v0.2 simple silly test package] -\newcommand{\spam}{\@percentchar\ wonderfull spam} - -\makeatother +r"""% Cannot embed stylesheet 'data/spam.sty': +% No such file or directory. % embedded stylesheet: data/ham.tex \newcommand{\ham}{wonderful ham} Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_manpage.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_manpage.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_manpage.py 2012-05-04 08:52:38 UTC (rev 655) @@ -54,10 +54,9 @@ r""".TH "" "" "" .SH NAME \- -.\" Man page generated from reStructeredText. +.\" Man page generated from reStructuredText. . .\" Generated by docutils manpage writer. -.\" . """], ] @@ -104,7 +103,7 @@ With mixed case. """, - r""".\" Man page generated from reStructeredText. + r""".\" Man page generated from reStructuredText. . .TH SIMPLE 1 "2009-08-05" "0.1" "text processing" .SH NAME @@ -142,7 +141,6 @@ .SH COPYRIGHT public domain .\" Generated by docutils manpage writer. -.\" . """], ] @@ -160,7 +158,7 @@ .TH "" "" "" .SH NAME \\- \n\ -.\\" Man page generated from reStructeredText. +.\\" Man page generated from reStructuredText. . .INDENT 0.0 .INDENT 3.5 @@ -190,7 +188,6 @@ .UNINDENT .UNINDENT .\\" Generated by docutils manpage writer. -.\\" . '''] ] @@ -218,7 +215,7 @@ .TH "" "" "" .SH NAME \\- \n\ -.\\" Man page generated from reStructeredText. +.\\" Man page generated from reStructuredText. . optin group with dot as group item .INDENT 0.0 @@ -247,7 +244,6 @@ bla bla bla .UNINDENT .\\" Generated by docutils manpage writer. -.\\" \n\ ."""], ] @@ -275,7 +271,7 @@ .TH DEFINITION LIST TEST "" "" "" .SH NAME Definition List Test \\- \n\ -.\\" Man page generated from reStructeredText. +.\\" Man page generated from reStructuredText. . .SS Abstract .sp @@ -291,7 +287,6 @@ Description of Term 1 Description of Term 1 .UNINDENT .\\" Generated by docutils manpage writer. -.\\" \n\ .'''], ] Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_odt.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_odt.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/test/test_writers/test_odt.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #!/usr/bin/env python -# $Id: test_odt.py 6989 2011-03-04 23:44:32Z dkuhlman $ +# $Id: test_odt.py 7337 2012-02-03 08:16:53Z milde $ # Author: Dave Kuhlman <dkuhlman@rexx.com> # Copyright: This module has been placed in the public domain. @@ -136,7 +136,7 @@ sep, first, sep, second, sep, ) #msg2 = '%s\n%s' % (msg1, msg, ) msg2 = '%s' % (msg, ) - DocutilsTestSupport.StandardTestCase.failUnlessEqual(self, + DocutilsTestSupport.StandardTestCase.assertEqual(self, first, second, msg2) # Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/buildhtml.py =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/buildhtml.py 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/buildhtml.py 2012-05-04 08:52:38 UTC (rev 655) @@ -1,6 +1,6 @@ #!/usr/bin/env python -# $Id: buildhtml.py 7037 2011-05-19 08:56:27Z milde $ +# $Id: buildhtml.py 7323 2012-01-23 20:57:29Z goodger $ # Author: David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. @@ -47,6 +47,8 @@ Runtime settings & command-line options for the front end. """ + prune_default = ['.hg', '.bzr', '.git', '.svn', 'CVS'] + # Can't be included in OptionParser below because we don't want to # override the base class. settings_spec = ( @@ -59,17 +61,19 @@ 'validator': frontend.validate_boolean}), ('Do not scan subdirectories for files to process.', ['--local'], {'dest': 'recurse', 'action': 'store_false'}), - ('BROKEN Do not process files in <directory>. This option may be used ' - 'more than once to specify multiple directories.', + ('Do not process files in <directory> (shell globbing patterns, ' + 'separated by colons). This option may be used ' + 'more than once to specify multiple directories. Default: "%s".' + % ':'.join(prune_default), ['--prune'], {'metavar': '<directory>', 'action': 'append', - 'validator': frontend.validate_colon_separated_string_list}), - ('BROKEN Recursively ignore files or directories matching any of the given ' - 'wildcard (shell globbing) patterns (separated by colons). ' - 'Default: ".svn:CVS"', + 'validator': frontend.validate_colon_separated_string_list, + 'default': prune_default,}), + ('Recursively ignore files matching any of the given ' + 'wildcard (shell globbing) patterns (separated by colons).', ['--ignore'], {'metavar': '<patterns>', 'action': 'append', - 'default': ['.svn', 'CVS'], + 'default': [], 'validator': frontend.validate_colon_separated_string_list}), ('Work silently (no progress messages). Independent of "--quiet".', ['--silent'], @@ -190,17 +194,16 @@ # influence by modifying dirs. if not recurse: del dirs[:] - self.visit(root, files) + self.visit(root, files, dirs) - def visit(self, directory, names): - # BUG prune and ignore do not work + def visit(self, directory, names, subdirectories): settings = self.get_settings('', directory) errout = ErrorOutput(encoding=settings.error_encoding) if settings.prune and (os.path.abspath(directory) in settings.prune): print >>errout, ('/// ...Skipping directory (pruned): %s' % directory) sys.stderr.flush() - names[:] = [] + del subdirectories[:] return if not self.initial_settings.silent: print >>errout, '/// Processing directory: %s' % directory @@ -212,12 +215,9 @@ if fnmatch(names[i], pattern): # Modify in place! del names[i] - prune = 0 for name in names: if name.endswith('.txt'): - prune = self.process_txt(directory, name) - if prune: - break + self.process_txt(directory, name) def process_txt(self, directory, name): if name.startswith('pep-'): @@ -227,8 +227,6 @@ settings = self.get_settings(publisher, directory) errout = ErrorOutput(encoding=settings.error_encoding) pub_struct = self.publishers[publisher] - if settings.prune and (directory in settings.prune): - return 1 settings._source = os.path.normpath(os.path.join(directory, name)) settings._destination = settings._source[:-4]+'.html' if not self.initial_settings.silent: Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/editors/emacs/IDEAS.rst =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/editors/emacs/IDEAS.rst 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/editors/emacs/IDEAS.rst 2012-05-04 08:52:38 UTC (rev 655) @@ -322,3 +322,14 @@ add a local mode variable at the top of the file. We could perform this guessing by searching for a valid adornment at the top of the document or searching for reStructuredText directives further on. + +Entry level for rst-straighten-adornments +----------------------------------------- + +* `rst-straighten-adornments` should have an entry level to start at a + lower than the top level + + * I for one prefer a verbose style for top level titles which is not + appropriate for documents without titles + + * Should be done by a prefix argument Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/editors/emacs/rst.el =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/editors/emacs/rst.el 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/editors/emacs/rst.el 2012-05-04 08:52:38 UTC (rev 655) @@ -1,7 +1,6 @@ ;;; rst.el --- Mode for viewing and editing reStructuredText-documents. -;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 -;; Free Software Foundation, Inc. +;; Copyright (C) 2003-2012 Free Software Foundation, Inc. ;; Maintainer: Stefan Merten <smerten@oekonux.de> ;; Author: Martin Blais <blais@furius.ca>, @@ -77,7 +76,7 @@ ;;; DOWNLOAD ;; The latest release of this file lies in the docutils source code repository: -;; http://svn.berlios.de/svnroot/repos/docutils/trunk/docutils/tools/editors/em... +;; http://docutils.svn.sourceforge.net/svnroot/docutils/trunk/docutils/tools/ed... ;;; INSTALLATION @@ -120,7 +119,7 @@ ;; Use CVSHeader to really get information from CVS and not other version ;; control systems (defconst rst-cvs-header - "$CVSHeader: sm/rst_el/rst.el,v 1.233 2011-03-20 17:20:28 stefan Exp $") + "$CVSHeader: sm/rst_el/rst.el,v 1.256 2012-04-29 15:00:50 stefan Exp $") (defconst rst-cvs-rev (rst-extract-version "\\$" "CVSHeader: \\S + " "[0-9]+\\(?:\\.[0-9]+\\)+" " .*" rst-cvs-header "0.0") @@ -134,22 +133,22 @@ ;; Use LastChanged... to really get information from SVN (defconst rst-svn-rev (rst-extract-version "\\$" "LastChangedRevision: " "[0-9]+" " " - "$LastChangedRevision: 6993 $") + "$LastChangedRevision: 7399 $") "The SVN revision of this file. SVN revision is the upstream (docutils) revision.") (defconst rst-svn-timestamp (rst-extract-version "\\$" "LastChangedDate: " ".+?+" " " - "$LastChangedDate: 2011-03-20 18:20:36 +0100 (Son, 20 Mär 2011) $") + "$LastChangedDate: 2012-04-29 17:01:05 +0200 (Son, 29 Apr 2012) $") "The SVN timestamp of this file.") ;; Maintained by the release process (defconst rst-official-version (rst-extract-version "%" "OfficialVersion: " "[0-9]+\\(?:\\.[0-9]+\\)+" " " - "%OfficialVersion: 1.1.0 %") + "%OfficialVersion: 1.2.1 %") "Official version of the package.") (defconst rst-official-cvs-rev (rst-extract-version "[%$]" "Revision: " "[0-9]+\\(?:\\.[0-9]+\\)+" " " - "%Revision: 1.233 %") + "%Revision: 1.256 %") "CVS revision of this file in the official version.") (defconst rst-version @@ -163,7 +162,9 @@ (defconst rst-package-emacs-version-alist '(("1.0.0" . "24.0") - ("1.1.0" . "24.0"))) + ("1.1.0" . "24.0") + ("1.2.0" . "24.0") + ("1.2.1" . "24.0"))) (unless (assoc rst-official-version rst-package-emacs-version-alist) (error "Version %s not listed in `rst-package-emacs-version-alist'" @@ -357,8 +358,7 @@ ; tag ;; Symbol (`sym') - (sym-prt (:alt "\\sw" "\\s_")) - (sym-tag sym-prt "+") + (sym-tag (:shy "\\sw+" (:shy "\\s_\\sw+") "*")) ;; URIs (`uri') (uri-tag (:alt ,@rst-uri-schemes)) @@ -422,6 +422,7 @@ Each entry consists of the symbol naming the regex and an argument list for `rst-re'.") +;; FIXME: Use `sregex` or `rx` instead of re-inventing the wheel (defun rst-re (&rest args) "Interpret ARGS as regular expressions and return a regex string. Each element of ARGS may be one of the following: @@ -548,7 +549,7 @@ (rst-define-key map [?\C-c ?\C-a ?\C-h] 'describe-prefix-bindings) ;; Display the hierarchy of adornments implied by the current document contents. (rst-define-key map [?\C-c ?\C-a ?\C-d] 'rst-display-adornments-hierarchy) - ;; Homogeneize the adornments in the document. + ;; Homogenize the adornments in the document. (rst-define-key map [?\C-c ?\C-a ?\C-s] 'rst-straighten-adornments [?\C-c ?\C-s]) @@ -664,21 +665,22 @@ (modify-syntax-entry ?& "." st) (modify-syntax-entry ?' "." st) (modify-syntax-entry ?* "." st) - (modify-syntax-entry ?+ "." st) + (modify-syntax-entry ?+ "_" st) (modify-syntax-entry ?. "_" st) (modify-syntax-entry ?/ "." st) + (modify-syntax-entry ?: "_" st) (modify-syntax-entry ?< "." st) (modify-syntax-entry ?= "." st) (modify-syntax-entry ?> "." st) (modify-syntax-entry ?\\ "\\" st) (modify-syntax-entry ?| "." st) - (modify-syntax-entry ?_ "." st) - (modify-syntax-entry (aref "\u00ab" 0) "." st) - (modify-syntax-entry (aref "\u00bb" 0) "." st) - (modify-syntax-entry (aref "\u2018" 0) "." st) - (modify-syntax-entry (aref "\u2019" 0) "." st) - (modify-syntax-entry (aref "\u201c" 0) "." st) - (modify-syntax-entry (aref "\u201d" 0) "." st) + (modify-syntax-entry ?_ "_" st) + (modify-syntax-entry ?\u00ab "." st) + (modify-syntax-entry ?\u00bb "." st) + (modify-syntax-entry ?\u2018 "." st) + (modify-syntax-entry ?\u2019 "." st) + (modify-syntax-entry ?\u201c "." st) + (modify-syntax-entry ?\u201d "." st) st) "Syntax table used while in `rst-mode'.") @@ -769,11 +771,10 @@ ;;;###autoload (define-minor-mode rst-minor-mode - "ReST Minor Mode. -Toggle ReST minor mode. -With no argument, this command toggles the mode. -Non-null prefix argument turns on the mode. -Null prefix argument turns off the mode. + "Toggle ReST minor mode. +With a prefix argument ARG, enable ReST minor mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. When ReST minor mode is enabled, the ReST mode keybindings are installed on top of the major mode bindings. Use this @@ -985,12 +986,10 @@ If there are existing overline and/or underline from the existing adornment, they are removed before adding the requested adornment." - (let (marker + (end-of-line) + (let ((marker (point-marker)) len) - (end-of-line) - (setq marker (point-marker)) - ;; Fixup whitespace at the beginning and end of the line (if (or (null indent) (eq style 'simple)) (setq indent 0)) @@ -1102,9 +1101,9 @@ (cond ((and nxt-emp prv-emp) ;; A transition - (setq key t) - (setq beg-txt beg-pnt) - (setq end-txt end-pnt)) + (setq key t + beg-txt beg-pnt + end-txt end-pnt)) ((or und-fnd ovr-fnd) ;; An overline with an underline (setq key (cons ado-ch 'over-and-under)) @@ -1113,22 +1112,22 @@ (ovr-pnt (if ovr-fnd ovr-fnd beg-pnt)) (txt-pnt (if ovr-fnd ttl-abv ttl-blw))) (goto-char ovr-pnt) - (setq beg-ovr (point)) - (setq end-ovr (line-end-position)) + (setq beg-ovr (point) + end-ovr (line-end-position)) (goto-char txt-pnt) - (setq beg-txt (point)) - (setq end-txt (line-end-position)) + (setq beg-txt (point) + end-txt (line-end-position)) (goto-char und-pnt) - (setq beg-und (point)) - (setq end-und (line-end-position)))) + (setq beg-und (point) + end-und (line-end-position)))) (ttl-abv ;; An underline - (setq key (cons ado-ch 'simple)) - (setq beg-und beg-pnt) - (setq end-und end-pnt) + (setq key (cons ado-ch 'simple) + beg-und beg-pnt + end-und end-pnt) (goto-char ttl-abv) - (setq beg-txt (point)) - (setq end-txt (line-end-position))) + (setq beg-txt (point) + end-txt (line-end-position))) (t ;; Invalid adornment (setq key nil))) @@ -1203,8 +1202,8 @@ (defun rst-reset-section-caches () "Reset all section cache variables. Should be called by interactive functions which deal with sections." - (setq rst-all-sections nil) - (setq rst-section-hierarchy nil)) + (setq rst-all-sections nil + rst-section-hierarchy nil)) (defvar rst-all-sections nil "All section adornments in the buffer as found by `rst-find-all-adornments'. @@ -1284,10 +1283,11 @@ (if (eq rst-section-hierarchy t) nil rst-section-hierarchy) - (let ((all (rst-find-all-adornments)) - r) - (setq all (assq-delete-all ignore all)) - (setq r (rst-infer-hierarchy (mapcar 'cdr all))) + (let ((r (rst-infer-hierarchy + (mapcar 'cdr + (assq-delete-all + ignore + (rst-find-all-adornments)))))) (setq rst-section-hierarchy (if ignore ;; Clear cache reflecting that a possible update is not @@ -1410,7 +1410,7 @@ (interactive "P") (let* (;; Save our original position on the current line. - (origpt (set-marker (make-marker) (point))) + (origpt (point-marker)) (reverse-direction (and pfxarg (< (prefix-numeric-value pfxarg) 0))) (toggle-style (and pfxarg (not reverse-direction)))) @@ -1709,32 +1709,28 @@ ;; Create a list of markers for all the adornments which are found within ;; the region. (save-excursion - (let (m line) + (let (line) (while (and cur (< (setq line (caar cur)) region-end-line)) - (setq m (make-marker)) (goto-char (point-min)) (forward-line (1- line)) - (push (list (set-marker m (point)) (cdar cur)) marker-list) + (push (list (point-marker) (cdar cur)) marker-list) (setq cur (cdr cur)) )) ;; Apply modifications. - (let (nextado) - (dolist (p marker-list) - ;; Go to the adornment to promote. - (goto-char (car p)) + (dolist (p marker-list) + ;; Go to the adornment to promote. + (goto-char (car p)) - ;; Rotate the next adornment. - (setq nextado (rst-get-next-adornment - (cadr p) hier suggestion demote)) + ;; Update the adornment. + (apply 'rst-update-section + ;; Rotate the next adornment. + (rst-get-next-adornment + (cadr p) hier suggestion demote)) - ;; Update the adornment. - (apply 'rst-update-section nextado) - - ;; Clear marker to avoid slowing down the editing after we're done. - (set-marker (car p) nil) - )) + ;; Clear marker to avoid slowing down the editing after we're done. + (set-marker (car p) nil)) (setq deactivate-mark nil) - ))) + ))) @@ -1776,11 +1772,10 @@ (lambda (ado) (cons (rst-position (cdr ado) (rst-get-hierarchy)) - (let ((m (make-marker))) + (progn (goto-char (point-min)) (forward-line (1- (car ado))) - (set-marker m (point)) - m))) + (point-marker)))) (rst-find-all-adornments)))) (dolist (lm levels-and-markers) ;; Go to the appropriate position @@ -1857,7 +1852,7 @@ a regular expression for matching the lines after indentation with items. Returns a list of cons cells consisting of the point and the column of the point." - (let (pfx) + (let ((pfx ())) (save-excursion (goto-char beg) (while (< (point) end) @@ -2132,10 +2127,9 @@ (forward-line (1- (car ado))) (list (gethash (cons (cadr ado) (caddr ado)) levels) (rst-get-stripped-line) - (let ((m (make-marker))) + (progn (beginning-of-line 1) - (set-marker m (point))) - )) + (point-marker)))) (rst-find-all-adornments)))) (let ((lcontnr (cons nil lines))) (rst-section-tree-rec lcontnr -1)))) @@ -2282,7 +2276,7 @@ (delete-region init-point (+ init-point (length initial-indent))) ;; Delete the last newline added. - (delete-backward-char 1) + (delete-char -1) ))) (defun rst-toc-insert-node (node level indent pfx) @@ -2461,7 +2455,7 @@ (defvar rst-toc-buffer-name "*Table of Contents*" "Name of the Table of Contents buffer.") -(defvar rst-toc-return-buffer nil +(defvar rst-toc-return-wincfg nil "Window configuration to which to return when leaving the TOC.") @@ -2503,7 +2497,7 @@ (pop-to-buffer buf) ;; Save the buffer to return to. - (set (make-local-variable 'rst-toc-return-buffer) curbuf) + (set (make-local-variable 'rst-toc-return-wincfg) curbuf) ;; Move the cursor near the right section in the TOC. (goto-char (point-min)) @@ -2528,7 +2522,7 @@ (interactive) (let ((pos (rst-toc-mode-find-section))) (when kill - (set-window-configuration (car rst-toc-return-buffer)) + (set-window-configuration (car rst-toc-return-wincfg)) (kill-buffer (get-buffer rst-toc-buffer-name))) (pop-to-buffer (marker-buffer pos)) (goto-char pos) @@ -2544,11 +2538,11 @@ "In `rst-toc' mode, go to the occurrence whose line you click on. EVENT is the input event." (interactive "e") - (let (pos) - (with-current-buffer (window-buffer (posn-window (event-end event))) - (save-excursion - (goto-char (posn-point (event-end event))) - (setq pos (rst-toc-mode-find-section)))) + (let ((pos + (with-current-buffer (window-buffer (posn-window (event-end event))) + (save-excursion + (goto-char (posn-point (event-end event))) + (rst-toc-mode-find-section))))) (pop-to-buffer (marker-buffer pos)) (goto-char pos) (recenter 5))) @@ -2562,7 +2556,7 @@ (defun rst-toc-quit-window () "Leave the current TOC buffer." (interactive) - (let ((retbuf rst-toc-return-buffer)) + (let ((retbuf rst-toc-return-wincfg)) (set-window-configuration (car retbuf)) (goto-char (cadr retbuf)))) @@ -2689,8 +2683,7 @@ of each paragraph only." `(save-excursion (let ((leftcol (rst-find-leftmost-column ,beg ,end)) - (endm (set-marker (make-marker) ,end)) - ) + (endm (copy-marker ,end))) (do* (;; Iterate lines (l (progn (goto-char ,beg) (back-to-indentation)) @@ -2727,8 +2720,7 @@ `(save-excursion (let ((,leftmost (rst-find-leftmost-column ,beg ,end)) - (endm (set-marker (make-marker) ,end)) - ) + (endm (copy-marker ,end))) (do* (;; Iterate lines (l (progn (goto-char ,beg) (back-to-indentation)) @@ -3059,7 +3051,7 @@ ;;------------------------------------------------------------------------------ ;; FIXME: these next functions should become part of a larger effort to redo the -;; bullets in bulletted lists. The enumerate would just be one of the possible +;; bullets in bulleted lists. The enumerate would just be one of the possible ;; outputs. ;; ;; FIXME: We need to do the enumeration removal as well. @@ -3100,9 +3092,7 @@ (let* (;; Find items and convert the positions to markers. (items (mapcar (lambda (x) - (cons (let ((m (make-marker))) - (set-marker m (car x)) - m) + (cons (copy-marker (car x)) (cdr x))) (rst-find-pfx-in-region beg end (rst-re 'itmany-sta-1)))) (count 1) @@ -3144,67 +3134,139 @@ (require 'font-lock) +;; FIXME: The obsolete variables need to disappear + (defgroup rst-faces nil "Faces used in Rst Mode." :group 'rst :group 'faces :version "21.1") -(defcustom rst-block-face 'font-lock-keyword-face +(defface rst-block '((t :inherit font-lock-keyword-face)) + "Face used for all syntax marking up a special block." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-block-face 'rst-block "All syntax marking up a special block." + :version "24.1" :group 'rst-faces :type '(face)) +(make-obsolete-variable 'rst-block-face + "customize the face `rst-block' instead." + "24.1") -(defcustom rst-external-face 'font-lock-type-face +(defface rst-external '((t :inherit font-lock-type-face)) + "Face used for field names and interpreted text." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-external-face 'rst-external "Field names and interpreted text." + :version "24.1" :group 'rst-faces :type '(face)) +(make-obsolete-variable 'rst-external-face + "customize the face `rst-external' instead." + "24.1") -(defcustom rst-definition-face 'font-lock-function-name-face +(defface rst-definition '((t :inherit font-lock-function-name-face)) + "Face used for all other defining constructs." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-definition-face 'rst-definition "All other defining constructs." + :version "24.1" :group 'rst-faces :type '(face)) +(make-obsolete-variable 'rst-definition-face + "customize the face `rst-definition' instead." + "24.1") -(defcustom rst-directive-face - ;; XEmacs compatibility - (if (boundp 'font-lock-builtin-face) - 'font-lock-builtin-face - 'font-lock-preprocessor-face) +;; XEmacs compatibility (?). +(defface rst-directive (if (boundp 'font-lock-builtin-face) + '((t :inherit font-lock-builtin-face)) + '((t :inherit font-lock-preprocessor-face))) + "Face used for directives and roles." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-directive-face 'rst-directive "Directives and roles." :group 'rst-faces :type '(face)) +(make-obsolete-variable 'rst-directive-face + "customize the face `rst-directive' instead." + "24.1") -(defcustom rst-comment-face 'font-lock-comment-face +(defface rst-comment '((t :inherit font-lock-comment-face)) + "Face used for comments." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-comment-face 'rst-comment "Comments." + :version "24.1" :group 'rst-faces :type '(face)) +(make-obsolete-variable 'rst-comment-face + "customize the face `rst-comment' instead." + "24.1") -(defcustom rst-emphasis1-face - ;; XEmacs compatibility - (if (facep 'italic) - ''italic - 'italic) +(defface rst-emphasis1 '((t :inherit italic)) + "Face used for simple emphasis." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-emphasis1-face 'rst-emphasis1 "Simple emphasis." + :version "24.1" :group 'rst-faces :type '(face)) +(make-obsolete-variable 'rst-emphasis1-face + "customize the face `rst-emphasis1' instead." + "24.1") -(defcustom rst-emphasis2-face - ;; XEmacs compatibility - (if (facep 'bold) - ''bold - 'bold) +(defface rst-emphasis2 '((t :inherit bold)) + "Face used for double emphasis." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-emphasis2-face 'rst-emphasis2 "Double emphasis." :group 'rst-faces :type '(face)) +(make-obsolete-variable 'rst-emphasis2-face + "customize the face `rst-emphasis2' instead." + "24.1") -(defcustom rst-literal-face 'font-lock-string-face +(defface rst-literal '((t :inherit font-lock-string-face)) + "Face used for literal text." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-literal-face 'rst-literal "Literal text." + :version "24.1" :group 'rst-faces :type '(face)) +(make-obsolete-variable 'rst-literal-face + "customize the face `rst-literal' instead." + "24.1") -(defcustom rst-reference-face 'font-lock-variable-name-face +(defface rst-reference '((t :inherit font-lock-variable-name-face)) + "Face used for references to a definition." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-reference-face 'rst-reference "References to a definition." + :version "24.1" :group 'rst-faces :type '(face)) +(make-obsolete-variable 'rst-reference-face + "customize the face `rst-reference' instead." + "24.1") ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -3228,7 +3290,7 @@ (rst-define-level-faces))) ;; Faces for displaying items on several levels; these definitions define -;; different shades of grey where the lightest one (i.e. least contrasting) is +;; different shades of gray where the lightest one (i.e. least contrasting) is ;; used for level 1 (defcustom rst-level-face-max 6 "Maximum depth of levels for which section title faces are defined." @@ -3311,10 +3373,11 @@ rst-level-face-base-color (+ (* (1- i) rst-level-face-step-light) rst-level-face-base-light)))) - (make-empty-face sym) - (set-face-doc-string sym doc) - (set-face-background sym col) - (set sym sym) + (unless (facep sym) + (make-empty-face sym) + (set-face-doc-string sym doc) + (set-face-background sym col) + (set sym sym)) (setq i (1+ i)))))) (rst-define-level-faces) @@ -3331,44 +3394,44 @@ ;; `Bullet Lists`_ ;; FIXME: A bullet directly after a field name is not recognized (,(rst-re 'lin-beg '(:grp bul-sta)) - 1 ,rst-block-face) + 1 rst-block-face) ;; `Enumerated Lists`_ (,(rst-re 'lin-beg '(:grp enmany-sta)) - 1 ,rst-block-face) + 1 rst-block-face) ;; `Definition Lists`_ FIXME: missing ;; `Field Lists`_ (,(rst-re 'lin-beg '(:grp fld-tag) 'bli-sfx) - 1 ,rst-external-face) + 1 rst-external-face) ;; `Option Lists`_ (,(rst-re 'lin-beg '(:grp opt-tag (:shy optsep-tag opt-tag) "*") '(:alt "$" (:seq hws-prt "\\{2\\}"))) - 1 ,rst-block-face) + 1 rst-block-face) ;; `Line Blocks`_ ;; Only for lines containing no more bar - to distinguish from tables (,(rst-re 'lin-beg '(:grp "|" bli-sfx) "[^|\n]*$") - 1 ,rst-block-face) + 1 rst-block-face) ;; `Tables`_ FIXME: missing ;; All the `Explicit Markup Blocks`_ ;; `Footnotes`_ / `Citations`_ (,(rst-re 'lin-beg 'fnc-sta-2) - (1 ,rst-definition-face) - (2 ,rst-definition-face)) + (1 rst-definition-face) + (2 rst-definition-face)) ;; `Directives`_ / `Substitution Definitions`_ (,(rst-re 'lin-beg 'dir-sta-3) - (1 ,rst-directive-face) - (2 ,rst-definition-face) - (3 ,rst-directive-face)) + (1 rst-directive-face) + (2 rst-definition-face) + (3 rst-directive-face)) ;; `Hyperlink Targets`_ (,(rst-re 'lin-beg '(:grp exm-sta "_" (:alt (:seq "`" ilcbkqdef-tag "`") (:seq (:alt "[^:\\\n]" "\\\\.") "+")) ":") 'bli-sfx) - 1 ,rst-definition-face) + 1 rst-definition-face) (,(rst-re 'lin-beg '(:grp "__") 'bli-sfx) - 1 ,rst-definition-face) + 1 rst-definition-face) ;; All `Inline Markup`_ - most of them may be multiline though this is ;; uninteresting @@ -3376,16 +3439,16 @@ ;; FIXME: Condition 5 preventing fontification of e.g. "*" not implemented ;; `Strong Emphasis`_ (,(rst-re 'ilm-pfx '(:grp "\\*\\*" ilcast-tag "\\*\\*") 'ilm-sfx) - 1 ,rst-emphasis2-face) + 1 rst-emphasis2-face) ;; `Emphasis`_ (,(rst-re 'ilm-pfx '(:grp "\\*" ilcast-tag "\\*") 'ilm-sfx) - 1 ,rst-emphasis1-face) + 1 rst-emphasis1-face) ;; `Inline Literals`_ (,(rst-re 'ilm-pfx '(:grp "``" ilcbkq-tag "``") 'ilm-sfx) - 1 ,rst-literal-face) + 1 rst-literal-face) ;; `Inline Internal Targets`_ (,(rst-re 'ilm-pfx '(:grp "_`" ilcbkq-tag "`") 'ilm-sfx) - 1 ,rst-definition-face) + 1 rst-definition-face) ;; `Hyperlink References`_ ;; FIXME: `Embedded URIs`_ not considered ;; FIXME: Directly adjacing marked up words are not fontified correctly @@ -3393,28 +3456,28 @@ (,(rst-re 'ilm-pfx '(:grp (:alt (:seq "`" ilcbkq-tag "`") (:seq "\\sw" (:alt "\\sw" "-") "+\\sw")) "__?") 'ilm-sfx) - 1 ,rst-reference-face) + 1 rst-reference-face) ;; `Interpreted Text`_ (,(rst-re 'ilm-pfx '(:grp (:shy ":" sym-tag ":") "?") '(:grp "`" ilcbkq-tag "`") '(:grp (:shy ":" sym-tag ":") "?") 'ilm-sfx) - (1 ,rst-directive-face) - (2 ,rst-external-face) - (3 ,rst-directive-face)) + (1 rst-directive-face) + (2 rst-external-face) + (3 rst-directive-face)) ;; `Footnote References`_ / `Citation References`_ (,(rst-re 'ilm-pfx '(:grp fnc-tag "_") 'ilm-sfx) - 1 ,rst-reference-face) + 1 rst-reference-face) ;; `Substitution References`_ ;; FIXME: References substitutions like |this|_ or |this|__ are not ;; fontified correctly (,(rst-re 'ilm-pfx '(:grp sub-tag) 'ilm-sfx) - 1 ,rst-reference-face) + 1 rst-reference-face) ;; `Standalone Hyperlinks`_ ;; FIXME: This takes it easy by using a whitespace as delimiter (,(rst-re 'ilm-pfx '(:grp uri-tag ":\\S +") 'ilm-sfx) - 1 ,rst-definition-face) + 1 rst-definition-face) (,(rst-re 'ilm-pfx '(:grp sym-tag "@" sym-tag ) 'ilm-sfx) - 1 ,rst-definition-face) + 1 rst-definition-face) ;; Do all block fontification as late as possible so 'append works @@ -3433,20 +3496,24 @@ ;; properties on comments and literal blocks so they are *not* ;; inline fontified; see (elisp)Search-based Fontification + ;; FIXME: And / or use `syntax-propertize` functions as in `octave-mod.el` + ;; and other V24 modes; may make `font-lock-extend-region` + ;; superfluous + ;; `Comments`_ - this is multiline (,(rst-re 'lin-beg 'cmt-sta-1) - (1 ,rst-comment-face) + (1 rst-comment-face) (rst-font-lock-find-unindented-line-match (rst-font-lock-find-unindented-line-limit (match-end 1)) nil - (0 ,rst-comment-face append))) + (0 rst-comment-face append))) (,(rst-re 'lin-beg '(:grp exm-tag) '(:grp hws-tag) "$") - (1 ,rst-comment-face) - (2 ,rst-comment-face) + (1 rst-comment-face) + (2 rst-comment-face) (rst-font-lock-find-unindented-line-match (rst-font-lock-find-unindented-line-limit 'next) nil - (0 ,rst-comment-face append))) + (0 rst-comment-face append))) ;; FIXME: This is not rendered as comment:: ;; .. .. list-table:: @@ -3469,11 +3536,11 @@ ;; `Indented Literal Blocks`_ - this is multiline (,(rst-re 'lin-beg 'lit-sta-2) - (2 ,rst-block-face) + (2 rst-block-face) (rst-font-lock-find-unindented-line-match (rst-font-lock-find-unindented-line-limit t) nil - (0 ,rst-literal-face append))) + (0 rst-literal-face append))) ;; FIXME: `Quoted Literal Blocks`_ missing - this is multiline @@ -3499,8 +3566,8 @@ ;; ;; Indentation is not required for doctest blocks. (,(rst-re 'lin-beg '(:grp (:alt ">>>" ell-tag)) '(:grp ".+")) - (1,rst-block-face) - (2 ,rst-literal-face)) + (1 rst-block-face) + (2 rst-literal-face)) ) "Keywords to highlight in rst mode.") @@ -3516,12 +3583,35 @@ (defun rst-font-lock-extend-region-internal (beg end) "Check the region BEG / END for being in the middle of a multiline construct. Return nil if not or a cons with new values for BEG / END" - ;; There are many potential multiline constructs but really relevant ones are - ;; comment lines without leading explicit markup tag and literal blocks - ;; following "::" which are both indented. Thus indendation is what is - ;; recognized here. The second criteria is an explicit markup tag which may - ;; be a comment or a double colon at the end of a line. - (if (not (get-text-property beg 'font-lock-multiline)) + (let ((nbeg (rst-font-lock-extend-region-extend beg -1)) + (nend (rst-font-lock-extend-region-extend end 1))) + (if (or nbeg nend) + (cons (or nbeg beg) (or nend end))))) + +(defun rst-forward-line (&optional n) + "Like `forward-line' but always end up in column 0 and return accordingly." + (let ((moved (forward-line n))) + (if (bolp) + moved + (forward-line 0) + (- moved (signum n))))) + +(defun rst-font-lock-extend-region-extend (pt dir) + "Extend the region starting at point PT and extending in direction DIR. +Return extended point or nil if not moved." + ;; There are many potential multiline constructs but there are two groups + ;; which are really relevant. The first group consists of + ;; + ;; * comment lines without leading explicit markup tag and + ;; + ;; * literal blocks following "::" + ;; + ;; which are both indented. Thus indendation is the first thing recognized + ;; here. The second criteria is an explicit markup tag which may be a comment + ;; or a double colon at the end of a line. + ;; + ;; The second group consists of the adornment cases. + (if (not (get-text-property pt 'font-lock-multiline)) ;; Move only if we don't start inside a multiline construct already (save-excursion (let (;; non-empty non-indented line, explicit markup tag or literal @@ -3529,13 +3619,36 @@ (stop-re (rst-re '(:alt "[^ \t\n]" (:seq hws-tag exm-tag) (:seq ".*" dcl-tag lin-end))))) - (goto-char beg) + ;; The comments below are for dir == -1 / dir == 1 + (goto-char pt) (forward-line 0) + (setq pt (point)) (while (and (not (looking-at stop-re)) - (zerop (forward-line -1)))) ; try previous line if exists - ;; FIXME: Extending the end should also be done - (if (not (= (point) beg)) - (cons (point) end)))))) + (zerop (rst-forward-line dir)))) ; try previous / next + ; line if it exists + (if (looking-at (rst-re 'ado-beg-2-1)) ; may be an underline / + ; overline + (if (zerop (rst-forward-line dir)) + (if (looking-at (rst-re 'ttl-beg)) ; title found, i.e. + ; underline / overline + ; found + (if (zerop (rst-forward-line dir)) + (if (not + (looking-at (rst-re 'ado-beg-2-1))) ; no + ; overline / + ; underline + (rst-forward-line (- dir)))) ; step back to title + ; / adornment + (if (< dir 0) ; keep downward adornment + (rst-forward-line (- dir))))) ; step back to adornment + (if (looking-at (rst-re 'ttl-beg)) ; may be a title + (if (zerop (rst-forward-line dir)) + (if (not + (looking-at (rst-re 'ado-beg-2-1))) ; no overline / + ; underline + (rst-forward-line (- dir)))))) ; step back to line + (if (not (= (point) pt)) + (point)))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Indented blocks @@ -3713,25 +3826,45 @@ :group 'rst :version "21.1") -;; FIXME: Should be `defcustom` -(defvar rst-compile-toolsets - '((html . ("rst2html.py" ".html" nil)) - (latex . ("rst2latex.py" ".tex" nil)) - (newlatex . ("rst2newlatex.py" ".tex" nil)) - (pseudoxml . ("rst2pseudoxml.py" ".xml" nil)) - (xml . ("rst2xml.py" ".xml" nil)) - (pdf . ("rst2pdf.py" ".pdf" nil)) - (s5 . ("rst2s5.py" ".xml" nil))) +(defcustom rst-compile-toolsets + `((html ,(if (executable-find "rst2html.py") "rst2html.py" "rst2html") + ".html" nil) + (latex ,(if (executable-find "rst2latex.py") "rst2latex.py" "rst2latex") + ".tex" nil) + (newlatex ,(if (executable-find "rst2newlatex.py") "rst2newlatex.py" + "rst2newlatex") + ".tex" nil) + (pseudoxml ,(if (executable-find "rst2pseudoxml.py") "rst2pseudoxml.py" + "rst2pseudoxml") + ".xml" nil) + (xml ,(if (executable-find "rst2xml.py") "rst2xml.py" "rst2xml") + ".xml" nil) + (pdf ,(if (executable-find "rst2pdf.py") "rst2pdf.py" "rst2pdf") + ".pdf" nil) + (s5 ,(if (executable-find "rst2s5.py") "rst2s5.py" "rst2s5") + ".html" nil)) "Table describing the command to use for each toolset. An association list of the toolset to a list of the (command to use, extension of produced filename, options to the tool (nil or a -string)) to be used for converting the document.") +string)) to be used for converting the document." + ;; FIXME: These are not options but symbols which may be referenced by + ;; `rst-compile-*-toolset` below + :type '(alist :options (html latex newlatex pseudoxml xml pdf s5) + :key-type symbol + :value-type (list :tag "Specification" + (file :tag "Command") + (string :tag "File extension") + (choice :tag "Command options" + (const :tag "No options" nil) + (string :tag "Options")))) + :group 'rst + :version "24.1") -;; FIXME: Should be `defcustom` +;; FIXME: Must be `defcustom` (defvar rst-compile-primary-toolset 'html "The default toolset for `rst-compile'.") -;; FIXME: Should be `defcustom` +;; FIXME: Must be `defcustom` (defvar rst-compile-secondary-toolset 'latex "The default toolset for `rst-compile' with a prefix argument.") @@ -3935,9 +4068,9 @@ "A portable function that returns non-nil if the mark is active." (cond ((fboundp 'region-active-p) (region-active-p)) - ((boundp 'transient-mark-mode) transient-mark-mode mark-active))) + ((boundp 'transient-mark-mode) (and transient-mark-mode mark-active)) + (t mark-active))) -  (provide 'rst) ;;; rst.el ends here Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/editors/emacs/tests/font-lock.el =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/editors/emacs/tests/font-lock.el 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/editors/emacs/tests/font-lock.el 2012-05-04 08:52:38 UTC (rev 655) @@ -31,7 +31,7 @@ (set-mark (cdr r)) t))) -(ert-deftest rst-font-lock-extend-region-internal () +(ert-deftest rst-font-lock-extend-region-internal-indent () "Tests `rst-font-lock-extend-region-internal'." (should (equal-buffer-return '(extend-region) @@ -55,32 +55,52 @@ t)) (should (equal-buffer-return '(extend-region) + " abc +\^@ def +\^? ghi +uvw" + "\^@ abc + def + ghi +\^?uvw" + t + t)) + (should (equal-buffer-return + '(extend-region) "xyz abc -\^@ def\^?" +\^@ def +\^? ghi" "xyz \^@abc - def\^?" + def + ghi\^?" t t)) (should (equal-buffer-return '(extend-region) "xyz abc:: -\^@ def\^?" +\^@ def +\^? ghi +uvw" "xyz \^@ abc:: - def\^?" + def + ghi +\^?uvw" t t)) (should (equal-buffer-return '(extend-region) "xyz .. abc -\^@ def\^?" +\^@ def +\^?uvw" "xyz \^@ .. abc - def\^?" + def +\^?uvw" t t)) (should (equal-buffer-return @@ -88,11 +108,15 @@ "xyz .. abc 123 -\^@ def\^?" +\^@ def +\^? +uvw" "xyz \^@ .. abc 123 - def\^?" + def +\^? +uvw" t t)) (should (equal-buffer-return @@ -103,14 +127,112 @@ 123 -\^@ def\^?" +\^@ def +\^? +uvw" "xyz \^@ .. abc 123 - def\^?" + def +\^? +uvw" t t)) ) + +(ert-deftest rst-font-lock-extend-region-internal-adornment () + "Tests `rst-font-lock-extend-region-internal'." + (should (equal-buffer-return + '(extend-region) + "\^@===\^?" + "\^@===\^?" + nil + t)) + (should (equal-buffer-return + '(extend-region) + "abc +\^@===\^?" + "\^@abc +===\^?" + t + t)) + (should (equal-buffer-return ; Quite complicated without the trailing newline + '(extend-region) + "\^@abc +\^?===" + "\^@abc +\^?===" + nil + t)) + (should (equal-buffer-return + '(extend-region) + "\^@abc +\^?=== +" + "\^@abc +=== +\^?" + t + t)) + (should (equal-buffer-return + '(extend-region) + "=== +abc +\^@=== +\^?" + "\^@=== +abc +=== +\^?" + t + t)) + (should (equal-buffer-return + '(extend-region) + "\^@=== +\^?abc +=== +" + "\^@=== +abc +=== +\^?" + t + t)) + (should (equal-buffer-return + '(extend-region) + "def + +=== +\^@abc +=== +\^?" + "def + +\^@=== +abc +=== +\^?" + t + t)) + (should (equal-buffer-return + '(extend-region) + "def + +\^@=== +abc +\^?=== + +xyz" + "def + +\^@=== +abc +=== +\^? +xyz" + t + t)) + ) Modified: branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/editors/emacs/tests/re.el =================================================================== --- branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/editors/emacs/tests/re.el 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/docutils/src/main/resources/docutils/tools/editors/emacs/tests/re.el 2012-05-04 08:52:38 UTC (rev 655) @@ -633,7 +633,8 @@ (cons "\\\\(|" "\\(?:|") ;; Make a group shy (cons "\\[^|\n]\\+" "\\(?:\\S \\|\\S \\(?:[^|\\\n]\\|\\\\.\\)\\{0,1000\\}[^ |\\]\\)" ) ;; Symbol name more sophisticated - (cons "\\\\(\\\\s" "\\(?:\\s") ;; Make a group shy + (cons (regexp-quote "\\(\\sw\\|\\s_\\)+") + "\\(?:\\sw+\\(?:\\s_\\sw+\\)*\\)") ;; New syntax for symbols (cons "\\\\(\\[\t " "\\(?:[\t ") ;; Make a group shy )) (should (re-equal-matches @@ -760,8 +761,10 @@ (cons "\\\\(\\[^" "\\(?:[^") ;; Make a group shy (cons "\\\\(:" "\\(?::") ;; Make a group shy (cons "\\\\(:" "\\(?::") ;; Make a group shy - (cons "\\\\(\\\\sw" "\\(?:\\sw") ;; Make a group shy - (cons "\\\\(\\\\sw" "\\(?:\\sw") ;; Make a group shy + (cons (regexp-quote "\\(\\sw\\|\\s_\\)+") + "\\(?:\\sw+\\(?:\\s_\\sw+\\)*\\)") ;; New syntax for symbols + (cons (regexp-quote "\\(\\sw\\|\\s_\\)+") + "\\(?:\\sw+\\(?:\\s_\\sw+\\)*\\)") ;; New syntax for symbols (cons (regexp-quote "\\\\]") "\\]") ;; Remove superfluous quote (cons (regexp-quote "\\|$") "") (cons (regexp-quote "\\([\t ]") @@ -819,8 +822,10 @@ (list "someone@example" (cons 2 1)) (cons "^\\\\(" "\\(?:") ;; Make a group shy - (cons "\\\\(\\\\sw" "\\(?:\\sw") ;; Make a group shy - (cons "\\\\(\\\\sw" "\\(?:\\sw") ;; Make a group shy + (cons (regexp-quote "\\(\\sw\\|\\s_\\)+") + "\\(?:\\sw+\\(?:\\s_\\sw+\\)*\\)") ;; New syntax for symbols + (cons (regexp-quote "\\(\\sw\\|\\s_\\)+") + "\\(?:\\sw+\\(?:\\s_\\sw+\\)*\\)") ;; New syntax for symbols (cons (regexp-quote "\\|$") "") (cons (regexp-quote "\\([\t ]") "\\(?:$\\|[\t ]") ;; Move "$" in regex and make a group shy Modified: branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 2012-05-04 08:52:38 UTC (rev 655) @@ -28,7 +28,6 @@ import java.awt.GraphicsEnvironment; import java.io.*; import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.net.URL; import java.util.*; @@ -58,10 +57,9 @@ import org.nuiton.util.FileUtil; import org.nuiton.util.Resource; import org.nuiton.util.StringUtil; -import org.python.core.Py; -import org.python.core.PySystemState; +import org.python.core.*; import org.python.core.adapter.ExtensiblePyObjectAdapter; -import org.python.core.imp; +import org.python.modules.zipimport.zipimporter; import org.python.util.JarRunner; import org.python.util.PythonInterpreter; @@ -427,57 +425,26 @@ } - /* public static Document generateXML(File in) throws Exception { final String runner = "__run__"; + /* Transformation of the __run__ URL into a path that python will use + For example the URL is : + jar:file:/home/user/.m2/repository/org/nuiton/jrst/docutils/1.6-SNAPSHOT/docutils-1.6-SNAPSHOT.jar!/__run__.py + and it will become : + /home/user/.m2/repository/org/nuiton/jrst/docutils/1.6-SNAPSHOT/docutils-1.6-SNAPSHOT.jar/ + */ URL resource = in.getClass().getResource("/__run__.py"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! " + resource); + log.info("URL of the resource : " + resource); String docutilsPath = resource.getPath().replaceAll("__run__.py", ""); docutilsPath = docutilsPath.replaceAll("!", ""); docutilsPath = docutilsPath.replaceAll("file:", ""); - // Methode initialize qui retourne un booléen - Method method = PySystemState.class.getDeclaredMethod("initialize",Properties.class, - Properties.class, - String[].class, - ClassLoader.class, - ExtensiblePyObjectAdapter.class, - ClassLoader.class); - method.setAccessible(true); - - //arguments de la méthode - Properties props = PySystemState.getBaseProperties(); - props.setProperty("python.path", docutilsPath); - File out = File.createTempFile("result", ".xml"); - String[] argv = new String[]{runner, docutilsPath, Format.XML.name(), in.getPath(), out.getPath()}; + // Creation of a temporary file to save the xml result log.info("docutilsPath = "+docutilsPath); - ClassLoader context = Thread.currentThread().getContextClassLoader(); - - Field initialized3 = PySystemState.class.getDeclaredField("defaultArgv"); - initialized3.setAccessible(true); - initialized3.set(null, argv); - - JarRunner.run(new String[]{docutilsPath, Format.XML.name(), in.getPath(), out.getPath()}); - - log.info("out = "+FileUtils.readFileToString(out)); - SAXReader saxReader = new SAXReader(); - return saxReader.read(out); - } */ - - - public static Document generateXML(File in) throws Exception { - final String runner = "__run__"; - - URL resource = in.getClass().getResource("/__run__.py"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! " + resource); - String docutilsPath = resource.getPath().replaceAll("__run__.py", ""); - docutilsPath = docutilsPath.replaceAll("!", ""); - docutilsPath = docutilsPath.replaceAll("file:", ""); - - log.info("docutilsPath = "+docutilsPath); File out = File.createTempFile("result", ".xml"); + /* Properties props = PySystemState.getBaseProperties(); props.setProperty("python.path", docutilsPath); String[] argv = new String[]{runner, docutilsPath, Format.XML.name(), in.getPath(), out.getPath()}; @@ -489,61 +456,41 @@ initialized.setAccessible(true); initialized.set(null, false); - Field initialized2 = PySystemState.class.getDeclaredField("registry"); - initialized2.setAccessible(true); - initialized2.set(null, null); + Field registry = PySystemState.class.getDeclaredField("registry"); + registry.setAccessible(true); + registry.set(null, null); - - /* - closer = new PySystemStateCloser(this); - modules = new PyStringMap(); - - argv = (PyList)defaultArgv.repeat(1); - path = (PyList)defaultPath.repeat(1); - path.append(Py.newString(JavaImporter.JAVA_IMPORT_PATH_ENTRY)); - path.append(Py.newString(ClasspathPyImporter.PYCLASSPATH_PREFIX)); - executable = defaultExecutable; - - meta_path = new PyList(); - path_hooks = new PyList(); - path_hooks.append(new JavaImporter()); - path_hooks.append(zipimporter.TYPE); - path_hooks.append(ClasspathPyImporter.TYPE); - path_importer_cache = new PyDictionary(); - - currentWorkingDir = new File("").getAbsolutePath(); - - // Set up the initial standard ins and outs - String mode = Options.unbuffered ? "b" : ""; - int buffering = Options.unbuffered ? 0 : 1; - stdin = __stdin__ = new PyFile(System.in, "<stdin>", "r" + mode, buffering, false); - stdout = __stdout__ = new PyFile(System.out, "<stdout>", "w" + mode, buffering, false); - stderr = __stderr__ = new PyFile(System.err, "<stderr>", "w" + mode, 0, false); - initEncoding(); - - __displayhook__ = new PySystemStateFunctions("displayhook", 10, 1, 1); - __excepthook__ = new PySystemStateFunctions("excepthook", 30, 3, 3); - - if (builtins == null) { - builtins = getDefaultBuiltins(); - } - modules.__setitem__("__builtin__", new PyModule("__builtin__", getDefaultBuiltins())); - __dict__ = new PyStringMap(); - __dict__.invoke("update", getType().fastGetDict()); - __dict__.__setitem__("displayhook", __displayhook__); - __dict__.__setitem__("excepthook", __excepthook__); - */ - - } else { INITIALIZED = true; } - PythonInterpreter.initialize(PySystemState.getBaseProperties(), props, argv); + PythonInterpreter.initialize(PySystemState.getBaseProperties(), props, argv); */ + // Import of the main script to use docutils ( __run__ ) PythonInterpreter interp = new PythonInterpreter(); + StringBuilder command = new StringBuilder("import __run__"); + log.info(command.toString()); + interp.exec(command.toString()); + + // Initialization of the docutils environment (adds jaropen in the built-in functions) + command = new StringBuilder("__run__.init_docutils(\""); + command.append(runner).append("\", \"") // The name of the script + .append(docutilsPath).append("\")"); // The docutils jar path + log.info(command.toString()); + interp.exec(command.toString()); + + // Execution of the docutils script to transform rst to xml + command = new StringBuilder("__run__.exec_docutils(\""); + command.append(docutilsPath).append("\", \"") // The docutils jar path + .append(Format.XML.name()).append("\", \"") // The outpout format (here XML) + .append(in.getPath()).append("\", \"") // The input file path + .append(out.getPath()).append("\")"); // The output file path + log.info(command.toString()); + interp.exec(command.toString()); + /* interp.execfile(in.getClass().getResourceAsStream("/__run__.py")); interp.getSystemState().cleanup(); + */ interp.cleanup(); log.info("out content =\n"+FileUtils.readFileToString(out)+"\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); @@ -559,7 +506,6 @@ docutilsPath = docutilsPath.replaceAll("!", ""); docutilsPath = docutilsPath.replaceAll("file:", ""); - String[] argv = new String[]{"__run__.py", docutilsPath, outputType, in.getPath(), out.getPath()}; // Only for debugging @@ -567,9 +513,7 @@ String message = "Run Python with args: " + Arrays.toString(argv); log.debug(message); } - /* - JarRunner.run(); - */ + Properties props = PySystemState.getBaseProperties(); System.out.println(props.getProperty("python.path")); props.setProperty("python.path", docutilsPath); Modified: branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java =================================================================== --- branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java 2012-05-02 16:30:29 UTC (rev 654) +++ branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java 2012-05-04 08:52:38 UTC (rev 655) @@ -120,11 +120,10 @@ public void generateXml() throws Exception { File in = getTestFile("text.rst"); - File out = getOutputTestFile("jrst-RstToXml1.xml"); - File out2 = getOutputTestFile("jrst-RstToXml2.xml"); JRST.generate(JRST.Format.XML.name(), in, out, JRST.Overwrite.ALLTIME); + File out2 = getOutputTestFile("jrst-RstToXml2.xml"); try { JRST.generate(JRST.Format.XML.name(), in, out2, JRST.Overwrite.ALLTIME); } catch (Throwable e) {