review 2.0.0 → 2.1.0

data/lib/review/book/index.rb

@@ -79,9 +79,10 @@ module ReVIEW
         @items.each(&block)
       end
 
-      def has_key?(id)
-        return @index.has_key?(id)
+      def key?(id)
+        return @index.key?(id)
       end
+      alias_method :has_key?, :key?
     end
 
 
@@ -238,28 +239,6 @@ module ReVIEW
       end
     end
 
-    class FormatRef
-      def initialize(locale, index)
-        @locale = locale
-        @index = index
-      end
-
-      def title(id)
-        sprintf(@locale["#{@index.item_type}_caption_format".to_sym],
-          @index.title(id))
-      end
-
-      def number(id)
-        sprintf(@locale["#{@index.item_type}_number_format".to_sym],
-          @index.number(id))
-      end
-
-      def method_missing(mid, *args, &block)
-        super unless @index.respond_to?(mid)
-        @index.__send__(mid, *args, &block)
-      end
-    end
-
     class BibpaperIndex < Index
       Item = Struct.new(:id, :number, :caption)
 

data/lib/review/book/part.rb

@@ -21,8 +21,8 @@ module ReVIEW
         @book = book
         @number = number
         @chapters = chapters
+        @name = name ? File.basename(name, '.re') : nil
         @path = name
-        @title = nil
         if io
           @content = io.read
         elsif @path && File.exist?(@path)
@@ -30,7 +30,11 @@ module ReVIEW
         else
           @content = nil
         end
-        @name = name ? File.basename(name, '.re') : nil
+        if file?
+          @title = nil
+        else
+          @title = name
+        end
         @volume = nil
       end
 

data/lib/review/configure.rb

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+require 'securerandom'
+
 module ReVIEW
   class Configure < Hash
 
@@ -23,7 +25,7 @@ module ReVIEW
         "date" => nil, # publishing date
         "rights" => nil, # Copyright messages
         "description" => nil, # Description
-        "urnid" => nil, # Identifier (nil makes random uuid)
+        "urnid" => "urn:uid:#{SecureRandom.uuid}", # Identifier
         "stylesheet" => "stylesheet.css", # stylesheet file
         "coverfile" => nil, # content file of body of cover page
         "mytoc" => nil, # whether make own table of contents or not
@@ -52,7 +54,7 @@ module ReVIEW
         "page_metric" => ReVIEW::Book::PageMetric::A5,
         "ext" => '.re',
         "image_dir" => 'images',
-        "image_types" => %w( .ai .psd .eps .pdf .tif .tiff .png .bmp .jpg .jpeg .gif .svg ),
+        "image_types" => %w(.ai .psd .eps .pdf .tif .tiff .png .bmp .jpg .jpeg .gif .svg),
         "image_scale2width" => true, # for LaTeX
         "bib_file" => "bib.re",
         "colophon_order" => %w(aut csl trl dsr ill cov edt pbl contact prt),

data/lib/review/htmlbuilder.rb

@@ -50,7 +50,7 @@ module ReVIEW
     def builder_init_file
       @warns = []
       @errors = []
-      @chapter.book.image_types = %w( .png .jpg .jpeg .gif .svg )
+      @chapter.book.image_types = %w(.png .jpg .jpeg .gif .svg)
       @column = 0
       @sec_counter = SecCounter.new(5, @chapter)
       @nonum_counter = 0
@@ -444,9 +444,11 @@ module ReVIEW
 
     def list_body(id, lines, lang)
       id ||= ''
-      print %Q[<pre class="list">]
-      body = lines.inject(''){|i, j| i + detab(j) + "\n"}
+      class_names = ["list"]
       lexer = lang || File.extname(id).gsub(/\./, '')
+      class_names.push("language-#{lexer}") unless lexer.blank?
+      print %Q[<pre class="#{class_names.join(" ")}">]
+      body = lines.inject(''){|i, j| i + detab(j) + "\n"}
       puts highlight(:body => body, :lexer => lexer, :format => 'html')
       puts '</pre>'
     end
@@ -491,7 +493,9 @@ module ReVIEW
         puts highlight(:body => body, :lexer => lexer, :format => 'html',
                        :options => {:linenos => 'inline', :nowrap => false})
       else
-        print '<pre class="list">'
+        class_names = ["list"]
+        class_names.push("language-#{lang}") unless lang.blank?
+        print %Q[<pre class="#{class_names.join(" ")}">]
         lines.each_with_index do |line, i|
           puts detab((i+1).to_s.rjust(2) + ": " + line)
         end
@@ -504,7 +508,9 @@ module ReVIEW
       if caption.present?
         puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
       end
