review 2.1.0 → 2.2.0

data/lib/review/latexbuilder.rb

@@ -37,11 +37,39 @@ module ReVIEW
       @tsize = nil
       @table_caption = nil
       @ol_num = nil
+      @first_line_num = nil
       @sec_counter = SecCounter.new(5, @chapter)
+      setup_index
       initialize_metachars(@book.config["texcommand"])
     end
     private :builder_init_file
 
+    def setup_index
+      @index_db = {}
+      @index_mecab = nil
+      if @book.config["pdfmaker"]["makeindex"]
+        @index_db = load_idxdb(@book.config["pdfmaker"]["makeindex_dic"]) if @book.config["pdfmaker"]["makeindex_dic"]
+        if @book.config["pdfmaker"]["makeindex_mecab"]
+          begin
+            require 'MeCab'
+            require 'nkf'
+            @index_mecab = MeCab::Tagger.new(@book.config["pdfmaker"]["makeindex_mecab_opts"])
+          rescue LoadError
+            error "not found MeCab"
+          end
+        end
+      end
+    end
+
+    def load_idxdb(file)
+      table = {}
+      File.foreach(file) do |line|
+        key, value = *line.strip.split(/\t+/, 2)
+        table[key] = value
+      end
+      table
+    end
+
     def blank
       @blank_needed = true
     end
@@ -261,11 +289,12 @@ module ReVIEW
 
     def emlistnum(lines, caption = nil, lang = nil)
       blank
+      first_line_num = get_line_num
       if highlight_listings?
-        common_code_block_lst(nil, lines, 'reviewemlistnumlst', 'title', caption, lang)
+        common_code_block_lst(nil, lines, 'reviewemlistnumlst', 'title', caption, lang, first_line_num: first_line_num)
       else
         common_code_block(nil, lines, 'reviewemlist', caption, lang) do |line, idx|
-          detab((idx+1).to_s.rjust(2)+": " + line) + "\n"
+          detab((idx+first_line_num).to_s.rjust(2)+": " + line) + "\n"
         end
       end
     end
@@ -283,11 +312,12 @@ module ReVIEW
 
     ## override Builder#listnum
     def listnum(lines, id, caption, lang = nil)
+      first_line_num = get_line_num
       if highlight_listings?
-        common_code_block_lst(id, lines, 'reviewlistnumlst', 'caption', caption, lang)
+        common_code_block_lst(id, lines, 'reviewlistnumlst', 'caption', caption, lang, first_line_num: first_line_num)
       else
         common_code_block(id, lines, 'reviewlist', caption, lang) do |line, idx|
-          detab((idx+1).to_s.rjust(2)+": " + line) + "\n"
+          detab((idx+first_line_num).to_s.rjust(2)+": " + line) + "\n"
         end
       end
     end
@@ -305,7 +335,7 @@ module ReVIEW
 
     def common_code_block(id, lines, command, caption, lang)
       if caption
-        if command =~ /emlist/ || command =~ /cmd/
+        if command =~ /emlist/ || command =~ /cmd/ || command =~ /source/
           puts macro(command + 'caption', "#{compile_inline(caption)}")
         else
           begin
@@ -319,17 +349,28 @@ module ReVIEW
       lines.each_with_index do |line, idx|
         body.concat(yield(line, idx))
       end
-      puts macro('begin' ,command)
+      puts macro('begin',command)
+      print body
+      puts macro('end',command)
+      blank
+    end
+
+    def common_code_block_lst(id, lines, command, title, caption, lang, first_line_num: 1)
+      if title == "title" && caption.blank?
+        print "\\vspace{-1.5em}"
+      end
+      body = lines.inject(''){|i, j| i + detab(unescape_latex(j)) + "\n"}
+      args = make_code_block_args(title, caption, lang, first_line_num: first_line_num)
+      puts "\\begin{"+command+"}[" + args + "]"
       print body
-      puts macro('end' ,command)
+      puts "\\end{"+ command + "}"
       blank
     end
 
-    def common_code_block_lst(id, lines, command, title, caption, lang)
+    def make_code_block_args(title, caption, lang, first_line_num: 1)
       caption_str = compile_inline((caption || ""))
       if title == "title" && caption_str == ""
         caption_str = "\\relax" ## dummy charactor to remove lstname
-        print "\\vspace{-1.5em}"
       end
       if @book.config["highlight"] && @book.config["highlight"]["lang"]
         lexer = @book.config["highlight"]["lang"] # default setting
@@ -337,24 +378,20 @@ module ReVIEW
         lexer = ""
       end
       lexer = lang if lang.present?
