Thread: [Docutils-checkins] SF.net SVN: docutils:[7694] trunk/docutils (Page 5)

docutils-checkins

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

From: <gr...@us...> - 2013-07-22 07:55:24

Revision: 7694
          http://sourceforge.net/p/docutils/code/7694
Author:   grubert
Date:     2013-07-22 07:55:20 +0000 (Mon, 22 Jul 2013)
Log Message:
-----------
Release 0.11: closed "Changes Since ..." section

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/RELEASE-NOTES.txt

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2013-07-22 07:54:27 UTC (rev 7693)
+++ trunk/docutils/HISTORY.txt	2013-07-22 07:55:20 UTC (rev 7694)
@@ -13,8 +13,8 @@
 
 .. contents::
 
-Changes Since 0.10
-==================
+Release 0.11 (2013-07-22)
+=========================
 
 * General
 

Modified: trunk/docutils/RELEASE-NOTES.txt
===================================================================
--- trunk/docutils/RELEASE-NOTES.txt	2013-07-22 07:54:27 UTC (rev 7693)
+++ trunk/docutils/RELEASE-NOTES.txt	2013-07-22 07:55:20 UTC (rev 7694)
@@ -29,8 +29,8 @@
     element with class attribute and auto-generated title.
 
 
-Changes Since 0.10
-==================
+Release 0.11 (2013-07-22)
+=========================
 
 * General
 

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

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

From: <gr...@us...> - 2013-07-22 08:23:21

Revision: 7698
          http://sourceforge.net/p/docutils/code/7698
Author:   grubert
Date:     2013-07-22 08:23:17 +0000 (Mon, 22 Jul 2013)
Log Message:
-----------
Release 0.11: added empty "Changes Since 0.11" section

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/RELEASE-NOTES.txt

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2013-07-22 08:22:45 UTC (rev 7697)
+++ trunk/docutils/HISTORY.txt	2013-07-22 08:23:17 UTC (rev 7698)
@@ -13,6 +13,10 @@
 
 .. contents::
 
+Changes Since 0.11
+==================
+
+
 Release 0.11 (2013-07-22)
 =========================
 

Modified: trunk/docutils/RELEASE-NOTES.txt
===================================================================
--- trunk/docutils/RELEASE-NOTES.txt	2013-07-22 08:22:45 UTC (rev 7697)
+++ trunk/docutils/RELEASE-NOTES.txt	2013-07-22 08:23:17 UTC (rev 7698)
@@ -29,6 +29,10 @@
     element with class attribute and auto-generated title.
 
 
+Changes Since 0.11
+==================
+
+
 Release 0.11 (2013-07-22)
 =========================
 

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

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

From: <gr...@us...> - 2013-07-22 08:28:09

Revision: 7699
          http://sourceforge.net/p/docutils/code/7699
Author:   grubert
Date:     2013-07-22 08:28:06 +0000 (Mon, 22 Jul 2013)
Log Message:
-----------
Release 0.11: set version number to 0.12

Modified Paths:
--------------
    trunk/docutils/docutils/__init__.py
    trunk/docutils/setup.py
    trunk/docutils/test/functional/expected/compact_lists.html
    trunk/docutils/test/functional/expected/dangerous.html
    trunk/docutils/test/functional/expected/field_name_limit.html
    trunk/docutils/test/functional/expected/math_output_html.html
    trunk/docutils/test/functional/expected/math_output_latex.html
    trunk/docutils/test/functional/expected/math_output_mathjax.html
    trunk/docutils/test/functional/expected/math_output_mathml.xhtml
    trunk/docutils/test/functional/expected/misc_rst_html4css1.html
    trunk/docutils/test/functional/expected/pep_html.html
    trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
    trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
    trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html

Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py	2013-07-22 08:23:17 UTC (rev 7698)
+++ trunk/docutils/docutils/__init__.py	2013-07-22 08:28:06 UTC (rev 7699)
@@ -52,7 +52,7 @@
 
 __docformat__ = 'reStructuredText'
 
-__version__ = '0.11'
+__version__ = '0.12'
 """``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: trunk/docutils/setup.py
===================================================================
--- trunk/docutils/setup.py	2013-07-22 08:23:17 UTC (rev 7698)
+++ trunk/docutils/setup.py	2013-07-22 08:28:06 UTC (rev 7699)
@@ -113,7 +113,7 @@
 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.11',
+    'version': '0.12',
     'author': 'David Goodger',
     'author_email': 'go...@py...',
     'maintainer': 'docutils-develop list',

Modified: trunk/docutils/test/functional/expected/compact_lists.html
===================================================================
--- trunk/docutils/test/functional/expected/compact_lists.html	2013-07-22 08:23:17 UTC (rev 7698)
+++ trunk/docutils/test/functional/expected/compact_lists.html	2013-07-22 08:28:06 UTC (rev 7699)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title></title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/dangerous.html
===================================================================
--- trunk/docutils/test/functional/expected/dangerous.html	2013-07-22 08:23:17 UTC (rev 7698)
+++ trunk/docutils/test/functional/expected/dangerous.html	2013-07-22 08:28:06 UTC (rev 7699)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title></title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/field_name_limit.html
===================================================================
--- trunk/docutils/test/functional/expected/field_name_limit.html	2013-07-22 08:23:17 UTC (rev 7698)
+++ trunk/docutils/test/functional/expected/field_name_limit.html	2013-07-22 08:28:06 UTC (rev 7699)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title></title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/math_output_html.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_html.html	2013-07-22 08:23:17 UTC (rev 7698)
+++ trunk/docutils/test/functional/expected/math_output_html.html	2013-07-22 08:28:06 UTC (rev 7699)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 <link rel="stylesheet" href="../input/data/math.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_output_latex.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_latex.html	2013-07-22 08:23:17 UTC (rev 7698)
+++ trunk/docutils/test/functional/expected/math_output_latex.html	2013-07-22 08:28:06 UTC (rev 7699)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/math_output_mathjax.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathjax.html	2013-07-22 08:23:17 UTC (rev 7698)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html	2013-07-22 08:28:06 UTC (rev 7699)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>Mathematics</title>
 <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_output_mathml.xhtml
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathml.xhtml	2013-07-22 08:23:17 UTC (rev 7698)
+++ trunk/docutils/test/functional/expected/math_output_mathml.xhtml	2013-07-22 08:28:06 UTC (rev 7699)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/misc_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html4css1.html	2013-07-22 08:23:17 UTC (rev 7698)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html	2013-07-22 08:28:06 UTC (rev 7699)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title></title>
 <link rel="stylesheet" href="foo&amp;bar.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/pep_html.html
===================================================================
--- trunk/docutils/test/functional/expected/pep_html.html	2013-07-22 08:23:17 UTC (rev 7698)
+++ trunk/docutils/test/functional/expected/pep_html.html	2013-07-22 08:28:06 UTC (rev 7699)
@@ -8,7 +8,7 @@
 -->
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+  <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
   <title>PEP 100 -- Test PEP</title>
   <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2013-07-22 08:23:17 UTC (rev 7698)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2013-07-22 08:28:06 UTC (rev 7699)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>reStructuredText Test Document</title>
 <meta name="author" content="David Goodger" />
 <meta name="authors" content="Me  Myself  I" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html	2013-07-22 08:23:17 UTC (rev 7698)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html	2013-07-22 08:28:06 UTC (rev 7699)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <meta name="version" content="S5 1.1" />
 <title>Slide Shows</title>
 <meta name="author" content="David Goodger" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html	2013-07-22 08:23:17 UTC (rev 7698)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html	2013-07-22 08:28:06 UTC (rev 7699)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <meta name="version" content="S5 1.1" />
 <title>Slide Shows</title>
 <meta name="author" content="David Goodger" />

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

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

From: <mi...@us...> - 2013-08-21 21:49:17

Revision: 7715
          http://sourceforge.net/p/docutils/code/7715
Author:   milde
Date:     2013-08-21 21:49:14 +0000 (Wed, 21 Aug 2013)
Log Message:
-----------
Simplify visit_inline code.

Modified Paths:
--------------
    trunk/docutils/docutils/writers/latex2e/__init__.py
    trunk/docutils/test/functional/expected/standalone_rst_latex.tex
    trunk/docutils/test/functional/expected/standalone_rst_xetex.tex

Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py	2013-08-04 09:12:16 UTC (rev 7714)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py	2013-08-21 21:49:14 UTC (rev 7715)
@@ -2339,27 +2339,18 @@
             self.out += self.ids_to_labels(node) + ['\n']
 
     def visit_inline(self, node): # <span>, i.e. custom roles
-        # Make a copy to keep  ``node['classes']`` True if a
-        # language argument is popped (used in conditional calls of
-        # depart_inline()):
-        classes = node['classes'][:]
-        self.context.append('}' * len(classes))
-    # handle language specification:
-        language_tags = [cls for cls in classes
-                         if cls.startswith('language-')]
-        if language_tags:
-            language = self.babel.language_name(language_tags[0][9:])
-            if language:
-                self.babel.otherlanguages[language] = True
-                self.out.append(r'\foreignlanguage{%s}{' % language)
-                classes.pop(classes.index(language_tags[0]))
-        if not classes:
-            return
-        # mark up for styling with custom macros
-        if 'align-center' in classes:
-            self.fallbacks['align-center'] = PreambleCmds.align_center
-        self.fallbacks['inline'] = PreambleCmds.inline
-        self.out += [r'\DUrole{%s}{' % cls for cls in classes]
+        self.context.append('}' * len(node['classes']))
+        for cls in node['classes']:
+            if cls == 'align-center':
+                self.fallbacks['align-center'] = PreambleCmds.align_center
+            if cls.startswith('language-'):
+                language = self.babel.language_name(cls[9:])
+                if language:
+                    self.babel.otherlanguages[language] = True
+                    self.out.append(r'\foreignlanguage{%s}{' % language)
+            else:
+                self.fallbacks['inline'] = PreambleCmds.inline
+                self.out.append(r'\DUrole{%s}{' % cls)
 
     def depart_inline(self, node):
         self.out.append(self.context.pop())

Modified: trunk/docutils/test/functional/expected/standalone_rst_latex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2013-08-04 09:12:16 UTC (rev 7714)
+++ trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2013-08-21 21:49:14 UTC (rev 7715)
@@ -1532,7 +1532,7 @@
 }
 \end{quote}
 
-\foreignlanguage{british}{\DUrole{green}{\DUrole{sc}{British colourful text in small-caps}}}.
+\DUrole{green}{\DUrole{sc}{\foreignlanguage{british}{British colourful text in small-caps}}}.
 
 \end{itemize}
 

Modified: trunk/docutils/test/functional/expected/standalone_rst_xetex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_xetex.tex	2013-08-04 09:12:16 UTC (rev 7714)
+++ trunk/docutils/test/functional/expected/standalone_rst_xetex.tex	2013-08-21 21:49:14 UTC (rev 7715)
@@ -1531,7 +1531,7 @@
 }
 \end{quote}
 
-\foreignlanguage{british}{\DUrole{green}{\DUrole{sc}{British colourful text in small-caps}}}.
+\DUrole{green}{\DUrole{sc}{\foreignlanguage{british}{British colourful text in small-caps}}}.
 
 \end{itemize}
 

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

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

From: <mi...@us...> - 2013-08-21 22:01:24

Revision: 7717
          http://sourceforge.net/p/docutils/code/7717
Author:   milde
Date:     2013-08-21 22:01:21 +0000 (Wed, 21 Aug 2013)
Log Message:
-----------
Apply patch by Jakub Wilk to fix bug [ 100 ].

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docutils/writers/odf_odt/__init__.py

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2013-08-21 21:54:57 UTC (rev 7716)
+++ trunk/docutils/HISTORY.txt	2013-08-21 22:01:21 UTC (rev 7717)
@@ -16,7 +16,10 @@
 Changes Since 0.11
 ==================
 
+* docutils/writers/odf_odt/__init__.py
 
+  - Apply patch by Jakub Wilk to fix bug [ 100 ].
+
 Release 0.11 (2013-07-22)
 =========================
 

Modified: trunk/docutils/docutils/writers/odf_odt/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/odf_odt/__init__.py	2013-08-21 21:54:57 UTC (rev 7716)
+++ trunk/docutils/docutils/writers/odf_odt/__init__.py	2013-08-21 22:01:21 UTC (rev 7717)
@@ -88,16 +88,20 @@
 #   that support for the ability to get the parent of an element.
 #
 if WhichElementTree == 'elementtree':
-    class _ElementInterfaceWrapper(etree._ElementInterface):
+    import weakref
+    _parents = weakref.WeakKeyDictionary()
+    if isinstance(etree.Element, type):
+        _ElementInterface = etree.Element
+    else:
+        _ElementInterface = etree._ElementInterface
+    class _ElementInterfaceWrapper(_ElementInterface):
         def __init__(self, tag, attrib=None):
-            etree._ElementInterface.__init__(self, tag, attrib)
-            if attrib is None:
-                attrib = {}
-            self.parent = None
+            _ElementInterface.__init__(self, tag, attrib)
+            _parents[self] = None
         def setparent(self, parent):
-            self.parent = parent
+            _parents[self] = parent
         def getparent(self):
-            return self.parent
+            return _parents[self]
 
 
 #

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

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

From: <mi...@us...> - 2013-09-02 15:44:17

Revision: 7718
          http://sourceforge.net/p/docutils/code/7718
Author:   milde
Date:     2013-09-02 15:44:15 +0000 (Mon, 02 Sep 2013)
Log Message:
-----------
Fix [ 239 ] Latex writer glues paragraphs with figure floats.

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docutils/writers/latex2e/__init__.py
    trunk/docutils/test/functional/expected/standalone_rst_latex.tex
    trunk/docutils/test/functional/expected/standalone_rst_xetex.tex

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2013-08-21 22:01:21 UTC (rev 7717)
+++ trunk/docutils/HISTORY.txt	2013-09-02 15:44:15 UTC (rev 7718)
@@ -16,6 +16,10 @@
 Changes Since 0.11
 ==================
 
+* docutils/writers/latex2e/__init__.py
+
+  - Fix [ 239 ] Latex writer glues paragraphs with figure floats.
+
 * docutils/writers/odf_odt/__init__.py
 
   - Apply patch by Jakub Wilk to fix bug [ 100 ].

Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py	2013-08-21 22:01:21 UTC (rev 7717)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py	2013-09-02 15:44:15 UTC (rev 7718)
@@ -2138,9 +2138,9 @@
             # The LaTeX "figure" environment always uses the full textwidth,
             # so "outer alignment" is ignored. Just write a comment.
             # TODO: use the wrapfigure environment?
-            self.out.append('\\begin{figure} %% align = "%s"\n' % alignment)
+            self.out.append('\n\\begin{figure} %% align = "%s"\n' % alignment)
         else:
-            self.out.append('\\begin{figure}\n')
+            self.out.append('\n\\begin{figure}\n')
         if node.get('ids'):
             self.out += self.ids_to_labels(node) + ['\n']
 

Modified: trunk/docutils/test/functional/expected/standalone_rst_latex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2013-08-21 22:01:21 UTC (rev 7717)
+++ trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2013-09-02 15:44:15 UTC (rev 7718)
@@ -938,6 +938,7 @@
 A \emph{figure} is an image with a caption and/or a legend.  With page-based output
 media, figures might float to a different position if this helps the page
 layout.
+
 \begin{figure}
 \noindent\makebox[\textwidth][c]{\includegraphics[width=258bp]{../../../docs/user/rst/images/title.png}}
 \caption{Plaintext markup syntax and parser system.}
@@ -970,6 +971,7 @@
 \end{figure}
 
 A left-aligned figure:
+
 \begin{figure} % align = "left"
 \noindent\makebox[\textwidth][c]{\includegraphics[width=40px]{../../../docs/user/rst/images/biohazard.png}}
 \caption{This is the caption.}
@@ -986,6 +988,7 @@
 rendering software used.
 
 A centered figure:
+
 \begin{figure}
 \noindent\makebox[\textwidth][c]{\includegraphics[width=40px]{../../../docs/user/rst/images/biohazard.png}}
 \caption{This is the caption.}
@@ -1002,6 +1005,7 @@
 rendering software used.
 
 A right-aligned figure:
+
 \begin{figure} % align = "right"
 \noindent\makebox[\textwidth][c]{\includegraphics[width=40px]{../../../docs/user/rst/images/biohazard.png}}
 \caption{This is the caption.}
@@ -2381,6 +2385,7 @@
 \hline
 \end{longtable}
 \label{table-label}
+
 \begin{figure}
 \phantomsection\label{figure-label}
 \noindent\makebox[\textwidth][c]{\includegraphics{../../../docs/user/rst/images/biohazard.png}}

Modified: trunk/docutils/test/functional/expected/standalone_rst_xetex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_xetex.tex	2013-08-21 22:01:21 UTC (rev 7717)
+++ trunk/docutils/test/functional/expected/standalone_rst_xetex.tex	2013-09-02 15:44:15 UTC (rev 7718)
@@ -937,6 +937,7 @@
 A \emph{figure} is an image with a caption and/or a legend.  With page-based output
 media, figures might float to a different position if this helps the page
 layout.
+
 \begin{figure}
 \noindent\makebox[\textwidth][c]{\includegraphics[width=258bp]{../../../docs/user/rst/images/title.png}}
 \caption{Plaintext markup syntax and parser system.}
@@ -969,6 +970,7 @@
 \end{figure}
 
 A left-aligned figure:
+
 \begin{figure} % align = "left"
 \noindent\makebox[\textwidth][c]{\includegraphics[width=40\pdfpxdimen]{../../../docs/user/rst/images/biohazard.png}}
 \caption{This is the caption.}
@@ -985,6 +987,7 @@
 rendering software used.
 
 A centered figure:
+
 \begin{figure}
 \noindent\makebox[\textwidth][c]{\includegraphics[width=40\pdfpxdimen]{../../../docs/user/rst/images/biohazard.png}}
 \caption{This is the caption.}
@@ -1001,6 +1004,7 @@
 rendering software used.
 
 A right-aligned figure:
+
 \begin{figure} % align = "right"
 \noindent\makebox[\textwidth][c]{\includegraphics[width=40\pdfpxdimen]{../../../docs/user/rst/images/biohazard.png}}
 \caption{This is the caption.}
@@ -2149,6 +2153,7 @@
 \hline
 \end{longtable}
 \label{table-label}
+
 \begin{figure}
 \phantomsection\label{figure-label}
 \noindent\makebox[\textwidth][c]{\includegraphics{../../../docs/user/rst/images/biohazard.png}}

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

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

From: <mi...@us...> - 2013-09-05 09:37:45

Revision: 7719
          http://sourceforge.net/p/docutils/code/7719
Author:   milde
Date:     2013-09-05 09:37:41 +0000 (Thu, 05 Sep 2013)
Log Message:
-----------
LaTeX writer: fix basic syntax highlight definitions for code role and directive.

Modified Paths:
--------------
    trunk/docutils/docutils/writers/latex2e/__init__.py
    trunk/docutils/test/functional/expected/standalone_rst_latex.tex
    trunk/docutils/test/functional/expected/standalone_rst_xetex.tex
    trunk/docutils/test/test_writers/test_latex2e.py

Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py	2013-09-02 15:44:15 UTC (rev 7718)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py	2013-09-05 09:37:41 UTC (rev 7719)
@@ -480,7 +480,7 @@
 
 PreambleCmds.abstract = r"""
 % abstract title
