update: build english pdf

changkun · changkun · commit 7c88f422ab6b · 2019-07-09T14:06:11.000+02:00
diff --git a/book/en-us/01-intro.md b/book/en-us/01-intro.md
@@ -1,5 +1,5 @@
 ---
-title: Chapter 01：Towards Modern C++
+title: "Chapter 01: Towards Modern C++"
 type: book-en-us
 order: 1
 ---
@@ -12,7 +12,7 @@ order: 1
 and always use the `-std=c++2a` compilation flag in your code.
 
 ```bash
-$ clang++ -v
+> clang++ -v
 Apple LLVM version 10.0.1 (clang-1001.0.46.4)
 Target: x86_64-apple-darwin18.6.0
 Thread model: posix
diff --git a/book/en-us/02-usability.md b/book/en-us/02-usability.md
@@ -1,5 +1,5 @@
 ---
-title: Chapter 02：Language Usability Enhancements
+title: "Chapter 02: Language Usability Enhancements"
 type: book-en-us
 order: 2
 ---
diff --git a/book/en-us/03-runtime.md b/book/en-us/03-runtime.md
@@ -1,5 +1,5 @@
 ---
-title: Chapter 03：Language Runtime Enhancements
+title: "Chapter 03: Language Runtime Enhancements"
 type: book-en-us
 order: 3
 ---
diff --git a/book/en-us/04-containers.md b/book/en-us/04-containers.md
@@ -1,5 +1,5 @@
 ---
-title: Chapter 04 Sandard Library：Containers
+title: "Chapter 04 Sandard Library: Containers"
 type: book-en-us
 order: 4
 ---
diff --git a/book/en-us/05-pointers.md b/book/en-us/05-pointers.md
@@ -1,5 +1,5 @@
 ---
-title: Chapter 05 Sandard Library：Pointers
+title: "Chapter 05 Sandard Library: Pointers"
 type: book-en-us
 order: 5
 ---
diff --git a/book/en-us/06-regex.md b/book/en-us/06-regex.md
@@ -1,5 +1,5 @@
 ---
-title: Chapter 06 Sandard Library：Regular Expression
+title: "Chapter 06 Sandard Library: Regular Expression"
 type: book-en-us
 order: 6
 ---
diff --git a/book/en-us/07-thread.md b/book/en-us/07-thread.md
@@ -1,5 +1,5 @@
 ---
-title: Chapter 07 Sandard Library：Threads and Concurrency
+title: "Chapter 07 Sandard Library: Threads and Concurrency"
 type: book-en-us
 order: 7
 ---
diff --git a/book/en-us/08-filesystem.md b/book/en-us/08-filesystem.md
@@ -1,5 +1,5 @@
 ---
-title: Chapter 08 Sandard Library：File System
+title: "Chapter 08 Sandard Library: File System"
 type: book-en-us
 order: 8
 ---
diff --git a/book/en-us/10-cpp20.md b/book/en-us/10-cpp20.md
@@ -1,5 +1,5 @@
 ---
-title: Chapter 10 Outlook：Introduction of C++20
+title: "Chapter 10 Outlook: Introduction of C++20"
 type: book-en-us
 order: 10
 ---
diff --git a/book/en-us/appendix1.md b/book/en-us/appendix1.md
@@ -1,10 +1,10 @@
 ---
-title: Appendix 1：Further Study Materials
+title: "Appendix 1: Further Study Materials"
 type: book-en-us
 order: 11
 ---
 
-# Appendix 1：Further Study Materials
+# Appendix 1: Further Study Materials
 
 First of all, congratulations 🎉 on reading this book! I hope this book has raised your interest in modern C++.
 
diff --git a/book/en-us/appendix2.md b/book/en-us/appendix2.md
@@ -1,10 +1,10 @@
 ---
-title: Appendix 2：Modern C++ Best Practices
+title: "Appendix 2: Modern C++ Best Practices"
 type: book-en-us
 order: 12
 ---
 
-# Appendix 2：Modern C++ Best Practices
+# Appendix 2: Modern C++ Best Practices
 
 In this appendix we will briefly talk about the best practices of modern C++. In general, the author's thoughts on C++'s best practices are mainly absorbed from [Effective Modern C++](https://www.amazon.com/dp/1491903996/ref=cm_sw_em_r_mt_dp_U_-ZgjDb81ERBNP) and [C++ Style Guide](https://google.github.io/styleguide/cppguide.html). In this appendix, we will briefly discuss and use the actual examples to illustrate the methods, and introduce some of **the author's personal**, **non-common**, **non-sensible** best practices, and how to ensure the overall quality of the code.
 
diff --git a/book/zh-cn/01-intro.md b/book/zh-cn/01-intro.md
@@ -11,7 +11,7 @@ order: 1
 **编译环境**：本书将使用 `clang++` 作为唯一使用的编译器，同时总是在代码中使用 `-std=c++2a` 编译标志。
 
 ```bash
