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

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

Revision: 7847
          http://sourceforge.net/p/docutils/code/7847
Author:   milde
Date:     2015-03-17 17:30:47 +0000 (Tue, 17 Mar 2015)
Log Message:
-----------
Small fixes to the writer aliases, supported formats, and front-end tools.

Modified Paths:
--------------
    trunk/docutils/docutils/writers/__init__.py
    trunk/docutils/docutils/writers/html4css1/__init__.py
    trunk/docutils/docutils/writers/html_base/__init__.py
    trunk/docutils/docutils/writers/xhtml11/__init__.py
    trunk/docutils/tools/rst2html5.py
    trunk/docutils/tools/rst2xetex.py
    trunk/docutils/tools/rst2xhtml11.py

Modified: trunk/docutils/docutils/writers/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/__init__.py	2015-03-17 17:11:15 UTC (rev 7846)
+++ trunk/docutils/docutils/writers/__init__.py	2015-03-17 17:30:47 UTC (rev 7847)
@@ -120,9 +120,11 @@
 
 
 _writer_aliases = {
-      'html': 'html4css1',
+      'html': 'html4css1',  # will change to html_base some day
       'html-base': 'html_base',
+      'html5': 'html_base', # only until a special HTML 5 writer is ready
       'xhtml': 'xhtml11',
+      'xhtml10': 'html4css1',
       'latex': 'latex2e',
       'xelatex': 'xetex',
       'pprint': 'pseudoxml',

Modified: trunk/docutils/docutils/writers/html4css1/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html4css1/__init__.py	2015-03-17 17:11:15 UTC (rev 7846)
+++ trunk/docutils/docutils/writers/html4css1/__init__.py	2015-03-17 17:30:47 UTC (rev 7847)
@@ -39,7 +39,7 @@
 
 class Writer(writers.Writer):
 
-    supported = ('html', 'html4css1', 'xhtml')
+    supported = ('html', 'html4', 'html4css1', 'xhtml', 'xhtml10')
     """Formats this writer supports."""
 
     default_stylesheets = ['html4css1.css']

Modified: trunk/docutils/docutils/writers/html_base/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html_base/__init__.py	2015-03-17 17:11:15 UTC (rev 7846)
+++ trunk/docutils/docutils/writers/html_base/__init__.py	2015-03-17 17:30:47 UTC (rev 7847)
@@ -49,7 +49,7 @@
 
 class Writer(writers.Writer):
 
-    supported = ('html', 'html5', 'xhtml')
+    supported = ('html', 'html5', 'html4', 'xhtml', 'xhtml10')
     """Formats this writer supports."""
 
     default_stylesheets = ['html-base.css']

Modified: trunk/docutils/docutils/writers/xhtml11/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/xhtml11/__init__.py	2015-03-17 17:11:15 UTC (rev 7846)
+++ trunk/docutils/docutils/writers/xhtml11/__init__.py	2015-03-17 17:30:47 UTC (rev 7847)
@@ -35,9 +35,8 @@
 
 class Writer(html_base.Writer):
 
-    supported = ('html', 'xhtml', 'xhtml1',
-                 'html4strict', 'xhtml1strict',
-                 'xhtml11', 'xhtml1css2')
+    supported = ('html', 'html4', 'html4strict', 'html4css2',
+                 'xhtml', 'xhtml1', 'xhtml1strict', 'xhtml11')
     """Formats this writer supports."""
 
     default_stylesheets = ['html-base.css', 'xhtml11.css']

Modified: trunk/docutils/tools/rst2html5.py
===================================================================
--- trunk/docutils/tools/rst2html5.py	2015-03-17 17:11:15 UTC (rev 7846)
+++ trunk/docutils/tools/rst2html5.py	2015-03-17 17:30:47 UTC (rev 7847)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf8 -*-
-# :Copyright: © 2005, 2009 Günter Milde.
+# :Copyright: © 2015 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,
@@ -14,7 +14,7 @@
 # Date: $Date$
 
 """
-A minimal front end to the Docutils Publisher, producing basic HTML 5
+A minimal front end to the Docutils Publisher, producing HTML 5 documents.
 
 The output also conforms to XHTML 1.0 transitional
 (except for the doctype declaration).
@@ -32,4 +32,4 @@
                u'reStructuredText sources '
                + default_description)
 
-publish_cmdline(writer_name='html-base', description=description)
+publish_cmdline(writer_name='html5', description=description)

Modified: trunk/docutils/tools/rst2xetex.py
===================================================================
--- trunk/docutils/tools/rst2xetex.py	2015-03-17 17:11:15 UTC (rev 7846)
+++ trunk/docutils/tools/rst2xetex.py	2015-03-17 17:30:47 UTC (rev 7847)
@@ -5,7 +5,7 @@
 # Copyright: This module has been placed in the public domain.
 
 """
-A minimal front end to the Docutils Publisher, producing XeLaTeX source code.
+A minimal front end to the Docutils Publisher, producing Lua/XeLaTeX code.
 """
 
 try:
@@ -16,8 +16,9 @@
 
 from docutils.core import publish_cmdline
 
-description = ('Generates XeLaTeX documents from standalone reStructuredText '
-               'sources. '
+description = ('Generates LaTeX documents from standalone reStructuredText '
+               'sources for compilation with the Unicode-aware TeX variants '
+               'XeLaTeX or LuaLaTeX. '
                'Reads from <source> (default is stdin) and writes to '
                '<destination> (default is stdout).  See '
                '<http://docutils.sourceforge.net/docs/user/latex.html> for '

Modified: trunk/docutils/tools/rst2xhtml11.py
===================================================================
--- trunk/docutils/tools/rst2xhtml11.py	2015-03-17 17:11:15 UTC (rev 7846)
+++ trunk/docutils/tools/rst2xhtml11.py	2015-03-17 17:30:47 UTC (rev 7847)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf8 -*-
-# :Copyright: © 2005, 2009 Günter Milde.
+# :Copyright: © 2015 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,

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