-      print %Q[<pre class="emlist">]
+      class_names = ["emlist"]
+      class_names.push("language-#{lang}") unless lang.blank?
+      print %Q[<pre class="#{class_names.join(" ")}">]
       body = lines.inject(''){|i, j| i + detab(j) + "\n"}
       lexer = lang
       puts highlight(:body => body, :lexer => lexer, :format => 'html')
@@ -524,7 +530,9 @@ module ReVIEW
         puts highlight(:body => body, :lexer => lexer, :format => 'html',
                        :options => {:linenos => 'inline', :nowrap => false})
       else
-        print '<pre class="emlist">'
+        class_names = ["emlist"]
+        class_names.push("language-#{lang}") unless lang.blank?
+        print %Q[<pre class="#{class_names.join(" ")}">]
         lines.each_with_index do |line, i|
           puts detab((i+1).to_s.rjust(2) + ": " + line)
         end
@@ -622,7 +630,7 @@ module ReVIEW
     end
 
     def image_dummy(id, caption, lines)
-      puts %Q[<div class="image">]
+      puts %Q[<div id="#{normalize_id(id)}" class="image">]
       puts %Q[<pre class="dummyimage">]
       lines.each do |line|
         puts detab(line)
@@ -761,7 +769,7 @@ module ReVIEW
     def indepimage(id, caption="", metric=nil)
       metrics = parse_metric("html", metric)
       caption = "" if caption.nil?