-      body = lines.inject(''){|i, j| i + detab(unescape_latex(j)) + "\n"}
-      puts "\\begin{"+command+"}["+title+"={"+caption_str+"},language={"+ lexer+"}]"
-      print body
-      puts "\\end{"+ command + "}"
-      blank
+      args = title + "={" + caption_str + "},language={" + lexer + "}"
+      if first_line_num != 1
+        args += ",firstnumber=#{first_line_num}"
+      end
+      args
     end
 
     def source(lines, caption, lang = nil)
       if highlight_listings?
-        common_code_block_lst(nil, lines, 'reviewlistlst', 'title', caption, lang)
+        common_code_block_lst(nil, lines, 'reviewsourcelst', 'title', caption, lang)
       else
-        puts '\begin{reviewlist}'
-        puts macro('reviewlistcaption', compile_inline(caption))
-        lines.each do |line|
-          puts detab(line)
+        common_code_block(nil, lines, 'reviewsource', caption, lang) do |line, idx|
+          detab(line) + "\n"
         end
-        puts '\end{reviewlist}'
-        puts ""
       end
     end
 
@@ -507,8 +544,12 @@ module ReVIEW
       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('|')+'|')
+        if @tsize =~ /\A[\d., ]+\Z/
+          cellwidth = @tsize.split(/\s*,\s*/)
+          puts macro('begin', 'reviewtable', '|'+cellwidth.collect{|i| "p{#{i}mm}"}.join('|')+'|')
+        else
+          puts macro('begin', 'reviewtable', @tsize)
+        end
       else
         puts macro('begin', 'reviewtable', (['|'] * (ncols + 1)).join('l'))
       end
@@ -634,7 +675,7 @@ module ReVIEW
       lines ||= []
       lines.unshift comment unless comment.blank?
       if @book.config["draft"]
-        str = lines.join("")
+        str = lines.join('\par ')
         puts macro('pdfcomment', escape(str))
       end
     end
@@ -821,7 +862,9 @@ module ReVIEW
     end
 
     def inline_column_chap(chapter, id)
-      macro('reviewcolumnref', "#{chapter.column(id).caption}", column_label(id))
+      macro('reviewcolumnref',
+            I18n.t("chapter_quote", compile_inline(chapter.column(id).caption)),
+            column_label(id))
     end
 
     def inline_raw(str)
@@ -884,21 +927,27 @@ module ReVIEW
     end
 
     def index(str)
-      str.sub!(/\(\)/, '')
-      decl = ''
-      if /@\z/ =~ str
-        str.chop!
-        decl = '|IndexDecl'
-      end
-      unless /[^ -~]/ =~ str
-        if /\^/ =~ str
-          macro('index', escape_index(str.gsub(/\^/, '')) + '@' + escape_index(text(str)) + decl)
+      sa = str.split('<<>>')
+
+      sa.map! do |item|
+        if @index_db[item]
+          item = escape_index(escape_latex(@index_db[item])) + "@" + escape_index(escape_latex(item))
         else
-          '\index{' + escape_index(text(str)) + decl + '}'
+          if item =~ /\A[[:ascii:]]+\Z/ || @index_mecab.nil?
+            esc_item = escape_index(escape_latex(item))
+            if esc_item != item
+              "#{escape_index(item)}@#{esc_item}"
+            else
+              esc_item
+            end
+          else
+            yomi = NKF.nkf("-w --hiragana", @index_mecab.parse(item).force_encoding("UTF-8").chomp)
+            escape_index(escape_latex(yomi)) + "@" + escape_index(escape_latex(item))
+          end
         end
-      else
-        '\index{' + escape_index(@index_db[str]) + '@' + escape_index(text(str)) + '}'
       end
+
+      "\\index{#{sa.join('!')}}"
     end
 
     def compile_kw(word, alt)
@@ -921,10 +970,6 @@ module ReVIEW
       end
     end
 
-    def tsize(str)
-      @tsize = str
-    end
-
     def latextsize(str)
       @latex_tsize = str
     end

data/lib/review/latexutils.rb

@@ -35,30 +35,30 @@ module ReVIEW
 
       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}'
-                         })
+                            '⓪' => '\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)
+          char_jisx0208 = NKF.nkf('-WwX',char)
           @metachars[char] = "\\aj半角{#{char_jisx0208}}"
         end
       end

data/lib/review/markdownbuilder.rb

@@ -74,10 +74,6 @@ module ReVIEW
       @ul_indent += 1
     end
 
-    def ul_item(lines)
-      puts "  " * (@ul_indent - 1) + "* " + "#{lines.join}"
-    end
-
     def ul_item_begin(lines)
       puts "  " * (@ul_indent - 1) + "* " + "#{lines.join}"
     end
@@ -301,6 +297,22 @@ module ReVIEW
       end
     end
 
