review 1.7.2 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5449a3e4fd04d6c45855f7858fe37e4b73ed92f8
-  data.tar.gz: f14a9c926fd798eb05456fccec1d377573ec0e98
+  metadata.gz: 82a5efdce4b15d0add6f2997f5e98b19dee1f83a
+  data.tar.gz: f4a04d0a1808a72e489d1271351d68d3cd23f492
 SHA512:
-  metadata.gz: 4f02063b7744003b7d51b41894c5bc4efba4446c33d7a0990d3054724e5d194109991c4005c083f1a1c1f4bb7fdb92c797cc1a214de8d77d29e664989e434f91
-  data.tar.gz: 0442d498dfbbab961286734b7ef544f86ad79f24a3744e6227f1e00b8d99fef12c81c0a27863b5c465f35b01e116cd4068f2f62fe6e926fad76f61eacec8ee36
+  metadata.gz: 827e1cd15bfc144217b36c859e31c3eecfa706415fd5a741b9e9e259a509c8e5f9b10f70a8d7cafebaac77a960473d5d2e1009e069b8910cf7b82a5d0e3213b5
+  data.tar.gz: a77e6829d1dd2f49c00505fd3c4f40e4c2d9ef379ed580f4a2e46d4a9358b1fa56f8a7d3227e7928cfc631bce75ad81192f041fc0bd880eb96f4721bfdbc9daa

data/.rubocop.yml

@@ -1,43 +1 @@
-AllCops:
-  Exclude:
-    - lib/lineinput.rb
-    - lib/uuid.rb
-
-inherit_from: .rubocop_todo.yml
-
-Lint/BlockAlignment:
-  Enabled: true
-
-Lint/EndAlignment:
-  Enabled: AlignWith
-
-Performance/ReverseEach:
-  Enabled: true
-
-# Unnecessary spacing detected.
-Style/ExtraSpacing:
-  Enabled: true
-
-# Use tr instead of gsub.
-Performance/StringReplacement:
-  Enabled: false
-
-# Use alias_method instead of alias.
-Style/Alias:
-  Enabled: true
-
-# Do not introduce global variables.
-Style/GlobalVars:
-  Enabled: true
-
-# Use self-assignment shorthand +=.
-Style/SelfAssignment:
-  Enabled: true
-
-# When defining the == operator, name its argument other.
-Style/OpMethod:
-  Enabled: true
-
-# Use snake_case for variable names.
-Style/VariableName:
-  Enabled: true
+inherit_from: rubocop-todo.yml

data/.travis.yml

@@ -1,18 +1,9 @@
-language: ruby
-sudo: false
-
 rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.*
   - 2.2.*
-  - ruby-head
 
 branches:
   only:
     - master
-
-script:
-  - bundle exec rake test
-  - bundle exec rubocop
-

data/ChangeLog

@@ -1,19 +1,3 @@
-Sun Dec 27 16:25:45 2015  Masayoshi Takahashi  <takahashimm@gmail.com>
-
-	* Release 1.7.2
-
-Sun Nov 29 23:12:29 2015  Masayoshi Takahashi  <takahashimm@gmail.com>
-
-	* Release 1.7.1
-
-Thu Oct 29 13:58:22 2015  KADO Masanori  <kdmsnr@gmail.com>
-
-	* Release 1.7.0
-
-Mon Jun 29 18:16:06 2015  KADO Masanori  <kdmsnr@gmail.com>
-
-	* Release 1.6.0
-
 Sat Feb 28 19:51:29 2015  KADO Masanori  <kdmsnr@gmail.com>
 
 	* Release 1.5.0.

data/Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in review.gemspec
 gemspec
 
+gem "json"

data/README.rdoc

@@ -78,4 +78,4 @@ LGPL. See COPYING file.
 
 == Copyright
 
-Copyright (c) 2006-2015 Minero Aoki, Kenshi Muto, Masayoshi Takahashi, Masanori Kado.
+Copyright (c) 2006-2014 Minero Aoki, Kenshi Muto, Masayoshi Takahashi, Masanori Kado.

data/Rakefile

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 begin
   require 'bundler'
   Bundler::GemHelper.install_tasks
@@ -11,8 +13,17 @@ require 'rake/clean'
 
 task :default => [:test]
 
