[Zope-Checkins] CVS: Zope2 - ClassicDocumentClass.py:1.11.2.1 STletters.py:1.1.2.1

[Andreas Jung]

Update of /cvs-repository/Zope2/lib/python/StructuredText
In directory yetix:/work/sandboxes/ajung-2_4-STXNG/lib/python/StructuredText

Modified Files:
      Tag: ajung-2_4-STXNG
	ClassicDocumentClass.py STletters.py 
Log Message:
unification of puncation



--- Updated File ClassicDocumentClass.py in package Zope2 --
--- ClassicDocumentClass.py	2001/05/01 20:01:55	1.11
+++ ClassicDocumentClass.py	2001/05/02 17:34:47	1.11.2.1
@@ -85,7 +85,7 @@
 
 import re, ST, STDOM
 from string import split, join, replace, expandtabs, strip, find
-from STletters import letters
+from STletters import letters,lettpunc
 
 StringType=type('')
 ListType=type([])
@@ -584,7 +584,7 @@
 
     def doc_emphasize(
         self, s,
-        expr = re.compile('\s*\*([ \n%s0-9.:/;,\'\"\?\=\-\>\<\(\)]+)\*(?!\*|-)' % letters).search
+        expr = re.compile('\s*\*([ \n%s0-9]+)\*(?!\*|-)' % lettfunc).search
         ):
 
         r=expr(s)
@@ -632,7 +632,7 @@
     
     def doc_underline(self,
                       s,
-                      expr=re.compile("\s+\_([%s0-9\s\.,\?\/]+)\_" % letters).search):
+                      expr=re.compile("\s+\_([0-9%s]+)\_" % lettpunc).search):
         
         result = expr(s)
         if result:
@@ -644,7 +644,7 @@
     
     def doc_strong(self, 
                    s,
-        expr = re.compile('\s*\*\*([ \n%s0-9.:/;\-,!\?\'\"]+)\*\*' % letters).search
+        expr = re.compile('\s*\*\*([ \n%s0-9]+)\*\*' % lettpunc).search
         ):
 
         r=expr(s)

--- Updated File STletters.py in package Zope2 --
--- STletters.py	2001/04/27 18:21:59	1.1
+++ STletters.py	2001/05/02 17:34:47	1.1.2.1
@@ -7,8 +7,9 @@
 except:
     pass    
 
-
 import string
-letters = string.letters
 
+letters = string.letters
+punctation = ".:/;\-,!\?\'\"\=\<\>"
 
+lettpunc = letters + punctation