review 1.2.0 → 1.3.0

data/lib/review/ewbbuilder.rb

@@ -1,4 +1,4 @@
-# -*- coding: euc-jp -*-
+# -*- coding: utf-8 -*-
 # $Id: ewbbuilder.rb 2195 2005-11-13 21:52:18Z aamine $
 
 require 'review/builder'
@@ -6,9 +6,7 @@ require 'review/textutils'
 require 'review/exception'
 
 module ReVIEW
-
   class EWBBuilder < Builder
-
     include TextUtils
 
     def initialize(chap)
@@ -39,7 +37,7 @@ module ReVIEW
       firstline = f.lineno
       puts
       puts caption
-      puts "//lst1"
+      puts '//lst1'
       lines.each do |line|
         if noescape
           puts detab(line)
@@ -60,7 +58,7 @@ module ReVIEW
     def cmd(lines, caption = nil)
       puts
       puts caption
-      puts "//sc1{"
+      puts '//sc1{'
       lines.each do |line|
         if noescape
           puts detab(line)
@@ -128,7 +126,7 @@ module ReVIEW
       output.puts '//}'
     end
 
-    LI = '��'
+    LI = '●'
 
     def ul_begin
       puts
@@ -165,7 +163,8 @@ module ReVIEW
     end
 
     def vspace
