review 1.6.0 → 1.7.0

data/lib/review/textbuilder.rb

@@ -14,4 +14,4 @@ module ReVIEW
   class TEXTBuilder < TOPBuilder
   end
 
-end   # module ReVIEW
+end # module ReVIEW

data/lib/review/textutils.rb

@@ -34,33 +34,5 @@ module ReVIEW
 
       blocked_lines.map{|l| l.join("")}
     end
-
-    def convert_inencoding(str, enc)
-      case enc
-      when /^EUC$/i
-        NKF.nkf("-E -w -m0x", str)
-      when /^SJIS$/i
-        NKF.nkf("-S -w -m0x", str)
-      when /^JIS$/i
-        NKF.nkf("-J -w -m0x", str)
-      when /^UTF-8$/i
-        NKF.nkf("-W -w -m0x", str)
-      else
-        NKF.nkf("-w -m0 -m0x", str)
-      end
-    end
-
-    def convert_outencoding(str, enc)
-      case enc
-      when /^EUC$/i
-        NKF.nkf("-W -e -m0x", str)
-      when /^SJIS$/i
-        NKF.nkf("-W -s -m0x", str)
-      when /^JIS$/i
-        NKF.nkf("-W -j -m0x", str)
-      else
-        str
-      end
-    end
   end
 end

data/lib/review/tocparser.rb

@@ -323,11 +323,11 @@ module ReVIEW
     end
   end
 
-  class Book::Base   # reopen
+  class Book::Base # reopen
     include TOCRoot
   end
 
-  class Book::ChapterSet   # reopen
+  class Book::ChapterSet # reopen
     include TOCRoot
   end
 
@@ -335,7 +335,7 @@ module ReVIEW
     include TOCRoot
   end
 
-  class Book::Chapter   # reopen
+  class Book::Chapter # reopen
     def toc
       @toc ||= TOCParser.parse(self)
       unless @toc.size == 1

data/lib/review/tocprinter.rb

@@ -13,14 +13,13 @@
 
 require 'review/htmlutils'
 require 'review/htmllayout'
-require 'nkf'
 
 module ReVIEW
 
   class TOCPrinter
 
     def TOCPrinter.default_upper_level
-      99   # no one use 99 level nest
+      99 # no one use 99 level nest
     end
 
     def initialize(print_upper, param)
@@ -31,28 +30,6 @@ module ReVIEW
     def print?(level)
       level <= @print_upper
     end
-
-    def nkffilter(line)
-      inc = ""
-      outc = "-w"
-      if @config["inencoding"] =~ /^EUC$/
-        inc = "-E"
-      elsif @config["inencoding"] =~ /^SJIS$/
-        inc = "-S"
-      elsif @config["inencoding"]  =~ /^JIS$/
-        inc = "-J"
-      end
-
-      if @config["outencoding"] =~ /^EUC$/
-        outc = "-e"
-      elsif @config["outencoding"] =~ /^SJIS$/
-        outc = "-s"
-      elsif @config["outencoding"]  =~ /^JIS$/
-        outc = "-j"
-      end
-
-      NKF.nkf("#{inc} #{outc}", line)
-    end
   end
 
 
@@ -79,11 +56,11 @@ module ReVIEW
         printf "%3s %3dKB %6dC %5dL  %s (%s)\n",
                chapnumstr(node.number),
                vol.kbytes, vol.chars, vol.lines,
-               nkffilter(node.label), node.chapter_id
+               node.label, node.chapter_id
       else
         printf "%17s %5dL  %s\n",
                '', node.estimated_lines,
-               nkffilter("  #{'   ' * (node.level - 1)}#{number} #{node.label}")
+               "  #{'   ' * (node.level - 1)}#{number} #{node.label}"
       end
     end
 
@@ -94,7 +71,7 @@ module ReVIEW
     def volume_columns(level, volstr)
       cols = ["", "", "", nil]
       cols[level - 1] = volstr
-      cols[0, 3]   # does not display volume of level-4 section
+      cols[0, 3] # does not display volume of level-4 section
     end
 
   end
@@ -186,7 +163,7 @@ module ReVIEW
   class IDGTOCPrinter < TOCPrinter
     def print_book(book)
       puts %Q(<?xml version="1.0" encoding="UTF-8"?>)
-      puts nkffilter(%Q(<doc xmlns:aid='http://ns.adobe.com/AdobeInDesign/4.0/'><title aid:pstyle="h0">1　パート1</title><?dtp level="0" section="第1部　パート1"?>)) # FIXME: 部タイトルを取るには？ & 部ごとに結果を分けるには？
+      puts %Q(<doc xmlns:aid='http://ns.adobe.com/AdobeInDesign/4.0/'><title aid:pstyle="h0">1　パート1</title><?dtp level="0" section="第1部　パート1"?>) # FIXME: 部タイトルを取るには？ & 部ごとに結果を分けるには？
       puts %Q(<ul aid:pstyle='ul-partblock'>)
       print_children book
       puts %Q(</ul></doc>)
@@ -208,15 +185,15 @@ module ReVIEW
       if node.chapter?
         vol = node.volume
         printf "<li aid:pstyle='ul-part'>%s</li>\n",
-               nkffilter("#{chapnumstr(node.number)}#{node.label}")
+               "#{chapnumstr(node.number)}#{node.label}"
       else
         printf "<li>%-#{LABEL_LEN}s\n",
-               nkffilter("  #{'   ' * (node.level - 1)}#{seq}　#{node.label}</li>")
+               "  #{'   ' * (node.level - 1)}#{seq}　#{node.label}</li>"
       end
     end
 
     def chapnumstr(n)
-      n ? nkffilter(sprintf('第%d章　', n)) : ''
+      n ? sprintf('第%d章　', n) : ''
     end
 
     def volume_columns(level, volstr)

data/lib/review/topbuilder.rb

@@ -741,8 +741,7 @@ module ReVIEW
     def inline_chapref(id)
       chs = ["", "「", "」"]
       unless @book.config["chapref"].nil?
-        _chs = convert_inencoding(@book.config["chapref"],
-                                  @book.config["inencoding"]).split(",")
+        _chs = @book.config["chapref"].split(",")
         if _chs.size != 3
           error "--chapsplitter must have exactly 3 parameters with comma."
         else
@@ -787,4 +786,4 @@ module ReVIEW
 
   end
 
-end   # module ReVIEW
+end # module ReVIEW

data/lib/review/unfold.rb

@@ -47,7 +47,7 @@ module ReVIEW
 
     private
 
-    ZSPACE = "\241\241"  # EUC-JP zen-kaku space
+    ZSPACE = "\241\241" # EUC-JP zen-kaku space
 
     def do_unfold(input)
       @blank_needed = false
@@ -135,4 +135,4 @@ module ReVIEW
 
   end
 
-end   # module ReVIEW
+end # module ReVIEW

data/lib/review/version.rb

@@ -1,3 +1,3 @@
 module ReVIEW
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

data/review.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   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 = "2015-06-29"
+  gem.date = "2015-10-29"
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -27,5 +27,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency("rake")
   gem.add_development_dependency("test-unit")
   gem.add_development_dependency("pygments.rb")
+  gem.add_development_dependency("rubocop")
 end
 

data/templates/html/layout-html5.html.erb

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xmlns:ops="http://www.idpf.org/2007/ops" xml:lang="<%= @language %>">
+<head>
+  <meta charset="UTF-8" />
+<% if @stylesheets.present? %>
+<%   @stylesheets.each do |style| %>
+  <link rel="stylesheet" type="text/css" href="<%= style %>" />
+<%   end %>
+<% end%>
+  <meta name="generator" content="Re:VIEW" />
+  <title><%= @title %></title>
+</head>
+<body<%= @body_ext %>>
+<%= @body %>
+</body>
+</html>

data/templates/html/layout-xhtml1.html.erb

@@ -0,0 +1,20 @@
+<?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="<%= @language %>">
+<head>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+  <meta http-equiv="Content-Style-Type" content="text/css"/>
+<% if @stylesheets.present? %>
+<%   @stylesheets.each do |style| %>
+  <link rel="stylesheet" type="text/css" href="<%= style %>" />
+<%   end %>
+<% end%>
+  <meta name="generator" content="Re:VIEW"/>
+  <title><%= @title %></title>
+</head>
+<body<%= @body_ext %>>
+<% if @error_messages   %><%= @error_messages   %><% end %>
+<% if @warning_messages %><%= @warning_messages %><% end %>
+<%= @body %>
+</body>
+</html>

