Merge branch 'jgm:main' into typst-template

Author: christopherkenny

AUTHORS.md

@@ -246,6 +246,7 @@
 - Lucas V. R
 - Luis Rivera
 - Luke Plant
+- Manolis Stamatogiannakis
 - Marc Schreiber
 - Marcin Serwin
 - Mario Lang
@@ -287,6 +288,7 @@
 - Mikołaj Machowski
 - Milan Bracke
 - MinRK
+- Mohamed Akram
 - Morgan Willcock
 - Morton Fox
 - Nathan Gass
@@ -296,6 +298,7 @@
 - Nick Berendsen
 - Nick Fleisher
 - Nicolas Kaiser
+- Niklas Eicker
 - Nikolai Korobeinikov
 - Nikolay Yakimov
 - Nils Carlson

CONTRIBUTING.md

@@ -118,7 +118,7 @@ to `odt`.  (You can, however, customize margin size using `--reference-doc`.)
 So before submitting a bug report, consider whether it might be
 "out of scope." If it concerns a feature of documents that isn't
 representable in pandoc's Markdown, then it very likely is.
-(If in doubt, you can always ask on the [discussion-forum].)
+(If in doubt, you can always ask on the [discussion forum].)
 
 Fixing bugs from the issue tracker
 ----------------------------------

MANUAL.txt

@@ -1,7 +1,7 @@
 ---
 title: Pandoc User's Guide
 author: John MacFarlane
-date: March 16, 2025
+date: 2025-05-14
 ---
 
 # Synopsis
@@ -774,13 +774,31 @@ header when requesting a document from a URL:
     not used, a default template appropriate for the output
     format will be used (see `-D/--print-default-template`).
 
-`-V` *KEY*[`=`*VAL*], `--variable=`*KEY*[`:`*VAL*]
+`-V` *KEY*[`=`*VAL*], `--variable=`*KEY*[`=`*VAL*]
 
 :   Set the template variable *KEY* to the string value *VAL* when rendering
-    the document in standalone mode. If no *VAL* is specified, the
+    the document in standalone mode. Either `:` or `=` may be used
+    to separate *KEY* from *VAL*. If no *VAL* is specified, the
     key will be given the value `true`.  Structured values (lists, maps)
     cannot be assigned using this option, but they can be assigned in
-    the `variables` section of a [defaults file][Defaults files].
+    the `variables` section of a [defaults file][Defaults files] or
+    using the `--variable-json` option. If the variable already has
+    a *list* value, the value will be added to the list. If it already
+    has another kind of value, it will be made into a list containing
+    the previous and the new value. For example,
+    `-V keyword=Joe -V author=Sue` makes `author` contain a list
+    of strings: `Joe` and `Sue`.
+
+`--variable-json=`*KEY*[`=`:*JSON*]
+
+:   Set the template variable *KEY* to the value specified by a JSON
+    string (this may be a boolean, a string, a list, or a mapping;
+    a number will be treated as a string). For example,
+    `--variable-json foo=false` will give `foo` the boolean false
+    value, while `--variable-json foo='"false"'` will give it the
+    string value `"false"`. Either `:` or `=` may be used to
+    separate *KEY* from *VAL*. If the variable already has a
+    value, this value will be replaced.
 
 `--sandbox[=true|false]`
 

Makefile

@@ -77,7 +77,7 @@ authors:  ## prints unique authors since last released version
 	git log --pretty=format:"%an" $$(git tag -l | grep '[^0-9]' | sort | tail -1)..HEAD | sort | uniq | while read -r; do grep -i -q "^- $$REPLY" AUTHORS.md || echo $$REPLY ; done
 
 check-stack:
-	stack-lint-extra-deps # check that stack.yaml dependencies are up to date
+	$$HOME/.local/bin/stack-lint-extra-deps # check that stack.yaml dependencies are up to date
 	! grep 'git:' stack.yaml # use only released versions
 .PHONY: check-stack
 
@@ -104,7 +104,7 @@ check-version-sync:
 
 check-changelog:
 	@echo "Checking for changelog entry for this version"
-	grep '## pandoc $(VERSION) (\d\d\d\d-\d\d-\d\d)' changelog.md
+	rg '## pandoc $(VERSION) \(\d\d\d\d-\d\d-\d\d\)' changelog.md
 .PHONY: check-changelog
 
 check-manversion:
@@ -116,7 +116,7 @@ check-manversion:
 
 checkdocs:
 	@echo "Checking for tabs in manual."
-	! grep -q -n -e "\t" \
+	! rg -n -e '\t' \
 	   MANUAL.txt changelog.md doc/pandoc-server.md doc/pandoc-lua.md
 .PHONY: checkdocs
 
@@ -144,7 +144,7 @@ man: pandoc-cli/man/pandoc.1 pandoc-cli/man/pandoc-server.1 pandoc-cli/man/pando
 .PHONY: man
 
 latex-package-dependencies: ## print packages used by default latex template
-	$(pandoc) lua tools=latex-package-dependencies.lua
+	$(pandoc) lua tools/latex-package-dependencies.lua
 .PHONY: latex-package-dependencies
 
 coverage: ## code coverage information
@@ -251,24 +251,26 @@ validate-docx-golden-tests: ## validate docx golden tests against schema
 
 validate-docx-golden-tests2: ## validate docx golden tests using OOXMLValidator
 	which dotnet || ("dotnet is required" && exit 1)
-	which json_reformat || ("json_reformat is required" && exit 1)
+	which jq || ("jq is required" && exit 1)
 	test -d ./OOXML-Validator || \
 		(git clone https://github.com/mikeebowen/OOXML-Validator.git \
 		&& cd OOXML-Validator && dotnet build --configuration=Release)
 	sh ./tools/validate-docx2.sh test/docx/golden/
 .PHONY: validate-docx-golden-tests2
 
-validate-epub: ## generate an epub and validate it with epubcheck and ace
+node_modules/.bin/ace:
+	npm install @daisy/ace
+
+validate-epub: node_modules/.bin/ace ## generate an epub and validate it with epubcheck and ace
 	which epubcheck || exit 1
-	which ace || exit 1
 	tmp=$$(mktemp -d) && \
   for epubver in 2 3; do \
     file=$$tmp/ver$$epubver.epub ; \
 	  $(pandoc) test/epub/wasteland.epub --epub-cover=test/lalune.jpg -Mtitle="The Wasteland" --resource-path test/epub -t epub$$epubver -o $$file --number-sections --toc --quiet && \
 	  echo $$file && \
 	  epubcheck $$file || exit 1 ; \
   done && \
-	ace $$tmp/ver3.epub -o ace-report-v2 --force
+	./node_modules/.bin/ace $$tmp/ver3.epub -o ace-report-v2 --force
 
 modules.csv: $(PANDOCSOURCEFILES)
 	@rg '^import.*Text\.Pandoc\.' --with-filename $^ \
@@ -294,7 +296,7 @@ modules.pdf: modules.dot
 # make moduledeps ROOT=Text.Pandoc.Parsing
 moduledeps: modules.csv  ## Print transitive dependencies of a module ROOT
 	@echo "$(ROOT)"
-	@lua tools/moduledeps.lua transitive $(ROOT) | sort
+	@$(pandoc) lua tools/moduledeps.lua transitive $(ROOT) | sort
 .PHONY: moduledeps
 
 clean: ## clean up

RELEASE-CHECKLIST-TEMPLATE.org

@@ -26,7 +26,7 @@ make man
 git log $(git describe --tags --abbrev=0)..HEAD --mailmap --reverse --format=format:'  * %s%n    %aN%n%w(78,4,4)%b' | sed -e '/^ *John MacFarlane$/d' | sed -e 's/  *$//'
 #+end_src
 *** TODO prerelease checks
-#+begin_src sh
+#+begin_src sh :results output verbatim
 make prerelease
 #+end_src
 *** TODO Update [[./AUTHORS.md]]
@@ -84,7 +84,14 @@ git push
 git push --tags
 popd
 #+end_src
-*** TODO Copy deb to server, install it
+*** TODO Copy binary to server, install it
+#+begin_src
+# example:
+cd 3.7
+tar xvzf pandoc-3.7-linux-amd64.tar.gz
+scp pandoc-3.7/bin/pandoc website:cgi-bin/pandoc-server.cgi
+#+end_src
+
 *** TODO create release announcement and add to GH release announcement
 #+NAME: relann
 #+begin_src elisp :results value file :file relann-RELEASE_VERSION

cabal.project

@@ -8,8 +8,3 @@ constraints: skylighting-format-blaze-html >= 0.1.1.3,
              skylighting-format-context >= 0.1.0.2,
              -- for now (commercialhaskell/stackage#7545):
              data-default-class <= 0.2, data-default <= 0.8
-
-source-repository-package
-  type: git
-  location: https://github.com/jgm/citeproc.git
-  tag: cf5542df8f21085bbfd794eaa5cc40abc605637b