aozora2html 2.0.0 → 3.0.1

data/lib/aozora2html/tag/ruby.rb

@@ -1,98 +1,202 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 # complex ruby markup
 # if css3 is major supported, please fix ruby position with property "ruby-position"
 # see also: http://www.w3.org/TR/2001/WD-css3-ruby-20010216/
 class Aozora2Html
   class Tag
+    # ルビ用
+    #
+    # 現状、under_rubyは無視しているのに注意
     class Ruby < Aozora2Html::Tag::ReferenceMentioned
       attr_accessor :ruby, :under_ruby
+      attr_reader :target
 
-      def initialize(parser, string, ruby, under_ruby = "")
+      def initialize(parser, string, ruby, under_ruby = '')
         @target = string
         @ruby = ruby
         @under_ruby = under_ruby
         super
       end
 
-      def gen_rt(string)
-        if string != ""
-          "<rt class=\"real_ruby\">#{string}</rt>"
-        else
-          "<rt class=\"dummy_ruby\"></rt>"
-        end
-      end
-
       def to_s
-        "<ruby><rb>#{@target.to_s}</rb><rp>" + "（".encode("shift_jis") + "</rp><rt>#{@ruby.to_s}</rt><rp>" + "）".encode("shift_jis") + "</rp></ruby>"
+        "<ruby><rb>#{@target}</rb><rp>#{PAREN_BEGIN_MARK}</rp><rt>#{@ruby}</rt><rp>#{PAREN_END_MARK}</rp></ruby>"
       end
 
-# complex ruby is waiting for IE support and CSS3 candidate
-=begin
-  def to_s
-    ans = "<ruby class=\"complex_ruby\"><rbc>" # indicator of new version of aozora ruby
-    if @ruby.is_a?(Array) and @ruby.length > 0
-      # cell is used
-      @rbspan = @ruby.length
-    end
-    if @under_ruby.is_a?(Array) and @under_ruby.length > 0
-      # cell is used, but two way cell is not supported
-      if @rbspan
-        raise Aozora2Html::Error, I18n.t(:unsupported_ruby)
-      else
-        @rbspan = @under_ruby.length
-      end
-    end
+      # rubyタグの再割り当て
+      def self.rearrange_ruby(parser, targets, upper_ruby, under_ruby)
+        unless include_ruby?(targets)
+          return Aozora2Html::Tag::Ruby.new(parser, targets, upper_ruby, under_ruby)
+        end
 
-    # target
-    if @rbspan
-      @target.each{|x|
-        ans.concat("<rb>#{x.to_s}</rb>")
-      }
-    else
-      ans.concat("<rb>#{@target.to_s}</rb>")
-    end
+        new_targets = []
+        new_upper = if upper_ruby == ''
+                      []
+                    else
+                      upper_ruby
+                    end
+        new_under = if under_ruby == ''
+                      []
+                    else
+                      under_ruby
+                    end
+        if (new_upper.length >= 1) && (new_under.length >= 1)
+          raise Aozora2Html::Error, I18n.t(:dont_allow_triple_ruby)
+        end
 
-    ans.concat("</rbc><rtc>")
+        targets.each do |x|
+          case x
+          when Aozora2Html::Tag::Ruby
+            raise Aozora2Html::Error, I18n.t(:dont_use_double_ruby) if x.target.is_a?(Array)
 
-    # upper ruby
-    if @ruby.is_a?(Array)
-      @ruby.each{|x|
-        ans.concat(gen_rt(x))
-      }
-    elsif @rbspan
-      if @ruby != ""
-        ans.concat("<rt class=\"real_ruby\" rbspan=\"#{@rbspan}\">#{@ruby}</rt>")
-      else
-        ans.concat("<rt class=\"dummy_ruby\" rbspan=\"#{@rbspan}\"></rt>")
-      end
-    else
-      ans.concat(gen_rt(@ruby))
-    end
+            if x.ruby == ''
+              raise Aozora2Html::Error, I18n.t(:dont_use_double_ruby) unless new_under.is_a?(Array)
 
-    ans.concat("</rtc>")
+              new_under.push(x.under_ruby)
+            else
+              raise Aozora2Html::Error, I18n.t(:dont_use_double_ruby) unless new_upper.is_a?(Array)
 