data/templates/ncx/epubv2.ncx.erb

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
+  <head>
+    <meta name="dtb:depth" content="1"/>
+    <meta name="dtb:totalPageCount" content="0"/>
+    <meta name="dtb:maxPageNumber" content="0"/>
+<%= @ncx_isbn %>
+  </head>
+<%= @ncx_doctitle %>
+<%= @ncx_navmap %>
+</ncx>

data/templates/opf/epubv2.opf.erb

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package version="2.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId">
+  <metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">
+<%= @opf_metainfo %>
+<%= @opf_coverimage %>
+  </metadata>
+<%= @opf_manifest %>
+<%= @opf_toc %>
+  <guide>
+    <reference type="cover" title="<%= @producer.res.v("covertitle") %>" href="<%= @producer.params["cover"] %>"/>
+<% if @producer.params["titlepage"].present? %>
+    <reference type="title-page" title="<%= @producer.res.v("titlepagetitle") %>" href="titlepage.<%= @producer.params["htmlext"] %>"/>
+<% end %>
+<% if @producer.params["mytoc"].present? %>
+    <reference type="toc" title="<%= @producer.res.v("toctitle") %>" href="<%= @producer.params["bookname"] %>-toc.<%= @producer.params["htmlext"] %>"/>
+<% end %>
+<% if @producer.params["colophon"].present? %>
+    <reference type="colophon" title="<%= @producer.res.v("colophontitle") %>" href="colophon.<%= @producer.params["htmlext"] %>"/>
+<% end %>
+  </guide>
+</package>

data/templates/opf/epubv3.opf.erb

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package version="3.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId" xml:lang="<%= @producer.params["language"] %>">
+  <metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">
+<%= @opf_metainfo %>
+  </metadata>
+<%= @opf_manifest %>
+<%= @opf_toc %>
+  <guide>
+    <reference type="cover" title="<%= @producer.res.v("covertitle") %>" href="<%= @producer.params["cover"] %>"/>
+<% if @producer.params["titlepage"].present? %>
+    <reference type="title-page" title="<%= @producer.res.v("titlepagetitle") %>" href="titlepage.<%= @producer.params["htmlext"] %>"/>
+<% end %>
+    <reference type="toc" title="<%= @producer.res.v("toctitle") %>" href="<%= @producer.params["bookname"] %>-toc.<%= @producer.params["htmlext"] %>"/>
+<% if @producer.params["colophon"].present? %>
+    <reference type="colophon" title="<%= @producer.res.v("colophontitle") %>" href="colophon.<%= @producer.params["htmlext"] %>"/>
+<% end %>
+  </guide>
+</package>

data/templates/xml/container.xml.erb

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container xmlns="urn:oasis:names:tc:opendocument:xmlns:container" version="1.0">
+  <rootfiles>
+    <rootfile full-path="<%= @opf_path %>" media-type="application/oebps-package+xml" />
+  </rootfiles>
+</container>

data/test/assets/test.xml.erb

@@ -0,0 +1,3 @@
+<test>
+<name><%= @name %></name>
+</test>

data/test/test.re

@@ -1,7 +1,7 @@
 = 見出し
 以下を実行
 //emlist{
-./bin/review-compile --inencoding=UTF-8 --outencoding=UTF-8 --hdnumberingmode test.re --target=html
+./bin/review-compile --hdnumberingmode test.re --target=html
 }
 == 節１
 

data/test/test_book.rb

@@ -158,14 +158,14 @@ class BookTest < Test::Unit::TestCase
   def test_setParameter
     book = Book::Base.new(File.dirname(__FILE__))
     book.param = :test
-    assert_equal :test, book.param  # old way
+    assert_equal :test, book.param # old way
     assert_equal :test, book.config # new way
   end
 
   def test_setConfig
     book = Book::Base.new(File.dirname(__FILE__))
     book.config = :test
-    assert_equal :test, book.param  # old way
+    assert_equal :test, book.param # old way
     assert_equal :test, book.config # new way
   end
 
@@ -391,7 +391,7 @@ EOC
     end
 
     mktmpbookdir 'catalog.yml' => "APPENDIX:\n  - p01.re",
-                 'p01.re' => '= appendix'  do |dir, book, files|
+                 'p01.re' => '= appendix' do |dir, book, files|
       assert_equal 'appendix', book.appendix.chapters.first.title
       assert_equal 1, book.appendix.chapters.first.number
     end
@@ -399,7 +399,7 @@ EOC
 
   def test_postscripts
     mktmpbookdir 'catalog.yml' => "POSTDEF:\n  - b01.re",
