review 1.2.0 → 1.3.0

data/lib/review/latexbuilder.rb

@@ -13,6 +13,7 @@
 require 'review/builder'
 require 'review/latexutils'
 require 'review/textutils'
+require 'review/sec_counter'
 
 module ReVIEW
 
@@ -33,12 +34,12 @@ module ReVIEW
     end
 
     def builder_init_file
-      #@index = indexes[:latex_index]
       @blank_needed = false
       @latex_tsize = nil
       @tsize = nil
       @table_caption = nil
       @ol_num = nil
+      @sec_counter = SecCounter.new(5, @chapter)
     end
     private :builder_init_file
 
@@ -74,18 +75,30 @@ module ReVIEW
       6 => 'subparagraph'
     }
 
+    def headline_prefix(level)
+      @sec_counter.inc(level)
+      anchor = @sec_counter.anchor(level)
+      prefix = @sec_counter.prefix(level, @book.config["secnolevel"])
+      [prefix, anchor]
+    end
+    private :headline_prefix
+
+
     def headline(level, label, caption)
+      _, anchor = headline_prefix(level)
       prefix = ""
-      if level > ReVIEW.book.param["secnolevel"] || (@chapter.number.to_s.empty? && level > 1)
+      if level > @book.config["secnolevel"] || (@chapter.number.to_s.empty? && level > 1)
         prefix = "*"
       end
       blank unless @output.pos == 0
       puts macro(HEADLINE[level]+prefix, compile_inline(caption))
-      if prefix == "*" && level <= ReVIEW.book.param["toclevel"].to_i
+      if prefix == "*" && level <= @book.config["toclevel"].to_i
         puts "\\addcontentsline{toc}{#{HEADLINE[level]}}{#{compile_inline(caption)}}"
       end
       if level == 1
         puts macro('label', chapter_label)
+      else
+        puts macro('label', sec_label(anchor))
       end
     rescue
       error "unknown level: #{level}"
@@ -102,8 +115,15 @@ module ReVIEW
     def column_begin(level, label, caption)
       blank
       puts "\\begin{reviewcolumn}\n"
+      if label
+        puts "\\hypertarget{#{column_label(label)}}{}"
+      else
+        puts "\\hypertarget{#{column_label(caption)}}{}"
+      end
       puts macro('reviewcolumnhead', nil, compile_inline(caption))
-
+      if level <= @book.config["toclevel"].to_i
+        puts "\\addcontentsline{toc}{#{HEADLINE[level]}}{#{compile_inline(caption)}}"
+      end
     end
 
     def column_end(level)
@@ -117,7 +137,7 @@ module ReVIEW
         puts "\\reviewminicolumntitle{#{compile_inline(caption)}}\n"
       end
 
-      if ReVIEW.book.param["deprecated-blocklines"].nil?
+      if @book.config["deprecated-blocklines"].nil?
         blocked_lines = split_paragraph(lines)
         puts blocked_lines.join("\n\n")
       else
@@ -206,7 +226,7 @@ module ReVIEW
       blank
     end
 
-    def parasep()
+    def parasep
       puts '\\parasep'
     end
 
@@ -214,7 +234,7 @@ module ReVIEW
       latex_block 'quotation', lines
     end
 
-    alias lead read
+    alias_method :lead, :read
 
     def emlist(lines, caption = nil)
       blank
@@ -337,16 +357,22 @@ module ReVIEW
     end
     private :existence
 
-    def image_label(id)
-      "image:#{@chapter.id}:#{id}"
+    def image_label(id, chapter=nil)
+      chapter ||= @chapter
+      "image:#{chapter.id}:#{id}"
     end
     private :image_label
 
-    def chapter_label()
+    def chapter_label
       "chap:#{@chapter.id}"
     end
     private :chapter_label
 
+    def sec_label(sec_anchor)
+      "sec:#{sec_anchor}"
+    end
+    private :sec_label
+
     def table_label(id)
       "table:#{@chapter.id}:#{id}"
     end
@@ -357,6 +383,13 @@ module ReVIEW
     end
     private :bib_label
 
