review 0.6.0 → 0.9.0

data/lib/review/index.rb

@@ -1,4 +1,4 @@
-# $Id: index.rb 4300 2009-06-21 23:45:49Z kmuto $
+# encoding: utf-8
 #
 # Copyright (c) 2002-2007 Minero Aoki
 #               2008-2009 Minero Aoki, Kenshi Muto
@@ -48,10 +48,6 @@ module ReVIEW
       end
     end
 
-    def setParameter(param)
-      @param = param
-    end
-
     def [](id)
       @index.fetch(id)
     end
@@ -63,6 +59,10 @@ module ReVIEW
     def each(&block)
       @items.each(&block)
     end
+
+    def has_key?(id)
+      return @index.has_key?(id)
+    end
   end
 
 
@@ -157,7 +157,7 @@ module ReVIEW
 
     # internal use only
     def find_pathes(id)
-      if @param["subdirmode"].nil?
+      if ReVIEW.book.param["subdirmode"].nil?
         re = /\A#{@chapid}-#{id}(?i:#{@types.join('|')})\z/x
         entries().select {|ent| re =~ ent }\
             .sort_by {|ent| @types.index(File.extname(ent).downcase) }\
@@ -173,7 +173,7 @@ module ReVIEW
     private
 
     def entries
-      if @param["subdirmode"].nil?
+      if ReVIEW.book.param["subdirmode"].nil?
         @entries ||= Dir.entries(@basedir)
       else
         @entries ||= Dir.entries(File.join(@basedir, @chapid))
@@ -221,4 +221,81 @@ module ReVIEW
       new(items)
     end
   end
+
+  class NumberlessImageIndex < ImageIndex
+    class Item < ImageIndex::Item
+      def initialize(id, number)
+        @id = id
+        @number = ""
+        @pathes = nil
+      end
+    end
+
+    def NumberlessImageIndex.item_type
+      'numberlessimage'
+    end
+
+    def number(id)
+      ""
+    end
+  end
+
+  class IndepImageIndex < ImageIndex
+    class Item < ImageIndex::Item
+      def initialize(id, number)
+        @id = id
+        @number = ""
+        @pathes = nil
+      end
+    end
+
+    def IndepImageIndex.item_type
+      'indepimage'
+    end
+
+    def number(id)
+      ""
+    end
+  end
+
+  class HeadlineIndex < Index
+    Item = Struct.new(:id, :number, :caption)
+
+    def HeadlineIndex.parse(src, chap)
+      items = []
+      indexs = []
+      headlines = []
+      src.each do |line|
+        if m = /\A(=+)(?:\[(.+?)\])?(?:\{(.+?)\})?(.*)/.match(line)
+          next if m[2] == 'column'
+          index = m[1].size - 2
+          if index >= 0
+            if indexs.size > (index + 1)
+              indexs = indexs.take(index + 1)
+              headlines = headlines.take(index + 1)
+            end
+            indexs << 0 if indexs[index].nil?
+            indexs[index] += 1
+            headlines[index] = m[4].strip
+            items.push Item.new(headlines.join("|"), indexs.dup, m[4].strip)
+          end
+        end
+      end
+      new(items, chap)
+    end
+
+    def initialize(items, chap)
+      @items = items
+      @chap = chap
+      @index = {}
+      items.each do |i|
+        warn "warning: duplicate ID: #{i.id}" unless @index[i.id].nil?
+        @index[i.id] = i
+      end
+    end
+
+    def number(id)
+      return ([@chap.number] + @index.fetch(id).number).join(".")
+    end
+  end
 end

data/lib/review/latexbuilder.rb

@@ -1,4 +1,4 @@
-#
+# encoding: utf-8
 #
 # Copyright (c) 2002-2007 Minero Aoki
 #               2008-2009 Minero Aoki, Kenshi Muto
@@ -21,6 +21,13 @@ module ReVIEW
     include LaTeXUtils
     include TextUtils
 
+    [:icon, :dtp, :hd_chap].each {|e|
+      Compiler.definline(e)
+    }
+
+    Compiler.defblock(:memo, 0..1)
+    Compiler.defsingle(:latextsize, 1)
+
     def extname
       '.tex'
     end
@@ -28,6 +35,9 @@ module ReVIEW
     def builder_init_file
       #@index = indexes[:latex_index]
       @blank_needed = false
