review 5.0.0 → 5.1.0

data/templates/opf/epubv2.opf.erb

@@ -7,15 +7,15 @@
 <%= @opf_manifest %>
 <%= @opf_toc %>
   <guide>
-    <reference type="cover" title="<%= @producer.res.v('covertitle') %>" href="<%= @producer.config['cover'] %>"/>
-<% if @producer.config['titlepage'].present? %>
-    <reference type="title-page" title="<%= @producer.res.v('titlepagetitle') %>" href="titlepage.<%= @producer.config['htmlext'] %>"/>
+    <reference type="cover" title="<%= ReVIEW::I18n.t('covertitle') %>" href="<%= @config['cover'] %>"/>
+<% if @config['titlepage'].present? %>
+    <reference type="title-page" title="<%= ReVIEW::I18n.t('titlepagetitle') %>" href="titlepage.<%= @config['htmlext'] %>"/>
 <% end %>
-<% if @producer.config['mytoc'].present? %>
-    <reference type="toc" title="<%= @producer.res.v('toctitle') %>" href="<%= @producer.config['bookname'] %>-toc.<%= @producer.config['htmlext'] %>"/>
+<% if @config['mytoc'].present? %>
+    <reference type="toc" title="<%= ReVIEW::I18n.t('toctitle') %>" href="<%= @config['bookname'] %>-toc.<%= @config['htmlext'] %>"/>
 <% end %>
-<% if @producer.config['colophon'].present? %>
-    <reference type="colophon" title="<%= @producer.res.v('colophontitle') %>" href="colophon.<%= @producer.config['htmlext'] %>"/>
+<% if @config['colophon'].present? %>
+    <reference type="colophon" title="<%= ReVIEW::I18n.t('colophontitle') %>" href="colophon.<%= @config['htmlext'] %>"/>
 <% end %>
   </guide>
 </package>

data/templates/opf/epubv3.opf.erb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package version="3.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId" xml:lang="<%= @producer.config['language'] %>"<%= @package_attrs %>>
+<package version="3.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId" xml:lang="<%= @config['language'] %>"<%= @package_attrs %>>
   <metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">
 <%= @opf_metainfo %>
 <%= @opf_coverimage %>
@@ -7,13 +7,13 @@
 <%= @opf_manifest %>
 <%= @opf_toc %>
   <guide>
-    <reference type="cover" title="<%= @producer.res.v('covertitle') %>" href="<%= @producer.config['cover'] %>"/>
-<% if @producer.config["titlepage"].present? %>
-    <reference type="title-page" title="<%= @producer.res.v('titlepagetitle') %>" href="titlepage.<%= @producer.config['htmlext'] %>"/>
+    <reference type="cover" title="<%= ReVIEW::I18n.t('covertitle') %>" href="<%= @config['cover'] %>"/>
+<% if @config["titlepage"].present? %>
+    <reference type="title-page" title="<%= ReVIEW::I18n.t('titlepagetitle') %>" href="titlepage.<%= @config['htmlext'] %>"/>
 <% end %>
-    <reference type="toc" title="<%= @producer.res.v('toctitle') %>" href="<%= @producer.config['bookname'] %>-toc.<%= @producer.config['htmlext'] %>"/>
-<% if @producer.config['colophon'].present? %>
-    <reference type="colophon" title="<%= @producer.res.v('colophontitle') %>" href="colophon.<%= @producer.config['htmlext'] %>"/>
+    <reference type="toc" title="<%= ReVIEW::I18n.t('toctitle') %>" href="<%= @config['bookname'] %>-toc.<%= @config['htmlext'] %>"/>
+<% if @config['colophon'].present? %>
+    <reference type="colophon" title="<%= ReVIEW::I18n.t('colophontitle') %>" href="colophon.<%= @config['htmlext'] %>"/>
 <% end %>
   </guide>
 </package>

data/templates/opf/opf_manifest_epubv2.opf.erb

@@ -0,0 +1,10 @@
+  <manifest>
+    <item id="ncx" href="<%= @config['bookname'] %>.ncx" media-type="application/x-dtbncx+xml"/>
+    <item id="<%= @config['bookname'] %>" href="<%= @config['cover'] %>" media-type="application/xhtml+xml"/>
+<% if @config['toc'] && @config['mytoc'] %>
+    <item id="toc" href="<%= @config['bookname'] %>-toc.<%= @config['htmlext'] %>" media-type="application/xhtml+xml"/>
+<% end %>
+<% @items.each do |item| %>
+    <item id="<%= item.id %>" href="<%= item.file %>" media-type="<%= item.media %>"/>
+<% end %>
+  </manifest>

data/templates/opf/opf_manifest_epubv3.opf.erb

@@ -0,0 +1,10 @@
+  <manifest>
+    <item properties="nav" id="<%= @config['bookname'] %>-toc.<%= @config['htmlext'] %>" href="<%= @config['bookname'] %>-toc.<%= @config['htmlext'] %>" media-type="application/xhtml+xml"/>
+    <item id="<%= @config['bookname'] %>" href="<%= @config['cover'] %>" media-type="application/xhtml+xml"/>
+<% if @coverimage %>
+    <item properties="cover-image" id="cover-<%= @coverimage.id %>" href="<%= @coverimage.file %>" media-type="<%= @coverimage.media %>"/>
+<% end %>
+<% @items.each do |item| %>
+    <item id="<%= item.id %>" href="<%= item.file %>" media-type="<%= item.media %>"<%= item.properties_attribute %>/>
+<% end %>
+  </manifest>

data/templates/opf/opf_metainfo_epubv2.opf.erb

@@ -0,0 +1,17 @@
+<% @dc_items.each do |item| %>
+    <<%= item[:tag] %>><%= h(item[:val]) %></<%= item[:tag] %>>
+<% end %>
+<% if @config['isbn'] %>
+    <dc:identifier id="BookId" opf:scheme="ISBN"><%= @config['isbn'] %></dc:identifier>
+<% else %>
+    <dc:identifier id="BookId"><%= @config['urnid'] %></dc:identifier>
+<% end %>
+<% @creators.each do |creator| %>
+    <dc:creator opf:role="<%= creator[:role] %>"><%= h(creator[:val]) %></dc:creator>
+<% end %>
+<% @contributers.each do |contributer| %>
+    <dc:contributor opf:role="<%= contributer[:role] %>"><%= h(contributer[:val]) %></dc:contributor>
+<%   if contributer[:role] == 'prt' %>
+    <dc:publisher><%= h(contributer[:val]) %></dc:publisher>
+<%   end %>
+<% end %>

data/templates/opf/opf_metainfo_epubv3.opf.erb

@@ -0,0 +1,49 @@
+<%# --- DC items --- %>
+<% @dc_items.each do |item| %>
+    <<%= item[:tag] %> id="<%= item[:id] %>"><%= item[:val] %></<%= item[:tag] %>>
+<%   item[:refines].each do | refine | %>
+    <meta refines="#<%= item[:id] %>" property="<%= refine[:name] %>"><%= h(refine[:val]) %></meta>
+<%   end %>
+<% end %>
+    <meta property="dcterms:modified"><%= @config['modified'] %></meta>
+<% if @config['isbn'] %>
+    <dc:identifier id="BookId"><%= @config['isbn'] %></dc:identifier>
+<% else %>
+    <dc:identifier id="BookId"><%= @config['urnid'] %></dc:identifier>
+<% end %>
+<%# --- creator --- %>
+<% @creators.each do |creator| %>
+    <dc:creator id="<%= creator[:id] %>"><%= creator[:val] %></dc:creator>
+<%   creator[:refines].each do |refine| %>
+<%     if refine[:scheme] %>
+    <meta refines="#<%= refine[:id] %>" property="<%= refine[:property]%>" scheme="<%= refine[:scheme] %>"><%= refine[:val] %></meta>
+<%     else %>
+    <meta refines="#<%= refine[:id] %>" property="<%= refine[:property]%>"><%= refine[:val] %></meta>
+<%     end %>
+<%   end %>
+<% end %>
+<%# --- contributer --- %>
+<% @contributers.each do |contributer| %>
+    <dc:contributor id="<%= contributer[:id] %>"><%= h(contributer[:val]) %></dc:contributor>
+<%   contributer[:refines].each do |refine| %>
+<%     if refine[:scheme] %>
+    <meta refines="#<%= refine[:id] %>" property="<%= refine[:property]%>" scheme="<%= refine[:scheme] %>"><%= refine[:val] %></meta>
+<%     else %>
+    <meta refines="#<%= refine[:id] %>" property="<%= refine[:property]%>"><%= refine[:val] %></meta>
+<%     end %>
+<%   end %>
+<%   if contributer[:pub_id] %>
+    <dc:publisher id="<%= contributer[:pub_id] %>"><%= h(contributer[:pub_val]) %></dc:publisher>
+<%     contributer[:pub_refines].each do |refine| %>
+<%       if refine[:scheme] %>
+    <meta refines="#<%= refine[:id] %>" property="<%= refine[:property]%>" scheme="<%= refine[:scheme] %>"><%= refine[:val] %></meta>
+<%       else %>
+    <meta refines="#<%= refine[:id] %>" property="<%= refine[:property]%>"><%= refine[:val] %></meta>
+<%       end %>
+<%     end %>
+<%   end %>
+<% end %>
+<%# --- other --- %>
+<% (@config['opf_meta'] || [] ).each do |k, v| %>
+    <meta property="<%= h(k) %>"><%= h(v) %></meta>
+<% end %>

data/templates/opf/opf_tocx_epubv2.opf.erb

@@ -0,0 +1,9 @@
+  <spine toc="ncx">
+    <itemref idref="<%= @config['bookname'] %>" linear="<%= @cover_linear %>"/>
+<% if @config['mytoc'] %>
+    <itemref idref="toc" />
+<% end %>
+<% @ncx_contents.each do |item| %>
+    <itemref idref="<%= item.id %>"/>
+<% end %>
+  </spine>

data/templates/opf/opf_tocx_epubv3.opf.erb

@@ -0,0 +1,17 @@
+<% if @config['direction'] %>
+  <spine page-progression-direction="<%= @config['direction'] %>">
+<% else %>
+  <spine>
+<% end %>
+    <itemref idref="<%= @config['bookname'] %>" linear="<%= @cover_linear %>"/>
+<% toc = nil %>
+<% @tocx_contents.each do |item| %>
+<%   if toc.nil? && item.chaptype != 'pre' %>
+<%     if @config['toc'] %>
+    <itemref idref="<%= @config['bookname'] %>-toc.<%= @config['htmlext'] %>" />
+<%     end %>
+<%     toc = true %>
+<%   end %>
+    <itemref idref="<%= item.id %>"/>
+<% end %>
+  </spine>

data/templates/web/html/layout-html5.html.erb

@@ -3,6 +3,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="<%=h @language %>">
 <head>
   <meta charset="UTF-8" />
+<% if @javascripts.present? %>
+<%   @javascripts.each do |js| %>
+  <%= js %>
+
+<%   end %>
+<% end %>
 <% if @stylesheets.present? %>
 <%   @stylesheets.each do |style| %>
   <link rel="stylesheet" type="text/css" href="<%=h style %>" />
@@ -47,10 +53,5 @@
     <p class="copyright"><%=h @config["copyright"] %></p>
     <% end %>
   </footer>
-  <% if @javascripts.present? %>
-  <%   @javascripts.each do |script| %>
-  <script src="<%=h script %>"></script>
-  <%   end %>
-  <% end%>
 </body>
 </html>

data/templates/web/html/layout-xhtml1.html.erb

@@ -3,6 +3,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ops="http://www.idpf.org/2007/ops" xml:lang="<%= @language %>">
 <head>
   <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+<% if @javascripts.present? %>
+<%   @javascripts.each do |js| %>
+  <%= js %>
+
+<%   end %>
+<% end %>
   <meta http-equiv="Content-Style-Type" content="text/css"/>
 <% if @stylesheets.present? %>
 <%   @stylesheets.each do |style| %>

data/test/assets/header_listener.html

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xmlns:ops="http://www.idpf.org/2007/ops" xml:lang="ja">
+<head>
+  <meta charset="UTF-8" />
+  <link rel="stylesheet" type="text/css" href="style.css" />
+  <meta name="generator" content="Re:VIEW" />
+  <title>first chapter</title>
+</head>
+<body>
+<h1><a id="h1"></a><span class="secno">第1章　</span>first chapter</h1>
+
+<h2><a id="h1-1"></a><span class="secno">1.1　</span>first section</h2>
+
+<h3><a id="h1-1-1"></a>first <img src="images/icon1.jpg" alt="subsection" /></h3>
+
+<h2><a id="h1-2"></a><span class="secno">1.2　</span>second section</h2>
+
+<h3 id="dummy1"><a id="h1-2-1"></a>dummy subsection</h3>
+
+<h2><a id="h1-3"></a><span class="secno">1.3　</span>third section</h2>
+
+<h2 id="ch01_nonum1" notoc="true">notoc section</h2>
+
+<h2 id="dummy2" notoc="true">notoc section</h2>
+
+<a id="ch01_nonum3" /><h2 id="ch01_nonum3" hidden="true">nodisp section</h2>
+
+<a id="dummy3" /><h2 id="dummy3" hidden="true">nodisp section</h2>
+
+<h2 id="ch01_nonum5">nonum section</h2>
+
+<h2 id="dummy4">nonum section</h2>
+</body>
+</html>

data/test/assets/syntax_book_index_detail.txt

@@ -0,0 +1,58 @@
+=============================
+   272C    16L     1P  pre01
+-----------------------------
+   272C    16L   0.7P  前書き
+=============================
+     9C     1L     1P  
+-----------------------------
+     9C     1L   0.0P  第I部　部扉見出し
+=============================
+  2444C    75L     5P  ch01
+-----------------------------
+   419C     9L   0.6P  第1章　章見出し
+   270C     9L   0.5P    1.1　節見出し
+   137C     3L   0.2P      1.1.1　項見出し……に脚注を入れるとTeXではエラー
+   187C     5L   0.3P        1.1.1.1　段見出し
+    46C     1L   0.0P    1.2　長い節見出し■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□
+    48C     1L   0.0P      1.2.1　長い項見出し■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□
+   193C     4L   0.3P        1.2.1.1　長い段見出し■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□
+   138C     2L   0.2P      1.2.2　採番する項見出し
+     8C     1L   0.0P    1.3　箇条書き
+   255C    12L   0.6P      1.3.1　ナカグロ箇条書き
+   159C     7L   0.4P      1.3.2　番号箇条書き
+   584C    21L   1.0P      1.3.3　用語リスト
+=============================
+   169C     2L     1P  part2
+-----------------------------
+   169C     2L   0.2P  第II部　部見出し■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□
+=============================
+  5652C   175L    10P  ch02
+-----------------------------
+    52C     1L   0.0P  第2章　長い章見出し■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□
+    10C     1L   0.0P    2.1　ブロック命令
+   784C    27L   1.4P      2.1.1　ソースコード
+   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　索引
+=============================
+  2255C    38L     4P  ch03
+-----------------------------
+  2255C    38L   3.1P  第3章　コラム
+=============================
+   134C    12L     1P  appA
+-----------------------------
+    10C     1L   0.0P  付録A　付録の見出し
+     8C     1L   0.0P    A.1　付録の節
+    10C     1L   0.0P      A.1.1　付録の項
+   106C     9L   0.4P        A.1.1.1　付録の段
+=============================
+   219C     3L     1P  bib
+-----------------------------
+   219C     3L   0.2P  参考文献

data/test/assets/test_template.tex

@@ -1,6 +1,6 @@
 \documentclass[dvipdfmx]{review-jsbook}
 \makeatletter
-\def\review@reviewversion{4.2.0}
+\def\review@reviewversion{5.1.0}
 \def\review@texcompiler{uplatex}
 \def\review@documentclass{review-jsbook}
 
@@ -58,6 +58,9 @@
   \ifdefined\covermatter\else% for 4.0.0 compatibility
     \def\covermatter{}
   \fi
+  \ifdefined\reviewchapref\else% for 5.1.0 compatibility
+    \newcommand{\reviewchapref}[2]{\hyperref[##2]{##1}}
+  \fi
 }
 
 \makeatother

data/test/assets/test_template_backmatter.tex

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

data/test/run_test.rb

@@ -1,4 +1,4 @@
-base_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+base_dir = File.expand_path('..', __dir__)
 lib_dir  = File.join(base_dir, 'lib')
 test_dir = File.join(base_dir, 'test')
 

data/test/test_book_chapter.rb

@@ -118,11 +118,11 @@ class ChapterTest < Test::Unit::TestCase
       assert !pre.on_chaps?
 
       ch2_path = File.join(dir, 'chapter2.re')
-      File.open(ch2_path, 'w') {}
+      FileUtils.touch(ch2_path)
       ch2 = Book::Chapter.new(book, 2, 'chapter2', ch2_path)
 
       ch3_path = File.join(dir, 'chapter3.re')
-      File.open(ch3_path, 'w') {}
+      FileUtils.touch(ch3_path)
       ch3 = Book::Chapter.new(book, 3, 'chapter3', ch3_path)
 
       assert ch2.on_chaps?

data/test/test_catalog_converter_cmd.rb

@@ -4,7 +4,7 @@ require 'fileutils'
 require 'yaml'
 require 'rbconfig'
 
-load(File.expand_path('../bin/review-catalog-converter', File.dirname(__FILE__)))
+load(File.expand_path('../bin/review-catalog-converter', __dir__))
 
 class CatalogConverterCmdTest < Test::Unit::TestCase
   def test_parse_chaps

data/test/test_epub3maker.rb

@@ -1,13 +1,11 @@
 require 'test_helper'
-require 'epubmaker'
+require 'review/configure'
 require 'review/epubmaker'
 
 class EPUB3MakerTest < Test::Unit::TestCase
-  include EPUBMaker
-
   def setup
-    @producer = Producer.new
-    @producer.merge_config(
+    config = ReVIEW::Configure.values
+    config.merge!(
       'bookname' => 'sample',
       'title' => 'Sample Book',
       'epubversion' => 3,
@@ -17,30 +15,32 @@ class EPUB3MakerTest < Test::Unit::TestCase
       'modified' => '2014-12-13T14:15:16Z',
       'titlepage' => nil
     )
-    @output = StringIO.new
+    @producer = ReVIEW::EPUBMaker::Producer.new(config)
   end
 
   def test_initialize
-    assert Producer.new
+    assert ReVIEW::EPUBMaker::Producer.new(ReVIEW::Configure.values)
   end
 
   def test_resource_en
-    @producer.merge_config('language' => 'en')
-    assert_equal 'Table of Contents', @producer.res.v('toctitle')
+    @producer.config['language'] = 'en'
+    @producer.modify_config
+    assert_equal 'Table of Contents', ReVIEW::I18n.t('toctitle')
   end
 
   def test_resource_ja
-    @producer.merge_config('language' => 'ja')
-    assert_equal '目次', @producer.res.v('toctitle')
+    @producer.config['language'] = 'ja'
+    @producer.modify_config
+    assert_equal '目次', ReVIEW::I18n.t('toctitle')
   end
 
   def test_mimetype
-    @producer.mimetype(@output)
-    assert_equal 'application/epub+zip', @output.string
+    output = @producer.instance_eval { @epub.mimetype }
+    assert_equal 'application/epub+zip', output
   end
 
   def test_container
-    @producer.container(@output)
+    output = @producer.instance_eval { @epub.container }
     expect = <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="urn:oasis:names:tc:opendocument:xmlns:container" version="1.0">
@@ -49,11 +49,11 @@ class EPUB3MakerTest < Test::Unit::TestCase
   </rootfiles>
 </container>
 EOT
-    assert_equal expect, @output.string
+    assert_equal expect, output
   end
 
   def test_stage1_opf
-    @producer.opf(@output)
+    output = @producer.instance_eval { @epub.opf }
     expect = <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <package version="3.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId" xml:lang="en">
@@ -77,15 +77,16 @@ EOT
   </guide>
 </package>
 EOT
-    assert_equal expect, @output.string
+    assert_equal expect, output
   end
 
   def test_stage1_opf_ebpaj
-    @producer.merge_config(
+    @producer.config.merge!(
       'opf_prefix' => { 'ebpaj' => 'http://www.ebpaj.jp/' },
       'opf_meta' => { 'ebpaj:guide-version' => '1.1.2' }
     )
-    @producer.opf(@output)
+    @producer.modify_config
+    output = @producer.instance_eval { @epub.opf }
     expect = <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <package version="3.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId" xml:lang="en" prefix="ebpaj: http://www.ebpaj.jp/">
@@ -110,14 +111,15 @@ EOT
   </guide>
 </package>
 EOT
-    assert_equal expect, @output.string
+    assert_equal expect, output
   end
 
   def test_stage1_opf_fileas
-    @producer.config['title'] = { 'name' => 'これは書籍です', 'file-as' => 'コレハショセキデス' }
-    @producer.config['aut'] = [{ 'name' => '著者A', 'file-as' => 'チョシャA' }, { 'name' => '著者B', 'file-as' => 'チョシャB' }]
-    @producer.config['pbl'] = [{ 'name' => '出版社', 'file-as' => 'シュッパンシャ' }]
-    @producer.opf(@output)
+    @producer.config.merge!('title' => { 'name' => 'これは書籍です', 'file-as' => 'コレハショセキデス' },
+                            'aut' => [{ 'name' => '著者A', 'file-as' => 'チョシャA' }, { 'name' => '著者B', 'file-as' => 'チョシャB' }],
+                            'pbl' => [{ 'name' => '出版社', 'file-as' => 'シュッパンシャ' }])
+    @producer.modify_config
+    output = @producer.instance_eval { @epub.opf }
     expect = <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <package version="3.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId" xml:lang="en">
@@ -154,11 +156,11 @@ EOT
   </guide>
 </package>
 EOT
-    assert_equal expect, @output.string
+    assert_equal expect, output
   end
 
   def test_stage1_ncx
-    @producer.ncx(@output)
+    output = @producer.instance_eval { @epub.ncx([]) }
     expect = <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
@@ -176,27 +178,27 @@ EOT
 </body>
 </html>
 EOT
-    assert_equal expect, @output.string
+    assert_equal expect, output
   end
 
   def stage2
     # add one item
-    @producer.contents << Content.new({ 'file' => 'ch01.html', 'title' => 'CH01', 'level' => 1 })
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'ch01.html', title: 'CH01', level: 1)
   end
 
   def test_stage2_add_l1item
     stage2
-    expect = EPUBMaker::Content.new('ch01.html',
-                                    'ch01-html',
-                                    'application/xhtml+xml',
-                                    'CH01',
-                                    1)
+    expect = ReVIEW::EPUBMaker::Content.new(file: 'ch01.html',
+                                            id: 'ch01-html',
+                                            media: 'application/xhtml+xml',
+                                            title: 'CH01',
+                                            level: 1)
     assert_equal expect, @producer.contents[0]
   end
 
   def test_stage2_opf
     stage2
-    @producer.opf(@output)
+    output = @producer.instance_eval { @epub.opf }
     expect = <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <package version="3.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId" xml:lang="en">
@@ -222,12 +224,12 @@ EOT
   </guide>
 </package>
 EOT
-    assert_equal expect, @output.string
+    assert_equal expect, output
   end
 
   def test_stage2_ncx
     stage2
-    @producer.ncx(@output)
+    output = @producer.instance_eval { @epub.ncx([]) }
     expect = <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
@@ -246,54 +248,54 @@ EOT
 </body>
 </html>
 EOT
-    assert_equal expect, @output.string
+    assert_equal expect, output
   end
 
   def stage3
     # add more items
-    @producer.contents << Content.new({ 'file' => 'ch01.html', 'title' => %Q(CH01<>&"), 'level' => 1 })
-    @producer.contents << Content.new({ 'file' => 'ch02.html', 'title' => 'CH02', 'level' => 1 })
-    @producer.contents << Content.new({ 'file' => 'ch02.html#S1', 'title' => 'CH02.1', 'level' => 2 })
-    @producer.contents << Content.new({ 'file' => 'ch02.html#S1.1', 'title' => 'CH02.1.1', 'level' => 3 })
-    @producer.contents << Content.new({ 'file' => 'ch02.html#S1.1.1', 'title' => 'CH02.1.1.1', 'level' => 4 })
-    @producer.contents << Content.new({ 'file' => 'ch02.html#S1.1.1.1', 'title' => 'CH02.1.1.1.1', 'level' => 5 })
-    @producer.contents << Content.new({ 'file' => 'ch02.html#S1.1.2', 'title' => 'CH02.1.1.2', 'level' => 4 })
-    @producer.contents << Content.new({ 'file' => 'ch02.html#S2', 'title' => 'CH02.2', 'level' => 2 })
-    @producer.contents << Content.new({ 'file' => 'ch02.html#S2.1', 'title' => 'CH02.2.1', 'level' => 3 })
-    @producer.contents << Content.new({ 'file' => 'ch03.html', 'title' => 'CH03', 'level' => 1, 'properties' => ['mathml'] })
-    @producer.contents << Content.new({ 'file' => 'ch03.html#S1', 'title' => 'CH03.1', 'level' => 2 })
-    @producer.contents << Content.new({ 'file' => 'ch03.html#S1.1', 'title' => 'CH03.1.1', 'level' => 3 })
-    @producer.contents << Content.new({ 'file' => 'ch04.html', 'title' => 'CH04', 'level' => 1 })
-    @producer.contents << Content.new({ 'file' => 'sample.png' })
-    @producer.contents << Content.new({ 'file' => 'sample.jpg' })
-    @producer.contents << Content.new({ 'file' => 'sample.JPEG' })
-    @producer.contents << Content.new({ 'file' => 'sample.SvG' })
-    @producer.contents << Content.new({ 'file' => 'sample.GIF' })
-    @producer.contents << Content.new({ 'file' => 'sample.css' })
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'ch01.html', title: %Q(CH01<>&"), level: 1)
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'ch02.html', title: 'CH02', level: 1)
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'ch02.html#S1', title: 'CH02.1', level: 2)
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'ch02.html#S1.1', title: 'CH02.1.1', level: 3)
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'ch02.html#S1.1.1', title: 'CH02.1.1.1', level: 4)
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'ch02.html#S1.1.1.1', title: 'CH02.1.1.1.1', level: 5)
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'ch02.html#S1.1.2', title: 'CH02.1.1.2', level: 4)
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'ch02.html#S2', title: 'CH02.2', level: 2)
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'ch02.html#S2.1', title: 'CH02.2.1', level: 3)
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'ch03.html', title: 'CH03', level: 1, properties: ['mathml'])
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'ch03.html#S1', title: 'CH03.1', level: 2)
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'ch03.html#S1.1', title: 'CH03.1.1', level: 3)
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'ch04.html', title: 'CH04', level: 1)
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'sample.png')
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'sample.jpg')
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'sample.JPEG')
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'sample.SvG')
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'sample.GIF')
+    @producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'sample.css')
   end
 
   def test_stage3_add_various_items
     stage3
     expect = [
-      Content.new('ch01.html', 'ch01-html', 'application/xhtml+xml', %Q(CH01<>&"), 1),
-      Content.new('ch02.html', 'ch02-html', 'application/xhtml+xml', 'CH02', 1),
-      Content.new('ch02.html#S1', 'ch02-html#S1', 'html#s1', 'CH02.1', 2),
-      Content.new('ch02.html#S1.1', 'ch02-html#S1-1', '1', 'CH02.1.1', 3),
-      Content.new('ch02.html#S1.1.1', 'ch02-html#S1-1-1', '1', 'CH02.1.1.1', 4),
-      Content.new('ch02.html#S1.1.1.1', 'ch02-html#S1-1-1-1', '1', 'CH02.1.1.1.1', 5),
-      Content.new('ch02.html#S1.1.2', 'ch02-html#S1-1-2', '2', 'CH02.1.1.2', 4),
-      Content.new('ch02.html#S2', 'ch02-html#S2', 'html#s2', 'CH02.2', 2),
-      Content.new('ch02.html#S2.1', 'ch02-html#S2-1', '1', 'CH02.2.1', 3),
-      Content.new('ch03.html', 'ch03-html', 'application/xhtml+xml', 'CH03', 1, nil, ['mathml']),
-      Content.new('ch03.html#S1', 'ch03-html#S1', 'html#s1', 'CH03.1', 2),
-      Content.new('ch03.html#S1.1', 'ch03-html#S1-1', '1', 'CH03.1.1', 3),
-      Content.new('ch04.html', 'ch04-html', 'application/xhtml+xml', 'CH04', 1),
-      Content.new('sample.png', 'sample-png', 'image/png'),
-      Content.new('sample.jpg', 'sample-jpg', 'image/jpeg'),
-      Content.new('sample.JPEG', 'sample-JPEG', 'image/jpeg'),
-      Content.new('sample.SvG', 'sample-SvG', 'image/svg+xml'),
-      Content.new('sample.GIF', 'sample-GIF', 'image/gif'),
-      Content.new('sample.css', 'sample-css', 'text/css')
+      ReVIEW::EPUBMaker::Content.new(file: 'ch01.html', id: 'ch01-html', media: 'application/xhtml+xml', title: %Q(CH01<>&"), level: 1),
+      ReVIEW::EPUBMaker::Content.new(file: 'ch02.html', id: 'ch02-html', media: 'application/xhtml+xml', title: 'CH02', level: 1),
+      ReVIEW::EPUBMaker::Content.new(file: 'ch02.html#S1', id: 'ch02-html#S1', media: 'html#s1', title: 'CH02.1', level: 2),
+      ReVIEW::EPUBMaker::Content.new(file: 'ch02.html#S1.1', id: 'ch02-html#S1-1', media: '1', title: 'CH02.1.1', level: 3),
+      ReVIEW::EPUBMaker::Content.new(file: 'ch02.html#S1.1.1', id: 'ch02-html#S1-1-1', media: '1', title: 'CH02.1.1.1', level: 4),
+      ReVIEW::EPUBMaker::Content.new(file: 'ch02.html#S1.1.1.1', id: 'ch02-html#S1-1-1-1', media: '1', title: 'CH02.1.1.1.1', level: 5),
+      ReVIEW::EPUBMaker::Content.new(file: 'ch02.html#S1.1.2', id: 'ch02-html#S1-1-2', media: '2', title: 'CH02.1.1.2', level: 4),
+      ReVIEW::EPUBMaker::Content.new(file: 'ch02.html#S2', id: 'ch02-html#S2', media: 'html#s2', title: 'CH02.2', level: 2),
+      ReVIEW::EPUBMaker::Content.new(file: 'ch02.html#S2.1', id: 'ch02-html#S2-1', media: '1', title: 'CH02.2.1', level: 3),
+      ReVIEW::EPUBMaker::Content.new(file: 'ch03.html', id: 'ch03-html', media: 'application/xhtml+xml', title: 'CH03', level: 1, properties: ['mathml']),
+      ReVIEW::EPUBMaker::Content.new(file: 'ch03.html#S1', id: 'ch03-html#S1', media: 'html#s1', title: 'CH03.1', level: 2),
+      ReVIEW::EPUBMaker::Content.new(file: 'ch03.html#S1.1', id: 'ch03-html#S1-1', media: '1', title: 'CH03.1.1', level: 3),
+      ReVIEW::EPUBMaker::Content.new(file: 'ch04.html', id: 'ch04-html', media: 'application/xhtml+xml', title: 'CH04', level: 1),
+      ReVIEW::EPUBMaker::Content.new(file: 'sample.png', id: 'sample-png', media: 'image/png'),
+      ReVIEW::EPUBMaker::Content.new(file: 'sample.jpg', id: 'sample-jpg', media: 'image/jpeg'),
+      ReVIEW::EPUBMaker::Content.new(file: 'sample.JPEG', id: 'sample-JPEG', media: 'image/jpeg'),
+      ReVIEW::EPUBMaker::Content.new(file: 'sample.SvG', id: 'sample-SvG', media: 'image/svg+xml'),
+      ReVIEW::EPUBMaker::Content.new(file: 'sample.GIF', id: 'sample-GIF', media: 'image/gif'),
+      ReVIEW::EPUBMaker::Content.new(file: 'sample.css', id: 'sample-css', media: 'text/css')
     ]
 
     assert_equal expect, @producer.contents
@@ -301,7 +303,7 @@ EOT
 
   def test_stage3_opf
     stage3
-    @producer.opf(@output)
+    output = @producer.instance_eval { @epub.opf }
     expect = <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <package version="3.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId" xml:lang="en">
@@ -339,12 +341,13 @@ EOT
   </guide>
 </package>
 EOT
-    assert_equal expect, @output.string
+    assert_equal expect, output
   end
 
   def test_stage3_ncx
     stage3
-    @producer.ncx(@output)
+    @producer.config['toclevel'] = 2
+    output = @producer.instance_eval { @epub.ncx([]) }
     expect = <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
@@ -371,12 +374,13 @@ EOT
 </body>
 </html>
 EOT
-    assert_equal expect, @output.string
+    assert_equal expect, output
   end
 
   def test_stage3_mytoc
     stage3
-    @producer.mytoc(@output)
+    @producer.config['toclevel'] = 2
+    output = @producer.instance_eval { @epub.mytoc }
     expect = <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
@@ -401,13 +405,17 @@ EOT
 </ul></body>
 </html>
 EOT
-    assert_equal expect, @output.string
+    assert_equal expect, output
   end
 
   def test_stage3_flat
-    @producer.merge_config('epubmaker' => { 'flattoc' => true, 'flattocindent' => false })
+    @producer.config.deep_merge!(
+      'toclevel' => 2,
+      'epubmaker' => { 'flattoc' => true, 'flattocindent' => false }
+    )
+    @producer.modify_config
     stage3
-    @producer.mytoc(@output)
+    output = @producer.instance_eval { @epub.mytoc }
     expect = <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
@@ -431,12 +439,12 @@ EOT
 </body>
 </html>
 EOT
-    assert_equal expect, @output.string
+    assert_equal expect, output
   end
 
   def test_stage3_cover
     stage3
-    @producer.cover(@output)
+    output = @producer.instance_eval { @epub.cover }
     expect = <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
@@ -451,13 +459,14 @@ EOT
 </body>
 </html>
 EOT
-    assert_equal expect, @output.string
+    assert_equal expect, output
   end
 
   def test_stage3_cover_with_image
     stage3
     @producer.config['coverimage'] = 'sample.png'
-    @producer.cover(@output)
+    @producer.modify_config
+    output = @producer.instance_eval { @epub.cover }
     expect = <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
@@ -474,13 +483,14 @@ EOT
 </body>
 </html>
 EOT
-    assert_equal expect, @output.string
+    assert_equal expect, output
   end
 
   def test_colophon_default
-    @producer.config['aut'] = ['Mr.Smith']
-    @producer.config['pbl'] = ['BLUEPRINT']
-    @producer.colophon(@output)
+    @producer.config.merge!('aut' => ['Mr.Smith'],
+                            'pbl' => ['BLUEPRINT'])
+    @producer.modify_config
+    output = @producer.instance_eval { @epub.colophon }
     expect = <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
@@ -504,14 +514,15 @@ EOT
 </body>
 </html>
 EOT
-    assert_equal expect, @output.string
+    assert_equal expect, output
   end
 
   def test_colophon_pht
-    @producer.config['aut'] = ['Mr.Smith']
-    @producer.config['pbl'] = ['BLUEPRINT']
-    @producer.config['pht'] = ['Mrs.Smith']
-    @producer.colophon(@output)
+    @producer.config.merge!('aut' => ['Mr.Smith'],
+                            'pbl' => ['BLUEPRINT'],
+                            'pht' => ['Mrs.Smith'])
+    @producer.modify_config
+    output = @producer.instance_eval { @epub.colophon }
     expect = <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
@@ -536,14 +547,15 @@ EOT
 </body>
 </html>
 EOT
-    assert_equal expect, @output.string
+    assert_equal expect, output
   end
 
   def test_colophon_history
-    @producer.config['aut'] = ['Mr.Smith']
-    @producer.config['pbl'] = ['BLUEPRINT']
-    @producer.config['pht'] = ['Mrs.Smith']
-    @producer.merge_config('language' => 'ja')
+    @producer.config.merge!('aut' => 'Mr.Smith',
+                            'pbl' => 'BLUEPRINT',
+                            'pht' => 'Mrs.Smith',
+                            'language' => 'ja')
+    @producer.modify_config
     history = @producer.instance_eval { @epub.colophon_history }
     expect = <<EOT
     <div class="pubhistory">
@@ -554,13 +566,12 @@ EOT
   end
 
   def test_colophon_history_2
-    @producer.config['aut'] = ['Mr.Smith']
-    @producer.config['pbl'] = ['BLUEPRINT']
-    @producer.config['pht'] = ['Mrs.Smith']
-    @producer.merge_config(
-      'language' => 'ja',
-      'history' => [['2011-08-03 v1.0.0版発行', '2012-02-15 v1.1.0版発行']]
-    )
+    @producer.config.merge!('aut' => ['Mr.Smith'],
+                            'pbl' => ['BLUEPRINT'],
+                            'pht' => ['Mrs.Smith'],
+                            'language' => 'ja',
+                            'history' => [['2011-08-03 v1.0.0版発行', '2012-02-15 v1.1.0版発行']])
+    @producer.modify_config
     history = @producer.instance_eval { @epub.colophon_history }
     expect = <<EOT
     <div class="pubhistory">
@@ -572,13 +583,12 @@ EOT
   end
 
   def test_colophon_history_date
-    @producer.config['aut'] = ['Mr.Smith']
-    @producer.config['pbl'] = ['BLUEPRINT']
-    @producer.config['pht'] = ['Mrs.Smith']
-    @producer.merge_config(
-      'language' => 'ja',
-      'history' => [['2011-08-03', '2012-02-15']]
-    )
+    @producer.config.merge!('aut' => ['Mr.Smith'],
+                            'pbl' => ['BLUEPRINT'],
+                            'pht' => ['Mrs.Smith'],
+                            'language' => 'ja',
+                            'history' => [['2011-08-03', '2012-02-15']])
+    @producer.modify_config
     history = @producer.instance_eval { @epub.colophon_history }
     expect = <<EOT
     <div class="pubhistory">
@@ -590,15 +600,14 @@ EOT
   end
 
   def test_colophon_history_date2
-    @producer.config['aut'] = ['Mr.Smith']
-    @producer.config['pbl'] = ['BLUEPRINT']
-    @producer.config['pht'] = ['Mrs.Smith']
-    @producer.merge_config(
-      'language' => 'ja',
-      'history' => [['2011-08-03', '2012-02-15'],
-                    ['2012-10-01'],
-                    ['2013-03-01']]
-    )
+    @producer.config.merge!('aut' => ['Mr.Smith'],
+                            'pbl' => ['BLUEPRINT'],
+                            'pht' => ['Mrs.Smith'],
+                            'language' => 'ja',
+                            'history' => [['2011-08-03', '2012-02-15'],
+                                          ['2012-10-01'],
+                                          ['2013-03-01']])
+    @producer.modify_config
     history = @producer.instance_eval { @epub.colophon_history }
     expect = <<EOT
     <div class="pubhistory">
@@ -686,4 +695,39 @@ large.svg: 250x150 exceeds a limit. suggeted value is 95x57
 EOS
     assert_equal expected, err
   end
+
+  def test_build_part
+    Dir.mktmpdir do |tmpdir|
+      book = ReVIEW::Book::Base.new
+      book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re])
+      io1 = StringIO.new("//list[sampletest][a]{\nfoo\n//}\n")
+      chap1 = ReVIEW::Book::Chapter.new(book, 1, 'ch1', 'ch1.re', io1)
+      part1 = ReVIEW::Book::Part.new(book, 1, [chap1])
+      book.parts = [part1]
+      epubmaker = ReVIEW::EPUBMaker.new
+      epubmaker.instance_eval do
+        @config = book.config
+        @producer = ReVIEW::EPUBMaker::Producer.new(@config)
+      end
+      epubmaker.build_part(part1, tmpdir, 'part1.html')
+
+      expected = <<-EOB
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xmlns:ops="http://www.idpf.org/2007/ops" xml:lang="ja">
+<head>
+  <meta charset="UTF-8" />
+  <meta name="generator" content="Re:VIEW" />
+  <title></title>
+</head>
+<body>
+<div class="part">
+<h1 class="part-number">第I部</h1>
+</div>
+</body>
+</html>
+      EOB
+      assert_equal expected, File.read(File.join(tmpdir, 'part1.html'))
+    end
+  end
 end