review 1.3.0 → 1.4.0

data/lib/review/book/chapter.rb

@@ -31,14 +31,6 @@ module ReVIEW
         }
       end
 
-      def Chapter.for_stdin
-        new(nil, nil, '-', nil, $stdin)
-      end
-
-      def Chapter.for_path(number, path)
-        new(nil, number, File.basename(path), path)
-      end
-
       attr_reader :number
 
       def initialize(book, number, name, path, io = nil)
@@ -69,7 +61,7 @@ module ReVIEW
           return "#{@number}"
         end
 
-        if on_POSTDEF?
+        if on_APPENDIX?
           return "#{@number}" if @number < 1 || @number > 27
 
           if @book.config["appendix_format"].blank?
@@ -103,15 +95,19 @@ module ReVIEW
       end
 
       def on_CHAPS?
-        on_FILE?(@book.read_CHAPS())
+        on_FILE?(@book.read_CHAPS)
       end
 
       def on_PREDEF?
-        on_FILE?(@book.read_PREDEF())
+        on_FILE?(@book.read_PREDEF)
+      end
+
+      def on_APPENDIX?
+        on_FILE?(@book.read_APPENDIX)
       end
 
       def on_POSTDEF?
-        on_FILE?(@book.read_POSTDEF())
+        on_FILE?(@book.read_POSTDEF)
       end
 
       private

data/lib/review/book/compilable.rb

@@ -118,29 +118,29 @@ module ReVIEW
       def numberless_image_index
         @numberless_image_index ||=
           NumberlessImageIndex.parse(lines(), id(),
-          "#{book.basedir}#{@book.image_dir}",
-          @book.image_types)
+          "#{book.basedir}/#{@book.image_dir}",
+          @book.image_types, @book.config['builder'])
       end
 
       def image_index
         @image_index ||= ImageIndex.parse(lines(), id(),
-          "#{book.basedir}#{@book.image_dir}",
-          @book.image_types)
+          "#{book.basedir}/#{@book.image_dir}",
+          @book.image_types, @book.config['builder'])
         @image_index
       end
 
       def icon_index
         @icon_index ||= IconIndex.parse(lines(), id(),
-          "#{book.basedir}#{@book.image_dir}",
-          @book.image_types)
+          "#{book.basedir}/#{@book.image_dir}",
+          @book.image_types, @book.config['builder'])
         @icon_index
       end
 
       def indepimage_index
         @indepimage_index ||=
           IndepImageIndex.parse(lines(), id(),
-          "#{book.basedir}#{@book.image_dir}",
-          @book.image_types)
+          "#{book.basedir}/#{@book.image_dir}",
+          @book.image_types, @book.config['builder'])
       end
 
       def bibpaper(id)

data/lib/review/book/image_finder.rb

@@ -25,6 +25,13 @@ module ReVIEW
         Dir.glob(File.join(@basedir, "**/*.*"))
       end
 
+      def add_entry(path)
+        unless @entries.include?(path)
+          @entries << path
+        end
+        @entries
+      end
+
       def find_path(id)
         targets = target_list(id)
         targets.each do |target|

data/lib/review/book/index.rb

@@ -159,7 +159,7 @@ module ReVIEW
 
       attr_reader :image_finder
 
-      def initialize(items, chapid, basedir, types)
+      def initialize(items, chapid, basedir, types, builder)
         super items
         items.each do |i|
           i.index = self
@@ -169,7 +169,7 @@ module ReVIEW
         @types = types
 
         @image_finder = ReVIEW::Book::ImageFinder.new(basedir, chapid,
-                                                      ReVIEW.book.config['builder'], types)
+                                                      builder, types)
       end
 
       def find_path(id)
@@ -179,7 +179,7 @@ module ReVIEW
     end
 
     class IconIndex < ImageIndex
-      def initialize(items, chapid, basedir, types)
+      def initialize(items, chapid, basedir, types, builder)
         @items = items
         @index = {}
         items.each do |i|
@@ -193,7 +193,7 @@ module ReVIEW
         @basedir = basedir
         @types = types
 
-        @image_finder = ImageFinder.new(basedir, chapid, ReVIEW.book.config['builder'], types)
+        @image_finder = ImageFinder.new(basedir, chapid, builder, types)
       end
 
       def IconIndex.parse(src, *args)
@@ -294,10 +294,28 @@ module ReVIEW
         items = []
         indexs = []
         headlines = []
+        inside_column = false
         src.each do |line|
           if m = HEADLINE_PATTERN.match(line)
-            next if m[2] == 'column'
+            next if m[1].size > 10 # Ignore too deep index
             index = m[1].size - 2
+
+            # column
+            if m[2] == 'column'
+              inside_column = true
+              next
+            end
+            if m[2] == '/column'
+              inside_column = false
+              next
+            end
+            if indexs.present? and indexs[-1] <= index
+              inside_column = false
+            end
+            if inside_column
+              next
+            end
+
             if index >= 0
               if indexs.size > (index + 1)
                 indexs = indexs.take(index + 1)

data/lib/review/book/volume.rb

@@ -36,6 +36,7 @@ module ReVIEW
         @bytes = bytes
         @chars = chars
         @lines = lines
+        @book  = ReVIEW::Book::Base.load_default
       end
 
       attr_reader :bytes
@@ -47,7 +48,7 @@ module ReVIEW
       end
 
       def page
-        (kbytes.to_f/ReVIEW.book.page_metric.page_per_kbyte).ceil
+        (kbytes.to_f/@book.page_metric.page_per_kbyte).ceil
       end
 
       def to_s

data/lib/review/builder.rb

@@ -42,9 +42,9 @@ module ReVIEW
       @chapter = chapter
       @location = location
       @output = StringIO.new
-      @book = ReVIEW.book
+      @book = @chapter.book if @chapter.present?
       @tabwidth = nil
-      if @book.config && @book.config["tabwidth"]
+      if @book && @book.config && @book.config["tabwidth"]
         @tabwidth = @book.config["tabwidth"]
       end
       builder_init_file
@@ -72,6 +72,10 @@ module ReVIEW
       }
     end
 
+    def target_name
+      self.class.to_s.gsub(/ReVIEW::/, '').gsub(/Builder/, '').downcase
+    end
+
     def list(lines, id, caption)
       begin
         list_header id, caption
@@ -186,7 +190,7 @@ module ReVIEW
     end
 
     def inline_title(id)
-      @chapter.env.chapter_index.title(id)
+      compile_inline @chapter.env.chapter_index.title(id)
     rescue KeyError
       error "unknown chapter: #{id}"
       nofunc_text("[UnknownChapter:#{id}]")
@@ -273,7 +277,7 @@ module ReVIEW
     def raw(str)
       if matched = str.match(/\|(.*?)\|(.*)/)
         builders = matched[1].split(/,/).map{|i| i.gsub(/\s/, '') }
-        c = self.class.to_s.gsub(/ReVIEW::/, '').gsub(/Builder/, '').downcase
+        c = target_name
         if builders.include?(c)
           print matched[2].gsub("\\n", "\n")
         else
@@ -347,7 +351,7 @@ module ReVIEW
     end
 
     def graph(lines, id, command, caption = nil)
-      c = self.class.to_s.gsub(/ReVIEW::/, '').gsub(/Builder/, '').downcase
+      c = target_name
       dir = File.join(@book.basedir, @book.image_dir, c)
       Dir.mkdir(dir) unless File.exist?(dir)
       file = "#{id}.#{image_ext}"
@@ -366,6 +370,7 @@ module ReVIEW
       cmd = cmds[command.to_sym]
       warn cmd
       system cmd
+      @chapter.image_index.image_finder.add_entry(file_path)
 
       image(lines, id, caption ||= "")
     end

data/lib/review/catalog.rb

@@ -39,6 +39,11 @@ module ReVIEW
       @yaml["CHAPS"].flatten.reject{|entry| entry.nil?}
     end
 
+    def appendix
+      return "" unless @yaml["APPENDIX"]
+      @yaml["APPENDIX"].join("\n")
+    end
+
     def postdef
       return "" unless @yaml["POSTDEF"]
       @yaml["POSTDEF"].join("\n")

data/lib/review/compiler.rb

@@ -294,7 +294,7 @@ module ReVIEW
         @headline_indexs[index] = 0 if @headline_indexs[index].nil?
         @headline_indexs[index] += 1
         close_current_tagged_section(level)
-        if ReVIEW.book.config["hdnumberingmode"]
+        if @chapter.book.config["hdnumberingmode"]
           caption = @chapter.on_CHAPS? ? "#{@headline_indexs.join('.')} #{caption}" : caption
           warn "--hdnumberingmode is deprecated. use --level option."
         end

data/lib/review/configure.rb

@@ -34,6 +34,18 @@ module ReVIEW
         "colophon" => nil, # Use colophon
         "debug" => nil, # debug flag
         "catalogfile" => 'catalog.yml',
+
+        "chapter_file" => 'CHAPS',
+        "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",
+        "colophon_order" => %w(aut csl trl dsr ill cov edt pbl contact prt),
       ]
     end
   end

data/lib/review/epubmaker.rb

@@ -44,7 +44,8 @@ module ReVIEW
     File.unlink("#{bookname}.epub") if File.exist?("#{bookname}.epub")
     FileUtils.rm_rf(booktmpname) if @params["debug"] && File.exist?(booktmpname)
 
-    Dir.mktmpdir(bookname, Dir.pwd) do |basetmpdir|
+    basetmpdir = Dir.mktmpdir("#{bookname}-", Dir.pwd)
+    begin
       log("Created first temporary directory as #{basetmpdir}.")
 
       log("Call hook_beforeprocess. (#{@params["hook_beforeprocess"]})")
@@ -88,7 +89,8 @@ module ReVIEW
       log("Call ePUB producer.")
       @epub.produce("#{bookname}.epub", basetmpdir, epubtmpdir)
       log("Finished.")
-
+    ensure
+      FileUtils.remove_entry_secure basetmpdir if @params["debug"].nil?
     end
   end
 
@@ -230,9 +232,13 @@ EOT
     filename = ""
 
     chaptype = "body"
-    chaptype = "part" unless ispart.nil?
-    chaptype = "pre" if chap.on_PREDEF?
-    chaptype = "post" if chap.on_POSTDEF?
+    if !ispart.nil?
+      chaptype = "part"
+    elsif chap.on_PREDEF?
+      chaptype = "pre"
+    elsif chap.on_APPENDIX?
+      chaptype = "post"
+    end
 
     if !ispart.nil?
       filename = chap.path
@@ -245,7 +251,7 @@ EOT
       if chap.on_PREDEF?
         @precount += 1
         id = sprintf("pre%02d", @precount)
-      elsif chap.on_POSTDEF?
+      elsif chap.on_APPENDIX?
         @postcount += 1
         id = sprintf("post%02d", @postcount)
       else
@@ -267,7 +273,7 @@ EOT
 #      level = @params["part_secnolevel"]
 #    else
 #      level = @params["pre_secnolevel"] if chap.on_PREDEF?
-#      level = @params["post_secnolevel"] if chap.on_POSTDEF?
+#      level = @params["post_secnolevel"] if chap.on_APPENDIX?
 #    end
 
     stylesheet = ""

data/lib/review/htmlbuilder.rb

@@ -63,7 +63,10 @@ module ReVIEW
     private :builder_init_file
 
     def result
-      layout_file = File.join(@book.basedir, "layouts", "layout.erb")
+      layout_file = File.join(@book.basedir, "layouts", "layout.html.erb")
+      unless File.exist?(layout_file) # backward compatibility
+        layout_file = File.join(@book.basedir, "layouts", "layout.erb")
+      end
       if File.exist?(layout_file)
         if ENV["REVIEW_SAFE_MODE"].to_i & 4 > 0
           warn "user's layout is prohibited in safe mode. ignored."
@@ -100,21 +103,21 @@ module ReVIEW
 
       # default XHTML header/footer
       header = <<EOT
-<?xml version="1.0" encoding="#{@book.config["outencoding"] || :UTF-8}"?>
+<?xml version="1.0" encoding="#{@book.config["outencoding"] || "UTF-8"}"?>
 EOT
       if @book.config["htmlversion"].to_i == 5
         header += <<EOT
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:#{xmlns_ops_prefix}="http://www.idpf.org/2007/ops" xml:lang="#{@book.config["language"]}">
 <head>
-  <meta charset="#{@book.config["outencoding"] || :UTF-8}" />
+  <meta charset="#{@book.config["outencoding"] || "UTF-8"}" />
 EOT
       else
         header += <<EOT
 <!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="#{@book.config["language"]}">
 <head>
-  <meta http-equiv="Content-Type" content="text/html;charset=#{@book.config["outencoding"] || :UTF-8}" />
+  <meta http-equiv="Content-Type" content="text/html;charset=#{@book.config["outencoding"] || "UTF-8"}" />
   <meta http-equiv="Content-Style-Type" content="text/css" />
 EOT
       end
@@ -502,7 +505,9 @@ EOT
 
     def emlist(lines, caption = nil)
       puts %Q[<div class="emlist-code">]
-      puts %Q(<p class="caption">#{caption}</p>) unless caption.nil?
+      if caption.present?
+        puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
+      end
       print %Q[<pre class="emlist">]
       lines.each do |line|
         puts detab(line)
@@ -513,7 +518,9 @@ EOT
 
     def emlistnum(lines, caption = nil)
       puts %Q[<div class="emlistnum-code">]
-      puts %Q(<p class="caption">#{caption}</p>) unless caption.nil?
+      if caption.present?
+        puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
+      end
       print %Q[<pre class="emlist">]
       lines.each_with_index do |line, i|
         puts detab((i+1).to_s.rjust(2) + ": " + line)
@@ -524,7 +531,9 @@ EOT
 
     def cmd(lines, caption = nil)
       puts %Q[<div class="cmd-code">]
-      puts %Q(<p class="caption">#{caption}</p>) unless caption.nil?
+      if caption.present?
+        puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
+      end
       print %Q[<pre class="cmd">]
       lines.each do |line|
         puts detab(line)
@@ -625,6 +634,7 @@ QUOTE
       puts %Q[</pre>]
       image_header id, caption
       puts %Q[</div>]
+      warn "no such image: #{id}"
     end
 
     def image_header(id, caption)
@@ -806,10 +816,11 @@ QUOTE
     end
 
     def inline_title(id)
+      title = super
       if @book.config["chapterlink"]
-        %Q(<a href="./#{id}#{extname}">#{compile_inline(@chapter.env.chapter_index.title(id))}</a>)
+        %Q(<a href="./#{id}#{extname}">#{title}</a>)
       else
-        @chapter.env.chapter_index.title(id)
+        title
       end
     rescue KeyError
       error "unknown chapter: #{id}"
@@ -899,8 +910,11 @@ QUOTE
 
     def inline_m(str)
       if @book.config["mathml"]
-        p = MathML::LaTeX::Parser.new(:symbol=>MathML::Symbol::CharacterReference)
-        %Q[<span class="equation">#{p.parse(str, nil)}</span>]
+        require 'math_ml'
+        require 'math_ml/symbol/character_reference'
+        parser = MathML::LaTeX::Parser.new(
+          :symbol => MathML::Symbol::CharacterReference)
+        %Q[<span class="equation">#{parser.parse(str, nil)}</span>]
       else
         %Q[<span class="equation">#{escape_html(str)}</span>]
       end
@@ -931,7 +945,7 @@ QUOTE
     end
 
     def inline_bib(id)
-      %Q(<a href=".#{@book.bib_file.gsub(/re\Z/, "html")}#bib-#{id}">[#{@chapter.bibpaper(id).number}]</a>)
+      %Q(<a href="#{@book.bib_file.gsub(/re\Z/, "html")}#bib-#{normalize_id(id)}">[#{@chapter.bibpaper(id).number}]</a>)
     end
 
     def inline_hd_chap(chap, id)

data/lib/review/i18n.rb

@@ -4,9 +4,9 @@ require 'yaml'
 module ReVIEW
   class I18n
     def self.setup
-      lfile = File.expand_path "locale.yml", ENV["PWD"]
+      lfile = File.expand_path "locale.yml", Dir.pwd
       # backward compatibility
-      lfile = File.expand_path "locale.yaml", ENV["PWD"] unless File.exist?(lfile)
+      lfile = File.expand_path "locale.yaml", Dir.pwd unless File.exist?(lfile)
       user_i18n = YAML.load_file(lfile)
       I18n.i18n user_i18n["locale"], user_i18n
     rescue