+      @latex_tsize = nil
+      @tsize = nil
+      @table_caption = nil
     end
     private :builder_init_file
 
@@ -63,32 +73,60 @@ module ReVIEW
 
     def headline(level, label, caption)
       prefix = ""
-      if level > @param["secnolevel"]
+      if level > ReVIEW.book.param["secnolevel"]
         prefix = "*"
       end
       blank unless @output.pos == 0
-      puts macro(HEADLINE[level]+prefix, escape(caption))
+      puts macro(HEADLINE[level]+prefix, compile_inline(caption))
+    end
+
+    def nonum_begin(level, label, caption)
+      blank unless @output.pos == 0
+      puts macro(HEADLINE[level]+"*", compile_inline(caption))
+    end
+
+    def nonum_end(level)
     end
 
     def column_begin(level, label, caption)
       blank
       ## puts '\vspace{2zw}' 
-      puts '\begin{center}'
-      puts '\begin{minipage}{0.9\linewidth}'
-      puts '\begin{framed}'
-      puts '\setlength{\FrameSep}{2zw}'
+##      puts '\begin{center}'
+##      puts '\begin{minipage}{1.0\linewidth}'
+##      puts '\begin{framed}'
+##      puts '\setlength{\FrameSep}{1zw}'
+
+##      nonum_begin(3, label, caption)   # FIXME
+
+      puts "\\begin{reviewcolumn}\n"
+      puts macro('reviewcolumnhead', nil, compile_inline(caption))
 
-      headline(2, label, caption)   # FIXME
     end
 
     def column_end(level)
-      puts '\end{framed}'
-      puts '\end{minipage}'
-      puts '\end{center}'
-      ## puts '\vspace{2zw}'
+##      puts '\end{framed}'
+##      puts '\end{minipage}'
+##      puts '\end{center}'
+##      ## puts '\vspace{2zw}'
+      puts "\\end{reviewcolumn}\n"
       blank
     end
 
+    def minicolumn(type, lines, caption)
+      puts "\\begin{reviewminicolumn}\n"
+      unless caption.nil?
+        puts "\\reviewminicolumntitle{#{compile_inline(caption)}}\n"
+      end
+      lines.each {|l|
+        puts l
+      }
+      puts "\\end{reviewminicolumn}\n"
+    end
+
+    def memo(lines, caption = nil)
+      minicolumn("memo", lines, caption)
+    end
+
     def ul_begin
       blank
       puts '\begin{itemize}'
@@ -158,46 +196,91 @@ module ReVIEW
     def emlist(lines)
       blank
       puts '\begin{reviewemlist}'
-      puts '\begin{verbatim}'
+      puts '\begin{alltt}'
       lines.each do |line|
         puts line
       end
-      puts '\end{verbatim}'
+      puts '\end{alltt}'
+      puts '\end{reviewemlist}'
+      blank
+    end
+
+    def emlistnum(lines)
+      blank
+      puts '\begin{reviewemlist}'
+      puts '\begin{alltt}'
+      lines.each_with_index do |line, i|
+        puts detab((i+1).to_s.rjust(2) + ": " + line)
+      end
+      puts '\end{alltt}'
       puts '\end{reviewemlist}'
       blank
     end
 
+    def listnum_body(lines)
+      puts '\begin{reviewlist}'
+      puts '\begin{alltt}'
+      lines.each_with_index do |line, i|
+        puts detab((i+1).to_s.rjust(2) + ": " + line)
+      end
+      puts '\end{alltt}'
+      puts '\end{reviewlist}'
+      puts
+
+     end
+
     def cmd(lines)
       blank
       puts '\begin{reviewcmd}'
-      puts '\begin{verbatim}'
+      puts '\begin{alltt}'
       lines.each do |line|
         puts line
       end
-      puts '\end{verbatim}'
+      puts '\end{alltt}'
       puts '\end{reviewcmd}'
       blank
     end
 
     def list_header(id, caption)
-      puts macro('reviewlistcaption', "#{@chapter.number}.#{@chapter.list(id).number}", text(caption))
+      puts macro('reviewlistcaption', "リスト#{@chapter.number}.#{@chapter.list(id).number}: #{compile_inline(caption)}")
     end
 
     def list_body(lines)
       puts '\begin{reviewlist}'
-      puts '\begin{verbatim}'
+      puts '\begin{alltt}'
       lines.each do |line|
         puts line
       end
