head	1.5;
access;
symbols
	old_old_RELEASE_6_1_0:1.1
	old_old_RELEASE_5_5_0:1.1;
locks; strict;
comment	@# @;


1.5
date	2006.08.03.15.53.04;	author garga;	state dead;
branches;
next	1.4;

1.4
date	2006.05.16.18.01.44;	author garga;	state Exp;
branches;
next	1.3;

1.3
date	2006.05.05.23.48.15;	author mnag;	state Exp;
branches;
next	1.2;

1.2
date	2006.03.21.16.54.03;	author garga;	state Exp;
branches;
next	1.1;

1.1
date	2006.01.28.10.07.29;	author pav;	state Exp;
branches;
next	;


desc
@@


1.5
log
@- Update to 2.9.4

PR:		ports/101236
Submitted by:	HAYASHI Yasushi <yasi at yasi.to> (maintainer)
@
text
@--- Dependencies/StructuredText-Zope-2.9.3/StructuredText/DocumentWithImages.py.orig	Sat Jan  7 21:07:51 2006
+++ Dependencies/StructuredText-Zope-2.9.3/StructuredText/DocumentWithImages.py	Sun Jan 15 10:23:46 2006
@@@@ -27,7 +27,7 @@@@
 
     def doc_img(
         self, s,
-        expr1=re.compile('\"([ _a-zA-Z0-9*.:/;,\[\]\'\-\n\~]+)\":img:([a-zA-Z0-9%\_\-.:/\?=;,\n\~]+)').search,
+        expr1=re.compile('\"((?:\w|[ *.:/;,\-\n\~])+)\":img:([a-zA-Z0-9\_\-.:/;,\n\~]+)', re.U).search,
         ):
 
 
