[Docutils-checkins] r5640 - in trunk/docutils: docutils/parsers/rst/states.py test/test_parsers/test_rst/test_inline_markup.py

[<go...@us...>]

Author: goodger
Date: 2008-09-05 19:57:40 +0200 (Fri, 05 Sep 2008)
New Revision: 5640

Modified:
   trunk/docutils/docutils/parsers/rst/states.py
   trunk/docutils/test/test_parsers/test_rst/test_inline_markup.py
Log:
allow more Unicode characters as openers & delimiters

Modified: trunk/docutils/docutils/parsers/rst/states.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/states.py	2008-09-05 15:07:51 UTC (rev 5639)
+++ trunk/docutils/docutils/parsers/rst/states.py	2008-09-05 17:57:40 UTC (rev 5640)
@@ -504,11 +504,15 @@
             processed += self.implicit_inline(remaining, lineno)
         return processed, messages
 
-    openers = u'\'"([{<\u2018\u201c\xab\u2019'
+    openers = u'\'"([{<\u2018\u201c\xab\u2019\u00a1\u00bf'
     closers = u'\'")]}>\u2019\u201d\xbb'
-    start_string_prefix = (r'((?<=^)|(?<=[-/: \n%s]))' % re.escape(openers))
-    end_string_suffix = (r'((?=$)|(?=[-/:.,;!? \n\x00%s]))'
-                         % re.escape(closers))
+    unicode_delimiters = u'\u2010\u2011\u2012\u2013\u2014\u00a0'
+    start_string_prefix = (r'((?<=^)|(?<=[-/: \n%s%s]))'
+                           % (re.escape(unicode_delimiters),
+                              re.escape(openers)))
+    end_string_suffix = (r'((?=$)|(?=[-/:.,;!? \n\x00%s%s]))'
+                         % (re.escape(unicode_delimiters),
+                            re.escape(closers)))
     non_whitespace_before = r'(?<![ \n])'
     non_whitespace_escape_before = r'(?<![ \n\x00])'
     non_whitespace_after = r'(?![ \n])'

Modified: trunk/docutils/test/test_parsers/test_rst/test_inline_markup.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_inline_markup.py	2008-09-05 15:07:51 UTC (rev 5639)
+++ trunk/docutils/test/test_parsers/test_rst/test_inline_markup.py	2008-09-05 17:57:40 UTC (rev 5640)
@@ -42,33 +42,6 @@
             emphasis
          with apostrophe
 """],
-[u"""\
-quoted '*emphasis*', quoted "*emphasis*",
-quoted \u2018*emphasis*\u2019, quoted \u201c*emphasis*\u201d,
-quoted \xab*emphasis*\xbb
-""",
-u"""\
-<document source="test data">
-    <paragraph>
-        quoted '
-        <emphasis>
-            emphasis
-        ', quoted "
-        <emphasis>
-            emphasis
-        ",
-        quoted \u2018
-        <emphasis>
-            emphasis
-        \u2019, quoted \u201c
-        <emphasis>
-            emphasis
-        \u201d,
-        quoted \xab
-        <emphasis>
-            emphasis
-        \xbb
-"""],
 ["""\
 *emphasized sentence
 across lines*
@@ -1368,6 +1341,70 @@
         p
         with backslash-escaped whitespace, including newlines.
 """],
+[u"""\
+quoted '*emphasis*', quoted "*emphasis*",
+quoted \u2018*emphasis*\u2019, quoted \u201c*emphasis*\u201d,
+quoted \xab*emphasis*\xbb
+""",
+u"""\
+<document source="test data">
+    <paragraph>
+        quoted '
+        <emphasis>
+            emphasis
+        ', quoted "
+        <emphasis>
+            emphasis
+        ",
+        quoted \u2018
+        <emphasis>
+            emphasis
+        \u2019, quoted \u201c
+        <emphasis>
+            emphasis
+        \u201d,
+        quoted \xab
+        <emphasis>
+            emphasis
+        \xbb
+"""],
+[u"""\
+text-*separated*\u2010*by*\u2011*various*\u2012*dashes*\u2013*and*\u2014*hyphens*.
+\u00bf*punctuation*? \u00a1*examples*!\u00a0*too*.
+""",
+u"""\
+<document source="test data">
+    <paragraph>
+        text-
+        <emphasis>
+            separated
+        \u2010
+        <emphasis>
+            by
+        \u2011
+        <emphasis>
+            various
+        \u2012
+        <emphasis>
+            dashes
+        \u2013
+        <emphasis>
+            and
+        \u2014
+        <emphasis>
+            hyphens
+        .
+        \xbf
+        <emphasis>
+            punctuation
+        ? \xa1
+        <emphasis>
+            examples
+        !\xa0
+        <emphasis>
+            too
+        .
+"""],
 ]