review 2.0.0.beta1 → 2.0.0

data/lib/review/template.rb

@@ -0,0 +1,24 @@
+require 'erb'
+require 'review/extentions'
+module ReVIEW
+  class Template
+    include ERB::Util
+
+    TEMPLATE_DIR = File.join(File.dirname(__FILE__), "../../templates")
+
+    def self.load(filename, mode = 1)
+      self.new(filename, mode)
+    end
+
+    def initialize(filename = nil, mode = nil)
+      if filename
+        content = File.read(filename)
+        @erb = ERB.new(content, nil, mode)
+      end
+    end
+
+    def result(bind_data = nil)
+      @erb.result(bind_data)
+    end
+  end
+end

data/lib/review/textbuilder.rb

@@ -14,4 +14,4 @@ module ReVIEW
   class TEXTBuilder < TOPBuilder
   end
 
-end   # module ReVIEW
+end # module ReVIEW

data/lib/review/textutils.rb

@@ -13,32 +13,26 @@ module ReVIEW
       }
     end
 
-    def convert_inencoding(str, enc)
-      case enc
-      when /^EUC$/i
-        NKF.nkf("-E -w -m0x", str)
-      when /^SJIS$/i
-        NKF.nkf("-S -w -m0x", str)
-      when /^JIS$/i
-        NKF.nkf("-J -w -m0x", str)
-      when /^UTF-8$/i
-        NKF.nkf("-W -w -m0x", str)
-      else
-        NKF.nkf("-w -m0 -m0x", str)
-      end
-    end
+    def split_paragraph(lines)
+      pre = pre_paragraph
+      post = post_paragraph
 
-    def convert_outencoding(str, enc)
-      case enc
-      when /^EUC$/i
-        NKF.nkf("-W -e -m0x", str)
-      when /^SJIS$/i
-        NKF.nkf("-W -s -m0x", str)
-      when /^JIS$/i
-        NKF.nkf("-W -j -m0x", str)
-      else
-        str
+      blocked_lines = [[]]
+      lines.each {|element|
+        if element == ""
+          if blocked_lines.last != []
+            blocked_lines << []
+          end
+        else
+          blocked_lines.last << element
+        end
+      }
+
+      if !pre.nil? and !post.nil?
+        blocked_lines.map!{|i| [pre] + i + [post] }
       end
+
+      blocked_lines.map{|l| l.join("")}
     end
   end
 end

data/lib/review/tocparser.rb

@@ -1,8 +1,6 @@
 #
-# $Id: tocparser.rb 4268 2009-05-27 04:17:08Z kmuto $
-#
 # Copyright (c) 2002-2007 Minero Aoki
-#               2008-2009 Minero Aoki, Kenshi Muto
+#               2008-2016 Minero Aoki, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -18,21 +16,27 @@ module ReVIEW
 
   class TOCParser
     def TOCParser.parse(chap)
-      chap.open {|f|
-        stream = Preprocessor::Strip.new(f)
-        new.parse(stream, chap.id, chap.path, chap).map {|root|
-          root.number = chap.number
-          root
-        }
-      }
+      f = StringIO.new(chap.content, 'r:BOM|utf-8')
+      stream = Preprocessor::Strip.new(f)
+      new.parse(stream, chap).map do |root|
+        root.number = chap.number
+        root
+      end
     end
 
-    def parse(f, id, filename, chap)
-      roots = []
-      path = []
+    def TOCParser.chapter_node(chap)
+      toc = TOCParser.parse(chap)
+      unless toc.size == 1
+        $stderr.puts "warning: chapter #{toc.join} contains more than 1 chapter"
+      end
+      toc.first
+    end
 
+    def parse(f, chap)
+      roots = [] ## list of chapters
+      node_stack = []
+      filename = chap.path
       while line = f.gets
-        line.sub!(/\A\xEF\xBB\xBF/u, '') # remove BOM
         case line
         when /\A\#@/
           ;
