Changeset 3182 for libcacaTweet

Timestamp:

Nov 1, 2008, 6:27:04 AM (14 years ago)

Author:

bsittler

Message:

fix table border, colors, and quoting of <, ", ', and > in html3 output

File:

• libcaca/trunk/caca/codec/export.c (modified) (4 diffs)

libcaca/trunk/caca/codec/export.c

@@ -489 +489 @@
     }
     
-    cur += sprintf(cur, "<table cols='%d' cellpadding='0' cellspacing='0'>\n",
+    cur += sprintf(cur, "<table border='0' cols='%d' cellpadding='0' cellspacing='0'>\n",
                         maxcols);
 
@@ -518 +518 @@
             cur += sprintf(cur, "<td");
 
-            if(caca_attr_to_ansi_fg(lineattr[x]) < 0x10)
+            if(caca_attr_to_ansi_bg(lineattr[x]) < 0x10)
                 cur += sprintf(cur, " bgcolor=#%.06lx", (unsigned long int)
                                _caca_attr_to_rgb24bg(lineattr[x]));
@@ -527 +527 @@
             cur += sprintf(cur, ">");
 
-            needfont = caca_attr_to_ansi_bg(lineattr[x]) < 0x10;
+            needfont = caca_attr_to_ansi_fg(lineattr[x]) < 0x10;
 
             if(needfont)
@@ -558 +558 @@
                     cur += sprintf(cur, "&nbsp;");
                 }
+                else if(linechar[x + i] == '&')
+                    cur += sprintf(cur, "&amp;");
+                else if(linechar[x + i] == '<')
+                    cur += sprintf(cur, "&lt;");
+                else if(linechar[x + i] == '>')
+                    cur += sprintf(cur, "&gt;");
+                else if(linechar[x + i] == '\"')
+                    cur += sprintf(cur, "&quot;");
+                else if(linechar[x + i] == '\'')
+                    cur += sprintf(cur, "&#39;");
                 else if(linechar[x + i] < 0x00000080)
                     cur += sprintf(cur, "%c", (uint8_t)linechar[x + i]);