diff --git a/.gitignore b/.gitignore index 449925a7510c13bbc49a499a2dce04b32b4c47f1..4b7b88fd1d8a519b00335bad0c28f4f7d09a1fca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.docx* +!ICHLL_STYLESHEET.docx *.pdf snippets/* !snippets/*.md diff --git a/ICHLL_STYLESHEET.docx b/ICHLL_STYLESHEET.docx new file mode 100644 index 0000000000000000000000000000000000000000..52fcc4eca180840870153f0062c8bf69d5451124 Binary files /dev/null and b/ICHLL_STYLESHEET.docx differ diff --git a/Makefile b/Makefile index 69e1ad0a17859d1ddf174f540d11159fc92de9fc..82e54ebac7cb0ba1ef3b8b5190fea2b8e250a125 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ FIGURES = action_t1 arbre boumerang_t7 cathète_t9 dictionaries europe_t16 geloc SNIPPETS = $(wildcard snippets/*.md) FILTERS = pandoc-fignos FILE_NAME = ICHLL_Brenon +DOCX_STYLE = ICHLL_STYLESHEET.docx DEPEDENCIES = $(FIGURES:%=ressources/%.png) $(SNIPPETS:%.md=%.png) biblio.bib all: $(FILE_NAME).pdf @@ -18,6 +19,6 @@ ICHLL_Brenon.docx: $(DEPEDENCIES) %.png: %.gv dot -Tpng $< -o $@ -%.docx: %.md - LANG=fr_FR.UTF-8 pandoc $< --to docx --number-sections $(FILTERS:%=--filter %) --bibliography=biblio.bib --csl=apa.csl --citeproc -o $@ +%.docx: %.md $(DOCX_STYLE) + LANG=fr_FR.UTF-8 pandoc $< --to docx --number-sections $(FILTERS:%=--filter %) --bibliography=biblio.bib --csl=apa.csl --citeproc --reference-doc=$(DOCX_STYLE) -o $@ diff --git a/manifest.scm b/manifest.scm index d0971bcf0cd0f3d6d620ac0ab02d155b122d0dbb..16cf43ddbba1a10e2f81157d2511255a00050d27 100644 --- a/manifest.scm +++ b/manifest.scm @@ -1,11 +1,19 @@ (use-modules (guix packages) (gnu packages base) + (gnu packages fontutils) (gnu packages graphviz) (gnu packages haskell-xyz) (gnu packages pdf) - (gnu packages tex)) + (gnu packages tex) + (nongnu packages fonts)) (let ((pandoc-fignos (load "pandoc-fignos.scm"))) (packages->manifest - (list gnu-make graphviz pandoc poppler texlive pandoc-fignos))) + (list fontconfig + font-microsoft-times-new-roman + gnu-make graphviz + pandoc + poppler + texlive + pandoc-fignos)))