review 1.6.0 → 1.7.0

data/lib/epubmaker/producer.rb

@@ -54,6 +54,18 @@ module EPUBMaker
       end
     end
 
+    def coverimage
+      if !params["coverimage"]
+        return nil
+      end
+      @contents.each do |item|
+        if item.media =~ /\Aimage/ && item.file =~ /#{params["coverimage"]}\Z/ # /
+          return item.file
+        end
+      end
+      return nil
+    end
+
     # Update parameters by merging from new parameter hash +params+.
     def merge_params(params)
       @params = @params.merge(params)

data/lib/review/book/base.rb

@@ -84,6 +84,14 @@ module ReVIEW
         end
       end
 
+      def htmlversion
+        if config["htmlversion"].blank?
+          nil
+        else
+          config["htmlversion"].to_i
+        end
+      end
+
       def parts
         @parts ||= read_parts()
       end
@@ -111,7 +119,7 @@ module ReVIEW
       end
 
       def each_chapter_r(&block)
-        chapters.reverse.each(&block)
+        chapters.reverse_each(&block)
       end
 
       def chapter_index
@@ -217,12 +225,12 @@ module ReVIEW
       end
 
       def read_PART
-        return @read_PART if @read_PART
+        return @read_part if @read_part
 
         if catalog
-          @read_PART = catalog.parts
+          @read_part = catalog.parts
         else
-          @read_PART = File.read("#{@basedir}/#{config["part_file"]}")
+          @read_part = File.read("#{@basedir}/#{config["part_file"]}")
         end
       end
 

data/lib/review/book/compilable.rb

@@ -44,7 +44,6 @@ module ReVIEW
         @title = ''
         open {|f|
           f.each_line {|l|
-            l = convert_inencoding(l, book.config["inencoding"])
             if l =~ /\A=+/
               @title = l.sub(/\A=+(\[.+?\])?(\{.+?\})?/, '').strip
               break
@@ -74,8 +73,7 @@ module ReVIEW
       attr_writer :content
 
       def content
-        @content = convert_inencoding(File.read(path()),
-                                      book.config["inencoding"])
+        @content = File.read(path())
       rescue
         @content
       end

data/lib/review/book/index.rb

@@ -58,7 +58,7 @@ module ReVIEW
         @index.fetch(id)
       rescue
         if @index.keys.map{|i| i.split(/\|/).last }.flatten. # unfold all ids
-            reduce(Hash.new(0)){|h, i| h[i] += 1; h}.  # number of occurrences
+            reduce(Hash.new(0)){|h, i| h[i] += 1; h}. # number of occurrences
             select{|k, v| k == id && v > 1 }.present? # detect duplicated
           raise KeyError, "key '#{id}' is ambiguous for #{self.class}"
         end
@@ -172,7 +172,7 @@ module ReVIEW
         attr_reader :id
         attr_reader :number
         attr_reader :caption
-        attr_writer :index    # internal use only
+        attr_writer :index # internal use only
 
         def bound?
           path
@@ -245,12 +245,12 @@ module ReVIEW
       end
 
       def title(id)
-        sprintf(@locale["#{@index.item_type}_caption_format".intern],
+        sprintf(@locale["#{@index.item_type}_caption_format".to_sym],
           @index.title(id))
       end
 
       def number(id)
-        sprintf(@locale["#{@index.item_type}_number_format".intern],
+        sprintf(@locale["#{@index.item_type}_number_format".to_sym],
           @index.number(id))
       end
 

data/lib/review/builder.rb

@@ -63,15 +63,11 @@ module ReVIEW
     alias_method :raw_result, :result
 
     def print(*s)
-      @output.print(*s.map{|i|
-        convert_outencoding(i, @book.config["outencoding"])
-      })
+      @output.print(*s)
     end
 
     def puts(*s)
-      @output.puts *s.map{|i|
-        convert_outencoding(i, @book.config["outencoding"])
-      }
+      @output.puts(*s)
     end
 
     def target_name
@@ -380,7 +376,7 @@ module ReVIEW
       line = self.unescape(lines.join("\n"))
       cmds = {
         :graphviz => "echo '#{line}' | dot -T#{image_ext} -o#{file_path}",
-        :gnuplot  => "echo 'set terminal " +
+        :gnuplot => "echo 'set terminal " +
         "#{(image_ext == "eps") ? "postscript eps" : image_ext}\n" +
         " set output \"#{file_path}\"\n#{line}' | gnuplot",
         :blockdiag => "echo '#{line}' "+
@@ -400,13 +396,12 @@ module ReVIEW
     end
 
     def inline_include(file_name)
-      compile_inline convert_inencoding(File.open(file_name).read,
-                                        @book.config["inencoding"])
+      compile_inline File.open(file_name).read
     end
 
     def include(file_name)
       File.foreach(file_name) do |line|
-        paragraph([convert_inencoding(line, @book.config["inencoding"])])
+        paragraph([line])
       end
     end
 
@@ -443,4 +438,4 @@ module ReVIEW
     end
   end
 
-end   # module ReVIEW
+end # module ReVIEW

data/lib/review/compiler.rb

@@ -362,7 +362,7 @@ module ReVIEW
         elsif level < current_level # down
           level_diff = current_level - level
           level = current_level
-          (1..(level_diff - 1)).to_a.reverse.each do |i|
+          (1..(level_diff - 1)).to_a.reverse_each do |i|
             @strategy.ul_begin {i}
             @strategy.ul_item_begin []
           end
@@ -371,7 +371,7 @@ module ReVIEW
         elsif level > current_level # up
           level_diff = level - current_level
           level = current_level
-          (1..level_diff).to_a.reverse.each do |i|
+          (1..level_diff).to_a.reverse_each do |i|
             @strategy.ul_item_end
             @strategy.ul_end {level + i}
           end
@@ -381,7 +381,7 @@ module ReVIEW
         end
       end
 
-      (1..level).to_a.reverse.each do |i|
+      (1..level).to_a.reverse_each do |i|
         @strategy.ul_item_end
         @strategy.ul_end {i}
       end
@@ -424,7 +424,7 @@ module ReVIEW
 
     def read_command(f)
       line = f.gets
-      name = line.slice(/[a-z]+/).intern
+      name = line.slice(/[a-z]+/).to_sym
       args = parse_args(line.sub(%r<\A//[a-z]+>, '').rstrip.chomp('{'), name)
       lines = block_open?(line) ? read_block(f) : nil
       return name, args, lines
@@ -446,7 +446,7 @@ module ReVIEW
         error "unexpected EOF (block begins at: #{head})"
         return buf
       end
-      f.gets   # discard terminator
+      f.gets # discard terminator
       buf
     end
 
@@ -524,7 +524,7 @@ module ReVIEW
     rescue => err
       error err.message
     end
-    public :text   # called from strategy
+    public :text # called from strategy
 
     def compile_inline(str)
       op, arg = /\A@<(\w+)>\{(.*?)\}\z/.match(str).captures
@@ -550,4 +550,4 @@ module ReVIEW
 
   end
 
-end   # module ReVIEW
+end # module ReVIEW

data/lib/review/configure.rb

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 module ReVIEW
   class Configure < Hash
+
+    attr_accessor :maker
+
     def self.values
       Configure[
         # These parameters can be overridden by YAML file.
@@ -36,17 +39,26 @@ module ReVIEW
         "language" => 'ja', # XXX default language should be JA??
 
         "chapter_file" => 'CHAPS',
-        "part_file"    => 'PART',
-        "reject_file"  => 'REJECT',
-        "predef_file"  => 'PREDEF',
+        "part_file" => 'PART',
+        "reject_file" => 'REJECT',
+        "predef_file" => 'PREDEF',
         "postdef_file" => 'POSTDEF',
-        "page_metric"  => ReVIEW::Book::PageMetric.a5,
-        "ext"          => '.re',
-        "image_dir"    => 'images',
-        "image_types"  => %w( .ai .psd .eps .pdf .tif .tiff .png .bmp .jpg .jpeg .gif .svg ),
-        "bib_file"     => "bib.re",
+        "page_metric" => ReVIEW::Book::PageMetric.a5,
+        "ext" => '.re',
+        "image_dir" => 'images',
+        "image_types" => %w( .ai .psd .eps .pdf .tif .tiff .png .bmp .jpg .jpeg .gif .svg ),
+        "bib_file" => "bib.re",
         "colophon_order" => %w(aut csl trl dsr ill cov edt pbl contact prt),
       ]
     end
+
+    def [](key)
+      if self.key?(key)
+        return self.fetch(key)
+      end
+      if @maker && self.key?(@maker)
+        return self.fetch(@maker).fetch(key, nil)
+      end
+    end
   end
 end

data/lib/review/epubbuilder.rb

@@ -15,4 +15,4 @@ module ReVIEW
   class EPUBBuilder < HTMLBuilder
   end
 
-end   # module ReVIEW
+end # module ReVIEW

data/lib/review/epubmaker.rb

@@ -11,6 +11,7 @@ require 'review'
 require 'rexml/document'
 require 'rexml/streamlistener'
 require 'epubmaker'
+require 'review/htmltoc'
 
 module ReVIEW
  class EPUBMaker
@@ -19,7 +20,7 @@ module ReVIEW
 
   def initialize
     @producer = nil
-    @tochtmltxt = "toc-html.txt"
+    @htmltoc = nil
     @buildlogtxt = "build-log.txt"
   end
 
@@ -51,6 +52,7 @@ module ReVIEW
 
       call_hook("hook_beforeprocess", basetmpdir)
 
+      @htmltoc = ReVIEW::HTMLToc.new(basetmpdir)
       ## copy all files into basetmpdir
       copy_stylesheet(basetmpdir)
 
@@ -200,7 +202,7 @@ module ReVIEW
           build_part(part, basetmpdir, htmlfile)
           title = ReVIEW::I18n.t("part", part.number)
           title += ReVIEW::I18n.t("chapter_postfix") + part.name.strip if part.name.strip.present?
-          write_tochtmltxt(basetmpdir, "0\t#{htmlfile}\t#{title}\tchaptype=part")
+          @htmltoc.add_item(0, htmlfile, title, {:chaptype => "part"})
           write_buildlogtxt(basetmpdir, htmlfile, "")
         end
       end
@@ -215,21 +217,23 @@ module ReVIEW
   def build_part(part, basetmpdir, htmlfile)
     log("Create #{htmlfile} from a template.")
     File.open("#{basetmpdir}/#{htmlfile}", "w") do |f|
-      f.puts header(CGI.escapeHTML(@params["booktitle"]))
-      f.puts <<EOT
-<div class="part">
-<h1 class="part-number">#{ReVIEW::I18n.t("part", part.number)}</h1>
-EOT
+      @body = ""
+      @body << "<div class=\"part\">\n"
+      @body << "<h1 class=\"part-number\">#{ReVIEW::I18n.t("part", part.number)}</h1>\n"
       if part.name.strip.present?
-        f.puts <<EOT
-<h2 class="part-title">#{part.name.strip}</h2>
-EOT
+        @body << "<h2 class=\"part-title\">#{part.name.strip}</h2>\n"
       end
+      @body << "</div>\n"
 
-      f.puts <<EOT
-</div>
-EOT
-      f.puts footer
+      @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)
+      f.write tmpl.result(binding)
     end
   end
 
@@ -320,51 +324,27 @@ EOT
     headlines.each do |headline|
       headline["level"] = 0 if ispart.present? && headline["level"] == 1
       if first.nil?
-        write_tochtmltxt(basetmpdir, "#{headline["level"]}\t#{filename}##{headline["id"]}\t#{headline["title"]}\tchaptype=#{chaptype}")
+        @htmltoc.add_item(headline["level"], filename+"#"+headline["id"], headline["title"], {:chaptype => chaptype})
       else
-        write_tochtmltxt(basetmpdir, "#{headline["level"]}\t#{filename}\t#{headline["title"]}\tforce_include=true,chaptype=#{chaptype}#{prop_str}")
+        @htmltoc.add_item(headline["level"], filename, headline["title"], {:force_include => true, :chaptype => chaptype+prop_str})
         first = nil
       end
     end
   end
 
   def push_contents(basetmpdir)
-    File.open("#{basetmpdir}/#{@tochtmltxt}") do |f|
-      f.each_line do |l|
-        force_include = nil
-        customid = nil
-        chaptype = nil
-        properties = nil
-        level, file, title, custom = l.chomp.split("\t")
-        if custom.present?
-          # custom setting
-          vars = custom.split(/,\s*/)
-          vars.each do |var|
-            k, v = var.split("=")
-            case k
-            when "id"
-              customid = v
-            when "force_include"
-              force_include = true
-            when "chaptype"
-              chaptype = v
-            when "properties"
-              properties = v
-            end
-          end
-        end
-        next if level.to_i > @params["toclevel"] && force_include.nil?
-        log("Push #{file} to ePUB contents.")
+    @htmltoc.each_item do |level, file, title, args|
+      next if level.to_i > @params["toclevel"] && args[:force_include].nil?
+      log("Push #{file} to ePUB contents.")
 
-        hash = {"file" => file, "level" => level.to_i, "title" => title, "chaptype" => chaptype}
-        if customid.present?
-          hash["id"] = customid
-        end
-        if properties.present?
-          hash["properties"] = properties.split(" ")
-        end
-        @producer.contents.push(Content.new(hash))
+      hash = {"file" => file, "level" => level.to_i, "title" => title, "chaptype" => args[:chaptype]}
+      if args[:id].present?
+        hash["id"] = args[:id]
+      end
+      if args[:properties].present?
+        hash["properties"] = args[:properties].split(" ")
       end
+      @producer.contents.push(Content.new(hash))
     end
   end
 
@@ -386,55 +366,54 @@ EOT
       else
         FileUtils.cp(@params["titlefile"], "#{basetmpdir}/titlepage.#{@params["htmlext"]}")
       end
-      write_tochtmltxt(basetmpdir, "1\ttitlepage.#{@params["htmlext"]}\t#{@producer.res.v("titlepagetitle")}\tchaptype=pre")
+      @htmltoc.add_item(1, "titlepage.#{@params['htmlext']}", @producer.res.v("titlepagetitle"), {:chaptype => "pre"})
     end
 
     if @params["originaltitlefile"].present? && File.exist?(@params["originaltitlefile"])
       FileUtils.cp(@params["originaltitlefile"], "#{basetmpdir}/#{File.basename(@params["originaltitlefile"])}")
-      write_tochtmltxt(basetmpdir, "1\t#{File.basename(@params["originaltitlefile"])}\t#{@producer.res.v("originaltitle")}\tchaptype=pre")
+      @htmltoc.add_item(1, File.basename(@params["originaltitlefile"]), @producer.res.v("originaltitle"), {:chaptype => "pre"})
     end
 
     if @params["creditfile"].present? && File.exist?(@params["creditfile"])
       FileUtils.cp(@params["creditfile"], "#{basetmpdir}/#{File.basename(@params["creditfile"])}")
-      write_tochtmltxt(basetmpdir, "1\t#{File.basename(@params["creditfile"])}\t#{@producer.res.v("credittitle")}\tchaptype=pre")
+      @htmltoc.add_item(1, File.basename(@params["creditfile"]), @producer.res.v("credittitle"), {:chaptype => "pre"})
     end
   end
 
   def build_titlepage(basetmpdir, htmlfile)
     File.open("#{basetmpdir}/#{htmlfile}", "w") do |f|
-      f.puts header(CGI.escapeHTML(@params["booktitle"]))
-      f.puts <<EOT
-<div class="titlepage">
-<h1 class="tp-title">#{CGI.escapeHTML(@params["booktitle"])}</h1>
-EOT
-
+      @body = ""
+      @body << "<div class=\"titlepage\">"
+      @body << "<h1 class=\"tp-title\">#{CGI.escapeHTML(@params["booktitle"])}</h1>"
       if @params["aut"]
-        f.puts <<EOT
-<h2 class="tp-author">#{@params["aut"].join(", ")}</h2>
-EOT
+        @body << "<h2 class=\"tp-author\">#{@params["aut"].join(", ")}</h2>"
       end
       if @params["prt"]
-        f.puts <<EOT
-<h3 class="tp-publisher">#{@params["prt"].join(", ")}</h3>
-EOT
+        @body << "<h3 class=\"tp-publisher\">#{@params["prt"].join(", ")}</h3>"
       end
+      @body << "</div>"
 
-      f.puts <<EOT
-</div>
-EOT
-      f.puts footer
+      @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)
+      f.write tmpl.result(binding)
     end
   end
 
   def copy_backmatter(basetmpdir)
     if @params["profile"]
       FileUtils.cp(@params["profile"], "#{basetmpdir}/#{File.basename(@params["profile"])}")
-      write_tochtmltxt(basetmpdir, "1\t#{File.basename(@params["profile"])}\t#{@producer.res.v("profiletitle")}\tchaptype=post")
+      @htmltoc.add_item(1, File.basename(@params["profile"]), @producer.res.v("profiletitle"), {:chaptype => "post"})
     end
 
     if @params["advfile"]
       FileUtils.cp(@params["advfile"], "#{basetmpdir}/#{File.basename(@params["advfile"])}")
-      write_tochtmltxt(basetmpdir, "1\t#{File.basename(@params["advfile"])}\t#{@producer.res.v("advtitle")}\tchaptype=post")
+      @htmltoc.add_item(1, File.basename(@params["advfile"]), @producer.res.v("advtitle"), {:chaptype => "post"})
     end
 
     if @params["colophon"]
@@ -443,18 +422,12 @@ EOT
       else
         File.open("#{basetmpdir}/colophon.#{@params["htmlext"]}", "w") {|f| @producer.colophon(f) }
       end
-      write_tochtmltxt(basetmpdir, "1\tcolophon.#{@params["htmlext"]}\t#{@producer.res.v("colophontitle")}\tchaptype=post")
+      @htmltoc.add_item(1, "colophon.#{@params["htmlext"]}", @producer.res.v("colophontitle"), {:chaptype => "post"})
     end
 
     if @params["backcover"]
       FileUtils.cp(@params["backcover"], "#{basetmpdir}/#{File.basename(@params["backcover"])}")
-      write_tochtmltxt(basetmpdir, "1\t#{File.basename(@params["backcover"])}\t#{@producer.res.v("backcovertitle")}\tchaptype=post")
-    end
-  end
-
-  def write_tochtmltxt(basetmpdir, s)
-    File.open("#{basetmpdir}/#{@tochtmltxt}", "a") do |f|
-      f.puts s
+      @htmltoc.add_item(1, File.basename(@params["backcover"]), @producer.res.v("backcovertitle"), {:chaptype => "post"})
     end
   end
 
@@ -464,49 +437,6 @@ EOT
     end
   end
 
-  def header(title)
-    # titleはすでにエスケープ済みと想定
-    s = <<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-EOT
-    if @params["htmlversion"] == 5
-      s << <<EOT
-<!DOCTYPE html>
-<html xml:lang='ja' xmlns:ops='http://www.idpf.org/2007/ops' xmlns='http://www.w3.org/1999/xhtml'>
-<head>
-  <meta charset="UTF-8" />
-EOT
-    else
-      s << <<EOT
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xml:lang='ja' xmlns:ops='http://www.idpf.org/2007/ops' xmlns='http://www.w3.org/1999/xhtml'>
-<head>
-  <meta http-equiv='Content-Type' content='text/html;charset=UTF-8' />
-  <meta http-equiv='Content-Style-Type' content='text/css' />
-EOT
-    end
-    if @params["stylesheet"].size > 0
-      @params["stylesheet"].each do |sfile|
-        s << <<EOT
-  <link rel='stylesheet' type='text/css' href='#{sfile}' />
-EOT
-      end
-    end
-    s << <<EOT
-  <meta content='Re:VIEW' name='generator'/>
-  <title>#{title}</title>
-</head>
-<body>
-EOT
-  end
-
-  def footer
-    <<EOT
-</body>
-</html>
-EOT
-  end
-
   class ReVIEWHeaderListener
     include REXML::StreamListener
     def initialize(headlines)