review 1.7.2 → 2.0.0.beta1

data/bin/review-vol

@@ -21,7 +21,13 @@ require 'optparse'
 include ReVIEW::TextUtils
 
 def main
+  $KCODE = 'UTF-8' unless defined?(Encoding)
+
   @config = ReVIEW::Configure.values
+  @config.merge!({
+    "inencoding" => "UTF-8",
+    "outencoding" => "UTF-8"
+  })
 
   part_sensitive = false
   basedir = nil
@@ -34,6 +40,12 @@ def main
   opts.on('-P', '--part-sensitive', 'Prints volume of each parts.') {
     part_sensitive = true
   }
+  opts.on('--inencoding=ENCODING', 'Set input encoding. (UTF-8, EUC, JIS, and SJIS)') {|enc|
+    @config["inencoding"] = enc
+  }
+  opts.on('--outencoding=ENCODING', 'Set output encoding. (UTF-8[default], EUC, JIS, and SJIS)') {|enc|
+    @config["outencoding"] = enc
+  }
   opts.on('--directory=DIR', 'Compile all chapters in DIR.') {|path|
     basedir = path
   }
@@ -83,7 +95,7 @@ end
 
 def print_chapter_volume(chap)
   vol = chap.volume
-  title = chap.title
+  title = convert_outencoding(chap.title, @config["outencoding"])
   printf "%s %3dKB %6dC %5dL %3dP %s %-s\n",
          chapnumstr(chap.number), vol.kbytes, vol.chars, vol.lines, vol.page,
          "#{chap.name} ".ljust(25, '.'), title

data/doc/quickstart.ja.md

@@ -161,7 +161,7 @@ sample.re を HTML に変換すると、次のようになります。
 </html>
 ```
 
-Re:VIEW フォーマットについての詳細は、 [format.ja.md](https://github.com/kmuto/review/blob/master/doc/format.ja.md) を参照してください。
+Re:VIEW フォーマットについての詳細は、 [format.rdoc](https://github.com/kmuto/review/blob/master/doc/format.rdoc) を参照してください。
 
 review-compile を含め、ほとんどのコマンドは `--help` オプションを付けるとオプションについてのヘルプが表示されます。`review-compile` には多数のオプションがあるので確認してください。
 

data/doc/quickstart.md

@@ -191,7 +191,7 @@ You can get HTML file as follows:
 </html>
 ```
 
-For more information about Re:VIEW format, see [format.md](https://github.com/kmuto/review/blob/master/doc/format.md).
+For more information about Re:VIEW format, see [format.rdoc](https://github.com/kmuto/review/blob/master/doc/format.rdoc).
 
 review-compile and other commands in Re:VIEW has `--help` option to output help.  `review-compile` has many options, so you may see them.
 

data/lib/epubmaker/content.rb

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

data/lib/epubmaker/epubcommon.rb

@@ -28,10 +28,6 @@ module EPUBMaker
       "application/epub+zip"
     end
 
-    def opf_path
-      "OEBPS/#{@producer.params["bookname"]}.opf"
-    end
-
     def opf_coverimage
       s = ""
       if @producer.params["coverimage"]
@@ -116,53 +112,66 @@ EOT
 
     # Return container content.
     def container
-      @opf_path = opf_path
-      tmplfile = File.expand_path('./xml/container.xml.erb', ReVIEW::Template::TEMPLATE_DIR)
-      tmpl = ReVIEW::Template.load(tmplfile)
-      tmpl.result(binding)
+      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
     end
 
     # Return cover content.
     def cover(type=nil)
-      @body_ext = type.nil? ? "" : " epub:type=\"#{type}\""
+      bodyext = type.nil? ? "" : " epub:type=\"#{type}\""
 
-      if @producer.params["coverimage"]
-        file = @producer.coverimage
-        if !file
-          raise "coverimage #{@producer.params["coverimage"]} not found. Abort."
+      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
         end
-        @body = <<-EOT
+        raise "coverimage #{@producer.params["coverimage"]} not found. Abort." if file.nil?
+        s << <<EOT
   <div id="cover-image" class="cover-image">
     <img src="#{file}" alt="#{CGI.escapeHTML(@producer.params["title"])}" class="max"/>
   </div>
-        EOT
-      else
-        @body = <<-EOT
-<h1 class="cover-title">#{CGI.escapeHTML(@producer.params["title"])}</h1>
-        EOT
+EOT
       end
 
-      @title = @producer.params['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)
+      s << <<EOT
+</body>
+</html>
+EOT
+      s
     end
 
     # Return title (copying) content.
     def titlepage
-      @title = @producer.params["title"]
-
-      @body = <<EOT
-  <h1 class="tp-title">#{CGI.escapeHTML(@title)}</h1>
+      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
+
       if @producer.params["aut"]
-        @body << <<EOT
+        s << <<EOT
   <p>
     <br />
     <br />
@@ -173,7 +182,7 @@ EOT
 
       publisher = @producer.params["pbl"] || @producer.params["prt"] # XXX Backward Compatiblity
       if publisher
-        @body << <<EOT
+        s << <<EOT
   <p>
     <br />
     <br />
@@ -184,66 +193,67 @@ EOT
 EOT
       end
 
-      @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)
+      s << <<EOT
+</body>
+</html>
+EOT
+
+      s
     end
 
     # Return colophon content.
     def colophon
-      @title = @producer.res.v("colophontitle")
-      @body = <<EOT
+      s = common_header
+      s << <<EOT
+  <title>#{@producer.res.v("colophontitle")}</title>
+</head>
+<body>
   <div class="colophon">
 EOT
 
       if @producer.params["subtitle"].nil?
-        @body << <<EOT
+        s << <<EOT
     <p class="title">#{CGI.escapeHTML(@producer.params["title"])}</p>
 EOT
       else
-        @body << <<EOT
+        s << <<EOT
     <p class="title">#{CGI.escapeHTML(@producer.params["title"])}<br /><span class="subtitle">#{CGI.escapeHTML(@producer.params["subtitle"])}</span></p>
 EOT
       end
 
       if @producer.params["date"] || @producer.params["history"]
-        @body << %Q[    <div class="pubhistory">\n]
+        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/
-                @body << %Q[      <p>#{ReVIEW::I18n.t("published_by1", [date_to_s(item), editstr+revstr])}</p>\n]
+                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|
-                  @body << %Q[      <p>#{ReVIEW::I18n.t("published_by3", [date_to_s(m[1]), m[2]])}</p>\n]
+                  s << %Q[      <p>#{ReVIEW::I18n.t("published_by3", [date_to_s(m[1]), m[2]])}</p>\n]
                 end
               end
             end
           end
         else
-          @body << %Q[      <p>#{ReVIEW::I18n.t("published_by2", date_to_s(@producer.params["date"]))}</p>\n]
+          s << %Q[      <p>#{ReVIEW::I18n.t("published_by2", date_to_s(@producer.params["date"]))}</p>\n]
         end
-        @body << %Q[    </div>\n]
+        s << %Q[    </div>\n]
       end
 
-      @body << %Q[    <table class="colophon">\n]
-      @body << %w[aut csl trl dsr ill edt pbl prt pht].map{ |role|
-        if @producer.params[role]
-          %Q[      <tr><th>#{@producer.res.v(role)}</th><td>#{CGI.escapeHTML(@producer.params[role].join(", "))}</td></tr>\n]
-        else
-          ""
-        end
-      }.join("")
-
+      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
@@ -252,23 +262,21 @@ EOT
         else
           isbn = "#{str[0..2]}-#{str[3..3]}-#{str[4..8]}-#{str[9..11]}-#{str[12..12]}"
         end
-        @body << %Q[      <tr><th>ISBN</th><td>#{isbn}</td></tr>\n]
+        s << %Q[      <tr><th>ISBN</th><td>#{isbn}</td></tr>\n]
       end
-      @body << %Q[    </table>\n]
+      s << <<EOT
+    </table>
+EOT
       if !@producer.params["rights"].nil? && @producer.params["rights"].size > 0
-        @body << %Q[    <p class="copyright">#{@producer.params["rights"].join("<br />")}</p>]
+        s << %Q[    <p class="copyright">#{@producer.params["rights"].join("<br />")}</p>]
       end
-      @body << %Q[  </div>\n]
 
-      @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)
+      s << <<EOT
+  </div>
+</body>
+</html>
+EOT
+      s
     end
 
     def date_to_s(date)
@@ -279,24 +287,25 @@ EOT
 
     # Return own toc content.
     def mytoc
-      @title = @producer.res.v("toctitle")
+      s = common_header
+      s << <<EOT
+  <title>#{@producer.res.v("toctitle")}</title>
+</head>
+<body>
+  <h1 class="toc-title">#{@producer.res.v("toctitle")}</h1>
+EOT
 
-      @body = %Q[  <h1 class="toc-title">#{@producer.res.v("toctitle")}</h1>\n]
       if @producer.params["epubmaker"]["flattoc"].nil?
-        @body << hierarchy_ncx("ul")
+        s << hierarchy_ncx("ul")
       else
-        @body << flat_ncx("ul", @producer.params["epubmaker"]["flattocindent"])
+        s << flat_ncx("ul", @producer.params["epubmaker"]["flattocindent"])
       end
 
-      @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)
+      s << <<EOT
+</body>
+</html>
+EOT
+      s
     end
 
     def hierarchy_ncx(type)
@@ -385,7 +394,7 @@ EOT
       File.open("#{tmpdir}/META-INF/container.xml", "w") {|f| @producer.container(f) }
 
       FileUtils.mkdir_p("#{tmpdir}/OEBPS")
-      File.open(File.join(tmpdir, opf_path), "w") {|f| @producer.opf(f) }
+      File.open("#{tmpdir}/OEBPS/#{@producer.params["bookname"]}.opf", "w") {|f| @producer.opf(f) }
 
       if File.exist?("#{basedir}/#{@producer.params["cover"]}")
         FileUtils.cp("#{basedir}/#{@producer.params["cover"]}", "#{tmpdir}/OEBPS")
@@ -408,13 +417,21 @@ EOT
     end
 
     def legacy_cover_and_title_file(loadfile, writefile)
-      @title = @producer.params["booktitle"]
-      s = ""
+      s = common_header
+      s << <<EOT
+  <title>#{@producer.params["booktitle"]}</title>
+</head>
+<body>
+EOT
       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

data/lib/epubmaker/epubv2.rb

@@ -23,14 +23,24 @@ module EPUBMaker
 
     # Return opf file content.
     def opf
-      @opf_metainfo = opf_metainfo
-      @opf_coverimage = opf_coverimage
-      @opf_manifest = opf_manifest
-      @opf_toc = opf_tocx
-
-      tmplfile = File.expand_path('./opf/epubv2.opf.erb', ReVIEW::Template::TEMPLATE_DIR)
-      tmpl = ReVIEW::Template.load(tmplfile)
-      return tmpl.result(binding)
+      s = <<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">
+EOT
+
+      s << opf_metainfo
+      s << opf_coverimage
+
+      s << %Q[  </metadata>\n]
+
+      s << opf_manifest
+      s << opf_tocx
+      s << opf_guide
+
+      s << %Q[</package>\n]
+
+      s
     end
 
     def opf_metainfo
@@ -111,15 +121,39 @@ EOT
       s
     end
 
+    def opf_guide
+      s = ""
+      s << %Q[  <guide>\n]
+      s << %Q[    <reference type="cover" title="#{@producer.res.v("covertitle")}" href="#{@producer.params["cover"]}"/>\n]
+      s << %Q[    <reference type="title-page" title="#{@producer.res.v("titlepagetitle")}" href="titlepage.#{@producer.params["htmlext"]}"/>\n] unless @producer.params["titlepage"].nil?
+      s << %Q[    <reference type="toc" title="#{@producer.res.v("toctitle")}" href="#{@producer.params["bookname"]}-toc.#{@producer.params["htmlext"]}"/>\n] unless @producer.params["mytoc"].nil?
+      s << %Q[    <reference type="colophon" title="#{@producer.res.v("colophontitle")}" href="colophon.#{@producer.params["htmlext"]}"/>\n] unless @producer.params["colophon"].nil?
+      s << %Q[  </guide>\n]
+      s
+    end
+
     # Return ncx content. +indentarray+ has prefix marks for each level.
     def ncx(indentarray)
-      @ncx_isbn = ncx_isbn
-      @ncx_doctitle = ncx_doctitle
-      @ncx_navmap = ncx_navmap(indentarray)
+      s = <<EOT
+<?xml version="1.0" encoding="UTF-8"?>
+<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
+  <head>
+    <meta name="dtb:depth" content="1"/>
+    <meta name="dtb:totalPageCount" content="0"/>
+    <meta name="dtb:maxPageNumber" content="0"/>
+EOT
+      s << ncx_isbn
 
-      tmplfile = File.expand_path('./ncx/epubv2.ncx.erb', ReVIEW::Template::TEMPLATE_DIR)
-      tmpl = ReVIEW::Template.load(tmplfile)
-      return tmpl.result(binding)
+      s << <<EOT
+  </head>
+EOT
+      s << ncx_doctitle
+      s << ncx_navmap(indentarray)
+
+      s << <<EOT
+</ncx>
+EOT
+      s
     end
 
     # Produce EPUB file +epubfile+.
@@ -135,5 +169,24 @@ EOT
       export_zip(tmpdir, epubfile)
     end
 
+    private
+
+    # Return common XHTML headder
+    def common_header
+      s =<<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="#{@producer.params["language"]}">
+<head>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+  <meta http-equiv="Content-Style-Type" content="text/css"/>
+  <meta name="generator" content="Re:VIEW"/>
+EOT
+
+      @producer.params["stylesheet"].each do |file|
+        s << %Q[  <link rel="stylesheet" type="text/css" href="#{file}"/>\n]
+      end
+      s
+    end
   end
 end