review 1.7.2 → 2.0.0.beta1

data/lib/review/htmllayout.rb

@@ -11,8 +11,6 @@ class HTMLLayout
     @next = params['next']
     @prev = params['prev']
     @builder = params['builder']
-    @language = params['language']
-    @stylesheets = params['stylesheets']
     @template = template
   end
   attr_reader :body, :title, :toc

data/lib/review/htmlutils.rb

@@ -40,7 +40,7 @@ module ReVIEW
       str.gsub('-', '-')
     end
 
-    def highlight?
+    def highlight_pygments?
       @book.config["pygments"].present? ||
         @book.config["highlight"] && @book.config["highlight"]["html"] == "pygments"
     end
@@ -58,7 +58,7 @@ module ReVIEW
       if ops[:options] && ops[:options].kind_of?(Hash)
         options.merge!(ops[:options])
       end
-      return body if !highlight?
+      return body if !highlight_pygments?
 
       begin
         require 'pygments'
@@ -72,7 +72,7 @@ module ReVIEW
           body
         end
       rescue LoadError
-          body
+        body
       end
     end
 
@@ -87,4 +87,4 @@ module ReVIEW
     end
   end
 
-end # module ReVIEW
+end   # module ReVIEW

data/lib/review/i18n.rb

@@ -38,7 +38,7 @@ module ReVIEW
     end
 
     class << self
-      alias_method :v, :t ## for EPUBMaker backward compatibility
+      alias v t  ## for EPUBMaker backward compatibility
     end
 
     def self.update(user_i18n, locale = nil)
@@ -65,11 +65,7 @@ module ReVIEW
       locale = user_i18n["locale"]
       if locale
         user_i18n.delete("locale")
-        if @store[locale]
-          @store[locale].merge!(user_i18n)
-        else
-          @store[locale] = user_i18n
-        end
+        @store[locale].merge!(user_i18n)
       else
         user_i18n.each do |key, values|
           raise KeyError, "Invalid locale file: #{path}" unless values.kind_of? Hash

data/lib/review/i18n.yml

@@ -116,7 +116,7 @@ en:
   profiletitle: "Profile"
   backcovertitle: "Back Cover"
 
-zh-TW:
+zh_TW:
   image: 圖
   table: 表
   list: List

data/lib/review/idgxmlbuilder.rb

@@ -23,7 +23,7 @@ module ReVIEW
     [:ttbold, :hint, :maru, :keytop, :labelref, :ref, :pageref, :balloon].each {|e| Compiler.definline(e) }
     Compiler.defsingle(:dtp, 1)
 
-    Compiler.defblock(:insn, 0..1)
+    Compiler.defcodeblock(:insn, 1)
     Compiler.defblock(:memo, 0..1)
     Compiler.defblock(:tip, 0..1)
     Compiler.defblock(:info, 0..1)
@@ -42,14 +42,6 @@ module ReVIEW
     Compiler.defblock(:expert, 0)
     Compiler.defblock(:rawblock, 0)
 
-    def pre_paragraph
-      '<p>'
-    end
-
-    def post_paragraph
-      '</p>'
-    end
-
     def extname
       '.xml'
     end
@@ -74,14 +66,13 @@ module ReVIEW
       @tsize = nil
       @texblockequation = 0
       @texinlineequation = 0
