review 1.0.0 → 1.1.0

data/test/test_latexbuilder.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'test_helper'
 require 'review/compiler'
 require 'review/book'
@@ -10,6 +11,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     @builder = LATEXBuilder.new()
     @param = {
       "secnolevel" => 2,    # for IDGXMLBuilder, EPUBBuilder
+      "toclevel" => 2,
       "inencoding" => "UTF-8",
       "outencoding" => "UTF-8",
       "subdirmode" => nil,
@@ -17,7 +19,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     }
     ReVIEW.book.param = @param
     @compiler = ReVIEW::Compiler.new(@builder)
-    @chapter = Chapter.new(nil, 1, 'chap1', nil, StringIO.new)
+    @chapter = Book::Chapter.new(nil, 1, 'chap1', nil, StringIO.new)
     location = Location.new(nil, nil)
     @builder.bind(@compiler, @chapter, location)
   end
@@ -30,12 +32,12 @@ class LATEXBuidlerTest < Test::Unit::TestCase
   def test_headline_level1_without_secno
     @param["secnolevel"] = 0
     @builder.headline(1,"test","this is test.")
-    assert_equal %Q|\\chapter*{this is test.}\n\\label{chap:chap1}\n|, @builder.result
+    assert_equal %Q|\\chapter*{this is test.}\n\\addcontentsline{toc}{chapter}{this is test.}\n\\label{chap:chap1}\n|, @builder.result
   end
 
   def test_headline_level1_with_inlinetag
     @builder.headline(1,"test","this @<b>{is} test.<&\"_>")
-    assert_equal %Q|\\chapter{this \\textbf{is} test.\\textless{}\\&"\\textunderscore{}\\textgreater{}}\n\\label{chap:chap1}\n|, @builder.result
+    assert_equal %Q|\\chapter{this \\textbf{is} test.\\textless{}\\&\"\\textunderscore{}\\textgreater{}}\n\\label{chap:chap1}\n|, @builder.result
   end
 
   def test_headline_level2
@@ -80,6 +82,11 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|\\href{http://example.com/aaa/bbb}{AAA\\textunderscore{}BBB}|, ret
   end
 
+  def test_href_mailto
+    ret = @builder.compile_inline('@<href>{mailto:takahashim@example.com, takahashim@example.com}')
+    assert_equal %Q|\\href{mailto:takahashim@example.com}{takahashim@example.com}|, ret
+  end
+
   def test_inline_br
     ret = @builder.inline_br("")
     assert_equal %Q|\\\\\n|, ret
@@ -141,12 +148,12 @@ class LATEXBuidlerTest < Test::Unit::TestCase
   end
   def test_inline_em
     ret = @builder.compile_inline("abc@<em>{def}")
-    assert_equal %Q|abc\\textbf{def}|, ret
+    assert_equal %Q|abc\\reviewem{def}|, ret
   end
 
   def test_inline_strong
     ret = @builder.compile_inline("abc@<strong>{def}")
-    assert_equal %Q|abc\\textbf{def}|, ret
+    assert_equal %Q|abc\\reviewstrong{def}|, ret
   end
 
   def test_inline_u
@@ -166,7 +173,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
 
   def test_inline_tt_endash
     ret = @builder.compile_inline("test @<tt>{in-line --test ---foo ----bar -----buz} --test2")
-    assert_equal %Q|test \\texttt{in-line {-}{-}test {-}{-}-foo {-}{-}{-}{-}bar {-}{-}{-}{-}-buz} --test2|, ret
+    assert_equal %Q|test \\texttt{in{-}line {-}{-}test {-}{-}{-}foo {-}{-}{-}{-}bar {-}{-}{-}{-}{-}buz} {-}{-}test2|, ret
   end
 
   def test_inline_tti
@@ -179,11 +186,26 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|test \\texttt{\\textbf{inline test}} test2|, ret
   end
 
+  def test_inline_hd_chap
+    def @chapter.headline_index
+      items = [Book::HeadlineIndex::Item.new("chap1|test", [1, 1], "te_st")]
+      Book::HeadlineIndex.new(items, self)
+    end
+
+    ret = @builder.compile_inline("test @<hd>{chap1|test} test2")
+    assert_equal %Q|test 「1.1.1 te\\textunderscore{}st」 test2|, ret
+  end
+
   def test_inline_uchar
     ret = @builder.compile_inline("test @<uchar>{2460} test2")
     assert_equal %Q|test \\UTF{2460} test2|, ret
   end
 
+  def test_jis_x_0201_kana
+    ret = @builder.compile_inline("foo･ｶﾝｼﾞ､テスト")
+    assert_equal %Q|foo\\aj半角{・}\\aj半角{カ}\\aj半角{ン}\\aj半角{シ}\\aj半角{゛}\\aj半角{、}テスト|, ret
+  end
+
   def test_dlist
     @builder.dl_begin
     @builder.dt "foo"
@@ -192,28 +214,49 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|\n\\begin{description}\n\\item[foo] \\mbox{} \\\\\nfoo.\nbar.\n\\end{description}\n|, @builder.result
   end
 
+  def test_dlist_with_bracket
+    @builder.dl_begin
+    @builder.dt "foo[bar]"
+    @builder.dd ["foo.\n", "bar.\n"]
+    @builder.dl_end
+    assert_equal %Q|\n\\begin{description}\n\\item[foo\\lbrack{}bar\\rbrack{}] \\mbox{} \\\\\nfoo.\nbar.\n\\end{description}\n|, @builder.result
+  end
+
   def test_cmd
     lines = ["foo", "bar", "","buz"]
     @builder.cmd(lines)
-    assert_equal %Q|\n\\begin{reviewcmd}\n\\begin{alltt}\nfoo\nbar\n\nbuz\n\\end{alltt}\n\\end{reviewcmd}\n|, @builder.result
+    assert_equal %Q|\n\\begin{reviewcmd}\nfoo\nbar\n\nbuz\n\\end{reviewcmd}\n|, @builder.result
   end
 
   def test_cmd_caption
     lines = ["foo", "bar", "","buz"]
     @builder.cmd(lines, "cap1")
-    assert_equal %Q|\n\\reviewcmdcaption{cap1}\n\\begin{reviewcmd}\n\\begin{alltt}\nfoo\nbar\n\nbuz\n\\end{alltt}\n\\end{reviewcmd}\n|, @builder.result
+    assert_equal %Q|\n\\reviewcmdcaption{cap1}\n\\begin{reviewcmd}\nfoo\nbar\n\nbuz\n\\end{reviewcmd}\n|, @builder.result
   end
 
   def test_emlist
     lines = ["foo", "bar", "","buz"]
     @builder.emlist(lines)
-    assert_equal %Q|\n\\begin{reviewemlist}\n\\begin{alltt}\nfoo\nbar\n\nbuz\n\\end{alltt}\n\\end{reviewemlist}\n|, @builder.result
+    assert_equal %Q|\n\\begin{reviewemlist}\nfoo\nbar\n\nbuz\n\\end{reviewemlist}\n|, @builder.result
   end
 
   def test_emlist_caption
     lines = ["foo", "bar", "","buz"]
     @builder.emlist(lines, "cap1")
-    assert_equal %Q|\n\\reviewemlistcaption{cap1}\n\\begin{reviewemlist}\n\\begin{alltt}\nfoo\nbar\n\nbuz\n\\end{alltt}\n\\end{reviewemlist}\n|, @builder.result
+    assert_equal %Q|\n\\reviewemlistcaption{cap1}\n\\begin{reviewemlist}\nfoo\nbar\n\nbuz\n\\end{reviewemlist}\n|, @builder.result
+  end
+
+  def test_emlist_with_tab
+    lines = ["\tfoo", "\t\tbar", "","\tbuz"]
+    @builder.emlist(lines)
+    assert_equal %Q|\n\\begin{reviewemlist}\n        foo\n                bar\n\n        buz\n\\end{reviewemlist}\n|, @builder.result
+  end
+
+  def test_emlist_with_tab4
+    lines = ["\tfoo", "\t\tbar", "","\tbuz"]
+    @builder.instance_eval{@tabwidth=4}
+    @builder.emlist(lines)
+    assert_equal %Q|\n\\begin{reviewemlist}\n    foo\n        bar\n\n    buz\n\\end{reviewemlist}\n|, @builder.result
   end
 
   def test_quote
@@ -232,6 +275,11 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|\n\\begin{flushright}\nfoobar\n\nbuz\n\\end{flushright}\n|, @builder.raw_result
   end
 
+  def test_centering
+    @builder.centering(["foo", "bar", "","buz"])
+    assert_equal %Q|\n\\begin{center}\nfoobar\n\nbuz\n\\end{center}\n|, @builder.raw_result
+  end
+
   def test_noindent
     @builder.noindent
     @builder.paragraph(["foo", "bar"])
@@ -241,52 +289,51 @@ class LATEXBuidlerTest < Test::Unit::TestCase
 
   def test_image
     def @chapter.image(id)
-      item = ImageIndex::Item.new("sampleimg",1)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
       item
     end
 
     @builder.image_image("sampleimg","sample photo",nil)
-    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}\n\\label{image:chap1:sampleimg}\n\\caption{sample photo}\n\\end{reviewimage}\n|, @builder.raw_result
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n|, @builder.raw_result
   end
 
   def test_image_with_metric
     def @chapter.image(id)
-      item = ImageIndex::Item.new("sampleimg",1)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
       item
     end
 
     @builder.image_image("sampleimg","sample photo","scale=1.2")
-    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2]{./images/chap1-sampleimg.png}\n\\label{image:chap1:sampleimg}\n\\caption{sample photo}\n\\end{reviewimage}\n|, @builder.raw_result
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n|, @builder.raw_result
   end
 
   def test_image_with_metric2
     def @chapter.image(id)
-      item = ImageIndex::Item.new("sampleimg",1)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
       item
     end
 
     @builder.image_image("sampleimg","sample photo","scale=1.2, html::class=\"sample\", latex::height=3cm")
-    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2,height=3cm]{./images/chap1-sampleimg.png}\n\\label{image:chap1:sampleimg}\n\\caption{sample photo}\n\\end{reviewimage}\n|, @builder.raw_result
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2,height=3cm]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n|, @builder.raw_result
   end
 
   def test_indepimage
     def @chapter.image(id)
-      item = ImageIndex::Item.new("sampleimg",1)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
       item
     end
 
-    # FIXME: indepimage's caption should not be with a counter.
     @builder.indepimage("sampleimg","sample photo",nil)
-    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\end{reviewimage}\n|, @builder.raw_result
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}\n\\reviewindepimagecaption{図: sample photo}\n\\end{reviewimage}\n|, @builder.raw_result
   end
 
   def test_indepimage_without_caption
     def @chapter.image(id)
-      item = ImageIndex::Item.new("sampleimg",1)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
       item
     end
@@ -298,31 +345,29 @@ class LATEXBuidlerTest < Test::Unit::TestCase
 
   def test_indepimage_with_metric
     def @chapter.image(id)
-      item = ImageIndex::Item.new("sampleimg",1)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
       item
     end
 
-    # FIXME: indepimage's caption should not be with a counter.
     @builder.indepimage("sampleimg","sample photo","scale=1.2")
-    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\end{reviewimage}\n|, @builder.raw_result
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2]{./images/chap1-sampleimg.png}\n\\reviewindepimagecaption{図: sample photo}\n\\end{reviewimage}\n|, @builder.raw_result
   end
 
   def test_indepimage_with_metric2
     def @chapter.image(id)
-      item = ImageIndex::Item.new("sampleimg",1)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
       item
     end
 
-    # FIXME: indepimage's caption should not be with a counter.
     @builder.indepimage("sampleimg","sample photo","scale=1.2, latex::height=3cm, html::class=\"sample\"")
-    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2,height=3cm]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\end{reviewimage}\n|, @builder.raw_result
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2,height=3cm]{./images/chap1-sampleimg.png}\n\\reviewindepimagecaption{図: sample photo}\n\\end{reviewimage}\n|, @builder.raw_result
   end
 
   def test_indepimage_without_caption_but_with_metric
     def @chapter.image(id)
-      item = ImageIndex::Item.new("sampleimg",1)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
       item
     end
@@ -334,28 +379,28 @@ class LATEXBuidlerTest < Test::Unit::TestCase
 
   def test_bib
     def @chapter.bibpaper(id)
-      BibpaperIndex::Item.new("samplebib",1,"sample bib")
+      Book::BibpaperIndex::Item.new("samplebib",1,"sample bib")
     end
 
-    assert_equal "[1]", @builder.inline_bib("samplebib")
+    assert_equal "\\reviewbibref{[1]}{bib:samplebib}", @builder.inline_bib("samplebib")
   end
 
   def test_bibpaper
     def @chapter.bibpaper(id)
-      BibpaperIndex::Item.new("samplebib",1,"sample bib")
+      Book::BibpaperIndex::Item.new("samplebib",1,"sample bib")
     end
 
     @builder.bibpaper(["a", "b"], "samplebib", "sample bib @<b>{bold}")
-    assert_equal %Q|[1] sample bib \\textbf{bold}\n\na\nb\n\n|, @builder.raw_result
+    assert_equal %Q|[1] sample bib \\textbf{bold}\n\\label{bib:samplebib}\n\nab\n|, @builder.raw_result
   end
 
   def test_bibpaper_without_body
     def @chapter.bibpaper(id)
-      BibpaperIndex::Item.new("samplebib",1,"sample bib")
+      Book::BibpaperIndex::Item.new("samplebib",1,"sample bib")
     end
 
     @builder.bibpaper([], "samplebib", "sample bib")
-    assert_equal %Q|[1] sample bib\n\n|, @builder.raw_result
+    assert_equal %Q|[1] sample bib\n\\label{bib:samplebib}\n\n|, @builder.raw_result
   end
 
   def column_helper(review)
@@ -446,6 +491,21 @@ EOS
     ul_helper(src, expect)
   end
 
+  def test_ul_with_bracket
+    src =<<-EOS
+  * AAA
+  * []BBB
+EOS
+    expect =<<-EOS
+
+\\begin{itemize}
+\\item AAA
+\\item \\lbrack{}]BBB
+\\end{itemize}
+EOS
+    ul_helper(src, expect)
+  end
+
   def test_cont
     src =<<-EOS
   * AAA
@@ -456,8 +516,8 @@ EOS
     expect =<<-EOS
 
 \\begin{itemize}
-\\item AAA-AA
-\\item BBB-BB
+\\item AAA{-}AA
+\\item BBB{-}BB
 \\end{itemize}
 EOS
     ul_helper(src, expect)
@@ -511,6 +571,21 @@ EOS
     ul_helper(src, expect)
   end
 
+  def test_ol_with_bracket
+    src =<<-EOS
+  1. AAA
+  2. []BBB
+EOS
+    expect =<<-EOS
+
+\\begin{enumerate}
+\\item AAA
+\\item \\lbrack{}]BBB
+\\end{enumerate}
+EOS
+    builder_helper(src, expect, :compile_olist)
+  end
+
   def test_inline_raw0
     assert_equal "normal", @builder.inline_raw("normal")
   end
@@ -535,6 +610,11 @@ EOS
     assert_equal "nor\nmal", @builder.inline_raw("|latex|nor\\nmal")
   end
 
+  def test_inline_endash
+    ret = @builder.compile_inline("- -- --- ----")
+    assert_equal "{-} {-}{-} {-}{-}{-} {-}{-}{-}{-}", ret
+  end
+
   def test_block_raw0
     @builder.raw("<>!\"\\n& ")
     expect =<<-EOS

