review 0.9.0 → 1.0.0

data/lib/review/i18n.rb

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+require 'yaml'
+
+module ReVIEW
+  class I18n
+    def self.setup
+      user_i18n = YAML.load_file(File.expand_path "locale.yaml", ENV["PWD"])
+      I18n.i18n user_i18n["locale"], user_i18n
+    rescue
+      I18n.i18n "ja"
+    end
+
+    def self.i18n(locale, user_i18n = {})
+      locale ||= "ja"
+      i18n_yaml_path = File.expand_path "i18n.yaml", File.dirname(__FILE__)
+      @i18n = YAML.load_file(i18n_yaml_path)[locale]
+      if @i18n
+        @i18n.merge!(user_i18n)
+      end
+    end
+
+    def self.t(str, args = nil)
+      @i18n[str] % args
+    rescue
+      str
+    end
+  end
+
+  I18n.setup
+end

data/lib/review/i18n.yaml

@@ -0,0 +1,23 @@
+ja:
+  image: 図
+  table: 表
+  list: リスト
+  chapter: 第%d章
+  chapter_postfix: "　"
+  numberless_image: "図:"
+  format_number: "%s.%d"
+  format_number_header: "%s.%d:"
+  format_number_without_chapter: "%d"
+  format_number_header_without_chapter: "%d:"
+
+en:
+  image: "Figure "
+  table: "Table "
+  list: "List "
+  chapter: Chapter %d
+  chapter_postfix: ". "
+  numberless_image: "Figure:"
+  format_number: "%s.%d"
+  format_number_header: "%s.%d:"
+  format_number_without_chapter: "%d"
+  format_number_header_without_chapter: "%d:"

data/lib/review/idgxmlbuilder.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #
 # Copyright (c) 2002-2007 Minero Aoki
-#               2008-2010 Minero Aoki, Kenshi Muto
+#               2008-2012 Minero Aoki, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -20,9 +20,7 @@ module ReVIEW
     include TextUtils
     include HTMLUtils
 
-    [:ttbold, :hint, :maru, :keytop, :labelref, :ref, :pageref, :icon, :balloon].each {|e|
-      Compiler.definline(e)
-    }
+    [:ttbold, :hint, :maru, :keytop, :labelref, :ref, :pageref, :balloon].each {|e| Compiler.definline(e) }
     Compiler.defsingle(:dtp, 1)
 
     Compiler.defblock(:insn, 0..1)
@@ -148,9 +146,9 @@ module ReVIEW
 
         print %Q(<chapter id="chap:#{@chapter.number}">) unless @secttags.nil?
         if @chapter.number.to_s =~ /\A\d+$/
-          prefix = "第#{@chapter.number}章　"
+          prefix = "#{I18n.t("chapter", @chapter.number)}#{I18n.t("chapter_postfix")}"
         elsif !@chapter.number.nil? && !@chapter.number.to_s.empty?
-          prefix = "#{@chapter.number}　"
+          prefix = "#{@chapter.number}#{I18n.t("chapter_postfix")}"
         end
         @section = 0
         @subsection = 0
@@ -212,12 +210,23 @@ module ReVIEW
       puts %Q(<title#{label} aid:pstyle="h#{level}">#{prefix}#{compile_inline(caption)}</title><?dtp level="#{level}" section="#{prefix}#{escape_html(compile_inline(caption))}"?>)
     end
 
+
     def ul_begin
-      puts '<ul>'
+      level = block_given? ? yield : ""
+      level = nil if level == 1
+      puts "<ul#{level == 1 ? nil : level}>"
     end
 
     def ul_item(lines)
-      puts %Q(<li aid:pstyle="ul-item">#{lines.join("\n").chomp}</li>)
+      puts %Q(<li aid:pstyle="ul-item">#{lines.join.chomp}</li>)
+    end
+
+    def ul_item_begin(lines)
+      print %Q(<li aid:pstyle="ul-item">#{lines.join.chomp})
+    end
+
+    def ul_item_end
+      puts "</li>"
     end
 
     def choice_single_begin
@@ -237,7 +246,9 @@ module ReVIEW
     end
 
     def ul_end
-      puts '</ul>'
+      level = block_given? ? yield : ""
+      level = nil if level == 1
+      puts "</ul#{level}>"
     end
 
     def ol_begin
@@ -245,7 +256,7 @@ module ReVIEW
     end
 
     def ol_item(lines, num)
-      puts %Q(<li aid:pstyle="ol-item" num="#{num}">#{lines.join("\n").chomp}</li>)
+      puts %Q(<li aid:pstyle="ol-item" num="#{num}">#{lines.join.chomp}</li>)
     end
 
     def ol_end
@@ -261,7 +272,7 @@ module ReVIEW
     end
 
     def dd(lines)
-      puts "<dd>#{lines.join("\n").chomp}</dd>"
+      puts "<dd>#{lines.join.chomp}</dd>"
     end
 
     def dl_end
@@ -282,27 +293,47 @@ module ReVIEW
     end
 
     def read(lines)
-      blocked_lines = ReVIEW.book.param["deprecated-blocklines"].nil? ? split_paragraph(lines) : lines
-      puts %Q[<p aid:pstyle="lead">#{blocked_lines.join}</p>]
+      if ReVIEW.book.param["deprecated-blocklines"].nil?
+        puts %Q[<lead>#{split_paragraph(lines).join}</lead>]
+      else
+        puts %Q[<p aid:pstyle="lead">#{lines.join}</p>]
+      end
     end
 
     alias :lead read
 
     def inline_list(id)
       chapter, id = extract_chapter_id(id)
-      "<span type='list'>リスト#{getChap(chapter)}#{chapter.list(id).number}</span>"
+      if get_chap(chapter).nil?
+        "<span type='list'>#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [chapter.list(id).number])}</span>"
+      else
+        "<span type='list'>#{I18n.t("list")}#{I18n.t("format_number", [get_chap(chapter), chapter.list(id).number])}</span>"
+      end
     end
 
     def list_header(id, caption)
       puts %Q[<codelist>]
-      puts %Q[<caption>リスト#{getChap}#{@chapter.list(id).number}　#{compile_inline(caption)}</caption>]
+      if get_chap.nil?
+        puts %Q[<caption>#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [@chapter.list(id).number])}　#{compile_inline(caption)}</caption>]
+      else
+        puts %Q[<caption>#{I18n.t("list")}#{I18n.t("format_number", [get_chap, @chapter.list(id).number])}　#{compile_inline(caption)}</caption>]
+      end
     end
 
     def list_body(lines)
       print %Q(<pre>)
+      no = 1
       lines.each do |line|
+        unless ReVIEW.book.param["listinfo"].nil?
+          print "<listinfo line=\"#{no}\""
+          print " begin=\"1\"" if no == 1
+          print " end=\"#{no}\"" if no == lines.size
+          print ">"
+        end
         print detab(line)
         print "\n"
+        print "</listinfo>" unless ReVIEW.book.param["listinfo"].nil?
+        no += 1
       end
       puts "</pre></codelist>"
     end
@@ -364,39 +395,46 @@ module ReVIEW
 
     def inline_table(id)
       chapter, id = extract_chapter_id(id)
-      "<span type='table'>表#{getChap(chapter)}#{chapter.table(id).number}</span>"
+      if get_chap(chapter).nil?
+        "<span type='table'>#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [chapter.table(id).number])}</span>"
+      else
+        "<span type='table'>#{I18n.t("table")}#{I18n.t("format_number", [get_chap(chapter), chapter.table(id).number])}</span>"
+      end
     end
 
     def inline_img(id)
       chapter, id = extract_chapter_id(id)
-      "<span type='image'>図#{getChap(chapter)}#{chapter.image(id).number}</span>"
+      if get_chap(chapter).nil?
+        "<span type='image'>#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [chapter.image(id).number])}</span>"
+      else
+        "<span type='image'>#{I18n.t("image")}#{I18n.t("format_number", [get_chap(chapter), chapter.image(id).number])}</span>"
+      end
     end
-
-    def parse_metric(metric)
-      return [] if metric.nil? || metric.empty?
-      params = []
-      values = metric.split(/\s*?,\s*?/)
-      return [] if values.size == 0
-      values.each {|value|
-        k, v = value.split("=", 2)
-        params.push("#{k}=\"" + v.gsub("\"", '') + "\"")
-      }
-      return params
+ 
+    def handle_metric(str)
+      k, v = str.split('=', 2)
+      return %Q|#{k}=\"#{v.sub(/\A["']/, '').sub(/["']\Z/, '')}\"|
+    end
+      
+    def result_metric(array)
+      " #{array.join(' ')}"
     end
 
     def image_image(id, caption, metric=nil)
+      metrics = parse_metric("idgxml", metric)
       puts "<img>"
-      params = parse_metric(metric)
-      puts %Q[<Image href="file://#{@chapter.image(id).path.sub(/\A.\//, "")}" #{params.join(" ")} />]
+      puts %Q[<Image href="file://#{@chapter.image(id).path.sub(/\A.\//, "")}"#{metrics} />]
       image_header id, caption
       puts "</img>"
     end
 
     def image_dummy(id, caption, lines)
-      if ReVIEW.book.param["subdirmode"].nil?
-        warn "image file not exist: images/#{@chapter.id}-#{id}.eps" unless File.exist?("images/#{@chapter.id}-#{id}.eps")
-      else
+      if ReVIEW.book.param["subdirmode"]
         warn "image file not exist: images/#{@chapter.id}/#{id}.eps" unless File.exist?("images/#{@chapter.id}/#{id}.eps")
+      elsif ReVIEW.book.param["singledirmode"]
+        warn "image file not exist: images/#{@chapter.id}/#{id}.eps" unless File.exist?("images/#{id}.eps")
+      else
+        warn "image file not exist: images/#{@chapter.id}-#{id}.eps" unless File.exist?("images/#{@chapter.id}-#{id}.eps")
       end
       puts "<img>"
       print %Q[<pre aid:pstyle="dummyimage">]
@@ -410,7 +448,11 @@ module ReVIEW
     end
 
     def image_header(id, caption)
-      puts %Q[<caption>図#{getChap}#{@chapter.image(id).number}　#{compile_inline(caption)}</caption>]
+      if get_chap.nil?
+        puts %Q[<caption>#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [@chapter.image(id).number])}　#{compile_inline(caption)}</caption>]
+      else
+        puts %Q[<caption>#{I18n.t("image")}#{I18n.t("format_number", [get_chap, @chapter.image(id).number])}　#{compile_inline(caption)}</caption>]
+      end
     end
 
     def texequation(lines)
@@ -448,17 +490,15 @@ module ReVIEW
       cellwidth = []
       unless tablewidth.nil?
         if @tsize.nil?
-          col.times {|n|
-            cellwidth[n] = tablewidth / col
-          }
+          col.times {|n| cellwidth[n] = tablewidth / col }
         else
           cellwidth = @tsize.split(/\s*,\s*/)
           totallength = 0
-          cellwidth.size.times {|n|
+          cellwidth.size.times do |n|
             cellwidth[n] = cellwidth[n].to_f / 0.351 # mm -> pt
             totallength = totallength + cellwidth[n]
             warn "total length exceeds limit for table: #{id}" if totallength > tablewidth
-          }
+          end
           if cellwidth.size < col
             cw = (tablewidth - totallength) / (col - cellwidth.size)
             warn "auto cell sizing exceeds limit for table: #{id}" if cw <= 0
@@ -483,43 +523,46 @@ module ReVIEW
       end
 
       if sepidx
-        sepidx.times do
+        sepidx.times do |y|
           if tablewidth.nil?
             puts %Q[<tr type="header">#{rows.shift}</tr>]
           else
             i = 0
-            rows.shift.split(/\t/).each {|cell|
-              print %Q[<td aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="#{sprintf("%.13f", cellwidth[i])}">#{cell.sub("DUMMYCELLSPLITTER", "")}</td>]
+            rows.shift.split(/\t/).each_with_index do |cell, x|
+              print %Q[<td xyh="#{x + 1},#{y + 1},#{sepidx}" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="#{sprintf("%.13f", cellwidth[i])}">#{cell.sub("DUMMYCELLSPLITTER", "")}</td>]
               i += 1
-            }
+            end
           end
         end
       end
-      trputs(tablewidth, rows, cellwidth)
+      trputs(tablewidth, rows, cellwidth, sepidx)
       puts "</tbody></table>"
       @tsize = nil
     end
 
-    def trputs(tablewidth, rows, cellwidth)
+    def trputs(tablewidth, rows, cellwidth, sepidx)
+      sepidx = 0 if sepidx.nil?
       if tablewidth.nil?
         lastline = rows.pop
-        rows.each do |row|
-          puts %Q[<tr>#{row}</tr>]
-        end
+        rows.each {|row| puts %Q[<tr>#{row}</tr>] }
         puts %Q[<tr type="lastline">#{lastline}</tr>] unless lastline.nil?
       else
-        rows.each do |row|
+        rows.each_with_index do |row, y|
           i = 0
-          row.split(/\t/).each {|cell|
-            print %Q[<td aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="#{sprintf("%.13f", cellwidth[i])}">#{cell.sub("DUMMYCELLSPLITTER", "")}</td>]
+          row.split(/\t/).each_with_index do |cell, x|
+            print %Q[<td xyh="#{x + 1},#{y + 1 + sepidx},#{sepidx}" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="#{sprintf("%.13f", cellwidth[i])}">#{cell.sub("DUMMYCELLSPLITTER", "")}</td>]
             i += 1
-          }
+          end
         end
       end
     end
 
     def table_header(id, caption)
-      puts %Q[<caption>表#{getChap}#{@chapter.table(id).number}　#{compile_inline(caption)}</caption>]
+      if get_chap.nil?
+      puts %Q[<caption>#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [@chapter.table(id).number])}　#{compile_inline(caption)}</caption>]
+      else
+        puts %Q[<caption>#{I18n.t("table")}#{I18n.t("format_number", [get_chap, @chapter.table(id).number])}　#{compile_inline(caption)}</caption>]
+      end
     end
 
     def table_begin(ncols)
@@ -585,7 +628,7 @@ module ReVIEW
     end
 
     def inline_raw(str)
-      %Q[#{str.gsub("\\n", "\n")}]
+      %Q[#{super(str).gsub("\\n", "\n")}]
     end
 
     def inline_hint(str)
@@ -597,15 +640,15 @@ module ReVIEW
     end
 
     def inline_maru(str)
-      if str =~ /\A\d+$/
+      if str =~ /\A\d+\Z/
         sprintf("&#x%x;", 9311 + str.to_i)
-      elsif str =~ /\A[A-Z]$/
+      elsif str =~ /\A[A-Z]\Z/
         begin
           sprintf("&#x%x;", 9398 + str.codepoints.to_a[0] - 65)
         rescue NoMethodError
           sprintf("&#x%x;", 9398 + str[0] - 65)
         end
-      elsif str =~ /\A[a-z]$/
+      elsif str =~ /\A[a-z]\Z/
         begin
           sprintf("&#x%x;", 9392 + str.codepoints.to_a[0] - 65)
         rescue NoMethodError
@@ -940,10 +983,10 @@ module ReVIEW
     end
 
    def indepimage(id, caption=nil, metric=nil)
+     metrics = parse_metric("idgxml", metric)
       puts "<img>"
-      params = parse_metric(metric)
       begin
-        puts %Q[<Image href="file://#{@chapter.image(id).path.sub(/\A\.\//, "")}" #{params.join(" ")} />]
+        puts %Q[<Image href="file://#{@chapter.image(id).path.sub(/\A\.\//, "")}"#{metrics} />]
       rescue
         warn %Q[no such image: #{id}]
       end
@@ -979,7 +1022,7 @@ module ReVIEW
     end
 
     def inline_code(str)
-      %Q(<tt type='inline-code'>#{escape_html(str)}</tt>)
+      %Q[<tt type='inline-code'>#{escape_html(str)}</tt>]
     end
 
     def inline_br(str)
@@ -988,11 +1031,11 @@ module ReVIEW
 
     def rawblock(lines)
       no = 1
-      lines.each {|l|
+      lines.each do |l|
         print l.gsub("&lt;", "<").gsub("&gt;", ">").gsub("&quot;", "\"").gsub("&amp;", "&")
         print "\n" unless lines.length == no
         no = no + 1
-      }
+      end
     end
 
     def text(str)
@@ -1055,13 +1098,17 @@ module ReVIEW
 
     def inline_recipe(id)
       # FIXME
-      %Q(<recipe idref="#{escape_html(id)}">[XXX]「#{escape_html(id)}」\tp.XX</recipe>)
+      %Q(<recipe idref="#{escape_html(id)}">[XXX]「#{escape_html(id)}」　p.XX</recipe>)
     end
 
     def nofunc_text(str)
       escape_html(str)
     end
 
+    def image_ext
+      "eps"
+    end
+
   end
 
 end   # module ReVIEW

data/lib/review/index.rb

@@ -22,6 +22,9 @@ module ReVIEW
         if id = line.slice(/\[(.*?)\]/, 1)
           items.push item_class().new(id, seq)
           seq += 1
+          if id == ""
+            warn "warning: no ID of #{item_type()} in #{line}"
+          end
         end
       end
       new(items, *args)
@@ -43,7 +46,7 @@ module ReVIEW
       @items = items
       @index = {}
       items.each do |i|
-        warn "warning: duplicate ID: #{i.id}" unless @index[i.id].nil?
+        warn "warning: duplicate ID: #{i.id} (#{i})" unless @index[i.id].nil?
         @index[i.id] = i
       end
     end
@@ -142,7 +145,7 @@ module ReVIEW
     end
 
     def ImageIndex.item_type
-      'image'
+      '(image|graph)'
     end
 
     def initialize(items, chapid, basedir, types)
@@ -157,32 +160,51 @@ module ReVIEW
 
     # internal use only
     def find_pathes(id)
-      if ReVIEW.book.param["subdirmode"].nil?
-        re = /\A#{@chapid}-#{id}(?i:#{@types.join('|')})\z/x
+      if ReVIEW.book.param["subdirmode"]
+        re = /\A#{id}(?i:#{@types.join('|')})\z/x
         entries().select {|ent| re =~ ent }\
-            .sort_by {|ent| @types.index(File.extname(ent).downcase) }\
-            .map {|ent| "#{@basedir}/#{ent}" }
-      else
+          .sort_by {|ent| @types.index(File.extname(ent).downcase) }\
+          .map {|ent| "#{@basedir}/#{@chapid}/#{ent}" }
+      elsif ReVIEW.book.param["singledirmode"]
         re = /\A#{id}(?i:#{@types.join('|')})\z/x
         entries().select {|ent| re =~ ent }\
-            .sort_by {|ent| @types.index(File.extname(ent).downcase) }\
-            .map {|ent| "#{@basedir}/#{@chapid}/#{ent}" }
+          .sort_by {|ent| @types.index(File.extname(ent).downcase) }\
+          .map {|ent| "#{@basedir}/#{ent}" }
+      else
+        re = /\A#{@chapid}-#{id}(?i:#{@types.join('|')})\z/x
+        entries().select {|ent| re =~ ent }\
+          .sort_by {|ent| @types.index(File.extname(ent).downcase) }\
+          .map {|ent| "#{@basedir}/#{ent}" }
       end
     end
 
     private
 
     def entries
-      if ReVIEW.book.param["subdirmode"].nil?
-        @entries ||= Dir.entries(@basedir)
+      # @entries: do not cache for graph
+      if ReVIEW.book.param["subdirmode"]
+        @entries = Dir.entries(File.join(@basedir, @chapid))
       else
-        @entries ||= Dir.entries(File.join(@basedir, @chapid))
+        @entries = Dir.entries(@basedir)
       end
     rescue Errno::ENOENT
       @entries = []
     end
   end
 
+  class IconIndex < ImageIndex
+    def IconIndex.parse(src, *args)
+      items = []
+      seq = 1
+      src.grep(%r!@<icon>!) do |line|
+        line.gsub(/@<icon>\{(.+?)\}/) do |m|
+          items.push item_class().new($1, seq)
+          seq += 1
+        end
+      end
+      new(items, *args)
+    end
+  end
 
   class FormatRef
     def initialize(locale, index)