[Zope-Checkins] CVS: Zope/lib/python/StructuredText - DocumentClass.py:1.22.2.13

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/StructuredText
In directory cvs.zope.org:/tmp/cvs-serv7236

Modified Files:
      Tag: Zope-2_4-branch
	DocumentClass.py 
Log Message:
backport from trunk (*sigh* stale cvs locks really suck)


=== Zope/lib/python/StructuredText/DocumentClass.py 1.22.2.12 => 1.22.2.13 ===
                       s,
                       #expr=re.compile(r"\_([a-zA-Z0-9\s\.,\?]+)\_").search, # old expr, inconsistent punc, failed to cross newlines
-                      expr=re.compile(r'_([%s%s%s\s]+)_' % (letters, digits, under_punc)).search):
+                      expr=re.compile(r'_([%s%s%s\s]+)_[\s%s]' % (letters, digits, under_punc,phrase_delimiters)).search):
 
         result = expr(s)
         if result:
@@ -933,7 +933,7 @@
                return None # no double unders
             start,end = result.span(1)
             st,e = result.span()
-            return (StructuredTextUnderline(s[start:end]),st,e)
+            return (StructuredTextUnderline(s[start:end]),st,e-1)
         else:
             return None