Mercurial > pidgin

changeset 5101:a7e9036cd46f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 5464] this still needs a lot of work committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Thu, 10 Apr 2003 21:55:13 +0000
parents 8655d83e1e1e
children 4b4455c52f62
files src/gtkimhtml.c src/html.c
diffstat 2 files changed, 26 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkimhtml.c	Thu Apr 10 21:27:58 2003 +0000
+++ b/src/gtkimhtml.c	Thu Apr 10 21:55:13 2003 +0000
@@ -716,6 +716,13 @@
 	VALID_OPT_TAG ("H3");
 	VALID_OPT_TAG ("HTML");
 
+	VALID_TAG ("CITE");
+	VALID_TAG ("/CITE");
+	VALID_TAG ("EM");
+	VALID_TAG ("/EM");
+	VALID_TAG ("STRONG");
+	VALID_TAG ("/STRONG");
+
 	if (!g_ascii_strncasecmp(string, "!--", strlen ("!--"))) {
 		gchar *e = strstr (string + strlen("!--"), "-->");
 		if (e) {
@@ -904,22 +911,26 @@
 				{
 				case 1:		/* B */
 				case 2:		/* BOLD */
+				case 54:	/* STRONG */
 					NEW_BIT (NEW_TEXT_BIT);
 					bold++;
 					break;
 				case 3:		/* /B */
 				case 4:		/* /BOLD */
+				case 55:	/* /STRONG */
 					NEW_BIT (NEW_TEXT_BIT);
 					if (bold)
 						bold--;
 					break;
 				case 5:		/* I */
 				case 6:		/* ITALIC */
+				case 52:	/* EM */
 					NEW_BIT (NEW_TEXT_BIT);
 					italics++;
 					break;
 				case 7:		/* /I */
 				case 8:		/* /ITALIC */
+				case 53:	/* /EM */
 					NEW_BIT (NEW_TEXT_BIT);
 					if (italics)
 						italics--;
@@ -1175,8 +1186,10 @@
 				case 47:	/* P (opt) */
 				case 48:	/* H3 (opt) */
 				case 49:	/* HTML (opt) */
+				case 50:	/* CITE */
+				case 51:	/* /CITE */
 					break;
-				case 50:	/* comment */
+				case 56:	/* comment */
 					NEW_BIT (NEW_TEXT_BIT);
 					if (imhtml->show_comments)
 						wpos = g_snprintf (ws, len, "%s", tag);
--- a/src/html.c	Thu Apr 10 21:27:58 2003 +0000
+++ b/src/html.c	Thu Apr 10 21:55:13 2003 +0000
@@ -394,40 +394,38 @@
 				}
 			} else { /* opening tag */
 				ALLOW_TAG("a");
-				ALLOW_TAG("b");
+				ALLOW_TAG_ALT("b", "strong");
 				ALLOW_TAG("blockquote");
 				ALLOW_TAG("body");
-				ALLOW_TAG_ALT("bold", "b");
+				ALLOW_TAG_ALT("bold", "strong");
 				ALLOW_TAG("br");
 				ALLOW_TAG("cite");
 				ALLOW_TAG("div");
 				ALLOW_TAG("em");
-				ALLOW_TAG("font");
+				ALLOW_TAG("font"); /* FIXME: not valid, need to translate */
 				ALLOW_TAG("h1");
 				ALLOW_TAG("h2");
 				ALLOW_TAG("h3");
 				ALLOW_TAG("h4");
 				ALLOW_TAG("h5");
 				ALLOW_TAG("h6");
-				ALLOW_TAG("head");
-				ALLOW_TAG("hr");
+				ALLOW_TAG("hr"); /* FIXME: not valid, need to skip?? */
 				ALLOW_TAG("html");
-				ALLOW_TAG("i");
-				ALLOW_TAG_ALT("italic", "i");
+				ALLOW_TAG_ALT("i", "em");
+				ALLOW_TAG_ALT("italic", "em");
 				ALLOW_TAG("li");
 				ALLOW_TAG("ol");
 				ALLOW_TAG("p");
 				ALLOW_TAG("pre");
 				ALLOW_TAG("q");
-				ALLOW_TAG_ALT("s", "strike");
+				ALLOW_TAG_ALT("s", "strike"); /* FIXME: see strike */
 				ALLOW_TAG("span");
-				ALLOW_TAG("strike");
+				ALLOW_TAG("strike"); /* FIXME: not valid, need to convert */
 				ALLOW_TAG("strong");
-				ALLOW_TAG("sub");
-				ALLOW_TAG("sup");
-				ALLOW_TAG("title");
-				ALLOW_TAG("u");
-				ALLOW_TAG_ALT("underline","u");
+				ALLOW_TAG("sub"); /* FIXME: not valid, need to convert */
+				ALLOW_TAG("sup"); /* FIXME: not valid, need to convert */
+				ALLOW_TAG("u"); /* FIXME: need to convert */
+				ALLOW_TAG_ALT("underline","u"); /* FIXME: need to convert */
 				ALLOW_TAG("ul");
 
 				if(!g_ascii_strncasecmp(c, "<!--", strlen("<!--"))) {