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

[Andreas Jung]

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

Modified Files:
      Tag: Zope-2_5-branch
	DocumentClass.py 
Log Message:
fixed broken handling of underlined text at the end of a line


=== Zope/lib/python/StructuredText/DocumentClass.py 1.43.10.1 => 1.43.10.2 ===
                       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]+)_[\s%s]' % (letters, digits, under_punc,phrase_delimiters)).search):
+                      expr=re.compile(r'_([%s%s%s\s]+)_([\s%s]|$)' % (letters, digits, under_punc,phrase_delimiters)).search):
 
         result = expr(s)
         if result:
@@ -863,7 +863,7 @@
                return None # no double unders
             start,end = result.span(1)
             st,e = result.span()
-            return (StructuredTextUnderline(s[start:end]),st,e-1)
+            return (StructuredTextUnderline(s[start:end]),st,e-len(result.group(2)))
         else:
             return None