review 2.0.0.beta1 → 2.0.0

data/lib/review/topbuilder.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #
 # Copyright (c) 2002-2006 Minero Aoki
-#               2008-2010 Minero Aoki, Kenshi Muto
+#               2008-2016 Minero Aoki, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -22,21 +22,17 @@ module ReVIEW
     }
     Compiler.defsingle(:dtp, 1)
 
-    Compiler.defcodeblock(:insn, 1)
-    Compiler.defblock(:memo, 0..1)
-    Compiler.defblock(:tip, 0..1)
-    Compiler.defblock(:info, 0..1)
+    Compiler.defblock(:insn, 1)
     Compiler.defblock(:planning, 0..1)
     Compiler.defblock(:best, 0..1)
-    Compiler.defblock(:important, 0..1)
     Compiler.defblock(:securty, 0..1)
-    Compiler.defblock(:caution, 0..1)
-    Compiler.defblock(:notice, 0..1)
     Compiler.defblock(:point, 0..1)
     Compiler.defblock(:reference, 0)
     Compiler.defblock(:term, 0)
     Compiler.defblock(:practice, 0)
     Compiler.defblock(:expert, 0)
+    Compiler.defblock(:link, 0..1)
+    Compiler.defblock(:shoot, 0..1)
 
     def pre_paragraph
       ''
@@ -55,6 +51,7 @@ module ReVIEW
       @subsection = 0
       @subsubsection = 0
       @subsubsubsection = 0
+      @blank_seen = true
 
       @titles = {
         "emlist" => "インラインリスト",
@@ -71,6 +68,7 @@ module ReVIEW
         "term" => "用語解説",
         "notice" => "注意",
         "caution" => "警告",
+        "warning" => "危険",
         "point" => "ここがポイント",
         "reference" => "参考",
         "link" => "リンク",
@@ -101,6 +99,28 @@ module ReVIEW
     end
     private :builder_init_file
 
+    def print(s)
+      @blank_seen = false
+      super
+    end
+    private :print
+
+    def puts(s)
+      @blank_seen = false
+      super
+    end
+    private :puts
+
+    def blank
+      @output.puts unless @blank_seen
+      @blank_seen = true
+    end
+    private :blank
+
+    def result
+      @output.string
+    end
+
     def warn(msg)
       $stderr.puts "#{@location.filename}:#{@location.lineno}: warning: #{msg}"
     end
@@ -114,8 +134,8 @@ module ReVIEW
     end
 
     def headline(level, label, caption)
-      buf = ""
       prefix = ""
+      blank
       case level
       when 1
         if @chapter.number.to_s =~ /\A\d+\Z/
@@ -149,67 +169,62 @@ module ReVIEW
         raise "caption level too deep or unsupported: #{level}"
       end
       prefix = "" if (level.to_i > @book.config["secnolevel"])
-      buf << "■H#{level}■#{prefix}#{caption}\n"
-      buf
+      puts "■H#{level}■#{prefix}#{compile_inline(caption)}"
     end
 
     def ul_begin
-      "\n"
+      blank
     end
 
     def ul_item(lines)
-      "●\t#{lines.join}\n"
+      puts "●\t#{lines.join}"
     end
 
     def ul_end
-      "\n"
+      blank
     end
 
     def ol_begin
+      blank
       @olitem = 0
-      "\n"
     end
 
     def ol_item(lines, num)
-      "#{num}\t#{lines.join}\n"
+      puts "#{num}\t#{lines.join}"
     end
 
     def ol_end
+      blank
       @olitem = nil
-      "\n"
     end
 
     def dl_begin
-      "\n"
+      blank
     end
 
     def dt(line)
-      "★#{line}☆\n"
+      puts "★#{line}☆"
     end
 
     def dd(lines)
-      buf = ""
-      lines.each do |paragraph|
-        buf << "\t#{paragraph.gsub(/\n/, '')}\n"
+      split_paragraph(lines).each do |paragraph|
+        puts "\t#{paragraph.gsub(/\n/, '')}"
       end
-      buf
     end
 
     def dl_end
-      "\n"
+      blank
     end
 
     def paragraph(lines)
-      lines.join+"\n"
+      puts lines.join
     end
 
     def read(lines)
-      buf = ""
-      buf << "◆→開始:#{@titles["lead"]}←◆\n"
-      buf << lines.join("\n") << "\n"
-      buf << "◆→終了:#{@titles["lead"]}←◆\n"
-      buf << "\n"
-      buf
+      puts "◆→開始:#{@titles["lead"]}←◆"
+      puts split_paragraph(lines).join("\n")
+      puts "◆→終了:#{@titles["lead"]}←◆"
+      blank
     end
 
     alias_method :lead, :read
@@ -221,50 +236,44 @@ module ReVIEW
       else
         %Q[#{I18n.t("list")}#{I18n.t("format_number", [get_chap(chapter), @chapter.list(id).number])}]
       end
+
     end
 
     def list_header(id, caption, lang)
-      buf = ""
-      #buf << "\n"
-      buf << "◆→開始:#{@titles["list"]}←◆\n"
+      blank
+      puts "◆→開始:#{@titles["list"]}←◆"
       if get_chap.nil?
-        buf << %Q[#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [@chapter.list(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}] << "\n"
+        puts %Q[#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [@chapter.list(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}]
       else
-        buf << %Q[#{I18n.t("list")}#{I18n.t("format_number", [get_chap, @chapter.list(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}] << "\n"
+        puts %Q[#{I18n.t("list")}#{I18n.t("format_number", [get_chap, @chapter.list(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}]
       end
-      buf << "\n"
-      buf
+      blank
     end
 
     def list_body(id, lines, lang)
-      buf = ""
       lines.each do |line|
-        buf << detab(line) << "\n"
+        puts detab(line)
       end
-      buf << "◆→終了:#{@titles["list"]}←◆\n"
-      buf << "\n"
-      buf
+      puts "◆→終了:#{@titles["list"]}←◆"
+      blank
     end
 
     def base_block(type, lines, caption = nil)
-      buf = ""
-      buf << "\n"
-      buf << "◆→開始:#{@titles[type]}←◆\n"
-      buf << "■#{caption}\n" unless caption.nil?
-      buf << lines.join("")
-      buf << "◆→終了:#{@titles[type]}←◆\n"
-      buf << "\n"
-      buf
+      blank
+      puts "◆→開始:#{@titles[type]}←◆"
+      puts "■#{compile_inline(caption)}" unless caption.nil?
+      puts lines.join("\n")
+      puts "◆→終了:#{@titles[type]}←◆"
+      blank
     end
 
     def base_parablock(type, lines, caption = nil)
-      buf = ""
-      buf << "◆→開始:#{@titles[type]}←◆\n"
-      buf << "■#{caption}\n" unless caption.nil?
-      buf << lines.join("")
-      buf << "◆→終了:#{@titles[type]}←◆\n"
-      buf << "\n"
-      buf
+      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, lang = nil)
@@ -272,26 +281,23 @@ module ReVIEW
     end
 
     def emlistnum(lines, caption = nil, lang = nil)
-      buf = ""
-      buf << "◆→開始:#{@titles["emlist"]}←◆\n"
-      buf << "■#{caption}\n" unless caption.nil?
+      blank
+      puts "◆→開始:#{@titles["emlist"]}←◆"
+      puts "■#{compile_inline(caption)}" unless caption.nil?
       _lines = []
       lines.each_with_index do |line, i|
-        buf << (i + 1).to_s.rjust(2) + ": #{line}\n"
+        puts (i + 1).to_s.rjust(2) + ": #{line}"
       end
-      buf << "◆→終了:#{@titles["emlist"]}←◆\n"
-      buf << "\n"
-      buf
+      puts "◆→終了:#{@titles["emlist"]}←◆"
+      blank
     end
 
     def listnum_body(lines, lang)
-      buf = ""
       lines.each_with_index do |line, i|
-        buf << (i + 1).to_s.rjust(2) + ": #{line}\n"
+        puts (i + 1).to_s.rjust(2) + ": #{line}"
       end
-      buf << "◆→終了:#{@titles["list"]}←◆\n"
-      buf << "\n"
-      buf
+      puts "◆→終了:#{@titles["list"]}←◆"
+      blank
     end
 
     def cmd(lines, caption = nil)
@@ -321,57 +327,48 @@ module ReVIEW
     end
 
     def image(lines, id, caption, metric=nil)
-      buf = ""
-      #buf << "\n"
-      buf << "◆→開始:#{@titles["image"]}←◆\n"
+      blank
+      puts "◆→開始:#{@titles["image"]}←◆"
       if get_chap.nil?
-        buf << "#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [@chapter.image(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}\n"
+        puts "#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [@chapter.image(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}"
       else
-        buf << "#{I18n.t("image")}#{I18n.t("format_number", [get_chap, @chapter.image(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}\n"
+        puts "#{I18n.t("image")}#{I18n.t("format_number", [get_chap, @chapter.image(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}"
       end
-      buf << "\n"
+      blank
       if @chapter.image(id).bound?
-        buf << "◆→#{@chapter.image(id).path}←◆\n"
+        puts "◆→#{@chapter.image(id).path}←◆"
       else
         lines.each do |line|
-          buf << line << "\n"
+          puts line
         end
       end
-      buf << "◆→終了:#{@titles["image"]}←◆\n"
-      buf << "\n"
-      buf
+      puts "◆→終了:#{@titles["image"]}←◆"
+      blank
     end
 
     def texequation(lines)
-      buf = ""
-      buf << "◆→開始:#{@titles["texequation"]}←◆\n"
-      buf << "#{lines.join("\n")}\n"
-      buf << "◆→終了:#{@titles["texequation"]}←◆\n"
-      buf << "\n"
-      buf
+      puts "◆→開始:#{@titles["texequation"]}←◆"
+      puts "#{lines.join("\n")}"
+      puts "◆→終了:#{@titles["texequation"]}←◆"
+      blank
     end
 
     def table_header(id, caption)
-      buf = ""
-      buf << "\n"
-      buf << "◆→開始:#{@titles["table"]}←◆\n"
+      blank
+      puts "◆→開始:#{@titles["table"]}←◆"
       if get_chap.nil?
-        buf << "#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}\n"
+        puts "#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}"
       else
-        buf << "#{I18n.t("table")}#{I18n.t("format_number", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{caption}\n"
+        puts "#{I18n.t("table")}#{I18n.t("format_number", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}"
       end
-      buf << "\n"
-      buf
+      blank
     end
 
     def table_begin(ncols)
-      ""
     end
 
     def tr(rows)
-      buf = ""
-      buf << rows.join("\t") << "\n"
-      buf
+      puts rows.join("\t")
     end
 
     def th(str)
@@ -383,21 +380,19 @@ module ReVIEW
     end
 
     def table_end
-      buf = ""
-      buf << "◆→終了:#{@titles["table"]}←◆\n"
-      buf << "\n"
-      buf
+      puts "◆→終了:#{@titles["table"]}←◆"
+      blank
     end
 
     def comment(lines, comment = nil)
       lines ||= []
       lines.unshift comment unless comment.blank?
       str = lines.join("")
-      "◆→DTP連絡:#{str}←◆\n"
+      puts "◆→DTP連絡:#{str}←◆"
     end
 
     def footnote(id, str)
-      "【注#{@chapter.footnote(id).number}】#{str}\n"
+      puts "【注#{@chapter.footnote(id).number}】#{compile_inline(str)}"
     end
 
     def inline_fn(id)
@@ -513,28 +508,25 @@ module ReVIEW
     end
 
     def noindent
-      "◆→DTP連絡:次の1行インデントなし←◆\n"
+      puts "◆→DTP連絡:次の1行インデントなし←◆"
     end
 
     def nonum_begin(level, label, caption)
-      "■H#{level}■#{caption}\n"
+      puts "■H#{level}■#{compile_inline(caption)}"
     end
 
     def nonum_end(level)
     end
 
     def common_column_begin(type, caption)
-      buf = ""
-      buf << "◆→開始:#{@titles[type]}←◆\n"
-      buf << %Q[■#{caption}\n]
-      buf
+      blank
+      puts "◆→開始:#{@titles[type]}←◆"
+      puts %Q[■#{compile_inline(caption)}]
     end
 
     def common_column_end(type)
-      buf = ""
-      buf << %Q[◆→終了:#{@titles[type]}←◆\n]
-      buf << "\n"
-      buf
+      puts %Q[◆→終了:#{@titles[type]}←◆]
+      blank
     end
 
     def column_begin(level, label, caption)
@@ -681,20 +673,22 @@ module ReVIEW
       base_block "insn", lines, caption
     end
 
+    def warning(lines, caption = nil)
+      base_parablock "warning", lines, caption
+    end
+
     alias_method :box, :insn
 
     def indepimage(id, caption=nil, metric=nil)
-      buf = ""
-      buf << "\n"
+      blank
       begin
-        buf << "◆→画像 #{@chapter.image(id).path.sub(/\A\.\//, "")} #{metric.join(" ")}←◆\n"
+        puts "◆→画像 #{@chapter.image(id).path.sub(/\A\.\//, "")} #{metric.join(" ")}←◆"
       rescue
         warn "no such image: #{id}"
-        buf << "◆→画像 #{id}←◆\n"
+        puts "◆→画像 #{id}←◆"
       end
-      buf << "図　#{caption}\n" if caption.present?
-      buf << "\n"
-      buf
+      puts "図　#{compile_inline(caption)}" if caption.present?
+      blank
     end
 
     alias_method :numberlessimage, :indepimage
@@ -748,8 +742,7 @@ module ReVIEW
     def inline_chapref(id)
       chs = ["", "「", "」"]
       unless @book.config["chapref"].nil?
-        _chs = convert_inencoding(@book.config["chapref"],
-                                  @book.config["inencoding"]).split(",")
+        _chs = @book.config["chapref"].split(",")
         if _chs.size != 3
           error "--chapsplitter must have exactly 3 parameters with comma."
         else
@@ -763,7 +756,7 @@ module ReVIEW
       nofunc_text("[UnknownChapter:#{id}]")
     end
 
-    def source(lines, caption = nil)
+    def source(lines, caption = nil, lang = nil)
       base_block "source", lines, caption
     end
 
@@ -782,7 +775,7 @@ module ReVIEW
     end
 
     def circle_begin(level, label, caption)
-      "・\t#{caption}\n"
+      puts "・\t#{caption}"
     end
 
     def circle_end(level)
@@ -794,4 +787,4 @@ module ReVIEW
 
   end
 
-end   # module ReVIEW
+end # module ReVIEW