-      puts '\end{verbatim}'
+      puts '\end{alltt}'
       puts '\end{reviewlist}'
-      puts
+      puts ""
+    end
+
+    def source(lines, caption)
+      puts '\begin{reviewlist}'
+      source_header caption
+      source_body lines
+      puts '\end{reviewlist}'
+      puts ""
+    end
+
+    def source_header(caption)
+      puts macro('reviewlistcaption', compile_inline(caption))
     end
 
+    def source_body(lines)
+      puts '\begin{alltt}'
+      lines.each do |line|
+        puts line
+      end
+      puts '\end{alltt}'
+    end
+
+
     def image_header(id, caption)
     end
 
-    def image_image(id, metric, caption)
+    def image_image(id, caption, metric)
       # image is always bound here
       puts '\begin{reviewimage}'
       if metric
@@ -207,22 +290,22 @@ module ReVIEW
       end
       puts macro('label', image_label(id))
       if !caption.empty?
-        puts macro('caption', text(caption))
+        puts macro('caption', compile_inline(caption))
       end
       puts '\end{reviewimage}'
     end
 
     def image_dummy(id, caption, lines)
       puts '\begin{reviewdummyimage}'
-      puts '\begin{verbatim}'
+      puts '\begin{alltt}'
       path = @chapter.image(id).path
       puts "--[[path = #{path} (#{existence(id)})]]--"
       lines.each do |line|
         puts detab(line.rstrip)
       end
-      puts '\end{verbatim}'
+      puts '\end{alltt}'
       puts macro('label', image_label(id))
-      puts text(caption)
+      puts compile_inline(caption)
       puts '\end{reviewdummyimage}'
     end
 
@@ -236,13 +319,42 @@ module ReVIEW
     end
     private :image_label
 
+    def indepimage(id, caption=nil, metric=nil)
+      puts '\begin{reviewimage}'
+      if metric
+        puts "\\includegraphics[#{metric}]{#{@chapter.image(id).path}}"
+      else
+        puts macro('includegraphics', @chapter.image(id).path)
+      end
+      if !caption.nil? && !caption.empty?
+        puts macro('caption', compile_inline(caption))
+      end
+      puts '\end{reviewimage}'
+    end
+
+    alias :numberlessimage indepimage
+
     def table_header(id, caption)
-      puts macro('reviewtablecaption', "#{@chapter.number}.#{@chapter.table(id).number}", text(caption))
+      if caption && !caption.empty?
+        @table_caption = true
+        puts '\begin{table}[h]'
+##      puts macro('reviewtablecaption', "表#{@chapter.number}.#{@chapter.table(id).number} #{compile_inline(caption)}")
+        puts macro('reviewtablecaption', compile_inline(caption))
+      end
     end
 
     def table_begin(ncols)
-      puts macro('begin', 'reviewtable', (['|'] * (ncols + 1)).join('l'))
+      if @latex_tsize
+        puts macro('begin', 'reviewtable', @latex_tsize)
+      elsif @tsize
+        cellwidth = @tsize.split(/\s*,\s*/)
+        puts macro('begin', 'reviewtable', '|'+(cellwidth.collect{|i| "p{#{i}mm}"}.join('|'))+'|')
+      else
+        puts macro('begin', 'reviewtable', (['|'] * (ncols + 1)).join('l'))
+      end
       puts '\hline'
+      @tsize = nil
+      @latex_tsize = nil
     end
 
     def table_separator
@@ -250,11 +362,21 @@ module ReVIEW
     end
 
     def th(s)
-      macro('textgt', s)
+      ## use shortstack for @<br>
+      if  /\\\\/i =~ s
+        macro('textgt', macro('shortstack[l]', s))
+      else
+        macro('textgt', s)
+      end
     end
 
     def td(s)
-      s
+      ## use shortstack for @<br>
+      if  /\\\\/ =~ s
+        macro('shortstack[l]', s)
+      else
+        s
+      end
     end
 
     def tr(rows)
@@ -264,26 +386,45 @@ module ReVIEW
 
     def table_end
       puts macro('end', 'reviewtable')
+      if @table_caption
+        puts '\end{table}'
+      end
+      @table_caption = nil
       blank
     end
 
     def quote(lines)
-      latex_block 'quotation', lines
+      latex_block 'quote', lines
     end
 
     def center(lines)
       latex_block 'center', lines
     end
 
-    def right(lines)
+    def flushright(lines)
       latex_block 'flushright', lines
     end
 
+    def texequation(lines)
+      blank
+      puts macro('begin','equation*')
+      lines.each do |line|
+        puts unescape_latex(line)
+      end
+      puts macro('end', 'equation*')
+      blank
+    end
+
     def latex_block(type, lines)
       blank
       puts macro('begin', type)
-      lines.each do |line|
-        puts line
+      if ReVIEW.book.param["deprecated-blocklines"].nil?
+        blocked_lines = split_paragraph(lines)
+        puts blocked_lines.join("\n\n")
+      else
+        lines.each do |line|
+          puts line
+        end
       end
       puts macro('end', type)
       blank
@@ -319,15 +460,18 @@ module ReVIEW
 
     # FIXME: use TeX native label/ref.
     def inline_list(id)
-      macro('reviewlistref', "#{@chapter.number}.#{@chapter.list(id).number}")
+      chapter, id = extract_chapter_id(id)
+      macro('reviewlistref', "#{chapter.number}.#{chapter.list(id).number}")
     end
 
     def inline_table(id)
-      macro('reviewtableref', "#{@chapter.number}.#{@chapter.table(id).number}")
+      chapter, id = extract_chapter_id(id)
+      macro('reviewtableref', "#{chapter.number}.#{chapter.table(id).number}")
     end
 
     def inline_img(id)
-      macro('reviewimageref', "#{@chapter.number}.#{@chapter.image(id).number}")
+      chapter, id = extract_chapter_id(id)
+      macro('reviewimageref', "#{chapter.number}.#{chapter.image(id).number}")
     end
 
     def footnote(id, content)
@@ -358,14 +502,39 @@ module ReVIEW
       index(str)
     end
 
-    # index
+    # index -> italic
     def inline_i(str)
+      macro('textit', escape(str))
+    end
+
+    # index
+    def inline_idx(str)
       text(str) + index(str)
     end
 
+    # hidden index??
+    def inline_hidx(str)
+      index(str)
+    end
+
     # bold
     def inline_b(str)
-      macro('textbf', text(str))
+      macro('textbf', escape(str))
+    end
+
+    # line break
+    def inline_br(str)
+      "\\\\\n"
+    end
+
+    def inline_dtp(str)
+      # ignore
+      ""
+    end
+
+    ## @<code> is same as @<tt>
+    def inline_code(str)
+      macro('texttt', escape(str))
     end
 
     def nofunc_text(str)
@@ -373,7 +542,53 @@ module ReVIEW
     end
 
     def inline_tt(str)
-      macro('texttt', escape(str))
+      str_escaped = escape(str).gsub(/\-\-/, "{-}{-}")
+      macro('texttt', str_escaped)
+    end
+
+    def inline_tti(str)
+      macro('texttt', macro('textit', escape(str)))
+    end
+
+    def inline_ttb(str)
+      macro('texttt', macro('textbf', escape(str)))
+    end
+
+    def inline_hd_chap(chap, id)
+      "「#{chap.headline_index.number(id)} #{chap.headline(id).caption}」"
+    end
+
+    def inline_raw(str)
+      escape(str)
+    end
+
+    def inline_sub(str)
+      macro('textsubscript', escape(str))
+    end
+
+    def inline_sup(str)
+      macro('textsuperscript', escape(str))
+    end
+
+    def inline_em(str)
+      macro('textbf', escape(str))
+    end
+
+    def inline_strong(str)
+      macro('textbf', escape(str))
+    end
+
+    def inline_u(str)
+      macro('Underline', escape(str))
+    end
+
+    def inline_icon(id)
+      macro('includegraphics', @chapter.image(id).path)
+    end
+
+    def inline_uchar(str)
+      # with otf package
+      macro('UTF', escape(str))
     end
 
     def index(str)
@@ -396,9 +611,9 @@ module ReVIEW
 
     def compile_kw(word, alt)
       if alt
-        macro('textgt', escape(word)) + "（#{escape(alt.strip)}）"
+        macro('reviewkw', escape(word)) + "（#{escape(alt.strip)}）"
       else
-        macro('textgt', escape(word))
+        macro('reviewkw', escape(word))
       end
     end
 
@@ -412,7 +627,11 @@ module ReVIEW
     end
 
     def tsize(str)
-      # dummy
+      @tsize = str
+    end
+
+    def latextsize(str)
+      @latex_tsize = str
     end
 
   end