review 2.4.0 → 2.5.0

data/lib/review/markdownbuilder.rb

@@ -28,7 +28,9 @@ module ReVIEW
     end
 
     def blank
-      @output.puts unless @blank_seen
+      unless @blank_seen
+        @output.puts
+      end
       @blank_seen = true
     end
 
@@ -132,7 +134,9 @@ module ReVIEW
     end
 
     def compile_href(url, label)
-      label = url if label.blank?
+      if label.blank?
+        label = url
+      end
       "[#{label}](#{url})"
     end
 
@@ -174,7 +178,6 @@ module ReVIEW
       "#{I18n.t('image')}#{@chapter.image(id).number}"
     rescue KeyError
       error "unknown image: #{id}"
-      nofunc_text("[UnknownImage:#{id}]")
     end
 
     def indepimage(_lines, id, caption = '', _metric = nil)
@@ -193,7 +196,9 @@ module ReVIEW
 
     def cmd(lines)
       puts '```shell-session'
-      lines.each { |line| puts detab(line) }
+      lines.each do |line|
+        puts detab(line)
+      end
       puts '```'
     end
 
@@ -297,7 +302,9 @@ module ReVIEW
     def comment(lines, comment = nil)
       return unless @book.config['draft']
       lines ||= []
-      lines.unshift comment unless comment.blank?
+      unless comment.blank?
+        lines.unshift comment
+      end
       str = lines.join('<br />')
       puts %Q(<div class="red">#{escape_html(str)}</div>)
     end

data/lib/review/md2inaobuilder.rb

@@ -20,7 +20,9 @@ module ReVIEW
     def cmd(lines)
       # WEB+DB では使っていないらしいけど
       puts '!!! cmd'
-      lines.each { |line| puts detab(line) }
+      lines.each do |line|
+        puts detab(line)
+      end
       puts ''
     end
 

data/lib/review/pdfmaker.rb

@@ -107,10 +107,16 @@ module ReVIEW
       @config = ReVIEW::Configure.values
       @config.maker = 'pdfmaker'
       cmd_config, yamlfile = parse_opts(args)
-      loader = ReVIEW::YAMLLoader.new
-      @config.deep_merge!(loader.load_file(yamlfile))
+      error "#{yamlfile} not found." unless File.exist?(yamlfile)
+
+      begin
+        loader = ReVIEW::YAMLLoader.new
+        @config.deep_merge!(loader.load_file(yamlfile))
+      rescue => e
+        error "yaml error #{e.message}"
+      end
       # YAML configs will be overridden by command line options.
-      @config.merge!(cmd_config)
+      @config.deep_merge!(cmd_config)
       I18n.setup(@config['language'])
       @basedir = File.dirname(yamlfile)
       @basehookdir = File.absolute_path(File.dirname(yamlfile))
@@ -120,7 +126,13 @@ module ReVIEW
       rescue ReVIEW::ConfigError => e
         warn e.message
       end
-      generate_pdf(yamlfile)
+
+      begin
+        generate_pdf(yamlfile)
+      rescue ApplicationError => e
+        raise if @config['debug']
+        error(e.message)
+      end
     end
 
     def make_input_files(book, yamlfile)
@@ -218,9 +230,6 @@ module ReVIEW
 
         check_compile_status(@config['ignore-errors'])
 
-        @config['usepackage'] = ''
-        @config['usepackage'] = "\\usepackage{#{@config['texstyle']}}" if @config['texstyle']
-
         copy_images(@config['imagedir'], File.join(@path, @config['imagedir']))
         copy_sty(File.join(Dir.pwd, 'sty'), @path)
         copy_sty(File.join(Dir.pwd, 'sty'), @path, 'fd')
@@ -255,8 +264,13 @@ module ReVIEW
       Dir.chdir(to) do
         images = Dir.glob('**/*').find_all { |f| File.file?(f) and f =~ /\.(jpg|jpeg|png|pdf|ai|eps|tif)\z/ }
         break if images.empty?
-        system('extractbb', *images)
-        system_or_raise('ebb', *images) unless system('extractbb', '-m', *images)
+        if @config['pdfmaker']['bbox']
+          system('extractbb', '-B', @config['pdfmaker']['bbox'], *images)
+          system_or_raise('ebb', '-B', @config['pdfmaker']['bbox'], *images) unless system('extractbb', '-B', @config['pdfmaker']['bbox'], '-m', *images)
+        else
+          system('extractbb', *images)
+          system_or_raise('ebb', *images) unless system('extractbb', '-m', *images)
+        end
       end
     end
 

data/lib/review/plaintextbuilder.rb

@@ -0,0 +1,683 @@
+# Copyright (c) 2018 Kenshi Muto
+#
+# 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.
+#
+
+require 'review/builder'
+require 'review/textutils'
+
+module ReVIEW
+  class PLAINTEXTBuilder < Builder
+    include TextUtils
+
+    %i[ttbold hint maru keytop labelref ref balloon strong].each do |e|
+      Compiler.definline(e)
+    end
+    Compiler.defsingle(:dtp, 1)
+
+    Compiler.defblock(:insn, 1)
+    Compiler.defblock(:planning, 0..1)
+    Compiler.defblock(:best, 0..1)
+    Compiler.defblock(:securty, 0..1)
+    Compiler.defblock(:point, 0..1)
+    Compiler.defblock(:reference, 0)
+    Compiler.defblock(:term, 0)
+    Compiler.defblock(:practice, 0)
+    Compiler.defblock(:expert, 0)
+    Compiler.defblock(:link, 0..1)
+    Compiler.defblock(:shoot, 0..1)
+
+    def pre_paragraph
+      ''
+    end
+
+    def post_paragraph
+      ''
+    end
+
+    def extname
+      '.txt'
+    end
+
+    def builder_init_file
+      @section = 0
+      @subsection = 0
+      @subsubsection = 0
+      @subsubsubsection = 0
+      @blank_seen = true
+      @sec_counter = SecCounter.new(5, @chapter)
+    end
+    private :builder_init_file
+
+    def olnum(num)
+      @ol_num = num.to_i
+    end
+
+    def print(s)
+      @blank_seen = false
+      super
+    end
+    private :print
+
+    def puts(s)
+      @blank_seen = false
+      super
+    end
+    private :puts
+
+    def blank
+      @output.puts unless @blank_seen
+      @blank_seen = true
+    end
+    private :blank
+
+    def result
+      @output.string
+    end
+
+    def headline(level, _label, caption)
+      prefix, _anchor = headline_prefix(level)
+      puts %Q(#{prefix}#{compile_inline(caption)})
+    end
+
+    def ul_begin
+      blank
+    end
+
+    def ul_item(lines)
+      puts lines.join
+    end
+
+    def ul_end
+      blank
+    end
+
+    def ol_begin
+      blank
+      @olitem = 0
+    end
+
+    def ol_item(lines, num)
+      puts "#{num}　#{lines.join}"
+    end
+
+    def ol_end
+      blank
+      @olitem = nil
+    end
+
+    def dl_begin
+      blank
+    end
+
+    def dt(line)
+      puts line
+    end
+
+    def dd(lines)
+      split_paragraph(lines).each do |paragraph|
+        puts paragraph.gsub(/\n/, '')
+      end
+    end
+
+    def dl_end
+      blank
+    end
+
+    def paragraph(lines)
+      puts lines.join
+    end
+
+    def read(lines)
+      puts split_paragraph(lines).join("\n")
+      blank
+    end
+
+    alias_method :lead, :read
+
+    def inline_list(id)
+      chapter, id = extract_chapter_id(id)
+      if get_chap(chapter)
+        %Q(#{I18n.t('list')}#{I18n.t('format_number', [get_chap(chapter), chapter.list(id).number])})
+      else
+        %Q(#{I18n.t('list')}#{I18n.t('format_number_without_chapter', [chapter.list(id).number])})
+      end
+    rescue KeyError
+      error "unknown list: #{id}"
+    end
+
+    def list_header(id, caption, _lang)
+      blank
+      if get_chap
+        puts %Q(#{I18n.t('list')}#{I18n.t('format_number', [get_chap, @chapter.list(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)})
+      else
+        puts %Q(#{I18n.t('list')}#{I18n.t('format_number_without_chapter', [@chapter.list(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)})
+      end
+      blank
+    end
+
+    def list_body(_id, lines, _lang)
+      lines.each do |line|
+        puts detab(line)
+      end
+      blank
+    end
+
+    def base_block(_type, lines, caption = nil)
+      blank
+      puts compile_inline(caption) if caption.present?
+      puts lines.join("\n")
+      blank
+    end
+
+    def base_parablock(_type, lines, caption = nil)
+      blank
+      puts compile_inline(caption) if caption.present?
+      puts split_paragraph(lines).join("\n")
+      blank
+    end
+
+    def emlist(lines, caption = nil, _lang = nil)
+      base_block 'emlist', lines, caption
+    end
+
+    def emlistnum(lines, caption = nil, _lang = nil)
+      blank
+      puts compile_inline(caption) if caption.present?
+      lines.each_with_index do |line, i|
+        puts((i + 1).to_s.rjust(2) + ": #{line}")
+      end
+      blank
+    end
+
+    def listnum_body(lines, _lang)
+      lines.each_with_index do |line, i|
+        puts((i + 1).to_s.rjust(2) + ": #{line}")
+      end
+      blank
+    end
+
+    def cmd(lines, caption = nil)
+      base_block 'cmd', lines, caption
+    end
+
+    def quote(lines)
+      base_parablock 'quote', lines, nil
+    end
+
+    def inline_table(id)
+      chapter, id = extract_chapter_id(id)
+      if get_chap(chapter)
+        "#{I18n.t('table')}#{I18n.t('format_number', [get_chap(chapter), chapter.table(id).number])}"
+      else
+        "#{I18n.t('table')}#{I18n.t('format_number_without_chapter', [chapter.table(id).number])}"
+      end
+    rescue KeyError
+      error "unknown table: #{id}"
+    end
+
+    def inline_img(id)
+      chapter, id = extract_chapter_id(id)
+      if get_chap(chapter)
+        "#{I18n.t('image')}#{I18n.t('format_number', [get_chap(chapter), chapter.image(id).number])}"
+      else
+        "#{I18n.t('image')}#{I18n.t('format_number_without_chapter', [chapter.image(id).number])}"
+      end
+    rescue KeyError
+      error "unknown image: #{id}"
+    end
+
+    def image(_lines, id, caption, _metric = nil)
+      blank
+      if get_chap
+        puts "#{I18n.t('image')}#{I18n.t('format_number', [get_chap, @chapter.image(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}"
+      else
+        puts "#{I18n.t('image')}#{I18n.t('format_number_without_chapter', [@chapter.image(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}"
+      end
+      blank
+    end
+
+    def texequation(lines)
+      puts lines.join("\n")
+      blank
+    end
+
+    def table(lines, id = nil, caption = nil)
+      blank
+      rows = []
+      sepidx = nil
+      lines.each_with_index do |line, idx|
+        if /\A[\=\-]{12}/ =~ line
+          # just ignore
+          # error "too many table separator" if sepidx
+          sepidx ||= idx
+          next
+        end
+        rows.push(line.strip.split(/\t+/).map { |s| s.sub(/\A\./, '') })
+      end
+      rows = adjust_n_cols(rows)
+
+      begin
+        table_header id, caption if caption.present?
+      rescue KeyError
+        error "no such table: #{id}"
+      end
+      return if rows.empty?
+      table_begin rows.first.size
+      if sepidx
+        sepidx.times do
+          tr(rows.shift.map { |s| th(s) })
+        end
+        rows.each do |cols|
+          tr(cols.map { |s| td(s) })
+        end
+      else
+        rows.each do |cols|
+          h, *cs = *cols
+          tr([th(h)] + cs.map { |s| td(s) })
+        end
+      end
+      table_end
+    end
+
+    def table_header(id, caption)
+      if id.nil?
+        puts compile_inline(caption)
+      elsif get_chap
+        puts "#{I18n.t('table')}#{I18n.t('format_number', [get_chap, @chapter.table(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}"
+      else
+        puts "#{I18n.t('table')}#{I18n.t('format_number_without_chapter', [@chapter.table(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}"
+      end
+      blank
+    end
+
+    def table_begin(_ncols)
+    end
+
+    def imgtable(_lines, id, caption = nil, _metric = nil)
+      blank
+      table_header id, caption if caption.present?
+      blank
+    end
+
+    def tr(rows)
+      puts rows.join("\t")
+    end
+
+    def table_end
+      blank
+    end
+
+    def comment(lines, comment = nil)
+    end
+
+    def footnote(id, str)
+      puts "注#{@chapter.footnote(id).number} #{compile_inline(str)}"
+    end
+
+    def inline_fn(id)
+      " 注#{@chapter.footnote(id).number} "
+    rescue KeyError
+      error "unknown footnote: #{id}"
+    end
+
+    def compile_ruby(base, _ruby)
+      base
+    end
+
+    def compile_kw(word, alt)
+      if alt
+        "#{word}（#{alt.strip}）"
+      else
+        word
+      end
+    end
+
+    def compile_href(url, label)
+      if label
+        "#{label}（#{url}）"
+      else
+        url
+      end
+    end
+
+    def inline_raw(str)
+      super(str).gsub('\\n', "\n")
+    end
+
+    def inline_hidx(_str)
+      ''
+    end
+
+    def inline_icon(_id)
+      ''
+    end
+
+    def inline_balloon(str)
+      %Q(←#{str.gsub(/@maru\[(\d+)\]/, inline_maru('\1'))})
+    end
+
+    def inline_uchar(str)
+      [str.to_i(16)].pack('U')
+    end
+
+    def inline_comment(_str)
+      ''
+    end
+
+    def bibpaper(lines, id, caption)
+      bibpaper_header id, caption
+      bibpaper_bibpaper id, caption, lines unless lines.empty?
+    end
+
+    def bibpaper_header(id, caption)
+      print @chapter.bibpaper(id).number
+      puts " #{compile_inline(caption)}"
+    end
+
+    def bibpaper_bibpaper(_id, _caption, lines)
+      print split_paragraph(lines).join
+    end
+
+    def inline_bib(id)
+      %Q(#{@chapter.bibpaper(id).number} )
+    rescue KeyError
+      error "unknown bib: #{id}"
+    end
+
+    def inline_hd_chap(chap, id)
+      if chap.number
+        n = chap.headline_index.number(id)
+        return I18n.t('chapter_quote', "#{n}　#{compile_inline(chap.headline(id).caption)}") if @book.config['secnolevel'] >= n.split('.').size
+      end
+      I18n.t('chapter_quote', compile_inline(chap.headline(id).caption))
+    rescue KeyError
+      error "unknown headline: #{id}"
+    end
+
+    def noindent
+    end
+
+    def nonum_begin(_level, _label, caption)
+      puts compile_inline(caption)
+    end
+
+    def nonum_end(_level)
+    end
+
+    def notoc_begin(_level, _label, caption)
+      puts compile_inline(caption)
+    end
+
+    def notoc_end(level)
+    end
+
+    def nodisp_begin(level, label, caption)
+    end
+
+    def nodisp_end(level)
+    end
+
+    def common_column_begin(_type, caption)
+      blank
+      puts compile_inline(caption)
+    end
+
+    def common_column_end(_type)
+      blank
+    end
+
+    def column_begin(_level, _label, caption)
+      common_column_begin('column', caption)
+    end
+
+    def column_end(_level)
+      common_column_end('column')
+    end
+
+    def xcolumn_begin(_level, _label, caption)
+      common_column_begin('xcolumn', caption)
+    end
+
+    def xcolumn_end(_level)
+      common_column_end('xcolumn')
+    end
+
+    def world_begin(_level, _label, caption)
+      common_column_begin('world', caption)
+    end
+
+    def world_end(_level)
+      common_column_end('world')
+    end
+
+    def hood_begin(_level, _label, caption)
+      common_column_begin('hood', caption)
+    end
+
+    def hood_end(_level)
+      common_column_end('hood')
+    end
+
+    def edition_begin(_level, _label, caption)
+      common_column_begin('edition', caption)
+    end
+
+    def edition_end(_level)
+      common_column_end('edition')
+    end
+
+    def insideout_begin(_level, _label, caption)
+      common_column_begin('insideout', caption)
+    end
+
+    def insideout_end(_level)
+      common_column_end('insideout')
+    end
+
+    def ref_begin(_level, _label, caption)
+      common_column_begin('ref', caption)
+    end
+
+    def ref_end(_level)
+      common_column_end('ref')
+    end
+
+    def sup_begin(_level, _label, caption)
+      common_column_begin('sup', caption)
+    end
+
+    def sup_end(_level)
+      common_column_end('sup')
+    end
+
+    def flushright(lines)
+      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
+
+    def memo(lines, caption = nil)
+      base_parablock 'memo', lines, caption
+    end
+
+    def tip(lines, caption = nil)
+      base_parablock 'tip', lines, caption
+    end
+
+    def info(lines, caption = nil)
+      base_parablock 'info', lines, caption
+    end
+
+    def planning(lines, caption = nil)
+      base_parablock 'planning', lines, caption
+    end
+
+    def best(lines, caption = nil)
+      base_parablock 'best', lines, caption
+    end
+
+    def important(lines, caption = nil)
+      base_parablock 'important', lines, caption
+    end
+
+    def security(lines, caption = nil)
+      base_parablock 'security', lines, caption
+    end
+
+    def caution(lines, caption = nil)
+      base_parablock 'caution', lines, caption
+    end
+
+    def term(lines)
+      base_parablock 'term', lines, nil
+    end
+
+    def link(lines, caption = nil)
+      base_parablock 'link', lines, caption
+    end
+
+    def notice(lines, caption = nil)
+      base_parablock 'notice', lines, caption
+    end
+
+    def point(lines, caption = nil)
+      base_parablock 'point', lines, caption
+    end
+
+    def shoot(lines, caption = nil)
+      base_parablock 'shoot', lines, caption
+    end
+
+    def reference(lines)
+      base_parablock 'reference', lines, nil
+    end
+
+    def practice(lines)
+      base_parablock 'practice', lines, nil
+    end
+
+    def expert(lines)
+      base_parablock 'expert', lines, nil
+    end
+
+    def insn(lines, caption = nil)
+      base_block 'insn', lines, caption
+    end
+
+    def warning(lines, caption = nil)
+      base_parablock 'warning', lines, caption
+    end
+
+    alias_method :box, :insn
+
+    def indepimage(_lines, _id, caption = nil, _metric = nil)
+      blank
+      puts "図　#{compile_inline(caption)}" if caption.present?
+      blank
+    end
+
+    alias_method :numberlessimage, :indepimage
+
+    def label(_id)
+      ''
+    end
+
+    def dtp(str)
+    end
+
+    def bpo(lines)
+      base_block 'bpo', lines, nil
+    end
+
+    def inline_dtp(_str)
+      ''
+    end
+
+    def inline_del(_str)
+      ''
+    end
+
+    def inline_br(_str)
+      "\n"
+    end
+
+    def text(str)
+      str
+    end
+
+    def inline_chap(id)
+      # "「第#{super}章　#{inline_title(id)}」"
+      # "第#{super}章"
+      super
+    end
+
+    def inline_chapref(id)
+      chs = ['', '「', '」']
+      if @book.config['chapref']
+        chs2 = @book.config['chapref'].split(',')
+        error '--chapsplitter must have exactly 3 parameters with comma.' if chs2.size != 3
+        chs = chs2
+      end
+      "#{chs[0]}#{@book.chapter_index.number(id)}#{chs[1]}#{@book.chapter_index.title(id)}#{chs[2]}"
+    rescue KeyError
+      error "unknown chapter: #{id}"
+    end
+
+    def source(lines, caption = nil, _lang = nil)
+      base_block 'source', lines, caption
+    end
+
+    def inline_labelref(_idref)
+      '●'
+    end
+
+    alias_method :inline_ref, :inline_labelref
+
+    def inline_pageref(_idref)
+      '●ページ' # ページ番号を参照
+    end
+
+    def circle_begin(_level, _label, caption)
+      puts "・#{caption}"
+    end
+
+    def circle_end(level)
+    end
+
+    def nofunc_text(str)
+      str
+    end
+
+    alias_method :th, :nofunc_text
+    alias_method :td, :nofunc_text
+    alias_method :inline_sup, :nofunc_text
+    alias_method :inline_sub, :nofunc_text
+    alias_method :inline_hint, :nofunc_text
+    alias_method :inline_maru, :nofunc_text
+    alias_method :inline_idx, :nofunc_text
+    alias_method :inline_ami, :nofunc_text
+    alias_method :inline_i, :nofunc_text
+    alias_method :inline_em, :nofunc_text
+    alias_method :inline_b, :nofunc_text
+    alias_method :inline_strong, :nofunc_text
+    alias_method :inline_tt, :nofunc_text
+    alias_method :inline_code, :nofunc_text
+    alias_method :inline_ttb, :nofunc_text
+    alias_method :inline_ttbold, :nofunc_text
+    alias_method :inline_tti, :nofunc_text
+    alias_method :inline_ttibold, :nofunc_text
+    alias_method :inline_u, :nofunc_text
+    alias_method :inline_bou, :nofunc_text
+    alias_method :inline_keytop, :nofunc_text
+    alias_method :inline_m, :nofunc_text
+  end
+end # module ReVIEW