Use PANDOC env-var to control which pandoc binary is used

tarleb · tarleb · commit 8d00045a0308 · 2021-11-03T13:31:42.000+01:00
diff --git a/abstract-to-meta/Makefile b/abstract-to-meta/Makefile
@@ -1,17 +1,18 @@
 DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 
 test: sample1.md sample2.md abstract-to-meta.lua
-	@pandoc --lua-filter=abstract-to-meta.lua --standalone --to=markdown \
+	@$(PANDOC) --lua-filter=abstract-to-meta.lua --standalone --to=markdown \
 		sample1.md | $(DIFF) expected1.md -
-	@pandoc --lua-filter=abstract-to-meta.lua --standalone --to=markdown \
+	@$(PANDOC) --lua-filter=abstract-to-meta.lua --standalone --to=markdown \
 		sample2.md | $(DIFF) expected2.md -
 
 expected: sample1.md expected1.md sample2.md expected2.md abstract-to-meta.lua
 
 expected1.md: sample1.md abstract-to-meta.lua
-	pandoc --lua-filter=abstract-to-meta.lua --standalone --output $@ $<
+	$(PANDOC) --lua-filter=abstract-to-meta.lua --standalone --output $@ $<
 
 expected2.md: sample2.md abstract-to-meta.lua
-	pandoc --lua-filter=abstract-to-meta.lua --standalone --output $@ $<
+	$(PANDOC) --lua-filter=abstract-to-meta.lua --standalone --output $@ $<
 
 .PHONY: test
diff --git a/author-info-blocks/Makefile b/author-info-blocks/Makefile
@@ -1,14 +1,15 @@
 DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 
 test: sample.md author-info-blocks.lua
-	@pandoc --lua-filter=author-info-blocks.lua --standalone --to=native $< \
+	@$(PANDOC) --lua-filter=author-info-blocks.lua --standalone --to=native $< \
 	    | $(DIFF) expected.native -
 
 expected.native: sample.md author-info-blocks.lua
-	@pandoc --lua-filter=author-info-blocks.lua --standalone --output $@ $<
+	@$(PANDOC) --lua-filter=author-info-blocks.lua --standalone --output $@ $<
 
 sample.pdf: sample.md author-info-blocks.lua
-	@pandoc \
+	@$(PANDOC) \
 	    --lua-filter=author-info-blocks.lua \
 	    --output $@ $<
 
diff --git a/bibexport/Makefile b/bibexport/Makefile
@@ -1,7 +1,8 @@
 DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 
 test:
-	@pandoc --lua-filter=bibexport.lua sample.md > /dev/null
+	@$(PANDOC) --lua-filter=bibexport.lua sample.md > /dev/null
 	@$(DIFF) bibexport.aux expected.bibexport.aux
 	@$(DIFF) bibexport.bib expected.bibexport.bib
 	@rm -f bibexport.aux bibexport.bib
diff --git a/cito/Makefile b/cito/Makefile
@@ -1,7 +1,8 @@
 DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 
 test:
-	@pandoc --lua-filter=cito.lua --output=output.md --standalone sample.md
+	@$(PANDOC) --lua-filter=cito.lua --output=output.md --standalone sample.md
 	@$(DIFF) expected.md output.md
 	@rm -f output.md
 
diff --git a/diagram-generator/Makefile b/diagram-generator/Makefile
@@ -1,8 +1,10 @@
+PANDOC ?= pandoc
+
 .PHONY: test
 test: clean sample.html
 
 sample.html: sample.md diagram-generator.lua
-	@pandoc --self-contained \
+	@$(PANDOC) --self-contained \
 	    --lua-filter=diagram-generator.lua \
 	    --metadata=pythonPath:"python3" \
 	    --metadata=title:"README" \
diff --git a/doi2cite/Makefile b/doi2cite/Makefile
@@ -1,18 +1,19 @@
 DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 
 test:
-	@pandoc --lua-filter=doi2cite.lua --wrap=preserve --output=output.md sample1.md
+	@$(PANDOC) --lua-filter=doi2cite.lua --wrap=preserve --output=output.md sample1.md
 	@$(DIFF) expected1.md output.md
 	@rm -f output.md
 
 expected1.md: sample1.md doi2cite.lua
-	pandoc --lua-filter=doi2cite.lua --wrap=preserve --output $@ $<
+	$(PANDOC) --lua-filter=doi2cite.lua --wrap=preserve --output $@ $<
 
 expected1.pdf: sample1.md sample1.csl doi2cite.lua
-	pandoc --lua-filter=doi2cite.lua --filter=pandoc-crossref --citeproc --csl=sample1.csl --output $@ $<
+	$(PANDOC) --lua-filter=doi2cite.lua --filter=pandoc-crossref --citeproc --csl=sample1.csl --output $@ $<
 
 expected2.md: sample2.md doi2cite.lua
-	pandoc --lua-filter=doi2cite.lua --wrap=preserve --output $@ $<
+	$(PANDOC) --lua-filter=doi2cite.lua --wrap=preserve --output $@ $<
 
 clean:
 	@rm -f expected1.md
diff --git a/first-line-indent/Makefile b/first-line-indent/Makefile
@@ -1,19 +1,20 @@
 DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 
 .PHONY: test
 
 test: test_latex test_html
 
 test_html: sample.md expected.html first-line-indent.lua
-	@pandoc -s --lua-filter first-line-indent.lua --to=html $< \
+	@$(PANDOC) -s --lua-filter first-line-indent.lua --to=html $< \
 		| $(DIFF) expected.html -
 
 test_latex: sample.md expected.tex first-line-indent.lua
-	@pandoc -s --lua-filter first-line-indent.lua --to=latex $< \
+	@$(PANDOC) -s --lua-filter first-line-indent.lua --to=latex $< \
 		| $(DIFF) expected.tex -
 
 expected.html: sample.md first-line-indent.lua
-	pandoc -s --lua-filter first-line-indent.lua --output $@ $<
+	$(PANDOC) -s --lua-filter first-line-indent.lua --output $@ $<
 
 expected.tex: sample.md first-line-indent.lua
-	pandoc -s --lua-filter first-line-indent.lua --output $@ $<
+	$(PANDOC) -s --lua-filter first-line-indent.lua --output $@ $<
diff --git a/include-code-files/Makefile b/include-code-files/Makefile
@@ -1,10 +1,11 @@
 DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 
 test: sample.md include-code-files.lua
-	@pandoc --lua-filter=include-code-files.lua --to=native $< \
+	@$(PANDOC) --lua-filter=include-code-files.lua --to=native $< \
 	    | $(DIFF) expected.native -
 
 expected.native: sample.md include-code-files.lua
-	pandoc --lua-filter=include-code-files.lua --output $@ $<
+	$(PANDOC) --lua-filter=include-code-files.lua --output $@ $<
 
 .PHONY: test
diff --git a/include-files/Makefile b/include-files/Makefile
@@ -1,15 +1,16 @@
 DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 
 test: sample.md file-a.md file-b.md file-c.md include-files.lua
-	@pandoc --lua-filter=include-files.lua --to=native $< \
+	@$(PANDOC) --lua-filter=include-files.lua --to=native $< \
 	    | $(DIFF) expected.native -
-	@pandoc --lua-filter=include-files.lua -M include-auto --to=native $< \
+	@$(PANDOC) --lua-filter=include-files.lua -M include-auto --to=native $< \
 	    | $(DIFF) expected-auto.native -
 
 expected.native: sample.md file-a.md file-b.md file-c.md include-files.lua
-	pandoc --lua-filter=include-files.lua --output $@ $<
+	$(PANDOC) --lua-filter=include-files.lua --output $@ $<
 
 expected-auto.native: sample.md file-a.md file-b.md file-c.md include-files.lua
-	pandoc --lua-filter=include-files.lua -M include-auto --output $@ $<
+	$(PANDOC) --lua-filter=include-files.lua -M include-auto --output $@ $<
 
 .PHONY: test
diff --git a/latex-hyphen/Makefile b/latex-hyphen/Makefile
@@ -1,7 +1,8 @@
 DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 
 test:
-	@pandoc --lua-filter=latex-hyphen.lua --output=output.tex sample.md
+	@$(PANDOC) --lua-filter=latex-hyphen.lua --output=output.tex sample.md
 	@$(DIFF) expected.tex output.tex
 	@rm -f output.tex
 
diff --git a/lilypond/Makefile b/lilypond/Makefile
@@ -1,21 +1,22 @@
 DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 
 test: test-appoggiaturas test-oboe test-code
 
 test-appoggiaturas:
-	@{ pandoc --lua-filter=lilypond.lua -t native \
+	@{ $(PANDOC) --lua-filter=lilypond.lua -t native \
 	          --extract-media=. appoggiaturas.md \
 		| $(DIFF) appoggiaturas.native.expected -; } && \
 	test -e beethoven.png
 
 test-oboe:
-	@{ pandoc --lua-filter=lilypond.lua -t native --extract-media=. oboe.md \
+	@{ $(PANDOC) --lua-filter=lilypond.lua -t native --extract-media=. oboe.md \
 		| $(DIFF) oboe.native.expected -; } && \
 	test -e oboe.png && \
 	test -e b-flat.png
 
 test-code:
-	@pandoc --lua-filter=lilypond.lua -t native code.md \
+	@$(PANDOC) --lua-filter=lilypond.lua -t native code.md \
 		| $(DIFF) code.native.expected -
 
 .PHONY: test test-appoggiaturas test-oboe test-code
diff --git a/math2svg/Makefile b/math2svg/Makefile
@@ -1,14 +1,15 @@
 DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 
 test: sample.md math2svg.lua
-	@pandoc \
+	@$(PANDOC) \
 		--mathml --lua-filter=math2svg.lua \
 			-M math2svg_font='Gyre-Pagella' \
 		--to=html sample.yaml $< \
 	    | $(DIFF) expected.html -
 
 expected: sample.md math2svg.lua
-	pandoc \
+	$(PANDOC) \
 		--mathml --lua-filter=math2svg.lua \
 			-M math2svg_tex2svg='/usr/local/bin/tex2svg' \
 			-M math2svg_font='Gyre-Pagella' \
diff --git a/minted/Makefile b/minted/Makefile
@@ -1,3 +1,5 @@
+PANDOC ?= pandoc
+
 .PHONY: all
 all: sample_beamer.pdf sample_latex.pdf sample.html
 
@@ -23,21 +25,21 @@ pandoc_inputs := sample.md
 
 # Sample beamer presentation.
 sample_beamer.tex: $(pandoc_inputs)
-	pandoc -s -t beamer --no-highlight --lua-filter=minted.lua $^ > $@
+	$(PANDOC) -s -t beamer --no-highlight --lua-filter=minted.lua $^ > $@
 
 sample_beamer.pdf: sample_beamer.tex
 	latexmk -pdf -shell-escape -jobname=sample_beamer sample_beamer
 
 # Sample latex document.
 sample_latex.tex: $(pandoc_inputs)
-	pandoc -s -t latex --no-highlight --lua-filter=minted.lua $^ > $@
+	$(PANDOC) -s -t latex --no-highlight --lua-filter=minted.lua $^ > $@
 
 sample_latex.pdf: sample_latex.tex
 	latexmk -pdf -shell-escape -jobname=sample_latex sample_latex
 
 # Sample html5 document.
 sample.html: $(pandoc_inputs)
-	pandoc -s -t html5 --lua-filter=minted.lua $^ > $@
+	$(PANDOC) -s -t html5 --lua-filter=minted.lua $^ > $@
 
 # ---
 
diff --git a/multiple-bibliographies/Makefile b/multiple-bibliographies/Makefile
@@ -1,8 +1,11 @@
 DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 
 test: sample.md multiple-bibliographies.lua
-	@pandoc --lua-filter=multiple-bibliographies.lua \
-	        --standalone --to=native $< \
+	@$(PANDOC) \
+		--lua-filter=multiple-bibliographies.lua \
+		--standalone \
+		--to=native $< \
 	    | $(DIFF) - expected.native
 
 .PHONY: test
diff --git a/not-in-format/Makefile b/not-in-format/Makefile
@@ -1,19 +1,20 @@
 DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 
 .PHONY: test
 
 test: test_html test_latex
 
 test_html: sample.md expected.html not-in-format.lua
-	@pandoc --lua-filter not-in-format.lua --to=html $< \
+	@$(PANDOC) --lua-filter not-in-format.lua --to=html $< \
 		| $(DIFF) expected.html -
 
 test_latex: sample.md expected.tex not-in-format.lua
-	@pandoc --lua-filter not-in-format.lua --to=latex $< \
+	@$(PANDOC) --lua-filter not-in-format.lua --to=latex $< \
 		| $(DIFF) expected.tex -
 
 expected.html: sample.md not-in-format.lua
-	pandoc --lua-filter not-in-format.lua --output $@ $<
+	$(PANDOC) --lua-filter not-in-format.lua --output $@ $<
 
 expected.tex: sample.md not-in-format.lua
-	pandoc --lua-filter not-in-format.lua --output $@ $<
+	$(PANDOC) --lua-filter not-in-format.lua --output $@ $<
diff --git a/pagebreak/Makefile b/pagebreak/Makefile
@@ -1,14 +1,15 @@
 DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 
-test: test-asciidoc test-html test-md 
+test: test-asciidoc test-html test-md
 
 test-asciidoc:
-	@pandoc --lua-filter=pagebreak.lua sample.md --to asciidoc | $(DIFF) expected.adoc -
+	@$(PANDOC) --lua-filter=pagebreak.lua sample.md --to asciidoc | $(DIFF) expected.adoc -
 
 test-html:
-	@pandoc --lua-filter=pagebreak.lua sample.md | $(DIFF) expected.html -
+	@$(PANDOC) --lua-filter=pagebreak.lua sample.md | $(DIFF) expected.html -
 
 test-md:
-	@pandoc -t ms --lua-filter=pagebreak.lua sample.md | $(DIFF) expected.ms -
+	@$(PANDOC) -t ms --lua-filter=pagebreak.lua sample.md | $(DIFF) expected.ms -
 
-.PHONY: test test-asciidoc test-html test-md 
+.PHONY: test test-asciidoc test-html test-md
diff --git a/pandoc-quotes.lua/Makefile b/pandoc-quotes.lua/Makefile
@@ -1,3 +1,5 @@
+DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 BASE_DIR := test
 DATA_DIR := $(BASE_DIR)/docs
 TMP_DIR  := $(BASE_DIR)/tmp
@@ -13,14 +15,14 @@ prepare-tmp:
 	@rm -f test/tmp/*
 
 test-noop: prepare-tmp
-	@pandoc --lua-filter ./pandoc-quotes.lua -f markdown-smart -t html \
+	@$(PANDOC) --lua-filter ./$(PANDOC)-quotes.lua -f markdown-smart -t html \
 		-o $(TMP_DIR)/$@.out $(DATA_DIR)/$@.md
-	@cmp $(TMP_DIR)/$@.out $(NORM_DIR)/$@.out
+	@$(DIFF) $(TMP_DIR)/$@.out $(NORM_DIR)/$@.out
 
 $(TESTS): prepare-tmp
-	@pandoc --lua-filter ./pandoc-quotes.lua -t html \
+	@$(PANDOC) --lua-filter ./$(PANDOC)-quotes.lua -t html \
 		-o $(TMP_DIR)/$@.out $(DATA_DIR)/$@.md
-	@cmp $(TMP_DIR)/$@.out $(NORM_DIR)/$@.out
+	@$(DIFF) $(TMP_DIR)/$@.out $(NORM_DIR)/$@.out
 
 
 .PHONY: prepare-tmp test $(TESTS)
diff --git a/revealjs-codeblock/Makefile b/revealjs-codeblock/Makefile
@@ -1,6 +1,8 @@
 DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 
 test:
-	@pandoc --lua-filter=revealjs-codeblock.lua sample.md -t revealjs | $(DIFF) expected.html -
+	@$(PANDOC) --lua-filter=revealjs-codeblock.lua sample.md -t revealjs | \
+		$(DIFF) expected.html -
 
-.PHONY: test
+.PHONY: test
diff --git a/scholarly-metadata/Makefile b/scholarly-metadata/Makefile
@@ -1,10 +1,11 @@
 DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 
 test: sample.md scholarly-metadata.lua
-	@pandoc --lua-filter=scholarly-metadata.lua --standalone --to=markdown $< \
+	@$(PANDOC) --lua-filter=scholarly-metadata.lua --standalone --to=markdown $< \
 	    | $(DIFF) expected.md -
 
 expected.md: sample.md scholarly-metadata.lua
-	pandoc --lua-filter=scholarly-metadata.lua --standalone --output $@ $<
+	$(PANDOC) --lua-filter=scholarly-metadata.lua --standalone --output $@ $<
 
 .PHONY: test
diff --git a/scrlttr2/Makefile b/scrlttr2/Makefile
@@ -1,9 +1,11 @@
+PANDOC ?= pandoc
+
 test: sample.md scrlttr2.lua sample.pdf
-	@pandoc --to=latex --lua-filter=scrlttr2.lua -s sample.md | \
+	@$(PANDOC) --to=latex --lua-filter=scrlttr2.lua -s sample.md | \
 	    sh expected-strings.sh
 	@rm sample.pdf
 
 %.pdf: %.md scrlttr2.lua
-	@pandoc --lua-filter=scrlttr2.lua --output=$@ $<
+	@$(PANDOC) --lua-filter=scrlttr2.lua --output=$@ $<
 
 .PHONY: test
diff --git a/section-refs/Makefile b/section-refs/Makefile
@@ -1,4 +1,5 @@
 DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
 
 OPTIONS_test_default := -t native \
 	-M bibliography=bibliography.bib \
@@ -23,4 +24,4 @@ OPTIONS_test_section_level := -t native \
 test: test_default test_no_citeproc test_refs_name test_section_level
 
 test_%: expected_%.native sample.md bibliography.bib
-	@pandoc sample.md $(OPTIONS_$@) | $(DIFF) $< -
+	@$(PANDOC) sample.md $(OPTIONS_$@) | $(DIFF) $< -
diff --git a/short-captions/Makefile b/short-captions/Makefile
diff --git a/spellcheck/Makefile b/spellcheck/Makefile
diff --git a/table-short-captions/Makefile b/table-short-captions/Makefile
diff --git a/track-changes/Makefile b/track-changes/Makefile
diff --git a/wordcount/Makefile b/wordcount/Makefile
