review 2.0.0.beta1 → 2.0.0

data/doc/quickstart.md

@@ -9,11 +9,13 @@ Re:VIEW is free software under the terms of the GNU Lesser General Public Licens
 
 This article describes how to setup Re:VIEW and use it.
 
+The supported version of the article is Re:VIEW 2.0.
+
 ## Set up Re:VIEW
 
-Re:VIEW is a software in Ruby and worked in Linux/Unix, Mac OS X, and Cygwin. You can install Re:VIEW with RubyGems, Git or Subversion.
+Re:VIEW is a software in Ruby and worked in Linux/Unix, Mac OS X, and Windows. You can install Re:VIEW with RubyGems or Git.
 
-Note that Re:VIEW format is tagged text file, so you can write it on any editors and OSes.
+Note that Re:VIEW format is plain texts with simple markups in UTF-8, so you can write it on any editors and OSes.
 
 ### using RubyGmes
 
@@ -55,23 +57,9 @@ You can update the sources as follows:
 $ git pull
 ```
 
-### using Subversion
-
-For non git users and environments, Re:VIEW is also distributed with Subversion.
-
-```bash
-$ svn co https://kmuto.jp/svn/review/trunk review
-```
-
-You can use Re:VIEW to add `review/bin` directory to `$PATH` variable.
-
-You can update the sources as follows:
-
-```bash
-$ svn up
-```
+## Writing Re:VIEW Document
 
-# writing Re:VIEW documents and converting them
+### Generating template fiels
 
 After setup, you can use `review-init` command to generate Re:VIEW project directory.
 
@@ -84,32 +72,22 @@ $ ls hello
 Rakefile     catalog.yml  config.yml   hello.re     images/      layouts/     sty/         style.css
 ```
 
-In `hello` directory, many files are generated. `*.re` files are Re:VIEW format file.
-If you make `hello` project, a file `hello.re` is generated.
+In `hello` directory, many files are generated.
 
-`catalog.yml` file is a catalog of Re:VIEW format files.
+* `*.re` : Re:VIEW format file.
+* config.yml : configuration file
+* catalog.yml : catalog file (for TOC)
+* Rakefile : rule file for `rake` command
+* images : folder for images
+* layouts : forlder for layout files
+* style.css : sample stylesheet
+* sty : style files for LaTeX
 
-```bash
-$ cat catalog.yml
-PREDEF:
-
-CHAPS:
-  - hello.re
-
-APPENDIX:
-
-POSTDEF:
-```
-
-The first item in CHAPS is the first chapter, and the second item (if you add) is the second chapter. PREDEF is for front matter, APPENDIX is for appendix, and POSTDEF is for back matter.
-
-If you create new `*.re` files as new chapters, you should add the name of files into `catalog.yml`.
-
-Now you can edit `hello.re`. A simple example of Re:VIEW format text is as follows.
 
+### writing Re:VIEW documents and converting them
 
 ```review
-= my first Re:VIEW
+= My First Re:VIEW
 
 //lead{
 "Hello, Re:VIEW."
@@ -130,81 +108,79 @@ You can install Re:VIEW with:
 
  1. RubyGems
  2. Git
- 3. Subversion
+ 3. Download from GitHub
 
-For more information, see @<tt>{https://github.com/kmuto/review/wiki/}.
+The web site of Re:VIEW is @<tt>{https://reviewml.org/}.
 ```
 
 You should use UTF-8 as encodings in text files.
 
-To convert hello.re, you can use `review-compile` command.
+### generating PDF and EPUB
+
+You can generate a PDF file with `review-pdfmaker` command.  Also you can generate an EPUB file with `review-epubmaker` command.
+
+To generate PDF, you should install TeXLive 2012 or later.  To generate EPUB, you should install zip command.
+When you want to use MathML, you should install [MathML library](http://www.hinet.mydns.jp/?mathml.rb)
+
+`review-pdfmaker` and `review-epubmaker` need `config.yml`, configuration YAML files.  `review-init` command generates `config.yml` in default.
 
 ```bash
-$ review-compile --target html hello.re > hello.html  ## generating HTML
-$ review-compile --target latex hello.re > hello.tex  ## generating LaTeX
-$ review-compile --target idgxml hello.re > hello.xml ## generating XML for InDesing
+$ review-pdfmaker config.yml  ## generate PDF
+$ review-epubmaker config.yml ## generate EPUB
 ```
 
-You can convert all `*.re` files in `catalog.yml` with `-a` option.
+You also can generate them with Rake.
 
+```bash
+$ rake pdf  ## generate PDF
+$ rake epub ## generate EPUB
 ```
-$ review-compile --target html -a  ## convert all files into HTML
-```
 
-You can get HTML file as follows:
-
-```html
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ops="http://www.idpf.org/2007/ops" xml:lang="ja">
-<head>
-  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-  <meta http-equiv="Content-Style-Type" content="text/css" />
-  <link rel="stylesheet" type="text/css" href="style.css" />
-  <meta name="generator" content="Re:VIEW" />
-  <title>my first Re:VIEW</title>
-</head>
-<body>
-<h1><a id="h1"></a>第1章　my first Re:VIEW</h1>
-<div class="lead">
-<p>&quot;Hello, Re:VIEW.&quot;</p>
-</div>
-
-<h2><a id="h1-1"></a>1.1　What's Re:VIEW</h2>
-<p><b>Re:VIEW</b> is a converter from simple markup documents into various formats.</p>
-<p>You can generate documents as follows:</p>
-<ul>
-<li>text with tagging</li>
-<li>LaTeX</li>
-<li>HTML</li>
-<li>XML</li>
-</ul>
-<p>You can install Re:VIEW with:</p>
-<ol>
-<li>RubyGems</li>
-<li>Git</li>
-<li>Subversion</li>
-</ol>
-<p>For more information, see <tt>https://github.com/kmuto/review/wiki/</tt>.</p>
-
-</body>
-</html>
+
+There is a sample YAML file [config.yml.sample](https://github.com/kmuto/review/blob/master/doc/config.yml.sample) in the same directory of this document.
+
+### add chapters and modify them
+
+`catalog.yml` file is a catalog of Re:VIEW format files.
+
+If you create new `*.re` files as new chapters, you should add the name of files into `catalog.yml`.
+
+```bash
+$ cat catalog.yml
+PREDEF:
+
+CHAPS:
+  - first-chapter.re
+  - second-chapter.re
+
+APPENDIX:
+
+POSTDEF:
 ```
 
-For more information about Re:VIEW format, see [format.rdoc](https://github.com/kmuto/review/blob/master/doc/format.rdoc).
+The first item in CHAPS is the first chapter, and the second item (if you add) is the second chapter. PREDEF is for front matter, APPENDIX is for appendix, and POSTDEF is for back matter.  You can see in detail with [catalog.md](https://github.com/kmuto/review/blob/master/doc/catalog.ja.md).
 
-review-compile and other commands in Re:VIEW has `--help` option to output help.  `review-compile` has many options, so you may see them.
 
-If you don't want to type `--target` every time, you can use symbolic links to `review-compile`. You can use new commands `review2html` and so on.
+### more information
+
+For more information about Re:VIEW format, see [format.md](https://github.com/kmuto/review/blob/master/doc/format.md).
+
+## convert file by file
+
+You can convert a *.re file with `review-compile` command.
+
+When you want to convert sample.re, you can do as belows:
 
 ```bash
-$ cd path/to/review/bin
-$ ln -s review-compile review2text
-$ ln -s review-compile review2html
-$ ln -s review-compile review2latex
-$ ln -s review-compile review2idgxml
+$ review-compile --target text sample.re > sample.txt    ## for text
+$ review-compile --target html sample.re > sample.html   ## for HTML
+$ review-compile --target latex sample.re > sample.tex   ## for LaTeX
+$ review-compile --target idgxml sample.re > sample.xml  ## for XML
+$ review-compile --target markdown sample.re > sample.md ## for Markdown
 ```
 
+`review-compile` and other commands in Re:VIEW has `--help` option to output help.  `review-compile` has many options, so you may see them.
+
 ## preprocessor and other commands
 
 With Re:VIEW tags such as `#@mapfile`, `#@maprange` and `#@mapoutput`, you can include content of files or result of command execution. To do so, you use `review-preproc` command.
@@ -228,25 +204,11 @@ You can also use `review-index` command to generate header list.
 $ review-index --level <heading level> -a
 ```
 
-## generating PDF and EPUB
-
-You can generate PDF and EPUB as:
-
-```bash
-$ review-pdfmaker config.yml  ## generate PDF
-$ review-epubmaker config.yml ## generate EPUB
-```
-
-To generate PDF, you should install TeXLive 2012 or later.  To generate EPUB, you should install zip command.
-When you want to use MathML, you should install [MathML library](http://www.hinet.mydns.jp/?mathml.rb)
-
-`review-pdfmaker` and `review-epubmaker` need `config.yml`, configuration YAML files. There is a sample YAML file [sample.yml](https://github.com/kmuto/review/blob/master/doc/sample.yml) in the same directory of this document.
-
-
 ## 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 (2015/01).
+The original author of Re:VIEW is Minero Aoki. The current maintainer is Kenshi Muto(@kmuto), and committers are Masayoshi Takahashi and Masanori Kado (2016/04).
 
 If you want to report bugs and patches, or to get more information, see:
 
+* http://reviewml.org/
 * https://github.com/kmuto/review/wiki

data/doc/sample.css

@@ -106,3 +106,44 @@ p.noindent {
 p.flushright {
     text-align: right;
 }
+
+
+/**
+ * from EBPAJ EPUB 3 File Creation Guide sample style
+ *
+ * cf. http://ebpaj.jp/counsel/guide
+ */
+
+/* image width definition(pacentage)  */
+.width-010per { width:  10%; }
+.width-020per { width:  20%; }
+.width-025per { width:  25%; }
+.width-030per { width:  30%; }
+.width-033per { width:  33%; }
+.width-040per { width:  40%; }
+.width-050per { width:  50%; }
+.width-060per { width:  60%; }
+.width-067per { width:  67%; }
+.width-070per { width:  70%; }
+.width-075per { width:  75%; }
+.width-080per { width:  80%; }
+.width-090per { width:  90%; }
+.width-100per { width: 100%; }
+
+.tcy {
+  -webkit-text-combine:         horizontal;
+  -webkit-text-combine-upright: all;
+  text-combine-upright:         all;
+  -epub-text-combine:           horizontal;
+}
+
+upright-1 {
+  -webkit-text-combine:         horizontal;
+  -webkit-text-combine-upright: all;
+  text-combine-upright:         all;
+  -epub-text-combine:           horizontal;
+}
+.upright {
+  -webkit-text-orientation: upright;
+  -epub-text-orientation:   upright;
+}

data/doc/writing_vertical.ja.md

@@ -0,0 +1,55 @@
+# 縦書きのサポート（実験的）
+
+Re:VIEW 2.0 より、縦書きの実験的なサポートを含めています。このドキュメントでその利用方法を説明します。
+
+このドキュメントは、Re:VIEW 2.0 に基づいています。
+
+## Re:VIEW フォーマットテキストファイルでの利用
+縦書きのドキュメントをサポートするため、次のような機能を提供します。
+
+### 縦中横文字
+縦書き中の1〜2文字を横置きに回転させる目的で、インライン命令 `@<tcy>` を用意しました。
+
+```
+@<tcy>{縦中横化する文字}
+```
+
+図表などの大きなブロックを回転させる用途ではありません。2桁の半角アラビア数字などのごく小さな箇所の回転に対応するものです。
+
+### 採番の漢数字や全角対応
+locale.yml の番号付けに縦書き向けの以下のカスタムフォーマットを用意しています。
+
+* `%pAW` : アルファベット（大文字・いわゆる全角）Ａ, Ｂ, Ｃ, ...
+* `%paW` : アルファベット（小文字・いわゆる全角）ａ, ｂ, ｃ, ...
+* `%pJ` : 漢数字 一, 二, 三, ...
+* `%pdW' : アラビア数字（0〜9まではいわゆる全角、10以降半角）１, ２, ... 10, ...
+* `%pDW' : アラビア数字（すべて全角）１, ２, ... １０, ...
+
+## EPUB（review-epubmaker）
+HTML のボディ部が縦書きになるよう、CSS ファイル（review-init コマンドで作成した雛型を利用しているのであれば style.css）にスタイルを追加します。
+
+```css
+body {
+    （…既存の設定…）
+    -webkit-writing-mode: vertical-rl;
+    -epub-writing-mode:   vertical-rl;
+    writing-mode: tb-rl;
+}
+```
+
+また、縦書きの書籍は通常、「左開き」（右ページから左ページへ進む）となるので、config.yml の direction パラメータを設定します。
+
+```yaml
+direction: "rtl"
+```
+
+なお、仕様としては正しくても、正しく表示されるかは EPUB リーダーおよび使用フォントに強く依存します（たとえばフォントの選択によっては、句読点が横書き位置のままで崩れた表示になることがあります）。
+
+## TeX PDF（review-pdfmaker）
+review-pdfmaker のバックエンドとなっている TeX で縦書きを利用するには、ドキュメントクラスファイルを縦書き対応のものに変更する必要があります。config.yml に次のように追加します（`"oneside"` の箇所は必要に応じて変更してください）。
+
+```yaml
+texdocumentclass: ["utbook", "oneside"]
+```
+
+utbook クラスは uplatex に合わせた縦書きの紙面デザインを提供します（platex を使用する場合は tbook クラスを使います）。マクロや追加パッケージが縦書きに対応していない場合、エラーあるいは予想外の結果になることがあります。

data/doc/writing_vertical.md

@@ -0,0 +1,5 @@
+# Supporing Vertical Writing (experimental)
+
+From Re:VIEW 2.0, Re:VIEW supports vertical writings, especially for Japanese document.
+
+If you need any further information, please read [writing_vertical.ja.md](writing_vertical.ja.md) (in Japanese).

data/lib/epubmaker/content.rb

@@ -60,12 +60,12 @@ module EPUBMaker
       complement
     end
 
-    def ==(obj)
-      if self.class != obj.class
+    def ==(other)
+      if self.class != other.class
         return false
       end
       [self.id, self.file, self.media, self.title, self.level, self.notoc, self.chaptype, self.properties] ==
-        [obj.id, obj.file, obj.media, obj.title, obj.level, obj.notoc, obj.chaptype, obj.properties]
+        [other.id, other.file, other.media, other.title, other.level, other.notoc, other.chaptype, other.properties]
     end
 
     private

data/lib/epubmaker/epubcommon.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # = epubcommon.rb -- super class for EPUBv2 and EPUBv3
 #
-# Copyright (c) 2010-2014 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2016 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -9,10 +9,15 @@
 # For details of the GNU LGPL, see the file "COPYING".
 #
 
-require 'epubmaker/producer'
 require 'review/i18n'
+require 'review/template'
 require 'cgi'
 require 'shellwords'
+begin
+  require 'zip'
+rescue LoadError
+  ## I cannot find rubyzip library, so I use external zip command.
+end
 
 module EPUBMaker
 
@@ -20,7 +25,9 @@ module EPUBMaker
   class EPUBCommon
     # Construct object with parameter hash +params+ and message resource hash +res+.
     def initialize(producer)
+      @body_ext = ''
       @producer = producer
+      @body_ext = nil
     end
 
     # Return mimetype content.
@@ -28,12 +35,16 @@ module EPUBMaker
       "application/epub+zip"
     end
 
+    def opf_path
+      "OEBPS/#{@producer.params["bookname"]}.opf"
+    end
+
     def opf_coverimage
       s = ""
       if @producer.params["coverimage"]
         file = nil
         @producer.contents.each do |item|
-          if item.media =~ /\Aimage/ && item.file =~ /#{@producer.params["coverimage"]}\Z/
+          if item.media.start_with?('image') && item.file =~ /#{@producer.params["coverimage"]}\Z/
             s << %Q[    <meta name="cover" content="#{item.id}"/>\n]
             file = item.file
             break
@@ -45,11 +56,8 @@ module EPUBMaker
     end
 
     def ncx_isbn
-      if @producer.params["isbn"].nil?
-        %Q[    <meta name="dtb:uid" content="#{@producer.params["urnid"]}"/>\n]
-      else
-        %Q[    <meta name="dtb:uid" content="#{@producer.params["isbn"]}"/>\n]
-      end
+      uid = @producer.params["isbn"] || @producer.params["urnid"]
+      %Q[    <meta name="dtb:uid" content="#{uid}"/>\n]
     end
 
     def ncx_doctitle
@@ -58,7 +66,7 @@ module EPUBMaker
     <text>#{CGI.escapeHTML(@producer.params["title"])}</text>
   </docTitle>
   <docAuthor>
-    <text>#{@producer.params["aut"].nil? ? "" : CGI.escapeHTML(@producer.params["aut"].join(", "))}</text>
+    <text>#{@producer.params["aut"].nil? ? "" : CGI.escapeHTML(join_with_separator(@producer.params["aut"], ReVIEW::I18n.t("names_splitter")))}</text>
   </docAuthor>
 EOT
     end
@@ -80,7 +88,7 @@ EOT
         s << <<EOT
     <navPoint id="toc" playOrder="#{nav_count}">
       <navLabel>
-        <text>#{@producer.res.v("toctitle")}</text>
+        <text>#{CGI.escapeHTML(@producer.res.v("toctitle"))}</text>
       </navLabel>
       <content src="#{@producer.params["bookname"]}-toc.#{@producer.params["htmlext"]}"/>
     </navPoint>
@@ -112,171 +120,158 @@ EOT
 
     # Return container content.
     def container
-      s = <<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<container xmlns="urn:oasis:names:tc:opendocument:xmlns:container" version="1.0">
-  <rootfiles>
-    <rootfile full-path="OEBPS/#{@producer.params["bookname"]}.opf" media-type="application/oebps-package+xml" />
-  </rootfiles>
-</container>
-EOT
-      s
+      @opf_path = opf_path
+      tmplfile = File.expand_path('./xml/container.xml.erb', ReVIEW::Template::TEMPLATE_DIR)
+      tmpl = ReVIEW::Template.load(tmplfile)
+      tmpl.result(binding)
     end
 
     # Return cover content.
     def cover(type=nil)
-      bodyext = type.nil? ? "" : " epub:type=\"#{type}\""
+      @body_ext = type.nil? ? "" : " epub:type=\"#{type}\""
 
-      s = common_header
-      s << <<EOT
-  <title>#{CGI.escapeHTML(@producer.params["title"])}</title>
-</head>
-<body#{bodyext}>
-EOT
-      if @producer.params["coverimage"].nil?
-        s << <<EOT
-<h1 class="cover-title">#{CGI.escapeHTML(@producer.params["title"])}</h1>
-EOT
-      else
-        file = nil
-        @producer.contents.each do |item|
-          if item.media =~ /\Aimage/ && item.file =~ /#{@producer.params["coverimage"]}\Z/ # /
-            file = item.file
-            break
-          end
+      if @producer.params["coverimage"]
+        file = @producer.coverimage
+        if !file
+          raise "coverimage #{@producer.params["coverimage"]} not found. Abort."
         end
-        raise "coverimage #{@producer.params["coverimage"]} not found. Abort." if file.nil?
-        s << <<EOT
+        @body = <<-EOT
   <div id="cover-image" class="cover-image">
-    <img src="#{file}" alt="#{CGI.escapeHTML(@producer.params["title"])}" class="max"/>
+    <img src="#{file}" alt="#{CGI.escapeHTML(@producer.params.name_of("title"))}" class="max"/>
   </div>
-EOT
+        EOT
+      else
+        @body = <<-EOT
+<h1 class="cover-title">#{CGI.escapeHTML(@producer.params.name_of("title"))}</h1>
+        EOT
       end
 
-      s << <<EOT
-</body>
-</html>
-EOT
-      s
+      @title = CGI.escapeHTML(@producer.params.name_of("title"))
+      @language = @producer.params['language']
+      @stylesheets = @producer.params["stylesheet"]
+      if @producer.params["htmlversion"].to_i == 5
+        tmplfile = File.expand_path('./html/layout-html5.html.erb', ReVIEW::Template::TEMPLATE_DIR)
+      else
+        tmplfile = File.expand_path('./html/layout-xhtml1.html.erb', ReVIEW::Template::TEMPLATE_DIR)
+      end
+      tmpl = ReVIEW::Template.load(tmplfile)
+      tmpl.result(binding)
     end
 
     # Return title (copying) content.
     def titlepage
-      s = common_header
-      s << <<EOT
-  <title>#{CGI.escapeHTML(@producer.params["title"])}</title>
-</head>
-<body>
-  <h1 class="tp-title">#{CGI.escapeHTML(@producer.params["title"])}</h1>
-EOT
+      @title = CGI.escapeHTML(@producer.params.name_of("title"))
 
+      @body = <<EOT
+  <h1 class="tp-title">#{@title}</h1>
+EOT
       if @producer.params["aut"]
-        s << <<EOT
+        @body << <<EOT
   <p>
     <br />
     <br />
   </p>
-  <h2 class="tp-author">#{CGI.escapeHTML(@producer.params["aut"].join(", "))}</h2>
+  <h2 class="tp-author">#{CGI.escapeHTML(join_with_separator(@producer.params.names_of("aut"), ReVIEW::I18n.t("names_splitter")))}</h2>
 EOT
       end
 
-      publisher = @producer.params["pbl"] || @producer.params["prt"] # XXX Backward Compatiblity
+      publisher = @producer.params.names_of("pbl")
       if publisher
-        s << <<EOT
+        @body << <<EOT
   <p>
     <br />
     <br />
     <br />
     <br />
   </p>
-  <h3 class="tp-publisher">#{CGI.escapeHTML(publisher.join(", "))}</h3>
+  <h3 class="tp-publisher">#{CGI.escapeHTML(join_with_separator(publisher, ReVIEW::I18n.t("names_splitter")))}</h3>
 EOT
       end
 
-      s << <<EOT
-</body>
-</html>
-EOT
-
-      s
+      @language = @producer.params['language']
+      @stylesheets = @producer.params["stylesheet"]
+      if @producer.params["htmlversion"].to_i == 5
+        tmplfile = File.expand_path('./html/layout-html5.html.erb', ReVIEW::Template::TEMPLATE_DIR)
+      else
+        tmplfile = File.expand_path('./html/layout-xhtml1.html.erb', ReVIEW::Template::TEMPLATE_DIR)
+      end
+      tmpl = ReVIEW::Template.load(tmplfile)
+      tmpl.result(binding)
     end
 
     # Return colophon content.
     def colophon
-      s = common_header
-      s << <<EOT
-  <title>#{@producer.res.v("colophontitle")}</title>
-</head>
-<body>
+      @title = CGI.escapeHTML(@producer.res.v("colophontitle"))
+      @body = <<EOT
   <div class="colophon">
 EOT
 
       if @producer.params["subtitle"].nil?
-        s << <<EOT
-    <p class="title">#{CGI.escapeHTML(@producer.params["title"])}</p>
+        @body << <<EOT
+    <p class="title">#{CGI.escapeHTML(@producer.params.name_of("title"))}</p>
 EOT
       else
-        s << <<EOT
-    <p class="title">#{CGI.escapeHTML(@producer.params["title"])}<br /><span class="subtitle">#{CGI.escapeHTML(@producer.params["subtitle"])}</span></p>
+        @body << <<EOT
+    <p class="title">#{CGI.escapeHTML(@producer.params.name_of("title"))}<br /><span class="subtitle">#{CGI.escapeHTML(@producer.params.name_of("subtitle"))}</span></p>
 EOT
       end
 
       if @producer.params["date"] || @producer.params["history"]
-        s << %Q[    <div class="pubhistory">\n]
-        if @producer.params["history"]
-          @producer.params["history"].each_with_index do |items, edit|
-            items.each_with_index do |item, rev|
-              editstr = (edit == 0) ? ReVIEW::I18n.t("first_edition") : ReVIEW::I18n.t("nth_edition","#{edit+1}")
-              revstr = ReVIEW::I18n.t("nth_impression", "#{rev+1}")
-              if item =~ /\A\d+\-\d+\-\d+\Z/
-                s << %Q[      <p>#{ReVIEW::I18n.t("published_by1", [date_to_s(item), editstr+revstr])}</p>\n]
-              else
-                # custom date with string
-                item.match(/\A(\d+\-\d+\-\d+)[\s　](.+)/) do |m|
-                  s << %Q[      <p>#{ReVIEW::I18n.t("published_by3", [date_to_s(m[1]), m[2]])}</p>\n]
-                end
-              end
-            end
-          end
-        else
-          s << %Q[      <p>#{ReVIEW::I18n.t("published_by2", date_to_s(@producer.params["date"]))}</p>\n]
-        end
-        s << %Q[    </div>\n]
+        @body << colophon_history
       end
 
-      s << %Q[    <table class="colophon">\n]
-      s << %Q[      <tr><th>#{@producer.res.v("aut")}</th><td>#{CGI.escapeHTML(@producer.params["aut"].join(", "))}</td></tr>\n] unless @producer.params["aut"].nil?
-      s << %Q[      <tr><th>#{@producer.res.v("csl")}</th><td>#{CGI.escapeHTML(@producer.params["csl"].join(", "))}</td></tr>\n] unless @producer.params["csl"].nil?
-      s << %Q[      <tr><th>#{@producer.res.v("trl")}</th><td>#{CGI.escapeHTML(@producer.params["trl"].join(", "))}</td></tr>\n] unless @producer.params["trl"].nil?
-      s << %Q[      <tr><th>#{@producer.res.v("dsr")}</th><td>#{CGI.escapeHTML(@producer.params["dsr"].join(", "))}</td></tr>\n] unless @producer.params["dsr"].nil?
-      s << %Q[      <tr><th>#{@producer.res.v("ill")}</th><td>#{CGI.escapeHTML(@producer.params["ill"].join(", "))}</td></tr>\n] unless @producer.params["ill"].nil?
-      s << %Q[      <tr><th>#{@producer.res.v("edt")}</th><td>#{CGI.escapeHTML(@producer.params["edt"].join(", "))}</td></tr>\n] unless @producer.params["edt"].nil?
-      s << %Q[      <tr><th>#{@producer.res.v("pbl")}</th><td>#{CGI.escapeHTML(@producer.params["pbl"].join(", "))}</td></tr>\n] unless @producer.params["pbl"].nil?
-      s << %Q[      <tr><th>#{@producer.res.v("prt")}</th><td>#{CGI.escapeHTML(@producer.params["prt"].join(", "))}</td></tr>\n] unless @producer.params["prt"].nil?
-      s << %Q[      <tr><th>#{@producer.res.v("pht")}</th><td>#{CGI.escapeHTML(@producer.params["pht"].join(", "))}</td></tr>\n] unless @producer.params["pht"].nil?
-      if @producer.params["isbn"].to_s =~ /\A\d{10}\Z/ || @producer.params["isbn"].to_s =~ /\A\d{13}\Z/
-        isbn = nil
-        str = @producer.params["isbn"].to_s
-        if str.size == 10
-          isbn = "#{str[0..0]}-#{str[1..5]}-#{str[6..8]}-#{str[9..9]}"
+      @body << %Q[    <table class="colophon">\n]
+      @body << @producer.params["colophon_order"].map{ |role|
+        if @producer.params[role]
+          %Q[      <tr><th>#{CGI.escapeHTML(@producer.res.v(role))}</th><td>#{CGI.escapeHTML(join_with_separator(@producer.params.names_of(role), ReVIEW::I18n.t("names_splitter")))}</td></tr>\n]
         else
-          isbn = "#{str[0..2]}-#{str[3..3]}-#{str[4..8]}-#{str[9..11]}-#{str[12..12]}"
+          ""
         end
-        s << %Q[      <tr><th>ISBN</th><td>#{isbn}</td></tr>\n]
+      }.join("")
+
+      if @producer.isbn_hyphen
+        @body << %Q[      <tr><th>ISBN</th><td>#{@producer.isbn_hyphen}</td></tr>\n]
       end
-      s << <<EOT
-    </table>
-EOT
+      @body << %Q[    </table>\n]
       if !@producer.params["rights"].nil? && @producer.params["rights"].size > 0
-        s << %Q[    <p class="copyright">#{@producer.params["rights"].join("<br />")}</p>]
+        @body << %Q[    <p class="copyright">#{join_with_separator(@producer.params.names_of("rights").map {|m| CGI.escapeHTML(m)}, "<br />")}</p>\n]
       end
+      @body << %Q[  </div>\n]
 
-      s << <<EOT
-  </div>
-</body>
-</html>
-EOT
-      s
+      @language = @producer.params['language']
+      @stylesheets = @producer.params["stylesheet"]
+      if @producer.params["htmlversion"].to_i == 5
+        tmplfile = File.expand_path('./html/layout-html5.html.erb', ReVIEW::Template::TEMPLATE_DIR)
+      else
+        tmplfile = File.expand_path('./html/layout-xhtml1.html.erb', ReVIEW::Template::TEMPLATE_DIR)
+      end
+      tmpl = ReVIEW::Template.load(tmplfile)
+      tmpl.result(binding)
+    end
+
+    def colophon_history
+      buf = ""
+      buf << %Q[    <div class="pubhistory">\n]
+      if @producer.params["history"]
+        @producer.params["history"].each_with_index do |items, edit|
+          items.each_with_index do |item, rev|
+            editstr = (edit == 0) ? ReVIEW::I18n.t("first_edition") : ReVIEW::I18n.t("nth_edition","#{edit+1}")
+            revstr = ReVIEW::I18n.t("nth_impression", "#{rev+1}")
+            if item =~ /\A\d+\-\d+\-\d+\Z/
+              buf << %Q[      <p>#{ReVIEW::I18n.t("published_by1", [date_to_s(item), editstr+revstr])}</p>\n]
+            else
+              # custom date with string
+              item.match(/\A(\d+\-\d+\-\d+)[\s　](.+)/) do |m|
+                buf << %Q[      <p>#{ReVIEW::I18n.t("published_by3", [date_to_s(m[1]), m[2]])}</p>\n]
+              end
+            end
+          end
+        end
+      else
+        buf << %Q[      <p>#{ReVIEW::I18n.t("published_by2", date_to_s(@producer.params["date"]))}</p>\n]
+      end
+      buf << %Q[    </div>\n]
+      buf
     end
 
     def date_to_s(date)
@@ -287,25 +282,24 @@ EOT
 
     # Return own toc content.
     def mytoc
-      s = common_header
-      s << <<EOT
-  <title>#{@producer.res.v("toctitle")}</title>
-</head>
-<body>
-  <h1 class="toc-title">#{@producer.res.v("toctitle")}</h1>
-EOT
+      @title = CGI.escapeHTML(@producer.res.v("toctitle"))
 
+      @body = %Q[  <h1 class="toc-title">#{CGI.escapeHTML(@producer.res.v("toctitle"))}</h1>\n]
       if @producer.params["epubmaker"]["flattoc"].nil?
-        s << hierarchy_ncx("ul")
+        @body << hierarchy_ncx("ul")
       else
-        s << flat_ncx("ul", @producer.params["epubmaker"]["flattocindent"])
+        @body << flat_ncx("ul", @producer.params["epubmaker"]["flattocindent"])
       end
 
-      s << <<EOT
-</body>
-</html>
-EOT
-      s
+      @language = @producer.params['language']
+      @stylesheets = @producer.params["stylesheet"]
+      if @producer.params["htmlversion"].to_i == 5
+        tmplfile = File.expand_path('./html/layout-html5.html.erb', ReVIEW::Template::TEMPLATE_DIR)
+      else
+        tmplfile = File.expand_path('./html/layout-xhtml1.html.erb', ReVIEW::Template::TEMPLATE_DIR)
+      end
+      tmpl = ReVIEW::Template.load(tmplfile)
+      tmpl.result(binding)
     end
 
     def hierarchy_ncx(type)
@@ -394,7 +388,7 @@ EOT
       File.open("#{tmpdir}/META-INF/container.xml", "w") {|f| @producer.container(f) }
 
       FileUtils.mkdir_p("#{tmpdir}/OEBPS")
-      File.open("#{tmpdir}/OEBPS/#{@producer.params["bookname"]}.opf", "w") {|f| @producer.opf(f) }
+      File.open(File.join(tmpdir, opf_path), "w") {|f| @producer.opf(f) }
 
       if File.exist?("#{basedir}/#{@producer.params["cover"]}")
         FileUtils.cp("#{basedir}/#{@producer.params["cover"]}", "#{tmpdir}/OEBPS")
@@ -412,30 +406,64 @@ EOT
     end
 
     def export_zip(tmpdir, epubfile)
+      if defined?(Zip)
+        export_zip_rubyzip(tmpdir, epubfile)
+      else
+        export_zip_extcmd(tmpdir, epubfile)
+      end
+    end
+
+    def export_zip_extcmd(tmpdir, epubfile)
       Dir.chdir(tmpdir) {|d| `#{@producer.params["epubmaker"]["zip_stage1"]} #{epubfile.shellescape} mimetype` }
       Dir.chdir(tmpdir) {|d| `#{@producer.params["epubmaker"]["zip_stage2"]} #{epubfile.shellescape} META-INF OEBPS #{@producer.params["epubmaker"]["zip_addpath"]}` }
     end
 
+    def export_zip_rubyzip(tmpdir, epubfile)
+      Dir.chdir(tmpdir) do |d|
+        Zip::OutputStream.open(epubfile) do |epub|
+          root_pathname = Pathname.new(tmpdir)
+          # relpath = Pathname.new(File.join(tmpdir,'mimetype')).relative_path_from(root_pathname)
+          epub.put_next_entry('mimetype', nil, nil, Zip::Entry::STORED)
+          epub << "application/epub+zip"
+
+          export_zip_rubyzip_addpath(epub, File.join(tmpdir,'META-INF'), root_pathname)
+          export_zip_rubyzip_addpath(epub, File.join(tmpdir,'OEBPS'), root_pathname)
+          if @producer.params["zip_addpath"].present?
+            export_zip_rubyzip_addpath(epub, File.join(tmpdir,@producer.params["zip_addpath"]), root_pathname)
+          end
+        end
+      end
+    end
+
+    def export_zip_rubyzip_addpath(epub, dirname, rootdir)
+      Dir[File.join(dirname,'**','**')].each do |path|
+        next if File.directory?(path)
+        relpath = Pathname.new(path).relative_path_from(rootdir)
+        epub.put_next_entry(relpath)
+        epub << File.binread(path)
+      end
+    end
+
     def legacy_cover_and_title_file(loadfile, writefile)
-      s = common_header
-      s << <<EOT
-  <title>#{@producer.params["booktitle"]}</title>
-</head>
-<body>
-EOT
+      @title = @producer.params["booktitle"]
+      s = ""
       File.open(loadfile) do |f|
         f.each_line do |l|
           s << l
         end
       end
-      s << <<EOT
-</body>
-</html>
-EOT
 
       File.open(writefile, "w") do |f|
         f.puts s
       end
     end
+
+    def join_with_separator(value, sep)
+      if value.kind_of? Array
+        value.join(sep)
+      else
+        value
+      end
+    end
   end
 end