review 1.7.2 → 2.0.0.beta1

data/lib/review/latexutils.rb

@@ -17,18 +17,18 @@ module ReVIEW
   module LaTeXUtils
 
     METACHARS = {
-      '#' => '\#',
-      "$" => '\textdollar{}',
+      '#'  => '\#',
+      "$"  => '\textdollar{}',
       '%' => '\%',
       '&' => '\&',
       '{' => '\{',
       '}' => '\}',
-      '_' => '\textunderscore{}',
+      '_'  => '\textunderscore{}',
       '^' => '\textasciicircum{}',
       '~' => '\textasciitilde{}',
       '|' => '\textbar{}',
-      '<' => '\textless{}',
-      '>' => '\textgreater{}',
+      '<'  => '\textless{}',
+      '>'  => '\textgreater{}',
       "\\" => '\reviewbackslash{}',
       "-" => '{-}',
 
@@ -70,7 +70,7 @@ module ReVIEW
     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}"
       }

data/lib/review/layout.tex.erb

@@ -250,7 +250,7 @@
         <%= authors %>
       \end{tabular}\par}%
     \vfill
-    {\large <%= values["date"] %> <%= I18n.t("edition")%>\hspace{2zw}<%= I18n.t("published_by", values["prt"])%>\par}%
+    {\large <%= values["date"] %> <%= I18n.t("version")%>\hspace{2zw}<%= I18n.t("published_by", values["prt"])%>\par}%
 \vskip4zw\mbox{}
   \end{center}%
 \end{titlepage}

data/lib/review/location.rb

@@ -0,0 +1,24 @@
+module ReVIEW
+  class Location
+    def initialize(filename, compiler)
+      @filename = filename
+      @f = compiler
+    end
+
+    attr_reader :filename
+
+    def lineno
+      @f.current_line
+    end
+
+    def string
+      begin
+        "#{@filename}:#{self.lineno}"
+      rescue
+        "#{@filename}:nil"
+      end
+    end
+
+    alias to_s string
+  end
+end

data/lib/review/markdownbuilder.rb

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

data/lib/review/node.rb

@@ -0,0 +1,267 @@
+require 'json'
+
+module ReVIEW
+  class Node
+    attr_accessor :content
+
+    def to_raw
+      to_s_by(:to_raw)
+    end
+
+    def to_doc
+      to_s_by(:to_doc)
+    end
+
+    def to_s_by(meth)
+      if content.kind_of? String
+        @content
+      elsif content == nil
+        nil
+      elsif !content.kind_of? Array
+        @content.__send__(meth)
+      else
+        ##@content.map(&meth).join("")
+        @content.map{|o| o.__send__(meth)}.join("")
+      end
+    end
+
+    def to_json(*args)
+      if content.kind_of? String
+        val = '"'+@content.gsub(/\"/,'\\"').gsub(/\n/,'\\n')+'"'
+      elsif content == nil
+        val = "null"
+      elsif !content.kind_of? Array
+        val = @content.to_json
+      else
+        val = "["+@content.map(&:to_json).join(",")+"]"
+      end
+      '{"ruleName":"' + self.class.to_s.sub(/ReVIEW::/,"").sub(/Node$/,"") + '",' +
+        "\"offset\":#{position.pos},\"line\":#{position.line},\"column\":#{position.col}," +
+        '"childNodes":' + val +
+        '}'
+    end
+
+    def inspect
+      self.to_json
+    end
+
+  end
+
+  class HeadlineNode < Node
+
+    def to_doc
+      content_str = super
+      cmd = @cmd ? @cmd.to_doc : nil
+      label = @label
+      @compiler.compile_headline(@level, cmd, label, content_str)
+    end
+
+    def to_json
+      '{"ruleName":"' + self.class.to_s.sub(/ReVIEW::/,"").sub(/Node$/,"") + '",' +
+        %Q|"cmd":"#{@cmd.to_json}",|+
+        %Q|"label":"#{@label.to_json}",|+
+        "\"offset\":#{position.pos},\"line\":#{position.line},\"column\":#{position.col}," +
+        '"childNodes":' + @content.to_json + '}'
+    end
+  end
+
+  class ParagraphNode < Node
+
+    def to_doc
+      #content = @content.map(&:to_doc)
+      content = super.split(/\n/)
+      @compiler.compile_paragraph(content)
+    end
+  end
+
+  class BlockElementNode < Node
+
+    def to_doc
+      # content_str = super
+      args = @args.map(&:to_doc)
+      if @content
+        content_lines = @content.map(&:to_doc)
+      else
+        content_lines = nil
+      end
+      @compiler.compile_command(@name, @args, content_lines, self)
+    end
+
+    def parse_args(*patterns)
+      patterns.map.with_index do |pattern, i|
+        if @args[i]
+          @args[i].__send__("to_#{pattern}")
+        else
+          nil
+        end
+      end
+    end
+  end
+
+  class CodeBlockElementNode < Node
+
+    def to_doc
+      # content_str = super
+      args = @args.map(&:to_doc)
+      if @content
+        content_lines = raw_lines
+      else
+        content_lines = nil
+      end
+      @compiler.compile_command(@name, @args, content_lines, self)
+    end
+
+    def parse_args(*patterns)
+      patterns.map.with_index do |pattern, i|
+        if @args[i]
+          @args[i].__send__("to_#{pattern}")
+        else
+          nil
+        end
+      end
+    end
+
+    def raw_lines
+      self.content.to_doc.split(/\n/)
+    end
+  end
+
+
+  class InlineElementNode < Node
+
+    def to_raw
+      content_str = super
+      "@<#{@symbol.to_s}>{#{content_str}}"
+    end
+
+    def to_doc
+      #content_str = super
+      @compiler.compile_inline(@symbol, @content)
+    end
+
+    def to_json
+      '{"ruleName":"' + self.class.to_s.sub(/ReVIEW::/,"").sub(/Node$/,"") + '",' +
+        %Q|"symbol":"#{@symbol}",| +
+        "\"offset\":#{position.pos},\"line\":#{position.line},\"column\":#{position.col}," +
+        '"childNodes":[' + @content.map(&:to_json).join(",") + ']}'
+    end
+  end
+
+  class InlineElementContentNode < Node
+  end
+
+  class TextNode < Node
+
+    def to_raw
+      content_str = super
+      content_str.to_s
+    end
+
+    def to_doc
+      content_str = super
+      @compiler.compile_text(content_str)
+    end
+
+    def to_json(*args)
+      val = '"'+@content.gsub(/\"/,'\\"').gsub(/\n/,'\\n')+'"'
+      '{"ruleName":"' + self.class.to_s.sub(/ReVIEW::/,"").sub(/Node$/,"") + '",' +
+        "\"offset\":#{position.pos},\"line\":#{position.line},\"column\":#{position.col}," +
+        '"text":' + val + '}'
+    end
+  end
+
+  class NewLineNode < Node
+
+    def to_doc
+      ""
+    end
+  end
+
+  class RawNode < Node
+
+    def to_doc
+      @compiler.compile_raw(@builder, @content.join(""))
+    end
+  end
+
+  class BracketArgNode < Node
+  end
+
+  class BraceArgNode < Node
+  end
+
+  class SinglelineCommentNode < Node
+    def to_doc
+      ""
+    end
+  end
+
+  class SinglelineContentNode < Node
+  end
+
+  class UlistNode < Node
+    def to_doc
+      @compiler.compile_ulist(@content)
+    end
+  end
+
+  class UlistElementNode < Node
+    def level=(level)
+      @level = level
+    end
+
+    def to_doc
+      @content.map(&:to_doc).join("")
+    end
+
+    def concat(elem)
+      @content << elem
+    end
+  end
+
+  class OlistNode < Node
+    def to_doc
+      @compiler.compile_olist(@content)
+    end
+  end
+
+  class OlistElementNode < Node
+    def num=(num)
+      @num = num
+    end
+
+    def to_doc
+      @content.map(&:to_doc).join("")
+    end
+
+    def concat(elem)
+      @content << elem
+    end
+  end
+
+  class DlistNode < Node
+    def to_doc
+      @compiler.compile_dlist(@content)
+    end
+  end
+
+  class DlistElementNode < Node
+    def to_doc
+      @content.map(&:to_doc).join("")
+    end
+  end
+
+  class DocumentNode < Node
+  end
+
+  class ColumnNode < Node
+
+    def to_doc
+      level = @level
+      label = @label
+      caption = @caption ? @caption.to_doc : nil
+      @compiler.compile_column(level, label, caption, @content)
+    end
+  end
+
+end