-    # under_ruby (if exists)
-    if @under_ruby.length > 0
-      ans.concat("<rtc>")
-      if @under_ruby.is_a?(Array)
-        @under_ruby.each{|x|
-          ans.concat(gen_rt(x))
-        }
-      elsif @rbspan
-        ans.concat("<rt class=\"real_ruby\" rbspan=\"#{@rbspan}\">#{@under_ruby}</rt>")
-      else
-        ans.concat(gen_rt(@under_ruby))
-      end
-      ans.concat("</rtc>")
-    end
+              new_upper.push(x.ruby)
+            end
+            new_targets.push(x.target)
+          when Aozora2Html::Tag::ReferenceMentioned
+            if x.target.is_a?(Array)
+              # recursive
+              ruby2 = rearrange_ruby(parser, x.target, '', '')
+              target2, upper_ruby2, under_ruby2 = ruby2.target, ruby2.ruby, ruby2.under_ruby
+              # rotation!!
+              target2.each do |y|
+                tmp = x.dup
+                tmp.target = y
+                new_targets.push(tmp)
+              end
+              if new_under.is_a?(Array)
+                new_under.concat(under_ruby2)
+              elsif under_ruby2.to_s.length > 0
+                raise Aozora2Html::Error, I18n.t(:dont_use_double_ruby)
+              end
+              if new_upper.is_a?(Array)
+                new_upper.concat(upper_ruby2)
+              elsif upper_ruby2.to_s.length > 0
+                raise Aozora2Html::Error, I18n.t(:dont_use_double_ruby)
+              end
+            else
+              new_targets.push(x)
+              if new_under.is_a?(Array)
+                new_under.push('')
+              end
+              if new_upper.is_a?(Array)
+                new_upper.push('')
+              end
+            end
+          else
+            new_targets.push(x)
+            if new_under.is_a?(Array)
+              new_under.push('')
+            end
+            if new_upper.is_a?(Array)
+              new_upper.push('')
+            end
+          end
+        end
 
-    # finalize
-    ans.concat("</ruby>")
+        Aozora2Html::Tag::Ruby.new(parser, new_targets, new_upper, new_under)
+      end
 
-    ans
-  end
-=end
+      # arrayがルビを含んでいればそのインデックスを返す
+      #
+      # @return [Integer, nil]
+      #
+      def self.include_ruby?(array)
+        array.index do |elt|
+          case elt
+          when Aozora2Html::Tag::Ruby
+            true
+          when Aozora2Html::Tag::ReferenceMentioned
+            if elt.target.is_a?(Array)
+              include_ruby?(elt.target)
+            else
+              elt.target.is_a?(Aozora2Html::Tag::Ruby)
+            end
+          end
+        end
+      end
 
+      # ----------------------------------------------------
+      #
+      # def gen_rt(string)
+      #   if string == ''
+      #     '<rt class="dummy_ruby"></rt>'
+      #   else
+      #     "<rt class=\"real_ruby\">#{string}</rt>"
+      #   end
+      # end
+      #
+      #
+      # complex ruby is waiting for IE support and CSS3 candidate
+      #   def to_s
+      #     ans = "<ruby class=\"complex_ruby\"><rbc>" # indicator of new version of aozora ruby
+      #     if @ruby.is_a?(Array) and @ruby.length > 0
+      #       # cell is used
+      #       @rbspan = @ruby.length
+      #     end
+      #     if @under_ruby.is_a?(Array) and @under_ruby.length > 0
+      #       # cell is used, but two way cell is not supported
+      #       if @rbspan
+      #         raise Aozora2Html::Error, I18n.t(:unsupported_ruby)
+      #       else
+      #         @rbspan = @under_ruby.length
+      #       end
+      #     end
+      #
+      #     # target
+      #     if @rbspan
+      #       @target.each{|x|
+      #         ans.concat("<rb>#{x.to_s}</rb>")
+      #       }
+      #     else
+      #       ans.concat("<rb>#{@target.to_s}</rb>")
+      #     end
+      #
+      #     ans.concat("</rbc><rtc>")
+      #
+      #     # upper ruby
+      #     if @ruby.is_a?(Array)
+      #       @ruby.each{|x|
+      #         ans.concat(gen_rt(x))
+      #       }
+      #     elsif @rbspan
+      #       if @ruby != ""
+      #         ans.concat("<rt class=\"real_ruby\" rbspan=\"#{@rbspan}\">#{@ruby}</rt>")
+      #       else
+      #         ans.concat("<rt class=\"dummy_ruby\" rbspan=\"#{@rbspan}\"></rt>")
+      #       end
+      #     else
+      #       ans.concat(gen_rt(@ruby))
+      #     end
+      #
+      #     ans.concat("</rtc>")
+      #
+      #     # under_ruby (if exists)
+      #     if @under_ruby.length > 0
+      #       ans.concat("<rtc>")
+      #       if @under_ruby.is_a?(Array)
+      #         @under_ruby.each{|x|
+      #           ans.concat(gen_rt(x))
+      #         }
+      #       elsif @rbspan
+      #         ans.concat("<rt class=\"real_ruby\" rbspan=\"#{@rbspan}\">#{@under_ruby}</rt>")
+      #       else
+      #         ans.concat(gen_rt(@under_ruby))
+      #       end
+      #       ans.concat("</rtc>")
+      #     end
+      #
+      #     # finalize
+      #     ans.concat("</ruby>")
+      #
+      #     ans
+      #   end
     end
   end
 end

