review 2.1.0 → 2.2.0

data/doc/sample.css

@@ -107,6 +107,220 @@ p.flushright {
     text-align: right;
 }
 
+/**
+ * from Rouge
+ */
+.highlight table td { padding: 5px; }
+.highlight table pre { margin: 0; }
+.highlight .cm {
+  color: #999988;
+  font-style: italic;
+}
+.highlight .cp {
+  color: #999999;
+  font-weight: bold;
+}
+.highlight .c1 {
+  color: #999988;
+  font-style: italic;
+}
+.highlight .cs {
+  color: #999999;
+  font-weight: bold;
+  font-style: italic;
+}
+.highlight .c, .highlight .cd {
+  color: #999988;
+  font-style: italic;
+}
+.highlight .err {
+  color: #a61717;
+  background-color: #e3d2d2;
+}
+.highlight .gd {
+  color: #000000;
+  background-color: #ffdddd;
+}
+.highlight .ge {
+  color: #000000;
+  font-style: italic;
+}
+.highlight .gr {
+  color: #aa0000;
+}
+.highlight .gh {
+  color: #999999;
+}
+.highlight .gi {
+  color: #000000;
+  background-color: #ddffdd;
+}
+.highlight .go {
+  color: #888888;
+}
+.highlight .gp {
+  color: #555555;
+}
+.highlight .gs {
+  font-weight: bold;
+}
+.highlight .gu {
+  color: #aaaaaa;
+}
+.highlight .gt {
+  color: #aa0000;
+}
+.highlight .kc {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .kd {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .kn {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .kp {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .kr {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .kt {
+  color: #445588;
+  font-weight: bold;
+}
+.highlight .k, .highlight .kv {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .mf {
+  color: #009999;
+}
+.highlight .mh {
+  color: #009999;
+}
+.highlight .il {
+  color: #009999;
+}
+.highlight .mi {
+  color: #009999;
+}
+.highlight .mo {
+  color: #009999;
+}
+.highlight .m, .highlight .mb, .highlight .mx {
+  color: #009999;
+}
+.highlight .sb {
+  color: #d14;
+}
+.highlight .sc {
+  color: #d14;
+}
+.highlight .sd {
+  color: #d14;
+}
+.highlight .s2 {
+  color: #d14;
+}
+.highlight .se {
+  color: #d14;
+}
+.highlight .sh {
+  color: #d14;
+}
+.highlight .si {
+  color: #d14;
+}
+.highlight .sx {
+  color: #d14;
+}
+.highlight .sr {
+  color: #009926;
+}
+.highlight .s1 {
+  color: #d14;
+}
+.highlight .ss {
+  color: #990073;
+}
+.highlight .s {
+  color: #d14;
+}
+.highlight .na {
+  color: #008080;
+}
+.highlight .bp {
+  color: #999999;
+}
+.highlight .nb {
+  color: #0086B3;
+}
+.highlight .nc {
+  color: #445588;
+  font-weight: bold;
+}
+.highlight .no {
+  color: #008080;
+}
+.highlight .nd {
+  color: #3c5d5d;
+  font-weight: bold;
+}
+.highlight .ni {
+  color: #800080;
+}
+.highlight .ne {
+  color: #990000;
+  font-weight: bold;
+}
+.highlight .nf {
+  color: #990000;
+  font-weight: bold;
+}
+.highlight .nl {
+  color: #990000;
+  font-weight: bold;
+}
+.highlight .nn {
+  color: #555555;
+}
+.highlight .nt {
+  color: #000080;
+}
+.highlight .vc {
+  color: #008080;
+}
+.highlight .vg {
+  color: #008080;
+}
+.highlight .vi {
+  color: #008080;
+}
+.highlight .nv {
+  color: #008080;
+}
+.highlight .ow {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .o {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .w {
+  color: #bbbbbb;
+}
+.highlight {
+  background-color: #f8f8f8;
+}
+.rouge-table { border-spacing: 0 }
+.rouge-gutter { text-align: right }
 
 /**
  * from EBPAJ EPUB 3 File Creation Guide sample style

data/lib/epubmaker.rb

@@ -10,13 +10,13 @@
 #
 # == Quick usage
 #  require 'epubmaker'
-#  epub = EPUBMaker::Producer.new
-#  params = epub.load("config.yml")
-#  epub.contents.push(EPUBMaker::Content.new({"file" => "ch01.xhtml"}))
-#  epub.contents.push(EPUBMaker::Content.new({"file" => "ch02.xhtml"}))
+#  producer = EPUBMaker::Producer.new
+#  params = producer.load("config.yml")
+#  producer.contents.push(EPUBMaker::Content.new({"file" => "ch01.xhtml"}))
+#  producer.contents.push(EPUBMaker::Content.new({"file" => "ch02.xhtml"}))
 #   ...
-#  epub.import_imageinfo("images")
-#  epub.produce
+#  producer.import_imageinfo("images")
+#  producer.produce
 
 require 'epubmaker/producer'
 require 'epubmaker/content'

data/lib/epubmaker/epubcommon.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # = epubcommon.rb -- super class for EPUBv2 and EPUBv3
 #
-# Copyright (c) 2010-2016 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2017 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -12,12 +12,6 @@
 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
 
@@ -144,6 +138,11 @@ EOT
         @body = <<-EOT
 <h1 class="cover-title">#{CGI.escapeHTML(@producer.params.name_of("title"))}</h1>
         EOT
+        if @producer.params["subtitle"]
+          @body << <<-EOT
+<h2 class="cover-subtitle">#{CGI.escapeHTML(@producer.params.name_of("subtitle"))}</h2>
+          EOT
+        end
       end
 
       @title = CGI.escapeHTML(@producer.params.name_of("title"))
@@ -159,12 +158,21 @@ EOT
     end
 
     # Return title (copying) content.
+    # NOTE: this method is not used yet.
+    #       see lib/review/epubmaker.rb#build_titlepage
     def titlepage
       @title = CGI.escapeHTML(@producer.params.name_of("title"))
 
       @body = <<EOT
   <h1 class="tp-title">#{@title}</h1>
 EOT
+
+      if @producer.params["subtitle"]
+        @body << <<EOT
+  <h2 class="tp-subtitle">#{CGI.escapeHTML(@producer.params.name_of("subtitle"))}</h2>
+EOT
+      end
+
       if @producer.params["aut"]
         @body << <<EOT
   <p>
@@ -259,11 +267,14 @@ EOT
             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
+            elsif item =~ /\A(\d+\-\d+\-\d+)[\s　](.+)/
               # 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
+            else
+              # free format
+              buf << %Q[      <p>#{item}</p>\n]
             end
           end
         end
@@ -405,45 +416,6 @@ EOT
       end
     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)
       @title = @producer.params["booktitle"]
       s = ""

data/lib/epubmaker/epubv2.rb

@@ -11,6 +11,7 @@
 
 require 'epubmaker/epubcommon'
 require 'cgi'
+require 'epubmaker/zip_exporter'
 
 module EPUBMaker
 
@@ -132,7 +133,8 @@ EOT
       File.open("#{tmpdir}/OEBPS/#{@producer.params["bookname"]}-toc.#{@producer.params["htmlext"]}", "w") {|f| @producer.mytoc(f) } unless @producer.params["mytoc"].nil?
 
       @producer.call_hook(@producer.params["epubmaker"]["hook_prepack"], tmpdir)
-      export_zip(tmpdir, epubfile)
+      expoter = EPUBMaker::ZipExporter.new(tmpdir, @producer.params)
+      expoter.export_zip(epubfile)
     end
 
   end

data/lib/epubmaker/epubv3.rb

@@ -10,6 +10,7 @@
 #
 
 require 'epubmaker/epubcommon'
+require 'epubmaker/zip_exporter'
 
 module EPUBMaker
 
@@ -18,7 +19,7 @@ module EPUBMaker
     # Construct object with parameter hash +params+ and message resource hash +res+.
     def initialize(producer)
       super
-      @opf_prefix = Hash.new
+      @opf_prefix = {}
       if @producer.params["opf_prefix"].present?
         @producer.params["opf_prefix"].each do |k, v|
           @opf_prefix[k] = v
@@ -225,31 +226,8 @@ EOT
       File.open("#{tmpdir}/OEBPS/#{@producer.params["bookname"]}-toc.#{@producer.params["htmlext"]}", "w") {|f| @producer.ncx(f, @producer.params["epubmaker"]["ncxindent"]) }
 
       @producer.call_hook(@producer.params["epubmaker"]["hook_prepack"], tmpdir)
-      export_zip(tmpdir, epubfile)
+      expoter = EPUBMaker::ZipExporter.new(tmpdir, @producer.params)
+      expoter.export_zip(epubfile)
     end
-
-    private
-
-    # Return cover pointer for opf file
-    def cover_in_opf
-      s = ""
-
-      if @producer.params["coverimage"]
-        @producer.contents.each do |item|
-          if item.media.start_with?('image') && item.file =~ /#{@producer.params["coverimage"]}\Z/
-              s << <<EOT
-            <item id="#{item.id}" href="#{item.file}" media-type="#{item.media}"/>
-EOT
-            break
-          end
-        end
-      end
-
-      s << <<EOT
-    <item id="#{@producer.params["bookname"]}" href="#{@producer.params["cover"]}" media-type="application/xhtml+xml"/>
-EOT
-      s
-    end
-
   end
 end

data/lib/epubmaker/producer.rb

@@ -170,16 +170,16 @@ module EPUBMaker
       current = Dir.pwd
       basedir = current if basedir.nil?
 
-      _tmpdir = tmpdir.nil? ? Dir.mktmpdir : tmpdir
+      new_tmpdir = tmpdir.nil? ? Dir.mktmpdir : tmpdir
       epubfile = "#{current}/#{epubfile}" if epubfile !~ /\A\// # /
 
       # FIXME: error check
       File.unlink(epubfile) if File.exist?(epubfile)
 
       begin
-        @epub.produce(epubfile, basedir, _tmpdir)
+        @epub.produce(epubfile, basedir, new_tmpdir)
       ensure
-        FileUtils.rm_r(_tmpdir) if tmpdir.nil?
+        FileUtils.rm_r(new_tmpdir) if tmpdir.nil?
       end
     end
 
@@ -211,49 +211,49 @@ module EPUBMaker
     def complement
       @params["htmlext"] = "html" if @params["htmlext"].nil?
       defaults = ReVIEW::Configure.new.merge({
-        "language" => "ja",
-        "date" => Time.now.strftime("%Y-%m-%d"),
-        "modified" => Time.now.strftime("%Y-%02m-%02dT%02H:%02M:%02SZ"),
-        "isbn" => nil,
-        "toclevel" => 2,
-        "stylesheet" => [],
-        "epubversion" => 3,
-        "htmlversion" => 5,
-        "secnolevel" => 2,
-        "pre_secnolevel" => 0,
-        "post_secnolevel" => 1,
-        "part_secnolevel" => 1,
-        "titlepage" => nil,
-        "titlefile" => nil,
-        "originaltitlefile" => nil,
-        "profile" => nil,
-        "colophon" => nil,
-        "colophon_order" => %w[aut csl trl dsr ill edt pbl prt pht],
-        "direction" => "ltr",
-        "epubmaker" => {
-          "flattoc" => nil,
-          "flattocindent" => true,
-          "ncx_indent" => [],
-          "zip_stage1" => "zip -0Xq",
-          "zip_stage2" => "zip -Xr9Dq",
-          "zip_addpath" => nil,
-          "hook_beforeprocess" => nil,
-          "hook_afterfrontmatter" => nil,
-          "hook_afterbody" => nil,
-          "hook_afterbackmatter" => nil,
-          "hook_aftercopyimage" => nil,
-          "hook_prepack" => nil,
-          "rename_for_legacy" => nil,
-          "verify_target_images" => nil,
-          "force_include_images" => [],
-          "cover_linear" => nil,
-        },
-        "externallink" => true,
-        "imagedir" => "images",
-        "fontdir" => "fonts",
-        "image_ext" => %w(png gif jpg jpeg svg ttf woff otf),
-        "font_ext" => %w(ttf woff otf),
-      })
+                                               "language" => "ja",
+                                               "date" => Time.now.strftime("%Y-%m-%d"),
+                                               "modified" => Time.now.strftime("%Y-%02m-%02dT%02H:%02M:%02SZ"),
+                                               "isbn" => nil,
+                                               "toclevel" => 2,
+                                               "stylesheet" => [],
+                                               "epubversion" => 3,
+                                               "htmlversion" => 5,
+                                               "secnolevel" => 2,
+                                               "pre_secnolevel" => 0,
+                                               "post_secnolevel" => 1,
+                                               "part_secnolevel" => 1,
+                                               "titlepage" => nil,
+                                               "titlefile" => nil,
+                                               "originaltitlefile" => nil,
+                                               "profile" => nil,
+                                               "colophon" => nil,
+                                               "colophon_order" => %w[aut csl trl dsr ill edt pbl prt pht],
+                                               "direction" => "ltr",
+                                               "epubmaker" => {
+                                                 "flattoc" => nil,
+                                                 "flattocindent" => true,
+                                                 "ncx_indent" => [],
+                                                 "zip_stage1" => "zip -0Xq",
+                                                 "zip_stage2" => "zip -Xr9Dq",
+                                                 "zip_addpath" => nil,
+                                                 "hook_beforeprocess" => nil,
+                                                 "hook_afterfrontmatter" => nil,
+                                                 "hook_afterbody" => nil,
+                                                 "hook_afterbackmatter" => nil,
+                                                 "hook_aftercopyimage" => nil,
+                                                 "hook_prepack" => nil,
+                                                 "rename_for_legacy" => nil,
+                                                 "verify_target_images" => nil,
+                                                 "force_include_images" => [],
+                                                 "cover_linear" => nil,
+                                               },
+                                               "externallink" => true,
+                                               "imagedir" => "images",
+                                               "fontdir" => "fonts",
+                                               "image_ext" => %w(png gif jpg jpeg svg ttf woff otf),
+                                               "font_ext" => %w(ttf woff otf),
+                                             })
 
       @params = defaults.deep_merge(@params)
       @params["title"] = @params["booktitle"] unless @params["title"]