-      puts %Q[<div class="image">]
+      puts %Q[<div id="#{normalize_id(id)}" class="image">]
       begin
         puts %Q[<img src="#{@chapter.image(id).path.sub(/\A\.\//, "")}" alt="#{escape_html(compile_inline(caption))}"#{metrics} />]
       rescue
@@ -932,8 +940,7 @@ module ReVIEW
       if @book.config["mathml"]
         require 'math_ml'
         require 'math_ml/symbol/character_reference'
-        parser = MathML::LaTeX::Parser.new(
-          :symbol => MathML::Symbol::CharacterReference)
+        parser = MathML::LaTeX::Parser.new(:symbol => MathML::Symbol::CharacterReference)
         %Q[<span class="equation">#{parser.parse(str, nil)}</span>]
       else
         %Q[<span class="equation">#{escape_html(str)}</span>]

data/lib/review/htmlutils.rb

@@ -69,11 +69,10 @@ module ReVIEW
       begin
         require 'pygments'
         begin
-          Pygments.highlight(
-                   unescape_html(body),
-                   :options => options,
-                   :formatter => format,
-                   :lexer => lexer)
+          Pygments.highlight(unescape_html(body),
+                             :options => options,
+                             :formatter => format,
+                             :lexer => lexer)
         rescue MentosError
           body
         end

data/lib/review/i18n.rb

@@ -119,41 +119,47 @@ module ReVIEW
         end
       end
 
-      percents = frmt.scan(/%\w{1,3}/)
+      percents = frmt.scan(/%[A-Za-z]{1,3}/)
+      remove_args = []
       percents.each_with_index do |i, idx|
         case i
         when "%pA"
           frmt.sub!(i, ALPHA_U[args[idx]])
-          args.delete idx
+          remove_args << idx
         when "%pa"
           frmt.sub!(i, ALPHA_L[args[idx]])
-          args.delete idx
+          remove_args << idx
         when "%pAW"
           frmt.sub!(i, ALPHA_UW[args[idx]])
-          args.delete idx
+          remove_args << idx
         when "%paW"
           frmt.sub!(i, ALPHA_LW[args[idx]])
-          args.delete idx
+          remove_args << idx
         when "%pR"
           frmt.sub!(i, ROMAN_U[args[idx]])
-          args.delete idx
+          remove_args << idx
         when "%pr"
           frmt.sub!(i, ROMAN_L[args[idx]])
-          args.delete idx
+          remove_args << idx
         when "%pRW"
           frmt.sub!(i, ROMAN_UW[args[idx]])
-          args.delete idx
+          remove_args << idx
         when "%pJ"
           frmt.sub!(i, JAPAN[args[idx]])
-          args.delete idx
+          remove_args << idx
         when "%pdW"
           frmt.sub!(i, ARABIC_LW[args[idx]])
-          args.delete idx
+          remove_args << idx
         when "%pDW"
           frmt.sub!(i, ARABIC_UW[args[idx]])
-          args.delete idx
+          remove_args << idx
+        else
+          # noop
         end
       end
+      remove_args.reverse_each do |idx|
+        args.delete_at idx
+      end
       args_matched = (frmt.count("%") == args.size)
       frmt.gsub!('##', '%%')
       args_matched ? (frmt % args) : frmt

data/lib/review/i18n.yml

@@ -6,7 +6,9 @@ ja:
   columnname: "コラム"
   column_head: "■コラム"
   part: 第%d部
+  part_short: "%pR"
   chapter: 第%d章
+  chapter_short: "%d"
   chapter_postfix: "　"
   chapter_quote: "「%s」"
   appendix: 付録%pA
@@ -66,7 +68,9 @@ en:
   columnname: "Column"
   column_head: "Column"
   part: "Part %s"
+  part_short: "%pR"
   chapter: Chapter %d
+  chapter_short: "%d"
   chapter_postfix: ". "
   chapter_quote: '"%s"'
   appendix: Appendix %s
@@ -123,7 +127,9 @@ zh-TW:
   table: 表
   list: List
   part: 第%d部份
+  part_short: "%pR"
   chapter: 第%d章
+  chapter_short: "%d"
   chapter_postfix: "　"
   chapter_quote: "「%s」"
   appendix: 附錄%s

data/lib/review/idgxmlbuilder.rb

@@ -392,7 +392,7 @@ module ReVIEW
 
     def quotedlist(lines, css_class, caption)
       print %Q[<list type='#{css_class}'>]
-      puts "<caption aid:pstyle='#{css_class}-title'>#{compile_inline(caption)}</caption>" unless caption.nil?
+      puts "<caption aid:pstyle='#{css_class}-title'>#{compile_inline(caption)}</caption>" if caption.present?
       print %Q[<pre>]
       no = 1
       lines.each do |line|
@@ -811,7 +811,7 @@ module ReVIEW
       @column += 1
       a_id = %Q[id="column-#{@column}"]
       print "<#{type}column #{a_id}>"
-      puts %Q[<title aid:pstyle="#{type}column-title">#{compile_inline(caption)}</title>]
+      puts %Q[<title aid:pstyle="#{type}column-title">#{compile_inline(caption)}</title><?dtp level="9" section="#{escape_html(compile_inline(caption))}"?>]
     end
 
     def common_column_end(type)

data/lib/review/makerhelper.rb

@@ -53,7 +53,7 @@ module ReVIEW
               image_files << "#{from_dir}/#{fname}.#{conv_type}"
             end
 
-            exts = options[:exts] || %w(png gif jpg jpeg svg pdf eps)
+            exts = options[:exts] || %w(png gif jpg jpeg svg pdf eps ai tif)
             exts_str = exts.join('|')
             if !is_converted && fname =~ /\.(#{exts_str})$/i
               FileUtils.cp "#{from_dir}/#{fname}", to_dir

data/lib/review/markdownbuilder.rb

@@ -5,11 +5,13 @@
 
 require 'review/builder'
 require 'review/textutils'
+require 'review/htmlutils'
 
 module ReVIEW
 
   class MARKDOWNBuilder < Builder
     include TextUtils
+    include HTMLUtils
 
     def extname
       '.md'
@@ -18,7 +20,7 @@ module ReVIEW
     def builder_init_file
       @blank_seen = nil
       @ul_indent = 0
-      @chapter.book.image_types = %w( .png .jpg .jpeg .gif .svg )
+      @chapter.book.image_types = %w(.png .jpg .jpeg .gif .svg)
     end
     private :builder_init_file
 
@@ -290,6 +292,15 @@ module ReVIEW
     def nofunc_text(str)
       str
     end
+
+    def compile_ruby(base, ruby)
+      if @book.htmlversion == 5
+        %Q[<ruby>#{escape_html(base)}<rp>#{I18n.t("ruby_prefix")}</rp><rt>#{escape_html(ruby)}</rt><rp>#{I18n.t("ruby_postfix")}</rp></ruby>]
+      else
+        %Q[<ruby><rb>#{escape_html(base)}</rb><rp>#{I18n.t("ruby_prefix")}</rp><rt>#{ruby}</rt><rp>#{I18n.t("ruby_postfix")}</rp></ruby>]
+      end
+    end
+
   end
 
 end # module ReVIEW

data/lib/review/md2inaobuilder.rb

@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+# 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.
+
+require 'review/markdownbuilder'
+
+module ReVIEW
+
+  class MD2INAOBuilder < MARKDOWNBuilder
+    def paragraph(lines)
+      puts "　" + lines.join
+      puts "\n"
+    end
+
+    def list_header(id, caption, lang)
+      lang ||= ""
+      puts "```#{lang}"
+      print %Q[●リスト#{@chapter.list(id).number}::#{compile_inline(caption)}\n\n]
+    end
+
+    def cmd(lines)
+      # WEB+DB では使っていないらしいけど
+      puts "!!! cmd"
+      lines.each do |line|
+        puts detab(line)
+      end
+      puts ""
+    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>'
+    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>]
+      else
+        %Q[<span class='groupruby'>#{escape_html(base)}(#{escape_html(ruby)})</span>]
+      end
+    end
+
+  end
+
+end # module ReVIEW

data/lib/review/pdfmaker.rb

@@ -30,10 +30,11 @@ module ReVIEW
     include FileUtils
     include ReVIEW::LaTeXUtils
 
-    attr_accessor :config, :basedir
+    attr_accessor :config, :basedir, :basehookdir
 
     def initialize
       @basedir = nil
+      @basehookdir = nil
       @input_files = Hash.new{|h, key| h[key] = ""}
     end
 
@@ -121,6 +122,7 @@ module ReVIEW
       @config.merge!(cmd_config)
       I18n.setup(@config["language"])
       @basedir = File.dirname(yamlfile)
+      @basehookdir = File.absolute_path(File.dirname(yamlfile))
 
       begin
         @config.check_version(ReVIEW::VERSION)
@@ -226,7 +228,7 @@ module ReVIEW
         ReVIEW::MakerHelper.copy_images_to_dir(from, to)
         Dir.chdir(to) do
           images = Dir.glob("**/*").find_all{|f|
-            File.file?(f) and f =~ /\.(jpg|jpeg|png|pdf)\z/
+            File.file?(f) and f =~ /\.(jpg|jpeg|png|pdf|ai|eps|tif)\z/
           }
           break if images.empty?
           system("extractbb", *images)
@@ -274,15 +276,15 @@ module ReVIEW
     def make_authors
       authors = ""
       if @config["aut"].present?
-        author_names = join_with_separator(@config.names_of("aut"), ReVIEW::I18n.t("names_splitter"))
+        author_names = join_with_separator(@config.names_of("aut").map{|s| escape_latex(s)}, ReVIEW::I18n.t("names_splitter"))
         authors = ReVIEW::I18n.t("author_with_label", author_names)
       end
       if @config["csl"].present?
-        csl_names = join_with_separator(@config.names_of("csl"), ReVIEW::I18n.t("names_splitter"))
+        csl_names = join_with_separator(@config.names_of("csl").map{|s| escape_latex(s)}, ReVIEW::I18n.t("names_splitter"))
         authors += " \\\\\n"+ ReVIEW::I18n.t("supervisor_with_label", csl_names)
       end
       if @config["trl"].present?
-        trl_names = join_with_separator(@config.names_of("trl"), ReVIEW::I18n.t("names_splitter"))
+        trl_names = join_with_separator(@config.names_of("trl").map{|s| escape_latex(s)}, ReVIEW::I18n.t("names_splitter"))
         authors += " \\\\\n"+ ReVIEW::I18n.t("translator_with_label", trl_names)
       end
       authors
@@ -348,6 +350,17 @@ module ReVIEW
         @coverimageoption = "width=\\textwidth,height=\\textheight,keepaspectratio"
       end
 
+      @locale_latex = Hash.new
+      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)
+      @locale_latex["prepartname"] = part_tuple[0]
+      @locale_latex["postpartname"] = part_tuple[1]
+      @locale_latex["prechaptername"] = chapter_tuple[0]
+      @locale_latex["postchaptername"] = chapter_tuple[1]
+      @locale_latex["preappendixname"] = appendix_tuple[0]
+      @locale_latex["postappendixname"] = appendix_tuple[1]
+
       template = File.expand_path('./latex/layout.tex.erb', ReVIEW::Template::TEMPLATE_DIR)
       layout_file = File.join(@basedir, "layouts", "layout.tex.erb")
       if File.exist?(layout_file)
@@ -378,11 +391,11 @@ module ReVIEW
 
     def call_hook(hookname)
       if @config["pdfmaker"].instance_of?(Hash) && @config["pdfmaker"][hookname]
-        hook = File.absolute_path(@config["pdfmaker"][hookname], @basedir)
+        hook = File.absolute_path(@config["pdfmaker"][hookname], @basehookdir)
         if ENV["REVIEW_SAFE_MODE"].to_i & 1 > 0
           warn "hook configuration is prohibited in safe mode. ignored."
         else
-          system_or_raise("#{hook} #{Dir.pwd} #{@basedir}")
+          system_or_raise("#{hook} #{Dir.pwd} #{@basehookdir}")
         end
       end
     end