From b83240ab6d383a00e25d687df25b9b1d0966ef26 Mon Sep 17 00:00:00 2001 From: Everett Hildenbrandt Date: Sat, 21 Apr 2018 16:00:45 -0600 Subject: [PATCH] Shake.hs, tools/pandoc-drop-html-blocks: switch to lua script filter --- Shake.hs | 8 ++++---- tools/pandoc-drop-html-blocks.hs | 11 ----------- tools/pandoc-drop-html-blocks.lua | 6 ++++++ 3 files changed, 10 insertions(+), 15 deletions(-) delete mode 100755 tools/pandoc-drop-html-blocks.hs create mode 100644 tools/pandoc-drop-html-blocks.lua diff --git a/Shake.hs b/Shake.hs index f33591dac..191d2de8e 100755 --- a/Shake.hs +++ b/Shake.hs @@ -83,8 +83,8 @@ main = do let pandocFilters = [ --- "tools" "pandoc-demote-headers" - "tools" "pandoc-drop-html-blocks" - ,"tools" "pandoc-drop-html-inlines" + --- "tools" "pandoc-drop-html-blocks" + "tools" "pandoc-drop-html-inlines" ,"tools" "pandoc-drop-links" ,"tools" "pandoc-drop-notes" ,"tools" "pandoc-drop-toc" @@ -204,7 +204,7 @@ main = do "m4 -P -DMAN -I" dir lib src "|" pandoc "-f markdown -s --template" tmpl -- "--filter tools/pandoc-drop-web-blocks" - "--filter tools/pandoc-drop-html-blocks" + "--lua-filter tools/pandoc-drop-html-blocks.lua" "--filter tools/pandoc-drop-html-inlines" "--filter tools/pandoc-drop-links" "--filter tools/pandoc-drop-notes" @@ -232,7 +232,7 @@ main = do "m4 -P -I" dir lib src "|" pandoc "-f markdown" -- "--filter tools/pandoc-drop-web-blocks" - "--filter tools/pandoc-drop-html-blocks" + "--lua-filter tools/pandoc-drop-html-blocks.lua" "--filter tools/pandoc-drop-html-inlines" "--filter tools/pandoc-drop-links" "--filter tools/pandoc-drop-notes" diff --git a/tools/pandoc-drop-html-blocks.hs b/tools/pandoc-drop-html-blocks.hs deleted file mode 100755 index 1238af0ac..000000000 --- a/tools/pandoc-drop-html-blocks.hs +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env stack -{- stack runghc --verbosity info --package pandoc-types -} - -import Text.Pandoc.JSON - -main :: IO () -main = toJSONFilter dropHtmlBlocks - -dropHtmlBlocks :: Block -> Block -dropHtmlBlocks (RawBlock (Format "html") _) = Plain [] -dropHtmlBlocks x = x diff --git a/tools/pandoc-drop-html-blocks.lua b/tools/pandoc-drop-html-blocks.lua new file mode 100644 index 000000000..bc2a3285b --- /dev/null +++ b/tools/pandoc-drop-html-blocks.lua @@ -0,0 +1,6 @@ +function RawBlock(rb) + if rb.format == "html" + then return pandoc.Null() + else return rb + end +end