review 2.0.0.beta1 → 2.0.0

data/lib/review/htmltoc.rb

@@ -0,0 +1,44 @@
+module ReVIEW
+  class HTMLToc
+    def initialize(basedir)
+      @tochtmltxt = "toc-html.txt"
+      @basedir = basedir
+    end
+
+    def add_item(level, filename, title, args)
+      args_str = encode_args(args)
+      line = [level, filename, title, args_str].join("\t")
+      File.open(tocfilename, "a") do |f|
+        f.write "#{line}\n"
+      end
+    end
+
+    def each_item
+      File.open(tocfilename) do |f|
+        f.each_line do |line|
+          level, file, title, args_str = line.chomp.split("\t")
+          args = decode_args(args_str)
+          yield level, file, title, args
+        end
+      end
+    end
+
+    def tocfilename
+      File.join(@basedir, @tochtmltxt)
+    end
+
+    def decode_args(args_str)
+      args = Hash.new
+      args_str.split(/,\s*/).each do |pair|
+        key, val = pair.split("=")
+        args[key.to_sym] = val
+      end
+      args
+    end
+
+    def encode_args(args)
+      args.delete_if {|k,v| v.nil? }.map{|k,v| "#{k}=#{v}"}.join(",")
+    end
+  end
+end
+

data/lib/review/htmlutils.rb

@@ -8,6 +8,7 @@
 # the GNU LGPL, Lesser General Public License version 2.1.
 #
 
+require 'cgi/util'
 module ReVIEW
 
   module HTMLUtils
@@ -24,6 +25,7 @@ module ReVIEW
     end
 
     alias_method :escape, :escape_html
+    alias_method :h, :escape_html
 
     def unescape_html(str)
       # FIXME better code
@@ -40,12 +42,16 @@ module ReVIEW
       str.gsub('-', '-')
     end
 
-    def highlight_pygments?
-      @book.config["pygments"].present? ||
-        @book.config["highlight"] && @book.config["highlight"]["html"] == "pygments"
+    def highlight?
+      @book.config["highlight"] &&
+        @book.config["highlight"]["html"] == "pygments"
     end
 
     def highlight(ops)
+      if @book.config["pygments"].present?
+        raise ReVIEW::ConfigError, "'pygments:' in config.yml is obsoleted."
+      end
+
       body = ops[:body] || ''
       if @book.config["highlight"] && @book.config["highlight"]["lang"]
         lexer = @book.config["highlight"]["lang"] # default setting
@@ -58,7 +64,7 @@ module ReVIEW
       if ops[:options] && ops[:options].kind_of?(Hash)
         options.merge!(ops[:options])
       end
-      return body if !highlight_pygments?
+      return body if !highlight?
 
       begin
         require 'pygments'
@@ -72,7 +78,7 @@ module ReVIEW
           body
         end
       rescue LoadError
-        body
+          body
       end
     end
 
@@ -87,4 +93,4 @@ module ReVIEW
     end
   end
 
-end   # module ReVIEW
+end # module ReVIEW

data/lib/review/i18n.rb

@@ -3,6 +3,17 @@ require 'yaml'
 
 module ReVIEW
   class I18n
+    ALPHA_U = %w[0 A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
+    ALPHA_L = %w[0 a b c d e f g h i j k l m n o p q r s t u v w x y z]
+    ROMAN_U = %w[0 I II III IV V VI VII VIII IX X XI XII XIII XIV XV XVI XVII XVIII XIX XX XXI XXII XXIII XXIV XXV XXVI XXVII]
+    ROMAN_L = %w[0 i ii iii iv v vi vii viii ix x xi xii xiii xiv xv xvi xvii xviii xix xx xxi xxii xxiii xxiv xxv xxvi xxvii]
+    ALPHA_UW = %w[０ Ａ Ｂ Ｃ Ｄ Ｅ Ｆ Ｇ Ｈ Ｉ Ｊ Ｋ Ｌ Ｍ Ｎ Ｏ Ｐ Ｑ Ｒ Ｓ Ｔ Ｕ Ｖ Ｗ Ｘ Ｙ Ｚ]
+    ALPHA_LW = %w[０ ａ ｂ ｃ ｄ ｅ ｆ ｇ ｈ ｉ ｊ ｋ ｌ ｍ ｎ ｏ ｐ ｑ ｒ ｓ ｔ ｕ ｖ ｗ ｘ ｙ ｚ]
+    ROMAN_UW = %w[０ Ⅰ Ⅱ Ⅲ Ⅳ Ｖ Ⅵ Ⅶ Ⅷ Ⅸ Ｘ Ⅺ Ⅻ]
+    ARABIC_UW = %w[〇 １ ２ ３ ４ ５ ６ ７ ８ ９ １０ １１ １２ １３ １４ １５ １６ １７ １８ １９ ２０ ２１ ２２ ２３ ２４ ２５ ２６ ２７]
+    ARABIC_LW = %w[〇 １ ２ ３ ４ ５ ６ ７ ８ ９ 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27]
+    JAPAN = %w[〇 一 二 三 四 五 六 七 八 九 十 十一 十二 十三 十四 十五 十六 十七 十八 十九 二十 二十一 二十二 二十三 二十四 二十五 二十六 二十七]
+
     def self.setup(locale="ja", ymlfile = "locale.yml")
       @i18n = ReVIEW::I18n.new(locale)
 
@@ -11,8 +22,8 @@ module ReVIEW
         lfile = File.expand_path(ymlfile, Dir.pwd)
 
         # backward compatibility
-        if !File.exist?(lfile) && (ymlfile == "locale.yml")
-          lfile = File.expand_path("locale.yaml", Dir.pwd)
+        if !File.exist?(lfile) && (ymlfile == "locale.yml") && File.exist?(File.expand_path("locale.yaml", Dir.pwd))
+          raise ReVIEW::ConfigError, "locale.yaml is obsoleted.  Please use locale.yml."
         end
       end
 
@@ -38,13 +49,17 @@ module ReVIEW
     end
 
     class << self
-      alias v t  ## for EPUBMaker backward compatibility
+      alias_method :v, :t ## for EPUBMaker backward compatibility
     end
 
     def self.update(user_i18n, locale = nil)
       @i18n.update(user_i18n, locale)
     end
 
+    def self.get(word, locale = nil)
+      @i18n.get(word, locale)
+    end
+
     attr_accessor :locale
 
     def initialize(locale = nil)
@@ -53,7 +68,7 @@ module ReVIEW
     end
 
     def load_default
-      load_file(File.expand_path "i18n.yml", File.dirname(__FILE__))
+      load_file(File.expand_path("i18n.yml", File.dirname(__FILE__)))
     end
 
     def load_file(path)
@@ -65,7 +80,11 @@ module ReVIEW
       locale = user_i18n["locale"]
       if locale
         user_i18n.delete("locale")
-        @store[locale].merge!(user_i18n)
+        if @store[locale]
+          @store[locale].merge!(user_i18n)
+        else
+          @store[locale] = user_i18n
+        end
       else
         user_i18n.each do |key, values|
           raise KeyError, "Invalid locale file: #{path}" unless values.kind_of? Hash
@@ -83,8 +102,61 @@ module ReVIEW
       end
     end
 
+    def get(word, locale = nil)
+      locale ||= @locale
+      @store[locale][word]
+    end
+
     def t(str, args = nil)
-      @store[@locale][str] % args
+      frmt = @store[@locale][str].dup
+      frmt.gsub!('%%', '##')
+
+      if !args.is_a?(Array)
+        if args.nil? && frmt !~ /\%/
+          args = []
+        else
+          args = [args]
+        end
+      end
+
+      percents = frmt.scan(/%\w{1,3}/)
+      percents.each_with_index do |i, idx|
+        case i
+        when "%pA"
+          frmt.sub!(i, ALPHA_U[args[idx]])
+          args.delete idx
+        when "%pa"
+          frmt.sub!(i, ALPHA_L[args[idx]])
+          args.delete idx
+        when "%pAW"
+          frmt.sub!(i, ALPHA_UW[args[idx]])
+          args.delete idx
+        when "%paW"
+          frmt.sub!(i, ALPHA_LW[args[idx]])
+          args.delete idx
+        when "%pR"
+          frmt.sub!(i, ROMAN_U[args[idx]])
+          args.delete idx
+        when "%pr"
+          frmt.sub!(i, ROMAN_L[args[idx]])
+          args.delete idx
+        when "%pRW"
+          frmt.sub!(i, ROMAN_UW[args[idx]])
+          args.delete idx
+        when "%pJ"
+          frmt.sub!(i, JAPAN[args[idx]])
+          args.delete idx
+        when "%pdW"
+          frmt.sub!(i, ARABIC_LW[args[idx]])
+          args.delete idx
+        when "%pDW"
+          frmt.sub!(i, ARABIC_UW[args[idx]])
+          args.delete idx
+        end
+      end
+      args_matched = (frmt.count("%") == args.size)
+      frmt.gsub!('##', '%%')
+      args_matched ? (frmt % args) : frmt
     rescue
       str
     end

data/lib/review/i18n.yml

@@ -9,7 +9,7 @@ ja:
   chapter: 第%d章
   chapter_postfix: "　"
   chapter_quote: "「%s」"
-  appendix: 付録%s
+  appendix: 付録%pA
   numberless_image: "図:"
   memo_head: ■メモ
   format_number: "%s.%d"
@@ -21,6 +21,7 @@ ja:
   caption_prefix_idgxml: "　"
   ruby_prefix: "（"
   ruby_postfix: "）"
+  external_link: "%s（%s）"
   label_marker: "●●　"
   aut: "著　者"
   csl: "監　修"
@@ -30,8 +31,8 @@ ja:
   edt: "編　集"
   pht: "撮　影"
   trl: "翻　訳"
-  ## XXX Backward Compatibility: `prt` should be "印刷所"
-  prt: "発行所"
+  ## XXX Breaking Change: now `prt` is "印刷所", not "発行所"
+  prt: "印刷所"
   pbl: "発行所"
   contact: "連絡先"
   author_with_label: "%s　著"
@@ -78,6 +79,7 @@ en:
   image_quote: '"%s"'
   caption_prefix: " "
   caption_prefix_idgxml: "　"
+  external_link: "%s (%s)"
   ruby_prefix: "("
   ruby_postfix: ")"
   label_marker: "●●　"
@@ -116,7 +118,7 @@ en:
   profiletitle: "Profile"
   backcovertitle: "Back Cover"
 
-zh_TW:
+zh-TW:
   image: 圖
   table: 表
   list: List
@@ -135,6 +137,7 @@ zh_TW:
   caption_prefix_idgxml: "　"
   ruby_prefix: "（"
   ruby_postfix: "）"
+  external_link: "%s (%s)"
   label_marker: "●●　"
   aut: "著作人"
   csl: "監　修"

data/lib/review/idgxmlbuilder.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #
 # Copyright (c) 2002-2007 Minero Aoki
-#               2008-2014 Minero Aoki, Kenshi Muto
+#               2008-2016 Minero Aoki, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -23,16 +23,10 @@ module ReVIEW
     [:ttbold, :hint, :maru, :keytop, :labelref, :ref, :pageref, :balloon].each {|e| Compiler.definline(e) }
     Compiler.defsingle(:dtp, 1)
 
-    Compiler.defcodeblock(:insn, 1)
-    Compiler.defblock(:memo, 0..1)
-    Compiler.defblock(:tip, 0..1)
-    Compiler.defblock(:info, 0..1)
+    Compiler.defblock(:insn, 0..1)
     Compiler.defblock(:planning, 0..1)
     Compiler.defblock(:best, 0..1)
-    Compiler.defblock(:important, 0..1)
     Compiler.defblock(:security, 0..1)
-    Compiler.defblock(:caution, 0..1)
-    Compiler.defblock(:notice, 0..1)
     Compiler.defblock(:point, 0..1)
     Compiler.defblock(:shoot, 0..1)
     Compiler.defblock(:reference, 0)
@@ -42,6 +36,14 @@ module ReVIEW
     Compiler.defblock(:expert, 0)
     Compiler.defblock(:rawblock, 0)
 
+    def pre_paragraph
+      '<p>'
+    end
+
+    def post_paragraph
+      '</p>'
+    end
+
     def extname
       '.xml'
     end
@@ -61,22 +63,25 @@ module ReVIEW
       @sec_counter = SecCounter.new(5, @chapter)
       @column = 0
       @noindent = nil
+      @ol_num = nil
       @rootelement = "doc"
       @secttags = nil
       @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/">)
+      @secttags = true unless @book.config["structuredxml"].nil?
+    end
+    private :builder_init_file
 
-      @output << %Q(<?xml version="1.0" encoding="UTF-8"?>\n)
-      @output << %Q(<#{@rootelement} xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/">)
+    def puts(arg)
       if @book.config["nolf"].present?
-        @lf = ""
+        print arg
       else
-        @lf = "\n"
+        super
       end
-      @secttags = true unless @book.config["structuredxml"].nil?
     end
-    private :builder_init_file
 
     def result
       s = ""
@@ -93,7 +98,7 @@ module ReVIEW
     def warn(msg)
       if @no_error
         @warns.push [@location.filename, @location.lineno, msg]
-        buf << "----WARNING: #{escape_html(msg)}----" << @lf
+        puts "----WARNING: #{escape_html(msg)}----"
       else
         $stderr.puts "#{@location}: warning: #{msg}"
       end
@@ -102,7 +107,7 @@ module ReVIEW
     def error(msg)
       if @no_error
         @errors.push [@location.filename, @location.lineno, msg]
-        buf << "----ERROR: #{escape_html(msg)}----" << @lf
+        puts "----ERROR: #{escape_html(msg)}----"
       else
         $stderr.puts "#{@location}: error: #{msg}"
       end
@@ -133,57 +138,63 @@ module ReVIEW
     end
 
     def headline(level, label, caption)
-      buf = ""
       case level
       when 1
         unless @secttags.nil?
-          buf << "</sect4>" if @subsubsubsection > 0
-          buf << "</sect3>" if @subsubsection > 0
-          buf << "</sect2>" if @subsection > 0
-          buf << "</sect>" if @section > 0
+          print "</sect4>" if @subsubsubsection > 0
+          print "</sect3>" if @subsubsection > 0
+          print "</sect2>" if @subsection > 0
+          print "</sect>" if @section > 0
         end
-        buf << %Q(<chapter id="chap:#{@chapter.number}">) unless @secttags.nil?
+
+        print %Q(<chapter id="chap:#{@chapter.number}">) unless @secttags.nil?
+
         @section = 0
         @subsection = 0
         @subsubsection = 0
         @subsubsubsection = 0
       when 2
         unless @secttags.nil?
-          buf << "</sect4>" if @subsubsubsection > 0
-          buf << "</sect3>" if @subsubsection > 0
-          buf << "</sect2>" if @subsection > 0
-          buf << "</sect>" if @section > 0
+          print "</sect4>" if @subsubsubsection > 0
+          print "</sect3>" if @subsubsection > 0
+          print "</sect2>" if @subsection > 0
+          print "</sect>" if @section > 0
         end
         @section += 1
-        buf << %Q(<sect id="sect:#{@chapter.number}.#{@section}">) unless @secttags.nil?
+        print %Q(<sect id="sect:#{@chapter.number}.#{@section}">) unless @secttags.nil?
+      
         @subsection = 0
         @subsubsection = 0
         @subsubsubsection = 0
       when 3
         unless @secttags.nil?
-          buf << "</sect4>" if @subsubsubsection > 0
-          buf << "</sect3>" if @subsubsection > 0
-          buf << "</sect2>" if @subsection > 0
+          print "</sect4>" if @subsubsubsection > 0
+          print "</sect3>" if @subsubsection > 0
+          print "</sect2>" if @subsection > 0
         end
+
         @subsection += 1
-        buf << %Q(<sect2 id="sect:#{@chapter.number}.#{@section}.#{@subsection}">) unless @secttags.nil?
+        print %Q(<sect2 id="sect:#{@chapter.number}.#{@section}.#{@subsection}">) unless @secttags.nil?
+
         @subsubsection = 0
         @subsubsubsection = 0
       when 4
         unless @secttags.nil?
-          buf << "</sect4>" if @subsubsubsection > 0
-          buf << "</sect3>" if @subsubsection > 0
+          print "</sect4>" if @subsubsubsection > 0
+          print "</sect3>" if @subsubsection > 0
         end
+
         @subsubsection += 1
-        buf << %Q(<sect3 id="sect:#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}">) unless @secttags.nil?
+        print %Q(<sect3 id="sect:#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}">) unless @secttags.nil?
+
         @subsubsubsection = 0
       when 5
         unless @secttags.nil?
-          buf << "</sect4>" if @subsubsubsection > 0
+          print "</sect4>" if @subsubsubsection > 0
         end
 
         @subsubsubsection += 1
-        buf << %Q(<sect4 id="sect:#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}.#{@subsubsubsection}">) unless @secttags.nil?
+        print %Q(<sect4 id="sect:#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}.#{@subsubsubsection}">) unless @secttags.nil?
       else
         raise "caption level too deep or unsupported: #{level}"
       end
@@ -191,68 +202,65 @@ module ReVIEW
       prefix, anchor = headline_prefix(level)
 
       label = label.nil? ? "" : " id=\"#{label}\""
-      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
+      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}"?>)
     end
 
     def ul_begin
       level = block_given? ? yield : ""
       level = nil if level == 1
-      "<ul#{level == 1 ? nil : level}>" + @lf
+      puts "<ul#{level == 1 ? nil : level}>"
     end
 
     def ul_item(lines)
-      %Q(<li aid:pstyle="ul-item">#{lines.join.chomp}</li>) + @lf
+      puts %Q(<li aid:pstyle="ul-item">#{lines.join.chomp}</li>)
     end
 
     def ul_item_begin(lines)
-      %Q(<li aid:pstyle="ul-item">#{lines.join.chomp})
+      print %Q(<li aid:pstyle="ul-item">#{lines.join.chomp})
     end
 
     def ul_item_end
-      "</li>" + @lf
+      puts "</li>"
     end
 
     def choice_single_begin
-      "<choice type='single'>" + @lf
+      puts "<choice type='single'>"
     end
 
     def choice_multi_begin
-      "<choice type='multi'>" + @lf
+      puts "<choice type='multi'>"
     end
 
     def choice_single_end
-      "</choice>" + @lf
+      puts "</choice>"
     end
 
     def choice_multi_end
-      "</choice>" + @lf
+      puts "</choice>"
     end
 
     def ul_end
       level = block_given? ? yield : ""
       level = nil if level == 1
-      "</ul#{level}>" + @lf
+      puts "</ul#{level}>"
     end
 
     def ol_begin
+      puts '<ol>'
       if !@ol_num
         @ol_num = 1
       end
-      '<ol>' + @lf
     end
 
     def ol_item(lines, num)
-      buf = %Q(<li aid:pstyle="ol-item" olnum="#{@ol_num}" num="#{num}">#{lines.join.chomp}</li>) + @lf
+      puts %Q(<li aid:pstyle="ol-item" olnum="#{@ol_num}" num="#{num}">#{lines.join.chomp}</li>)
       @ol_num += 1
-      buf
     end
 
     def ol_end
+      puts '</ol>'
       @ol_num = nil
-      '</ol>' + @lf
     end
 
     def olnum(num)
@@ -260,43 +268,36 @@ module ReVIEW
     end
 
     def dl_begin
-      '<dl>' + @lf
+      puts '<dl>'
     end
 
     def dt(line)
-      "<dt>#{line}</dt>" + @lf
+      puts "<dt>#{line}</dt>"
     end
 
     def dd(lines)
-      "<dd>#{lines.join.chomp}</dd>" + @lf
+      puts "<dd>#{lines.join.chomp}</dd>"
     end
 
     def dl_end
-      '</dl>' + @lf
+      puts '</dl>'
     end
 
     def paragraph(lines)
-      buf = ""
       if @noindent.nil?
         if lines[0] =~ /\A(\t+)/
-          buf << %Q(<p inlist="#{$1.size}">#{lines.join('').sub(/\A\t+/, "")}</p>) << @lf
+          puts %Q(<p inlist="#{$1.size}">#{lines.join('').sub(/\A\t+/, "")}</p>)
         else
-          buf << "<p>#{lines.join}</p>" << @lf
+          puts "<p>#{lines.join}</p>"
         end
       else
-        buf << %Q(<p aid:pstyle="noindent" noindent='1'>#{lines.join}</p>) << @lf
+        puts %Q(<p aid:pstyle="noindent" noindent='1'>#{lines.join}</p>)
         @noindent = nil
       end
-      buf
     end
 
     def read(lines)
-      if @book.config["deprecated-blocklines"].nil?
-        %Q[<lead>#{lines.join}</lead>] + @lf
-      else
-        str = lines.map{|l| l.sub(/^<p>/,"").sub(/<\/p>$/,"")}.join()
-        %Q[<p aid:pstyle="lead">#{str}</p>] + @lf
-      end
+      puts %Q[<lead>#{split_paragraph(lines).join}</lead>]
     end
 
     alias_method :lead, :read
@@ -307,15 +308,12 @@ module ReVIEW
     end
     private :column_label
 
-    def inline_column(id)
+    def inline_column_chap(chapter, id)
       if @book.config["chapterlink"]
-        %Q(<link href="#{column_label(id)}">#{escape_html(@chapter.column(id).caption)}</link>)
+        %Q(<link href="#{column_label(id)}">#{escape_html(chapter.column(id).caption)}</link>)
       else
-        escape_html(@chapter.column(id).caption)
+        escape_html(chapter.column(id).caption)
       end
-    rescue KeyError
-      error "unknown column: #{id}"
-      nofunc_text("[UnknownColumn:#{id}]")
     end
 
     def inline_list(id)
@@ -328,40 +326,34 @@ module ReVIEW
     end
 
     def list_header(id, caption, lang)
-      buf = ""
-      buf << %Q[<codelist>] << @lf
+      puts %Q[<codelist>]
       if get_chap.nil?
-        buf << %Q[<caption>#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [@chapter.list(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}</caption>] << @lf
+        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>]
       else
-        buf << %Q[<caption>#{I18n.t("list")}#{I18n.t("format_number", [get_chap, @chapter.list(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}</caption>] << @lf
+        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>]
       end
-      buf
     end
 
     def codelines_body(lines)
-      buf = ""
       no = 1
       lines.each do |line|
         unless @book.config["listinfo"].nil?
-          buf << "<listinfo line=\"#{no}\""
-          buf << " begin=\"1\"" if no == 1
-          buf << " end=\"#{no}\"" if no == lines.size
-          buf << ">"
+          print "<listinfo line=\"#{no}\""
+          print " begin=\"1\"" if no == 1
+          print " end=\"#{no}\"" if no == lines.size
+          print ">"
         end
-        buf << detab(line)
-        buf << "\n"
-        buf << "</listinfo>" unless @book.config["listinfo"].nil?
+        print detab(line)
+        print "\n"
+        print "</listinfo>" unless @book.config["listinfo"].nil?
         no += 1
       end
-      buf
     end
 
     def list_body(id, lines, lang)
-      buf = ""
-      buf << %Q(<pre>)
-      buf << codelines_body(lines)
-      buf << "</pre></codelist>" << @lf
-      buf
+      print %Q(<pre>)
+      codelines_body(lines)
+      puts "</pre></codelist>"
     end
 
     def emlist(lines, caption = nil, lang = nil)
@@ -371,30 +363,27 @@ 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)
-      buf = ""
-      buf << %Q(<pre>)
+      print %Q(<pre>)
       no = 1
       lines.each_with_index do |line, i|
         unless @book.config["listinfo"].nil?
-          buf << "<listinfo line=\"#{no}\""
-          buf << " begin=\"1\"" if no == 1
-          buf << " end=\"#{no}\"" if no == lines.size
-          buf << ">"
+          print "<listinfo line=\"#{no}\""
+          print " begin=\"1\"" if no == 1
+          print " end=\"#{no}\"" if no == lines.size
+          print ">"
         end
-        buf << detab("<span type='lineno'>" + (i + 1).to_s.rjust(2) + ": </span>" + line)
-        buf << "\n"
-        buf << "</listinfo>" unless @book.config["listinfo"].nil?
+        print detab("<span type='lineno'>" + (i + 1).to_s.rjust(2) + ": </span>" + line)
+        print "\n"
+        print "</listinfo>" unless @book.config["listinfo"].nil?
         no += 1
       end
-      buf << "</pre></codelist>" << @lf
-      buf
+      puts "</pre></codelist>"
     end
 
     def cmd(lines, caption = nil)
@@ -402,35 +391,29 @@ module ReVIEW
     end
 
     def quotedlist(lines, css_class, caption)
-      buf = ""
-      buf << %Q[<list type='#{css_class}'>]
-      buf << "<caption aid:pstyle='#{css_class}-title'>#{caption}</caption>" + @lf unless caption.nil?
-      buf << %Q[<pre>]
+      print %Q[<list type='#{css_class}'>]
+      puts "<caption aid:pstyle='#{css_class}-title'>#{compile_inline(caption)}</caption>" unless caption.nil?
+      print %Q[<pre>]
       no = 1
       lines.each do |line|
         unless @book.config["listinfo"].nil?
-          buf << "<listinfo line=\"#{no}\""
-          buf << " begin=\"1\"" if no == 1
-          buf << " end=\"#{no}\"" if no == lines.size
-          buf << ">"
+          print "<listinfo line=\"#{no}\""
+          print " begin=\"1\"" if no == 1
+          print " end=\"#{no}\"" if no == lines.size
+          print ">"
         end
-        buf << detab(line)
-        buf << "\n"
-        buf << "</listinfo>" unless @book.config["listinfo"].nil?
+        print detab(line)
+        print "\n"
+        print "</listinfo>" unless @book.config["listinfo"].nil?
         no += 1
       end
-      buf << '</pre></list>' << @lf
-      buf
+      puts '</pre></list>'
     end
     private :quotedlist
 
     def quote(lines)
-      if @book.config["deprecated-blocklines"].nil?
-        "<quote>#{lines.join("")}</quote>" + @lf
-      else
-        str = lines.map{|l| l.sub(/^<p>/,"").sub(/<\/p>$/,"")}.join("\n")
-        "<quote>#{str}</quote>" + @lf
-      end
+      blocked_lines = split_paragraph(lines)
+      puts "<quote>#{blocked_lines.join("")}</quote>"
     end
 
     def inline_table(id)
@@ -474,59 +457,53 @@ module ReVIEW
     end
 
     def image_image(id, caption, metric=nil)
-      buf = ""
       metrics = parse_metric("idgxml", metric)
-      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
+      puts "<img>"
+      puts %Q[<Image href="file://#{@chapter.image(id).path.sub(/\A.\//, "")}"#{metrics} />]
+      image_header id, caption
+      puts "</img>"
     end
 
     def image_dummy(id, caption, lines)
-      buf << "<img>" << @lf
-      buf << %Q[<pre aid:pstyle="dummyimage">]
+      puts "<img>"
+      print %Q[<pre aid:pstyle="dummyimage">]
       lines.each do |line|
-        buf << detab(line)
-        buf << "\n"
+        print detab(line)
+        print "\n"
       end
-      buf << %Q[</pre>]
+      print %Q[</pre>]
       image_header id, caption
-      buf << "</img>" << @lf
+      puts "</img>"
       warn "no such image: #{id}"
-      buf
     end
 
     def image_header(id, caption)
       if get_chap.nil?
-        %Q[<caption>#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [@chapter.image(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}</caption>] + @lf
+        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>]
       else
-        %Q[<caption>#{I18n.t("image")}#{I18n.t("format_number", [get_chap, @chapter.image(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}</caption>] + @lf
+        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>]
       end
     end
 
     def texequation(lines)
-      buf = ""
       @texblockequation += 1
-      buf << %Q[<replace idref="texblock-#{@texblockequation}">] << @lf
-      buf << '<pre>' << @lf
-      buf << "#{lines.join("\n")}" << @lf
-      buf << '</pre>' << @lf
-      buf << '</replace>' << @lf
+      puts %Q[<replace idref="texblock-#{@texblockequation}">]
+      puts '<pre>'
+      puts "#{lines.join("\n")}"
+      puts '</pre>'
+      puts '</replace>'
     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
+      if @book.config["tableopt"]
+        tablewidth = @book.config["tableopt"].split(",")[0].to_f / @book.config["pt_to_mm_unit"].to_f
       end
-      buf << "<table>"
+      puts "<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
@@ -548,8 +525,8 @@ module ReVIEW
           cellwidth = @tsize.split(/\s*,\s*/)
           totallength = 0
           cellwidth.size.times do |n|
-            cellwidth[n] = cellwidth[n].to_f / 0.351 # mm -> pt
-            totallength = totallength + cellwidth[n]
+            cellwidth[n] = cellwidth[n].to_f / @book.config["pt_to_mm_unit"].to_f
+            totallength += cellwidth[n]
             warn "total length exceeds limit for table: #{id}" if totallength > tablewidth
           end
           if cellwidth.size < col
@@ -563,71 +540,66 @@ module ReVIEW
       end
 
       begin
-        buf << table_header(id, caption) unless caption.nil?
+        table_header id, caption unless caption.nil?
       rescue KeyError
         error "no such table: #{id}"
       end
       return if rows.empty?
 
       if tablewidth.nil?
-        buf << "<tbody>"
+        print "<tbody>"
       else
-        buf << %Q[<tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="#{rows.length}" aid:tcols="#{col}">]
+        print %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?
-            buf << %Q[<tr type="header">#{rows.shift}</tr>] << @lf
+            puts %Q[<tr type="header">#{rows.shift}</tr>]
           else
             i = 0
             rows.shift.split(/\t/).each_with_index do |cell, x|
-              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>]
+              print %Q[<td xyh="#{x + 1},#{y + 1},#{sepidx}" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="#{sprintf("%.3f", cellwidth[i])}">#{cell.sub("DUMMYCELLSPLITTER", "")}</td>]
               i += 1
             end
           end
         end
       end
-      buf << trputs(tablewidth, rows, cellwidth, sepidx)
-      buf << "</tbody></table>" << @lf
+      trputs(tablewidth, rows, cellwidth, sepidx)
+      puts "</tbody></table>"
       @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| buf << %Q[<tr>#{row}</tr>] }
-        buf << %Q[<tr type="lastline">#{lastline}</tr>] + @lf unless lastline.nil?
+        rows.each {|row| puts %Q[<tr>#{row}</tr>] }
+        puts %Q[<tr type="lastline">#{lastline}</tr>] unless lastline.nil?
       else
         rows.each_with_index do |row, y|
           i = 0
           row.split(/\t/).each_with_index do |cell, x|
-            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>]
+            print %Q[<td xyh="#{x + 1},#{y + 1 + sepidx},#{sepidx}" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="#{sprintf("%.3f", cellwidth[i])}">#{cell.sub("DUMMYCELLSPLITTER", "")}</td>]
             i += 1
           end
         end
       end
-      buf
     end
 
     def table_header(id, caption)
-      buf = ""
       if get_chap.nil?
-        buf << %Q[<caption>#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}</caption>] + @lf
+      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>]
       else
-        buf << %Q[<caption>#{I18n.t("table")}#{I18n.t("format_number", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}</caption>] + @lf
+        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>]
       end
-      buf
     end
 
     def table_begin(ncols)
     end
 
     def tr(rows)
-      %Q[<tr>#{rows.join("\t")}</tr>] + @lf
+      puts %Q[<tr>#{rows.join("\t")}</tr>]
     end
 
     def th(str)
@@ -639,11 +611,24 @@ module ReVIEW
     end
 
     def table_end
-      "<?dtp tablerow last?>"
+      print "<?dtp tablerow last?>"
+    end
+
+    def imgtable(lines, id, caption = nil, metric = nil)
+      if @chapter.image(id).bound?
+        metrics = parse_metric("idgxml", metric)
+        puts "<table>"
+        table_header id, caption
+        puts %Q[<imgtable><Image href="file://#{@chapter.image(id).path.sub(/\A.\//, "")}"#{metrics} /></imgtable>]
+        puts "</table>"
+      else
+        warn "image not bound: #{id}" if @strict
+        image_dummy id, caption, lines
+      end
     end
 
     def comment(str)
-      %Q(<!-- [Comment] #{escape_html(str)} -->)
+      print %Q(<!-- [Comment] #{escape_html(str)} -->)
     end
 
     def footnote(id, str)
@@ -651,7 +636,7 @@ module ReVIEW
     end
 
     def inline_fn(id)
-      %Q[<footnote>#{@chapter.footnote(id).content.strip}</footnote>]
+      %Q[<footnote>#{compile_inline(@chapter.footnote(id).content.strip)}</footnote>]
     end
 
     def compile_ruby(base, ruby)
@@ -661,13 +646,13 @@ module ReVIEW
     def compile_kw(word, alt)
       '<keyword>' +
         if alt
-        then ("#{word}（#{alt.strip}）")
-        else (word)
+        then escape_html("#{word}（#{alt.strip}）")
+        else escape_html(word)
         end +
       '</keyword>' +
-        %Q[<index value="#{word}" />] +
+        %Q[<index value="#{escape_html(word)}" />] +
         if alt
-          alt.split(/\s*,\s*/).collect! {|e| %Q[<index value="#{(e.strip)}" />] }.join
+          alt.split(/\s*,\s*/).collect! {|e| %Q[<index value="#{escape_html(e.strip)}" />] }.join
         else
           ""
         end
@@ -738,11 +723,11 @@ module ReVIEW
     end
 
     def inline_tt(str)
-      %Q(<tt>#{str}</tt>)
+      %Q(<tt>#{escape_html(str)}</tt>)
     end
 
     def inline_ttb(str)
-      %Q(<tt style='bold'>#{str}</tt>)
+      %Q(<tt style='bold'>#{escape_html(str)}</tt>)
     end
 
     alias_method :inline_ttbold, :inline_ttb
@@ -773,13 +758,13 @@ module ReVIEW
     end
 
     def inline_labelref(idref)
-      %Q[<ref idref='#{(idref)}'>「#{I18n.t("label_marker")}#{(idref)}」</ref>] # FIXME:節名とタイトルも込みで要出力
+      %Q[<ref idref='#{escape_html(idref)}'>「#{I18n.t("label_marker")}#{escape_html(idref)}」</ref>] # FIXME:節名とタイトルも込みで要出力
     end
 
     alias_method :inline_ref, :inline_labelref
 
     def inline_pageref(idref)
-      %Q[<pageref idref='#{(idref)}'>●●</pageref>] # ページ番号を参照
+      %Q[<pageref idref='#{escape_html(idref)}'>●●</pageref>] # ページ番号を参照
     end
 
     def inline_balloon(str)
@@ -797,43 +782,40 @@ module ReVIEW
 
     def noindent
       @noindent = true
-      ""
     end
 
     def linebreak
       # FIXME:pが閉じちゃってるので一度戻らないといけないが、難しい…。
-      "<br />" + @lf
+      puts "<br />"
     end
 
     def pagebreak
-      "<pagebreak />" + @lf
+      puts "<pagebreak />"
     end
 
     def nonum_begin(level, label, caption)
-      %Q[<title aid:pstyle="h#{level}">#{caption}</title><?dtp level="#{level}" section="#{escape_html(caption)}"?>] + @lf
+      puts %Q[<title aid:pstyle="h#{level}">#{compile_inline(caption)}</title><?dtp level="#{level}" section="#{escape_html(compile_inline(caption))}"?>]
     end
 
     def nonum_end(level)
     end
 
     def circle_begin(level, label, caption)
-      %Q[<title aid:pstyle="smallcircle">&#x2022;#{caption}</title>] + @lf
+      puts %Q[<title aid:pstyle="smallcircle">&#x2022;#{compile_inline(caption)}</title>]
     end
 
     def circle_end(level)
     end
 
     def common_column_begin(type, caption)
-      buf = ""
       @column += 1
       a_id = %Q[id="column-#{@column}"]
-      buf << "<#{type}column #{a_id}>"
-      buf << %Q[<title aid:pstyle="#{type}column-title">#{compile_inline(caption)}</title>] << @lf
-      buf
+      print "<#{type}column #{a_id}>"
+      puts %Q[<title aid:pstyle="#{type}column-title">#{compile_inline(caption)}</title>]
     end
 
     def common_column_end(type)
-      "</#{type}column>" + @lf
+      puts "</#{type}column>"
     end
 
     def column_begin(level, label, caption)
@@ -886,53 +868,42 @@ module ReVIEW
 
     def ref_begin(level, label, caption)
       if !label.nil?
-        "<reference id='#{label}'>" + @lf
+        puts "<reference id='#{label}'>"
       else
-        "<reference>" + @lf
+        puts "<reference>"
       end
     end
 
     def ref_end(level)
-      "</reference>" + @lf
+      puts "</reference>"
     end
 
     def sup_begin(level, label, caption)
       if !label.nil?
-        "<supplement id='#{label}'>" + @lf
+        puts "<supplement id='#{label}'>"
       else
-        "<supplement>" + @lf
+        puts "<supplement>"
       end
     end
 
     def sup_end(level)
-      "</supplement>" + @lf
+      puts "</supplement>"
     end
 
     def flushright(lines)
-      if @book.config["deprecated-blocklines"].nil?
-        lines.join("").gsub("<p>", "<p align='right'>") + @lf
-      else
-        str = lines.map{|l| l.sub(/^<p>/,"").sub(/<\/p>$/,"")}.join("\n")
-        "<p align='right'>#{str}</p>" + @lf
-      end
+      puts split_paragraph(lines).join.gsub("<p>", "<p align='right'>")
     end
 
     def centering(lines)
-      lines.join("").gsub("<p>", "<p align='center'>") + @lf
+      puts split_paragraph(lines).join.gsub("<p>", "<p align='center'>")
     end
 
     def captionblock(type, lines, caption, specialstyle = nil)
-      buf = ""
-      buf << "<#{type}>"
+      print "<#{type}>"
       style = specialstyle.nil? ? "#{type}-title" : specialstyle
-      buf << "<title aid:pstyle='#{style}'>#{(caption)}</title>" + @lf unless caption.nil?
-      if @book.config["deprecated-blocklines"].nil?
-        buf << "#{lines.join}</#{type}>" << @lf
-      else
-        str = lines.map{|l| l.sub(/^<p>/,"").sub(/<\/p>$/,"")}.join("\n")
-        buf << "#{str}</#{type}>" << @lf
-      end
-      buf
+      puts "<title aid:pstyle='#{style}'>#{compile_inline(caption)}</title>" unless caption.nil?
+      blocked_lines = split_paragraph(lines)
+      puts "#{blocked_lines.join}</#{type}>"
     end
 
     def note(lines, caption = nil)
@@ -971,6 +942,10 @@ module ReVIEW
       captionblock("caution", lines, caption)
     end
 
+    def warning(lines, caption = nil)
+      captionblock("warning", lines, caption)
+    end
+
     def term(lines)
       captionblock("term", lines, nil)
     end
@@ -1016,9 +991,8 @@ module ReVIEW
     end
 
     def syntaxblock(type, lines, caption)
-      buf = ""
       if caption.nil?
-        buf << %Q[<#{type}>] << @lf
+        puts %Q[<#{type}>]
       else
         titleopentag = %Q[caption aid:pstyle="#{type}-title"]
         titleclosetag = "caption"
@@ -1026,24 +1000,22 @@ module ReVIEW
           titleopentag = %Q[floattitle type="insn"]
           titleclosetag = "floattitle"
         end
-        buf << %Q[<#{type}><#{titleopentag}>#{caption}</#{titleclosetag}>] << @lf
+        puts %Q[<#{type}><#{titleopentag}>#{compile_inline(caption)}</#{titleclosetag}>]
       end
       no = 1
       lines.each do |line|
-        line.chomp!
         unless @book.config["listinfo"].nil?
-          buf << %Q[<listinfo line="#{no}"]
-          buf << %Q[ begin="1"] if no == 1
-          buf << %Q[ end="#{no}"] if no == lines.size
-          buf << %Q[>]
+          print %Q[<listinfo line="#{no}"]
+          print %Q[ begin="1"] if no == 1
+          print %Q[ end="#{no}"] if no == lines.size
+          print %Q[>]
         end
-        buf << detab(line)
-        buf << "\n"
-        buf << "</listinfo>" unless @book.config["listinfo"].nil?
+        print detab(line)
+        print "\n"
+        print "</listinfo>" unless @book.config["listinfo"].nil?
         no += 1
       end
-      buf << "</#{type}>" << @lf
-      buf
+      puts "</#{type}>"
     end
 
     def insn(lines, caption = nil)
@@ -1055,24 +1027,22 @@ module ReVIEW
     end
 
     def indepimage(id, caption=nil, metric=nil)
-      buf = ""
       metrics = parse_metric("idgxml", metric)
-      buf << "<img>" << @lf
+      puts "<img>"
       begin
-        buf << %Q[<Image href="file://#{@chapter.image(id).path.sub(/\A\.\//, "")}"#{metrics} />] << @lf
+        puts %Q[<Image href="file://#{@chapter.image(id).path.sub(/\A\.\//, "")}"#{metrics} />]
       rescue
         warn %Q[no such image: #{id}]
       end
-      buf << %Q[<caption>#{caption}</caption>] + @lf if caption.present?
-      buf << "</img>" << @lf
-      buf
+      puts %Q[<caption>#{compile_inline(caption)}</caption>] if caption.present?
+      puts "</img>"
     end
 
     alias_method :numberlessimage, :indepimage
 
     def label(id)
       # FIXME
-      "<label id='#{id}' />"
+      print "<label id='#{id}' />"
     end
 
     def tsize(str)
@@ -1080,15 +1050,15 @@ module ReVIEW
     end
 
     def dtp(str)
-      %Q(<?dtp #{str} ?>)
+      print %Q(<?dtp #{str} ?>)
     end
 
     def hr
-      "<hr />"
+      print "<hr />"
     end
 
     def bpo(lines)
-      %Q[<bpo>#{lines.join("\n")}</bpo>] + @lf
+      puts %Q[<bpo>#{lines.join("\n")}</bpo>]
     end
 
     def inline_dtp(str)
@@ -1104,14 +1074,12 @@ module ReVIEW
     end
 
     def rawblock(lines)
-      buf = ""
       no = 1
       lines.each do |l|
-        buf << l.gsub("&lt;", "<").gsub("&gt;", ">").gsub("&quot;", "\"").gsub("&amp;", "&")
-        buf << "\n" unless lines.length == no
-        no = no + 1
+        print l.gsub("&lt;", "<").gsub("&gt;", ">").gsub("&quot;", "\"").gsub("&amp;", "&")
+        print "\n" unless lines.length == no
+        no += 1
       end
-      buf
     end
 
     def text(str)
@@ -1121,8 +1089,7 @@ module ReVIEW
     def inline_chapref(id)
       chs = ["", "「", "」"]
       unless @book.config["chapref"].nil?
-        _chs = convert_inencoding(@book.config["chapref"],
-                                  @book.config["inencoding"]).split(",")
+        _chs = @book.config["chapref"].split(",")
         if _chs.size != 3
           error "--chapsplitter must have exactly 3 parameters with comma."
         else
@@ -1165,39 +1132,31 @@ module ReVIEW
     end
 
     def source_header(caption)
-      buf = ""
-      buf << %Q[<source>] << @lf
-      buf << %Q[<caption>#{caption}</caption>] << @lf
-      buf
+      puts %Q[<source>]
+      puts %Q[<caption>#{compile_inline(caption)}</caption>]
     end
 
-    def source_body(lines)
-      buf = ""
-      buf << %Q[<pre>] << @lf
-      buf << codelines_body(lines)
-      buf << %Q[</pre></source>] << @lf
-      buf
+    def source_body(lines, lang)
+      puts %Q[<pre>]
+      codelines_body(lines)
+      puts %Q[</pre></source>]
     end
 
     def bibpaper(lines, id, caption)
-      buf = ""
-      buf << bibpaper_header(id, caption)
+      bibpaper_header id, caption
       unless lines.empty?
-        buf << bibpaper_bibpaper(id, caption, lines)
+        bibpaper_bibpaper id, caption, lines
       end
-      buf << %Q(</bibitem>) << @lf
-      buf
+      puts %Q(</bibitem>)
     end
 
     def bibpaper_header(id, caption)
-      buf = ""
-      buf << %Q(<bibitem id="bib-#{id}">) << @lf
-      buf << "<caption><span type='bibno'>[#{@chapter.bibpaper(id).number}] </span>#{caption}</caption>" << @lf
-      buf
+      puts %Q(<bibitem id="bib-#{id}">)
+      puts "<caption><span type='bibno'>[#{@chapter.bibpaper(id).number}] </span>#{compile_inline(caption)}</caption>"
     end
 
     def bibpaper_bibpaper(id, caption, lines)
-      lines.join("")
+        print split_paragraph(lines).join("")
     end
 
     def inline_bib(id)
@@ -1208,10 +1167,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}　#{chap.headline(id).caption}")
+          return I18n.t("chapter_quote", "#{n}　#{compile_inline(chap.headline(id).caption)}")
         end
       end
-      I18n.t("chapter_quote", chap.headline(id).caption)
+      I18n.t("chapter_quote", compile_inline(chap.headline(id).caption))
     end
 
     def inline_recipe(id)
@@ -1229,4 +1188,4 @@ module ReVIEW
 
   end
 
-end   # module ReVIEW
+end # module ReVIEW