review 2.0.0.beta1 → 2.0.0

data/lib/review/ewbbuilder.rb

@@ -34,7 +34,7 @@ module ReVIEW
 #     }
 
     def emlist(lines, caption = nil)
-      firstline = f.lineno
+      # firstline = f.lineno
       puts
       puts caption
       puts '//lst1'
@@ -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,4 +1,4 @@
 require 'review/extentions/object'
 require 'review/extentions/string'
-require 'review/extentions/array'
+require 'review/extentions/hash'
 

data/lib/review/extentions/hash.rb

@@ -0,0 +1,15 @@
+class Hash
+  def deep_merge!(other)
+    self.merge!(other) do |key, v_self, v_other|
+      if v_self.kind_of?(Hash) && v_other.kind_of?(Hash)
+        v_self.deep_merge(v_other)
+      else
+        v_other
+      end
+    end
+  end
+
+  def deep_merge(other)
+    self.dup.deep_merge!(other)
+  end
+end

data/lib/review/extentions/string.rb

@@ -1,4 +1,5 @@
-if defined?(Encoding) && Encoding.respond_to?("default_external")
+if defined?(Encoding) && Encoding.respond_to?("default_external") &&
+   Encoding.default_external != Encoding::UTF_8
   Encoding.default_external = "UTF-8"
 end
 

data/lib/review/htmlbuilder.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #
 # Copyright (c) 2002-2007 Minero Aoki
-#               2008-2014 Minero Aoki, Kenshi Muto, Masayoshi Takahashi,
+#               2008-2016 Minero Aoki, Kenshi Muto, Masayoshi Takahashi,
 #                         KADO Masanori
 #
 # This program is free software.
@@ -11,8 +11,9 @@
 
 require 'review/builder'
 require 'review/htmlutils'
-require 'review/htmllayout'
+require 'review/template'
 require 'review/textutils'
+require 'review/webtocprinter'
 
 module ReVIEW
 
@@ -22,18 +23,19 @@ module ReVIEW
     include HTMLUtils
 
     [:ref].each {|e| Compiler.definline(e) }
-    Compiler.defblock(:memo, 0..1)
-    Compiler.defblock(:tip, 0..1)
-    Compiler.defblock(:info, 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)
 
+    def pre_paragraph
+      '<p>'
+    end
+    def post_paragraph
+      '</p>'
+    end
+
     def extname
       ".#{@book.config["htmlext"]}"
     end
@@ -51,87 +53,57 @@ module ReVIEW
       @chapter.book.image_types = %w( .png .jpg .jpeg .gif .svg )
       @column = 0
       @sec_counter = SecCounter.new(5, @chapter)
+      @nonum_counter = 0
+      @body_ext = nil
+      @toc = nil
     end
     private :builder_init_file
 
     def result
-      layout_file = File.join(@book.basedir, "layouts", "layout.html.erb")
-      unless File.exist?(layout_file) # backward compatibility
-        layout_file = File.join(@book.basedir, "layouts", "layout.erb")
+      if @book.config.maker == "webmaker"
+        htmldir = "web/html"
+        localfilename = "layout-web.html.erb"
+      else
+        htmldir = "html"
+        localfilename = "layout.html.erb"
+      end
+      if @book.htmlversion == 5
+        htmlfilename = File.join(htmldir, "layout-html5.html.erb")
+      else
+        htmlfilename = File.join(htmldir, "layout-xhtml1.html.erb")
+      end
+
+      layout_file = File.join(@book.basedir, "layouts", localfilename)
+      if !File.exist?(layout_file) && File.exist?(File.join(@book.basedir, "layouts", "layout.erb"))
+        raise ReVIEW::ConfigError, "layout.erb is obsoleted. Please use layout.html.erb."
       end
       if File.exist?(layout_file)
         if ENV["REVIEW_SAFE_MODE"].to_i & 4 > 0
           warn "user's layout is prohibited in safe mode. ignored."
-        else
-          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(i.caption)}</li>\n"
-            if toc_level == i.number.size
-              # do nothing
-            elsif toc_level < i.number.size
-              toc += "<ul>\n" * (i.number.size - toc_level)
-              toc_level = i.number.size
-            elsif toc_level > i.number.size
-              toc += "</ul>\n" * (toc_level - i.number.size)
-              toc_level = i.number.size
-              toc += "<ul>\n" * (toc_level - 1)
-            end
-            toc += caption
-          end
-          toc += "</ul>" * toc_level
-
-          return messages() +
-            HTMLLayout.new(
-            {'body' => @output.string, 'title' => title, 'toc' => toc,
-             'builder' => self,
-             'next' => @chapter.next_chapter,
-             'prev' => @chapter.prev_chapter},
-            layout_file).result
+          layout_file = File.expand_path(htmlfilename, ReVIEW::Template::TEMPLATE_DIR)
         end
+      else
+        layout_file = File.expand_path(htmlfilename, ReVIEW::Template::TEMPLATE_DIR)
       end
 
       # default XHTML header/footer
