review 1.1.0 → 1.2.0

data/lib/review/markdownbuilder.rb

@@ -88,10 +88,18 @@ module ReVIEW
       "*#{str.gsub(/\*/, '\*')}*"
     end
 
+    def inline_em(str)
+      "*#{str.gsub(/\*/, '\*')}*"
+    end
+
     def inline_b(str)
       "**#{str.gsub(/\*/, '\*')}**"
     end
 
+    def inline_strong(str)
+      "**#{str.gsub(/\*/, '\*')}**"
+    end
+
     def inline_code(str)
       "`#{str}`"
     end

data/lib/review/sec_counter.rb

@@ -0,0 +1,71 @@
+# encoding: utf-8
+#
+# Copyright (c) 2008-2014 Minero Aoki, Kenshi Muto, Masayoshi Takahashi,
+#                         KADO Masanori
+#
+# 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.
+#
+
+module ReVIEW
+
+  # Secion Counter class
+  #
+  class SecCounter
+    def initialize(n, chapter)
+      @chapter = chapter
+      reset(n)
+    end
+
+    def reset(n)
+      @counter = Array.new(n, 0)
+    end
+
+    def inc(level)
+      n = level - 2
+      if n >= 0
+        @counter[n] += 1
+      end
+      if @counter.size > n
+        (n+1 .. @counter.size).each do |i|
+          @counter[i] = 0
+        end
+      end
+    end
+
+    def anchor(level)
+      str = "#{@chapter.number}"
+      0.upto(level-2) do |i|
+        str << "-#{@counter[i]}"
+      end
+      str
+    end
+
+    def prefix(level, secnolevel)
+      return nil if @chapter.number.blank?
+
+      if level == 1
+        if secnolevel >= 1
+          placeholder = if @chapter.is_a? ReVIEW::Book::Part
+                          'part'
+                        elsif @chapter.on_POSTDEF?
+                          'appendix'
+                        else
+                          'chapter'
+                        end
+          return "#{I18n.t(placeholder, @chapter.number)}#{I18n.t("chapter_postfix")}"
+        end
+      else
+        if secnolevel >= level && !@chapter.on_POSTDEF?
+          prefix = "#{@chapter.number}"
+          0.upto(level-2) do |i|
+            prefix << ".#{@counter[i]}"
+          end
+          prefix << I18n.t("chapter_postfix")
+          return prefix
+        end
+      end
+    end
+  end
+end

data/lib/review/topbuilder.rb

@@ -10,7 +10,6 @@
 
 require 'review/builder'
 require 'review/textutils'
-require 'review/compiler'
 
 module ReVIEW
 

data/lib/review/version.rb

@@ -1,3 +1,3 @@
-module Review
-  VERSION = "1.1.0"
+module ReVIEW
+  VERSION = "1.2.0"
 end

data/review.gemspec

@@ -4,16 +4,16 @@ require "review/version"
 
 Gem::Specification.new do |gem|
   gem.name        = "review"
-  gem.version     = Review::VERSION
+  gem.version     = ReVIEW::VERSION
   gem.platform    = Gem::Platform::RUBY
   gem.license     = "LGPL"
   gem.authors     = ["kmuto", "takahashim"]
   gem.email       = "kmuto@debian.org"
   gem.homepage    = "http://github.com/kmuto/review"
-  gem.summary     = "ReVIEW: a easy-to-use digital publishing system"
-  gem.description = "ReVIEW is a digital publishing system for books and ebooks. It supports InDesign, EPUB and LaTeX."
+  gem.summary     = "Re:VIEW: a easy-to-use digital publishing system"
+  gem.description = "Re:VIEW is a digital publishing system for books and ebooks. It supports InDesign, EPUB and LaTeX."
   gem.required_rubygems_version = Gem::Requirement.new(">= 0") if gem.respond_to? :required_rubygems_version=
-  gem.date = "2013-03-29"
+  gem.date = "2014-04-02"
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/sample-book/README.md

@@ -1,5 +1,5 @@
-# ReVIEWサンプル書籍データ
+# Re:VIEWサンプル書籍データ
 
