Merge remote-tracking branch 'zh/master' into sync

Author: OlingCat

.travis.yml

@@ -4,8 +4,7 @@ git:
   depth: false
 cache: bundler
 before_install:
- - wget https://raw.githubusercontent.com/progit/progit2-pub/master/bootstrap.sh
- - sh bootstrap.sh
+ - rm -f Gemfile.lock
 script: bundle exec rake book:build
 after_success: bundle exec rake book:tag
 deploy:

Gemfile

@@ -6,8 +6,9 @@ gem 'asciidoctor', '1.5.6.2'
 gem 'json'
 gem 'awesome_print'
 
-gem 'asciidoctor-epub3', '~> 1.5.0.alpha.9'
-gem 'asciidoctor-pdf', '~> 1.5.0.beta.8'
+gem 'ttfunk', '= 1.5.1'
+gem 'asciidoctor-epub3', '1.5.0.alpha.9'
+gem 'asciidoctor-pdf', '1.5.0.alpha.16'
 gem 'asciidoctor-pdf-cjk', '~> 0.1.3'
 gem 'asciidoctor-pdf-cjk-kai_gen_gothic', '~> 0.1.1'