diff options
-rw-r--r-- | Makefile | 14 | ||||
-rw-r--r-- | content/notebook/fediverse/i-want-to-be-a-fox.md (renamed from content/notebook/fediverse/foxes-and-me.md) | 2 | ||||
-rw-r--r-- | content/notebook/fediverse/in-depth-image-descriptions.md | 2 | ||||
-rw-r--r-- | content/notebook/fediverse/index.md | 1 | ||||
-rw-r--r-- | content/notebook/index.md | 2 | ||||
-rwxr-xr-x | scripts/metadata.json (renamed from scripts/metadata_tpl.json) | 0 | ||||
-rw-r--r-- | scripts/metadata.lua (renamed from scripts/metadata_filter.lua) | 0 |
7 files changed, 11 insertions, 10 deletions
@@ -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="$@" \ |
diff --git a/content/notebook/fediverse/foxes-and-me.md b/content/notebook/fediverse/i-want-to-be-a-fox.md index b938a3a..e562922 100644 --- a/content/notebook/fediverse/foxes-and-me.md +++ b/content/notebook/fediverse/i-want-to-be-a-fox.md | |||
@@ -1,6 +1,6 @@ | |||
1 | --- | 1 | --- |
2 | schema_type: DigitalDocument | 2 | schema_type: DigitalDocument |
3 | title: Foxes and me | 3 | title: I Want To Be a Fox |
4 | date: 2022-07-09 | 4 | date: 2022-07-09 |
5 | 5 | ||
6 | references: | 6 | references: |
diff --git a/content/notebook/fediverse/in-depth-image-descriptions.md b/content/notebook/fediverse/in-depth-image-descriptions.md index 8af09ff..3143a36 100644 --- a/content/notebook/fediverse/in-depth-image-descriptions.md +++ b/content/notebook/fediverse/in-depth-image-descriptions.md | |||
@@ -1,6 +1,6 @@ | |||
1 | --- | 1 | --- |
2 | schema_type: DigitalDocument | 2 | schema_type: DigitalDocument |
3 | title: Detailed image descriptions aren't always helpful | 3 | title: Detailed Image Descriptions Aren't Always Helpful |
4 | date: 2022-05-05 | 4 | date: 2022-05-05 |
5 | 5 | ||
6 | references: | 6 | references: |
diff --git a/content/notebook/fediverse/index.md b/content/notebook/fediverse/index.md index c628a37..0c5b5f3 100644 --- a/content/notebook/fediverse/index.md +++ b/content/notebook/fediverse/index.md | |||
@@ -1,6 +1,7 @@ | |||
1 | --- | 1 | --- |
2 | title: Fediverse | 2 | title: Fediverse |
3 | position: 2 | 3 | position: 2 |
4 | list_order: date_desc | ||
4 | list_read_indicators: true | 5 | list_read_indicators: true |
5 | feed: true | 6 | feed: true |
6 | --- | 7 | --- |
diff --git a/content/notebook/index.md b/content/notebook/index.md index 17283b0..524bebb 100644 --- a/content/notebook/index.md +++ b/content/notebook/index.md | |||
@@ -7,4 +7,4 @@ list_limit: 4 | |||
7 | feed: true | 7 | feed: true |
8 | --- | 8 | --- |
9 | 9 | ||
10 | Essays, notes, blogs, thoughts... all kinds of textual content. | 10 | Essays, notes, mini blogs, thoughts... all kinds of textual content. |
diff --git a/scripts/metadata_tpl.json b/scripts/metadata.json index fb36f0f..fb36f0f 100755 --- a/scripts/metadata_tpl.json +++ b/scripts/metadata.json | |||
diff --git a/scripts/metadata_filter.lua b/scripts/metadata.lua index 8f32bd4..8f32bd4 100644 --- a/scripts/metadata_filter.lua +++ b/scripts/metadata.lua | |||