-                 'b01.re' => '= back'  do |dir, book, files|
+                 'b01.re' => '= back' do |dir, book, files|
       assert_kind_of Book::Part, book.postscripts
       assert_equal 1, book.postscripts.chapters.size
       assert_equal 'back', book.postscripts.chapters.first.title

data/test/test_book_chapter.rb

@@ -3,27 +3,6 @@ require 'book_test_helper'
 class ChapterTest < Test::Unit::TestCase
   include BookTestHelper
 
-  def setup
-
-    if "".respond_to?(:encode)
-      @utf8_str = "あいうえお"
-      @eucjp_str = "あいうえお".encode("EUC-JP")
-      @sjis_str = "あいうえお".encode("Shift_JIS")
-      @jis_str = "あいうえお".encode("ISO-2022-JP")
-    else
-      @utf8_str = "\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a" # "あいうえお"
-      @eucjp_str = "\xa4\xa2\xa4\xa4\xa4\xa6\xa4\xa8\xa4\xaa"
-      @sjis_str = "\x82\xa0\x82\xa2\x82\xa4\x82\xa6\x82\xa8"
-      @jis_str = "\x1b\x24\x42\x24\x22\x24\x24\x24\x26\x24\x28\x24\x2a\x1b\x28\x42"
-    end
-=begin
-    @utf8_str = "\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a" # "あいうえお"
-    @eucjp_str = "\xa4\xa2\xa4\xa4\xa4\xa6\xa4\xa8\xa4\xaa"
-    @sjis_str = "\x82\xa0\x82\xa2\x82\xa4\x82\xa6\x82\xa8"
-    @jis_str = "\x1b\x24\x42\x24\x22\x24\x24\x24\x26\x24\x28\x24\x2a\x1b\x28\x42"
-=end
-  end
-
   def test_initialize
     ch = Book::Chapter.new(:book, :number, :name, '/foo/bar', :io)
     assert_equal :book, ch.book
@@ -88,60 +67,6 @@ class ChapterTest < Test::Unit::TestCase
     io = StringIO.new("=1\n=2\n")
     ch = Book::Chapter.new(book, nil, nil, nil, io)
     assert_equal '1', ch.title
-
-
-    [
-      ['EUC', @eucjp_str],
-      ['SJIS', @sjis_str],
-#      ['JIS', @jis_str],
-      ['XYZ', @eucjp_str],
-    ].each do |enc, instr|
-      io = StringIO.new("= #{instr}\n")
-      ch = Book::Chapter.new(book, nil, nil, nil, io)
-      book.config['inencoding'] = enc
-      assert_equal @utf8_str, ch.title
-      assert_equal @utf8_str, ch.instance_eval { @title }
-    end
-  end
-
-  def test_content
-    [
-      ['EUC', @eucjp_str],
-      ['SJIS', @sjis_str],
-      ['JIS', @jis_str],
-      ['XYZ', @eucjp_str],
-    ].each do |enc, instr|
-      tf = Tempfile.new('chapter_test')
-      book = Book::Base.new(nil)
-      begin
-        tf.print instr
-        tf.close
-
-        ch = Book::Chapter.new(book, nil, nil, tf.path)
-        book.config['inencoding'] = enc
-        assert_equal @utf8_str, ch.content
-        assert_equal @utf8_str, ch.instance_eval { @content }
-      ensure
-        tf.close(true)
-      end
-
-      tf1 = Tempfile.new('chapter_test1')
-      tf2 = Tempfile.new('chapter_test2')
-      begin
-        tf1.puts instr
-        tf1.puts instr
-        tf1.close
-        tf2.puts instr
-        tf1.close
-
-        ch = Book::Chapter.new(book, nil, nil, tf1.path, tf2)
-        book.config['inencoding'] = enc
-        assert_equal "#{@utf8_str}\n#{@utf8_str}\n", ch.content # XXX: OK?
-      ensure
-        tf1.close(true)
-        tf2.close(true)
-      end
-    end
   end
 
   def test_lines
@@ -282,7 +207,6 @@ E
 
   def test_column_index
     book = Book::Base.new(nil)
-    book.config["inencoding"] = "utf-8"
     do_test_index(<<E, Book::ColumnIndex, :column_index, :column, :propagate => false)
 = dummy1
 ===[column]{abc} aaaa