Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_object_textblock.c
Log Message:
illogict patch for more escapes :)
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_textblock.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -3 -r1.127 -r1.128
--- evas_object_textblock.c 11 May 2006 12:55:04 -0000 1.127
+++ evas_object_textblock.c 11 May 2006 23:46:54 -0000 1.128
@@ -440,7 +440,7 @@
}
}
-/* table of html escapes (that i can find) this shoudl be ordered with the
+/* table of html escapes (that i can find) this should be ordered with the
* most common first as it's a linear search to match - no hash for this
*/
static const char *_escapes[] =
@@ -449,11 +449,12 @@
"<", "<",
">", ">",
"&", "&",
- " ", " ", /* NOTE: we will allow nbsp's to break as we map early -
maybe map to ascii 0x01 and then make the rendring code think 0x01 -> 0x20 */
+ " ", " ", /* NOTE: we will allow nbsp's to break as we map early -
maybe map to ascii 0x01 and then make the rendering code think 0x01 -> 0x20 */
""", "\"",
/* all the rest */
"©", "©",
"®", "®",
+ "…", "â¦",
"Ñ", "Ã",
"ñ", "ñ",
"Ç", "Ã",
@@ -471,6 +472,7 @@
"£", "£",
"¤", "¤",
"¥", "Â¥",
+ "€", "â¬",
"§", "§",
"¶", "¶",
"«", "«",
@@ -583,6 +585,7 @@
"θ", "θ",
"ι", "ι",
"κ", "κ",
+ "λ", "λ",
"μ", "μ",
"ν", "ν",
"ο", "ο",
@@ -596,6 +599,30 @@
"χ", "Ï",
"ψ", "Ï",
"ω", "Ï"
+ "Α", "Î",
+ "Β", "Î",
+ "Γ", "Î",
+ "Δ", "Î",
+ "Ε", "Î",
+ "Ζ", "Î",
+ "Η", "Î",
+ "Θ", "Î",
+ "Ι", "Î",
+ "Κ", "Î",
+ "Λ", "Î",
+ "Μ", "Î",
+ "Ν", "Î",
+ "Ο", "Î",
+ "Ξ", "Î",
+ "Π", "Î ",
+ "Ρ", "Ρ",
+ "Σ", "Σ",
+ "Τ", "Τ",
+ "Υ", "Î¥",
+ "Φ", "Φ",
+ "Χ", "Χ",
+ "Ψ", "Ψ",
+ "Ω", "Ω"
};
static int
@@ -784,7 +811,7 @@
((fmt->font.fallbacks) && (strcmp(fmt->font.fallbacks, param))))
{
/* policy - when we say "fallbacks" do we prepend and use prior
- * fallbacks... or shoudl we replace. for nwo we replace
+ * fallbacks... or should we replace. for now we replace
*/
if (fmt->font.fallbacks) evas_stringshare_del(fmt->font.fallbacks);
fmt->font.fallbacks = evas_stringshare_add(param);
@@ -1079,7 +1106,7 @@
if (item)
{
ds = item;
- for (ds = item, ss = s1; ss < s2; ss++, ds++)
+ for (ss = s1; ss < s2; ss++, ds++)
{
if ((*ss == '\\') && (ss < (s2 - 1))) ss++;
*ds = *ss;
@@ -1102,7 +1129,7 @@
s = str;
- /* get rid of anything +'s or -'s off the start of the string */
+ /* get rid of anything +s or -s off the start of the string */
while ((*s == ' ') || (*s == '+') || (*s == '-')) s++;
while ((item = _format_parse(&s)))
@@ -1855,7 +1882,7 @@
if (h_ret) *h_ret = 0;
return;
}
- /* run thru all text and format nodes generating lines */
+ /* run through all text and format nodes generating lines */
for (l = (Evas_Object_List *)c->o->nodes; l; l = l->next)
{
Evas_Object_Textblock_Node *n;
@@ -2461,37 +2488,26 @@
&slen, &salloc);
break;
}
- else if (*p == '<')
- {
- o->markup_text = _strbuf_append_n(o->markup_text,
- ps, p - ps,
- &slen, &salloc);
- o->markup_text = _strbuf_append(o->markup_text,
- "<",
- &slen, &salloc);
- ps = p + 1;
- }
- else if (*p == '>')
- {
- o->markup_text = _strbuf_append_n(o->markup_text,
- ps, p - ps,
- &slen, &salloc);
- o->markup_text = _strbuf_append(o->markup_text,
- ">",
- &slen, &salloc);
- ps = p + 1;
- }
- else if (*p == '&')
+ else
{
- o->markup_text = _strbuf_append_n(o->markup_text,
- ps, p - ps,
- &slen, &salloc);
- o->markup_text = _strbuf_append(o->markup_text,
- "&",
- &slen, &salloc);
- ps = p + 1;
+ int i;
+
+ for (i = 1; i < (sizeof(_escapes) / sizeof(char
*)); i += 2)
+ {
+ if (!strncmp(_escapes[i], p,
+ strlen(_escapes[i])))
+ {
+ o->markup_text =
_strbuf_append_n(o->markup_text,
+ ps, p -
ps,
+ &slen,
&salloc);
+ o->markup_text =
_strbuf_append(o->markup_text,
+
_escapes[i-1],
+ &slen,
&salloc);
+ ps = p + strlen(_escapes[i]);
+ p += strlen(_escapes[i]) - 1;
+ }
+ }
}
- /* FIXME: learn how to do all the other escapes */
/* FIXME: strip extra whitespace ala HTML */
p++;
}
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs