Skip to content

Commit 55a31be

Browse files
author
TinyWang
authored
Merge pull request #1 from changkun/master
Follow the upstream.
2 parents f7b0c41 + c4c7ad1 commit 55a31be

File tree

14 files changed

+888
-2458
lines changed

14 files changed

+888
-2458
lines changed

‎assets/cover-2nd-en-logo.png

19.2 KB
Loading

‎assets/cover-2nd-logo.png

19 KB
Loading

‎book/zh-cn/05-pointers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,13 @@ struct B;
148148
struct A {
149149
std::shared_ptr<B> pointer;
150150
~A() {
151-
std::cout << "A 被销毁" << std::end;
151+
std::cout << "A 被销毁" << std::endl;
152152
}
153153
};
154154
struct B {
155155
std::shared_ptr<A> pointer;
156156
~B() {
157-
std::cout << "B 被销毁" << std::end;
157+
std::cout << "B 被销毁" << std::endl;
158158
}
159159
};
160160
int main() {

‎pdf/en-us/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ pdf: markdown
1313
@echo "Compiling PDF file..."
1414
pandoc -f markdown+smart -s $(filename).md -o $(filename).pdf \
1515
--title-prefix $(title) \
16-
--listings -H meta/cpp-listings.tex \
1716
--template=meta/template.tex \
1817
--pdf-engine=`which xelatex`
1918
@echo "Done."

‎pdf/en-us/meta/cpp-listings.tex

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎pdf/en-us/meta/template.tex

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@
4747
\bibliography{$biblio-files$}
4848
$endif$
4949
$endif$
50-
$if(listings)$
5150
\usepackage{listings}
52-
$endif$
5351
$if(lhs)$
5452
\lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{}
5553
$endif$

‎pdf/zh-cn/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ pdf: markdown
1313
@echo "Compiling PDF file..."
1414
pandoc -f markdown+smart -s $(filename).md -o $(filename).pdf \
1515
--title-prefix $(title) \
16-
--listings -H meta/cpp-listings.tex \
1716
--template=meta/template.tex \
1817
--pdf-engine=`which xelatex`
1918
@echo "Done."

‎pdf/zh-cn/meta/cpp-listings.tex

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎pdf/zh-cn/meta/template.tex

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,8 @@
5151
\bibliography{$biblio-files$}
5252
$endif$
5353
$endif$
54-
$if(listings)$
54+
\usepackage{textcomp}
5555
\usepackage{listings}
56-
$endif$
5756
$if(lhs)$
5857
\lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{}
5958
$endif$

‎website/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ all: clean
22
node install.js
33
python3 filter.py
44
cp ../assets/cover-2nd.png ./src/modern-cpp/assets/cover-2nd.png
5+
cp ../assets/cover-2nd-logo.png ./src/modern-cpp/assets/cover-2nd-logo.png
56
cp ../assets/cover-2nd-en.png ./src/modern-cpp/assets/cover-2nd-en.png
7+
cp ../assets/cover-2nd-en-logo.png ./src/modern-cpp/assets/cover-2nd-en-logo.png
68
cp ../assets/alipay.jpg ./src/modern-cpp/assets/alipay.jpg
79
cp ../assets/wechat.jpg ./src/modern-cpp/assets/wechat.jpg
810
cp ../assets/donate.md ./src/modern-cpp/about/
@@ -16,6 +18,9 @@ s: all
1618
node_modules/serve/bin/serve.js ./public
1719
clean:
1820
rm -rf ./src/modern-cpp/assets/cover-2nd.png \
21+
./src/modern-cpp/assets/cover-2nd-en.png \
22+
./src/modern-cpp/assets/cover-2nd-logo.png \
23+
./src/modern-cpp/assets/cover-2nd-en-logo.png \
1924
./src/modern-cpp/assets/figures \
2025
./src/modern-cpp/assets/alipay.jpg \
2126
./src/modern-cpp/assets/wechat.jpg \

0 commit comments

Comments
 (0)