David Goodger | 1 Nov 2004 03:58
Picon

docutils/test/test_transforms test_final_checks.py,1.5,1.6

Update of /cvsroot/docutils/docutils/test/test_transforms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18381/test/test_transforms

Modified Files:
	test_final_checks.py 
Log Message:
added transition tests

Index: test_final_checks.py
===================================================================
RCS file: /cvsroot/docutils/docutils/test/test_transforms/test_final_checks.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- test_final_checks.py	8 Oct 2002 01:34:51 -0000	1.5
+++ test_final_checks.py	1 Nov 2004 02:58:27 -0000	1.6
 <at>  <at>  -23,7 +23,7  <at>  <at> 

 totest = {}

-totest['final_checks'] = ((FinalChecks,), [
+totest['references'] = ((FinalChecks,), [
 ["""\
 Unknown reference_.
 """,
 <at>  <at>  -41,6 +41,288  <at>  <at> 
 ])

 
+# See DocutilsTestSupport.ParserTestSuite.generateTests for a
(Continue reading)

David Goodger | 1 Nov 2004 03:59
Picon

docutils/test/test_parsers/test_rst test_transitions.py,1.9,1.10

Update of /cvsroot/docutils/docutils/test/test_parsers/test_rst
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18505/test/test_parsers/test_rst

Modified Files:
	test_transitions.py 
Log Message:
updated tests for parser only -- no transforms applied

Index: test_transitions.py
===================================================================
RCS file: /cvsroot/docutils/docutils/test/test_parsers/test_rst/test_transitions.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- test_transitions.py	30 Oct 2004 16:01:42 -0000	1.9
+++ test_transitions.py	1 Nov 2004 02:59:17 -0000	1.10
 <at>  <at>  -14,7 +14,6  <at>  <at> 

 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
-    s.test_case_class = DocutilsTestSupport.ParserTransformTestCase
     s.generateTests(totest)
     return s

 <at>  <at>  -88,9 +87,6  <at>  <at> 
 """,
 """\
 <document source="test data">
-    <system_message level="3" line="1" source="test data" type="ERROR">
-        <paragraph>
(Continue reading)

David Goodger | 1 Nov 2004 03:58
Picon

docutils/test DocutilsTestSupport.py,1.54,1.55

Update of /cvsroot/docutils/docutils/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18329/test

Modified Files:
	DocutilsTestSupport.py 
Log Message:
removed ParserTransformTestCase (it was mixing testing modes)

Index: DocutilsTestSupport.py
===================================================================
RCS file: /cvsroot/docutils/docutils/test/DocutilsTestSupport.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- DocutilsTestSupport.py	30 Oct 2004 15:54:45 -0000	1.54
+++ DocutilsTestSupport.py	1 Nov 2004 02:58:09 -0000	1.55
 <at>  <at>  -427,31 +427,6  <at>  <at> 
                       run_in_debugger=run_in_debugger)

 
-class ParserTransformTestCase(ParserTestCase):
-
-    """
-    Like ParserTestCase, except that default transforms are run.
-
-    For use with ParserTestSuite.
-    """
-
-    # Get settings with report_level == 1 from TransformTestCase
-    settings = TransformTestCase.settings
(Continue reading)

David Goodger | 2 Nov 2004 23:14
Picon

docutils/docs/ref docutils.dtd,1.36,1.37

Update of /cvsroot/docutils/docutils/docs/ref
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15156/docs/ref

Modified Files:
	docutils.dtd 
Log Message:
Added "ltrim" and "rtrim" attributes to ``substitution_definition`` element.

Index: docutils.dtd
===================================================================
RCS file: /cvsroot/docutils/docutils/docs/ref/docutils.dtd,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- docutils.dtd	31 Oct 2004 17:49:42 -0000	1.36
+++ docutils.dtd	2 Nov 2004 22:14:08 -0000	1.37
 <at>  <at>  -447,7 +447,10  <at>  <at> 
     %anonymous.att;>

 <!ELEMENT substitution_definition %text.model;>
-<!ATTLIST substitution_definition %basic.atts;>
+<!ATTLIST substitution_definition
+    %basic.atts;
+    ltrim     %yesorno; #IMPLIED
+    rtrim     %yesorno; #IMPLIED>

 <!ELEMENT comment (#PCDATA)>
 <!ATTLIST comment

-------------------------------------------------------
(Continue reading)

David Goodger | 2 Nov 2004 23:14
Picon

docutils/docutils/parsers/rst/directives misc.py,1.30,1.31

Update of /cvsroot/docutils/docutils/docutils/parsers/rst/directives
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15213/docutils/parsers/rst/directives

Modified Files:
	misc.py 
Log Message:
Added "trim", "ltrim", and "rtrim" options to "unicode" directive.

Index: misc.py
===================================================================
RCS file: /cvsroot/docutils/docutils/docutils/parsers/rst/directives/misc.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- misc.py	25 Sep 2004 23:44:06 -0000	1.30
+++ misc.py	2 Nov 2004 22:14:14 -0000	1.31
 <at>  <at>  -177,7 +177,7  <at>  <at> 
 replace.content = 1

 def unicode_directive(name, arguments, options, content, lineno,
-                         content_offset, block_text, state, state_machine):
+                      content_offset, block_text, state, state_machine):
     r"""
     Convert Unicode character codes (numbers) to characters.  Codes may be
     decimal numbers, hexadecimal numbers (prefixed by ``0x``, ``x``, ``\x``,
 <at>  <at>  -191,6 +191,14  <at>  <at> 
             'substitution definition.' % (name),
             nodes.literal_block(block_text, block_text), line=lineno)
         return [error]
+    substitution_definition = state_machine.node
(Continue reading)

David Goodger | 2 Nov 2004 23:14
Picon

docutils/docs/ref/rst directives.txt,1.64,1.65

Update of /cvsroot/docutils/docutils/docs/ref/rst
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15213/docs/ref/rst

Modified Files:
	directives.txt 
Log Message:
Added "trim", "ltrim", and "rtrim" options to "unicode" directive.

Index: directives.txt
===================================================================
RCS file: /cvsroot/docutils/docutils/docs/ref/rst/directives.txt,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- directives.txt	21 Oct 2004 03:34:22 -0000	1.64
+++ directives.txt	2 Nov 2004 22:14:14 -0000	1.65
 <at>  <at>  -1147,7 +1147,7  <at>  <at> 
 :Doctree Element: Text
 :Directive Arguments: One or more, required (Unicode character codes,
                       optional text, and comments).
-:Directive Options: None.
+:Directive Options: Possible.
 :Directive Content: None.

 The "unicode" directive converts Unicode character codes (numerical
 <at>  <at>  -1175,6 +1175,7  <at>  <at> 
     Copyright |copy| 2003, |BogusMegaCorp (TM)|.

     .. |copy| unicode:: 0xA9 .. copyright sign
+       :ltrim:
(Continue reading)

David Goodger | 2 Nov 2004 23:14
Picon

docutils/test/test_transforms test_substitutions.py,1.9,1.10

Update of /cvsroot/docutils/docutils/test/test_transforms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15245/test/test_transforms

Modified Files:
	test_substitutions.py 
Log Message:
Added support for trimming whitespace from beside substitution references.

Index: test_substitutions.py
===================================================================
RCS file: /cvsroot/docutils/docutils/test/test_transforms/test_substitutions.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- test_substitutions.py	22 Jun 2003 22:21:28 -0000	1.9
+++ test_substitutions.py	2 Nov 2004 22:14:23 -0000	1.10
 <at>  <at>  -143,6 +143,29  <at>  <at> 
         BogusMegaCorp
         \u2122
 """],
+["""\
+Insert an em-dash |---| automatically trimming whitespace.
+Some substitutions |TM| only need trimming on one side.
+
+.. |---| unicode:: U+02014
+   :trim:
+.. |TM| unicode:: U+02122
+   :ltrim:
+""",
+u"""\
(Continue reading)

David Goodger | 2 Nov 2004 23:14
Picon

docutils/docutils/transforms references.py,1.22,1.23

Update of /cvsroot/docutils/docutils/docutils/transforms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15245/docutils/transforms

Modified Files:
	references.py 
Log Message:
Added support for trimming whitespace from beside substitution references.

Index: references.py
===================================================================
RCS file: /cvsroot/docutils/docutils/docutils/transforms/references.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- references.py	30 Sep 2004 13:47:58 -0000	1.22
+++ references.py	2 Nov 2004 22:14:24 -0000	1.23
 <at>  <at>  -700,7 +700,22  <at>  <at> 
                     msg.add_backref(prbid)
                     ref.parent.replace(ref, prb)
                 else:
-                    ref.parent.replace(ref, defs[key].get_children())
+                    subdef = defs[key]
+                    parent = ref.parent
+                    index = parent.index(ref)
+                    if  (subdef.attributes.has_key('ltrim')
+                         or subdef.attributes.has_key('trim')):
+                        if index > 0 and isinstance(parent[index - 1],
+                                                    nodes.Text):
+                            parent.replace(parent[index - 1],
+                                           parent[index - 1].rstrip())
(Continue reading)

David Goodger | 2 Nov 2004 23:14
Picon

docutils HISTORY.txt,1.270,1.271

Update of /cvsroot/docutils/docutils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15319

Modified Files:
	HISTORY.txt 
Log Message:
updated

Index: HISTORY.txt
===================================================================
RCS file: /cvsroot/docutils/docutils/HISTORY.txt,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -d -r1.270 -r1.271
--- HISTORY.txt	30 Oct 2004 16:39:34 -0000	1.270
+++ HISTORY.txt	2 Nov 2004 22:14:38 -0000	1.271
 <at>  <at>  -59,6 +59,7  <at>  <at> 
 * docutils/parsers/rst/directives/misc.py:

   - Added "encoding" option to "include" and "raw" directives.
+  - Added "trim", "ltrim", and "rtrim" options to "unicode" directive.

 * docutils/parsers/rst/directives/parts.py:

 <at>  <at>  -76,6 +77,11  <at>  <at> 
   - Fixed bug when multiple "class" directives are applied to a single
     element.

+* docutils/transforms/references.py:
+
(Continue reading)

David Goodger | 2 Nov 2004 23:25
Picon

docutils/docs/ref/rst directives.txt,1.65,1.66

Update of /cvsroot/docutils/docutils/docs/ref/rst
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18317/docs/ref/rst

Modified Files:
	directives.txt 
Log Message:
improved example

Index: directives.txt
===================================================================
RCS file: /cvsroot/docutils/docutils/docs/ref/rst/directives.txt,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- directives.txt	2 Nov 2004 22:14:14 -0000	1.65
+++ directives.txt	2 Nov 2004 22:25:37 -0000	1.66
 <at>  <at>  -1172,21 +1172,25  <at>  <at> 

 For example, the following text::

-    Copyright |copy| 2003, |BogusMegaCorp (TM)|.
+    Copyright |copy| 2003, |BogusMegaCorp (TM)| |---|
+    all rights reserved.

     .. |copy| unicode:: 0xA9 .. copyright sign
-       :ltrim:
     .. |BogusMegaCorp (TM)| unicode:: BogusMegaCorp U+2122
        .. with trademark sign
+    .. |---| unicode:: U+02014 .. em dash
+       :trim:
(Continue reading)


Gmane