--- Dependencies/StructuredText-Zope-2.9.3/StructuredText/ST.py.orig	Sat Jan  7 21:07:51 2006
+++ Dependencies/StructuredText-Zope-2.9.3/StructuredText/ST.py	Sun Jan 15 10:23:46 2006
@@@@ -116,6 +116,9 @@@@
     Structure => [paragraph,[sub-paragraphs]]
     """
 
+    if type(paragraphs) == type(''):
+        paragraphs = unicode(paragraphs, 'utf-8')
+
     currentlevel    = 0
     currentindent  = 0
     levels            = {0:0}
--- Dependencies/StructuredText-Zope-2.9.3/StructuredText/DocumentClass.py.orig	Sat Jan  7 21:07:51 2006
+++ Dependencies/StructuredText-Zope-2.9.3/StructuredText/DocumentClass.py	Sun Jan 15 10:23:46 2006
@@@@ -786,7 +786,7 @@@@
 
     def doc_literal(
         self, s,
-        expr = re.compile(r"(\W+|^)'([%s%s%s\s]+)'([%s]+|$)" % (letters, digits, literal_punc, phrase_delimiters)).search,):
+        expr = re.compile(r"(\W+|^)'((?:\w|[%s%s\s])+)'([%s]+|$)" % (digits, literal_punc, phrase_delimiters), re.U).search,):
 
         # old expr... failed to cross newlines.
         #        expr=re.compile(
@@@@ -804,7 +804,9 @@@@
 
     def doc_emphasize(
         self, s,
-        expr = re.compile(r'\*([%s%s%s\s]+?)\*' % (letters, digits, strongem_punc)).search
+        # i18nal variant
+        expr = re.compile(r'\*((?:\w|[%s\s])+?)\*' % (strongem_punc), re.U).search
+        #expr = re.compile(r'\*([%s%s%s\s]+?)\*' % (letters, digits, strongem_punc)).search
         #expr = re.compile(r'\s*\*([ \n\r%s0-9.:/;,\'\"\?\-\_\/\=\-\>\<\(\)]+)\*(?!\*|-)' % letters).search       # old expr, inconsistent punctuation
         ):
 
@@@@ -850,7 +852,7 @@@@
 
     def doc_underline(self,
                       s,
-                      expr=re.compile(r'_([%s%s%s\s]+)_([\s%s]|$)' % (letters, digits, under_punc,phrase_delimiters)).search):
+                      expr=re.compile(r'_((?:\w|[%s\s])+)_([\s%s]|$)' % (under_punc,phrase_delimiters), re.U).search):
 
         result = expr(s)
         if result:
@@@@ -864,7 +866,7 @@@@
 
     def doc_strong(self,
                    s,
-                   expr = re.compile(r'\*\*([%s%s%s\s]+?)\*\*' % (letters, digits, strongem_punc)).search
+                   expr = re.compile(r'\*\*((?:\w|[%s%s\s])+?)\*\*' % (digits, strongem_punc), re.U).search
                    #expr = re.compile(r'\s*\*\*([ \n\r%s0-9.:/;,\'\"\?\-\_\/\=\-\>\<\(\)]+)\*\*(?!\*|-)' % letters).search, # old expr, inconsistent punc, failed to cross newlines.
         ):
 
@@@@ -876,7 +878,7 @@@@
             return None
 
     ## Some constants to make the doc_href() regex easier to read.
-    _DQUOTEDTEXT = r'("[ %s0-9\n\r%s]+")' % (letters,dbl_quoted_punc) ## double quoted text
+    _DQUOTEDTEXT = r'("[^"]+")'
     _ABSOLUTE_URL=r'((http|https|ftp|mailto|file|about)[:/]+?[%s0-9_\@@\.\,\?\!\/\:\;\-\#\~\=\&\%%\+]+)' % letters
     _ABS_AND_RELATIVE_URL=r'([%s0-9_\@@\.\,\?\!\/\:\;\-\#\~\=\&\%%\+]+)' % letters
 
@@@@ -884,12 +886,12 @@@@
 
 
     def doc_href1(self, s,
-                  expr=re.compile(_DQUOTEDTEXT + "(:)" + _ABS_AND_RELATIVE_URL + _SPACES).search
+                  expr=re.compile(_DQUOTEDTEXT + "(:)" + _ABS_AND_RELATIVE_URL + _SPACES, re.U).search
                    ):
         return self.doc_href(s, expr)
 
     def doc_href2(self, s,
-                  expr=re.compile(_DQUOTEDTEXT + r'(\,\s+)' + _ABSOLUTE_URL + _SPACES).search
+                  expr=re.compile(_DQUOTEDTEXT + r'(\,\s+)' + _ABSOLUTE_URL + _SPACES, re.U).search
                    ):
         return self.doc_href(s, expr)
 
@


1.4
log
@- Update to 2.9.3

PR:		ports/97340
Submitted by:	maintainer
@
text
@@


1.3
log
@- Update to 2.9.2

PR:		96804
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- Dependencies/StructuredText-Zope-2.9.2/StructuredText/DocumentWithImages.py.orig	Sat Jan  7 21:07:51 2006
+++ Dependencies/StructuredText-Zope-2.9.2/StructuredText/DocumentWithImages.py	Sun Jan 15 10:23:46 2006
d12 2
a13 2
--- Dependencies/StructuredText-Zope-2.9.2/StructuredText/ST.py.orig	Sat Jan  7 21:07:51 2006
+++ Dependencies/StructuredText-Zope-2.9.2/StructuredText/ST.py	Sun Jan 15 10:23:46 2006
d24 2
a25 2
--- Dependencies/StructuredText-Zope-2.9.2/StructuredText/DocumentClass.py.orig	Sat Jan  7 21:07:51 2006
+++ Dependencies/StructuredText-Zope-2.9.2/StructuredText/DocumentClass.py	Sun Jan 15 10:23:46 2006
@


1.2
log
@- Update to 2.9.1

PR:		ports/94776
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- Dependencies/StructuredText-Zope-2.9.1/StructuredText/DocumentWithImages.py.orig	Sat Jan  7 21:07:51 2006
+++ Dependencies/StructuredText-Zope-2.9.1/StructuredText/DocumentWithImages.py	Sun Jan 15 10:23:46 2006
d12 2
a13 2
--- Dependencies/StructuredText-Zope-2.9.1/StructuredText/ST.py.orig	Sat Jan  7 21:07:51 2006
+++ Dependencies/StructuredText-Zope-2.9.1/StructuredText/ST.py	Sun Jan 15 10:23:46 2006
d24 2
a25 2
--- Dependencies/StructuredText-Zope-2.9.1/StructuredText/DocumentClass.py.orig	Sat Jan  7 21:07:51 2006
+++ Dependencies/StructuredText-Zope-2.9.1/StructuredText/DocumentClass.py	Sun Jan 15 10:23:46 2006
@


1.1
log
@- Add Zope 2.9.0 after repocopy

PR:		ports/91824
Submitted by:	HAYASHI Yasushi <yasi@@yasi.to>
Repocopy by:	marcus
@
text
@d1 2
a2 2
--- Dependencies/StructuredText-Zope-2.9.0/StructuredText/DocumentWithImages.py.orig	Sat Jan  7 21:07:51 2006
+++ Dependencies/StructuredText-Zope-2.9.0/StructuredText/DocumentWithImages.py	Sun Jan 15 10:23:46 2006
d12 2
a13 2
--- Dependencies/StructuredText-Zope-2.9.0/StructuredText/ST.py.orig	Sat Jan  7 21:07:51 2006
+++ Dependencies/StructuredText-Zope-2.9.0/StructuredText/ST.py	Sun Jan 15 10:23:46 2006
d24 2
a25 2
--- Dependencies/StructuredText-Zope-2.9.0/StructuredText/DocumentClass.py.orig	Sat Jan  7 21:07:51 2006
+++ Dependencies/StructuredText-Zope-2.9.0/StructuredText/DocumentClass.py	Sun Jan 15 10:23:46 2006
@

