CCF_100/ncsa-mosaic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ignore <script> and <style> tags.

Browse Source
This commit is contained in:
TimP 2010-03-10 00:40:30 +00:00 committed by Robert Clausecker
parent 22da6c5d7d
commit 6b855b30e8
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libhtmlw/HTML.h
View File

@ -440,6 +440,8 @@ struct delay_rec {
#define M_MAP 58 /* swp - client side ismap */ #define M_MAP 58 /* swp - client side ismap */
#define M_AREA 59 /* swp - client side ismap */ #define M_AREA 59 /* swp - client side ismap */
#define M_CENTER 60 #define M_CENTER 60
#define M_SCRIPT 61
#define M_STYLE 62
/* syntax of Mark types */ /* syntax of Mark types */
#define MT_TITLE "title" #define MT_TITLE "title"
@ -502,6 +504,10 @@ struct delay_rec {
#define MT_AREA "area" /* swp - client side ismap */ #define MT_AREA "area" /* swp - client side ismap */
#define MT_CENTER "center" #define MT_CENTER "center"
/* tags from THE FUTURE! we will ignore their contents. */
#define MT_SCRIPT "script"
#define MT_STYLE "style"
/* anchor tags */ /* anchor tags */
#define AT_NAME "name" #define AT_NAME "name"
#define AT_HREF "href" #define AT_HREF "href"

5
libhtmlw/HTMLformat.c
View File

@ -3504,7 +3504,7 @@ int *x, *y;
* Let OPTION through so we can hit the OPTIONs. * Let OPTION through so we can hit the OPTIONs.
* Let TEXTAREA through so we can hit the TEXTAREAs. * 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_SELECT)&&(type != M_OPTION)&&
(type != M_TEXTAREA)&&(type != M_DOC_HEAD)) (type != M_TEXTAREA)&&(type != M_DOC_HEAD))
{ {
@ -4831,6 +4831,9 @@ int *x, *y;
TablePlace(hw, mptr, x, y, Width); TablePlace(hw, mptr, x, y, Width);
} }
break; break;
case M_COMMENT:
Ignore = !mark->is_end;
break;
default: default:
break; break;
} }

8
libhtmlw/HTMLparse.c
View File

@ -1407,6 +1407,14 @@ ParseMarkType(str)
{ {
type = M_CENTER; type = M_CENTER;
} }
else if (caseless_equal(str, MT_SCRIPT))
{
type = M_COMMENT;
}
else if (caseless_equal(str, MT_STYLE))
{
type = M_COMMENT;
}
else else
{ {
#ifndef DISABLE_TRACE #ifndef DISABLE_TRACE