review 1.0.0 → 1.1.0

data/.travis.yml

@@ -1,8 +1,7 @@
 rvm:
   - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - ruby-head
+  - 2.0.0
 
 branches:
   only:

data/ChangeLog

@@ -1,3 +1,68 @@
+Thu Aug 29 21:33:19 2013  Masayoshi Takahashi  <takahashimm@gmail.com>
+
+	* Version bump to 1.1.0.
+
+Sat Jun 29 01:34:14 2013  Masayoshi Takahashi  <takahashimm@gmail.com>
+
+	* lib/review/htmlbuilder.rb, lib/review/latexbuilder.rb: 
+
+	  use split_paragraph for //bibpaper block.
+
+Sat Mar 30 03:15:43 2013  Masayoshi Takahashi  <takahashimm@gmail.com>
+
+	* lib/review/latexbuilder.rb, lib/review/review.tex.erb,
+	  test/test_latexbuilder.rb:
+
+	  move alltt environment into ReVIEW macros
+          (reviewbox, reviewemlist, reviewlist, reviewcmd,
+	   reviewdummyimage.)
+
+	  If you redefine these macros, you should add \begin{alltt}
+	  and \end{alltt} in your definitions.
+
+Sun Mar 24 15:55:43 2013  Kenshi Muto  <kmuto@debian.org>
+
+	* lib/review/idgxmlbuilder.rb, test/test_idgxmlbuilder.rb:
+	  support PART.
+
+Mon Aug 27 20:27:11 2012  Kenshi Muto  <kmuto@debian.org>
+
+	* lib/review/compiler.rb, lib/review/htmlbuilder.rb,
+	  lib/review/idgxmlbuilder.rb, lib/review/latexbuilder.rb,
+	  lib/review/topbuilder.rb, test/test_htmlbuilder.rb,
+	  test/test_idgxmlbuilder.rb, test/test_latexbuilder.rb:
+	  Add //centering to centerize contents.
+
+Wed Aug  8 18:47:33 2012  Kenshi Muto  <kmuto@debian.org>
+
+	* bin/review-compile, lib/review/idgxmlbuilder.rb:
+	  Add --structuredxml option to produce structured XML for sections.
+
+Sat Jul 14 16:07:54 2012  Masayoshi Takahashi  <takahashimm@gmail.com>
+
+	* lib/review/review.tex.erb: \usepackage{jumoline} is optional
+
+Sat Jun 16 00:57:14 2012  Masayoshi Takahashi  <takahashimm@gmail.com>
+
+	* bin/review-compile, lib/review/builder.rb:
+	  support --tabwidth=WIDTH option in review-compile
+
+Fri Apr 20 16:07:35 2012  Kenshi Muto  <kmuto@debian.org>
+
+	* lib/epubmaker/epubv*.rb: escape entity strings in meta informations.
+
+Tue Mar 13 02:58:41 2012  Masayoshi Takahashi  <takahashimm@gmail.com>
+
+	* lib/review/htmlbuilder.rb: support @<bou> in HTMLBuilder
+
+Tue Mar 13 02:57:24 2012  Masayoshi Takahashi  <takahashimm@gmail.com>
+
+	* lib/review/latexbuilder.rb: support @<ami> in LATEXBuilder
+
+Sun Feb 12 16:06:52 2012  Masayoshi Takahashi  <takahashimm@gmail.com>
+
+	* bin/review-pdfmaker: fix ebb and extractbb options for PDF as images
+
 Mon Jan 30 20:39:17 2012  Masayoshi Takahashi  <takahashimm@gmail.com>
 
 	* Version bump to 1.0.0.

data/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in review.gemspec
+gemspec
+

data/README.rdoc

@@ -12,6 +12,7 @@ Output formats ReVIEW supports are:
 * LaTeX(ptexlive)
 * InDesign(IDGXML)
 * plain text(TOPBuilder Markup Lang.)
+* Inao(gihyo.jp original markup)
 
 == Commands
 
@@ -37,10 +38,14 @@ And some useful commands.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+== Build status
+
+* {<img src="https://secure.travis-ci.org/kmuto/review.png"/>}[http://travis-ci.org/kmuto/review]
+
 == License
 
 LGPL. See COPYING file.
 
 == Copyright
 
-Copyright (c) 2006-2010 Minero Aoki, Kenshi Muto, Masayoshi Takahashi.
+Copyright (c) 2006-2012 Minero Aoki, Kenshi Muto, Masayoshi Takahashi.

data/Rakefile

@@ -1,31 +1,15 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 require 'rubygems'
-require 'rake'
 require 'rake/testtask'
 require 'rake/clean'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "review"
-    gem.summary = %Q{ReVIEW: a easy-to-use digital publishing system}
-    gem.description = %Q{ReVIEW is a digital publishing system for books and ebooks. It supports InDesign, EPUB and LaTeX.}
-    gem.email = "kmuto@debian.org"
-    gem.homepage = "http://github.com/kmuto/review"
-    gem.authors = ["kmuto", "takahashim"]
-    # gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-
 task :default => [:test]
 
 Rake::TestTask.new("test") do |t|
   t.libs   << "test"
-  t.pattern = "test/test_*.rb"
+  t.test_files = Dir.glob("test/**/test_*.rb")
   t.verbose = true
 end
 
@@ -41,12 +25,14 @@ begin
 rescue LoadError
 end
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "review #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+begin
+  require 'rdoc/task'
+  Rake::RDocTask.new do |rdoc|
+    version = File.exist?('VERSION') ? File.read('VERSION') : ""
+    rdoc.rdoc_dir = 'rdoc'
+    rdoc.title = "review #{version}"
+    rdoc.rdoc_files.include('README*')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  end
+rescue LoadError
 end

data/bin/review-check

@@ -15,13 +15,16 @@ require 'pathname'
 bindir = Pathname.new(__FILE__).realpath.dirname
 $LOAD_PATH.unshift((bindir + '../lib').realpath)
 
-require 'review/book'
+require 'review'
 require 'optparse'
-require 'nkf'
+
+include ReVIEW::TextUtils
 
 def sigmain
   Signal.trap(:INT) { exit 1 }
-  Signal.trap(:PIPE, 'IGNORE')
+  if RUBY_PLATFORM !~ /mswin(?!ce)|mingw|cygwin|bccwin/
+    Signal.trap(:PIPE, 'IGNORE')
+  end
   main
 rescue Errno::EPIPE
   exit 0
@@ -92,15 +95,7 @@ def check_text(files)
           next if neg and neg =~ s
           str, offset = find_line(para, re)
           out = sprintf("%s:%d: %s\n", path, lineno + offset, str)
-          if @param["outencoding"] =~ /^EUC$/
-            print NKF.nkf("-e", out)
-          elsif @param["outencoding"] =~ /^SJIS$/
-            print NKF.nkf("-s", out)
-          elsif @param["outencoding"] =~ /^JIS$/
-            print NKF.nkf("-j", out)
-          else
-            print out
-          end
+          print convert_outencoding(out, @param["outencoding"])
         end
       end
     }
