review 1.5.0 → 1.6.0

data/test/assets/test_template_backmatter.tex

@@ -0,0 +1,32 @@
+
+
+
+
+
+%%% profile
+
+\thispagestyle{empty}\chapter*{Profile}
+some profile
+
+
+
+%%% advfile
+
+\thispagestyle{empty}\chapter*{Ad}
+some ad content
+
+
+
+%%% colophon
+
+
+%%% backcover
+
+\clearpage
+\thispagestyle{empty}\AddToShipoutPictureBG{%
+\AtPageLowerLeft{\includegraphics[width=\paperwidth,height=\paperheight]{images/backcover.png}}
+}
+\null
+
+
+\end{document}

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

@@ -75,6 +75,9 @@ epubversion: 3
 # HTMLのバージョン (4か5。epubversionを3にしたときには5にする)
 # htmlversion: 5
 
+# 目次を作成するか。省略した場合はnull（作成しない）
+# toc: true
+
 # 目次として抽出する見出しレベル。省略した場合は2
 toclevel: 2
 # 本文でセクション番号を表示する見出しレベル。省略した場合は2

data/test/test_epub3maker.rb

@@ -329,7 +329,9 @@ EOT
   end
 
   def test_stage3_flat
-    @producer.merge_params({"flattoc" => true, "flattocindent" => false})
+    @producer.merge_params({"epubmaker" =>
+        {"flattoc" => true, "flattocindent" => false}
+      })
     stage3
     @producer.mytoc(@output)
     expect = <<EOT

data/test/test_helper.rb

@@ -6,6 +6,10 @@ def touch_file(path)
   path
 end
 
+def assets_dir
+  File.join(File.dirname(__FILE__), "assets")
+end
+
 def prepare_samplebook(srcdir)
   samplebook_dir = File.expand_path("sample-book/src/", File.dirname(__FILE__))
   FileUtils.cp_r(Dir.glob(samplebook_dir + "/*"), srcdir)

data/test/test_htmlbuilder.rb

@@ -39,7 +39,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def test_headline_level1
     actual = compile_block("={test} this is test.\n")
-    assert_equal %Q|<h1 id="test"><a id="h1"></a>第1章　this is test.</h1>\n|, actual
+    assert_equal %Q|<h1 id="test"><a id="h1"></a><span class="secno">第1章　</span>this is test.</h1>\n|, actual
   end
 
   def test_headline_level1_postdef
@@ -49,7 +49,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       end
     end
     actual = compile_block("={test} this is test.\n")
-    assert_equal %Q|<h1 id="test"><a id="h1"></a>付録1　this is test.</h1>\n|, actual
+    assert_equal %Q|<h1 id="test"><a id="h1"></a><span class="secno">付録1　</span>this is test.</h1>\n|, actual
   end
 
   def test_headline_level2_postdef
@@ -59,7 +59,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       end
     end
     actual = compile_block("=={test} this is test.\n")
-    assert_equal %Q|\n<h2 id="test"><a id="h1-1"></a>1.1　this is test.</h2>\n|, actual
+    assert_equal %Q|\n<h2 id="test"><a id="h1-1"></a><span class="secno">1.1　</span>this is test.</h2>\n|, actual
   end
 
   def test_headline_level1_postdef_roman
@@ -70,7 +70,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       end
     end
     actual = compile_block("={test} this is test.\n")
-    assert_equal %Q|<h1 id="test"><a id="hI"></a>付録I　this is test.</h1>\n|, actual
+    assert_equal %Q|<h1 id="test"><a id="hI"></a><span class="secno">付録I　</span>this is test.</h1>\n|, actual
   end
 
   def test_headline_level2_postdef_roman
@@ -81,7 +81,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       end
     end
     actual = compile_block("=={test} this is test.\n")
-    assert_equal %Q|\n<h2 id="test"><a id="hI-1"></a>I.1　this is test.</h2>\n|, actual
+    assert_equal %Q|\n<h2 id="test"><a id="hI-1"></a><span class="secno">I.1　</span>this is test.</h2>\n|, actual
   end
 
   def test_headline_level1_postdef_alpha
@@ -92,7 +92,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       end
     end
     actual = compile_block("={test} this is test.\n")