@@ -41,29 +45,33 @@ module ReVIEW
         when /\A(={2,})[\[\s\{]/
           lev = $1.size
           error! filename, f.lineno, "section level too deep: #{lev}" if lev > 5
-          if path.empty?
+          label = get_label(line)
+          if node_stack.empty?
             # missing chapter label
-            path.push Chapter.new(get_label(line), id, filename, chap.book.page_metric)
-            roots.push path.first
+            dummy_chapter = Chapter.new(label, chap)
+            node_stack.push dummy_chapter
+            roots.push dummy_chapter
           end
-          next if get_label(line) =~ /\A\[\// # ex) "[/column]"
-          new = Section.new(lev, get_label(line).gsub(/\A\{.*?\}\s?/, ""))
-          until path.last.level < new.level
-            path.pop
+          next if label =~ /\A\[\// # ex) "[/column]"
+          sec = Section.new(lev, label.gsub(/\A\{.*?\}\s?/, ""))
+          until node_stack.last.level < sec.level
+            node_stack.pop
           end
-          path.last.add_child new
-          path.push new
+          node_stack.last.add_child sec
+          node_stack.push sec
 
-        when /\A= /
-          path.clear
-          path.push Chapter.new(get_label(line), id, filename, chap.book.page_metric)
-          roots.push path.first
+        when /\A=[^=]/
+          label = get_label(line)
+          node_stack.clear
+          new_chapter = Chapter.new(label, chap)
+          node_stack.push new_chapter
+          roots.push new_chapter
 
         when %r<\A//\w+(?:\[.*?\])*\{\s*\z>
-          if path.empty?
+          if node_stack.empty?
             error! filename, f.lineno, 'list found before section label'
           end
-          path.last.add_child(list = List.new)
+          node_stack.last.add_child(list = List.new)
           beg = f.lineno
           list.add line
           while line = f.gets
@@ -75,11 +83,11 @@ module ReVIEW
         when %r<\A//\w>
           ;
         else
-          #if path.empty?
+          #if node_stack.empty?
           #  error! filename, f.lineno, 'text found before section label'
           #end
-          next if path.empty?
-          path.last.add_child(par = Paragraph.new(chap.book.page_metric))
+          next if node_stack.empty?
+          node_stack.last.add_child(par = Paragraph.new(chap))
           par.add line
           while line = f.gets
             break if /\A\s*\z/ =~ line
@@ -151,7 +159,7 @@ module ReVIEW
         end
       end
 
-      def n_sections
+      def section_size
         cnt = 0
         @children.each do |n|
           n.yield_section { cnt += 1 }
@@ -183,14 +191,6 @@ module ReVIEW
       attr_reader :level
       attr_reader :label
 
-      def display_label
-        if @filename
-          @label + ' ' + @filename
-        else
-          @label
-        end
-      end
-
       def estimated_lines
         @children.inject(0) {|sum, n| sum + n.estimated_lines }
       end
@@ -208,11 +208,12 @@ module ReVIEW
 
     class Chapter < Section
 
-      def initialize(label, id, path, page_metric)
-        super 1, label, path
-        @chapter_id = id
-        @path = path
-        @page_metric = page_metric
+      def initialize(label, chap)
+        super 1, label, chap.path
+        @chapter = chap
+        @chapter_id = chap.id
+        @path = chap.path
+        @page_metric = chap.book.page_metric
         @volume = nil
         @number = nil
       end
@@ -227,9 +228,7 @@ module ReVIEW
 
       def volume
         return @volume if @volume
-        return Book::Volume.dummy unless @path
-        @volume = Book::Volume.count_file(@path)
-        @volume.page_per_kbyte = @page_metric.page_per_kbyte
+        @volume = @chapter.volume
         @volume.lines = estimated_lines()
         @volume
       end
@@ -243,9 +242,9 @@ module ReVIEW
 
     class Paragraph < Node
 
-      def initialize(page_metric)
+      def initialize(chap)
         @bytes = 0
-        @page_metric = page_metric
+        @page_metric = chap.book.page_metric
       end
 
       def inspect
@@ -290,59 +289,5 @@ module ReVIEW
     end
 
   end
-
-
-  module TOCRoot
-    def level
-      0
-    end
-
-    def chapter?
-      false
-    end
-
-    def each_section_with_index
-      idx = -1
-      each_section do |node|
-        yield node, (idx += 1)
-      end
-    end
-
-    def each_section(&block)
-      each_chapter do |chap|
-        yield chap.toc
-      end
-    end
-
-    def n_sections
-      chapters.size
-    end
-
-    def estimated_lines
-      chapters.inject(0) {|sum, chap| sum + chap.toc.estimated_lines }
-    end
-  end
-
-  class Book::Base   # reopen
-    include TOCRoot
-  end
-
-  class Book::ChapterSet   # reopen
-    include TOCRoot
-  end
-
-  class Book::Part
-    include TOCRoot
-  end
-
-  class Book::Chapter   # reopen
-    def toc
-      @toc ||= TOCParser.parse(self)
-      unless @toc.size == 1
-        $stderr.puts "warning: chapter #{@toc.join} contains more than 1 chapter"
-      end
-      @toc.first
-    end
-  end
-
 end
+

data/lib/review/tocprinter.rb

@@ -12,54 +12,47 @@
 #
 
 require 'review/htmlutils'
-require 'review/htmllayout'
-require 'nkf'
+require 'review/tocparser'
 
 module ReVIEW
 
   class TOCPrinter
 
     def TOCPrinter.default_upper_level
-      99   # no one use 99 level nest
+      99 # no one use 99 level nest
     end
 
-    def initialize(print_upper, param)
+    def initialize(print_upper, param, out = $stdout)
       @print_upper = print_upper
       @config = param
+      @out = out
     end
 
-    def print?(level)
-      level <= @print_upper
+    def print_book(book)
+      book.each_part do |part|
+        print_part(part)
+      end
     end
 
-    def nkffilter(line)
-      inc = ""
-      outc = "-w"
-      if @config["inencoding"] =~ /^EUC$/
-        inc = "-E"
-      elsif @config["inencoding"] =~ /^SJIS$/
-        inc = "-S"
-      elsif @config["inencoding"]  =~ /^JIS$/
-        inc = "-J"
+    def print_part(part)
+      part.each_chapter do |chap|
+        print_chapter(chap)
       end
+    end
 
-      if @config["outencoding"] =~ /^EUC$/
-        outc = "-e"
-      elsif @config["outencoding"] =~ /^SJIS$/
-        outc = "-s"
-      elsif @config["outencoding"]  =~ /^JIS$/
-        outc = "-j"
-      end
+    def print_chapter(chap)
+      chap_node = TOCParser.chapter_node(chap)
+      print_node 1, chap_node
+      print_children chap_node
+    end
 
-      NKF.nkf("#{inc} #{outc}", line)
+    def print?(level)
+      level <= @print_upper
     end
   end
 
 
   class TextTOCPrinter < TOCPrinter
-    def print_book(book)
-      print_children book
-    end
 
     private
 
@@ -76,14 +69,14 @@ module ReVIEW
     def print_node(number, node)
       if node.chapter?
         vol = node.volume
-        printf "%3s %3dKB %6dC %5dL  %s (%s)\n",
+        @out.printf "%3s %3dKB %6dC %5dL  %s (%s)\n",
                chapnumstr(node.number),
                vol.kbytes, vol.chars, vol.lines,
-               nkffilter(node.label), node.chapter_id
-      else
-        printf "%17s %5dL  %s\n",
+               node.label, node.chapter_id
+      else ## for section node
+        @out.printf "%17s %5dL  %s\n",
                '', node.estimated_lines,
-               nkffilter("  #{'   ' * (node.level - 1)}#{number} #{node.label}")
+               "  #{'   ' * (node.level - 1)}#{number} #{node.label}"
       end
     end
 
@@ -94,7 +87,7 @@ module ReVIEW
     def volume_columns(level, volstr)
       cols = ["", "", "", nil]
       cols[level - 1] = volstr
-      cols[0, 3]   # does not display volume of level-4 section
+      cols[0, 3] # does not display volume of level-4 section
     end
 
   end
@@ -105,38 +98,42 @@ module ReVIEW
     include HTMLUtils
 
     def print_book(book)
-      return unless print?(1)
-      html = ""
+      @out.puts '<ul class="book-toc">'
       book.each_part do |part|
-        html << h1(part.name) if part.name
-        part.each_section do |chap|
-          if chap.number
-            name = "chap#{chap.number}"
-            label = "第#{chap.number}章 #{chap.label}"
-            html << h2(a_name(escape_html(name), escape_html(label)))
-          else
-            label = "#{chap.label}"
-            html << h2(escape_html(label))
-          end
-          return unless print?(2)
-          if print?(3)
-            html << chap_sections_to_s(chap)
-          else
-            html << chapter_to_s(chap)
-          end
-        end
+        print_part(part)
+      end
+      @out.puts '</ul>'
+    end
+
+    def print_part(part)
+      if part.number
+        @out.puts li(part.title)
+      end
+      super
+    end
+
+    def print_chapter(chap)
+      chap_node = TOCParser.chapter_node(chap)
+      ext = chap.book.config["htmlext"] || "html"
+      path = chap.path.sub(/\.re/, "."+ext)
+      if chap_node.number && chap.on_CHAPS?
+        label = "#{chap.number} #{chap.title}"
+      else
+        label = chap.title
       end
-      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")
+      @out.puts li(a_name(path, escape_html(label)))
+      return unless print?(2)
+      if print?(3)
+        @out.puts chap_sections_to_s(chap_node)
+      else
+        @out.puts chapter_to_s(chap_node)
       end
-      puts HTMLLayout.new(
-        {'body' => html, 'title' => "目次"}, layout_file).result
     end
 
     private
 
     def chap_sections_to_s(chap)
+      return "" if chap.section_size < 1
       res = []
       res << "<ol>"
       chap.each_section do |sec|
@@ -146,33 +143,22 @@ module ReVIEW
       return res.join("\n")
     end
 
-    def print_chapter_to_s(chap)
+    def chapter_to_s(chap)
       res = []
       chap.each_section do |sec|
-        res << h3(escape_html(sec.label))
+        res << li(escape_html(sec.label))
         next unless print?(4)
-        next if sec.n_sections == 0
-        res << "<ul>"
-        sec.each_section do |node|
-          res << li(escape_html(node.label))
+        if sec.section_size > 0
+          res << "<ul>"
+          sec.each_section do |node|
+            res << li(escape_html(node.label))
+          end
+          res << "</ul>"
         end
-        res << "</ul>"
       end
       return res.join("\n")
     end
 
-    def h1(label)
-      "<h1>#{label}</h1>"
-    end
-
-    def h2(label)
-      "<h2>#{label}</h2>"
-    end
-
-    def h3(label)
-      "<h3>#{label}</h3>"
-    end
-
     def li(content)
       "<li>#{content}</li>"
     end
@@ -183,46 +169,4 @@ module ReVIEW
 
   end
 
-  class IDGTOCPrinter < TOCPrinter
-    def print_book(book)
-      puts %Q(<?xml version="1.0" encoding="UTF-8"?>)
-      puts nkffilter(%Q(<doc xmlns:aid='http://ns.adobe.com/AdobeInDesign/4.0/'><title aid:pstyle="h0">1　パート1</title><?dtp level="0" section="第1部　パート1"?>)) # FIXME: 部タイトルを取るには？ & 部ごとに結果を分けるには？
-      puts %Q(<ul aid:pstyle='ul-partblock'>)
-      print_children book
-      puts %Q(</ul></doc>)
-    end
-
-    private
-
-    def print_children(node)
-      return unless print?(node.level + 1)
-      node.each_section_with_index do |sec, idx|
-        print_node idx+1, sec
-        print_children sec
-      end
-    end
-
-    LABEL_LEN = 54
-
-    def print_node(seq, node)
-      if node.chapter?
-        vol = node.volume
-        printf "<li aid:pstyle='ul-part'>%s</li>\n",
-               nkffilter("#{chapnumstr(node.number)}#{node.label}")
-      else
-        printf "<li>%-#{LABEL_LEN}s\n",
-               nkffilter("  #{'   ' * (node.level - 1)}#{seq}　#{node.label}</li>")
-      end
-    end
-
-    def chapnumstr(n)
-      n ? nkffilter(sprintf('第%d章　', n)) : ''
-    end
-
-    def volume_columns(level, volstr)
-      cols = ["", "", "", nil]
-      cols[level - 1] = volstr
-      cols[0, 3]
-    end
-  end
 end