-      print %Q|\n//h|
+      print %Q(
+//h)
     end
 
     def noindent
@@ -224,7 +223,7 @@ module ReVIEW
         base = key
         ext = '.eps'
       end
-      currname = "images/ch_#{chapter_id()}_#{base}#{ext}"
+      currname = "images/ch_#{chapter_id}_#{base}#{ext}"
       destname = "images/fig#{figure_number(base)}#{ext}"
       unless File.exist? currname
         # error "image file not exist: #{currname}"
@@ -233,12 +232,12 @@ module ReVIEW
     end
 
     def image_label(str)
-      "#{chapter_id()}:#{str}"
+      "#{chapter_id}:#{str}"
     end
 
     def text(str)
       str = str.gsub(/\t/, ' ')
-      str.gsub(/([^@^]+)|\^(.*?)\^|@<(\w+)>\{(.*?)\}|@\{(.*?)\}|([@^])/) {
+      str.gsub(/([^@^]+)|\^(.*?)\^|@<(\w+)>\{(.*?)\}|@\{(.*?)\}|([@^])/) do
         if normal = $1
           escape(normal)
         elsif tt = $2
@@ -253,7 +252,7 @@ module ReVIEW
         else
           error "unknown inline: #{str.inspect}"
         end
-      }
+      end
     rescue DocumentError => e
       error e.message
       return 'ERROR'
@@ -263,11 +262,11 @@ module ReVIEW
       word, eng, abbr = arg.split(/,/).map {|s| s.strip }
       if abbr
         add_index(word) + "//g{#{word}//}" +
-        add_index(abbr) + "��#{abbr}, " +
-        add_index(eng)  + "#{eng}��"
+        add_index(abbr) + "（#{abbr}, " +
+        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
@@ -307,7 +306,7 @@ module ReVIEW
       "//ruby{#{arg}//}"
     end
 
-    NAKAGURO = '��'
+    NAKAGURO = '・'
 
     def inline_bou(str)
       "//ruby{#{escape(str)},#{NAKAGURO * char_length(str)}//}"
@@ -325,42 +324,41 @@ module ReVIEW
       "//LaTeX{ $#{arg}$ //}"
     end
 
-
     def chapter_id
       File.basename(@filename, '.rd')
     end
 
     def chapter_prefix
-      sprintf('%02d', @chapter_table.number(chapter_id()))
+      sprintf('%02d', @chapter_table.number(chapter_id))
     end
 
-    def chapter_number( key )
-      curr = @chapter_table.number(chapter_id())
+    def chapter_number(key)
+      curr = @chapter_table.number(chapter_id)
       dest = @chapter_table.number(key)
 
-      case chapter_id()
+      case chapter_id
       when /\.ewb\z/, 'tmp', 'temp'
-        return '��' + dest + '��'
+        return '第' + dest + '章'
       end
       if dest == curr + 1
-        '����'
+        '次章'
       elsif dest == curr - 1
-        '����'
+        '前章'
       else
-        "��#{dest}��"
+        "第#{dest}章"
       end
     end
 
     def chapter_name(key)
-      '��' + text(@chapter_table.title(key)) + '��'
+      '『' + text(@chapter_table.title(key)) + '』'
     end
 
     def list_number(key)
-      sprintf(chapter_prefix() + '%02d0', @list_table.number(key))
+      sprintf(chapter_prefix + '%02d0', @list_table.number(key))
     end
 
     def figure_number(key)
-      sprintf(chapter_prefix() + '%02d0', @figure_table.number(key))
+      sprintf(chapter_prefix + '%02d0', @figure_table.number(key))
     end
 
     def footnote_number(key)
@@ -373,13 +371,11 @@ module ReVIEW
     end
 
     def index_number(n)
-      900000 + @chapter_index.number(chapter_id()) * 1000 + n
+      900_000 + @chapter_index.number(chapter_id) * 1000 + n
     end
 
     def escape(str)
-      str.gsub(%r<//>, '////')
+      str.gsub(%r{//}, '////')
     end
-
   end
-
 end

data/lib/review/extentions/string.rb

@@ -5,19 +5,19 @@ end
 unless String.method_defined?(:lines)
   # Ruby 1.8
   class String
-    alias lines to_a
+    alias_method :lines, :to_a
   end
 end
 
 if String.method_defined?(:bytesize)
   # Ruby 1.9
   class String
-    alias charsize size
+    alias_method :charsize, :size
   end
 else
   # Ruby 1.8
   class String
-    alias bytesize size
+    alias_method :bytesize, :size
 
     def charsize
       split(//).size
@@ -28,6 +28,6 @@ end
 unless String.method_defined?(:each)
   # Ruby 1.9
   class String
-    alias each each_line
+    alias_method :each, :each_line
   end
 end

data/lib/review/htmlbuilder.rb

@@ -43,7 +43,7 @@ module ReVIEW
     end
 
     def extname
-      ".#{ReVIEW.book.param["htmlext"]}"
+      ".#{@book.config["htmlext"]}"
     end
 
     def builder_init(no_error = false)
@@ -65,54 +65,82 @@ module ReVIEW
     def result
       layout_file = File.join(@book.basedir, "layouts", "layout.erb")
       if File.exist?(layout_file)
-        title = convert_outencoding(strip_html(compile_inline(@chapter.title)), ReVIEW.book.param["outencoding"])
-        messages() +
-          HTMLLayout.new(@output.string, title, layout_file).result
-      else
-        # default XHTML header/footer
-        header = <<EOT
-<?xml version="1.0" encoding="#{ReVIEW.book.param["outencoding"] || :UTF-8}"?>
+        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(compile_inline(@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"
+            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
+        end
+      end
+
+      # default XHTML header/footer
+      header = <<EOT
+<?xml version="1.0" encoding="#{@book.config["outencoding"] || :UTF-8}"?>
 EOT
-        if ReVIEW.book.param["htmlversion"].to_i == 5
-          header += <<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="#{ReVIEW.book.param["language"]}">
+<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="#{ReVIEW.book.param["outencoding"] || :UTF-8}" />
+  <meta charset="#{@book.config["outencoding"] || :UTF-8}" />
 EOT
-        else
-          header += <<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="#{ReVIEW.book.param["language"]}">
+<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=#{ReVIEW.book.param["outencoding"] || :UTF-8}" />
+  <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
+      end
 
-        unless ReVIEW.book.param["stylesheet"].nil?
-          ReVIEW.book.param["stylesheet"].each do |style|
-            header += <<EOT
+      unless @book.config["stylesheet"].nil?
+        @book.config["stylesheet"].each do |style|
+          header += <<EOT
   <link rel="stylesheet" type="text/css" href="#{style}" />
 EOT
-          end
         end
-        header += <<EOT
+      end
+      header += <<EOT
   <meta name="generator" content="Re:VIEW" />
-  <title>#{convert_outencoding(strip_html(compile_inline(@chapter.title)), ReVIEW.book.param["outencoding"])}</title>
+  <title>#{convert_outencoding(strip_html(compile_inline(@chapter.title)), @book.config["outencoding"])}</title>
 </head>
 <body>
 EOT
-        footer = <<EOT
+      footer = <<EOT
 </body>
 </html>
 EOT
-        header + messages() + convert_outencoding(@output.string, ReVIEW.book.param["outencoding"]) + footer
-      end
+      header + messages() + convert_outencoding(@output.string, @book.config["outencoding"]) + footer
     end
 
     def xmlns_ops_prefix
-      if ReVIEW.book.param["epubversion"].to_i == 3
+      if @book.config["epubversion"].to_i == 3
         "epub"
       else
         "ops"
@@ -164,7 +192,7 @@ EOT
     def headline_prefix(level)
       @sec_counter.inc(level)
       anchor = @sec_counter.anchor(level)
-      prefix = @sec_counter.prefix(level, ReVIEW.book.param["secnolevel"])
+      prefix = @sec_counter.prefix(level, @book.config["secnolevel"])
       [prefix, anchor]
     end
     private :headline_prefix
@@ -182,7 +210,7 @@ EOT
         if label.nil?
           puts %Q[<h#{level}>#{a_id}#{prefix}#{compile_inline(caption)}</h#{level}>]
         else
-          puts %Q[<h#{level} id="#{label}">#{a_id}#{prefix}#{compile_inline(caption)}</h#{level}>]
+          puts %Q[<h#{level} id="#{normalize_id(label)}">#{a_id}#{prefix}#{compile_inline(caption)}</h#{level}>]
         end
       end
     end
@@ -193,7 +221,7 @@ EOT
         if label.nil?
           puts %Q[<h#{level}>#{compile_inline(caption)}</h#{level}>]
         else
-          puts %Q[<h#{level} id="#{label}">#{compile_inline(caption)}</h#{level}>]
+          puts %Q[<h#{level} id="#{normalize_id(label)}">#{compile_inline(caption)}</h#{level}>]
         end
       end
     end
@@ -214,7 +242,7 @@ EOT
         if label.nil?
           puts %Q[<h#{level}>#{a_id}#{compile_inline(caption)}</h#{level}>]
         else
-          puts %Q[<h#{level} id="#{label}">#{a_id}#{compile_inline(caption)}</h#{level}>]
+          puts %Q[<h#{level} id="#{normalize_id(label)}">#{a_id}#{compile_inline(caption)}</h#{level}>]
         end
       end
 #      headline(level, label, caption)
@@ -260,7 +288,7 @@ EOT
       unless caption.nil?
         puts %Q[<p class="caption">#{compile_inline(caption)}</p>]
       end
-      if ReVIEW.book.param["deprecated-blocklines"].nil?
+      if @book.config["deprecated-blocklines"].nil?
         blocked_lines = split_paragraph(lines)
         puts blocked_lines.join("\n")
       else
@@ -388,12 +416,12 @@ EOT
       end
     end
 
-    def parasep()
+    def parasep
       puts '<br />'
     end
 
     def read(lines)
-      if ReVIEW.book.param["deprecated-blocklines"].nil?
+      if @book.config["deprecated-blocklines"].nil?
         blocked_lines = split_paragraph(lines)
         puts %Q[<div class="lead">\n#{blocked_lines.join("\n")}\n</div>]
       else
@@ -401,7 +429,7 @@ EOT
       end
     end
 
-    alias :lead read
+    alias_method :lead, :read
 
     def list(lines, id, caption)
       puts %Q[<div class="caption-code">]
@@ -515,7 +543,7 @@ EOT
     private :quotedlist
 
     def quote(lines)
-      if ReVIEW.book.param["deprecated-blocklines"].nil?
+      if @book.config["deprecated-blocklines"].nil?
         blocked_lines = split_paragraph(lines)
         puts "<blockquote>#{blocked_lines.join("\n")}</blockquote>"
       else
@@ -524,7 +552,7 @@ EOT
     end
 
     def doorquote(lines, ref)
-      if ReVIEW.book.param["deprecated-blocklines"].nil?
+      if @book.config["deprecated-blocklines"].nil?
         blocked_lines = split_paragraph(lines)
         puts %Q[<blockquote style="text-align:right;">]
         puts "#{blocked_lines.join("\n")}"
@@ -543,7 +571,7 @@ QUOTE
 
     def talk(lines)
       puts %Q[<div class="talk">]
-      if ReVIEW.book.param["deprecated-blocklines"].nil?
+      if @book.config["deprecated-blocklines"].nil?
         blocked_lines = split_paragraph(lines)
         puts "#{blocked_lines.join("\n")}"
       else
@@ -556,7 +584,7 @@ QUOTE
 
     def texequation(lines)
       puts %Q[<div class="equation">]
-      if ReVIEW.book.param["mathml"]
+      if @book.config["mathml"]
         p = MathML::LaTeX::Parser.new(:symbol=>MathML::Symbol::CharacterReference)
         puts p.parse(unescape_html(lines.join("\n")), true)
       else
@@ -582,7 +610,7 @@ QUOTE
 
     def image_image(id, caption, metric)
       metrics = parse_metric("html", metric)
-      puts %Q[<div class="image">]
+      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>]
@@ -623,7 +651,11 @@ QUOTE
       end
       rows = adjust_n_cols(rows)
 
-      puts %Q[<div class="table">]
+      if id
+        puts %Q[<div id="#{normalize_id(id)}" class="table">]
+      else
+        puts %Q[<div class="table">]
+      end
       begin
         table_header id, caption unless caption.nil?
       rescue KeyError
@@ -679,20 +711,20 @@ QUOTE
     def comment(lines, comment = nil)
       lines ||= []
       lines.unshift comment unless comment.blank?
-      if ReVIEW.book.param["draft"]
-        str = lines.map{|line| escape_html(line) }.join("<br />")
+      if @book.config["draft"]
+        str = lines.join("<br />")
         puts %Q(<div class="draft-comment">#{str}</div>)
       else
         str = lines.join("\n")
-        puts %Q(<!-- #{escape_html(str)} -->)
+        puts %Q(<!-- #{escape_comment(str)} -->)
       end
     end
 
     def footnote(id, str)
-      if ReVIEW.book.param["epubversion"].to_i == 3
-        puts %Q(<div class="footnote" epub:type="footnote" id="fn-#{id}"><p class="footnote">[*#{@chapter.footnote(id).number}] #{compile_inline(str)}</p></div>)
+      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>)
       else
-        puts %Q(<div class="footnote"><p class="footnote">[<a id="fn-#{id}">*#{@chapter.footnote(id).number}</a>] #{compile_inline(str)}</p></div>)
+        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
 
@@ -714,14 +746,14 @@ QUOTE
       puts %Q[</div>]
     end
 
-    alias :numberlessimage indepimage
+    alias_method :numberlessimage, :indepimage
 
     def hr
       puts "<hr />"
     end
 
     def label(id)
-      puts %Q(<a id="#{id}"></a>)
+      puts %Q(<a id="#{normalize_id(id)}"></a>)
     end
 
     def linebreak
@@ -748,12 +780,12 @@ QUOTE
       %Q[<a target='#{escape_html(idref)}'>「●●　#{escape_html(idref)}」</a>]
     end
 
-    alias inline_ref inline_labelref
+    alias_method :inline_ref, :inline_labelref
 
     def inline_chapref(id)
       title = super
-      if ReVIEW.book.param["chapterlink"]
-        %Q(<a href="./#{id}.html">#{title}</a>)
+      if @book.config["chapterlink"]
+        %Q(<a href="./#{id}#{extname}">#{title}</a>)
       else
         title
       end
@@ -763,8 +795,8 @@ QUOTE
     end
 
     def inline_chap(id)
-      if ReVIEW.book.param["chapterlink"]
-        %Q(<a href="./#{id}.html">#{@chapter.env.chapter_index.number(id)}</a>)
+      if @book.config["chapterlink"]
+        %Q(<a href="./#{id}#{extname}">#{@chapter.env.chapter_index.number(id)}</a>)
       else
         @chapter.env.chapter_index.number(id)
       end
@@ -774,8 +806,8 @@ QUOTE
     end
 
     def inline_title(id)
-      if ReVIEW.book.param["chapterlink"]
-        %Q(<a href="./#{id}.html">#{compile_inline(@chapter.env.chapter_index.title(id))}</a>)
+      if @book.config["chapterlink"]
+        %Q(<a href="./#{id}#{extname}">#{compile_inline(@chapter.env.chapter_index.title(id))}</a>)
       else
         @chapter.env.chapter_index.title(id)
       end
@@ -785,15 +817,15 @@ QUOTE
     end
 
     def inline_fn(id)
-      if ReVIEW.book.param["epubversion"].to_i == 3
-        %Q(<a href="#fn-#{id}" class="noteref" epub:type="noteref">*#{@chapter.footnote(id).number}</a>)
+      if @book.config["epubversion"].to_i == 3
+        %Q(<a id="fnb-#{normalize_id(id)}" href="#fn-#{normalize_id(id)}" class="noteref" epub:type="noteref">*#{@chapter.footnote(id).number}</a>)
       else
-        %Q(<a href="#fn-#{id}" class="noteref">*#{@chapter.footnote(id).number}</a>)
+        %Q(<a id="fnb-#{normalize_id(id)}" href="#fn-#{normalize_id(id)}" class="noteref">*#{@chapter.footnote(id).number}</a>)
       end
     end
 
     def compile_ruby(base, ruby)
-      if ReVIEW.book.param["htmlversion"].to_i == 5
+      if @book.config["htmlversion"].to_i == 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>#{escape_html(base)}</rb><rp>#{I18n.t("ruby_prefix")}</rp><rt>#{ruby}</rt><rp>#{I18n.t("ruby_postfix")}</rp></ruby>]
@@ -806,7 +838,7 @@ QUOTE
         then escape_html(word + " (#{alt.strip})")
         else escape_html(word)
         end +
-        "</b><!-- IDX:#{escape_html(word)} -->"
+        "</b><!-- IDX:#{escape_comment(escape_html(word))} -->"
     end
 
     def inline_i(str)
@@ -826,7 +858,7 @@ QUOTE
     end
 
     def inline_tti(str)
-      if ReVIEW.book.param["htmlversion"].to_i == 5
+      if @book.config["htmlversion"].to_i == 5
         %Q(<code class="tt"><i>#{escape_html(str)}</i></code>)
       else
         %Q(<tt><i>#{escape_html(str)}</i></tt>)
@@ -834,7 +866,7 @@ QUOTE
     end
 
     def inline_ttb(str)
-      if ReVIEW.book.param["htmlversion"].to_i == 5
+      if @book.config["htmlversion"].to_i == 5
         %Q(<code class="tt"><b>#{escape_html(str)}</b></code>)
       else
         %Q(<tt><b>#{escape_html(str)}</b></tt>)
@@ -846,7 +878,7 @@ QUOTE
     end
 
     def inline_code(str)
-      if ReVIEW.book.param["htmlversion"].to_i == 5
+      if @book.config["htmlversion"].to_i == 5
         %Q(<code class="inline-code tt">#{escape_html(str)}</code>)
       else
         %Q(<tt class="inline-code">#{escape_html(str)}</tt>)
@@ -854,11 +886,11 @@ QUOTE
     end
 
     def inline_idx(str)
-      %Q(#{escape_html(str)}<!-- IDX:#{escape_html(str)} -->)
+      %Q(#{escape_html(str)}<!-- IDX:#{escape_comment(escape_html(str))} -->)
     end
 
     def inline_hidx(str)
-      %Q(<!-- IDX:#{escape_html(str)} -->)
+      %Q(<!-- IDX:#{escape_comment(escape_html(str))} -->)
     end
 
     def inline_br(str)
@@ -866,7 +898,7 @@ QUOTE
     end
 
     def inline_m(str)
-      if ReVIEW.book.param["mathml"]
+      if @book.config["mathml"]
         p = MathML::LaTeX::Parser.new(:symbol=>MathML::Symbol::CharacterReference)
         %Q[<span class="equation">#{p.parse(str, nil)}</span>]
       else
@@ -888,7 +920,7 @@ QUOTE
     end
 
     def bibpaper_header(id, caption)
-      print %Q(<a id="bib-#{id}">)
+      print %Q(<a id="bib-#{normalize_id(id)}">)
       print "[#{@chapter.bibpaper(id).number}]"
       print %Q(</a>)
       puts " #{compile_inline(caption)}"
@@ -904,19 +936,36 @@ QUOTE
 
     def inline_hd_chap(chap, id)
       n = chap.headline_index.number(id)
-      if chap.number and ReVIEW.book.param["secnolevel"] >= n.split('.').size
+      if chap.number and @book.config["secnolevel"] >= n.split('.').size
         str = "「#{n} #{compile_inline(chap.headline(id).caption)}」"
       else
         str = "「#{compile_inline(chap.headline(id).caption)}」"
       end
-      if ReVIEW.book.param["chapterlink"]
+      if @book.config["chapterlink"]
         anchor = "h"+n.gsub(/\./, "-")
-        %Q(<a href="#{chap.id}.html\##{anchor}">#{str}</a>)
+        %Q(<a href="#{chap.id}#{extname}##{anchor}">#{str}</a>)
       else
         str
       end
     end
 
+    def column_label(id)
+      num = @chapter.column(id).number
+      "column-#{num}"
+    end
+    private :column_label
+
+    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>)
+      else
+        escape_html(@chapter.column(id).caption)
+      end
+    rescue KeyError
+      error "unknown column: #{id}"
+      nofunc_text("[UnknownColumn:#{id}]")
+    end
+
     def inline_list(id)
       chapter, id = extract_chapter_id(id)
       if get_chap(chapter).nil?
@@ -931,10 +980,16 @@ QUOTE
 
     def inline_table(id)
       chapter, id = extract_chapter_id(id)
+      str = nil
       if get_chap(chapter).nil?
-        "#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [chapter.table(id).number])}"
+        str = "#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [chapter.table(id).number])}"
+      else
+        str = "#{I18n.t("table")}#{I18n.t("format_number", [get_chap(chapter), chapter.table(id).number])}"
+      end
+      if @book.config["chapterlink"]
+        %Q(<a href="./#{chapter.id}#{extname}##{id}">#{str}</a>)
       else
-        "#{I18n.t("table")}#{I18n.t("format_number", [get_chap(chapter), chapter.table(id).number])}"
+        str
       end
     rescue KeyError
       error "unknown table: #{id}"
@@ -943,10 +998,16 @@ QUOTE
 
     def inline_img(id)
       chapter, id = extract_chapter_id(id)
+      str = nil
       if get_chap(chapter).nil?
-        "#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [chapter.image(id).number])}"
+        str = "#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [chapter.image(id).number])}"
+      else
+        str = "#{I18n.t("image")}#{I18n.t("format_number", [get_chap(chapter), chapter.image(id).number])}"
+      end
+      if @book.config["chapterlink"]
+        %Q(<a href="./#{chapter.id}#{extname}##{normalize_id(id)}">#{str}</a>)
       else
-        "#{I18n.t("image")}#{I18n.t("format_number", [get_chap(chapter), chapter.image(id).number])}"
+        str
       end
     rescue KeyError
       error "unknown image: #{id}"
@@ -1010,7 +1071,7 @@ QUOTE
     end
 
     def inline_tt(str)
-      if ReVIEW.book.param["htmlversion"].to_i == 5
+      if @book.config["htmlversion"].to_i == 5
         %Q(<code class="tt">#{escape_html(str)}</code>)
       else
         %Q(<tt>#{escape_html(str)}</tt>)
@@ -1046,10 +1107,10 @@ QUOTE
     end
 
     def inline_comment(str)
-      if ReVIEW.book.param["draft"]
+      if @book.config["draft"]
         %Q(<span class="draft-comment">#{escape_html(str)}</span>)
       else
-        %Q(<!-- #{escape_html(str)} -->)
+        %Q(<!-- #{escape_comment(escape_html(str))} -->)
       end
     end
 
@@ -1066,7 +1127,7 @@ QUOTE
     end
 
     def flushright(lines)
-      if ReVIEW.book.param["deprecated-blocklines"].nil?
+      if @book.config["deprecated-blocklines"].nil?
         puts split_paragraph(lines).join("\n").gsub("<p>", "<p class=\"flushright\">")
       else
         puts %Q[<div style="text-align:right;">]