diff --git a/README-zh-cn.md b/README-zh-cn.md index 795c959e..5b3335b2 100644 --- a/README-zh-cn.md +++ b/README-zh-cn.md @@ -1,6 +1,6 @@ logo -# 《高速上手 C++11/14/17/20》 +# 现代 C++ 教程：高速上手 C++11/14/17/20 [![](https://img.shields.io/badge/language-English-blue.svg?style=flat-square)](./README.md) [![](https://img.shields.io/badge/language-简体中文-red.svg?style=flat-square)](./README-zh-cn.md) [![](https://img.shields.io/badge/€-donate-ff69b4.svg?style=flat-square)](./assets/donate.md) [![](https://img.shields.io/badge/chat-community-667ed5.svg?style=flat-square)](./assets/community.md) diff --git a/README.md b/README.md index f7e211ab..fe139697 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ logo -# C++11/14/17/20 On the Fly +# Modern C++ Tutorial: C++11/14/17/20 On the Fly [![](https://img.shields.io/badge/language-English-blue.svg?style=flat-square)](./README.md) [![](https://img.shields.io/badge/language-简体中文-red.svg?style=flat-square)](./README-zh-cn.md) [![](https://img.shields.io/badge/€-donate-ff69b4.svg?style=flat-square)](./assets/donate.md) [![](https://img.shields.io/badge/chat-community-667ed5.svg?style=flat-square)](./assets/community.md) diff --git a/assets/cover-2nd-en.afphoto b/assets/cover-2nd-en.afphoto index 28c7848d..60d66375 100644 Binary files a/assets/cover-2nd-en.afphoto and b/assets/cover-2nd-en.afphoto differ diff --git a/assets/cover-2nd-en.png b/assets/cover-2nd-en.png index 3f8c1619..3811060d 100644 Binary files a/assets/cover-2nd-en.png and b/assets/cover-2nd-en.png differ diff --git a/assets/cover-2nd.afphoto b/assets/cover-2nd.afphoto index 0f350deb..a313ae3a 100644 Binary files a/assets/cover-2nd.afphoto and b/assets/cover-2nd.afphoto differ diff --git a/assets/cover-2nd.png b/assets/cover-2nd.png index 393e45fc..c89122bb 100644 Binary files a/assets/cover-2nd.png and b/assets/cover-2nd.png differ diff --git a/book/en-us/00-preface.md b/book/en-us/00-preface.md index 1d14c312..3d3f7f69 100644 --- a/book/en-us/00-preface.md +++ b/book/en-us/00-preface.md @@ -11,7 +11,7 @@ order: 0 ## Introduction C++ user group is a fairly large. From the advent of C++98 to the official finalization of C++11, it has accumulated over a decade. C++14/17 is an important complement and optimization for C++11, and C++20 brings this language to the door of modernization. The extended features of all these new standards are given to the C++ language. Infused with new vitality. -C++ programmers, who are still using **traditional C++** (this book refers to C++98 and its previous C++ standards as traditional C++), may even amzed by the fact that they are not using the same language while reading C++11/14/17/20 code. +C++ programmers, who are still using **traditional C++** (this book refers to C++98 and its previous C++ standards as traditional C++), may even amzed by the fact that they are not using the same language while reading modern C++ code. **Modern C++** (this book refers to C++11/14/17/20) introduces a lot of features into traditional C++, which makes the whole C++ become language that modernized. Modern C++ not only enhances the usability of the C++ language itself, but the modification of the `auto` keyword semantics gives us more confidence in manipulating extremely complex template types. At the same time, a lot of enhancements have been made to the language runtime. The emergence of Lambda expressions has made C++ have the "closure" feature of "anonymous functions", which is almost in modern programming languages ​​(such as Python/Swift/.. It has become commonplace, and the emergence of rvalue references has solved the problem of temporary object efficiency that C++ has long been criticized. diff --git a/book/zh-cn/00-preface.md b/book/zh-cn/00-preface.md index 992fdb3d..7e8e0420 100644 --- a/book/zh-cn/00-preface.md +++ b/book/zh-cn/00-preface.md @@ -11,7 +11,7 @@ order: 0 ## 引言 C++ 是一个用户群体相当大的语言。从 C++98 的出现到 C++11 的正式定稿经历了长达十年多之久的积累。C++14/17 则是作为对 C++11 的重要补充和优化，C++20 则将这门语言领进了现代化的大门，所有这些新标准中扩充的特性，给 C++ 这门语言注入了新的活力。 -那些还在坚持使用**传统 C++**（本书把 C++98 及其之前的 C++ 特性均称之为传统 C++）而未接触过 C++11/14/17/20 的 C++ 程序员在见到诸如 Lambda 表达式这类全新特性时，甚至会流露出『学的不是同一门语言』的惊叹之情。 +那些还在坚持使用**传统 C++**（本书把 C++98 及其之前的 C++ 特性均称之为传统 C++）而未接触过现代 C++ 的 C++ 程序员在见到诸如 Lambda 表达式这类全新特性时，甚至会流露出『学的不是同一门语言』的惊叹之情。 **现代 C++** (本书中均指 C++11/14/17/20) 为传统 C++ 注入的大量特性使得整个 C++ 变得更加像一门现代化的语言。现代 C++ 不仅仅增强了 C++ 语言自身的可用性，`auto` 关键字语义的修改使得我们更加有信心来操控极度复杂的模板类型。同时还对语言运行期进行了大量的强化，Lambda 表达式的出现让 C++ 具有了『匿名函数』的『闭包』特性，而这一特性几乎在现代的编程语言（诸如 Python/Swift/... ）中已经司空见惯，右值引用的出现解决了 C++ 长期以来被人诟病的临时对象效率问题等等。 diff --git a/book/zh-cn/toc.md b/book/zh-cn/toc.md index c567df05..5a444896 100644 --- a/book/zh-cn/toc.md +++ b/book/zh-cn/toc.md @@ -1,4 +1,4 @@ -# 高速上手 C++ 11/14/17/20 +# 现代 C++ 教程：高速上手 C++ 11/14/17/20 ## 目录 diff --git a/pdf/en-us/Makefile b/pdf/en-us/Makefile index d51fb45b..9de3e75d 100644 --- a/pdf/en-us/Makefile +++ b/pdf/en-us/Makefile @@ -1,4 +1,4 @@ -title = 'C++11/14/17/20 On the Fly' +title = 'Modern C++ Tutorial: C++11/14/17/20 On the Fly' filename = 'modern-cpp-tutorial' outputname='modern-cpp-tutorial' revision = $(shell git describe --always --tags) diff --git a/pdf/en-us/aggregator.py b/pdf/en-us/aggregator.py index 1bea485f..dc89fb23 100644 --- a/pdf/en-us/aggregator.py +++ b/pdf/en-us/aggregator.py @@ -10,7 +10,7 @@ with open('modern-cpp-tutorial.md', 'w') as outfile: outfile.write("""--- -title: "C++11/14/17/20 On the Fly" +title: "Modern C++ Tutorial: C++11/14/17/20 On the Fly" author: Changkun Ou copyright: cc-by-nc-nd 4.0 --- diff --git a/pdf/en-us/meta/template.tex b/pdf/en-us/meta/template.tex index 9025bc98..9c09040e 100644 --- a/pdf/en-us/meta/template.tex +++ b/pdf/en-us/meta/template.tex @@ -158,7 +158,7 @@ \thispagestyle{plain} \begin{center} - {\LARGE\textbf{C++11/14/17/20 On the Fly}} + {\LARGE\textbf{Modern C++ Tutorial: C++11/14/17/20 On the Fly}} \vspace{1em} {\large Changkun Ou (hi@changkun.us)} @@ -176,7 +176,7 @@ \noindent This work was written by \href{https://github.com/changkun}{Ou Changkun} and licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. \texttt{\small http://creativecommons.org/licenses/by-nc-nd/4.0/} - \vspace{6em} + \vspace{5em} \includegraphics{../../assets/cover-2nd-en} \end{center} diff --git a/pdf/zh-cn/Makefile b/pdf/zh-cn/Makefile index e8d8d319..72ad8cff 100644 --- a/pdf/zh-cn/Makefile +++ b/pdf/zh-cn/Makefile @@ -1,4 +1,4 @@ -title = '高速上手 C++11/14/17/20' +title = '现代 C++ 教程：高速上手 C++11/14/17/20' filename = 'modern-cpp-tutorial' outputname='modern-cpp-tutorial' revision = $(shell git describe --always --tags) diff --git a/pdf/zh-cn/aggregator.py b/pdf/zh-cn/aggregator.py index f8a3c22c..8a8329f1 100755 --- a/pdf/zh-cn/aggregator.py +++ b/pdf/zh-cn/aggregator.py @@ -8,7 +8,7 @@ ignores = ['TOC', '返回目录', '许可', 'license'] head = """--- -title: "高速上手 C++11/14/17/20" +title: "现代 C++ 教程：高速上手 C++11/14/17/20" author: 欧长坤 copyright: cc-by-nc-nd 4.0 --- diff --git a/pdf/zh-cn/meta/template.tex b/pdf/zh-cn/meta/template.tex index 90834479..993f49fa 100644 --- a/pdf/zh-cn/meta/template.tex +++ b/pdf/zh-cn/meta/template.tex @@ -164,7 +164,7 @@ \thispagestyle{plain} \begin{center} - {\LARGE\textbf{高速上手 C++11/14/17/20}} + {\LARGE\textbf{现代 C++ 教程：高速上手 C++11/14/17/20}} \vspace{1em} {\large 欧长坤 (hi@changkun.us)} diff --git a/website/_config.yml b/website/_config.yml index 07608f23..d1116fe8 100755 --- a/website/_config.yml +++ b/website/_config.yml @@ -1,5 +1,5 @@ # Site Configuration -title: 高速上手 C++ 11/14/17/20 +title: "现代 C++ 教程: 高速上手 C++ 11/14/17/20" subtitle: C++ 11/14/17/20 On the Fly description: "欧长坤" author: 欧长坤 diff --git a/website/package.json b/website/package.json index d86bed9f..0914f054 100755 --- a/website/package.json +++ b/website/package.json @@ -3,7 +3,7 @@ "version": "2.0.0", "private": true, "hexo": { - "version": "3.9.0" + "version": "3.8.0" }, "dependencies": { "hexo-generator-index": "^0.2.1", @@ -16,4 +16,4 @@ "hexo": "^3.8.0", "serve": ">=7.0.0" } -} +} \ No newline at end of file diff --git a/website/themes/moderncpp/_config.yml b/website/themes/moderncpp/_config.yml index 1248cab3..4fb7e026 100755 --- a/website/themes/moderncpp/_config.yml +++ b/website/themes/moderncpp/_config.yml @@ -1,4 +1,4 @@ -site_description: "Modern C++ | C++ 11/14/17/20 On the Fly | 现代 C++ | 高速上手 C++11/14/17/20" +site_description: "Modern C++ Tutorial | C++ 11/14/17/20 On the Fly | 现代 C++ 教程 | 高速上手 C++11/14/17/20" google_analytics: root_domain: changkun.de/modern-cpp moderncpp_version: 2.0.0 diff --git a/website/themes/moderncpp/layout/index.ejs b/website/themes/moderncpp/layout/index.ejs index e3715d69..0dbd3cd9 100755 --- a/website/themes/moderncpp/layout/index.ejs +++ b/website/themes/moderncpp/layout/index.ejs @@ -17,9 +17,10 @@

