From 835f6ee37c15343a640edcd8fda3f41a6db26fd7 Mon Sep 17 00:00:00 2001 From: Joan Josep Ordinas Rosa Date: Thu, 20 Apr 2017 20:23:51 +0200 Subject: [PATCH] Defined "pages" filter --- README.md | 2 +- docs/blocks/body/_blog/markup.html | 2 +- docs/blocks/filters.jq | 10 ++++++++++ docs/blocks/menu-bar/markup.html | 4 ++-- docs/config.yaml | 7 +++++++ docs/make.d/data.make | 9 ++------- docs/make.d/pages.make | 8 ++++---- docs/make.d/phase3.jq | 10 +++++++++- docs/make.d/sitemap.make | 2 +- docs/project.make | 14 +++----------- 10 files changed, 40 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index c3299e7..ee53ed1 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The tools used in the implementation of _jqt_ are: If you want to learn how to use _jqt_ visit the site . The site pages are generated using _jqt_ in the [`docs`](./docs/) folder of this repository. -If you are interested in _jq_ you can see also [JBOL](https://fadado.github.io/jbol/), +If you are interested in _jqt_ you can see also [JBOL](https://github.com/fadado/jbol), a related project with a collection of modules for the _jq_ language. _jqt_ is developed under the _Fedora_ Linux distribution, and a lot of diff --git a/docs/blocks/body/_blog/markup.html b/docs/blocks/body/_blog/markup.html index 2a37781..58e737a 100644 --- a/docs/blocks/body/_blog/markup.html +++ b/docs/blocks/body/_blog/markup.html @@ -2,7 +2,7 @@ # Body for blog posts ######################################################################>&
- {% $pages::pages[0][] | select(.section=="blog") %}<#TODO: sort?#> + {% pages[] | select(.section=="blog") %}<#TODO: sort?#>
{{.title}}

{{.description}} diff --git a/docs/blocks/filters.jq b/docs/blocks/filters.jq index 2af7677..69845df 100644 --- a/docs/blocks/filters.jq +++ b/docs/blocks/filters.jq @@ -2,10 +2,20 @@ # Extra filters for this site # +import "collected-front-matter" as $pages; + # Remove XML tags def striptags: # warning: algorithm too simplistic gsub("<[^>]*>"; "") ; +def pages: + $pages::pages[0] +; + +def sections: + [pages[].section] | unique | map(select(.)) +; + # vim:ts=4:sw=4:ai:et:fileencoding=utf8:syntax=jq diff --git a/docs/blocks/menu-bar/markup.html b/docs/blocks/menu-bar/markup.html index e584206..7019620 100644 --- a/docs/blocks/menu-bar/markup.html +++ b/docs/blocks/menu-bar/markup.html @@ -2,9 +2,9 @@ # Menu Bar ######################################################################>&

    -{% $pages::pages[0] as $pages | .site.menu[] %} +{% .site.menu[] %}
  1. - {% (. as $id | $pages[] | select($id == .id)) as $page %} + {% (. as $id | pages[] | select($id == .id)) as $page %} {{$page.name}} {% end %}
    2. diff --git a/docs/config.yaml b/docs/config.yaml index c2dd885..a1e4eb0 100644 --- a/docs/config.yaml +++ b/docs/config.yaml @@ -51,5 +51,12 @@ defaults: author: *author lang: *lang +# data: +# - snippets + +# TODO: explore flags here! +# flags: +# - -msnippets:$(Metadata)/snippets.json + # vim:ts=2:sw=2:ai:et:fileencoding=utf8:syntax=yaml ... diff --git a/docs/make.d/data.make b/docs/make.d/data.make index 58a5916..ee6ca6e 100644 --- a/docs/make.d/data.make +++ b/docs/make.d/data.make @@ -18,8 +18,7 @@ # $(DestinationPaths) # $(MetadataPaths) # $(MetadataPages) -# $(Metadata)/pages.json -# $(Metadata)/sections.json +# $(Metadata)/collected-front-matter.json # $(DataFiles) # Targets: # init @@ -99,14 +98,10 @@ $(MetadataPaths): # Group metadata ######################################################################## -$(Metadata)/pages.json: $(MetadataPages) +$(Metadata)/collected-front-matter.json: $(MetadataPages) $(info ==> $@) @jq --slurp '.' $^ > $@ -$(Metadata)/sections.json: $(Metadata)/pages.json - $(info ==> $@) - @jq '[.[].section] | unique | map(select(.))' < $< > $@ - ######################################################################## # Files derived from $(Data)/* ######################################################################## diff --git a/docs/make.d/pages.make b/docs/make.d/pages.make index 834c7d1..e46aa21 100644 --- a/docs/make.d/pages.make +++ b/docs/make.d/pages.make @@ -18,7 +18,7 @@ ######################################################################## # Build rules for each page -$(Metadata)/phase3.make: $(Metadata)/pages.json make.d/pages.make make.d/phase3.jq $(Metadata)/phase2.make +$(Metadata)/phase3.make: $(Metadata)/collected-front-matter.json make.d/pages.make make.d/phase3.jq $(Metadata)/phase2.make $(info ==> $@) @jq --raw-output \ --arg Metadata $(Metadata) \ @@ -34,9 +34,9 @@ ifdef __phase_3 # define JQTFLAGS := - -msite:$(Metadata)/config.json \ - -j'$$'pages:$(Metadata)/pages \ - -I./ + -msite:$(Metadata)/site.json \ + -I./ -L$(Metadata) -L$(Blocks) \ + -ifilters endef JQT = jqt $(JQTFLAGS) diff --git a/docs/make.d/phase3.jq b/docs/make.d/phase3.jq index 17cd2f7..607f779 100644 --- a/docs/make.d/phase3.jq +++ b/docs/make.d/phase3.jq @@ -12,6 +12,14 @@ def use: else "" end ; +def flags: + if .flags then .flags | join(" ") else "" end +; + +def data: + if .data then .data | map("-m\(.):$(Metadata)/snippets.json") | join(" ") else "" end +; + ######################################################################## # Output makefile ######################################################################## @@ -20,7 +28,7 @@ def use: (.[] | ( $Destination+"/"+.url+": "+.source+" "+$Layouts+"/"+.layout+".html"+use, "\t$(info ==> $@)", - "\t@$(JQT) -mpage:"+$Metadata+"/pages/"+.id+".json -d $< "+$Layouts+"/"+.layout+".html | $(DETAILS) > $@" + "\t@$(JQT) "+data+" "+flags+" -mpage:"+$Metadata+"/pages/"+.id+".json -d $< "+$Layouts+"/"+.layout+".html | $(DETAILS) > $@" ) ), comment diff --git a/docs/make.d/sitemap.make b/docs/make.d/sitemap.make index 2f5ddf1..3babb66 100644 --- a/docs/make.d/sitemap.make +++ b/docs/make.d/sitemap.make @@ -23,7 +23,7 @@ define SITEMAP.jq "" endef -$(Destination)/sitemap.xml: $(Metadata)/pages.json $(Metadata)/site.json \ +$(Destination)/sitemap.xml: $(Metadata)/collected-front-matter.json $(Metadata)/site.json \ | $(Destination) $(info ==> $@) @jq --raw-output --slurpfile site $(Metadata)/site.json '$(SITEMAP.jq)' < $< > $@ diff --git a/docs/project.make b/docs/project.make index 64404d6..4854c91 100644 --- a/docs/project.make +++ b/docs/project.make @@ -14,18 +14,10 @@ # Build pages options ######################################################################## -# Declare explicitly modules with -m, -M or -j; this must be decided by a -# human! -JQTFLAGS += -msnippets:$(Metadata)/snippets.json +JQTFLAGS += -msnippets:$(Metadata)/snippets.json -# Options for `jqt`. -JQTFLAGS += \ - -5 \ - --toc-depth=4 \ - -iblocks/filters \ - -# only for derived nodes? -# -msections:$(Metadata)/sections.json \ +# Pandoc options +JQTFLAGS += -5 --toc-depth=4 # Extra dependencies #?$(DestinationPages): $(Blocks)/filters.jq $(Blocks)/*/*.html $(Blocks)/*/*/*.html