review 1.4.0 → 1.5.0

data/lib/review/idgxmlbuilder.rb

@@ -66,6 +66,7 @@ module ReVIEW
       @subsection = 0
       @subsubsection = 0
       @subsubsubsection = 0
+      @sec_counter = SecCounter.new(5, @chapter)
       @column = 0
       @noindent = nil
       @rootelement = "doc"
@@ -73,7 +74,6 @@ module ReVIEW
       @tsize = nil
       @texblockequation = 0
       @texinlineequation = 0
-
       print %Q(<?xml version="1.0" encoding="UTF-8"?>\n)
       print %Q(<#{@rootelement} xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/">)
       if @book.config["nolf"].present?
@@ -142,7 +142,6 @@ module ReVIEW
     end
 
     def headline(level, label, caption)
-      prefix = ""
       case level
       when 1
         unless @secttags.nil?
@@ -154,19 +153,6 @@ module ReVIEW
 
         print %Q(<chapter id="chap:#{@chapter.number}">) unless @secttags.nil?
 
-        if @chapter.number.blank?
-          prefix = ""
-        else
-          placeholder = if @chapter.is_a? ReVIEW::Book::Part
-                          level = 0
-                          'part'
-                        elsif @chapter.on_APPENDIX?
-                          'appendix'
-                        else
-                          'chapter'
-                        end
-          prefix = "#{I18n.t(placeholder, @chapter.number)}#{I18n.t("chapter_postfix")}"
-        end
         @section = 0
         @subsection = 0
         @subsubsection = 0
@@ -180,14 +166,7 @@ module ReVIEW
         end
         @section += 1
         print %Q(<sect id="sect:#{@chapter.number}.#{@section}">) unless @secttags.nil?
-        if @book.config["secnolevel"] >= 2
-          if @chapter.number.blank? or @chapter.on_APPENDIX?
-            prefix = ""
-          else
-            prefix = "#{@chapter.number}.#{@section}#{I18n.t("chapter_postfix")}"
-          end
-        end
-
+      
         @subsection = 0
         @subsubsection = 0
         @subsubsubsection = 0
@@ -200,13 +179,6 @@ module ReVIEW
 
         @subsection += 1
         print %Q(<sect2 id="sect:#{@chapter.number}.#{@section}.#{@subsection}">) unless @secttags.nil?
-        if @book.config["secnolevel"] >= 3
-          if @chapter.number.blank? or @chapter.on_APPENDIX?
-            prefix = ""
-          else
-            prefix = "#{@chapter.number}.#{@section}.#{@subsection}#{I18n.t("chapter_postfix")}"
-          end
-        end
 
         @subsubsection = 0
         @subsubsubsection = 0
@@ -218,13 +190,6 @@ module ReVIEW
 
         @subsubsection += 1
         print %Q(<sect3 id="sect:#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}">) unless @secttags.nil?
-        if @book.config["secnolevel"] >= 4
-          if @chapter.number.blank? or @chapter.on_APPENDIX?
-            prefix = ""
-          else
-            prefix = "#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}#{I18n.t("chapter_postfix")}"
-          end
-        end
 
         @subsubsubsection = 0
       when 5
@@ -234,19 +199,12 @@ module ReVIEW
 
         @subsubsubsection += 1
         print %Q(<sect4 id="sect:#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}.#{@subsubsubsection}">) unless @secttags.nil?
-        if @book.config["secnolevel"] >= 5
-          if @chapter.number.blank? or @chapter.on_APPENDIX?
-            prefix = ""
-          else
-            prefix = "#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}.#{@subsubsubsection}#{I18n.t("chapter_postfix")}"
-          end
-        end
-
       else
         raise "caption level too deep or unsupported: #{level}"
       end
 
-      prefix = "" if (level.to_i > @book.config["secnolevel"])
+      prefix, anchor = headline_prefix(level)
+
       label = label.nil? ? "" : " id=\"#{label}\""
       toccaption = escape_html(compile_inline(caption.gsub(/@<fn>\{.+?\}/, '')).gsub(/<[^>]+>/, ''))
       puts %Q(<title#{label} aid:pstyle="h#{level}">#{prefix}#{compile_inline(caption)}</title><?dtp level="#{level}" section="#{prefix}#{toccaption}"?>)
@@ -378,7 +336,7 @@ module ReVIEW
       end
     end
 
-    def list_header(id, caption)
+    def list_header(id, caption, lang)
       puts %Q[<codelist>]
       if get_chap.nil?
         puts %Q[<caption>#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [@chapter.list(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}</caption>]
@@ -403,17 +361,17 @@ module ReVIEW
       end
     end
 
-    def list_body(id, lines)
+    def list_body(id, lines, lang)
       print %Q(<pre>)
       codelines_body(lines)
       puts "</pre></codelist>"
     end
 
-    def emlist(lines, caption = nil)
+    def emlist(lines, caption = nil, lang = nil)
       quotedlist lines, 'emlist', caption
     end
 
-    def emlistnum(lines, caption = nil)
+    def emlistnum(lines, caption = nil, lang = nil)
       _lines = []
       lines.each_with_index do |line, i|
         _lines << detab("<span type='lineno'>" + (i + 1).to_s.rjust(2) + ": </span>" + line)
@@ -421,7 +379,7 @@ module ReVIEW
       quotedlist _lines, 'emlistnum', caption
     end
 
-    def listnum_body(lines)
+    def listnum_body(lines, lang)
       print %Q(<pre>)
       no = 1
       lines.each_with_index do |line, i|
@@ -491,6 +449,19 @@ module ReVIEW
       end
     end
 
+    def inline_imgref(id)
+      chapter, id = extract_chapter_id(id)
+      if chapter.image(id).caption.blank?
+        inline_img(id)
+      else
+        if get_chap(chapter).nil?
+          "<span type='image'>#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [chapter.image(id).number])}#{I18n.t('image_quote', chapter.image(id).caption)}</span>"
+        else
+          "<span type='image'>#{I18n.t("image")}#{I18n.t("format_number", [get_chap(chapter), chapter.image(id).number])}#{I18n.t('image_quote', chapter.image(id).caption)}</span>"
+        end
+      end
+    end
+
     def handle_metric(str)
       k, v = str.split('=', 2)
       return %Q|#{k}=\"#{v.sub(/\A["']/, '').sub(/["']\Z/, '')}\"|
@@ -758,8 +729,7 @@ module ReVIEW
     end
 
     def inline_ttb(str)
-      index = escape_html(str).gsub(/<.*?>/, "").gsub(/\*/, "ESCAPED_ASTERISK").gsub(/'/, "&#27;")
-      %Q(<tt style='bold'>#{escape_html(str)}</tt><index value='#{index}' />)
+      %Q(<tt style='bold'>#{escape_html(str)}</tt>)
     end
 
     alias_method :inline_ttbold, :inline_ttb
@@ -790,7 +760,7 @@ module ReVIEW
     end
 
     def inline_labelref(idref)
-      %Q[<ref idref='#{escape_html(idref)}'>「●●　#{escape_html(idref)}」</ref>] # FIXME:節名とタイトルも込みで要出力
+      %Q[<ref idref='#{escape_html(idref)}'>「#{I18n.t("label_marker")}#{escape_html(idref)}」</ref>] # FIXME:節名とタイトルも込みで要出力
     end
 
     alias_method :inline_ref, :inline_labelref
@@ -1134,7 +1104,7 @@ module ReVIEW
         end
       else
       end
-      s = "#{chs[0]}#{@chapter.env.chapter_index.number(id)}#{chs[1]}#{@chapter.env.chapter_index.title(id)}#{chs[2]}"
+      s = "#{chs[0]}#{@book.chapter_index.number(id)}#{chs[1]}#{@book.chapter_index.title(id)}#{chs[2]}"
       if @book.config["chapterlink"]
         %Q(<link href="#{id}">#{s}</link>)
       else
@@ -1147,9 +1117,9 @@ module ReVIEW
 
     def inline_chap(id)
       if @book.config["chapterlink"]
-        %Q(<link href="#{id}">#{@chapter.env.chapter_index.number(id)}</link>)
+        %Q(<link href="#{id}">#{@book.chapter_index.number(id)}</link>)
       else
-        @chapter.env.chapter_index.number(id)
+        @book.chapter_index.number(id)
       end
     rescue KeyError
       error "unknown chapter: #{id}"

data/lib/review/inaobuilder.rb

@@ -184,7 +184,7 @@ module ReVIEW
       end
     end
 
-    def list_header(id, caption)
+    def list_header(id, caption, lang)
       puts "◆list/◆"
       if get_chap.nil?
         puts %Q[●リスト#{@chapter.list(id).number}　#{compile_inline(caption)}]
@@ -193,14 +193,14 @@ module ReVIEW
       end
     end
 
-    def list_body(id, lines)
+    def list_body(id, lines, lang)
       lines.each do |line|
         puts detab(line)
       end
       puts "◆/list◆"
     end
 
-    def listnum_body(lines)
+    def listnum_body(lines, lang)
       lines.each_with_index do |line, i|
         puts detab((i+1).to_s.rjust(2) + " " +line)
       end

data/lib/review/latexbuilder.rb

@@ -13,7 +13,6 @@
 require 'review/builder'
 require 'review/latexutils'
 require 'review/textutils'
-require 'review/sec_counter'
 
 module ReVIEW
 
@@ -75,25 +74,20 @@ 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)
+      headline_name = HEADLINE[level]
+      if @chapter.kind_of? ReVIEW::Book::Part
+        headline_name = "part"
+      end
       prefix = ""
       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))
+      puts macro(headline_name+prefix, compile_inline(caption))
       if prefix == "*" && level <= @book.config["toclevel"].to_i
-        puts "\\addcontentsline{toc}{#{HEADLINE[level]}}{#{compile_inline(caption)}}"
+        puts "\\addcontentsline{toc}{#{headline_name}}{#{compile_inline(caption)}}"
       end
       if level == 1
         puts macro('label', chapter_label)
@@ -236,84 +230,112 @@ module ReVIEW
 
     alias_method :lead, :read
 
-    def emlist(lines, caption = nil)
+    def highlight_listings?
+      @book.config["highlight"] && @book.config["highlight"]["latex"] == "listings"
+    end
+    private :highlight_listings?
+
+    def emlist(lines, caption = nil, lang = nil)
       blank
-      if caption
-        puts macro('reviewemlistcaption', "#{compile_inline(caption)}")
-      end
-      puts '\begin{reviewemlist}'
-      lines.each do |line|
-        puts detab(line)
+      if highlight_listings?
+        common_code_block_lst(lines, 'reviewemlistlst', 'title', caption, lang)
+      else
+        common_code_block(lines, 'reviewemlist', caption, lang) do |line, idx|
+          detab(line) + "\n"
+        end
       end
-      puts '\end{reviewemlist}'
-      blank
     end
 
-    def emlistnum(lines, caption = nil)
+    def emlistnum(lines, caption = nil, lang = nil)
       blank
-      if caption
-        puts macro('reviewemlistcaption', "#{compile_inline(caption)}")
+      if highlight_listings?
+        common_code_block_lst(lines, 'reviewemlistnumlst', 'title', caption, lang)
+      else
+        common_code_block(lines, 'reviewemlist', caption, lang) do |line, idx|
+          detab((idx+1).to_s.rjust(2)+": " + line) + "\n"
+        end
       end
-      puts '\begin{reviewemlist}'
-      lines.each_with_index do |line, i|
-        puts detab((i+1).to_s.rjust(2) + ": " + line)
+    end
+
+    ## override Builder#list
+    def list(lines, id, caption, lang = nil)
+      if highlight_listings?
+        common_code_block_lst(lines, 'reviewlistlst', 'caption', caption, lang)
+      else
+        begin
+          puts macro('reviewlistcaption', "#{I18n.t("list")}#{I18n.t("format_number_header", [@chapter.number, @chapter.list(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}")
+        rescue KeyError
+          error "no such list: #{id}"
+        end
+        common_code_block(lines, 'reviewlist', nil, lang) do |line, idx|
+          detab(line) + "\n"
+        end
       end
-      puts '\end{reviewemlist}'
-      blank
     end
 
-    def listnum_body(lines)
-      puts '\begin{reviewlist}'
-      lines.each_with_index do |line, i|
-        puts detab((i+1).to_s.rjust(2) + ": " + line)
+    ## override Builder#listnum
+    def listnum(lines, id, caption, lang = nil)
+      if highlight_listings?
+        common_code_block_lst(lines, 'reviewlistnumlst', 'caption', caption, lang)
+      else
+        begin
+          puts macro('reviewlistcaption', "#{I18n.t("list")}#{I18n.t("format_number_header", [@chapter.number, @chapter.list(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}")
+        rescue KeyError
+          error "no such list: #{id}"
+        end
+        common_code_block(lines, 'reviewlist', caption, lang) do |line, idx|
+          detab((idx+1).to_s.rjust(2)+": " + line) + "\n"
+        end
       end
-      puts '\end{reviewlist}'
-      blank
+    end
 
+    def cmd(lines, caption = nil, lang = nil)
+      if highlight_listings?
+        common_code_block_lst(lines, 'reviewcmdlst', 'title', caption, lang)
+      else
+        blank
+        common_code_block(lines, 'reviewcmd', caption, lang) do |line, idx|
+          detab(line) + "\n"
+        end
+      end
     end
 
-    def cmd(lines, caption = nil)
-      blank
+    def common_code_block(lines, command, caption, lang)
       if caption
-        puts macro('reviewcmdcaption', "#{compile_inline(caption)}")
+        puts macro(command + 'caption', "#{compile_inline(caption)}")
       end
-      puts '\begin{reviewcmd}'
-      lines.each do |line|
-        puts detab(line)
+      body = ""
+      lines.each_with_index do |line, idx|
+        body.concat(yield(line, idx))
       end
-      puts '\end{reviewcmd}'
+      puts macro('begin' ,command)
+      print body
+      puts macro('end' ,command)
       blank
     end
 
-    def list_header(id, caption)
-      puts macro('reviewlistcaption', "#{I18n.t("list")}#{I18n.t("format_number_header", [@chapter.number, @chapter.list(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}")
-    end
-
-    def list_body(id, lines)
-      puts '\begin{reviewlist}'
-      lines.each do |line|
-        puts detab(line)
+    def common_code_block_lst(lines, command, title, caption, lang)
+      caption_str = compile_inline((caption || ""))
+      if title == "title" && caption_str == ""
+        caption_str = "\\relax" ## dummy charactor to remove lstname
+        print "\\vspace{-1.5em}"
       end
-      puts '\end{reviewlist}'
-      puts ""
+      lexer = lang || ""
+      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
     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)
       lines.each do |line|
         puts detab(line)
       end
+      puts '\end{reviewlist}'
+      puts ""
     end
 
 
@@ -373,8 +395,9 @@ module ReVIEW
     end
     private :sec_label
 
-    def table_label(id)
-      "table:#{@chapter.id}:#{id}"
+    def table_label(id, chapter=nil)
+      chapter ||= @chapter
+      "table:#{chapter.id}:#{id}"
     end
     private :table_label
 
@@ -593,9 +616,9 @@ module ReVIEW
 
     def inline_chap(id)
       if @book.config["chapterlink"]
-        "\\hyperref[chap:#{id}]{#{@chapter.env.chapter_index.number(id)}}"
+        "\\hyperref[chap:#{id}]{#{@book.chapter_index.number(id)}}"
       else
-        @chapter.env.chapter_index.number(id)
+        @book.chapter_index.number(id)
       end
     rescue KeyError
       error "unknown chapter: #{id}"
@@ -623,7 +646,7 @@ module ReVIEW
 
     def inline_table(id)
       chapter, id = extract_chapter_id(id)
-      macro('reviewtableref', "#{chapter.number}.#{chapter.table(id).number}", table_label(id))
+      macro('reviewtableref', "#{chapter.number}.#{chapter.table(id).number}", table_label(id, chapter))
     end
 
     def inline_img(id)