From f3aa37867522ac08f9ffc29b5a1d1803666ece53 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 11 Nov 2022 07:05:07 +0100 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 2 +- .../NordicFilters-uBOLegacy.txt | 5 +- .../NordicFilters-uMatrixSupplement.txt | 2 +- .../NordicFiltersABP-Inclusion.txt | 26 ++++------ .../NordicFiltersABP.txt | 5 +- .../NordicFiltersAdGuard.txt | 5 +- .../NordicFiltersPrivacy.txt | 5 +- .../NordicFiltersPrivoxy.action | 2 +- .../XYZPrepareFilters.py | 50 ++++++++++++++++--- 9 files changed, 67 insertions(+), 35 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index a3a2e1a83..78142ce8c 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,7 +1,7 @@ msFilterList # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites -# Version: 01November2022v1-Alpha +# Version: 10November2022v1-Alpha : expires = 1 # Lisens Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md # Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt index fa047c945..03cbff871 100644 --- a/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt @@ -1,6 +1,6 @@ ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for «uBlock Origin Legacy») ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for «uBlock Origin Legacy») -! Version: 01November2022v1-Beta +! Version: 10November2022v1-Beta ! Expires: 1 day ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -1568,7 +1568,6 @@ ehandel.*##body[data-scrolling] .post-container-sponsored ehandel.*#?#.aside-image-with-link:has([href^="https://www.whatsnxt.io/"]) e24.no##div[data-placement^=native_in_text_] vg.no##div[class^=article-wrapper-] > div[class^=" css-"] -isabellas.dk,femina.dk##div[data-type=ad] jyllands-posten.dk##div[class*=" jp-banner--"] dagbladet.no,sol.no##.adunit:upward(1) nhi.no,langrenn.com##.advert @@ -1588,6 +1587,7 @@ kammeret.no#?#.ipsWidget:has(a[href*="=advertisement"]) liverpool.no##.ot-ad tv2.no##.feed-ad lydogbilde.no,lydogbillede.dk##.adunit-lazy:upward(1) +billedbladet.dk##.lg\:flex.hidden ! — — — — — ! 🇳🇴: Oppføringer med spesielle omstendigheter ! 🇬🇧: Entries with special circumstances @@ -1644,6 +1644,7 @@ midtjyllandsavis.dk,herningfolkeblad.dk,ikast-brandenyt.dk##.container-spacer midtjyllandsavis.dk,herningfolkeblad.dk,ikast-brandenyt.dk##.container-outer-wrapper > .col-2:last-of-type united.no,valkal.no,montages.no##.ads mytastenor.com,mytastednk.com,tv3sport.dk##.panorama +isabellas.dk,femina.dk,billedbladet.dk##div[data-type=ad] kulturplot.no,dagensperspektiv.no,velferd.no###main > .small-12:nth-of-type(1) ! — — — — — diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index d4a3c8704..eb3e41e29 100644 --- a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt +++ b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt @@ -1,6 +1,6 @@ ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uMatrix-regler til å benytte sammen med domeneversjonen) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (uMatrix rules to use together with the raw domains version) -! Version: 01November2022v1-Alpha +! Version: 10November2022v1-Alpha ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md ! 🇳🇴: Denne listen dekker nettsteder for Norge, Danmark, Island, Færøyene, Grønland, Schleswig-Holsteins danske minoritet, og samebefolkningen. For mere informasjon, detaljer, hjelpemidler, og andre lister jeg har laget, gå til https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#norsk diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index 1fda20530..56dabb594 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1,7 +1,7 @@ [Adblock Plus 3.13] ! Title: 🏔️ Dandelion Sprouts helnordiske filtre for ryddigere nettsider (for Adblock Plus - Møter ABP sine inkluderingsregler) ! Translated title: Dandelion Sprout's All-Nordic filters for tidier websites (for Adblock Plus with ABP inclusion compliance) -! Version: 011120221 +! Version: 101120221 ! Expires: 1 day ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -1506,7 +1506,6 @@ ehandel.com,ehandel.dk,ehandel.se,ehandel.fi##body[data-scrolling] .post-contain ehandel.com,ehandel.dk,ehandel.se,ehandel.fi#?#.aside-image-with-link:has([href^="https://www.whatsnxt.io/"]) e24.no##div[data-placement^=native_in_text_] vg.no##div[class^=article-wrapper-] > div[class^=" css-"] -isabellas.dk,femina.dk##div[data-type=ad] jyllands-posten.dk##div[class*=" jp-banner--"] dagbladet.no,sol.no#?#*:has(> .adunit) nhi.no,langrenn.com##.advert @@ -1526,6 +1525,7 @@ kammeret.no#?#.ipsWidget:has(a[href*="=advertisement"]) liverpool.no##.ot-ad tv2.no##.feed-ad lydogbilde.no,lydogbillede.dk#?#*:has(> .adunit-lazy) +billedbladet.dk##.lg\:flex.hidden ! — — — — — ! 🇳🇴: Oppføringer med spesielle omstendigheter ! 🇬🇧: Entries with special circumstances @@ -1575,6 +1575,7 @@ midtjyllandsavis.dk,herningfolkeblad.dk,ikast-brandenyt.dk##.container-spacer midtjyllandsavis.dk,herningfolkeblad.dk,ikast-brandenyt.dk##.container-outer-wrapper > .col-2:last-of-type united.no,valkal.no,montages.no##.ads mytastenor.com,mytastednk.com,tv3sport.dk##.panorama +isabellas.dk,femina.dk,billedbladet.dk##div[data-type=ad] kulturplot.no,dagensperspektiv.no,velferd.no###main > .small-12:nth-of-type(1) ! — — — — — ! 🇳🇴: Generelle oppføringer med kilder @@ -4540,7 +4541,7 @@ vmj.se#?#.sidebox:-abp-contains(/Externa länkar|Artiklar/) ! /\/\/\/\/\/\/\/\/\/\ Manuella fixor tillagt av Adblock Plus-teamet / Manual fixes added by the Adblock Plus team /\/\/\/\/\/\/\/\/\/\ ! (Currently empty.) [Adblock Plus 3.13] -! Version: 051120222 +! Version: 081120221 ! Title: Adblock List for Finland ! Description: Finnish adblock list ! Expires: 4 days @@ -4773,7 +4774,8 @@ como.fi,episodi.fi,fum.fi,inferno.fi,rumba.fi,soundi.fi,tilt.fi##div[data-recomm como.fi,episodi.fi,fum.fi,inferno.fi,rumba.fi,soundi.fi,tilt.fi#?#.border-bottom.row:-abp-has(.poppartners) como.fi,tilt.fi#?#body:not(.post-type-archive-advertoriaali) .bg-white.p-3.mb-6:-abp-has(a[href*=".fi/advertoriaali/"]) como.fi,tilt.fi#?#div[class="w-full bg-white border-gray-200 border-b py-2 px-4"]:-abp-has([id*="_smart_boksi"]) -como.fi,tilt.fi#?#div[style^="min-height:"]:-abp-has([id*="_smart_paraati"]) +como.fi##.px-4.py-2.border-b.border-gray-200.bg-white.w-full +como.fi##div[class="flex flex-wrap md:flex-nowrap lg:flex-nowrap gap-x-4"][style="min-height:500px;"] dailyfinland.fi##.wrepper.mx-auto > .row[style="margin-bottom:20px"] dawn.fi##[style="margin:-15px -15px 15px -15px;text-align:center; min-height: 250px;"] dawn.fi##[style="margin:-15px -15px 15px -15px;text-align:center; min-height: 300px;"] @@ -4822,7 +4824,7 @@ epari.fi,jarviseutu-lehti.fi,jurvansanomat.fi,komiat.fi,suupohjansanomat.fi,vaas episodi.fi##.bg-elisa-dark episodi.fi#?#.main-article > div:has-text(Mainos) episodi.fi,inferno.fi#?#.px-4.py-2.bg-white.w-full:-abp-has(.poppartners) -episodi.fi,inferno.fi,rumba.fi###tilt-ad-top-stay-away +episodi.fi,inferno.fi,rumba.fi,tilt.fi###tilt-ad-top-stay-away esaimaa.fi,ita-savo.fi,kouvolansanomat.fi,kymensanomat.fi,lansi-savo.fi,uutisvuoksi.fi##.box.ads esaimaa.fi,ita-savo.fi,kouvolansanomat.fi,kymensanomat.fi,lansi-savo.fi,uutisvuoksi.fi##article[class="article-preview content-marketing box"] esaimaa.fi,ita-savo.fi,kouvolansanomat.fi,kymensanomat.fi,lansi-savo.fi,uutisvuoksi.fi##div.section:nth-of-type(2) > .row > .show-for-large.columns.xxlarge-6.xlarge-7.large-8.sidebar @@ -4838,8 +4840,6 @@ f1-forum.fi##.sponsoredrow facebook.com##a[aria-label="Mainostajan linkki"] facebook.com##a[aria-label=Mainostaja] facebook.com#?#div[aria-label="Hakutulokset"][role="main"] [role="feed"] > [role="article"]:-abp-has(b[class]:has-text(Sponsoroitu)) -facebook.com#?#div[role="feed"] > div:-abp-has(div[class][role="button"][tabindex]:has-text(Sponsoroitu)) -facebook.com#?#div[role="feed"] > span:-abp-has(a[class][href][role][tabindex]:has-text(Sponsoroitu)) facebook.com#?#div[role=complementary] > div > div > div > div > div:not([class], [data-visualcompletion]) > span:-abp-has([aria-label=Mainostaja]) facebook.com#?#span#ssrb_feed_start + div > div[class]:-abp-has(span[class][dir="auto"] > span[id]:has-text(Sponsoroitu)) feedi.fi,tanssiin.fi##.alp-advert @@ -5410,17 +5410,9 @@ satakunnankansa.fi##div[class=s-ryhma-carousel-wrapper] satakunnankansa.fi##div[class^=adContainer] satakunnankansa.fi#?#article.list:has-text(Mainokset) satakunnanviikko.fi##.panoraama_etus -seiska.fi###inhouse_ad -seiska.fi##.ad-inhouse-desktop -seiska.fi##.category-container--commercial.category-container.container-fluid -seiska.fi##.dicCCM -seiska.fi##.dre-item--skin-native -seiska.fi##.hcAuCH -seiska.fi##.tilaa-banner -seiska.fi##div[class*=AdAndCarousel__Wrapper] -seiska.fi##div[class^=Ad__AdWrapper] seiska.fi#?##article-body > div[class]:-abp-has(.ad-container) -seiska.fi#?#article:-abp-has(a[href=""][rel="no-index,no-follow"]) +seiska.fi#?##article-body > div[class^="sc-"]:has-text(/Juttu jatkuu ilmoituksen jälkeen|ilmoitus päättyy/i) +seiska.fi#?#div[data-testid="article-body"] > div[class^="sc-"]:has-text(/Juttu jatkuu ilmoituksen jälkeen|ilmoitus päättyy/i) selanne-lehti.fi##.ad-list-read-all selanne-lehti.fi##.mainospalsta seura.fi#?#.grid__item_lg-1.grid__item_1:-abp-has(.dfp-advertisement) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 976675f5e..48387d9a7 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,7 +1,7 @@ [Adblock Plus 3.13] ! Title: 🏔️ Dandelion Sprouts vestnordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus) ! Translated title: Dandelion Sprout's West Nordic filters for tidier websites (for AdBlock and Adblock Plus) -! Version: 011120221 +! Version: 101120221 ! Expires: 1 day ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -1514,7 +1514,6 @@ ehandel.com,ehandel.dk,ehandel.se,ehandel.fi##body[data-scrolling] .post-contain ehandel.com,ehandel.dk,ehandel.se,ehandel.fi#?#.aside-image-with-link:has([href^="https://www.whatsnxt.io/"]) e24.no##div[data-placement^=native_in_text_] vg.no##div[class^=article-wrapper-] > div[class^=" css-"] -isabellas.dk,femina.dk##div[data-type=ad] jyllands-posten.dk##div[class*=" jp-banner--"] dagbladet.no,sol.no#?#*:-abp-has(> .adunit) nhi.no,langrenn.com##.advert @@ -1534,6 +1533,7 @@ kammeret.no#?#.ipsWidget:has(a[href*="=advertisement"]) liverpool.no##.ot-ad tv2.no##.feed-ad lydogbilde.no,lydogbillede.dk#?#*:-abp-has(> .adunit-lazy) +billedbladet.dk##.lg\:flex.hidden ! — — — — — ! 🇳🇴: Oppføringer med spesielle omstendigheter ! 🇬🇧: Entries with special circumstances @@ -1583,6 +1583,7 @@ midtjyllandsavis.dk,herningfolkeblad.dk,ikast-brandenyt.dk##.container-spacer midtjyllandsavis.dk,herningfolkeblad.dk,ikast-brandenyt.dk##.container-outer-wrapper > .col-2:last-of-type united.no,valkal.no,montages.no##.ads mytastenor.com,mytastednk.com,tv3sport.dk##.panorama +isabellas.dk,femina.dk,billedbladet.dk##div[data-type=ad] kulturplot.no,dagensperspektiv.no,velferd.no###main > .small-12:nth-of-type(1) ! — — — — — ! 🇳🇴: Generelle oppføringer med kilder diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 721f94063..4ad8c558a 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,6 +1,6 @@ ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard) -! Version: 01November2022v1 +! Version: 10November2022v1 ! Expires: 1 day ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -1567,7 +1567,6 @@ ehandel.*##body[data-scrolling] .post-container-sponsored ehandel.*#?#.aside-image-with-link:has([href^="https://www.whatsnxt.io/"]) e24.no##div[data-placement^=native_in_text_] vg.no##div[class^=article-wrapper-] > div[class^=" css-"] -isabellas.dk,femina.dk##div[data-type=ad] jyllands-posten.dk##div[class*=" jp-banner--"] dagbladet.no,sol.no##.adunit:upward(1) nhi.no,langrenn.com##.advert @@ -1587,6 +1586,7 @@ kammeret.no#?#.ipsWidget:has(a[href*="=advertisement"]) liverpool.no##.ot-ad tv2.no##.feed-ad lydogbilde.no,lydogbillede.dk##.adunit-lazy:upward(1) +billedbladet.dk##.lg\:flex.hidden ! — — — — — ! 🇳🇴: Oppføringer med spesielle omstendigheter ! 🇬🇧: Entries with special circumstances @@ -1643,6 +1643,7 @@ midtjyllandsavis.dk,herningfolkeblad.dk,ikast-brandenyt.dk##.container-spacer midtjyllandsavis.dk,herningfolkeblad.dk,ikast-brandenyt.dk##.container-outer-wrapper > .col-2:last-of-type united.no,valkal.no,montages.no##.ads mytastenor.com,mytastednk.com,tv3sport.dk##.panorama +isabellas.dk,femina.dk,billedbladet.dk##div[data-type=ad] !+ NOT_OPTIMIZED kulturplot.no,dagensperspektiv.no,velferd.no###main > .small-12:nth-of-type(1) ! — — — — — diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 60a9a95c5..7e766e95f 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,6 +1,6 @@ ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) -! Version: 01November2022v1 +! Version: 10November2022v1 ! Expires: 1 day ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -1567,7 +1567,6 @@ ehandel.*##body[data-scrolling] .post-container-sponsored ehandel.*#?#.aside-image-with-link:has([href^="https://www.whatsnxt.io/"]) e24.no##div[data-placement^=native_in_text_] vg.no##div[class^=article-wrapper-] > div[class^=" css-"] -isabellas.dk,femina.dk##div[data-type=ad] jyllands-posten.dk##div[class*=" jp-banner--"] dagbladet.no,sol.no##.adunit:upward(1) nhi.no,langrenn.com##.advert @@ -1587,6 +1586,7 @@ kammeret.no#?#.ipsWidget:has(a[href*="=advertisement"]) liverpool.no##.ot-ad tv2.no##.feed-ad lydogbilde.no,lydogbillede.dk##.adunit-lazy:upward(1) +billedbladet.dk##.lg\:flex.hidden ! — — — — — ! 🇳🇴: Oppføringer med spesielle omstendigheter ! 🇬🇧: Entries with special circumstances @@ -1643,6 +1643,7 @@ midtjyllandsavis.dk,herningfolkeblad.dk,ikast-brandenyt.dk##.container-spacer midtjyllandsavis.dk,herningfolkeblad.dk,ikast-brandenyt.dk##.container-outer-wrapper > .col-2:last-of-type united.no,valkal.no,montages.no##.ads mytastenor.com,mytastednk.com,tv3sport.dk##.panorama +isabellas.dk,femina.dk,billedbladet.dk##div[data-type=ad] !+ NOT_OPTIMIZED kulturplot.no,dagensperspektiv.no,velferd.no###main > .small-12:nth-of-type(1) ! — — — — — diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 275930353..2b6f727eb 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,6 +1,6 @@ # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy) # Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy) -# Version: 01November2022v1-Alpha +# Version: 10November2022v1-Alpha # Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md # Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md # 🇳🇴: Denne listen dekker nettsteder for Norge, Danmark, Island, Færøyene, Grønland, Schleswig-Holsteins danske minoritet, og samebefolkningen. For mere informasjon, detaljer, hjelpemidler, og andre lister jeg har laget, gå til https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#norsk diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 2903032fc..879712375 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -178,6 +178,12 @@ def prepare_ag(lines) -> str: line ) + line = re.sub( + r",~inline-font,~inline-script$", + r"", + line + ) + text += line + '\r\n' return text @@ -4295,6 +4301,18 @@ def prepare_ag(lines) -> str: line ) + line = re.sub( + r",~inline-font,~inline-script$", + r"", + line + ) + + line = re.sub( + r",~inline-font,~inline-script,~domain=", + r",~domain=", + line + ) + text += line + '\r\n' return text @@ -4536,6 +4554,18 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r",~inline-font,~inline-script$", + r"", + line + ) + + line = re.sub( + r".*,~inline-font,~inline-script,~domain=discord\.gift$", + r"", + line + ) + if is_supported_abp(line): text += line + '\r\n' @@ -5029,12 +5059,6 @@ def prepare_privoxy(lines) -> str: line ) - line = re.sub( - r"^\..*", - r"", - line - ) - line = re.sub( r"^&.*", r"", @@ -5522,7 +5546,13 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"\$all,$", + r".*\$all,.*\..*$", + r"", + line + ) + + line = re.sub( + r"\$all,(.*)?$", r"", line ) @@ -5635,6 +5665,12 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r".*\$popup$", + r"", + line + ) + if is_supported_agh(line): text += line + '\r\n'