-    assert_equal %Q|<h1 id="test"><a id="hA"></a>付録A　this is test.</h1>\n|, actual
+    assert_equal %Q|<h1 id="test"><a id="hA"></a><span class="secno">付録A　</span>this is test.</h1>\n|, actual
   end
 
   def test_headline_level2_postdef_alpha
@@ -103,7 +103,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       end
     end
     actual = compile_block("=={test} this is test.\n")
-    assert_equal %Q|\n<h2 id="test"><a id="hA-1"></a>A.1　this is test.</h2>\n|, actual
+    assert_equal %Q|\n<h2 id="test"><a id="hA-1"></a><span class="secno">A.1　</span>this is test.</h2>\n|, actual
   end
 
   def test_headline_level1_without_secno
@@ -114,17 +114,17 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def test_headline_level1_with_tricky_id
     actual = compile_block("={123 あ_;} this is test.\n")
-    assert_equal %Q|<h1 id="id_123-_E3_81_82___3B"><a id="h1"></a>第1章　this is test.</h1>\n|, actual
+    assert_equal %Q|<h1 id="id_123-_E3_81_82___3B"><a id="h1"></a><span class="secno">第1章　</span>this is test.</h1>\n|, actual
   end
 
   def test_headline_level1_with_inlinetag
     actual = compile_block("={test} this @<b>{is} test.<&\">\n")
-    assert_equal %Q|<h1 id="test"><a id="h1"></a>第1章　this <b>is</b> test.&lt;&amp;&quot;&gt;</h1>\n|, actual
+    assert_equal %Q|<h1 id="test"><a id="h1"></a><span class="secno">第1章　</span>this <b>is</b> test.&lt;&amp;&quot;&gt;</h1>\n|, actual
   end
 
   def test_headline_level2
     actual = compile_block("=={test} this is test.\n")
-    assert_equal %Q|\n<h2 id="test"><a id="h1-1"></a>1.1　this is test.</h2>\n|, actual
+    assert_equal %Q|\n<h2 id="test"><a id="h1-1"></a><span class="secno">1.1　</span>this is test.</h2>\n|, actual
   end
 
   def test_headline_level3
@@ -135,7 +135,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
   def test_headline_level3_with_secno
     @book.config["secnolevel"] = 3
     actual = compile_block("==={test} this is test.\n")
-    assert_equal %Q|\n<h3 id="test"><a id="h1-0-1"></a>1.0.1　this is test.</h3>\n|, actual
+    assert_equal %Q|\n<h3 id="test"><a id="h1-0-1"></a><span class="secno">1.0.1　</span>this is test.</h3>\n|, actual
   end
 
   def test_label
@@ -453,6 +453,12 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<dl>\n<dt>foo[bar]</dt>\n<dd>foo.bar.</dd>\n</dl>\n|, actual
   end
 
+  def test_dlist_with_comment
+    source = ": title\n  body\n\#@ comment\n\#@ comment\n: title2\n  body2\n"
+    actual = compile_block(source)
+    assert_equal %Q|<dl>\n<dt>title</dt>\n<dd>body</dd>\n<dt>title2</dt>\n<dd>body2</dd>\n</dl>\n|, actual
+  end
+
   def test_list
     def @chapter.list(id)
       Book::ListIndex::Item.new("samplelist",1)
