Update

author: Volpeon <git@volpeon.ink> 2022-07-10 10:11:46 +0200
committer: Volpeon <git@volpeon.ink> 2022-07-10 10:11:46 +0200
commit: 61e141f8c1e72c530683cfaca0c1b17077d2385d (patch)
tree: 2c7c188b983e89d54d25c5d0c520c7433f292871 /Makefile
parent: Added notebook entry "Foxes and me" (diff)
download: volpeon.ink-61e141f8c1e72c530683cfaca0c1b17077d2385d.tar.gz
volpeon.ink-61e141f8c1e72c530683cfaca0c1b17077d2385d.tar.bz2
volpeon.ink-61e141f8c1e72c530683cfaca0c1b17077d2385d.zip
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 2517b7d..dcf5414 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ subpages = $(patsubst content/%.md,.cache/meta/%.json, \
        $(shell test -d $(patsubst .cache/meta%,content%,$(1)) && find $(patsubst .cache/meta%,content%,$(1)) -maxdepth 1 -type f -name "*.md" ! -name "index.md") \
        $(shell test -d $(patsubst .cache/meta%,content%,$(1)) && find $(patsubst .cache/meta%,content%,$(1)) -mindepth 2 -maxdepth 2 -type f -name "index.md"))
-.cache/meta/%.json: content/%.md $$(call subpages,$$(call namespace,$$@,)) filters/*.lua scripts/subpages.lua scripts/subpages.jq scripts/metadata_tpl.json | .cache/meta
+.cache/meta/%.json: content/%.md $$(call subpages,$$(call namespace,$$@,)) filters/*.lua scripts/subpages.lua scripts/subpages.jq scripts/metadata.json | .cache/meta
        $(info [META] $< -> $@)
        
        mkdir -p $(@D)
@@ -60,7 +60,7 @@ subpages = $(patsubst content/%.md,.cache/meta/%.json, \
                -t html5 \
                --wrap preserve \
                --no-highlight \
-                --template scripts/metadata_tpl.json \
+                --template scripts/metadata.json \
                --metadata namespace="$(NAMESPACE)" \
                --metadata file_out="$(patsubst .cache/meta/%.json,out/%.html,$@)" \
                --metadata-file "$@.pages" \
@@ -71,7 +71,7 @@ subpages = $(patsubst content/%.md,.cache/meta/%.json, \
                -f markdown-citations-implicit_figures \
                -t html5 \
                --wrap preserve \
-                --lua-filter scripts/metadata_filter.lua \
+                --lua-filter scripts/metadata.lua \
                --lua-filter scripts/subpages.lua \
                $(GLOBAL_METADATA) \
                --metadata-file "$@.meta" \
@@ -85,7 +85,7 @@ subpages = $(patsubst content/%.md,.cache/meta/%.json, \
 .cache/assets.json: $(ASSET_FILES) | .cache
        sha256sum $^ | sed -r 's/([0-9a-f]+) +out\/(.*)/{ "\2": "\/\2?\1" }/' | jq '{ assets: [inputs] | add | with_entries( .key |= gsub( "\\."; "_") ) }' > "$@"
-out/%.html: content/%.md .cache/meta/%.json .cache/assets.json $(CONTENT_TEMPLATES_SRC) metadata/*.yaml filters/*.lua scripts/metadata_filter.lua | out
+out/%.html: content/%.md .cache/meta/%.json .cache/assets.json $(CONTENT_TEMPLATES_SRC) metadata/*.yaml filters/*.lua scripts/metadata.lua | out
        $(info [MARK] $< -> $@)
        
        mkdir -p $(@D)
@@ -95,7 +95,7 @@ out/%.html: content/%.md .cache/meta/%.json .cache/assets.json $(CONTENT_TEMPLAT
                --wrap preserve \
                --no-highlight \
                --template templates/base.html \
-                --lua-filter scripts/metadata_filter.lua \
+                --lua-filter scripts/metadata.lua \
                $(GLOBAL_METADATA) \
                --metadata-file .cache/assets.json \
                --metadata-file "$(filter .cache/meta/%.json,$^)" \
@@ -103,7 +103,7 @@ out/%.html: content/%.md .cache/meta/%.json .cache/assets.json $(CONTENT_TEMPLAT
                $(PANDOC_FILTERS) \
                -o "$@" "$<"
-out/%.xml: content/%.md .cache/meta/%.json $(FEED_TEMPLATES_SRC) metadata/*.yaml filters/*.lua scripts/metadata_filter.lua | out
+out/%.xml: content/%.md .cache/meta/%.json $(FEED_TEMPLATES_SRC) metadata/*.yaml filters/*.lua scripts/metadata.lua | out
        $(info [FEED] $< -> $@)
        
        mkdir -p $(@D)
@@ -113,7 +113,7 @@ out/%.xml: content/%.md .cache/meta/%.json $(FEED_TEMPLATES_SRC) metadata/*.yaml
                --wrap preserve \
                --no-highlight \
                --template templates/feed.xml \
-                --lua-filter scripts/metadata_filter.lua \
+                --lua-filter scripts/metadata.lua \
                $(GLOBAL_METADATA) \
                --metadata-file "$(filter .cache/meta/%.json,$^)" \
                --metadata file_out="$@" \
author	Volpeon <git@volpeon.ink>	2022-07-10 10:11:46 +0200
committer	Volpeon <git@volpeon.ink>	2022-07-10 10:11:46 +0200
commit	61e141f8c1e72c530683cfaca0c1b17077d2385d (patch)
tree	2c7c188b983e89d54d25c5d0c520c7433f292871 /Makefile
parent	Added notebook entry "Foxes and me" (diff)
download	volpeon.ink-61e141f8c1e72c530683cfaca0c1b17077d2385d.tar.gz volpeon.ink-61e141f8c1e72c530683cfaca0c1b17077d2385d.tar.bz2 volpeon.ink-61e141f8c1e72c530683cfaca0c1b17077d2385d.zip

diff --git a/Makefile b/Makefile index 2517b7d..dcf5414 100644 --- a/Makefile +++ b/Makefile
@@ -48,7 +48,7 @@ subpages = $(patsubst content/%.md,.cache/meta/%.json, \
48	$(shell test -d $(patsubst .cache/meta%,content%,$(1)) && find $(patsubst .cache/meta%,content%,$(1)) -maxdepth 1 -type f -name "*.md" ! -name "index.md") \	48	$(shell test -d $(patsubst .cache/meta%,content%,$(1)) && find $(patsubst .cache/meta%,content%,$(1)) -maxdepth 1 -type f -name "*.md" ! -name "index.md") \
49	$(shell test -d $(patsubst .cache/meta%,content%,$(1)) && find $(patsubst .cache/meta%,content%,$(1)) -mindepth 2 -maxdepth 2 -type f -name "index.md"))	49	$(shell test -d $(patsubst .cache/meta%,content%,$(1)) && find $(patsubst .cache/meta%,content%,$(1)) -mindepth 2 -maxdepth 2 -type f -name "index.md"))
50		50
51	.cache/meta/%.json: content/%.md $$(call subpages,$$(call namespace,$$@,)) filters/*.lua scripts/subpages.lua scripts/subpages.jq scripts/metadata_tpl.json \| .cache/meta	51	.cache/meta/%.json: content/%.md $$(call subpages,$$(call namespace,$$@,)) filters/*.lua scripts/subpages.lua scripts/subpages.jq scripts/metadata.json \| .cache/meta
52	$(info [META] $< -> $@)	52	$(info [META] $< -> $@)
53		53
54	mkdir -p $(@D)	54	mkdir -p $(@D)
@@ -60,7 +60,7 @@ subpages = $(patsubst content/%.md,.cache/meta/%.json, \
60	-t html5 \	60	-t html5 \
61	--wrap preserve \	61	--wrap preserve \
62	--no-highlight \	62	--no-highlight \
63	--template scripts/metadata_tpl.json \	63	--template scripts/metadata.json \
64	--metadata namespace="$(NAMESPACE)" \	64	--metadata namespace="$(NAMESPACE)" \
65	--metadata file_out="$(patsubst .cache/meta/%.json,out/%.html,$@)" \	65	--metadata file_out="$(patsubst .cache/meta/%.json,out/%.html,$@)" \
66	--metadata-file "$@.pages" \	66	--metadata-file "$@.pages" \
@@ -71,7 +71,7 @@ subpages = $(patsubst content/%.md,.cache/meta/%.json, \
71	-f markdown-citations-implicit_figures \	71	-f markdown-citations-implicit_figures \
72	-t html5 \	72	-t html5 \
73	--wrap preserve \	73	--wrap preserve \
74	--lua-filter scripts/metadata_filter.lua \	74	--lua-filter scripts/metadata.lua \
75	--lua-filter scripts/subpages.lua \	75	--lua-filter scripts/subpages.lua \
76	$(GLOBAL_METADATA) \	76	$(GLOBAL_METADATA) \
77	--metadata-file "$@.meta" \	77	--metadata-file "$@.meta" \
@@ -85,7 +85,7 @@ subpages = $(patsubst content/%.md,.cache/meta/%.json, \
85	.cache/assets.json: $(ASSET_FILES) \| .cache	85	.cache/assets.json: $(ASSET_FILES) \| .cache
86	sha256sum $^ \| sed -r 's/([0-9a-f]+) +out\/(.*)/{ "\2": "\/\2?\1" }/' \| jq '{ assets: [inputs] \| add \| with_entries( .key \|= gsub( "\\."; "_") ) }' > "$@"	86	sha256sum $^ \| sed -r 's/([0-9a-f]+) +out\/(.*)/{ "\2": "\/\2?\1" }/' \| jq '{ assets: [inputs] \| add \| with_entries( .key \|= gsub( "\\."; "_") ) }' > "$@"
87		87
88	out/%.html: content/%.md .cache/meta/%.json .cache/assets.json $(CONTENT_TEMPLATES_SRC) metadata/.yaml filters/.lua scripts/metadata_filter.lua \| out	88	out/%.html: content/%.md .cache/meta/%.json .cache/assets.json $(CONTENT_TEMPLATES_SRC) metadata/.yaml filters/.lua scripts/metadata.lua \| out
89	$(info [MARK] $< -> $@)	89	$(info [MARK] $< -> $@)
90		90
91	mkdir -p $(@D)	91	mkdir -p $(@D)
@@ -95,7 +95,7 @@ out/%.html: content/%.md .cache/meta/%.json .cache/assets.json $(CONTENT_TEMPLAT
95	--wrap preserve \	95	--wrap preserve \
96	--no-highlight \	96	--no-highlight \
97	--template templates/base.html \	97	--template templates/base.html \
98	--lua-filter scripts/metadata_filter.lua \	98	--lua-filter scripts/metadata.lua \
99	$(GLOBAL_METADATA) \	99	$(GLOBAL_METADATA) \
100	--metadata-file .cache/assets.json \	100	--metadata-file .cache/assets.json \
101	--metadata-file "$(filter .cache/meta/%.json,$^)" \	101	--metadata-file "$(filter .cache/meta/%.json,$^)" \
@@ -103,7 +103,7 @@ out/%.html: content/%.md .cache/meta/%.json .cache/assets.json $(CONTENT_TEMPLAT
103	$(PANDOC_FILTERS) \	103	$(PANDOC_FILTERS) \
104	-o "$@" "$<"	104	-o "$@" "$<"
105		105
106	out/%.xml: content/%.md .cache/meta/%.json $(FEED_TEMPLATES_SRC) metadata/.yaml filters/.lua scripts/metadata_filter.lua \| out	106	out/%.xml: content/%.md .cache/meta/%.json $(FEED_TEMPLATES_SRC) metadata/.yaml filters/.lua scripts/metadata.lua \| out
107	$(info [FEED] $< -> $@)	107	$(info [FEED] $< -> $@)
108		108
109	mkdir -p $(@D)	109	mkdir -p $(@D)
@@ -113,7 +113,7 @@ out/%.xml: content/%.md .cache/meta/%.json $(FEED_TEMPLATES_SRC) metadata/*.yaml
113	--wrap preserve \	113	--wrap preserve \
114	--no-highlight \	114	--no-highlight \
115	--template templates/feed.xml \	115	--template templates/feed.xml \
116	--lua-filter scripts/metadata_filter.lua \	116	--lua-filter scripts/metadata.lua \
117	$(GLOBAL_METADATA) \	117	$(GLOBAL_METADATA) \
118	--metadata-file "$(filter .cache/meta/%.json,$^)" \	118	--metadata-file "$(filter .cache/meta/%.json,$^)" \
119	--metadata file_out="$@" \	119	--metadata file_out="$@" \