From abde069d295a70ca92c0ad56d9932f359a5236ba Mon Sep 17 00:00:00 2001 From: urosm Date: Sat, 4 May 2024 18:56:17 +0200 Subject: [PATCH] update `pandoc` data dir --- pandoc/defaults/bavbavhaus.net.part.yaml | 11 ++++ pandoc/defaults/bavbavhaus.net.yaml | 9 +-- pandoc/filters/insert_bodypart.lua | 16 +++++ ...{insert_links.lua => insert_linkparts.lua} | 12 ++-- pandoc/filters/insert_sitemap.lua | 22 ------- pandoc/filters/insert_url.lua | 15 ----- ...ocalize-quotes.lua => localize_quotes.lua} | 0 pandoc/templates/bavbavhaus.net.html5 | 65 ++++++++----------- pandoc/templates/bavbavhaus.net.inline.html5 | 15 ----- pandoc/templates/bavbavhaus.net.part.html5 | 15 +++++ 10 files changed, 79 insertions(+), 101 deletions(-) create mode 100644 pandoc/defaults/bavbavhaus.net.part.yaml create mode 100644 pandoc/filters/insert_bodypart.lua rename pandoc/filters/{insert_links.lua => insert_linkparts.lua} (61%) delete mode 100644 pandoc/filters/insert_sitemap.lua delete mode 100644 pandoc/filters/insert_url.lua rename pandoc/filters/{localize-quotes.lua => localize_quotes.lua} (100%) delete mode 100644 pandoc/templates/bavbavhaus.net.inline.html5 create mode 100644 pandoc/templates/bavbavhaus.net.part.html5 diff --git a/pandoc/defaults/bavbavhaus.net.part.yaml b/pandoc/defaults/bavbavhaus.net.part.yaml new file mode 100644 index 0000000..7894ca0 --- /dev/null +++ b/pandoc/defaults/bavbavhaus.net.part.yaml @@ -0,0 +1,11 @@ +--- +from: markdown +toc: true +citeproc: true +csl: chicago-fullnote-sl +filters: + - localize_quotes.lua + - update_internal_targets.lua +template: bavbavhaus.net.part.html5 +to: html +... diff --git a/pandoc/defaults/bavbavhaus.net.yaml b/pandoc/defaults/bavbavhaus.net.yaml index fb7ce23..d07c5d1 100644 --- a/pandoc/defaults/bavbavhaus.net.yaml +++ b/pandoc/defaults/bavbavhaus.net.yaml @@ -1,11 +1,8 @@ --- from: markdown -toc: true -citeproc: true -csl: chicago-fullnote-sl filters: - - localize-quotes.lua - - update_internal_targets.lua - - insert_links.lua + - insert_bodypart.lua + - insert_linkparts.lua +template: bavbavhaus.net.html5 to: html ... diff --git a/pandoc/filters/insert_bodypart.lua b/pandoc/filters/insert_bodypart.lua new file mode 100644 index 0000000..6316cdf --- /dev/null +++ b/pandoc/filters/insert_bodypart.lua @@ -0,0 +1,16 @@ +local RawBlock = pandoc.RawBlock + +SCRIPT_NAME = "insert_bodypart.lua" +os.setlocale("C") + +return { + { Meta = function (meta) + if not meta["bodypart"] then return end + local fp = meta["bodypart"] + local f = assert(io.open(fp), "\n" .. + "[ERROR] could not open " .. fp .. " for reading.") + meta["bodypart"] = RawBlock("html5", f:read("a")) + f:close() + return meta + end } +} diff --git a/pandoc/filters/insert_links.lua b/pandoc/filters/insert_linkparts.lua similarity index 61% rename from pandoc/filters/insert_links.lua rename to pandoc/filters/insert_linkparts.lua index c715fa8..e50583d 100644 --- a/pandoc/filters/insert_links.lua +++ b/pandoc/filters/insert_linkparts.lua @@ -2,23 +2,23 @@ local MetaList = pandoc.MetaList local RawBlock = pandoc.RawBlock -SCRIPT_NAME = "insert_links.lua" +SCRIPT_NAME = "insert_linkparts.lua" os.setlocale("C") return { { Meta = function (meta) - if not meta["links"] then return end - if type(meta["links"]) == "string" then - meta["links"] = { meta["links"] } + if not meta["linkparts"] then return end + if type(meta["linkparts"]) == "string" then + meta["linkparts"] = { meta["linkparts"] } end local links = MetaList({}) - for _,fp in ipairs(meta["links"]) do + for _,fp in ipairs(meta["linkparts"]) do local f = assert(io.open(fp), "\n" .. "[ERROR] could not open " .. fp .. " for reading.") links:insert(RawBlock("html5", f:read("a"))) f:close() end - meta["links"] = links + meta["linkparts"] = links return meta end } } diff --git a/pandoc/filters/insert_sitemap.lua b/pandoc/filters/insert_sitemap.lua deleted file mode 100644 index 88c52e5..0000000 --- a/pandoc/filters/insert_sitemap.lua +++ /dev/null @@ -1,22 +0,0 @@ --- local l = require("pandoc.logging") -local json = pandoc.json -local Link = pandoc.Link - -SCRIPT_NAME = "insert_sitemap.lua" -os.setlocale("C") - -return { - { Meta = function (meta) - local sitemap_filepath = meta["sitemap-file"] or "sitemap.json" - local f = assert(io.open(sitemap_filepath), "\n" .. - "[ERROR] could not open " .. sitemap_filepath) - local sitemap = json.decode(f:read("a")) - f:close() - local sitemap_meta = pandoc.MetaList({}) - sitemap:map(function (item) - sitemap_meta:insert(Link(item, item)) - end) - meta["sitemap"] = sitemap_meta - return meta - end } -} diff --git a/pandoc/filters/insert_url.lua b/pandoc/filters/insert_url.lua deleted file mode 100644 index bcf21b7..0000000 --- a/pandoc/filters/insert_url.lua +++ /dev/null @@ -1,15 +0,0 @@ --- local l = require("pandoc.logging") -local stringify = pandoc.utils.stringify -local Link = pandoc.Link - -SCRIPT_NAME = "insert_url.lua" -os.setlocale("C") - -return { - { Meta = function (meta) - local target = PANDOC_STATE["input_files"][1] - local title = stringify(meta["title"] or target) - meta["url"] = Link(title, target) - return meta - end } -} diff --git a/pandoc/filters/localize-quotes.lua b/pandoc/filters/localize_quotes.lua similarity index 100% rename from pandoc/filters/localize-quotes.lua rename to pandoc/filters/localize_quotes.lua diff --git a/pandoc/templates/bavbavhaus.net.html5 b/pandoc/templates/bavbavhaus.net.html5 index efc5b66..dc87b94 100644 --- a/pandoc/templates/bavbavhaus.net.html5 +++ b/pandoc/templates/bavbavhaus.net.html5 @@ -1,49 +1,40 @@ +xmlns="http://www.w3.org/1999/xhtml" +lang="$if(lang)$$lang$$else$sl$endif$" +xml:lang="$if(lang)$$lang$$else$sl$endif$" +$if(dir)$dir="$dir$"$endif$> - - - + + + $if(description-meta)$ - + $else$ - + $endif$ - bavbavhaus.net/$pagetitle$ - - +$pagetitle$, bavbavhaus.net + +
- - $for(links)$ -
- $it$ -
- $endfor$ + +
+
+$if(bodypart)$ +$bodypart$ +$endif$ +
+$for(linkparts)$ +
+$it$ +
+$endfor$ +
diff --git a/pandoc/templates/bavbavhaus.net.inline.html5 b/pandoc/templates/bavbavhaus.net.inline.html5 deleted file mode 100644 index a3ec74e..0000000 --- a/pandoc/templates/bavbavhaus.net.inline.html5 +++ /dev/null @@ -1,15 +0,0 @@ -
-

$if(title)$$title$$else$$pagetitle$$endif$

- $if(abstract)$ - $abstract$ - $endif$ -
-$if(toc)$ - -$endif$ -$body$ diff --git a/pandoc/templates/bavbavhaus.net.part.html5 b/pandoc/templates/bavbavhaus.net.part.html5 new file mode 100644 index 0000000..e7cb85d --- /dev/null +++ b/pandoc/templates/bavbavhaus.net.part.html5 @@ -0,0 +1,15 @@ +
+

$pagetitle$

+$if(abstract)$ +$abstract$ +$endif$ +
+$if(toc)$ + +$endif$ +$body$