+    def comment(lines, comment = nil)
+      if @book.config["draft"]
+        lines ||= []
+        lines.unshift comment unless comment.blank?
+        str = lines.join("<br />")
+        puts %Q(<div class="red">#{escape_html(str)}</div>)
+      end
+    end
+
+    def inline_comment(str)
+      if @book.config["draft"]
+        %Q(<span class="red">#{escape_html(str)}</span>)
+      else
+        ''
+      end
+    end
   end
 
 end # module ReVIEW

data/lib/review/md2inaobuilder.rb

@@ -44,15 +44,6 @@ module ReVIEW
       puts '</dl>'
     end
 
-    def comment(lines, comment = nil)
-      lines ||= []
-      lines.unshift comment unless comment.blank?
-      str = lines.join("\n")
-      puts '<span class="red">'
-      puts str
-      puts '</span>'
-    end
-
     def compile_ruby(base, ruby)
       if base.length == 1
         %Q[<span class='monoruby'>#{escape_html(base)}(#{escape_html(ruby)})</span>]

data/lib/review/pdfmaker.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #
-# Copyright (c) 2010-2016 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2017 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -87,7 +87,7 @@ module ReVIEW
     end
 
     def parse_opts(args)
-      cmd_config = Hash.new
+      cmd_config = {}
       opts = OptionParser.new
 
       opts.banner = "Usage: review-pdfmaker configfile"
@@ -132,6 +132,87 @@ module ReVIEW
       generate_pdf(yamlfile)
     end
 
+    def make_input_files(book, yamlfile)
+      input_files = Hash.new{|h, key| h[key] = ""}
+      book.parts.each do |part|
+        if part.name.present?
+          if part.file?
+            output_chaps(part.name, yamlfile)
+            input_files["CHAPS"] << %Q|\\input{#{part.name}.tex}\n|
+          else
+            input_files["CHAPS"] << %Q|\\part{#{part.name}}\n|
+          end
+        end
+
+        part.chapters.each do |chap|
+          filename = File.basename(chap.path, ".*")
+          output_chaps(filename, yamlfile)
+          input_files["PREDEF"] << "\\input{#{filename}.tex}\n" if chap.on_PREDEF?
+          input_files["CHAPS"] << "\\input{#{filename}.tex}\n" if chap.on_CHAPS?
+          input_files["APPENDIX"] << "\\input{#{filename}.tex}\n" if chap.on_APPENDIX?
+          input_files["POSTDEF"] << "\\input{#{filename}.tex}\n" if chap.on_POSTDEF?
+        end
+      end
+
+      input_files
+    end
+
+    def build_pdf
+      template = get_template
+      Dir.chdir(@path) do
+        File.open("./book.tex", "wb"){|f| f.write(template)}
+
+        call_hook("hook_beforetexcompile")
+
+        ## do compile
+        if ENV["REVIEW_SAFE_MODE"].to_i & 4 > 0
+          warn "command configuration is prohibited in safe mode. ignored."
+          texcommand = ReVIEW::Configure.values["texcommand"]
+          dvicommand = ReVIEW::Configure.values["dvicommand"]
+          dvioptions = ReVIEW::Configure.values["dvioptions"]
+          texoptions = ReVIEW::Configure.values["texoptions"]
+          makeindex_command = ReVIEW::Configure.values["pdfmaker"]["makeindex_command"]
+          makeindex_options = ReVIEW::Configure.values["pdfmaker"]["makeindex_options"]
+          makeindex_sty = ReVIEW::Configure.values["pdfmaker"]["makeindex_sty"]
+          makeindex_dic = ReVIEW::Configure.values["pdfmaker"]["makeindex_dic"]
+        else
+          texcommand = @config["texcommand"] if @config["texcommand"]
+          dvicommand = @config["dvicommand"] if @config["dvicommand"]
+          dvioptions = @config["dvioptions"] if @config["dvioptions"]
+          texoptions = @config["texoptions"] if @config["texoptions"]
+          makeindex_command = @config["pdfmaker"]["makeindex_command"]
+          makeindex_options = @config["pdfmaker"]["makeindex_options"]
+          makeindex_sty = @config["pdfmaker"]["makeindex_sty"]
+          makeindex_dic = @config["pdfmaker"]["makeindex_dic"]
+        end
+
+        if makeindex_sty.present?
+          makeindex_sty = File.absolute_path(makeindex_sty, @basedir)
+          makeindex_options += " -s #{makeindex_sty}" if File.exist?(makeindex_sty)
+        end
+        if makeindex_dic.present?
+          makeindex_dic = File.absolute_path(makeindex_dic, @basedir)
+          makeindex_options += " -d #{makeindex_dic}" if File.exist?(makeindex_dic)
+        end
+
+        2.times do
+          system_or_raise("#{texcommand} #{texoptions} book.tex")
+        end
+
+        call_hook("hook_beforemakeindex")
+        system_or_raise("#{makeindex_command} #{makeindex_options} book") if @config["pdfmaker"]["makeindex"] && File.exist?("book.idx")
+        call_hook("hook_aftermakeindex")
+
+        system_or_raise("#{texcommand} #{texoptions} book.tex")
+        call_hook("hook_aftertexcompile")
+
+        if File.exist?("book.dvi")
+          system_or_raise("#{dvicommand} #{dvioptions} book.dvi")
+          call_hook("hook_afterdvipdf")
+        end
+      end
+    end
+
     def generate_pdf(yamlfile)
       remove_old_file
       @path = build_path()
@@ -141,25 +222,8 @@ module ReVIEW
         book = ReVIEW::Book.load(@basedir)
         book.config = @config
         @converter = ReVIEW::Converter.new(book, ReVIEW::LATEXBuilder.new)
-        book.parts.each do |part|
-          if part.name.present?
-            if part.file?
-              output_chaps(part.name, yamlfile)
-              @input_files["CHAPS"] << %Q|\\input{#{part.name}.tex}\n|
-            else
-              @input_files["CHAPS"] << %Q|\\part{#{part.name}}\n|
-            end
-          end
 
-          part.chapters.each do |chap|
-            filename = File.basename(chap.path, ".*")
-            output_chaps(filename, yamlfile)
-            @input_files["PREDEF"] << "\\input{#{filename}.tex}\n" if chap.on_PREDEF?
-            @input_files["CHAPS"] << "\\input{#{filename}.tex}\n" if chap.on_CHAPS?
-            @input_files["APPENDIX"] << "\\input{#{filename}.tex}\n" if chap.on_APPENDIX?
-            @input_files["POSTDEF"] << "\\input{#{filename}.tex}\n" if chap.on_POSTDEF?
-          end
-        end
+        @input_files = make_input_files(book, yamlfile)
 
         check_compile_status(@config["ignore-errors"])
 
@@ -168,37 +232,13 @@ module ReVIEW
           @config["usepackage"] = "\\usepackage{#{@config['texstyle']}}"
         end
 
-        copy_images("./images", File.join(@path, "images"))
+        copy_images(@config["imagedir"], File.join(@path, @config["imagedir"]))
         copyStyToDir(File.join(Dir.pwd, "sty"), @path)
         copyStyToDir(File.join(Dir.pwd, "sty"), @path, "fd")
         copyStyToDir(File.join(Dir.pwd, "sty"), @path, "cls")
         copyStyToDir(Dir.pwd, @path, "tex")
 
-        template = get_template
-        Dir.chdir(@path) do
-          File.open("./book.tex", "wb"){|f| f.write(template)}
-
-          call_hook("hook_beforetexcompile")
-
-          ## do compile
-          if ENV["REVIEW_SAFE_MODE"].to_i & 4 > 0
-            warn "command configuration is prohibited in safe mode. ignored."
-          else
-            texcommand = @config["texcommand"] if @config["texcommand"]
-            dvicommand = @config["dvicommand"] if @config["dvicommand"]
-            dvioptions = @config["dvioptions"] if @config["dvioptions"]
-            texoptions = @config["texoptions"] if @config["texoptions"]
-          end
-          3.times do
-            system_or_raise("#{texcommand} #{texoptions} book.tex")
-          end
-          call_hook("hook_aftertexcompile")
-
-          if File.exist?("book.dvi")
-            system_or_raise("#{dvicommand} #{dvioptions} book.dvi")
-          end
-        end
-        call_hook("hook_afterdvipdf")
+        build_pdf
 
         FileUtils.cp(File.join(@path, "book.pdf"), pdf_filepath)
 
@@ -299,11 +339,14 @@ module ReVIEW
             revstr = ReVIEW::I18n.t("nth_impression", "#{rev+1}")
             if item =~ /\A\d+\-\d+\-\d+\Z/
               buf << ReVIEW::I18n.t("published_by1", [date_to_s(item), editstr+revstr])
-            else
+            elsif item =~ /\A(\d+\-\d+\-\d+)[\s　](.+)/
               # custom date with string
               item.match(/\A(\d+\-\d+\-\d+)[\s　](.+)/) do |m|
                 buf << ReVIEW::I18n.t("published_by3", [date_to_s(m[1]), m[2]])
               end
+            else
+              # free format
+              buf << item
             end
           end
         end
@@ -350,7 +393,7 @@ module ReVIEW
         @coverimageoption = "width=\\textwidth,height=\\textheight,keepaspectratio"
       end
 
-      @locale_latex = Hash.new
+      @locale_latex = {}
       part_tuple = I18n.get("part").split(/\%[A-Za-z]{1,3}/, 2)
       chapter_tuple = I18n.get("chapter").split(/\%[A-Za-z]{1,3}/, 2)
       appendix_tuple = I18n.get("appendix").split(/\%[A-Za-z]{1,3}/, 2)