欧长坤 著

- 高速上手
C++ 11/14/17/20 + 现代 C++ 教程

-

第二版

+

高速上手 C++ 11/14/17/20

+

第二版

">🇨🇳 在线阅读 ">🇨🇳 下载 @@ -35,9 +36,10 @@

Changkun Ou

- C++ 11/14/17/20
On the Fly + Modern C++ Tutorial

-

Second Edition

+

C++ 11/14/17/20 On the Fly

+

SECOND EDITION

">🇬🇧 Read Online ">🇬🇧 Download diff --git a/website/themes/moderncpp/layout/layout.ejs b/website/themes/moderncpp/layout/layout.ejs index aab1b00b..4b54d774 100755 --- a/website/themes/moderncpp/layout/layout.ejs +++ b/website/themes/moderncpp/layout/layout.ejs @@ -3,7 +3,7 @@ - <%- page.title ? page.title : '' %> 高速上手 C++ 11/14/17/20 - C++ 11/14/17/20 On the Fly + <%- page.title ? page.title : '' %> 现代 C++ 教程: 高速上手 C++ 11/14/17/20 - Modern C++ Tutorial: C++ 11/14/17/20 On the Fly @@ -24,12 +24,12 @@ <% if (page.type == 'book-en-us') { %> -

> +
>
<% } else {%> -
> +
>
diff --git a/website/themes/moderncpp/layout/partials/header.ejs b/website/themes/moderncpp/layout/partials/header.ejs index 2f742d34..254b018f 100755 --- a/website/themes/moderncpp/layout/partials/header.ejs +++ b/website/themes/moderncpp/layout/partials/header.ejs @@ -2,10 +2,10 @@