review 2.3.0 → 2.4.0

data/lib/review/yamlloader.rb

@@ -17,30 +17,28 @@ module ReVIEW
 
       loop do
         # Check exit condition
-        if file_queue.empty?
-          return yaml
-        end
+        return yaml if file_queue.empty?
 
         current_file = file_queue.shift
         current_yaml = YAML.load_file(current_file)
         yaml = current_yaml.deep_merge(yaml)
 
-        if yaml.key?('inherit')
-          buf = []
-          yaml['inherit'].reverse_each do |item|
-            inherit_file = File.expand_path(item, File.dirname(yamlfile))
+        next unless yaml.key?('inherit')
 
-            # Check loop
-            if loaded_files[inherit_file]
-              raise "Found circular YAML inheritance '#{inherit_file}' in #{yamlfile}."
-            end
+        buf = []
+        yaml['inherit'].reverse_each do |item|
+          inherit_file = File.expand_path(item, File.dirname(yamlfile))
 
-            loaded_files[inherit_file] = true
-            buf << inherit_file
+          # Check loop
+          if loaded_files[inherit_file]
+            raise "Found circular YAML inheritance '#{inherit_file}' in #{yamlfile}."
           end
-          yaml.delete('inherit')
-          file_queue = buf + file_queue
+
+          loaded_files[inherit_file] = true
+          buf << inherit_file
         end
+        yaml.delete('inherit')
+        file_queue = buf + file_queue
       end
     end
   end

data/review.gemspec

@@ -1,33 +1,31 @@
-# -*- encoding: utf-8 -*-
-
-$:.push File.expand_path("../lib", __FILE__)
-require "review/version"
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'review/version'
 
 Gem::Specification.new do |gem|
-  gem.name        = "review"
+  gem.name        = 'review'
   gem.version     = ReVIEW::VERSION
   gem.platform    = Gem::Platform::RUBY
-  gem.license     = "LGPL"
-  gem.authors     = ["kmuto", "takahashim"]
-  gem.email       = "kmuto@debian.org"
-  gem.homepage    = "http://github.com/kmuto/review"
-  gem.summary     = "Re:VIEW: a easy-to-use digital publishing system"
-  gem.description = "Re:VIEW is a digital publishing system for books and ebooks. It supports InDesign, EPUB and LaTeX."
-  gem.required_rubygems_version = Gem::Requirement.new(">= 0") if gem.respond_to? :required_rubygems_version=
-  gem.date = "2016-04-29"
+  gem.license     = 'LGPL'
+  gem.authors     = %w[kmuto takahashim]
+  gem.email       = 'kmuto@debian.org'
+  gem.homepage    = 'http://github.com/kmuto/review'
+  gem.summary     = 'Re:VIEW: a easy-to-use digital publishing system'
+  gem.description = 'Re:VIEW is a digital publishing system for books and ebooks. It supports InDesign, EPUB and LaTeX.'
+  gem.required_rubygems_version = Gem::Requirement.new('>= 0') if gem.respond_to? :required_rubygems_version=
+  gem.date = '2017-06-29'
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.extra_rdoc_files = [
   ]
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
-  gem.add_dependency("rubyzip")
-  gem.add_dependency("rouge")
-  gem.add_development_dependency("rake")
-  gem.add_development_dependency("test-unit")
-  gem.add_development_dependency("pygments.rb")
-  gem.add_development_dependency("rubocop")
+  gem.add_dependency('image_size')
+  gem.add_dependency('rouge')
+  gem.add_dependency('rubyzip')
+  gem.add_development_dependency('pygments.rb')
+  gem.add_development_dependency('rake')
+  gem.add_development_dependency('rubocop')
+  gem.add_development_dependency('test-unit')
 end
-

data/templates/latex/layout.tex.erb

@@ -11,7 +11,7 @@
 \usepackage{caption}
 \usepackage{suffix}
 \usepackage[T1]{fontenc}\usepackage{textcomp}%T1/TS1
-% \usepackage{lmodern}
+\usepackage{lmodern}
 \usepackage[dvipdfmx]{graphicx}
 \usepackage[dvipdfmx,table]{xcolor}%requires colortbl, array
 \usepackage{framed}
@@ -312,7 +312,7 @@
 <%= @input_files["PREDEF"] %>
 
 <%- if @config["toc"] -%>
-\setcounter{tocdepth}{<%= @config["toclevel"] %>}
+\setcounter{tocdepth}{<%= @config["toclevel"] - 1 %>}
 \tableofcontents
 <%- end -%>
 

data/templates/opf/epubv2.opf.erb

@@ -7,15 +7,15 @@
 <%= @opf_manifest %>
 <%= @opf_toc %>
   <guide>
-    <reference type="cover" title="<%= @producer.res.v("covertitle") %>" href="<%= @producer.params["cover"] %>"/>
-<% if @producer.params["titlepage"].present? %>
-    <reference type="title-page" title="<%= @producer.res.v("titlepagetitle") %>" href="titlepage.<%= @producer.params["htmlext"] %>"/>
+    <reference type="cover" title="<%= @producer.res.v('covertitle') %>" href="<%= @producer.config['cover'] %>"/>
+<% if @producer.config['titlepage'].present? %>
+    <reference type="title-page" title="<%= @producer.res.v('titlepagetitle') %>" href="titlepage.<%= @producer.config['htmlext'] %>"/>
 <% end %>
-<% if @producer.params["mytoc"].present? %>
-    <reference type="toc" title="<%= @producer.res.v("toctitle") %>" href="<%= @producer.params["bookname"] %>-toc.<%= @producer.params["htmlext"] %>"/>
+<% if @producer.config['mytoc'].present? %>
+    <reference type="toc" title="<%= @producer.res.v('toctitle') %>" href="<%= @producer.config['bookname'] %>-toc.<%= @producer.config['htmlext'] %>"/>
 <% end %>
-<% if @producer.params["colophon"].present? %>
-    <reference type="colophon" title="<%= @producer.res.v("colophontitle") %>" href="colophon.<%= @producer.params["htmlext"] %>"/>
+<% if @producer.config['colophon'].present? %>
+    <reference type="colophon" title="<%= @producer.res.v('colophontitle') %>" href="colophon.<%= @producer.config['htmlext'] %>"/>
 <% end %>
   </guide>
 </package>

data/templates/opf/epubv3.opf.erb

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package version="3.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId" xml:lang="<%= @producer.params["language"] %>"<%= @package_attrs %>>
+<package version="3.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId" xml:lang="<%= @producer.config['language'] %>"<%= @package_attrs %>>
   <metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">
 <%= @opf_metainfo %>
   </metadata>
 <%= @opf_manifest %>
 <%= @opf_toc %>
   <guide>
-    <reference type="cover" title="<%= @producer.res.v("covertitle") %>" href="<%= @producer.params["cover"] %>"/>
-<% if @producer.params["titlepage"].present? %>
-    <reference type="title-page" title="<%= @producer.res.v("titlepagetitle") %>" href="titlepage.<%= @producer.params["htmlext"] %>"/>
+    <reference type="cover" title="<%= @producer.res.v('covertitle') %>" href="<%= @producer.config['cover'] %>"/>
+<% if @producer.config["titlepage"].present? %>
+    <reference type="title-page" title="<%= @producer.res.v('titlepagetitle') %>" href="titlepage.<%= @producer.config['htmlext'] %>"/>
 <% end %>
-    <reference type="toc" title="<%= @producer.res.v("toctitle") %>" href="<%= @producer.params["bookname"] %>-toc.<%= @producer.params["htmlext"] %>"/>
-<% if @producer.params["colophon"].present? %>
-    <reference type="colophon" title="<%= @producer.res.v("colophontitle") %>" href="colophon.<%= @producer.params["htmlext"] %>"/>
+    <reference type="toc" title="<%= @producer.res.v('toctitle') %>" href="<%= @producer.config['bookname'] %>-toc.<%= @producer.config['htmlext'] %>"/>
+<% if @producer.config['colophon'].present? %>
+    <reference type="colophon" title="<%= @producer.res.v('colophontitle') %>" href="colophon.<%= @producer.config['htmlext'] %>"/>
 <% end %>
   </guide>
 </package>

data/templates/web/html/layout-html5.html.erb

@@ -11,12 +11,12 @@
 <% if @next.present? %><link rel="next" title="<%= h(@next_title)%>" href="<%= h(@next.id.to_s+"."+@book.config['htmlext']) %>"><% end %>
 <% if @prev.present? %><link rel="prev" title="<%= h(@prev_title)%>" href="<%= h(@prev.id.to_s+"."+@book.config['htmlext']) %>"><% end %>
   <meta name="generator" content="Re:VIEW" />
-  <title><%=h @title %> | <%=h @book.config["booktitle"]%></title>
+  <title><%=h @title %> | <%=h @book.config.name_of("booktitle")%></title>
 </head>
 <body<%= @body_ext %>>
   <div class="book">
     <nav class="side-content">
-      <h1><%=h @book.config["booktitle"] %></h1>
+      <h1><%=h @book.config.name_of("booktitle") %></h1>
       <%= @toc %>
       <p class="review-signature">powered by <a href="http://reviewml.org/">Re:VIEW</a></p>
     </nav>

data/test/assets/black.eps

@@ -0,0 +1,280 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Creator: (ImageMagick)
+%%Title: (test/assets/black.eps)
+%%CreationDate: (2017-08-12T22:40:26+09:00)
+%%BoundingBox: -0 -0 10 10
+%%HiResBoundingBox: 0 0 10 10
+%%DocumentData: Clean7Bit
+%%LanguageLevel: 1
+%%Pages: 1
+%%EndComments
+
+%%BeginDefaults
+%%EndDefaults
+
+%%BeginProlog
+%
+% Display a color image.  The image is displayed in color on
+% Postscript viewers or printers that support color, otherwise
+% it is displayed as grayscale.
+%
+/DirectClassPacket
+{
+  %
+  % Get a DirectClass packet.
+  %
+  % Parameters:
+  %   red.
+  %   green.
+  %   blue.
+  %   length: number of pixels minus one of this color (optional).
+  %
+  currentfile color_packet readhexstring pop pop
+  compression 0 eq
+  {
+    /number_pixels 3 def
+  }
+  {
+    currentfile byte readhexstring pop 0 get
+    /number_pixels exch 1 add 3 mul def
+  } ifelse
+  0 3 number_pixels 1 sub
+  {
+    pixels exch color_packet putinterval
+  } for
+  pixels 0 number_pixels getinterval
+} bind def
+
+/DirectClassImage
+{
+  %
+  % Display a DirectClass image.
+  %
+  systemdict /colorimage known
+  {
+    columns rows 8
+    [
+      columns 0 0
+      rows neg 0 rows
+    ]
+    { DirectClassPacket } false 3 colorimage
+  }
+  {
+    %
+    % No colorimage operator;  convert to grayscale.
+    %
+    columns rows 8
+    [
+      columns 0 0
+      rows neg 0 rows
+    ]
+    { GrayDirectClassPacket } image
+  } ifelse
+} bind def
+
+/GrayDirectClassPacket
+{
+  %
+  % Get a DirectClass packet;  convert to grayscale.
+  %
+  % Parameters:
+  %   red
+  %   green
+  %   blue
+  %   length: number of pixels minus one of this color (optional).
+  %
+  currentfile color_packet readhexstring pop pop
+  color_packet 0 get 0.299 mul
+  color_packet 1 get 0.587 mul add
+  color_packet 2 get 0.114 mul add
+  cvi
+  /gray_packet exch def
+  compression 0 eq
+  {
+    /number_pixels 1 def
+  }
+  {
+    currentfile byte readhexstring pop 0 get
+    /number_pixels exch 1 add def
+  } ifelse
+  0 1 number_pixels 1 sub
+  {
+    pixels exch gray_packet put
+  } for
+  pixels 0 number_pixels getinterval
+} bind def
+
+/GrayPseudoClassPacket
+{
+  %
+  % Get a PseudoClass packet;  convert to grayscale.
+  %
+  % Parameters:
+  %   index: index into the colormap.
+  %   length: number of pixels minus one of this color (optional).
+  %
+  currentfile byte readhexstring pop 0 get
+  /offset exch 3 mul def
+  /color_packet colormap offset 3 getinterval def
+  color_packet 0 get 0.299 mul
+  color_packet 1 get 0.587 mul add
+  color_packet 2 get 0.114 mul add
+  cvi
+  /gray_packet exch def
+  compression 0 eq
+  {
+    /number_pixels 1 def
+  }
+  {
+    currentfile byte readhexstring pop 0 get
+    /number_pixels exch 1 add def
+  } ifelse
+  0 1 number_pixels 1 sub
+  {
+    pixels exch gray_packet put
+  } for
+  pixels 0 number_pixels getinterval
+} bind def
+
+/PseudoClassPacket
+{
+  %
+  % Get a PseudoClass packet.
+  %
+  % Parameters:
+  %   index: index into the colormap.
+  %   length: number of pixels minus one of this color (optional).
+  %
+  currentfile byte readhexstring pop 0 get
+  /offset exch 3 mul def
+  /color_packet colormap offset 3 getinterval def
+  compression 0 eq
+  {
+    /number_pixels 3 def
+  }
+  {
+    currentfile byte readhexstring pop 0 get
+    /number_pixels exch 1 add 3 mul def
+  } ifelse
+  0 3 number_pixels 1 sub
+  {
+    pixels exch color_packet putinterval
+  } for
+  pixels 0 number_pixels getinterval
+} bind def
+
+/PseudoClassImage
+{
+  %
+  % Display a PseudoClass image.
+  %
+  % Parameters:
+  %   class: 0-PseudoClass or 1-Grayscale.
+  %
+  currentfile buffer readline pop
+  token pop /class exch def pop
+  class 0 gt
+  {
+    currentfile buffer readline pop
+    token pop /depth exch def pop
+    /grays columns 8 add depth sub depth mul 8 idiv string def
+    columns rows depth
+    [
+      columns 0 0
+      rows neg 0 rows
+    ]
+    { currentfile grays readhexstring pop } image
+  }
+  {
+    %
+    % Parameters:
+    %   colors: number of colors in the colormap.
+    %   colormap: red, green, blue color packets.
+    %
+    currentfile buffer readline pop
+    token pop /colors exch def pop
+    /colors colors 3 mul def
+    /colormap colors string def
+    currentfile colormap readhexstring pop pop
+    systemdict /colorimage known
+    {
+      columns rows 8
+      [
+        columns 0 0
+        rows neg 0 rows
+      ]
+      { PseudoClassPacket } false 3 colorimage
+    }
+    {
+      %
+      % No colorimage operator;  convert to grayscale.
+      %
+      columns rows 8
+      [
+        columns 0 0
+        rows neg 0 rows
+      ]
+      { GrayPseudoClassPacket } image
+    } ifelse
+  } ifelse
+} bind def
+
+/DisplayImage
+{
+  %
+  % Display a DirectClass or PseudoClass image.
+  %
+  % Parameters:
+  %   x & y translation.
+  %   x & y scale.
+  %   label pointsize.
+  %   image label.
+  %   image columns & rows.
+  %   class: 0-DirectClass or 1-PseudoClass.
+  %   compression: 0-none or 1-RunlengthEncoded.
+  %   hex color packets.
+  %
+  gsave
+  /buffer 512 string def
+  /byte 1 string def
+  /color_packet 3 string def
+  /pixels 768 string def
+
+  currentfile buffer readline pop
+  token pop /x exch def
+  token pop /y exch def pop
+  x y translate
+  currentfile buffer readline pop
+  token pop /x exch def
+  token pop /y exch def pop
+  currentfile buffer readline pop
+  token pop /pointsize exch def pop
+  x y scale
+  currentfile buffer readline pop
+  token pop /columns exch def
+  token pop /rows exch def pop
+  currentfile buffer readline pop
+  token pop /class exch def pop
+  currentfile buffer readline pop
+  token pop /compression exch def pop
+  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
+  grestore
+} bind def
+%%EndProlog
+%%Page:  1 1
+%%PageBoundingBox: 0 0 10 10
+userdict begin
+DisplayImage
+0 0
+10 10
+12
+10 10
+1
+1
+1
+1
+0000000000000000000000000000000000000000
+end
+%%PageTrailer
+%%Trailer
+%%EOF