X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=inline;f=re_filterfile;h=4a2486c7dc8fefb94629ed4dfc0175b67e4e58d5;hb=dc24600efa30171a73a2c094733ab8909b53c026;hp=8348054514010654f3e1e81d42ac4f0758138561;hpb=a90476caaea41cabf25cf48c85c324b482989dff;p=privoxy.git
diff --git a/re_filterfile b/re_filterfile
index 83480545..4a2486c7 100644
--- a/re_filterfile
+++ b/re_filterfile
@@ -27,6 +27,9 @@
#
# 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
#
@@ -89,10 +92,11 @@
#
#################################################################################
#
-# 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)
@@ -116,16 +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 (if allowed -- see no-popups filter below) should be
# resizeable and have a location and status bar
#
-s/(]+)resizable="?(no|0)"?(.*>)/$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
+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