review 1.7.2 → 2.0.0.beta1

data/lib/review/configure.rb

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 module ReVIEW
   class Configure < Hash
-
-    attr_accessor :maker
-
     def self.values
       Configure[
         # These parameters can be overridden by YAML file.
@@ -39,26 +36,17 @@ module ReVIEW
         "language" => 'ja', # XXX default language should be JA??
 
         "chapter_file" => 'CHAPS',
-        "part_file" => 'PART',
-        "reject_file" => 'REJECT',
-        "predef_file" => 'PREDEF',
+        "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",
+        "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
-
-    def [](key)
-      if self.key?(key)
-        return self.fetch(key)
-      end
-      if @maker && self.key?(@maker)
-        return self.fetch(@maker).fetch(key, nil)
-      end
-    end
   end
 end

data/lib/review/epubbuilder.rb

@@ -15,4 +15,4 @@ module ReVIEW
   class EPUBBuilder < HTMLBuilder
   end
 
-end # module ReVIEW
+end   # module ReVIEW

data/lib/review/epubmaker.rb

@@ -11,7 +11,6 @@ require 'review'
 require 'rexml/document'
 require 'rexml/streamlistener'
 require 'epubmaker'
-require 'review/htmltoc'
 
 module ReVIEW
  class EPUBMaker
@@ -20,7 +19,7 @@ module ReVIEW
 
   def initialize
     @producer = nil
-    @htmltoc = nil
+    @tochtmltxt = "toc-html.txt"
     @buildlogtxt = "build-log.txt"
   end
 
@@ -52,7 +51,6 @@ module ReVIEW
 
       call_hook("hook_beforeprocess", basetmpdir)
 
-      @htmltoc = ReVIEW::HTMLToc.new(basetmpdir)
       ## copy all files into basetmpdir
       copy_stylesheet(basetmpdir)
 
@@ -202,7 +200,7 @@ module ReVIEW
           build_part(part, basetmpdir, htmlfile)
           title = ReVIEW::I18n.t("part", part.number)
           title += ReVIEW::I18n.t("chapter_postfix") + part.name.strip if part.name.strip.present?
-          @htmltoc.add_item(0, htmlfile, title, {:chaptype => "part"})
+          write_tochtmltxt(basetmpdir, "0\t#{htmlfile}\t#{title}\tchaptype=part")
           write_buildlogtxt(basetmpdir, htmlfile, "")
         end
       end
@@ -217,23 +215,21 @@ module ReVIEW
   def build_part(part, basetmpdir, htmlfile)
     log("Create #{htmlfile} from a template.")
     File.open("#{basetmpdir}/#{htmlfile}", "w") do |f|
-      @body = ""
-      @body << "<div class=\"part\">\n"
-      @body << "<h1 class=\"part-number\">#{ReVIEW::I18n.t("part", part.number)}</h1>\n"
+      f.puts header(CGI.escapeHTML(@params["booktitle"]))
+      f.puts <<EOT
+<div class="part">
+<h1 class="part-number">#{ReVIEW::I18n.t("part", part.number)}</h1>
+EOT
       if part.name.strip.present?
-        @body << "<h2 class=\"part-title\">#{part.name.strip}</h2>\n"
+        f.puts <<EOT
+<h2 class="part-title">#{part.name.strip}</h2>
+EOT
       end
-      @body << "</div>\n"
 
-      @language = @producer.params['language']
-      @stylesheets = @producer.params["stylesheet"]
-      if @producer.params["htmlversion"].to_i == 5
-        tmplfile = File.expand_path('./html/layout-html5.html.erb', ReVIEW::Template::TEMPLATE_DIR)
-      else
-        tmplfile = File.expand_path('./html/layout-xhtml1.html.erb', ReVIEW::Template::TEMPLATE_DIR)
-      end
-      tmpl = ReVIEW::Template.load(tmplfile)
-      f.write tmpl.result(binding)
+      f.puts <<EOT
+</div>
+EOT
+      f.puts footer
     end
   end
 
@@ -324,27 +320,51 @@ module ReVIEW
     headlines.each do |headline|
       headline["level"] = 0 if ispart.present? && headline["level"] == 1
       if first.nil?
-        @htmltoc.add_item(headline["level"], filename+"#"+headline["id"], headline["title"], {:chaptype => chaptype})
+        write_tochtmltxt(basetmpdir, "#{headline["level"]}\t#{filename}##{headline["id"]}\t#{headline["title"]}\tchaptype=#{chaptype}")
       else
-        @htmltoc.add_item(headline["level"], filename, headline["title"], {:force_include => true, :chaptype => chaptype+prop_str})
+        write_tochtmltxt(basetmpdir, "#{headline["level"]}\t#{filename}\t#{headline["title"]}\tforce_include=true,chaptype=#{chaptype}#{prop_str}")
         first = nil
       end
     end
   end
 
   def push_contents(basetmpdir)
-    @htmltoc.each_item do |level, file, title, args|
-      next if level.to_i > @params["toclevel"] && args[:force_include].nil?
-      log("Push #{file} to ePUB contents.")
+    File.open("#{basetmpdir}/#{@tochtmltxt}") do |f|
+      f.each_line do |l|
+        force_include = nil
+        customid = nil
+        chaptype = nil
+        properties = nil
+        level, file, title, custom = l.chomp.split("\t")
+        if custom.present?
+          # custom setting
+          vars = custom.split(/,\s*/)
+          vars.each do |var|
+            k, v = var.split("=")
+            case k
+            when "id"
+              customid = v
+            when "force_include"
+              force_include = true
+            when "chaptype"
+              chaptype = v
+            when "properties"
+              properties = v
+            end
+          end
+        end
+        next if level.to_i > @params["toclevel"] && force_include.nil?
+        log("Push #{file} to ePUB contents.")
 
-      hash = {"file" => file, "level" => level.to_i, "title" => title, "chaptype" => args[:chaptype]}
-      if args[:id].present?
-        hash["id"] = args[:id]
-      end
-      if args[:properties].present?
-        hash["properties"] = args[:properties].split(" ")
+        hash = {"file" => file, "level" => level.to_i, "title" => title, "chaptype" => chaptype}
+        if customid.present?
+          hash["id"] = customid
+        end
+        if properties.present?
+          hash["properties"] = properties.split(" ")
+        end
+        @producer.contents.push(Content.new(hash))
       end
-      @producer.contents.push(Content.new(hash))
     end
   end
 
@@ -366,54 +386,55 @@ module ReVIEW
       else
         FileUtils.cp(@params["titlefile"], "#{basetmpdir}/titlepage.#{@params["htmlext"]}")
       end
-      @htmltoc.add_item(1, "titlepage.#{@params['htmlext']}", @producer.res.v("titlepagetitle"), {:chaptype => "pre"})
+      write_tochtmltxt(basetmpdir, "1\ttitlepage.#{@params["htmlext"]}\t#{@producer.res.v("titlepagetitle")}\tchaptype=pre")
     end
 
     if @params["originaltitlefile"].present? && File.exist?(@params["originaltitlefile"])
       FileUtils.cp(@params["originaltitlefile"], "#{basetmpdir}/#{File.basename(@params["originaltitlefile"])}")
-      @htmltoc.add_item(1, File.basename(@params["originaltitlefile"]), @producer.res.v("originaltitle"), {:chaptype => "pre"})
+      write_tochtmltxt(basetmpdir, "1\t#{File.basename(@params["originaltitlefile"])}\t#{@producer.res.v("originaltitle")}\tchaptype=pre")
     end
 
     if @params["creditfile"].present? && File.exist?(@params["creditfile"])
       FileUtils.cp(@params["creditfile"], "#{basetmpdir}/#{File.basename(@params["creditfile"])}")
-      @htmltoc.add_item(1, File.basename(@params["creditfile"]), @producer.res.v("credittitle"), {:chaptype => "pre"})
+      write_tochtmltxt(basetmpdir, "1\t#{File.basename(@params["creditfile"])}\t#{@producer.res.v("credittitle")}\tchaptype=pre")
     end
   end
 
   def build_titlepage(basetmpdir, htmlfile)
     File.open("#{basetmpdir}/#{htmlfile}", "w") do |f|
-      @body = ""
-      @body << "<div class=\"titlepage\">"
-      @body << "<h1 class=\"tp-title\">#{CGI.escapeHTML(@params["booktitle"])}</h1>"
+      f.puts header(CGI.escapeHTML(@params["booktitle"]))
+      f.puts <<EOT
+<div class="titlepage">
+<h1 class="tp-title">#{CGI.escapeHTML(@params["booktitle"])}</h1>
+EOT
+
       if @params["aut"]
-        @body << "<h2 class=\"tp-author\">#{@params["aut"].join(", ")}</h2>"
+        f.puts <<EOT
+<h2 class="tp-author">#{@params["aut"].join(", ")}</h2>
+EOT
       end
       if @params["prt"]
-        @body << "<h3 class=\"tp-publisher\">#{@params["prt"].join(", ")}</h3>"
+        f.puts <<EOT
+<h3 class="tp-publisher">#{@params["prt"].join(", ")}</h3>
+EOT
       end
-      @body << "</div>"
 
-      @language = @producer.params['language']
-      @stylesheets = @producer.params["stylesheet"]
-      if @producer.params["htmlversion"].to_i == 5
-        tmplfile = File.expand_path('./html/layout-html5.html.erb', ReVIEW::Template::TEMPLATE_DIR)
-      else
-        tmplfile = File.expand_path('./html/layout-xhtml1.html.erb', ReVIEW::Template::TEMPLATE_DIR)
-      end
-      tmpl = ReVIEW::Template.load(tmplfile)
-      f.write tmpl.result(binding)
+      f.puts <<EOT
+</div>
+EOT
+      f.puts footer
     end
   end
 
   def copy_backmatter(basetmpdir)
     if @params["profile"]
       FileUtils.cp(@params["profile"], "#{basetmpdir}/#{File.basename(@params["profile"])}")
-      @htmltoc.add_item(1, File.basename(@params["profile"]), @producer.res.v("profiletitle"), {:chaptype => "post"})
+      write_tochtmltxt(basetmpdir, "1\t#{File.basename(@params["profile"])}\t#{@producer.res.v("profiletitle")}\tchaptype=post")
     end
 
     if @params["advfile"]
       FileUtils.cp(@params["advfile"], "#{basetmpdir}/#{File.basename(@params["advfile"])}")
-      @htmltoc.add_item(1, File.basename(@params["advfile"]), @producer.res.v("advtitle"), {:chaptype => "post"})
+      write_tochtmltxt(basetmpdir, "1\t#{File.basename(@params["advfile"])}\t#{@producer.res.v("advtitle")}\tchaptype=post")
     end
 
     if @params["colophon"]
@@ -422,12 +443,18 @@ module ReVIEW
       else
         File.open("#{basetmpdir}/colophon.#{@params["htmlext"]}", "w") {|f| @producer.colophon(f) }
       end
-      @htmltoc.add_item(1, "colophon.#{@params["htmlext"]}", @producer.res.v("colophontitle"), {:chaptype => "post"})
+      write_tochtmltxt(basetmpdir, "1\tcolophon.#{@params["htmlext"]}\t#{@producer.res.v("colophontitle")}\tchaptype=post")
     end
 
     if @params["backcover"]
       FileUtils.cp(@params["backcover"], "#{basetmpdir}/#{File.basename(@params["backcover"])}")
-      @htmltoc.add_item(1, File.basename(@params["backcover"]), @producer.res.v("backcovertitle"), {:chaptype => "post"})
+      write_tochtmltxt(basetmpdir, "1\t#{File.basename(@params["backcover"])}\t#{@producer.res.v("backcovertitle")}\tchaptype=post")
+    end
+  end
+
+  def write_tochtmltxt(basetmpdir, s)
+    File.open("#{basetmpdir}/#{@tochtmltxt}", "a") do |f|
+      f.puts s
     end
   end
 
@@ -437,6 +464,49 @@ module ReVIEW
     end
   end
 
+  def header(title)
+    # titleはすでにエスケープ済みと想定
+    s = <<EOT
+<?xml version="1.0" encoding="UTF-8"?>
+EOT
+    if @params["htmlversion"] == 5
+      s << <<EOT
+<!DOCTYPE html>
+<html xml:lang='ja' xmlns:ops='http://www.idpf.org/2007/ops' xmlns='http://www.w3.org/1999/xhtml'>
+<head>
+  <meta charset="UTF-8" />
+EOT
+    else
+      s << <<EOT
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xml:lang='ja' xmlns:ops='http://www.idpf.org/2007/ops' xmlns='http://www.w3.org/1999/xhtml'>
+<head>
+  <meta http-equiv='Content-Type' content='text/html;charset=UTF-8' />
+  <meta http-equiv='Content-Style-Type' content='text/css' />
+EOT
+    end
+    if @params["stylesheet"].size > 0
+      @params["stylesheet"].each do |sfile|
+        s << <<EOT
+  <link rel='stylesheet' type='text/css' href='#{sfile}' />
+EOT
+      end
+    end
+    s << <<EOT
+  <meta content='Re:VIEW' name='generator'/>
+  <title>#{title}</title>
+</head>
+<body>
+EOT
+  end
+
+  def footer
+    <<EOT
+</body>
+</html>
+EOT
+  end
+
   class ReVIEWHeaderListener
     include REXML::StreamListener
     def initialize(headlines)

data/lib/review/ewbbuilder.rb

@@ -62,7 +62,7 @@ module ReVIEW
       lines.each do |line|
         if noescape
           puts detab(line)
-        elsif /\AC:.*?>(.+)/ =~ line # DOS prompt hack
+        elsif /\AC:.*?>(.+)/ =~ line   # DOS prompt hack
           prompt, cmd = *line.split('>', 2)
           puts "#{escape(prompt)}>//command{#{escape(cmd)}}//}"
         else
@@ -198,7 +198,7 @@ module ReVIEW
       # FIXME
     end
 
-    Z_SPACE = "\241\241" # zen-kaku space in EUC-JP
+    Z_SPACE = "\241\241"   # zen-kaku space in EUC-JP
 
     def paragraph(lines)
       if @noindent
@@ -263,10 +263,10 @@ module ReVIEW
       if abbr
         add_index(word) + "//g{#{word}//}" +
         add_index(abbr) + "（#{abbr}, " +
-        add_index(eng) + "#{eng}）"
+        add_index(eng)  + "#{eng}）"
       elsif eng
         add_index(word) + "//g{#{word}//}" +
-        add_index(eng) + "（#{eng}）"
+        add_index(eng)  + "（#{eng}）"
       else
         add_index(word) + "//g{#{word}//}"
       end

data/lib/review/exception.rb

@@ -17,5 +17,5 @@ module ReVIEW
   class CompileError < ApplicationError; end
   class SyntaxError < CompileError; end
   class FileNotFound < ApplicationError; end
-  class KeyError < CompileError; end
+  class KeyError <  CompileError; end
 end

data/lib/review/extentions.rb

@@ -1,3 +1,4 @@
 require 'review/extentions/object'
 require 'review/extentions/string'
+require 'review/extentions/array'
 

data/lib/review/extentions/array.rb

@@ -0,0 +1,25 @@
+class Array
+
+  # for ReVIEW::Node
+  #
+  def to_doc
+    self.map(&:to_doc).join("")
+  end
+
+  # for ReVIEW::Node
+  #
+  def to_raw
+    self.map(&:to_raw).join("")
+  end
+
+  if [].map.kind_of?(Array)
+    # Ruby 1.8
+    def map(&block)
+      if !block_given?
+        return to_enum :map
+      else
+        collect(&block)  ## XXX same as original
+      end
+    end
+  end
+end

data/lib/review/htmlbuilder.rb

@@ -34,13 +34,6 @@ module ReVIEW
     Compiler.defblock(:point, 0..1)
     Compiler.defblock(:shoot, 0..1)
 
-    def pre_paragraph
-      '<p>'
-    end
-    def post_paragraph
-      '</p>'
-    end
-
     def extname
       ".#{@book.config["htmlext"]}"
     end
@@ -70,14 +63,12 @@ module ReVIEW
         if ENV["REVIEW_SAFE_MODE"].to_i & 4 > 0
           warn "user's layout is prohibited in safe mode. ignored."
         else
-          title = strip_html(compile_inline(@chapter.title))
-          language = @book.config['language']
-          stylesheets = @book.config["stylesheet"]
+          title = convert_outencoding(strip_html(@chapter.title), @book.config["outencoding"])
 
           toc = ""
           toc_level = 0
           @chapter.headline_index.items.each do |i|
-            caption = "<li>#{strip_html(compile_inline(i.caption))}</li>\n"
+            caption = "<li>#{strip_html(i.caption)}</li>\n"
             if toc_level == i.number.size
               # do nothing
             elsif toc_level < i.number.size
@@ -96,8 +87,6 @@ module ReVIEW
             HTMLLayout.new(
             {'body' => @output.string, 'title' => title, 'toc' => toc,
              'builder' => self,
-             'language' => language,
-             'stylesheets' => stylesheets,
              'next' => @chapter.next_chapter,
              'prev' => @chapter.prev_chapter},
             layout_file).result
@@ -105,21 +94,44 @@ module ReVIEW
       end
 
       # default XHTML header/footer
-      @error_messages = error_messages
-      @warning_messages = warning_messages
-      @title = strip_html(compile_inline(@chapter.title))
-      @body = @output.string
-      @language = @book.config['language']
-      @stylesheets = @book.config["stylesheet"]
-
-      if @book.htmlversion == 5
-        htmlfilename = "layout-html5.html.erb"
+      header = <<EOT
+<?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"}" />
+EOT
       else
-        htmlfilename = "layout-xhtml1.html.erb"
+        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-Style-Type" content="text/css" />
+EOT
+      end
+
+      unless @book.config["stylesheet"].nil?
+        @book.config["stylesheet"].each do |style|
+          header += <<EOT
+  <link rel="stylesheet" type="text/css" href="#{style}" />
+EOT
+        end
       end
-      tmplfile = File.expand_path('./html/'+htmlfilename, ReVIEW::Template::TEMPLATE_DIR)
-      tmpl = ReVIEW::Template.load(tmplfile)
-      tmpl.result(binding)
+      header += <<EOT
+  <meta name="generator" content="Re:VIEW" />
+  <title>#{convert_outencoding(strip_html(@chapter.title), @book.config["outencoding"])}</title>
+</head>
+<body>
+EOT
+      footer = <<EOT
+</body>
+</html>
+EOT
+      header + messages() + convert_outencoding(@output.string, @book.config["outencoding"]) + footer
     end
 
     def xmlns_ops_prefix
@@ -158,7 +170,7 @@ module ReVIEW
       "<ul>\n" +
         @errors.map {|file, line, msg|
         "<li>#{escape_html(file)}:#{line}: #{escape_html(msg.to_s)}</li>\n"
-        }.join('') +
+      }.join('') +
       "</ul>\n"
     end
 
