[Zope-Checkins] CVS: Zope2 - ClassicDocumentClass.py:1.11 DocumentClass.py:1.16

andreas@serenade.digicool.com andreas@serenade.digicool.com
Tue, 1 May 2001 16:01:56 -0400


Update of /cvs-repository/Zope2/lib/python/StructuredText
In directory serenade.digicool.com:/tmp/cvs-serv15350

Modified Files:
	ClassicDocumentClass.py DocumentClass.py 
Log Message:
Changed pattern for detecting _..._ text. We now require that 
at least one space precedes the first underscore. This is neccessary
for handling underscores inside DTML vars.




--- Updated File ClassicDocumentClass.py in package Zope2 --
--- ClassicDocumentClass.py	2001/05/01 17:04:38	1.10
+++ ClassicDocumentClass.py	2001/05/01 20:01:55	1.11
@@ -632,7 +632,7 @@
     
     def doc_underline(self,
                       s,
-                      expr=re.compile("\s*\_([%s0-9\s\.,\?\/]+)\_" % letters).search):
+                      expr=re.compile("\s+\_([%s0-9\s\.,\?\/]+)\_" % letters).search):
         
         result = expr(s)
         if result:

--- Updated File DocumentClass.py in package Zope2 --
--- DocumentClass.py	2001/05/01 17:07:40	1.15
+++ DocumentClass.py	2001/05/01 20:01:55	1.16
@@ -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\.,\?]+)\_" % letters).search):
         
         result = expr(s)
         if result: