From 77534ea71ea7e902908015fb3aad5c48f66c12f6 Mon Sep 17 00:00:00 2001
From: Joan Josep Ordinas Rosa <jordinas@gmail.com>
Date: Mon, 19 Nov 2018 10:29:00 +0100
Subject: [PATCH] Implemented `sake` wrapper to `make`.

---
 Makefile                                      | 11 +--
 README.md                                     | 14 ++--
 bin/sake                                      | 70 +++++++++++++++++++
 docs/README.md                                | 29 ++++++--
 docs/{Makefile => Sakefile}                   | 43 +++++-------
 docs/config.yaml                              |  2 +-
 docs/content/data.md                          |  6 ++
 docs/make.d/tools.make                        | 26 -------
 .../sake}/make.d/configuration.make           |  7 +-
 .../sake/make.d/main.make                     | 25 ++++++-
 {docs => share/sake}/make.d/phase1.jq         |  0
 {docs => share/sake}/make.d/phase1.make       |  4 +-
 {docs => share/sake}/make.d/phase1_site.jq    |  0
 {docs => share/sake}/make.d/phase2.jq         |  0
 {docs => share/sake}/make.d/phase2.make       | 30 ++++----
 {docs => share/sake}/make.d/phase2_page.jq    |  0
 {docs => share/sake}/make.d/phase3.jq         | 10 ++-
 {docs => share/sake}/make.d/phase3.make       | 49 ++++---------
 {docs => share/sake}/make.d/sitemap.jq        |  0
 {docs => share/sake}/make.d/sitemap.make      |  4 +-
 {docs => share/sake}/make.d/styles.make       | 13 ++--
 share/sake/make.d/tools.make                  | 34 +++++++++
 {docs/styles => share/sake}/milligram/BEM.m   |  0
 .../sake}/milligram/COLORNAMES.m              |  0
 .../sake}/milligram/Normalize.css             |  0
 .../styles => share/sake}/milligram/base.css  |  0
 .../sake}/milligram/blockquote.css            |  0
 .../sake}/milligram/button.css                |  0
 .../styles => share/sake}/milligram/code.css  |  0
 .../styles => share/sake}/milligram/color.css |  0
 .../sake}/milligram/divider.css               |  0
 .../styles => share/sake}/milligram/form.css  |  0
 .../styles => share/sake}/milligram/grid.css  |  0
 .../styles => share/sake}/milligram/image.css |  0
 .../styles => share/sake}/milligram/link.css  |  0
 .../styles => share/sake}/milligram/list.css  |  0
 .../sake}/milligram/spacing.css               |  0
 .../styles => share/sake}/milligram/table.css |  0
 .../sake}/milligram/typography.css            |  0
 .../sake}/milligram/utility.css               |  0
 40 files changed, 243 insertions(+), 134 deletions(-)
 create mode 100755 bin/sake
 rename docs/{Makefile => Sakefile} (60%)
 delete mode 100644 docs/make.d/tools.make
 rename {docs => share/sake}/make.d/configuration.make (96%)
 rename docs/make.d/Makefile.make => share/sake/make.d/main.make (87%)
 rename {docs => share/sake}/make.d/phase1.jq (100%)
 rename {docs => share/sake}/make.d/phase1.make (97%)
 rename {docs => share/sake}/make.d/phase1_site.jq (100%)
 rename {docs => share/sake}/make.d/phase2.jq (100%)
 rename {docs => share/sake}/make.d/phase2.make (91%)
 rename {docs => share/sake}/make.d/phase2_page.jq (100%)
 rename {docs => share/sake}/make.d/phase3.jq (85%)
 rename {docs => share/sake}/make.d/phase3.make (74%)
 rename {docs => share/sake}/make.d/sitemap.jq (100%)
 rename {docs => share/sake}/make.d/sitemap.make (90%)
 rename {docs => share/sake}/make.d/styles.make (68%)
 create mode 100644 share/sake/make.d/tools.make
 rename {docs/styles => share/sake}/milligram/BEM.m (100%)
 rename {docs/styles => share/sake}/milligram/COLORNAMES.m (100%)
 rename {docs/styles => share/sake}/milligram/Normalize.css (100%)
 rename {docs/styles => share/sake}/milligram/base.css (100%)
 rename {docs/styles => share/sake}/milligram/blockquote.css (100%)
 rename {docs/styles => share/sake}/milligram/button.css (100%)
 rename {docs/styles => share/sake}/milligram/code.css (100%)
 rename {docs/styles => share/sake}/milligram/color.css (100%)
 rename {docs/styles => share/sake}/milligram/divider.css (100%)
 rename {docs/styles => share/sake}/milligram/form.css (100%)
 rename {docs/styles => share/sake}/milligram/grid.css (100%)
 rename {docs/styles => share/sake}/milligram/image.css (100%)
 rename {docs/styles => share/sake}/milligram/link.css (100%)
 rename {docs/styles => share/sake}/milligram/list.css (100%)
 rename {docs/styles => share/sake}/milligram/spacing.css (100%)
 rename {docs/styles => share/sake}/milligram/table.css (100%)
 rename {docs/styles => share/sake}/milligram/typography.css (100%)
 rename {docs/styles => share/sake}/milligram/utility.css (100%)

diff --git a/Makefile b/Makefile
index 5499aed..c446af8 100644
--- a/Makefile
+++ b/Makefile
@@ -106,14 +106,17 @@ setup:
 
 .PHONY: install uninstall
 
+SAKE=$(datadir)/$(PROJECT)/sake/
+
 install: all
-	test -d $(bindir) || mkdir --verbose --parents $(bindir)
-	test -d $(datadir)/$(PROJECT) || mkdir --verbose --parents $(datadir)/$(PROJECT)
-	test -d $(mandir)/man1 || mkdir --verbose --parents $(mandir)/man1
+	install --directory $(bindir) $(datadir) $(mandir)/man1 $(SAKE)/{make.d,milligram}
 	install --verbose --compare --mode 555 bin/* $(bindir)
-	install --verbose --compare --mode 644 share/* $(datadir)/$(PROJECT)
+	install --verbose --compare --mode 644 share/*.* $(datadir)/$(PROJECT)
 	install --verbose --compare --mode 644 $(ManPage) $(mandir)/man1
+	install --verbose --compare --mode 644 share/sake/make.d/*.* $(SAKE)/make.d
+	install --verbose --compare --mode 644 share/sake/milligram/*.* $(SAKE)/milligram
 	sed -i -e "s#DATADIR='.*'#DATADIR='$(datadir)'#" $(bindir)/jqt
+	sed -i -e "s#DATADIR='.*'#DATADIR='$(datadir)'#" $(bindir)/sake
 
 uninstall:
 	rm --verbose --force -- $(addprefix $(prefix)/,$(wildcard bin/*))
diff --git a/README.md b/README.md
index c41716e..c6b1ca4 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,8 @@ The file `Makefile` concentrates all the routine procedures, like running the te
 or install last versions of scripts in the system directories. The main defined _targets_
 are:
 
+* `list`:  list all targets defined in the Makefile.
+
 * `check`: run the _jqt_ tests. This is the default target.
 
 * `clean`: remove all files generated during tests execution.
@@ -39,8 +41,6 @@ are:
 
 * `uninstall`: remove installed files from the system directories.
 
-* `help`:  list all targets defined in the Makefile.
-
 ### Installation
 
 In systems with the GNU software installed tools such as [Bash](https://www.gnu.org/software/bash/),
@@ -50,7 +50,7 @@ or [Pandoc](http://pandoc.org/); for example, in recent _Fedora Linux_ distribut
 the following command will install all the extra software _jqt_ needs:
 
 ```zsh
-$ sudo dnf -y install make general-purpose-preprocessor jq pandoc PyYAML
+$ sudo dnf -y install make general-purpose-preprocessor jq pandoc python2-pyyaml
 ```
 
 To install _jqt_ simply run `make install` on the _jqt_ repository top
@@ -67,7 +67,7 @@ _jqt_ top directory:
 ```zsh
 $ sudo mkdir -p /usr/local/bin /usr/local/share/jqt
 $ sudo cp bin/* /usr/local/bin
-$ sudo cp share/* /usr/local/share/jqt
+$ sudo cp -r share/* /usr/local/share/jqt
 $ [[ $PATH =~ /usr/local/bin ]] || echo 'Add /usr/local/bin to your PATH'
 ```
 
@@ -84,9 +84,9 @@ another `jqt` uses.
 
 ### Documentation
 
-The directory [`docs`](./docs/) contains the source files for _jqt_ documentation, and is in itself a subproject with his
-own makefile. Please see the directory [`docs`](./docs/) for all information on
-this subproject.
+The directory [`docs`](./docs/) contains the source files for _jqt_
+documentation.  Please see the directory [`docs`](./docs/) for all information
+on this subproject.
 
 <!--
 vim:ts=4:sw=4:ai:et:fileencoding=utf8:syntax=markdown
diff --git a/bin/sake b/bin/sake
new file mode 100755
index 0000000..427a1c4
--- /dev/null
+++ b/bin/sake
@@ -0,0 +1,70 @@
+#!/bin/bash
+
+#
+# Wraps make
+#
+
+# Options
+set -o errexit -o noglob -o nounset -o pipefail
+shopt -s expand_aliases
+
+# Script name
+declare -r SELF=${0##*/}
+
+# Exported to use in makefiles and Sakefile
+declare -xr DATADIR='/usr/local/share'
+declare -xr SAKE="${DATADIR}/jqt/sake"
+
+# GMake call
+declare -ri CORES=2
+declare -ra makeflags=(
+    --jobs=$(( CORES * 150 / 100  ))  # CORES * 1.5
+    --makefile=Sakefile
+    --output-sync=target
+)
+alias _sake='exec make "${makeflags[@]}"'
+
+# Check project on current directory
+if test ! -e Sakefile; then
+    echo 1>&2 "${SELF}: no \`Sakefile\` found."
+    exit 1
+fi
+if test ! -e config.yaml && test ! -e config.json; then
+    echo 1>&2 "${SELF}: no \`config.yaml\` or \`config.json\` file found."
+    exit 1
+fi
+
+# Check arguments
+[[ $# == 0 ]] && set -- build
+
+# Run _sake
+case $1 in
+    help)
+        echo 1>&2 "${SELF}: Target \`help\` not implemented."
+        exit 1
+        ;;
+    new)
+        echo 1>&2 "${SELF}: Target \`new\` not implemented."
+        exit 1
+        ;;
+    list)
+        echo 'Usage: sake [goal] [[options] [variable=string] ...]'
+        echo 'Goals:'
+        _sake --jobs=1 --dry-run --print-data-base --question 2>&1 \
+        | grep -v '^[SmM]akefile' \
+        | awk '/^[^ \t.%][-A-Za-z0-9_.]*:/ { print $1 }' \
+        | sort --unique \
+        | sed 's/:\+$//' \
+        | pr --omit-pagination --indent=4 --width=80 --columns=5
+        ;;
+    touch)
+        if test -e config.yaml; then touch config.yaml; else touch config.json; fi
+        shift
+        _sake build "$@"
+        ;;
+    *)
+        _sake "$@"
+        ;;
+esac
+
+# vim:ai:sw=4:ts=4:et:syntax=sh
diff --git a/docs/README.md b/docs/README.md
index 3ca6d66..d9d74ec 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -36,7 +36,7 @@ predefined variables:
 
 In the configuration file you can assign new values to all predefined variables
 except `Meta`, with default value defined in the file `make.d/Makefile.make`.
-You can modify this variable at the very beggining of your `Makefile`.
+You can modify this variable at the very beggining of your `Sakefile`.
 
 ## Page variables
 
@@ -87,13 +87,32 @@ content/extras/indexes/name.html
 
 # _Sake_: static site build automation system
 
-## Current _GMake_ commands
+## Sakefile
+
+_Sake_ managed projects must have a makefile named `Sakefile`, and this
+makefile must contain the following include:
+
+    include $(SAKE)/make.d/main.make
+
+## Current _Sake_ commands
+
+Targets not defined now: `help`, `new`.
 
 ```
-Usage: make TARGET [parameter=value...]
 Targets:
-    build       clobber         h5.lint     list
-    clean       configure       h5.valid    touch
+    build       configure       help        new
+    clean       h5.lint         list        touch
+    clobber     h5.valid
+```
+
+## Autocompletion
+
+Hint (on _Fedora_): to enable autocompletion for `sake` do this:
+
+```
+    $ cd /usr/share/bash-completion/completions
+    $ sudo sed -i make -e '/^complete -F/s/$/ sake/'
+    $ sudo ln -s make sake
 ```
 
 <!--
diff --git a/docs/Makefile b/docs/Sakefile
similarity index 60%
rename from docs/Makefile
rename to docs/Sakefile
index d1c7580..03aa2d6 100644
--- a/docs/Makefile
+++ b/docs/Sakefile
@@ -8,48 +8,41 @@
 # independent, valid for any project without any change.  This should be
 # the only makefile to edit by hand!
 #
-# Variables used:
-#	Root
-#
 # Variables modified:
 # 	JQTFLAGS
 
+########################################################################
+# Variables to define before include if default values must be changed.
+########################################################################
+
 #Meta := .meta
+#JQTFLAGS +=
 #VERBOSE := 1
 #TRACE := 1
+#VNU := java -jar /usr/local/vnu/vnu.jar
 
-include make.d/Makefile.make
+########################################################################
+# Starting makefile
+########################################################################
 
-# Last phase, after metadata configuration.
-ifdef __build
+include $(SAKE)/make.d/main.make
 
 ########################################################################
-# Build pages options.
+# Last phase, after metadata configuration.
 ########################################################################
+ifdef __build
 
-# Pandoc options
+# Add some Pandoc options
 JQTFLAGS += -5 --toc-depth=4
 
 ########################################################################
-# HTML 5 validation.
+# experimental
 ########################################################################
 
-# Download vnu.jar from `https://github.com/validator/validator/releases`.
-
-.PHONY: h5.valid h5.lint
-
-# Validation tool.
-VNU := /usr/local/vnu/vnu.jar
-
-# Validation.
-h5.valid: build
-	@xmlwf $(Root)/*.html
-	@java -jar $(VNU) --errors-only --format gnu $(Root)/*.html
-
-# Validation with warnings.
-h5.lint: build
-	@xmlwf $(Root)/*.html
-	@java -jar $(VNU) --format text $(Root)/*.html
+depend:
+	grep -r '<%include\s\+[^>]\+>'  blocks/ layouts/\
+	| sed -e 's/:.*<%include\s\+/\t/;s/>.*$$//'	\
+	| sort
 
 endif # __build
 
diff --git a/docs/config.yaml b/docs/config.yaml
index af0da03..f1a4271 100644
--- a/docs/config.yaml
+++ b/docs/config.yaml
@@ -53,7 +53,7 @@ defaults:
       lang: *lang
       Layout: page-toc
       Datasets:
-        - snippets
+        - snippets.md
       Dependencies:
         - layouts/default.html
         - content/macros.m
diff --git a/docs/content/data.md b/docs/content/data.md
index 66597bd..32cf44c 100644
--- a/docs/content/data.md
+++ b/docs/content/data.md
@@ -166,6 +166,12 @@ The CSS minimization is not extremely aggressive, but is safe and fast.
 
 ## Tools
 
+### Build automation
+
+One step over any templating system is a static site generator. A companion
+site generator to <%cite jqt> is <%cite sake>, a simple wrapper to
+<%cite 'GNU Make'> used to build this very same site.
+
 ### Data conversion
 
 When preparing data inputs sometimes you need to mix files in several formats.
diff --git a/docs/make.d/tools.make b/docs/make.d/tools.make
deleted file mode 100644
index 4557188..0000000
--- a/docs/make.d/tools.make
+++ /dev/null
@@ -1,26 +0,0 @@
-########################################################################
-# tools.make
-#
-# Miscelaneous tools.
-#
-# Defined targets:
-# 	list
-
-########################################################################
-# Show all targets.
-########################################################################
-
-.PHONY: list
-
-# Warning: `make list` can build several phases.
-list:
-	@echo 'Usage: make TARGET [parameter=value...]'
-	@echo 'Targets:';					\
-	$(MAKE) --print-data-base --just-print 2>&1		\
-	| grep -v '^[mM]akefile'				\
-	| awk '/^[^ \t.%][-A-Za-z0-9_.]*:/ { print $$1 }'	\
-	| sort --unique						\
-	| sed 's/:\+$$//'					\
-	| pr --omit-pagination --indent=4 --width=80 --columns=4
-
-# vim:ai:sw=8:ts=8:noet:fileencoding=utf8:syntax=make
diff --git a/docs/make.d/configuration.make b/share/sake/make.d/configuration.make
similarity index 96%
rename from docs/make.d/configuration.make
rename to share/sake/make.d/configuration.make
index 9915a81..ed63d3c 100644
--- a/docs/make.d/configuration.make
+++ b/share/sake/make.d/configuration.make
@@ -5,8 +5,8 @@
 # 	VERBOSE
 # 	TRACE
 
-TRACE ?=
-VERBOSE ?=
+export TRACE ?=
+export VERBOSE ?=
 
 ########################################################################
 # Prerequisites.
@@ -26,6 +26,9 @@ MAKECMDGOALS ?= build
 # Make configuration.
 ########################################################################
 
+# Use renamed makefile
+MAKE += --makefile=Sakefile
+
 # Disable builtins.
 MAKEFLAGS += --no-builtin-rules
 MAKEFLAGS += --no-builtin-variables
diff --git a/docs/make.d/Makefile.make b/share/sake/make.d/main.make
similarity index 87%
rename from docs/make.d/Makefile.make
rename to share/sake/make.d/main.make
index c4d0e6e..d31498c 100644
--- a/docs/make.d/Makefile.make
+++ b/share/sake/make.d/main.make
@@ -1,8 +1,12 @@
 ########################################################################
-# Makefile.make -- Main makefile.
+# main.make -- Main makefile.
+#
+# Imported variables:
+# 	SAKE
+# 	DATADIR
 #
 # Variables:
-# 	$(Meta)
+# 	Meta
 # Rules:
 # 	$(Meta) directory target and clobber target
 #
@@ -18,7 +22,7 @@ MDIR := $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
 include $(MDIR)/configuration.make
 
 # Do not try to rebuilt static makefiles.
-$(MDIR)/Makefile.make $(MDIR)/configuration.make: ;
+$(CURDIR)/Sakefile $(MDIR)/main.make $(MDIR)/configuration.make: ;
 
 ########################################################################
 # Metadata directory for all generated make and metadata files.
@@ -47,6 +51,15 @@ endif
 # Check command line sanity.
 ########################################################################
 
+# TODO: check only one target is present?
+
+# Target 'clean' must be alone.
+ifeq (clean,$(filter clean,$(MAKECMDGOALS)))
+ifneq (1,$(words $(MAKECMDGOALS)))
+$(error Target "clean" must be alone)
+endif
+endif
+
 # Target 'clobber' must be alone.
 ifeq (clobber,$(filter clobber,$(MAKECMDGOALS)))
 ifneq (1,$(words $(MAKECMDGOALS)))
@@ -129,6 +142,12 @@ $(MDIR)/sitemap.make: ;
 $(MDIR)/styles.make: ;
 $(MDIR)/tools.make: ;
 
+# Filter builtin tools defined in `sake`script.
+sake_builtin := new help touch list
+.PHONY: $(sake_builtin)
+$(sake_builtin):
+	echo 'sake: Target `$@` not implemented.'
+
 endif # __phase_3
 endif # __phase_2
 endif # __phase_1
diff --git a/docs/make.d/phase1.jq b/share/sake/make.d/phase1.jq
similarity index 100%
rename from docs/make.d/phase1.jq
rename to share/sake/make.d/phase1.jq
diff --git a/docs/make.d/phase1.make b/share/sake/make.d/phase1.make
similarity index 97%
rename from docs/make.d/phase1.make
rename to share/sake/make.d/phase1.make
index 1ec270e..c2e251e 100644
--- a/docs/make.d/phase1.make
+++ b/share/sake/make.d/phase1.make
@@ -17,7 +17,7 @@
 #	$(Meta)/phase1.make
 # 	$(Root) directory rule and clobber and clean targets
 
-SUPER := $(MDIR)/Makefile.make
+SUPER := $(MDIR)/main.make
 
 ########################################################################
 # Files derived from user defined configuration file.
@@ -63,7 +63,7 @@ $(Meta)/site.json: $(Meta)/config.json $(MDIR)/phase1_site.jq
 #
 $(Meta)/phase1.make: $(Meta)/site.json $(MDIR)/phase1.jq 
 	$(info ==> $@)
-	jq --raw-output 		\
+	jq --raw-output 			\
 	   --from-file $(MDIR)/phase1.jq	\
 	   < $< > $@
 
diff --git a/docs/make.d/phase1_site.jq b/share/sake/make.d/phase1_site.jq
similarity index 100%
rename from docs/make.d/phase1_site.jq
rename to share/sake/make.d/phase1_site.jq
diff --git a/docs/make.d/phase2.jq b/share/sake/make.d/phase2.jq
similarity index 100%
rename from docs/make.d/phase2.jq
rename to share/sake/make.d/phase2.jq
diff --git a/docs/make.d/phase2.make b/share/sake/make.d/phase2.make
similarity index 91%
rename from docs/make.d/phase2.make
rename to share/sake/make.d/phase2.make
index 512cbb1..ee588ad 100644
--- a/docs/make.d/phase2.make
+++ b/share/sake/make.d/phase2.make
@@ -37,8 +37,12 @@ SUPER := $(Meta)/phase1.make
 # generate JSON metadata files for each page.
 ########################################################################
 
+phase2_files := $(Meta)/content.text $(Meta)/data.text
+
+# Do not preserve!
+.INTERMEDIATE: $(phase2_files)
+
 $(Meta)/content.text: $(THIS)
-	$(info ==> $@)
 	find $(Content) -type f -a	\
 		-name '[!_]*.md' -o	\
 		-name '[!_]*.mkd' -o	\
@@ -46,26 +50,23 @@ $(Meta)/content.text: $(THIS)
 	> $@
 
 $(Meta)/data.text: $(THIS)
-	$(info ==> $@)
 	find $(Data) -name '*.*' > $@
 
 #
 # Create `$(Meta)/phase2.make` from `find` output using `$(MDIR)/phase2.jq`.
 #
-$(Meta)/phase2.make: CONTENT := $(Meta)/content.text 
-$(Meta)/phase2.make: DATA := $(Meta)/data.text 
-$(Meta)/phase2.make: $(MDIR)/phase2.jq $(Meta)/content.text $(Meta)/data.text $(SUPER) $(THIS)
+$(Meta)/phase2.make: $(MDIR)/phase2.jq $(phase2_files) $(SUPER) $(THIS)
 	$(info ==> $@)
-	jq --raw-input			\
-	   --raw-output			\
-	   --slurp			\
+	jq --raw-input				\
+	   --raw-output				\
+	   --slurp				\
 	   --from-file $(MDIR)/phase2.jq	\
-	   --arg DF "$$(<$(DATA))"	\
-	   --arg Content $(Content)	\
-	   --arg Data $(Data)		\
-	   --arg Root $(Root)		\
-	   --arg Meta $(Meta)		\
-	   < $(CONTENT) > $@
+	   --arg DF "$$(<$(Meta)/data.text )"	\
+	   --arg Content $(Content)		\
+	   --arg Data $(Data)			\
+	   --arg Root $(Root)			\
+	   --arg Meta $(Meta)			\
+	   < $(Meta)/content.text > $@
 
 ifdef __phase_2
 
@@ -146,6 +147,7 @@ $(Meta)/pages-by-id.json: $(PagesJSON)
 	| jq -n 'reduce inputs as $$p ({}; . + {($$p.Id):$$p})'	\
 	> $@
 
+# Alternative:
 #$(Meta)/pages-by-id.json: $(PagesJSON)
 #	$(info ==> $@)
 #	@jq --slurp 'reduce .[] as $$p ({}; . + {($$p.Id): $$p})' $^ > $@
diff --git a/docs/make.d/phase2_page.jq b/share/sake/make.d/phase2_page.jq
similarity index 100%
rename from docs/make.d/phase2_page.jq
rename to share/sake/make.d/phase2_page.jq
diff --git a/docs/make.d/phase3.jq b/share/sake/make.d/phase3.jq
similarity index 85%
rename from docs/make.d/phase3.jq
rename to share/sake/make.d/phase3.jq
index 2c22482..6fb2f3f 100644
--- a/docs/make.d/phase3.jq
+++ b/share/sake/make.d/phase3.jq
@@ -8,15 +8,23 @@
 #   < $(Meta)/pages-by-id.json
 #   > $(Meta)/phase3.make
 
+def basename:
+    sub("\\.[^/]+$"; "")
+;
+
 def dependencies:
     if .Dependencies
     then " " + (.Dependencies | join(" "))
     else "" end
+    +
+    if .Datasets
+    then " " + ([.Datasets[] | basename | "\($Meta)/\(.).json"] | join(" "))
+    else "" end
 ;
 
 def dataset:
     if .Datasets
-    then " " + (.Datasets | map("-m\(.):\($Meta)/\(.).json") | join(" "))
+    then " " + ([.Datasets[] | basename | "-m\(.):\($Meta)/\(.).json"] | join(" "))
     else "" end
 ;
 
diff --git a/docs/make.d/phase3.make b/share/sake/make.d/phase3.make
similarity index 74%
rename from docs/make.d/phase3.make
rename to share/sake/make.d/phase3.make
index 08c7c80..dbe6b70 100644
--- a/docs/make.d/phase3.make
+++ b/share/sake/make.d/phase3.make
@@ -12,7 +12,6 @@
 # 	clean
 # 	clobber
 # 	configure
-# 	touch
 
 SUPER := $(Meta)/phase2.make
 
@@ -23,10 +22,10 @@ SUPER := $(Meta)/phase2.make
 # Build rules for each page.
 $(Meta)/phase3.make: $(Meta)/pages-by-id.json $(MDIR)/phase3.jq $(SUPER) $(THIS)
 	$(info ==> $@)
-	jq --raw-output			\
-	   --arg Meta $(Meta)		\
-	   --arg Layouts $(Layouts)	\
-	   --arg Root $(Root)		\
+	jq --raw-output				\
+	   --arg Meta $(Meta)			\
+	   --arg Layouts $(Layouts)		\
+	   --arg Root $(Root)			\
 	   --from-file $(MDIR)/phase3.jq	\
 	   < $< > $@
 
@@ -60,21 +59,18 @@ endef
 $(PagesHTML): $(Root)/%.html : $(Meta)/pages/%.json
 $(PagesHTML): $(Meta)/phase3.make $(Blocks)/*/markup.html $(Blocks)/*/*/markup.html \
 | $$(dir $$@)
-ifneq (,$(DataFiles))
-$(PagesHTML): $(DataFiles)
-endif
 
 # Content example for `$(Meta)/phase3.make`:
 
 # __phase_3 := 1
-# _site/jqt/index.html: content/index.md layouts/page.html content/macros.m content/LINKS.txt content/EXAMPLE.txt
+# _site/jqt/index.html: content/index.md layouts/page.html content/macros.m content/LINKS.txt content/EXAMPLE.txt .meta/snippets.json
 # 	$(info ==> $@)
 # 	@$(JQT) -d $< -mpage:.meta/pages/index.json layouts/page.html | $(DETAILS) > $@
 # ...
-# _site/jqt/blog/2017-04-13-hello.html: content/blog/2017-04-13-hello.md layouts/page.html
+# _site/jqt/blog/2017-04-13-hello.html: content/blog/2017-04-13-hello.md layouts/page.html .meta/snippets.json
 # 	$(info ==> $@)
 # 	@$(JQT) -d $< -mpage:.meta/pages/blog/2017-04-13-hello.json layouts/page.html | $(DETAILS) > $@
-# _site/jqt/blog/index.html: content/blog/index.md layouts/blog.html
+# _site/jqt/blog/index.html: content/blog/index.md layouts/blog.html .meta/snippets.json
 # 	$(info ==> $@)
 # 	@$(JQT) -d $< -mpage:.meta/pages/blog/index.json layouts/blog.html | $(DETAILS) > $@
 