-\providecommand*{\DUtitleabstract}[1]{\centerline{\textbf{#1}}}"""
+\providecommand*{\DUtitleabstract}[1]{\centering\textbf{#1}}"""
 
 PreambleCmds.admonition = r"""
 % admonition (specially marked topic)
@@ -2402,9 +2402,10 @@
 
     def visit_literal(self, node):
         self.literal = True
-        if 'code' in node.get('classes', []):
+        if 'code' in node['classes'] and (
+                    self.settings.syntax_highlight != 'none'):
             self.requirements['color'] = PreambleCmds.color
-            self.requirements['code'] = PreambleCmds.highlight_rules
+            self.fallbacks['code'] = PreambleCmds.highlight_rules
         self.out.append('\\texttt{')
         if node['classes']:
             self.visit_inline(node)
@@ -2446,7 +2447,7 @@
         if not self.active_table.is_open():
             # no quote inside tables, to avoid vertical space between
             # table border and literal block.
-            # BUG: fails if normal text preceeds the literal block.
+            # BUG: fails if normal text precedes the literal block.
             self.out.append('%\n\\begin{quote}')
             self.context.append('\n\\end{quote}\n')
         else:
@@ -2462,6 +2463,10 @@
             self.literal = True
             self.insert_newline = True
             self.insert_non_breaking_blanks = True
+            if 'code' in node['classes'] and (
+                    self.settings.syntax_highlight != 'none'):
+                self.requirements['color'] = PreambleCmds.color
+                self.fallbacks['code'] = PreambleCmds.highlight_rules
             self.out.append('{\\ttfamily \\raggedright \\noindent\n')
 
     def depart_literal_block(self, node):

Modified: trunk/docutils/test/functional/expected/standalone_rst_latex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2013-09-02 15:44:15 UTC (rev 7718)
+++ trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2013-09-05 09:37:41 UTC (rev 7719)
@@ -10,11 +10,6 @@
 % Prevent side-effects if French hyphenation patterns are not loaded:
 \frenchbsetup{StandardLayout}
 \AtBeginDocument{\selectlanguage{english}\noextrasfrench}
-% basic code highlight:
-\providecommand*\DUrolecomment[1]{\textcolor[rgb]{0.40,0.40,0.40}{#1}}
-\providecommand*\DUroledeleted[1]{\textcolor[rgb]{0.40,0.40,0.40}{#1}}
-\providecommand*\DUrolekeyword[1]{\textbf{#1}}
-\providecommand*\DUrolestring[1]{\textit{#1}}
 \usepackage{color}
 \usepackage{float} % float configuration
 \floatplacement{figure}{H} % place figures here definitely
@@ -44,7 +39,7 @@
 }
 
 % abstract title
-\providecommand*{\DUtitleabstract}[1]{\centerline{\textbf{#1}}}
+\providecommand*{\DUtitleabstract}[1]{\centering\textbf{#1}}
 
 % admonition (specially marked topic)
 \providecommand{\DUadmonition}[2][class-arg]{%

Modified: trunk/docutils/test/functional/expected/standalone_rst_xetex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_xetex.tex	2013-09-02 15:44:15 UTC (rev 7718)
+++ trunk/docutils/test/functional/expected/standalone_rst_xetex.tex	2013-09-05 09:37:41 UTC (rev 7719)
@@ -8,11 +8,6 @@
 \usepackage{polyglossia}
 \setdefaultlanguage{english}
 \setotherlanguages{british,french,german}
-% basic code highlight:
-\providecommand*\DUrolecomment[1]{\textcolor[rgb]{0.40,0.40,0.40}{#1}}
-\providecommand*\DUroledeleted[1]{\textcolor[rgb]{0.40,0.40,0.40}{#1}}
-\providecommand*\DUrolekeyword[1]{\textbf{#1}}
-\providecommand*\DUrolestring[1]{\textit{#1}}
 \usepackage{color}
 \usepackage{float} % float configuration
 \floatplacement{figure}{H} % place figures here definitely
@@ -40,7 +35,7 @@
 }
 
 % abstract title
-\providecommand*{\DUtitleabstract}[1]{\centerline{\textbf{#1}}}
+\providecommand*{\DUtitleabstract}[1]{\centering\textbf{#1}}
 
 % admonition (specially marked topic)
 \providecommand{\DUadmonition}[2][class-arg]{%

Modified: trunk/docutils/test/test_writers/test_latex2e.py
===================================================================
--- trunk/docutils/test/test_writers/test_latex2e.py	2013-09-02 15:44:15 UTC (rev 7718)
+++ trunk/docutils/test/test_writers/test_latex2e.py	2013-09-05 09:37:41 UTC (rev 7719)
@@ -61,6 +61,26 @@
 """,
 stylesheet = '',
 fallbacks =  '',
+fallbacks_highlight = r"""% basic code highlight:
+\providecommand*\DUrolecomment[1]{\textcolor[rgb]{0.40,0.40,0.40}{#1}}
+\providecommand*\DUroledeleted[1]{\textcolor[rgb]{0.40,0.40,0.40}{#1}}
+\providecommand*\DUrolekeyword[1]{\textbf{#1}}
+\providecommand*\DUrolestring[1]{\textit{#1}}
+
+% inline markup (custom roles)
+% \DUrole{#1}{#2} tries \DUrole#1{#2}
+\providecommand*{\DUrole}[2]{%
+  \ifcsname DUrole#1\endcsname%
+    \csname DUrole#1\endcsname{#2}%
+  \else% backwards compatibility: try \docutilsrole#1{#2}
+    \ifcsname docutilsrole#1\endcsname%
+      \csname docutilsrole#1\endcsname{#2}%
+    \else%
+      #2%
+    \fi%
+  \fi%
+}
+""",
 pdfsetup = r"""
 % hyperlinks:
 \ifthenelse{\isundefined{\hypersetup}}{
@@ -124,6 +144,17 @@
 """],
 ]
 
+totest['code role'] = [
+[":code:`x=1`",
+head_template.substitute(dict(parts, requirements = parts['requirements']+
+r"""\usepackage{color}
+""", fallbacks = parts['fallbacks_highlight'])) + r"""
+\texttt{\DUrole{code}{x=1}}
+
+\end{document}
+"""],
+]
+
 totest['table_of_contents'] = [
 # input
 ["""\
@@ -485,7 +516,7 @@
 # The "[" needs to be protected (otherwise it will be seen as an
 # option to "\\", "\item", etc. ).
 
-totest['brackett_protection'] = [
+totest['bracket_protection'] = [
 # input
 ["""\
 ::
@@ -549,7 +580,7 @@
 
 This is the *document*.
 """,
-head_template.substitute(dict(parts, 
+head_template.substitute(dict(parts,
     requirements=parts['requirements'] + '\\setcounter{secnumdepth}{0}\n',
     pdfsetup=parts['pdfsetup'] + r"""\hypersetup{
   pdftitle={This is the Title},

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

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

From: <mi...@us...> - 2013-09-28 09:17:11

Revision: 7723
          http://sourceforge.net/p/docutils/code/7723
Author:   milde
Date:     2013-09-28 09:17:07 +0000 (Sat, 28 Sep 2013)
Log Message:
-----------
Fix [ 223 ] by removing redundant tests we do not have control over.

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/test/test_error_reporting.py

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2013-09-28 08:51:39 UTC (rev 7722)
+++ trunk/docutils/HISTORY.txt	2013-09-28 09:17:07 UTC (rev 7723)
@@ -24,6 +24,10 @@
 
   - Apply patch by Jakub Wilk to fix bug [ 100 ].
 
+* test/test_error_reporting.py
+
+  - Fix [ 223 ] by removing redundant tests we do not have control over.
+    
 Release 0.11 (2013-07-22)
 =========================
 

Modified: trunk/docutils/test/test_error_reporting.py
===================================================================
--- trunk/docutils/test/test_error_reporting.py	2013-09-28 08:51:39 UTC (rev 7722)
+++ trunk/docutils/test/test_error_reporting.py	2013-09-28 09:17:07 UTC (rev 7723)
@@ -285,8 +285,8 @@
     ensure that the correct exception is thrown.
     """
 
-    # These tests fail with a 'problematic locale' and
-    # (revision < 7035) and Python-2.
+    # These tests fail with a 'problematic locale',
+    # Docutils revision < 7035, and Python 2:
 
     parser = parsers.rst.Parser()
     """Parser shared by all ParserTestCases."""
@@ -317,23 +317,11 @@
         self.assertRaises(utils.SystemMessage,
                           self.parser.parse, source, self.document)
 
-    def test_raw_url(self):
-        source = ('.. raw:: html\n'
-                  '   :url: http://bogus.html\n')
-        self.assertRaises(utils.SystemMessage,
-                          self.parser.parse, source, self.document)
-
     def test_csv_table(self):
         source = ('.. csv-table:: external file\n'
                   '   :file: bogus.csv\n')
         self.assertRaises(utils.SystemMessage,
                           self.parser.parse, source, self.document)
 
-    def test_csv_table_url(self):
-        source = ('.. csv-table:: external URL\n'
-                  '   :url: ftp://bogus.csv\n')
-        self.assertRaises(utils.SystemMessage,
-                          self.parser.parse, source, self.document)
-
 if __name__ == '__main__':
     unittest.main()

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

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

From: <mi...@us...> - 2014-02-28 14:16:06

Revision: 7745
          http://sourceforge.net/p/docutils/code/7745
Author:   milde
Date:     2014-02-28 14:15:59 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
Apply [ 116 ] by Kirill Smelkov. No hardcode \\\\large for subtitle. 

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docutils/writers/latex2e/__init__.py
    trunk/docutils/test/functional/expected/standalone_rst_latex.tex
    trunk/docutils/test/functional/expected/standalone_rst_xetex.tex
    trunk/docutils/test/test_writers/test_latex2e.py

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2014-02-28 11:02:23 UTC (rev 7744)
+++ trunk/docutils/HISTORY.txt	2014-02-28 14:15:59 UTC (rev 7745)
@@ -19,6 +19,7 @@
 * docutils/writers/latex2e/__init__.py
 
   - Fix [ 239 ] Latex writer glues paragraphs with figure floats.
+  - Apply [ 116 ] by Kirill Smelkov. Don't hardcode \large for subtitle. 
 
 * docutils/writers/odf_odt/__init__.py
 

Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py	2014-02-28 11:02:23 UTC (rev 7744)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py	2014-02-28 14:15:59 UTC (rev 7745)
@@ -658,6 +658,10 @@
 % subtitle (for topic/sidebar)
 \providecommand*{\DUsubtitle}[2][class-arg]{\par\emph{#2}\smallskip}"""
 
+PreambleCmds.documentsubtitle = r"""
+% subtitle (in document title)
+\providecommand*{\DUdocumentsubtitle}[1]{{\large #1}}"""
+
 PreambleCmds.table = r"""\usepackage{longtable,ltcaption,array}
 \setlength{\extrarowheight}{2pt}
 \newlength{\DUtablewidth} % internal use in tables"""
@@ -1903,7 +1907,7 @@
             title = [''.join(self.title)] + self.title_labels
             if self.subtitle:
                 title += [r'\\ % subtitle',
-                             r'\large{%s}' % ''.join(self.subtitle)
+                          r'\DUdocumentsubtitle{%s}' % ''.join(self.subtitle)
                          ] + self.subtitle_labels
             self.titledata.append(r'\title{%s}' % '%\n  '.join(title))
             # \author (empty \author prevents warning with \maketitle)
@@ -2746,6 +2750,7 @@
     def visit_subtitle(self, node):
         if isinstance(node.parent, nodes.document):
             self.push_output_collector(self.subtitle)
+            self.fallbacks['documentsubtitle'] = PreambleCmds.documentsubtitle
             self.subtitle_labels += self.ids_to_labels(node, set_anchor=False)
         # section subtitle: "starred" (no number, not in ToC)
         elif isinstance(node.parent, nodes.section):

Modified: trunk/docutils/test/functional/expected/standalone_rst_latex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2014-02-28 11:02:23 UTC (rev 7744)
+++ trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2014-02-28 14:15:59 UTC (rev 7745)
@@ -64,6 +64,9 @@
 % docinfo (width of docinfo table)
 \DUprovidelength{\DUdocinfowidth}{0.9\textwidth}
 
+% subtitle (in document title)
+\providecommand*{\DUdocumentsubtitle}[1]{{\large #1}}
+
 % error admonition title
 \providecommand*{\DUtitleerror}[1]{\DUtitle{\color{red}#1}}
 
@@ -194,7 +197,7 @@
   \label{restructuredtext-test-document}%
   \label{doctitle}%
   \\ % subtitle%
-  \large{Examples of Syntax Constructs}%
+  \DUdocumentsubtitle{Examples of Syntax Constructs}%
   \label{examples-of-syntax-constructs}%
   \label{subtitle}}
 \author{}

Modified: trunk/docutils/test/functional/expected/standalone_rst_xetex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_xetex.tex	2014-02-28 11:02:23 UTC (rev 7744)
+++ trunk/docutils/test/functional/expected/standalone_rst_xetex.tex	2014-02-28 14:15:59 UTC (rev 7745)
@@ -60,6 +60,9 @@
 % docinfo (width of docinfo table)
 \DUprovidelength{\DUdocinfowidth}{0.9\textwidth}
 
+% subtitle (in document title)
+\providecommand*{\DUdocumentsubtitle}[1]{{\large #1}}
+
 % error admonition title
 \providecommand*{\DUtitleerror}[1]{\DUtitle{\color{red}#1}}
 
@@ -193,7 +196,7 @@
   \label{restructuredtext-test-document}%
   \label{doctitle}%
   \\ % subtitle%
-  \large{Examples of Syntax Constructs}%
+  \DUdocumentsubtitle{Examples of Syntax Constructs}%
   \label{examples-of-syntax-constructs}%
   \label{subtitle}}
 \author{}

Modified: trunk/docutils/test/test_writers/test_latex2e.py
===================================================================
--- trunk/docutils/test/test_writers/test_latex2e.py	2014-02-28 11:02:23 UTC (rev 7744)
+++ trunk/docutils/test/test_writers/test_latex2e.py	2014-02-28 14:15:59 UTC (rev 7745)
@@ -582,6 +582,10 @@
 """,
 head_template.substitute(dict(parts,
     requirements=parts['requirements'] + '\\setcounter{secnumdepth}{0}\n',
+    fallbacks=r"""
+% subtitle (in document title)
+\providecommand*{\DUdocumentsubtitle}[1]{{\large #1}}
+""",
     pdfsetup=parts['pdfsetup'] + r"""\hypersetup{
   pdftitle={This is the Title},
 }
@@ -590,7 +594,7 @@
   This is the \emph{Title}%
   \label{this-is-the-title}%
   \\ % subtitle%
-  \large{This is the \emph{Subtitle}}%
+  \DUdocumentsubtitle{This is the \emph{Subtitle}}%
   \label{this-is-the-subtitle}}
 \author{}
 \date{}

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

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

From: <mi...@us...> - 2014-02-28 14:28:10

Revision: 7746
          http://sourceforge.net/p/docutils/code/7746
Author:   milde
Date:     2014-02-28 14:28:07 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
Apply [ 115 ] mind for fixed 2to3 string literal conversion behavior.

Thanks to Jakub Wilk and Michael Schutte.

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/test/test_nodes.py

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2014-02-28 14:15:59 UTC (rev 7745)
+++ trunk/docutils/HISTORY.txt	2014-02-28 14:28:07 UTC (rev 7746)
@@ -28,7 +28,11 @@
 * test/test_error_reporting.py
 
   - Fix [ 223 ] by removing redundant tests we do not have control over.
-    
+
+* test/test_nodes.py
+
+  - Apply [ 115 ] respect fixed 2to3 string literal conversion behavior.
+      
 Release 0.11 (2013-07-22)
 =========================
 

Modified: trunk/docutils/test/test_nodes.py
===================================================================
--- trunk/docutils/test/test_nodes.py	2014-02-28 14:15:59 UTC (rev 7745)
+++ trunk/docutils/test/test_nodes.py	2014-02-28 14:28:07 UTC (rev 7746)
@@ -92,7 +92,7 @@
         if sys.version_info < (3,):
             self.assertEqual(str(element), '<Element mark="\\u2022"/>')
         else:
-            self.assertEqual(str(element), '<Element mark="\u2022"/>')
+            self.assertEqual(str(element), u'<Element mark="\u2022"/>')
         dom = element.asdom()
         self.assertEqual(dom.toxml(), u'<Element mark="\u2022"/>')
         dom.unlink()

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

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

From: <mi...@us...> - 2014-03-20 10:51:13

Revision: 7747
          http://sourceforge.net/p/docutils/code/7747
Author:   milde
Date:     2014-03-20 10:51:10 +0000 (Thu, 20 Mar 2014)
Log Message:
-----------
Address [ 249 ] and [ 250 ]. CSV table fails on python 2 with unicode.

While the problem of Unicode characters in the options under Python 2 
cannot be solved with reasonable effort, the patch improves error reporting
and documents the limitation.

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docs/ref/rst/directives.txt
    trunk/docutils/docutils/parsers/rst/directives/tables.py

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2014-02-28 14:28:07 UTC (rev 7746)
+++ trunk/docutils/HISTORY.txt	2014-03-20 10:51:10 UTC (rev 7747)
@@ -16,6 +16,16 @@
 Changes Since 0.11
 ==================
 
+* docs/ref/rst/directives.txt
+
+  - Update "math" and "csv-table" descriptions.
+
+* docutils/parsers/rst/states.py
+
+  - Improve error report when a non-ASCII character is specified as
+    delimiter, quote or escape character under Python 2.
+    Fixes [ 249 ] and [ 250 ].
+  
 * docutils/writers/latex2e/__init__.py
 
   - Fix [ 239 ] Latex writer glues paragraphs with figure floats.

Modified: trunk/docutils/docs/ref/rst/directives.txt
===================================================================
--- trunk/docutils/docs/ref/rst/directives.txt	2014-02-28 14:28:07 UTC (rev 7746)
+++ trunk/docutils/docs/ref/rst/directives.txt	2014-03-20 10:51:10 UTC (rev 7747)
@@ -486,7 +486,7 @@
 tokens are stored in nested `inline elements`_ with class arguments
 according to their syntactic category. The actual highlighting requires
 a style-sheet (e.g. one `generated by Pygments`__, see the
-`sandbox/stylesheets`_ for examples).
+`sandbox/stylesheets`__ for examples).
 
 The parsing can be turned off with the syntax_highlight_ configuration
 setting and command line option or by specifying the language as `:class:`_
@@ -515,11 +515,11 @@
 Example::
   The content of the following directive ::
 
-   .. code:: python
+    .. code:: python
 
-    def my_function():
-        "just a test"
-        print 8/2
+      def my_function():
+          "just a test"
+          print 8/2
 
   is parsed and marked up as Python source code.
 
@@ -538,23 +538,28 @@
 
 (New in Docutils 0.8)
 
-The "math" directive inserts block(s) with mathematical content
+The "math" directive inserts blocks 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
-for Unicode symbols, for example::
+*LaTeX math syntax*\ [#math-syntax]_ with support for Unicode
+symbols, for example::
 
   .. math::
 
     α_t(i) = P(O_1, O_2, … O_t, q_t = S_i λ)
 
+Support is limited to a subset of *LaTeX math* by the conversion
+required for many output formats.  For HTML, the the `math_output`_
+configuration setting (or the corresponding ``--math-output``
+command line option) select between alternative output formats with
+different subsets of supported elements. If a writer does not
+support math typesetting at all, the content is inserted verbatim.
+
+.. [#math-syntax] The supported LaTeX commands include AMS extensions
+   (see, e.g., the `Short Math Guide`_).
+
+
 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.
-For HTML, the output format can be set with the `math_output`_
-configuration setting (or the corresponding ``--math-output`` command
-line option).
-
 .. _Short Math Guide: ftp://ftp.ams.org/ams/doc/amsmath/short-math-guide.pdf
 .. _"math" role: roles.html#math
 .. _math_output: ../../user/config.html#math-output
@@ -803,8 +808,6 @@
 
 Working limitations:
 
-* Whitespace delimiters are supported only for external CSV files.
-
 * There is no support for checking that the number of columns in each
   row is the same.  However, this directive supports CSV generators
   that do not insert "empty" entries at the end of short rows, by
@@ -812,6 +815,15 @@
 
   .. Add "strict" option to verify input?
 
+.. [#whitespace-delim] Whitespace delimiters are supported only for external
+   CSV files.
+
+.. [#ASCII-char] With Python 2, the valuess for the ``delimiter``,
+   ``quote``, and ``escape`` options must be ASCII characters. (The csv
+   module does not support Unicode and all non-ASCII characters are
+   encoded as multi-byte utf-8 string). This limitation does not exist
+   under Python 3.
+
 The following options are recognized:
 
 ``widths`` : integer [, integer...]
@@ -841,28 +853,29 @@
     The text encoding of the external CSV data (file or URL).
     Defaults to the document's encoding (if specified).
 
-``delim`` : char | "tab" | "space"
-    A one-character string used to separate fields.  Defaults to ``,``
-    (comma).  May be specified as a Unicode code point; see the
-    unicode_ directive for syntax details.
+``delim`` : char | "tab" | "space" [#whitespace-delim]_
+    A one-character string\ [#ASCII-char]_ used to separate fields.
+    Defaults to ``,`` (comma).  May be specified as a Unicode code
+    point; see the unicode_ directive for syntax details.
 
 ``quote`` : char
-    A one-character string used to quote elements containing the
-    delimiter or which start with the quote character.  Defaults to
-    ``"`` (quote).  May be specified as a Unicode code point; see the
-    unicode_ directive for syntax details.
+    A one-character string\ [#ASCII-char]_ used to quote elements
+    containing the delimiter or which start with the quote
+    character.  Defaults to ``"`` (quote).  May be specified as a
+    Unicode code point; see the unicode_ directive for syntax
+    details.
 
 ``keepspace`` : flag
     Treat whitespace immediately following the delimiter as
     significant.  The default is to ignore such whitespace.
 
 ``escape`` : char
-    A one-character string used to escape the delimiter or quote
-    characters.  May be specified as a Unicode code point; see the
-    unicode_ directive for syntax details.  Used when the delimiter is
-    used in an unquoted field, or when quote characters are used
-    within a field.  The default is to double-up the character,
-    e.g. "He said, ""Hi!"""
+    A one-character\ [#ASCII-char]_ string used to escape the
+    delimiter or quote characters.  May be specified as a Unicode
+    code point; see the unicode_ directive for syntax details.  Used
+    when the delimiter is used in an unquoted field, or when quote
+    characters are used within a field.  The default is to double-up
+    the character, e.g. "He said, ""Hi!"""
 
     .. Add another possible value, "double", to explicitly indicate
        the default case?

Modified: trunk/docutils/docutils/parsers/rst/directives/tables.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/directives/tables.py	2014-02-28 14:28:07 UTC (rev 7746)
+++ trunk/docutils/docutils/parsers/rst/directives/tables.py	2014-03-20 10:51:10 UTC (rev 7747)
@@ -170,14 +170,14 @@
 
         def __init__(self, options):
             if 'delim' in options:
-                self.delimiter = str(options['delim'])
+                self.delimiter = CSVTable.encode_for_csv(options['delim'])
             if 'keepspace' in options:
                 self.skipinitialspace = False
             if 'quote' in options:
-                self.quotechar = str(options['quote'])
+                self.quotechar = CSVTable.encode_for_csv(options['quote'])
             if 'escape' in options:
                 self.doublequote = False
-                self.escapechar = str(options['escape'])
+                self.escapechar = CSVTable.encode_for_csv(options['escape'])
             csv.Dialect.__init__(self)
 
 
@@ -225,9 +225,12 @@
         except SystemMessagePropagation, detail:
             return [detail.args[0]]
         except csv.Error, detail:
+            message = str(detail)
+            if sys.version_info < (3,) and '1-character string' in message:
+                message += '\nwith Python 2.x this must be an ASCII character.'
             error = self.state_machine.reporter.error(
                 'Error with CSV data in "%s" directive:\n%s'
-                % (self.name, detail), nodes.literal_block(
+                % (self.name, message), nodes.literal_block(
                 self.block_text, self.block_text), line=self.lineno)
             return [error]
         table = (col_widths, table_head, table_body)

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

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

From: <mi...@us...> - 2014-05-28 16:02:59

Revision: 7749
          http://sourceforge.net/p/docutils/code/7749
Author:   milde
Date:     2014-05-28 16:02:56 +0000 (Wed, 28 May 2014)
Log Message:
-----------
Do not add newline after inline math (produces unwanted whitespace).
Thanks to Yury G. Kudryashov for the patch.

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docutils/writers/html4css1/__init__.py
    trunk/docutils/test/functional/expected/math_output_html.html
    trunk/docutils/test/functional/expected/math_output_latex.html
    trunk/docutils/test/functional/expected/math_output_mathjax.html
    trunk/docutils/test/functional/expected/standalone_rst_html4css1.html

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2014-05-13 08:33:28 UTC (rev 7748)
+++ trunk/docutils/HISTORY.txt	2014-05-28 16:02:56 UTC (rev 7749)
@@ -25,11 +25,16 @@
   - Improve error report when a non-ASCII character is specified as
     delimiter, quote or escape character under Python 2.
     Fixes [ 249 ] and [ 250 ].
-  
+
+* docutils/writers/html4css1/__init__.py
+
+  - Don't add newline after inline math.
+    Thanks to Yury G. Kudryashov for the patch.
+
 * docutils/writers/latex2e/__init__.py
 
   - Fix [ 239 ] Latex writer glues paragraphs with figure floats.
-  - Apply [ 116 ] by Kirill Smelkov. Don't hardcode \large for subtitle. 
+  - Apply [ 116 ] by Kirill Smelkov. Don't hardcode \large for subtitle.
 
 * docutils/writers/odf_odt/__init__.py
 
@@ -42,7 +47,7 @@
 * test/test_nodes.py
 
   - Apply [ 115 ] respect fixed 2to3 string literal conversion behavior.
-      
+
 Release 0.11 (2013-07-22)
 =========================
 

Modified: trunk/docutils/docutils/writers/html4css1/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html4css1/__init__.py	2014-05-13 08:33:28 UTC (rev 7748)
+++ trunk/docutils/docutils/writers/html4css1/__init__.py	2014-05-28 16:02:56 UTC (rev 7749)
@@ -1245,10 +1245,12 @@
                                            suffix='\n'*bool(math_env),
                                            CLASS=clsarg))
         self.body.append(math_code)
+        if math_env: # block mode (equation, display)
+            self.body.append('\n')
+        if tag:
+            self.body.append('</%s>' % tag)
         if math_env:
             self.body.append('\n')
-        if tag:
-            self.body.append('</%s>\n' % tag)
         # Content already processed:
         raise nodes.SkipNode
 

Modified: trunk/docutils/test/functional/expected/math_output_html.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_html.html	2014-05-13 08:33:28 UTC (rev 7748)
+++ trunk/docutils/test/functional/expected/math_output_html.html	2014-05-28 16:02:56 UTC (rev 7749)
@@ -13,9 +13,7 @@
 <h1 class="title">Mathematics</h1>
 
 <p>Docutils supports inline math with the prefix or postfix <tt class="docutils literal">:math:</tt>
-role specificator, <span class="formula"><i>n</i>! + sin(<i>x</i><span class="scripts"><sup class="script">2</sup><sub class="script"><i>n</i></sub></span>)</span>
- and <span class="formula"><i>A</i><sub><span class="text">c</span></sub> = <span class="fraction"><span class="ignored">(</span><span class="numerator"><i>π</i></span><span class="ignored">)/(</span><span class="denominator">4</span><span class="ignored">)</span></span><i>d</i><sup>2</sup></span>
-, as well as displayed math via the
+role specificator, <span class="formula"><i>n</i>! + sin(<i>x</i><span class="scripts"><sup class="script">2</sup><sub class="script"><i>n</i></sub></span>)</span> and <span class="formula"><i>A</i><sub><span class="text">c</span></sub> = <span class="fraction"><span class="ignored">(</span><span class="numerator"><i>π</i></span><span class="ignored">)/(</span><span class="denominator">4</span><span class="ignored">)</span></span><i>d</i><sup>2</sup></span>, as well as displayed math via the
 <cite>math</cite> directive:</p>
 <div class="formula">
 <i>f</i>(<i>ϵ</i>) = <span class="fraction"><span class="ignored">(</span><span class="numerator">1</span><span class="ignored">)/(</span><span class="denominator">1 + exp<span class="array"><span class="arrayrow"><span class="bracket align-left">⎛</span></span><span class="arrayrow"><span class="bracket align-left">⎝</span></span></span><span class="fraction"><span class="ignored">(</span><span class="numerator"><i>ε</i></span><span class="ignored">)/(</span><span class="denominator"><i>k</i><sub><span class="text">B</span></sub><i>T</i></span><span class="ignored">)</span></span><span class="array"><span class="arrayrow"><span class="bracket align-right">⎞</span></span><span class="arrayrow"><span class="bracket align-right">⎠</span></span></span></span><span class="ignored">)</span></span>
@@ -57,8 +55,7 @@
 </span>
 </span><span class="array"><span class="arrayrow"><span class="bracket align-right">⎞</span></span><span class="arrayrow"><span class="bracket align-right">⎟</span></span><span class="arrayrow"><span class="bracket align-right">⎠</span></span></span>
 </div>
-<p>is <span class="formula">|<b>M</b>| = <i>ad</i> − <i>bc</i></span>
-.</p>
+<p>is <span class="formula">|<b>M</b>| = <i>ad</i> − <i>bc</i></span>.</p>
 <p>More than one display math block can be put in one math directive.
 For example, the following sum and integral with limits:</p>
 <div class="formula">
@@ -73,8 +70,7 @@
 <div class="formula" id="eq-schrodinger">
 <i>i</i>ℏ<span class="fraction"><span class="ignored">(</span><span class="numerator">∂</span><span class="ignored">)/(</span><span class="denominator">∂<i>t</i></span><span class="ignored">)</span></span>Ψ = <i>Ĥ</i>Ψ, 
 </div>
-<p>with the <em>wave function</em> <span class="formula">Ψ</span>
-, describes how the quantum state of a
+<p>with the <em>wave function</em> <span class="formula">Ψ</span>, describes how the quantum state of a
 physical system changes in time.</p>
 <dl class="docutils">
 <dt>Math-Accents:</dt>
@@ -85,33 +81,21 @@
 <col width="33%" />
 </colgroup>
 <tbody valign="top">
-<tr><td><span class="formula"><i>á</i></span>
-      <tt class="docutils literal">\acute{a}</tt></td>
-<td><span class="formula"><i>ṫ</i></span>
-        <tt class="docutils literal">\dot{t}</tt></td>
-<td><span class="formula"><i>γ̂</i></span>
-   <tt class="docutils literal"><span class="pre">\hat{\gamma}</span></tt></td>
+<tr><td><span class="formula"><i>á</i></span>      <tt class="docutils literal">\acute{a}</tt></td>
+<td><span class="formula"><i>ṫ</i></span>        <tt class="docutils literal">\dot{t}</tt></td>
+<td><span class="formula"><i>γ̂</i></span>   <tt class="docutils literal"><span class="pre">\hat{\gamma}</span></tt></td>
 </tr>
-<tr><td><span class="formula"><i>à</i></span>
-      <tt class="docutils literal">\grave{a}</tt></td>
-<td><span class="formula"><i>ẗ</i></span>
-       <tt class="docutils literal">\ddot{t}</tt></td>
-<td><span class="formula"><i>α̃</i></span>
- <tt class="docutils literal"><span class="pre">\tilde{\alpha}</span></tt></td>
+<tr><td><span class="formula"><i>à</i></span>      <tt class="docutils literal">\grave{a}</tt></td>
+<td><span class="formula"><i>ẗ</i></span>       <tt class="docutils literal">\ddot{t}</tt></td>
+<td><span class="formula"><i>α̃</i></span> <tt class="docutils literal"><span class="pre">\tilde{\alpha}</span></tt></td>
 </tr>
-<tr><td><span class="formula"><i>x̆</i></span>
-      <tt class="docutils literal">\breve{x}</tt></td>
-<td><span class="formula"><i>t⃛</i></span>
-      <tt class="docutils literal">\dddot{t}</tt></td>
-<td><span class="formula"><i>ı⃗</i></span>
-   <tt class="docutils literal"><span class="pre">\vec{\imath}</span></tt></td>
+<tr><td><span class="formula"><i>x̆</i></span>      <tt class="docutils literal">\breve{x}</tt></td>
+<td><span class="formula"><i>t⃛</i></span>      <tt class="docutils literal">\dddot{t}</tt></td>
+<td><span class="formula"><i>ı⃗</i></span>   <tt class="docutils literal"><span class="pre">\vec{\imath}</span></tt></td>
 </tr>
-<tr><td><span class="formula"><i>ǎ</i></span>
-      <tt class="docutils literal">\check{a}</tt></td>
-<td><span class="formula"><span class="bar"><i>a</i></span></span>
-        <tt class="docutils literal">\bar{a}</tt></td>
-<td><span class="formula"><i>R⃗</i></span>
-        <tt class="docutils literal">\vec{R}</tt></td>
+<tr><td><span class="formula"><i>ǎ</i></span>      <tt class="docutils literal">\check{a}</tt></td>
+<td><span class="formula"><span class="bar"><i>a</i></span></span>        <tt class="docutils literal">\bar{a}</tt></td>
+<td><span class="formula"><i>R⃗</i></span>        <tt class="docutils literal">\vec{R}</tt></td>
 </tr>
 </tbody>
 </table>

Modified: trunk/docutils/test/functional/expected/math_output_latex.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_latex.html	2014-05-13 08:33:28 UTC (rev 7748)
+++ trunk/docutils/test/functional/expected/math_output_latex.html	2014-05-28 16:02:56 UTC (rev 7749)
@@ -12,10 +12,8 @@
 <h1 class="title">Mathematics</h1>
 
 <p>Docutils supports inline math with the prefix or postfix <tt class="docutils literal">:math:</tt>
-role specificator, <tt class="math">n! + \sin(x_n^2)</tt>
- and <tt class="math">A_\text{c} =
-\frac{\pi}{4} d^2</tt>
-, as well as displayed math via the
+role specificator, <tt class="math">n! + \sin(x_n^2)</tt> and <tt class="math">A_\text{c} =
+\frac{\pi}{4} d^2</tt>, as well as displayed math via the
 <cite>math</cite> directive:</p>
 <pre class="math">
 f(\epsilon) = \frac{1}{1 + \exp\left(\frac{\varepsilon}{k_\text{B}T}\right)}
@@ -30,8 +28,7 @@
 <pre class="math" id="eq-m">
 \mathbf{M} = \left(\begin{matrix}a&amp;b\\c&amp;d\end{matrix}\right)
 </pre>
-<p>is <tt class="math">|\mathbf{M}| = ad - bc</tt>
-.</p>
+<p>is <tt class="math">|\mathbf{M}| = ad - bc</tt>.</p>
 <p>More than one display math block can be put in one math directive.
 For example, the following sum and integral with limits:</p>
 <pre class="math">
@@ -46,8 +43,7 @@
 <pre class="math" id="eq-schrodinger">
 i\hbar \frac{\partial }{\partial t}\Psi  = \hat{H}\Psi ,
 </pre>
-<p>with the <em>wave function</em> <tt class="math">\Psi </tt>
-, describes how the quantum state of a
+<p>with the <em>wave function</em> <tt class="math">\Psi </tt>, describes how the quantum state of a
 physical system changes in time.</p>
 <dl class="docutils">
 <dt>Math-Accents:</dt>
@@ -58,33 +54,21 @@
 <col width="33%" />
 </colgroup>
 <tbody valign="top">
-<tr><td><tt class="math">\acute{a}</tt>
-      <tt class="docutils literal">\acute{a}</tt></td>
-<td><tt class="math">\dot{t}</tt>
-        <tt class="docutils literal">\dot{t}</tt></td>
-<td><tt class="math">\hat{\gamma}</tt>
-   <tt class="docutils literal"><span class="pre">\hat{\gamma}</span></tt></td>
+<tr><td><tt class="math">\acute{a}</tt>      <tt class="docutils literal">\acute{a}</tt></td>
+<td><tt class="math">\dot{t}</tt>        <tt class="docutils literal">\dot{t}</tt></td>
+<td><tt class="math">\hat{\gamma}</tt>   <tt class="docutils literal"><span class="pre">\hat{\gamma}</span></tt></td>
 </tr>
-<tr><td><tt class="math">\grave{a}</tt>
-      <tt class="docutils literal">\grave{a}</tt></td>
-<td><tt class="math">\ddot{t}</tt>
-       <tt class="docutils literal">\ddot{t}</tt></td>
-<td><tt class="math">\tilde{\alpha}</tt>
- <tt class="docutils literal"><span class="pre">\tilde{\alpha}</span></tt></td>
+<tr><td><tt class="math">\grave{a}</tt>      <tt class="docutils literal">\grave{a}</tt></td>
+<td><tt class="math">\ddot{t}</tt>       <tt class="docutils literal">\ddot{t}</tt></td>
+<td><tt class="math">\tilde{\alpha}</tt> <tt class="docutils literal"><span class="pre">\tilde{\alpha}</span></tt></td>
 </tr>
-<tr><td><tt class="math">\breve{x}</tt>
-      <tt class="docutils literal">\breve{x}</tt></td>
-<td><tt class="math">\dddot{t}</tt>
-      <tt class="docutils literal">\dddot{t}</tt></td>
-<td><tt class="math">\vec{\imath}</tt>
-   <tt class="docutils literal"><span class="pre">\vec{\imath}</span></tt></td>
+<tr><td><tt class="math">\breve{x}</tt>      <tt class="docutils literal">\breve{x}</tt></td>
+<td><tt class="math">\dddot{t}</tt>      <tt class="docutils literal">\dddot{t}</tt></td>
+<td><tt class="math">\vec{\imath}</tt>   <tt class="docutils literal"><span class="pre">\vec{\imath}</span></tt></td>
 </tr>
-<tr><td><tt class="math">\check{a}</tt>
-      <tt class="docutils literal">\check{a}</tt></td>
-<td><tt class="math">\bar{a}</tt>
-        <tt class="docutils literal">\bar{a}</tt></td>
-<td><tt class="math">\vec{R}</tt>
-        <tt class="docutils literal">\vec{R}</tt></td>
+<tr><td><tt class="math">\check{a}</tt>      <tt class="docutils literal">\check{a}</tt></td>
+<td><tt class="math">\bar{a}</tt>        <tt class="docutils literal">\bar{a}</tt></td>
+<td><tt class="math">\vec{R}</tt>        <tt class="docutils literal">\vec{R}</tt></td>
 </tr>
 </tbody>
 </table>

Modified: trunk/docutils/test/functional/expected/math_output_mathjax.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathjax.html	2014-05-13 08:33:28 UTC (rev 7748)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html	2014-05-28 16:02:56 UTC (rev 7749)
@@ -13,10 +13,8 @@
 <h1 class="title">Mathematics</h1>
 
 <p>Docutils supports inline math with the prefix or postfix <tt class="docutils literal">:math:</tt>
-role specificator, <span class="math">\(n! + \sin(x_n^2)\)</span>
- and <span class="math">\(A_\text{c} =
-\frac{\pi}{4} d^2\)</span>
-, as well as displayed math via the
+role specificator, <span class="math">\(n! + \sin(x_n^2)\)</span> and <span class="math">\(A_\text{c} =
+\frac{\pi}{4} d^2\)</span>, as well as displayed math via the
 <cite>math</cite> directive:</p>
 <div class="math">
 \begin{equation*}
@@ -37,8 +35,7 @@
 \mathbf{M} = \left(\begin{matrix}a&amp;b\\c&amp;d\end{matrix}\right)
 \end{equation*}
 </div>
-<p>is <span class="math">\(|\mathbf{M}| = ad - bc\)</span>
-.</p>
+<p>is <span class="math">\(|\mathbf{M}| = ad - bc\)</span>.</p>
 <p>More than one display math block can be put in one math directive.
 For example, the following sum and integral with limits:</p>
 <div class="math">
@@ -59,8 +56,7 @@
 i\hbar \frac{\partial }{\partial t}\Psi  = \hat{H}\Psi ,
 \end{equation*}
 </div>
-<p>with the <em>wave function</em> <span class="math">\(\Psi \)</span>
-, describes how the quantum state of a
+<p>with the <em>wave function</em> <span class="math">\(\Psi \)</span>, describes how the quantum state of a
 physical system changes in time.</p>
 <dl class="docutils">
 <dt>Math-Accents:</dt>
@@ -71,33 +67,21 @@
 <col width="33%" />
 </colgroup>
 <tbody valign="top">
-<tr><td><span class="math">\(\acute{a}\)</span>
-      <tt class="docutils literal">\acute{a}</tt></td>
-<td><span class="math">\(\dot{t}\)</span>
-        <tt class="docutils literal">\dot{t}</tt></td>
-<td><span class="math">\(\hat{\gamma}\)</span>
-   <tt class="docutils literal"><span class="pre">\hat{\gamma}</span></tt></td>
+<tr><td><span class="math">\(\acute{a}\)</span>      <tt class="docutils literal">\acute{a}</tt></td>
+<td><span class="math">\(\dot{t}\)</span>        <tt class="docutils literal">\dot{t}</tt></td>
+<td><span class="math">\(\hat{\gamma}\)</span>   <tt class="docutils literal"><span class="pre">\hat{\gamma}</span></tt></td>
 </tr>
-<tr><td><span class="math">\(\grave{a}\)</span>
-      <tt class="docutils literal">\grave{a}</tt></td>
-<td><span class="math">\(\ddot{t}\)</span>
-       <tt class="docutils literal">\ddot{t}</tt></td>
-<td><span class="math">\(\tilde{\alpha}\)</span>
- <tt class="docutils literal"><span class="pre">\tilde{\alpha}</span></tt></td>
+<tr><td><span class="math">\(\grave{a}\)</span>      <tt class="docutils literal">\grave{a}</tt></td>
+<td><span class="math">\(\ddot{t}\)</span>       <tt class="docutils literal">\ddot{t}</tt></td>
+<td><span class="math">\(\tilde{\alpha}\)</span> <tt class="docutils literal"><span class="pre">\tilde{\alpha}</span></tt></td>
 </tr>
-<tr><td><span class="math">\(\breve{x}\)</span>
-      <tt class="docutils literal">\breve{x}</tt></td>
-<td><span class="math">\(\dddot{t}\)</span>
-      <tt class="docutils literal">\dddot{t}</tt></td>
-<td><span class="math">\(\vec{\imath}\)</span>
-   <tt class="docutils literal"><span class="pre">\vec{\imath}</span></tt></td>
+<tr><td><span class="math">\(\breve{x}\)</span>      <tt class="docutils literal">\breve{x}</tt></td>
+<td><span class="math">\(\dddot{t}\)</span>      <tt class="docutils literal">\dddot{t}</tt></td>
+<td><span class="math">\(\vec{\imath}\)</span>   <tt class="docutils literal"><span class="pre">\vec{\imath}</span></tt></td>
 </tr>
-<tr><td><span class="math">\(\check{a}\)</span>
-      <tt class="docutils literal">\check{a}</tt></td>
-<td><span class="math">\(\bar{a}\)</span>
-        <tt class="docutils literal">\bar{a}</tt></td>
-<td><span class="math">\(\vec{R}\)</span>
-        <tt class="docutils literal">\vec{R}</tt></td>
+<tr><td><span class="math">\(\check{a}\)</span>      <tt class="docutils literal">\check{a}</tt></td>
+<td><span class="math">\(\bar{a}\)</span>        <tt class="docutils literal">\bar{a}</tt></td>
+<td><span class="math">\(\vec{R}\)</span>        <tt class="docutils literal">\vec{R}</tt></td>
 </tr>
 </tbody>
 </table>

Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2014-05-13 08:33:28 UTC (rev 7748)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2014-05-28 16:02:56 UTC (rev 7749)
@@ -862,8 +862,7 @@
 or as base for special code roles, e.g. the LaTeX code in the next
 paragraph.</p>
 <p>Docutils uses LaTeX syntax for math directives and roles:
-<code class="tex">\alpha = f(x)</code> prints <span class="formula"><i>α</i> = <i>f</i>(<i>x</i>)</span>
-.</p>
+<code class="tex">\alpha = f(x)</code> prints <span class="formula"><i>α</i> = <i>f</i>(<i>x</i>)</span>.</p>
 <p>The <tt class="docutils literal">:code:</tt> option of the <cite>include</cite> directive sets the included content
 as a code block, here the rst file <tt class="docutils literal">header_footer.txt</tt> with line numbers:</p>
 <pre class="code rst literal-block">

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

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

From: <mi...@us...> - 2014-06-24 14:53:03

Revision: 7753
          http://sourceforge.net/p/docutils/code/7753
Author:   milde
Date:     2014-06-24 14:52:59 +0000 (Tue, 24 Jun 2014)
Log Message:
-----------
Fix [258] figwidth="image" generates unitless width value.

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docutils/parsers/rst/directives/images.py
    trunk/docutils/docutils/writers/html4css1/__init__.py

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2014-06-17 07:32:24 UTC (rev 7752)
+++ trunk/docutils/HISTORY.txt	2014-06-24 14:52:59 UTC (rev 7753)
@@ -20,6 +20,10 @@
 
   - Update "math" and "csv-table" descriptions.
 
+* docutils/parsers/rst/directives/images.py
+
+  - Fix [258] figwidth="image" generates unitless width value.
+  
 * docutils/parsers/rst/states.py
 
   - Improve error report when a non-ASCII character is specified as

Modified: trunk/docutils/docutils/parsers/rst/directives/images.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/directives/images.py	2014-06-17 07:32:24 UTC (rev 7752)
+++ trunk/docutils/docutils/parsers/rst/directives/images.py	2014-06-24 14:52:59 UTC (rev 7753)
@@ -134,7 +134,7 @@
                 else:
                     self.state.document.settings.record_dependencies.add(
                         imagepath.replace('\\', '/'))
-                    figure_node['width'] = img.size[0]
+                    figure_node['width'] = '%dpx' % img.size[0]
                     del img
         elif figwidth is not None:
             figure_node['width'] = figwidth

Modified: trunk/docutils/docutils/writers/html4css1/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html4css1/__init__.py	2014-06-17 07:32:24 UTC (rev 7752)
+++ trunk/docutils/docutils/writers/html4css1/__init__.py	2014-06-24 14:52:59 UTC (rev 7753)
@@ -1047,9 +1047,9 @@
                     self.settings.record_dependencies.add(
                         imagepath.replace('\\', '/'))
                     if 'width' not in atts:
-                        atts['width'] = str(img.size[0])
+                        atts['width'] = '%dpx' % img.size[0]
                     if 'height' not in atts:
-                        atts['height'] = str(img.size[1])
+                        atts['height'] = '%dpx' % img.size[1]
                     del img
             for att_name in 'width', 'height':
                 if att_name in atts:

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

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

From: <gr...@us...> - 2014-07-06 11:48:42

Revision: 7757
          http://sourceforge.net/p/docutils/code/7757
Author:   grubert
Date:     2014-07-06 11:48:38 +0000 (Sun, 06 Jul 2014)
Log Message:
-----------
Release 0.12: closed "Changes Since ..." section

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/RELEASE-NOTES.txt

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2014-07-06 11:48:05 UTC (rev 7756)
+++ trunk/docutils/HISTORY.txt	2014-07-06 11:48:38 UTC (rev 7757)
@@ -13,8 +13,8 @@
 
 .. contents::
 
-Changes Since 0.11
-==================
+Release 0.12 (2014-07-06)
+=========================
 
 * docs/ref/rst/directives.txt
 

Modified: trunk/docutils/RELEASE-NOTES.txt
===================================================================
--- trunk/docutils/RELEASE-NOTES.txt	2014-07-06 11:48:05 UTC (rev 7756)
+++ trunk/docutils/RELEASE-NOTES.txt	2014-07-06 11:48:38 UTC (rev 7757)
@@ -37,8 +37,8 @@
 .. _Porting Python 2 Code to Python 3: https://docs.python.org/3/howto/pyporting.html
 .. _future\: clean single-source support for Python 2/3: http://python-future.org
 
-Changes Since 0.11
-==================
+Release 0.12 (2014-07-06)
+=========================
 
 
 Release 0.11 (2013-07-22)

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

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

From: <gr...@us...> - 2014-07-06 12:38:46

Revision: 7762
          http://sourceforge.net/p/docutils/code/7762
Author:   grubert
Date:     2014-07-06 12:38:39 +0000 (Sun, 06 Jul 2014)
Log Message:
-----------
Release 0.12: added empty "Changes Since 0.12" section

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/RELEASE-NOTES.txt

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2014-07-06 12:38:11 UTC (rev 7761)
+++ trunk/docutils/HISTORY.txt	2014-07-06 12:38:39 UTC (rev 7762)
@@ -13,6 +13,10 @@
 
 .. contents::
 
+Changes Since 0.12
+==================
+
+
 Release 0.12 (2014-07-06)
 =========================
 

Modified: trunk/docutils/RELEASE-NOTES.txt
===================================================================
--- trunk/docutils/RELEASE-NOTES.txt	2014-07-06 12:38:11 UTC (rev 7761)
+++ trunk/docutils/RELEASE-NOTES.txt	2014-07-06 12:38:39 UTC (rev 7762)
@@ -37,6 +37,10 @@
 .. _Porting Python 2 Code to Python 3: https://docs.python.org/3/howto/pyporting.html
 .. _future\: clean single-source support for Python 2/3: http://python-future.org
 
+Changes Since 0.12
+==================
+
+
 Release 0.12 (2014-07-06)
 =========================
 

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

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

From: <gr...@us...> - 2014-07-06 12:39:47

Revision: 7763
          http://sourceforge.net/p/docutils/code/7763
Author:   grubert
Date:     2014-07-06 12:39:44 +0000 (Sun, 06 Jul 2014)
Log Message:
-----------
Release 0.12: set version number to 0.13

Modified Paths:
--------------
    trunk/docutils/docutils/__init__.py
    trunk/docutils/setup.py
    trunk/docutils/test/functional/expected/compact_lists.html
    trunk/docutils/test/functional/expected/dangerous.html
    trunk/docutils/test/functional/expected/field_name_limit.html
    trunk/docutils/test/functional/expected/math_output_html.html
    trunk/docutils/test/functional/expected/math_output_latex.html
    trunk/docutils/test/functional/expected/math_output_mathjax.html
    trunk/docutils/test/functional/expected/math_output_mathml.xhtml
    trunk/docutils/test/functional/expected/misc_rst_html4css1.html
    trunk/docutils/test/functional/expected/pep_html.html
    trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
    trunk/docutils/test/functional/expected/standalone_rst_latex.tex
    trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
    trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html

Modified: trunk/docutils/docutils/__init__.py
===================================================================
--- trunk/docutils/docutils/__init__.py	2014-07-06 12:38:39 UTC (rev 7762)
+++ trunk/docutils/docutils/__init__.py	2014-07-06 12:39:44 UTC (rev 7763)
@@ -52,7 +52,7 @@
 
 __docformat__ = 'reStructuredText'
 
-__version__ = '0.12'
+__version__ = '0.13'
 """``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: trunk/docutils/setup.py
===================================================================
--- trunk/docutils/setup.py	2014-07-06 12:38:39 UTC (rev 7762)
+++ trunk/docutils/setup.py	2014-07-06 12:39:44 UTC (rev 7763)
@@ -113,7 +113,7 @@
 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.12',
+    'version': '0.13',
     'author': 'David Goodger',
     'author_email': 'go...@py...',
     'maintainer': 'docutils-develop list',

Modified: trunk/docutils/test/functional/expected/compact_lists.html
===================================================================
--- trunk/docutils/test/functional/expected/compact_lists.html	2014-07-06 12:38:39 UTC (rev 7762)
+++ trunk/docutils/test/functional/expected/compact_lists.html	2014-07-06 12:39:44 UTC (rev 7763)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" />
 <title></title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/dangerous.html
===================================================================
--- trunk/docutils/test/functional/expected/dangerous.html	2014-07-06 12:38:39 UTC (rev 7762)
+++ trunk/docutils/test/functional/expected/dangerous.html	2014-07-06 12:39:44 UTC (rev 7763)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" />
 <title></title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/field_name_limit.html
===================================================================
--- trunk/docutils/test/functional/expected/field_name_limit.html	2014-07-06 12:38:39 UTC (rev 7762)
+++ trunk/docutils/test/functional/expected/field_name_limit.html	2014-07-06 12:39:44 UTC (rev 7763)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" />
 <title></title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/math_output_html.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_html.html	2014-07-06 12:38:39 UTC (rev 7762)
+++ trunk/docutils/test/functional/expected/math_output_html.html	2014-07-06 12:39:44 UTC (rev 7763)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 <link rel="stylesheet" href="../input/data/math.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_output_latex.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_latex.html	2014-07-06 12:38:39 UTC (rev 7762)
+++ trunk/docutils/test/functional/expected/math_output_latex.html	2014-07-06 12:39:44 UTC (rev 7763)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/math_output_mathjax.html
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathjax.html	2014-07-06 12:38:39 UTC (rev 7762)
+++ trunk/docutils/test/functional/expected/math_output_mathjax.html	2014-07-06 12:39:44 UTC (rev 7763)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" />
 <title>Mathematics</title>
 <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />

Modified: trunk/docutils/test/functional/expected/math_output_mathml.xhtml
===================================================================
--- trunk/docutils/test/functional/expected/math_output_mathml.xhtml	2014-07-06 12:38:39 UTC (rev 7762)
+++ trunk/docutils/test/functional/expected/math_output_mathml.xhtml	2014-07-06 12:39:44 UTC (rev 7763)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
-<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" />
 <title>Mathematics</title>
 <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/misc_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/misc_rst_html4css1.html	2014-07-06 12:38:39 UTC (rev 7762)
+++ trunk/docutils/test/functional/expected/misc_rst_html4css1.html	2014-07-06 12:39:44 UTC (rev 7763)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" />
 <title></title>
 <link rel="stylesheet" href="foo&amp;bar.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/pep_html.html
===================================================================
--- trunk/docutils/test/functional/expected/pep_html.html	2014-07-06 12:38:39 UTC (rev 7762)
+++ trunk/docutils/test/functional/expected/pep_html.html	2014-07-06 12:39:44 UTC (rev 7763)
@@ -8,7 +8,7 @@
 -->
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
+  <meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" />
   <title>PEP 100 -- Test PEP</title>
   <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
 </head>

Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2014-07-06 12:38:39 UTC (rev 7762)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2014-07-06 12:39:44 UTC (rev 7763)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" />
 <title>reStructuredText Test Document</title>
 <meta name="author" content="David Goodger" />
 <meta name="authors" content="Me  Myself  I" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_latex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2014-07-06 12:38:39 UTC (rev 7762)
+++ trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2014-07-06 12:39:44 UTC (rev 7763)
@@ -1724,7 +1724,7 @@
 A multicolumn table with multi-paragraph rowspanning cells:
 
 \setlength{\DUtablewidth}{\linewidth}
-\begin{longtable*}[c]{|p{0.133\DUtablewidth}|p{0.179\DUtablewidth}|p{0.179\DUtablewidth}|p{0.110\DUtablewidth}|p{0.121\DUtablewidth}|p{0.145\DUtablewidth}|}
+\begin{longtable*}[c]{|p{0.133\DUtablewidth}|p{0.179\DUtablewidth}|p{0.179\DUtablewidth}|p{0.110\DUtablewidth}|p{0.131\DUtablewidth}|p{0.145\DUtablewidth}|}
 \hline
 
 test

Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html	2014-07-06 12:38:39 UTC (rev 7762)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html	2014-07-06 12:39:44 UTC (rev 7763)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" />
 <meta name="version" content="S5 1.1" />
 <title>Slide Shows</title>
 <meta name="author" content="David Goodger" />

Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html	2014-07-06 12:38:39 UTC (rev 7762)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html	2014-07-06 12:39:44 UTC (rev 7763)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" />
 <meta name="version" content="S5 1.1" />
 <title>Slide Shows</title>
 <meta name="author" content="David Goodger" />

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

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

From: <gr...@us...> - 2014-07-07 02:36:42

Revision: 7768
          http://sourceforge.net/p/docutils/code/7768
Author:   grubert
Date:     2014-07-07 02:36:36 +0000 (Mon, 07 Jul 2014)
Log Message:
-----------
Fix link to bug tracker

Modified Paths:
--------------
    trunk/docutils/BUGS.txt
    trunk/docutils/README.txt
    trunk/docutils/docs/howto/i18n.txt

Modified: trunk/docutils/BUGS.txt
===================================================================
--- trunk/docutils/BUGS.txt	2014-07-06 20:46:37 UTC (rev 7767)
+++ trunk/docutils/BUGS.txt	2014-07-07 02:36:36 UTC (rev 7768)
@@ -124,7 +124,7 @@
 .. _mailing list archives: http://docutils.sf.net/#mailing-lists
 .. _Docutils-users: docs/user/mailing-lists.html#docutils-users
 .. _SourceForge Bug Tracker:
-   http://sourceforge.net/tracker/?group_id=38414&atid=422030
+   http://sourceforge.net/p/docutils/bugs/
 
 
 Known Bugs

Modified: trunk/docutils/README.txt
===================================================================
--- trunk/docutils/README.txt	2014-07-06 20:46:37 UTC (rev 7767)
+++ trunk/docutils/README.txt	2014-07-07 02:36:36 UTC (rev 7768)
@@ -371,7 +371,7 @@
 
 .. _Docutils Testing: http://docutils.sourceforge.net/docs/dev/testing.html
 .. _open a bug report:
-   http://sourceforge.net/tracker/?group_id=38414&atid=422030
+   http://sourceforge.net/p/docutils/bugs/
 .. _send email: mailto:doc...@li...
    ?subject=Test%20suite%20failure
 .. _web interface: http://post.gmane.org/post.php

Modified: trunk/docutils/docs/howto/i18n.txt
===================================================================
--- trunk/docutils/docs/howto/i18n.txt	2014-07-06 20:46:37 UTC (rev 7767)
+++ trunk/docutils/docs/howto/i18n.txt	2014-07-07 02:36:36 UTC (rev 7768)
@@ -34,7 +34,7 @@
 .. [#] If anything in Docutils is insufficiently parameterized, it
    should be considered a bug.  Please report bugs to the Docutils
    project bug tracker on SourceForge at
-   http://sourceforge.net/tracker/?group_id=38414&atid=422030.
+   http://sourceforge.net/p/docutils/bugs/
 
 .. _Docutils: http://docutils.sourceforge.net/
 .. _Introduction to i18n:
@@ -193,4 +193,4 @@
 language modules, feel free to submit them via the `SourceForge patch
 tracker`__.
 
-__ http://sourceforge.net/tracker/?group_id=38414&atid=422032
+__ http://sourceforge.net/p/docutils/patches/

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

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

From: <gr...@us...> - 2014-10-21 14:08:11

Revision: 7774
          http://sourceforge.net/p/docutils/code/7774
Author:   grubert
Date:     2014-10-21 14:07:59 +0000 (Tue, 21 Oct 2014)
Log Message:
-----------
change link to vim vst plugin (bug #242)

Modified Paths:
--------------
    trunk/docutils/docs/user/links.txt
    trunk/docutils/tools/editors/README.txt

Modified: trunk/docutils/docs/user/links.txt
===================================================================
--- trunk/docutils/docs/user/links.txt	2014-10-08 15:08:29 UTC (rev 7773)
+++ trunk/docutils/docs/user/links.txt	2014-10-21 14:07:59 UTC (rev 7774)
@@ -33,13 +33,16 @@
   - `reStructuredText syntax highlighting mode
     <http://www.vim.org/scripts/script.php?script_id=973>`__,
 
-  - `VST <http://skawina.eu.org/mikolaj/vst.html>`__ (Vim reStructuredText)
-    plugin for Vim7 with folding.
+  - `VST <http://www.vim.org/scripts/script.php?script_id=1334>`__ (Vim 
+    reStructuredText) plugin for Vim7 with folding.
 
   - `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).
 
+  - `Riv: Take notes in rst <https://github.com/Rykka/riv.vim>`__ Vim
+    plugin to take notes in reStructured text.
+
 * `JED <http://www.jedsoft.org/jed/>`__ programmers editor with
   `rst mode <http://jedmodes.sf.net/mode/rst/>`__
 

Modified: trunk/docutils/tools/editors/README.txt
===================================================================
--- trunk/docutils/tools/editors/README.txt	2014-10-08 15:08:29 UTC (rev 7773)
+++ trunk/docutils/tools/editors/README.txt	2014-10-21 14:07:59 UTC (rev 7774)
@@ -16,7 +16,7 @@
   <http://www.vim.org/scripts/script.php?script_id=973>`__
 
 * `VST (Vim reStructured Text) is a plugin for Vim7 with folding for
-  reST <http://skawina.eu.org/mikolaj/vst.html>`__
+  reST <http://www.vim.org/scripts/script.php?script_id=1334>`__
 
 * `rst mode <http://jedmodes.sf.net/mode/rst/>`__ for the `JED`_
   programmers editor

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

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

From: <mi...@us...> - 2014-11-10 16:03:42

Revision: 7775
          http://sourceforge.net/p/docutils/code/7775
Author:   milde
Date:     2014-11-10 16:03:33 +0000 (Mon, 10 Nov 2014)
Log Message:
-----------
Fix [ 262 ] 

Use ``\\\\linewidth`` instead of ``\\\\textwidth`` for figures, admonitions and docinfo.

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docutils/writers/latex2e/__init__.py
    trunk/docutils/test/functional/expected/standalone_rst_latex.tex
    trunk/docutils/test/functional/expected/standalone_rst_xetex.tex

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2014-10-21 14:07:59 UTC (rev 7774)
+++ trunk/docutils/HISTORY.txt	2014-11-10 16:03:33 UTC (rev 7775)
@@ -16,7 +16,11 @@
 Changes Since 0.12
 ==================
 
+* docutils/writers/latex2e/__init__.py
 
+  - Fix [ 262 ] Use ``\linewidth`` instead of ``\textwidth`` for figures,
+    admonitions and docinfo.
+
 Release 0.12 (2014-07-06)
 =========================
 
@@ -26,7 +30,7 @@
 
 * docutils/parsers/rst/directives/images.py
 
-  - Fix [258] figwidth="image" generates unitless width value.
+  - Fix [ 258 ] figwidth="image" generates unitless width value.
   
 * docutils/parsers/rst/states.py
 

Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py	2014-10-21 14:07:59 UTC (rev 7774)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py	2014-11-10 16:03:33 UTC (rev 7775)
@@ -490,7 +490,7 @@
     \csname DUadmonition#1\endcsname{#2}%
   \else
     \begin{center}
-      \fbox{\parbox{0.9\textwidth}{#2}}
+      \fbox{\parbox{0.9\linewidth}{#2}}
     \end{center}
   \fi
 }"""
@@ -509,7 +509,7 @@
 
 PreambleCmds.docinfo = r"""
 % docinfo (width of docinfo table)
-\DUprovidelength{\DUdocinfowidth}{0.9\textwidth}"""
+\DUprovidelength{\DUdocinfowidth}{0.9\linewidth}"""
 # PreambleCmds.docinfo._depends = 'providelength'
 
 PreambleCmds.dedication = r"""
@@ -650,7 +650,7 @@
 % sidebar (text outside the main text flow)
 \providecommand{\DUsidebar}[2][class-arg]{%
   \begin{center}
-    \colorbox[gray]{0.80}{\parbox{0.9\textwidth}{#2}}
+    \colorbox[gray]{0.80}{\parbox{0.9\linewidth}{#2}}
   \end{center}
 }"""
 
@@ -2139,7 +2139,7 @@
         # for "inner alignment" use LaTeX default alignment (similar to HTML)
         alignment = node.attributes.get('align', 'center')
         if alignment != 'center':
-            # The LaTeX "figure" environment always uses the full textwidth,
+            # The LaTeX "figure" environment always uses the full linewidth,
             # so "outer alignment" is ignored. Just write a comment.
             # TODO: use the wrapfigure environment?
             self.out.append('\n\\begin{figure} %% align = "%s"\n' % alignment)
@@ -2306,7 +2306,7 @@
             'middle': (r'\raisebox{-0.5\height}{', '}'),
             'top':    (r'\raisebox{-\height}{', '}'),
             # block level images:
-            'center': (r'\noindent\makebox[\textwidth][c]{', '}'),
+            'center': (r'\noindent\makebox[\linewidth][c]{', '}'),
             'left':   (r'\noindent{', r'\hfill}'),
             'right':  (r'\noindent{\hfill', '}'),}
         if 'align' in attrs:

Modified: trunk/docutils/test/functional/expected/standalone_rst_latex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2014-10-21 14:07:59 UTC (rev 7774)
+++ trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2014-11-10 16:03:33 UTC (rev 7775)
@@ -48,7 +48,7 @@
     \csname DUadmonition#1\endcsname{#2}%
   \else
     \begin{center}
-      \fbox{\parbox{0.9\textwidth}{#2}}
+      \fbox{\parbox{0.9\linewidth}{#2}}
     \end{center}
   \fi
 }
@@ -62,7 +62,7 @@
 \providecommand{\DUtopicdedication}[1]{\begin{center}#1\end{center}}
 
 % docinfo (width of docinfo table)
-\DUprovidelength{\DUdocinfowidth}{0.9\textwidth}
+\DUprovidelength{\DUdocinfowidth}{0.9\linewidth}
 
 % subtitle (in document title)
 \providecommand*{\DUdocumentsubtitle}[1]{{\large #1}}
@@ -146,7 +146,7 @@
 % sidebar (text outside the main text flow)
 \providecommand{\DUsidebar}[2][class-arg]{%
   \begin{center}
-    \colorbox[gray]{0.80}{\parbox{0.9\textwidth}{#2}}
+    \colorbox[gray]{0.80}{\parbox{0.9\linewidth}{#2}}
   \end{center}
 }
 
@@ -895,7 +895,7 @@
 
 A centered image:
 
-\noindent\makebox[\textwidth][c]{\includegraphics{../../../docs/user/rst/images/biohazard.png}}
+\noindent\makebox[\linewidth][c]{\includegraphics{../../../docs/user/rst/images/biohazard.png}}
 
 A left-aligned image:
 
@@ -938,7 +938,7 @@
 layout.
 
 \begin{figure}
-\noindent\makebox[\textwidth][c]{\includegraphics[width=258bp]{../../../docs/user/rst/images/title.png}}
+\noindent\makebox[\linewidth][c]{\includegraphics[width=258bp]{../../../docs/user/rst/images/title.png}}
 \caption{Plaintext markup syntax and parser system.}
 \begin{DUlegend}
 \setlength{\DUtablewidth}{\linewidth}
@@ -971,7 +971,7 @@
 A left-aligned figure:
 
 \begin{figure} % align = "left"
-\noindent\makebox[\textwidth][c]{\includegraphics[width=40px]{../../../docs/user/rst/images/biohazard.png}}
+\noindent\makebox[\linewidth][c]{\includegraphics[width=40px]{../../../docs/user/rst/images/biohazard.png}}
 \caption{This is the caption.}
 \begin{DUlegend}
 This is the legend.
@@ -988,7 +988,7 @@
 A centered figure:
 
 \begin{figure}
-\noindent\makebox[\textwidth][c]{\includegraphics[width=40px]{../../../docs/user/rst/images/biohazard.png}}
+\noindent\makebox[\linewidth][c]{\includegraphics[width=40px]{../../../docs/user/rst/images/biohazard.png}}
 \caption{This is the caption.}
 \begin{DUlegend}
 This is the legend.
@@ -1005,7 +1005,7 @@
 A right-aligned figure:
 
 \begin{figure} % align = "right"
-\noindent\makebox[\textwidth][c]{\includegraphics[width=40px]{../../../docs/user/rst/images/biohazard.png}}
+\noindent\makebox[\linewidth][c]{\includegraphics[width=40px]{../../../docs/user/rst/images/biohazard.png}}
 \caption{This is the caption.}
 \begin{DUlegend}
 This is the legend.
@@ -2386,7 +2386,7 @@
 
 \begin{figure}
 \phantomsection\label{figure-label}
-\noindent\makebox[\textwidth][c]{\includegraphics{../../../docs/user/rst/images/biohazard.png}}
+\noindent\makebox[\linewidth][c]{\includegraphics{../../../docs/user/rst/images/biohazard.png}}
 \caption{Figure with %
 \label{hypertarget-in-figure-caption}hypertarget in figure caption.}
 \begin{DUlegend}

Modified: trunk/docutils/test/functional/expected/standalone_rst_xetex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_xetex.tex	2014-10-21 14:07:59 UTC (rev 7774)
+++ trunk/docutils/test/functional/expected/standalone_rst_xetex.tex	2014-11-10 16:03:33 UTC (rev 7775)
@@ -44,7 +44,7 @@
     \csname DUadmonition#1\endcsname{#2}%
   \else
     \begin{center}
-      \fbox{\parbox{0.9\textwidth}{#2}}
+      \fbox{\parbox{0.9\linewidth}{#2}}
     \end{center}
   \fi
 }
@@ -58,7 +58,7 @@
 \providecommand{\DUtopicdedication}[1]{\begin{center}#1\end{center}}
 
 % docinfo (width of docinfo table)
-\DUprovidelength{\DUdocinfowidth}{0.9\textwidth}
+\DUprovidelength{\DUdocinfowidth}{0.9\linewidth}
 
 % subtitle (in document title)
 \providecommand*{\DUdocumentsubtitle}[1]{{\large #1}}
@@ -145,7 +145,7 @@
 % sidebar (text outside the main text flow)
 \providecommand{\DUsidebar}[2][class-arg]{%
   \begin{center}
-    \colorbox[gray]{0.80}{\parbox{0.9\textwidth}{#2}}
+    \colorbox[gray]{0.80}{\parbox{0.9\linewidth}{#2}}
   \end{center}
 }
 
@@ -894,7 +894,7 @@
 
 A centered image:
 
-\noindent\makebox[\textwidth][c]{\includegraphics{../../../docs/user/rst/images/biohazard.png}}
+\noindent\makebox[\linewidth][c]{\includegraphics{../../../docs/user/rst/images/biohazard.png}}
 
 A left-aligned image:
 
@@ -937,7 +937,7 @@
 layout.
 
 \begin{figure}
-\noindent\makebox[\textwidth][c]{\includegraphics[width=258bp]{../../../docs/user/rst/images/title.png}}
+\noindent\makebox[\linewidth][c]{\includegraphics[width=258bp]{../../../docs/user/rst/images/title.png}}
 \caption{Plaintext markup syntax and parser system.}
 \begin{DUlegend}
 \setlength{\DUtablewidth}{\linewidth}
@@ -970,7 +970,7 @@
 A left-aligned figure:
 
 \begin{figure} % align = "left"
-\noindent\makebox[\textwidth][c]{\includegraphics[width=40\pdfpxdimen]{../../../docs/user/rst/images/biohazard.png}}
+\noindent\makebox[\linewidth][c]{\includegraphics[width=40\pdfpxdimen]{../../../docs/user/rst/images/biohazard.png}}
 \caption{This is the caption.}
 \begin{DUlegend}
 This is the legend.
@@ -987,7 +987,7 @@
 A centered figure:
 
 \begin{figure}
-\noindent\makebox[\textwidth][c]{\includegraphics[width=40\pdfpxdimen]{../../../docs/user/rst/images/biohazard.png}}
+\noindent\makebox[\linewidth][c]{\includegraphics[width=40\pdfpxdimen]{../../../docs/user/rst/images/biohazard.png}}
 \caption{This is the caption.}
 \begin{DUlegend}
 This is the legend.
@@ -1004,7 +1004,7 @@
 A right-aligned figure:
 
 \begin{figure} % align = "right"
-\noindent\makebox[\textwidth][c]{\includegraphics[width=40\pdfpxdimen]{../../../docs/user/rst/images/biohazard.png}}
+\noindent\makebox[\linewidth][c]{\includegraphics[width=40\pdfpxdimen]{../../../docs/user/rst/images/biohazard.png}}
 \caption{This is the caption.}
 \begin{DUlegend}
 This is the legend.
@@ -2154,7 +2154,7 @@
 
 \begin{figure}
 \phantomsection\label{figure-label}
-\noindent\makebox[\textwidth][c]{\includegraphics{../../../docs/user/rst/images/biohazard.png}}
+\noindent\makebox[\linewidth][c]{\includegraphics{../../../docs/user/rst/images/biohazard.png}}
 \caption{Figure with %
 \label{hypertarget-in-figure-caption}hypertarget in figure caption.}
 \begin{DUlegend}

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

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

From: <gr...@us...> - 2015-02-08 23:21:25

Revision: 7784
          http://sourceforge.net/p/docutils/code/7784
Author:   grubert
Date:     2015-02-08 23:21:18 +0000 (Sun, 08 Feb 2015)
Log Message:
-----------
non csv-tables accept option widths 

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/THANKS.txt
    trunk/docutils/docutils/parsers/rst/directives/tables.py
    trunk/docutils/test/test_parsers/test_rst/test_directives/test_tables.py

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2015-01-13 16:45:41 UTC (rev 7783)
+++ trunk/docutils/HISTORY.txt	2015-02-08 23:21:18 UTC (rev 7784)
@@ -21,6 +21,10 @@
   - Fix [ 262 ] Use ``\linewidth`` instead of ``\textwidth`` for figures,
     admonitions and docinfo.
 
+* docutils/parsers/rst/directives/tables.py
+
+  - non-csv tables accept widths, patch [120] .1 
+
 Release 0.12 (2014-07-06)
 =========================
 

Modified: trunk/docutils/THANKS.txt
===================================================================
--- trunk/docutils/THANKS.txt	2015-01-13 16:45:41 UTC (rev 7783)
+++ trunk/docutils/THANKS.txt	2015-02-08 23:21:18 UTC (rev 7784)
@@ -92,6 +92,7 @@
 * Wolfgang Lipp
 * Edward Loper
 * Dallas Mahrt
+* Brecht Machiels
 * Mikolaj Machowski
 * Ken Manheimer
 * Bob Marshall

Modified: trunk/docutils/docutils/parsers/rst/directives/tables.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/directives/tables.py	2015-01-13 16:45:41 UTC (rev 7783)
+++ trunk/docutils/docutils/parsers/rst/directives/tables.py	2015-02-08 23:21:18 UTC (rev 7784)
@@ -29,7 +29,8 @@
     optional_arguments = 1
     final_argument_whitespace = True
     option_spec = {'class': directives.class_option,
-                   'name': directives.unchanged}
+                   'name': directives.unchanged,
+                   'widths': directives.positive_int_list}
     has_content = True
 
     def make_title(self):
@@ -85,7 +86,7 @@
                     self.block_text, self.block_text), line=self.lineno)
                 raise SystemMessagePropagation(error)
 
-    def get_column_widths(self, max_cols):
+    def get_column_widths_from_option(self, max_cols):
         if 'widths' in self.options:
             col_widths = self.options['widths']
             if len(col_widths) != max_cols:
@@ -94,6 +95,12 @@
                     '(%s).' % (self.name, max_cols), nodes.literal_block(
                     self.block_text, self.block_text), line=self.lineno)
                 raise SystemMessagePropagation(error)
+            return col_widths
+
+    def get_column_widths(self, max_cols):
+        col_widths_from_option = self.get_column_widths_from_option(max_cols)
+        if col_widths_from_option:
+            col_widths = col_widths_from_option
         elif max_cols:
             col_widths = [100 // max_cols] * max_cols
         else:
@@ -130,6 +137,13 @@
             return [error]
         table_node = node[0]
         table_node['classes'] += self.options.get('class', [])
+        tgroup = table_node[0]
+        colspecs = [child for child in tgroup.children
+                    if child.tagname == 'colspec']
+        col_widths = self.get_column_widths_from_option(len(colspecs))
+        if col_widths:
+            for colspec, col_width in zip(colspecs, col_widths):
+                colspec['colwidth'] = col_width
         self.add_name(table_node)
         if title:
             table_node.insert(0, title)

Modified: trunk/docutils/test/test_parsers/test_rst/test_directives/test_tables.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_directives/test_tables.py	2015-01-13 16:45:41 UTC (rev 7783)
+++ trunk/docutils/test/test_parsers/test_rst/test_directives/test_tables.py	2015-02-08 23:21:18 UTC (rev 7784)
@@ -184,6 +184,52 @@
         <literal_block xml:space="preserve">
             .. table:: empty
 """],
+["""\
+.. table::
+    :widths: 15, 25
+
+    ============ ==============
+    Columns with custom widths.
+    ============ ==============
+""",
+"""\
+<document source="test data">
+    <table>
+        <tgroup cols="2">
+            <colspec colwidth="15">
+            <colspec colwidth="25">
+            <tbody>
+                <row>
+                    <entry>
+                        <paragraph>
+                            Columns with
+                    <entry>
+                        <paragraph>
+                            custom widths.
+"""],
+["""\
+.. table::
+    :widths: 10, 20
+
+    +--------------+----------------+
+    | Columns with | custom widths. |
+    +--------------+----------------+
+""",
+"""\
+<document source="test data">
+    <table>
+        <tgroup cols="2">
+            <colspec colwidth="10">
+            <colspec colwidth="20">
+            <tbody>
+                <row>
+                    <entry>
+                        <paragraph>
+                            Columns with
+                    <entry>
+                        <paragraph>
+                            custom widths.
+"""],
 ]
 
 totest['csv-table'] = [

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

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

From: <gr...@us...> - 2015-02-08 23:51:54

Revision: 7785
          http://sourceforge.net/p/docutils/code/7785
Author:   grubert
Date:     2015-02-08 23:51:45 +0000 (Sun, 08 Feb 2015)
Log Message:
-----------
patch [120] 0002 tables accept option widths: list of relative widths, 'auto'  
    or 'grid'

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docutils/parsers/rst/directives/__init__.py
    trunk/docutils/docutils/parsers/rst/directives/tables.py
    trunk/docutils/docutils/parsers/rst/states.py
    trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt
    trunk/docutils/test/test_parsers/test_rst/test_directives/test_figures.py
    trunk/docutils/test/test_parsers/test_rst/test_directives/test_include.py
    trunk/docutils/test/test_parsers/test_rst/test_directives/test_tables.py
    trunk/docutils/test/test_parsers/test_rst/test_east_asian_text.py
    trunk/docutils/test/test_parsers/test_rst/test_tables.py

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/HISTORY.txt	2015-02-08 23:51:45 UTC (rev 7785)
@@ -23,7 +23,8 @@
 
 * docutils/parsers/rst/directives/tables.py
 
-  - non-csv tables accept widths, patch [120] .1 
+  - patch [120] tables accept option widths: list of relative widths, 'auto' 
+    or 'grid'.
 
 Release 0.12 (2014-07-06)
 =========================

Modified: trunk/docutils/docutils/parsers/rst/directives/__init__.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/directives/__init__.py	2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/docutils/parsers/rst/directives/__init__.py	2015-02-08 23:51:45 UTC (rev 7785)
@@ -402,3 +402,15 @@
 def format_values(values):
     return '%s, or "%s"' % (', '.join(['"%s"' % s for s in values[:-1]]),
                             values[-1])
+
+def value_or(values, other):
+    """
+    The argument can be any of `values` or `argument_type`.
+    """
+    def auto_or_other(argument):
+        if argument in values:
+            return argument
+        else:
+            return other(argument)
+    return auto_or_other
+

Modified: trunk/docutils/docutils/parsers/rst/directives/tables.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/directives/tables.py	2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/docutils/parsers/rst/directives/tables.py	2015-02-08 23:51:45 UTC (rev 7785)
@@ -30,7 +30,8 @@
     final_argument_whitespace = True
     option_spec = {'class': directives.class_option,
                    'name': directives.unchanged,
-                   'widths': directives.positive_int_list}
+                   'widths': directives.value_or(('auto', 'grid'),
+                                                 directives.positive_int_list)}
     has_content = True
 
     def make_title(self):
@@ -86,21 +87,19 @@
                     self.block_text, self.block_text), line=self.lineno)
                 raise SystemMessagePropagation(error)
 
-    def get_column_widths_from_option(self, max_cols):
-        if 'widths' in self.options:
-            col_widths = self.options['widths']
-            if len(col_widths) != max_cols:
+    @property
+    def widths(self):
+        return self.options.get('widths', 'auto')
+
+    def get_column_widths(self, max_cols):
+        if type(self.widths) == list:
+            if len(self.widths) != max_cols:
                 error = self.state_machine.reporter.error(
                     '"%s" widths do not match the number of columns in table '
                     '(%s).' % (self.name, max_cols), nodes.literal_block(
                     self.block_text, self.block_text), line=self.lineno)
                 raise SystemMessagePropagation(error)
-            return col_widths
-
-    def get_column_widths(self, max_cols):
-        col_widths_from_option = self.get_column_widths_from_option(max_cols)
-        if col_widths_from_option:
-            col_widths = col_widths_from_option
+            col_widths = self.widths
         elif max_cols:
             col_widths = [100 // max_cols] * max_cols
         else:
@@ -108,7 +107,8 @@
                 'No table data detected in CSV file.', nodes.literal_block(
                 self.block_text, self.block_text), line=self.lineno)
             raise SystemMessagePropagation(error)
-        return col_widths
+        widths = 'auto' if self.widths == 'auto' else 'given'
+        return widths, col_widths
 
     def extend_short_rows_with_empty_cells(self, columns, parts):
         for part in parts:
@@ -138,12 +138,12 @@
         table_node = node[0]
         table_node['classes'] += self.options.get('class', [])
         tgroup = table_node[0]
-        colspecs = [child for child in tgroup.children
-                    if child.tagname == 'colspec']
-        col_widths = self.get_column_widths_from_option(len(colspecs))
-        if col_widths:
-            for colspec, col_width in zip(colspecs, col_widths):
+        if type(self.widths) == list:
+            colspecs = [child for child in tgroup.children
+                        if child.tagname == 'colspec']
+            for colspec, col_width in zip(colspecs, self.widths):
                 colspec['colwidth'] = col_width
+        tgroup['colwidths'] = 'auto' if self.widths == 'auto' else 'given'
         self.add_name(table_node)
         if title:
             table_node.insert(0, title)
@@ -155,7 +155,8 @@
     option_spec = {'header-rows': directives.nonnegative_int,
                    'stub-columns': directives.nonnegative_int,
                    'header': directives.unchanged,
-                   'widths': directives.positive_int_list,
+                   'widths': directives.value_or(('auto', ),
+                                                 directives.positive_int_list),
                    'file': directives.path,
                    'url': directives.uri,
                    'encoding': directives.encoding,
@@ -233,7 +234,7 @@
             self.check_table_dimensions(rows, header_rows, stub_columns)
             table_head.extend(rows[:header_rows])
             table_body = rows[header_rows:]
-            col_widths = self.get_column_widths(max_cols)
+            widths, col_widths = self.get_column_widths(max_cols)
             self.extend_short_rows_with_empty_cells(max_cols,
                                                     (table_head, table_body))
         except SystemMessagePropagation, detail:
@@ -249,7 +250,7 @@
             return [error]
         table = (col_widths, table_head, table_body)
         table_node = self.state.build_table(table, self.content_offset,
-                                            stub_columns)
+                                            stub_columns, widths=widths)
         table_node['classes'] += self.options.get('class', [])
         self.add_name(table_node)
         if title:
@@ -374,7 +375,8 @@
 
     option_spec = {'header-rows': directives.nonnegative_int,
                    'stub-columns': directives.nonnegative_int,
-                   'widths': directives.positive_int_list,
+                   'widths': directives.value_or(('auto', ),
+                                                 directives.positive_int_list),
                    'class': directives.class_option,
                    'name': directives.unchanged}
 
@@ -389,7 +391,7 @@
         node = nodes.Element()          # anonymous container for parsing
         self.state.nested_parse(self.content, self.content_offset, node)
         try:
-            num_cols, col_widths = self.check_list_content(node)
+            num_cols, widths, col_widths = self.check_list_content(node)
             table_data = [[item.children for item in row_list[0]]
                           for row_list in node[0]]
             header_rows = self.options.get('header-rows', 0)
@@ -397,7 +399,7 @@
             self.check_table_dimensions(table_data, header_rows, stub_columns)
         except SystemMessagePropagation, detail:
             return [detail.args[0]]
-        table_node = self.build_table_from_list(table_data, col_widths,
+        table_node = self.build_table_from_list(table_data, widths, col_widths,
                                                 header_rows, stub_columns)
         table_node['classes'] += self.options.get('class', [])
         self.add_name(table_node)
@@ -441,15 +443,18 @@
                     raise SystemMessagePropagation(error)
             else:
                 num_cols = len(item[0])
-        col_widths = self.get_column_widths(num_cols)
-        return num_cols, col_widths
+        widths, col_widths = self.get_column_widths(num_cols)
+        return num_cols, widths, col_widths
 
-    def build_table_from_list(self, table_data, col_widths, header_rows, stub_columns):
+    def build_table_from_list(self, table_data, widths, col_widths, header_rows,
+                              stub_columns):
         table = nodes.table()
-        tgroup = nodes.tgroup(cols=len(col_widths))
+        tgroup = nodes.tgroup(cols=len(col_widths), colwidths=widths)
         table += tgroup
         for col_width in col_widths:
-            colspec = nodes.colspec(colwidth=col_width)
+            colspec = nodes.colspec()
+            if col_width is not None:
+                colspec.attributes['colwidth'] = col_width
             if stub_columns:
                 colspec.attributes['stub'] = 1
                 stub_columns -= 1

Modified: trunk/docutils/docutils/parsers/rst/states.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/states.py	2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/docutils/parsers/rst/states.py	2015-02-08 23:51:45 UTC (rev 7785)
@@ -1747,10 +1747,10 @@
                                     line=startline+offset)
         return [error]
 
-    def build_table(self, tabledata, tableline, stub_columns=0):
+    def build_table(self, tabledata, tableline, stub_columns=0, widths='auto'):
         colwidths, headrows, bodyrows = tabledata
         table = nodes.table()
-        tgroup = nodes.tgroup(cols=len(colwidths))
+        tgroup = nodes.tgroup(cols=len(colwidths), colwidths=widths)
         table += tgroup
         for colwidth in colwidths:
             colspec = nodes.colspec(colwidth=colwidth)

Modified: trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt	2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt	2015-02-08 23:51:45 UTC (rev 7785)
@@ -1288,7 +1288,7 @@
                         Plaintext markup syntax and parser system.
                     <legend>
                         <table>
-                            <tgroup cols="2">
+                            <tgroup cols="2" colwidths="auto">
                                 <colspec colwidth="12">
                                 <colspec colwidth="47">
                                 <tbody>
@@ -1558,7 +1558,7 @@
                     <paragraph>
                         Compound 7, with a table inside:
                     <table>
-                        <tgroup cols="3">
+                        <tgroup cols="3" colwidths="auto">
                             <colspec colwidth="20">
                             <colspec colwidth="20">
                             <colspec colwidth="20">
@@ -1768,7 +1768,7 @@
             <paragraph>
                 This table has a cell spanning two columns:
             <table>
-                <tgroup cols="3">
+                <tgroup cols="3" colwidths="auto">
                     <colspec colwidth="5">
                     <colspec colwidth="5">
                     <colspec colwidth="6">
@@ -1839,7 +1839,7 @@
             <paragraph>
                 Here's a table with cells spanning several rows:
             <table>
-                <tgroup cols="3">
+                <tgroup cols="3" colwidths="auto">
                     <colspec colwidth="24">
                     <colspec colwidth="12">
                     <colspec colwidth="18">
@@ -1891,7 +1891,7 @@
             <paragraph>
                 Here's a complex table, which should test all features.
             <table>
-                <tgroup cols="4">
+                <tgroup cols="4" colwidths="auto">
                     <colspec colwidth="24">
                     <colspec colwidth="12">
                     <colspec colwidth="10">
@@ -1978,7 +1978,7 @@
             <table classes="test">
                 <title>
                     list table with integral header
-                <tgroup cols="3">
+                <tgroup cols="3" colwidths="given">
                     <colspec colwidth="10" stub="1">
                     <colspec colwidth="20">
                     <colspec colwidth="30">

Modified: trunk/docutils/test/test_parsers/test_rst/test_directives/test_figures.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_directives/test_figures.py	2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/test/test_parsers/test_rst/test_directives/test_figures.py	2015-02-08 23:51:45 UTC (rev 7785)
@@ -173,7 +173,7 @@
             A picture with a caption and a legend.
         <legend>
             <table>
-                <tgroup cols="2">
+                <tgroup cols="2" colwidths="auto">
                     <colspec colwidth="23">
                     <colspec colwidth="23">
                     <thead>

Modified: trunk/docutils/test/test_parsers/test_rst/test_directives/test_include.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_directives/test_include.py	2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/test/test_parsers/test_rst/test_directives/test_include.py	2015-02-08 23:51:45 UTC (rev 7785)
@@ -531,7 +531,7 @@
                 section underline too short
                 -----
         <table>
-            <tgroup cols="2">
+            <tgroup cols="2" colwidths="auto">
                 <colspec colwidth="14">
                 <colspec colwidth="6">
                 <thead>

Modified: trunk/docutils/test/test_parsers/test_rst/test_directives/test_tables.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_directives/test_tables.py	2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/test/test_parsers/test_rst/test_directives/test_tables.py	2015-02-08 23:51:45 UTC (rev 7785)
@@ -71,7 +71,7 @@
     <table classes="custom" ids="tab-truth-not" names="tab:truth.not">
         <title>
             Truth table for "not"
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="5">
             <colspec colwidth="5">
             <thead>
@@ -109,7 +109,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="10">
             <colspec colwidth="10">
             <tbody>
@@ -143,7 +143,7 @@
             <problematic ids="id2" refid="id1">
                 *
             error
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="6">
             <colspec colwidth="5">
             <tbody>
@@ -195,7 +195,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="given">
             <colspec colwidth="15">
             <colspec colwidth="25">
             <tbody>
@@ -218,7 +218,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="given">
             <colspec colwidth="10">
             <colspec colwidth="20">
             <tbody>
@@ -230,6 +230,52 @@
                         <paragraph>
                             custom widths.
 """],
+["""\
+.. table::
+    :widths: auto
+
+    +--------------+-------------------+
+    | Columns with | automatic widths. |
+    +--------------+-------------------+
+""",
+"""\
+<document source="test data">
+    <table>
+        <tgroup cols="2" colwidths="auto">
+            <colspec colwidth="14">
+            <colspec colwidth="19">
+            <tbody>
+                <row>
+                    <entry>
+                        <paragraph>
+                            Columns with
+                    <entry>
+                        <paragraph>
+                            automatic widths.
+"""],
+["""\
+.. table::
+    :widths: grid
+
+    +--------------+-------------------+
+    | Columns with | automatic widths. |
+    +--------------+-------------------+
+""",
+"""\
+<document source="test data">
+    <table>
+        <tgroup cols="2" colwidths="given">
+            <colspec colwidth="14">
+            <colspec colwidth="19">
+            <tbody>
+                <row>
+                    <entry>
+                        <paragraph>
+                            Columns with
+                    <entry>
+                        <paragraph>
+                            automatic widths.
+"""],
 ]
 
 totest['csv-table'] = [
@@ -250,7 +296,7 @@
     <table>
         <title>
             inline with integral header
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="given">
             <colspec colwidth="10" stub="1">
             <colspec colwidth="20">
             <colspec colwidth="30">
@@ -310,7 +356,7 @@
     <table>
         <title>
             inline with separate header
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="given">
             <colspec colwidth="10">
             <colspec colwidth="20">
             <colspec colwidth="30">
@@ -354,7 +400,7 @@
     <table>
         <title>
             complex internal structure
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="auto">
             <colspec colwidth="33">
             <colspec colwidth="33">
             <colspec colwidth="33">
@@ -408,7 +454,7 @@
     <table>
         <title>
             short rows
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="auto">
             <colspec colwidth="33">
             <colspec colwidth="33">
             <colspec colwidth="33">
@@ -445,7 +491,7 @@
     <table>
         <title>
             short rows
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="auto">
             <colspec colwidth="33">
             <colspec colwidth="33">
             <colspec colwidth="33">
@@ -486,7 +532,7 @@
     <table>
         <title>
             non-ASCII characters
-        <tgroup cols="1">
+        <tgroup cols="1" colwidths="auto">
             <colspec colwidth="100">
             <tbody>
                 <row>
@@ -584,7 +630,7 @@
             <problematic ids="id2" refid="id1">
                 *
             title
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="auto">
             <colspec colwidth="33">
             <colspec colwidth="33">
             <colspec colwidth="33">
@@ -709,7 +755,7 @@
     <table>
         <title>
             good delimiter
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="auto">
             <colspec colwidth="33">
             <colspec colwidth="33">
             <colspec colwidth="33">
@@ -727,7 +773,7 @@
     <table>
         <title>
             good delimiter
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="auto">
             <colspec colwidth="33">
             <colspec colwidth="33">
             <colspec colwidth="33">
@@ -745,7 +791,7 @@
     <table>
         <title>
             good delimiter
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="auto">
             <colspec colwidth="33">
             <colspec colwidth="33">
             <colspec colwidth="33">
@@ -763,7 +809,7 @@
     <table>
         <title>
             good delimiter
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="auto">
             <colspec colwidth="33">
             <colspec colwidth="33">
             <colspec colwidth="33">
@@ -870,7 +916,7 @@
     <table>
         <title>
             good encoding
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="auto">
             <colspec colwidth="33">
             <colspec colwidth="33">
             <colspec colwidth="33">
@@ -959,7 +1005,7 @@
     <table>
         <title>
             list table with integral header
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="given">
             <colspec colwidth="10" stub="1">
             <colspec colwidth="20">
             <colspec colwidth="30">
@@ -1008,6 +1054,123 @@
                             On a stick!
 """],
 ["""\
+.. list-table:: list table with integral header
+   :widths: auto
+   :header-rows: 1
+   :stub-columns: 1
+
+   * - Treat
+     - Quantity
+     - Description
+   * - Albatross
+     - 2.99
+     - On a stick!
+""",
+"""\
+<document source="test data">
+    <table>
+        <title>
+            list table with integral header
+        <tgroup cols="3" colwidths="auto">
+            <colspec colwidth="33" stub="1">
+            <colspec colwidth="33">
+            <colspec colwidth="33">
+            <thead>
+                <row>
+                    <entry>
+                        <paragraph>
+                            Treat
+                    <entry>
+                        <paragraph>
+                            Quantity
+                    <entry>
+                        <paragraph>
+                            Description
+            <tbody>
+                <row>
+                    <entry>
+                        <paragraph>
+                            Albatross
+                    <entry>
+                        <paragraph>
+                            2.99
+                    <entry>
+                        <paragraph>
+                            On a stick!
+"""],
+["""\
+.. list-table:: list table with integral header
+   :header-rows: 1
+   :stub-columns: 1
+
+   * - Treat
+     - Quantity
+     - Description
+   * - Albatross
+     - 2.99
+     - On a stick!
+   * - Crunchy Frog
+     - 1.49
+     - If we took the bones out, it wouldn\'t be
+       crunchy, now would it?
+   * - Gannet Ripple
+     - 1.99
+     - On a stick!
+""",
+"""\
+<document source="test data">
+    <table>
+        <title>
+            list table with integral header
+        <tgroup cols="3" colwidths="auto">
+            <colspec colwidth="33" stub="1">
+            <colspec colwidth="33">
+            <colspec colwidth="33">
+            <thead>
+                <row>
+                    <entry>
+                        <paragraph>
+                            Treat
+                    <entry>
+                        <paragraph>
+                            Quantity
+                    <entry>
+                        <paragraph>
+                            Description
+            <tbody>
+                <row>
+                    <entry>
+                        <paragraph>
+                            Albatross
+                    <entry>
+                        <paragraph>
+                            2.99
+                    <entry>
+                        <paragraph>
+                            On a stick!
+                <row>
+                    <entry>
+                        <paragraph>
+                            Crunchy Frog
+                    <entry>
+                        <paragraph>
+                            1.49
+                    <entry>
+                        <paragraph>
+                            If we took the bones out, it wouldn\'t be
+                            crunchy, now would it?
+                <row>
+                    <entry>
+                        <paragraph>
+                            Gannet Ripple
+                    <entry>
+                        <paragraph>
+                            1.99
+                    <entry>
+                        <paragraph>
+                            On a stick!
+"""],
+["""\
 .. list-table::
 
    not a bullet list

Modified: trunk/docutils/test/test_parsers/test_rst/test_east_asian_text.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_east_asian_text.py	2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/test/test_parsers/test_rst/test_east_asian_text.py	2015-02-08 23:51:45 UTC (rev 7785)
@@ -65,7 +65,7 @@
 u"""\
 <document source="test data">
     <table>
-        <tgroup cols="1">
+        <tgroup cols="1" colwidths="auto">
             <colspec colwidth="23">
             <tbody>
                 <row>
@@ -99,7 +99,7 @@
     <paragraph>
         Complex spanning pattern (no edge knows all rows/cols):
     <table>
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="auto">
             <colspec colwidth="8">
             <colspec colwidth="14">
             <colspec colwidth="6">
@@ -138,7 +138,7 @@
 u"""\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="9">
             <colspec colwidth="9">
             <tbody>
@@ -186,7 +186,7 @@
     <paragraph>
         Some ambiguous-width characters:
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="1">
             <colspec colwidth="35">
             <tbody>

Modified: trunk/docutils/test/test_parsers/test_rst/test_tables.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_tables.py	2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/test/test_parsers/test_rst/test_tables.py	2015-02-08 23:51:45 UTC (rev 7785)
@@ -30,7 +30,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="1">
+        <tgroup cols="1" colwidths="auto">
             <colspec colwidth="37">
             <tbody>
                 <row>
@@ -47,7 +47,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="1">
+        <tgroup cols="1" colwidths="auto">
             <colspec colwidth="23">
             <tbody>
                 <row>
@@ -83,7 +83,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="1">
+        <tgroup cols="1" colwidths="auto">
             <colspec colwidth="24">
             <tbody>
                 <row>
@@ -91,7 +91,7 @@
                         <paragraph>
                             A well-formed | table.
     <table>
-        <tgroup cols="1">
+        <tgroup cols="1" colwidths="auto">
             <colspec colwidth="24">
             <tbody>
                 <row>
@@ -107,7 +107,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="14">
             <colspec colwidth="14">
             <tbody>
@@ -129,7 +129,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="1">
+        <tgroup cols="1" colwidths="auto">
             <colspec colwidth="14">
             <tbody>
                 <row>
@@ -151,7 +151,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="14">
             <colspec colwidth="13">
             <tbody>
@@ -180,7 +180,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="14">
             <colspec colwidth="15">
             <tbody>
@@ -209,7 +209,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="12">
             <colspec colwidth="13">
             <tbody>
@@ -240,7 +240,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="14">
             <colspec colwidth="14">
             <tbody>
@@ -268,7 +268,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="auto">
             <colspec colwidth="12">
             <colspec colwidth="13">
             <colspec colwidth="15">
@@ -308,7 +308,7 @@
     <paragraph>
         Complex spanning pattern (no edge knows all rows/cols):
     <table>
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="auto">
             <colspec colwidth="11">
             <colspec colwidth="13">
             <colspec colwidth="11">
@@ -348,7 +348,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="4">
+        <tgroup cols="4" colwidths="auto">
             <colspec colwidth="24">
             <colspec colwidth="12">
             <colspec colwidth="10">
@@ -423,7 +423,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="17">
             <colspec colwidth="8">
             <tbody>
@@ -458,7 +458,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="17">
             <colspec colwidth="8">
             <tbody>
@@ -518,7 +518,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="1">
+        <tgroup cols="1" colwidths="auto">
             <colspec colwidth="30">
             <tbody>
                 <row>
@@ -526,7 +526,7 @@
                         <paragraph>
                             This table contains another.
                         <table>
-                            <tgroup cols="1">
+                            <tgroup cols="1" colwidths="auto">
                                 <colspec colwidth="25">
                                 <tbody>
                                     <row>
@@ -544,7 +544,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="18">
             <colspec colwidth="8">
             <tbody>
@@ -572,7 +572,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="1">
+        <tgroup cols="1" colwidths="auto">
             <colspec colwidth="78">
             <tbody>
                 <row>
@@ -609,7 +609,7 @@
     <paragraph>
         Something before.
     <table>
-        <tgroup cols="1">
+        <tgroup cols="1" colwidths="auto">
             <colspec colwidth="78">
             <tbody>
                 <row>
@@ -640,7 +640,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="12">
             <colspec colwidth="12">
             <tbody>
@@ -663,7 +663,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="12">
             <colspec colwidth="12">
             <tbody>
@@ -691,7 +691,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="12">
             <colspec colwidth="14">
             <tbody>
@@ -723,7 +723,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="auto">
             <colspec colwidth="2">
             <colspec colwidth="11">
             <colspec colwidth="44">
@@ -774,7 +774,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="auto">
             <colspec colwidth="7">
             <colspec colwidth="9">
             <colspec colwidth="8">
@@ -838,7 +838,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="14">
             <colspec colwidth="6">
             <thead>
@@ -939,7 +939,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="2">
             <colspec colwidth="28">
             <tbody>
@@ -956,7 +956,7 @@
                             2
                     <entry>
                         <table>
-                            <tgroup cols="3">
+                            <tgroup cols="3" colwidths="auto">
                                 <colspec colwidth="7">
                                 <colspec colwidth="6">
                                 <colspec colwidth="8">
@@ -985,7 +985,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="16">
             <colspec colwidth="6">
             <tbody>
@@ -1011,7 +1011,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="14">
             <colspec colwidth="8">
             <thead>
@@ -1067,7 +1067,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="12">
             <colspec colwidth="17">
             <tbody>
@@ -1112,7 +1112,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="12">
             <colspec colwidth="20">
             <tbody>
@@ -1183,7 +1183,7 @@
             3   no spans     here
             ==  ===========  ===========
     <table>
-        <tgroup cols="3">
+        <tgroup cols="3" colwidths="auto">
             <colspec colwidth="2">
             <colspec colwidth="11">
             <colspec colwidth="11">
@@ -1225,7 +1225,7 @@
 """\
 <document source="test data">
     <table>
-        <tgroup cols="2">
+        <tgroup cols="2" colwidths="auto">
             <colspec colwidth="9">
             <colspec colwidth="69">
             <tbody>

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

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

From: <gr...@us...> - 2015-02-11 12:45:47

Revision: 7786
          http://sourceforge.net/p/docutils/code/7786
Author:   grubert
Date:     2015-02-11 12:45:33 +0000 (Wed, 11 Feb 2015)
Log Message:
-----------
docutils/writers/odf_odt/__init__.py remove decode.encode of filename stored in zip.

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docutils/writers/odf_odt/__init__.py

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2015-02-08 23:51:45 UTC (rev 7785)
+++ trunk/docutils/HISTORY.txt	2015-02-11 12:45:33 UTC (rev 7786)
@@ -26,6 +26,9 @@
   - patch [120] tables accept option widths: list of relative widths, 'auto' 
     or 'grid'.
 
+* docutils/writers/odf_odt/__init__.py remove decode.encode of filename
+  stored in zip.
+
 Release 0.12 (2014-07-06)
 =========================
 

Modified: trunk/docutils/docutils/writers/odf_odt/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/odf_odt/__init__.py	2015-02-08 23:51:45 UTC (rev 7785)
+++ trunk/docutils/docutils/writers/odf_odt/__init__.py	2015-02-11 12:45:33 UTC (rev 7786)
@@ -594,9 +594,7 @@
             if source is None:
                 continue
             try:
-                # encode/decode
-                destination1 = destination.decode('latin-1').encode('utf-8')
-                zfile.write(source, destination1)
+                zfile.write(source, destination)
             except OSError, e:
                 self.document.reporter.warning(
                     "Can't open file %s." % (source, ))

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

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

From: <mi...@us...> - 2015-02-16 22:10:54

Revision: 7788
          http://sourceforge.net/p/docutils/code/7788
Author:   milde
Date:     2015-02-16 22:10:52 +0000 (Mon, 16 Feb 2015)
Log Message:
-----------
Fix [ 253 ] Attribute key without value not allowed in XML.

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docutils/nodes.py

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2015-02-16 21:53:20 UTC (rev 7787)
+++ trunk/docutils/HISTORY.txt	2015-02-16 22:10:52 UTC (rev 7788)
@@ -16,19 +16,23 @@
 Changes Since 0.12
 ==================
 
-* docutils/writers/latex2e/__init__.py
+* docutils/nodes.py
 
-  - Fix [ 262 ] Use ``\linewidth`` instead of ``\textwidth`` for figures,
-    admonitions and docinfo.
+  - Fix [ 253 ] Attribute key without value not allowed in XML.
 
 * docutils/parsers/rst/directives/tables.py
 
-  - patch [120] tables accept option widths: list of relative widths, 'auto' 
+  - patch [ 120 ] tables accept option widths: list of relative widths, 'auto' 
     or 'grid'.
 
 * docutils/writers/odf_odt/__init__.py remove decode.encode of filename
   stored in zip.
 
+* docutils/writers/latex2e/__init__.py
+
+  - Fix [ 262 ] Use ``\linewidth`` instead of ``\textwidth`` for figures,
+    admonitions and docinfo.
+
 Release 0.12 (2014-07-06)
 =========================
 

Modified: trunk/docutils/docutils/nodes.py
===================================================================
--- trunk/docutils/docutils/nodes.py	2015-02-16 21:53:20 UTC (rev 7787)
+++ trunk/docutils/docutils/nodes.py	2015-02-16 22:10:52 UTC (rev 7788)
@@ -533,7 +533,7 @@
         parts = [self.tagname]
         for name, value in self.attlist():
             if value is None:           # boolean attribute
-                parts.append(name)
+                parts.append('%s="True"' % name)
                 continue
             if isinstance(value, list):
                 values = [serial_escape('%s' % (v,)) for v in value]

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

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

From: <mi...@us...> - 2015-02-16 23:47:56

Revision: 7792
          http://sourceforge.net/p/docutils/code/7792
Author:   milde
Date:     2015-02-16 23:47:49 +0000 (Mon, 16 Feb 2015)
Log Message:
-----------
Add "docutils" to class values for "container" object to address [ 267 ].

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docutils/writers/html4css1/__init__.py
    trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
    trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
    trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2015-02-16 23:40:09 UTC (rev 7791)
+++ trunk/docutils/HISTORY.txt	2015-02-16 23:47:49 UTC (rev 7792)
@@ -25,9 +25,14 @@
   - patch [ 120 ] tables accept option widths: list of relative widths, 'auto' 
     or 'grid'.
 
-* docutils/writers/odf_odt/__init__.py remove decode.encode of filename
-  stored in zip.
+* docutils/writers/html4css1/__init__.py 
 
+  - Add "docutils" to class values for "container" object to address [ 267 ].
+
+* docutils/writers/odf_odt/__init__.py 
+
+  - remove decode.encode of filename stored in zip.
+
 * docutils/writers/latex2e/__init__.py
 
   - Fix [ 262 ] Use ``\linewidth`` instead of ``\textwidth`` for figures,

Modified: trunk/docutils/docutils/writers/html4css1/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html4css1/__init__.py	2015-02-16 23:40:09 UTC (rev 7791)
+++ trunk/docutils/docutils/writers/html4css1/__init__.py	2015-02-16 23:47:49 UTC (rev 7792)
@@ -663,7 +663,7 @@
         self.body.append('</div>\n')
 
     def visit_container(self, node):
-        self.body.append(self.starttag(node, 'div', CLASS='container'))
+        self.body.append(self.starttag(node, 'div', CLASS='docutils container'))
 
     def depart_container(self, node):
         self.body.append('</div>\n')

Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2015-02-16 23:40:09 UTC (rev 7791)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2015-02-16 23:47:49 UTC (rev 7792)
@@ -896,7 +896,7 @@
 Fifth test in HTML.<br />Line two.</div>
 <div class="section" id="container">
 <h2><a class="toc-backref" href="#id68">2.18&nbsp;&nbsp;&nbsp;Container</a></h2>
-<div class="custom container">
+<div class="custom docutils container">
 <p>paragraph 1</p>
 <p>paragraph 2</p>
 </div>

Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html	2015-02-16 23:40:09 UTC (rev 7791)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_1.html	2015-02-16 23:47:49 UTC (rev 7792)
@@ -85,7 +85,7 @@
 <li>Click the &quot;Ø&quot; button to switch between presentation &amp;
 handout/outline modes.</li>
 </ul>
-<div class="handout container">
+<div class="handout docutils container">
 In presentation mode, mouse over to the lower right-hand corner to
 display the controls.</div>
 

Modified: trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html	2015-02-16 23:40:09 UTC (rev 7791)
+++ trunk/docutils/test/functional/expected/standalone_rst_s5_html_2.html	2015-02-16 23:47:49 UTC (rev 7792)
@@ -81,7 +81,7 @@
 <li>Click the &quot;Ø&quot; button to switch between presentation &amp;
 handout/outline modes.</li>
 </ul>
-<div class="handout container">
+<div class="handout docutils container">
 In presentation mode, mouse over to the lower right-hand corner to
 display the controls.</div>
 

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

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

From: <mi...@us...> - 2015-02-17 14:55:09

Revision: 7793
          http://sourceforge.net/p/docutils/code/7793
Author:   milde
Date:     2015-02-17 14:55:01 +0000 (Tue, 17 Feb 2015)
Log Message:
-----------
Fix [ 233 ] Change the base URL for the :rfc: role.

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docutils/parsers/rst/__init__.py
    trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
    trunk/docutils/test/functional/expected/standalone_rst_latex.tex
    trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt
    trunk/docutils/test/functional/expected/standalone_rst_xetex.tex
    trunk/docutils/test/test_parsers/test_rst/test_interpreted.py
    trunk/docutils/test/test_readers/test_pep/test_inline_markup.py

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2015-02-16 23:47:49 UTC (rev 7792)
+++ trunk/docutils/HISTORY.txt	2015-02-17 14:55:01 UTC (rev 7793)
@@ -20,6 +20,10 @@
 
   - Fix [ 253 ] Attribute key without value not allowed in XML.
 
+* docutils/parsers/rst/__init__.py
+
+  - Fix [ 233 ] Change the base URL for the :rfc: role.
+
 * docutils/parsers/rst/directives/tables.py
 
   - patch [ 120 ] tables accept option widths: list of relative widths, 'auto' 

Modified: trunk/docutils/docutils/parsers/rst/__init__.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/__init__.py	2015-02-16 23:47:49 UTC (rev 7792)
+++ trunk/docutils/docutils/parsers/rst/__init__.py	2015-02-17 14:55:01 UTC (rev 7793)
@@ -101,9 +101,9 @@
          ('Recognize and link to standalone RFC references (like "RFC 822").',
           ['--rfc-references'],
           {'action': 'store_true', 'validator': frontend.validate_boolean}),
-         ('Base URL for RFC references (default "http://www.faqs.org/rfcs/").',
+         ('Base URL for RFC references (default "http://tools.ietf.org/html/").',
           ['--rfc-base-url'],
-          {'metavar': '<URL>', 'default': 'http://www.faqs.org/rfcs/',
+          {'metavar': '<URL>', 'default': 'http://tools.ietf.org/html/',
            'validator': frontend.validate_url_trailing_slash}),
          ('Set number of spaces for tab expansion (default 8).',
           ['--tab-width'],

Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2015-02-16 23:47:49 UTC (rev 7792)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2015-02-17 14:55:01 UTC (rev 7793)
@@ -183,7 +183,7 @@
 reference to the <a class="reference internal" href="#doctitle">doctitle</a> and the <a class="reference internal" href="#subtitle">subtitle</a>.</p>
 <p>The default role for interpreted text is <cite>Title Reference</cite>.  Here are
 some explicit interpreted text roles: a PEP reference (<a class="reference external" href="http://www.python.org/dev/peps/pep-0287">PEP 287</a>); an
-RFC reference (<a class="reference external" href="http://www.faqs.org/rfcs/rfc2822.html">RFC 2822</a>); an abbreviation (<abbr>abb.</abbr>), an acronym
+RFC reference (<a class="reference external" href="http://tools.ietf.org/html/rfc2822.html">RFC 2822</a>); an abbreviation (<abbr>abb.</abbr>), an acronym
 (<acronym>reST</acronym>), code (<code>print &quot;hello world&quot;</code>); a <sub>subscript</sub>;
 a <sup>superscript</sup> and explicit roles for <cite>Docutils</cite>'
 <em>standard</em> <strong>inline</strong> <tt class="docutils literal">markup</tt>.</p>

Modified: trunk/docutils/test/functional/expected/standalone_rst_latex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2015-02-16 23:47:49 UTC (rev 7792)
+++ trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2015-02-17 14:55:01 UTC (rev 7793)
@@ -356,7 +356,7 @@
 
 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}); an abbreviation (\DUrole{abbreviation}{abb.}), an acronym
+RFC reference (\href{http://tools.ietf.org/html/rfc2822.html}{RFC 2822}); an abbreviation (\DUrole{abbreviation}{abb.}), an acronym
 (\DUrole{acronym}{reST}), code (\texttt{\DUrole{code}{print \textquotedbl{}hello world\textquotedbl{}}}); a \textsubscript{subscript};
 a \textsuperscript{superscript} and explicit roles for \DUroletitlereference{Docutils}’
 \emph{standard} \textbf{inline} \texttt{markup}.

Modified: trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt	2015-02-16 23:47:49 UTC (rev 7792)
+++ trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt	2015-02-17 14:55:01 UTC (rev 7793)
@@ -489,7 +489,7 @@
                         PEP 287
                     ); an
                     RFC reference (
-                    <reference refuri="http://www.faqs.org/rfcs/rfc2822.html">
+                    <reference refuri="http://tools.ietf.org/html/rfc2822.html">
                         RFC 2822
                     ); an abbreviation (
                     <abbreviation>

Modified: trunk/docutils/test/functional/expected/standalone_rst_xetex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_xetex.tex	2015-02-16 23:47:49 UTC (rev 7792)
+++ trunk/docutils/test/functional/expected/standalone_rst_xetex.tex	2015-02-17 14:55:01 UTC (rev 7793)
@@ -355,7 +355,7 @@
 
 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}); an abbreviation (\DUrole{abbreviation}{abb.}), an acronym
+RFC reference (\href{http://tools.ietf.org/html/rfc2822.html}{RFC 2822}); an abbreviation (\DUrole{abbreviation}{abb.}), an acronym
 (\DUrole{acronym}{reST}), code (\texttt{\DUrole{code}{print \textquotedbl{}hello world\textquotedbl{}}}); a \textsubscript{subscript};
 a \textsuperscript{superscript} and explicit roles for \DUroletitlereference{Docutils}’
 \emph{standard} \textbf{inline} \texttt{markup}.

Modified: trunk/docutils/test/test_parsers/test_rst/test_interpreted.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_interpreted.py	2015-02-16 23:47:49 UTC (rev 7792)
+++ trunk/docutils/test/test_parsers/test_rst/test_interpreted.py	2015-02-17 14:55:01 UTC (rev 7793)
@@ -319,7 +319,7 @@
 """\
 <document source="test data">
     <paragraph>
-        <reference refuri="http://www.faqs.org/rfcs/rfc2822.html">
+        <reference refuri="http://tools.ietf.org/html/rfc2822.html">
             RFC 2822
 """],
 ["""\

Modified: trunk/docutils/test/test_readers/test_pep/test_inline_markup.py
===================================================================
--- trunk/docutils/test/test_readers/test_pep/test_inline_markup.py	2015-02-16 23:47:49 UTC (rev 7792)
+++ trunk/docutils/test/test_readers/test_pep/test_inline_markup.py	2015-02-17 14:55:01 UTC (rev 7793)
@@ -35,13 +35,13 @@
             pep-0287.txt
         ),
         and \n\
-        <reference refuri="http://www.faqs.org/rfcs/rfc2822.html">
+        <reference refuri="http://tools.ietf.org/html/rfc2822.html">
             RFC 2822
          (which obsoletes \n\
-        <reference refuri="http://www.faqs.org/rfcs/rfc822.html">
+        <reference refuri="http://tools.ietf.org/html/rfc822.html">
             RFC822
          and \n\
-        <reference refuri="http://www.faqs.org/rfcs/rfc733.html">
+        <reference refuri="http://tools.ietf.org/html/rfc733.html">
             RFC-733
         ).
 """],
@@ -63,7 +63,7 @@
             PEP
             287
     <paragraph>
-        <reference refuri="http://www.faqs.org/rfcs/rfc2822.html">
+        <reference refuri="http://tools.ietf.org/html/rfc2822.html">
             RFC
             2822
 """],
@@ -83,7 +83,7 @@
         <reference refuri="http://www.python.org/dev/peps/pep-0287">
             http://www.python.org/dev/peps/pep-0287
         ), \n\
-        <reference refuri="http://www.faqs.org/rfcs/rfc2822.html">
+        <reference refuri="http://tools.ietf.org/html/rfc2822.html">
             RFC 2822
         .
 """],

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

<< < 1 .. 3 4 5 6 7 .. 38 > >> (Page 5 of 38)