Now also handling strikethrough (as in <del>, <s> and <strike>)

This commit is contained in:
Pierre Pronchery 2010-09-13 03:16:59 +00:00
parent a56134d8ba
commit bab6a313c0

View File

@ -58,7 +58,7 @@ typedef struct _GHtmlTag
GtkTextTag * tag; GtkTextTag * tag;
} GHtmlTag; } GHtmlTag;
#define GHTML_TAGS_COUNT 21 #define GHTML_TAGS_COUNT 24
typedef struct _GHtml typedef struct _GHtml
{ {
Surfer * surfer; Surfer * surfer;
@ -104,6 +104,13 @@ static const GHtmlProperty _ghtml_properties_b[] =
{ NULL, NULL } { NULL, NULL }
}; };
static const GHtmlProperty _ghtml_properties_del[] =
{
{ "strikethrough", (void*)TRUE },
{ "strikethrough-set", (void*)TRUE },
{ NULL, NULL }
};
/* XXX should use "scale" but gdouble values are not accepted this way */ /* XXX should use "scale" but gdouble values are not accepted this way */
static const GHtmlProperty _ghtml_properties_h1[] = static const GHtmlProperty _ghtml_properties_h1[] =
{ {
@ -186,6 +193,7 @@ static const GHtmlTag _ghtml_tags[GHTML_TAGS_COUNT] =
{ {
{ "a", GHTML_DISPLAY_INLINE, _ghtml_properties_a, NULL }, { "a", GHTML_DISPLAY_INLINE, _ghtml_properties_a, NULL },
{ "b", GHTML_DISPLAY_INLINE, _ghtml_properties_b, NULL }, { "b", GHTML_DISPLAY_INLINE, _ghtml_properties_b, NULL },
{ "del", GHTML_DISPLAY_INLINE, _ghtml_properties_del, NULL },
{ "div", GHTML_DISPLAY_BLOCK, NULL, NULL }, { "div", GHTML_DISPLAY_BLOCK, NULL, NULL },
{ "em", GHTML_DISPLAY_INLINE, _ghtml_properties_b, NULL }, { "em", GHTML_DISPLAY_INLINE, _ghtml_properties_b, NULL },
{ "form", GHTML_DISPLAY_BLOCK, NULL, NULL }, { "form", GHTML_DISPLAY_BLOCK, NULL, NULL },
@ -201,6 +209,8 @@ static const GHtmlTag _ghtml_tags[GHTML_TAGS_COUNT] =
{ "ol", GHTML_DISPLAY_BLOCK, NULL, NULL }, { "ol", GHTML_DISPLAY_BLOCK, NULL, NULL },
{ "p", GHTML_DISPLAY_BLOCK, NULL, NULL }, { "p", GHTML_DISPLAY_BLOCK, NULL, NULL },
{ "pre", GHTML_DISPLAY_BLOCK,_ghtml_properties_pre, NULL }, { "pre", GHTML_DISPLAY_BLOCK,_ghtml_properties_pre, NULL },
{ "s", GHTML_DISPLAY_INLINE, _ghtml_properties_del, NULL },
{ "strike", GHTML_DISPLAY_INLINE,_ghtml_properties_del, NULL },
{ "strong", GHTML_DISPLAY_INLINE,_ghtml_properties_b, NULL }, { "strong", GHTML_DISPLAY_INLINE,_ghtml_properties_b, NULL },
{ "tt", GHTML_DISPLAY_INLINE, _ghtml_properties_tt, NULL }, { "tt", GHTML_DISPLAY_INLINE, _ghtml_properties_tt, NULL },
{ "u", GHTML_DISPLAY_INLINE, _ghtml_properties_u, NULL }, { "u", GHTML_DISPLAY_INLINE, _ghtml_properties_u, NULL },