review 1.4.0 → 1.5.0

data/lib/review/htmlbuilder.rb

@@ -13,7 +13,6 @@ require 'review/builder'
 require 'review/htmlutils'
 require 'review/htmllayout'
 require 'review/textutils'
-require 'review/sec_counter'
 
 module ReVIEW
 
@@ -48,7 +47,6 @@ module ReVIEW
 
     def builder_init(no_error = false)
       @no_error = no_error
-      @column = 0
       @noindent = nil
       @ol_num = nil
     end
@@ -58,6 +56,7 @@ module ReVIEW
       @warns = []
       @errors = []
       @chapter.book.image_types = %w( .png .jpg .jpeg .gif .svg )
+      @column = 0
       @sec_counter = SecCounter.new(5, @chapter)
     end
     private :builder_init_file
@@ -192,14 +191,6 @@ EOT
       "</ul>\n"
     end
 
-    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)
       prefix, anchor = headline_prefix(level)
       puts '' if level > 1
@@ -434,18 +425,18 @@ EOT
 
     alias_method :lead, :read
 
-    def list(lines, id, caption)
+    def list(lines, id, caption, lang = nil)
       puts %Q[<div class="caption-code">]
       begin
-        list_header id, caption
+        list_header id, caption, lang
       rescue KeyError
         error "no such list: #{id}"
       end
-      list_body id, lines
+      list_body id, lines, lang
       puts '</div>'
     end
 
-    def list_header(id, caption)
+    def list_header(id, caption, lang)
       if get_chap.nil?
         puts %Q[<p class="caption">#{I18n.t("list")}#{I18n.t("format_number_header_without_chapter", [@chapter.list(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}</p>]
       else
@@ -453,11 +444,11 @@ EOT
       end
     end
 
-    def list_body(id, lines)
+    def list_body(id, lines, lang)
       id ||= ''
       print %Q[<pre class="list">]
       body = lines.inject(''){|i, j| i + detab(j) + "\n"}
-      lexer = File.extname(id).gsub(/\./, '')
+      lexer = lang || File.extname(id).gsub(/\./, '')
       puts highlight(:body => body, :lexer => lexer, :format => 'html')
       puts '</pre>'
     end
@@ -484,48 +475,46 @@ EOT
       puts '</pre>'
     end
 
-    def listnum(lines, id, caption)
+    def listnum(lines, id, caption, lang = nil)
       puts %Q[<div class="code">]
       begin
-        list_header id, caption
+        list_header id, caption, lang
       rescue KeyError
         error "no such list: #{id}"
       end
-      listnum_body lines
+      listnum_body lines, lang
       puts '</div>'
     end
 
-    def listnum_body(lines)
-      print %Q[<pre class="list">]
-      lines.each_with_index do |line, i|
-        puts detab((i+1).to_s.rjust(2) + ": " + line)
-      end
-      puts '</pre>'
+    def listnum_body(lines, lang)
+      body = lines.inject(''){|i, j| i + detab(j) + "\n"}
+      lexer = lang
+      puts highlight(:body => body, :lexer => lexer, :format => 'html',
+                     :options => {:linenos => 'inline', :nowrap => false})
     end
 
-    def emlist(lines, caption = nil)
+    def emlist(lines, caption = nil, lang = nil)
       puts %Q[<div class="emlist-code">]
       if caption.present?
         puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
       end
       print %Q[<pre class="emlist">]
-      lines.each do |line|
-        puts detab(line)
-      end
+      body = lines.inject(''){|i, j| i + detab(j) + "\n"}
+      lexer = lang
+      puts highlight(:body => body, :lexer => lexer, :format => 'html')
       puts '</pre>'
       puts '</div>'
     end
 
-    def emlistnum(lines, caption = nil)
+    def emlistnum(lines, caption = nil, lang = nil)
       puts %Q[<div class="emlistnum-code">]
       if caption.present?
         puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
       end
-      print %Q[<pre class="emlist">]
-      lines.each_with_index do |line, i|
-        puts detab((i+1).to_s.rjust(2) + ": " + line)
-      end
-      puts '</pre>'
+      body = lines.inject(''){|i, j| i + detab(j) + "\n"}
+      lexer = lang
+      puts highlight(:body => body, :lexer => lexer, :format => 'html',
+                     :options => {:linenos => 'inline', :nowrap => false})
       puts '</div>'
     end
 
@@ -535,9 +524,9 @@ EOT
         puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
       end
       print %Q[<pre class="cmd">]
-      lines.each do |line|
-        puts detab(line)
-      end
+      body = lines.inject(''){|i, j| i + detab(j) + "\n"}
+      lexer = 'shell-session'
+      puts highlight(:body => body, :lexer => lexer, :format => 'html')
       puts '</pre>'
       puts '</div>'
     end
@@ -594,6 +583,8 @@ QUOTE
     def texequation(lines)
       puts %Q[<div class="equation">]
       if @book.config["mathml"]
+        require 'math_ml'
+        require 'math_ml/symbol/character_reference'
         p = MathML::LaTeX::Parser.new(:symbol=>MathML::Symbol::CharacterReference)
         puts p.parse(unescape_html(lines.join("\n")), true)
       else
@@ -787,7 +778,7 @@ QUOTE
     end
 
     def inline_labelref(idref)
-      %Q[<a target='#{escape_html(idref)}'>「●●　#{escape_html(idref)}」</a>]
+      %Q[<a target='#{escape_html(idref)}'>「#{I18n.t("label_marker")}#{escape_html(idref)}」</a>]
     end
 
     alias_method :inline_ref, :inline_labelref
@@ -806,9 +797,9 @@ QUOTE
 
     def inline_chap(id)
       if @book.config["chapterlink"]
-        %Q(<a href="./#{id}#{extname}">#{@chapter.env.chapter_index.number(id)}</a>)
+        %Q(<a href="./#{id}#{extname}">#{@book.chapter_index.number(id)}</a>)
       else
-        @chapter.env.chapter_index.number(id)
+        @book.chapter_index.number(id)
       end
     rescue KeyError
       error "unknown chapter: #{id}"
@@ -973,7 +964,7 @@ QUOTE
       if @book.config["chapterlink"]
         %Q(<a href="\##{column_label(id)}" class="columnref">#{I18n.t("column", escape_html(@chapter.column(id).caption))}</a>)
       else
-        escape_html(@chapter.column(id).caption)
+        I18n.t("column", escape_html(@chapter.column(id).caption))
       end
     rescue KeyError
       error "unknown column: #{id}"

data/lib/review/htmlutils.rb

@@ -40,22 +40,27 @@ module ReVIEW
       str.gsub('-', '-')
     end
 
+    def highlight_pygments?
+      @book.config["pygments"].present? ||
+        @book.config["highlight"] && @book.config["highlight"]["html"] == "pygments"
+    end
+
     def highlight(ops)
       body = ops[:body] || ''
-      lexer = ops[:lexer] || ''
+      lexer = ops[:lexer].blank? ? 'text' : ops[:lexer]
       format = ops[:format] || ''
-
-      return body if @book.config["pygments"].nil?
+      options = {:nowrap => true, :noclasses => true}
+      if ops[:options] && ops[:options].kind_of?(Hash)
+        options.merge!(ops[:options])
+      end
+      return body if !highlight_pygments?
 
       begin
         require 'pygments'
         begin
           Pygments.highlight(
                    unescape_html(body),
-                   :options => {
-                               :nowrap => true,
-                               :noclasses => true
-                             },
+                   :options => options,
                    :formatter => format,
                    :lexer => lexer)
         rescue MentosError

data/lib/review/i18n.rb

@@ -3,31 +3,91 @@ require 'yaml'
 
 module ReVIEW
   class I18n
-    def self.setup
-      lfile = File.expand_path "locale.yml", Dir.pwd
-      # backward compatibility
-      lfile = File.expand_path "locale.yaml", Dir.pwd unless File.exist?(lfile)
-      user_i18n = YAML.load_file(lfile)
-      I18n.i18n user_i18n["locale"], user_i18n
-    rescue
-      I18n.i18n "ja"
+    def self.setup(locale="ja", ymlfile = "locale.yml")
+      @i18n = ReVIEW::I18n.new(locale)
+
+      lfile = nil
+      if ymlfile
+        lfile = File.expand_path(ymlfile, Dir.pwd)
+
+        # backward compatibility
+        if !File.exist?(lfile) && (ymlfile == "locale.yml")
+          lfile = File.expand_path("locale.yaml", Dir.pwd)
+        end
+      end
+
+      if lfile && File.file?(lfile)
+        @i18n.update_localefile(lfile)
+      end
+    end
+
+    def self.i18n(*args)
+      raise NotImplementedError, "I18n.i18n is obsoleted. Please use I18n.setup(locale, [ymlfile])"
     end
 
-    def self.i18n(locale, user_i18n = {})
-      locale ||= "ja"
-      i18n_yaml_path = File.expand_path "i18n.yml", File.dirname(__FILE__)
-      @i18n = YAML.load_file(i18n_yaml_path)[locale]
+    def self.t(str, args = nil)
+      @i18n.t(str, args)
+    end
+
+    def self.locale=(locale)
       if @i18n
-        @i18n.merge!(user_i18n)
+        @i18n.locale = locale
+      else
+        I18n.setup(locale)
       end
     end
 
-    def self.t(str, args = nil)
-      @i18n[str] % args
+    class << self
+      alias v t  ## for EPUBMaker backward compatibility
+    end
+
+    def self.update(user_i18n, locale = nil)
+      @i18n.update(user_i18n, locale)
+    end
+
+    attr_accessor :locale
+
+    def initialize(locale = nil)
+      @locale = locale
+      load_default
+    end
+
+    def load_default
+      load_file(File.expand_path "i18n.yml", File.dirname(__FILE__))
+    end
+
+    def load_file(path)
+      @store = YAML.load_file(path)
+    end
+
+    def update_localefile(path)
+      user_i18n = YAML.load_file(path)
+      locale = user_i18n["locale"]
+      if locale
+        user_i18n.delete("locale")
+        @store[locale].merge!(user_i18n)
+      else
+        key = user_i18n.keys.first
+        if !user_i18n[key].kind_of? Hash
+          raise KeyError, "Invalid locale file: #{path}"
+        end
+        @store.merge!(user_i18n)
+      end
+    end
+
+    def update(user_i18n, locale = nil)
+      locale ||= @locale
+      if @store[locale]
+        @store[locale].merge!(user_i18n)
+      else
+        @store[locale] = user_i18n
+      end
+    end
+
+    def t(str, args = nil)
+      @store[@locale][str] % args
     rescue
       str
     end
   end
-
-  I18n.setup
 end

data/lib/review/i18n.yml

@@ -3,19 +3,25 @@ ja:
   table: 表
   list: リスト
   column: "コラム「%s」"
+  columnname: "コラム"
+  column_head: "■コラム"
   part: 第%d部
   chapter: 第%d章
   chapter_postfix: "　"
+  chapter_quote: "「%s」"
   appendix: 付録%s
   numberless_image: "図:"
+  memo_head: ■メモ
   format_number: "%s.%d"
   format_number_header: "%s.%d:"
   format_number_without_chapter: "%d"
   format_number_header_without_chapter: "%d:"
+  image_quote: "「%s」"
   caption_prefix: " "
   caption_prefix_idgxml: "　"
   ruby_prefix: "（"
   ruby_postfix: "）"
+  label_marker: "●●　"
   aut: "著　者"
   csl: "監　修"
   dsr: "デザイン"
@@ -28,39 +34,87 @@ ja:
   prt: "発行所"
   pbl: "発行所"
   contact: "連絡先"
-  author_postfix: "　著"
-  supervisor_postfix: "　監修"
-  translator_postfix: "　訳"
+  author_with_label: "%s　著"
+  supervisor_with_label: "%s　監修"
+  translator_with_label: "%s　訳"
   names_splitter: "、"
+  edition: "版"
+  nth_edition: "第%s版"
+  first_edition: "初版"
+  nth_impression: "第%s刷"
+  published_by: "%s 発行"
+  published_by1: "%s　%s　発行"
+  published_by2: "%s　発行"
+  published_by3: "%s　%s"
+  date_format: '%%Y年%%-m月%%-d日'
+  toctitle: "目次"
+  covertitle: "表紙"
+  titlepagetitle: "大扉"
+  originaltitle: "原書大扉"
+  credittitle: "クレジット"
+  colophontitle: "奥付"
+  advtitle: "広告"
+  profiletitle: "著者紹介"
+  backcovertitle: "裏表紙"
 
 en:
   image: "Figure "
   table: "Table "
   list: "List "
   column: "Column %s"
+  columnname: "Column"
+  column_head: "Column"
+  part: "Part %s"
   chapter: Chapter %d
   chapter_postfix: ". "
+  chapter_quote: '"%s"'
   appendix: Appendix %s
   numberless_image: "Figure:"
+  memo_head: Note
   format_number: "%s.%d"
   format_number_header: "%s.%d:"
   format_number_without_chapter: "%d"
   format_number_header_without_chapter: "%d:"
+  image_quote: '"%s"'
   caption_prefix: " "
   caption_prefix_idgxml: "　"
   ruby_prefix: "("
   ruby_postfix: ")"
+  label_marker: "●●　"
   aut: "Author"
   csl: "Consultant"
   dsr: "Design"
   ill: "Illustrator"
+  cov: "Cover"
   edt: "Editor"
-  pht: "Photographer"
+  pht: "Director of Photography"
   trl: "Translator"
   prt: "Printer"
   pbl: "Publisher"
   contact: "Contact"
+  author_with_label: "Author: %s"
+  supervisor_with_label: "Supervisor: %s"
+  translator_with_label: "Translator: %s"
   names_splitter: ", "
+  edition: "edition"
+  impression: "impression"
+  nth_edition: "%s edition"
+  first_edition: "first edition"
+  nth_impression: "%s impression"
+  published_by: "%s"
+  published_by1: "published by %s %s"
+  published_by2: "published by %s"
+  published_by3: "%s %s"
+  date_format: '%%b. %%e, %%Y'
+  toctitle: "Table of Contents"
+  covertitle: "Cover"
+  titlepagetitle: "Title Page"
+  originaltitle: "Title Page of Original"
+  credittitle: "Credit"
+  colophontitle: "Colophon"
+  advtitle: "Advertisement"
+  profiletitle: "Profile"
+  backcovertitle: "Back Cover"
 
 zh_TW:
   image: 圖
@@ -69,14 +123,36 @@ zh_TW:
   part: 第%d部份
   chapter: 第%d章
   chapter_postfix: "　"
+  chapter_quote: "「%s」"
   appendix: 附錄%s
   numberless_image: "圖:"
   format_number: "%s.%d"
   format_number_header: "%s.%d:"
   format_number_without_chapter: "%d"
   format_number_header_without_chapter: "%d:"
+  image_quote: '"%s"'
   caption_prefix: " "
   caption_prefix_idgxml: "　"
   ruby_prefix: "（"
   ruby_postfix: "）"
+  label_marker: "●●　"
+  aut: "著作人"
+  csl: "監　修"
+  dsr: "美術編輯"
+  cov: "封面設計"
+  edt: "編　輯"
+  pht: "攝　影"
+  trl: "翻　譯"
+  prt: "印刷所"
+  pbl: "發行所"
+  contact: "联系方式"
+  author_with_label: "%s　著"
+  supervisor_with_label: "%s　監修"
+  translator_with_label: "%s　譯"
   names_splitter: ", "
+  edition: "版"
+  published_by: "%s 出版"
+  published_by1: "%s %s 出版"
+  published_by2: "%s 出版"
+  published_by3: "%s %s"
+  impression: "刷"