-ReVIEW ( http://github.com/kmuto/review )で書籍データを作るためのサンプルファイルです。
+Re:VIEW ( http://github.com/kmuto/review )で書籍データを作るためのサンプルファイルです。
 
 必要なファイルはsrc/ディレクトリ内にあります。srcディレクトリで「review-epubmaker config.yml」と実行すればEPUBが、「review-pdfmaker config.yml」とすればPDFが生成されます(PDFの生成にはpLaTeXとdvipdfmxが必要です)。

data/test/sample-book/src/Rakefile

@@ -1,14 +1,14 @@
 require 'fileutils'
 
 def build(mode, chapter)
-  sh "review-compile --target=#{mode} --footnotetext --singledirmode --stylesheet=style.css #{chapter} > tmp"
+  sh "review-compile --target=#{mode} --footnotetext --stylesheet=style.css #{chapter} > tmp"
   mode_ext = {"html" => "html", "latex" => "tex",
               "idgxml" => "xml", "inao" => "inao"}
   FileUtils.mv "tmp", chapter.gsub(/re\z/, mode_ext[mode])
 end
 
 def build_all(mode)
-  sh "review-compile --all --target=#{mode} --footnotetext --singledirmode --stylesheet=style.css"
+  sh "review-compile --all --target=#{mode} --footnotetext --stylesheet=style.css"
 end
 
 desc "build html (Usage: rake build re=target.re)"

data/test/sample-book/src/config.yml

@@ -1,5 +1,5 @@
 # review-epubmaker向けの設定ファイルの例。
-# yamlファイルをReVIEWファイルのある場所に置き、
+# yamlファイルをRe:VIEWファイルのある場所に置き、
 # 「review-epubmaker yamlファイル」を実行すると、<bookname>.epubファイルが
 # 生成されます。
 # このファイルはUTF-8エンコーディングで記述してください。
@@ -7,7 +7,7 @@
 # ブック名(ファイル名になるもの。ASCII範囲の文字を使用)
 bookname: book
 # 書名
-booktitle: ReVIEWサンプル書籍
+booktitle: Re:VIEWサンプル書籍
 # 著者
 aut: 高橋征義
 prt: 達人出版会
@@ -37,7 +37,7 @@ coverfile: _cover.html
 coverimage: cover.jpg
 # 固有IDに使用するドメイン
 urnid: http://tatsu-zine.com/books/review-sample-book/1.0.0/
-# CSSファイル (yamlファイルおよびReVIEWファイルを置いたディレクトリにあること
+# CSSファイル (yamlファイルおよびRe:VIEWファイルを置いたディレクトリにあること
 stylesheet: main.css
 # 目次として抽出するレベル
 toclevel: 2
@@ -49,7 +49,7 @@ params: --stylesheet=main.css
 mytoc: true
 # 奥付生成用
 colophon: true
-texstyle: samplemacro
+texstyle: reviewmacro
 pubhistory: |
   2011年08月03日 v1.0.0版発行
 debug: true

data/test/sample-book/src/sty/{samplemacro.sty → reviewmacro.sty}

@@ -15,7 +15,7 @@
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0pt}}
 
-%%Helveticaを使う
+%% using Helvetica as sans-serif
 \renewcommand{\sfdefault}{phv}
 
 \sloppy

data/test/test_book_parameter.rb

@@ -21,7 +21,7 @@ class ParametersTest < Test::Unit::TestCase
 
   def test_s_get_page_metric
     mod = Module.new
-    assert_raises ArgumentError do # XXX: OK?
+    assert_nothing_raised do # XXX: OK?
       params = Book::Parameters.get_page_metric(mod)
       assert params
     end

data/test/test_epubmaker.rb

@@ -8,7 +8,7 @@ class EPUBMakerTest < Test::Unit::TestCase
 
   def setup
     @producer = Producer.new
-    @producer.mergeparams({
+    @producer.merge_params({
                             "bookname" => "sample",
                             "title" => "Sample Book",
                             "version" => 2,
@@ -24,12 +24,12 @@ class EPUBMakerTest < Test::Unit::TestCase
   end
 
   def test_resource_en
-    @producer.mergeparams({"language" => "en"})
+    @producer.merge_params({"language" => "en"})
     assert_equal "Table of Contents", @producer.res.v("toctitle")
   end
 
   def test_resource_ja
-    @producer.mergeparams({"language" => "ja"})
+    @producer.merge_params({"language" => "ja"})
     assert_equal "目次", @producer.res.v("toctitle")
   end
 
@@ -403,21 +403,47 @@ EOT
 </head>
 <body>
   <h1 class="toc-title">Table of Contents</h1>
-  <ul class="toc-h1">
-<li><a href="ch01.html">CH01</a></li>
+
+<ul class="toc-h1"><li><a href="ch01.html">CH01</a></li>
 <li><a href="ch02.html">CH02</a>
-<ul class="toc-h2">
-<li><a href="ch02.html#S1">CH02.1</a></li>
+<ul class="toc-h2"><li><a href="ch02.html#S1">CH02.1</a></li>
 <li><a href="ch02.html#S2">CH02.2</a></li>
-</ul>
-</li>
+</ul></li>
 <li><a href="ch03.html">CH03</a>
-<ul class="toc-h2">
+<ul class="toc-h2"><li><a href="ch03.html#S1">CH03.1</a></li>
+</ul></li>
+<li><a href="ch04.html">CH04</a></li>
+</ul></body>
+</html>
+EOT
+    assert_equal expect, @output.string
+  end
+
+  def test_stage3_flat
+    @producer.merge_params({"flattoc" => true, "flattocindent" => false})
+    stage3
+    @producer.mytoc(@output)
+    expect = <<EOT
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ops="http://www.idpf.org/2007/ops" xml:lang="en">
+<head>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+  <meta http-equiv="Content-Style-Type" content="text/css"/>
+  <meta name="generator" content="EPUBMaker::Producer"/>
+  <title>Table of Contents</title>
+</head>
+<body>
+  <h1 class="toc-title">Table of Contents</h1>
+<ul class="toc-h1">
+<li><a href="ch01.html">CH01</a></li>
+<li><a href="ch02.html">CH02</a></li>
+<li><a href="ch02.html#S1">CH02.1</a></li>
+<li><a href="ch02.html#S2">CH02.2</a></li>
+<li><a href="ch03.html">CH03</a></li>
 <li><a href="ch03.html#S1">CH03.1</a></li>
-</ul>
-</li>
 <li><a href="ch04.html">CH04</a></li>
-  </ul>
+</ul>
 </body>
 </html>
 EOT
@@ -470,8 +496,40 @@ EOT
   end
 
   def test_colophon_default
-    @producer.params["aut"] = "Mr.Smith"
-    @producer.params["prt"] = "BLUEPRINT"
+    @producer.params["aut"] = ["Mr.Smith"]
+    @producer.params["prt"] = ["BLUEPRINT"]
+    @producer.colophon(@output)
+    expect = <<EOT
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ops="http://www.idpf.org/2007/ops" xml:lang="en">
+<head>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+  <meta http-equiv="Content-Style-Type" content="text/css"/>
+  <meta name="generator" content="EPUBMaker::Producer"/>
+  <title>Colophon</title>
+</head>
+<body>
+  <div class="colophon">
+    <p class="title">Sample Book</p>
+    <div class="pubhistory">
+      <p>2011年1月1日　発行</p>
+    </div>
+    <table class="colophon">
+      <tr><th>Author</th><td>Mr.Smith</td></tr>
+      <tr><th>Publisher</th><td>BLUEPRINT</td></tr>
+    </table>
+  </div>
+</body>
+</html>
+EOT
+    assert_equal expect, @output.string
+  end
+
+  def test_colophon_pht
+    @producer.params["aut"] = ["Mr.Smith"]
+    @producer.params["prt"] = ["BLUEPRINT"]
+    @producer.params["pht"] = ["Mrs.Smith"]
     @producer.colophon(@output)
     expect = <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
@@ -486,9 +544,13 @@ EOT
 <body>
   <div class="colophon">
     <p class="title">Sample Book</p>
+    <div class="pubhistory">
+      <p>2011年1月1日　発行</p>
+    </div>
     <table class="colophon">
       <tr><th>Author</th><td>Mr.Smith</td></tr>
       <tr><th>Publisher</th><td>BLUEPRINT</td></tr>
+      <tr><th>Director of Photography</th><td>Mrs.Smith</td></tr>
     </table>
   </div>
 </body>

data/test/test_epubmaker_cmd.rb

@@ -4,6 +4,7 @@ require 'test_helper'
 require 'tmpdir'
 require 'fileutils'
 require 'yaml'
+require 'rbconfig'
 
 REVIEW_EPUBMAKER = File.expand_path('../bin/review-epubmaker', File.dirname(__FILE__))
 
@@ -23,14 +24,17 @@ class EPUBMakerCmdTest < Test::Unit::TestCase
   end
 
   def test_epubmaker_cmd
-    config = prepare_samplebook(@tmpdir1)
-    builddir = @tmpdir1 + "/" + config['bookname'] + '-epub'
-    assert ! File.exists?(builddir)
+    if RUBY_VERSION !~ /^1.8/
+      config = prepare_samplebook(@tmpdir1)
+      builddir = @tmpdir1 + "/" + config['bookname'] + '-epub'
+      assert ! File.exist?(builddir)
 
-    Dir.chdir(@tmpdir1) do
-      system("#{REVIEW_EPUBMAKER} config.yml 1>/dev/null 2>/dev/null")
-    end
+      ruby_cmd = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+      Dir.chdir(@tmpdir1) do
+        system("#{ruby_cmd} -S #{REVIEW_EPUBMAKER} config.yml 1>/dev/null 2>/dev/null")
+      end
 
-    assert File.exists?(builddir)
+      assert File.exist?(builddir)
+    end
   end
 end

data/test/test_helper.rb

@@ -8,6 +8,13 @@ def ul_helper(src, expect)
   assert_equal expect, @builder.raw_result
 end
 
+def ol_helper(src, expect)
+  io = StringIO.new(src)
+  li = LineInput.new(io)
+  @compiler.__send__(:compile_olist, li)
+  assert_equal expect, @builder.raw_result
+end
+
 def builder_helper(src, expect, method_sym)
   io = StringIO.new(src)
   li = LineInput.new(io)

data/test/test_htmlbuilder.rb

@@ -15,7 +15,6 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       "secnolevel" => 2,    # for IDGXMLBuilder, HTMLBuilder
       "inencoding" => "UTF-8",
       "outencoding" => "UTF-8",
-      "subdirmode" => nil,
       "stylesheet" => nil,  # for HTMLBuilder
     }
     ReVIEW.book.param = @param
@@ -25,13 +24,22 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     @builder.bind(@compiler, @chapter, location)
   end
 
+  def test_xmlns_ops_prefix_epub3
+    ReVIEW.book.param["epubversion"] = 3
+    assert_equal "epub", @builder.xmlns_ops_prefix
+  end
+
+  def test_xmlns_ops_prefix_epub2
+    assert_equal "ops", @builder.xmlns_ops_prefix
+  end
+
   def test_headline_level1
     @builder.headline(1,"test","this is test.")
     assert_equal %Q|<h1 id="test"><a id="h1"></a>第1章　this is test.</h1>\n|, @builder.raw_result
   end
 
   def test_headline_level1_without_secno
-    @param["secnolevel"] = 0
+    ReVIEW.book.param["secnolevel"] = 0
     @builder.headline(1,"test","this is test.")
     assert_equal %Q|<h1 id="test"><a id="h1"></a>this is test.</h1>\n|, @builder.raw_result
   end
@@ -52,7 +60,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
   end
 
   def test_headline_level3_with_secno
-    @param["secnolevel"] = 3
+    ReVIEW.book.param["secnolevel"] = 3
     @builder.headline(3,"test","this is test.")
     assert_equal %Q|\n<h3 id="test"><a id="h1-0-1"></a>1.0.1　this is test.</h3>\n|, @builder.raw_result
   end
@@ -288,12 +296,22 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     end
     @builder.list(["test1", "test1.5", "", "test<i>2</i>"], "samplelist", "this is @<b>{test}<&>_")
 
-    begin # FIXME: Use params instead of exception handling
+    assert_equal %Q|<div class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list">test1\ntest1.5\n\ntest<i>2</i>\n</pre>\n</div>\n|, @builder.raw_result
+  end
+
+  def test_list_pygments
+    def @chapter.list(id)
+      Book::ListIndex::Item.new("samplelist",1)
+    end
+    begin
       require 'pygments'
-      assert_equal %Q|<div class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list">test1\ntest1.5\n\ntest<span style="color: #666666">&lt;</span>i<span style="color: #666666">&gt;2&lt;/</span>i<span style="color: #666666">&gt;</span>\n</pre>\n</div>\n|, @builder.raw_result
     rescue LoadError
-      assert_equal %Q|<div class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list">test1\ntest1.5\n\ntest<i>2</i>\n</pre>\n</div>\n|, @builder.raw_result
+      return true
     end
+    ReVIEW.book.param["pygments"] = true
+    @builder.list(["test1", "test1.5", "", "test<i>2</i>"], "samplelist", "this is @<b>{test}<&>_")
+
+    assert_equal %Q|<div class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list">test1\ntest1.5\n\ntest<span style="color: #008000; font-weight: bold">&lt;i&gt;</span>2<span style="color: #008000; font-weight: bold">&lt;/i&gt;</span>\n</pre>\n</div>\n|, @builder.raw_result
   end
 
   def test_emlist
@@ -561,6 +579,21 @@ EOS
     ul_helper(src, expect)
   end
 
+  def test_ol
+    src =<<-EOS
+  3. AAA
+  3. BBB
+EOS
+
+    expect =<<-EOS
+<ol>
+<li>AAA</li>
+<li>BBB</li>
+</ol>
+EOS
+    ol_helper(src, expect)
+  end
+
   def test_inline_raw0
     assert_equal "normal", @builder.inline_raw("normal")
   end