[Docutils-checkins] SF.net SVN: docutils:[7801] trunk/docutils

[<mi...@us...>]

Revision: 7801
          http://sourceforge.net/p/docutils/code/7801
Author:   milde
Date:     2015-02-24 13:51:32 +0000 (Tue, 24 Feb 2015)
Log Message:
-----------
Basic documentation for the xhtml11 writer and frontend.

Modified Paths:
--------------
    trunk/docutils/docs/dev/release.txt
    trunk/docutils/docs/user/config.txt
    trunk/docutils/docs/user/tools.txt
    trunk/docutils/docutils/writers/xhtml11/__init__.py
    trunk/docutils/tools/rst2xhtml11.py

Modified: trunk/docutils/docs/dev/release.txt
===================================================================
--- trunk/docutils/docs/dev/release.txt	2015-02-24 13:01:43 UTC (rev 7800)
+++ trunk/docutils/docs/dev/release.txt	2015-02-24 13:51:32 UTC (rev 7801)
@@ -185,8 +185,8 @@
   .. _wheels: https://packaging.python.org/en/latest/distributing.html#wheels
   __ https://pypi.python.org/pypi/pip/
 
-  See also `Bug report [271]
-  <https://sourceforge.net/p/docutils/bugs/271/>`__
+  See also `feature request 43
+  <https://sourceforge.net/p/docutils/feature-requests/43/>`__
 
   For current Docutils, this would mean `pure Python wheels`__ for Python 2
   and 3 respectively.

Modified: trunk/docutils/docs/user/config.txt
===================================================================
--- trunk/docutils/docs/user/config.txt	2015-02-24 13:01:43 UTC (rev 7800)
+++ trunk/docutils/docs/user/config.txt	2015-02-24 13:51:32 UTC (rev 7801)
@@ -1102,7 +1102,31 @@
 
 __ `xml_declaration [docutils_xml writer]`_
 
+[xhtml11 writer]
+~~~~~~~~~~~~~~~~~
 
+The XHTML1.1 Writer derives from the standard HTML Writer, and shares
+most settings defined in the `[html4css1 writer]`_ section.  The
+"[html4css1 writer]" section of configuration files is processed
+before the "[xhtml11 writer]" section.
+
+removed options:
+  `field_name_limit`_, `option_limit`_
+
+The XHTML1.1 Writer's default for the following settings differ from
+those of the standard HTML Writer:
+
+`stylesheet_path <stylesheet_path [html4css1 writer]_>`_:
+  Default: "html4css1.css,xhtml11.css"
+
+`stylesheet_dirs <stylesheet_dirs [html4css1 writer]_>`_:
+  Default: Installation-dependent. Use the --help option to get the exact
+  value.
+
+math_output_:
+  Default: "MathML"
+
+
 [pep_html writer]
 ~~~~~~~~~~~~~~~~~
 

Modified: trunk/docutils/docs/user/tools.txt
===================================================================
--- trunk/docutils/docs/user/tools.txt	2015-02-24 13:01:43 UTC (rev 7800)
+++ trunk/docutils/docs/user/tools.txt	2015-02-24 13:51:32 UTC (rev 7801)
@@ -37,7 +37,7 @@
 The two arguments, "source" and "destination", are optional.  If only
 one argument (source) is specified, the standard output (stdout) is
 used for the destination.  If no arguments are specified, the standard
-input (stdin) is used for the source as well.
+input (stdin) is used for the source.
 
 
 Getting Help
@@ -101,10 +101,10 @@
 
 :Reader: Standalone
 :Parser: reStructuredText
-:Writer: HTML
+:Writer: HTML (html4css1)
 
 The ``rst2html.py`` front end reads standalone reStructuredText source
-files and produces HTML 4 (XHTML 1) output compatible with modern
+files and produces HTML 4 (XHTML 1) "transitional" output compatible with
 browsers that support cascading stylesheets (CSS).  A stylesheet is
 required for proper rendering; a simple but complete stylesheet is
 installed and used by default (see Stylesheets_ below).
@@ -139,6 +139,17 @@
 __ ../howto/html-stylesheets.html
 
 
+rst2xhtml11.py
+--------------
+
+:Reader: Standalone
+:Parser: reStructuredText
+:Writer: xhtml11
+
+The ``rst2xhtml11.py`` front end reads standalone reStructuredText source
+files and produces clean XHTML 1.1 output. A stylesheet is required for
+proper rendering; a complete stylesheet is installed and used by default.
+
 rstpep2html.py
 --------------
 

Modified: trunk/docutils/docutils/writers/xhtml11/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/xhtml11/__init__.py	2015-02-24 13:01:43 UTC (rev 7800)
+++ trunk/docutils/docutils/writers/xhtml11/__init__.py	2015-02-24 13:51:32 UTC (rev 7801)
@@ -63,7 +63,6 @@
           {'metavar': '<file[,file,...]>', 'overrides': 'stylesheet',
            'validator': frontend.validate_comma_separated_list,
            'default': default_stylesheets}),
-
         stylesheet_dirs = (
           'Comma-separated list of directories where stylesheets are found. '
           'Used by --stylesheet-path when expanding relative path arguments. '

Modified: trunk/docutils/tools/rst2xhtml11.py
===================================================================
--- trunk/docutils/tools/rst2xhtml11.py	2015-02-24 13:01:43 UTC (rev 7800)
+++ trunk/docutils/tools/rst2xhtml11.py	2015-02-24 13:51:32 UTC (rev 7801)
@@ -25,15 +25,9 @@
 
 from docutils.core import publish_cmdline, default_description
 
-# Import the xhtml11 writer from either the canonical place for a
-# Docutils writer or anywhere in the PYTHONPATH::
-
-from docutils.writers.xhtml11 import Writer
-
 description = ('Generates CSS2-styled HTML documents from standalone '
                'reStructuredText! sources that conform to the XHTML 1.1 DTD '
                '(strict XHTML). '
                + default_description)
 
-publish_cmdline(writer=Writer(), 
-                description=description)
+publish_cmdline(writer_name='xhtml11', description=description)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.