@@ -93,33 +89,12 @@ build:: $(PagesHTML)
 clobber:: ; @rm -rf *~ *.bak  *.log
 
 ########################################################################
-# Debug variations on the `build` target.
-
-.PHONY: configure touch
-
-# Touch top file
-define TEST_AND_TOUCH.sh
-  if test -e config.yaml;	\
-  then touch config.yaml;	\
-  elif test -e config.json;	\
-  then touch config.json;	\
-  else false;			\
-  fi
-endef
+# Variations on the `build` target.
+
+.PHONY: configure
 
-# Force regeneration of all metadata and data files.
-configure:
-ifdef MAKE_RESTARTS
-	@$(MAKE) -s $(DataFiles) VERBOSE=$(VERBOSE) TRACE=$(TRACE)
-else
-	@rm -rf $(Meta)
-	@$(MAKE) -s $(DataFiles) VERBOSE=$(VERBOSE) TRACE=$(TRACE)
-endif
-
-# Make after touching `config.{yaml,json}`.
-touch:
-	@$(TEST_AND_TOUCH.sh)
-	@$(MAKE) -s build VERBOSE=$(VERBOSE) TRACE=$(TRACE)
+# Build all metadata and data files.
+configure: $(DataFiles)	# $(PagesJSON) are built for phase2.make
 
 endif # __phase_3
 
