Commit bd6eeb4c authored by Benoit Rat's avatar Benoit Rat

doc: update Makefile & template

parent 84254c85
pdf/* ~
tex/* pdf/
tex/
*.aux
*.log
*.out
*.pdf
*.tex
*.toc
...@@ -19,16 +19,21 @@ ...@@ -19,16 +19,21 @@
## Obtaining the proper file ## Obtaining the proper file
SRC=$(wildcard *.md) SRC=$(wildcard *.md)
PDFDIR=pdf/ PDF=$(addprefix pdf/, $(SRC:.md=.pdf))
TEXDIR=tex/ TEX=$(SRC:.md=.tex)
PDF=$(addprefix $(PDFDIR), $(SRC:.mkd=.pdf))
TEX=$(addprefix $(TEXDIR), $(SRC:.mkd=.tex))
## Pandoc arguments ## Pandoc arguments
OPTIONS=-f markdown --toc --number-sections --smart OPTIONS=-f markdown --toc --number-sections --smart
TEMPLATE=pandoc.latex TEMPLATE=pandoc.latex
ifneq "$(TEMPLATE)" ""
TEMPLATEARG=--template=$(TEMPLATE)
endif
#--highlight-style=pygments (the default), kate, monochrome, espresso, haddock, and tango
#-V highlight-bg=true
## Main targets ## Main targets
all: $(PDF) all: $(PDF)
tex: $(TEX) tex: $(TEX)
...@@ -38,19 +43,11 @@ pdf: $(PDF) ...@@ -38,19 +43,11 @@ pdf: $(PDF)
DIR_%: DIR_%:
mkdir -p $(subst DIR_,,$@) mkdir -p $(subst DIR_,,$@)
pdf/%.pdf: %.md Makefile $(TEMPLATE) DIR_pdf
ifneq "$(TEMPLATE)" ""
TEMPLATEARG=--template=$(TEMPLATE)
endif
#--highlight-style=pygments (the default), kate, monochrome, espresso, haddock, and tango
#-V highlight-bg=true
$(PDFDIR)%.pdf: %.mkd Makefile $(TEMPLATE) DIR_pdf
pandoc $(OPTIONS) --latex-engine=xelatex --highlight-style=haddock $(TEMPLATEARG) \ pandoc $(OPTIONS) --latex-engine=xelatex --highlight-style=haddock $(TEMPLATEARG) \
-V lang=english -V fontsize=11pt -V documentclass=article -V bg-color=238,245,240 -o $@ $< -V lang=english -V fontsize=11pt -V documentclass=article -V bg-color=238,245,240 -o $@ $<
$(TEXDIR)%.tex: %.mkd Makefile $(TEMPLATE) DIR_tex %.tex: %.md Makefile $(TEMPLATE)
@echo "$(dir $@) $< $^ $(TEX)" @echo "$(dir $@) $< $^ $(TEX)"
pandoc $(OPTIONS) --highlight-style=haddock $(TEMPLATEARG) \ pandoc $(OPTIONS) --highlight-style=haddock $(TEMPLATEARG) \
-V lang=english -V fontsize=11pt -V documentclass=article -o $@ $< -V lang=english -V fontsize=11pt -V documentclass=article -o $@ $<
...@@ -58,5 +55,7 @@ $(TEXDIR)%.tex: %.mkd Makefile $(TEMPLATE) DIR_tex ...@@ -58,5 +55,7 @@ $(TEXDIR)%.tex: %.mkd Makefile $(TEMPLATE) DIR_tex
.PHONY: clean .PHONY: clean
clean: clean:
rm -f $(PDFDIR)*.pdf *~ $(TEXDIR)*.tex *.log rm -f pdf/*.pdf *~ *.tex *.log
...@@ -197,29 +197,23 @@ $if(fancy-enums)$ ...@@ -197,29 +197,23 @@ $if(fancy-enums)$
% cause markers to extend beyond the left margin. % cause markers to extend beyond the left margin.
\makeatletter\AtBeginDocument{% \makeatletter\AtBeginDocument{%
\renewcommand{\@listi} \renewcommand{\@listi}
{\setlength{\labelwidth}{4em}} {
\setlength{\labelwidth}{4em}
\leftmargin=25pt
\rightmargin=0pt
\labelsep=7pt
\labelwidth=20pt
\itemindent=0pt
\listparindent=0pt
\topsep=2pt plus 2pt minus 2pt
\partopsep=0pt plus 1pt minus 10pt
\parsep=1pt plus 1pt
\itemsep=\parsep
}
}\makeatother }\makeatother
\usepackage{enumerate} \usepackage{enumerate}
$endif$ $endif$
%%% SPACING
% Less vertical space between list items
%\setlength{\itemsep}{2pt}
% Less vertical space before a list
%\setlength{\topsep}{0.3cm}
\renewcommand{\@listI}{%
\leftmargin=25pt
\rightmargin=0pt
\labelsep=7pt
\labelwidth=20pt
\itemindent=0pt
\listparindent=0pt
\topsep=2pt plus 2pt minus 2pt
\partopsep=0pt plus 1pt minus 10pt
\parsep=1pt plus 1pt
\itemsep=\parsep}
\setlength{\parindent}{0pt} \setlength{\parindent}{0pt}
\setlength{\parskip}{6pt plus 2pt minus 1pt} \setlength{\parskip}{6pt plus 2pt minus 1pt}
\setlength{\emergencystretch}{3em} % prevent overfull lines \setlength{\emergencystretch}{3em} % prevent overfull lines
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment