diff --git a/pdf/zh-cn/Makefile b/pdf/zh-cn/Makefile index 32be357..bf1771a 100644 --- a/pdf/zh-cn/Makefile +++ b/pdf/zh-cn/Makefile @@ -1,20 +1,23 @@ title = '高速上手 C++11/14/17' filename = 'modern-cpp-tutorial' outputname='modern-cpp-tutorial' +revision = $(shell git describe --always --tags) -all: pdf +all: revision pdf + +revision: + @echo '% Autogenerated, do not edit' > revision.tex + @echo '\\newcommand{\\revision}{'$(revision)'}' >> revision.tex pdf: markdown @echo "Compiling PDF file..." - @pandoc -s $(filename).md -o $(filename).pdf \ + @pandoc -f markdown+smart -s $(filename).md -o $(filename).pdf \ --title-prefix $(title) \ --listings -H meta/cpp-listings.tex \ --template=meta/template.tex \ - --normalize \ - --smart \ - --latex-engine=`which xelatex` + --pdf-engine=`which xelatex` @echo "Done." - @rm *.md + @rm *.md revision.tex markdown: @echo "Copy markdown files..." @@ -23,6 +26,6 @@ markdown: @python3 aggregator.py clean: - rm -rf *.md *.pdf + rm -rf revision.tex *.md *.pdf .PHONY: markdown pdf clean \ No newline at end of file diff --git a/pdf/zh-cn/meta/template.tex b/pdf/zh-cn/meta/template.tex index 119c0a5..b7609e3 100644 --- a/pdf/zh-cn/meta/template.tex +++ b/pdf/zh-cn/meta/template.tex @@ -152,22 +152,25 @@ $endif$ \setlength{\parskip}{1ex} \setlength{\parskip}{0.5\baselineskip} +\input{revision} + +% fix build, see https://github.com/laboon/ebook/issues/139#issuecomment-408696480 +\newcommand{\passthrough}[1]{\lstset{mathescape=false}#1\lstset{mathescape=true}} \begin{document} - \newcommand{\tightlist}{% - \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} +\setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} \thispagestyle{plain} \begin{center} - + {\LARGE\textbf{高速上手 C++11/14/17}} - + \vspace{1em} {\large 欧长坤 (hi@changkun.us)} - + \vspace{1ex} - 最后更新 \today + 最后更新 \today - \revision \vspace{1em} \textbf{\large 版权声明} diff --git a/pdf/zh-cn/modern-cpp-tutorial.pdf b/pdf/zh-cn/modern-cpp-tutorial.pdf index ce375d8..adb2f6d 100644 Binary files a/pdf/zh-cn/modern-cpp-tutorial.pdf and b/pdf/zh-cn/modern-cpp-tutorial.pdf differ diff --git a/pdf/zh-cn/revision.tex b/pdf/zh-cn/revision.tex new file mode 100644 index 0000000..3d197ed --- /dev/null +++ b/pdf/zh-cn/revision.tex @@ -0,0 +1,2 @@ +% Autogenerated, do not edit +\newcommand{\revision}{v1.0.1-91-g6f6531f}