-      print %Q(<?xml version="1.0" encoding="UTF-8"?>\n)
-      print %Q(<#{@rootelement} xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/">)
+
+      @output << %Q(<?xml version="1.0" encoding="UTF-8"?>\n)
+      @output << %Q(<#{@rootelement} xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/">)
       if @book.config["nolf"].present?
-        IDGXMLBuilder.class_eval do
-          def puts(arg)
-            print arg
-          end
-        end
+        @lf = ""
+      else
+        @lf = "\n"
       end
       @secttags = true unless @book.config["structuredxml"].nil?
     end
@@ -102,7 +93,7 @@ module ReVIEW
     def warn(msg)
       if @no_error
         @warns.push [@location.filename, @location.lineno, msg]
-        puts "----WARNING: #{escape_html(msg)}----"
+        buf << "----WARNING: #{escape_html(msg)}----" << @lf
       else
         $stderr.puts "#{@location}: warning: #{msg}"
       end
@@ -111,7 +102,7 @@ module ReVIEW
     def error(msg)
       if @no_error
         @errors.push [@location.filename, @location.lineno, msg]
-        puts "----ERROR: #{escape_html(msg)}----"
+        buf << "----ERROR: #{escape_html(msg)}----" << @lf
       else
         $stderr.puts "#{@location}: error: #{msg}"
       end
@@ -142,63 +133,57 @@ module ReVIEW
     end
 
     def headline(level, label, caption)
+      buf = ""
       case level
       when 1
         unless @secttags.nil?
-          print "</sect4>" if @subsubsubsection > 0
-          print "</sect3>" if @subsubsection > 0
-          print "</sect2>" if @subsection > 0
-          print "</sect>" if @section > 0
+          buf << "</sect4>" if @subsubsubsection > 0
+          buf << "</sect3>" if @subsubsection > 0
+          buf << "</sect2>" if @subsection > 0
+          buf << "</sect>" if @section > 0
         end
-
-        print %Q(<chapter id="chap:#{@chapter.number}">) unless @secttags.nil?
-
+        buf << %Q(<chapter id="chap:#{@chapter.number}">) unless @secttags.nil?
         @section = 0
         @subsection = 0
         @subsubsection = 0
         @subsubsubsection = 0
       when 2
         unless @secttags.nil?
-          print "</sect4>" if @subsubsubsection > 0
-          print "</sect3>" if @subsubsection > 0
-          print "</sect2>" if @subsection > 0
-          print "</sect>" if @section > 0
+          buf << "</sect4>" if @subsubsubsection > 0
+          buf << "</sect3>" if @subsubsection > 0
+          buf << "</sect2>" if @subsection > 0
+          buf << "</sect>" if @section > 0
         end
         @section += 1
-        print %Q(<sect id="sect:#{@chapter.number}.#{@section}">) unless @secttags.nil?
-      
+        buf << %Q(<sect id="sect:#{@chapter.number}.#{@section}">) unless @secttags.nil?
         @subsection = 0
         @subsubsection = 0
         @subsubsubsection = 0
       when 3
         unless @secttags.nil?
-          print "</sect4>" if @subsubsubsection > 0
-          print "</sect3>" if @subsubsection > 0
-          print "</sect2>" if @subsection > 0
+          buf << "</sect4>" if @subsubsubsection > 0
+          buf << "</sect3>" if @subsubsection > 0
+          buf << "</sect2>" if @subsection > 0
         end
-
         @subsection += 1
-        print %Q(<sect2 id="sect:#{@chapter.number}.#{@section}.#{@subsection}">) unless @secttags.nil?
-
+        buf << %Q(<sect2 id="sect:#{@chapter.number}.#{@section}.#{@subsection}">) unless @secttags.nil?
         @subsubsection = 0
         @subsubsubsection = 0
       when 4
         unless @secttags.nil?
-          print "</sect4>" if @subsubsubsection > 0
-          print "</sect3>" if @subsubsection > 0
+          buf << "</sect4>" if @subsubsubsection > 0
+          buf << "</sect3>" if @subsubsection > 0
         end
-
         @subsubsection += 1
-        print %Q(<sect3 id="sect:#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}">) unless @secttags.nil?
-
+        buf << %Q(<sect3 id="sect:#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}">) unless @secttags.nil?
         @subsubsubsection = 0
       when 5
         unless @secttags.nil?
-          print "</sect4>" if @subsubsubsection > 0
+          buf << "</sect4>" if @subsubsubsection > 0
         end
 
         @subsubsubsection += 1
-        print %Q(<sect4 id="sect:#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}.#{@subsubsubsection}">) unless @secttags.nil?
+        buf << %Q(<sect4 id="sect:#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}.#{@subsubsubsection}">) unless @secttags.nil?
       else
         raise "caption level too deep or unsupported: #{level}"
       end
@@ -206,65 +191,68 @@ module ReVIEW
       prefix, anchor = headline_prefix(level)
 
       label = label.nil? ? "" : " id=\"#{label}\""
-      toccaption = escape_html(compile_inline(caption.gsub(/@<fn>\{.+?\}/, '')).gsub(/<[^>]+>/, ''))
-      puts %Q(<title#{label} aid:pstyle="h#{level}">#{prefix}#{compile_inline(caption)}</title><?dtp level="#{level}" section="#{prefix}#{toccaption}"?>)
+      toccaption = escape_html(caption.gsub(/@<fn>\{.+?\}/, '').gsub(/<[^>]+>/, ''))
+      buf << %Q(<title#{label} aid:pstyle="h#{level}">#{prefix}#{caption}</title><?dtp level="#{level}" section="#{prefix}#{toccaption}"?>) << @lf
+
+      buf
     end
 
     def ul_begin
       level = block_given? ? yield : ""
       level = nil if level == 1
-      puts "<ul#{level == 1 ? nil : level}>"
+      "<ul#{level == 1 ? nil : level}>" + @lf
     end
 
     def ul_item(lines)
-      puts %Q(<li aid:pstyle="ul-item">#{lines.join.chomp}</li>)
+      %Q(<li aid:pstyle="ul-item">#{lines.join.chomp}</li>) + @lf
     end
 
     def ul_item_begin(lines)
-      print %Q(<li aid:pstyle="ul-item">#{lines.join.chomp})
+      %Q(<li aid:pstyle="ul-item">#{lines.join.chomp})
     end
 
     def ul_item_end
-      puts "</li>"
+      "</li>" + @lf
     end
 
     def choice_single_begin
-      puts "<choice type='single'>"
+      "<choice type='single'>" + @lf
     end
 
     def choice_multi_begin
-      puts "<choice type='multi'>"
+      "<choice type='multi'>" + @lf
     end
 
     def choice_single_end
-      puts "</choice>"
+      "</choice>" + @lf
     end
 
     def choice_multi_end
-      puts "</choice>"
+      "</choice>" + @lf
     end
 
     def ul_end
       level = block_given? ? yield : ""
       level = nil if level == 1
-      puts "</ul#{level}>"
+      "</ul#{level}>" + @lf
     end
 
     def ol_begin
-      puts '<ol>'
       if !@ol_num
         @ol_num = 1
       end
+      '<ol>' + @lf
     end
 
     def ol_item(lines, num)
-      puts %Q(<li aid:pstyle="ol-item" olnum="#{@ol_num}" num="#{num}">#{lines.join.chomp}</li>)
+      buf = %Q(<li aid:pstyle="ol-item" olnum="#{@ol_num}" num="#{num}">#{lines.join.chomp}</li>) + @lf
       @ol_num += 1
+      buf
     end
 
     def ol_end
-      puts '</ol>'
       @ol_num = nil
+      '</ol>' + @lf
     end
 
     def olnum(num)
@@ -272,39 +260,42 @@ module ReVIEW
     end
 
     def dl_begin
-      puts '<dl>'
+      '<dl>' + @lf
     end
 
     def dt(line)
-      puts "<dt>#{line}</dt>"
+      "<dt>#{line}</dt>" + @lf
     end
 
     def dd(lines)
-      puts "<dd>#{lines.join.chomp}</dd>"
+      "<dd>#{lines.join.chomp}</dd>" + @lf
     end
 
     def dl_end
-      puts '</dl>'
+      '</dl>' + @lf
     end
 
     def paragraph(lines)
+      buf = ""
       if @noindent.nil?
         if lines[0] =~ /\A(\t+)/
-          puts %Q(<p inlist="#{$1.size}">#{lines.join('').sub(/\A\t+/, "")}</p>)
+          buf << %Q(<p inlist="#{$1.size}">#{lines.join('').sub(/\A\t+/, "")}</p>) << @lf
         else
-          puts "<p>#{lines.join}</p>"
+          buf << "<p>#{lines.join}</p>" << @lf
         end
       else
-        puts %Q(<p aid:pstyle="noindent" noindent='1'>#{lines.join}</p>)
+        buf << %Q(<p aid:pstyle="noindent" noindent='1'>#{lines.join}</p>) << @lf
         @noindent = nil
       end
+      buf
     end
 
     def read(lines)
       if @book.config["deprecated-blocklines"].nil?
-        puts %Q[<lead>#{split_paragraph(lines).join}</lead>]
+        %Q[<lead>#{lines.join}</lead>] + @lf
       else
-        puts %Q[<p aid:pstyle="lead">#{lines.join}</p>]
+        str = lines.map{|l| l.sub(/^<p>/,"").sub(/<\/p>$/,"")}.join()
+        %Q[<p aid:pstyle="lead">#{str}</p>] + @lf
       end
     end
 
@@ -337,34 +328,40 @@ module ReVIEW
     end
 
     def list_header(id, caption, lang)
-      puts %Q[<codelist>]
+      buf = ""
+      buf << %Q[<codelist>] << @lf
       if get_chap.nil?
-        puts %Q[<caption>#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [@chapter.list(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}</caption>]
+        buf << %Q[<caption>#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [@chapter.list(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}</caption>] << @lf
       else
-        puts %Q[<caption>#{I18n.t("list")}#{I18n.t("format_number", [get_chap, @chapter.list(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}</caption>]
+        buf << %Q[<caption>#{I18n.t("list")}#{I18n.t("format_number", [get_chap, @chapter.list(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}</caption>] << @lf
       end
+      buf
     end
 
     def codelines_body(lines)
+      buf = ""
       no = 1
       lines.each do |line|
         unless @book.config["listinfo"].nil?
-          print "<listinfo line=\"#{no}\""
-          print " begin=\"1\"" if no == 1
-          print " end=\"#{no}\"" if no == lines.size
-          print ">"
+          buf << "<listinfo line=\"#{no}\""
+          buf << " begin=\"1\"" if no == 1
+          buf << " end=\"#{no}\"" if no == lines.size
+          buf << ">"
         end
-        print detab(line)
-        print "\n"
-        print "</listinfo>" unless @book.config["listinfo"].nil?
+        buf << detab(line)
+        buf << "\n"
+        buf << "</listinfo>" unless @book.config["listinfo"].nil?
         no += 1
       end
+      buf
     end
 
     def list_body(id, lines, lang)
-      print %Q(<pre>)
-      codelines_body(lines)
-      puts "</pre></codelist>"
+      buf = ""
+      buf << %Q(<pre>)
+      buf << codelines_body(lines)
+      buf << "</pre></codelist>" << @lf
+      buf
     end
 
     def emlist(lines, caption = nil, lang = nil)
@@ -374,27 +371,30 @@ module ReVIEW
     def emlistnum(lines, caption = nil, lang = nil)
       _lines = []
       lines.each_with_index do |line, i|
+        line.chomp! ## new parser don't remove LF in table (code block)
         _lines << detab("<span type='lineno'>" + (i + 1).to_s.rjust(2) + ": </span>" + line)
       end
       quotedlist _lines, 'emlistnum', caption
     end
 
     def listnum_body(lines, lang)
-      print %Q(<pre>)
+      buf = ""
+      buf << %Q(<pre>)
       no = 1
       lines.each_with_index do |line, i|
         unless @book.config["listinfo"].nil?
-          print "<listinfo line=\"#{no}\""
-          print " begin=\"1\"" if no == 1
-          print " end=\"#{no}\"" if no == lines.size
-          print ">"
+          buf << "<listinfo line=\"#{no}\""
+          buf << " begin=\"1\"" if no == 1
+          buf << " end=\"#{no}\"" if no == lines.size
+          buf << ">"
         end
-        print detab("<span type='lineno'>" + (i + 1).to_s.rjust(2) + ": </span>" + line)
-        print "\n"
-        print "</listinfo>" unless @book.config["listinfo"].nil?
+        buf << detab("<span type='lineno'>" + (i + 1).to_s.rjust(2) + ": </span>" + line)
+        buf << "\n"
+        buf << "</listinfo>" unless @book.config["listinfo"].nil?
         no += 1
       end
-      puts "</pre></codelist>"
+      buf << "</pre></codelist>" << @lf
+      buf
     end
 
     def cmd(lines, caption = nil)
@@ -402,32 +402,34 @@ module ReVIEW
     end
 
     def quotedlist(lines, css_class, caption)
-      print %Q[<list type='#{css_class}'>]
-      puts "<caption aid:pstyle='#{css_class}-title'>#{compile_inline(caption)}</caption>" unless caption.nil?
-      print %Q[<pre>]
+      buf = ""
+      buf << %Q[<list type='#{css_class}'>]
+      buf << "<caption aid:pstyle='#{css_class}-title'>#{caption}</caption>" + @lf unless caption.nil?
+      buf << %Q[<pre>]
       no = 1
       lines.each do |line|
         unless @book.config["listinfo"].nil?
-          print "<listinfo line=\"#{no}\""
-          print " begin=\"1\"" if no == 1
-          print " end=\"#{no}\"" if no == lines.size
-          print ">"
+          buf << "<listinfo line=\"#{no}\""
+          buf << " begin=\"1\"" if no == 1
+          buf << " end=\"#{no}\"" if no == lines.size
+          buf << ">"
         end
-        print detab(line)
-        print "\n"
-        print "</listinfo>" unless @book.config["listinfo"].nil?
+        buf << detab(line)
+        buf << "\n"
+        buf << "</listinfo>" unless @book.config["listinfo"].nil?
         no += 1
       end
-      puts '</pre></list>'
+      buf << '</pre></list>' << @lf
+      buf
     end
     private :quotedlist
 
     def quote(lines)
       if @book.config["deprecated-blocklines"].nil?
-        blocked_lines = split_paragraph(lines)
-        puts "<quote>#{blocked_lines.join("")}</quote>"
+        "<quote>#{lines.join("")}</quote>" + @lf
       else
-        puts "<quote>#{lines.join("\n")}</quote>"
+        str = lines.map{|l| l.sub(/^<p>/,"").sub(/<\/p>$/,"")}.join("\n")
+        "<quote>#{str}</quote>" + @lf
       end
     end
 
@@ -472,53 +474,59 @@ module ReVIEW
     end
 
     def image_image(id, caption, metric=nil)
+      buf = ""
       metrics = parse_metric("idgxml", metric)
-      puts "<img>"
-      puts %Q[<Image href="file://#{@chapter.image(id).path.sub(/\A.\//, "")}"#{metrics} />]
-      image_header id, caption
-      puts "</img>"
+      buf << "<img>" << @lf
+      buf << %Q[<Image href="file://#{@chapter.image(id).path.sub(/\A.\//, "")}"#{metrics} />] << @lf
+      buf << image_header(id, caption)
+      buf << "</img>" << @lf
+      buf
     end
 
     def image_dummy(id, caption, lines)
-      puts "<img>"
-      print %Q[<pre aid:pstyle="dummyimage">]
+      buf << "<img>" << @lf
+      buf << %Q[<pre aid:pstyle="dummyimage">]
       lines.each do |line|
-        print detab(line)
-        print "\n"
+        buf << detab(line)
+        buf << "\n"
       end
-      print %Q[</pre>]
+      buf << %Q[</pre>]
       image_header id, caption
-      puts "</img>"
+      buf << "</img>" << @lf
       warn "no such image: #{id}"
+      buf
     end
 
     def image_header(id, caption)
       if get_chap.nil?
-        puts %Q[<caption>#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [@chapter.image(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}</caption>]
+        %Q[<caption>#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [@chapter.image(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}</caption>] + @lf
       else
-        puts %Q[<caption>#{I18n.t("image")}#{I18n.t("format_number", [get_chap, @chapter.image(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}</caption>]
+        %Q[<caption>#{I18n.t("image")}#{I18n.t("format_number", [get_chap, @chapter.image(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}</caption>] + @lf
       end
     end
 
     def texequation(lines)
+      buf = ""
       @texblockequation += 1
-      puts %Q[<replace idref="texblock-#{@texblockequation}">]
-      puts '<pre>'
-      puts "#{lines.join("\n")}"
-      puts '</pre>'
-      puts '</replace>'
+      buf << %Q[<replace idref="texblock-#{@texblockequation}">] << @lf
+      buf << '<pre>' << @lf
+      buf << "#{lines.join("\n")}" << @lf
+      buf << '</pre>' << @lf
+      buf << '</replace>' << @lf
     end
 
     def table(lines, id = nil, caption = nil)
+      buf = ""
       tablewidth = nil
       col = 0
       unless @book.config["tableopt"].nil?
         tablewidth = @book.config["tableopt"].split(",")[0].to_f / 0.351 # mm -> pt
       end
-      puts "<table>"
+      buf << "<table>"
       rows = []
       sepidx = nil
       lines.each_with_index do |line, idx|
+        line.chomp! ## new parser don't remove LF in table (code block)
         if /\A[\=\-]{12}/ =~ line
           sepidx ||= idx
           next
@@ -541,7 +549,7 @@ module ReVIEW
           totallength = 0
           cellwidth.size.times do |n|
             cellwidth[n] = cellwidth[n].to_f / 0.351 # mm -> pt
-            totallength += cellwidth[n]
+            totallength = totallength + cellwidth[n]
             warn "total length exceeds limit for table: #{id}" if totallength > tablewidth
           end
           if cellwidth.size < col
@@ -555,66 +563,71 @@ module ReVIEW
       end
 
       begin
-        table_header id, caption unless caption.nil?
+        buf << table_header(id, caption) unless caption.nil?
       rescue KeyError
         error "no such table: #{id}"
       end
       return if rows.empty?
 
       if tablewidth.nil?
-        print "<tbody>"
+        buf << "<tbody>"
       else
-        print %Q[<tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="#{rows.length}" aid:tcols="#{col}">]
+        buf << %Q[<tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="#{rows.length}" aid:tcols="#{col}">]
       end
 
       if sepidx
         sepidx.times do |y|
           if tablewidth.nil?
-            puts %Q[<tr type="header">#{rows.shift}</tr>]
+            buf << %Q[<tr type="header">#{rows.shift}</tr>] << @lf
           else
             i = 0
             rows.shift.split(/\t/).each_with_index do |cell, x|
-              print %Q[<td xyh="#{x + 1},#{y + 1},#{sepidx}" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="#{sprintf("%.13f", cellwidth[i])}">#{cell.sub("DUMMYCELLSPLITTER", "")}</td>]
+              buf << %Q[<td xyh="#{x + 1},#{y + 1},#{sepidx}" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="#{sprintf("%.13f", cellwidth[i])}">#{cell.sub("DUMMYCELLSPLITTER", "")}</td>]
               i += 1
             end
           end
         end
       end
-      trputs(tablewidth, rows, cellwidth, sepidx)
-      puts "</tbody></table>"
+      buf << trputs(tablewidth, rows, cellwidth, sepidx)
+      buf << "</tbody></table>" << @lf
       @tsize = nil
+      buf
     end
 
     def trputs(tablewidth, rows, cellwidth, sepidx)
+      buf = ""
       sepidx = 0 if sepidx.nil?
       if tablewidth.nil?
         lastline = rows.pop
-        rows.each {|row| puts %Q[<tr>#{row}</tr>] }
-        puts %Q[<tr type="lastline">#{lastline}</tr>] unless lastline.nil?
+        rows.each {|row| buf << %Q[<tr>#{row}</tr>] }
+        buf << %Q[<tr type="lastline">#{lastline}</tr>] + @lf unless lastline.nil?
       else
         rows.each_with_index do |row, y|
           i = 0
           row.split(/\t/).each_with_index do |cell, x|
-            print %Q[<td xyh="#{x + 1},#{y + 1 + sepidx},#{sepidx}" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="#{sprintf("%.13f", cellwidth[i])}">#{cell.sub("DUMMYCELLSPLITTER", "")}</td>]
+            buf << %Q[<td xyh="#{x + 1},#{y + 1 + sepidx},#{sepidx}" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="#{sprintf("%.13f", cellwidth[i])}">#{cell.sub("DUMMYCELLSPLITTER", "")}</td>]
             i += 1
           end
         end
       end
+      buf
     end
 
     def table_header(id, caption)
+      buf = ""
       if get_chap.nil?
-      puts %Q[<caption>#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}</caption>]
+        buf << %Q[<caption>#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}</caption>] + @lf
       else
-        puts %Q[<caption>#{I18n.t("table")}#{I18n.t("format_number", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}</caption>]
+        buf << %Q[<caption>#{I18n.t("table")}#{I18n.t("format_number", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}</caption>] + @lf
       end
+      buf
     end
 
     def table_begin(ncols)
     end
 
     def tr(rows)
-      puts %Q[<tr>#{rows.join("\t")}</tr>]
+      %Q[<tr>#{rows.join("\t")}</tr>] + @lf
     end
 
     def th(str)
@@ -626,11 +639,11 @@ module ReVIEW
     end
 
     def table_end
-      print "<?dtp tablerow last?>"
+      "<?dtp tablerow last?>"
     end
 
     def comment(str)
-      print %Q(<!-- [Comment] #{escape_html(str)} -->)
+      %Q(<!-- [Comment] #{escape_html(str)} -->)
     end
 
     def footnote(id, str)
@@ -638,7 +651,7 @@ module ReVIEW
     end
 
     def inline_fn(id)
-      %Q[<footnote>#{compile_inline(@chapter.footnote(id).content.strip)}</footnote>]
+      %Q[<footnote>#{@chapter.footnote(id).content.strip}</footnote>]
     end
 
     def compile_ruby(base, ruby)
@@ -648,13 +661,13 @@ module ReVIEW
     def compile_kw(word, alt)
       '<keyword>' +
         if alt
-        then escape_html("#{word}（#{alt.strip}）")
-        else escape_html(word)
+        then ("#{word}（#{alt.strip}）")
+        else (word)
         end +
       '</keyword>' +
-        %Q[<index value="#{escape_html(word)}" />] +
+        %Q[<index value="#{word}" />] +
         if alt
-          alt.split(/\s*,\s*/).collect! {|e| %Q[<index value="#{escape_html(e.strip)}" />] }.join
+          alt.split(/\s*,\s*/).collect! {|e| %Q[<index value="#{(e.strip)}" />] }.join
         else
           ""
         end
@@ -725,11 +738,11 @@ module ReVIEW
     end
 
     def inline_tt(str)
-      %Q(<tt>#{escape_html(str)}</tt>)
+      %Q(<tt>#{str}</tt>)
     end
 
     def inline_ttb(str)
-      %Q(<tt style='bold'>#{escape_html(str)}</tt>)
+      %Q(<tt style='bold'>#{str}</tt>)
     end
 
     alias_method :inline_ttbold, :inline_ttb
@@ -760,13 +773,13 @@ module ReVIEW
     end
 
     def inline_labelref(idref)
-      %Q[<ref idref='#{escape_html(idref)}'>「#{I18n.t("label_marker")}#{escape_html(idref)}」</ref>] # FIXME:節名とタイトルも込みで要出力
+      %Q[<ref idref='#{(idref)}'>「#{I18n.t("label_marker")}#{(idref)}」</ref>] # FIXME:節名とタイトルも込みで要出力
     end
 
     alias_method :inline_ref, :inline_labelref
 
     def inline_pageref(idref)
-      %Q[<pageref idref='#{escape_html(idref)}'>●●</pageref>] # ページ番号を参照
+      %Q[<pageref idref='#{(idref)}'>●●</pageref>] # ページ番号を参照
     end
 
     def inline_balloon(str)
@@ -784,40 +797,43 @@ module ReVIEW
 
     def noindent
       @noindent = true
+      ""
     end
 
     def linebreak
       # FIXME:pが閉じちゃってるので一度戻らないといけないが、難しい…。
-      puts "<br />"
+      "<br />" + @lf
     end
 
     def pagebreak
-      puts "<pagebreak />"
+      "<pagebreak />" + @lf
     end
 
     def nonum_begin(level, label, caption)
-      puts %Q[<title aid:pstyle="h#{level}">#{compile_inline(caption)}</title><?dtp level="#{level}" section="#{escape_html(compile_inline(caption))}"?>]
+      %Q[<title aid:pstyle="h#{level}">#{caption}</title><?dtp level="#{level}" section="#{escape_html(caption)}"?>] + @lf
     end
 
     def nonum_end(level)
     end
 
     def circle_begin(level, label, caption)
-      puts %Q[<title aid:pstyle="smallcircle">&#x2022;#{compile_inline(caption)}</title>]
+      %Q[<title aid:pstyle="smallcircle">&#x2022;#{caption}</title>] + @lf
     end
 
     def circle_end(level)
     end
 
     def common_column_begin(type, caption)
+      buf = ""
       @column += 1
       a_id = %Q[id="column-#{@column}"]
-      print "<#{type}column #{a_id}>"
-      puts %Q[<title aid:pstyle="#{type}column-title">#{compile_inline(caption)}</title>]
+      buf << "<#{type}column #{a_id}>"
+      buf << %Q[<title aid:pstyle="#{type}column-title">#{compile_inline(caption)}</title>] << @lf
+      buf
     end
 
     def common_column_end(type)
-      puts "</#{type}column>"
+      "</#{type}column>" + @lf
     end
 
     def column_begin(level, label, caption)
@@ -870,50 +886,53 @@ module ReVIEW
 
     def ref_begin(level, label, caption)
       if !label.nil?
-        puts "<reference id='#{label}'>"
+        "<reference id='#{label}'>" + @lf
       else
-        puts "<reference>"
+        "<reference>" + @lf
       end
     end
 
     def ref_end(level)
-      puts "</reference>"
+      "</reference>" + @lf
     end
 
     def sup_begin(level, label, caption)
       if !label.nil?
-        puts "<supplement id='#{label}'>"
+        "<supplement id='#{label}'>" + @lf
       else
-        puts "<supplement>"
+        "<supplement>" + @lf
       end
     end
 
     def sup_end(level)
-      puts "</supplement>"
+      "</supplement>" + @lf
     end
 
     def flushright(lines)
       if @book.config["deprecated-blocklines"].nil?
-        puts split_paragraph(lines).join.gsub("<p>", "<p align='right'>")
+        lines.join("").gsub("<p>", "<p align='right'>") + @lf
       else
-        puts "<p align='right'>#{lines.join("\n")}</p>"
+        str = lines.map{|l| l.sub(/^<p>/,"").sub(/<\/p>$/,"")}.join("\n")
+        "<p align='right'>#{str}</p>" + @lf
       end
     end
 
     def centering(lines)
-      puts split_paragraph(lines).join.gsub("<p>", "<p align='center'>")
+      lines.join("").gsub("<p>", "<p align='center'>") + @lf
     end
 
     def captionblock(type, lines, caption, specialstyle = nil)
-      print "<#{type}>"
+      buf = ""
+      buf << "<#{type}>"
       style = specialstyle.nil? ? "#{type}-title" : specialstyle
-      puts "<title aid:pstyle='#{style}'>#{compile_inline(caption)}</title>" unless caption.nil?
+      buf << "<title aid:pstyle='#{style}'>#{(caption)}</title>" + @lf unless caption.nil?
       if @book.config["deprecated-blocklines"].nil?
-        blocked_lines = split_paragraph(lines)
-        puts "#{blocked_lines.join}</#{type}>"
+        buf << "#{lines.join}</#{type}>" << @lf
       else
-        puts "#{lines.join("\n")}</#{type}>"
+        str = lines.map{|l| l.sub(/^<p>/,"").sub(/<\/p>$/,"")}.join("\n")
+        buf << "#{str}</#{type}>" << @lf
       end
+      buf
     end
 
     def note(lines, caption = nil)
@@ -997,8 +1016,9 @@ module ReVIEW
     end
 
     def syntaxblock(type, lines, caption)
+      buf = ""
       if caption.nil?
-        puts %Q[<#{type}>]
+        buf << %Q[<#{type}>] << @lf
       else
         titleopentag = %Q[caption aid:pstyle="#{type}-title"]
         titleclosetag = "caption"
@@ -1006,22 +1026,24 @@ module ReVIEW
           titleopentag = %Q[floattitle type="insn"]
           titleclosetag = "floattitle"
         end
-        puts %Q[<#{type}><#{titleopentag}>#{compile_inline(caption)}</#{titleclosetag}>]
+        buf << %Q[<#{type}><#{titleopentag}>#{caption}</#{titleclosetag}>] << @lf
       end
       no = 1
       lines.each do |line|
+        line.chomp!
         unless @book.config["listinfo"].nil?
-          print %Q[<listinfo line="#{no}"]
-          print %Q[ begin="1"] if no == 1
-          print %Q[ end="#{no}"] if no == lines.size
-          print %Q[>]
+          buf << %Q[<listinfo line="#{no}"]
+          buf << %Q[ begin="1"] if no == 1
+          buf << %Q[ end="#{no}"] if no == lines.size
+          buf << %Q[>]
         end
-        print detab(line)
-        print "\n"
-        print "</listinfo>" unless @book.config["listinfo"].nil?
+        buf << detab(line)
+        buf << "\n"
+        buf << "</listinfo>" unless @book.config["listinfo"].nil?
         no += 1
       end
-      puts "</#{type}>"
+      buf << "</#{type}>" << @lf
+      buf
     end
 
     def insn(lines, caption = nil)
@@ -1033,22 +1055,24 @@ module ReVIEW
     end
 
     def indepimage(id, caption=nil, metric=nil)
+      buf = ""
       metrics = parse_metric("idgxml", metric)
-      puts "<img>"
+      buf << "<img>" << @lf
       begin
-        puts %Q[<Image href="file://#{@chapter.image(id).path.sub(/\A\.\//, "")}"#{metrics} />]
+        buf << %Q[<Image href="file://#{@chapter.image(id).path.sub(/\A\.\//, "")}"#{metrics} />] << @lf
       rescue
         warn %Q[no such image: #{id}]
       end
-      puts %Q[<caption>#{compile_inline(caption)}</caption>] if caption.present?
-      puts "</img>"
+      buf << %Q[<caption>#{caption}</caption>] + @lf if caption.present?
+      buf << "</img>" << @lf
+      buf
     end
 
     alias_method :numberlessimage, :indepimage
 
     def label(id)
       # FIXME
-      print "<label id='#{id}' />"
+      "<label id='#{id}' />"
     end
 
     def tsize(str)
@@ -1056,15 +1080,15 @@ module ReVIEW
     end
 
     def dtp(str)
-      print %Q(<?dtp #{str} ?>)
+      %Q(<?dtp #{str} ?>)
     end
 
     def hr
-      print "<hr />"
+      "<hr />"
     end
 
     def bpo(lines)
-      puts %Q[<bpo>#{lines.join("\n")}</bpo>]
+      %Q[<bpo>#{lines.join("\n")}</bpo>] + @lf
     end
 
     def inline_dtp(str)
@@ -1080,12 +1104,14 @@ module ReVIEW
     end
 
     def rawblock(lines)
+      buf = ""
       no = 1
       lines.each do |l|
-        print l.gsub("&lt;", "<").gsub("&gt;", ">").gsub("&quot;", "\"").gsub("&amp;", "&")
-        print "\n" unless lines.length == no
-        no += 1
+        buf << l.gsub("&lt;", "<").gsub("&gt;", ">").gsub("&quot;", "\"").gsub("&amp;", "&")
+        buf << "\n" unless lines.length == no
+        no = no + 1
       end
+      buf
     end
 
     def text(str)
@@ -1095,7 +1121,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
@@ -1138,31 +1165,39 @@ module ReVIEW
     end
 
     def source_header(caption)
-      puts %Q[<source>]
-      puts %Q[<caption>#{compile_inline(caption)}</caption>]
+      buf = ""
+      buf << %Q[<source>] << @lf
+      buf << %Q[<caption>#{caption}</caption>] << @lf
+      buf
     end
 
-    def source_body(lines, lang)
-      puts %Q[<pre>]
-      codelines_body(lines)
-      puts %Q[</pre></source>]
+    def source_body(lines)
+      buf = ""
+      buf << %Q[<pre>] << @lf
+      buf << codelines_body(lines)
+      buf << %Q[</pre></source>] << @lf
+      buf
     end
 
     def bibpaper(lines, id, caption)
-      bibpaper_header id, caption
+      buf = ""
+      buf << bibpaper_header(id, caption)
       unless lines.empty?
-        bibpaper_bibpaper id, caption, lines
+        buf << bibpaper_bibpaper(id, caption, lines)
       end
-      puts %Q(</bibitem>)
+      buf << %Q(</bibitem>) << @lf
+      buf
     end
 
     def bibpaper_header(id, caption)
-      puts %Q(<bibitem id="bib-#{id}">)
-      puts "<caption><span type='bibno'>[#{@chapter.bibpaper(id).number}] </span>#{compile_inline(caption)}</caption>"
+      buf = ""
+      buf << %Q(<bibitem id="bib-#{id}">) << @lf
+      buf << "<caption><span type='bibno'>[#{@chapter.bibpaper(id).number}] </span>#{caption}</caption>" << @lf
+      buf
     end
 
     def bibpaper_bibpaper(id, caption, lines)
-        print split_paragraph(lines).join("")
+      lines.join("")
     end
 
     def inline_bib(id)
@@ -1173,10 +1208,10 @@ module ReVIEW
       if chap.number
         n = chap.headline_index.number(id)
         if @book.config["secnolevel"] >= n.split('.').size
-          return I18n.t("chapter_quote", "#{n}　#{compile_inline(chap.headline(id).caption)}")
+          return I18n.t("chapter_quote", "#{n}　#{chap.headline(id).caption}")
         end
       end
-      I18n.t("chapter_quote", compile_inline(chap.headline(id).caption))
+      I18n.t("chapter_quote", chap.headline(id).caption)
     end
 
     def inline_recipe(id)
@@ -1194,4 +1229,4 @@ module ReVIEW
 
   end
 
-end # module ReVIEW
+end   # module ReVIEW