tinyvan · tinyvan · Jul 31, 2020 · Jul 17, 2020 · Jul 17, 2020 · Jul 17, 2020
diff --git a/assets/cover-2nd-en-logo.png b/assets/cover-2nd-en-logo.png
diff --git a/assets/cover-2nd-logo.png b/assets/cover-2nd-logo.png
diff --git a/book/en-us/06-regex.md b/book/en-us/06-regex.md
@@ -48,7 +48,7 @@ and is also the core matching syntax of a regular expression. See the table belo
 | `\`| Marks the next character as either a special character, or a literal character, or a backward reference, or an octal escape character. For example, `n` Matches the character `n`. `\n` matches newline characters. The sequence `\\` Matches the `'\'` character, while `\(` matches the `'('` character.|
 |`^`| Matches the beginning of the input string, unless it is used in a square bracket expression, at which point it indicates that the set of characters is not accepted. |
 |`{`| Marks the beginning of a qualifier expression. |
-|`\`| Indicates a choice between the two. |
+|`\|`| Indicates a choice between the two. |
 
 ### Quantifiers
 

diff --git a/book/zh-cn/05-pointers.md b/book/zh-cn/05-pointers.md
@@ -148,13 +148,13 @@ struct B;
 struct A {
     std::shared_ptr<B> pointer;
     ~A() {
-        std::cout << "A 被销毁" << std::end;
+        std::cout << "A 被销毁" << std::endl;
     }
 };
 struct B {
     std::shared_ptr<A> pointer;
     ~B() {
-        std::cout << "B 被销毁" << std::end;
+        std::cout << "B 被销毁" << std::endl;
     }
 };
 int main() {

diff --git a/book/zh-cn/06-regex.md b/book/zh-cn/06-regex.md
@@ -42,7 +42,7 @@ order: 6
 | `\`|  将下一个字符标记为或特殊字符、或原义字符、或向后引用、或八进制转义符。例如， `n` 匹配字符 `n`。`\n` 匹配换行符。序列 `\\` 匹配 `'\'` 字符，而 `\(` 则匹配 `'('` 字符。|
 |`^`|  匹配输入字符串的开始位置，除非在方括号表达式中使用，此时它表示不接受该字符集合。|
 |`{`|  标记限定符表达式的开始。|
-|`\`|  指明两项之间的一个选择。|
+|`\|`|  指明两项之间的一个选择。|
 
 ### 限定符
 

diff --git a/pdf/en-us/Makefile b/pdf/en-us/Makefile
@@ -13,7 +13,6 @@ pdf: markdown
 	@echo "Compiling PDF file..."
 	pandoc -f markdown+smart -s $(filename).md -o $(filename).pdf \
 		--title-prefix $(title) \
-		--listings -H meta/cpp-listings.tex \
 		--template=meta/template.tex \
 		--pdf-engine=`which xelatex`
 	@echo "Done."

diff --git a/pdf/en-us/meta/cpp-listings.tex b/pdf/en-us/meta/cpp-listings.tex
diff --git a/pdf/en-us/meta/template.tex b/pdf/en-us/meta/template.tex
@@ -47,9 +47,7 @@
 \bibliography{$biblio-files$}
 $endif$
 $endif$
-$if(listings)$
 \usepackage{listings}
-$endif$
 $if(lhs)$
 \lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{}
 $endif$

diff --git a/pdf/zh-cn/Makefile b/pdf/zh-cn/Makefile
@@ -13,7 +13,6 @@ pdf: markdown
 	@echo "Compiling PDF file..."
 	pandoc -f markdown+smart -s $(filename).md -o $(filename).pdf \
 		--title-prefix $(title) \
-		--listings -H meta/cpp-listings.tex \
 		--template=meta/template.tex \
 		--pdf-engine=`which xelatex`
 	@echo "Done."

diff --git a/pdf/zh-cn/meta/cpp-listings.tex b/pdf/zh-cn/meta/cpp-listings.tex
diff --git a/pdf/zh-cn/meta/template.tex b/pdf/zh-cn/meta/template.tex
@@ -51,9 +51,8 @@
 \bibliography{$biblio-files$}
 $endif$
 $endif$
-$if(listings)$
+\usepackage{textcomp}
 \usepackage{listings}
-$endif$
 $if(lhs)$
 \lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{}
 $endif$

diff --git a/website/Makefile b/website/Makefile
@@ -2,7 +2,9 @@ all: clean
 	node install.js
 	python3 filter.py
 	cp ../assets/cover-2nd.png ./src/modern-cpp/assets/cover-2nd.png
+	cp ../assets/cover-2nd-logo.png ./src/modern-cpp/assets/cover-2nd-logo.png
 	cp ../assets/cover-2nd-en.png ./src/modern-cpp/assets/cover-2nd-en.png
+	cp ../assets/cover-2nd-en-logo.png ./src/modern-cpp/assets/cover-2nd-en-logo.png
 	cp ../assets/alipay.jpg ./src/modern-cpp/assets/alipay.jpg
 	cp ../assets/wechat.jpg ./src/modern-cpp/assets/wechat.jpg
 	cp ../assets/donate.md ./src/modern-cpp/about/
@@ -16,6 +18,9 @@ s: all
 	node_modules/serve/bin/serve.js ./public
 clean:
 	rm -rf ./src/modern-cpp/assets/cover-2nd.png \
+		./src/modern-cpp/assets/cover-2nd-en.png \
+		./src/modern-cpp/assets/cover-2nd-logo.png \
+		./src/modern-cpp/assets/cover-2nd-en-logo.png \
 		./src/modern-cpp/assets/figures \
 		./src/modern-cpp/assets/alipay.jpg \
 		./src/modern-cpp/assets/wechat.jpg \