@@ -173,88 +185,94 @@ module ReVIEW
     end
 
     def headline(level, label, caption)
+      buf = ""
       prefix, anchor = headline_prefix(level)
       unless prefix.nil?
         prefix = %Q[<span class="secno">#{prefix}</span>]
       end
-      puts '' if level > 1
       a_id = ""
       unless anchor.nil?
         a_id = %Q[<a id="h#{anchor}"></a>]
       end
       if caption.empty?
-        puts a_id unless label.nil?
+        buf << a_id+"\n" unless label.nil?
       else
         if label.nil?
-          puts %Q[<h#{level}>#{a_id}#{prefix}#{compile_inline(caption)}</h#{level}>]
+          buf << %Q[<h#{level}>#{a_id}#{prefix}#{caption}</h#{level}>\n]
         else
-          puts %Q[<h#{level} id="#{normalize_id(label)}">#{a_id}#{prefix}#{compile_inline(caption)}</h#{level}>]
+          buf << %Q[<h#{level} id="#{normalize_id(label)}">#{a_id}#{prefix}#{caption}</h#{level}>\n]
         end
       end
+      buf
     end
 
     def nonum_begin(level, label, caption)
-      puts '' if level > 1
+      buf = ""
+      buf << "\n" if level > 1
       unless caption.empty?
         if label.nil?
-          puts %Q[<h#{level}>#{compile_inline(caption)}</h#{level}>]
+          buf << %Q[<h#{level}>#{caption}</h#{level}>\n]
         else
-          puts %Q[<h#{level} id="#{normalize_id(label)}">#{compile_inline(caption)}</h#{level}>]
+          buf << %Q[<h#{level} id="#{normalize_id(label)}">#{caption}</h#{level}>\n]
         end
       end
+      buf
     end
 
     def nonum_end(level)
     end
 
     def column_begin(level, label, caption)
-      puts %Q[<div class="column">]
+      buf = %Q[<div class="column">\n]
 
       @column += 1
-      puts '' if level > 1
+      buf << "\n" if level > 1
       a_id = %Q[<a id="column-#{@column}"></a>]
 
       if caption.empty?
-        puts a_id unless label.nil?
+        buf << a_id + "\n" unless label.nil?
       else
         if label.nil?
-          puts %Q[<h#{level}>#{a_id}#{compile_inline(caption)}</h#{level}>]
+          buf << %Q[<h#{level}>#{a_id}#{caption}</h#{level}>\n]
         else
-          puts %Q[<h#{level} id="#{normalize_id(label)}">#{a_id}#{compile_inline(caption)}</h#{level}>]
+          buf << %Q[<h#{level} id="#{normalize_id(label)}">#{a_id}#{caption}</h#{level}>\n]
         end
       end
-#      headline(level, label, caption)
+      buf
     end
 
     def column_end(level)
-      puts '</div>'
+      "</div>\n"
     end
 
     def xcolumn_begin(level, label, caption)
-      puts %Q[<div class="xcolumn">]
-      headline(level, label, caption)
+      buf << %Q[<div class="xcolumn">\n]
+      buf << headline(level, label, caption)
+      buf
     end
 
     def xcolumn_end(level)
-      puts '</div>'
+      "</div>\n"
     end
 
     def ref_begin(level, label, caption)
-      print %Q[<div class="reference">]
-      headline(level, label, caption)
+      buf << %Q[<div class="reference">\n]
+      buf << headline(level, label, caption)
+      buf
     end
 
     def ref_end(level)
-      puts '</div>'
+      "</div>\n"
     end
 
     def sup_begin(level, label, caption)
-      print %Q[<div class="supplement">]
-      headline(level, label, caption)
+      buf << %Q[<div class="supplement">\n]
+      buf << headline(level, label, caption)
+      buf
     end
 
     def sup_end(level)
-      puts '</div>'
+      "</div>\n"
     end
 
     def tsize(str)
@@ -262,17 +280,17 @@ module ReVIEW
     end
 
     def captionblock(type, lines, caption)
-      puts %Q[<div class="#{type}">]
+      buf = %Q[<div class="#{type}">\n]
       unless caption.nil?
-        puts %Q[<p class="caption">#{compile_inline(caption)}</p>]
+        buf << %Q[<p class="caption">#{caption}</p>\n]
       end
       if @book.config["deprecated-blocklines"].nil?
-        blocked_lines = split_paragraph(lines)
-        puts blocked_lines.join("\n")
+        buf << lines.join("")
       else
-        lines.each {|l| puts "<p>#{l}</p>" }
+        error "deprecated-blocklines is obsoleted."
       end
-      puts '</div>'
+      buf << "</div>\n"
+      buf
     end
 
     def memo(lines, caption = nil)
@@ -320,12 +338,14 @@ module ReVIEW
     end
 
     def box(lines, caption = nil)
-      puts %Q[<div class="syntax">]
-      puts %Q[<p class="caption">#{compile_inline(caption)}</p>] unless caption.nil?
-      print %Q[<pre class="syntax">]
-      lines.each {|line| puts detab(line) }
-      puts '</pre>'
-      puts '</div>'
+      buf = ""
+      buf << %Q[<div class="syntax">\n]
+      buf << %Q[<p class="caption">#{caption}</p>\n] unless caption.nil?
+      buf << %Q[<pre class="syntax">]
+      lines.each {|line| buf << detab(line) << "\n" }
+      buf << "</pre>\n"
+      buf << "</div>\n"
+      buf
     end
 
     def note(lines, caption = nil)
@@ -333,268 +353,254 @@ module ReVIEW
     end
 
     def ul_begin
-      puts '<ul>'
+      "<ul>\n"
     end
 
     def ul_item(lines)
-      puts "<li>#{lines.join}</li>"
+      "<li>#{lines.map(&:to_s).join}</li>\n"
     end
 
     def ul_item_begin(lines)
-      print "<li>#{lines.join}"
+      "<li>#{lines.map(&:to_s).join}"
     end
 
     def ul_item_end
-      puts "</li>"
+      "</li>\n"
     end
 
     def ul_end
-      puts '</ul>'
+      "</ul>\n"
     end
 
     def ol_begin
       if @ol_num
-        puts "<ol start=\"#{@ol_num}\">" ## it's OK in HTML5, but not OK in XHTML1.1
+        num = @ol_num
         @ol_num = nil
+        "<ol start=\"#{num}\">\n"  ## it's OK in HTML5, but not OK in XHTML1.1
       else
-        puts '<ol>'
+        "<ol>\n"
       end
     end
 
     def ol_item(lines, num)
-      puts "<li>#{lines.join}</li>"
+      "<li>#{lines.map(&:to_s).join}</li>\n"
     end
 
     def ol_end
-      puts '</ol>'
+      "</ol>\n"
     end
 
     def dl_begin
-      puts '<dl>'
+      "<dl>\n"
     end
 
     def dt(line)
-      puts "<dt>#{line}</dt>"
+      "<dt>#{line}</dt>\n"
     end
 
     def dd(lines)
-      puts "<dd>#{lines.join}</dd>"
+      "<dd>#{lines.join}</dd>\n"
     end
 
     def dl_end
-      puts '</dl>'
+      "</dl>\n"
     end
 
     def paragraph(lines)
       if @noindent.nil?
-        puts "<p>#{lines.join}</p>"
+        "<p>#{lines.join}</p>\n"
       else
-        puts %Q[<p class="noindent">#{lines.join}</p>]
         @noindent = nil
+        %Q[<p class="noindent">#{lines.join}</p>\n]
       end
     end
 
-    def parasep
-      puts '<br />'
+    def parasep()
+      "<br />\n"
     end
 
     def read(lines)
       if @book.config["deprecated-blocklines"].nil?
-        blocked_lines = split_paragraph(lines)
-        puts %Q[<div class="lead">\n#{blocked_lines.join("\n")}\n</div>]
+        %Q[<div class="lead">\n#{lines.join("")}\n</div>\n]
       else
-        puts %Q[<p class="lead">\n#{lines.join("\n")}\n</p>]
+        error "deprecated-blocklines is obsoleted."
       end
     end
 
     alias_method :lead, :read
 
     def list(lines, id, caption, lang = nil)
-      puts %Q[<div class="caption-code">]
+      buf = %Q[<div class="caption-code">\n]
       begin
-        list_header id, caption, lang
+        buf << list_header(id, caption, lang)
       rescue KeyError
         error "no such list: #{id}"
       end
-      list_body id, lines, lang
-      puts '</div>'
+      buf << list_body(id, lines, lang)
+      buf << "</div>\n"
+      buf
     end
 
     def list_header(id, caption, lang)
       if get_chap.nil?
-        puts %Q[<p class="caption">#{I18n.t("list")}#{I18n.t("format_number_header_without_chapter", [@chapter.list(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}</p>]
+        %Q[<p class="caption">#{I18n.t("list")}#{I18n.t("format_number_header_without_chapter", [@chapter.list(id).number])}#{I18n.t("caption_prefix")}#{caption}</p>\n]
       else
-        puts %Q[<p class="caption">#{I18n.t("list")}#{I18n.t("format_number_header", [get_chap, @chapter.list(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}</p>]
+        %Q[<p class="caption">#{I18n.t("list")}#{I18n.t("format_number_header", [get_chap, @chapter.list(id).number])}#{I18n.t("caption_prefix")}#{caption}</p>\n]
       end
     end
 
     def list_body(id, lines, lang)
       id ||= ''
-      print %Q[<pre class="list">]
+      buf = %Q[<pre class="list">]
       body = lines.inject(''){|i, j| i + detab(j) + "\n"}
       lexer = lang || File.extname(id).gsub(/\./, '')
-      puts highlight(:body => body, :lexer => lexer, :format => 'html')
-      puts '</pre>'
+      buf << highlight(:body => body, :lexer => lexer, :format => 'html')
+      buf << "</pre>\n"
+      buf
     end
 
-    def source(lines, caption = nil, lang = nil)
-      puts %Q[<div class="source-code">]
-      source_header caption
-      source_body caption, lines, lang
-      puts '</div>'
+    def source(lines, caption = nil)
+      buf = %Q[<div class="source-code">\n]
+      buf << source_header(caption)
+      buf << source_body(caption, lines)
+      buf << "</div>\n"
+      buf
     end
 
     def source_header(caption)
       if caption.present?
-        puts %Q[<p class="caption">#{compile_inline(caption)}</p>]
+        %Q[<p class="caption">#{caption}</p>\n]
       end
     end
 
-    def source_body(id, lines, lang)
+    def source_body(id, lines)
       id ||= ''
-      print %Q[<pre class="source">]
+      buf = %Q[<pre class="source">]
       body = lines.inject(''){|i, j| i + detab(j) + "\n"}
-      lexer = lang || File.extname(id).gsub(/\./, '')
-      puts highlight(:body => body, :lexer => lexer, :format => 'html')
-      puts '</pre>'
+      lexer = File.extname(id).gsub(/\./, '')
+      buf << highlight(:body => body, :lexer => lexer, :format => 'html')
+      buf << "</pre>\n"
+      buf
     end
 
     def listnum(lines, id, caption, lang = nil)
-      puts %Q[<div class="code">]
+      buf = %Q[<div class="code">\n]
       begin
-        list_header id, caption, lang
+        buf << list_header(id, caption, lang)
       rescue KeyError
         error "no such list: #{id}"
       end
-      listnum_body lines, lang
-      puts '</div>'
+      buf << listnum_body(lines, lang)
+      buf << "</div>"
+      buf
     end
 
     def listnum_body(lines, lang)
-      if highlight?
-        body = lines.inject(''){|i, j| i + detab(j) + "\n"}
-        lexer = lang
-        puts highlight(:body => body, :lexer => lexer, :format => 'html',
-                       :options => {:linenos => 'inline', :nowrap => false})
-      else
-        print '<pre class="list">'
-        lines.each_with_index do |line, i|
-          puts detab((i+1).to_s.rjust(2) + ": " + line)
-        end
-        puts '</pre>'
-      end
+      buf = ""
+      body = lines.inject(''){|i, j| i + detab(j) + "\n"}
+      lexer = lang
+      buf << highlight(:body => body, :lexer => lexer, :format => 'html',
+                     :options => {:linenos => 'inline', :nowrap => false})
+      buf
     end
 
     def emlist(lines, caption = nil, lang = nil)
-      puts %Q[<div class="emlist-code">]
+      buf = %Q[<div class="emlist-code">\n]
       if caption.present?
-        puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
+        buf << %Q(<p class="caption">#{caption}</p>\n)
       end
-      print %Q[<pre class="emlist">]
+      buf << %Q[<pre class="emlist">]
       body = lines.inject(''){|i, j| i + detab(j) + "\n"}
       lexer = lang
-      puts highlight(:body => body, :lexer => lexer, :format => 'html')
-      puts '</pre>'
-      puts '</div>'
+      buf << highlight(:body => body, :lexer => lexer, :format => 'html')
+      buf << "</pre>\n"
+      buf << "</div>\n"
+      buf
     end
 
     def emlistnum(lines, caption = nil, lang = nil)
-      puts %Q[<div class="emlistnum-code">]
+      buf = %Q[<div class="emlistnum-code">\n]
       if caption.present?
-        puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
-      end
-
-      if highlight?
-        body = lines.inject(''){|i, j| i + detab(j) + "\n"}
-        lexer = lang
-        puts highlight(:body => body, :lexer => lexer, :format => 'html',
-                       :options => {:linenos => 'inline', :nowrap => false})
-      else
-        print '<pre class="emlist">'
-        lines.each_with_index do |line, i|
-          puts detab((i+1).to_s.rjust(2) + ": " + line)
-        end
-        puts '</pre>'
+        buf << %Q(<p class="caption">#{caption}</p>\n)
       end
-
-      puts '</div>'
+      body = lines.inject(''){|i, j| i + detab(j) + "\n"}
+      lexer = lang
+      buf << highlight(:body => body, :lexer => lexer, :format => 'html',
+                     :options => {:linenos => 'inline', :nowrap => false})
+      buf << "</div>\n"
+      buf
     end
 
     def cmd(lines, caption = nil)
-      puts %Q[<div class="cmd-code">]
+      buf = %Q[<div class="cmd-code">\n]
       if caption.present?
-        puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
+        buf << %Q(<p class="caption">#{caption}</p>\n)
       end
-      print %Q[<pre class="cmd">]
+      buf << %Q[<pre class="cmd">]
       body = lines.inject(''){|i, j| i + detab(j) + "\n"}
       lexer = 'shell-session'
-      puts highlight(:body => body, :lexer => lexer, :format => 'html')
-      puts '</pre>'
-      puts '</div>'
+      buf << highlight(:body => body, :lexer => lexer, :format => 'html')
+      buf << "</pre>\n"
+      buf << "</div>\n"
+      buf
     end
 
     def quotedlist(lines, css_class)
-      print %Q[<blockquote><pre class="#{css_class}">]
+      buf = %Q[<blockquote><pre class="#{css_class}">\n]
       lines.each do |line|
-        puts detab(line)
+        buf << detab(line) << "\n"
       end
-      puts '</pre></blockquote>'
+      buf << "</pre></blockquote>\n"
     end
     private :quotedlist
 
     def quote(lines)
       if @book.config["deprecated-blocklines"].nil?
-        blocked_lines = split_paragraph(lines)
-        puts "<blockquote>#{blocked_lines.join("\n")}</blockquote>"
+        "<blockquote>#{lines.join("")}</blockquote>\n"
       else
-        puts "<blockquote><pre>#{lines.join("\n")}</pre></blockquote>"
+        error "deprecated-blocklines is obsoleted."
       end
     end
 
     def doorquote(lines, ref)
+      buf = ""
       if @book.config["deprecated-blocklines"].nil?
-        blocked_lines = split_paragraph(lines)
-        puts %Q[<blockquote style="text-align:right;">]
-        puts "#{blocked_lines.join("\n")}"
-        puts %Q[<p>#{ref}より</p>]
-        puts %Q[</blockquote>]
+        buf << %Q[<blockquote style="text-align:right;">\n]
+        buf << "#{lines.join("")}\n"
+        buf << %Q[<p>#{ref}より</p>\n]
+        buf << %Q[</blockquote>\n]
       else
-        puts <<-QUOTE
-<blockquote style="text-align:right;">
-  <pre>#{lines.join("\n")}
-
-#{ref}より</pre>
-</blockquote>
-QUOTE
+        error "deprecated-blocklines is obsoleted."
       end
+      buf
     end
 
     def talk(lines)
-      puts %Q[<div class="talk">]
+      buf = ""
+      buf << %Q[<div class="talk">\n]
       if @book.config["deprecated-blocklines"].nil?
-        blocked_lines = split_paragraph(lines)
-        puts "#{blocked_lines.join("\n")}"
+        buf << "#{lines.join("\n")}\n"
       else
-        print '<pre>'
-        puts "#{lines.join("\n")}"
-        puts '</pre>'
+        error "deprecated-blocklines is obsoleted."
       end
-      puts '</div>'
+      buf << "</div>\n"
+      buf
     end
 
     def texequation(lines)
-      puts %Q[<div class="equation">]
+      buf << %Q[<div class="equation">\n]
       if @book.config["mathml"]
         require 'math_ml'
         require 'math_ml/symbol/character_reference'
         p = MathML::LaTeX::Parser.new(:symbol=>MathML::Symbol::CharacterReference)
-        puts p.parse(unescape_html(lines.join("\n")), true)
+        buf << p.parse(unescape_html(lines.join("\n")), true) << "\n
       else
-        print '<pre>'
-        puts "#{lines.join("\n")}"
-        puts '</pre>'
+        buf << '<pre>'
+        buf << "#{lines.join("\n")}\n"
+        buf << "</pre>\n"
       end
-      puts '</div>'
+      buf << "</div>\n"
+      buf
     end
 
     def handle_metric(str)
@@ -602,7 +608,7 @@ QUOTE
         return "width=\"#{($1.to_f * 100).round}%\""
       else
         k, v = str.split('=', 2)
-        return %Q|#{k}=\"#{v.sub(/\A["']/, '').sub(/["']\Z/, '')}\"|
+        return %Q|#{k}=\"#{v.sub(/\A&quot;/, '').sub(/\A["']/, '').sub(/&quot;\Z/, '').sub(/["']\Z/, '')}\"|
       end
     end
 
@@ -612,32 +618,35 @@ QUOTE
 
     def image_image(id, caption, metric)
       metrics = parse_metric("html", metric)
-      puts %Q[<div id="#{normalize_id(id)}" class="image">]
-      puts %Q[<img src="#{@chapter.image(id).path.sub(/\A\.\//, "")}" alt="#{escape_html(compile_inline(caption))}"#{metrics} />]
-      image_header id, caption
-      puts %Q[</div>]
+      buf = %Q[<div id="#{normalize_id(id)}" class="image">\n]
+      buf << %Q[<img src="#{@chapter.image(id).path.sub(/\A\.\//, "")}" alt="#{escape_html(caption)}"#{metrics} />\n]
+      buf << image_header(id, caption)
+      buf << %Q[</div>\n]
+      buf
     end
 
     def image_dummy(id, caption, lines)
-      puts %Q[<div class="image">]
-      puts %Q[<pre class="dummyimage">]
+      buf = %Q[<div class="image">\n]
+      buf << %Q[<pre class="dummyimage">\n]
       lines.each do |line|
-        puts detab(line)
+        buf << detab(line) << "\n"
       end
-      puts %Q[</pre>]
-      image_header id, caption
-      puts %Q[</div>]
+      buf << %Q[</pre>\n]
+      buf << image_header(id, caption)
+      buf << %Q[</div>\n]
       warn "no such image: #{id}"
+      buf
     end
 
     def image_header(id, caption)
-      puts %Q[<p class="caption">]
+      buf = %Q[<p class="caption">\n]
       if get_chap.nil?
-        puts %Q[#{I18n.t("image")}#{I18n.t("format_number_header_without_chapter", [@chapter.image(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}]
+        buf << %Q[#{I18n.t("image")}#{I18n.t("format_number_header_without_chapter", [@chapter.image(id).number])}#{I18n.t("caption_prefix")}#{caption}\n]
       else
-        puts %Q[#{I18n.t("image")}#{I18n.t("format_number_header", [get_chap, @chapter.image(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}]
+        buf << %Q[#{I18n.t("image")}#{I18n.t("format_number_header", [get_chap, @chapter.image(id).number])}#{I18n.t("caption_prefix")}#{caption}\n]
       end
-      puts %Q[</p>]
+      buf << %Q[</p>\n]
+      buf
     end
 
     def table(lines, id = nil, caption = nil)
@@ -655,48 +664,49 @@ QUOTE
       rows = adjust_n_cols(rows)
 
       if id
-        puts %Q[<div id="#{normalize_id(id)}" class="table">]
+        buf = %Q[<div id="#{normalize_id(id)}" class="table">\n]
       else
-        puts %Q[<div class="table">]
+        buf = %Q[<div class="table">\n]
       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
-      table_begin rows.first.size
+      buf << table_begin(rows.first.size)
       return if rows.empty?
       if sepidx
         sepidx.times do
-          tr rows.shift.map {|s| th(s) }
+          buf << tr(rows.shift.map {|s| th(s) })
         end
         rows.each do |cols|
-          tr cols.map {|s| td(s) }
+          buf << tr(cols.map {|s| td(s) })
         end
       else
         rows.each do |cols|
           h, *cs = *cols
-          tr [th(h)] + cs.map {|s| td(s) }
+          buf << tr([th(h)] + cs.map {|s| td(s) })
         end
       end
-      table_end
-      puts %Q[</div>]
+      buf << table_end
+      buf << %Q[</div>\n]
+      buf
     end
 
     def table_header(id, caption)
       if get_chap.nil?
-        puts %Q[<p class="caption">#{I18n.t("table")}#{I18n.t("format_number_header_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}</p>]
+        %Q[<p class="caption">#{I18n.t("table")}#{I18n.t("format_number_header_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix")}#{caption}</p>\n]
       else
-        puts %Q[<p class="caption">#{I18n.t("table")}#{I18n.t("format_number_header", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}</p>]
+        %Q[<p class="caption">#{I18n.t("table")}#{I18n.t("format_number_header", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix")}#{caption}</p>\n]
       end
     end
 
     def table_begin(ncols)
-      puts '<table>'
+      "<table>\n"
     end
 
     def tr(rows)
-      puts "<tr>#{rows.join}</tr>"
+      "<tr>#{rows.join}</tr>\n"
     end
 
     def th(str)
@@ -708,71 +718,73 @@ QUOTE
     end
 
     def table_end
-      puts '</table>'
+      "</table>\n"
     end
 
     def comment(lines, comment = nil)
       lines ||= []
       lines.unshift comment unless comment.blank?
       if @book.config["draft"]
-        str = lines.join("<br />")
-        puts %Q(<div class="draft-comment">#{str}</div>)
+        str = lines.map{|line| escape_html(line) }.join("<br />")
+        return %Q(<div class="draft-comment">#{str}</div>\n)
       else
         str = lines.join("\n")
-        puts %Q(<!-- #{escape_comment(str)} -->)
+        return %Q(<!-- #{escape_comment(str)} -->\n)
       end
     end
 
     def footnote(id, str)
       if @book.config["epubversion"].to_i == 3
-        puts %Q(<div class="footnote" epub:type="footnote" id="fn-#{normalize_id(id)}"><p class="footnote">[*#{@chapter.footnote(id).number}] #{compile_inline(str)}</p></div>)
+        %Q(<div class="footnote" epub:type="footnote" id="fn-#{normalize_id(id)}"><p class="footnote">[*#{@chapter.footnote(id).number}] #{str}</p></div>\n)
       else
-        puts %Q(<div class="footnote" id="fn-#{normalize_id(id)}"><p class="footnote">[<a href="#fnb-#{normalize_id(id)}">*#{@chapter.footnote(id).number}</a>] #{compile_inline(str)}</p></div>)
+        %Q(<div class="footnote" id="fn-#{normalize_id(id)}"><p class="footnote">[<a href="#fnb-#{normalize_id(id)}">*#{@chapter.footnote(id).number}</a>] #{str}</p></div>\n)
       end
     end
 
     def indepimage(id, caption="", metric=nil)
       metrics = parse_metric("html", metric)
       caption = "" if caption.nil?
-      puts %Q[<div class="image">]
+      buf = %Q[<div class="image">\n]
       begin
-        puts %Q[<img src="#{@chapter.image(id).path.sub(/\A\.\//, "")}" alt="#{escape_html(compile_inline(caption))}"#{metrics} />]
+        buf << %Q[<img src="#{@chapter.image(id).path.sub(/\A\.\//, "")}" alt="#{escape_html(caption)}"#{metrics} />\n]
       rescue
-        puts %Q[<pre>missing image: #{id}</pre>]
+        buf << %Q[<pre>missing image: #{id}</pre>\n]
       end
 
       unless caption.empty?
-        puts %Q[<p class="caption">]
-        puts %Q[#{I18n.t("numberless_image")}#{I18n.t("caption_prefix")}#{compile_inline(caption)}]
-        puts %Q[</p>]
+        buf << %Q[<p class="caption">\n]
+        buf << %Q[#{I18n.t("numberless_image")}#{I18n.t("caption_prefix")}#{caption}\n]
+        buf << %Q[</p>\n]
       end
-      puts %Q[</div>]
+      buf << %Q[</div>\n]
+      buf
     end
 
     alias_method :numberlessimage, :indepimage
 
     def hr
-      puts "<hr />"
+      "<hr />\n"
     end
 
     def label(id)
-      puts %Q(<a id="#{normalize_id(id)}"></a>)
+      %Q(<a id="#{normalize_id(id)}"></a>\n)
     end
 
     def linebreak
-      puts "<br />"
+      "<br />\n"
     end
 
     def pagebreak
-      puts %Q(<br class="pagebreak" />)
+      %Q(<br class="pagebreak" />\n)
     end
 
     def bpo(lines)
-      puts "<bpo>"
+      buf = "<bpo>\n"
       lines.each do |line|
-        puts detab(line)
+        buf << detab(line) + "\n"
       end
-      puts "</bpo>"
+      buf << "</bpo>\n"
+      buf
     end
 
     def noindent
@@ -780,7 +792,7 @@ QUOTE
     end
 
     def inline_labelref(idref)
-      %Q[<a target='#{escape_html(idref)}'>「#{I18n.t("label_marker")}#{escape_html(idref)}」</a>]
+      %Q[<a target='#{(idref)}'>「#{I18n.t("label_marker")}#{(idref)}」</a>]
     end
 
     alias_method :inline_ref, :inline_labelref
@@ -829,10 +841,10 @@ QUOTE
     end
 
     def compile_ruby(base, ruby)
-      if @book.htmlversion == 5
-        %Q[<ruby>#{escape_html(base)}<rp>#{I18n.t("ruby_prefix")}</rp><rt>#{escape_html(ruby)}</rt><rp>#{I18n.t("ruby_postfix")}</rp></ruby>]
+      if @book.config["htmlversion"].to_i == 5
+        %Q[<ruby>#{(base)}<rp>#{I18n.t("ruby_prefix")}</rp><rt>#{(ruby)}</rt><rp>#{I18n.t("ruby_postfix")}</rp></ruby>]
       else
-        %Q[<ruby><rb>#{escape_html(base)}</rb><rp>#{I18n.t("ruby_prefix")}</rp><rt>#{ruby}</rt><rp>#{I18n.t("ruby_postfix")}</rp></ruby>]
+        %Q[<ruby><rb>#{(base)}</rb><rp>#{I18n.t("ruby_prefix")}</rp><rt>#{ruby}</rt><rp>#{I18n.t("ruby_postfix")}</rp></ruby>]
       end
     end
 
@@ -846,34 +858,34 @@ QUOTE
     end
 
     def inline_i(str)
-      %Q(<i>#{escape_html(str)}</i>)
+      %Q(<i>#{str}</i>)
     end
 
     def inline_b(str)
-      %Q(<b>#{escape_html(str)}</b>)
+      %Q(<b>#{str}</b>)
     end
 
     def inline_ami(str)
-      %Q(<span class="ami">#{escape_html(str)}</span>)
+      %Q(<span class="ami">#{(str)}</span>)
     end
 
     def inline_bou(str)
-      %Q(<span class="bou">#{escape_html(str)}</span>)
+      %Q(<span class="bou">#{(str)}</span>)
     end
 
     def inline_tti(str)
-      if @book.htmlversion == 5
-        %Q(<code class="tt"><i>#{escape_html(str)}</i></code>)
+      if @book.config["htmlversion"].to_i == 5
+        %Q(<code class="tt"><i>#{(str)}</i></code>)
       else
-        %Q(<tt><i>#{escape_html(str)}</i></tt>)
+        %Q(<tt><i>#{(str)}</i></tt>)
       end
     end
 
     def inline_ttb(str)
-      if @book.htmlversion == 5
-        %Q(<code class="tt"><b>#{escape_html(str)}</b></code>)
+      if @book.config["htmlversion"].to_i == 5
+        %Q(<code class="tt"><b>#{(str)}</b></code>)
       else
-        %Q(<tt><b>#{escape_html(str)}</b></tt>)
+        %Q(<tt><b>#{(str)}</b></tt>)
       end
     end
 
@@ -882,15 +894,15 @@ QUOTE
     end
 
     def inline_code(str)
-      if @book.htmlversion == 5
-        %Q(<code class="inline-code tt">#{escape_html(str)}</code>)
+      if @book.config["htmlversion"].to_i == 5
+        %Q(<code class="inline-code tt">#{(str)}</code>)
       else
-        %Q(<tt class="inline-code">#{escape_html(str)}</tt>)
+        %Q(<tt class="inline-code">#{(str)}</tt>)
       end
     end
 
     def inline_idx(str)
-      %Q(#{escape_html(str)}<!-- IDX:#{escape_comment(escape_html(str))} -->)
+      %Q(#{(str)}<!-- IDX:#{escape_comment(escape_html(str))} -->)
     end
 
     def inline_hidx(str)
@@ -909,7 +921,7 @@ QUOTE
           :symbol => MathML::Symbol::CharacterReference)
         %Q[<span class="equation">#{parser.parse(str, nil)}</span>]
       else
-        %Q[<span class="equation">#{escape_html(str)}</span>]
+        %Q[<span class="equation">#{(str)}</span>]
       end
     end
 
@@ -918,35 +930,36 @@ QUOTE
     end
 
     def bibpaper(lines, id, caption)
-      puts %Q[<div class="bibpaper">]
-      bibpaper_header id, caption
+      buf = %Q[<div class="bibpaper">\n]
+      buf << bibpaper_header(id, caption)
       unless lines.empty?
-        bibpaper_bibpaper id, caption, lines
+        buf << bibpaper_bibpaper(id, caption, lines)
       end
-      puts "</div>"
+      buf << "</div>" << "\n"
+      buf
     end
 
     def bibpaper_header(id, caption)
-      print %Q(<a id="bib-#{normalize_id(id)}">)
-      print "[#{@chapter.bibpaper(id).number}]"
-      print %Q(</a>)
-      puts " #{compile_inline(caption)}"
+      buf = %Q(<a id="bib-#{normalize_id(id)}">)
+      buf << "[#{@chapter.bibpaper(id).number}]"
+      buf << %Q(</a>)
+      buf << " #{(caption)}" << "\n"
     end
 
     def bibpaper_bibpaper(id, caption, lines)
-      print split_paragraph(lines).join("")
+      lines.join("")
     end
 
     def inline_bib(id)
-      %Q(<a href="#{@book.bib_file.gsub(/\.re\Z/, ".#{@book.config['htmlext']}")}#bib-#{normalize_id(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)
       n = chap.headline_index.number(id)
       if chap.number and @book.config["secnolevel"] >= n.split('.').size
-        str = I18n.t("chapter_quote", "#{n} #{compile_inline(chap.headline(id).caption)}")
+        str = I18n.t("chapter_quote", "#{n} #{chap.headline(id).caption}")
       else
-        str = I18n.t("chapter_quote", compile_inline(chap.headline(id).caption))
+        str = I18n.t("chapter_quote", chap.headline(id).caption)
       end
       if @book.config["chapterlink"]
         anchor = "h"+n.gsub(/\./, "-")
@@ -964,9 +977,9 @@ QUOTE
 
     def inline_column(id)
       if @book.config["chapterlink"]
-        %Q(<a href="\##{column_label(id)}" class="columnref">#{I18n.t("column", escape_html(@chapter.column(id).caption))}</a>)
+        %Q(<a href="\##{column_label(id)}" class="columnref">#{I18n.t("column", (@chapter.column(id).caption))}</a>)
       else
-        I18n.t("column", escape_html(@chapter.column(id).caption))
+        I18n.t("column", (@chapter.column(id).caption))
       end
     rescue KeyError
       error "unknown column: #{id}"
@@ -1022,7 +1035,7 @@ QUOTE
     end
 
     def inline_asis(str, tag)
-      %Q(<#{tag}>#{escape_html(str)}</#{tag}>)
+      %Q(<#{tag}>#{(str)}</#{tag}>)
     end
 
     def inline_abbr(str)
@@ -1078,10 +1091,10 @@ QUOTE
     end
 
     def inline_tt(str)
-      if @book.htmlversion == 5
-        %Q(<code class="tt">#{escape_html(str)}</code>)
+      if @book.config["htmlversion"].to_i == 5
+        %Q(<code class="tt">#{(str)}</code>)
       else
-        %Q(<tt>#{escape_html(str)}</tt>)
+        %Q(<tt>#{(str)}</tt>)
       end
     end
 
@@ -1094,11 +1107,11 @@ QUOTE
     end
 
     def inline_u(str)
-      %Q(<u>#{escape_html(str)}</u>)
+      %Q(<u>#{(str)}</u>)
     end
 
     def inline_recipe(str)
-      %Q(<span class="recipe">「#{escape_html(str)}」</span>)
+      %Q(<span class="recipe">「#{(str)}」</span>)
     end
 
     def inline_icon(id)
@@ -1115,7 +1128,7 @@ QUOTE
 
     def inline_comment(str)
       if @book.config["draft"]
-        %Q(<span class="draft-comment">#{escape_html(str)}</span>)
+        %Q(<span class="draft-comment">#{(str)}</span>)
       else
         %Q(<!-- #{escape_comment(escape_html(str))} -->)
       end
@@ -1130,23 +1143,21 @@ QUOTE
     end
 
     def compile_href(url, label)
-      %Q(<a href="#{escape_html(url)}" class="link">#{label.nil? ? escape_html(url) : escape_html(label)}</a>)
+      %Q(<a href="#{escape_html(url)}" class="link">#{label.nil? ? (url) : (label)}</a>)
     end
 
     def flushright(lines)
+      result = ""
       if @book.config["deprecated-blocklines"].nil?
-        puts split_paragraph(lines).join("\n").gsub("<p>", "<p class=\"flushright\">")
+        result << lines.join("").gsub("<p>", "<p class=\"flushright\">")
       else
-        puts %Q[<div style="text-align:right;">]
-        print %Q[<pre class="flushright">]
-        lines.each {|line| puts detab(line) }
-        puts '</pre>'
-        puts '</div>'
+        error "deprecated-blocklines is obsoleted."
       end
+      result
     end
 
     def centering(lines)
-      puts split_paragraph(lines).join("\n").gsub("<p>", "<p class=\"center\">")
+      lines.join("").gsub("<p>", "<p class=\"center\">")
     end
 
     def image_ext
@@ -1158,4 +1169,4 @@ QUOTE
     end
   end
 
-end # module ReVIEW
+end   # module ReVIEW