review 2.0.0.beta1 → 2.0.0

data/lib/review/latexutils.rb

@@ -1,8 +1,7 @@
 # encoding: utf-8
 #
-# $Id: latexutils.rb 2204 2006-03-18 06:10:26Z aamine $
-#
 # Copyright (c) 2002-2006 Minero Aoki
+# Copyright (c) 2006-2016 Minero Aoki, Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -16,63 +15,71 @@ module ReVIEW
 
   module LaTeXUtils
 
-    METACHARS = {
-      '#'  => '\#',
-      "$"  => '\textdollar{}',
-      '%' => '\%',
-      '&' => '\&',
-      '{' => '\{',
-      '}' => '\}',
-      '_'  => '\textunderscore{}',
-      '^' => '\textasciicircum{}',
-      '~' => '\textasciitilde{}',
-      '|' => '\textbar{}',
-      '<'  => '\textless{}',
-      '>'  => '\textgreater{}',
-      "\\" => '\reviewbackslash{}',
-      "-" => '{-}',
-
-      '⓪' => '\UTF{24EA}',
-      '①' => '\UTF{2460}',
-      '②' => '\UTF{2461}',
-      '③' => '\UTF{2462}',
-      '④' => '\UTF{2463}',
-      '⑤' => '\UTF{2464}',
-      '⑥' => '\UTF{2465}',
-      '⑦' => '\UTF{2466}',
-      '⑧' => '\UTF{2467}',
-      '⑨' => '\UTF{2468}',
-      '⑩' => '\UTF{2469}',
-      '⑪' => '\UTF{246A}',
-      '⑫' => '\UTF{246B}',
-      '⑬' => '\UTF{246C}',
-      '⑭' => '\UTF{246D}',
-      '⑮' => '\UTF{246E}',
-      '⑯' => '\UTF{246F}',
-    }
-
-    kanalist = %w{｡ ｢ ｣ ､ ･ ｦ ｧ ｨ ｩ ｪ ｫ ｬ ｭ ｮ ｯ ｰ ｱ ｲ ｳ ｴ ｵ ｶ ｷ ｸ ｹ ｺ ｻ ｼ ｽ ｾ ｿ ﾀ ﾁ ﾂ ﾃ ﾄ ﾅ ﾆ ﾇ ﾈ ﾉ ﾊ ﾋ ﾌ ﾍ ﾎ ﾏ ﾐ ﾑ ﾒ ﾓ ﾔ ﾕ ﾖ ﾗ ﾘ ﾙ ﾚ ﾛ ﾜ ﾝ ﾞ ﾟ}
-    kanalist.each do |char|
-      char_jisx0208 = NKF::nkf('-WwX',char)
-      METACHARS[char] = "\\aj半角{#{char_jisx0208}}"
-    end
-
-    METACHARS_RE = /[#{Regexp.escape(METACHARS.keys.join(''))}]/u
+    def initialize_metachars(texcommand)
+      @metachars = {
+        '#' => '\#',
+        "$" => '\textdollar{}',
+        '%' => '\%',
+        '&' => '\&',
+        '{' => '\{',
+        '}' => '\}',
+        '_' => '\textunderscore{}',
+        '^' => '\textasciicircum{}',
+        '~' => '\textasciitilde{}',
+        '|' => '\textbar{}',
+        '<' => '\textless{}',
+        '>' => '\textgreater{}',
+        "\\" => '\reviewbackslash{}',
+        "-" => '{-}'
+      }
 
-    METACHARS_INVERT = METACHARS.invert
+      if File.basename(texcommand, ".*") == "platex"
+        @metachars.merge!({
+                           '⓪' => '\UTF{24EA}',
+                           '①' => '\UTF{2460}',
+                           '②' => '\UTF{2461}',
+                           '③' => '\UTF{2462}',
+                           '④' => '\UTF{2463}',
+                           '⑤' => '\UTF{2464}',
+                           '⑥' => '\UTF{2465}',
+                           '⑦' => '\UTF{2466}',
+                           '⑧' => '\UTF{2467}',
+                           '⑨' => '\UTF{2468}',
+                           '⑩' => '\UTF{2469}',
+                           '⑪' => '\UTF{246A}',
+                           '⑫' => '\UTF{246B}',
+                           '⑬' => '\UTF{246C}',
+                           '⑭' => '\UTF{246D}',
+                           '⑮' => '\UTF{246E}',
+                           '⑯' => '\UTF{246F}'
+                         })
+
+        kanalist = %w{｡ ｢ ｣ ､ ･ ｦ ｧ ｨ ｩ ｪ ｫ ｬ ｭ ｮ ｯ ｰ ｱ ｲ ｳ ｴ
+                      ｵ ｶ ｷ ｸ ｹ ｺ ｻ ｼ ｽ ｾ ｿ ﾀ ﾁ ﾂ ﾃ ﾄ ﾅ ﾆ ﾇ ﾈ ﾉ ﾊ ﾋ ﾌ ﾍ ﾎ ﾏ
+                      ﾐ ﾑ ﾒ ﾓ ﾔ ﾕ ﾖ ﾗ ﾘ ﾙ ﾚ ﾛ ﾜ ﾝ ﾞ ﾟ}
+        kanalist.each do |char|
+          char_jisx0208 = NKF::nkf('-WwX',char)
+          @metachars[char] = "\\aj半角{#{char_jisx0208}}"
+        end
+      end
+
+      @metachars_re = /[#{Regexp.escape(@metachars.keys.join(''))}]/u
+
+      @metachars_invert = @metachars.invert
+    end
 
     def escape_latex(str)
-      str.gsub(METACHARS_RE) {|s|
-        METACHARS[s] or raise "unknown trans char: #{s}"
+      str.gsub(@metachars_re) {|s|
+        @metachars[s] or raise "unknown trans char: #{s}"
       }
     end
 
     alias_method :escape, :escape_latex
 
     def unescape_latex(str)
-      metachars_invert_re = Regexp.new(METACHARS_INVERT.keys.collect{|key|  Regexp.escape(key)}.join('|'))
+      metachars_invert_re = Regexp.new(@metachars_invert.keys.collect{|key| Regexp.escape(key)}.join('|'))
       str.gsub(metachars_invert_re) {|s|
-        METACHARS_INVERT[s] or raise "unknown trans char: #{s}"
+        @metachars_invert[s] or raise "unknown trans char: #{s}"
       }
     end
 

data/lib/review/makerhelper.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #
-# Copyright (c) 2012-2014 Yuto HAYAMIZU, Kenshi Muto
+# Copyright (c) 2012-2016 Yuto HAYAMIZU, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -9,13 +9,15 @@
 #
 require 'pathname'
 require 'fileutils'
+require 'yaml'
 
 module ReVIEW
-  class MakerHelper
+  module MakerHelper
     # Return review/bin directory
-    def self.bindir
+    def bindir
       Pathname.new("#{Pathname.new(__FILE__).realpath.dirname}/../../bin").realpath
     end
+    module_function :bindir
 
     # Copy image files under from_dir to to_dir recursively
     # ==== Args
@@ -33,7 +35,7 @@ module ReVIEW
     # Image files are copied recursively, and each '.eps' file is converted into '.eps.png'
     #
 
-    def self.copy_images_to_dir(from_dir, to_dir, options = {})
+    def copy_images_to_dir(from_dir, to_dir, options = {})
       image_files = []
 
       Dir.open(from_dir) do |dir|
@@ -63,5 +65,7 @@ module ReVIEW
 
       image_files
     end
+    module_function :copy_images_to_dir
+
   end
 end

data/lib/review/markdownbuilder.rb

@@ -16,141 +16,123 @@ module ReVIEW
     end
 
     def builder_init_file
+      @blank_seen = nil
       @ul_indent = 0
       @chapter.book.image_types = %w( .png .jpg .jpeg .gif .svg )
     end
     private :builder_init_file
 
-    def blank_reset
+    def puts(str)
       @blank_seen = false
+      super
     end
 
-#    def puts(str)
-#      @blank_seen = false
-#      "#{str}\n"
-#    end
-
     def blank
-      buf = ""
-      unless @blank_seen
-        buf = "\n"
-      end
+      @output.puts unless @blank_seen
       @blank_seen = true
-      buf
     end
 
     def headline(level, label, caption)
-      buf = ""
-      buf << blank
+      blank
       prefix = "#" * level
-      buf << "#{prefix} #{caption}\n"
-      blank_reset
-      buf << "\n"
-      buf
+      puts "#{prefix} #{caption}"
+      blank
     end
 
     def quote(lines)
-      buf = ""
-      buf << blank
-      buf << lines.map{|line| line.chomp!;line.chomp!;"> #{line}"}.join("\n") << "\n"
-      blank_reset
-      buf << "\n"
-      buf
+      blank
+      puts split_paragraph(lines).map{|line| "> #{line}"}.join("\n> \n")
+      blank
     end
 
     def paragraph(lines)
-      buf = lines.join << "\n"
-      blank_reset
-      buf << "\n"
-      buf
+      puts lines.join
+      puts "\n"
     end
 
     def list_header(id, caption, lang)
-      lang ||= ""
       if get_chap.nil?
-        %Q[リスト#{@chapter.list(id).number} #{compile_inline(caption)}\n] + "```#{lang}\n"
+        print %Q[リスト#{@chapter.list(id).number} #{compile_inline(caption)}\n\n]
       else
-        %Q[リスト#{get_chap}.#{@chapter.list(id).number} #{compile_inline(caption)}\n] + "```#{lang}\n"
+        print %Q[リスト#{get_chap}.#{@chapter.list(id).number} #{compile_inline(caption)}\n\n]
       end
+      lang ||= ""
+      puts "```#{lang}"
     end
 
     def list_body(id, lines, lang)
-      buf = ""
       lines.each do |line|
-        buf << detab(line) << "\n"
+        puts detab(line)
       end
-      buf << '```' << "\n"
-      buf
+      puts '```'
     end
 
     def ul_begin
-      buf = ""
-      buf << blank if @ul_indent == 0
+      blank if @ul_indent == 0
       @ul_indent += 1
-      buf
     end
 
     def ul_item(lines)
-      blank_reset
-      "  " * (@ul_indent - 1) + "* " + "#{lines.join}" + "\n"
+      puts "  " * (@ul_indent - 1) + "* " + "#{lines.join}"
     end
 
     def ul_item_begin(lines)
-      blank_reset
-      "  " * (@ul_indent - 1) + "* " + "#{lines.join}" + "\n"
+      puts "  " * (@ul_indent - 1) + "* " + "#{lines.join}"
     end
 
     def ul_item_end
-      ""
     end
 
     def ul_end
-      buf = ""
       @ul_indent -= 1
-      buf << blank if @ul_indent == 0
-      buf
+      blank if @ul_indent == 0
     end
 
     def ol_begin
-      buf = ""
-      buf << blank
-      buf
+      blank
     end
 
     def ol_item(lines, num)
-      buf = ""
-      buf << "#{num}. #{lines.join}" << "\n"
-      blank_reset
-      buf
+      puts "#{num}. #{lines.join}"
     end
 
     def ol_end
-      buf = ""
-      buf << blank
-      buf
+      blank
+    end
+
+    def dl_begin
+      puts '<dl>'
+    end
+
+    def dt(line)
+      puts "<dt>#{line}</dt>"
+    end
+
+    def dd(lines)
+      puts "<dd>#{lines.join}</dd>"
+    end
+
+    def dl_end
+      puts '</dl>'
     end
 
     def emlist(lines, caption = nil, lang = nil)
-      buf = ""
-      buf << blank
+      blank
       if caption
-        buf << caption << "\n"
+        puts caption
+        print "\n"
       end
       lang ||= ""
-      buf << "```#{lang}\n"
-      blank_reset
+      puts "```#{lang}"
       lines.each do |line|
-        buf << detab(line) << "\n"
+        puts detab(line)
       end
-      buf << "```\n"
-      buf << blank
-      buf
+      puts "```"
+      blank
     end
 
     def hr
-      buf << "----\n"
-      blank_reset
-      buf
+      puts "----"
     end
 
     def compile_href(url, label)
@@ -184,60 +166,45 @@ module ReVIEW
 
 
     def image_image(id, caption, metric)
-      buf = ""
-      buf << blank
-      buf << "![#{compile_inline(caption)}](#{@chapter.image(id).path.sub(/\A\.\//, "")})" << "\n"
-      blank_reset
-      buf << blank
-      buf
+      blank
+      puts "![#{compile_inline(caption)}](#{@chapter.image(id).path.sub(/\A\.\//, "")})"
+      blank
     end
 
     def image_dummy(id, caption, lines)
-      buf = ""
-      buf << lines.join << "\n"
-      blank_reset
-      buf
+      puts lines.join
     end
 
     def inline_img(id)
       "#{I18n.t("image")}#{@chapter.image(id).number}"
     rescue KeyError
       error "unknown image: #{id}"
-      "[UnknownImage:#{id}]"
+      nofunc_text("[UnknownImage:#{id}]")
     end
 
     def indepimage(id, caption="", metric=nil)
-      buf = ""
-      buf << blank
-      buf << "![#{compile_inline(caption)}](#{@chapter.image(id).path.sub(/\A\.\//, "")})" << "\n"
-      blank_reset
-      buf << blank
-      buf
+      blank
+      puts "![#{compile_inline(caption)}](#{@chapter.image(id).path.sub(/\A\.\//, "")})"
+      blank
     end
 
     def pagebreak
-      buf  = ""
-      buf << "{pagebreak}" << "\n"
-      buf
+      puts "{pagebreak}"
     end
 
     def image_ext
       "jpg"
     end
 
-    def cmd(lines, caption = nil)
-      buf = ""
-      buf << "```shell-session" << "\n"
-      blank_reset
+    def cmd(lines)
+      puts "```shell-session"
       lines.each do |line|
-        buf << detab(line) << "\n"
+        puts detab(line)
       end
-      buf << "```" << "\n"
-      buf
+      puts "```"
     end
 
     def table(lines, id = nil, caption = nil)
-      buf = ""
       rows = []
       sepidx = nil
       lines.each_with_index do |line, idx|
@@ -247,58 +214,52 @@ module ReVIEW
           sepidx ||= idx
           next
         end
-        rows.push line.strip.split(/\t+/).map{|s| s.sub(/\A\./, '') }
+        rows.push line.strip.split(/\t+/).map {|s| s.sub(/\A\./, '') }
       end
       rows = adjust_n_cols(rows)
 
       begin
-        buf << table_header(id, caption) unless caption.nil?
+        table_header id, caption unless caption.nil?
       rescue KeyError
         error "no such table: #{id}"
       end
-      buf << table_begin(rows.first.size)
-      return buf if rows.empty?
+      table_begin rows.first.size
+      return if rows.empty?
       if sepidx
         sepidx.times do
-          buf << tr(rows.shift.map{|s| th(s) })
+          tr rows.shift.map {|s| th(s) }
         end
-        buf << table_border(rows.first.size)
+        table_border rows.first.size
         rows.each do |cols|
-          buf << tr(cols.map{|s| td(s) })
+          tr cols.map {|s| td(s) }
         end
       else
         rows.each do |cols|
           h, *cs = *cols
-          tr([th(h)] + cs.map {|s| td(s) })
+          tr [th(h)] + cs.map {|s| td(s) }
         end
       end
-      buf << table_end
-      buf
+      table_end
     end
 
     def table_header(id, caption)
-      buf = ""
       if get_chap.nil?
-        buf << %Q[#{I18n.t("table")}#{I18n.t("format_number_header_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}] << "\n"
+        puts %Q[#{I18n.t("table")}#{I18n.t("format_number_header_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}]
       else
-        buf << %Q[#{I18n.t("table")}#{I18n.t("format_number_header", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}] << "\n"
+        puts %Q[#{I18n.t("table")}#{I18n.t("format_number_header", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}]
       end
-      blank_reset
-      buf << blank
-      buf
+      blank
     end
 
     def table_begin(ncols)
-      ""
     end
 
     def tr(rows)
-      "|#{rows.join("|")}|\n"
+      puts "|#{rows.join("|")}|"
     end
 
     def table_border(ncols)
-      blank_reset
-      (0..ncols).map{"|"}.join(":--") + "\n"
+      puts (0..ncols).map{"|"}.join(":--")
     end
 
     def th(str)
@@ -310,17 +271,12 @@ module ReVIEW
     end
 
     def table_end
-      buf = ""
-      buf << blank
-      buf
+      blank
     end
 
     def footnote(id, str)
-      buf = ""
-      buf << "[^#{id}]: #{compile_inline(str)}" << "\n"
-      blank_reset
-      buf << blank
-      buf
+      puts "[^#{id}]: #{compile_inline(str)}"
+      blank
     end
 
     def inline_fn(id)
@@ -336,4 +292,4 @@ module ReVIEW
     end
   end
 
-end   # module ReVIEW
+end # module ReVIEW