Skip to content

Commit

Permalink
Merge pull request #2 from addiva-elektronik/bump-templates
Browse files Browse the repository at this point in the history
Bump templates
  • Loading branch information
troglobit authored Oct 6, 2024
2 parents 61edd95 + 388e0ee commit 657d8cd
Show file tree
Hide file tree
Showing 3 changed files with 201 additions and 133 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docgen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
container:
image: ghcr.io/addiva-elektronik/pandoc
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Generate documentation
Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,15 @@ gitrev = $(shell git log -n 1 --pretty=format:-%h -- $< 2>/dev/null)
gitdate = $(shell git log -n 1 --pretty=format:%as -- $< 2>/dev/null)
gitver = $(repo):$(objhash)$(gitrev)
args = --standalone --data-dir=$(docgen) --template=addiva -f markdown+implicit_figures+implicit_header_references
args += --resource-path $(shell dirname $<) -V data-dir="$(docgen)" -V gitrev="$(gitrev)"
args += --resource-path $(shell dirname $<) -V data-dir="$(docgen)" -V gitrev="$(gitrev)" -V colorlinks
args += -V gitversion="$(gitver)" -V date="$(gitdate)" -V today="$(shell date --iso)" -V year=$(shell date +'%Y')

html-args = -t html $(args)
pdf-args = -t pdf $(args) --pdf-engine=xelatex --listings

ifdef V
pdf-args += --verbose
endif

%.html: %.md
pandoc $(html-args) -o $@ $<
Expand Down
Loading

0 comments on commit 657d8cd

Please sign in to comment.