Merge branch 'weasyprint'

alerque · Dec 26, 2023 · 85740d6 · 85740d6
2 parents fcb0e39 + d275259
commit 85740d6
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -10,17 +10,21 @@ GIT ?= git
 MAGICK ?= magick
 NPM ?= npm
 NPX ?= npx
+SED ?= sed
 SILE ?= sile
 TERA ?= tera
 TOMLQ ?= tomlq
 TYPST ?= typst
+WEASYPRINT ?= weasyprint
 XELATEX ?= xelatex
 XQ ?= xq
 ZOLA ?= zola
 
-TYPESETTERS = xelatex typst sile
+TYPESETTERS = sile typst weasyprint xelatex
 BASE_URL = /
 
+WEASYPRINT_ARGS = $< $@
+
 XELATEX_ARGS  = -interaction=batchmode -halt-on-error
 XELATEX_ARGS += -jobname $*-xelatex $<
 
@@ -31,9 +35,11 @@ SILE_ARGS = -o $@ $<
 .PHONY: default
 default: public
 
+get_typesetters = $(shell $(SED) '0,/^\+\+\+$$/d;/^\+\+\+$$/,$$d' $1 | $(TOMLQ) -r '.extra.typesetters[]' | xargs)
+
 SAMPLES := $(notdir $(shell echo data/*(/)))
-MANIFESTS := $(foreach S,$(SAMPLES),$(foreach T,$(TYPESETTERS),data/$(S)-$(T).toml))
-PDFS := $(foreach S,$(SAMPLES),$(foreach T,$(TYPESETTERS),data/$(S)-$(T).pdf))
+MANIFESTS := $(foreach S,$(SAMPLES),$(foreach T,$(call get_typesetters,content/$(S).md),data/$(S)-$(T).toml))
+PDFS := $(addsuffix .pdf,$(basename $(MANIFESTS)))
 PREVIEWS := $(addsuffix .avif,$(basename $(PDFS)))
 
 define make_manifest ?=
@@ -53,25 +59,28 @@ all: $(PDFS)
 node_modules:
 	$(NPM) ci
 
-%-xelatex.pdf %-xelatex.toml: %/xelatex.tex
-	$(call make_manifest,$(XELATEX) $(XELATEX_ARGS))
-
-%-typst.pdf %-typst.toml: %/typst.typ
-	$(call make_manifest,$(TYPST) $(TYPST_ARGS))
-
 %-sile.pdf %-sile.toml: %/sile.sil
 	$(call make_manifest,$(SILE) $(SILE_ARGS))
 
 %-sile.pdf %-sile.toml: %/sile.xml
 	$(call make_manifest,$(SILE) $(SILE_ARGS))
 
-%.avif: %.pdf
-	$(MAGICK) convert $< $@
+%-typst.pdf %-typst.toml: %/typst.typ
+	$(call make_manifest,$(TYPST) $(TYPST_ARGS))
+
+%-weasyprint.pdf %-weasyprint.html: %/weasyprint.html
+	$(call make_manifest,$(WEASYPRINT) $(WEASYPRINT_ARGS))
+
+%-xelatex.pdf %-xelatex.toml: %/xelatex.tex
+	$(call make_manifest,$(XELATEX) $(XELATEX_ARGS))
 
 static/%.css: sass/%.scss | node_modules
 	$(NPX) sass --no-source-map $<:$@
 	$(NPX) postcss -u autoprefixer --no-map $@ -o $@
 
+%.avif: %.pdf
+	$(MAGICK) convert $< $@
+
 .PHONY: static
 static: $(PDFS) $(PREVIEWS) static/main.css
 	install -Dm0644 -t static $(filter-out static/%,$^)

diff --git a/content/hello-world.md b/content/hello-world.md
@@ -1,7 +1,7 @@
 +++
 title = "Hello World!"
 description = "Your most basic greeting."
-extra.typesetters = [ "typst", "sile", "xelatex" ]
+extra.typesetters = [ "sile", "typst", "weasyprint", "xelatex" ]
 +++
 
 Just the simplest way to get a phrase onto a numbered page.
diff --git a/data/hello-world/weasyprint.html b/data/hello-world/weasyprint.html
@@ -0,0 +1,13 @@
+<html>
+	<head>
+		<style>
+		@page {
+			@bottom-center {
+				content: counter(page);
+				position: absolute;
+				z-index: -1;
+			}
+		}
+		</style>
+	<p>Hello World</p>
+</html>
diff --git a/flake.nix b/flake.nix
@@ -49,6 +49,7 @@
             teracli.defaultPackage.${system}
             texlive.combined.scheme-full
             typst
+            weasyprint
             yq
             zola
             zsh
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,6 +49,7 @@ @@
                 teracli.defaultPackage.${system}
                 texlive.combined.scheme-full
                 typst
+                weasyprint
                 yq
                 zola
                 zsh
@@ Expand Down @@