Skip to content

Commit

Permalink
all: rename book title
Browse files Browse the repository at this point in the history
Update #1
  • Loading branch information
changkun committed Jul 20, 2019
1 parent 6238d66 commit 2eb8fdb
Show file tree
Hide file tree
Showing 21 changed files with 27 additions and 25 deletions.
2 changes: 1 addition & 1 deletion README-zh-cn.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<img src="assets/cover-2nd.png" alt="logo" height="550" align="right" />

# 高速上手 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)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<img src="assets/cover-2nd-en.png" alt="logo" height="550" align="right" />

# 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)

Expand Down
Binary file modified assets/cover-2nd-en.afphoto
Binary file not shown.
Binary file modified assets/cover-2nd-en.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/cover-2nd.afphoto
Binary file not shown.
Binary file modified assets/cover-2nd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion book/en-us/00-preface.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion book/zh-cn/00-preface.md
Original file line number Diff line number Diff line change
Expand Up @@ -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++ 长期以来被人诟病的临时对象效率问题等等。

Expand Down
2 changes: 1 addition & 1 deletion book/zh-cn/toc.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 高速上手 C++ 11/14/17/20
# 现代 C++ 教程:高速上手 C++ 11/14/17/20

## 目录

Expand Down
2 changes: 1 addition & 1 deletion pdf/en-us/Makefile
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pdf/en-us/aggregator.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 <hi@changkun.us>
copyright: cc-by-nc-nd 4.0
---
Expand Down
4 changes: 2 additions & 2 deletions pdf/en-us/meta/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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)}
Expand All @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion pdf/zh-cn/Makefile
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pdf/zh-cn/aggregator.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
ignores = ['TOC', '返回目录', '许可', 'license']

head = """---
title: "高速上手 C++11/14/17/20"
title: "现代 C++ 教程:高速上手 C++11/14/17/20"
author: 欧长坤 <hi@changkun.us>
copyright: cc-by-nc-nd 4.0
---
Expand Down
2 changes: 1 addition & 1 deletion pdf/zh-cn/meta/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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)}
Expand Down
2 changes: 1 addition & 1 deletion website/_config.yml
Original file line number Diff line number Diff line change
@@ -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: 欧长坤
Expand Down
4 changes: 2 additions & 2 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -16,4 +16,4 @@
"hexo": "^3.8.0",
"serve": ">=7.0.0"
}
}
}
2 changes: 1 addition & 1 deletion website/themes/moderncpp/_config.yml
Original file line number Diff line number Diff line change
@@ -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
10 changes: 6 additions & 4 deletions website/themes/moderncpp/layout/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
</div><div class="right">
<h4>欧长坤 著</h4>
<h1>
高速上手<br>C++ 11/14/17/20
现代 C++ 教程<br>
</h1>
<h2>第二版</h2>
<h2>高速上手 C++ 11/14/17/20</h2>
<h3>第二版</h3>
<p>
<a class="button white" href="<%- url_for("/modern-cpp/zh-cn/00-preface/") %>">🇨🇳 在线阅读</a>
<a class="button download" href="<%- url_for("/modern-cpp/pdf/modern-cpp-tutorial-zh-cn.pdf") %>">🇨🇳 下载</a>
Expand All @@ -35,9 +36,10 @@
</div><div class="right">
<h4>Changkun Ou</h4>
<h1>
C++ 11/14/17/20<br>On the Fly
Modern C++ Tutorial
</h1>
<h2>Second Edition</h2>
<h2>C++ 11/14/17/20 On the Fly</h2>
<h3>SECOND EDITION</h3>
<p>
<a class="button white" href="<%- url_for("/modern-cpp/en-us/00-preface/") %>">🇬🇧 Read Online</a>
<a class="button download" href="<%- url_for("/modern-cpp/pdf/modern-cpp-tutorial-en-us.pdf") %>">🇬🇧 Download</a>
Expand Down
6 changes: 3 additions & 3 deletions website/themes/moderncpp/layout/layout.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title><%- page.title ? page.title : '' %> 高速上手 C++ 11/14/17/20 - C++ 11/14/17/20 On the Fly</title>
<title><%- page.title ? page.title : '' %> 现代 C++ 教程: 高速上手 C++ 11/14/17/20 - Modern C++ Tutorial: C++ 11/14/17/20 On the Fly</title>
<meta charset="utf-8">
<meta name="description" content="<%- theme.site_description %>">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
Expand All @@ -24,12 +24,12 @@
</head>
<body class="<%- isIndex ? '' : 'docs' -%>">
<% if (page.type == 'book-en-us') { %>
<div id="mobile-bar" data-bg-text="C++ 11/14/17/20 On the Fly" <%- isIndex ? 'class="top"' : '' %>>
<div id="mobile-bar" data-bg-text="Modern C++ Tutorial" <%- isIndex ? 'class="top"' : '' %>>
<a class="menu-button"></a>
<a class="logo" href="/modern-cpp/"></a>
</div>
<% } else {%>
<div id="mobile-bar" data-bg-text="高速上手 C++ 11/14/17/20" <%- isIndex ? 'class="top"' : '' %>>
<div id="mobile-bar" data-bg-text="现代 C++ 教程" <%- isIndex ? 'class="top"' : '' %>>
<a class="menu-button"></a>
<a class="logo" href="/modern-cpp/"></a>
</div>
Expand Down
4 changes: 2 additions & 2 deletions website/themes/moderncpp/layout/partials/header.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<a id="logo" href="<%- url_for("/modern-cpp/") %>">
<% if (page.type == 'book-en-us') { %>
<img src="<%- url_for("/modern-cpp/assets/cover-2nd-en.png") %>">
<span>C++ 11/14/17/20 On the Fly</span>
<span>Modern C++ Tutorial: C++ 11/14/17/20 On the Fly</span>
<% } else {%>
<img src="<%- url_for("/modern-cpp/assets/cover-2nd.png") %>">
<span>高速上手 C++ 11/14/17/20</span>
<span>现代 C++ 教程:高速上手 C++ 11/14/17/20</span>
<% } %>
</a>
<ul id="nav">
Expand Down

0 comments on commit 2eb8fdb

Please sign in to comment.