RubyGems - review - Versions diffs - 1.0.0 → 1.1.0 - Mend

review 1.0.0 → 1.1.0

Files changed (100) hide show

data/.travis.yml +1 -2
data/ChangeLog +65 -0
data/Gemfile +5 -0
data/README.rdoc +6 -1
data/Rakefile +14 -28
data/bin/review-check +9 -21
data/bin/review-compile +45 -12
data/bin/review-epubmaker +477 -220
data/bin/review-epubmaker-ng +5 -14
data/bin/review-index +4 -2
data/bin/review-init +94 -0
data/bin/review-pdfmaker +70 -287
data/bin/review-preproc +5 -2
data/bin/review-vol +4 -11
data/debian/changelog +3 -3
data/debian/copyright +5 -3
data/debian/docs +1 -0
data/doc/format.rdoc +57 -11
data/doc/quickstart.rdoc +4 -4
data/doc/sample.yaml +11 -7
data/lib/epubmaker.rb +1 -1
data/lib/epubmaker/epubv2.rb +26 -27
data/lib/epubmaker/epubv3.rb +13 -13
data/lib/epubmaker/producer.rb +1 -1
data/lib/review.rb +3 -4
data/lib/review/book.rb +17 -581
data/lib/review/book/base.rb +247 -0
data/lib/review/book/chapter.rb +81 -0
data/lib/review/book/compilable.rb +163 -0
data/lib/review/book/index.rb +339 -0
data/lib/review/book/page_metric.rb +38 -0
data/lib/review/book/parameters.rb +97 -0
data/lib/review/book/part.rb +44 -0
data/lib/review/book/volume.rb +65 -0
data/lib/review/builder.rb +34 -40
data/lib/review/compiler.rb +32 -13
data/lib/review/configure.rb +38 -0
data/lib/review/ewbbuilder.rb +23 -21
data/lib/review/extentions.rb +3 -0
data/lib/review/extentions/object.rb +9 -0
data/lib/review/{compat.rb → extentions/string.rb} +11 -0
data/lib/review/htmlbuilder.rb +162 -74
data/lib/review/htmlutils.rb +28 -1
data/lib/review/i18n.yaml +11 -0
data/lib/review/idgxmlbuilder.rb +119 -35
data/lib/review/inaobuilder.rb +355 -0
data/lib/review/latexbuilder.rb +133 -59
data/lib/review/latexutils.rb +15 -6
data/lib/review/makerhelper.rb +59 -0
data/lib/review/markdownbuilder.rb +129 -0
data/lib/review/preprocessor.rb +20 -7
data/lib/review/review.tex.erb +250 -0
data/lib/review/textutils.rb +28 -3
data/lib/review/tocparser.rb +20 -12
data/lib/review/tocprinter.rb +7 -3
data/lib/review/topbuilder.rb +44 -27
data/lib/review/version.rb +3 -0
data/review.gemspec +20 -117
data/test/book_test_helper.rb +35 -0
data/test/sample-book/README.md +5 -0
data/test/sample-book/src/CHAPS +2 -0
data/test/sample-book/src/PREDEF +1 -0
data/test/sample-book/src/Rakefile +26 -0
data/test/sample-book/src/_cover.html +3 -0
data/test/sample-book/src/ch01.re +71 -0
data/test/sample-book/src/ch02.re +3 -0
data/test/sample-book/src/config.yml +55 -0
data/test/sample-book/src/images/ch01-imgsample.jpg +0 -0
data/test/sample-book/src/images/cover.jpg +0 -0
data/test/sample-book/src/main.css +251 -0
data/test/sample-book/src/preface.re +15 -0
data/test/sample-book/src/sty/jumoline.sty +310 -0
data/test/sample-book/src/sty/samplemacro.sty +21 -0
data/test/sample-book/src/vendor/jumoline/README +29 -0
data/test/sample-book/src/vendor/jumoline/jumoline.dtx +2988 -0
data/test/sample-book/src/vendor/jumoline/jumoline.ins +6 -0
data/test/test_book.rb +26 -646
data/test/test_book_chapter.rb +418 -0
data/test/test_book_parameter.rb +42 -0
data/test/test_book_part.rb +53 -0
data/test/test_builder.rb +17 -10
data/test/test_compiler.rb +46 -0
data/test/test_epubmaker.rb +1 -1
data/test/test_epubmaker_cmd.rb +36 -0
data/test/test_helper.rb +17 -0
data/test/test_htmlbuilder.rb +156 -24
data/test/test_htmlutils.rb +4 -0
data/test/test_i18n.rb +6 -2
data/test/test_idgxmlbuilder.rb +33 -11
data/test/test_inaobuilder.rb +247 -0
data/test/test_index.rb +31 -0
data/test/test_latexbuilder.rb +115 -35
data/test/test_makerhelper.rb +50 -0
data/test/test_pdfmaker_cmd.rb +36 -0
data/test/test_preprocessor.rb +7 -7
data/test/test_topbuilder.rb +6 -7
data/test/test_uuid.rb +1 -0
metadata +117 -12
data/lib/review/index.rb +0 -323
data/lib/review/volume.rb +0 -66