diff --git a/docs/make.d/sitemap.jq b/share/sake/make.d/sitemap.jq
similarity index 100%
rename from docs/make.d/sitemap.jq
rename to share/sake/make.d/sitemap.jq
diff --git a/docs/make.d/sitemap.make b/share/sake/make.d/sitemap.make
similarity index 90%
rename from docs/make.d/sitemap.make
rename to share/sake/make.d/sitemap.make
index e1232d1..1ec2cb3 100644
--- a/docs/make.d/sitemap.make
+++ b/share/sake/make.d/sitemap.make
@@ -8,9 +8,9 @@
 $(Root)/sitemap.xml: $(Meta)/pages-by-id.json $(Meta)/site.json $(MDIR)/sitemap.jq $(THIS) \
 | $(Root)
 	$(info ==> $@)
-	jq --raw-output					\
+	jq --raw-output				\
 	   --slurpfile site $(Meta)/site.json	\
-	   --from-file $(MDIR)/sitemap.jq		\
+	   --from-file $(MDIR)/sitemap.jq	\
 	   < $< > $@
 
 $(Root)/sitemap.xml.gz: $(Root)/sitemap.xml
diff --git a/docs/make.d/styles.make b/share/sake/make.d/styles.make
similarity index 68%
rename from docs/make.d/styles.make
rename to share/sake/make.d/styles.make
index e170078..599f30c 100644
--- a/docs/make.d/styles.make
+++ b/share/sake/make.d/styles.make
@@ -4,18 +4,21 @@
 # Exported rules for:
 #	$(Root)/styles.css
 
+# DATADIR defined in `sake` script.
+_sake := $(DATADIR)/jqt/sake
+
 # Secondary prerequisites.
-$(Root)/styles.css:		\
+$(Root)/styles.css:			\
+	$(_sake)/milligram/*.css	\
+	$(_sake)/milligram/*.m		\
+	$(Styles)/*.css			\
 	$(Blocks)/*/style.css		\
 	$(Blocks)/*/*/style.css		\
