review 2.2.0 → 2.3.0

data/lib/review/idgxmlbuilder.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-#
+
 # Copyright (c) 2002-2007 Minero Aoki
-#               2008-2016 Minero Aoki, Kenshi Muto
+#               2008-2017 Minero Aoki, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -563,10 +563,14 @@ module ReVIEW
     end
 
     def table_header(id, caption)
-      if get_chap.nil?
-        puts %Q[<caption>#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}</caption>]
+      if id.nil?
+        puts %Q[<caption>#{compile_inline(caption)}</caption>]
       else
-        puts %Q[<caption>#{I18n.t("table")}#{I18n.t("format_number", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}</caption>]
+        if get_chap.nil?
+          puts %Q[<caption>#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}</caption>]
+        else
+          puts %Q[<caption>#{I18n.t("table")}#{I18n.t("format_number", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}</caption>]
+        end
       end
     end
 
@@ -589,6 +593,10 @@ module ReVIEW
       print "<?dtp tablerow last?>"
     end
 
+    def emtable(lines, caption = nil)
+      table(lines, nil, caption)
+    end
+
     def imgtable(lines, id, caption = nil, metric = nil)
       if @chapter.image(id).bound?
         metrics = parse_metric("idgxml", metric)

data/lib/review/latexbuilder.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
-#
+
 # Copyright (c) 2002-2007 Minero Aoki
 #               2008-2009 Minero Aoki, Kenshi Muto
-#               2010-2016  Minero Aoki, Kenshi Muto, TAKAHASHI Masayoshi
+#               2010-2017 Minero Aoki, Kenshi Muto, TAKAHASHI Masayoshi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -32,6 +32,7 @@ module ReVIEW
     end
 
     def builder_init_file
+      @chapter.book.image_types = %w(.ai .eps .pdf .tif .tiff .png .bmp .jpg .jpeg .gif)
       @blank_needed = false
       @latex_tsize = nil
       @tsize = nil
@@ -339,7 +340,11 @@ module ReVIEW
           puts macro(command + 'caption', "#{compile_inline(caption)}")
         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)}")
+            if get_chap.nil?
+              puts macro('reviewlistcaption', "#{I18n.t("list")}#{I18n.t("format_number_header_without_chapter", [@chapter.list(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}")
+            else
+              puts macro('reviewlistcaption', "#{I18n.t("list")}#{I18n.t("format_number_header", [get_chap, @chapter.list(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}")
+            end
           rescue KeyError
             error "no such list: #{id}"
           end
@@ -395,7 +400,6 @@ module ReVIEW
       end
     end
 
-
     def image_header(id, caption)
     end
 
@@ -504,7 +508,7 @@ module ReVIEW
           sepidx ||= idx
           next
         end
-        rows.push line.strip.split(/\t+/).map {|s| s.sub(/\A\./, '') }
+        rows.push(line.strip.split(/\t+/).map {|s| s.sub(/\A\./, '') })
       end
       rows = adjust_n_cols(rows)
 
@@ -517,27 +521,35 @@ module ReVIEW
       table_begin rows.first.size
       if sepidx
         sepidx.times do
-          tr rows.shift.map {|s| th(s) }
+          tr(rows.shift.map {|s| th(s) })
         end
         rows.each do |cols|
-          tr cols.map {|s| td(s) }
+          tr(cols.map {|s| td(s) })
         end
       else
         rows.each do |cols|
           h, *cs = *cols
-          tr [th(h)] + cs.map {|s| td(s) }
+          tr([th(h)] + cs.map {|s| td(s) })
         end
       end
       table_end
     end
 
     def table_header(id, caption)
-      if caption.present?
-        @table_caption = true
-        puts '\begin{table}[h]'
-        puts macro('reviewtablecaption', compile_inline(caption))
+      if id.nil?
+        if caption.present?
+          @table_caption = true
+          puts '\begin{table}[h]'
+          puts macro('reviewtablecaption*', compile_inline(caption))
+        end
+      else
+        if caption.present?
+          @table_caption = true
+          puts '\begin{table}[h]'
+          puts macro('reviewtablecaption', compile_inline(caption))
+        end
+        puts macro('label', table_label(id))
       end
-      puts macro('label', table_label(id))
     end
 
     def table_begin(ncols)
@@ -594,6 +606,10 @@ module ReVIEW
       blank
     end
 
+    def emtable(lines, caption = nil)
+      table(lines, nil, caption)
+    end
+
     def imgtable(lines, id, caption = nil, metric = nil)
       if !@chapter.image(id).bound?
         warn "image not bound: #{id}"
@@ -735,21 +751,32 @@ module ReVIEW
       nofunc_text("[UnknownChapter:#{id}]")
     end
 
-
     # FIXME: use TeX native label/ref.
     def inline_list(id)
       chapter, id = extract_chapter_id(id)
-      macro('reviewlistref', "#{chapter.number}.#{chapter.list(id).number}")
+      if get_chap(chapter).nil?
+        macro('reviewlistref', I18n.t("format_number_without_header", [chapter.list(id).number]))
+      else
+        macro('reviewlistref', I18n.t("format_number", [get_chap(chapter), chapter.list(id).number]))
+      end
     end
 
     def inline_table(id)
       chapter, id = extract_chapter_id(id)
-      macro('reviewtableref', "#{chapter.number}.#{chapter.table(id).number}", table_label(id, chapter))
+      if get_chap(chapter).nil?
+        macro('reviewtableref', I18n.t("format_number_without_header", [chapter.table(id).number]), table_label(id, chapter))
+      else
+        macro('reviewtableref', I18n.t("format_number", [get_chap(chapter), chapter.table(id).number]), table_label(id, chapter))
+      end
     end
 
     def inline_img(id)
       chapter, id = extract_chapter_id(id)
-      macro('reviewimageref', "#{chapter.number}.#{chapter.image(id).number}", image_label(id, chapter))
+      if get_chap(chapter).nil?
+        macro('reviewimageref', I18n.t("format_number_without_header", [chapter.image(id).number]), image_label(id, chapter))
+      else
+        macro('reviewimageref', I18n.t("format_number", [get_chap(chapter), chapter.image(id).number]), image_label(id, chapter))
+      end
     end
 
     def footnote(id, content)

data/lib/review/latexutils.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-#
+
 # Copyright (c) 2002-2006 Minero Aoki
-# Copyright (c) 2006-2016 Minero Aoki, Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2006-2017 Minero Aoki, Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of

data/lib/review/makerhelper.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-#
-# Copyright (c) 2012-2016 Yuto HAYAMIZU, Kenshi Muto
+
+# Copyright (c) 2012-2017 Yuto HAYAMIZU, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of

data/lib/review/markdownbuilder.rb

@@ -1,4 +1,5 @@
 # -*- 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.
@@ -162,7 +163,6 @@ module ReVIEW
       "`#{str}`"
     end
 
-
     def image_image(id, caption, metric)
       blank
       puts "![#{compile_inline(caption)}](#{@chapter.image(id).path.sub(/\A\.\//, "")})"
@@ -212,7 +212,7 @@ module ReVIEW
           sepidx ||= idx
           next
         end
-        rows.push line.strip.split(/\t+/).map {|s| s.sub(/\A\./, '') }
+        rows.push(line.strip.split(/\t+/).map {|s| s.sub(/\A\./, '') })
       end
       rows = adjust_n_cols(rows)
 
@@ -225,26 +225,30 @@ module ReVIEW
       return if rows.empty?
       if sepidx
         sepidx.times do
-          tr rows.shift.map {|s| th(s) }
+          tr(rows.shift.map {|s| th(s) })
         end
         table_border rows.first.size
         rows.each do |cols|
-          tr cols.map {|s| td(s) }
+          tr(cols.map {|s| td(s) })
         end
       else
         rows.each do |cols|
           h, *cs = *cols
-          tr [th(h)] + cs.map {|s| td(s) }
+          tr([th(h)] + cs.map {|s| td(s) })
         end
       end
       table_end
     end
 
     def table_header(id, caption)
-      if get_chap.nil?
-        puts %Q[#{I18n.t("table")}#{I18n.t("format_number_header_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}]
+      if id.nil?
+        puts compile_inline(caption)
       else
-        puts %Q[#{I18n.t("table")}#{I18n.t("format_number_header", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}]
+        if get_chap.nil?
+          puts %Q[#{I18n.t("table")}#{I18n.t("format_number_header_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}]
+        else
+          puts %Q[#{I18n.t("table")}#{I18n.t("format_number_header", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix")}#{compile_inline(caption)}]
+        end
       end
       blank
     end

data/lib/review/pdfmaker.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-#
+
 # Copyright (c) 2010-2017 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
@@ -241,7 +241,6 @@ module ReVIEW
         build_pdf
 
         FileUtils.cp(File.join(@path, "book.pdf"), pdf_filepath)
-
       ensure
         unless @config["debug"]
           remove_entry_secure @path

data/lib/review/rstbuilder.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-#
+
 # Copyright (c) 2002-2006 Minero Aoki
-#               2008-2016 Minero Aoki, Kenshi Muto
+#               2008-2017 Minero Aoki, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -317,8 +317,10 @@ module ReVIEW
     end
 
     def table_header(id, caption)
-      blank
-      puts ".. _#{id}:"
+      unless id.nil?
+        blank
+        puts ".. _#{id}:"
+      end
       blank
       puts ".. list-table:: #{compile_inline(caption)}"
       puts "   :header-rows: 1"
@@ -352,6 +354,10 @@ module ReVIEW
       blank
     end
 
+    def emtable(lines, caption = nil)
+      table(lines, nil, caption)
+    end
+
     def comment(lines, comment = nil)
       puts lines.map{|line| "  .. #{line}"}.join("")
     end

data/lib/review/sec_counter.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-#
-# Copyright (c) 2008-2014 Minero Aoki, Kenshi Muto, Masayoshi Takahashi,
+
+# Copyright (c) 2008-2017 Minero Aoki, Kenshi Muto, Masayoshi Takahashi,
 #                         KADO Masanori
 #
 # This program is free software.
@@ -55,7 +55,13 @@ module ReVIEW
           end
         end
       elsif secnolevel >= level
-        prefix = @chapter.format_number(false)
+        prefix = ''
+        if @chapter.is_a? ReVIEW::Book::Part
+          prefix = I18n.t('part_short', @chapter.number)
+        else
+          prefix = @chapter.format_number(false)
+        end
+
         0.upto(level - 2) do |i|
           prefix << ".#{@counter[i]}"
         end

data/lib/review/topbuilder.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-#
+
 # Copyright (c) 2002-2006 Minero Aoki
 #               2008-2017 Minero Aoki, Kenshi Muto
 #
@@ -315,13 +315,55 @@ module ReVIEW
       blank
     end
 
-    def table_header(id, caption)
+    def table(lines, id = nil, caption = nil)
       blank
       puts "◆→開始:#{@titles["table"]}←◆"
-      if get_chap.nil?
-        puts "#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}"
+
+      rows = []
+      sepidx = nil
+      lines.each_with_index do |line, idx|
+        if /\A[\=\-]{12}/ =~ line
+          # just ignore
+          #error "too many table separator" if sepidx
+          sepidx ||= idx
+          next
+        end
+        rows.push(line.strip.split(/\t+/).map {|s| s.sub(/\A\./, '') })
+      end
+      rows = adjust_n_cols(rows)
+
+      begin
+        table_header id, caption unless caption.nil?
+      rescue KeyError
+        error "no such table: #{id}"
+      end
+      return if rows.empty?
+      table_begin rows.first.size
+      if sepidx
+        sepidx.times do
+          tr(rows.shift.map {|s| th(s) })
+        end
+        rows.each do |cols|
+          tr(cols.map {|s| td(s) })
+        end
+      else
+        rows.each do |cols|
+          h, *cs = *cols
+          tr([th(h)] + cs.map {|s| td(s) })
+        end
+      end
+      table_end
+    end
+
+    def table_header(id, caption)
+      if id.nil?
+        puts compile_inline(caption)
       else
-        puts "#{I18n.t("table")}#{I18n.t("format_number", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}"
+        if get_chap.nil?
+          puts "#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}"
+        else
+          puts "#{I18n.t("table")}#{I18n.t("format_number", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}"
+        end
       end
       blank
     end

data/lib/review/version.rb

@@ -1,3 +1,3 @@
 module ReVIEW
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

data/lib/review/webmaker.rb

@@ -1,5 +1,5 @@
 # encoding: 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.
@@ -65,7 +65,6 @@ module ReVIEW
       FileUtils.rm_rf(path)
     end
 
-
     def execute(*args)
       @config = ReVIEW::Configure.values
       @config.maker = "webmaker"

data/review.gemspec

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 $:.push File.expand_path("../lib", __FILE__)
 require "review/version"
 
@@ -19,7 +20,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.extra_rdoc_files = [
-    "ChangeLog",
   ]
   gem.require_paths = ["lib"]
 

data/templates/latex/layout.tex.erb

@@ -8,6 +8,8 @@
 <%- else -%>
 \usepackage[deluxe]{otf}
 <%- end -%>
+\usepackage{caption}
+\usepackage{suffix}
 \usepackage[T1]{fontenc}\usepackage{textcomp}%T1/TS1
 % \usepackage{lmodern}
 \usepackage[dvipdfmx]{graphicx}
@@ -136,6 +138,9 @@
 \newcommand{\reviewtablecaption}[1]{%
   \caption{#1}}
 
+\WithSuffix\newcommand\reviewtablecaption*[1]{%
+  \caption*{#1}}
+
 \newcommand{\reviewimgtablecaption}[1]{%
   \caption{#1}\vspace{-3mm}}