review 2.1.0 → 2.2.0

data/lib/review/sec_counter.rb

@@ -28,7 +28,7 @@ module ReVIEW
         @counter[n] += 1
       end
       if @counter.size > n
-        (n+1 .. @counter.size).each do |i|
+        (n+1..@counter.size).each do |i|
           @counter[i] = 0
         end
       end
@@ -54,15 +54,13 @@ module ReVIEW
             return "#{@chapter.format_number}#{I18n.t("chapter_postfix")}"
           end
         end
-      else
-        if secnolevel >= level
-          prefix = @chapter.format_number(false)
-          0.upto(level - 2) do |i|
-            prefix << ".#{@counter[i]}"
-          end
-          prefix << I18n.t("chapter_postfix")
-          return prefix
+      elsif secnolevel >= level
+        prefix = @chapter.format_number(false)
+        0.upto(level - 2) do |i|
+          prefix << ".#{@counter[i]}"
         end
+        prefix << I18n.t("chapter_postfix")
+        return prefix
       end
     end
   end

data/lib/review/tocparser.rb

@@ -39,9 +39,9 @@ module ReVIEW
       while line = f.gets
         case line
         when /\A\#@/
-          ;
+          # do nothing
         when /\A\s*\z/
-          ;
+          # do nothing
         when /\A(={2,})[\[\s\{]/
           lev = $1.size
           error! filename, f.lineno, "section level too deep: #{lev}" if lev > 5
@@ -81,7 +81,7 @@ module ReVIEW
           error! filename, beg, 'unterminated list' unless line
 
         when %r<\A//\w>
-          ;
+          # do nothing
         else
           #if node_stack.empty?
           #  error! filename, f.lineno, 'text found before section label'

data/lib/review/tocprinter.rb

@@ -70,13 +70,13 @@ module ReVIEW
       if node.chapter?
         vol = node.volume
         @out.printf "%3s %3dKB %6dC %5dL  %s (%s)\n",
-               chapnumstr(node.number),
-               vol.kbytes, vol.chars, vol.lines,
-               node.label, node.chapter_id
+                    chapnumstr(node.number),
+                    vol.kbytes, vol.chars, vol.lines,
+                    node.label, node.chapter_id
       else ## for section node
         @out.printf "%17s %5dL  %s\n",
-               '', node.estimated_lines,
-               "  #{'   ' * (node.level - 1)}#{number} #{node.label}"
+                    '', node.estimated_lines,
+                    "  #{'   ' * (node.level - 1)}#{number} #{node.label}"
       end
     end
 

data/lib/review/topbuilder.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
@@ -52,6 +52,7 @@ module ReVIEW
       @subsubsection = 0
       @subsubsubsection = 0
       @blank_seen = true
+      @sec_counter = SecCounter.new(5, @chapter)
 
       @titles = {
         "emlist" => "インラインリスト",
@@ -129,47 +130,9 @@ module ReVIEW
       $stderr.puts "#{@location.filename}:#{@location.lineno}: error: #{msg}"
     end
 
-    def messages
-      error_messages() + warning_messages()
-    end
-
     def headline(level, label, caption)
-      prefix = ""
-      blank
-      case level
-      when 1
-        if @chapter.number.to_s =~ /\A\d+\Z/
-          prefix = "第#{@chapter.number}章　"
-        elsif @chapter.number.present?
-          prefix = "#{@chapter.number}　"
-        end
-        @section = 0
-        @subsection = 0
-        @subsubsection = 0
-        @subsubsubsection = 0
-      when 2
-        @section += 1
-        prefix = @chapter.number.present? ? "#{@chapter.number}.#{@section}　" : ""
-        @subsection = 0
-        @subsubsection = 0
-        @subsubsubsection = 0
-      when 3
-        @subsection += 1
-        prefix = @chapter.number.present? ? "#{@chapter.number}.#{@section}.#{@subsection}　" : ""
-        @subsubsection = 0
-        @subsubsubsection = 0
-      when 4
-        @subsubsection += 1
-        prefix = @chapter.number.present? ? "#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}　" : ""
-        @subsubsubsection = 0
-      when 5
-        @subsubsubsection += 1
-        prefix = @chapter.number.present? ? "#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}.#{@subsubsubsection}　" : ""
-      else
-        raise "caption level too deep or unsupported: #{level}"
-      end
-      prefix = "" if (level.to_i > @book.config["secnolevel"])
-      puts "■H#{level}■#{prefix}#{compile_inline(caption)}"
+      prefix, anchor = headline_prefix(level)
+      puts %Q[■H#{level}■#{prefix}#{compile_inline(caption)}]
     end
 
     def ul_begin
@@ -232,11 +195,10 @@ module ReVIEW
     def inline_list(id)
       chapter, id = extract_chapter_id(id)
       if get_chap(chapter).nil?
-        %Q[#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [@chapter.list(id).number])}]
+        %Q[#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [chapter.list(id).number])}]
       else
-        %Q[#{I18n.t("list")}#{I18n.t("format_number", [get_chap(chapter), @chapter.list(id).number])}]
+        %Q[#{I18n.t("list")}#{I18n.t("format_number", [get_chap(chapter), chapter.list(id).number])}]
       end
-
     end
 
     def list_header(id, caption, lang)
@@ -385,10 +347,12 @@ module ReVIEW
     end
 
     def comment(lines, comment = nil)
-      lines ||= []
-      lines.unshift comment unless comment.blank?
-      str = lines.join("")
-      puts "◆→DTP連絡:#{str}←◆"
+      if @book.config["draft"]
+        lines ||= []
+        lines.unshift comment unless comment.blank?
+        str = lines.join("")
+        puts "◆→#{str}←◆"
+      end
     end
 
     def footnote(id, str)
@@ -505,7 +469,7 @@ module ReVIEW
 
     def inline_comment(str)
       if @book.config["draft"]
-        %Q[◆→DTP連絡:#{str}←◆]
+        "◆→#{str}←◆"
       else
         ""
       end
@@ -515,6 +479,26 @@ module ReVIEW
       %Q[◆→TeX式ここから←◆#{str}◆→TeX式ここまで←◆]
     end
 
+    def bibpaper(lines, id, caption)
+      bibpaper_header id, caption
+      unless lines.empty?
+        bibpaper_bibpaper id, caption, lines
+      end
+    end
+
+    def bibpaper_header(id, caption)
+      print "[#{@chapter.bibpaper(id).number}]"
+      puts " #{compile_inline(caption)}"
+    end
+
+    def bibpaper_bibpaper(id, caption, lines)
+      print split_paragraph(lines).join("")
+    end
+
+    def inline_bib(id)
+      %Q([#{@chapter.bibpaper(id).number}])
+    end
+
     def inline_hd_chap(chap, id)
       if chap.number
         n = chap.headline_index.number(id)
@@ -536,6 +520,20 @@ module ReVIEW
     def nonum_end(level)
     end
 
+    def notoc_begin(level, label, caption)
+      puts "■H#{level}■#{compile_inline(caption)}◆→DTP連絡:目次に掲載しない←◆"
+    end
+
+    def notoc_end(level)
+    end
+
+    def nodisp_begin(level, label, caption)
+      # return empty
+    end
+
+    def nodisp_end(level)
+    end
+
     def common_column_begin(type, caption)
       blank
       puts "◆→開始:#{@titles[type]}←◆"
@@ -716,11 +714,6 @@ module ReVIEW
       ""
     end
 
-    def tsize(id)
-      # FIXME
-      ""
-    end
-
     def dtp(str)
       # FIXME
     end
@@ -759,14 +752,13 @@ module ReVIEW
 
     def inline_chapref(id)
       chs = ["", "「", "」"]
-      unless @book.config["chapref"].nil?
+      if @book.config["chapref"]
         _chs = @book.config["chapref"].split(",")
         if _chs.size != 3
           error "--chapsplitter must have exactly 3 parameters with comma."
         else
           chs = _chs
         end
-      else
       end
       "#{chs[0]}#{@book.chapter_index.number(id)}#{chs[1]}#{@book.chapter_index.title(id)}#{chs[2]}"
     rescue KeyError

data/lib/review/version.rb

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

data/lib/review/webmaker.rb

@@ -35,7 +35,7 @@ module ReVIEW
     end
 
     def parse_opts(args)
-      cmd_config = Hash.new
+      cmd_config = {}
       opts = OptionParser.new
 
       opts.banner = "Usage: review-webmaker configfile"
@@ -93,10 +93,10 @@ module ReVIEW
       build_body(@path, yamlfile)
       copy_backmatter(@path)
 
-      copy_images(@config["imagedir"], "#{@path}/images")
+      copy_images(@config["imagedir"], "#{@path}/#{@config["imagedir"]}")
 
-      copy_resources("covers", "#{@path}/images")
-      copy_resources("adv", "#{@path}/images")
+      copy_resources("covers", "#{@path}/#{@config["imagedir"]}")
+      copy_resources("adv", "#{@path}/#{@config["imagedir"]}")
       copy_resources(@config["fontdir"], "#{@path}/fonts", @config["font_ext"])
     end
 
@@ -120,7 +120,6 @@ module ReVIEW
         part.chapters.each do |chap|
           build_chap(chap, base_path, basetmpdir, false)
         end
-
       end
     end
 
@@ -232,8 +231,8 @@ module ReVIEW
     def build_indexpage(basetmpdir)
       File.open("#{basetmpdir}/index.html", "w") do |f|
         if @config["coverimage"]
-          file = File.join("images", @config["coverimage"])
-        @body = <<-EOT
+          file = File.join(@config["imagedir"], @config["coverimage"])
+          @body = <<-EOT
   <div id="cover-image" class="cover-image">
     <img src="#{file}" class="max"/>
   </div>

data/review.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency("rubyzip")
+  gem.add_dependency("rouge")
   gem.add_development_dependency("rake")
   gem.add_development_dependency("test-unit")
   gem.add_development_dependency("pygments.rb")

data/templates/latex/layout.tex.erb

@@ -27,7 +27,9 @@
 \usepackage{amsmath}
 
 %% if you use @<u>{} (underline), use jumoline.sty
-%%\usepackage{jumoline}
+\IfFileExists{jumoline.sty}{
+\usepackage{jumoline}
+}
 
 \newenvironment{shadedb}{%
   \def\FrameCommand{\fboxsep=\FrameSep \colorbox{shadecolorb}}%
@@ -79,6 +81,8 @@
 \lstnewenvironment{reviewemlistnumlst}[1][]{\lstset{numbers=left, #1}}{}
 \lstnewenvironment{reviewlistlst}[1][]{\lstset{#1}}{}
 \lstnewenvironment{reviewlistnumlst}[1][]{\lstset{numbers=left, #1}}{}
+\lstnewenvironment{reviewsourcelst}[1][]{\lstset{#1}}{}
+\lstnewenvironment{reviewsourcenumlst}[1][]{\lstset{numbers=left, #1}}{}
 \lstnewenvironment{reviewcmdlst}[1][]{\lstset{backgroundcolor=\color{white}, frameround=tttt, frame=trbl, #1}}{}
 <%- end -%>
 
@@ -102,6 +106,10 @@
   \begin{shaded}\small\setlength{\baselineskip}{1.3zw}\begin{alltt}}{%
   \end{alltt}\end{shaded}\par\vspace*{0.5zw}}
 
+\newenvironment{reviewsource}{%
+  \begin{shaded}\small\setlength{\baselineskip}{1.3zw}\begin{alltt}}{%
+  \end{alltt}\end{shaded}\par\vspace*{0.5zw}}
+
 \newenvironment{reviewcmd}{%
   \color{white}\medskip\small\begin{shadedb}\setlength{\baselineskip}{1.3zw}\begin{alltt}}{%
   \end{alltt}\end{shadedb}}
@@ -140,6 +148,9 @@
 \newcommand{\reviewemlistcaption}[1]{%
   \medskip{\small\noindent #1}\vspace*{-1.3zw}}
 
+\newcommand{\reviewsourcecaption}[1]{%
+  \medskip{\small\noindent #1}\vspace*{-1.3zw}}
+
 \newcommand{\reviewcmdcaption}[1]{%
   \medskip{\small\noindent #1}\vspace*{-1.3zw}}
 
@@ -236,6 +247,10 @@
 <%- if @config["usepackage"] -%>
 <%= @config["usepackage"] %>
 <%- end -%>
+<%- if @config["makeindex"] -%>
+\usepackage{makeidx}
+\makeindex
+<%- end -%>
 
 \begin{document}
 
@@ -248,7 +263,7 @@
 \begin{titlepage}
 <%-     if @config["coverimage"] -%>
   \begin{center}
-    \includegraphics[<%= @coverimageoption%>]{./images/<%= @config["coverimage"] %>}
+    \includegraphics[<%= @coverimageoption%>]{./<%= @config["imagedir"] %>/<%= @config["coverimage"] %>}
   \end{center}
   \clearpage
 <%-     end -%>
@@ -257,6 +272,10 @@
   \mbox{} \vskip5zw
    \reviewtitlefont%
     {\Huge <%= escape_latex(@config.name_of("booktitle")) %> \par}%
+<%- if @config["subtitle"] -%>
+    \vskip 1em%
+    {\Large <%= escape_latex(@config.name_of("subtitle")) %> \par}%
+<%- end -%>
     \vskip 15em%
     {\huge
       \lineskip .75em
@@ -307,6 +326,9 @@
 <%- if @input_files["POSTDEF"] -%>
 <%= @input_files["POSTDEF"] %>
 <%- end -%>
+<%- if @config["pdfmaker"]["makeindex"] -%>
+\printindex
+<%- end -%>
 
 %%% profile
 <%- if @config["profile"] -%>
@@ -330,6 +352,9 @@
 \vspace*{\fill}
 
 {\noindent\reviewtitlefont\Large <%= escape_latex(@config.name_of("booktitle")) %>} \\
+<%- if @config["subtitle"] -%>
+{\noindent\reviewtitlefont\large <%= escape_latex(@config.name_of("subtitle")) %>} \\
+<%- end -%>
 \rule[8pt]{14cm}{1pt} \\
 {\noindent
 <%= @config["pubhistory"].to_s.gsub(/\n/){"\n\n\\noindent\n"} %>

data/test/assets/test_template.tex

@@ -23,7 +23,9 @@
 \usepackage{amsmath}
 
 %% if you use @<u>{} (underline), use jumoline.sty
-%%\usepackage{jumoline}
+\IfFileExists{jumoline.sty}{
+\usepackage{jumoline}
+}
 
 \newenvironment{shadedb}{%
   \def\FrameCommand{\fboxsep=\FrameSep \colorbox{shadecolorb}}%
@@ -64,6 +66,10 @@
   \begin{shaded}\small\setlength{\baselineskip}{1.3zw}\begin{alltt}}{%
   \end{alltt}\end{shaded}\par\vspace*{0.5zw}}
 
+\newenvironment{reviewsource}{%
+  \begin{shaded}\small\setlength{\baselineskip}{1.3zw}\begin{alltt}}{%
+  \end{alltt}\end{shaded}\par\vspace*{0.5zw}}
+
 \newenvironment{reviewcmd}{%
   \color{white}\medskip\small\begin{shadedb}\setlength{\baselineskip}{1.3zw}\begin{alltt}}{%
   \end{alltt}\end{shadedb}}
@@ -102,6 +108,9 @@
 \newcommand{\reviewemlistcaption}[1]{%
   \medskip{\small\noindent #1}\vspace*{-1.3zw}}
 
+\newcommand{\reviewsourcecaption}[1]{%
+  \medskip{\small\noindent #1}\vspace*{-1.3zw}}
+
 \newcommand{\reviewcmdcaption}[1]{%
   \medskip{\small\noindent #1}\vspace*{-1.3zw}}
 

data/test/book_test_helper.rb

@@ -25,14 +25,13 @@ module BookTestHelper
   end
 
   def get_instance_variables(obj)
-    obj.instance_variables.inject({}) do |memo, name|
+    obj.instance_variables.each_with_object({}) do |name, memo|
       value = obj.instance_variable_get(name)
       if value.instance_variables.empty?
         memo[name] = value
       else
         memo[name] = get_instance_variables(value)
       end
-      memo
     end
   end
 end

data/test/run_test.rb

@@ -0,0 +1,10 @@
+base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+lib_dir  = File.join(base_dir, "lib")
+test_dir = File.join(base_dir, "test")
+
+$LOAD_PATH.unshift(lib_dir)
+
+require 'test/unit'
+
+argv = ["--max-diff-target-string-size=10000"]
+exit Test::Unit::AutoRunner.run(true, test_dir, argv)