review 1.0.0 → 1.1.0

data/lib/review/textutils.rb

@@ -1,9 +1,8 @@
 # $Id: textutils.rb 2192 2005-11-13 11:55:42Z aamine $
+require 'nkf'
 
 module ReVIEW
-
   module TextUtils
-
     def detab(str, ts = 8)
       add = 0
       len = nil
@@ -36,6 +35,32 @@ module ReVIEW
       blocked_lines.map{|l| l.join("")}
     end
 
-  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

@@ -12,13 +12,12 @@
 
 require 'review/preprocessor'
 require 'review/book'
-require 'review/volume'
+require 'review/textbuilder'
 require 'forwardable'
 
 module ReVIEW
 
   class TOCParser
-
     def TOCParser.parse(chap)
       chap.open {|f|
         stream = Preprocessor::Strip.new(f)
@@ -34,11 +33,13 @@ module ReVIEW
       path = []
 
       while line = f.gets
-        line.sub!(/\A\xEF\xBB\xBF/, '') # remove BOM
+        line.sub!(/\A\xEF\xBB\xBF/u, '') # remove BOM
         case line
+        when /\A\#@/
+          ;
         when /\A\s*\z/
           ;
-        when /\A(={2,})[\[\s]/
+        when /\A(={2,})[\[\s\{]/
           lev = $1.size
           error! filename, f.lineno, "section level too deep: #{lev}" if lev > 5
           if path.empty?
@@ -47,7 +48,7 @@ module ReVIEW
             roots.push path.first
           end
           next if get_label(line) =~ /\A\[\// # ex) "[/column]"
-          new = Section.new(lev, get_label(line))
+          new = Section.new(lev, get_label(line).gsub(/\A\{.*?\}\s?/, ""))
           until path.last.level < new.level
             path.pop
           end
@@ -92,7 +93,14 @@ module ReVIEW
     end
 
     def get_label(line)
-      line.strip.sub(/\A=+\s*/, '')
+      line = line.strip.sub(/\A=+\s*/, '')
+      compile_label(line)
+    end
+
+    def compile_label(line)
+      b = ReVIEW::TEXTBuilder.new
+      b.bind(ReVIEW::Compiler.new(b), nil, nil)
+      b.compile_inline(line)
     end
 
     def error!(filename, lineno, msg)
@@ -216,8 +224,8 @@ module ReVIEW
 
       def volume
         return @volume if @volume
-        return Volume.dummy unless @path
-        @volume = Volume.count_file(@path)
+        return Book::Volume.dummy unless @path
+        @volume = Book::Volume.count_file(@path)
         @volume.lines = estimated_lines()
         @volume
       end
@@ -310,19 +318,19 @@ module ReVIEW
     end
   end
 
-  class Book   # reopen
+  class Book::Base   # reopen
     include TOCRoot
   end
 
-  class ChapterSet   # reopen
+  class Book::ChapterSet   # reopen
     include TOCRoot
   end
 
-  class Part
+  class Book::Part
     include TOCRoot
   end
 
-  class Chapter   # reopen
+  class Book::Chapter   # reopen
     def toc
       @toc ||= TOCParser.parse(self)
       unless @toc.size == 1

data/lib/review/tocprinter.rb

@@ -66,8 +66,10 @@ module ReVIEW
     def print_children(node)
       return unless print?(node.level + 1)
       node.each_section_with_index do |section, idx|
-        print_node idx+1, section
-        print_children section
+        unless section.blank?
+          print_node idx+1, section
+          print_children section
+        end
       end
     end
 
@@ -124,7 +126,9 @@ module ReVIEW
           end
         end
       end
-      puts HTMLLayout.new(html, "目次", File.join(book.basedir, "layouts", "layout.erb")).result
+      puts HTMLLayout.new({ :body => html,
+                            :title => "目次",
+                            :template => File.join(book.basedir, "layouts", "layout.erb")}).result
     end
 
     private

data/lib/review/topbuilder.rb

@@ -10,6 +10,7 @@
 
 require 'review/builder'
 require 'review/textutils'
+require 'review/compiler'
 
 module ReVIEW
 
@@ -17,7 +18,7 @@ module ReVIEW
 
     include TextUtils
 
-    [:ttbold, :hint, :maru, :keytop, :labelref, :ref, :pageref, :balloon].each {|e|
+    [:ttbold, :hint, :maru, :keytop, :labelref, :ref, :pageref, :balloon, :strong].each {|e|
       Compiler.definline(e)
     }
     Compiler.defsingle(:dtp, 1)
@@ -61,6 +62,7 @@ module ReVIEW
         "emlist" => "インラインリスト",
         "cmd" => "コマンド",
         "quote" => "引用",
+        "centering" => "中央揃え",
         "flushright" => "右寄せ",
         "note" => "ノート",
         "memo" => "メモ",
@@ -142,7 +144,7 @@ module ReVIEW
       when 1
         if @chapter.number.to_s =~ /\A\d+\Z/
           prefix = "第#{@chapter.number}章　"
-        elsif !@chapter.number.nil? && !@chapter.number.to_s.empty?
+        elsif @chapter.number.present?
           prefix = "#{@chapter.number}　"
         end
         @section = 0
@@ -151,22 +153,22 @@ module ReVIEW
         @subsubsubsection = 0
       when 2
         @section += 1
-        prefix = (!@chapter.number.nil? && !@chapter.number.to_s.empty?) ? "#{@chapter.number}.#{@section}　" : ""
+        prefix = @chapter.number.present? ? "#{@chapter.number}.#{@section}　" : ""
         @subsection = 0
         @subsubsection = 0
         @subsubsubsection = 0
       when 3
         @subsection += 1
-        prefix = (!@chapter.number.nil? && !@chapter.number.to_s.empty?) ? "#{@chapter.number}.#{@section}.#{@subsection}　" : ""
+        prefix = @chapter.number.present? ? "#{@chapter.number}.#{@section}.#{@subsection}　" : ""
         @subsubsection = 0
         @subsubsubsection = 0
       when 4
         @subsubsection += 1
-        prefix = (!@chapter.number.nil? && !@chapter.number.to_s.empty?) ? "#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}　" : ""
+        prefix = @chapter.number.present? ? "#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}　" : ""
         @subsubsubsection = 0
       when 5
         @subsubsubsection += 1
-        prefix = (!@chapter.number.nil? && !@chapter.number.to_s.empty?) ? "#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}.#{@subsubsubsection}　" : ""
+        prefix = @chapter.number.present? ? "#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}.#{@subsubsubsection}　" : ""
       else
         raise "caption level too deep or unsupported: #{level}"
       end
@@ -234,9 +236,9 @@ module ReVIEW
     def inline_list(id)
       chapter, id = extract_chapter_id(id)
       if get_chap(chapter).nil?
-        puts %Q[#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [@chapter.list(id).number])}]
+        %Q[#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [@chapter.list(id).number])}]
       else
-        puts %Q[#{I18n.t("list")}#{I18n.t("format_number", [get_chap(chapter), @chapter.list(id).number])}]
+        %Q[#{I18n.t("list")}#{I18n.t("format_number", [get_chap(chapter), @chapter.list(id).number])}]
       end
 
     end
@@ -245,14 +247,14 @@ module ReVIEW
       blank
       puts "◆→開始:#{@titles["list"]}←◆"
       if get_chap.nil?
-        puts %Q[#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [@chapter.list(id).number])}　#{compile_inline(caption)}]
+        puts %Q[#{I18n.t("list")}#{I18n.t("format_number_without_chapter", [@chapter.list(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}]
       else
-        puts %Q[#{I18n.t("list")}#{I18n.t("format_number", [get_chap, @chapter.list(id).number])}　#{compile_inline(caption)}]
+        puts %Q[#{I18n.t("list")}#{I18n.t("format_number", [get_chap, @chapter.list(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}]
       end
       blank
     end
 
-    def list_body(lines)
+    def list_body(id, lines)
       lines.each do |line|
         puts detab(line)
       end
@@ -332,9 +334,9 @@ module ReVIEW
       blank
       puts "◆→開始:#{@titles["image"]}←◆"
       if get_chap.nil?
-        puts "#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [@chapter.image(id).number])}　#{compile_inline(caption)}"
+        puts "#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [@chapter.image(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}"
       else
-        puts "#{I18n.t("image")}#{I18n.t("format_number", [get_chap, @chapter.image(id).number])}　#{compile_inline(caption)}"
+        puts "#{I18n.t("image")}#{I18n.t("format_number", [get_chap, @chapter.image(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}"
       end
       blank
       if @chapter.image(id).bound?
@@ -359,9 +361,9 @@ module ReVIEW
       blank
       puts "◆→開始:#{@titles["table"]}←◆"
       if get_chap.nil?
-        puts "#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [@chapter.table(id).number])}　#{compile_inline(caption)}"
+        puts "#{I18n.t("table")}#{I18n.t("format_number_without_chapter", [@chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}"
       else
-        puts "#{I18n.t("table")}#{I18n.t("format_number", [get_chap, @chapter.table(id).number])}　#{compile_inline(caption)}"
+        puts "#{I18n.t("table")}#{I18n.t("format_number", [get_chap, @chapter.table(id).number])}#{I18n.t("caption_prefix_idgxml")}#{compile_inline(caption)}"
       end
       blank
     end
@@ -386,7 +388,10 @@ module ReVIEW
       blank
     end
 
-    def comment(str)
+    def comment(lines, comment = nil)
+      lines ||= []
+      lines.unshift comment unless comment.blank?
+      str = lines.join("")
       puts "◆→DTP連絡:#{str}←◆"
     end
 
@@ -394,7 +399,7 @@ module ReVIEW
       puts "【注#{@chapter.footnote(id).number}】#{compile_inline(str)}"
     end
 
-   def inline_fn(id)
+    def inline_fn(id)
       "【注#{@chapter.footnote(id).number}】"
     end
 
@@ -449,7 +454,7 @@ module ReVIEW
       "#{str}◆→DTP連絡:「#{str}」に網カケ←◆"
     end
 
-     def inline_i(str)
+    def inline_i(str)
       "▲#{str}☆"
     end
 
@@ -457,6 +462,8 @@ module ReVIEW
       "★#{str}☆"
     end
 
+    alias :inline_strong inline_b
+
     def inline_tt(str)
       "△#{str}☆"
     end
@@ -475,13 +482,13 @@ module ReVIEW
       "＠#{str}＠◆→＠〜＠部分に下線←◆"
     end
 
-   def inline_icon(id)
-     begin
-       return "◆→画像 #{@chapter.image(id).path.sub(/\A\.\//, "")}←◆"
-     rescue
-       warn "no such icon image: #{id}"
-       return "◆→画像 #{id}←◆"
-     end
+    def inline_icon(id)
+      begin
+        return "◆→画像 #{@chapter.image(id).path.sub(/\A\.\//, "")}←◆"
+      rescue
+        warn "no such icon image: #{id}"
+        return "◆→画像 #{id}←◆"
+      end
     end
 
     def inline_bou(str)
@@ -594,6 +601,10 @@ module ReVIEW
       base_parablock "flushright", lines, nil
     end
 
+    def centering(lines)
+      base_parablock "centering", lines, nil
+    end
+
     def note(lines, caption = nil)
       base_parablock "note", lines, caption
     end
@@ -676,7 +687,7 @@ module ReVIEW
         warn "no such image: #{id}"
         puts "◆→画像 #{id}←◆"
       end
-      puts "図　#{compile_inline(caption)}" if !caption.nil? && !caption.empty?
+      puts "図　#{compile_inline(caption)}" if caption.present?
       blank
     end
 
@@ -705,6 +716,11 @@ module ReVIEW
       ""
     end
 
+    def inline_del(str)
+      # FIXME
+      ""
+    end
+
     def inline_code(str)
       %Q[△#{str}☆]
     end
@@ -726,7 +742,8 @@ module ReVIEW
     def inline_chapref(id)
       chs = ["", "「", "」"]
       unless ReVIEW.book.param["chapref"].nil?
-        _chs = NKF.nkf("-w", ReVIEW.book.param["chapref"]).split(",")
+        _chs = convert_inencoding(ReVIEW.book.param["chapref"],
+                                  ReVIEW.book.param["inencoding"]).split(",")
         if _chs.size != 3
           error "--chapsplitter must have exactly 3 parameters with comma."
         else

data/lib/review/version.rb

@@ -0,0 +1,3 @@
+module Review
+  VERSION = "1.1.0"
+end

data/review.gemspec

@@ -1,126 +1,29 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "review/version"
 
-Gem::Specification.new do |s|
-  s.name = "review"
-  s.version = "1.0.0"
+Gem::Specification.new do |gem|
+  gem.name        = "review"
+  gem.version     = Review::VERSION
+  gem.platform    = Gem::Platform::RUBY
+  gem.license     = "LGPL"
+  gem.authors     = ["kmuto", "takahashim"]
+  gem.email       = "kmuto@debian.org"
+  gem.homepage    = "http://github.com/kmuto/review"
+  gem.summary     = "ReVIEW: a easy-to-use digital publishing system"
+  gem.description = "ReVIEW 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 = "2013-03-29"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["kmuto", "takahashim"]
-  s.date = "2012-01-30"
-  s.description = "ReVIEW is a digital publishing system for books and ebooks. It supports InDesign, EPUB and LaTeX."
-  s.email = "kmuto@debian.org"
-  s.executables = ["review-check", "review-checkdep", "review-compile", "review-epubmaker", "review-epubmaker-ng", "review-index", "review-pdfmaker", "review-preproc", "review-validate", "review-vol"]
-  s.extra_rdoc_files = [
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.extra_rdoc_files = [
     "ChangeLog",
     "README.rdoc"
   ]
-  s.files = [
-    ".travis.yml",
-    "COPYING",
-    "ChangeLog",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "bin/review-check",
-    "bin/review-checkdep",
-    "bin/review-compile",
-    "bin/review-epubmaker",
-    "bin/review-epubmaker-ng",
-    "bin/review-index",
-    "bin/review-pdfmaker",
-    "bin/review-preproc",
-    "bin/review-validate",
-    "bin/review-vol",
-    "debian/README.Debian",
-    "debian/README.source",
-    "debian/changelog",
-    "debian/compat",
-    "debian/control",
-    "debian/copyright",
-    "debian/docs",
-    "debian/manpage.1.ex",
-    "debian/patches/path.diff",
-    "debian/patches/series",
-    "debian/review.install",
-    "debian/review.links",
-    "debian/rules",
-    "debian/source/format",
-    "doc/format.rdoc",
-    "doc/format_idg.rdoc",
-    "doc/libepubmaker/sample.yaml",
-    "doc/quickstart.rdoc",
-    "doc/ruby-uuid/README",
-    "doc/ruby-uuid/README.ja",
-    "doc/sample.css",
-    "doc/sample.yaml",
-    "lib/epubmaker.rb",
-    "lib/epubmaker/content.rb",
-    "lib/epubmaker/epubv2.rb",
-    "lib/epubmaker/epubv3.rb",
-    "lib/epubmaker/producer.rb",
-    "lib/epubmaker/resource.rb",
-    "lib/lineinput.rb",
-    "lib/review.rb",
-    "lib/review/book.rb",
-    "lib/review/builder.rb",
-    "lib/review/compat.rb",
-    "lib/review/compiler.rb",
-    "lib/review/epubbuilder.rb",
-    "lib/review/ewbbuilder.rb",
-    "lib/review/exception.rb",
-    "lib/review/htmlbuilder.rb",
-    "lib/review/htmllayout.rb",
-    "lib/review/htmlutils.rb",
-    "lib/review/i18n.rb",
-    "lib/review/i18n.yaml",
-    "lib/review/idgxmlbuilder.rb",
-    "lib/review/index.rb",
-    "lib/review/latexbuilder.rb",
-    "lib/review/latexindex.rb",
-    "lib/review/latexutils.rb",
-    "lib/review/preprocessor.rb",
-    "lib/review/textbuilder.rb",
-    "lib/review/textutils.rb",
-    "lib/review/tocparser.rb",
-    "lib/review/tocprinter.rb",
-    "lib/review/topbuilder.rb",
-    "lib/review/unfold.rb",
-    "lib/review/volume.rb",
-    "lib/uuid.rb",
-    "review.gemspec",
-    "test/CHAPS",
-    "test/bib.re",
-    "test/test.re",
-    "test/test_book.rb",
-    "test/test_builder.rb",
-    "test/test_epubmaker.rb",
-    "test/test_helper.rb",
-    "test/test_htmlbuilder.rb",
-    "test/test_htmlutils.rb",
-    "test/test_i18n.rb",
-    "test/test_idgxmlbuilder.rb",
-    "test/test_latexbuilder.rb",
-    "test/test_lineinput.rb",
-    "test/test_preprocessor.rb",
-    "test/test_textutils.rb",
-    "test/test_topbuilder.rb",
-    "test/test_uuid.rb"
-  ]
-  s.homepage = "http://github.com/kmuto/review"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "ReVIEW: a easy-to-use digital publishing system"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  gem.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  gem.add_development_dependency("rake", ["0.8.7"])
 end