-$ clang++ -v
+> clang++ -v
 Apple LLVM version 10.0.1 (clang-1001.0.46.4)
 Target: x86_64-apple-darwin18.6.0
 Thread model: posix
diff --git a/book/zh-cn/02-usability.md b/book/zh-cn/02-usability.md
@@ -963,8 +963,6 @@ std::cout << new_enum::value3 << std::endl
 
 2. 尝试用[折叠表达式](#折叠表达式)实现用于计算均值的函数，传入允许任意参数。
 
-3. ​
-
 > 参考答案[见此](../exercises/2)。
 
 [返回目录](./toc.md) | [上一章](./01-intro.md) | [下一章 运行时强化](./03-runtime.md)
diff --git a/pdf/en-us/aggregator.py b/pdf/en-us/aggregator.py
@@ -5,7 +5,7 @@
 
 chapters = ['00-preface.md', '01-intro.md',  '02-usability.md', '03-runtime.md', '04-containers.md', '05-pointers.md', '06-regex.md', '07-thread.md', '08-filesystem.md', '09-others.md', '10-cpp20.md', 'appendix1.md', 'appendix2.md']
 
-ignores = ['TOC', 'Return to TOC', 'License', 'license']
+ignores = ['TOC', 'Table of Content', 'License', 'license']
 
 
 with open('modern-cpp-tutorial.md', 'w') as outfile:
diff --git a/pdf/en-us/meta/template.tex b/pdf/en-us/meta/template.tex
@@ -15,11 +15,7 @@
 \usepackage{amssymb,amsmath}
 \usepackage{ifxetex,ifluatex}
 
-\linespread{1.2}\selectfont                       % 行距
-%\XeTeXlinebreaklocale "zh"                        % 针对中文自动换行
-%\XeTeXlinebreakskip = 0pt plus 1pt                % 字与字之间加入 0pt 至 1pt 的间距，确保左右对齐
-%\parindent 0em                                    % 段落缩进
-%\setlength{\parskip}{20pt}                        % 段落间距
+\linespread{1.2}\selectfont
 \ifxetex
   \usepackage{xltxtra,xunicode}
 \fi
@@ -140,22 +136,23 @@
 \author{$for(author)$$author$$sep$ \and $endfor$}
 \date{$date$}
 
-%%%% 段落首行缩进两个字 %%%%
 \makeatletter
 \let\@afterindentfalse\@afterindenttrue
 \@afterindenttrue
 \makeatother
-\setlength{\parindent}{2em}  %中文缩进两个汉字位
+\setlength{\parindent}{2em}
 
-%%%% 下面的命令设置行间距与段落间距 %%%%
 \linespread{1.4}
 \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}{%
+\newcommand{\tightlist}{
   \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
 
 \thispagestyle{plain}
diff --git a/pdf/en-us/modern-cpp-tutorial.pdf b/pdf/en-us/modern-cpp-tutorial.pdf
diff --git a/pdf/zh-cn/modern-cpp-tutorial.pdf b/pdf/zh-cn/modern-cpp-tutorial.pdf
