From b22cc7833e3116bac8c74886bac14df668c49f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= Date: Sat, 24 Jan 2026 16:16:25 +0000 Subject: [PATCH] use new pdftools from autodoc --- src/Beispiel_Dokument.dok.md | 2 +- src/lenaisten/compile-md.mk | 37 ------------------------------------ src/lev-dokument.mk | 10 +++++----- src/lev-protokoll.mk | 14 +++++++------- 4 files changed, 13 insertions(+), 50 deletions(-) delete mode 100644 src/lenaisten/compile-md.mk diff --git a/src/Beispiel_Dokument.dok.md b/src/Beispiel_Dokument.dok.md index ec59c8d..09ae6bd 100644 --- a/src/Beispiel_Dokument.dok.md +++ b/src/Beispiel_Dokument.dok.md @@ -31,7 +31,7 @@ Vinaque sanguine metuenti cuiquam Alcyone fixus Lorem markdownum Letoia, et alios: figurae flectentem annis aliquid Peneosque ab esse, obstat gravitate. Obscura atque coniuge, per de coniunx, sibi **medias commentaque virgine** anima tamen comitemque petis, sed. In Amphion vestros -hamos ire arceor mandere spicula, in licet aliquando. +hamos ire arceor mandere spicula, in licet aliquando \ref{eq:neighbor-propability}. ```java public class Example implements LoremIpsum { diff --git a/src/lenaisten/compile-md.mk b/src/lenaisten/compile-md.mk deleted file mode 100644 index a48cfcc..0000000 --- a/src/lenaisten/compile-md.mk +++ /dev/null @@ -1,37 +0,0 @@ -include /usr/local/share/autodoc/pdftools.mk - -# compile markdown using pandoc -# params: -# 1: input file -# 2: pandoc template -# 3: output format -# 4: output file -compile_md = pandoc \ - $(1) \ - --standalone \ - --from markdown \ - --to $(3) \ - --template $(2) \ - $(addprefix --variable ,$(PANDOCVARS)) \ - $(PANDOCFLAGS) \ - --output $(4) - -# convert markdown to LaTeX -# params: -# 1: input file -# 2: pandoc template -# 3: output file -md2tex = $(call compile_md,$(1),$(2),latex,$(3)) - -# convert markdown to PDF -# params: -# 1: input file -# 2: pandoc template -# 3: output file -md2pdf = $(call compile_md,$(1),$(2),pdf,-) | $(call pdftools_pdfcat,-,$(3)) - -# convert markdown to PDF/A 2-b -# 1: input file -# 2: pandoc template -# 3: output file -md2pdfa = $(call md2pdf,$(1),$(2),-) | $(call pdftools_mkpdfa,3,-,$(3)) diff --git a/src/lev-dokument.mk b/src/lev-dokument.mk index 5741ae8..7c816c1 100644 --- a/src/lev-dokument.mk +++ b/src/lev-dokument.mk @@ -1,11 +1,11 @@ #%SRCPAT% \.dok\.md -include /opt/lenaisten/compile-md.mk +include /usr/local/share/autodoc/pdftools.mk PANDOCVARS := \ colorlinks:true \ - csquotes:true \ - hyperrefoptions:pdfa \ + linkcolor:violet \ + urlcolor:violet \ lang:de-DE \ tables:true @@ -26,9 +26,9 @@ tex: $(texFiles) # pdf %.pdf: %.dok.md - $(call md2pdfa,$<,lev-dokument,$@) + $(call pdftools_md2pdfa_auto,lev-dokument) # tex %.tex: %.dok.md - $(call md2tex,$<,lev-dokument,$@) + $(call pdftools_md2tex_auto,lev-dokument) diff --git a/src/lev-protokoll.mk b/src/lev-protokoll.mk index 892dd68..820ad1b 100644 --- a/src/lev-protokoll.mk +++ b/src/lev-protokoll.mk @@ -1,11 +1,11 @@ #%SRCPAT% \.prot\.md -include /opt/lenaisten/compile-md.mk +include /usr/local/share/autodoc/pdftools.mk PANDOCVARS := \ colorlinks:true \ - csquotes:true \ - hyperrefoptions:pdfa \ + linkcolor:violet \ + urlcolor:violet \ lang:de-DE suffixPub := @@ -31,15 +31,15 @@ tex: $(texFilesPub) $(texFilesInt) # pdf %$(suffixPub).pdf: %.prot.md lev-shorthands.sty - /opt/lenaisten/redact.py $< | $(call md2pdfa,-,lev-protokoll,$@) + /opt/lenaisten/redact.py $< | $(call pdftools_md2pdfa,-,lev-protokoll,$@) %$(suffixInt).pdf: %.prot.md lev-shorthands.sty - /opt/lenaisten/redact.py --internal $< | $(call md2pdfa,-,lev-protokoll,$@) + /opt/lenaisten/redact.py --internal $< | $(call pdftools_md2pdfa,-,lev-protokoll,$@) # tex %$(suffixPub).tex: %.prot.md lev-shorthands.sty - /opt/lenaisten/redact.py $< | $(call compile_md,-,lev-protokoll,latex,$@) + /opt/lenaisten/redact.py $< | $(call pdftools_md2tex,-,lev-protokoll,latex,$@) %$(suffixInt).tex: %.prot.md lev-shorthands.sty - /opt/lenaisten/redact.py --internal $< | $(call compile_md,-,lev-protokoll,latex,$@) + /opt/lenaisten/redact.py --internal $< | $(call pdftools_md2tex,-,lev-protokoll,latex,$@)