data/test/test_makerhelper.rb

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+
+require 'test_helper'
+require 'review/makerhelper'
+require 'tmpdir'
+require 'fileutils'
+
+
+class MakerHelperTest < Test::Unit::TestCase
+  include ReVIEW
+
+  def setup
+    @tmpdir1 = Dir.mktmpdir
+    @tmpdir2 = Dir.mktmpdir
+  end
+
+  def teardown
+    FileUtils.rm_rf @tmpdir1
+    FileUtils.rm_rf @tmpdir2
+  end
+
+  def test_copy_images_to_dir
+    types = %w{png gif jpg jpeg svg pdf eps}
+    types.each do |type|
+      touch_file("#{@tmpdir1}/foo.#{type}")
+    end
+    FileUtils.mkdir("#{@tmpdir1}/subdir")
+    touch_file("#{@tmpdir1}/subdir/foo.png")
+
+    image_files = MakerHelper.copy_images_to_dir(@tmpdir1, @tmpdir2)
+
+    types.each do |type|
+      assert File.exists?("#{@tmpdir2}/foo.#{type}"), "Copying #{type} file failed"
+      assert image_files.include?("#{@tmpdir1}/foo.#{type}")
+    end
+    assert File.exists?("#{@tmpdir2}/subdir/foo.png"), "Copying a image file in a subdirectory"
+    assert image_files.include?("#{@tmpdir1}/subdir/foo.png")
+  end
+
+  def test_copy_images_to_dir_convert
+    touch_file("#{@tmpdir1}/foo.eps")
+
+    image_files = MakerHelper.copy_images_to_dir(@tmpdir1, @tmpdir2,
+                                                 :convert => {:eps => :png})
+
+    assert File.exists?("#{@tmpdir2}/foo.eps.png"), "EPS to PNG conversion failed"
+    assert image_files.include?("#{@tmpdir1}/foo.eps.png")
+  end
+
+end

data/test/test_pdfmaker_cmd.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+
+require 'test_helper'
+require 'tmpdir'
+require 'fileutils'
+require 'yaml'
+
+REVIEW_PDFMAKER = File.expand_path('../bin/review-pdfmaker', File.dirname(__FILE__))
+
+class PDFMakerCmdTest < Test::Unit::TestCase
+  def setup
+    @tmpdir1 = Dir.mktmpdir
+    @tmpdir2 = Dir.mktmpdir
+
+    @old_rubylib = ENV['RUBYLIB']
+    ENV['RUBYLIB'] = File.expand_path('../lib', File.dirname(__FILE__))
+  end
+
+  def teardown
+    FileUtils.rm_rf @tmpdir1
+    FileUtils.rm_rf @tmpdir2
+    ENV['RUBYLIB'] = @old_rubylib
+  end
+
+  def test_pdfmaker_cmd
+    config = prepare_samplebook(@tmpdir1)
+    builddir = @tmpdir1 + "/" + config['bookname'] + '-pdf'
+    assert ! File.exists?(builddir)
+
+    Dir.chdir(@tmpdir1) do
+      system("#{REVIEW_PDFMAKER} config.yml 1>/dev/null 2>/dev/null")
+    end
+
+    assert File.exists?(builddir)
+  end
+end

data/test/test_preprocessor.rb

@@ -13,11 +13,11 @@ class PreprocessorStripTest < Test::Unit::TestCase
     assert_equal expect, actual
   end
 
-#  def test_gets_with_comment
-#    f = StringIO.new '#@warn(write it later)'
-#    s = Preprocessor::Strip.new(f)
-#    expect = '#@#' + "\n"
-#    actual = s.gets
-#    assert_equal expect, actual
-#  end
+  def test_gets_with_comment
+    f = StringIO.new '#@warn(write it later)'
+    s = Preprocessor::Strip.new(f)
+    expect = '#@#' + "\n"
+    actual = s.gets
+    assert_equal expect, actual
+  end
 end