[rig3] r440 committed - UTF8-to-HTML conversion of upper case accents

2 views
Skip to first unread message

ri...@googlecode.com

unread,
Apr 5, 2010, 2:38:31 AM4/5/10
to rig3-d...@googlegroups.com
Revision: 440
Author: ralfoide
Date: Sun Apr 4 23:37:44 2010
Log: UTF8-to-HTML conversion of upper case accents
http://code.google.com/p/rig3/source/detail?r=440

Modified:
/trunk/rig3serv/.settings/org.eclipse.core.resources.prefs
/trunk/rig3serv/misc/TaskList.txt
/trunk/rig3serv/src/rig/parser/izu_parser.py
/trunk/rig3serv/src/rig/parser/utf8_accents.py
/trunk/rig3serv/src/rig/site/site_default.py
/trunk/rig3serv/src/rig/version.py

=======================================
--- /trunk/rig3serv/.settings/org.eclipse.core.resources.prefs Sun Mar 22
22:15:48 2009
+++ /trunk/rig3serv/.settings/org.eclipse.core.resources.prefs Sun Apr 4
23:37:44 2010
@@ -1,7 +1,7 @@
-#Sun Mar 22 15:35:02 PDT 2009
+#Sun Apr 04 23:33:08 PDT 2010
eclipse.preferences.version=1
encoding//src/rig/parser/izu_parser.py=iso-8859-1
-encoding//src/rig/parser/utf8_accents.py=UTF-8
+encoding//src/rig/parser/utf8_accents.py=utf-8
encoding//src/tests/parser/test_izu_parser.py=iso-8859-1
encoding//testdata/album/blog1/2007-10-07_Folder\ 1/index.izu=ISO-8859-1
instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
=======================================
--- /trunk/rig3serv/misc/TaskList.txt Sun Apr 4 15:59:00 2010
+++ /trunk/rig3serv/misc/TaskList.txt Sun Apr 4 23:37:44 2010
@@ -38,6 +38,7 @@

---- Done Version 0.4 ----

+20100404 Izu: UTF8-to-HTML conversion of upper case accents
20100404 Izu: Implement legacy Izumi [table] and [izu:image] tags
20100404 Engine: Add option to exclude some categories from the 'all
index' page

=======================================
--- /trunk/rig3serv/src/rig/parser/izu_parser.py Sun Apr 4 15:59:00 2010
+++ /trunk/rig3serv/src/rig/parser/izu_parser.py Sun Apr 4 23:37:44 2010
@@ -803,7 +803,7 @@
line = self._ReplRigImage(state, m.group(1), m.group(2),
m.group(3), m.group(4), m.group(5))
return line

- # groups: . first . 1 title 2
islink. 3 size 4 img glob . 5 caption
+ # groups: . first 1 title 2
islink. 3 size 4 img glob . 5 caption
_RE_RIGIMGLINK = re.compile(r'(?<!\[)\[(?:([^\|\[\]]+)\|
)?rigimg(link)?:(?:([^:\]]*?):)?([^"<>|]+?)(?:\|([^"<>\]]+?))?\]')

def _ReplRigLink(self, state, title, image_glob):
=======================================
--- /trunk/rig3serv/src/rig/parser/utf8_accents.py Wed Sep 2 21:57:04 2009
+++ /trunk/rig3serv/src/rig/parser/utf8_accents.py Sun Apr 4 23:37:44 2010
@@ -31,31 +31,55 @@
"â": "&acirc;",
"ä": "&auml;",
"ã": "&atilde;",
+ "Á": "&Aacute;",
+ "À": "&Agrave;",
+ "Â": "&Acirc;",
+ "Ä": "&Auml;",
+ "Ã": "&Atilde;",

"ç": "&ccedil;",
+ "Ç": "&Ccedil;",

"é": "&eacute;",
"è": "&egrave;",
"ê": "&ecirc;",
"ë": "&euml;",
+ "É": "&Eacute;",
+ "È": "&Egrave;",
+ "Ê": "&Ecirc;",
+ "Ë": "&Euml;",

"í": "&iacute;",
"ì": "&igrave;",
"î": "&icirc;",
"ï": "&iuml;",
-
- "ñ": "&mtilde;",
+ "Í": "&Iacute;",
+ "Ì": "&Igrave;",
+ "Î": "&Icirc;",
+ "Ï": "&Iuml;",
+
+ "ñ": "&ntilde;",
+ "Ñ": "&Ntilde;",

"ó": "&oacute;",
"ò": "&ograve;",
"ô": "&ocirc;",
"ö": "&ouml;",
"õ": "&otilde;",
+ "Ó": "&Oacute;",
+ "Ò": "&Ograve;",
+ "Ô": "&Ocirc;",
+ "Ö": "&Ouml;",
+ "Õ": "&Otilde;",

"ú": "&uacute;",
"ù": "&ugrave;",
"û": "&ucirc;",
"ü": "&uuml;",
+ "Ú": "&Uacute;",
+ "Ù": "&Ugrave;",
+ "Û": "&Ucirc;",
+ "Ü": "&Uuml;",
}

#------------------------
=======================================
--- /trunk/rig3serv/src/rig/site/site_default.py Sun Apr 4 12:11:03 2010
+++ /trunk/rig3serv/src/rig/site/site_default.py Sun Apr 4 23:37:44 2010
@@ -922,7 +922,7 @@
"""
rig_base = keywords["rig_base"]
if not rig_base:
- self._log.Info("[%s], No rig_base, no images generated for %s",
+ self._log.Info("[%s] No rig_base, no images auto-generated
for %s",
self._site_settings.public_name,
source_dir.rel_curr)
return None
=======================================
--- /trunk/rig3serv/src/rig/version.py Sun Apr 4 15:59:00 2010
+++ /trunk/rig3serv/src/rig/version.py Sun Apr 4 23:37:44 2010
@@ -13,7 +13,7 @@
To enable substitutions, do something like this:
$ svn propset svn:keywords "Date Author Revision HeadURL Id" version.py

------
+----

Part of Rig3.
Copyright (C) 2007-2009 ralfoide gmail com
Reply all
Reply to author
Forward
0 new messages