@@ -12,6 +12,7 @@
 require 'pathname'
 bindir = Pathname.new(__FILE__).realpath.dirname
 $LOAD_PATH.unshift((bindir + '../lib').realpath)
+require 'review'
 require 'epubmaker'
 include EPUBMaker
@@ -20,19 +21,9 @@ def main
     puts "Usage: #{$0} configfile"
     exit 0
   end
-  @params = {          # These parameters can be overridden by YAML file.
-    "bookname" => "example", # Book file
-    "title" => "example", # Book title
-    "params" => "",    # specify review2html parameters
-    "epubversion" => 2,# EPUB version
-    "toclevel" => 3,   # level of toc
-    "secnolevel" => 2, # level of section #
-    "posthook" => nil, # command path of post hook
-    "debug" => nil,    # debug flag
-  }
   yamlfile = ARGV[0]
+  @params = ReVIEW::Configure.values.merge(YAML.load_file(yamlfile))
   @epub = Producer.new(@params)
   @epub.load(yamlfile)
   @params = @epub.params
@@ -52,14 +43,14 @@ def main
   FileUtils.cp(@params["cover"], "#{basetmp}/#{@params["cover"]}") if !@params["cover"].nil? && File.exist?(@params["cover"])
-  unless @params["titlepage"].nil? # FIXME
+  if @params["titlepage"] # FIXME
     FileUtils.cp(@params["titlepage"], "#{basetmp}/#{@params["titlepage"]}")
     @epub.contents.push(Content.new("id" => "title", "file" => @params["titlepage"], "title" => @epub.res.v("titlepagetitle")))
   end
   makeBody(basetmp, yamlfile)
-  unless @params["colophon"].nil?
+  if @params["colophon"]
     if @params["colophon"].instance_of?(String)
       FileUtils.cp(@params["colophon"], "#{basetmp}/colophon.#{@params["htmlext"]}")
     else

data/bin/review-index CHANGED

@@ -22,7 +22,9 @@ require 'optparse'
 def main
   Signal.trap(:INT) { exit 1 }
-  Signal.trap(:PIPE, 'IGNORE')
+  if RUBY_PLATFORM !~ /mswin(?!ce)|mingw|cygwin|bccwin/
+    Signal.trap(:PIPE, 'IGNORE')
+  end
   _main
 rescue Errno::EPIPE
   exit 0
@@ -59,7 +61,7 @@ def _main
   }
   parser.on('-c', '--chapter C', 'list only chapter C.') {|c|
     begin
-      source = ReVIEW::Part.new(1, [ReVIEW.book.chapter(c)])
+      source = ReVIEW::Book::Part.new(nil, 1, [ReVIEW.book.chapter(c)])
     rescue
       error_exit "chapter #{c} does not exist in this book"
     end

data/bin/review-init ADDED

@@ -0,0 +1,94 @@
+#!/usr/bin/env ruby
+#
+# Copyright (c) 2013 Masanori Kado
+#
+# 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.
+# For details of the GNU LGPL, see the file "COPYING".
+require 'fileutils'
+def main
+  if ARGV.empty?
+    puts "Usage: #{File.basename($0)} dirname"
+    exit
+  end
+  dir = File.expand_path(ARGV.shift)
+  @review_dir = File.dirname(File.expand_path(__FILE__ + "./../"))
+  generate_dir(dir) do |dir|
+    generate_review_setting_files(dir)
+    generate_sample(dir)
+    generate_images_dir(dir)
+    generate_layout(dir)
+    generate_config(dir)
+    generate_rakefile(dir)
+  end
+end
+def generate_dir(dir)
+  if File.exist? dir
+    puts "#{dir} already exists."
+    exit
+  end
+  FileUtils.mkdir_p dir
+  yield dir
+end
+def generate_sample(dir)
+  File.open("#{dir}/#{File.basename(dir)}.re", "w") do |file|
+    file.write("= ")
+  end
+end
+def generate_layout(dir)
+  Dir.mkdir dir + '/layouts'
+  File.open("#{dir}/layouts/layout.erb", "w") do |file|
+    file.write <<-EOS
+<?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="ja">
+<head>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+  <meta http-equiv="Content-Style-Type" content="text/css" />
+  <link rel="stylesheet" type="text/css" href="style.css" />
+  <meta name="generator" content="ReVIEW" />
+  <title><%= title %></title>
+</head>
+<body>
+<%= body %>
+</body>
+</html>
+EOS
+  end
+end
+def generate_review_setting_files(dir)
+  File.open(dir + "/PREDEF", "w")
+  File.open(dir + "/CHAPS", "w") do |file|
+    file.write("#{File.basename(dir)}.re")
+  end
+  File.open(dir + "/POSTDEF", "w")
+end
+def generate_images_dir(dir)
+  Dir.mkdir dir + '/images'
+end
+def generate_config(dir)
+  FileUtils.cp @review_dir + "/test/sample-book/src/config.yml", dir
+end
+def generate_style(dir)
+  File.open(dir + "/style.css", "w")
+end
+def generate_rakefile(dir)
+  FileUtils.cp @review_dir + "/test/sample-book/src/Rakefile", dir
+end
+if $0 == __FILE__
+  main()
+end

data/bin/review-pdfmaker CHANGED

@@ -12,6 +12,13 @@
 require 'tmpdir'
 require 'yaml'
 require 'fileutils'
+require 'erb'
+require 'pathname'
+bindir = Pathname.new(__FILE__).realpath.dirname
+$LOAD_PATH.unshift((bindir + '../lib').realpath)
+require 'review'
 def error(msg)
   $stderr.puts "#{File.basename($0, '.*')}: error: #{msg}"
@@ -32,9 +39,9 @@ end
 def build_path(values)
   if values["debug"].nil?
-    Dir.mktmpdir+"/#{values["bookname"]}"
+    Dir.mktmpdir+"/#{values["bookname"]}-pdf"
   else
-    "./#{values["bookname"]}"
+    "./#{values["bookname"]}-pdf"
   end
 end
@@ -42,27 +49,37 @@ def main
   usage if ARGV.size != 1
   yamlfile = ARGV[0]
-  values = YAML.load_file(yamlfile)
+  values = ReVIEW::Configure.values.merge(YAML.load_file(yamlfile))
   check_book(values)
-  basedir = Dir.pwd
+  @basedir = Dir.pwd
   @path = build_path(values)
   bookname = values["bookname"]
   Dir.mkdir(@path)
-  @chaps_filenames = Hash.new{|h, key| h[key] = ""}
+  @chaps_fnames = Hash.new{|h, key| h[key] = ""}
-  if File.exists?("PREDEF")
-    output_chaps("PREDEF", values)
-  end
-  if File.exists?("CHAPS")
-    output_chaps("CHAPS", values)
-  end
-  if File.exists?("POSTDEF")
-    output_chaps("POSTDEF", values)
+  ReVIEW::Book.load(@basedir).parts.each do |part|
+    if part.name.present?
+      if part.file?
+        output_parts(part.name, values)
+        @chaps_fnames["CHAPS"] << %Q|\\input{#{part.name}.tex}\n|
+      else
+        @chaps_fnames["CHAPS"] << %Q|\\part{#{part.name}}\n|
+      end
+    end
+    part.chapters.each do |chap|
+      filename = "#{File.basename(chap.path, ".*")}.tex"
+      output_chaps(filename, values)
+      @chaps_fnames["PREDEF"]  << "\\input{#{filename}}\n" if chap.on_PREDEF?
+      @chaps_fnames["CHAPS"]   << "\\input{#{filename}}\n" if chap.on_CHAPS?
+      @chaps_fnames["POSTDEF"] << "\\input{#{filename}}\n" if chap.on_POSTDEF?
+    end
   end
-  values["pre_str"]  = @chaps_filenames["PREDEF"]
-  values["chap_str"] = @chaps_filenames["CHAPS"]
-  values["post_str"] = @chaps_filenames["POSTDEF"]
+  values["pre_str"]  = @chaps_fnames["PREDEF"]
+  values["chap_str"] = @chaps_fnames["CHAPS"]
+  values["post_str"] = @chaps_fnames["POSTDEF"]
   values["usepackage"] = ""
   if values["texstyle"]
@@ -76,7 +93,7 @@ def main
   Dir.chdir(@path) {
     template = get_template(values)
     File.open("./book.tex", "wb"){|f| f.write(template)}
     ## do compile
     enc = values["params"].to_s.split(/\s+/).find{|i| i =~ /\A--outencoding=/ }
     kanji = enc ? enc.split(/=/).last.gsub(/-/, '').downcase : 'utf8'
@@ -97,36 +114,39 @@ def main
     }
     Process.waitall
   }
-  FileUtils.cp("#{@path}/book.pdf", "#{basedir}/#{bookname}.pdf")
+  FileUtils.cp("#{@path}/book.pdf", "#{@basedir}/#{bookname}.pdf")
 end
-def output_chaps(chapsfile, values)
-  File.open(chapsfile) {|chaps|
-    chaps.each_line {|l|
-      next if l =~ /^#/
-      file_id = File.basename(l.chomp.strip,".*")
-      filename = "#{file_id}.tex"
-      fork {
-        STDOUT.reopen("#{@path}/#{filename}")
-        $stderr.puts "compiling #{l}"
-        exec("review-compile --target=latex --level=#{values["secnolevel"]} #{values["params"]} #{l}")
-      }
-      Process.waitall
-      @chaps_filenames[chapsfile] << %Q|\\input{#{filename}}\n|
-    }
+def output_chaps(filename, values)
+  fork {
+    STDOUT.reopen("#{@path}/#{filename}")
+    $stderr.puts "compiling #{filename}"
+    exec("review-compile --target=latex --level=#{values["secnolevel"]} --toclevel=#{values["toclevel"]} #{values["params"]} #{filename}")
+  }
+  Process.waitall
+end
+def output_parts(filename, values)
+  fork {
+    STDOUT.reopen("#{@path}/#{filename}.tex")
+    $stderr.puts "compiling #{filename}.tex"
+    exec("review-compile --target=latex --level=#{values["secnolevel"]} --toclevel=#{values["toclevel"]} #{values["params"]} #{filename}.re | sed -e s/\\chapter{/\\part{/")
   }
+  Process.waitall
 end
 def copy_images(from, to)
   if File.exist?(from)
     Dir.mkdir(to)
-    copyImagesToDir(from, to)
+    ReVIEW::MakerHelper.copy_images_to_dir(from, to)
     Dir.chdir(to) {
       fork {
         begin
-          exec("extractbb *.png *.jpg */*.jpg */*.png;extractbb -m *.png *.jpg */*.jpg */*.png")
+          exec("extractbb *.png *.jpg *.pdf */*.jpg */*.png */*.pdf;extractbb -m *.png *.jpg *.pdf */*.jpg */*.png */*.pdf")
         rescue
-          exec("ebb *.png *.jpg */*.jpg */*.png")
+          exec("ebb *.png *.jpg *.pdf */*.jpg */*.png */*.pdf")
         end
       }
     }
@@ -134,49 +154,13 @@ def copy_images(from, to)
   end
 end
-def make_titlepage(values, authors)
-  coverfile = values["coverfile"]
-  if coverfile
-    coverfile_sty = coverfile.sub(/\.[^.]+$/, ".tex")
-    if File.exist?(coverfile_sty)
-      titlepage = File.read(coverfile_sty)
-      return titlepage
-    end
-  end
-  ## use default titlepage template
-  titlepage = <<EOB
-\\begin{titlepage}
-EOB
-  if values["coverimage"]
-    titlepage += <<EOB
-  \\begin{center}
-    %%%\\mbox{}\\vskip5zw%
-    \\includegraphics[width=\\textwidth,height=\\textheight,keepaspectratio]{./images/#{values["coverimage"]}}
-  \\end{center}
-  \\clearpage
-EOB
+def make_custom_titlepage(coverfile)
+  coverfile_sty = coverfile.to_s.sub(/\.[^.]+$/, ".tex")
+  if File.exist?(coverfile_sty)
+    File.read(coverfile_sty)
+  else
+    nil
   end
-  titlepage += <<EOB
-\\thispagestyle{empty}
-\\begin{center}%
-  \\mbox{} \\vskip5zw
-   \\reviewtitlefont%
-    {\\Huge #{values["booktitle"]} \\par}%
-    \\vskip 15em%
-    {\\huge
-      \\lineskip .75em
-      \\begin{tabular}[t]{c}%
-        #{authors}
-      \\end{tabular}\\par}%
-    \\vfill
-    {\\large #{values["date"]} 版\\hspace{2zw}#{values["prt"]}　発行\\par}%
-\\vskip4zw\\mbox{}
-  \\end{center}%
-\\end{titlepage}
-EOB
-  return titlepage
 end
 def get_template(values)
@@ -186,7 +170,6 @@ def get_template(values)
   okuduke = ""
   authors = ""
   if values["aut"]
     okuduke += "著　者 & #{values["aut"]} \\\\\n"
     authors = values["aut"]+ "\\vspace*{1zh} 著"
@@ -202,216 +185,17 @@ def get_template(values)
 発行所 & #{values["prt"]} \\\\
 EOB
-  titlepage = make_titlepage(values, authors)
-  str = <<EOB
-\\documentclass[#{documentclassoption}]{#{documentclass}}
-\\usepackage[deluxe]{otf}
-\\usepackage[dvipdfmx]{color}
-\\usepackage[dvipdfmx]{graphicx}
-\\usepackage{framed}
-\\usepackage{wrapfig}
-\\definecolor{shadecolor}{gray}{0.9}
-\\definecolor{shadecolorb}{gray}{0.1}
-\\usepackage[utf8]{inputenc}
-\\usepackage{jumoline}
-\\usepackage{ascmac}
-\\usepackage{float}
-\\usepackage{alltt}
-\\newenvironment{shadedb}{%
-  \\def\\FrameCommand{\\fboxsep=\\FrameSep \\colorbox{shadecolorb}}%
-  \\MakeFramed {\\FrameRestore}}%
- {\\endMakeFramed}
-\\usepackage[top=10zw,bottom=12zw,left=10zw,right=10zw]{geometry}
-%\\usepackage[top=5zw,bottom=5zw,left=1zw,right=1zw]{geometry}
-\\newcommand{\\parasep}{\\vspace*{3zh}}
-\\setlength{\\footskip}{30pt}
-%% Bookmarkの文字化け対策（日本語向け）
-\\ifnum 46273=\\euc"B4C1 % 46273 == 0xB4C1 == 漢(EUC-JP)
-  \\usepackage{atbegshi}%
-  \\AtBeginShipoutFirst{\\special{pdf:tounicode EUC-UCS2}}%
-  %%\\AtBeginDvi{\\special{pdf:tounicode EUC-UCS2}}%
-\\else
-  \\usepackage{atbegshi}%
-  \\AtBeginShipoutFirst{\\special{pdf:tounicode 90ms-RKSJ-UCS2}}%
-  %%\\AtBeginDvi{\\special{pdf:tounicode 90ms-RKSJ-UCS2}}%
-\\fi
-\\usepackage[dvipdfm,bookmarks=true,bookmarksnumbered=true,colorlinks=true,%
-            pdftitle={#{values["booktitle"]}},%
-            pdfauthor={#{values["aut"]}}]{hyperref}
-\\newenvironment{reviewimage}{%
-  \\begin{figure}[H]
-    \\begin{center}}{%
-    \\end{center}
-  \\end{figure}}
-\\newenvironment{reviewdummyimage}{%
-  \\begin{figure}[H]
-    \\begin{center}}{%
-    \\end{center}
-  \\end{figure}}
-\\newenvironment{reviewemlist}{%
-  \\medskip\\small\\begin{shaded}\\setlength{\\baselineskip}{1.3zw}}{%
-  \\end{shaded}}
-\\newenvironment{reviewlist}{%
-  \\begin{shaded}\\small\\setlength{\\baselineskip}{1.3zw}}{%
-  \\end{shaded}\\par\\vspace*{0.5zw}}
-\\newenvironment{reviewcmd}{%
-  \\color{white}\\medskip\\small\\begin{shadedb}\\setlength{\\baselineskip}{1.3zw}}{%
-  \\end{shadedb}}
+  custom_titlepage = make_custom_titlepage(values["coverfile"])
-\\newenvironment{reviewtable}[1]{%
-  \\begin{center}\\small\\setlength{\\baselineskip}{1.2zw}
-    \\begin{tabular}{#1}}{%
-    \\end{tabular}
-  \\end{center}}
-\\newenvironment{reviewcolumn}{%
-     \\begin{framed}
-   }{%
-      \\end{framed}
-  \\vspace{2zw}}
-\\newcommand{\\reviewcolumnhead}[2]{%
-{\\noindent\\large ■コラム: #2}}
-\\newcommand{\\reviewtablecaption}[1]{%
-  \\caption{#1}}
-\\newcommand{\\reviewbackslash}[0]{%
-  \\textbackslash{}}
-\\newcommand{\\reviewlistcaption}[1]{%
-  \\medskip{\\small\\noindent #1}\\vspace*{-1.3zw}}
-\\newcommand{\\reviewemlistcaption}[1]{%
-  \\medskip{\\small\\noindent #1}\\vspace*{-1.3zw}}
-\\newcommand{\\reviewcmdcaption}[1]{%
-  \\medskip{\\small\\noindent #1}\\vspace*{-1.3zw}}
-\\newcommand{\\reviewimageref}[1]{%
-  図 #1}
-\\newcommand{\\reviewtableref}[1]{%
-  表 #1}
-\\newcommand{\\reviewlistref}[1]{%
-  リスト #1}
-\\newcommand{\\reviewminicolumntitle}[1]{%
-  {\\large ■メモ：#1}\\\\}
-\\newenvironment{reviewminicolumn}{%
-  \\vspace{1.5zw}\\begin{screen}}{%
-  \\end{screen}\\vspace{2zw}}
-\\newcommand{\\reviewkw}[1]{%
-  \\textbf{\\textgt{#1}}}
-\\newcommand{\\reviewtitlefont}[0]{%
-  \\usefont{T1}{phv}{b}{n}\\gtfamily}
-\\newcommand{\\reviewmainfont}[0]{%
- }
-\\newcommand{\\reviewcolophon}[0]{%
-  \\backmatter
-  \\clearpage}
-\\newcommand{\\reviewappendix}[0]{%
-  \\appendix}
-\\makeatletter
-\\def\\maxwidth{%
-  \\ifdim\\Gin@nat@width>\\linewidth
-    \\linewidth
-  \\else
-    \\Gin@nat@width
-  \\fi
-}
-\\makeatother
-#{values["usepackage"]}
-\\usepackage[T1]{fontenc}
-\\begin{document}
-\\reviewmainfont
-EOB
-  str += titlepage
-  str += <<EOB
-\\renewcommand{\\chaptermark}[1]{{}}
-\\frontmatter
-%% preface
-#{values["pre_str"]}
-\\tableofcontents
-\\renewcommand{\\chaptermark}[1]{\\markboth{\\prechaptername\\thechapter\\postchaptername~#1}{}}
-\\mainmatter
-#{values["chap_str"]}
-\\renewcommand{\\chaptermark}[1]{\\markboth{\\appendixname\\thechapter~#1}{}}
-\\reviewappendix
-#{values["post_str"]}
-%% okuduke
-\\reviewcolophon
-\\thispagestyle{empty}
-\\vspace*{\\fill}
-{\\noindent\\reviewtitlefont\\Large #{values["booktitle"]}} \\\\
-\\rule[8pt]{14cm}{1pt} \\\\
-{\\noindent
-#{values["pubhistory"].to_s.gsub(/\n/){"\n\n\\noindent"} }
-}
-\\begin{tabular}{ll}
-#{okuduke}
-\\end{tabular}
-　\\\\
-\\rule[0pt]{14cm}{1pt} \\\\
-#{values["rights"]} \\\\
-\\end{document}
-EOB
-end
+  template = File.expand_path(File.dirname(__FILE__) +
+                              '/../lib/review/review.tex.erb')
+  layout_file = File.join(@basedir, "layouts", "layout.tex.erb")
+  if File.exists?(layout_file)
+    template = layout_file
+  end
-def copyImagesToDir(dirname, copybase)
-  Dir.open(dirname) {|dir|
-    dir.each {|fname|
-      next if fname =~ /^\./
-      if FileTest.directory?("#{dirname}/#{fname}")
-        copyImagesToDir("#{dirname}/#{fname}", "#{copybase}/#{fname}")
-      else
-        if fname =~ /\.(png|gif|jpg|jpeg|svg|pdf)$/i
-          Dir.mkdir(copybase) unless File.exist?(copybase)
-          FileUtils.cp "#{dirname}/#{fname}", copybase
-        end
-      end
-    }
-  }
+  erb = ERB.new(File.open(template).read)
+  erb.result(binding)
 end
 def copyStyToDir(dirname, copybase, extname = "sty")
@@ -431,5 +215,4 @@ def copyStyToDir(dirname, copybase, extname = "sty")
   }
 end
 main