data/lib/aozora2html/tag/un_embed_gaiji.rb

@@ -1,6 +1,10 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
+require_relative '../string_refinements'
+
 class Aozora2Html
   class Tag
+    # 非埋め込み外字
     class UnEmbedGaiji < Aozora2Html::Tag::Gaiji
       def initialize(parser, desc)
         @desc = desc
@@ -8,8 +12,10 @@ class Aozora2Html
         super
       end
 
+      using StringRefinements
+
       def to_s
-        '<span class="notes">［'.encode("shift_jis") + @desc + '］</span>'.encode("shift_jis")
+        '<span class="notes">［'.to_sjis + @desc + '］</span>'.to_sjis
       end
 
       def escaped?

data/lib/aozora2html/tag.rb

@@ -1,43 +1,45 @@
-require "aozora2html/tag/inline"
-require "aozora2html/tag/block"
-require "aozora2html/tag/accent"
-require "aozora2html/tag/gaiji"
-require "aozora2html/tag/embed_gaiji"
-require "aozora2html/tag/un_embed_gaiji"
-require "aozora2html/tag/editor_note"
-require "aozora2html/tag/indent"
-require "aozora2html/tag/oneline_indent"
-require "aozora2html/tag/multiline"
-require "aozora2html/tag/multiline_style"
-require "aozora2html/tag/font_size"
-require "aozora2html/tag/jizume"
-require "aozora2html/tag/keigakomi"
-require "aozora2html/tag/multiline_yokogumi"
-require "aozora2html/tag/multiline_caption"
-require "aozora2html/tag/multiline_midashi"
-require "aozora2html/tag/jisage"
-require "aozora2html/tag/oneline_jisage"
-require "aozora2html/tag/multiline_jisage"
-require "aozora2html/tag/chitsuki"
-require "aozora2html/tag/oneline_chitsuki"
-require "aozora2html/tag/multiline_chitsuki"
-require "aozora2html/tag/reference_mentioned"
-require "aozora2html/tag/midashi"
-require "aozora2html/tag/ruby"
-require "aozora2html/tag/kunten"
-require "aozora2html/tag/kaeriten"
-require "aozora2html/tag/okurigana"
-require "aozora2html/tag/inline_keigakomi"
-require "aozora2html/tag/inline_yokogumi"
-require "aozora2html/tag/inline_caption"
-require "aozora2html/tag/inline_font_size"
-require "aozora2html/tag/decorate"
-require "aozora2html/tag/dakuten_katakana"
-require "aozora2html/tag/dir"
-require "aozora2html/tag/img"
+# frozen_string_literal: true
+
+require_relative 'tag/inline'
+require_relative 'tag/block'
+require_relative 'tag/accent'
+require_relative 'tag/gaiji'
+require_relative 'tag/embed_gaiji'
+require_relative 'tag/un_embed_gaiji'
+require_relative 'tag/editor_note'
+require_relative 'tag/indent'
+require_relative 'tag/oneline_indent'
+require_relative 'tag/multiline'
+require_relative 'tag/multiline_style'
+require_relative 'tag/font_size'
+require_relative 'tag/jizume'
+require_relative 'tag/keigakomi'
+require_relative 'tag/multiline_yokogumi'
+require_relative 'tag/multiline_caption'
+require_relative 'tag/multiline_midashi'
+require_relative 'tag/jisage'
+require_relative 'tag/oneline_jisage'
+require_relative 'tag/multiline_jisage'
+require_relative 'tag/chitsuki'
+require_relative 'tag/oneline_chitsuki'
+require_relative 'tag/multiline_chitsuki'
+require_relative 'tag/reference_mentioned'
+require_relative 'tag/midashi'
+require_relative 'tag/ruby'
+require_relative 'tag/kunten'
+require_relative 'tag/kaeriten'
+require_relative 'tag/okurigana'
+require_relative 'tag/inline_keigakomi'
+require_relative 'tag/inline_yokogumi'
+require_relative 'tag/inline_caption'
+require_relative 'tag/inline_font_size'
+require_relative 'tag/decorate'
+require_relative 'tag/dakuten_katakana'
+require_relative 'tag/dir'
+require_relative 'tag/img'
 
