review 0.9.0 → 1.0.0

data/lib/review/latexbuilder.rb

@@ -21,7 +21,7 @@ module ReVIEW
     include LaTeXUtils
     include TextUtils
 
-    [:icon, :dtp, :hd_chap].each {|e|
+    [:dtp, :hd_chap].each {|e|
       Compiler.definline(e)
     }
 
@@ -73,11 +73,14 @@ module ReVIEW
 
     def headline(level, label, caption)
       prefix = ""
-      if level > ReVIEW.book.param["secnolevel"]
+      if level > ReVIEW.book.param["secnolevel"] || (@chapter.number.to_s.empty? && level > 1)
         prefix = "*"
       end
       blank unless @output.pos == 0
       puts macro(HEADLINE[level]+prefix, compile_inline(caption))
+      if level == 1
+        puts macro('label', chapter_label)
+      end
     end
 
     def nonum_begin(level, label, caption)
@@ -90,7 +93,7 @@ module ReVIEW
 
     def column_begin(level, label, caption)
       blank
-      ## puts '\vspace{2zw}' 
+      ## puts '\vspace{2zw}'
 ##      puts '\begin{center}'
 ##      puts '\begin{minipage}{1.0\linewidth}'
 ##      puts '\begin{framed}'
@@ -112,19 +115,22 @@ module ReVIEW
       blank
     end
 
-    def minicolumn(type, lines, caption)
+    def captionblock(type, lines, caption)
       puts "\\begin{reviewminicolumn}\n"
       unless caption.nil?
         puts "\\reviewminicolumntitle{#{compile_inline(caption)}}\n"
       end
-      lines.each {|l|
-        puts l
-      }
-      puts "\\end{reviewminicolumn}\n"
-    end
 
-    def memo(lines, caption = nil)
-      minicolumn("memo", lines, caption)
+      if ReVIEW.book.param["deprecated-blocklines"].nil?
+        blocked_lines = split_paragraph(lines)
+        puts blocked_lines.join("\n\n")
+      else
+        lines.each do |line|
+          puts line
+        end
+      end
+
+      puts "\\end{reviewminicolumn}\n"
     end
 
     def ul_begin
@@ -133,7 +139,7 @@ module ReVIEW
     end
 
     def ul_item(lines)
-      puts '\item ' + lines.join("\n")
+      puts '\item ' + lines.join
     end
 
     def ul_end
@@ -147,7 +153,7 @@ module ReVIEW
     end
 
     def ol_item(lines, num)
-      puts '\item ' + lines.join("\n")
+      puts '\item ' + lines.join
     end
 
     def ol_end
@@ -165,9 +171,7 @@ module ReVIEW
     end
 
     def dd(lines)
-      lines.each do |line|
-        puts line
-      end
+      puts lines.join
     end
 
     def dl_end
@@ -193,8 +197,11 @@ module ReVIEW
 
     alias lead read
 
-    def emlist(lines)
+    def emlist(lines, caption = nil)
       blank
+      if caption
+        puts macro('reviewemlistcaption', "#{compile_inline(caption)}")
+      end
       puts '\begin{reviewemlist}'
       puts '\begin{alltt}'
       lines.each do |line|
@@ -205,8 +212,11 @@ module ReVIEW
       blank
     end
 
-    def emlistnum(lines)
+    def emlistnum(lines, caption = nil)
       blank
+      if caption
+        puts macro('reviewemlistcaption', "#{compile_inline(caption)}")
+      end
       puts '\begin{reviewemlist}'
       puts '\begin{alltt}'
       lines.each_with_index do |line, i|
@@ -225,12 +235,15 @@ module ReVIEW
       end
       puts '\end{alltt}'
       puts '\end{reviewlist}'
-      puts
+      blank
 
      end
 
-    def cmd(lines)
+    def cmd(lines, caption = nil)
       blank
+      if caption
+        puts macro('reviewcmdcaption', "#{compile_inline(caption)}")
+      end
       puts '\begin{reviewcmd}'
       puts '\begin{alltt}'
       lines.each do |line|
@@ -242,7 +255,7 @@ module ReVIEW
     end
 
     def list_header(id, caption)
-      puts macro('reviewlistcaption', "リスト#{@chapter.number}.#{@chapter.list(id).number}: #{compile_inline(caption)}")
+      puts macro('reviewlistcaption', "#{I18n.t("list")}#{I18n.t("format_number_header", [@chapter.number, @chapter.list(id).number])} #{compile_inline(caption)}")
     end
 
     def list_body(lines)
@@ -280,13 +293,18 @@ module ReVIEW
     def image_header(id, caption)
     end
 
+    def result_metric(array)
+      "#{array.join(',')}"
+    end
+
     def image_image(id, caption, metric)
+      metrics = parse_metric("latex", metric)
       # image is always bound here
       puts '\begin{reviewimage}'
-      if metric
-        puts "\\includegraphics[#{metric}]{#{@chapter.image(id).path}}"
+      if !metrics.empty?
+        puts "\\includegraphics[#{metrics}]{#{@chapter.image(id).path}}"
       else
-        puts macro('includegraphics', @chapter.image(id).path)
+        puts "\\includegraphics[width=\\maxwidth]{#{@chapter.image(id).path}}"
       end
       puts macro('label', image_label(id))
       if !caption.empty?
@@ -319,12 +337,18 @@ module ReVIEW
     end
     private :image_label
 
+    def chapter_label()
+      "chap:#{@chapter.id}"
+    end
+    private :chapter_label
+
     def indepimage(id, caption=nil, metric=nil)
+      metrics = parse_metric("latex", metric)
       puts '\begin{reviewimage}'
-      if metric
-        puts "\\includegraphics[#{metric}]{#{@chapter.image(id).path}}"
+      if !metrics.empty?
+        puts "\\includegraphics[#{metrics}]{#{@chapter.image(id).path}}"
       else
-        puts macro('includegraphics', @chapter.image(id).path)
+        puts "\\includegraphics[width=\\maxwidth]{#{@chapter.image(id).path}}"
       end
       if !caption.nil? && !caption.empty?
         puts macro('caption', compile_inline(caption))
@@ -439,7 +463,9 @@ module ReVIEW
     end
 
     def comment(str)
-      puts "% #{str}"
+      if ReVIEW.book.param["draft"]
+        puts macro('pdfcomment', escape(str))
+      end
     end
 
     def label(id)
@@ -455,9 +481,43 @@ module ReVIEW
     end
 
     def noindent
-      puts '\noindent'
+      print '\noindent'
+    end
+
+    def inline_chapref(id)
+      if ReVIEW.book.param["chapterlink"]
+        "\\hyperref[chap:#{id}]{#{@chapter.env.chapter_index.display_string(id)}}"
+      else
+        @chapter.env.chapter_index.display_string(id)
+      end
+    rescue KeyError
+      error "unknown chapter: #{id}"
+      nofunc_text("[UnknownChapter:#{id}]")
     end
 
+    def inline_chap(id)
+      if ReVIEW.book.param["chapterlink"]
+        "\\hyperref[chap:#{id}]{#{@chapter.env.chapter_index.number(id)}}"
+      else
+        @chapter.env.chapter_index.number(id)
+      end
+    rescue KeyError
+      error "unknown chapter: #{id}"
+      nofunc_text("[UnknownChapter:#{id}]")
+    end
+
+    def inline_title(id)
+      if ReVIEW.book.param["chapterlink"]
+        "\\hyperref[chap:#{id}]{#{@chapter.env.chapter_index.title(id)}}"
+      else
+        @chapter.env.chapter_index.title(id)
+      end
+    rescue KeyError
+      error "unknown chapter: #{id}"
+      nofunc_text("[UnknownChapter:#{id}]")
+    end
+
+
     # FIXME: use TeX native label/ref.
     def inline_list(id)
       chapter, id = extract_chapter_id(id)
@@ -475,10 +535,18 @@ module ReVIEW
     end
 
     def footnote(id, content)
+      if ReVIEW.book.param["footnotetext"]
+        puts macro("footnotetext[#{@chapter.footnote(id).number}]",
+                   compile_inline(content.strip))
+      end
     end
 
     def inline_fn(id)
-      macro('footnote', compile_inline(@chapter.footnote(id).content.strip))
+      if ReVIEW.book.param["footnotetext"]
+        macro("footnotemark[#{@chapter.footnote(id).number}]", "")
+      else
+        macro('footnote', compile_inline(@chapter.footnote(id).content.strip))
+      end
     end
 
     BOUTEN = "・"
@@ -554,12 +622,16 @@ module ReVIEW
       macro('texttt', macro('textbf', escape(str)))
     end
 
+    def inline_bib(id)
+      "[#{@chapter.bibpaper(id).number}]"
+    end
+
     def inline_hd_chap(chap, id)
       "「#{chap.headline_index.number(id)} #{chap.headline(id).caption}」"
     end
 
     def inline_raw(str)
-      escape(str)
+      super(str)
     end
 
     def inline_sub(str)
@@ -591,6 +663,22 @@ module ReVIEW
       macro('UTF', escape(str))
     end
 
+    def inline_comment(str)
+      if ReVIEW.book.param["draft"]
+        macro('pdfcomment', escape(str))
+      end
+    end
+
+    def bibpaper_header(id, caption)
+      puts "[#{@chapter.bibpaper(id).number}] #{compile_inline(caption)}"
+    end
+
+    def bibpaper_bibpaper(id, caption, lines)
+      lines.each do |line|
+        puts detab(line)
+      end
+    end
+
     def index(str)
       str.sub!(/\(\)/, '')
       decl = ''
@@ -618,9 +706,12 @@ module ReVIEW
     end
 
     def compile_href(url, label)
-      label ||=  url
       if /\A[a-z]+:\/\// =~ url
-        macro("href", url, escape(label))
+        if label
+          macro("href", escape_url(url), escape(label))
+        else
+          macro("url", escape_url(url))
+        end
       else
         macro("ref", url)
       end
@@ -634,6 +725,10 @@ module ReVIEW
       @latex_tsize = str
     end
 
+    def image_ext
+      "svg"
+    end
+
   end
 
 end

data/lib/review/latexutils.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 #
 # $Id: latexutils.rb 2204 2006-03-18 06:10:26Z aamine $
 #
@@ -26,7 +27,19 @@ module ReVIEW
       '|' => '\textbar{}',
       '<'  => '\textless{}',
       '>'  => '\textgreater{}',
-      "\\" => '\reviewbackslash{}'
+      "\\" => '\reviewbackslash{}',
+
+      '⓪' => '\UTF{24EA}',
+      '①' => '\UTF{2460}',
+      '②' => '\UTF{2461}',
+      '③' => '\UTF{2462}',
+      '④' => '\UTF{2463}',
+      '⑤' => '\UTF{2464}',
+      '⑥' => '\UTF{2465}',
+      '⑦' => '\UTF{2466}',
+      '⑧' => '\UTF{2467}',
+      '⑨' => '\UTF{2468}',
+      '⑩' => '\UTF{2469}',
     }
 
     METACHARS_RE = /[#{Regexp.escape(MATACHARS.keys.join(''))}]/
@@ -52,6 +65,10 @@ module ReVIEW
       str.gsub(/[@!|"]/) {|s| '"' + s }
     end
 
+    def escape_url(str)
+      str.gsub(/[\#%]/) {|s| '\\'+s }
+    end
+
     def macro(name, *args)
       "\\#{name}" + args.map {|a| "{#{a}}" }.join('')
     end

data/lib/review/textbuilder.rb

@@ -0,0 +1,17 @@
+# textbuilder.rb
+#
+# Copyright (c) 2010 Kenshi Muto
+#
+# This program is free software.
+# You can distribute or modify this program under the terms of
+# the GNU LGPL, Lesser General Public License version 2.1.
+#
+
+require 'review/topbuilder'
+
+module ReVIEW
+
+  class TEXTBuilder < TOPBuilder
+  end
+
+end   # module ReVIEW

data/lib/review/tocparser.rb

@@ -34,6 +34,7 @@ module ReVIEW
       path = []
 
       while line = f.gets
+        line.sub!(/\A\xEF\xBB\xBF/, '') # remove BOM
         case line
         when /\A\s*\z/
           ;
@@ -45,6 +46,7 @@ module ReVIEW
             path.push Chapter.new(get_label(line), id, filename)
             roots.push path.first
           end
+          next if get_label(line) =~ /\A\[\// # ex) "[/column]"
           new = Section.new(lev, get_label(line))
           until path.last.level < new.level
             path.pop
@@ -324,7 +326,7 @@ module ReVIEW
     def toc
       @toc ||= TOCParser.parse(self)
       unless @toc.size == 1
-        $stderr.puts "warning: chapter #{title} contains more than 1 chapter"
+        $stderr.puts "warning: chapter #{@toc.join} contains more than 1 chapter"
       end
       @toc.first
     end

data/lib/review/tocprinter.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # $Id: tocprinter.rb 4309 2009-07-19 04:15:02Z aamine $
 #

data/lib/review/topbuilder.rb

@@ -1,7 +1,7 @@
-# $Id: topbuilder.rb 4304 2009-07-01 12:03:39Z kmuto $
+# encoding: utf-8
 #
 # Copyright (c) 2002-2006 Minero Aoki
-#               2008-2009 Minero Aoki, Kenshi Muto
+#               2008-2010 Minero Aoki, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -17,18 +17,12 @@ module ReVIEW
 
     include TextUtils
 
-    [:i, :tt, :ttbold, :tti, :idx, :hidx, :dtp, :sup, :sub, :hint, :raw, :maru, :keytop, :labelref, :ref, :pageref, :u, :icon, :balloon].each {|e|
+    [:ttbold, :hint, :maru, :keytop, :labelref, :ref, :pageref, :balloon].each {|e|
       Compiler.definline(e)
     }
     Compiler.defsingle(:dtp, 1)
-    Compiler.defsingle(:raw, 1)
-    Compiler.defsingle(:indepimage, 1)
-    Compiler.defsingle(:label, 1)
-    Compiler.defsingle(:tsize, 1)
 
     Compiler.defblock(:insn, 1)
-    Compiler.defblock(:flushright, 0)
-    Compiler.defblock(:note, 0..1)
     Compiler.defblock(:memo, 0..1)
     Compiler.defblock(:tip, 0..1)
     Compiler.defblock(:info, 0..1)
@@ -43,12 +37,67 @@ module ReVIEW
     Compiler.defblock(:term, 0)
     Compiler.defblock(:practice, 0)
     Compiler.defblock(:expert, 0)
-    Compiler.defblock(:lead, 0)
+
+    def pre_paragraph
+      ''
+    end
+
+    def post_paragraph
+      ''
+    end
+
+    def extname
+      '.txt'
+    end
 
     def builder_init_file
       @section = 0
+      @subsection = 0
+      @subsubsection = 0
+      @subsubsubsection = 0
       @blank_seen = true
-      @choice = nil
+
+      @titles = {
+        "emlist" => "インラインリスト",
+        "cmd" => "コマンド",
+        "quote" => "引用",
+        "flushright" => "右寄せ",
+        "note" => "ノート",
+        "memo" => "メモ",
+        "important" => "重要",
+        "info" => "情報",
+        "planning" => "プランニング",
+        "shoot" => "トラブルシュート",
+        "term" => "用語解説",
+        "notice" => "注意",
+        "caution" => "警告",
+        "point" => "ここがポイント",
+        "reference" => "参考",
+        "link" => "リンク",
+        "best" => "ベストプラクティス",
+        "practice" => "練習問題",
+        "security" => "セキュリティ",
+        "expert" => "エキスパートに訊け",
+        "tip" => "TIP",
+        "box" => "書式",
+        "insn" => "書式",
+        "column" => "コラム",
+        "xcolumn" => "コラムパターン2",
+        "world" => "Worldコラム",
+        "hood" => "Under The Hoodコラム",
+        "edition" => "Editionコラム",
+        "insideout" => "InSideOutコラム",
+        "ref" => "参照",
+        "sup" => "補足",
+        "read" => "リード",
+        "lead" => "リード",
+        "list" => "リスト",
+        "image" => "図",
+        "texequation" => "TeX式",
+        "table" => "表",
+        "bpo" => "bpo",
+        "source" => "ソースコードリスト",
+      }
     end
     private :builder_init_file
 
@@ -87,33 +136,42 @@ module ReVIEW
     end
 
     def headline(level, label, caption)
-      # FIXME: handling label
+      prefix = ""
       blank
       case level
       when 1
-        puts "■H1■第#{@chapter.number}章　#{caption}"
+        if @chapter.number.to_s =~ /\A\d+\Z/
+          prefix = "第#{@chapter.number}章　"
+        elsif !@chapter.number.nil? && !@chapter.number.to_s.empty?
+          prefix = "#{@chapter.number}　"
+        end
+        @section = 0
+        @subsection = 0
+        @subsubsection = 0
+        @subsubsubsection = 0
       when 2
-        puts "■H2■#{@chapter.number}.#{@section += 1}　#{caption}"
+        @section += 1
+        prefix = (!@chapter.number.nil? && !@chapter.number.to_s.empty?) ? "#{@chapter.number}.#{@section}　" : ""
+        @subsection = 0
+        @subsubsection = 0
+        @subsubsubsection = 0
       when 3
-        puts "■H3■#{caption}"
+        @subsection += 1
+        prefix = (!@chapter.number.nil? && !@chapter.number.to_s.empty?) ? "#{@chapter.number}.#{@section}.#{@subsection}　" : ""
+        @subsubsection = 0
+        @subsubsubsection = 0
       when 4
-        puts "■H4■#{caption}"
+        @subsubsection += 1
+        prefix = (!@chapter.number.nil? && !@chapter.number.to_s.empty?) ? "#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}　" : ""
+        @subsubsubsection = 0
       when 5
-        puts "■H5■#{caption}"
+        @subsubsubsection += 1
+        prefix = (!@chapter.number.nil? && !@chapter.number.to_s.empty?) ? "#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}.#{@subsubsubsection}　" : ""
       else
         raise "caption level too deep or unsupported: #{level}"
       end
-    end
-
-    def column_begin(level, label, caption)
-      blank
-      puts "◆→開始:コラム←◆"
-      puts "■#{caption}"
-    end
-
-    def column_end(level)
-      puts "◆→終了:コラム←◆"
-      blank
+      prefix = "" if (level.to_i > ReVIEW.book.param["secnolevel"])
+      puts "■H#{level}■#{prefix}#{compile_inline(caption)}"
     end
 
     def ul_begin
@@ -121,42 +179,20 @@ module ReVIEW
     end
 
     def ul_item(lines)
-      print @choice.nil? ? "●" : @choice
-      puts "\t#{lines.join('')}"
+      puts "●\t#{lines.join}"
     end
 
     def ul_end
       blank
     end
 
-    def choice_single_begin
-      @choice = "○"
-      blank
-    end
-
-    def choice_single_end
-      @choice = nil
-      blank
-    end
-
-    def choice_multi_begin
-      @choice = "□"
-      blank
-    end
-
-    def choice_multi_end
-      @choice = nil
-      blank
-    end
-
     def ol_begin
       blank
       @olitem = 0
     end
 
     def ol_item(lines, num)
-      #puts "#{@olitem += 1}\t#{lines.join('')}"
-      puts "#{num}\t#{lines.join('')}"
+      puts "#{num}\t#{lines.join}"
     end
 
     def ol_end
@@ -178,74 +214,128 @@ module ReVIEW
       end
     end
 
-    def split_paragraph(lines)
-      lines.map {|line| line.strip }.join("\n").strip.split("\n\n")
-    end
-
     def dl_end
       blank
     end
 
     def paragraph(lines)
-      puts lines.join('')
+      puts lines.join
     end
 
     def read(lines)
-      puts "◆→開始:リード←◆"
-      paragraph(lines)
-      puts "◆→終了:リード←◆"
+      puts "◆→開始:#{@titles["lead"]}←◆"
+      puts split_paragraph(lines).join("\n")
+      puts "◆→終了:#{@titles["lead"]}←◆"
+      blank
     end
 
-    alias lead read
+    alias :lead read
 
     def inline_list(id)
-      "リスト#{@chapter.number}.#{@chapter.list(id).number}"
+      chapter, id = extract_chapter_id(id)
+      if get_chap(chapter).nil?
+        puts %Q[#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [@chapter.list(id).number])}]
+      else
+        puts %Q[#{I18n.t("list")}#{I18n.t("format_number", [get_chap(chapter), @chapter.list(id).number])}]
+      end
+
     end
 
     def list_header(id, caption)
       blank
-      puts "◆→開始:リスト←◆"
-      puts "リスト#{@chapter.number}.#{@chapter.list(id).number}　#{caption}"
+      puts "◆→開始:#{@titles["list"]}←◆"
+      if get_chap.nil?
+        puts %Q[#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [@chapter.list(id).number])}　#{compile_inline(caption)}]
+      else
+        puts %Q[#{I18n.t("list")}#{I18n.t("format_number", [get_chap, @chapter.list(id).number])}　#{compile_inline(caption)}]
+      end
       blank
     end
 
     def list_body(lines)
       lines.each do |line|
-        puts line
+        puts detab(line)
       end
-      puts "◆→終了:リスト←◆"
+      puts "◆→終了:#{@titles["list"]}←◆"
       blank
     end
 
     def base_block(type, lines, caption = nil)
       blank
-      puts "◆→開始:#{type}←◆"
-      puts "■#{caption}" unless caption.nil?
+      puts "◆→開始:#{@titles[type]}←◆"
+      puts "■#{compile_inline(caption)}" unless caption.nil?
       puts lines.join("\n")
-      puts "◆→終了:#{type}←◆"
+      puts "◆→終了:#{@titles[type]}←◆"
+      blank
+    end
+
+    def base_parablock(type, lines, caption = nil)
+      blank
+      puts "◆→開始:#{@titles[type]}←◆"
+      puts "■#{compile_inline(caption)}" unless caption.nil?
+      puts split_paragraph(lines).join("\n")
+      puts "◆→終了:#{@titles[type]}←◆"
       blank
     end
 
     def emlist(lines, caption = nil)
-      base_block "インラインリスト", lines, caption
+      base_block "emlist", lines, caption
+    end
+
+    def emlistnum(lines, caption = nil)
+      blank
+      puts "◆→開始:#{@titles["emlist"]}←◆"
+      puts "■#{compile_inline(caption)}" unless caption.nil?
+      _lines = []
+      lines.each_with_index do |line, i|
+        puts (i + 1).to_s.rjust(2) + ": #{line}"
+      end
+      puts "◆→終了:#{@titles["emlist"]}←◆"
+      blank
+    end
+
+    def listnum_body(lines)
+      lines.each_with_index do |line, i|
+        puts (i + 1).to_s.rjust(2) + ": #{line}"
+      end
+      puts "◆→終了:#{@titles["list"]}←◆"
+      blank
     end
 
     def cmd(lines, caption = nil)
-      base_block "コマンド", lines, caption
+      base_block "cmd", lines, caption
     end
 
     def quote(lines)
-      base_block "引用", lines, nil
+      base_parablock "quote", lines, nil
+    end
+
+    def inline_table(id)
+      chapter, id = extract_chapter_id(id)
+      if get_chap(chapter).nil?
+        "#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [chapter.table(id).number])}"
+      else
+        "#{I18n.t("table")}#{I18n.t("format_number", [get_chap(chapter), chapter.table(id).number])}"
+      end
     end
 
     def inline_img(id)
-      "図#{@chapter.number}.#{@chapter.image(id).number}"
+      chapter, id = extract_chapter_id(id)
+      if get_chap(chapter).nil?
+        "#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [chapter.image(id).number])}"
+      else
+        "#{I18n.t("image")}#{I18n.t("format_number", [get_chap(chapter), chapter.image(id).number])}"
+      end
     end
 
-    def image(lines, id, caption)
+    def image(lines, id, caption, metric=nil)
       blank
-      puts "◆→開始:図←◆"
-      puts "図#{@chapter.number}.#{@chapter.image(id).number}　#{caption}"
+      puts "◆→開始:#{@titles["image"]}←◆"
+      if get_chap.nil?
+        puts "#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [@chapter.image(id).number])}　#{compile_inline(caption)}"
+      else
+        puts "#{I18n.t("image")}#{I18n.t("format_number", [get_chap, @chapter.image(id).number])}　#{compile_inline(caption)}"
+      end
       blank
       if @chapter.image(id).bound?
         puts "◆→#{@chapter.image(id).path}←◆"
@@ -254,18 +344,25 @@ module ReVIEW
           puts line
         end
       end
-      puts "◆→終了:図←◆"
+      puts "◆→終了:#{@titles["image"]}←◆"
       blank
     end
 
-    def inline_table(id)
-      "表#{@chapter.number}.#{@chapter.table(id).number}"
+    def texequation(lines)
+      puts "◆→開始:#{@titles["texequation"]}←◆"
+      puts "#{lines.join("\n")}"
+      puts "◆→終了:#{@titles["texequation"]}←◆"
+      blank
     end
 
     def table_header(id, caption)
       blank
-      puts "◆→開始:表←◆"
-      puts "表#{@chapter.number}.#{@chapter.table(id).number}　#{caption}"
+      puts "◆→開始:#{@titles["table"]}←◆"
+      if get_chap.nil?
+        puts "#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [@chapter.table(id).number])}　#{compile_inline(caption)}"
+      else
+        puts "#{I18n.t("table")}#{I18n.t("format_number", [get_chap, @chapter.table(id).number])}　#{compile_inline(caption)}"
+      end
       blank
     end
 
@@ -285,44 +382,74 @@ module ReVIEW
     end
     
     def table_end
-      puts "◆→終了:表←◆"
+      puts "◆→終了:#{@titles["table"]}←◆"
       blank
     end
 
     def comment(str)
-      puts "◆→DTP担当:#{str}←◆"
+      puts "◆→DTP連絡:#{str}←◆"
     end
 
-    def inline_fn(id)
+    def footnote(id, str)
+      puts "【注#{@chapter.footnote(id).number}】#{compile_inline(str)}"
+    end
+
+   def inline_fn(id)
       "【注#{@chapter.footnote(id).number}】"
     end
 
-    def footnote(id, str)
-      puts "【注#{@chapter.footnote(id).number}】#{compile_inline(str)}"
+    def compile_ruby(base, ruby)
+      "#{base}◆→DTP連絡:「#{base}」に「#{ruby}」とルビ←◆"
     end
 
     def compile_kw(word, alt)
       if alt
-      then "★#{word}☆（#{alt.sub(/\A\s+/,"")}）"
+      then "★#{word}☆（#{alt.strip}）"
       else "★#{word}☆"
       end
     end
 
-    def inline_chap(id)
-      #"「第#{super}章　#{inline_title(id)}」"
-      # "第#{super}章"
-      super
+    def compile_href(url, label)
+      if label.nil?
+        %Q[△#{url}☆]
+      else
+        %Q[#{label}（△#{url}☆）]
+      end
     end
 
-    def compile_ruby(base, ruby)
-      "#{base}◆→DTP担当:「#{base}」に「#{ruby}」とルビ←◆"
+    def inline_sup(str)
+      "#{str}◆→DTP連絡:「#{str}」は上付き←◆"
     end
 
-    def inline_bou(str)
-      "#{str}◆→DTP担当:「#{str}」に傍点←◆"
+    def inline_sub(str)
+      "#{str}◆→DTP連絡:「#{str}」は下付き←◆"
     end
 
-    def inline_i(str)
+    def inline_raw(str)
+      %Q[#{super(str).gsub("\\n", "\n")}]
+    end
+
+    def inline_hint(str)
+      "◆→ヒントスタイルここから←◆#{str}◆→ヒントスタイルここまで←◆"
+    end
+
+    def inline_maru(str)
+      "#{str}◆→丸数字#{str}←◆"
+    end
+
+    def inline_idx(str)
+      "#{str}◆→索引項目:#{str}←◆"
+    end
+
+    def inline_hidx(str)
+      "◆→索引項目:#{str}←◆"
+    end
+
+    def inline_ami(str)
+      "#{str}◆→DTP連絡:「#{str}」に網カケ←◆"
+    end
+
+     def inline_i(str)
       "▲#{str}☆"
     end
 
@@ -334,169 +461,227 @@ module ReVIEW
       "△#{str}☆"
     end
 
-    def inline_ttbold(str)
+    def inline_ttb(str)
       "★#{str}☆◆→等幅フォント太字←◆"
     end
 
+    alias :inline_ttbold inline_ttb
+
     def inline_tti(str)
       "▲#{str}☆◆→等幅フォントイタ←◆"
     end
 
-    def inline_ttibold(str)
-      "▲#{str}☆◆→等幅フォント太字イタ←◆"
-    end
-
     def inline_u(str)
       "＠#{str}＠◆→＠〜＠部分に下線←◆"
     end
 
-    def inline_icon(id)
-      "◆→画像 #{@chapter.id}-#{id}.eps←◆"
+   def inline_icon(id)
+     begin
+       return "◆→画像 #{@chapter.image(id).path.sub(/\A\.\//, "")}←◆"
+     rescue
+       warn "no such icon image: #{id}"
+       return "◆→画像 #{id}←◆"
+     end
     end
 
-    def inline_ami(str)
-      "#{str}◆→DTP担当:「#{str}」に網カケ←◆"
+    def inline_bou(str)
+      "#{str}◆→DTP連絡:「#{str}」に傍点←◆"
     end
 
-    def inline_sup(str)
-      "#{str}◆→DTP担当:「#{str}」は上付き←◆"
+    def inline_keytop(str)
+      "#{str}◆→キートップ#{str}←◆"
     end
 
-    def inline_sub(str)
-      "#{str}◆→DTP担当:「#{str}」は下付き←◆"
+    def inline_balloon(str)
+      %Q(\t←#{str.gsub(/@maru\[(\d+)\]/, inline_maru('\1'))})
     end
 
-    def inline_raw(str)
-      # FIXME
-      str
+    def inline_uchar(str)
+      [str.to_i(16)].pack("U")
     end
 
-    def inline_hint(str)
-      "◆→ヒントスタイル←◆#{str}"
+    def inline_m(str)
+      %Q[◆→TeX式ここから←◆#{str}◆→TeX式ここまで←◆]
     end
 
-    def inline_maru(str)
-      "#{str}◆→丸数字#{str}←◆"
+    def noindent
+      puts "◆→DTP連絡:次の1行インデントなし←◆"
     end
 
-    def inline_idx(str)
-      "#{str}◆→索引項目:#{str}←◆"
+    def nonum_begin(level, label, caption)
+      puts "■H#{level}■#{compile_inline(caption)}"
     end
 
-    def inline_hidx(str)
-      "◆→索引項目:#{str}←◆"
+    def nonum_end(level)
     end
 
-    def inline_keytop(str)
-      "#{str}◆→キートップ#{str}←◆"
+    def common_column_begin(type, caption)
+      blank
+      puts "◆→開始:#{@titles["type"]}←◆"
+      puts %Q[■#{compile_inline(caption)}]
     end
 
-    def inline_labelref(idref)
-      %Q(「◆→#{idref}←◆」) # 節、項を参照
+    def common_column_end(type)
+      puts %Q[◆→終了:#{@titles["type"]}←◆]
+      blank
     end
 
-    alias inline_ref inline_labelref
+    def column_begin(level, label, caption)
+      common_column_begin("column", caption)
+    end
 
-    def inline_pageref(idref)
-      %Q(●ページ◆→#{idref}←◆) # ページ番号を参照
+    def column_end(level)
+      common_column_end("column")
     end
 
-    def inline_balloon(str)
-      %Q(\t←#{str.gsub(/@maru\[(\d+)\]/, inline_maru('\1'))})
+    def xcolumn_begin(level, label, caption)
+      common_column_begin("xcolumn", caption)
     end
 
-    def noindent
-      %Q(◆→インデントなし←◆)
+    def xcolumn_end(level)
+      common_column_end("xcolumn")
     end
 
-    def nonum_begin(level, label, caption)
-      puts "■H#{level}■#{caption}"
+    def world_begin(level, label, caption)
+      common_column_begin("world", caption)
     end
 
-    def nonum_end(level)
+    def world_end(level)
+      common_column_end("world")
     end
 
-    def circle_begin(level, label, caption)
-      puts "・\t#{caption}"
+    def hood_begin(level, label, caption)
+      common_column_begin("hood", caption)
     end
 
-    def circle_end(level)
+    def hood_end(level)
+      common_column_end("hood")
+    end
+
+    def edition_begin(level, label, caption)
+      common_column_begin("edition", caption)
+    end
+
+    def edition_end(level)
+      common_column_end("edition")
+    end
+
+    def insideout_begin(level, label, caption)
+      common_column_begin("insideout", caption)
+    end
+
+    def insideout_end(level)
+      common_column_end("insideout")
+    end
+
+    def ref_begin(level, label, caption)
+      common_column_begin("ref", caption)
+    end
+
+    def ref_end(level)
+      common_column_end("ref")
+    end
+
+    def sup_begin(level, label, caption)
+      common_column_begin("sup", caption)
+    end
+
+    def sup_end(level)
+      common_column_end("sup")
     end
 
     def flushright(lines)
-      base_block "右寄せ", lines, nil
+      base_parablock "flushright", lines, nil
     end
 
     def note(lines, caption = nil)
-      base_block "ノート", lines, caption
+      base_parablock "note", lines, caption
     end
 
     def memo(lines, caption = nil)
-      base_block "メモ", lines, caption
+      base_parablock "memo", lines, caption
     end
 
     def tip(lines, caption = nil)
-      base_block "TIP", lines, caption
+      base_parablock "tip", lines, caption
     end
 
     def info(lines, caption = nil)
-      base_block "情報", lines, caption
+      base_parablock "info", lines, caption
     end
 
     def planning(lines, caption = nil)
-      base_block "プランニング", lines, caption
+      base_parablock "planning", lines, caption
     end
 
     def best(lines, caption = nil)
-      base_block "ベストプラクティス", lines, caption
+      base_parablock "best", lines, caption
     end
 
     def important(lines, caption = nil)
-      base_block "重要", lines, caption
+      base_parablock "important", lines, caption
     end
 
     def security(lines, caption = nil)
-      base_block "セキュリティ", lines, caption
+      base_parablock "security", lines, caption
     end
 
     def caution(lines, caption = nil)
-      base_block "警告", lines, caption
+      base_parablock "caution", lines, caption
     end
 
     def term(lines)
-      base_block "用語解説", lines, nil
+      base_parablock "term", lines, nil
+    end
+
+    def link(lines, caption = nil)
+      base_parablock "link", lines, caption
     end
 
     def notice(lines, caption = nil)
-      base_block "注意", lines, caption
+      base_parablock "notice", lines, caption
     end
 
     def point(lines, caption = nil)
-      base_block "ここがポイント", lines, caption
+      base_parablock "point", lines, caption
+    end
+
+    def shoot(lines, caption = nil)
+      base_parablock "shoot", lines, caption
     end
 
     def reference(lines)
-      base_block "参考", lines, nil
+      base_parablock "reference", lines, nil
     end
 
     def practice(lines)
-      base_block "練習問題", lines, nil
+      base_parablock "practice", lines, nil
     end
 
     def expert(lines)
-      base_block "エキスパートに訊け", lines, nil
+      base_parablock "expert", lines, nil
     end
 
     def insn(lines, caption = nil)
-      base_block "書式", lines, caption
+      base_block "insn", lines, caption
     end
 
-    alias box insn
+    alias :box insn
 
-    def indepimage(id)
-      puts "◆→画像 #{@chapter.id}-#{id}.eps←◆"
+    def indepimage(id, caption=nil, metric=nil)
+      blank
+      begin
+        puts "◆→画像 #{@chapter.image(id).path.sub(/\A\.\//, "")} #{metric.join(" ")}←◆"
+      rescue
+        warn "no such image: #{id}"
+        puts "◆→画像 #{id}←◆"
+      end
+      puts "図　#{compile_inline(caption)}" if !caption.nil? && !caption.empty?
+      blank
     end
 
+    alias :numberlessimage indepimage
+
     def label(id)
       # FIXME
       ""
@@ -511,61 +696,75 @@ module ReVIEW
       # FIXME
     end
 
+    def bpo(lines)
+      base_block "bpo", lines, nil
+    end
+
     def inline_dtp(str)
       # FIXME
       ""
     end
 
+    def inline_code(str)
+      %Q[△#{str}☆]
+    end
+
     def inline_br(str)
       %Q(\n)
     end
     
-    def raw(str)
-      if str =~ /\A<\/(.+)>$/
-        case $1
-          when "emlist": puts "◆→終了:インラインリスト←◆"
-          when "cmd": puts "◆→終了:コマンド←◆"
-          when "quote": puts "◆→終了:引用←◆"
-          when "flushright": puts "◆→終了:右寄せ←◆"
-          when "note": puts "◆→終了:ノート←◆"
-          when "important": puts "◆→終了:重要←◆"
-          when "term": puts "◆→終了:用語解説←◆"
-          when "notice": puts "◆→終了:注意←◆"
-          when "point": puts "◆→終了:ここがポイント←◆"
-          when "reference": puts "◆→終了:参考←◆"
-          when "practice": puts "◆→終了:練習問題←◆"
-          when "expert": puts "◆→終了:エキスパートに訊け←◆"
-          when "box": puts "◆→終了:書式←◆"
-          when "insn": puts "◆→終了:書式←◆"
-        end
-      elsif str =~ /\A<([^\/].+)>(?:<title[^>]>(.+)<\/title>)?(.*)/
-        case $1
-          when "emlist": puts "◆→開始:インラインリスト←◆"
-          when "cmd": puts "◆→開始:コマンド←◆"
-          when "quote": puts "◆→開始:引用←◆"
-          when "flushright": puts "◆→開始:右寄せ←◆"
-          when "note": puts "◆→開始:ノート←◆"
-          when "important": puts "◆→開始:重要←◆"
-          when "term": puts "◆→開始:用語解説←◆"
-          when "notice": puts "◆→開始:注意←◆"
-          when "point": puts "◆→開始:ここがポイント←◆"
-          when "reference": puts "◆→開始:参考←◆"
-          when "practice": puts "◆→開始:練習問題←◆"
-          when "expert": puts "◆→開始:エキスパートに訊け←◆"
-          when "box": puts "◆→開始:書式←◆"
-          when "insn": puts "◆→開始:書式←◆"
+    def text(str)
+      str
+    end
+    
+    def inline_chap(id)
+      #"「第#{super}章　#{inline_title(id)}」"
+      # "第#{super}章"
+      super
+    end
+
+    def inline_chapref(id)
+      chs = ["", "「", "」"]
+      unless ReVIEW.book.param["chapref"].nil?
+        _chs = NKF.nkf("-w", ReVIEW.book.param["chapref"]).split(",")
+        if _chs.size != 3
+          error "--chapsplitter must have exactly 3 parameters with comma."
+        else
+          chs = _chs
         end
-        puts "■#{$2}" unless $2.nil?
-        print $3
       else
-        puts str
       end
+      "#{chs[0]}#{@chapter.env.chapter_index.number(id)}#{chs[1]}#{@chapter.env.chapter_index.title(id)}#{chs[2]}"
+    rescue KeyError
+      error "unknown chapter: #{id}"
+      nofunc_text("[UnknownChapter:#{id}]")
     end
-    
-    def text(str)
-      str
+
+    def source(lines, caption = nil)
+      base_block "source", lines, caption
     end
-    
+
+    def inline_ttibold(str)
+      "▲#{str}☆◆→等幅フォント太字イタ←◆"
+    end
+
+    def inline_labelref(idref)
+      %Q(「◆→#{idref}←◆」) # 節、項を参照
+    end
+
+    alias inline_ref inline_labelref
+
+    def inline_pageref(idref)
+      %Q(●ページ◆→#{idref}←◆) # ページ番号を参照
+    end
+
+    def circle_begin(level, label, caption)
+      puts "・\t#{caption}"
+    end
+
+    def circle_end(level)
+    end
+
     def nofunc_text(str)
       str
     end