From 6b855b30e84f050391f333b5033f2fadeaa9b1b2 Mon Sep 17 00:00:00 2001
From: TimP <timp@eric13.home>
Date: Wed, 10 Mar 2010 00:40:30 +0000
Subject: [PATCH] Ignore <script> and <style> tags.

---
 libhtmlw/HTML.h       | 6 ++++++
 libhtmlw/HTMLformat.c | 5 ++++-
 libhtmlw/HTMLparse.c  | 8 ++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/libhtmlw/HTML.h b/libhtmlw/HTML.h
index 3fe3b17..5be62e4 100644
--- a/libhtmlw/HTML.h
+++ b/libhtmlw/HTML.h
@@ -440,6 +440,8 @@ struct delay_rec {
 #define M_MAP		58 /* swp - client side ismap */
 #define M_AREA		59 /* swp - client side ismap */
 #define M_CENTER	60
+#define M_SCRIPT        61
+#define M_STYLE         62
 
 /* syntax of Mark types */
 #define	MT_TITLE	"title"
@@ -502,6 +504,10 @@ struct delay_rec {
 #define MT_AREA		"area" /* swp - client side ismap */
 #define MT_CENTER	"center"
 
+/* tags from THE FUTURE! we will ignore their contents. */
+#define MT_SCRIPT       "script"
+#define MT_STYLE        "style"
+
 /* anchor tags */
 #define	AT_NAME		"name"
 #define	AT_HREF		"href"
diff --git a/libhtmlw/HTMLformat.c b/libhtmlw/HTMLformat.c
index 066e035..f5474c4 100644
--- a/libhtmlw/HTMLformat.c
+++ b/libhtmlw/HTMLformat.c
@@ -3504,7 +3504,7 @@ int *x, *y;
 	 * Let OPTION through so we can hit the OPTIONs.
 	 * Let TEXTAREA through so we can hit the TEXTAREAs.
 	 */
-	if ((Ignore)&&(!InDocHead)&&(type != M_TITLE)&&(type != M_NONE)&&
+	if ((Ignore)&&(!InDocHead)&&(type != M_TITLE)&&(type != M_NONE)&&(type != M_COMMENT)&&
 		(type != M_SELECT)&&(type != M_OPTION)&&
 		(type != M_TEXTAREA)&&(type != M_DOC_HEAD))
 	{
@@ -4831,6 +4831,9 @@ int *x, *y;
 			TablePlace(hw, mptr, x, y, Width);
 		}
 		break;
+	case M_COMMENT:
+		Ignore = !mark->is_end;
+		break;
 	default:
 		break;
 	}
diff --git a/libhtmlw/HTMLparse.c b/libhtmlw/HTMLparse.c
index e618835..9121989 100644
--- a/libhtmlw/HTMLparse.c
+++ b/libhtmlw/HTMLparse.c
@@ -1407,6 +1407,14 @@ ParseMarkType(str)
 	{
 		type = M_CENTER;
 	}
+	else if (caseless_equal(str, MT_SCRIPT))
+	{
+		type = M_COMMENT;
+	}
+	else if (caseless_equal(str, MT_STYLE))
+	{
+		type = M_COMMENT;
+	}
 	else
 	{
 #ifndef DISABLE_TRACE