-	$(Styles)/*.css			\
-	$(Styles)/milligram/*.css	\
-	$(Styles)/milligram/*.m		\
 
 $(Root)/styles.css: $(Styles)/main.css $(THIS) \
 | $(Root)
 	$(info ==> $@)
-	jqt -P CSS-min -I$(Styles) < $< > $@
+	jqt -P CSS-min -I$(_sake) -I$(Styles) < $< > $@
 
 build:: $(Root)/styles.css
 
diff --git a/share/sake/make.d/tools.make b/share/sake/make.d/tools.make
new file mode 100644
index 0000000..73f0cf9
--- /dev/null
+++ b/share/sake/make.d/tools.make
@@ -0,0 +1,34 @@
+########################################################################
+# tools.make
+#
+# Miscelaneous tools.
+#
+# Imported variables:
+# 	VNU
+#	Root
+# Defined targets:
+# 	h5.lint
+# 	h5.valid
+
+########################################################################
+# HTML 5 validation.
+########################################################################
+
+# Download vnu.jar from `https://github.com/validator/validator/releases`.
+
+.PHONY: h5.valid h5.lint
+
+# Validation tool.
+VNU ?= java -jar /usr/local/vnu/vnu.jar
+
+# Validation.
+h5.valid: build
+	@xmlwf $(Root)/*.html $(Root)/*/*.html
+	@$(VNU) --errors-only --format gnu $(Root)/*.html
+
+# Validation with warnings.
+h5.lint: build
+	@xmlwf $(Root)/*.html $(Root)/*/*.html
+	@$(VNU) --format text $(Root)/*.html
+
+# vim:ai:sw=8:ts=8:noet:fileencoding=utf8:syntax=make
diff --git a/docs/styles/milligram/BEM.m b/share/sake/milligram/BEM.m
similarity index 100%
rename from docs/styles/milligram/BEM.m
rename to share/sake/milligram/BEM.m
diff --git a/docs/styles/milligram/COLORNAMES.m b/share/sake/milligram/COLORNAMES.m
similarity index 100%
rename from docs/styles/milligram/COLORNAMES.m
rename to share/sake/milligram/COLORNAMES.m
diff --git a/docs/styles/milligram/Normalize.css b/share/sake/milligram/Normalize.css
similarity index 100%
rename from docs/styles/milligram/Normalize.css
rename to share/sake/milligram/Normalize.css
diff --git a/docs/styles/milligram/base.css b/share/sake/milligram/base.css
similarity index 100%
rename from docs/styles/milligram/base.css
rename to share/sake/milligram/base.css
diff --git a/docs/styles/milligram/blockquote.css b/share/sake/milligram/blockquote.css
similarity index 100%
rename from docs/styles/milligram/blockquote.css
rename to share/sake/milligram/blockquote.css
diff --git a/docs/styles/milligram/button.css b/share/sake/milligram/button.css
similarity index 100%
rename from docs/styles/milligram/button.css
rename to share/sake/milligram/button.css
diff --git a/docs/styles/milligram/code.css b/share/sake/milligram/code.css
similarity index 100%
rename from docs/styles/milligram/code.css
rename to share/sake/milligram/code.css
diff --git a/docs/styles/milligram/color.css b/share/sake/milligram/color.css
similarity index 100%
rename from docs/styles/milligram/color.css
rename to share/sake/milligram/color.css
diff --git a/docs/styles/milligram/divider.css b/share/sake/milligram/divider.css
similarity index 100%
rename from docs/styles/milligram/divider.css
rename to share/sake/milligram/divider.css
diff --git a/docs/styles/milligram/form.css b/share/sake/milligram/form.css
similarity index 100%
rename from docs/styles/milligram/form.css
rename to share/sake/milligram/form.css
diff --git a/docs/styles/milligram/grid.css b/share/sake/milligram/grid.css
similarity index 100%
rename from docs/styles/milligram/grid.css
rename to share/sake/milligram/grid.css
diff --git a/docs/styles/milligram/image.css b/share/sake/milligram/image.css
similarity index 100%
rename from docs/styles/milligram/image.css
rename to share/sake/milligram/image.css
diff --git a/docs/styles/milligram/link.css b/share/sake/milligram/link.css
similarity index 100%
rename from docs/styles/milligram/link.css
rename to share/sake/milligram/link.css
diff --git a/docs/styles/milligram/list.css b/share/sake/milligram/list.css
similarity index 100%
rename from docs/styles/milligram/list.css
rename to share/sake/milligram/list.css
diff --git a/docs/styles/milligram/spacing.css b/share/sake/milligram/spacing.css
similarity index 100%
rename from docs/styles/milligram/spacing.css
rename to share/sake/milligram/spacing.css
diff --git a/docs/styles/milligram/table.css b/share/sake/milligram/table.css
similarity index 100%
rename from docs/styles/milligram/table.css
rename to share/sake/milligram/table.css
diff --git a/docs/styles/milligram/typography.css b/share/sake/milligram/typography.css
similarity index 100%
rename from docs/styles/milligram/typography.css
rename to share/sake/milligram/typography.css
diff --git a/docs/styles/milligram/utility.css b/share/sake/milligram/utility.css
similarity index 100%
rename from docs/styles/milligram/utility.css
rename to share/sake/milligram/utility.css