summaryrefslogtreecommitdiff
path: root/www/zope210/files/patch-lib-python-StructuredText-i18n
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@FreeBSD.org>2005-09-18 21:33:04 +0000
committerVsevolod Stakhov <vsevolod@FreeBSD.org>2005-09-18 21:33:04 +0000
commit6b2c94a1a249771bc753e292d208b4619fd9ca2b (patch)
treed403701da93efd12cd068f67d200a212fe8857ae /www/zope210/files/patch-lib-python-StructuredText-i18n
parentFracplanet is an application to generate random planets and terrain (diff)
Add zope28 - new stable branch of zope application server.
Here are some of the "headlines" mentioned in the features list. Database Integration SQL and HTML in Harmony Multiple Data Sources Publish Databases Application Development DTML Scripting External Methods Content Management Builtin Objects Document Templates Web to Objects Integrated Object Database Managed Through the Web Direct URL Access to Objects PR: 85063 Submitted by: Denis Shaposhnikov <dsh@vlink.ru>
Notes
Notes: svn path=/head/; revision=143107
Diffstat (limited to 'www/zope210/files/patch-lib-python-StructuredText-i18n')
-rw-r--r--www/zope210/files/patch-lib-python-StructuredText-i18n87
1 files changed, 87 insertions, 0 deletions
diff --git a/www/zope210/files/patch-lib-python-StructuredText-i18n b/www/zope210/files/patch-lib-python-StructuredText-i18n
new file mode 100644
index 000000000000..f90e30cb16ba
--- /dev/null
+++ b/www/zope210/files/patch-lib-python-StructuredText-i18n
@@ -0,0 +1,87 @@
+--- lib/python/StructuredText/DocumentClass.py.orig Thu Aug 11 09:11:26 2005
++++ lib/python/StructuredText/DocumentClass.py Wed Sep 7 13:27:26 2005
+@@ -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)
+
+--- lib/python/StructuredText/DocumentWithImages.py.orig Thu Aug 11 09:11:26 2005
++++ lib/python/StructuredText/DocumentWithImages.py Wed Sep 7 13:30:10 2005
+@@ -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,
+ ):
+
+
+--- lib/python/StructuredText/ST.py.orig Thu Aug 11 09:11:26 2005
++++ lib/python/StructuredText/ST.py Wed Sep 7 13:27:26 2005
+@@ -116,6 +116,9 @@
+ Structure => [paragraph,[sub-paragraphs]]
+ """
+
++ if type(paragraphs) == type(''):
++ paragraphs = unicode(paragraphs, 'utf-8')
++
+ currentlevel = 0
+ currentindent = 0
+ levels = {0:0}