review 3.0.0.preview4 → 3.0.0.rc1

data/test/test_epubmaker_cmd.rb

@@ -24,7 +24,7 @@ class EPUBMakerCmdTest < Test::Unit::TestCase
   def test_epubmaker_cmd
     if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
       config = prepare_samplebook(@tmpdir1)
-      builddir = @tmpdir1 + '/' + config['bookname'] + '-epub'
+      builddir = File.join(@tmpdir1, config['bookname'] + '-epub')
       assert !File.exist?(builddir)
 
       ruby_cmd = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']) + RbConfig::CONFIG['EXEEXT']

data/test/test_helper.rb

@@ -12,11 +12,11 @@ end
 
 def prepare_samplebook(srcdir)
   samplebook_dir = File.expand_path('../samples/sample-book/src/', File.dirname(__FILE__))
-  FileUtils.cp_r(Dir.glob(samplebook_dir + '/*'), srcdir)
+  FileUtils.cp_r(Dir.glob(File.join(samplebook_dir, '*')), srcdir)
   # copy from review-jsbook
   template_dir = File.expand_path('../templates/latex/review-jsbook/', File.dirname(__FILE__))
-  FileUtils.cp(Dir.glob(template_dir + '/*'), File.join(srcdir, 'sty'))
-  YAML.load(File.open(srcdir + '/config.yml'))
+  FileUtils.cp(Dir.glob(File.join(template_dir, '*')), File.join(srcdir, 'sty'))
+  YAML.load(File.open(File.join(srcdir, 'config.yml')))
 end
 
 def compile_inline(text)

data/test/test_image_finder.rb

@@ -12,7 +12,7 @@ class ImageFinderTest < Test::Unit::TestCase
   def test_find_path_pattern1
     dir = Dir.mktmpdir
     begin
-      path = dir + '/builder/ch01/foo.jpg'
+      path = File.join(dir, 'builder/ch01/foo.jpg')
       FileUtils.mkdir_p(File.dirname(path))
       FileUtils.touch(path)
 
@@ -26,7 +26,7 @@ class ImageFinderTest < Test::Unit::TestCase
   def test_find_path_pattern2
     dir = Dir.mktmpdir
     begin
-      path = dir + '/builder/ch01-foo.jpg'
+      path = File.join(dir, 'builder/ch01-foo.jpg')
       FileUtils.mkdir_p(File.dirname(path))
       FileUtils.touch(path)
 
@@ -40,7 +40,7 @@ class ImageFinderTest < Test::Unit::TestCase
   def test_find_path_pattern3
     dir = Dir.mktmpdir
     begin
-      path = dir + '/builder/foo.jpg'
+      path = File.join(dir, 'builder/foo.jpg')
       FileUtils.mkdir_p(File.dirname(path))
       FileUtils.touch(path)
 
@@ -54,7 +54,7 @@ class ImageFinderTest < Test::Unit::TestCase
   def test_find_path_pattern4
     dir = Dir.mktmpdir
     begin
-      path = dir + '/ch01/foo.jpg'
+      path = File.join(dir, 'ch01/foo.jpg')
       FileUtils.mkdir_p(File.dirname(path))
       FileUtils.touch(path)
 
@@ -68,7 +68,7 @@ class ImageFinderTest < Test::Unit::TestCase
   def test_find_path_pattern5
     dir = Dir.mktmpdir
     begin
-      path = dir + '/ch01-foo.jpg'
+      path = File.join(dir, 'ch01-foo.jpg')
       FileUtils.mkdir_p(File.dirname(path))
       FileUtils.touch(path)
 
@@ -82,12 +82,12 @@ class ImageFinderTest < Test::Unit::TestCase
   def test_find_path_dir_symlink
     dir = Dir.mktmpdir
     begin
-      path_src = dir + '/src'
-      path_dst = dir + '/ch01'
+      path_src = File.join(dir, 'src')
+      path_dst = File.join(dir, 'ch01')
       FileUtils.mkdir_p(path_src)
       FileUtils.symlink(path_src, path_dst)
-      path_srcimg = path_src + '/foo.jpg'
-      path_dstimg = path_dst + '/foo.jpg'
+      path_srcimg = File.join(path_src, 'foo.jpg')
+      path_dstimg = File.join(path_dst, 'foo.jpg')
       FileUtils.touch(path_srcimg)
 
       finder = ReVIEW::Book::ImageFinder.new(dir, 'ch01', 'builder', ['.jpg'])

data/test/test_latexbuilder.rb

@@ -257,7 +257,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
       return true
     end
     tmpdir = Dir.mktmpdir
-    File.write("#{tmpdir}/sample.dic", "強運\tはーどらっく\n")
+    File.write(File.join(tmpdir, 'sample.dic'), "強運\tはーどらっく\n")
     @book.config['pdfmaker']['makeindex'] = true
     @book.config['pdfmaker']['makeindex_dic'] = "#{tmpdir}/sample.dic"
     @builder.setup_index
@@ -591,6 +591,25 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q(\\begin{reviewtable}{|p{5mm}|cr|}\n\\hline\n\\reviewth{A} & B & C \\\\  \\hline\n\\end{reviewtable}\n), actual
   end
 
+  def test_separate_tsize
+    actual = @builder.separate_tsize('|l|c|r|p{1cm}lp{1.5cm}|p{5mm}').join(',')
+    assert_equal 'l,c,r,p{1cm},l,p{1.5cm},p{5mm}', actual
+
+    actual = @builder.separate_tsize('|lcr').join(',')
+    assert_equal 'l,c,r', actual
+
+    actual = @builder.separate_tsize('{p}p{').join(',')
+    assert_equal '{p},p{', actual
+  end
+
+  def test_break_tablecell
+    actual = compile_block("//tsize[|latex||p{10mm}|cp{10mm}|]\n//table{\nA@<br>{}A\tB@<br>{}B\tC@<br>{}C\n//}\n")
+    assert_equal %Q(\\begin{reviewtable}{|p{10mm}|cp{10mm}|}\n\\hline\n\\reviewth{A\\newline{}A} & \\shortstack[l]{B\\\\\nB} & C\\newline{}C \\\\  \\hline\n\\end{reviewtable}\n), actual
+
+    actual = compile_block("//tsize[|latex||p{10mm}|cp{10mm}|]\n//table{\n1@<br>{}1\t2@<br>{}2\t3\n------------\nA@<br>{}A\tB@<br>{}B\tC@<br>{}C\n//}\n")
+    assert_equal %Q(\\begin{reviewtable}{|p{10mm}|cp{10mm}|}\n\\hline\n\\reviewth{1\\newline{}1} & \\reviewth{\\shortstack[l]{2\\\\\n2}} & \\reviewth{3} \\\\  \\hline\nA\\newline{}A & \\shortstack[l]{B\\\\\nB} & C\\newline{}C \\\\  \\hline\n\\end{reviewtable}\n), actual
+  end
+
   def test_emtable
     actual = compile_block("//emtable[foo]{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n//emtable{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
     assert_equal "\\begin{table}%%\n\\reviewtablecaption*{foo}\n\\begin{reviewtable}{|l|l|}\n\\hline\n\\reviewth{aaa} & \\reviewth{bbb} \\\\  \\hline\nccc & ddd\\textless{}\\textgreater{}\\& \\\\  \\hline\n\\end{reviewtable}\n\\end{table}\n\n\\begin{reviewtable}{|l|l|}\n\\hline\n\\reviewth{aaa} & \\reviewth{bbb} \\\\  \\hline\nccc & ddd\\textless{}\\textgreater{}\\& \\\\  \\hline\n\\end{reviewtable}\n",

data/test/test_makerhelper.rb

@@ -18,18 +18,18 @@ class MakerHelperTest < Test::Unit::TestCase
 
   def test_copy_images_to_dir
     types = %w[png gif jpg jpeg svg pdf eps]
-    types.each { |type| touch_file("#{@tmpdir1}/foo.#{type}") }
-    FileUtils.mkdir("#{@tmpdir1}/subdir")
-    touch_file("#{@tmpdir1}/subdir/foo.png")
+    types.each { |type| touch_file(File.join(@tmpdir1, "foo.#{type}")) }
+    FileUtils.mkdir(File.join(@tmpdir1, 'subdir'))
+    touch_file(File.join(@tmpdir1, 'subdir/foo.png'))
 
     image_files = MakerHelper.copy_images_to_dir(@tmpdir1, @tmpdir2)
 
     types.each do |type|
-      assert File.exist?("#{@tmpdir2}/foo.#{type}"), "Copying #{type} file failed"
-      assert image_files.include?("#{@tmpdir1}/foo.#{type}")
+      assert File.exist?(File.join(@tmpdir2, "foo.#{type}")), "Copying #{type} file failed"
+      assert image_files.include?(File.join(@tmpdir1, "foo.#{type}"))
     end
-    assert File.exist?("#{@tmpdir2}/subdir/foo.png"), 'Copying a image file in a subdirectory'
-    assert image_files.include?("#{@tmpdir1}/subdir/foo.png")
+    assert File.exist?(File.join(@tmpdir2, 'subdir/foo.png')), 'Copying a image file in a subdirectory'
+    assert image_files.include?(File.join(@tmpdir1, 'subdir/foo.png'))
   end
 
   def test_copy_images_to_dir_convert
@@ -39,18 +39,18 @@ class MakerHelperTest < Test::Unit::TestCase
       image_files = MakerHelper.copy_images_to_dir(@tmpdir1, @tmpdir2,
                                                    convert: { eps: :png })
 
-      assert File.exist?("#{@tmpdir2}/foo.eps.png"), 'EPS to PNG conversion failed'
-      assert image_files.include?("#{@tmpdir1}/foo.eps.png")
+      assert File.exist?(File.join(@tmpdir2, 'foo.eps.png')), 'EPS to PNG conversion failed'
+      assert image_files.include?(File.join(@tmpdir1, 'foo.eps.png'))
     end
   end
 
   def test_copy_images_to_dir_with_exts
     types = %w[png gif jpg jpeg svg pdf eps]
     types4epub = %w[png gif jpg jpeg svg]
-    types.each { |type| touch_file("#{@tmpdir1}/foo.#{type}") }
+    types.each { |type| touch_file(File.join(@tmpdir1, "foo.#{type}")) }
     image_files = MakerHelper.copy_images_to_dir(@tmpdir1, @tmpdir2, exts: types4epub)
 
-    types4epub.each { |type| assert image_files.include?("#{@tmpdir1}/foo.#{type}"), "foo.#{type} is not included" }
-    (types - types4epub).each { |type| assert !image_files.include?("#{@tmpdir1}/foo.#{type}"), "foo.#{type} is included" }
+    types4epub.each { |type| assert image_files.include?(File.join(@tmpdir1, "foo.#{type}")), "foo.#{type} is not included" }
+    (types - types4epub).each { |type| assert !image_files.include?(File.join(@tmpdir1, "foo.#{type}")), "foo.#{type} is included" }
   end
 end

data/test/test_pdfmaker_cmd.rb

@@ -22,7 +22,7 @@ class PDFMakerCmdTest < Test::Unit::TestCase
   def test_pdfmaker_cmd
     if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
       config = prepare_samplebook(@tmpdir1)
-      builddir = @tmpdir1 + '/' + config['bookname'] + '-pdf'
+      builddir = File.join(@tmpdir1, config['bookname'] + '-pdf')
       # assert !File.exist?(builddir)
 
       ruby_cmd = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])

data/test/test_update.rb

@@ -234,7 +234,7 @@ EOT
     assert_match(/By default it is migrated to/, io.string)
     assert_match(/is safely replaced/, io.string)
     cont = <<EOT
-texdocumentclass: ["review-jsbook", "paper=a5,Q=15.46,landscape,oneside,twoside,vartwoside,onecolumn,twocolumn,titlepage,notitlepage,openright,openany,leqno,fleqn,disablejfam,draft,final,mingoth,winjis,jis,papersize,english,report,jslogo,nojslogo,cameraready=print,cover=false"]
+texdocumentclass: ["review-jsbook", "paper=a5,fontsize=11pt,landscape,oneside,twoside,vartwoside,onecolumn,twocolumn,titlepage,notitlepage,openright,openany,leqno,fleqn,disablejfam,draft,final,mingoth,winjis,jis,papersize,english,report,jslogo,nojslogo,media=print,cover=false"]
 EOT
     assert_equal cont, File.read(File.join(@tmpdir, 'config.yml'))
   end
@@ -246,7 +246,7 @@ EOT
     @u.parse_ymls(@tmpdir)
     @u.update_tex_parameters
     assert_match(/couldn't be converted fully/, io.string)
-    assert_match("'paper=a5,cameraready=print,cover=false' is suggested", io.string)
+    assert_match("'paper=a5,media=print,cover=false' is suggested", io.string)
     cont = <<EOT
 texdocumentclass: ["jsbook", "a5paper,invalid"]
 EOT
@@ -266,6 +266,18 @@ EOT
     assert_equal cont, File.read(File.join(@tmpdir, 'config.yml'))
   end
 
+  def test_update_tex_parameters_review_jsbook_obsoletekey
+    File.write(File.join(@tmpdir, 'config.yml'), %Q(texdocumentclass: ["review-jsbook", "Q=13.5, H=20, W=40, L=34, head=20mm, gutter=20mm"]\n))
+    io = StringIO.new
+    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.parse_ymls(@tmpdir)
+    @u.update_tex_parameters
+    cont = <<EOT
+texdocumentclass: ["review-jsbook", "fontsize=13.5Q, baselineskip=20H, line_length=40zw, number_of_lines=34, head_space=20mm, gutter=20mm"]
+EOT
+    assert_equal cont, File.read(File.join(@tmpdir, 'config.yml'))
+  end
+
   def test_update_tex_parameters_review_jlreq
     File.write(File.join(@tmpdir, 'config.yml'), %Q(texdocumentclass: ["review-jlreq", ""]\n))
     io = StringIO.new
@@ -330,7 +342,7 @@ EOT
     assert_match(/By default it is migrated to/, io.string)
     assert_match(/is safely replaced/, io.string)
     cont = <<EOT
-texdocumentclass: ["review-jlreq", "paper=a5,fontsize=11pt,landscape,oneside,twoside,onecolumn,twocolumn,titlepage,notitlepage,openright,openany,leqno,fleqn,draft,final,report,cameraready=print,cover=false"]
+texdocumentclass: ["review-jlreq", "paper=a5,fontsize=11pt,landscape,oneside,twoside,onecolumn,twocolumn,titlepage,notitlepage,openright,openany,leqno,fleqn,draft,final,report,media=print,cover=false"]
 EOT
     assert_equal cont, File.read(File.join(@tmpdir, 'config.yml'))
   end
@@ -341,13 +353,15 @@ EOT
     @u.update_tex_stys('review-jsbook', @tmpdir)
     assert_equal '', io.string
     assert_equal true, File.exist?(File.join(@tmpdir, 'sty/review-base.sty'))
-    assert_equal true, File.exist?(File.join(@tmpdir, 'sty/gentombow09j.sty'))
+    assert_equal true, File.exist?(File.join(@tmpdir, 'sty/gentombow.sty'))
+    assert_equal true, File.exist?(File.join(@tmpdir, 'sty/jsbook.cls'))
   end
 
   def test_update_stys_new_custom
     io = StringIO.new
     @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
     @u.update_tex_stys('review-jsbook', @tmpdir)
+    assert_equal '', io.string
     File.write(File.join(@tmpdir, 'sty/review-custom.sty'), "% MY CUSTOM\n")
     @u.update_tex_stys('review-jsbook', @tmpdir)
     assert_equal '', io.string

data/test/test_zip_exporter.rb

@@ -8,10 +8,10 @@ class ZipExporterTest < Test::Unit::TestCase
 
   def setup
     @tmpdir = Dir.mktmpdir
-    @epubdir = "#{@tmpdir}/epubdir"
-    FileUtils.mkdir_p("#{@epubdir}/META-INF")
-    FileUtils.mkdir_p("#{@epubdir}/OEBPS")
-    File.write("#{@epubdir}/mimetype", 'application/epub+zip')
+    @epubdir = File.join(@tmpdir, 'epubdir')
+    FileUtils.mkdir_p(File.join(@epubdir, 'META-INF'))
+    FileUtils.mkdir_p(File.join(@epubdir, 'OEBPS'))
+    File.write(File.join(@epubdir, 'mimetype'), 'application/epub+zip')
 
     container_xml = <<-EOB
     <?xml version="1.0" encoding="UTF-8"?>
@@ -54,9 +54,9 @@ class ZipExporterTest < Test::Unit::TestCase
 </html>
     EOB
 
-    File.write("#{@epubdir}/META-INF/container.xml", container_xml)
-    File.write("#{@epubdir}/OEBPS/book.opf", book_opf)
-    File.write("#{@epubdir}/OEBPS/ch1.xhtml", ch1_xhtml)
+    File.write(File.join(@epubdir, 'META-INF/container.xml'), container_xml)
+    File.write(File.join(@epubdir, 'OEBPS/book.opf'), book_opf)
+    File.write(File.join(@epubdir, 'OEBPS/ch1.xhtml'), ch1_xhtml)
   end
 
   def test_export_zipcmd

data/vendor/jsclasses/.gitignore

@@ -0,0 +1,163 @@
+## Core latex/pdflatex auxiliary files:
+*.aux
+*.lof
+*.log
+*.lot
+*.fls
+*.out
+*.toc
+*.fmt
+
+## Intermediate documents:
+*.dvi
+*-converted-to.*
+# these rules might exclude image files for figures etc.
+# *.ps
+# *.eps
+# *.pdf
+
+## Bibliography auxiliary files (bibtex/biblatex/biber):
+*.bbl
+*.bcf
+*.blg
+*-blx.aux
+*-blx.bib
+*.brf
+*.run.xml
+
+## Build tool auxiliary files:
+*.fdb_latexmk
+*.synctex
+*.synctex.gz
+*.synctex.gz(busy)
+*.pdfsync
+
+## Auxiliary and intermediate files from other packages:
+# algorithms
+*.alg
+*.loa
+
+# achemso
+acs-*.bib
+
+# amsthm
+*.thm
+
+# beamer
+*.nav
+*.snm
+*.vrb
+
+# cprotect
+*.cpt
+
+#(e)ledmac/(e)ledpar
+*.end
+*.[1-9]
+*.[1-9][0-9]
+*.[1-9][0-9][0-9]
+*.[1-9]R
+*.[1-9][0-9]R
+*.[1-9][0-9][0-9]R
+*.eledsec[1-9]
+*.eledsec[1-9]R
+*.eledsec[1-9][0-9]
+*.eledsec[1-9][0-9]R
+*.eledsec[1-9][0-9][0-9]
+*.eledsec[1-9][0-9][0-9]R
+
+# glossaries
+*.acn
+*.acr
+*.glg
+*.glo
+*.gls
+
+# gnuplottex
+*-gnuplottex-*
+
+# hyperref
+*.brf
+
+# knitr
+*-concordance.tex
+*.tikz
+*-tikzDictionary
+
+# listings
+*.lol
+
+# makeidx
+*.idx
+*.ilg
+*.ind
+*.ist
+
+# minitoc
+*.maf
+*.mtc
+*.mtc[0-9]
+*.mtc[1-9][0-9]
+
+# minted
+_minted*
+*.pyg
+
+# morewrites
+*.mw
+
+# mylatexformat
+*.fmt
+
+# nomencl
+*.nlo
+
+# sagetex
+*.sagetex.sage
+*.sagetex.py
+*.sagetex.scmd
+
+# sympy
+*.sout
+*.sympy
+sympy-plots-for-*.tex/
+
+# pdfcomment
+*.upa
+*.upb
+
+#pythontex
+*.pytxcode
+pythontex-files-*/
+
+# Texpad
+.texpadtmp
+
+# TikZ & PGF
+*.dpth
+*.md5
+*.auxlock
+
+# todonotes
+*.tdo
+
+# xindy
+*.xdy
+
+# xypic precompiled matrices
+*.xyc
+
+# WinEdt, Emacs
+*~
+*.bak
+*.sav
+
+# endfloat
+*.ttt
+*.fff
+
+# Latexian
+TSWLatexianTemp*
+
+# temporary directory
+jis0/*

data/vendor/jsclasses/LICENSE

@@ -0,0 +1,25 @@
+Copyright 1995-1999 ASCII MEDIA WORKS
+Copyright 1999-2016 Haruhiko Okumura
+Copyright 2016-2018 Japanese TeX Development Community
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.