-      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
-        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
+      @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"]
+      @next = @chapter.next_chapter
+      @prev = @chapter.prev_chapter
+      @next_title = @next ? compile_inline(@next.title) : ""
+      @prev_title = @prev ? compile_inline(@prev.title) : ""
+
+      if @book.config.maker == "webmaker"
+        @toc = ReVIEW::WEBTOCPrinter.book_to_string(@book)
       end
-      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
+
+      tmpl = ReVIEW::Template.load(layout_file)
+      tmpl.result(binding)
     end
 
     def xmlns_ops_prefix
@@ -170,7 +142,7 @@ EOT
       "<ul>\n" +
         @errors.map {|file, line, msg|
         "<li>#{escape_html(file)}:#{line}: #{escape_html(msg.to_s)}</li>\n"
-      }.join('') +
+        }.join('') +
       "</ul>\n"
     end
 
@@ -185,94 +157,122 @@ EOT
     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?
-        buf << a_id+"\n" unless label.nil?
+        puts a_id unless label.nil?
       else
         if label.nil?
-          buf << %Q[<h#{level}>#{a_id}#{prefix}#{caption}</h#{level}>\n]
+          puts %Q[<h#{level}>#{a_id}#{prefix}#{compile_inline(caption)}</h#{level}>]
         else
-          buf << %Q[<h#{level} id="#{normalize_id(label)}">#{a_id}#{prefix}#{caption}</h#{level}>\n]
+          puts %Q[<h#{level} id="#{normalize_id(label)}">#{a_id}#{prefix}#{compile_inline(caption)}</h#{level}>]
         end
       end
-      buf
     end
 
     def nonum_begin(level, label, caption)
-      buf = ""
-      buf << "\n" if level > 1
+      @nonum_counter += 1
+      puts '' if level > 1
       unless caption.empty?
         if label.nil?
-          buf << %Q[<h#{level}>#{caption}</h#{level}>\n]
+          id = normalize_id("#{@chapter.name}_nonum#{@nonum_counter}")
+          puts %Q[<h#{level} id="#{id}">#{compile_inline(caption)}</h#{level}>]
         else
-          buf << %Q[<h#{level} id="#{normalize_id(label)}">#{caption}</h#{level}>\n]
+          puts %Q[<h#{level} id="#{normalize_id(label)}">#{compile_inline(caption)}</h#{level}>]
         end
       end
-      buf
     end
 
     def nonum_end(level)
     end
 
+    def notoc_begin(level, label, caption)
+      @nonum_counter += 1
+      puts '' if level > 1
+      unless caption.empty?
+        if label.nil?
+          id = normalize_id("#{@chapter.name}_nonum#{@nonum_counter}")
+          puts %Q[<h#{level} id="#{id}" notoc="true">#{compile_inline(caption)}</h#{level}>]
+        else
+          puts %Q[<h#{level} id="#{normalize_id(label)}" notoc="true">#{compile_inline(caption)}</h#{level}>]
+        end
+      end
+    end
+
+    def notoc_end(level)
+    end
+
+    def nodisp_begin(level, label, caption)
+      @nonum_counter += 1
+      puts '' if level > 1
+      unless caption.empty?
+        if label.nil?
+          id = normalize_id("#{@chapter.name}_nonum#{@nonum_counter}")
+          puts %Q[<a id="#{id}" /><h#{level} id="#{id}" hidden="true">#{compile_inline(caption)}</h#{level}>]
+        else
+          puts %Q[<a id="#{normalize_id(label)}" /><h#{level} id="#{normalize_id(label)}" hidden="true">#{compile_inline(caption)}</h#{level}>]
+        end
+      end
+    end
+
+    def nodisp_end(level)
+    end
+
     def column_begin(level, label, caption)
-      buf = %Q[<div class="column">\n]
+      puts %Q[<div class="column">]
 
       @column += 1
-      buf << "\n" if level > 1
+      puts '' if level > 1
       a_id = %Q[<a id="column-#{@column}"></a>]
 
       if caption.empty?
-        buf << a_id + "\n" unless label.nil?
+        puts a_id unless label.nil?
       else
         if label.nil?
-          buf << %Q[<h#{level}>#{a_id}#{caption}</h#{level}>\n]
+          puts %Q[<h#{level}>#{a_id}#{compile_inline(caption)}</h#{level}>]
         else
-          buf << %Q[<h#{level} id="#{normalize_id(label)}">#{a_id}#{caption}</h#{level}>\n]
+          puts %Q[<h#{level} id="#{normalize_id(label)}">#{a_id}#{compile_inline(caption)}</h#{level}>]
         end
       end
-      buf
+#      headline(level, label, caption)
     end
 
     def column_end(level)
-      "</div>\n"
+      puts '</div>'
     end
 
     def xcolumn_begin(level, label, caption)
-      buf << %Q[<div class="xcolumn">\n]
-      buf << headline(level, label, caption)
-      buf
+      puts %Q[<div class="xcolumn">]
+      headline(level, label, caption)
     end
 
     def xcolumn_end(level)
-      "</div>\n"
+      puts '</div>'
     end
 
     def ref_begin(level, label, caption)
-      buf << %Q[<div class="reference">\n]
-      buf << headline(level, label, caption)
-      buf
+      print %Q[<div class="reference">]
+      headline(level, label, caption)
     end
 
     def ref_end(level)
-      "</div>\n"
+      puts '</div>'
     end
 
     def sup_begin(level, label, caption)
-      buf << %Q[<div class="supplement">\n]
-      buf << headline(level, label, caption)
-      buf
+      print %Q[<div class="supplement">]
+      headline(level, label, caption)
     end
 
     def sup_end(level)
-      "</div>\n"
+      puts '</div>'
     end
 
     def tsize(str)
@@ -280,17 +280,13 @@ EOT
     end
 
     def captionblock(type, lines, caption)
-      buf = %Q[<div class="#{type}">\n]
+      puts %Q[<div class="#{type}">]
       unless caption.nil?
-        buf << %Q[<p class="caption">#{caption}</p>\n]
+        puts %Q[<p class="caption">#{compile_inline(caption)}</p>]
       end
-      if @book.config["deprecated-blocklines"].nil?
-        buf << lines.join("")
-      else
-        error "deprecated-blocklines is obsoleted."
-      end
-      buf << "</div>\n"
-      buf
+      blocked_lines = split_paragraph(lines)
+      puts blocked_lines.join("\n")
+      puts '</div>'
     end
 
     def memo(lines, caption = nil)
@@ -329,6 +325,10 @@ EOT
       captionblock("notice", lines, caption)
     end
 
+    def warning(lines, caption = nil)
+      captionblock("warning", lines, caption)
+    end
+
     def point(lines, caption = nil)
       captionblock("point", lines, caption)
     end
@@ -338,14 +338,12 @@ EOT
     end
 
     def box(lines, caption = nil)
-      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
+      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>'
     end
 
     def note(lines, caption = nil)
@@ -353,300 +351,296 @@ EOT
     end
 
     def ul_begin
-      "<ul>\n"
+      puts '<ul>'
     end
 
     def ul_item(lines)
-      "<li>#{lines.map(&:to_s).join}</li>\n"
+      puts "<li>#{lines.join}</li>"
     end
 
     def ul_item_begin(lines)
-      "<li>#{lines.map(&:to_s).join}"
+      print "<li>#{lines.join}"
     end
 
     def ul_item_end
-      "</li>\n"
+      puts "</li>"
     end
 
     def ul_end
-      "</ul>\n"
+      puts '</ul>'
     end
 
     def ol_begin
       if @ol_num
-        num = @ol_num
+        puts "<ol start=\"#{@ol_num}\">" ## it's OK in HTML5, but not OK in XHTML1.1
         @ol_num = nil
-        "<ol start=\"#{num}\">\n"  ## it's OK in HTML5, but not OK in XHTML1.1
       else
-        "<ol>\n"
+        puts '<ol>'
       end
     end
 
     def ol_item(lines, num)
-      "<li>#{lines.map(&:to_s).join}</li>\n"
+      puts "<li>#{lines.join}</li>"
     end
 
     def ol_end
-      "</ol>\n"
+      puts '</ol>'
     end
 
     def dl_begin
-      "<dl>\n"
+      puts '<dl>'
     end
 
     def dt(line)
-      "<dt>#{line}</dt>\n"
+      puts "<dt>#{line}</dt>"
     end
 
     def dd(lines)
-      "<dd>#{lines.join}</dd>\n"
+      puts "<dd>#{lines.join}</dd>"
     end
 
     def dl_end
-      "</dl>\n"
+      puts '</dl>'
     end
 
     def paragraph(lines)
       if @noindent.nil?
-        "<p>#{lines.join}</p>\n"
+        puts "<p>#{lines.join}</p>"
       else
+        puts %Q[<p class="noindent">#{lines.join}</p>]
         @noindent = nil
-        %Q[<p class="noindent">#{lines.join}</p>\n]
       end
     end
 
-    def parasep()
-      "<br />\n"
+    def parasep
+      puts '<br />'
     end
 
     def read(lines)
-      if @book.config["deprecated-blocklines"].nil?
-        %Q[<div class="lead">\n#{lines.join("")}\n</div>\n]
-      else
-        error "deprecated-blocklines is obsoleted."
-      end
+      blocked_lines = split_paragraph(lines)
+      puts %Q[<div class="lead">\n#{blocked_lines.join("\n")}\n</div>]
     end
 
     alias_method :lead, :read
 
     def list(lines, id, caption, lang = nil)
-      buf = %Q[<div class="caption-code">\n]
+      puts %Q[<div class="caption-code">]
       begin
-        buf << list_header(id, caption, lang)
+        list_header id, caption, lang
       rescue KeyError
         error "no such list: #{id}"
       end
-      buf << list_body(id, lines, lang)
-      buf << "</div>\n"
-      buf
+      list_body id, lines, lang
+      puts '</div>'
     end
 
     def list_header(id, caption, lang)
       if get_chap.nil?
-        %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]
+        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>]
       else
-        %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]
+        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>]
       end
     end
 
     def list_body(id, lines, lang)
       id ||= ''
-      buf = %Q[<pre class="list">]
+      print %Q[<pre class="list">]
       body = lines.inject(''){|i, j| i + detab(j) + "\n"}
       lexer = lang || File.extname(id).gsub(/\./, '')
-      buf << highlight(:body => body, :lexer => lexer, :format => 'html')
-      buf << "</pre>\n"
-      buf
+      puts highlight(:body => body, :lexer => lexer, :format => 'html')
+      puts '</pre>'
     end
 
-    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
+    def source(lines, caption = nil, lang = nil)
+      puts %Q[<div class="source-code">]
+      source_header caption
+      source_body caption, lines, lang
+      puts '</div>'
     end
 
     def source_header(caption)
       if caption.present?
-        %Q[<p class="caption">#{caption}</p>\n]
+        puts %Q[<p class="caption">#{compile_inline(caption)}</p>]
       end
     end
 
-    def source_body(id, lines)
+    def source_body(id, lines, lang)
       id ||= ''
-      buf = %Q[<pre class="source">]
+      print %Q[<pre class="source">]
       body = lines.inject(''){|i, j| i + detab(j) + "\n"}
-      lexer = File.extname(id).gsub(/\./, '')
-      buf << highlight(:body => body, :lexer => lexer, :format => 'html')
-      buf << "</pre>\n"
-      buf
+      lexer = lang || File.extname(id).gsub(/\./, '')
+      puts highlight(:body => body, :lexer => lexer, :format => 'html')
+      puts '</pre>'
     end
 
     def listnum(lines, id, caption, lang = nil)
-      buf = %Q[<div class="code">\n]
+      puts %Q[<div class="code">]
       begin
-        buf << list_header(id, caption, lang)
+        list_header id, caption, lang
       rescue KeyError
         error "no such list: #{id}"
       end
-      buf << listnum_body(lines, lang)
-      buf << "</div>"
-      buf
+      listnum_body lines, lang
+      puts '</div>'
     end
 
     def listnum_body(lines, lang)
-      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
+      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
     end
 
     def emlist(lines, caption = nil, lang = nil)
-      buf = %Q[<div class="emlist-code">\n]
+      puts %Q[<div class="emlist-code">]
       if caption.present?
-        buf << %Q(<p class="caption">#{caption}</p>\n)
+        puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
       end
-      buf << %Q[<pre class="emlist">]
+      print %Q[<pre class="emlist">]
       body = lines.inject(''){|i, j| i + detab(j) + "\n"}
       lexer = lang
-      buf << highlight(:body => body, :lexer => lexer, :format => 'html')
-      buf << "</pre>\n"
-      buf << "</div>\n"
-      buf
+      puts highlight(:body => body, :lexer => lexer, :format => 'html')
+      puts '</pre>'
+      puts '</div>'
     end
 
     def emlistnum(lines, caption = nil, lang = nil)
-      buf = %Q[<div class="emlistnum-code">\n]
+      puts %Q[<div class="emlistnum-code">]
       if caption.present?
-        buf << %Q(<p class="caption">#{caption}</p>\n)
+        puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
       end
-      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
+
+      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>'
+      end
+
+      puts '</div>'
     end
 
     def cmd(lines, caption = nil)
-      buf = %Q[<div class="cmd-code">\n]
+      puts %Q[<div class="cmd-code">]
       if caption.present?
-        buf << %Q(<p class="caption">#{caption}</p>\n)
+        puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
       end
-      buf << %Q[<pre class="cmd">]
+      print %Q[<pre class="cmd">]
       body = lines.inject(''){|i, j| i + detab(j) + "\n"}
       lexer = 'shell-session'
-      buf << highlight(:body => body, :lexer => lexer, :format => 'html')
-      buf << "</pre>\n"
-      buf << "</div>\n"
-      buf
+      puts highlight(:body => body, :lexer => lexer, :format => 'html')
+      puts '</pre>'
+      puts '</div>'
     end
 
     def quotedlist(lines, css_class)
-      buf = %Q[<blockquote><pre class="#{css_class}">\n]
+      print %Q[<blockquote><pre class="#{css_class}">]
       lines.each do |line|
-        buf << detab(line) << "\n"
+        puts detab(line)
       end
-      buf << "</pre></blockquote>\n"
+      puts '</pre></blockquote>'
     end
     private :quotedlist
 
     def quote(lines)
-      if @book.config["deprecated-blocklines"].nil?
-        "<blockquote>#{lines.join("")}</blockquote>\n"
-      else
-        error "deprecated-blocklines is obsoleted."
-      end
+      blocked_lines = split_paragraph(lines)
+      puts "<blockquote>#{blocked_lines.join("\n")}</blockquote>"
     end
 
     def doorquote(lines, ref)
-      buf = ""
-      if @book.config["deprecated-blocklines"].nil?
-        buf << %Q[<blockquote style="text-align:right;">\n]
-        buf << "#{lines.join("")}\n"
-        buf << %Q[<p>#{ref}より</p>\n]
-        buf << %Q[</blockquote>\n]
-      else
-        error "deprecated-blocklines is obsoleted."
-      end
-      buf
+      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>]
     end
 
     def talk(lines)
-      buf = ""
-      buf << %Q[<div class="talk">\n]
-      if @book.config["deprecated-blocklines"].nil?
-        buf << "#{lines.join("\n")}\n"
-      else
-        error "deprecated-blocklines is obsoleted."
-      end
-      buf << "</div>\n"
-      buf
+      puts %Q[<div class="talk">]
+      blocked_lines = split_paragraph(lines)
+      puts "#{blocked_lines.join("\n")}"
+      puts '</div>'
     end
 
     def texequation(lines)
-      buf << %Q[<div class="equation">\n]
+      puts %Q[<div class="equation">]
       if @book.config["mathml"]
         require 'math_ml'
         require 'math_ml/symbol/character_reference'
         p = MathML::LaTeX::Parser.new(:symbol=>MathML::Symbol::CharacterReference)
-        buf << p.parse(unescape_html(lines.join("\n")), true) << "\n
+        puts p.parse(unescape_html(lines.join("\n")), true)
       else
-        buf << '<pre>'
-        buf << "#{lines.join("\n")}\n"
-        buf << "</pre>\n"
+        print '<pre>'
+        puts "#{lines.join("\n")}"
+        puts '</pre>'
       end
-      buf << "</div>\n"
-      buf
+      puts '</div>'
     end
 
     def handle_metric(str)
       if str =~ /\Ascale=([\d.]+)\Z/
-        return "width=\"#{($1.to_f * 100).round}%\""
+        return {'class' => sprintf("width-%03dper", ($1.to_f * 100).round)}
       else
         k, v = str.split('=', 2)
-        return %Q|#{k}=\"#{v.sub(/\A&quot;/, '').sub(/\A["']/, '').sub(/&quot;\Z/, '').sub(/["']\Z/, '')}\"|
+        return {k => v.sub(/\A["']/, '').sub(/["']\Z/, '')}
       end
     end
 
     def result_metric(array)
-      " #{array.join(' ')}"
+      attrs = {}
+      array.each do |item|
+        k = item.keys[0]
+        if attrs[k]
+          attrs[k] << item[k]
+        else
+          attrs[k] = [item[k]]
+        end
+      end
+      " "+attrs.map{|k, v| %Q|#{k}="#{v.join(' ')}"| }.join(' ')
     end
 
     def image_image(id, caption, metric)
       metrics = parse_metric("html", metric)
-      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
+      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>]
     end
 
     def image_dummy(id, caption, lines)
-      buf = %Q[<div class="image">\n]
-      buf << %Q[<pre class="dummyimage">\n]
+      puts %Q[<div class="image">]
+      puts %Q[<pre class="dummyimage">]
       lines.each do |line|
-        buf << detab(line) << "\n"
+        puts detab(line)
       end
-      buf << %Q[</pre>\n]
-      buf << image_header(id, caption)
-      buf << %Q[</div>\n]
+      puts %Q[</pre>]
+      image_header id, caption
+      puts %Q[</div>]
       warn "no such image: #{id}"
-      buf
     end
 
     def image_header(id, caption)
-      buf = %Q[<p class="caption">\n]
+      puts %Q[<p class="caption">]
       if get_chap.nil?
-        buf << %Q[#{I18n.t("image")}#{I18n.t("format_number_header_without_chapter", [@chapter.image(id).number])}#{I18n.t("caption_prefix")}#{caption}\n]
+        puts %Q[#{I18n.t("image")}#{I18n.t("format_number_header_without_chapter", [@chapter.image(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}]
       else
-        buf << %Q[#{I18n.t("image")}#{I18n.t("format_number_header", [get_chap, @chapter.image(id).number])}#{I18n.t("caption_prefix")}#{caption}\n]
+        puts %Q[#{I18n.t("image")}#{I18n.t("format_number_header", [get_chap, @chapter.image(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}]
       end
-      buf << %Q[</p>\n]
-      buf
+      puts %Q[</p>]
     end
 
     def table(lines, id = nil, caption = nil)
@@ -664,49 +658,48 @@ EOT
       rows = adjust_n_cols(rows)
 
       if id
-        buf = %Q[<div id="#{normalize_id(id)}" class="table">\n]
+        puts %Q[<div id="#{normalize_id(id)}" class="table">]
       else
-        buf = %Q[<div class="table">\n]
+        puts %Q[<div class="table">]
       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
-      buf << table_begin(rows.first.size)
+      table_begin rows.first.size
       return if rows.empty?
       if sepidx
         sepidx.times do
-          buf << tr(rows.shift.map {|s| th(s) })
+          tr rows.shift.map {|s| th(s) }
         end
         rows.each do |cols|
-          buf << tr(cols.map {|s| td(s) })
+          tr cols.map {|s| td(s) }
         end
       else
         rows.each do |cols|
           h, *cs = *cols
-          buf << tr([th(h)] + cs.map {|s| td(s) })
+          tr [th(h)] + cs.map {|s| td(s) }
         end
       end
-      buf << table_end
-      buf << %Q[</div>\n]
-      buf
+      table_end
+      puts %Q[</div>]
     end
 
     def table_header(id, caption)
       if get_chap.nil?
-        %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]
+        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>]
       else
-        %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]
+        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>]
       end
     end
 
     def table_begin(ncols)
-      "<table>\n"
+      puts '<table>'
     end
 
     def tr(rows)
-      "<tr>#{rows.join}</tr>\n"
+      puts "<tr>#{rows.join}</tr>"
     end
 
     def th(str)
@@ -718,73 +711,95 @@ EOT
     end
 
     def table_end
-      "</table>\n"
+      puts '</table>'
+    end
+
+    def imgtable(lines, id, caption = nil, metric = nil)
+      if !@chapter.image(id).bound?
+        warn "image not bound: #{id}"
+        image_dummy id, caption, lines
+        return
+      end
+
+      puts %Q[<div id="#{normalize_id(id)}" class="imgtable image">]
+      begin
+        table_header id, caption unless caption.nil?
+      rescue KeyError
+        error "no such table: #{id}"
+      end
+
+      imgtable_image(id, caption, metric)
+
+      puts %Q[</div>]
+    end
+
+    def imgtable_image(id, caption, metric)
+      metrics = parse_metric("html", metric)
+      puts %Q[<img src="#{@chapter.image(id).path.sub(/\A\.\//, "")}" alt="#{escape_html(compile_inline(caption))}"#{metrics} />]
     end
 
     def comment(lines, comment = nil)
       lines ||= []
       lines.unshift comment unless comment.blank?
       if @book.config["draft"]
-        str = lines.map{|line| escape_html(line) }.join("<br />")
-        return %Q(<div class="draft-comment">#{str}</div>\n)
+        str = lines.join("<br />")
+        puts %Q(<div class="draft-comment">#{str}</div>)
       else
         str = lines.join("\n")
-        return %Q(<!-- #{escape_comment(str)} -->\n)
+        puts %Q(<!-- #{escape_comment(str)} -->)
       end
     end
 
     def footnote(id, str)
       if @book.config["epubversion"].to_i == 3
-        %Q(<div class="footnote" epub:type="footnote" id="fn-#{normalize_id(id)}"><p class="footnote">[*#{@chapter.footnote(id).number}] #{str}</p></div>\n)
+        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>)
       else
-        %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)
+        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>)
       end
     end
 
     def indepimage(id, caption="", metric=nil)
       metrics = parse_metric("html", metric)
       caption = "" if caption.nil?
-      buf = %Q[<div class="image">\n]
+      puts %Q[<div class="image">]
       begin
-        buf << %Q[<img src="#{@chapter.image(id).path.sub(/\A\.\//, "")}" alt="#{escape_html(caption)}"#{metrics} />\n]
+        puts %Q[<img src="#{@chapter.image(id).path.sub(/\A\.\//, "")}" alt="#{escape_html(compile_inline(caption))}"#{metrics} />]
       rescue
-        buf << %Q[<pre>missing image: #{id}</pre>\n]
+        puts %Q[<pre>missing image: #{id}</pre>]
       end
 
       unless caption.empty?
-        buf << %Q[<p class="caption">\n]
-        buf << %Q[#{I18n.t("numberless_image")}#{I18n.t("caption_prefix")}#{caption}\n]
-        buf << %Q[</p>\n]
+        puts %Q[<p class="caption">]
+        puts %Q[#{I18n.t("numberless_image")}#{I18n.t("caption_prefix")}#{compile_inline(caption)}]
+        puts %Q[</p>]
       end
-      buf << %Q[</div>\n]
-      buf
+      puts %Q[</div>]
     end
 
     alias_method :numberlessimage, :indepimage
 
     def hr
-      "<hr />\n"
+      puts "<hr />"
     end
 
     def label(id)
-      %Q(<a id="#{normalize_id(id)}"></a>\n)
+      puts %Q(<a id="#{normalize_id(id)}"></a>)
     end
 
     def linebreak
-      "<br />\n"
+      puts "<br />"
     end
 
     def pagebreak
-      %Q(<br class="pagebreak" />\n)
+      puts %Q(<br class="pagebreak" />)
     end
 
     def bpo(lines)
-      buf = "<bpo>\n"
+      puts "<bpo>"
       lines.each do |line|
-        buf << detab(line) + "\n"
+        puts detab(line)
       end
-      buf << "</bpo>\n"
-      buf
+      puts "</bpo>"
     end
 
     def noindent
@@ -792,7 +807,7 @@ EOT
     end
 
     def inline_labelref(idref)
-      %Q[<a target='#{(idref)}'>「#{I18n.t("label_marker")}#{(idref)}」</a>]
+      %Q[<a target='#{escape_html(idref)}'>「#{I18n.t("label_marker")}#{escape_html(idref)}」</a>]
     end
 
     alias_method :inline_ref, :inline_labelref
@@ -841,10 +856,10 @@ EOT
     end
 
     def compile_ruby(base, 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>]
+      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>]
       else
-        %Q[<ruby><rb>#{(base)}</rb><rp>#{I18n.t("ruby_prefix")}</rp><rt>#{ruby}</rt><rp>#{I18n.t("ruby_postfix")}</rp></ruby>]
+        %Q[<ruby><rb>#{escape_html(base)}</rb><rp>#{I18n.t("ruby_prefix")}</rp><rt>#{ruby}</rt><rp>#{I18n.t("ruby_postfix")}</rp></ruby>]
       end
     end
 
@@ -858,34 +873,34 @@ EOT
     end
 
     def inline_i(str)
-      %Q(<i>#{str}</i>)
+      %Q(<i>#{escape_html(str)}</i>)
     end
 
     def inline_b(str)
-      %Q(<b>#{str}</b>)
+      %Q(<b>#{escape_html(str)}</b>)
     end
 
     def inline_ami(str)
-      %Q(<span class="ami">#{(str)}</span>)
+      %Q(<span class="ami">#{escape_html(str)}</span>)
     end
 
     def inline_bou(str)
-      %Q(<span class="bou">#{(str)}</span>)
+      %Q(<span class="bou">#{escape_html(str)}</span>)
     end
 
     def inline_tti(str)
-      if @book.config["htmlversion"].to_i == 5
-        %Q(<code class="tt"><i>#{(str)}</i></code>)
+      if @book.htmlversion == 5
+        %Q(<code class="tt"><i>#{escape_html(str)}</i></code>)
       else
-        %Q(<tt><i>#{(str)}</i></tt>)
+        %Q(<tt><i>#{escape_html(str)}</i></tt>)
       end
     end
 
     def inline_ttb(str)
-      if @book.config["htmlversion"].to_i == 5
-        %Q(<code class="tt"><b>#{(str)}</b></code>)
+      if @book.htmlversion == 5
+        %Q(<code class="tt"><b>#{escape_html(str)}</b></code>)
       else
-        %Q(<tt><b>#{(str)}</b></tt>)
+        %Q(<tt><b>#{escape_html(str)}</b></tt>)
       end
     end
 
@@ -894,15 +909,15 @@ EOT
     end
 
     def inline_code(str)
-      if @book.config["htmlversion"].to_i == 5
-        %Q(<code class="inline-code tt">#{(str)}</code>)
+      if @book.htmlversion == 5
+        %Q(<code class="inline-code tt">#{escape_html(str)}</code>)
       else
-        %Q(<tt class="inline-code">#{(str)}</tt>)
+        %Q(<tt class="inline-code">#{escape_html(str)}</tt>)
       end
     end
 
     def inline_idx(str)
-      %Q(#{(str)}<!-- IDX:#{escape_comment(escape_html(str))} -->)
+      %Q(#{escape_html(str)}<!-- IDX:#{escape_comment(escape_html(str))} -->)
     end
 
     def inline_hidx(str)
@@ -921,7 +936,7 @@ EOT
           :symbol => MathML::Symbol::CharacterReference)
         %Q[<span class="equation">#{parser.parse(str, nil)}</span>]
       else
-        %Q[<span class="equation">#{(str)}</span>]
+        %Q[<span class="equation">#{escape_html(str)}</span>]
       end
     end
 
@@ -930,36 +945,35 @@ EOT
     end
 
     def bibpaper(lines, id, caption)
-      buf = %Q[<div class="bibpaper">\n]
-      buf << bibpaper_header(id, caption)
+      puts %Q[<div class="bibpaper">]
+      bibpaper_header id, caption
       unless lines.empty?
-        buf << bibpaper_bibpaper(id, caption, lines)
+        bibpaper_bibpaper id, caption, lines
       end
-      buf << "</div>" << "\n"
-      buf
+      puts "</div>"
     end
 
     def bibpaper_header(id, caption)
-      buf = %Q(<a id="bib-#{normalize_id(id)}">)
-      buf << "[#{@chapter.bibpaper(id).number}]"
-      buf << %Q(</a>)
-      buf << " #{(caption)}" << "\n"
+      print %Q(<a id="bib-#{normalize_id(id)}">)
+      print "[#{@chapter.bibpaper(id).number}]"
+      print %Q(</a>)
+      puts " #{compile_inline(caption)}"
     end
 
     def bibpaper_bibpaper(id, caption, lines)
-      lines.join("")
+      print split_paragraph(lines).join("")
     end
 
     def inline_bib(id)
-      %Q(<a href="#{@book.bib_file.gsub(/re\Z/, "html")}#bib-#{normalize_id(id)}">[#{@chapter.bibpaper(id).number}]</a>)
+      %Q(<a href="#{@book.bib_file.gsub(/\.re\Z/, ".#{@book.config['htmlext']}")}#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} #{chap.headline(id).caption}")
+        str = I18n.t("chapter_quote", "#{n} #{compile_inline(chap.headline(id).caption)}")
       else
-        str = I18n.t("chapter_quote", chap.headline(id).caption)
+        str = I18n.t("chapter_quote", compile_inline(chap.headline(id).caption))
       end
       if @book.config["chapterlink"]
         anchor = "h"+n.gsub(/\./, "-")
@@ -975,15 +989,12 @@ EOT
     end
     private :column_label
 
-    def inline_column(id)
+    def inline_column_chap(chapter, id)
       if @book.config["chapterlink"]
-        %Q(<a href="\##{column_label(id)}" class="columnref">#{I18n.t("column", (@chapter.column(id).caption))}</a>)
+        %Q(<a href="\##{column_label(id)}" class="columnref">#{I18n.t("column", escape_html(chapter.column(id).caption))}</a>)
       else
-        I18n.t("column", (@chapter.column(id).caption))
+        I18n.t("column", escape_html(chapter.column(id).caption))
       end
-    rescue KeyError
-      error "unknown column: #{id}"
-      nofunc_text("[UnknownColumn:#{id}]")
     end
 
     def inline_list(id)
@@ -1035,7 +1046,7 @@ EOT
     end
 
     def inline_asis(str, tag)
-      %Q(<#{tag}>#{(str)}</#{tag}>)
+      %Q(<#{tag}>#{escape_html(str)}</#{tag}>)
     end
 
     def inline_abbr(str)
@@ -1091,10 +1102,10 @@ EOT
     end
 
     def inline_tt(str)
-      if @book.config["htmlversion"].to_i == 5
-        %Q(<code class="tt">#{(str)}</code>)
+      if @book.htmlversion == 5
+        %Q(<code class="tt">#{escape_html(str)}</code>)
       else
-        %Q(<tt>#{(str)}</tt>)
+        %Q(<tt>#{escape_html(str)}</tt>)
       end
     end
 
@@ -1107,11 +1118,11 @@ EOT
     end
 
     def inline_u(str)
-      %Q(<u>#{(str)}</u>)
+      %Q(<u>#{escape_html(str)}</u>)
     end
 
     def inline_recipe(str)
-      %Q(<span class="recipe">「#{(str)}」</span>)
+      %Q(<span class="recipe">「#{escape_html(str)}」</span>)
     end
 
     def inline_icon(id)
@@ -1128,12 +1139,19 @@ EOT
 
     def inline_comment(str)
       if @book.config["draft"]
-        %Q(<span class="draft-comment">#{(str)}</span>)
+        %Q(<span class="draft-comment">#{escape_html(str)}</span>)
       else
         %Q(<!-- #{escape_comment(escape_html(str))} -->)
       end
     end
 
+    def inline_tcy(str)
+      # 縦中横用のtcy、uprightのCSSスタイルについては電書協ガイドラインを参照
+      style = "tcy"
+      style = "upright" if str.size == 1 && str.match(/[[:ascii:]]/)
+      %Q[<span class="#{style}">#{escape_html(str)}</span>]
+    end
+
     def inline_raw(str)
       super(str)
     end
@@ -1143,21 +1161,19 @@ EOT
     end
 
     def compile_href(url, label)
-      %Q(<a href="#{escape_html(url)}" class="link">#{label.nil? ? (url) : (label)}</a>)
+      if @book.config["externallink"]
+        %Q(<a href="#{escape_html(url)}" class="link">#{label.nil? ? escape_html(url) : escape_html(label)}</a>)
+      else
+        label.nil? ? escape_html(url) : I18n.t('external_link', [escape_html(label), escape_html(url)])
+      end
     end
 
     def flushright(lines)
-      result = ""
-      if @book.config["deprecated-blocklines"].nil?
-        result << lines.join("").gsub("<p>", "<p class=\"flushright\">")
-      else
-        error "deprecated-blocklines is obsoleted."
-      end
-      result
+      puts split_paragraph(lines).join("\n").gsub("<p>", "<p class=\"flushright\">")
     end
 
     def centering(lines)
-      lines.join("").gsub("<p>", "<p class=\"center\">")
+      puts split_paragraph(lines).join("\n").gsub("<p>", "<p class=\"center\">")
     end
 
     def image_ext
@@ -1169,4 +1185,4 @@ EOT
     end
   end
 
-end   # module ReVIEW
+end # module ReVIEW