From: <fel...@us...> - 2005-08-24 21:33:29
|
Author: felixwiemann Date: 2005-08-24 23:33:21 +0200 (Wed, 24 Aug 2005) New Revision: 3830 Modified: trunk/docutils/HISTORY.txt trunk/docutils/docs/user/config.txt trunk/docutils/docutils/core.py trunk/docutils/docutils/frontend.py trunk/docutils/docutils/writers/html4css1.py trunk/docutils/test/DocutilsTestSupport.py trunk/docutils/test/functional/tests/_default.py trunk/docutils/test/test_dependencies.py trunk/docutils/test/test_writers/test_html4css1_misc.py trunk/docutils/tools/rst2html.py Log: made _stylesheet_required setting default to 0, activating it in the rst2html.py front-end tool Modified: trunk/docutils/HISTORY.txt =================================================================== --- trunk/docutils/HISTORY.txt 2005-08-24 00:23:46 UTC (rev 3829) +++ trunk/docutils/HISTORY.txt 2005-08-24 21:33:21 UTC (rev 3830) @@ -28,10 +28,6 @@ - Added ``publish_doctree`` and ``publish_from_doctree`` convenience functions, for document tree extraction and reprocessing. -* docutils/frontend.py: - - - Added ``_stylesheet_required`` internal setting. - * docutils/io.py: - Added ``DocTreeInput`` class, for reprocessing existing documents. @@ -100,6 +96,7 @@ - Made ``--embed-stylesheet`` the default rather than ``--link-stylesheet``. - Added writer-specific transform to check the stylesheet setting. + - Added ``_stylesheet_required`` internal setting, defaulting to 0. * docutils/writers/docutils_xml.py: @@ -125,6 +122,9 @@ * test/coverage.sh: Added to project; test coverage script. +* tools/rst2html.py: Made stylesheet requirement explicit (via + ``_stylesheet_required`` setting). + * tools/rstpep2html.py: Renamed from pep.py. * tools/dev/create_unimap.py: Added to project; script to create the Modified: trunk/docutils/docs/user/config.txt =================================================================== --- trunk/docutils/docs/user/config.txt 2005-08-24 00:23:46 UTC (rev 3829) +++ trunk/docutils/docs/user/config.txt 2005-08-24 21:33:21 UTC (rev 3830) @@ -651,6 +651,14 @@ __ `stylesheet_path [latex2e writer]`_ +_`_stylesheet_required` + Warn if valid stylesheet settings are absent. For programmatic + use only. + + Default: not required (0), except when using the ``rst2html.py`` + front-end tool. No command-line options; pass ``--stylesheet=`` + (i.e., with no argument) to disable the stylesheet explicitly. + .. _xml_declaration [html4css1 writer]: xml_declaration @@ -911,15 +919,6 @@ Default: stdin (None). No command-line options. -_`_stylesheet_required` - Writers that require stylesheets for correct rendering will check - and warn if valid stylesheet settings are absent. This setting is - used to enable stylesheet checking in writers and applications - that require a stylesheet, and disable checking in writers and - applications that don't. For programmatic use only. - - Default: required (1). No command-line options. - .. _ISO 639: http://www.loc.gov/standards/iso639-2/englangn.html .. [#pwd] Path relative to the working directory of the process at Modified: trunk/docutils/docutils/core.py =================================================================== --- trunk/docutils/docutils/core.py 2005-08-24 00:23:46 UTC (rev 3829) +++ trunk/docutils/docutils/core.py 2005-08-24 21:33:21 UTC (rev 3830) @@ -135,12 +135,6 @@ defaults = (settings_overrides or {}).copy() # Propagate exceptions by default when used programmatically: defaults.setdefault('traceback', 1) - # Do not complain on missing stylesheet when used - # programmatically. A stylesheet is often not necessary - # because the application uses only snippets of the - # output, and requiring a stylesheet would break existing - # applications which use Docutils programmatically. - defaults.setdefault('_stylesheet_required', 0) self.get_settings(settings_spec=settings_spec, config_section=config_section, **defaults) Modified: trunk/docutils/docutils/frontend.py =================================================================== --- trunk/docutils/docutils/frontend.py 2005-08-24 00:23:46 UTC (rev 3829) +++ trunk/docutils/docutils/frontend.py 2005-08-24 21:33:21 UTC (rev 3830) @@ -461,8 +461,7 @@ settings_defaults = {'_disable_config': None, '_source': None, - '_destination': None, - '_stylesheet_required': 1,} + '_destination': None,} """Defaults for settings that don't have command-line option equivalents.""" relative_path_settings = ('warning_stream',) Modified: trunk/docutils/docutils/writers/html4css1.py =================================================================== --- trunk/docutils/docutils/writers/html4css1.py 2005-08-24 00:23:46 UTC (rev 3829) +++ trunk/docutils/docutils/writers/html4css1.py 2005-08-24 21:33:21 UTC (rev 3830) @@ -111,7 +111,8 @@ ['--cloak-email-addresses'], {'action': 'store_true', 'validator': frontend.validate_boolean}),)) - settings_defaults = {'output_encoding_error_handler': 'xmlcharrefreplace'} + settings_defaults = {'output_encoding_error_handler': 'xmlcharrefreplace', + '_stylesheet_required': 0} relative_path_settings = ('stylesheet_path',) Modified: trunk/docutils/test/DocutilsTestSupport.py =================================================================== --- trunk/docutils/test/DocutilsTestSupport.py 2005-08-24 00:23:46 UTC (rev 3829) +++ trunk/docutils/test/DocutilsTestSupport.py 2005-08-24 21:33:21 UTC (rev 3830) @@ -638,7 +638,6 @@ """ settings_default_overrides = {'_disable_config': 1, - '_stylesheet_required': 0, 'strict_visitor': 1} writer_name = '' # set in subclasses or constructor Modified: trunk/docutils/test/functional/tests/_default.py =================================================================== --- trunk/docutils/test/functional/tests/_default.py 2005-08-24 00:23:46 UTC (rev 3829) +++ trunk/docutils/test/functional/tests/_default.py 2005-08-24 21:33:21 UTC (rev 3830) @@ -5,4 +5,3 @@ settings_overrides['warning_stream'] = '' settings_overrides['input_encoding'] = 'utf-8' settings_overrides['embed_stylesheet'] = 0 -settings_overrides['_stylesheet_required'] = 0 Modified: trunk/docutils/test/test_dependencies.py =================================================================== --- trunk/docutils/test/test_dependencies.py 2005-08-24 00:23:46 UTC (rev 3829) +++ trunk/docutils/test/test_dependencies.py 2005-08-24 21:33:21 UTC (rev 3830) @@ -30,7 +30,6 @@ settings.setdefault('settings_overrides', {}) settings['settings_overrides'] = settings['settings_overrides'].copy() settings['settings_overrides']['_disable_config'] = 1 - settings['settings_overrides']['_stylesheet_required'] = 0 if not settings['settings_overrides'].has_key('record_dependencies'): settings['settings_overrides']['record_dependencies'] = \ docutils.utils.DependencyList(recordfile) Modified: trunk/docutils/test/test_writers/test_html4css1_misc.py =================================================================== --- trunk/docutils/test/test_writers/test_html4css1_misc.py 2005-08-24 00:23:46 UTC (rev 3829) +++ trunk/docutils/test/test_writers/test_html4css1_misc.py 2005-08-24 21:33:21 UTC (rev 3830) @@ -23,8 +23,7 @@ settings_overrides={ 'output_encoding': 'latin1', 'stylesheet': '', - '_disable_config': 1, - '_stylesheet_required': 0,} + '_disable_config': 1,} result = core.publish_string( 'äöü€', writer_name='html4css1', settings_overrides=settings_overrides) Modified: trunk/docutils/tools/rst2html.py =================================================================== --- trunk/docutils/tools/rst2html.py 2005-08-24 00:23:46 UTC (rev 3829) +++ trunk/docutils/tools/rst2html.py 2005-08-24 21:33:21 UTC (rev 3830) @@ -22,4 +22,5 @@ description = ('Generates (X)HTML documents from standalone reStructuredText ' 'sources. ' + default_description) -publish_cmdline(writer_name='html', description=description) +publish_cmdline(writer_name='html', description=description, + settings_overrides={'_stylesheet_required': 1}) |