From ff40ef5959aacfcee5f13578421c9ee0c94f629f Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sun, 20 Dec 2015 15:45:37 +0900 Subject: [PATCH 1/6] parepare for Jekyll 3.x * remove "plugins" settings which not used. it will be renamed on 3.x * remove markdown engine settings which not used and will be changed on 3.x Not work yet, because "gems" are not support 3.x yet. --- _config.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/_config.yml b/_config.yml index 07d220d5..ddd80922 100644 --- a/_config.yml +++ b/_config.yml @@ -4,7 +4,6 @@ base-url: http://vim-jp.org source: . destination: ./_site -plugins: ./_plugins future: true lsi: false @@ -21,24 +20,6 @@ maruku: png_dir: images/latex png_url: /images/latex -rdiscount: - extensions: [] - -kramdown: - auto_ids: true - footnote_nr: 1 - entity_output: as_char - toc_levels: 1..6 - use_coderay: false - - coderay: - coderay_wrap: div - coderay_line_numbers: inline - coderay_line_numbers_start: 1 - coderay_tab_width: 4 - coderay_bold_every: 10 - coderay_css: style - exclude: - 'scripts' - 'Gemfile' From c258ff35321d9f85c9262809c3c5c5cba662cd25 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sun, 20 Dec 2015 15:51:33 +0900 Subject: [PATCH 2/6] remove settings for unused maruku markdown engine --- _config.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/_config.yml b/_config.yml index ddd80922..e3b2b4f1 100644 --- a/_config.yml +++ b/_config.yml @@ -13,12 +13,6 @@ permalink: date redcarpet: extensions: ["tables", "autolink", "strikethrough", "superscript"] -maruku: - use_tex: false - use_divs: false - png_engine: blahtex - png_dir: images/latex - png_url: /images/latex exclude: - 'scripts' From a7a12cc33f9963505fbc289bb51ca6c1706500bd Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 4 Feb 2016 22:46:55 +0900 Subject: [PATCH 3/6] fix for jekyll 3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将来予定される kmarkdown への移行のために、_config.yml の整理と CSS の微 調整が必要となった。 --- _config.yml | 39 ++++++++++++++++++++++++--------------- assets/css/syntax.css | 2 +- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/_config.yml b/_config.yml index e3b2b4f1..c2a226b3 100644 --- a/_config.yml +++ b/_config.yml @@ -1,27 +1,36 @@ -encoding: utf-8 -safe: false -base-url: http://vim-jp.org - -source: . -destination: ./_site - -future: true -lsi: false -highlighter: pygments -markdown: redcarpet -permalink: date - -redcarpet: - extensions: ["tables", "autolink", "strikethrough", "superscript"] +############################################################################ +# 原則 http://jekyllrb.com/docs/configuration/#default-configuration からの +# 差分のみ記述している。記述順序も前述に従う。 +### Handling Reading exclude: - 'scripts' - 'Gemfile' - 'README.md' - 'vendor' +encoding: utf-8 +### Filtering Content +future: true + +### Plugins gems: - jemoji - jekyll-sitemap +### Outputting +# default と同じだが、万が一デフォルトが変わってしまうと記事のURLが変わってしま +# いクリティカルなので、明示的に指定した。 +permalink: date + +### Markdown Processors +kramdown: + input: GFM + +############################################################################ +# 以下はvim-jp固有の設定項目 + +# baseurl と紛らわしいが別物なので要注意 +base-url: http://vim-jp.org + hotkeys: true diff --git a/assets/css/syntax.css b/assets/css/syntax.css index 2774b764..71990618 100644 --- a/assets/css/syntax.css +++ b/assets/css/syntax.css @@ -1,4 +1,4 @@ -.highlight { background: #ffffff; } +.highlight { background: #000; } .highlight .c { color: #999988; font-style: italic } /* Comment */ .highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */ .highlight .k { font-weight: bold } /* Keyword */ From c2a6d53dd49dc5e1ea44898a0d11fd2b51fa0782 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 4 Feb 2016 22:58:31 +0900 Subject: [PATCH 4/6] specify versions for travis --- .travis.yml | 2 +- Gemfile | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e91f1c53..fa30882e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: - - 2.0.0 + - 2.2.4 before_script: "bundle show" script: "bundle exec jekyll build" after_script: "find _site -type f" diff --git a/Gemfile b/Gemfile index b03d0d34..d5779e6c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,3 @@ source 'https://rubygems.org' -gem 'github-pages' -gem 'jemoji' +gem 'github-pages', '>= 45' From 3a57186590c2e0bbb3a8cc3d0609cef34bb995b6 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 4 Feb 2016 23:03:27 +0900 Subject: [PATCH 5/6] fix comments --- _config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index c2a226b3..794d557d 100644 --- a/_config.yml +++ b/_config.yml @@ -8,6 +8,7 @@ exclude: - 'Gemfile' - 'README.md' - 'vendor' +# デフォルトと同じだが「utf-8で記事を書こう」という宣言的な意味合で残した。 encoding: utf-8 ### Filtering Content @@ -19,8 +20,8 @@ gems: - jekyll-sitemap ### Outputting -# default と同じだが、万が一デフォルトが変わってしまうと記事のURLが変わってしま -# いクリティカルなので、明示的に指定した。 +# デフォルトと同じだが、万が一デフォルトが変わってしまうと記事のURLが変わってし +# まいクリティカルなので、明示的に指定した。 permalink: date ### Markdown Processors From e1bb64b8e28ca6c0e0a0ebfce7dfaca4cfbb6d17 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 4 Feb 2016 23:06:52 +0900 Subject: [PATCH 6/6] add comment --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index fa30882e..176b77f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: ruby rvm: + # RubyInstallerで提供される最新版を、指定・利用の目安としている - 2.2.4 before_script: "bundle show" script: "bundle exec jekyll build"