@@ -531,6 +537,25 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal "<div class=\"code\">\n<p class=\"caption\">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<div class=\"highlight\" style=\"background: #f8f8f8\"><pre style=\"line-height: 125%\"><span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">1</span> <span style=\"color: #008000; font-weight: bold\">def</span> <span style=\"color: #0000FF\">foo</span>(a1, a2<span style=\"color: #666666\">=</span><span style=\"color: #19177C\">:test</span>)\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">2</span>   (<span style=\"color: #666666\">1.</span>.<span style=\"color: #666666\">3</span>)<span style=\"color: #666666\">.</span>times{<span style=\"color: #666666\">|</span>i<span style=\"color: #666666\">|</span> a<span style=\"color: #666666\">.</span>include?(<span style=\"color: #19177C\">:foo</span>)}\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">3</span>   <span style=\"color: #008000; font-weight: bold\">return</span> <span style=\"color: #008000\">true</span>\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">4</span> <span style=\"color: #008000; font-weight: bold\">end</span>\n</pre></div>\n</div>\n", actual
   end
 
+  def test_listnum_pygments_lang_without_lang
+    def @chapter.list(id)
+      Book::ListIndex::Item.new("samplelist",1)
+    end
+    begin
+      require 'pygments'
+    rescue LoadError
+      $stderr.puts "skip test_listnum_pygments_lang (cannot find pygments.rb)"
+      return true
+    end
+    @book.config["highlight"] = {}
+    @book.config["highlight"]["html"] = "pygments"
+    @book.config["highlight"]["lang"] = "ruby"
+    actual = compile_block("//listnum[samplelist][this is @<b>{test}<&>_]{\ndef foo(a1, a2=:test)\n  (1..3).times{|i| a.include?(:foo)}\n  return true\nend\n\n//}\n")
+
+    assert_equal "<div class=\"code\">\n<p class=\"caption\">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<div class=\"highlight\" style=\"background: #f8f8f8\"><pre style=\"line-height: 125%\"><span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">1</span> <span style=\"color: #008000; font-weight: bold\">def</span> <span style=\"color: #0000FF\">foo</span>(a1, a2<span style=\"color: #666666\">=</span><span style=\"color: #19177C\">:test</span>)\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">2</span>   (<span style=\"color: #666666\">1.</span>.<span style=\"color: #666666\">3</span>)<span style=\"color: #666666\">.</span>times{<span style=\"color: #666666\">|</span>i<span style=\"color: #666666\">|</span> a<span style=\"color: #666666\">.</span>include?(<span style=\"color: #19177C\">:foo</span>)}\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">3</span>   <span style=\"color: #008000; font-weight: bold\">return</span> <span style=\"color: #008000\">true</span>\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">4</span> <span style=\"color: #008000; font-weight: bold\">end</span>\n</pre></div>\n</div>\n", actual
+  end
+
+
   def test_emlist
     actual = compile_block("//emlist{\nlineA\nlineB\n//}\n")
     assert_equal %Q|<div class="emlist-code">\n<pre class="emlist">lineA\nlineB\n</pre>\n</div>\n|, actual

data/test/test_i18n.rb

@@ -74,8 +74,10 @@ class I18nTest < Test::Unit::TestCase
           File.open(file, "w"){|f| f.write("ja:\n  foo: \"bar\"\nen:\n  foo: \"buz\"\n")}
           I18n.setup
           assert_equal "bar", I18n.t("foo")
+          assert_equal "図", I18n.t("image")
           I18n.setup("en")
           assert_equal "buz", I18n.t("foo")
+          assert_equal "Figure ", I18n.t("image")
         end
       end
     end
@@ -128,7 +130,7 @@ class I18nTest < Test::Unit::TestCase
   def test_htmlbuilder
     _setup_htmlbuilder
     actual = compile_block("={test} this is test.\n")
-    assert_equal %Q|<h1 id="test"><a id="h1"></a>Chapter 1. this is test.</h1>\n|, actual
+    assert_equal %Q|<h1 id="test"><a id="h1"></a><span class="secno">Chapter 1. </span>this is test.</h1>\n|, actual
   end
 
   def _setup_htmlbuilder

data/test/test_index.rb

@@ -155,5 +155,20 @@ class IndexTest < Test::Unit::TestCase
     end
   end
 
+  def test_HeadelineIndex8
+    src = <<-EOB
+= chap1
+== sec1
+=== sec1-1
+==== sec1-1-1
+
+    EOB
+    book = Book::Base.load
+    chap = Book::Chapter.new(book, 1, '-', nil)
+    index = Book::HeadlineIndex.parse(src, chap)
+    assert_equal "1.1.1", index.number('sec1-1')
+  end
+
+
 end
 

data/test/test_latexbuilder.rb

@@ -254,6 +254,15 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|\n\\vspace{-1.5em}\\begin{reviewemlistlst}[title={\\relax},language={sql}]\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n\\end{reviewemlistlst}\n|, actual
   end
 
+  def test_emlist_lst_without_lang
+    @book.config["highlight"] = {}
+    @book.config["highlight"]["latex"] = "listings"
+    @book.config["highlight"]["lang"] = "sql"
+    actual = compile_block("//emlist[]{\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n//}\n")
+    assert_equal %Q|\n\\vspace{-1.5em}\\begin{reviewemlistlst}[title={\\relax},language={sql}]\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n\\end{reviewemlistlst}\n|, actual
+  end
+
+
   def test_emlist_caption
     actual = compile_block("//emlist[cap1]{\nfoo\nbar\n\nbuz\n//}\n")
     assert_equal %Q|\n\\reviewemlistcaption{cap1}\n\\begin{reviewemlist}\nfoo\nbar\n\nbuz\n\\end{reviewemlist}\n|, actual

data/test/test_pdfmaker.rb

@@ -63,12 +63,12 @@ class PDFMakerTest < Test::Unit::TestCase
     assert_equal yml, "hoge.yml"
   end
 
-  def test_make_custom_titlepage
+  def test_make_custom_page
     Dir.mktmpdir do |dir|
       coverfile = "cover.html"
       content = "<html><body>test</body></html>"
       File.open(File.join(dir, "cover.tex"),"w"){|f| f.write(content) }
-      page = @maker.make_custom_titlepage(File.join(dir, coverfile))
+      page = @maker.make_custom_page(File.join(dir, coverfile))
       assert_equal(content, page)
     end
   end
@@ -128,4 +128,41 @@ class PDFMakerTest < Test::Unit::TestCase
     end
   end
 
+  def test_gettemplate
+    Dir.mktmpdir do |dir|
+      tmpl = @maker.get_template(@config)
+      expect = File.read(File.join(assets_dir,"test_template.tex"))
+      assert_equal(expect, tmpl)
+    end
+  end
+
+  def test_gettemplate_with_backmatter
+    if RUBY_VERSION =~ /^1.8/
+      $stderr.puts "skip test_gettemplate_with_backmatter (for travis error)"
+      return
+    end
+    @config.merge!({
+      "backcover"=>"backcover.html",
+      "profile"=>"profile.html",
+      "advfile"=>"advfile.html",
+    })
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        profile = "\\thispagestyle{empty}\\chapter*{Profile}\nsome profile\n"
+        File.open(File.join(dir, "profile.tex"),"w"){|f| f.write(profile) }
+        advfile = "\\thispagestyle{empty}\\chapter*{Ad}\nsome ad content\n"
+        File.open(File.join(dir, "advfile.tex"),"w"){|f| f.write(advfile) }
+        backcover = "\\clearpage\n\\thispagestyle{empty}\\AddToShipoutPictureBG{%\n\\AtPageLowerLeft{\\includegraphics[width=\\paperwidth,height=\\paperheight]{images/backcover.png}}\n}\n\\null"
+        File.open(File.join(dir, "backcover.tex"),"w"){|f| f.write(backcover) }
+
+        expect = File.read(File.join(assets_dir,"test_template_backmatter.tex"))
+
+        maker = ReVIEW::PDFMaker.new
+        tmpl = maker.get_template(@config)
+        tmpl.gsub!(/\A.*%% backmatter begins\n/m,"")
+        assert_equal(expect, tmpl)
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: review
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - kmuto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,6 +108,8 @@ files:
 - debian/review.links
 - debian/rules
 - debian/source/format
+- doc/NEWS.ja.md
+- doc/NEWS.md
 - doc/catalog.ja.md
 - doc/catalog.md
 - doc/format.ja.md
@@ -158,6 +160,7 @@ files:
 - lib/review/latexindex.rb
 - lib/review/latexutils.rb
 - lib/review/layout.tex.erb
+- lib/review/lineinput.rb
 - lib/review/makerhelper.rb
 - lib/review/markdownbuilder.rb
 - lib/review/pdfmaker.rb
@@ -174,6 +177,8 @@ files:
 - review.gemspec
 - rubocop-todo.yml
 - test/CHAPS
+- test/assets/test_template.tex
+- test/assets/test_template_backmatter.tex
 - test/bib.re
 - test/book_test_helper.rb
 - test/sample-book/README.md
@@ -242,12 +247,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: 'Re:VIEW: a easy-to-use digital publishing system'
 test_files:
 - test/CHAPS
+- test/assets/test_template.tex
+- test/assets/test_template_backmatter.tex
 - test/bib.re
 - test/book_test_helper.rb
 - test/sample-book/README.md
@@ -296,4 +303,3 @@ test_files:
 - test/test_textutils.rb
 - test/test_topbuilder.rb
 - test/test_uuid.rb
-has_rdoc: