X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=re_filterfile;h=69e4f02ee6076d01c389ea338ee07b6b1d2f2b57;hb=1f84ee054de4451ca0a591362a3ef724029b5dfa;hp=9582ef3961fee8535ec3a503dbc4eda5a0745b4c;hpb=d20be58bf045c0deae4e522b8c895b05d77644ab;p=privoxy.git
diff --git a/re_filterfile b/re_filterfile
index 9582ef39..69e4f02e 100644
--- a/re_filterfile
+++ b/re_filterfile
@@ -27,6 +27,12 @@
#
# Revisions :
# $Log: re_filterfile,v $
+# Revision 1.22 2002/03/12 13:42:50 oes
+# Fixing & Optimizing REs
+#
+# Revision 1.21 2002/03/12 11:59:20 oes
+# Beefed up Buzzword Bingo
+#
# Revision 1.20 2002/03/12 01:42:50 oes
# Introduced modular filters
#
@@ -84,10 +90,13 @@
#
# Syntax:
#
-# Filters start with a line "FILTER: name". They are then referrable
+#################################################################################
+#
+# Filters start with a line "FILTER: name description". They are then referrable
# from the actionsfile with +filter{name}
#
-# Inside the filters, write one Perl-Style substitution per line.
+# Inside the filters, write one Perl-Style substitution (job) per line.
+# Jobs that precede the first FILTER: line are ignored.
#
# For Details see the pcrs manpage contained in this distribution.
# (and the perlre, perlop and pcre manpages)
@@ -111,14 +120,16 @@
# html-annoyances: Get rid of particularly annoying HTML abuse
#
#################################################################################
-FILTER: html-annoyances
+FILTER: html-annoyances Get rid of particularly annoying HTML abuse
-# New browser windows should be resizeable and have a location and status bar
+# New browser windows (if allowed -- see no-popups filter below) should be
+# resizeable and have a location and status bar
#
-s/resizable="?(no|0)"?/resizable=1/ig s/noresize/yesresize/ig
-s/location="?(no|0)"?/location=1/ig s/status="?(no|0)"?/status=1/ig
-s/scrolling="?(no|0|Auto)"?/scrolling=1/ig
-s/menubar="?(no|0)"?/menubar=1/ig
+s/(]+)resizable=['"]?(no|0|false)['"]?(.*>)/$1resizable=1$3/igU
+s/(]+)location=['"]?(no|0)['"]?(.*>)/$1location=1$3/igU
+s/(]+)status=['"]?(no|0)['"]?(.*>)/$1status=1$3/igU
+s/(]+)scrolling=['"]?(no|0|auto)['"]?(.*>)/$1scrolling=no$3/igU
+s/(]+)menubar=['"]?(no|0)['"]?(.*>)/$1menubar=1$3/igU
# The