+    def column_label(id)
+      filename = @chapter.id
+      num = @chapter.column(id).number
+      "column:#{filename}:#{num}"
+    end
+    private :column_label
+
     def indepimage(id, caption=nil, metric=nil)
       metrics = parse_metric("latex", metric)
       puts '\begin{reviewimage}'
@@ -372,7 +405,7 @@ module ReVIEW
       puts '\end{reviewimage}'
     end
 
-    alias :numberlessimage indepimage
+    alias_method :numberlessimage, :indepimage
 
     def table(lines, id = nil, caption = nil)
       rows = []
@@ -478,7 +511,7 @@ module ReVIEW
       latex_block 'center', lines
     end
 
-    alias centering center
+    alias_method :centering, :center
 
     def flushright(lines)
       latex_block 'flushright', lines
@@ -497,7 +530,7 @@ module ReVIEW
     def latex_block(type, lines)
       blank
       puts macro('begin', type)
-      if ReVIEW.book.param["deprecated-blocklines"].nil?
+      if @book.config["deprecated-blocklines"].nil?
         blocked_lines = split_paragraph(lines)
         puts blocked_lines.join("\n\n")
       else
@@ -520,7 +553,7 @@ module ReVIEW
     def comment(lines, comment = nil)
       lines ||= []
       lines.unshift comment unless comment.blank?
-      if ReVIEW.book.param["draft"]
+      if @book.config["draft"]
         str = lines.join("")
         puts macro('pdfcomment', escape(str))
       end
@@ -548,7 +581,7 @@ module ReVIEW
 
     def inline_chapref(id)
       title = super
-      if ReVIEW.book.param["chapterlink"]
+      if @book.config["chapterlink"]
         "\\hyperref[chap:#{id}]{#{title}}"
       else
         title
@@ -559,7 +592,7 @@ module ReVIEW
     end
 
     def inline_chap(id)
-      if ReVIEW.book.param["chapterlink"]
+      if @book.config["chapterlink"]
         "\\hyperref[chap:#{id}]{#{@chapter.env.chapter_index.number(id)}}"
       else
         @chapter.env.chapter_index.number(id)
@@ -570,7 +603,7 @@ module ReVIEW
     end
 
     def inline_title(id)
-      if ReVIEW.book.param["chapterlink"]
+      if @book.config["chapterlink"]
         "\\hyperref[chap:#{id}]{#{@chapter.env.chapter_index.title(id)}}"
       else
         @chapter.env.chapter_index.title(id)
@@ -594,18 +627,18 @@ module ReVIEW
 
     def inline_img(id)
       chapter, id = extract_chapter_id(id)
-      macro('reviewimageref', "#{chapter.number}.#{chapter.image(id).number}", image_label(id))
+      macro('reviewimageref', "#{chapter.number}.#{chapter.image(id).number}", image_label(id, chapter))
     end
 
     def footnote(id, content)
-      if ReVIEW.book.param["footnotetext"]
+      if @book.config["footnotetext"]
         puts macro("footnotetext[#{@chapter.footnote(id).number}]",
                    compile_inline(content.strip))
       end
     end
 
     def inline_fn(id)
-      if ReVIEW.book.param["footnotetext"]
+      if @book.config["footnotetext"]
         macro("footnotemark[#{@chapter.footnote(id).number}]", "")
       else
         macro('footnote', compile_inline(@chapter.footnote(id).content.strip))
@@ -639,7 +672,7 @@ module ReVIEW
 
     # index
     def inline_idx(str)
-      text(str) + index(str)
+      escape(str) + index(str)
     end
 
     # hidden index??
@@ -692,7 +725,22 @@ module ReVIEW
     end
 
     def inline_hd_chap(chap, id)
-      "「#{chap.headline_index.number(id)} #{compile_inline(chap.headline(id).caption)}」"
+      n = chap.headline_index.number(id)
+      if chap.number and @book.config["secnolevel"] >= n.split('.').size
+        str = "「#{chap.headline_index.number(id)} #{compile_inline(chap.headline(id).caption)}」"
+      else
+        str = "「#{compile_inline(chap.headline(id).caption)}」"
+      end
+      if @book.config["chapterlink"]
+        anchor = n.gsub(/\./, "-")
+        macro('reviewsecref', str, sec_label(anchor))
+      else
+        str
+      end
+    end
+
+    def inline_column(id)
+      macro('reviewcolumnref', "#{@chapter.column(id).caption}", column_label(id))
     end
 
     def inline_raw(str)
@@ -733,7 +781,7 @@ module ReVIEW
     end
 
     def inline_comment(str)
-      if ReVIEW.book.param["draft"]
+      if @book.config["draft"]
         macro('pdfcomment', escape(str))
       else
         ""
@@ -797,7 +845,7 @@ module ReVIEW
     end
 
     def image_ext
-      "svg"
+      "pdf"
     end
 
     def olnum(num)

data/lib/review/latexutils.rb

@@ -67,7 +67,7 @@ module ReVIEW
       }
     end
 
-    alias escape escape_latex
+    alias_method :escape, :escape_latex
 
     def unescape_latex(str)
       metachars_invert_re = Regexp.new(METACHARS_INVERT.keys.collect{|key|  Regexp.escape(key)}.join('|'))
@@ -76,6 +76,8 @@ module ReVIEW
       }
     end
 
+    alias_method :unescape, :unescape_latex
+
     def escape_index(str)
       str.gsub(/[@!|"]/) {|s| '"' + s }
     end

data/lib/review/makerhelper.rb

@@ -1,15 +1,21 @@
 # encoding: utf-8
 #
-# Copyright (c) 2012 Yuto HAYAMIZU
+# Copyright (c) 2012-2014 Yuto HAYAMIZU, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
 # the GNU LGPL, Lesser General Public License version 2.1.
 # For details of the GNU LGPL, see the file "COPYING".
 #
+require 'pathname'
+require 'fileutils'
 
 module ReVIEW
   class MakerHelper
+    # Return review/bin directory
+    def self.bindir
+      Pathname.new("#{Pathname.new(__FILE__).realpath.dirname}/../../bin").realpath
+    end
 
     # Copy image files under from_dir to to_dir recursively
     # ==== Args
@@ -36,7 +42,7 @@ module ReVIEW
           if FileTest.directory?("#{from_dir}/#{fname}")
             image_files += copy_images_to_dir("#{from_dir}/#{fname}", "#{to_dir}/#{fname}", options)
           else
-            Dir.mkdir(to_dir) unless File.exist?(to_dir)
+            FileUtils.mkdir_p(to_dir) unless File.exist?(to_dir)
 
             is_converted = false
             (options[:convert] || {}).each do |orig_type, conv_type|

data/lib/review/preprocessor.rb

@@ -24,22 +24,22 @@ module ReVIEW
     end
 
     def warn(msg)
-      if @param["outencoding"] =~ /^EUC$/
+      if @config["outencoding"] =~ /^EUC$/
         msg = NKF.nkf("-W -e", msg)
-      elsif @param["outencoding"] =~ /^SJIS$/
+      elsif @config["outencoding"] =~ /^SJIS$/
         msg = NKF.nkf("-W -s", msg)
-      elsif @param["outencoding"] =~ /^JIS$/
+      elsif @config["outencoding"] =~ /^JIS$/
         msg = NKF.nkf("-W -j", msg)
       end
       $stderr.puts "#{location()}: warning: #{msg}"
     end
 
     def error(msg)
-      if @param["outencoding"] =~ /^EUC$/
+      if @config["outencoding"] =~ /^EUC$/
         msg = NKF.nkf("-W -e", msg)
-      elsif @param["outencoding"] =~ /^SJIS$/
+      elsif @config["outencoding"] =~ /^SJIS$/
         msg = NKF.nkf("-W -s", msg)
-      elsif @param["outencoding"] =~ /^JIS$/
+      elsif @config["outencoding"] =~ /^JIS$/
         msg = NKF.nkf("-W -j", msg)
       end
       @errutils_err = true
@@ -106,7 +106,7 @@ module ReVIEW
 
     def initialize(repo, param)
       @repository = repo
-      @param = param
+      @config = param
     end
 
     def process(inf, outf)
@@ -142,7 +142,7 @@ module ReVIEW
             @f.print out.string
           end
           skip_list f
-        
+
         when /\A\#@mapfile/
           direc = parse_directive(line, 1, 'eval')
           path = expand(direc.arg)
@@ -166,7 +166,7 @@ module ReVIEW
           #error "unkown directive: #{line.strip}" unless known_directive?(op)
           warn "unkown directive: #{line.strip}" unless known_directive?(op)
           @f.print line
-        
+
         when /\A\s*\z/   # empty line
           @f.puts
         else
@@ -185,21 +185,21 @@ module ReVIEW
 
     def convert_outencoding(*s)
       ine = ""
-      if @param["inencoding"] =~ /^EUC$/i
+      if @config["inencoding"] =~ /^EUC$/i
         ine = "-E,"
-      elsif @param["inencoding"] =~ /^SJIS$/i
+      elsif @config["inencoding"] =~ /^SJIS$/i
         ine = "-S,"
-      elsif @param["inencoding"] =~ /^JIS$/i
+      elsif @config["inencoding"] =~ /^JIS$/i
         ine = "-J,"
-      elsif @param["inencoding"] =~ /^UTF\-8$/i
+      elsif @config["inencoding"] =~ /^UTF\-8$/i
         ine = "-W,"
       end
 
-      if @param["outencoding"] =~ /^EUC$/i
+      if @config["outencoding"] =~ /^EUC$/i
         NKF.nkf("#{ine} -m0x -e", *s)
-      elsif @param["outencoding"] =~ /^SJIS$/i
+      elsif @config["outencoding"] =~ /^SJIS$/i
         NKF.nkf("#{ine} -m0x -s", *s)
-      elsif @param["outencoding"] =~ /^JIS$/i
+      elsif @config["outencoding"] =~ /^JIS$/i
         NKF.nkf("#{ine} -m0x -j", *s)
       else
         NKF.nkf("#{ine} -m0x -w", *s)
@@ -395,7 +395,7 @@ module ReVIEW
 
     attr_reader :number
     attr_reader :string
-    alias to_s string
+    alias_method :to_s, :string
 
     def edit
       self.class.new(@number, yield(@string))
@@ -418,7 +418,7 @@ module ReVIEW
 
     def initialize(param)
       @repository = {}
-      @param = param
+      @config = param
     end
 
     def fetch_file(file)
@@ -538,8 +538,8 @@ module ReVIEW
 
     def canonical(line)
       tabwidth = 8
-      if @param['tabwidth']
-        tabwidth = @param['tabwidth']
+      if @config['tabwidth']
+        tabwidth = @config['tabwidth']
       end
       if tabwidth > 0
         detab(line, tabwidth).rstrip + "\n"

data/lib/review/review.tex.erb

@@ -114,6 +114,10 @@
   リスト #1}
 \newcommand{\reviewbibref}[2]{%
   #1}
+\newcommand{\reviewcolumnref}[2]{%
+  コラム #1}
+\newcommand{\reviewsecref}[2]{%
+  #1}
 
 \newcommand{\reviewminicolumntitle}[1]{%
   {\large ■メモ：#1}\\}

data/lib/review/sec_counter.rb

@@ -47,19 +47,17 @@ module ReVIEW
 
       if level == 1
         if secnolevel >= 1
-          placeholder = if @chapter.is_a? ReVIEW::Book::Part
-                          'part'
-                        elsif @chapter.on_POSTDEF?
-                          'appendix'
-                        else
-                          'chapter'
-                        end
-          return "#{I18n.t(placeholder, @chapter.number)}#{I18n.t("chapter_postfix")}"
+          if @chapter.is_a? ReVIEW::Book::Part
+            num = @chapter.number
+            return "#{I18n.t('part', num)}#{I18n.t("chapter_postfix")}"
+          else
+            return "#{@chapter.format_number}#{I18n.t("chapter_postfix")}"
+          end
         end
       else
-        if secnolevel >= level && !@chapter.on_POSTDEF?
-          prefix = "#{@chapter.number}"
-          0.upto(level-2) do |i|
+        if secnolevel >= level
+          prefix = @chapter.format_number(false)
+          0.upto(level - 2) do |i|
             prefix << ".#{@counter[i]}"
           end
           prefix << I18n.t("chapter_postfix")