review 1.7.2 → 2.0.0.beta1

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,26 +13,32 @@ module ReVIEW
       }
     end
 
-    def split_paragraph(lines)
-      pre = pre_paragraph
-      post = post_paragraph
-
-      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] }
+    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
 
-      blocked_lines.map{|l| l.join("")}
+    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
+      end
     end
   end
 end

data/lib/review/tocparser.rb

@@ -323,11 +323,11 @@ module ReVIEW
     end
   end
 
-  class Book::Base # reopen
+  class Book::Base   # reopen
     include TOCRoot
   end
 
-  class Book::ChapterSet # reopen
+  class Book::ChapterSet   # reopen
     include TOCRoot
   end
 
@@ -335,7 +335,7 @@ module ReVIEW
     include TOCRoot
   end
 
-  class Book::Chapter # reopen
+  class Book::Chapter   # reopen
     def toc
       @toc ||= TOCParser.parse(self)
       unless @toc.size == 1

data/lib/review/tocprinter.rb

@@ -13,13 +13,14 @@
 
 require 'review/htmlutils'
 require 'review/htmllayout'
+require 'nkf'
 
 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)
@@ -30,6 +31,28 @@ module ReVIEW
     def print?(level)
       level <= @print_upper
     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"
+      end
+
+      if @config["outencoding"] =~ /^EUC$/
+        outc = "-e"
+      elsif @config["outencoding"] =~ /^SJIS$/
+        outc = "-s"
+      elsif @config["outencoding"]  =~ /^JIS$/
+        outc = "-j"
+      end
+
+      NKF.nkf("#{inc} #{outc}", line)
+    end
   end
 
 
@@ -56,11 +79,11 @@ module ReVIEW
         printf "%3s %3dKB %6dC %5dL  %s (%s)\n",
                chapnumstr(node.number),
                vol.kbytes, vol.chars, vol.lines,
-               node.label, node.chapter_id
+               nkffilter(node.label), node.chapter_id
       else
         printf "%17s %5dL  %s\n",
                '', node.estimated_lines,
-               "  #{'   ' * (node.level - 1)}#{number} #{node.label}"
+               nkffilter("  #{'   ' * (node.level - 1)}#{number} #{node.label}")
       end
     end
 
@@ -71,7 +94,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
@@ -163,7 +186,7 @@ module ReVIEW
   class IDGTOCPrinter < TOCPrinter
     def print_book(book)
       puts %Q(<?xml version="1.0" encoding="UTF-8"?>)
-      puts %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 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>)
@@ -185,15 +208,15 @@ module ReVIEW
       if node.chapter?
         vol = node.volume
         printf "<li aid:pstyle='ul-part'>%s</li>\n",
-               "#{chapnumstr(node.number)}#{node.label}"
+               nkffilter("#{chapnumstr(node.number)}#{node.label}")
       else
         printf "<li>%-#{LABEL_LEN}s\n",
-               "  #{'   ' * (node.level - 1)}#{seq}　#{node.label}</li>"
+               nkffilter("  #{'   ' * (node.level - 1)}#{seq}　#{node.label}</li>")
       end
     end
 
     def chapnumstr(n)
-      n ? sprintf('第%d章　', n) : ''
+      n ? nkffilter(sprintf('第%d章　', n)) : ''
     end
 
     def volume_columns(level, volstr)

data/lib/review/topbuilder.rb

@@ -22,7 +22,7 @@ module ReVIEW
     }
     Compiler.defsingle(:dtp, 1)
 
-    Compiler.defblock(:insn, 1)
+    Compiler.defcodeblock(:insn, 1)
     Compiler.defblock(:memo, 0..1)
     Compiler.defblock(:tip, 0..1)
     Compiler.defblock(:info, 0..1)
@@ -55,7 +55,6 @@ module ReVIEW
       @subsection = 0
       @subsubsection = 0
       @subsubsubsection = 0
-      @blank_seen = true
 
       @titles = {
         "emlist" => "インラインリスト",
@@ -102,28 +101,6 @@ module ReVIEW
     end
     private :builder_init_file
 
-    def print(s)
-      @blank_seen = false
-      super
-    end
-    private :print
-
-    def puts(s)
-      @blank_seen = false
-      super
-    end
-    private :puts
-
-    def blank
-      @output.puts unless @blank_seen
-      @blank_seen = true
-    end
-    private :blank
-
-    def result
-      @output.string
-    end
-
     def warn(msg)
       $stderr.puts "#{@location.filename}:#{@location.lineno}: warning: #{msg}"
     end
@@ -137,8 +114,8 @@ module ReVIEW
     end
 
     def headline(level, label, caption)
+      buf = ""
       prefix = ""
-      blank
       case level
       when 1
         if @chapter.number.to_s =~ /\A\d+\Z/
@@ -172,62 +149,67 @@ module ReVIEW
         raise "caption level too deep or unsupported: #{level}"
       end
       prefix = "" if (level.to_i > @book.config["secnolevel"])
-      puts "■H#{level}■#{prefix}#{compile_inline(caption)}"
+      buf << "■H#{level}■#{prefix}#{caption}\n"
+      buf
     end
 
     def ul_begin
-      blank
+      "\n"
     end
 
     def ul_item(lines)
-      puts "●\t#{lines.join}"
+      "●\t#{lines.join}\n"
     end
 
     def ul_end
-      blank
+      "\n"
     end
 
     def ol_begin
-      blank
       @olitem = 0
+      "\n"
     end
 
     def ol_item(lines, num)
-      puts "#{num}\t#{lines.join}"
+      "#{num}\t#{lines.join}\n"
     end
 
     def ol_end
-      blank
       @olitem = nil
+      "\n"
     end
 
     def dl_begin
-      blank
+      "\n"
     end
 
     def dt(line)
-      puts "★#{line}☆"
+      "★#{line}☆\n"
     end
 
     def dd(lines)
-      split_paragraph(lines).each do |paragraph|
-        puts "\t#{paragraph.gsub(/\n/, '')}"
+      buf = ""
+      lines.each do |paragraph|
+        buf << "\t#{paragraph.gsub(/\n/, '')}\n"
       end
+      buf
     end
 
     def dl_end
-      blank
+      "\n"
     end
 
     def paragraph(lines)
-      puts lines.join
+      lines.join+"\n"
     end
 
     def read(lines)
-      puts "◆→開始:#{@titles["lead"]}←◆"
-      puts split_paragraph(lines).join("\n")
-      puts "◆→終了:#{@titles["lead"]}←◆"
-      blank
+      buf = ""
+      buf << "◆→開始:#{@titles["lead"]}←◆\n"
+      buf << lines.join("\n") << "\n"
+      buf << "◆→終了:#{@titles["lead"]}←◆\n"
+      buf << "\n"
+      buf
     end
 
     alias_method :lead, :read
@@ -239,44 +221,50 @@ module ReVIEW
       else
         %Q[#{I18n.t("list")}#{I18n.t("format_number", [get_chap(chapter), @chapter.list(id).number])}]
       end
-
     end
 
     def list_header(id, caption, lang)
-      blank
-      puts "◆→開始:#{@titles["list"]}←◆"
+      buf = ""
+      #buf << "\n"
+      buf << "◆→開始:#{@titles["list"]}←◆\n"
       if get_chap.nil?
-        puts %Q[#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [@chapter.list(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}]
+        buf << %Q[#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [@chapter.list(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}] << "\n"
       else
-        puts %Q[#{I18n.t("list")}#{I18n.t("format_number", [get_chap, @chapter.list(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}]
+        buf << %Q[#{I18n.t("list")}#{I18n.t("format_number", [get_chap, @chapter.list(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}] << "\n"
       end
-      blank
+      buf << "\n"
+      buf
     end
 
     def list_body(id, lines, lang)
+      buf = ""
       lines.each do |line|
-        puts detab(line)
+        buf << detab(line) << "\n"
       end
-      puts "◆→終了:#{@titles["list"]}←◆"
-      blank
+      buf << "◆→終了:#{@titles["list"]}←◆\n"
+      buf << "\n"
+      buf
     end
 
     def base_block(type, lines, caption = nil)
-      blank
-      puts "◆→開始:#{@titles[type]}←◆"
-      puts "■#{compile_inline(caption)}" unless caption.nil?
-      puts lines.join("\n")
-      puts "◆→終了:#{@titles[type]}←◆"
-      blank
+      buf = ""
+      buf << "\n"
+      buf << "◆→開始:#{@titles[type]}←◆\n"
+      buf << "■#{caption}\n" unless caption.nil?
+      buf << lines.join("")
+      buf << "◆→終了:#{@titles[type]}←◆\n"
+      buf << "\n"
+      buf
     end
 
     def base_parablock(type, lines, caption = nil)
-      blank
-      puts "◆→開始:#{@titles[type]}←◆"
-      puts "■#{compile_inline(caption)}" unless caption.nil?
-      puts split_paragraph(lines).join("\n")
-      puts "◆→終了:#{@titles[type]}←◆"
-      blank
+      buf = ""
+      buf << "◆→開始:#{@titles[type]}←◆\n"
+      buf << "■#{caption}\n" unless caption.nil?
+      buf << lines.join("")
+      buf << "◆→終了:#{@titles[type]}←◆\n"
+      buf << "\n"
+      buf
     end
 
     def emlist(lines, caption = nil, lang = nil)
@@ -284,23 +272,26 @@ module ReVIEW
     end
 
     def emlistnum(lines, caption = nil, lang = nil)
-      blank
-      puts "◆→開始:#{@titles["emlist"]}←◆"
-      puts "■#{compile_inline(caption)}" unless caption.nil?
+      buf = ""
+      buf << "◆→開始:#{@titles["emlist"]}←◆\n"
+      buf << "■#{caption}\n" unless caption.nil?
       _lines = []
       lines.each_with_index do |line, i|
-        puts (i + 1).to_s.rjust(2) + ": #{line}"
+        buf << (i + 1).to_s.rjust(2) + ": #{line}\n"
       end
-      puts "◆→終了:#{@titles["emlist"]}←◆"
-      blank
+      buf << "◆→終了:#{@titles["emlist"]}←◆\n"
+      buf << "\n"
+      buf
     end
 
     def listnum_body(lines, lang)
+      buf = ""
       lines.each_with_index do |line, i|
-        puts (i + 1).to_s.rjust(2) + ": #{line}"
+        buf << (i + 1).to_s.rjust(2) + ": #{line}\n"
       end
-      puts "◆→終了:#{@titles["list"]}←◆"
-      blank
+      buf << "◆→終了:#{@titles["list"]}←◆\n"
+      buf << "\n"
+      buf
     end
 
     def cmd(lines, caption = nil)
@@ -330,48 +321,57 @@ module ReVIEW
     end
 
     def image(lines, id, caption, metric=nil)
-      blank
-      puts "◆→開始:#{@titles["image"]}←◆"
+      buf = ""
+      #buf << "\n"
+      buf << "◆→開始:#{@titles["image"]}←◆\n"
       if get_chap.nil?
-        puts "#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [@chapter.image(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}"
+        buf << "#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [@chapter.image(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}\n"
       else
-        puts "#{I18n.t("image")}#{I18n.t("format_number", [get_chap, @chapter.image(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}"
+        buf << "#{I18n.t("image")}#{I18n.t("format_number", [get_chap, @chapter.image(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}\n"
       end
-      blank
+      buf << "\n"
       if @chapter.image(id).bound?
-        puts "◆→#{@chapter.image(id).path}←◆"
+        buf << "◆→#{@chapter.image(id).path}←◆\n"
       else
         lines.each do |line|
-          puts line
+          buf << line << "\n"
         end
       end
-      puts "◆→終了:#{@titles["image"]}←◆"
-      blank
+      buf << "◆→終了:#{@titles["image"]}←◆\n"
+      buf << "\n"
+      buf
     end
 
     def texequation(lines)
-      puts "◆→開始:#{@titles["texequation"]}←◆"
-      puts "#{lines.join("\n")}"
-      puts "◆→終了:#{@titles["texequation"]}←◆"
-      blank
+      buf = ""
+      buf << "◆→開始:#{@titles["texequation"]}←◆\n"
+      buf << "#{lines.join("\n")}\n"
+      buf << "◆→終了:#{@titles["texequation"]}←◆\n"
+      buf << "\n"
+      buf
     end
 
     def table_header(id, caption)
-      blank
-      puts "◆→開始:#{@titles["table"]}←◆"
+      buf = ""
+      buf << "\n"
+      buf << "◆→開始:#{@titles["table"]}←◆\n"
       if get_chap.nil?
-        puts "#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}"
+        buf << "#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}\n"
       else
-        puts "#{I18n.t("table")}#{I18n.t("format_number", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}"
+        buf << "#{I18n.t("table")}#{I18n.t("format_number", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}\n"
       end
-      blank
+      buf << "\n"
+      buf
     end
 
     def table_begin(ncols)
+      ""
     end
 
     def tr(rows)
-      puts rows.join("\t")
+      buf = ""
+      buf << rows.join("\t") << "\n"
+      buf
     end
 
     def th(str)
@@ -383,19 +383,21 @@ module ReVIEW
     end
 
     def table_end
-      puts "◆→終了:#{@titles["table"]}←◆"
-      blank
+      buf = ""
+      buf << "◆→終了:#{@titles["table"]}←◆\n"
+      buf << "\n"
+      buf
     end
 
     def comment(lines, comment = nil)
       lines ||= []
       lines.unshift comment unless comment.blank?
       str = lines.join("")
-      puts "◆→DTP連絡:#{str}←◆"
+      "◆→DTP連絡:#{str}←◆\n"
     end
 
     def footnote(id, str)
-      puts "【注#{@chapter.footnote(id).number}】#{compile_inline(str)}"
+      "【注#{@chapter.footnote(id).number}】#{str}\n"
     end
 
     def inline_fn(id)
@@ -511,25 +513,28 @@ module ReVIEW
     end
 
     def noindent
-      puts "◆→DTP連絡:次の1行インデントなし←◆"
+      "◆→DTP連絡:次の1行インデントなし←◆\n"
     end
 
     def nonum_begin(level, label, caption)
-      puts "■H#{level}■#{compile_inline(caption)}"
+      "■H#{level}■#{caption}\n"
     end
 
     def nonum_end(level)
     end
 
     def common_column_begin(type, caption)
-      blank
-      puts "◆→開始:#{@titles[type]}←◆"
-      puts %Q[■#{compile_inline(caption)}]
+      buf = ""
+      buf << "◆→開始:#{@titles[type]}←◆\n"
+      buf << %Q[■#{caption}\n]
+      buf
     end
 
     def common_column_end(type)
-      puts %Q[◆→終了:#{@titles[type]}←◆]
-      blank
+      buf = ""
+      buf << %Q[◆→終了:#{@titles[type]}←◆\n]
+      buf << "\n"
+      buf
     end
 
     def column_begin(level, label, caption)
@@ -679,15 +684,17 @@ module ReVIEW
     alias_method :box, :insn
 
     def indepimage(id, caption=nil, metric=nil)
-      blank
+      buf = ""
+      buf << "\n"
       begin
-        puts "◆→画像 #{@chapter.image(id).path.sub(/\A\.\//, "")} #{metric.join(" ")}←◆"
+        buf << "◆→画像 #{@chapter.image(id).path.sub(/\A\.\//, "")} #{metric.join(" ")}←◆\n"
       rescue
         warn "no such image: #{id}"
-        puts "◆→画像 #{id}←◆"
+        buf << "◆→画像 #{id}←◆\n"
       end
-      puts "図　#{compile_inline(caption)}" if caption.present?
-      blank
+      buf << "図　#{caption}\n" if caption.present?
+      buf << "\n"
+      buf
     end
 
     alias_method :numberlessimage, :indepimage
@@ -741,7 +748,8 @@ module ReVIEW
     def inline_chapref(id)
       chs = ["", "「", "」"]
       unless @book.config["chapref"].nil?
-        _chs = @book.config["chapref"].split(",")
+        _chs = convert_inencoding(@book.config["chapref"],
+                                  @book.config["inencoding"]).split(",")
         if _chs.size != 3
           error "--chapsplitter must have exactly 3 parameters with comma."
         else
@@ -755,7 +763,7 @@ module ReVIEW
       nofunc_text("[UnknownChapter:#{id}]")
     end
 
-    def source(lines, caption = nil, lang = nil)
+    def source(lines, caption = nil)
       base_block "source", lines, caption
     end
 
@@ -774,7 +782,7 @@ module ReVIEW
     end
 
     def circle_begin(level, label, caption)
-      puts "・\t#{caption}"
+      "・\t#{caption}\n"
     end
 
     def circle_end(level)
@@ -786,4 +794,4 @@ module ReVIEW
 
   end
 
-end # module ReVIEW
+end   # module ReVIEW