/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#include <glib.h>
};
static SC_HTMLSymbol symbol_list[] = {
- {"<" , "<"},
- {">" , ">"},
- {"&" , "&"},
- {""" , "\""},
- {"‘", "'"},
- {"’", "'"},
- {"“", "\""},
- {"”", "\""},
- {" " , " "},
- {"™" , "(TM)"},
- {"™", "(TM)"},
- {"…", "..."},
+ {""", "\42"},
+ {"&", "\46"},
+ {"'", "\47"},
+ {"<", "\74"},
+ {">", "\76"},
+ {""", "\42"},
+ {"&", "\46"},
+ {"'", "\47"},
+ {"<", "\74"},
+ {">", "\76"},
+ {"’", "\47"},
+ {"™", "\342\204\242"},
+ {" ", "\40"},
+ {"¡", "\302\241"},
+ {"¢", "\302\242"},
+ {"£", "\302\243"},
+ {"¤", "\302\244"},
+ {"¥", "\302\245"},
+ {"¦", "\302\246"},
+ {"§", "\302\247"},
+ {"¨", "\302\250"},
+ {"©", "\302\251"},
+ {"ª", "\302\252"},
+ {"«", "\302\253"},
+ {"¬", "\302\254"},
+ {"­", "\302\255"},
+ {"®", "\302\256"},
+ {"¯", "\302\257"},
+ {"°", "\302\260"},
+ {"±", "\302\261"},
+ {"²", "\302\262"},
+ {"³", "\302\263"},
+ {"´", "\302\264"},
+ {"µ", "\302\265"},
+ {"¶", "\302\266"},
+ {"·", "\302\267"},
+ {"¸", "\302\270"},
+ {"¹", "\302\271"},
+ {"º", "\302\272"},
+ {"»", "\302\273"},
+ {"¼", "\302\274"},
+ {"½", "\302\275"},
+ {"¾", "\302\276"},
+ {"¿", "\302\277"},
+ {"À", "\303\200"},
+ {"Á", "\303\201"},
+ {"Â", "\303\202"},
+ {"Ã", "\303\203"},
+ {"Ä", "\303\204"},
+ {"Å", "\303\205"},
+ {"Æ", "\303\206"},
+ {"Ç", "\303\207"},
+ {"È", "\303\210"},
+ {"É", "\303\211"},
+ {"Ê", "\303\212"},
+ {"Ë", "\303\213"},
+ {"Ì", "\303\214"},
+ {"Í", "\303\215"},
+ {"Î", "\303\216"},
+ {"Ï", "\303\217"},
+ {"Ð", "\303\220"},
+ {"Ñ", "\303\221"},
+ {"Ò", "\303\222"},
+ {"Ó", "\303\223"},
+ {"Ô", "\303\224"},
+ {"Õ", "\303\225"},
+ {"Ö", "\303\226"},
+ {"×", "\303\227"},
+ {"Ø", "\303\230"},
+ {"Ù", "\303\231"},
+ {"Ú", "\303\232"},
+ {"Û", "\303\233"},
+ {"Ü", "\303\234"},
+ {"Ý", "\303\235"},
+ {"Þ", "\303\236"},
+ {"ß", "\303\237"},
+ {"à", "\303\240"},
+ {"á", "\303\241"},
+ {"â", "\303\242"},
+ {"ã", "\303\243"},
+ {"ä", "\303\244"},
+ {"å", "\303\245"},
+ {"æ", "\303\246"},
+ {"ç", "\303\247"},
+ {"è", "\303\250"},
+ {"é", "\303\251"},
+ {"ê", "\303\252"},
+ {"ë", "\303\253"},
+ {"ì", "\303\254"},
+ {"í", "\303\255"},
+ {"î", "\303\256"},
+ {"ï", "\303\257"},
+ {"ð", "\303\260"},
+ {"ñ", "\303\261"},
+ {"ò", "\303\262"},
+ {"ó", "\303\263"},
+ {"ô", "\303\264"},
+ {"õ", "\303\265"},
+ {"ö", "\303\266"},
+ {"÷", "\303\267"},
+ {"ø", "\303\270"},
+ {"ù", "\303\271"},
+ {"ú", "\303\272"},
+ {"û", "\303\273"},
+ {"ü", "\303\274"},
+ {"ý", "\303\275"},
+ {"þ", "\303\276"},
+ {"ÿ", "\303\277"},
+ {"Œ", "\305\222"},
+ {"œ", "\305\223"},
+ {"Š", "\305\240"},
+ {"š", "\305\241"},
+ {"Ÿ", "\305\270"},
+ {"ˆ", "\313\206"},
+ {"˜", "\313\234"},
+ {" ", "\342\200\202"},
+ {" ", "\342\200\203"},
+ {" ", "\342\200\211"},
+ {"–", "\342\200\223"},
+ {"—", "\342\200\224"},
+ {"‘", "\342\200\230"},
+ {"’", "\342\200\231"},
+ {"‚", "\342\200\232"},
+ {"“", "\342\200\234"},
+ {"”", "\342\200\235"},
+ {"„", "\342\200\236"},
+ {"†", "\342\200\240"},
+ {"‡", "\342\200\241"},
+ {"•", "\342\200\242"},
+ {"…", "\342\200\246"},
+ {"‰", "\342\200\260"},
+ {"‹", "\342\200\271"},
+ {"›", "\342\200\272"},
+ {"€", "\342\202\254"},
+ {"™", "\342\204\242"},
+ {""", "\42"},
+ {"&", "\46"},
+ {"'", "\47"},
+ {"<", "\74"},
+ {">", "\76"},
+ {"&squot;", "\47"},
+ {" ", "\40"},
+ {"¡", "\302\241"},
+ {"¢", "\302\242"},
+ {"£", "\302\243"},
+ {"¤", "\302\244"},
+ {"¥", "\302\245"},
+ {"¦", "\302\246"},
+ {"§", "\302\247"},
+ {"¨", "\302\250"},
+ {"©", "\302\251"},
+ {"ª", "\302\252"},
+ {"«", "\302\253"},
+ {"¬", "\302\254"},
+ {"­", "\302\255"},
+ {"®", "\302\256"},
+ {"¯", "\302\257"},
+ {"°", "\302\260"},
+ {"±", "\302\261"},
+ {"²", "\302\262"},
+ {"³", "\302\263"},
+ {"´", "\302\264"},
+ {"µ", "\302\265"},
+ {"¶", "\302\266"},
+ {"·", "\302\267"},
+ {"¸", "\302\270"},
+ {"¹", "\302\271"},
+ {"º", "\302\272"},
+ {"»", "\302\273"},
+ {"¼", "\302\274"},
+ {"½", "\302\275"},
+ {"¾", "\302\276"},
+ {"¿", "\302\277"},
+ {"À", "\303\200"},
+ {"Á", "\303\201"},
+ {"Â", "\303\202"},
+ {"Ã", "\303\203"},
+ {"Ä", "\303\204"},
+ {"Å", "\303\205"},
+ {"Æ", "\303\206"},
+ {"Ç", "\303\207"},
+ {"È", "\303\210"},
+ {"É", "\303\211"},
+ {"Ê", "\303\212"},
+ {"Ë", "\303\213"},
+ {"Ì", "\303\214"},
+ {"Í", "\303\215"},
+ {"Î", "\303\216"},
+ {"Ï", "\303\217"},
+ {"Ð", "\303\220"},
+ {"Ñ", "\303\221"},
+ {"Ò", "\303\222"},
+ {"Ó", "\303\223"},
+ {"Ô", "\303\224"},
+ {"Õ", "\303\225"},
+ {"Ö", "\303\226"},
+ {"×", "\303\227"},
+ {"Ø", "\303\230"},
+ {"Ù", "\303\231"},
+ {"Ú", "\303\232"},
+ {"Û", "\303\233"},
+ {"Ü", "\303\234"},
+ {"Ý", "\303\235"},
+ {"Þ", "\303\236"},
+ {"ß", "\303\237"},
+ {"à", "\303\240"},
+ {"á", "\303\241"},
+ {"â", "\303\242"},
+ {"ã", "\303\243"},
+ {"ä", "\303\244"},
+ {"å", "\303\245"},
+ {"æ", "\303\246"},
+ {"ç", "\303\247"},
+ {"è", "\303\250"},
+ {"é", "\303\251"},
+ {"ê", "\303\252"},
+ {"ë", "\303\253"},
+ {"ì", "\303\254"},
+ {"í", "\303\255"},
+ {"î", "\303\256"},
+ {"ï", "\303\257"},
+ {"ð", "\303\260"},
+ {"ñ", "\303\261"},
+ {"ò", "\303\262"},
+ {"ó", "\303\263"},
+ {"ô", "\303\264"},
+ {"õ", "\303\265"},
+ {"ö", "\303\266"},
+ {"÷", "\303\267"},
+ {"ø", "\303\270"},
+ {"ù", "\303\271"},
+ {"ú", "\303\272"},
+ {"û", "\303\273"},
+ {"ü", "\303\274"},
+ {"ý", "\303\275"},
+ {"þ", "\303\276"},
+ {"ÿ", "\303\277"},
+ {"Œ", "\305\222"},
+ {"œ", "\305\223"},
+ {"Š", "\305\240"},
+ {"š", "\305\241"},
+ {"Ÿ", "\305\270"},
+ {"ˆ", "\313\206"},
+ {"˜", "\313\234"},
+ {" ", "\342\200\202"},
+ {" ", "\342\200\203"},
+ {" ", "\342\200\211"},
+ {"–", "\342\200\223"},
+ {"—", "\342\200\224"},
+ {"‘", "\342\200\230"},
+ {"’", "\342\200\231"},
+ {"‚", "\342\200\232"},
+ {"“", "\342\200\234"},
+ {"”", "\342\200\235"},
+ {"„", "\342\200\236"},
+ {"†", "\342\200\240"},
+ {"‡", "\342\200\241"},
+ {"•", "\342\200\242"},
+ {"…", "\342\200\246"},
+ {"‰", "\342\200\260"},
+ {"‹", "\342\200\271"},
+ {"›", "\342\200\272"},
+ {"€", "\342\202\254"},
+ {"™", "\342\204\242"}
};
-static SC_HTMLSymbol ascii_symbol_list[] = {
- {"¡" , "\302\241"},
- {"¦", "\302\246"},
- {"©" , "\302\251"},
- {"«" , "\302\253"},
- {"®" , "\302\256"},
-
- {"²" , "\302\262"},
- {"³" , "\302\263"},
- {"´" , "\302\264"},
- {"¸" , "\302\270"},
- {"¹" , "\302\271"},
- {"»" , "\302\273"},
- {"¼", "\302\274"},
- {"½", "\302\275"},
- {"¾", "\302\276"},
- {"¿", "\302\277"},
-
- {"À", "\303\200"},
- {"Á", "\303\201"},
- {"Â" , "\303\202"},
- {"Ã", "\303\203"},
- {"Æ" , "\303\206"},
- {"È", "\303\210"},
- {"É", "\303\211"},
- {"Ê" , "\303\212"},
- {"Ì", "\303\214"},
- {"Í", "\303\215"},
- {"Î" , "\303\216"},
-
- {"Ñ", "\303\221"},
- {"Ò", "\303\222"},
- {"Ó", "\303\223"},
- {"Ô" , "\303\224"},
- {"Õ", "\303\225"},
- {"Ù", "\303\231"},
- {"Ú", "\303\232"},
- {"Û" , "\303\233"},
- {"Ý", "\303\235"},
-
- {"à", "\303\240"},
- {"á", "\303\241"},
- {"â" , "\303\242"},
- {"ã", "\303\243"},
- {"æ" , "\303\246"},
- {"è", "\303\250"},
- {"é", "\303\251"},
- {"ê" , "\303\252"},
- {"ì", "\303\254"},
- {"í", "\303\255"},
- {"î" , "\303\256"},
-
- {"ñ", "\303\261"},
- {"ò", "\303\262"},
- {"ó", "\303\263"},
- {"ô" , "\303\264"},
- {"õ", "\303\265"},
- {"ù", "\303\271"},
- {"ú", "\303\272"},
- {"û" , "\303\273"},
- {"ý", "\303\275"},
+typedef struct _SC_HTMLAltSymbol SC_HTMLAltSymbol;
+
+struct _SC_HTMLAltSymbol
+{
+ gint key;
+ gchar *const val;
};
static GHashTable *default_symbol_table;
{
SC_HTMLParser *parser;
- g_return_val_if_fail(fp != NULL, NULL);
- g_return_val_if_fail(conv != NULL, NULL);
+ cm_return_val_if_fail(fp != NULL, NULL);
+ cm_return_val_if_fail(conv != NULL, NULL);
parser = g_new0(SC_HTMLParser, 1);
parser->fp = fp;
for (i = 0; i < sizeof(list) / sizeof(list[0]); i++) \
g_hash_table_insert(table, list[i].key, list[i].val); \
}
+#define SYMBOL_TABLE_REF_ADD(table, list) \
+{ \
+ gint i; \
+ \
+ for (i = 0; i < sizeof(list) / sizeof(list[0]); i++) \
+ g_hash_table_insert(table, &list[i].key, list[i].val); \
+}
if (!default_symbol_table) {
default_symbol_table =
g_hash_table_new(g_str_hash, g_str_equal);
SYMBOL_TABLE_ADD(default_symbol_table, symbol_list);
- SYMBOL_TABLE_ADD(default_symbol_table, ascii_symbol_list);
}
#undef SYMBOL_TABLE_ADD
+#undef SYMBOL_TABLE_REF_ADD
parser->symbol_table = default_symbol_table;
gchar buf[SC_HTMLBUFSIZE];
gchar buf2[SC_HTMLBUFSIZE];
gint index;
+ gint n;
+
+ if (parser->fp == NULL)
+ return SC_HTML_EOF;
- if (fgets(buf, sizeof(buf), parser->fp) == NULL) {
+ n = fread(buf, 1, sizeof(buf) - 1, parser->fp);
+ if (n == 0) {
parser->state = SC_HTML_EOF;
return SC_HTML_EOF;
- }
+ } else
+ buf[n] = '\0';
if (conv_convert(parser->conv, buf2, sizeof(buf2), buf) < 0) {
index = parser->bufp - parser->buf->str;
gchar *tmp;
guchar *tmpp;
- g_return_val_if_fail(str != NULL, NULL);
+ cm_return_val_if_fail(str != NULL, NULL);
if (*str == '\0' || *str == '!') return NULL;
;
if (*tmpp == '\0') {
- g_strdown(tmp);
- tag->name = g_strdup(tmp);
+ tag->name = g_utf8_strdown(tmp, -1);
return tag;
} else {
*tmpp++ = '\0';
- g_strdown(tmp);
- tag->name = g_strdup(tmp);
+ tag->name = g_utf8_strdown(tmp, -1);
}
while (*tmpp != '\0') {
attr_value = "";
g_strchomp(attr_name);
- g_strdown(attr_name);
attr = g_new(SC_HTMLAttr, 1);
- attr->name = g_strdup(attr_name);
+ attr->name = g_utf8_strdown(attr_name, -1);
attr->value = g_strdup(attr_value);
tag->attr = g_list_append(tag->attr, attr);
}
g_free(tag);
}
+static void decode_href(SC_HTMLParser *parser)
+{
+ gchar *tmp;
+ SC_HTMLParser *tparser = g_new0(SC_HTMLParser, 1);
+
+ tparser->str = g_string_new(NULL);
+ tparser->buf = g_string_new(parser->href);
+ tparser->bufp = tparser->buf->str;
+ tparser->symbol_table = default_symbol_table;
+
+ tmp = sc_html_parse(tparser);
+
+ g_free(parser->href);
+ parser->href = g_strdup(tmp);
+
+ sc_html_parser_destroy(tparser);
+}
+
static SC_HTMLState sc_html_parse_tag(SC_HTMLParser *parser)
{
gchar buf[SC_HTMLBUFSIZE];
parser->state = SC_HTML_UNKNOWN;
if (!tag) return SC_HTML_UNKNOWN;
- if (!strcmp(tag->name, "br")) {
+ if (!strcmp(tag->name, "br") || !strcmp(tag->name, "br/")) {
parser->space = FALSE;
sc_html_append_char(parser, '\n');
parser->state = SC_HTML_BR;
if (cur->data && !strcmp(((SC_HTMLAttr *)cur->data)->name, "href")) {
g_free(parser->href);
parser->href = g_strdup(((SC_HTMLAttr *)cur->data)->value);
+ decode_href(parser);
parser->state = SC_HTML_HREF_BEG;
break;
}
const gchar *val;
parser->state = SC_HTML_UNKNOWN;
- g_return_if_fail(*parser->bufp == '&');
+ cm_return_if_fail(*parser->bufp == '&');
/* &foo; */
for (n = 0; parser->bufp[n] != '\0' && parser->bufp[n] != ';'; n++)
sc_html_append_str(parser, val, -1);
parser->state = SC_HTML_NORMAL;
return;
- } else if (symbol_name[1] == '#' && g_ascii_isdigit(symbol_name[2])) {
- gint ch;
-
- ch = atoi(symbol_name + 2);
- if ((ch > 0 && ch <= 127) ||
- (ch >= 128 && ch <= 255 &&
- parser->conv->charset == C_ISO_8859_1)) {
- sc_html_append_char(parser, ch);
- parser->state = SC_HTML_NORMAL;
- return;
- } else {
- char *symb = NULL;
- switch (ch) {
- /* http://www.w3schools.com/html/html_entitiesref.asp */
- case 96: /* backtick */
- symb = "`";
- break;
- case 338: /* capital ligature OE Π*/
- symb = "OE";
- break;
- case 339: /* small ligature OE œ */
- symb = "oe";
- break;
- case 352: /* capital S w/caron Š */
- case 353: /* small S w/caron š */
- case 376: /* cap Y w/ diaeres Ÿ */
- break;
- case 710: /* circumflex accent ˆ */
- symb = "^";
- break;
- case 732: /* small tilde ˜ */
- symb = "~";
- break;
- case 8194: /* en space   */
- case 8195: /* em space   */
- case 8201: /* thin space   */
- symb = " ";
- break;
- case 8204: /* zero width non-joiner ‌ */
- case 8205: /* zero width joiner ‍ */
- case 8206: /* l-t-r mark ‎ */
- case 8207: /* r-t-l mark &rlm */
- break;
- case 8211: /* en dash – */
- symb = "-";
- break;
- case 8212: /* em dash — */
- symb = "--";
- break;
- case 8216: /* l single quot mark ‘ */
- case 8217: /* r single quot mark ’ */
- symb = "'";
- break;
- case 8218: /* single low-9 quot ‚ */
- symb = ",";
- break;
- case 8220: /* l double quot mark “ */
- case 8221: /* r double quot mark ” */
- symb = "\"";
- break;
- case 8222: /* double low-9 quot „ */
- symb = ",,";
- break;
- case 8224: /* dagger † */
- case 8225: /* double dagger ‡ */
- break;
- case 8230: /* horizontal ellipsis … */
- symb = "...";
- break;
- case 8240: /* per mile ‰ */
- symb = "\%o";
- break;
- case 8249: /* l-pointing angle quot ‹ */
- symb = "<";
- break;
- case 8250: /* r-pointing angle quot › */
- symb = ">";
- break;
- case 8364: /* euro € */
- symb = "EUR";
- break;
- case 8482: /* trademark ™ */
- symb = "(TM)";
- break;
- default:
- break;
- }
- if (symb) {
- sc_html_append_str(parser, symb, -1);
- parser->state = SC_HTML_NORMAL;
- return;
- }
- }
- }
+ }
sc_html_append_str(parser, symbol_name, -1);
}
+static gchar *sc_html_find_tag(SC_HTMLParser *parser, const gchar *tag)
+{
+ gchar *cur = parser->bufp;
+ gint len = strlen(tag);
+
+ if (cur == NULL)
+ return NULL;
+
+ while ((cur = strstr(cur, "<")) != NULL) {
+ if (!g_ascii_strncasecmp(cur, tag, len))
+ return cur;
+ cur += 2;
+ }
+ return NULL;
+}
+
static void sc_html_get_parenthesis(SC_HTMLParser *parser, gchar *buf, gint len)
{
gchar *p;
buf[0] = '\0';
- g_return_if_fail(*parser->bufp == '<');
+ cm_return_if_fail(*parser->bufp == '<');
/* ignore comment / CSS / script stuff */
if (!strncmp(parser->bufp, "<!--", 4)) {
}
if (!g_ascii_strncasecmp(parser->bufp, "<style", 6)) {
parser->bufp += 6;
- while ((p = strcasestr(parser->bufp, "</style>")) == NULL)
+ while ((p = sc_html_find_tag(parser, "</style>")) == NULL)
if (sc_html_read_line(parser) == SC_HTML_EOF) return;
parser->bufp = p + 8;
return;
}
if (!g_ascii_strncasecmp(parser->bufp, "<script", 7)) {
parser->bufp += 7;
- while ((p = strcasestr(parser->bufp, "</script>")) == NULL)
+ while ((p = sc_html_find_tag(parser, "</script>")) == NULL)
if (sc_html_read_line(parser) == SC_HTML_EOF) return;
parser->bufp = p + 9;
return;
projects / claws.git / blobdiff