[Zope-Checkins] CVS: Zope2 - ClassicDocumentClass.py:1.11.2.2 DocumentClass.py:1.16.2.1 STletters.py:1.1.2.2

[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 DocumentClass.py STletters.py 
Log Message:
update



--- Updated File ClassicDocumentClass.py in package Zope2 --
--- ClassicDocumentClass.py	2001/05/02 17:34:47	1.11.2.1
+++ ClassicDocumentClass.py	2001/05/02 18:06:33	1.11.2.2
@@ -584,7 +584,7 @@
 
     def doc_emphasize(
         self, s,
-        expr = re.compile('\s*\*([ \n%s0-9]+)\*(?!\*|-)' % lettfunc).search
+        expr = re.compile('\s*\*([ \n%s0-9]+)\*(?!\*|-)' % lettpunc).search
         ):
 
         r=expr(s)
@@ -632,7 +632,7 @@
     
     def doc_underline(self,
                       s,
-                      expr=re.compile("\s+\_([0-9%s]+)\_" % lettpunc).search):
+                      expr=re.compile("\s+\_([0-9%s ]+)\_" % lettpunc).search):
         
         result = expr(s)
         if result:

--- Updated File DocumentClass.py in package Zope2 --
--- DocumentClass.py	2001/05/01 20:01:55	1.16
+++ DocumentClass.py	2001/05/02 18:06:33	1.16.2.1
@@ -85,7 +85,7 @@
 
 import re, ST, STDOM
 from string import split, join, replace, expandtabs, strip, find, rstrip
-from STletters import letters
+from STletters import *
 
 
 StringType=type('')
@@ -867,7 +867,7 @@
 
     def doc_emphasize(
         self, s,
-        expr = re.compile(r'\s*\*([ \n%s0-9.:/;,\'\"\?\-\_\/\=\-\>\<\(\)]+)\*(?!\*|-)' % letters).search
+        expr = re.compile(r'\s*\*([ \n%s0-9]+)\*(?!\*|-)' % lettpunc).search
         ):
 
         r=expr(s)
@@ -914,7 +914,7 @@
     
     def doc_underline(self,
                       s,
-                      expr=re.compile(r"\s+\_([%s0-9\s\.,\?]+)\_" % letters).search):
+                      expr=re.compile(r"\s+\_([%s0-9\s]+)\_" % lettpunc).search):
         
         result = expr(s)
         if result:
@@ -926,7 +926,7 @@
     
     def doc_strong(self, 
                    s,
-        expr = re.compile(r'\s*\*\*([ \n%sZ0-9.:/;\-,!\?\'\"]+)\*\*' % letters).search
+        expr = re.compile(r'\s*\*\*([ \n%s0-9]+)\*\*' % lettpunc).search
         ):
 
         r=expr(s)

--- Updated File STletters.py in package Zope2 --
--- STletters.py	2001/05/02 17:34:47	1.1.2.1
+++ STletters.py	2001/05/02 18:06:34	1.1.2.2
@@ -9,7 +9,7 @@
 
 import string
 
-letters = string.letters
-punctation = ".:/;\-,!\?\'\"\=\<\>"
+letters     = string.letters
+punctuation = string.punctuation
 
-lettpunc = letters + punctation
+lettpunc    = letters + punctuation