@@ -142,15 +137,8 @@ end
 def each_paragraph(f)
   $ReVIEW_utils_word_ok = nil
   while line = f.gets
-    if @param["inencoding"] =~ /^EUC$/
-      line = NKF.nkf("-E -w", line)
-    elsif @param["inencoding"] =~ /SJIS$/
-      line = NKF.nkf("-S -w", line)
-    elsif @param["inencoding"] =~ /^JIS$/
-      line = NKF.nkf("-J -w", line)
-    else
-      line = NKF.nkf("-w", line)
-    end
+    line = convert_inencoding(line, @param["inencoding"])
+
     case line
     when /\A\#@ok\((.*)\)/
       $ReVIEW_utils_word_ok = $1

data/bin/review-compile

@@ -23,7 +23,9 @@ require 'optparse'
 
 def main
   Signal.trap(:INT) { exit 1 }
-  Signal.trap(:PIPE, "IGNORE")
+  if RUBY_PLATFORM !~ /mswin(?!ce)|mingw|cygwin|bccwin/
+    Signal.trap(:PIPE, 'IGNORE')
+  end
   _main
 rescue Errno::EPIPE
   exit 0
@@ -40,12 +42,14 @@ def _main
     target = nil
   end
   check_only = false
+  output_filename = nil
 
   param = {
     "secnolevel" => 2,    # for IDGXML and HTML
     "tableopt" => nil,    # for IDGXML
     "nolf" => nil,        # for IDGXML
     "chapref" => nil,     # for IDGXML
+    "structuredxml" => nil, # for IDGXML
     "inencoding" => "UTF-8",
     "outencoding" => "UTF-8",
     "subdirmode" => nil,
@@ -69,7 +73,9 @@ def _main
   parser.on('--outencoding=ENCODING', 'Set output encoding. (UTF-8[default], EUC, JIS, and SJIS)') {|enc| param["outencoding"] = enc }
   parser.on('-c', '--check', 'Check manuscript') { check_only = true }
   parser.on('--level=LVL', 'Section level to append number.') {|lvl| param["secnolevel"] = lvl.to_i }
+  parser.on('--toclevel=LVL', 'Section level to append number.') {|lvl| param["toclevel"] = lvl.to_i }
   parser.on('--nolfinxml', 'Do not insert LF in XML. (idgxml)') { param["nolf"] = true }
+  parser.on('--structuredxml', 'Produce XML with structured sections. (idgxml)') { param["structuredxml"] = true }
   parser.on('--table=WIDTH', 'Default table width. (idgxml)') {|tbl| param["tableopt"] = tbl }
   parser.on('--listinfo', 'Append listinfo tag to lists to indicate begin/end. (idgxml)') { param["listinfo"] = true }
   parser.on('--chapref="before,middle,after"', 'Chapref decoration.') {|cdec| param["chapref"] = cdec }
@@ -101,6 +107,10 @@ def _main
     mode = :dir
     basedir = path
   end
+  parser.on('--output-file=FILENAME', 'Write all results into file instead of stdout.') do |filename|
+    output_filename = filename
+  end
+  parser.on('--tabwidth=WIDTH', 'tab width') {|width| param["tabwidth"] = width.to_i }
   parser.on('--help', 'Prints this message and quit.') do
     puts parser.help
     exit 0
@@ -120,25 +130,40 @@ def _main
     exit 1
   end
 
-  # array parameter
-  ["stylesheet"].each do |k|
-    if param["k"].instance_of?(String)
-      param["k"] = [param["k"]]
-    end
-  end
-
   begin
-    compiler = ReVIEW::Compiler.new(load_strategy_class(target, check_only))
     ReVIEW.book.param = param
+    compiler = ReVIEW::Compiler.new(load_strategy_class(target, check_only))
     case mode
     when :files
       if ARGV.empty?
         error 'no input'
         exit 1
       end
-      ReVIEW::Chapter.intern_pathes(ARGV).each do |chap|
-        result = compiler.compile(chap)
-        puts result unless check_only
+
+      begin
+        ReVIEW::Book::Chapter.intern_pathes(ARGV).each do |chap|
+          result = compiler.compile(chap)
+          if output_filename
+            write output_filename, result
+          else
+            puts result unless check_only
+          end
+        end
+      rescue => e
+        # PART
+        part = ReVIEW.book.parts_in_file.select do |part|
+          ARGV.map{|path| File.basename path}.include? part.path
+        end
+        if part.present?
+          result = compiler.compile(part.first)
+          if output_filename
+            write output_filename, result
+          else
+            puts result unless check_only
+          end
+        else
+          raise e
+        end
       end
     when :dir
       book = basedir ? ReVIEW::Book.load(basedir) : ReVIEW.book
@@ -146,6 +171,14 @@ def _main
         str = compiler.compile(chap)
         write "#{chap.name}#{compiler.strategy.extname}", str  unless check_only
       end
+      # PART
+      book.parts_in_file.each do |part|
+        str = compiler.compile(part)
+        if compiler.strategy.extname == ".tex"
+          str.gsub!(/\A\\chapter\{/, '\part{') # FIXME: UGLY...
+        end
+        write "#{part.name}#{compiler.strategy.extname}", str  unless check_only
+      end
     else
       raise "must not happen: #{mode}"
     end

data/bin/review-epubmaker

@@ -14,6 +14,7 @@ require 'fileutils'
 require 'yaml'
 require 'optparse'
 require 'rexml/document'
+require 'time'
 
 require 'pathname'
 
@@ -21,61 +22,48 @@ bindir = Pathname.new(__FILE__).realpath.dirname
 $LOAD_PATH.unshift((bindir + '../lib').realpath)
 
 require 'uuid'
+require 'review'
+require 'review/i18n'
 
+require 'review/htmlutils'
+include ReVIEW::HTMLUtils
+
+$essential_files = ['top', 'toc', 'colophon']
 def main
-  values = { # These parameters can be overridden by YAML file.
-    "bookname"=> nil, # it defines epub file name also
-    "booktitle" => "ReVIEW EPUBサンプル",
-    "aut" => nil, # author
-    "prt" => nil, # printer(publisher)
-    "asn" => nil, # associated name
-    "ant" => nil, # bibliographic antecedent
-    "clb" => nil, # Collaborator
-    "edt" => nil, # Editor
-    "dsr" => nil, # Designer
-    "ill" => nil, # Illustrator
-    "pht" => nil, # Photographer
-    "trl" => nil, # Translator
-    "date" => nil, # publishing date
-    "rights" => nil, # Copyright messages
-    "description" => nil, # Description
-    "urnid" => nil, # Identifier (nil makes random uuid)
-    "stylesheet" => "stylesheet.css", # stylesheet file
-    "coverfile" => nil, # content file of body of cover page
-    "mytoc" => nil, # whether make own table of contents or not
-    "params" => "", # specify review2html parameters
-    "toclevel" => 3, # level of toc
-    "secnolevel" => 2, # level of section #
-    "posthook" => nil, # command path of post hook
-    "debug" => nil, # debug flag
-  }
   if ARGV.size != 1
     puts "Usage: #{$0} configfile"
     exit 0
   end
-  
+
   yamlfile = ARGV[0]
-  values = values.merge(YAML.load_file(yamlfile))
+  values = ReVIEW::Configure.values.merge(YAML.load_file(yamlfile))
   bookname = values["bookname"]
+  $essential_files <<= bookname
+  tmp = values["debug"].nil? ? Dir.mktmpdir : "."
+  @bookdir = "#{tmp}/#{bookname}-epub"
+  @epubversion = values["epubversion"] || 2
+  @htmlversion = values["htmlversion"] || 4
+  if @epubversion == 3
+    ## if epubversion is 3, htmlversion should be 5
+    @htmlversion = 5
+  end
 
   if File.exist?("#{bookname}.epub")
     STDERR.puts "#{bookname}.epub exists. Please remove or rename first."
     exit 1
   end
-  if File.exist?("#{bookname}")
-    STDERR.puts "#{bookname} directory exists. Please remove or rename first."
+  if File.exist?(@bookdir)
+    STDERR.puts "#{@bookdir} directory exists. Please remove or rename first."
     exit 1
   end
 
-  identifier = values["urnid"].nil? ? "urn:uuid:#{UUID.create}" : values["urnid"]
+  @identifier = values["urnid"].nil? ? "urn:uuid:#{UUID.create}" : values["urnid"]
 
-  tmp = values["debug"].nil? ? Dir.mktmpdir : "."
-  @bookdir = "#{tmp}/#{bookname}"
   Dir.mkdir(@bookdir)
   
   # MIME type
   File.open("#{@bookdir}/mimetype", "w") {|f|
-    f.puts "application/epub+zip"
+    f.write "application/epub+zip"
   }
   
   Dir.mkdir("#{@bookdir}/OEBPS")
@@ -83,21 +71,57 @@ def main
   @manifeststr = ""
   @ncxstr = ""
   @tocdesc = Array.new
-  
-  if File.exists?("PREDEF")
-    output_chaps("PREDEF", values)
-  end
-  if File.exists?("CHAPS")
-    output_chaps("CHAPS", values)
-  end
-  if File.exists?("POSTDEF")
-    output_chaps("POSTDEF", values)
+
+  basedir = Dir.pwd
+  base_path = Pathname.new(basedir)
+  ReVIEW::Book.load(basedir).parts.each do |part|
+    if part.name.present?
+      if part.file?
+        filename = (base_path + part.path).to_s
+        output_chaps_by_file(filename, values)
+        htmlfile = File.basename(filename.chomp.strip,".*")+".html"
+      else
+        htmlfile = "part_#{part.number}.html"
+        make_part_page(part, htmlfile, values)
+      end
+      file_id = "part_#{part.number}"
+      part_name = "#{ReVIEW::I18n.t("part", part.number)} #{part.name.strip}"
+      @tocdesc << [1, htmlfile, nil, part_name]
+      @manifeststr << %Q(<item id="#{file_id}" href="#{htmlfile}" media-type="application/xhtml+xml" />\n)
+      @ncxstr << %Q(<itemref idref="#{file_id}" />\n)
+    end
+
+    part.chapters.each do |chap|
+      filename = Pathname.new(chap.path).relative_path_from(base_path).to_s
+      output_chaps_by_file(filename, values)
+    end
   end
+
   if File.exist?("images")
     Dir.mkdir("#{@bookdir}/OEBPS/images")
-    copyImagesToDir("images", "#{@bookdir}/OEBPS/images")
+    image_files = ReVIEW::MakerHelper.copy_images_to_dir("images", "#{@bookdir}/OEBPS/images")
+    image_files.each do |image_file|
+      dirname = File.dirname(image_file)
+      fname = File.basename(image_file)
+      figid = getFigId(dirname.gsub(%r|/|,'-')+"-"+fname)
+      mime = nil
+      next unless fname =~ /\.(png|gif|jpg|jpeg|svg)$/i
+      case fname.downcase.match(/\.(png|gif|jpg|jpeg|svg)$/)[1]
+      when "png"
+        mime = "image/png"
+      when "gif"
+        mime = "image/gif"
+      when "jpg", "jpeg"
+        mime = "image/jpeg"
+      when "svg"
+        mime = "image/svg+xml"
+      else
+        raise "unsupported type #{fname}"
+      end
+      @manifeststr << %Q(<item id="#{figid}" href="#{image_file}" media-type="#{mime}" />\n)
+    end
   end
-  
+
   # container
   Dir.mkdir("#{@bookdir}/META-INF")
   File.open("#{@bookdir}/META-INF/container.xml", "w") {|f|
@@ -111,102 +135,21 @@ def main
 EOT
   }
 
-# opf (meta info)
-  File.open("#{@bookdir}/OEBPS/#{bookname}.opf", "w") {|f|
-    f.puts <<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<package version="2.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId">
- <metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">
-   <dc:title>#{values["booktitle"]}</dc:title>
-EOT
-
-   f.puts %Q(<dc:creator opf:role="aut">#{values["aut"]}</dc:creator>) unless values["aut"].nil? # FIXME: support multiple members
-
-   f.puts %Q(<dc:publisher>#{values["prt"]}</dc:publisher>) unless values["prt"].nil?
-
-   f.puts %Q(<dc:date>#{values["date"]}</dc:date>) unless values["date"].nil?
-   f.puts %Q(<dc:rights>#{values["rights"]}</dc:rights>) unless values["rights"].nil?
-
-   f.puts %Q(<dc:contributor opf:role="asn">#{values["asn"]}</dc:contributor>) unless values["asn"].nil?
-   f.puts %Q(<dc:contributor opf:role="ant">#{values["ant"]}</dc:contributor>) unless values["ant"].nil?
-   f.puts %Q(<dc:contributor opf:role="clb">#{values["clb"]}</dc:contributor>) unless values["clb"].nil?
-   f.puts %Q(<dc:contributor opf:role="edt">#{values["edt"]}</dc:contributor>) unless values["edt"].nil?
-   f.puts %Q(<dc:contributor opf:role="dsr">#{values["dsr"]}</dc:contributor>) unless values["dsr"].nil?
-   f.puts %Q(<dc:contributor opf:role="ill">#{values["ill"]}</dc:contributor>) unless values["ill"].nil?
-   f.puts %Q(<dc:contributor opf:role="pht">#{values["pht"]}</dc:contributor>) unless values["pht"].nil?
-   f.puts %Q(<dc:contributor opf:role="trl">#{values["trl"]}</dc:contributor>) unless values["trl"].nil?
-
-   f.puts %Q(<dc:description>#{values["description"]}</dc:description>) unless values["description"].nil?
-
-    if values["coverimage"]
-      f.puts %Q(<meta name="cover" content="#{getFigId(values["coverimage"])}"/>)
-    end
-    f.puts <<EOT
-   <dc:language>ja</dc:language>
-   <dc:identifier id="BookId">#{identifier}</dc:identifier>
- </metadata>
- <manifest>
-  <item id="ncx" href="#{bookname}.ncx" media-type="application/x-dtbncx+xml" />
-  <item id="style" href="#{values["stylesheet"]}" media-type="text/css" />
-  <item id="#{bookname}" href="#{bookname}.html" media-type="application/xhtml+xml" />
-  <item id="top" href="top.html" media-type="application/xhtml+xml" />
-EOT
-
-    unless values["mytoc"].nil?
-      f.puts <<EOT
-  <item id="toc" href="toc.html" media-type="application/xhtml+xml" />
-EOT
-    end
-
-    f.puts @manifeststr
-    unless values["colophon"].nil?
-      f.puts <<EOT
-  <item id="colophon" href="colophon.html" media-type="application/xhtml+xml" />
-EOT
-    end
-    cover_linear = values["cover_linear"] || "no"
-    f.puts <<EOT
- </manifest>
- <spine toc="ncx">
-  <itemref idref="#{bookname}" linear="#{cover_linear}" />
-  <itemref idref="top" />
-EOT
-    unless values["mytoc"].nil?
-      f.puts <<EOT
-  <itemref idref="toc" />
-EOT
-    end
-
-    f.puts @ncxstr
-    unless values["colophon"].nil?
-      f.puts <<EOT
-  <itemref idref="colophon" />
-EOT
-    end
-    f.puts <<EOT
- </spine>
- <guide>
-  <reference type="cover" title="表紙" href="#{bookname}.html"/>
-  <reference type="title-page" title="Title Page" href="top.html"/>
-EOT
-    unless values["mytoc"].nil?
-      f.puts <<EOT
-  <reference type="toc" title="目次" href="toc.html"/>
-EOT
-    end
-    f.puts <<EOT
- </guide>
-</package>
-EOT
-  }
+  # opf (meta info)
+  if @epubversion == 3
+    make_opf_filev3(values, bookname)
+  else
+    make_opf_file(values, bookname)
+  end
 
   # ncx (toc)
-  File.open("#{@bookdir}/OEBPS/#{bookname}.ncx", "w") {|f|
-    f.puts <<EOT
+  if values["toc"]
+    File.open("#{@bookdir}/OEBPS/#{bookname}.ncx", "w") {|f|
+      f.puts <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
   <head>
-    <meta name="dtb:uid" content="#{identifier}"/>
+    <meta name="dtb:uid" content="#{@identifier}"/>
     <meta name="dtb:depth" content="1"/>
     <meta name="dtb:totalPageCount" content="0"/>
     <meta name="dtb:maxPageNumber" content="0"/>
@@ -226,10 +169,10 @@ EOT
     </navPoint>
 EOT
 
-    nav_count = 2
+      nav_count = 2
 
-    unless values["mytoc"].nil?
-      f.puts <<EOT
+      if values["mytoc"]
+        f.puts <<EOT
     <navPoint id="toc" playOrder="2">
       <navLabel>
         <text>目次</text>
@@ -237,44 +180,61 @@ EOT
       <content src="toc.html"/>
     </navPoint>
 EOT
-      nav_count = 3
-    end
-    
-    @tocdesc.each {|item|
-      level, file, id, content = item
-      # values["level"]
-      next if level > values["toclevel"].to_i
-      indent = ""
-      if level > values["secnolevel"].to_i
-        indent = "- "
+        nav_count = 3
       end
-      f.puts <<EOT
+
+      @tocdesc.each {|item|
+        level, file, id, content = item
+        # values["level"]
+        next if level > values["toclevel"].to_i
+        indent = ""
+        if level > values["secnolevel"].to_i
+          indent = "- "
+        end
+        fragment_id = (id ? '#'+id : '')
+        f.puts <<EOT
     <navPoint id="navPoint-#{nav_count}" playOrder="#{nav_count}">
       <navLabel>
-        <text>#{indent}#{content}</text>
+        <text>#{indent}#{strip_html(content)}</text>
       </navLabel>
-      <content src="#{file}##{id}"/>
+      <content src="#{file}#{fragment_id}"/>
     </navPoint>
 EOT
-      nav_count += 1
-    }
-    f.puts <<EOT
+        nav_count += 1
+      }
+      f.puts <<EOT
   </navMap>
 </ncx>
 EOT
-  }
-  
+    }
+  end
+
   # Cover page
   File.open("#{@bookdir}/OEBPS/#{bookname}.html", "w") {|f|
     f.puts <<EOT
 <?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">
+EOT
+    doctype = make_doctype()
+    f.puts doctype
+    f.puts <<EOT
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ops="http://www.idpf.org/2007/ops" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="ja">
 <head>
+EOT
+  if @htmlversion == 4
+    f.puts <<EOT
   <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="#{values["stylesheet"]}"/>
-  <meta name="generator" content="ReVIEW"/>
+  <meta name="generator" content="ReVIEW EPUB Maker"/>
+EOT
+  else
+    f.puts <<EOT
+  <meta charset="UTF-8" />
+  <link rel="stylesheet" type="text/css" href="#{values["stylesheet"]}"/>
+  <meta name="generator" content="ReVIEW EPUB Maker"/>
+EOT
+  end
+    f.puts <<EOT
   <title>#{values["booktitle"]}</title>
 </head>
 <body>
@@ -302,13 +262,28 @@ EOT
   File.open("#{@bookdir}/OEBPS/top.html", "w") {|f|
     f.puts <<EOT
 <?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">
+EOT
+    doctype = make_doctype()
+    f.puts doctype
+    f.puts <<EOT
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ops="http://www.idpf.org/2007/ops" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="ja">
 <head>
+EOT
+  if @htmlversion == 4
+    f.puts <<EOT
   <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="#{values["stylesheet"]}"/>
   <meta name="generator" content="ReVIEW EPUB Maker"/>
+EOT
+  else
+    f.puts <<EOT
+  <meta charset="UTF-8" />
+  <link rel="stylesheet" type="text/css" href="#{values["stylesheet"]}"/>
+  <meta name="generator" content="ReVIEW EPUB Maker"/>
+EOT
+  end
+    f.puts <<EOT
   <title>#{values["booktitle"]}</title>
 </head>
 <body>
@@ -352,24 +327,46 @@ EOT
   }
 
   # Additional toc page
-  unless values["mytoc"].nil?
+  if values["toc"] && values["mytoc"]
     File.open("#{@bookdir}/OEBPS/toc.html", "w") {|f|
+      if @epubversion == 3
+        listelm = "ol"
+      else
+        listelm = "ul"
+      end
       f.puts <<EOT
 <?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">
+EOT
+    doctype = make_doctype()
+    f.puts doctype
+    f.puts <<EOT
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ops="http://www.idpf.org/2007/ops" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="ja">
 <head>
+EOT
+  if @htmlversion == 4
+    f.puts <<EOT
   <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="#{values["stylesheet"]}"/>
   <meta name="generator" content="ReVIEW EPUB Maker"/>
+EOT
+  else
+    f.puts <<EOT
+  <meta charset="UTF-8" />
+  <link rel="stylesheet" type="text/css" href="#{values["stylesheet"]}"/>
+  <meta name="generator" content="ReVIEW EPUB Maker"/>
+EOT
+  end
+    f.puts <<EOT
   <title>目次</title>
 </head>
 <body>
+EOT
+    f.puts %q(<nav epub:type="toc" id="toc">) if @epubversion == 3
+    f.puts <<EOT
 <h1>目次</h1>
-<ul class=\"toc-h1\">
+<#{listelm} class=\"toc-h1\">
 EOT
-
       current = 1
       init_item = true
       @tocdesc.each {|item|
@@ -379,20 +376,20 @@ EOT
         if level > current
           current += 1
           f.puts ""
-          f.puts "<ul class=\"toc-h#{current}\">"
+          f.puts "<#{listelm} class=\"toc-h#{current}\">"
           while current < level
             current += 1
             f.puts "<li>"
-            f.puts "<ul class=\"toc-h#{current}\">"
+            f.puts "<#{listelm} class=\"toc-h#{current}\">"
           end
         elsif level < current
           current -= 1
           f.puts "</li>"
-          f.puts "</ul>"
+          f.puts "</#{listelm}>"
           f.puts "</li>"
           while current > level
             current -= 1
-            f.puts "</ul>"
+            f.puts "</#{listelm}>"
             f.puts "</li>"
           end
         elsif init_item
@@ -400,20 +397,22 @@ EOT
         else
           f.puts "</li>"
         end
-        f.write "<li><a href=\"#{file}##{id}\">#{content}</a>"
+        fragment_id = (id ? '#'+id : '')
+        f.write "<li><a href=\"#{file}#{fragment_id}\">#{content}</a>"
         init_item = false
       }
 
       (current - 1).downto(1) {|n|
         f.puts "</li>"
-        f.puts "</ul>"
+        f.puts "</#{listelm}>"
       }
       if !init_item
         f.puts "</li>"
       end
 
+      f.puts "</#{listelm}>"
+      f.puts %q(</nav>) if @epubversion == 3
       f.puts <<EOT
-</ul>
 </body>
 </html>
 EOT
@@ -436,7 +435,7 @@ EOT
   end
 
   # Colophon page
-  if !values["colophon"].nil?
+  if values["colophon"]
     make_colophon_page(tmp, bookname, values)
   end
 
@@ -452,69 +451,279 @@ EOT
   fork {
     basedir = Dir.pwd
     Dir.chdir(@bookdir) {|d|
-      exec("zip -0X #{basedir}/#{bookname}.epub mimetype")
+      exec("zip", "-0X", "#{basedir}/#{bookname}.epub", "mimetype")
     }
   }
   Process.waitall
   fork {
     basedir = Dir.pwd
     Dir.chdir(@bookdir) {|d|
-      exec("zip -Xr9D #{basedir}/#{bookname}.epub META-INF OEBPS")
+      exec("zip", "-Xr9D", "#{basedir}/#{bookname}.epub", "META-INF", "OEBPS")
     }
   }
   Process.waitall
-  
+
   FileUtils.rm_r(tmp) if values["debug"].nil?
 end
 
+def make_doctype
+  if @htmlversion == 5
+    %q(<!DOCTYPE html>)
+  else
+    %q(<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">)
+  end
+end
+
+
+def make_opf_file(values, bookname)
+  File.open("#{@bookdir}/OEBPS/#{bookname}.opf", "w") {|f|
+    f.puts <<EOT
+<?xml version="1.0" encoding="UTF-8"?>
+<package version="2.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId">
+ <metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">
+   <dc:title>#{values["booktitle"]}</dc:title>
+EOT
+
+   f.puts %Q(<dc:creator opf:role="aut">#{values["aut"]}</dc:creator>) unless values["aut"].nil? # FIXME: support multiple members
+
+   f.puts %Q(<dc:publisher>#{values["prt"]}</dc:publisher>) unless values["prt"].nil?
+
+   f.puts %Q(<dc:date>#{values["date"]}</dc:date>) unless values["date"].nil?
+   f.puts %Q(<dc:rights>#{values["rights"]}</dc:rights>) unless values["rights"].nil?
+
+   f.puts %Q(<dc:contributor opf:role="asn">#{values["asn"]}</dc:contributor>) unless values["asn"].nil?
+   f.puts %Q(<dc:contributor opf:role="ant">#{values["ant"]}</dc:contributor>) unless values["ant"].nil?
+   f.puts %Q(<dc:contributor opf:role="clb">#{values["clb"]}</dc:contributor>) unless values["clb"].nil?
+   f.puts %Q(<dc:contributor opf:role="edt">#{values["edt"]}</dc:contributor>) unless values["edt"].nil?
+   f.puts %Q(<dc:contributor opf:role="dsr">#{values["dsr"]}</dc:contributor>) unless values["dsr"].nil?
+   f.puts %Q(<dc:contributor opf:role="ill">#{values["ill"]}</dc:contributor>) unless values["ill"].nil?
+   f.puts %Q(<dc:contributor opf:role="pht">#{values["pht"]}</dc:contributor>) unless values["pht"].nil?
+   f.puts %Q(<dc:contributor opf:role="trl">#{values["trl"]}</dc:contributor>) unless values["trl"].nil?
+
+   f.puts %Q(<dc:description>#{values["description"]}</dc:description>) unless values["description"].nil?
+
+    if values["coverimage"]
+      f.puts %Q(<meta name="cover" content="#{getFigId("images-"+values["coverimage"])}"/>)
+    end
+    f.puts <<EOT
+   <dc:language>ja</dc:language>
+   <dc:identifier id="BookId">#{@identifier}</dc:identifier>
+ </metadata>
+ <manifest>
+EOT
+
+    if values["toc"]
+      f.puts <<EOT
+  <item id="ncx" href="#{bookname}.ncx" media-type="application/x-dtbncx+xml" />
+EOT
+    end
+
+    f.puts <<EOT
+  <item id="style" href="#{values["stylesheet"]}" media-type="text/css" />
+  <item id="#{bookname}" href="#{bookname}.html" media-type="application/xhtml+xml" />
+  <item id="top" href="top.html" media-type="application/xhtml+xml" />
+EOT
+
+    if values["toc"] && values["mytoc"]
+      f.puts <<EOT
+  <item id="toc" href="toc.html" media-type="application/xhtml+xml" />
+EOT
+    end
+
+    f.puts @manifeststr
+    if values["colophon"]
+      f.puts <<EOT
+  <item id="colophon" href="colophon.html" media-type="application/xhtml+xml" />
+EOT
+    end
+
+    if values["cover_linear"] && values["cover_linear"] != "no"
+      cover_linear = "yes"
+    else
+      cover_linear = "no"
+    end
+
+    f.puts <<EOT
+ </manifest>
+ <spine toc="ncx">
+  <itemref idref="#{bookname}" linear="#{cover_linear}" />
+  <itemref idref="top" />
+EOT
+
+    if values["toc"] && values["mytoc"]
+      f.puts <<EOT
+  <itemref idref="toc" />
+EOT
+    end
+
+    f.puts @ncxstr
+    if values["colophon"]
+      f.puts <<EOT
+  <itemref idref="colophon" />
+EOT
+    end
+    f.puts <<EOT
+ </spine>
+ <guide>
+EOT
+
+    if values["titlepage"]
+      f.puts <<EOT
+  <reference type="cover" title="表紙" href="#{bookname}.html"/>
+  <reference type="title-page" title="Title Page" href="top.html"/>
+EOT
+    end
+
+    if values["toc"] && values["mytoc"]
+      f.puts <<EOT
+  <reference type="toc" title="目次" href="toc.html"/>
+EOT
+    end
+    f.puts <<EOT
+ </guide>
+</package>
+EOT
+  }
+end
+
+def make_opf_filev3(values, bookname)
+  File.open("#{@bookdir}/OEBPS/#{bookname}.opf", "w") {|f|
+    f.puts <<EOT
+<?xml version="1.0" encoding="UTF-8"?>
+<package version="3.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId">
+ <metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">
+   <dc:title>#{values["booktitle"]}</dc:title>
+EOT
+    unless values["aut"].nil? # FIXME: support multiple members
+      f.puts %Q(<dc:creator id="author">#{values["aut"]}</dc:creator>)
+      f.puts %Q(<meta refines="#author" property="role" scheme="marc:relators" id="role">aut</meta>)
+    end
+    f.puts %Q(<dc:publisher id="publisher">#{values["prt"]}</dc:publisher>) unless values["prt"].nil?
+
+    f.puts %Q(<dc:date>#{values["date"]}</dc:date>) unless values["date"].nil?
+    f.puts %Q(<dc:rights>#{values["rights"]}</dc:rights>) unless values["rights"].nil?
+
+    %w(asn ant clb edt dsr ill pht trl).each do |attr|
+      unless values[attr].nil?
+        f.puts %Q(<dc:contributor id="#{attr}">#{values[attr]}</dc:contributor>)
+        f.puts %Q(<meta refines='##{attr}' property='role' scheme='marc:relators'>#{attr}</meta>)
+      end
+    end
+   f.puts %Q(<dc:description>#{values["description"]}</dc:description>) unless values["description"].nil?
+    f.puts %Q(<meta property="dcterms:modified">#{Time.now.utc.iso8601(0)}</meta>)
+    if values["coverimage"]
+      f.puts %Q(<meta name="cover" content="#{getFigId("images-"+values["coverimage"])}"/>)
+    end
+    f.puts <<EOT
+   <dc:language>ja</dc:language>
+   <dc:identifier id="BookId">#{@identifier}</dc:identifier>
+ </metadata>
+ <manifest>
+EOT
+
+    if values["toc"]
+      f.puts <<EOT
+  <item id="ncx" href="#{bookname}.ncx" media-type="application/x-dtbncx+xml" />
+EOT
+    end
+
+    f.puts <<EOT
+  <item id="style" href="#{values["stylesheet"]}" media-type="text/css" />
+  <item id="#{bookname}" href="#{bookname}.html" media-type="application/xhtml+xml" />
+  <item id="top" href="top.html" media-type="application/xhtml+xml" />
+EOT
+
+    if values["toc"] && values["mytoc"]
+      f.puts <<EOT
+  <item id="toc" href="toc.html" properties="nav" media-type="application/xhtml+xml" />
+EOT
+    end
+
+    f.puts @manifeststr
+    if values["colophon"]
+      f.puts <<EOT
+  <item id="colophon" href="colophon.html" media-type="application/xhtml+xml" />
+EOT
+    end
+
+    if values["cover_linear"] && values["cover_linear"] != "no"
+      cover_linear = "yes"
+    else
+      cover_linear = "no"
+    end
+
+    f.puts <<EOT
+ </manifest>
+ <spine toc="ncx">
+  <itemref idref="#{bookname}" linear="#{cover_linear}" />
+  <itemref idref="top" />
+EOT
+
+    if values["toc"] && values["mytoc"]
+      f.puts <<EOT
+  <itemref idref="toc" />
+EOT
+    end
+
+    f.puts @ncxstr
+    if values["colophon"]
+      f.puts <<EOT
+  <itemref idref="colophon" />
+EOT
+    end
+    f.puts <<EOT
+ </spine>
+ <guide>
+EOT
+
+    if values["titlepage"]
+      f.puts <<EOT
+  <reference type="cover" title="表紙" href="#{bookname}.html"/>
+  <reference type="title-page" title="Title Page" href="top.html"/>
+EOT
+    end
+
+    if values["toc"] && values["mytoc"]
+      f.puts <<EOT
+  <reference type="toc" title="目次" href="toc.html"/>
+EOT
+    end
+    f.puts <<EOT
+ </guide>
+</package>
+EOT
+  }
+end
+
+
 def output_chaps(chapsfile, values)
   File.open(chapsfile) {|chaps|
     chaps.each_line {|l|
       next if l =~ /^#/
-      file_id = File.basename(l.chomp.strip,".*")
-      filename = "#{file_id}.html"
-      fork {
-        STDOUT.reopen("#{@bookdir}/OEBPS/#{filename}")
-        exec("review-compile --target=html --level=#{values["secnolevel"]} #{values["params"]} #{l}")
-      }
-      Process.waitall
-      getanchors("#{@bookdir}/OEBPS/#{filename}")
-      @manifeststr << %Q(<item id="#{file_id}" href="#{filename}" media-type="application/xhtml+xml" />\n)
-      @ncxstr << %Q(<itemref idref="#{file_id}" />\n)
+      output_chaps_by_file(l, values)
     }
   }
 end
 
-
-def copyImagesToDir(dirname, copybase)
-  Dir.open(dirname) {|dir|
-    dir.each {|fname|
-      next if fname =~ /^\./
-      if FileTest.directory?("#{dirname}/#{fname}")
-        copyImagesToDir("#{dirname}/#{fname}", "#{copybase}/#{fname}")
-      else
-        if fname =~ /\.(png|gif|jpg|jpeg|svg)$/i
-          Dir.mkdir(copybase) unless File.exist?(copybase)
-          FileUtils.cp "#{dirname}/#{fname}", copybase
-          figid = getFigId(fname)
-          mime = nil
-          case fname.downcase.match(/\.(png|gif|jpg|jpeg|svg)$/)[1]
-          when "png"
-            mime = "image/png"
-          when "gif"
-            mime = "image/gif"
-          when "jpg", "jpeg"
-            mime = "image/jpeg"
-          when "svg"
-            mime = "image/svg+xml"
-          else
-            raise "unsupported type #{fname}"
-          end
-          @manifeststr << %Q(<item id="#{figid}" href="#{dirname}/#{fname}" media-type="#{mime}" />\n)
-        end
-      end
-    }
+def output_chaps_by_file(l, values)
+  file_id = File.basename(l.chomp.strip,".*")
+  if (idx = $essential_files.index(file_id))
+    if idx == $essential_files.size - 1
+      STDERR.puts "#{file_id} is book name. Please rename #{l.chomp.strip}."
+    else
+      STDERR.puts "#{file_id} is special name. Please rename #{l.chomp.strip}."
+    end
+    exit 1
+  end
+  filename = "#{file_id}.html"
+  fork {
+    STDOUT.reopen("#{@bookdir}/OEBPS/#{filename}")
+    exec("review-compile --target=html --level=#{values["secnolevel"]} --htmlversion=#{values["htmlversion"]} #{values["params"]} #{l}")
   }
+  Process.waitall
+  getanchors("#{@bookdir}/OEBPS/#{filename}")
+  @manifeststr << %Q(<item id="#{file_id}" href="#{filename}" media-type="application/xhtml+xml" />\n)
+  @ncxstr << %Q(<itemref idref="#{file_id}" />\n)
 end
 
 def getFigId(filename)
@@ -532,7 +741,7 @@ def getanchors(filename)
   File.open(filename) {|f|
     file = filename.sub(/.+\//, '')
     f.each_line {|l|
-      if l =~ /\A<h(\d)><a id=\"(.+?)\" \/>(.+?)<\/h/
+      if l =~ /\A<h(\d)[^>]*><a id=\"(.+?)\"><\/a>(.+?)<\/h/
         # level, ID, content
         @tocdesc << [$1.to_i, file, $2, $3]
       end
@@ -544,13 +753,27 @@ def make_colophon_page(tmp,bookname,values)
 
   header = <<EOT
 <?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">
+EOT
+    header += make_doctype()
+    header += <<EOT
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ops="http://www.idpf.org/2007/ops" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="ja">
 <head>
+EOT
+  if @htmlversion == 4
+    header += <<EOT
   <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="#{values["stylesheet"]}"/>
   <meta name="generator" content="ReVIEW EPUB Maker"/>
+EOT
+  else
+    header += <<EOT
+  <meta charset="UTF-8" />
+  <link rel="stylesheet" type="text/css" href="#{values["stylesheet"]}"/>
+  <meta name="generator" content="ReVIEW EPUB Maker"/>
+EOT
+  end
+    header += <<EOT
   <title>#{values["booktitle"]}</title>
 </head>
 <body>
@@ -606,4 +829,38 @@ EOT
   end
 end
 
+def make_part_page(part, filename, values)
+  File.open("#{@bookdir}/OEBPS/#{filename}", "w") {|f|
+    f.puts <<-EOT
+<?xml version="1.0" encoding="UTF-8"?>
+    EOT
+    doctype = make_doctype()
+    f.puts doctype
+    f.puts <<-EOT
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ops="http://www.idpf.org/2007/ops" xmlns:epub="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="#{values["stylesheet"]}"/>
+  <meta name="generator" content="ReVIEW EPUB Maker"/>
+  <title>#{values["booktitle"]}</title>
+</head>
+<body>
+<h1 class="part-number">#{ReVIEW::I18n.t("part", part.number)}</h1>
+    EOT
+
+    if part.name.strip.present?
+      f.puts <<-EOT
+<h2 class="part-title">#{part.name.strip}</h2>
+      EOT
+    end
+
+    f.puts <<-EOT
+</body>
+</html>
+    EOT
+  }
+end
+
+
 main