/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 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
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <glib.h>
#include "codeconv.h"
#include "utils.h"
-#define HTMLBUFSIZE 8192
+#define SC_HTMLBUFSIZE 8192
#define HR_STR "------------------------------------------------"
-typedef struct _HTMLSymbol HTMLSymbol;
+typedef struct _SC_HTMLSymbol SC_HTMLSymbol;
-struct _HTMLSymbol
+struct _SC_HTMLSymbol
{
gchar *const key;
gchar *const val;
};
-static HTMLSymbol symbol_list[] = {
- {"<" , "<"},
- {">" , ">"},
- {"&" , "&"},
- {""" , "\""},
- {" " , " "},
- {"™" , "(TM)"},
+static SC_HTMLSymbol symbol_list[] = {
+ {"<", "\74"},
+ {">", "\76"},
+ {"&", "\46"},
+ {""", "\42"},
+ {"‘", "\47"},
+ {"’", "\47"},
+ {"“", "\42"},
+ {"”", "\42"},
+ {"«", "\302\253"},
+ {"»", "\302\273"},
+ {" ", "\40"},
+ {"™", "\50\124\115\51"},
+ {"…", "\56\56\56"},
+ {"•", "\52"},
+ {"–", "\55"},
+ {"—", "\55\55"},
+ {"€", "\105\125\122"},
+ {"¢", "\302\242"},
+ {"£", "\302\243"},
+ {"¤", "\302\244"},
+ {"¥", "\302\245"},
+ {"©", "\302\251"},
+ {"®", "\302\256"},
+ {"¿", "\302\277"},
+ {"¡", "\302\241"}
+};
+
+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"}
+};
- {"™", "(TM)"},
+typedef struct _SC_HTMLAltSymbol SC_HTMLAltSymbol;
+
+struct _SC_HTMLAltSymbol
+{
+ gint key;
+ gchar *const val;
};
-static HTMLSymbol ascii_symbol_list[] = {
- {"¡" , "^!"},
- {"¦", "|"},
- {"©" , "(C)"},
- {"«" , "<<"},
- {"®" , "(R)"},
-
- {"²" , "^2"},
- {"³" , "^3"},
- {"´" , "'"},
- {"¸" , ","},
- {"¹" , "^1"},
- {"»" , ">>"},
- {"¼", "1/4"},
- {"½", "1/2"},
- {"¾", "3/4"},
- {"¿", "^?"},
-
- {"À", "A`"},
- {"Á", "A'"},
- {"Â" , "A^"},
- {"Ã", "A~"},
- {"Æ" , "AE"},
- {"È", "E`"},
- {"É", "E'"},
- {"Ê" , "E^"},
- {"Ì", "I`"},
- {"Í", "I'"},
- {"Î" , "I^"},
-
- {"Ñ", "N~"},
- {"Ò", "O`"},
- {"Ó", "O'"},
- {"Ô" , "O^"},
- {"Õ", "O~"},
- {"Ù", "U`"},
- {"Ú", "U'"},
- {"Û" , "U^"},
- {"Ý", "Y'"},
-
- {"à", "a`"},
- {"á", "a'"},
- {"â" , "a^"},
- {"ã", "a~"},
- {"æ" , "ae"},
- {"è", "e`"},
- {"é", "e'"},
- {"ê" , "e^"},
- {"ì", "i`"},
- {"í", "i'"},
- {"î" , "i^"},
-
- {"ñ", "n~"},
- {"ò", "o`"},
- {"ó", "o'"},
- {"ô" , "o^"},
- {"õ", "o~"},
- {"ù", "u`"},
- {"ú", "u'"},
- {"û" , "u^"},
- {"ý", "y'"},
+/* http://www.w3schools.com/html/html_entitiesref.asp */
+static SC_HTMLAltSymbol alternate_symbol_list[] = {
+ { 96, "\140"}, /* backtick */
+ { 153, "\50\124\115\51"}, /* trademark */
+ { 161, "\302\241"}, /* inverted exclamation mark ¡ */
+ { 162, "\302\242"}, /* cent (currency) ¢ */
+ { 163, "\302\243"}, /* pound (currency) £ */
+ { 164, "\342\202\254"}, /* currency sign ¤ */
+ { 165, "\302\245"}, /* yen (currency) ¥ */
+ { 169, "\302\251"}, /* copyright sign © */
+ { 174, "\302\256"}, /* registered sign ® */
+ { 191, "\302\277"}, /* inverted question mark ¿ */
+ { 338, "\117\105"}, /* capital ligature OE &OElig */
+ { 339, "\157\145"}, /* small ligature OE &oelig */
+ { 352, NULL}, /* capital S w/caron &Scaron */
+ { 353, NULL}, /* small S w/caron &scaron */
+ { 376, NULL}, /* cap Y w/ diaeres &Yuml */
+ { 710, "\136"}, /* circumflex accent &circ */
+ { 732, "\176"}, /* small tilde &tilde */
+ {8194, "\40"}, /* en space &ensp */
+ {8195, "\40"}, /* em space &emsp */
+ {8201, "\40"}, /* thin space &thinsp */
+ {8204, NULL}, /* zero width non-joiner &zwnj */
+ {8205, NULL}, /* zero width joiner &zwj */
+ {8206, NULL}, /* l-t-r mark &lrm */
+ {8207, NULL}, /* r-t-l mark &rlm */
+ {8211, "\55"}, /* en dash &ndash */
+ {8212, "\55\55"}, /* em dash &mdash */
+ {8216, "\47"}, /* l single quot mark &lsquo */
+ {8217, "\47"}, /* r single quot mark &rsquo */
+ {8218, "\54"}, /* single low-9 quot &sbquo */
+ {8220, "\134"}, /* l double quot mark &ldquo */
+ {8221, "\134"}, /* r double quot mark &rdquo */
+ {8222, "\42"}, /* double low-9 quot &bdquo */
+ {8224, NULL}, /* dagger &dagger */
+ {8225, NULL}, /* double dagger &Dagger */
+ {8226, "\52"}, /* bullet &bull */
+ {8230, "\56\56\56"}, /* horizontal ellipsis &hellip */
+ {8240, "\45\157"}, /* per mile &permil */
+ {8249, "\74"}, /* l-pointing angle quot &lsaquo */
+ {8250, "\76"}, /* r-pointing angle quot &rsaquo */
+ {8364, "\105\125\122"}, /* euro &euro */
+ {8482, "\50\124\115\51"} /* trademark &trade */
};
static GHashTable *default_symbol_table;
+static GHashTable *alternate_symbol_table;
-static HTMLState html_read_line (HTMLParser *parser);
-static void html_append_char (HTMLParser *parser,
+static SC_HTMLState sc_html_read_line (SC_HTMLParser *parser);
+static void sc_html_append_char (SC_HTMLParser *parser,
gchar ch);
-static void html_append_str (HTMLParser *parser,
+static void sc_html_append_str (SC_HTMLParser *parser,
const gchar *str,
gint len);
-static HTMLState html_parse_tag (HTMLParser *parser);
-static void html_parse_special (HTMLParser *parser);
-static void html_get_parenthesis (HTMLParser *parser,
+static SC_HTMLState sc_html_parse_tag (SC_HTMLParser *parser);
+static void sc_html_parse_special (SC_HTMLParser *parser);
+static void sc_html_get_parenthesis (SC_HTMLParser *parser,
gchar *buf,
gint len);
-HTMLParser *html_parser_new(FILE *fp, CodeConverter *conv)
+SC_HTMLParser *sc_html_parser_new(FILE *fp, CodeConverter *conv)
{
- HTMLParser *parser;
+ SC_HTMLParser *parser;
g_return_val_if_fail(fp != NULL, NULL);
g_return_val_if_fail(conv != NULL, NULL);
- parser = g_new0(HTMLParser, 1);
+ parser = g_new0(SC_HTMLParser, 1);
parser->fp = fp;
parser->conv = conv;
parser->str = g_string_new(NULL);
parser->buf = g_string_new(NULL);
parser->bufp = parser->buf->str;
- parser->state = HTML_NORMAL;
+ parser->state = SC_HTML_NORMAL;
parser->href = NULL;
parser->newline = TRUE;
parser->empty_line = TRUE;
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 =
SYMBOL_TABLE_ADD(default_symbol_table, symbol_list);
SYMBOL_TABLE_ADD(default_symbol_table, ascii_symbol_list);
}
+ if (!alternate_symbol_table) {
+ alternate_symbol_table =
+ g_hash_table_new(g_int_hash, g_int_equal);
+ SYMBOL_TABLE_REF_ADD(alternate_symbol_table, alternate_symbol_list);
+ }
#undef SYMBOL_TABLE_ADD
+#undef SYMBOL_TABLE_REF_ADD
parser->symbol_table = default_symbol_table;
+ parser->alt_symbol_table = alternate_symbol_table;
return parser;
}
-void html_parser_destroy(HTMLParser *parser)
+void sc_html_parser_destroy(SC_HTMLParser *parser)
{
g_string_free(parser->str, TRUE);
g_string_free(parser->buf, TRUE);
g_free(parser);
}
-gchar *html_parse(HTMLParser *parser)
+gchar *sc_html_parse(SC_HTMLParser *parser)
{
- parser->state = HTML_NORMAL;
+ parser->state = SC_HTML_NORMAL;
g_string_truncate(parser->str, 0);
if (*parser->bufp == '\0') {
g_string_truncate(parser->buf, 0);
parser->bufp = parser->buf->str;
- if (html_read_line(parser) == HTML_EOF)
+ if (sc_html_read_line(parser) == SC_HTML_EOF)
return NULL;
}
while (*parser->bufp != '\0') {
switch (*parser->bufp) {
case '<': {
- HTMLState st;
- st = html_parse_tag(parser);
+ SC_HTMLState st;
+ st = sc_html_parse_tag(parser);
/* when we see an href, we need to flush the str
* buffer. Then collect all the chars until we
* see the end anchor tag
*/
- if (HTML_HREF_BEG == st || HTML_HREF == st)
+ if (SC_HTML_HREF_BEG == st || SC_HTML_HREF == st)
return parser->str->str;
}
break;
case '&':
- html_parse_special(parser);
+ sc_html_parse_special(parser);
break;
case ' ':
case '\t':
}
/* fallthrough */
default:
- html_append_char(parser, *parser->bufp++);
+ sc_html_append_char(parser, *parser->bufp++);
}
}
return parser->str->str;
}
-static HTMLState html_read_line(HTMLParser *parser)
+static SC_HTMLState sc_html_read_line(SC_HTMLParser *parser)
{
- gchar buf[HTMLBUFSIZE];
- gchar buf2[HTMLBUFSIZE];
+ gchar buf[SC_HTMLBUFSIZE];
+ gchar buf2[SC_HTMLBUFSIZE];
gint index;
if (fgets(buf, sizeof(buf), parser->fp) == NULL) {
- parser->state = HTML_EOF;
- return HTML_EOF;
+ parser->state = SC_HTML_EOF;
+ return SC_HTML_EOF;
}
if (conv_convert(parser->conv, buf2, sizeof(buf2), buf) < 0) {
parser->bufp = parser->buf->str + index;
- return HTML_CONV_FAILED;
+ return SC_HTML_CONV_FAILED;
}
index = parser->bufp - parser->buf->str;
parser->bufp = parser->buf->str + index;
- return HTML_NORMAL;
+ return SC_HTML_NORMAL;
}
-static void html_append_char(HTMLParser *parser, gchar ch)
+static void sc_html_append_char(SC_HTMLParser *parser, gchar ch)
{
GString *str = parser->str;
parser->newline = FALSE;
}
-static void html_append_str(HTMLParser *parser, const gchar *str, gint len)
+static void sc_html_append_str(SC_HTMLParser *parser, const gchar *str, gint len)
{
GString *string = parser->str;
parser->newline = FALSE;
}
-static HTMLTag *html_get_tag(const gchar *str)
+static SC_HTMLTag *sc_html_get_tag(const gchar *str)
{
- HTMLTag *tag;
+ SC_HTMLTag *tag;
gchar *tmp;
guchar *tmpp;
Xstrdup_a(tmp, str, return NULL);
- tag = g_new0(HTMLTag, 1);
+ tag = g_new0(SC_HTMLTag, 1);
for (tmpp = tmp; *tmpp != '\0' && !g_ascii_isspace(*tmpp); tmpp++)
;
}
while (*tmpp != '\0') {
- HTMLAttr *attr;
+ SC_HTMLAttr *attr;
gchar *attr_name;
gchar *attr_value;
gchar *p;
tmpp++;
attr_value = tmpp;
if ((p = strchr(attr_value, quote)) == NULL) {
- g_warning("html_get_tag(): syntax error in tag: '%s'\n", str);
+ g_warning("sc_html_get_tag(): syntax error in tag: '%s'\n", str);
return tag;
}
tmpp = p;
g_strchomp(attr_name);
g_strdown(attr_name);
- attr = g_new(HTMLAttr, 1);
+ attr = g_new(SC_HTMLAttr, 1);
attr->name = g_strdup(attr_name);
attr->value = g_strdup(attr_value);
tag->attr = g_list_append(tag->attr, attr);
return tag;
}
-static void html_free_tag(HTMLTag *tag)
+static void sc_html_free_tag(SC_HTMLTag *tag)
{
if (!tag) return;
g_free(tag->name);
while (tag->attr != NULL) {
- HTMLAttr *attr = (HTMLAttr *)tag->attr->data;
+ SC_HTMLAttr *attr = (SC_HTMLAttr *)tag->attr->data;
g_free(attr->name);
g_free(attr->value);
g_free(attr);
g_free(tag);
}
-static HTMLState html_parse_tag(HTMLParser *parser)
+static SC_HTMLState sc_html_parse_tag(SC_HTMLParser *parser)
{
- gchar buf[HTMLBUFSIZE];
- HTMLTag *tag;
+ gchar buf[SC_HTMLBUFSIZE];
+ SC_HTMLTag *tag;
- html_get_parenthesis(parser, buf, sizeof(buf));
+ sc_html_get_parenthesis(parser, buf, sizeof(buf));
- tag = html_get_tag(buf);
+ tag = sc_html_get_tag(buf);
- parser->state = HTML_UNKNOWN;
- if (!tag) return HTML_UNKNOWN;
+ parser->state = SC_HTML_UNKNOWN;
+ if (!tag) return SC_HTML_UNKNOWN;
if (!strcmp(tag->name, "br")) {
parser->space = FALSE;
- html_append_char(parser, '\n');
- parser->state = HTML_BR;
+ sc_html_append_char(parser, '\n');
+ parser->state = SC_HTML_BR;
} else if (!strcmp(tag->name, "a")) {
- if (tag->attr && tag->attr->data &&
- !strcmp(((HTMLAttr *)tag->attr->data)->name, "href")) {
- g_free(parser->href);
- parser->href =
- g_strdup(((HTMLAttr *)tag->attr->data)->value);
- parser->state = HTML_HREF_BEG;
+ GList *cur;
+ for (cur = tag->attr; cur != NULL; cur = cur->next) {
+ if (cur->data && !strcmp(((SC_HTMLAttr *)cur->data)->name, "href")) {
+ g_free(parser->href);
+ parser->href = g_strdup(((SC_HTMLAttr *)cur->data)->value);
+ parser->state = SC_HTML_HREF_BEG;
+ break;
+ }
}
} else if (!strcmp(tag->name, "/a")) {
- parser->state = HTML_HREF;
+ parser->state = SC_HTML_HREF;
} else if (!strcmp(tag->name, "p")) {
parser->space = FALSE;
if (!parser->empty_line) {
parser->space = FALSE;
- if (!parser->newline) html_append_char(parser, '\n');
- html_append_char(parser, '\n');
+ if (!parser->newline) sc_html_append_char(parser, '\n');
+ sc_html_append_char(parser, '\n');
}
- parser->state = HTML_PAR;
+ parser->state = SC_HTML_PAR;
} else if (!strcmp(tag->name, "pre")) {
parser->pre = TRUE;
- parser->state = HTML_PRE;
+ parser->state = SC_HTML_PRE;
} else if (!strcmp(tag->name, "/pre")) {
parser->pre = FALSE;
- parser->state = HTML_NORMAL;
+ parser->state = SC_HTML_NORMAL;
} else if (!strcmp(tag->name, "hr")) {
if (!parser->newline) {
parser->space = FALSE;
- html_append_char(parser, '\n');
+ sc_html_append_char(parser, '\n');
}
- html_append_str(parser, HR_STR "\n", -1);
- parser->state = HTML_HR;
+ sc_html_append_str(parser, HR_STR "\n", -1);
+ parser->state = SC_HTML_HR;
} else if (!strcmp(tag->name, "div") ||
!strcmp(tag->name, "ul") ||
!strcmp(tag->name, "li") ||
(tag->name[0] == 'h' && g_ascii_isdigit(tag->name[1]))) {
if (!parser->newline) {
parser->space = FALSE;
- html_append_char(parser, '\n');
+ sc_html_append_char(parser, '\n');
}
- parser->state = HTML_NORMAL;
+ parser->state = SC_HTML_NORMAL;
} else if (!strcmp(tag->name, "/table") ||
(tag->name[0] == '/' &&
tag->name[1] == 'h' &&
g_ascii_isdigit(tag->name[1]))) {
if (!parser->empty_line) {
parser->space = FALSE;
- if (!parser->newline) html_append_char(parser, '\n');
- html_append_char(parser, '\n');
+ if (!parser->newline) sc_html_append_char(parser, '\n');
+ sc_html_append_char(parser, '\n');
}
- parser->state = HTML_NORMAL;
+ parser->state = SC_HTML_NORMAL;
} else if (!strcmp(tag->name, "/div") ||
!strcmp(tag->name, "/ul") ||
!strcmp(tag->name, "/li")) {
if (!parser->newline) {
parser->space = FALSE;
- html_append_char(parser, '\n');
+ sc_html_append_char(parser, '\n');
}
- parser->state = HTML_NORMAL;
+ parser->state = SC_HTML_NORMAL;
}
- html_free_tag(tag);
+ sc_html_free_tag(tag);
return parser->state;
}
-static void html_parse_special(HTMLParser *parser)
+static void sc_html_parse_special(SC_HTMLParser *parser)
{
gchar symbol_name[9];
gint n;
const gchar *val;
- parser->state = HTML_UNKNOWN;
+ parser->state = SC_HTML_UNKNOWN;
g_return_if_fail(*parser->bufp == '&');
/* &foo; */
;
if (n > 7 || parser->bufp[n] != ';') {
/* output literal `&' */
- html_append_char(parser, *parser->bufp++);
- parser->state = HTML_NORMAL;
+ sc_html_append_char(parser, *parser->bufp++);
+ parser->state = SC_HTML_NORMAL;
return;
}
strncpy2(symbol_name, parser->bufp, n + 2);
if ((val = g_hash_table_lookup(parser->symbol_table, symbol_name))
!= NULL) {
- html_append_str(parser, val, -1);
- parser->state = HTML_NORMAL;
+ 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;
if ((ch > 0 && ch <= 127) ||
(ch >= 128 && ch <= 255 &&
parser->conv->charset == C_ISO_8859_1)) {
- html_append_char(parser, ch);
- parser->state = HTML_NORMAL;
+ 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 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 ‘ */
- symb = "`";
- break;
- case 8217: /* r single quot mark ’ */
- symb = "'";
- break;
- case 8218: /* single low-9 quot ‚ */
- symb = ",";
- break;
- case 8220: /* l double quot mark “ */
- symb = "``";
- break;
- 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;
- }
+ const gchar *symb = g_hash_table_lookup(parser->alt_symbol_table, &ch);
if (symb) {
- html_append_str(parser, symb, -1);
- parser->state = HTML_NORMAL;
+ sc_html_append_str(parser, symb, -1);
+ parser->state = SC_HTML_NORMAL;
return;
}
}
}
- html_append_str(parser, symbol_name, -1);
+ sc_html_append_str(parser, symbol_name, -1);
}
-static void html_get_parenthesis(HTMLParser *parser, gchar *buf, gint len)
+static void sc_html_get_parenthesis(SC_HTMLParser *parser, gchar *buf, gint len)
{
gchar *p;
if (!strncmp(parser->bufp, "<!--", 4)) {
parser->bufp += 4;
while ((p = strstr(parser->bufp, "-->")) == NULL)
- if (html_read_line(parser) == HTML_EOF) return;
+ if (sc_html_read_line(parser) == SC_HTML_EOF) return;
parser->bufp = p + 3;
return;
}
if (!g_ascii_strncasecmp(parser->bufp, "<style", 6)) {
parser->bufp += 6;
while ((p = strcasestr(parser->bufp, "</style>")) == NULL)
- if (html_read_line(parser) == HTML_EOF) return;
+ 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)
- if (html_read_line(parser) == HTML_EOF) return;
+ if (sc_html_read_line(parser) == SC_HTML_EOF) return;
parser->bufp = p + 9;
return;
}
parser->bufp++;
while ((p = strchr(parser->bufp, '>')) == NULL)
- if (html_read_line(parser) == HTML_EOF) return;
+ if (sc_html_read_line(parser) == SC_HTML_EOF) return;
strncpy2(buf, parser->bufp, MIN(p - parser->bufp + 1, len));
g_strstrip(buf);
projects / claws.git / blobdiff