-# 変換される青空記法class
 class Aozora2Html
+  # 変換される青空記法class
   class Tag
     # debug用
     def inspect

data/lib/aozora2html/tag_parser.rb

@@ -1,22 +1,30 @@
-# 青空記法の入れ子に対応（？）
-require 'aozora2html/ruby_buffer'
+# frozen_string_literal: true
+
+require_relative 'ruby_buffer'
+
 class Aozora2Html
+  # 注記記法parser
+  #
+  # 青空記法の入れ子に対応（？）
   class TagParser < Aozora2Html
-    def initialize(input, endchar, chuuki, image)
-      if not(input.is_a?(Jstream))
-        raise ArgumentError, "tag_parser must supply Jstream as input"
+    def initialize(input, endchar, chuuki, image, gaiji_dir:) # rubocop:disable Lint/MissingSuper
+      unless input.is_a?(Jstream)
+        raise ArgumentError, 'tag_parser must supply Jstream as input'
       end
+
       @stream = input
-      @buffer = []
+      @gaiji_dir = gaiji_dir
+      @buffer = TextBuffer.new
       @ruby_buf = RubyBuffer.new
       @chuuki_table = chuuki
       @images = image # globalな環境を記録するアイテムは共有する必要あり
       @endchar = endchar # 改行を越えるべきか否か…
       @section = :tail # 末尾処理と記法内はインデントをしないので等価
-      @raw = "" # 外字変換前の生テキストを残したいことがあるらしい
+      @raw = +'' # 外字変換前の生テキストを残したいことがあるらしい
     end
 
-    def read_char # method override!
+    # method override!
+    def read_char
       c = @stream.read_char
       @raw.concat(c)
       c
@@ -28,24 +36,23 @@ class Aozora2Html
       ans
     end
 
-    def general_output # 出力は[String,String]返しで！
+    # 出力は[String,String]返しで！
+    def general_output
       @ruby_buf.dump_into(@buffer)
-      ans=""
+      ans = +''
       @buffer.each do |s|
-        if s.is_a?(Aozora2Html::Tag::UnEmbedGaiji) and !s.escaped?
+        if s.is_a?(Aozora2Html::Tag::UnEmbedGaiji) && !s.escaped?
           # 消してあった※を復活させて
           ans.concat(GAIJI_MARK)
         end
         ans.concat(s.to_s)
       end
-      [ans,@raw]
+      [ans, @raw]
     end
 
-    def process()
+    def process
       catch(:terminate) do
-        loop do
-          parse
-        end
+        parse
       end
       general_output
     end

data/lib/aozora2html/text_buffer.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+class Aozora2Html
+  # 本文テキスト用バッファ
+  #
+  # 要素はString以外も含む
+  # to_sすると文字列化できる
+  class TextBuffer < Array
+    # 行出力時に@bufferが空かどうか調べる
+    #
+    # @bufferの中身によって行末の出力が異なるため
+    #
+    # @return [true, false, :inline] 空文字ではない文字列が入っていればfalse、1行注記なら:inline、それ以外しか入っていなければtrue
+    #
+    def blank_type
+      each do |token|
+        return false if token.is_a?(String) && token != ''
+
+        if token.is_a?(Aozora2Html::Tag::OnelineIndent)
+          return :inline
+        end
+      end
+      true
+    end
+
+    # 行末で<br />を出力するべきかどうかの判別用
+    #
+    # @return [true, false] Multilineの注記しか入っていなければfalse、Multilineでも空文字でもない要素が含まれていればtrue
+    #
+    def terpri?
+      flag = true
+      each do |x|
+        case x
+        when Aozora2Html::Tag::Multiline
+          flag = false
+        when ''
+        # skip
+        else
+          return true
+        end
+      end
+
+      flag
+    end
+
+    def to_s
+      join
+    end
+  end
+end