RubyGems - review - Versions diffs - 0.6.0 → 0.9.0 - Mend

review 0.6.0 → 0.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (68) hide show

data/ChangeLog +441 -0
data/README.rdoc +25 -0
data/Rakefile +13 -1
data/VERSION +1 -1
data/bin/review-check +1 -1
data/bin/review-compile +19 -10
data/bin/review-epubmaker +114 -17
data/bin/review-index +8 -1
data/bin/review-pdfmaker +378 -0
data/bin/review-preproc +2 -3
data/bin/review-vol +1 -2
data/debian/README.Debian +12 -0
data/debian/README.source +5 -0
data/debian/changelog +5 -0
data/debian/compat +1 -0
data/debian/control +22 -0
data/debian/copyright +60 -0
data/debian/docs +5 -0
data/debian/manpage.1.ex +59 -0
data/debian/patches/path.diff +91 -0
data/debian/patches/series +1 -0
data/debian/review.install +13 -0
data/debian/review.links +4 -0
data/debian/rules +13 -0
data/debian/source/format +1 -0
data/doc/format.rdoc +477 -0
data/doc/format.re +19 -0
data/doc/format_idg.rdoc +180 -0
data/doc/ruby-uuid/README +11 -0
data/doc/ruby-uuid/README.ja +34 -0
data/doc/sample.css +17 -0
data/doc/sample.yaml +8 -4
data/lib/lineinput.rb +1 -1
data/lib/review/book.rb +43 -36
data/lib/review/builder.rb +78 -33
data/lib/review/compiler.rb +45 -48
data/lib/review/epubbuilder.rb +1 -675
data/lib/review/exception.rb +1 -1
data/lib/review/htmlbuilder.rb +627 -49
data/lib/review/htmlutils.rb +5 -0
data/lib/review/idgxmlbuilder.rb +239 -250
data/lib/review/index.rb +84 -7
data/lib/review/latexbuilder.rb +261 -42
data/lib/review/latexutils.rb +15 -6
data/lib/review/preprocessor.rb +40 -6
data/lib/review/textutils.rb +22 -0
data/lib/review/topbuilder.rb +4 -1
data/lib/uuid.rb +312 -0
data/review.gemspec +44 -12
data/test/CHAPS +2 -0
data/test/bib.re +13 -0
data/test/test.re +43 -0
data/test/test_book.rb +1191 -0
data/test/test_builder.rb +147 -0
data/test/test_htmlbuilder.rb +191 -10
data/test/test_htmlutils.rb +24 -0
data/test/test_idgxmlbuilder.rb +310 -0
data/test/test_index.rb +15 -0
data/test/test_latexbuilder.rb +217 -6
data/test/test_lineinput.rb +198 -0
data/test/test_textutils.rb +68 -0
data/test/test_uuid.rb +156 -0
metadata +43 -10
data/doc/format.txt +0 -434
data/doc/format_idg.txt +0 -194
data/doc/format_sjis.txt +0 -313
data/setup.rb +0 -1587
data/test/test_epubbuilder.rb +0 -73

data/lib/review/exception.rb CHANGED

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

data/lib/review/htmlbuilder.rb CHANGED

@@ -1,7 +1,8 @@
+# encoding: utf-8
 # $Id: htmlbuilder.rb 4268 2009-05-27 04:17:08Z kmuto $
 #
 # Copyright (c) 2002-2007 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
@@ -20,12 +21,40 @@ module ReVIEW
     include TextUtils
     include HTMLUtils
+    [:icon].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
       '.html'
     end
     def builder_init(no_error = false)
       @no_error = no_error
+      @section = 0
+      @subsection = 0
+      @subsubsection = 0
+      @subsubsubsection = 0
+      @noindent = nil
     end
     private :builder_init
@@ -41,7 +70,31 @@ module ReVIEW
         messages() +
           HTMLLayout.new(@output.string, @chapter.title, layout_file).result
       else
-        messages() + @output.string
+        # default XHTML header/footer
+        header = <<EOT
+<?xml version="1.0" encoding="UTF-8"?>
+<!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="ja">
+<head>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+  <meta http-equiv="Content-Style-Type" content="text/css" />
+EOT
+        unless ReVIEW.book.param["stylesheet"].nil?
+          header += <<EOT
+  <link rel="stylesheet" type="text/css" href="#{ReVIEW.book.param["stylesheet"]}" />
+EOT
+        end
+        header += <<EOT
+  <meta name="generator" content="ReVIEW" />
+  <title>#{convert_outencoding(@chapter.title)}</title>
+</head>
+<body>
+EOT
+        footer = <<EOT
+</body>
+</html>
+EOT
+        header + messages() + @output.string + footer
       end
     end
@@ -87,24 +140,222 @@ module ReVIEW
       "</ul>\n"
     end
+    def headline_prefix(level)
+      anchor = ""
+      case level
+      when 1
+        @section = 0
+        @subsection = 0
+        @subsubsection = 0
+        @subsubsubsection = 0
+        anchor = "#{@chapter.number}"
+        if ReVIEW.book.param["secnolevel"] >= 1
+          if @chapter.number.to_s =~ /\A\d+$/
+            prefix = "第#{@chapter.number}章　"
+          elsif !@chapter.number.nil? && !@chapter.number.to_s.empty?
+            prefix = "#{@chapter.number}　"
+          end
+        end
+      when 2
+        @section += 1
+        @subsection = 0
+        @subsubsection = 0
+        @subsubsubsection = 0
+        anchor = "#{@chapter.number}-#{@section}"
+        if ReVIEW.book.param["secnolevel"] >= 2
+          if @chapter.number.to_s =~ /\A\d+$/
+            prefix = "#{@chapter.number}.#{@section}　"
+          elsif !@chapter.number.nil? && !@chapter.number.to_s.empty?
+            prefix = "#{@chapter.number}.#{@section}　"
+          end
+        end
+      when 3
+        @subsection += 1
+        @subsubsection = 0
+        @subsubsubsection = 0
+        anchor = "#{@chapter.number}-#{@section}-#{@subsection}"
+        if ReVIEW.book.param["secnolevel"] >= 3
+          if @chapter.number.to_s =~ /\A\d+$/
+            prefix = "#{@chapter.number}.#{@section}.#{@subsection}　"
+          elsif !@chapter.number.nil? && !@chapter.number.to_s.empty?
+            prefix = "#{@chapter.number}.#{@section}.#{@subsection}　"
+          end
+        end
+      when 4
+        @subsubsection += 1
+        @subsubsubsection = 0
+        anchor = "#{@chapter.number}-#{@section}-#{@subsection}-#{@subsubsection}"
+        if ReVIEW.book.param["secnolevel"] >= 4
+          if @chapter.number.to_s =~ /\A\d+$/
+            prefix = "#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}　"
+          elsif !@chapter.number.nil? && !@chapter.number.to_s.empty?
+            prefix = "#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}　"
+          end
+        end
+      when 5
+        @subsubsubsection += 1
+        anchor = "#{@chapter.number}-#{@section}-#{@subsection}-#{@subsubsection}-#{@subsubsubsection}"
+        if ReVIEW.book.param["secnolevel"] >= 5
+          if @chapter.number.to_s =~ /\A\d+$/
+            prefix = "#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}.#{@subsubsubsection}　"
+          elsif !@chapter.number.nil? && !@chapter.number.to_s.empty?
+            prefix = "#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}.#{@subsubsubsection}　"
+          end
+        end
+      end
+      [prefix, anchor]
+    end
+    private :headline_prefix
     def headline(level, label, caption)
+      prefix, anchor = headline_prefix(level)
       puts '' if level > 1
-      if label.nil?
-        puts "<h#{level}>#{escape_html(caption)}</h#{level}>"
+      a_id = ""
+      unless anchor.nil?
+        a_id = %Q[<a id="h#{anchor}" />]
+      end
+      if caption.empty?
+        puts a_id unless label.nil?
       else
-        puts "<h#{level} id='#{label}'>#{escape_html(caption)}</h#{level}>"
+        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}>]
+        end
+      end
+    end
+    def nonum_begin(level, label, caption)
+      puts '' if level > 1
+      unless caption.empty?
+        if label.nil?
+          puts %Q[<h#{level}>#{compile_inline(caption)}</h#{level}>]
+        else
+          puts %Q[<h#{level} id="#{label}">#{compile_inline(caption)}</h#{level}>]
+        end
       end
     end
+    def nonum_end(level)
+    end
     def column_begin(level, label, caption)
-      puts "<div class='column'>"
-      headline(level, label, caption)   # FIXME
+      puts %Q[<div class="column">]
+      headline(level, label, caption)
     end
     def column_end(level)
       puts '</div>'
     end
+    def xcolumn_begin(level, label, caption)
+      puts %Q[<div class="xcolumn">]
+      headline(level, label, caption)
+    end
+    def xcolumn_end(level)
+      puts '</div>'
+    end
+    def ref_begin(level, label, caption)
+      print %Q[<div class="reference">]
+      headline(level, label, caption)
+    end
+    def ref_end(level)
+      puts '</div>'
+    end
+    def sup_begin(level, label, caption)
+      print %Q[<div class="supplement">]
+      headline(level, label, caption)
+    end
+    def sup_end(level)
+      puts '</div>'
+    end
+    def tsize(str)
+      # null
+    end
+    def captionblock(type, lines, caption)
+      puts %Q[<div class="#{type}">]
+      unless caption.nil?
+        puts %Q[<p class="caption">#{compile_inline(caption)}</p>]
+      end
+      if ReVIEW.book.param["deprecated-blocklines"].nil?
+        blocked_lines = split_paragraph(lines)
+        puts blocked_lines.join("\n")
+      else
+        lines.each {|l|
+          puts "<p>#{l}</p>"
+        }
+      end
+      puts '</div>'
+    end
+    def memo(lines, caption = nil)
+      captionblock("memo", lines, caption)
+    end
+    def tip(lines, caption = nil)
+      captionblock("tip", lines, caption)
+    end
+    def info(lines, caption = nil)
+      captionblock("info", lines, caption)
+    end
+    def planning(lines, caption = nil)
+      captionblock("planning", lines, caption)
+    end
+    def best(lines, caption = nil)
+      captionblock("best", lines, caption)
+    end
+    def important(lines, caption = nil)
+      captionblock("important", lines, caption)
+    end
+    def security(lines, caption = nil)
+      captionblock("security", lines, caption)
+    end
+    def caution(lines, caption = nil)
+      captionblock("caution", lines, caption)
+    end
+    def notice(lines, caption = nil)
+      captionblock("notice", lines, caption)
+    end
+    def point(lines, caption = nil)
+      captionblock("point", lines, caption)
+    end
+    def shoot(lines, caption = nil)
+      captionblock("shoot", lines, caption)
+    end
+    def box(lines, caption = nil)
+      puts %Q[<div class="syntax">]
+      puts %Q[<p class="caption">#{compile_inline(caption)}</p>] unless caption.nil?
+      puts %Q[<pre class="syntax">]
+      lines.each do |line|
+        puts detab(line)
+      end
+      puts '</pre>'
+      puts '</div>'
+    end
+    def note(lines, caption = nil)
+      puts %Q[<div class="note">]
+      puts %Q[<p class="caption">#{compile_inline(caption)}</p>] unless caption.nil?
+      puts "#{lines.join("\n")}</div>"
+    end
     def ul_begin
       puts '<ul>'
     end
@@ -146,7 +397,12 @@ module ReVIEW
     end
     def paragraph(lines)
-      puts "<p>#{lines.join("")}</p>"
+      if @noindent.nil?
+        puts "<p>#{lines.join}</p>"
+      else
+        puts %Q[<p class="noindent">#{lines.join}</p>]
+        @noindent = nil
+      end
     end
     def parasep()
@@ -154,54 +410,81 @@ module ReVIEW
     end
     def read(lines)
-      puts %Q[<p class="lead">\n#{lines.join("\n")}\n</p>]
+      if ReVIEW.book.param["deprecated-blocklines"].nil?
+        blocked_lines = split_paragraph(lines)
+        puts %Q[<div class="lead">\n#{blocked_lines.join("\n")}\n</div>]
+      else
+        puts %Q[<p class="lead">\n#{lines.join("\n")}\n</p>]
+      end
     end
-    def lead(lines)
-      read(lines)
+    alias :lead read
+    def list(lines, id, caption)
+      puts %Q[<div class="caption-code">]
+      begin
+        list_header id, caption
+      rescue KeyError
+        error "no such list: #{id}"
+      end
+      list_body lines
+      puts '</div>'
     end
     def list_header(id, caption)
-      puts %Q[<p class="toplabel">リスト#{@chapter.list(id).number}: #{escape_html(caption)}</p>]
+      puts %Q[<p class="caption">リスト#{getChap}#{@chapter.list(id).number}: #{compile_inline(caption)}</p>]
     end
     def list_body(lines)
-      puts '<div class="caption-code">'
-      puts '<pre class="list">'
+      puts %Q[<pre class="list">]
       lines.each do |line|
         puts detab(line)
       end
       puts '</pre>'
+    end
+    def source(lines, caption)
+      puts %Q[<div class="source-code">]
+      source_header caption
+      source_body lines
       puts '</div>'
     end
     def source_header(caption)
-      puts %Q[<p class="toplabel">▼#{escape_html(caption)}</p>]
+      puts %Q[<p class="caption">#{compile_inline(caption)}</p>]
     end
     def source_body(lines)
-      puts '<div class="caption-code">'
-      puts '<pre class="source">'
+      puts %Q[<pre class="source">]
       lines.each do |line|
         puts detab(line)
       end
       puts '</pre>'
+    end
+    def listnum(lines, id, caption)
+      puts %Q[<div class="code">]
+      begin
+        list_header id, caption
+      rescue KeyError
+        error "no such list: #{id}"
+      end
+      listnum_body lines
       puts '</div>'
     end
     def listnum_body(lines)
-      puts '<div class="code">'
-      puts '<pre class="list">'
+      puts %Q[<pre class="list">]
       lines.each_with_index do |line, i|
         puts detab((i+1).to_s.rjust(2) + ": " + line)
       end
       puts '</pre>'
-      puts '</div>'
      end
-    def emlist(lines)
-      puts '<div class="code">'
-      puts '<pre class="emlist">'
+    def emlist(lines, caption = nil)
+      puts %Q[<div class="emlist-code">]
+      puts %Q(<p class="caption">#{caption}</p>) unless caption.nil?
+      puts %Q[<pre class="emlist">]
       lines.each do |line|
         puts detab(line)
       end
@@ -210,8 +493,8 @@ module ReVIEW
     end
     def emlistnum(lines)
-      puts '<div class="code">'
-      puts '<pre class="emlist">'
+      puts %Q[<div class="emlistnum-code">]
+      puts %Q[<pre class="emlist">]
       lines.each_with_index do |line, i|
         puts detab((i+1).to_s.rjust(2) + ": " + line)
       end
@@ -220,8 +503,8 @@ module ReVIEW
     end
     def cmd(lines)
-      puts '<div class="code">'
-      puts '<pre class="cmd">'
+      puts %Q[<div class="cmd-code">]
+      puts %Q[<pre class="cmd">]
       lines.each do |line|
         puts detab(line)
       end
@@ -239,33 +522,125 @@ module ReVIEW
     private :quotedlist
     def quote(lines)
-      puts "<blockquote>#{lines.join("\n")}</blockquote>"
+      if ReVIEW.book.param["deprecated-blocklines"].nil?
+        blocked_lines = split_paragraph(lines)
+        puts "<blockquote>#{blocked_lines.join("\n")}</blockquote>"
+      else
+        puts "<blockquote><pre>#{lines.join("\n")}</pre></blockquote>"
+      end
     end
-    def image_image(id, metric, caption)
-      puts %Q[<p class="image">]
-      puts %Q[<img src="#{@chapter.image(id).path}" alt="(#{escape_html(caption)})">]
-      puts %Q[</p>]
+    def doorquote(lines, ref)
+      if ReVIEW.book.param["deprecated-blocklines"].nil?
+        blocked_lines = split_paragraph(lines)
+        puts %Q[<blockquote style="text-align:right;">]
+        puts "#{blocked_lines.join("\n")}"
+        puts %Q[<p>#{ref}より</p>]
+        puts %Q[</blockquote>]
+      else
+        puts <<-QUOTE
+<blockquote style="text-align:right;">
+  <pre>
+#{lines.join("\n")}
+#{ref}より</pre>
+</blockquote>
+QUOTE
+      end
+    end
+    def talk(lines)
+      puts %Q[<div class="talk">]
+      if ReVIEW.book.param["deprecated-blocklines"].nil?
+        blocked_lines = split_paragraph(lines)
+        puts "#{blocked_lines.join("\n")}"
+      else
+        puts '<pre>'
+        puts "#{lines.join("\n")}"
+        puts '</pre>'
+      end
+      puts '</div>'
+    end
+    def texequation(lines)
+      puts %Q[<div class="equation">]
+      if ReVIEW.book.param["mathml"]
+        p = MathML::LaTeX::Parser.new
+        puts p.parse(unescape_html(lines.join("\n")), true)
+      else
+        puts '<pre>'
+        puts "#{lines.join("\n")}"
+        puts '</pre>'
+      end
+      puts '</div>'
+    end
+    def image_image(id, caption, metric)
+      # FIXME: should respect metric?
+      puts %Q[<div class="image">]
+      puts %Q[<img src="#{@chapter.image(id).path.sub(/\A\.\//, "")}" alt="#{escape_html(compile_inline(caption))}" />]
       image_header id, caption
+      puts %Q[</div>]
     end
     def image_dummy(id, caption, lines)
+      puts %Q[<div class="image">]
       puts %Q[<pre class="dummyimage">]
       lines.each do |line|
         puts detab(line)
       end
       puts %Q[</pre>]
       image_header id, caption
+      puts %Q[</div>]
     end
     def image_header(id, caption)
-      puts %Q[<p class="botlabel">]
-      puts %Q[図#{@chapter.image(id).number}: #{escape_html(caption)}]
+      puts %Q[<p class="caption">]
+      puts %Q[図#{getChap}#{@chapter.image(id).number}: #{compile_inline(caption)}]
       puts %Q[</p>]
     end
+    def table(lines, id = nil, caption = nil)
+      rows = []
+      sepidx = nil
+      lines.each_with_index do |line, idx|
+        if /\A[\=\-]{12}/ =~ line
+          # just ignore
+          #error "too many table separator" if sepidx
+          sepidx ||= idx
+          next
+        end
+        rows.push line.strip.split(/\t+/).map {|s| s.sub(/\A\./, '') }
+      end
+      rows = adjust_n_cols(rows)
+      puts %Q[<div class="table">]
+      begin
+        table_header id, caption unless caption.nil?
+      rescue KeyError => err
+        error "no such table: #{id}"
+      end
+      table_begin rows.first.size
+      return if rows.empty?
+      if sepidx
+        sepidx.times do
+          tr rows.shift.map {|s| th(s) }
+        end
+        rows.each do |cols|
+          tr cols.map {|s| td(s) }
+        end
+      else
+        rows.each do |cols|
+          h, *cs = *cols
+          tr [th(h)] + cs.map {|s| td(s) }
+        end
+      end
+      table_end
+      puts %Q[</div>]
+    end
     def table_header(id, caption)
-      puts %Q[<p class="toplabel">表#{@chapter.table(id).number}: #{escape_html(caption)}</p>]
+      puts %Q[<p class="caption">表#{getChap}#{@chapter.table(id).number}: #{compile_inline(caption)}</p>]
     end
     def table_begin(ncols)
@@ -273,7 +648,7 @@ module ReVIEW
     end
     def tr(rows)
-      puts "<tr>#{rows.join('')}</tr>"
+      puts "<tr>#{rows.join}</tr>"
     end
     def th(str)
@@ -289,29 +664,75 @@ module ReVIEW
     end
     def comment(str)
-      puts %Q(<p class="comment">[Comment] #{escape_html(str)}</p>)
+      puts %Q(<!-- #{escape_html(str)} -->)
     end
     def footnote(id, str)
-      puts %Q(<p class="comment"><a name="fn-#{id}">#{escape_html(str)}</a></p>)
+      puts %Q(<div class="footnote"><p class="footnote"><a id="fn-#{id}">[*#{@chapter.footnote(id).number}] #{compile_inline(str)}</a></p></div>)
+    end
+    def indepimage(id, caption="", metric=nil)
+      caption = "" if caption.nil?
+      puts %Q[<div class="image">]
+      begin
+        puts %Q[<img src="#{@chapter.image(id).path.sub(/\A\.\//, "")}" alt="#{caption}" />]
+      rescue
+        puts %Q[<pre>missing image: #{id}</pre>]
+      end
+      unless caption.empty?
+        puts %Q[<p class="caption">]
+        puts %Q[図: #{compile_inline(caption)}]
+        puts %Q[</p>]
+        puts %Q[</div>]
+      end
+    end
+    alias :numberlessimage indepimage
+    def hr
+      puts "<hr />"
+    end
+    def label(id)
+      puts %Q(<a id="#{id}" />)
+    end
+    def linebreak
+      puts "<br />"
+    end
+    def pagebreak
+      puts %Q(<br class="pagebreak" />)
+    end
+    def bpo(lines)
+      puts "<bpo>"
+      lines.each do |line|
+        puts detab(line)
+      end
+      puts "</bpo>"
+    end
+    def noindent
+      @noindent = true
     end
     def inline_fn(id)
-      %Q(<a href="\#fn-#{id}">*#{@chapter.footnote(id).number}</a>)
+      %Q(<a href="#fn-#{id}">*#{@chapter.footnote(id).number}</a>)
     end
     def compile_ruby(base, ruby)
-      escape_html(base)   # tmp
+      %Q[<ruby><rb>{escape_html(base)}</rb><rp>(</rp><rt>#{ruby}</rt><rp>)</rp></ruby>]
     end
     def compile_kw(word, alt)
-      '<span class="kw">' +
+      %Q[<b class="kw">] +
         if alt
-        #then escape_html(word + sprintf(@locale[:parens], alt.strip))
         then escape_html(word + " (#{alt.strip})")
         else escape_html(word)
         end +
-      '</span>'
+        "</b><!-- IDX:#{escape_html(word)} -->"
     end
     def inline_i(str)
@@ -323,16 +744,44 @@ module ReVIEW
     end
     def inline_ami(str)
-      escape_html(str)   # tmp
+      %Q(<span class="ami">#{escape_html(str)}</span>)
+    end
+    def inline_tti(str)
+      %Q(<tt><i>#{escape_html(str)}</i></tt>)
     end
-    def inline_dtp(arg)
-      # ignore all
-      ''
+    def inline_ttb(str)
+      %Q(<tt><b>#{escape_html(str)}</b></tt>)
+    end
+    def inline_dtp(str)
+      "<?dtp #{str} ?>"
     end
     def inline_code(str)
-      %Q(<span class="inline-code">#{str}</span>)
+      %Q(<tt class="inline-code">#{str}</tt>)
+    end
+    def inline_idx(str)
+      %Q(#{escape_html(str)}<!-- IDX:#{escape_html(str)} -->)
+    end
+    def inline_hidx(str)
+      %Q(<!-- IDX:#{escape_html(str)} -->)
+    end
+    def inline_br(str)
+      %Q(<br />)
+    end
+    def inline_m(str)
+      if ReVIEW.book.param["mathml"]
+        p = MathML::LaTeX::Parser.new
+        %Q[<span class="equation">#{p.parse(str, nil)}</span>]
+      else
+        %Q[<span class="equation">#{escape_html(str)}</span>]
+      end
     end
     def text(str)
@@ -354,7 +803,119 @@ module ReVIEW
     end
     def inline_bib(id)
-      %Q(<a href=".#{@book.bib_file.gsub(/re$/, "html")}\#bib-#{id}">[#{@chapter.bibpaper(id).number}]</a>)
+      %Q(<a href=".#{@book.bib_file.gsub(/re$/, "html")}#bib-#{id}">[#{@chapter.bibpaper(id).number}]</a>)
+    end
+    def inline_hd_chap(chap, id)
+      "「#{chap.headline_index.number(id)} #{chap.headline(id).caption}」"
+    end
+    def inline_list(id)
+      chapter, id = extract_chapter_id(id)
+      "リスト#{getChap(chapter)}#{chapter.list(id).number}"
+    rescue KeyError
+      error "unknown list: #{id}"
+      nofunc_text("[UnknownList:#{id}]")
+    end
+    def inline_table(id)
+      chapter, id = extract_chapter_id(id)
+      "表#{getChap(chapter)}#{chapter.table(id).number}"
+    rescue KeyError
+      error "unknown table: #{id}"
+      nofunc_text("[UnknownTable:#{id}]")
+    end
+    def inline_img(id)
+      chapter, id = extract_chapter_id(id)
+      "図#{getChap(chapter)}#{chapter.image(id).number}"
+    rescue KeyError
+      error "unknown image: #{id}"
+      nofunc_text("[UnknownImage:#{id}]")
+    end
+    def inline_asis(str, tag)
+      %Q(<#{tag}>#{escape_html(str)}</#{tag}>)
+    end
+    def inline_abbr(str)
+      inline_asis(str, "abbr")
+    end
+    def inline_acronym(str)
+      inline_asis(str, "acronym")
+    end
+    def inline_cite(str)
+      inline_asis(str, "cite")
+    end
+    def inline_dfn(str)
+      inline_asis(str, "dfn")
+    end
+    def inline_em(str)
+      inline_asis(str, "em")
+    end
+    def inline_kbd(str)
+      inline_asis(str, "kbd")
+    end
+    def inline_samp(str)
+      inline_asis(str, "samp")
+    end
+    def inline_strong(str)
+      inline_asis(str, "strong")
+    end
+    def inline_var(str)
+      inline_asis(str, "var")
+    end
+    def inline_big(str)
+      inline_asis(str, "big")
+    end
+    def inline_small(str)
+      inline_asis(str, "small")
+    end
+    def inline_sub(str)
+      inline_asis(str, "sub")
+    end
+    def inline_sup(str)
+      inline_asis(str, "sup")
+    end
+    def inline_tt(str)
+      inline_asis(str, "tt")
+    end
+    def inline_del(str)
+      inline_asis(str, "del")
+    end
+    def inline_ins(str)
+      inline_asis(str, "ins")
+    end
+    def inline_u(str)
+      %Q(<u>#{escape_html(str)}</u>)
+    end
+   def inline_recipe(str)
+      %Q(<span class="recipe">「#{escape_html(str)}」</span>)
+    end
+    def inline_icon(id)
+      %Q[<img src=".#{@book.image_dir}#{find_pathes(id)[0].sub(/\A\.\//, "/")}" alt="[#{id}]" />]
+    end
+    def inline_uchar(str)
+      %Q(&#x#{str};)
     end
     def inline_raw(str)
@@ -365,6 +926,23 @@ module ReVIEW
       escape_html(str)
     end
+    def compile_href(url, label)
+      %Q(<a href="#{escape_html(url)}" class="link">#{label.nil? ? escape_html(url) : escape_html(label)}</a>)
+    end
+    def flushright(lines)
+      if ReVIEW.book.param["deprecated-blocklines"].nil?
+        puts split_paragraph(lines).join("\n").gsub("<p>", "<p class=\"flushright\">")
+      else
+        puts %Q[<div style="text-align:right;">]
+        puts %Q[<pre class="flushright">]
+        lines.each do |line|
+          puts detab(line)
+        end
+        puts '</pre>'
+        puts '</div>'
+      end
+    end
   end
 end   # module ReVIEW