update: prepare english chapters

sonic4x · Jun 5, 2019 · 589f417 · 589f417
1 parent 4a3889c
commit 589f417
Show file tree

Hide file tree

Showing 17 changed files with 10 additions and 123 deletions.
diff --git a/book/en-us/01-intro.md b/book/en-us/01-intro.md
diff --git a/book/en-us/02-usability.md b/book/en-us/02-usability.md
diff --git a/book/en-us/03-runtime.md b/book/en-us/03-runtime.md
diff --git a/book/en-us/04-containers.md b/book/en-us/04-containers.md
diff --git a/book/en-us/05-pointers.md b/book/en-us/05-pointers.md
diff --git a/book/en-us/06-regex.md b/book/en-us/06-regex.md
diff --git a/book/en-us/07-thread.md b/book/en-us/07-thread.md
diff --git a/book/en-us/08-filesystem.md b/book/en-us/08-filesystem.md
diff --git a/book/en-us/09-others.md b/book/en-us/09-others.md
diff --git a/book/en-us/10-cpp20.md b/book/en-us/10-cpp20.md
diff --git a/book/en-us/appendix1.md b/book/en-us/appendix1.md
diff --git a/book/en-us/appendix2.md b/book/en-us/appendix2.md
diff --git a/book/en-us/toc.md b/book/en-us/toc.md
@@ -1,7 +1,5 @@
 # C++ 11/14/17 On The Fly
 
-> This book adapting to C++17 and translating to English
-
 ## Table of Contents
 
 - [**Preface**](./00-preface.md)

diff --git a/pdf/en-us/Makefile b/pdf/en-us/Makefile
@@ -1,20 +1,23 @@
 title = 'C++11/14/17 On the Fly'
 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 $(outputname).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
diff --git a/pdf/en-us/modern-cpp-tutorial.md b/pdf/en-us/modern-cpp-tutorial.md
diff --git a/pdf/en-us/modern-cpp-tutorial.pdf b/pdf/en-us/modern-cpp-tutorial.pdf
diff --git a/pdf/en-us/toc.md b/pdf/en-us/toc.md