review 5.2.0 → 5.3.0

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

@@ -21,7 +21,7 @@
 
 \IfFileExists{plautopatch.sty}{\RequirePackage{plautopatch}}{}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{review-jlreq}[2021/06/28 Re:VIEW 5.2 upLaTeX/LuaLaTeX class modified for jlreq.cls]
+\ProvidesClass{review-jlreq}[2021/09/07 Re:VIEW 5.3 upLaTeX/LuaLaTeX class modified for jlreq.cls]
 
 %% hook at end of reviewmacro
 \let\@endofreviewmacrohook\@empty
@@ -32,12 +32,15 @@
 \RequirePackage{fix-cm}%%\RequirePackage{fix-cm,exscale}
 \IfFileExists{latexrelease.sty}{}{\RequirePackage{fixltx2e}}
 
+%% amsmath: override \@ifstar with \new@ifnextchar in amsgen.sty
+\let\ltx@ifstar\@ifstar%%as \@ifstar of LaTeX kernel
+
 %% graphicx: added nosetpagesize
 \IfFileExists{platexrelease.sty}{%% is bundled in TL16 or higher release version
 \PassOptionsToPackage{nosetpagesize}{graphicx}%%for TL16 or higher version
 }{}
 
-\RequirePackage{xkeyval,everypage}
+\RequirePackage{xkeyval,everypage,ifthen}
 
 %% useful helpers
 \newcommand\recls@get@p@[2]{%
@@ -226,12 +229,29 @@
 \edef\grnchry@gutter{\evensidemargin}
 \newcommand*\includefullpagegraphics{%
   \clearpage
-  \@ifstar
+  \ltx@ifstar
     {\@includefullpagegraphics}%
     {\thispagestyle{empty}\@includefullpagegraphics}
 }
 
 \newcommand*\@includefullpagegraphics[2][]{%
+  \if@tate
+    \vbox to \textheight{%
+      \ifodd\c@page
+        \vskip-\dimexpr\evensidemargin - \topskip + 1in\relax
+      \else
+        \vskip-\dimexpr\oddsidemargin - \topskip + 1in\relax
+      \fi
+      \vbox to \paperwidth{\vss
+        \hbox to \textwidth{%
+          \hskip-\grnchry@head\relax
+          \hbox to \paperheight{\hss
+            \rotatebox{90}{\includegraphics[#1]{#2}}%
+          \hss}%
+        \hss}%
+      \vss}%
+    \vss}%
+  \else
     \vbox to \textheight{%
       \vskip-\grnchry@head
       \vbox to \paperheight{\vss
@@ -247,6 +267,7 @@
         \hss}%
       \vss}%
     \vss}%
+  \fi
   \clearpage
 }
 
@@ -342,5 +363,17 @@
 \def\reviewleftcurlybrace{\{}
 \def\reviewrightcurlybrace{\}}
 
+%% 後注を見出しではなくchapter前にし、endnoteカウンタを新規に用意する
+\jlreqsetup{endnote_position=_chapter}
+\newcounter{reclsendnote}
+\setcounter{reclsendnote}{0}
+\if@tate
+  \renewcommand*{\thereclsendnote}{\jlreq@open@bracket@before@space\inhibitglue（\tatechuyoko{\@arabic\c@reclsendnote}）\inhibitglue}
+\else
+  \renewcommand*{\thereclsendnote}{(\arabic{reclsendnote}\hbox{}）\inhibitglue}
+\fi
+\def\jlreq@endnotecounter{reclsendnote}
+\ifthenelse{\equal{\jlreq@article@type}{article}}{}{\@addtoreset{reclsendnote}{chapter}}
+
 \listfiles
 \endinput

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

@@ -1,4 +1,4 @@
-\ProvidesClass{review-base}[2021/06/04]
+\ProvidesClass{review-base}[2021/09/06]
 \RequirePackage{ifthen}
 \@ifundefined{Hy@Info}{% for jsbook.cls
   \RequirePackage[dvipdfmx,bookmarks=true,bookmarksnumbered=true]{hyperref}
@@ -40,6 +40,9 @@
 \RequirePackage{amsthm}
 \RequirePackage{bm}
 \RequirePackage{tabularx}
+\RequirePackage{endnotesj}
+
+\def\enoteheading{}% endnotesj.styの後注前見出しおよび空行の出力を抑制
 
 %% if you use @<u>{} (underline), use jumoline.sty
 \IfFileExists{jumoline.sty}{
@@ -65,9 +68,12 @@
 \rubysetup{J}}{%
 \rubysetup{g}}
 
+\DeclareRobustCommand{\reviewtcy}[1]{\PackageError{review-base}{\reviewtcy is not allowed in yoko mode}{}}
+
 \ifthenelse{\equal{\review@documentclass}{utbook} \OR \equal{\review@documentclass}{tbook}}{%
 \newcommand{\headfont}{\gtfamily\sffamily\bfseries}
 \RequirePackage{plext}
+\DeclareRobustCommand{\reviewtcy}[1]{\rensuji{#1}}
 }{%
 }
 

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

@@ -22,7 +22,7 @@
 \IfFileExists{plautopatch.sty}{\RequirePackage{plautopatch}}{}
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{review-jsbook}
-  [2021/01/12 v5.1 Re:VIEW pLaTeX class modified for jsbook.cls]
+  [2021/08/23 v5.3 Re:VIEW pLaTeX class modified for jsbook.cls]
 
 \def\recls@error{\ClassError{review-jsbook}}
 \def\recls@warning{\ClassWarning{review-jsbook}}
@@ -39,12 +39,18 @@
 \RequirePackage{fix-cm}%%\RequirePackage{fix-cm,exscale}
 \IfFileExists{latexrelease.sty}{}{\RequirePackage{fixltx2e}}
 
+%% amsmath: override \@ifstar with \new@ifnextchar in amsgen.sty
+\let\ltx@ifstar\@ifstar%%as \@ifstar of LaTeX kernel
+
 %% graphicx: added nosetpagesize
 \IfFileExists{platexrelease.sty}{%% is bundled in TL16 or higher release version
 \PassOptionsToPackage{nosetpagesize}{graphicx}%%for TL16 or higher version
 }{}
 
-\RequirePackage{xkeyval,everypage}%%,etoolbox
+\RequirePackage{xkeyval}%%,etoolbox
+\IfFileExists{everypage-1x.sty}{% is bundled in TL20 or higher
+\RequirePackage{everypage-1x}
+}{\RequirePackage{everypage}}
 
 %% useful helpers
 \newcommand\recls@get@p@[2]{%
@@ -149,7 +155,7 @@
   \xdef#1{\ifx\recls@hiddenfolio\@empty tombo,\fi#1}}
 
 %% \recls@set@hiddenfolio{<preset>}
-%% <preset>: default, marusho-ink (丸正インキ), nikko-pc (日光企画), 
+%% <preset>: default, marusho-ink (丸正インキ), nikko-pc (日光企画),
 %%    shippo (ねこのしっぽ)
 \def\recls@set@hiddenfolio#1{\ifx#1\@empty\else
   \@ifundefined{@makehiddenfolio@#1}{%
@@ -284,6 +290,9 @@
 % \typeout{!!! magscale: \jsc@magscale}
 % \typeout{!!! mag: \the\mag}%%=> 1000 -> OK
 
+%% compatibility for jlreq.cls
+\let\if@tate\iftdir
+
 %% override papersize with custom papersize
 \ifx\recls@paperwidth\@empty\else\ifx\recls@paperheight\@empty\else
   \setlength{\paperwidth}{\recls@paperwidth}
@@ -398,12 +407,29 @@
 \let\grnchry@gutter\recls@gutter
 \newcommand*\includefullpagegraphics{%
   \clearpage
-  \@ifstar
+  \ltx@ifstar
     {\@includefullpagegraphics}%
     {\thispagestyle{empty}\@includefullpagegraphics}
 }
 
 \newcommand*\@includefullpagegraphics[2][]{%
+  \if@tate
+    \vbox to \textheight{%
+      \ifodd\c@page
+        \vskip-\dimexpr\evensidemargin - \topskip + 1in\relax
+      \else
+        \vskip-\dimexpr\oddsidemargin - \topskip + 1in\relax
+      \fi
+      \vbox to \paperwidth{\vss
+        \hbox to \textwidth{%
+          \hskip-\grnchry@head\relax
+          \hbox to \paperheight{\hss
+            \rotatebox{90}{\includegraphics[#1]{#2}}%
+          \hss}%
+        \hss}%
+      \vss}%
+    \vss}%
+  \else
     \vbox to \textheight{%
       \vskip-\grnchry@head
       \vbox to \paperheight{\vss
@@ -419,6 +445,7 @@
         \hss}%
       \vss}%
     \vss}%
+  \fi
   \clearpage
 }
 

data/test/assets/syntax_book_index_detail.txt

@@ -26,7 +26,7 @@
 -----------------------------
    169C     2L   0.2P  第II部　部見出し■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□
 =============================
-  5652C   175L    10P  ch02
+  5796C   180L    11P  ch02
 -----------------------------
     52C     1L   0.0P  第2章　長い章見出し■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□
     10C     1L   0.0P    2.1　ブロック命令
@@ -34,13 +34,15 @@
    338C     8L   0.5P      2.1.2　図
    709C    22L   1.3P      2.1.3　表
   1154C    56L   2.8P      2.1.4　囲み記事
-   523C    14L   0.8P    2.2　LaTeX式
-    11C     1L   0.0P    2.3　インライン命令
-   967C    17L   1.3P      2.3.1　書体
-    74C     1L   0.0P      2.3.2　見出し内 BOLD,ITALIC,TT,STRONG,EM,CODE,TTB,TTI,AMI,BOU,KW,UNDERLINE,INS、
-   797C    22L   1.3P      2.3.3　参照
-    39C     2L   0.1P      2.3.4　参考文献
-   194C     3L   0.3P      2.3.5　索引
+   110C     2L   0.2P    2.2　後注
+   523C    14L   0.8P    2.3　LaTeX式
+    11C     1L   0.0P    2.4　インライン命令
+   967C    17L   1.3P      2.4.1　書体
+    74C     1L   0.0P      2.4.2　見出し内 BOLD,ITALIC,TT,STRONG,EM,CODE,TTB,TTI,AMI,BOU,KW,UNDERLINE,INS、
+   797C    22L   1.3P      2.4.3　参照
+    39C     2L   0.1P      2.4.4　参考文献
+   194C     3L   0.3P      2.4.5　索引
+    34C     3L   0.1P        2.4.5.1　後注
 =============================
   2255C    38L     4P  ch03
 -----------------------------

data/test/assets/test_template.tex

@@ -1,6 +1,6 @@
 \documentclass[dvipdfmx]{review-jsbook}
 \makeatletter
-\def\review@reviewversion{5.1.0}
+\def\review@reviewversion{5.3.0}
 \def\review@texcompiler{uplatex}
 \def\review@documentclass{review-jsbook}
 
@@ -61,6 +61,9 @@
   \ifdefined\reviewchapref\else% for 5.1.0 compatibility
     \newcommand{\reviewchapref}[2]{\hyperref[##2]{##1}}
   \fi
+  \ifdefined\reviewtcy\else% for 5.3.0 compatibility
+    \DeclareRobustCommand{\reviewtcy}[1]{\rensuji{##1}}
+  \fi
 }
 
 \makeatother

data/test/assets/test_template_backmatter.tex

@@ -1,6 +1,6 @@
 \documentclass[dvipdfmx]{review-jsbook}
 \makeatletter
-\def\review@reviewversion{5.1.0}
+\def\review@reviewversion{5.3.0}
 \def\review@texcompiler{uplatex}
 \def\review@documentclass{review-jsbook}
 
@@ -72,6 +72,9 @@ some ad content
   \ifdefined\reviewchapref\else% for 5.1.0 compatibility
     \newcommand{\reviewchapref}[2]{\hyperref[##2]{##1}}
   \fi
+  \ifdefined\reviewtcy\else% for 5.3.0 compatibility
+    \DeclareRobustCommand{\reviewtcy}[1]{\rensuji{##1}}
+  \fi
 }
 
 \makeatother

data/test/test_book_chapter.rb

@@ -1,4 +1,5 @@
 require 'book_test_helper'
+
 class ChapterTest < Test::Unit::TestCase
   include BookTestHelper
 
@@ -41,12 +42,12 @@ class ChapterTest < Test::Unit::TestCase
 
   def test_size
     ch = Book::Chapter.new(nil, nil, nil, __FILE__, :io)
-    filesize = IO.read(__FILE__, mode: 'rt:BOM|utf-8').size
+    filesize = File.read(__FILE__, mode: 'rt:BOM|utf-8').size
     assert_equal filesize, ch.size
 
     File.open(__FILE__, 'r') do |i|
       ch = Book::Chapter.new(nil, nil, nil, nil, i)
-      filesize = IO.read(__FILE__, mode: 'rt:BOM|utf-8').size
+      filesize = File.read(__FILE__, mode: 'rt:BOM|utf-8').size
       assert_equal filesize, ch.size
     end
   end
@@ -174,6 +175,7 @@ E
 
   def test_footnote_index
     content = <<E
+@<fn>{abc}@<fn>{def}@<fn>{xyz}
 //footnote[abc][textabc...]
 //footnote[def][textdef...]
 //footnote[xyz][textxyz...]
@@ -189,6 +191,27 @@ E
     end
   end
 
+  def test_endnote_index
+    content = <<E
+@<fn>{abc}@<fn>{def}@<fn>{xyz}@<endnote>{abc}@<endnote>{def}@<endnote>{xyz}
+//footnote[abc][textabc...]
+//footnote[def][textdef...]
+//footnote[xyz][textxyz...]
+//endnote[abc][textabc...]
+//endnote[def][textdef...]
+//endnote[xyz][textxyz...]
+//list[def][def-list]{
+//}
+//list[others][others-list]{
+//}
+E
+    do_test_index(content, Book::EndnoteIndex, :endnote_index, :endnote) do |ch|
+      assert_raises ReVIEW::KeyError do
+        ch.endnote('xyz2')
+      end
+    end
+  end
+
   def test_bibpaper
     do_test_index(<<E, Book::BibpaperIndex, :bibpaper_index, :bibpaper, filename: 'bib.re')
 //bibpaper[abc][text...]

data/test/test_builder.rb

@@ -94,6 +94,8 @@ class BuidlerTest < Test::Unit::TestCase
     assert_equal 'unknown column: unknown|column1', e.message
     e = assert_raises(ReVIEW::ApplicationError) { b.inline_fn('unknown|footnote1') }
     assert_equal 'unknown footnote: unknown|footnote1', e.message
+    e = assert_raises(ReVIEW::ApplicationError) { b.inline_endnote('endnote1') }
+    assert_equal 'unknown endnote: endnote1', e.message
   end
 
   def test_nest_error
@@ -102,16 +104,16 @@ class BuidlerTest < Test::Unit::TestCase
     assert_equal '', b.solve_nest('')
     b.children = ['dl']
     e = assert_raises(ReVIEW::ApplicationError) { b.solve_nest('') }
-    assert_equal '//beginchild of dl misses //endchild', e.message
+    assert_equal ': //beginchild of dl misses //endchild', e.message
     b.children = ['ul', 'dl', 'ol']
     e = assert_raises(ReVIEW::ApplicationError) { b.solve_nest('') }
-    assert_equal '//beginchild of ol,dl,ul misses //endchild', e.message
+    assert_equal ': //beginchild of ol,dl,ul misses //endchild', e.message
 
     assert_equal "\u0001→/ol←\u0001", b.endchild
     assert_equal "\u0001→/dl←\u0001", b.endchild
     assert_equal "\u0001→/ul←\u0001", b.endchild
     e = assert_raises(ReVIEW::ApplicationError) { b.endchild }
-    assert_equal "//endchild is shown, but any opened //beginchild doesn't exist", e.message
+    assert_equal ": //endchild is shown, but any opened //beginchild doesn't exist", e.message
   end
 
   class XBuilder < Builder

data/test/test_htmlbuilder.rb

@@ -2322,6 +2322,43 @@ EOS
     assert_equal expected, fn
   end
 
+  def test_endnote
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//endnote[foo][bar]\n\n@<endnote>{foo}\n") }
+    assert_equal ':4: //endnote is found but //printendnotes is not found.', e.message
+
+    actual = compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    expected = <<-'EOS'
+<p><a id="endnoteb-foo" href="#endnote-foo" class="noteref" epub:type="noteref">(1)</a></p>
+<div class="endnotes">
+<div class="endnote" id="endnote-foo"><p class="endnote">(1) bar</p></div>
+</div>
+EOS
+    assert_equal expected, actual
+
+    @book.config['epubmaker'] ||= {}
+    @book.config['epubmaker']['back_footnote'] = true
+    actual = compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    expected = <<-'EOS'
+<p><a id="endnoteb-foo" href="#endnote-foo" class="noteref" epub:type="noteref">(1)</a></p>
+<div class="endnotes">
+<div class="endnote" id="endnote-foo"><p class="endnote"><a href="#endnoteb-foo">⏎</a>(1) bar</p></div>
+</div>
+EOS
+    assert_equal expected, actual
+
+    I18n.set('html_endnote_textmark', '+%s:')
+    I18n.set('html_endnote_refmark', '+%s:')
+    I18n.set('html_footnote_backmark', '←')
+    actual = compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    expected = <<-'EOS'
+<p><a id="endnoteb-foo" href="#endnote-foo" class="noteref" epub:type="noteref">+1:</a></p>
+<div class="endnotes">
+<div class="endnote" id="endnote-foo"><p class="endnote"><a href="#endnoteb-foo">←</a>+1:bar</p></div>
+</div>
+EOS
+    assert_equal expected, actual
+  end
+
   def test_inline_hd
     book = ReVIEW::Book::Base.new
     book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re ch2.re])
@@ -2868,6 +2905,8 @@ EOB
     assert_match(/unknown image: n/, @log_io.string)
     assert_raises(ReVIEW::ApplicationError) { compile_block("@<fn>{n}\n") }
     assert_match(/unknown footnote: n/, @log_io.string)
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<endnote>{n}\n") }
+    assert_match(/unknown endnote: n/, @log_io.string)
     assert_raises(ReVIEW::ApplicationError) { compile_block("@<hd>{n}\n") }
     assert_match(/unknown headline: n/, @log_io.string)
     %w[list table column].each do |name|
@@ -2951,7 +2990,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal "//beginchild is shown, but previous element isn't ul, ol, or dl", e.message
+    assert_equal ":1: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
   end
 
   def test_nest_error_close2
@@ -2969,7 +3008,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal '//beginchild of dl,ol,ul misses //endchild', e.message
+    assert_equal ':12: //beginchild of dl,ol,ul misses //endchild', e.message
   end
 
   def test_nest_error_close3
@@ -2989,7 +3028,7 @@ EOS
 //endchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal '//beginchild of ol,ul misses //endchild', e.message
+    assert_equal ':14: //beginchild of ol,ul misses //endchild', e.message
   end
 
   def test_nest_ul

data/test/test_idgxmlbuilder.rb

@@ -1291,7 +1291,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal "//beginchild is shown, but previous element isn't ul, ol, or dl", e.message
+    assert_equal ":1: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
   end
 
   def test_nest_error_close2
@@ -1309,7 +1309,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal '//beginchild of dl,ol,ul misses //endchild', e.message
+    assert_equal ':12: //beginchild of dl,ol,ul misses //endchild', e.message
   end
 
   def test_nest_error_close3
@@ -1329,7 +1329,7 @@ EOS
 //endchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal '//beginchild of ol,ul misses //endchild', e.message
+    assert_equal ':14: //beginchild of ol,ul misses //endchild', e.message
   end
 
   def test_nest_ul

data/test/test_index.rb

@@ -12,6 +12,8 @@ class IndexTest < Test::Unit::TestCase
     @builder = TOPBuilder.new
     @config = ReVIEW::Configure.create(config: { 'secnolevel' => 2, 'language' => 'ja' })
     @book = Book::Base.new(config: @config)
+    @log_io = StringIO.new
+    ReVIEW.logger = ReVIEW::Logger.new(@log_io)
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
     location = Location.new(nil, nil)
@@ -21,16 +23,19 @@ class IndexTest < Test::Unit::TestCase
   end
 
   def test_footnote_index
-    compile_block("//footnote[foo][bar]\n")
+    compile_block("@<fn>{foo}\n//footnote[foo][bar]\n")
     fn = @chapter.footnote_index
     items = fn.to_a
     item = items[0]
     assert_equal 'foo', item.id
     assert_equal 'bar', item.content
+
+    compile_block("//footnote[foo][bar]\n")
+    assert_match(/ID foo is not referred/, @log_io.string)
   end
 
   def test_footnote_index_with_escape
-    compile_block('//footnote[foo][bar[\]buz]' + "\n")
+    compile_block("@<fn>{foo}\n" + '//footnote[foo][bar[\]buz]' + "\n")
     fn = @chapter.footnote_index
     items = fn.to_a
     item = items[0]
@@ -39,7 +44,7 @@ class IndexTest < Test::Unit::TestCase
   end
 
   def test_footnote_index_with_escape2
-    compile_block('//footnote[foo][bar\\a\\$buz]' + "\n")
+    compile_block("@<fn>{foo}\n" + '//footnote[foo][bar\\a\\$buz]' + "\n")
     fn = @chapter.footnote_index
     items = fn.to_a
     item = items[0]
@@ -48,7 +53,7 @@ class IndexTest < Test::Unit::TestCase
   end
 
   def test_footnote_index_key?
-    compile_block('//footnote[foo][bar]' + "\n")
+    compile_block("@<fn>{foo}\n" + '//footnote[foo][bar]' + "\n")
     fn = @chapter.footnote_index
     assert_equal true, fn.key?('foo')
 
@@ -58,6 +63,27 @@ class IndexTest < Test::Unit::TestCase
     # rubocop:enable Style/PreferredHashMethods
   end
 
+  def test_endnote_index
+    compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    endnote = @chapter.endnote_index
+    items = endnote.to_a
+    item = items[0]
+    assert_equal 'foo', item.id
+    assert_equal 'bar', item.content
+    assert_equal true, endnote.key?('foo')
+    # rubocop:disable Style/PreferredHashMethods
+    assert_equal true, endnote.has_key?('foo')
+    # rubocop:enable Style/PreferredHashMethods
+
+    e = assert_raises(ReVIEW::ApplicationError) do
+      compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n")
+    end
+    assert_equal ':3: //endnote is found but //printendnotes is not found.', e.message
+
+    compile_block("//endnote[foo][bar]\n//printendnotes\n")
+    assert_match(/ID foo is not referred/, @log_io.string)
+  end
+
   def test_headline_index
     src = <<-EOB
 = chap1

data/test/test_latexbuilder.rb

@@ -257,6 +257,20 @@ EOS
     assert_equal 'test \\reviewttb{inline test} test2', actual
   end
 
+  def test_endnote
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//endnote[foo][bar]\n\n@<endnote>{foo}\n") }
+    assert_equal ':4: //endnote is found but //printendnotes is not found.', e.message
+
+    actual = compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    expected = <<-'EOS'
+
+\endnote{bar}
+
+\theendnotes
+EOS
+    assert_equal expected, actual
+  end
+
   def test_inline_hd_chap
     def @chapter.headline_index
       item = Book::Index::Item.new('chap1|test', [1, 1], 'te_st')
@@ -2596,7 +2610,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal "//beginchild is shown, but previous element isn't ul, ol, or dl", e.message
+    assert_equal ":1: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
   end
 
   def test_nest_error_close2
@@ -2614,7 +2628,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal '//beginchild of dl,ol,ul misses //endchild', e.message
+    assert_equal ':12: //beginchild of dl,ol,ul misses //endchild', e.message
   end
 
   def test_nest_error_close3
@@ -2634,7 +2648,7 @@ EOS
 //endchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal '//beginchild of ol,ul misses //endchild', e.message
+    assert_equal ':14: //beginchild of ol,ul misses //endchild', e.message
   end
 
   def test_nest_ul

data/test/test_markdownbuilder.rb

@@ -106,6 +106,19 @@ EOS
     assert_equal %Q(test <span class="red">コメント</span> test2), actual
   end
 
+  def test_endnote
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//endnote[foo][bar]\n\n@<endnote>{foo}\n") }
+    assert_equal ':4: //endnote is found but //printendnotes is not found.', e.message
+
+    actual = compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    expected = <<-'EOS'
+<sup>(1)</sup>
+
+(1) bar
+EOS
+    assert_equal expected, actual
+  end
+
   def test_inline_hd_chap
     def @chapter.headline_index
       item = Book::Index::Item.new('chap1|test', [1, 1], 'te_st')

data/test/test_pdfmaker.rb

@@ -167,6 +167,25 @@ class PDFMakerTest < Test::Unit::TestCase
     end
   end
 
+  def test_template_content_with_invalid_localconfig
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        Dir.mkdir('layouts')
+        File.write(File.join('layouts', 'config-local.tex.erb'), %q(<%= not_existed_method %>\n))
+        @maker.basedir = Dir.pwd
+        @maker.erb_config
+        @maker.instance_eval do
+          def error!(msg)
+            msg
+          end
+        end
+        error_msg = @maker.template_content
+        assert_match(/template or configuration error:/, error_msg)
+        assert_match(/undefined local variable or method `not_existed_method'/, error_msg)
+      end
+    end
+  end
+
   def test_gettemplate_with_backmatter
     @config.merge!(
       'backcover' => 'backcover.tex',