[Zope-Checkins] CVS: Zope2 - DocumentClass.py:1.18

[andreas@serenade.digicool.com]

Update of /cvs-repository/Zope2/lib/python/StructuredText
In directory serenade:/tmp/cvs-serv25388

Modified Files:
	DocumentClass.py 
Log Message:
unified punctuation



--- Updated File DocumentClass.py in package Zope2 --
--- DocumentClass.py	2001/05/03 16:27:02	1.17
+++ DocumentClass.py	2001/05/31 17:49:55	1.18
@@ -937,8 +937,8 @@
            return None
 
     ## Some constants to make the doc_href() regex easier to read.
-    _DQUOTEDTEXT = r'("[%s0-9\n\-\.\,\;\(\)\/\:\/\*\']+")'  % letters ## double quoted text
-    _URL_AND_PUNC = r'([%s0-9\@\.\,\?\!\/\:\;\-\#\~]+)' % letters 
+    _DQUOTEDTEXT = r'("[%s0-9\n%s]+")'  % (letters,punctuation) ## double quoted text
+    _URL_AND_PUNC = r'([%s0-9\@%s]+)' % (letters,punctuation) 
     _SPACES = r'(\s*)'
     
     def doc_href(self, s,