+task :kpeg do
+  FileUtils.rm_f "lib/review/compiler.rb"
+  FileUtils.rm_f "lib/review/compiler/literals_1_8.rb"
+  FileUtils.rm_f "lib/review/compiler/literals_1_9.rb"
+  sh "kpeg -s lib/review/compiler/literals_1_8.kpeg -o lib/review/compiler/literals_1_8.rb"
+  sh "kpeg -s lib/review/compiler/literals_1_9.kpeg -o lib/review/compiler/literals_1_9.rb"
+  sh "kpeg -s lib/review/review.kpeg -o lib/review/compiler.rb"
+end
+
 Rake::TestTask.new("test") do |t|
-  t.libs << "test"
+  t.libs   << "test"
   t.test_files = Dir.glob("test/**/test_*.rb")
   t.verbose = true
 end

data/bin/review-check

@@ -31,7 +31,12 @@ rescue Errno::EPIPE
 end
 
 def main
+  $KCODE = 'UTF-8' unless defined?(Encoding)
   @config = ReVIEW::Configure.values
+  @config.merge!({
+    "inencoding" => "UTF-8",
+    "outencoding" => "UTF-8"
+  })
   @book = ReVIEW::Book::Base.load
   @book.config = @config
 
@@ -39,6 +44,12 @@ def main
   files = ARGV unless ARGV.empty?
   opts = OptionParser.new
   opts.version = ReVIEW::VERSION
+  opts.on('--inencoding=ENCODING', 'Set input encoding. (UTF-8, EUC, JIS, and SJIS)') {|enc|
+    @config["inencoding"] = enc
+  }
+  opts.on('--outencoding=ENCODING', 'Set output encoding. (UTF-8[default], EUC, JIS, and SJIS)') {|enc|
+    @config["outencoding"] = enc
+  }
   opts.on('-a', '--all-chapters', 'Check all chapters.') {
     files = @book.chapters.map {|ent| ent.path }
   }
@@ -84,11 +95,11 @@ def check_text(files)
       each_paragraph(f) do |para, lineno|
         s = para.join('')
         if m = re.match(s)
-          next if m[0] == @review_utils_word_ok
+          next if m[0] == $ReVIEW_utils_word_ok
           next if neg and neg =~ s
           str, offset = find_line(para, re)
           out = sprintf("%s:%d: %s\n", path, lineno + offset, str)
-          print out
+          print convert_outencoding(out, @config["outencoding"])
         end
       end
     }
@@ -98,14 +109,14 @@ end
 def find_line(lines, re)
   # single line?
   lines.each_with_index do |line, idx|
-    return line.gsub(re, '<<<\&>>>'), idx if re =~ line
+    return line.gsub(re, '<<<\&>>>'), idx  if re =~ line
   end
 
   # multiple lines?
   i = 0
   while i < lines.size - 1
     str = lines[i] + lines[i+1]
-    return str.gsub(re, '<<<\&>>>'), i if re =~ str
+    return str.gsub(re, '<<<\&>>>'), i  if re =~ str
     i += 1
   end
 
@@ -116,7 +127,7 @@ def words_re(rc)
   words = []
   nega = []
   File.foreach(rc) do |line|
-    next if line[0,1] == '#'
+    next  if line[0,1] == '#'
     if / !/ =~ line
       line, n = *line.split(/!/, 2)
       nega.push n.strip
@@ -128,11 +139,13 @@ def words_re(rc)
 end
 
 def each_paragraph(f)
-  @review_utils_word_ok = nil
+  $ReVIEW_utils_word_ok = nil
   while line = f.gets
+    line = convert_inencoding(line, @config["inencoding"])
+
     case line
     when /\A\#@ok\((.*)\)/
-      @review_utils_word_ok = $1
+      $ReVIEW_utils_word_ok = $1
     when /\A\#@/
       ;
     when %r[\A//caption\{(.*?)//\}]
@@ -155,7 +168,7 @@ def each_paragraph(f)
         buf.push line.strip
       end
       yield buf, lineno
-      @review_utils_word_ok = nil
+      $ReVIEW_utils_word_ok = nil
     end
   end
 end

data/bin/review-compile

@@ -34,6 +34,8 @@ rescue Errno::EPIPE
 end
 
 def _main
+  $KCODE = 'UTF-8' unless defined?(Encoding)
+
   mode = :files
   basedir = nil
   if /\Areview2/ =~ File.basename($0)
@@ -46,14 +48,16 @@ def _main
 
   config = ReVIEW::Configure.values
   config.merge!({
-    "secnolevel" => 2, # for IDGXML and HTML
-    "tableopt" => nil, # for IDGXML
-    "nolf" => nil, # for IDGXML
-    "chapref" => nil, # for IDGXML
+    "secnolevel" => 2,    # for IDGXML and HTML
+    "tableopt" => nil,    # for IDGXML
+    "nolf" => nil,        # for IDGXML
+    "chapref" => nil,     # for IDGXML
     "structuredxml" => nil, # for IDGXML
-    "stylesheet" => [], # for HTML
-    "mathml" => nil, # for HTML
-    "language" => "ja", # for HTML
+    "inencoding" => "UTF-8",
+    "outencoding" => "UTF-8",
+    "stylesheet" => [],   # for HTML
+    "mathml" => nil,      # for HTML
+    "language" => "ja",   # for HTML
     "deprecated-blocklines" => nil,
     "footnotetext" => false,
     "htmlext" => "html",
@@ -67,6 +71,8 @@ def _main
     require 'yaml'
     config = config.merge(YAML.load_file(yaml))
   end
+  opts.on('--inencoding=ENCODING', 'Set input encoding. (UTF-8, EUC, JIS, and SJIS)') {|enc| config["inencoding"] = enc }
+  opts.on('--outencoding=ENCODING', 'Set output encoding. (UTF-8[default], EUC, JIS, and SJIS)') {|enc| config["outencoding"] = enc }
   opts.on('-c', '--check', 'Check manuscript') { check_only = true }
   opts.on('--level=LVL', 'Section level to append number.') {|lvl| config["secnolevel"] = lvl.to_i }
   opts.on('--toclevel=LVL', 'Section level to append number.') {|lvl| config["toclevel"] = lvl.to_i }
@@ -167,12 +173,12 @@ def _main
       compiler = ReVIEW::Compiler.new(load_strategy_class(target, check_only))
       book.chapters.each do |chap|
         str = compiler.compile(chap)
-        write "#{chap.name}#{compiler.strategy.extname}", str unless check_only
+        write "#{chap.name}#{compiler.strategy.extname}", str  unless check_only
       end
       # PART
       book.parts_in_file.each do |part|
         str = compiler.compile(part)
-        write "#{part.name}#{compiler.strategy.extname}", str unless check_only
+        write "#{part.name}#{compiler.strategy.extname}", str  unless check_only
       end
     else
       raise "must not happen: #{mode}"

data/bin/review-epubmaker-legacy

@@ -28,7 +28,7 @@ require 'review/i18n'
 require 'review/htmlutils'
 include ReVIEW::HTMLUtils
 
-@essential_files = ['top', 'toc', 'colophon']
+$essential_files = ['top', 'toc', 'colophon']
 def main
   opts = OptionParser.new
   opts.version = ReVIEW::VERSION
@@ -57,7 +57,7 @@ def main
   yamlfile = ARGV[0]
   values = ReVIEW::Configure.values.merge(YAML.load_file(yamlfile))
   bookname = values["bookname"]
-  @essential_files <<= bookname
+  $essential_files <<= bookname
   tmp = values["debug"].nil? ? Dir.mktmpdir : "."
   @bookdir = "#{tmp}/#{bookname}-epub"
   @epubversion = values["epubversion"] || 2
@@ -774,8 +774,8 @@ end
 
 def output_chaps_by_file(l, values)
   file_id = File.basename(l.chomp.strip,".*")
-  if (idx = @essential_files.index(file_id))
-    if idx == @essential_files.size - 1
+  if (idx = $essential_files.index(file_id))
+    if idx == $essential_files.size - 1
       STDERR.puts "#{file_id} is book name. Please rename #{l.chomp.strip}."
     else
       STDERR.puts "#{file_id} is special name. Please rename #{l.chomp.strip}."
@@ -800,8 +800,8 @@ def include_mathml?(filename)
     }
     return false
   }
-rescue
-  false
+  rescue
+    false
 end
 
 def getFigId(filename)

data/bin/review-index

@@ -32,14 +32,25 @@ rescue Errno::EPIPE
 end
 
 def _main
+  $KCODE = 'UTF-8' unless defined?(Encoding)
+
   printer_class = ReVIEW::TextTOCPrinter
   source = nil
   upper = ReVIEW::TOCPrinter.default_upper_level
-  param = {}
+  param = {
+    "inencoding" => "UTF-8",
+    "outencoding" => "UTF-8"
+  }
   book = ReVIEW::Book::Base.load
 
   opts = OptionParser.new
   opts.version = ReVIEW::VERSION
+  opts.on('--inencoding=ENCODING', 'Set input encoding. (UTF-8, EUC, JIS, and SJIS)') {|enc|
+    param["inencoding"] = enc
+  }
+  opts.on('--outencoding=ENCODING', 'Set output encoding. (UTF-8[default], EUC, JIS, and SJIS)') {|enc|
+    param["outencoding"] = enc
+  }
   opts.on('-a', '--all', 'print all chapters.') {
     begin
       source = book
@@ -60,7 +71,7 @@ def _main
   }
   opts.on('-l', '--level N', 'list upto N level (1..4, default=4)') {|n|
     upper = Integer(n)
-    unless (0..4).include?(upper) # 0 is hidden option
+    unless (0..4).include?(upper)  # 0 is hidden option
       $stderr.puts "-l/--level option accepts only 1..4"
       exit 1
     end

data/bin/review-init

@@ -31,9 +31,6 @@ def main
   opts.on('-l', '--locale', 'generate locale.yml file.') {
     @locale = true
   }
-  opts.on('', '--epub-version VERSION', 'define EPUB version') { |version|
-    @epub_version = version
-  }
   begin
     opts.parse!
   rescue OptionParser::ParseError => err
@@ -83,10 +80,23 @@ end
 
 def generate_layout(dir)
   FileUtils.mkdir_p dir + '/layouts'
-  if @epub_version.to_i == 2
-    FileUtils.cp @review_dir + "/templates/html/layout-xhtml1.html.erb", dir + '/layouts/layout.html.erb'
-  else
-    FileUtils.cp @review_dir + "/templates/html/layout-html5.html.erb", dir + '/layouts/layout.html.erb'
+  File.open("#{dir}/layouts/layout.html.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="Re:VIEW" />
+  <title><%= title %></title>
+</head>
+<body>
+<%= body %>
+</body>
+</html>
+EOS
   end
 end
 
@@ -115,11 +125,7 @@ def generate_cover_image(dir)
 end
 
 def generate_config(dir)
-  if @epub_version.to_i == 2
-    FileUtils.cp @review_dir + "/test/sample-book/src/config-epub2.yml", File.join(dir, "config.yml")
-  else
-    FileUtils.cp @review_dir + "/test/sample-book/src/config.yml", dir
-  end
+  FileUtils.cp @review_dir + "/test/sample-book/src/config.yml", dir
 end
 
 def generate_style(dir)

data/bin/review-preproc

@@ -35,12 +35,25 @@ rescue Errno::EPIPE
 end
 
 def main
-  param = {}
+  $KCODE = 'UTF-8' unless defined?(Encoding)
+
+  param = {
+    "inencoding" => "UTF-8",
+    "outencoding" => "UTF-8",
+  }
 
   mode = :output
   opts = OptionParser.new
   opts.version = ReVIEW::VERSION
   opts.banner = "Usage: #{File.basename($0)} [-c|-d|-s|--replace] [<file>...]"
+  opts.on('--inencoding=ENCODING', 'Set input encoding. (UTF-8, EUC, JIS, and
+SJIS)') {|enc|
+    param["inencoding"] = enc
+  }
+  opts.on('--outencoding=ENCODING', 'Set output encoding. (UTF-8[default], EUC
+, JIS, and SJIS)') {|enc|
+    param["outencoding"] = enc
+  }
   opts.on('-c', '--check', 'Check if preprocess is needed.') {
     mode = :check
   }

data/bin/review-validate

@@ -15,7 +15,7 @@ colcount = 0
 ln = 0
 
 ARGF.each {|line|
-  ln += 1
+  ln = ln + 1
   if line =~ /\A\/\/([a-z]+).+\{/
     # block
     _block = $1