review 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c42bf9b1882e845d3b136daa8a10a5b268ec5abc2c60f0e02e2f10bb390350be
-  data.tar.gz: 311a696028fcd8651245648a33d15acb79f79f12986ee2f2ceb67be1329fe2b2
+  metadata.gz: e84bcc2665b217e208b209c794a7d4e4a71440f8094cb32e969e294ef49b525b
+  data.tar.gz: 5a27039b3a6fa44437786debfc54fa2fe24213fdb497a84d4a483bb590fd1118
 SHA512:
-  metadata.gz: dec76569275ed22bc13a978b2181da58f1dec38fe8ddf9a6c5355f0f5fe00385b50307143b938764e5b854471ad80feda576cba5b350ee18e03f6a6b06b1d80b
-  data.tar.gz: aee5b0eff6ec9df9501810c38d0a60c22e5a957e2db2549f1ac63df4ab3e4a575b7ad8f698ab3a54fa10bbdadde5c95685c3f2db51f5c0a097a1b80f3da816b6
+  metadata.gz: cadd2c9a936fd38bd84f15d9b06fd0e85cd1df1b32e8116e165f4dd67801cdef887ca0e1c788ed8d5c3cc3b9979d729eb886149b7c188d2d461f459d6da36923
+  data.tar.gz: ce5a14cc670d7c57ce8fb6b7c2a885dc9bdef074da06eaa3a83d1bca5eeaa4196d42f60763d86e0aa2afe8a2115ad38f3e6e43ef69aaedd930dd938eefb50bd5

data/.travis.yml

@@ -11,16 +11,24 @@ addons:
       - dvipng
 
 before_install:
-  - gem update --system
-  - gem update bundler
+  - |-
+    RUBY_VER=`ruby -e "print RUBY_VERSION"`
+    if [ "$RUBY_VER" = "2.1.10" ]; then
+      gem install bundler -v '< 2'
+    elif [ "$RUBY_VER" = "2.2.10" ]; then
+      gem install bundler -v '< 2'
+    else
+      gem update --system
+      gem install bundler
+    fi
 
 rvm:
-##  - 2.0
   - 2.1
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-  - 2.5.0
+  - 2.2.10
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0
 ##  - ruby-head
 
 branches:

data/NEWS.ja.md

@@ -1,3 +1,61 @@
+# Version 3.1.0
+
+## 非互換の変更
+* PDFMaker: 図版のキャプションとして `\reviewimagecaption` マクロを導入しました ([#1254])。Re:VIEW 3 を使っているプロジェクトでは、`review-update` コマンドを実行して review-base.sty ファイルを更新することを推奨します。
+* `review-preproc` コマンドから、文書化されておらず正しく動作しない `--strip` オプションを除去しました ([#1257])
+
+## バグ修正
+* PDFMaker: 部の中の節番号が前の章の節番号を継続してしまう問題を修正しました ([#1225],[#1226])
+* samples 内で gentombow.sty ファイルのコピーが正しくできていないのを修正しました ([#1229])
+* PDFMaker: review-jsbook 利用時、numer_of_lines ドキュメントオプションで指定した行数より1行減ってしまうのを修正しました ([#1235])
+* PDFMaker: review-jlreq が LuaLaTeX で動作するように修正しました ([#1243])
+* EPUBMaker: 部があるときに目次の階層がおかしくなる問題を修正しました ([#1262])
+* `//comment` の内容が正しくエスケープされないことがある問題を修正しました ([#1264])
+* PDFMaker: 奥付の左列が長いときにあふれるのを修正しました ([#1252])
+* CHAPS: が空のときにエラーになるのを修正しました ([#1273])
+
+## 機能強化
+* PDFMaker: 数式表現の拡張としてよく使われる amssymb, amsthm, bm パッケージを標準で読み込むようにしました ([#1224])
+* HTMLBuilder: emlist, listnum 命令の挙動をほかのコードリスト命令に合わせ、highlight メソッドを必ず経由するようにしました ([#1231])
+* EPUBMaker: 脚注から本文に戻るリンクを表現できるようにしました ([#1233])。`epubmaker` パラメータの `back_footnote` サブパラメータを true にすると利用できます。
+* PDFMaker: ダミーの行を作成する `\makelines` マクロを追加しました ([#1240])
+* `#@warn` 命令を正しく実装しました ([#1258])
+* `#@mapfile` 命令に re 拡張子のファイルが指定されたときにはタブなどを整形せずそのまま取り込むようにしました ([#1247])
+* Ruby 2.6 をテスト対象にしました ([#1242])
+* PDFMaker: review-jlreq で `zw` を使っている箇所を `\zw` に置き換えました。コラム内の段落は字下げするようにしました ([#1250])
+* PDFMaker: [#1254] で導入した `\reviewimagecaption` が定義されていないときにはデフォルトのマクロを提供するようにしました ([#1267])
+
+## ドキュメント
+* README.md: jsbook.cls のファイル名が誤っていたのを修正しました ([#1239])
+* config.yml.sample に back_footnote の説明を追加し、その他いくつかドキュメントに些末な更新を行いました ([#1268])
+
+## コントリビューターのみなさん
+* [@doublemarket](https://github.com/doublemarket)
+* [@munepi](https://github.com/munepi)
+
+[#1224]: https://github.com/kmuto/review/issues/1224
+[#1225]: https://github.com/kmuto/review/pull/1225
+[#1226]: https://github.com/kmuto/review/pull/1226
+[#1229]: https://github.com/kmuto/review/pull/1229
+[#1231]: https://github.com/kmuto/review/issues/1231
+[#1233]: https://github.com/kmuto/review/issues/1233
+[#1235]: https://github.com/kmuto/review/issues/1235
+[#1239]: https://github.com/kmuto/review/pull/1239
+[#1240]: https://github.com/kmuto/review/pull/1240
+[#1242]: https://github.com/kmuto/review/pull/1242
+[#1243]: https://github.com/kmuto/review/issues/1243
+[#1247]: https://github.com/kmuto/review/issues/1247
+[#1250]: https://github.com/kmuto/review/pull/1250
+[#1252]: https://github.com/kmuto/review/issues/1252
+[#1254]: https://github.com/kmuto/review/issues/1254
+[#1257]: https://github.com/kmuto/review/issues/1257
+[#1258]: https://github.com/kmuto/review/issues/1258
+[#1262]: https://github.com/kmuto/review/issues/1262
+[#1264]: https://github.com/kmuto/review/issues/1264
+[#1267]: https://github.com/kmuto/review/issues/1267
+[#1268]: https://github.com/kmuto/review/issues/1268
+[#1273]: https://github.com/kmuto/review/issues/1273
+
 # Version 3.0.0
 
 ## バグ修正

data/NEWS.md

@@ -1,3 +1,60 @@
+# Version 3.1.0
+## Breaking Changes
+* PDFMaker: introduce `\reviewimagecaption` macro for the caption of figure ([#1254]). Please update your review-base.sty by `review-update` command on your  Re:VIEW 3 project.
+* remove `--strip` option which is undocumented and doesn't work correctly from `review-preproc command` ([#1257])
+
+## Bug Fixes
+* PDFMaker: fix a problem that the section number of the part continues the section number in the previous chapter ([#1225],[#1226])
+* fix copying of gentombow.sty in samples folder ([#1229])
+* PDFMaker: fix that the number of lines specified by `number_of_lines` document option decrease by 1 line than originally on review-jsbook ([#1235])
+* PDFMaker: fix review-jlreq to work with LuaLaTeX ([#1243])
+* EPUBMaker: fix a problem that the hierachy of the table of contents become strange when there is a part ([#1262])
+* fix escaping of `//comment` ([#1264])
+* PDFMaker: fix overflowing when the left column of colophon is long ([#1252])
+* fix an error when CHAPS: is empty ([#1273])
+
+## Enhancements
+* PDFMaker: load amssymb, amsthm, and bm packages which are often used as extension of mathematical expression ([#1224])
+* HTMLBuilder: `emlist` and `listnum` now always pass `highlight` method as well as others ([#1231])
+* EPUBMaker: implement a back-link to the text from the footnote ([#1233])
+* PDFMaker: add `\makelines` macro to create a dummy line ([#1240])
+* implement `#@warn` correctly ([#1258])
+* `#@mapfile` now imports as is (keep tabs etc.) when imported file has `.re` extension ([#1247])
+* add Ruby 2.6 for the test coverage ([#1242])
+* PDFMaker: replace `zw` with `\zw` in review-jlreq. add a indent to paragraphs in the column ([#1250])
+* PDFMaker: when `\reviewimagecaption` is undefined (implemented in [#1254]), define it ([#1267])
+
+## Docs
+* README.md: fix the filename of jsbook.cls ([#1239])
+* add the note about `back_footnote` into config.yml.sample and update documents a little ([#1268])
+
+## Contributors
+* [@doublemarket](https://github.com/doublemarket)
+* [@munepi](https://github.com/munepi)
+
+[#1224]: https://github.com/kmuto/review/issues/1224
+[#1225]: https://github.com/kmuto/review/pull/1225
+[#1226]: https://github.com/kmuto/review/pull/1226
+[#1229]: https://github.com/kmuto/review/pull/1229
+[#1231]: https://github.com/kmuto/review/issues/1231
+[#1233]: https://github.com/kmuto/review/issues/1233
+[#1235]: https://github.com/kmuto/review/issues/1235
+[#1239]: https://github.com/kmuto/review/pull/1239
+[#1240]: https://github.com/kmuto/review/pull/1240
+[#1242]: https://github.com/kmuto/review/pull/1242
+[#1243]: https://github.com/kmuto/review/issues/1243
+[#1247]: https://github.com/kmuto/review/issues/1247
+[#1250]: https://github.com/kmuto/review/pull/1250
+[#1252]: https://github.com/kmuto/review/issues/1252
+[#1254]: https://github.com/kmuto/review/issues/1254
+[#1257]: https://github.com/kmuto/review/issues/1257
+[#1258]: https://github.com/kmuto/review/issues/1258
+[#1262]: https://github.com/kmuto/review/issues/1262
+[#1264]: https://github.com/kmuto/review/issues/1264
+[#1267]: https://github.com/kmuto/review/issues/1267
+[#1268]: https://github.com/kmuto/review/issues/1268
+[#1273]: https://github.com/kmuto/review/issues/1273
+
 # Version 3.0.0
 
 ## Bug Fixes

data/README.md

@@ -108,8 +108,8 @@ Exception:
 * jumoline.sty, vendor/jumoline: The LaTeX Project Public License. See [LPPL](https://github.com/kmuto/review/blob/master/vendor/jumoline/lppl.txt) file.
 * plistings.sty, vendor/plistings: MIT License. See [LICENSE](https://github.com/kmuto/review/blob/master/vendor/plistings/LICENSE) file.
 * gentombow.sty, vendor/gentombow: BSD License. See [LICENSE](https://github.com/kmuto/review/blob/master/vendor/gentombow/LICENSE) file.
-* jsbook.sty, vendor/jsclasses: BSD License. See [LICENSE](https://github.com/kmuto/review/blob/master/vendor/jsclasses/LICENSE) file.
+* jsbook.cls, vendor/jsclasses: BSD License. See [LICENSE](https://github.com/kmuto/review/blob/master/vendor/jsclasses/LICENSE) file.
 
 ## Copyright
 
-Copyright (c) 2006-2018 Minero Aoki, Kenshi Muto, Masayoshi Takahashi, Masanori Kado.
+Copyright (c) 2006-2019 Minero Aoki, Kenshi Muto, Masayoshi Takahashi, Masanori Kado.

data/bin/review-preproc

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2010-2014 Minero Aoki, Kenshi Muto
+# Copyright (c) 2010-2019 Minero Aoki, Kenshi Muto
 #               1999-2007 Minero Aoki
 #
 # This program is free software.
@@ -52,7 +52,6 @@ def main
   opts.on('-c', '--check', 'Check if preprocess is needed.') { mode = :check }
   opts.on('-d', '--diff', 'Show diff from current file.') { mode = :diff }
   opts.on('--replace', 'Replace file by preprocessed one.') { mode = :replace }
-  opts.on('-s', '--strip', 'Strip preprocessor tags.') { mode = :strip }
   opts.on('--tabwidth=WIDTH', "Replace tabs with space characters. (0: don't replace)") { |width| param['tabwidth'] = width.to_i }
   opts.on('--help', 'Print this message and quit.') do
     puts opts.help
@@ -88,10 +87,6 @@ def main
       ensure
         FileUtils.rm_f tmp
       end
-    when :strip
-      File.open(path) do |f|
-        ReVIEW::Preprocessor::Strip.new(f).each { |line| puts line }
-      end
     else
       raise "must not happen: #{mode}"
     end

data/doc/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2018 Minero Aoki, Kenshi Muto, Masayoshi Takahashi, Masanori Kado.
+Copyright (c) 2006-2019 Minero Aoki, Kenshi Muto, Masayoshi Takahashi, Masanori Kado.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/doc/config.yml.sample

@@ -72,7 +72,7 @@ aut: ["青木峰郎", "武藤健志", "高橋征義", "角征典"]
 # 日付の後ろを空白文字で区切り、任意の文字列を置くことも可能。
 # history: [["2016-04-20 v1.0.0版発行", "2018-11-11 v3.0.0版発行"]]
 # 権利表記(配列で複数指定可)
-# rights: (C) 2016-2018 Re:VIEW Developers
+# rights: (C) 2016-2019 Re:VIEW Developers
 # description: 説明
 # subject: 短い説明用タグ(配列で複数指定可)
 # type: 書籍のカテゴリーなど(配列で複数指定可)
@@ -306,6 +306,8 @@ epubmaker:
   # @<href>タグでの外部リンクを禁止し、地の文にする(falseで禁止する)
   # externallink: true
   #
+  # 脚注に「戻る」リンクを追加する(trueで追加)。脚注の記号および戻るリンクの記号はlocale.ymlで変更可能
+  # back_footnote: null
   # epubmaker:階層を使うものはここまで
 
 # LaTeX用のスタイルファイル(styディレクトリ以下に置くこと)

data/doc/config.yml.sample-simple

@@ -22,7 +22,7 @@ pbl: "Re:VIEW Publishing inc."
 prt: "Re:VIEW Printing inc."
 date: 2018-11-11
 history: [["2012-01-30"],["2016-04-20","2016-05-03"],["2018-11-11"]]
-rights: (C) 2016-2018 Re:VIEW Commiters, some rights reserved.
+rights: (C) 2016-2019 Re:VIEW Commiters, some rights reserved.
 description: sample config.yml file for Re:VIEW book
 urnid: urn:uid:http://reviewml.org/review-sample-book
 # isbn: null
@@ -65,6 +65,7 @@ epubmaker:
   htmlext: xhtml
   cover_linear: true
   externallink: true
+  # back_footnote: true
 
 ## for LaTeX
 

data/doc/quickstart.ja.md

@@ -223,13 +223,13 @@ INFO: 新しいファイル /.../sty/review-custom.sty が作成されました
 INFO: 新しいファイル /.../sty/review-jsbook.cls が作成されました。
 INFO: 新しいファイル /.../sty/review-style.sty が作成されました。
 INFO: 新しいファイル /.../sty/review-base.sty が作成されました。
-INFO: 新しいファイル /.../sty/gentombow09j.sty が作成されました。
+INFO: 新しいファイル /.../sty/gentombow.sty が作成されました。
 完了しました。
 ```
 
 ## クレジット
 
-Re:VIEW は、青木峰郎によって最初に作成されました。武藤健志がこの開発・保守を引き継ぎ、2018年11月時点では、武藤健志、高橋征義、角征典が開発・保守を継続しています。
+Re:VIEW は、青木峰郎によって最初に作成されました。武藤健志がこの開発・保守を引き継ぎ、2019年2月時点では、武藤健志、高橋征義、角征典が開発・保守を継続しています。
 
 バグ・パッチの報告、開発者用メーリングリストなどについての情報は、
 

data/doc/quickstart.md

@@ -225,13 +225,13 @@ INFO: new file /.../sty/review-custom.sty is created.
 INFO: new file /.../sty/review-jsbook.cls is created.
 INFO: new file /.../sty/review-style.sty is created.
 INFO: new file /.../sty/review-base.sty is created.
-INFO: new file /.../sty/gentombow09j.sty is created.
+INFO: new file /.../sty/gentombow.sty is created.
 Finished.
 ```
 
 ## Copyright
 
-The original author of Re:VIEW is Minero Aoki. The current maintainer is Kenshi Muto(@kmuto), and committers are Masayoshi Takahashi and Masanori Kado (September 2018).
+The original author of Re:VIEW is Minero Aoki. The current maintainer is Kenshi Muto(@kmuto), and committers are Masayoshi Takahashi and Masanori Kado (February 2019).
 
 If you want to report bugs and patches, or to get more information, see:
 

data/lib/epubmaker/epubcommon.rb

@@ -1,6 +1,6 @@
 # = epubcommon.rb -- super class for EPUBv2 and EPUBv3
 #
-# Copyright (c) 2010-2017 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2019 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -327,8 +327,14 @@ EOT
 
       if has_part
         @producer.contents.each do |item|
-          item.level += 1 if item.chaptype == 'part' || item.chaptype == 'body'
-          item.notoc = true if (item.chaptype == 'pre' || item.chaptype == 'post') && !item.level.nil? && (item.level + 1 == toclevel) # FIXME: part processing
+          if item.chaptype == 'part' && item.level > 0
+            # sections in part
+            item.level -= 1
+          end
+          # down level for part and chaps. pre, appendix, post are preserved
+          if item.chaptype == 'part' || item.chaptype == 'body'
+            item.level += 1
+          end
         end
         toclevel += 1
       end

data/lib/epubmaker/producer.rb

@@ -269,7 +269,8 @@ module EPUBMaker
           'rename_for_legacy' => nil,
           'verify_target_images' => nil,
           'force_include_images' => [],
-          'cover_linear' => nil
+          'cover_linear' => nil,
+          'back_footnote' => nil
         },
         'externallink' => true,
         'contentdir' => '.',

data/lib/review/catalog.rb

@@ -50,7 +50,7 @@ module ReVIEW
     end
 
     def parts_with_chaps
-      return '' unless @yaml['CHAPS']
+      return [] unless @yaml['CHAPS']
       @yaml['CHAPS'].flatten.compact
     end
 

data/lib/review/epubmaker.rb

@@ -330,6 +330,8 @@ module ReVIEW
       elsif chap.on_predef?
         chaptype = 'pre'
       elsif chap.on_appendix?
+        chaptype = 'appendix'
+      elsif chap.on_postdef?
         chaptype = 'post'
       end
 

data/lib/review/htmlbuilder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2018 Minero Aoki, Kenshi Muto, Masayoshi Takahashi,
+# Copyright (c) 2008-2019 Minero Aoki, Kenshi Muto, Masayoshi Takahashi,
 #                         KADO Masanori
 #               2002-2007 Minero Aoki
 #
@@ -435,20 +435,20 @@ module ReVIEW
     end
 
     def listnum_body(lines, lang)
+      body = lines.inject('') { |i, j| i + detab(j) + "\n" }
+      lexer = lang
+      first_line_number = line_num
+      hs = highlight(body: body, lexer: lexer, format: 'html', linenum: true,
+                     options: { linenostart: first_line_number })
+
       if highlight?
-        body = lines.inject('') { |i, j| i + detab(j) + "\n" }
-        lexer = lang
-        first_line_number = line_num
-        puts highlight(body: body, lexer: lexer, format: 'html', linenum: true,
-                       options: { linenostart: first_line_number })
+        puts hs
       else
         class_names = ['list']
         class_names.push("language-#{lang}") unless lang.blank?
-        class_names.push('highlight') if highlight?
         print %Q(<pre class="#{class_names.join(' ')}">)
-        first_line_num = line_num
-        lines.each_with_index do |line, i|
-          puts detab((i + first_line_num).to_s.rjust(2) + ': ' + line)
+        hs.split("\n").each_with_index do |line, i|
+          puts detab((i + first_line_number).to_s.rjust(2) + ': ' + line)
         end
         puts '</pre>'
       end
@@ -476,20 +476,20 @@ module ReVIEW
         puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
       end
 
+      body = lines.inject('') { |i, j| i + detab(j) + "\n" }
+      lexer = lang
+      first_line_number = line_num
+      hs = highlight(body: body, lexer: lexer, format: 'html', linenum: true,
+                     options: { linenostart: first_line_number })
       if highlight?
-        body = lines.inject('') { |i, j| i + detab(j) + "\n" }
-        lexer = lang
-        first_line_number = line_num
-        puts highlight(body: body, lexer: lexer, format: 'html', linenum: true,
-                       options: { linenostart: first_line_number })
+        puts hs
       else
         class_names = ['emlist']
         class_names.push("language-#{lang}") unless lang.blank?
         class_names.push('highlight') if highlight?
         print %Q(<pre class="#{class_names.join(' ')}">)
-        first_line_num = line_num
-        lines.each_with_index do |line, i|
-          puts detab((i + first_line_num).to_s.rjust(2) + ': ' + line)
+        hs.split("\n").each_with_index do |line, i|
+          puts detab((i + first_line_number).to_s.rjust(2) + ': ' + line)
         end
         puts '</pre>'
       end
@@ -748,16 +748,21 @@ module ReVIEW
     end
 
     def comment(lines, comment = nil)
-      lines ||= []
-      lines.unshift comment unless comment.blank?
       return unless @book.config['draft']
+      lines ||= []
+      lines.unshift escape(comment) unless comment.blank?
       str = lines.join('<br />')
-      puts %Q(<div class="draft-comment">#{escape(str)}</div>)
+      puts %Q(<div class="draft-comment">#{str}</div>)
     end
 
     def footnote(id, str)
       if @book.config['epubversion'].to_i == 3
-        puts %Q(<div class="footnote" epub:type="footnote" id="fn-#{normalize_id(id)}"><p class="footnote">[*#{@chapter.footnote(id).number}] #{compile_inline(str)}</p></div>)
+        back = ''
+        if @book.config['epubmaker'] && @book.config['epubmaker']['back_footnote']
+          back = %Q(<a href="#fnb-#{normalize_id(id)}">#{I18n.t('html_footnote_backmark')}</a>)
+        end
+        # XXX: back link must be located at first of p for Kindle.
+        puts %Q(<div class="footnote" epub:type="footnote" id="fn-#{normalize_id(id)}"><p class="footnote">#{back}#{I18n.t('html_footnote_textmark', @chapter.footnote(id).number)}#{compile_inline(str)}</p></div>)
       else
         puts %Q(<div class="footnote" id="fn-#{normalize_id(id)}"><p class="footnote">[<a href="#fnb-#{normalize_id(id)}">*#{@chapter.footnote(id).number}</a>] #{compile_inline(str)}</p></div>)
       end
@@ -862,7 +867,7 @@ module ReVIEW
 
     def inline_fn(id)
       if @book.config['epubversion'].to_i == 3
-        %Q(<a id="fnb-#{normalize_id(id)}" href="#fn-#{normalize_id(id)}" class="noteref" epub:type="noteref">*#{@chapter.footnote(id).number}</a>)
+        %Q(<a id="fnb-#{normalize_id(id)}" href="#fn-#{normalize_id(id)}" class="noteref" epub:type="noteref">#{I18n.t('html_footnote_refmark', @chapter.footnote(id).number)}</a>)
       else
         %Q(<a id="fnb-#{normalize_id(id)}" href="#fn-#{normalize_id(id)}" class="noteref">*#{@chapter.footnote(id).number}</a>)
       end

data/lib/review/i18n.yml

@@ -29,6 +29,9 @@ ja:
   ruby_postfix: "）"
   external_link: "%s（%s）"
   label_marker: "●●　"
+  html_footnote_refmark: "*%s"
+  html_footnote_textmark: "[*%s] "
+  html_footnote_backmark: "⏎"
   aut: "著　者"
   csl: "監　修"
   dsr: "デザイン"
@@ -114,6 +117,9 @@ en:
   ruby_prefix: "("
   ruby_postfix: ")"
   label_marker: "●●　"
+  html_footnote_refmark: "*%s"
+  html_footnote_textmark: "[*%s] "
+  html_footnote_backmark: "⏎"
   aut: "Author"
   csl: "Consultant"
   dsr: "Design"
@@ -179,6 +185,9 @@ zh-TW:
   ruby_postfix: "）"
   external_link: "%s (%s)"
   label_marker: "●●　"
+  html_footnote_refmark: "*%s"
+  html_footnote_textmark: "[*%s] "
+  html_footnote_backmark: "⏎"
   aut: "著作人"
   csl: "監　修"
   dsr: "美術編輯"

data/lib/review/idgxmlbuilder.rb

@@ -581,11 +581,11 @@ module ReVIEW
     end
 
     def comment(lines, comment = nil)
-      return true unless @book.config['draft']
+      return unless @book.config['draft']
       lines ||= []
-      lines.unshift comment unless comment.blank?
+      lines.unshift escape(comment) unless comment.blank?
       str = lines.join("\n")
-      print "<msg>#{escape(str)}</msg>"
+      print "<msg>#{str}</msg>"
     end
 
     def inline_comment(str)

data/lib/review/latexbuilder.rb

@@ -1,6 +1,6 @@
 # Copyright (c) 2002-2007 Minero Aoki
 #               2008-2009 Minero Aoki, Kenshi Muto
-#               2010-2018 Minero Aoki, Kenshi Muto, TAKAHASHI Masayoshi
+#               2010-2019 Minero Aoki, Kenshi Muto, TAKAHASHI Masayoshi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -477,7 +477,12 @@ module ReVIEW
         puts "\\includegraphics[width=\\maxwidth]{#{@chapter.image(id).path}}"
       end
       @doc_status[:caption] = true
-      puts macro('caption', compile_inline(caption)) if caption.present?
+
+      if @book.config.check_version('2', exception: false)
+        puts macro('caption', compile_inline(caption)) if caption.present?
+      else
+        puts macro('reviewimagecaption', compile_inline(caption)) if caption.present?
+      end
       @doc_status[:caption] = nil
       puts macro('label', image_label(id))
       puts '\end{reviewimage}'
@@ -493,7 +498,11 @@ module ReVIEW
       end
       puts macro('label', image_label(id))
       @doc_status[:caption] = true
-      puts macro('caption', compile_inline(caption)) if caption.present?
+      if @book.config.check_version('2', exception: false)
+        puts macro('caption', compile_inline(caption)) if caption.present?
+      else
+        puts macro('reviewimagecaption', compile_inline(caption)) if caption.present?
+      end
       @doc_status[:caption] = nil
       puts '\end{reviewdummyimage}'
     end
@@ -853,13 +862,13 @@ module ReVIEW
     end
 
     def comment(lines, comment = nil)
+      return true unless @book.config['draft']
       lines ||= []
       unless comment.blank?
-        lines.unshift comment
+        lines.unshift escape(comment)
       end
-      return true unless @book.config['draft']
       str = lines.join('\par ')
-      puts macro('pdfcomment', escape(str))
+      puts macro('pdfcomment', str)
     end
 
     def hr

data/lib/review/preprocessor.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2017 Minero Aoki, Kenshi Muto
+# Copyright (c) 2010-2019 Minero Aoki, Kenshi Muto
 #               2002-2009 Minero Aoki
 #
 # This program is free software.
@@ -69,6 +69,7 @@ module ReVIEW
       @repository = repo
       @config = param
       @logger = ReVIEW.logger
+      @leave_content = nil
     end
 
     def process(inf, outf)
@@ -106,6 +107,7 @@ module ReVIEW
         when /\A\#@mapfile/
           direc = parse_directive(line, 1, 'eval')
           path = expand(direc.arg)
+          @leave_content = File.extname(path) == '.re'
           if direc['eval']
             ent = evaluate(path, ent)
           else
@@ -116,6 +118,7 @@ module ReVIEW
         when /\A\#@map(?:range)?/
           direc = parse_directive(line, 2, 'unindent')
           path = expand(direc.args[0])
+          @leave_content = File.extname(path) == '.re'
           ent = @repository.fetch_range(path, direc.args[1]) or
             error "unknown range: #{path}: #{direc.args[1]}"
           ent = (direc['unindent'] ? unindent(ent, direc['unindent']) : ent)
@@ -127,6 +130,9 @@ module ReVIEW
         when /\A\#@/
           op = line.slice(/@(\w+)/, 1)
           warn "unknown directive: #{line.strip}" unless known_directive?(op)
+          if op == 'warn'
+            warn line.strip.sub(/\#@warn\((.+)\)/, '\1')
+          end
           @f.print line
 
         when /\A\s*\z/ # empty line
@@ -166,9 +172,11 @@ module ReVIEW
           @f.print line
           return nil
         when %r{\A//\}}
-          warn '//} seen in list'
-          @f.print line
-          return nil
+          unless @leave_content
+            warn '//} seen in list'
+            @f.print line
+            return nil
+          end
         when /\A\#@\w/
           warn "#{line.slice(/\A\#@\w+/)} seen in list"
           @f.print line
@@ -357,6 +365,7 @@ module ReVIEW
     private
 
     def file_descripter(fname)
+      @leave_content = File.extname(fname) == '.re'
       return @repository[fname] if @repository[fname]
 
       @repository[fname] = git?(fname) ? parse_git_blob(fname) : parse_file(fname)
@@ -455,6 +464,10 @@ module ReVIEW
     end
 
     def canonical(line)
+      if @leave_content
+        return line
+      end
+
       tabwidth = @config['tabwidth'] || 8
       if tabwidth > 0
         detab(line, tabwidth).rstrip + "\n"

data/lib/review/topbuilder.rb

@@ -240,7 +240,7 @@ module ReVIEW
       unless comment.blank?
         lines.unshift comment
       end
-      str = lines.join
+      str = lines.join("\n")
       puts "◆→#{str}←◆"
     end
 

data/lib/review/version.rb

@@ -1,3 +1,3 @@
 module ReVIEW
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.1.0'.freeze
 end

data/review.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.summary     = 'Re:VIEW: a easy-to-use digital publishing system'
   gem.description = 'Re:VIEW is a digital publishing system for books and ebooks. It supports InDesign, EPUB and LaTeX.'
   gem.required_rubygems_version = Gem::Requirement.new('>= 0') if gem.respond_to? :required_rubygems_version=
-  gem.date = '2018-11-30'
+  gem.date = '2019-02-28'
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/samples/sample-book/src/lib/tasks/z01_copy_sty.rake

@@ -9,9 +9,9 @@ task :copy_sty do
   Dir.glob(File.join(jsbook_dir, 'review-*.sty')) do |file|
     FileUtils.cp file, 'sty'
   end
-  FileUtils.cp File.join(gentombow_dir, 'gentombow.sty'), 'sty/gentombow09j.sty'
+  FileUtils.cp File.join(gentombow_dir, 'gentombow.sty'), 'sty/gentombow.sty'
 end
 
-CLEAN.include([Dir.glob('sty/review-*.sty'), 'sty/review-jsbook.cls', 'sty/gentombow09j.sty'])
+CLEAN.include([Dir.glob('sty/review-*.sty'), 'sty/review-jsbook.cls', 'sty/gentombow.sty'])
 
 Rake::Task[BOOK_PDF].enhance([:copy_sty])

data/samples/syntax-book/lib/tasks/z01_copy_sty.rake

@@ -9,9 +9,9 @@ task :copy_sty do
   Dir.glob(File.join(jsbook_dir, 'review-*.sty')) do |file|
     FileUtils.cp file, 'sty'
   end
-  FileUtils.cp File.join(gentombow_dir, 'gentombow.sty'), 'sty/gentombow09j.sty'
+  FileUtils.cp File.join(gentombow_dir, 'gentombow.sty'), 'sty/gentombow.sty'
 end
 
-CLEAN.include([Dir.glob('sty/review-*.sty'), 'sty/review-jsbook.cls', 'sty/gentombow09j.sty'])
+CLEAN.include([Dir.glob('sty/review-*.sty'), 'sty/review-jsbook.cls', 'sty/gentombow.sty'])
 
 Rake::Task[BOOK_PDF].enhance([:copy_sty])

data/templates/latex/config.erb

@@ -98,4 +98,10 @@
 \def\reviewusepart{true}
 <%- end -%>
 
+\def\reviewbackcompatibilityhook{
+  \@ifundefined{reviewimagecaption}{% for 3.0.0 compatibility
+    \newcommand{\reviewimagecaption}[1]{\caption{##1}}
+  }
+}
+
 \makeatother

data/templates/latex/layout.tex.erb

@@ -6,6 +6,9 @@
 <%-   end -%>
 <%- end -%>
 
+%% backward compatibility (defined in config.erb)
+\reviewbackcompatibilityhook
+
 \begin{document}
 
 %% begindocument hook

data/templates/latex/review-jlreq/review-base.sty

@@ -59,11 +59,12 @@
 \begin{reviewtablesetup}\begin{tabular}{#1}}%
 {\end{tabular}\end{reviewtablesetup}}
 
+\newcommand\reviewimagecaption[1]{\caption{#1}}
 \newcommand*\reviewimgtablecaption[1]{\caption{#1}}
 
 % コラム
 \newenvironment{reviewcolumn}[1][COLUMN]{%
-  \begin{tcolorbox}[skin=enhanced jigsaw,breakable,boxrule=0.2mm,arc=2mm,colback=white,colframe=black!100!white,title={\sffamily\bfseries #1}]\par}
+  \begin{tcolorbox}[skin=enhanced jigsaw,breakable,boxrule=0.2mm,arc=2mm,colback=white,colframe=black!100!white,before upper={\parindent1\zw},title={\sffamily\bfseries #1}]\par}
  {\end{tcolorbox}}
 
 \newcommand{\reviewbackslash}[0]{\textbackslash{}}
@@ -107,6 +108,7 @@
 \renewcommand{\contentsname}{\review@toctitle}
 
 \newenvironment{reviewpart}{%
+\setcounter{section}{0}%
 \renewcommand{\thesection}{\thepart.\@arabic\c@section}%
 }{}
 
@@ -246,11 +248,7 @@
        \thispagestyle{empty}
        \begin{center}%
        \mbox{}%
-       \ifx\review@jlreq@driver\review@jlreq@driver@luatex
-         \vskip5\zw
-       \else
-         \vskip5zw
-       \fi
+       \vskip5\zw
        \reviewtitlefont%
        {\Huge\review@booktitlename\par}%
        \ifdefined\review@subtitlename
@@ -265,11 +263,7 @@
        \end{tabular}\par}%
        \vfill
        {\large\review@date \review@intn@edition%
-         \ifx\review@jlreq@driver\review@jlreq@driver@luatex
-           \hspace{2\zw}%
-         \else
-           \hspace{2zw}%
-         \fi
+         \hspace{2\zw}%
          \review@intn@publishedby\par}%
        \vskip4\zw\mbox{}
        \end{center}%
@@ -314,9 +308,9 @@
 \rule[8pt]{\textwidth}{1pt} \\
 {\noindent\review@pubhistories}
 
-\begin{tabular}{p{3em}p{\dimexpr\textwidth-6em}}
+\begin{tabularx}{\dimexpr\textwidth-0.5em}{lX}
 \review@colophonnames
-\end{tabular}
+\end{tabularx}
 　\\
 \rule[0pt]{\textwidth}{1pt} \\
 \ifdefined\review@rights

data/templates/latex/review-jlreq/review-jlreq.cls

@@ -1,5 +1,5 @@
 %#!ptex2pdf -l -u -ot '-synctex=1' test-rejlreqbk
-% Copyright (c) 2018 Kenshi Muto.
+% Copyright (c) 2018-2019 Kenshi Muto.
 %
 % Permission is hereby granted, free of charge, to any person obtaining a copy
 % of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 % THE SOFTWARE.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{review-jlreq}[2018/10/05 Re:VIEW pLaTeX class modified for jlreq.
+\ProvidesClass{review-jlreq}[2019/01/01 Re:VIEW pLaTeX class modified for jlreq.
 cls]
 
 %% hook at end of reviewmacro
@@ -92,7 +92,7 @@ cls]
     \edef\recls@tmp{\thepage}%
     \lower\dimexpr4pt+\recls@tombobleed+.5\paperheight+5\p@\hbox{%
       \vbox{\expandafter\@tfor\expandafter\recls@x\expandafter:\expandafter=\recls@tmp\do{%
-        \hbox to 1zw{\hss\recls@x\hss}}}}}%
+        \hbox to 1\zw{\hss\recls@x\hss}}}}}%
   \ifodd\c@page
     \rlap{\recls@hiddfolio}%
   \else
@@ -161,7 +161,7 @@ cls]
 \def\recls@engine{}
 \def\recls@driver{}
 \ifdefined\jlreq@trimmarks@engine
-  \ifx l\jlreq@trimmarks@engine\def\recls@engine{lualatex}\fi
+  \ifx l\jlreq@trimmarks@engine\def\recls@engine{lualatex}\def\recls@driver{luatex}\fi
   \ifx u\jlreq@trimmarks@engine\def\recls@engine{uplatex}\fi
   \ifx p\jlreq@trimmarks@engine\def\recls@engine{platex}\fi
 \else% jlreqから持ってくる
@@ -194,14 +194,22 @@ cls]
 \RequirePackage[\recls@driver]{graphicx}
 \RequirePackage[\recls@driver,table]{xcolor}
 
-\RequirePackage[T1]{fontenc}
+% luatex固有
+\def\recls@tmp{luatex}\ifx\recls@tmp\recls@driver
+  \DeclareGraphicsRule{.ai}{pdf}{.ai}{}
+  \usepackage[no-math]{fontspec}
+\else
+  \RequirePackage[T1]{fontenc}
+  \RequirePackage{lmodern}%\ttdefault: lmtt
+\fi
+
 \RequirePackage{textcomp}%T1/TS1
-\RequirePackage{lmodern}%\ttdefault: lmtt
 \RequirePackage{tikz}
 \usetikzlibrary{calc}
 \RequirePackage{multirow}
 \RequirePackage{amsmath}
 \RequirePackage{amssymb}
+\RequirePackage{amsthm}
 \RequirePackage{needspace}
 \RequirePackage{alltt}
 \RequirePackage{float}
@@ -211,14 +219,20 @@ cls]
 \RequirePackage{tcolorbox}
 \tcbuselibrary{xparse,hooks,skins,breakable}
 \RequirePackage{ulem}
+\RequirePackage{tabularx}
 
-\RequirePackage[dvipdfmx, \if@pdfhyperlink\else draft,\fi
+\def\recls@tmp{luatex}
+\RequirePackage[\recls@driver, \if@pdfhyperlink\else draft,\fi
+  \ifx\recls@tmp\recls@driver unicode,\fi
   bookmarks=true,
   bookmarksnumbered=true,
   hidelinks,
   setpagesize=false,
 ]{hyperref}
-\RequirePackage[\recls@driver]{pxjahyper}
+
+\def\recls@tmp{uplatex}\ifx\recls@tmp\recls@engine
+  \RequirePackage[\recls@driver]{pxjahyper}
+\fi
 
 %% include fullpage graphics
 \edef\grnchry@head{\dimexpr\topmargin+1in+\headheight+\headsep}
@@ -259,6 +273,25 @@ cls]
   \hbox{}\thispagestyle{empty}\newpage\if@twocolumn\hbox{}\newpage\fi\fi\fi}
 \let\clearoddpage\cleardoublepage@left
 
+%% 行のサンプル。\makelines{行数} で「■□■□…」からなる行を指定行数配置する
+\def\makelines#1{%
+  \@tempcnta\z@\relax
+  \def\@makeline@f@size{\f@size}%
+  \@whilenum\@tempcnta<#1\do{%
+    \advance\@tempcnta\@ne\relax
+    \noindent\rlap{\the\@tempcnta}\nobreak
+    \makelines@neline\par}%
+}
+\def\makelines@unit@#10#2\relax{%
+  \ifx!#2!\relax □\else\relax ■\fi}%
+\newcounter{makelines@unit}
+\def\makelines@neline{%
+  \c@makelines@unit\@ne
+  \@whilenum\c@makelines@unit<\dimexpr(\textwidth + \Cwd)/\Cwd\do{%
+    \expandafter\makelines@unit@\the\c@makelines@unit0\relax
+  \advance\c@makelines@unit\@ne}%
+}
+
 % シンプルな通しノンブル
 \ifrecls@serialpage
   \jlreqsetup{frontmatter_pagination=continuous}
@@ -283,5 +316,23 @@ cls]
   \if@restonecol\twocolumn\else\newpage\fi
 }
 
+% pdfpagesのトンボずれへの対処
+\if@pdftombo
+  \def\recls@patch@pdfpages{%
+    \patchcmd{\AM@output}{%
+      \setlength{\@tempdima}{\AM@xmargin}%
+      \edef\AM@xmargin{\the\@tempdima}%
+      \setlength{\@tempdima}{\AM@ymargin}%
+      \edef\AM@ymargin{\the\@tempdima}%
+    }{%
+      \setlength{\@tempdima}{\AM@xmargin+1in}%
+      \edef\AM@xmargin{\the\@tempdima}%
+      \setlength{\@tempdima}{\AM@ymargin-1in}%
+      \edef\AM@ymargin{\the\@tempdima}%
+    }%
+  }{\message{patch for pdfpages applied}}{}
+  \AtBeginDocument{\@ifpackageloaded{pdfpages}{\recls@patch@pdfpages}{}}
+\fi
+
 \listfiles
 \endinput

data/templates/latex/review-jsbook/review-base.sty

@@ -34,6 +34,10 @@
 \RequirePackage{float}
 \RequirePackage{alltt}
 \RequirePackage{amsmath}
+\RequirePackage{amssymb}
+\RequirePackage{amsthm}
+\RequirePackage{bm}
+\RequirePackage{tabularx}
 
 %% if you use @<u>{} (underline), use jumoline.sty
 \IfFileExists{jumoline.sty}{
@@ -165,6 +169,9 @@
 \WithSuffix\newcommand\reviewtablecaption*[1]{%
   \caption*{#1}}
 
+\newcommand\reviewimagecaption[1]{%
+  \caption{#1}}
+
 \newcommand{\reviewimgtablecaption}[1]{%
   \caption{#1}\vspace{-3mm}}
 
@@ -198,6 +205,7 @@
 \newcommand{\reviewsecref}[2]{#1}
 
 \newenvironment{reviewpart}{%
+\setcounter{section}{0}%
 \renewcommand{\thesection}{\thepart.\@arabic\c@section}%
 }{}
 
@@ -414,9 +422,9 @@
 \rule[8pt]{\textwidth}{1pt} \\
 {\noindent\review@pubhistories}
 
-\begin{tabular}{p{3em}p{\dimexpr\textwidth-6em}}
+\begin{tabularx}{\dimexpr\textwidth-0.5em}{lX}
 \review@colophonnames
-\end{tabular}
+\end{tabularx}
 　\\
 \rule[0pt]{\textwidth}{1pt} \\
 \ifdefined\review@rights

data/templates/latex/review-jsbook/review-jsbook.cls

@@ -331,7 +331,7 @@
 \ifx\recls@number@of@lines\@empty\else
   \setlength\textheight{\recls@number@of@lines\Cvs}
   \addtolength\textheight{-\Cvs}\addtolength\textheight{\Cwd}
-  \addtolength\textheight{1H}
+  \addtolength\textheight{\dimexpr\topskip-\Cht}%%adjustment for jsbook.cls's \topskip
 \fi
 
 %% ノド、小口
@@ -429,6 +429,25 @@
   \hbox{}\thispagestyle{empty}\newpage\if@twocolumn\hbox{}\newpage\fi\fi\fi}
 \let\clearoddpage\cleardoublepage@left
 
+%% 行のサンプル。\makelines{行数} で「■□■□…」からなる行を指定行数配置する
+\def\makelines#1{%
+  \@tempcnta\z@\relax
+  \def\@makeline@f@size{\f@size}%
+  \@whilenum\@tempcnta<#1\do{%
+    \advance\@tempcnta\@ne\relax
+    \noindent\rlap{\the\@tempcnta}\nobreak
+    \makelines@neline\par}%
+}
+\def\makelines@unit@#10#2\relax{%
+  \ifx!#2!\relax □\else\relax ■\fi}%
+\newcounter{makelines@unit}
+\def\makelines@neline{%
+  \c@makelines@unit\@ne
+  \@whilenum\c@makelines@unit<\dimexpr(\textwidth + \Cwd)/\Cwd\do{%
+    \expandafter\makelines@unit@\the\c@makelines@unit0\relax
+  \advance\c@makelines@unit\@ne}%
+}
+
 %% coverオプションによる表紙判定の上書き
 \def\recls@tmp{true}\ifx\recls@forcecover\recls@tmp
 \@reclscovertrue

data/test/assets/test_template.tex

@@ -44,9 +44,18 @@
 \def\reviewappendixfiles{}
 \def\reviewpostdeffiles{}
 
+\def\reviewbackcompatibilityhook{
+  \@ifundefined{reviewimagecaption}{% for 3.0.0 compatibility
+    \newcommand{\reviewimagecaption}[1]{\caption{##1}}
+  }
+}
+
 \makeatother
 
 
+%% backward compatibility (defined in config.erb)
+\reviewbackcompatibilityhook
+
 \begin{document}
 
 %% begindocument hook

data/test/assets/test_template_backmatter.tex

@@ -55,9 +55,18 @@ some ad content
 \def\reviewappendixfiles{}
 \def\reviewpostdeffiles{}
 
+\def\reviewbackcompatibilityhook{
+  \@ifundefined{reviewimagecaption}{% for 3.0.0 compatibility
+    \newcommand{\reviewimagecaption}[1]{\caption{##1}}
+  }
+}
+
 \makeatother
 
 
+%% backward compatibility (defined in config.erb)
+\reviewbackcompatibilityhook
+
 \begin{document}
 
 %% begindocument hook

data/test/test_htmlbuilder.rb

@@ -13,6 +13,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     @config['secnolevel'] = 2
     @config['stylesheet'] = nil
     @config['htmlext'] = 'html'
+    @config['epubmaker'] = {}
     @book = Book::Base.new('.')
     @book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
@@ -1590,17 +1591,33 @@ EOS
     assert_equal expected, actual
   end
 
-  def test_inline_fn
+  def test_footnote
     fn = Book::FootnoteIndex.parse(['//footnote[foo][bar\\a\\$buz]'])
     @chapter.instance_eval { @footnote_index = fn }
     actual = compile_block("//footnote[foo][bar\\a\\$buz]\n")
     expected = <<-'EOS'
 <div class="footnote" epub:type="footnote" id="fn-foo"><p class="footnote">[*1] bar\a\$buz</p></div>
+EOS
+    assert_equal expected, actual
+
+    @book.config['epubmaker'] ||= {}
+    @book.config['epubmaker']['back_footnote'] = true
+    actual = compile_block("//footnote[foo][bar\\a\\$buz]\n")
+    expected = <<-'EOS'
+<div class="footnote" epub:type="footnote" id="fn-foo"><p class="footnote"><a href="#fnb-foo">⏎</a>[*1] bar\a\$buz</p></div>
+EOS
+    assert_equal expected, actual
+
+    I18n.set('html_footnote_textmark', '+%s:')
+    I18n.set('html_footnote_backmark', '←')
+    actual = compile_block("//footnote[foo][bar\\a\\$buz]\n")
+    expected = <<-'EOS'
+<div class="footnote" epub:type="footnote" id="fn-foo"><p class="footnote"><a href="#fnb-foo">←</a>+1:bar\a\$buz</p></div>
 EOS
     assert_equal expected, actual
   end
 
-  def test_inline_fn_with_tricky_id
+  def test_footnote_with_tricky_id
     fn = Book::FootnoteIndex.parse(['//footnote[123 あ_;][bar\\a\\$buz]'])
     @chapter.instance_eval { @footnote_index = fn }
     actual = compile_block("//footnote[123 あ_;][bar\\a\\$buz]\n")
@@ -1610,6 +1627,22 @@ EOS
     assert_equal expected, actual
   end
 
+  def test_inline_fn
+    book = ReVIEW::Book::Base.load
+    book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re])
+    io1 = StringIO.new("//footnote[foo][bar]\n")
+    chap1 = ReVIEW::Book::Chapter.new(book, 1, 'ch1', 'ch1.re', io1)
+    book.parts = [ReVIEW::Book::Part.new(self, nil, [chap1])]
+    builder = ReVIEW::HTMLBuilder.new
+    comp = ReVIEW::Compiler.new(builder)
+    builder.bind(comp, chap1, nil)
+    fn = builder.inline_fn('foo')
+    assert_equal '<a id="fnb-foo" href="#fn-foo" class="noteref" epub:type="noteref">*1</a>', fn
+    I18n.set('html_footnote_refmark', '+%s')
+    fn = builder.inline_fn('foo')
+    assert_equal '<a id="fnb-foo" href="#fn-foo" class="noteref" epub:type="noteref">+1</a>', fn
+  end
+
   def test_inline_hd
     book = ReVIEW::Book::Base.load
     book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re ch2.re])
@@ -1725,8 +1758,10 @@ EOS
 
   def test_comment_for_draft
     @config['draft'] = true
-    actual = compile_block('//comment[コメント]')
-    assert_equal %Q(<div class="draft-comment">コメント</div>\n), actual
+    actual = compile_block('//comment[コメント<]')
+    assert_equal %Q(<div class="draft-comment">コメント&lt;</div>\n), actual
+    actual = compile_block("//comment{\nA<>\nB&\n//}")
+    assert_equal %Q(<div class="draft-comment">A&lt;&gt;<br />B&amp;</div>\n), actual
   end
 
   def test_inline_comment

data/test/test_idgxmlbuilder.rb

@@ -721,8 +721,10 @@ EOS
 
   def test_comment_for_draft
     @config['draft'] = true
-    actual = compile_block('//comment[コメント]')
-    assert_equal '<msg>コメント</msg>', actual
+    actual = compile_block('//comment[コメント<]')
+    assert_equal '<msg>コメント&lt;</msg>', actual
+    actual = compile_block("//comment{\nA<>\nB&\n//}")
+    assert_equal %Q(<msg>A&lt;&gt;\nB&amp;</msg>), actual
   end
 
   def test_inline_comment

data/test/test_latexbuilder.rb

@@ -450,7 +450,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     end
 
     actual = compile_block("//image[sampleimg][sample photo]{\n//}\n")
-    assert_equal %Q(\\begin{reviewimage}%%sampleimg\n\\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n), actual
+    assert_equal %Q(\\begin{reviewimage}%%sampleimg\n\\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}\n\\reviewimagecaption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n), actual
   end
 
   def test_image_with_metric
@@ -461,7 +461,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     end
 
     actual = compile_block("//image[sampleimg][sample photo][scale=1.2]{\n//}\n")
-    assert_equal %Q(\\begin{reviewimage}%%sampleimg\n\\includegraphics[scale=1.2]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n), actual
+    assert_equal %Q(\\begin{reviewimage}%%sampleimg\n\\includegraphics[scale=1.2]{./images/chap1-sampleimg.png}\n\\reviewimagecaption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n), actual
   end
 
   def test_image_with_metric_width
@@ -473,7 +473,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
 
     @config['image_scale2width'] = true
     actual = compile_block("//image[sampleimg][sample photo][scale=1.2]{\n//}\n")
-    assert_equal %Q(\\begin{reviewimage}%%sampleimg\n\\includegraphics[width=1.2\\maxwidth]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n), actual
+    assert_equal %Q(\\begin{reviewimage}%%sampleimg\n\\includegraphics[width=1.2\\maxwidth]{./images/chap1-sampleimg.png}\n\\reviewimagecaption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n), actual
   end
 
   def test_image_with_metric2
@@ -484,7 +484,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     end
 
     actual = compile_block("//image[sampleimg][sample photo][scale=1.2,html::class=sample,latex::ignore=params]{\n//}\n")
-    assert_equal %Q(\\begin{reviewimage}%%sampleimg\n\\includegraphics[scale=1.2,ignore=params]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n), actual
+    assert_equal %Q(\\begin{reviewimage}%%sampleimg\n\\includegraphics[scale=1.2,ignore=params]{./images/chap1-sampleimg.png}\n\\reviewimagecaption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n), actual
   end
 
   def test_image_with_metric2_width
@@ -496,7 +496,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
 
     @config['image_scale2width'] = true
     actual = compile_block("//image[sampleimg][sample photo][scale=1.2,html::class=sample,latex::ignore=params]{\n//}\n")
-    assert_equal %Q(\\begin{reviewimage}%%sampleimg\n\\includegraphics[width=1.2\\maxwidth,ignore=params]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n), actual
+    assert_equal %Q(\\begin{reviewimage}%%sampleimg\n\\includegraphics[width=1.2\\maxwidth,ignore=params]{./images/chap1-sampleimg.png}\n\\reviewimagecaption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n), actual
   end
 
   def test_indepimage
@@ -993,8 +993,10 @@ EOS
 
   def test_comment_for_draft
     @config['draft'] = true
-    actual = compile_block('//comment[コメント]')
-    assert_equal %Q(\\pdfcomment{コメント}\n), actual
+    actual = compile_block('//comment[コメント<]')
+    assert_equal %Q(\\pdfcomment{コメント\\textless{}}\n), actual
+    actual = compile_block("//comment{\nA<>\nB&\n//}")
+    assert_equal %Q(\\pdfcomment{A\\textless{}\\textgreater{}\\par B\\&}\n), actual
   end
 
   def test_inline_comment
@@ -1132,7 +1134,7 @@ EOS
 
 \\begin{reviewimage}%%sampleimg
 \\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}
-\\caption{FOO}
+\\reviewimagecaption{FOO}
 \\label{image:chap1:sampleimg}
 \\end{reviewimage}
 EOS

data/test/test_topbuilder.rb

@@ -182,8 +182,10 @@ class TOPBuidlerTest < Test::Unit::TestCase
 
   def test_comment_for_draft
     @config['draft'] = true
-    actual = compile_block('//comment[コメント]')
-    assert_equal %Q(◆→コメント←◆\n), actual
+    actual = compile_block('//comment[コメント<]')
+    assert_equal %Q(◆→コメント<←◆\n), actual
+    actual = compile_block("//comment{\nA<>\nB&\n//}")
+    assert_equal %Q(◆→A<>\nB&←◆\n), actual
   end
 
   def test_list

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: review
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - kmuto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_size