aozora2html 0.7.1 → 0.9.0

data/lib/aozora2html/version.rb

@@ -1,3 +1,3 @@
 class Aozora2Html
-  VERSION = "0.7.1"
+  VERSION = "0.9.0"
 end

data/lib/aozora2html/yaml_loader.rb

@@ -0,0 +1,31 @@
+require 'yaml'
+class Aozora2Html
+  class YamlLoader
+    def initialize(base_dir)
+      @base_dir = base_dir
+    end
+
+    def load(path)
+      tmp_data = YAML.load_file(File.join(@base_dir, path))
+      normalize_data(tmp_data)
+    end
+
+    def normalize_data(data)
+      case data
+      when String
+        data.encode("shift_jis")
+      when Hash
+        new_data = {}
+        data.each do |k, v|
+          new_data[normalize_data(k)] = normalize_data(v)
+        end
+        new_data
+      when Array
+        data.map{|item| normalize_data(item)}
+      else
+        # noop
+        data
+      end
+    end
+  end
+end

data/lib/extensions.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+# 1.8 like to_s method to Array
+class Array
+  def to_s
+    self.join
+  end
+end
+
+class String
+
+  # used in Aozora2Html#char_type
+  def char_type
+    ch = self
+    if ch.match(Regexp.new("[ぁ-んゝゞ]".encode("shift_jis")))
+      :hiragana
+    elsif ch.match(Regexp.new("[ァ-ンーヽヾヴ]".encode("shift_jis")))
+      :katakana
+    elsif ch.match(Regexp.new("[０-９Ａ-Ｚａ-ｚΑ-Ωα-ωА-Яа-я−＆’，．]".encode("shift_jis")))
+      :zenkaku
+    elsif ch.match(Regexp.new("[A-Za-z0-9#\\-\\&'\\,]".encode("shift_jis")))
+      :hankaku
+    elsif ch.match(Regexp.new("[亜-熙々※仝〆〇ヶ]".encode("shift_jis")))
+      :kanji
+    elsif ch.match(/[\.\;\"\?\!\)]/)
+      :hankaku_terminate
+    else
+      :else
+    end
+  end
+end
+

data/lib/jstream.rb

@@ -0,0 +1,68 @@
+require "aozora2html/error"
+require "aozora2html/i18n"
+
+##
+# Stream class for reading a file.
+#
+# It's just a wrapper class of IO to read characters.
+# when finished to read IO, return a symbol :eof.
+# when found line terminator except CR+LF, exit.
+#
+class Jstream
+
+  attr_accessor :line
+
+  def initialize(file_io)
+    @line = 0
+    @entry = false
+    @file = file_io
+    begin
+      store_to_buffer
+    rescue Aozora2Html::Error => e
+      puts e.message(1)
+      if e.is_a?(Aozora2Html::Error)
+        exit(2)
+      end
+    end
+  end
+
+  def inspect
+    "#<jcode-stream input " + @file.inspect + ">"
+  end
+
+  def read_char
+    found = @buffer.shift
+    if @entry
+      @line += 1
+      @entry = false
+    end
+    if found
+      return found
+    end
+
+    begin
+      store_to_buffer
+    rescue EOFError
+      @buffer = [:eof]
+    end
+    "\r\n"
+  end
+
+  def peek_char(pos)
+    @buffer[pos] || "\r\n"
+  end
+
+  def close
+    @file.close
+  end
+
+  private
+  def store_to_buffer
+    if tmp = @file.readline.chomp!("\r\n")
+      @buffer = tmp.each_char.to_a
+    else
+      raise Aozora2Html::Error, Aozora2Html::I18n.t(:use_crlf)
+    end
+    @entry = true
+  end
+end

data/lib/t2hs.rb

@@ -1,958 +1,206 @@
 # -*- coding:shift_jis -*-
 # �‹󕶌Ɍ`���̃e�L�X�g�t�@�C���� html �ɐ��`���� ruby �X�N���v�g
 require "cgi"
+require "extensions"
+require "aozora2html/error"
+require "jstream"
+require "aozora2html/tag"
+require "aozora2html/tag_parser"
+require "aozora2html/accent_parser"
+require "aozora2html/style_stack"
+require "aozora2html/header"
+require "aozora2html/ruby_buffer"
+require "aozora2html/yaml_loader"
+require "aozora2html/zip"
+require "aozora2html/utils"
 
 $gaiji_dir = "../../../gaiji/"
 
 $css_files = Array["../../aozora.css"]
 
-# 1.8 like to_s method to Array
-class Array
-  def to_s
-    self.join
-  end
-end
-
-# ��Oclass
-class Aozora_Exception < Exception
-  def initialize (message)
-    @message=message
-  end
-end
-
-class Aozora_Error < Aozora_Exception
-  def message (line)
-    "�G���[(#{line}�s��):#{@message}. \r\n�������~���܂�"
-  end
-end
-
-class Jstream
-  attr_accessor :line
-  def store_to_buffer
-    if tmp = @file.readline.chomp!("\r\n")
-      @buffer = tmp.each_char.to_a
-    else
-      raise Aozora_Error.new("���s�R�[�h���A�uCR+LF�v�ɂ��炽�߂Ă�������")
-    end
-    @entry = true
-  end
-  def initialize (file_io)
-    @line = 0
-    @entry = false
-    @file = file_io
-    begin
-      store_to_buffer
-    rescue Aozora_Exception => e
-      puts e.message(1)
-      if e.is_a?(Aozora_Error)
-        exit(2)
-      end
-    end
-  end
-  def inspect
-    "#<jcode-stream input " + @file.inspect + ">"
-  end
-  def read_char
-    found = @buffer.shift
-    if @entry
-      @line = @line + 1
-      @entry = false
-    end
-    if found
-      found
-    else
-      begin
-        store_to_buffer
-        "\r\n"
-      rescue EOFError
-        @buffer = [:eof]
-        "\r\n"
-      end
-    end
-  end
-  def peek_char (pos)
-    found = @buffer[pos]
-    if found
-      found
-    else
-      "\r\n"
-    end 
-  end
-  def close
-    @file.close
-  end
-end
-
-# �ϊ������‹�L�@class
-class Aozora_tag
-  # debug�p
-  def inspect
-    to_s
-  end
-  
-  def syntax_error
-    raise Aozora_Error.new("���L���d�˂�ۂ̌����A�u�����͈͂��ɁA�L���͈͂���Ɂv������Ă��܂���B�����N��̎w�j���Q�l�ɁA�����������炽�߂Ă�������")
-  end
-end
-
-# �S�Ă̐‹�L�@��HTML element�ɕϊ������
-# ���������āAblock/inline�̋�ʂ�����
-# �S�Ă̖��[�‹�class�͂ǂ��炩��module��include����K�v������
-module Inline_tag
-  def initialize (*args)
-    true
-  end
-end
-
-module Block_tag
-  # �K�v�Ɋ�Â�method override����
-  def close_tag
-    "</div>"
-  end
-  def initialize (parser, *args)
-    if parser.block_allowed_context?
-      nil
-    else
-      syntax_error
-    end
-  end
-end
-
-class Accent_tag < Aozora_tag
-  include Inline_tag
-  def initialize (parser, code, name)
-    @code = code
-    @name = name
-    super
-  end
-  def to_s
-    "<img src=\"#{$gaiji_dir}#{@code}.png\" alt=\"��(#{@name})\" class=\"gaiji\" />"
-  end
-end
-
-class Gaiji_tag < Aozora_tag
-  include Inline_tag
-end
-
-class Embed_Gaiji_tag < Gaiji_tag
-  def initialize (parser, folder, code, name)
-    @folder = folder
-    @code = code
-    @name = name
-    super
-  end
-  def to_s
-    "<img src=\"#{$gaiji_dir}#{@folder}/#{@code}.png\" alt=\"��(#{@name})\" class=\"gaiji\" />"
-  end
-end
-
-class UnEmbed_Gaiji_tag < Gaiji_tag
-  def initialize (parser, desc)
-    @desc = desc; @escaped = false
-    super
-  end
-  def to_s
-    '<span class="notes">�m' + @desc + '�n</span>'
-  end
-  def escaped?
-    @escaped
-  end
-  def escape!
-    @escaped = true
-  end
-end
-
-class Editor_note_tag < Aozora_tag
-  include Inline_tag
-  def initialize (parser, desc)
-    @desc = desc
-    super
-  end
-  def to_s
-    '<span class="notes">�m��' + @desc + '�n</span>'
-  end
-end
-
-class Indent_tag < Aozora_tag
-  include Block_tag
-end
-
-module Oneline_Indent_tag
-end
-
-module Multiline_tag
-end
-
-class Multiline_style_tag < Aozora_tag
-  include Block_tag, Multiline_tag
-  def initialize (parser, style)
-    @style = style
-    super
-  end
-  def to_s
-    "<div class=\"#{@style}\">"
-  end
-end
-
-class Font_size_tag < Aozora_tag
-  include Block_tag, Multiline_tag
-  def initialize (parser, times, daisho)
-    @class = daisho.to_s + times.to_s
-    @style = case times
-             when 1
-               ""
-             when 2
-               "x-"
-             else
-               if times >= 3
-                 "xx-"
-               else
-                 raise Aozora_Error.new("�����T�C�Y�̎w�肪�s���ł�")
-               end
-             end + case daisho
-                   when :dai
-                     "large"
-                   when :sho
-                     "small"
-                   end
-    super
-  end
-  def to_s
-    "<div class=\"#{@class}\" style=\"font-size: #{@style};\">"
-  end
-end
-
-class Jizume_tag < Indent_tag
-  include Multiline_tag
-  def initialize (parser, width)
-    @w = width
-    super
-  end
-  def to_s
-    "<div class=\"jizume_#{@w}\" style=\"width: #{@w}em\">"
-  end
-end
-
-class Keigakomi_tag < Aozora_tag
-  include Block_tag, Multiline_tag
-  def initialize (parser, size = 1)
-    @size = size
-    super
-  end
-  def to_s
-    "<div class=\"keigakomi\" style=\"border: solid #{@size}px\">"
-  end
-end
-
-class Multiline_yokogumi_tag < Aozora_tag
-  include Block_tag, Multiline_tag
-  def initialize (parser)
-    super
-  end
-  def to_s
-    "<div class=\"yokogumi\">"
-  end
-end
-
-class Multiline_caption_tag < Aozora_tag
-  include Block_tag, Multiline_tag
-  def initialize (parser)
-    super
-  end
-  def to_s
-    "<div class=\"caption\">"
-  end
-end
-
-class Multiline_midashi_tag < Aozora_tag
-  include Block_tag, Multiline_tag
-  def initialize (parser,size,type)
-    super
-    @tag = if size.match("��")
-             @id = parser.new_midashi_id(1)
-             "h5"
-           elsif size.match("��")
-             @id = parser.new_midashi_id(10)
-             "h4"
-           elsif size.match("��")
-             @id = parser.new_midashi_id(100)
-             "h3"
-           else
-             raise Aozora_Error.new("����`�Ȍ��o���ł�")
-           end   
-    @class = case type
-             when :normal
-               case @tag
-               when "h5"
-                 "ko-midashi"
-               when "h4"
-                 "naka-midashi"
-               when "h3"
-                 "o-midashi"
-               end
-             when :dogyo
-               case @tag
-               when "h5"
-                 "dogyo-ko-midashi"
-               when "h4"
-                 "dogyo-naka-midashi"
-               when "h3"
-                 "dogyo-o-midashi"
-               end
-             when :mado
-               case @tag
-               when "h5"
-                 "mado-ko-midashi"
-               when "h4"
-                 "mado-naka-midashi"
-               when "h3"
-                 "mado-o-midashi"
-               end
-             else
-               raise Aozora_Error.new("����`�Ȍ��o���ł�")
-             end
-  end
-  def to_s
-    "<#{@tag} class=\"#{@class}\"><a class=\"midashi_anchor\" id=\"midashi#{@id}\">"
-  end
-  def close_tag
-    "</a></#{@tag}>"
-  end
-end
-
-class Jisage_tag < Indent_tag
-  def initialize (parser, width)
-    @width = width
-    super
-  end
-  def to_s
-    "<div class=\"jisage_#{@width}\" style=\"margin-left: #{@width}em\">"
-  end
-end
-
-class Oneline_Jisage_tag < Jisage_tag
-  include Oneline_Indent_tag
-end
-class Multiline_Jisage_tag < Jisage_tag
-  include Multiline_tag
-end
-
-class Chitsuki_tag < Indent_tag
-  def initialize (parser, length)
-    @length = length
-    super
-  end
-  def to_s
-    '<div class="chitsuki_' + @length + '" style="text-align:right; margin-right: ' + @length + 'em">'
-  end
-end
-
-class Oneline_Chitsuki_tag < Chitsuki_tag
-  include Oneline_Indent_tag
-end
-
-
-class Multiline_Chitsuki_tag < Chitsuki_tag
-  include Multiline_tag
-end
+# �ϊ���{��
+class Aozora2Html
 
-# �O���Q�Ƃł����‚����͒��g���`�F�b�N����
-# �q�v�f������Inline_tag�͑S�Ă����‚̃T�u�N���X
-class Reference_mentioned_tag < Aozora_tag
-  include Inline_tag
-  attr_accessor :target
-  def block_element? (elt)
-    if elt.is_a?(Array)
-      elt.each{|x|
-        if block_element?(x)
-          return true
-        end
-      }
-      nil
-    elsif elt.is_a?(String)
-      elt.match(/<div/)
-    else
-      elt.is_a?(Block_tag)
-    end
-  end
-  def initialize (*args)
-    if block_element?(@target)
-      syntax_error
-    end
-  end
-  def target_string
-    if @target.is_a?(Reference_mentioned_tag)
-      @target.target_string
-    elsif @target.is_a?(Array)
-      @target.collect{|x|
-        if x.is_a?(Reference_mentioned_tag)
-          x.target_string
-        else
-          x
-        end}.to_s
-    else
-      @target
-    end
-  end
-end
+  # �S�p�o�b�N�X���b�V�����o���Ȃ����璼�ł�
+  KU = ["18e5"].pack("h*").force_encoding("shift_jis")
+  NOJI = ["18f5"].pack("h*").force_encoding("shift_jis")
+  DAKUTEN = ["18d8"].pack("h*").force_encoding("shift_jis")
+  GAIJI_MARK = "��"
+  SIZE_SMALL = "��"
+  SIZE_MIDDLE = "��"
+  SIZE_LARGE = "��"
+  AOZORABUNKO = "�‹󕶌�"
+  #PAT_EDITOR = /[�Z��|��|�ҏW|�ҏW�Z��|�Z���ҏW]$/
+  PAT_EDITOR = /(�Z��|��|�ҏW|�ҏW�Z��|�Z���ҏW)$/
+  PAT_HENYAKU = /�Җ�$/
+  PAT_TRANSLATOR = /��$/
+  RUBY_PREFIX = "�b"
+
+  # KUNOJI = ["18e518f5"].pack("h*")
+  # utf8 ["fecbf8fecbcb"].pack("h*")
+  # DAKUTENKUNOJI = ["18e518d818f5"].pack("h*")
+  # utf8 ["fecbf82e083bfecbcb"].pack("h*")
 
-class Midashi_tag < Reference_mentioned_tag
-  def initialize (parser,target,size,type)
-    super
-    @target = target
-    @tag = if size.match("��")
-             @id = parser.new_midashi_id(1)
-             "h5"
-           elsif size.match("��")
-             @id = parser.new_midashi_id(10)
-             "h4"
-           elsif size.match("��")
-             @id = parser.new_midashi_id(100)
-             "h3"
-           else
-             raise Aozora_Error.new("����`�Ȍ��o���ł�")
-           end   
-    @class = case type
-             when :normal
-               case @tag
-               when "h5"
-                 "ko-midashi"
-               when "h4"
-                 "naka-midashi"
-               when "h3"
-                 "o-midashi"
-               end
-             when :dogyo
-               case @tag
-               when "h5"
-                 "dogyo-ko-midashi"
-               when "h4"
-                 "dogyo-naka-midashi"
-               when "h3"
-                 "dogyo-o-midashi"
-               end
-             when :mado
-               case @tag
-               when "h5"
-                 "mado-ko-midashi"
-               when "h4"
-                 "mado-naka-midashi"
-               when "h3"
-                 "mado-o-midashi"
-               end
-             else
-               raise Aozora_Error.new("����`�Ȍ��o���ł�")
-             end
-  end
-  def to_s
-    "<#{@tag} class=\"#{@class}\"><a class=\"midashi_anchor\" id=\"midashi#{@id}\">#{@target}</a></#{@tag}>"
-  end
-end
+  loader = Aozora2Html::YamlLoader.new(File.dirname(__FILE__))
+  ACCENT_TABLE = loader.load("../yml/accent_table.yml")
 
-# 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 Ruby_tag < Reference_mentioned_tag
-  attr_accessor :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
+  # [class, tag]
+  COMMAND_TABLE = loader.load("../yml/command_table.yml")
+  JIS2UCS = loader.load("../yml/jis2ucs.yml")
+
+  INDENT_TYPE = {
+    :jisage => "������",
+    :chitsuki => "�n�t��",
+    :midashi => "���o��",
+    :jizume => "���l��",
+    :yokogumi => "���g��",
+    :keigakomi => "�r�͂�",
+    :caption => "�L���v�V����",
+    :futoji => "����",
+    :shatai => "�Α�",
+    :dai => "�傫�ȕ���",
+    :sho => "�����ȕ���",
+  }
 
-  def to_s
-    "<ruby><rb>#{@target.to_s}</rb><rp>�i</rp><rt>#{@ruby.to_s}</rt><rp>�j</rp></ruby>"
-  end
+  DAKUTEN_KATAKANA_TABLE = {
+    "2" => "���J",
+    "3" => "���J",
+    "4" => "���J",
+    "5" => "���J",
+  }
 
-# 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 Aozora_Error.new("�T�|�[�g����Ă��Ȃ����G�ȃ��r�t���ł�")
-      else
-        @rbspan = @under_ruby.length
-      end
-    end
-    
-    # target
-    if @rbspan
-      @target.each{|x|
-        ans.concat("<rb>#{x.to_s}</rb>")
-      }
+  def initialize(input, output)
+    if input.respond_to?(:read) ## readable IO?
+      @stream = Jstream.new(input)
     else
-      ans.concat("<rb>#{@target.to_s}</rb>")
+      @stream = Jstream.new(File.open(input,"rb:Shift_JIS"))
     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
+    if output.respond_to?(:print) ## writable IO?
+      @out = output
     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
-
-class Kunten_tag < Aozora_tag
-  include Inline_tag
-end
-
-class Kaeriten_tag < Kunten_tag
-  def initialize (parser, string)
-    @string = string
-    super
-  end
-  def to_s
-    "<sub class=\"kaeriten\">#{@string.to_s}</sub>"
-  end
-end
-
-class Okurigana_tag < Kunten_tag
-  def initialize (parser, string)
-    @string = string
-    super
-  end
-  def to_s
-    "<sup class=\"okurigana\">#{@string.to_s}</sup>"
-  end
-end
-
-class Inline_keigakomi_tag < Reference_mentioned_tag
-  def initialize (parser, target)
-    @target = target
-    super
-  end
-  def to_s
-    "<span class=\"keigakomi\">#{@target.to_s}</span>"
-  end
-end
-
-class Inline_yokogumi_tag < Reference_mentioned_tag
-  def initialize (parser, target)
-    @target = target
-    super
-  end
-  def to_s
-    "<span class=\"yokogumi\">#{@target.to_s}</span>"
-  end
-end
-
-class Inline_caption_tag < Reference_mentioned_tag
-  def initialize (parser, target)
-    @target = target
-    super
-  end
-  def to_s
-    "<span class=\"caption\">#{@target.to_s}</span>"
-  end
-end
-
-class Inline_font_size_tag < Reference_mentioned_tag
-  def initialize (parser, target, times, daisho)
-    @target = target
-    @class = daisho.to_s + times.to_s
-    @style = case times
-             when 1
-               ""
-             when 2
-               "x-"
-             else
-               if times >= 3
-                 "xx-"
-               else
-                 raise Aozora_Error.new("�����T�C�Y�̎w�肪�s���ł�")
-               end
-             end + case daisho
-                   when :dai
-                     "large"
-                   when :sho
-                     "small"
-                   end
-    super
-  end
-  def to_s
-    "<span class=\"#{@class}\" style=\"font-size: #{@style};\">" + @target.to_s + "</span>"
-  end
-end
-
-class Decorate_tag < Reference_mentioned_tag
-  def initialize (parser, target, html_class, html_tag)
-    @target = target; @close = "</#{html_tag}>"
-    @open = "<#{html_tag} class=\"#{html_class}\">"
-    super
-  end
-  def to_s
-    @open+@target.to_s+@close
-  end
-end
-
-class Dakuten_katakana_tag < Aozora_tag
-  include Inline_tag
-  def initialize (parser, n, katakana)
-    @n = n; @katakana = katakana
-    super
-  end
-  def to_s
-    "<img src=\"#{$gaiji_dir}/1-07/1-07-8#{@n}.png\" alt=\"��(���_�t���Љ����u#{@katakana}�v�A1-07-8#{@n})\" class=\"gaiji\" />"
-  end
-end
-
-class Dir_tag < Reference_mentioned_tag
-  def initialize (parser, target)
-    @target = target
-    super
-  end
-  def to_s
-    "<span dir=\"ltr\">#{@target.to_s}</span>"
-  end
-end
-
-class Img_tag < Aozora_tag
-  include Inline_tag
-  def initialize (parser, filename, css_class, alt, width, height)
-    @filename = filename; @css_class = css_class; @alt = alt; @width = width; @height = height
-    super
-  end
-  def to_s
-    "<img class=\"#{@css_class}\" width=\"#{@width}\" height=\"#{@height}\" src=\"#{@filename}\" alt=\"#{@alt}\" />"
-  end
-end
-
-# tag��`�I���
-
-# �ϊ���{��
-class Aozora2Html
-  # �S�p�o�b�N�X���b�V�����o���Ȃ����璼�ł�
-  @@ku = ["18e5"].pack("h*").force_encoding("shift_jis")
-  @@noji = ["18f5"].pack("h*").force_encoding("shift_jis")
-  @@dakuten = ["18d8"].pack("h*").force_encoding("shift_jis")
-  # @@kunoji = ["18e518f5"].pack("h*")
-  # utf8 ["fecbf8fecbcb"].pack("h*")
-  # @@dakutenkunoji = ["18e518d818f5"].pack("h*")
-  # utf8 ["fecbf82e083bfecbcb"].pack("h*")
-  @@accent_table = {
-    "!"=>{
-      "@"=>["1-09/1-09-03","�t���Q��"]
-    },
-    "?"=>{
-      "@"=>["1-09/1-09-22","�t�^�╄"]
-    },
-    "A"=>{
-      "`"=>["1-09/1-09-23","�O���[�u�A�N�Z���g�t��A"],
-      "'"=>["1-09/1-09-24","�A�L���[�g�A�N�Z���g�t��A"],
-      "^"=>["1-09/1-09-25","�T�[�J���t���b�N�X�A�N�Z���g�t��"],
-      "~"=>["1-09/1-09-26","�`���h�t��A"],
-      ":"=>["1-09/1-09-27","�_�C�G���V�X�t��A"],
-      "&"=>["1-09/1-09-28","�ナ���O�t��A"],
-      "_"=>["1-09/1-09-85","�}�N�����t��A"],
-      "E"=>{"&"=>["1-09/1-09-29","���K�`��AE"]}
-    },
-    "C"=>{
-      ","=>["1-09/1-09-30","�Z�f�B���t��C"]
-    },
-    "E"=>{
-      "`"=>["1-09/1-09-31","�O���[�u�A�N�Z���g�t��E"],
-      "'"=>["1-09/1-09-32","�A�L���[�g�A�N�Z���g�t��E"],
-      "^"=>["1-09/1-09-33","�T�[�J���t���b�N�X�A�N�Z���g�t��E"],
-      ":"=>["1-09/1-09-34","�_�C�G���V�X�t��E"],
-      "_"=>["1-09/1-09-88","�}�N�����t��E"]
-    },
-    "I"=>{
-      "`"=>["1-09/1-09-35","�O���[�u�A�N�Z���g�t��I"],
-      "'"=>["1-09/1-09-36","�A�L���[�g�A�N�Z���g�t��I"],
-      "^"=>["1-09/1-09-37","�T�[�J���t���b�N�X�A�N�Z���g�t��I"],
-      ":"=>["1-09/1-09-38","�_�C�G���V�X�t��I"],
-      "_"=>["1-09/1-09-86","�}�N�����t��I"]
-    },
-    "N"=>{
-      "~"=>["1-09/1-09-40","�`���h�t��N"]
-    },
-    "O"=>{
-      "`"=>["1-09/1-09-41","�O���[�u�A�N�Z���g�t��O"],
-      "'"=>["1-09/1-09-42","�A�L���[�g�A�N�Z���g�t��O"],
-      "^"=>["1-09/1-09-43","�T�[�J���t���b�N�X�A�N�Z���g�t��O"],
-      "~"=>["1-09/1-09-44","�`���h�t��O"],
-      ":"=>["1-09/1-09-45","�_�C�G���V�X�t��O"],
-      "/"=>["1-09/1-09-46","�X�g���[�N�t��O"],
-      "_"=>["1-09/1-09-89","�}�N�����t��O"],
-      "E"=>{"&"=>["1-11/1-11-11","���K�`��OE�啶��"]}
-    },
-    "U"=>{
-      "`"=>["1-09/1-09-47","�O���[�u�A�N�Z���g�t��U"],
-      "'"=>["1-09/1-09-48","�A�L���[�g�A�N�Z���g�t��U"],
-      "^"=>["1-09/1-09-49","�T�[�J���t���b�N�X�A�N�Z���g�t��U"],
-      ":"=>["1-09/1-09-50","�_�C�G���V�X�t��U"],
-      "_"=>["1-09/1-09-87","�}�N�����t��U"]
-    },
-    "Y"=>{
-      "'"=>["1-09/1-09-51","�A�L���[�g�A�N�Z���g�t��Y"]
-    },
-    "s"=>{
-      "&"=>["1-09/1-09-53","�h�C�c��G�X�c�F�b�g"]
-    },
-    "a"=>{
-      "`"=>["1-09/1-09-54","�O���[�u�A�N�Z���g�t��A������"],
-      "'"=>["1-09/1-09-55","�A�L���[�g�A�N�Z���g�t��A������"],
-      "^"=>["1-09/1-09-56","�T�[�J���t���b�N�X�A�N�Z���g�t��A������"],
-      "~"=>["1-09/1-09-57","�`���h�t��A������"],
-      ":"=>["1-09/1-09-58","�_�C�G���V�X�t��A������"],
-      "&"=>["1-09/1-09-59","�ナ���O�t��A������"],
-      "_"=>["1-09/1-09-90","�}�N�����t��A������"],
-      "e"=>{"&"=>["1-09/1-09-60","���K�`��AE������"]}
-    },
-    "c"=>{
-      ","=>["1-09/1-09-61","�Z�f�B���t��C������"]
-    },
-    "e"=>{
-      "`"=>["1-09/1-09-62","�O���[�u�A�N�Z���g�t��E������"],
-      "'"=>["1-09/1-09-63","�A�L���[�g�A�N�Z���g�t��E������"],
-      "^"=>["1-09/1-09-64","�T�[�J���t���b�N�X�A�N�Z���g�t��E������"],
-      ":"=>["1-09/1-09-65","�_�C�G���V�X�t��E������"],
-      "_"=>["1-09/1-09-93","�}�N�����t��E������"]
-    },
-    "i"=>{
-      "`"=>["1-09/1-09-66","�O���[�u�A�N�Z���g�t��I������"],
-      "'"=>["1-09/1-09-67","�A�L���[�g�A�N�Z���g�t��I������"],
-      "^"=>["1-09/1-09-68","�T�[�J���t���b�N�X�A�N�Z���g�t��I������"],
-      ":"=>["1-09/1-09-69","�_�C�G���V�X�t��I������"],
-      "_"=>["1-09/1-09-91","�}�N�����t��I������"]
-    },
-    "n"=>{
-      "~"=>["1-09/1-09-71","�`���h�t��N������"]
-    },
-    "o"=>{
-      "`"=>["1-09/1-09-72","�O���[�u�A�N�Z���g�t��O������"],
-      "'"=>["1-09/1-09-73","�A�L���[�g�A�N�Z���g�t��O������"],
-      "^"=>["1-09/1-09-74","�T�[�J���t���b�N�X�A�N�Z���g�t��O������"],
-      "~"=>["1-09/1-09-75","�`���h�t��O������"],
-      ":"=>["1-09/1-09-76","�_�C�G���V�X�t��O������"],
-      "_"=>["1-09/1-09-94","�}�N�����t��O������"],
-      "/"=>["1-09/1-09-77","�X�g���[�N�t��O������"],
-      "e"=>{"&"=>["1-11/1-11-10","���K�`��OE������"]}
-    },
-    "u"=>{
-      "`"=>["1-09/1-09-78","�O���[�u�A�N�Z���g�t��U������"],
-      "'"=>["1-09/1-09-79","�A�L���[�g�A�N�Z���g�t��U������"],
-      "^"=>["1-09/1-09-80","�T�[�J���t���b�N�X�A�N�Z���g�t��U������"],
-      "_"=>["1-09/1-09-92","�}�N�����t��U������"],
-      ":"=>["1-09/1-09-81","�_�C�G���V�X�t��U������"]
-    },
-    "y"=>{
-      "'"=>["1-09/1-09-82","�A�L���[�g�A�N�Z���g�t��Y������"],
-      ":"=>["1-09/1-09-84","�_�C�G���V�X�t��Y������"]
-    }
-  }
-  # [class, tag]
-  @@command_table = {
-    "�T�_" => ["sesame_dot","em"], 
-    "���S�}�T�_" => ["white_sesame_dot","em"],
-    "�ۖT�_" => ["black_circle","em"],
-    "���ۖT�_" => ["white_circle","em"],
-    "���O�p�T�_" => ["black_up-pointing_triangle","em"],
-    "���O�p�T�_" => ["white_up-pointing_triangle","em"],
-    "��d�ۖT�_" => ["bullseye","em"],
-    "�ւ̖ږT�_" => ["fisheye","em"],
-    "�΂–T�_" => ["saltire", "em"],
-    "�T��"=> ["underline_solid","em"],
-    "��d�T��"=> ["underline_double","em"],
-    "����"=> ["underline_dotted","em"],
-    "�j��"=> ["underline_dashed","em"],
-    "�g��"=> ["underline_wave","em"],
-    "����"=> ["futoji","span"],
-    "�Α�"=> ["shatai","span"],
-    "���t��������"=>["subscript","sub"],
-    "��t��������"=>["superscript","sup"],
-    "�s�E������"=>["superscript","sup"],
-    "�s��������"=>["subscript","sub"]
-  }
-  def initialize (input, output)
-    @stream = Jstream.new(File.open(input,"rb:Shift_JIS"))
-    @buffer = []; @ruby_buf = [""]; @ruby_char_type = nil
-    @out = File.open(output,"w"); @section = :head; @header = []; @style_stack = []
-    @chuuki_table = {}; @images = []; @indent_stack = []; @tag_stack = []
-    @midashi_id = 0; @terprip = true
-    @endchar = :eof
-  end
-  
-  def scount
+      @out = File.open(output,"w")
+    end
+    @buffer = []
+    @ruby_buf = RubyBuffer.new
+    @section = :head  ## ���ݏ������̃Z�N�V����(:head,:head_end,:chuuki,:chuuki_in,:body,:tail)
+    @header = Aozora2Html::Header.new()  ## �w�b�_�s�̔z��
+    @style_stack = StyleStack.new  ##�X�^�C���̃X�^�b�N
+    @chuuki_table = {} ## �Ō�ɂǂ̒��L���o������ێ����Ă���
+    @images = []  ## �g�p�����O���̉摜�ێ��p
+    @indent_stack = []
+    @tag_stack = []
+    @midashi_id = 0  ## ���o���̃J�E���^�A���o���̎�ނɂ���đ������قȂ�
+    @terprip = true  ## ���s����p (terpri��Lisp�R��?)
+    @endchar = :eof  ## ��͏I�������AAccentParser��TagParser�ł͈قȂ�
+    @noprint = nil
+  end
+
+  def line_number
     @stream.line
   end
 
   def block_allowed_context?
     # inline_tag���J���Ă��Ȃ����`�F�b�N����Ώ\��
-    not(@style_stack.last)
+    @style_stack.empty?
   end
 
+  # �ꕶ���ǂݍ���
   def read_char
     @stream.read_char
   end
 
-  def read_to (endchar)
-    buf=""
-    loop{
-      char=@stream.read_char
-      if char==endchar
+  # �w�肳�ꂽ�I�[����(1������String��CRLF)�܂œǂݍ���
+  #
+  #  @param [String] endchar �I�[����
+  def read_to(endchar)
+    buf = ""
+    loop do
+      char = @stream.read_char
+      if char == endchar
         break
       else
         if char.kind_of?(Symbol)
           print endchar
         end
         buf.concat(char)
-      end}
+      end
+    end
     buf
   end
 
   def read_accent
-    Aozora_accent_parser.new(@stream,"�l",@chuuki_table,@images).process
+    Aozora2Html::AccentParser.new(@stream, "�l", @chuuki_table, @images).process
   end
 
-  def read_to_nest (endchar)
-    Aozora_tag_parser.new(@stream,endchar,@chuuki_table,@images).process
+  def read_to_nest(endchar)
+    Aozora2Html::TagParser.new(@stream, endchar, @chuuki_table, @images).process
   end
 
   def read_line
-    tmp=read_to("\r\n")
-    @buffer=[]
+    tmp = read_to("\r\n")
+    @buffer = []
     tmp
   end
 
-  def process ()
-    catch(:terminate){
-      loop{
-        begin
-          parse
-        rescue Aozora_Exception => e
-          puts e.message(scount)
-          if e.is_a?(Aozora_Error)
-            exit(2)
+  # parse����
+  #
+  # �I�����i�I�[�܂ŗ����ꍇ�j�ɂ�throw :terminate�ŒE�o����
+  #
+  def process
+    begin
+      catch(:terminate) do
+        loop do
+          begin
+            parse
+          rescue Aozora2Html::Error => e
+            puts e.message(line_number)
+            if e.is_a?(Aozora2Html::Error)
+              exit(2)
+            end
           end
         end
-      }
-    }
-    tail_output # final call
-    finalize
-    close
-  end
-  
-  def char_type (char)
-    if char.is_a?(Accent_tag)
-      :hankaku
-    elsif char.is_a?(Gaiji_tag)
-      :kanji
-    elsif char.is_a?(Kunten_tag) # just remove this line
-      :else
-    elsif char.is_a?(Dakuten_katakana_tag)
-      :katakana
-    elsif char.is_a?(Aozora_tag)
-      :else
-    elsif char.match(/[��-��T�U]/)
-      :hiragana
-    elsif char.match(/[�@-���[�R�S��]/)
-      :katakana
-    elsif char.match(/[�O-�X�`-�y��-����-����-�ք@-�`�p-���|���f�C�D]/)
-      :zenkaku
-    elsif char.match(/[A-Za-z0-9#\-\&'\,]/)
-      :hankaku
-    elsif char.match(/[��-꤁X���W�Y�Z��]/)
-      :kanji
-    elsif char.match(/[\.\;\"\?\!\)]/)
-      :hankaku_terminate
-    else
+      end
+      tail_output # final call
+      finalize
+      close
+    rescue => e
+      puts "ERROR: line: #{line_number}"
+      raise e
+    end
+  end
+
+  def char_type(char)
+    begin
+      char.char_type
+    rescue
       :else
     end
   end
-  
-  def finalize ()
+
+  def finalize
     hyoki
     dynamic_contents
     @out.print("</body>\r\n</html>\r\n")
   end
-  
+
   def dynamic_contents
-    @out.print("<div id=\"card\">\r\n<hr />\r\n<br />\r\n")
-    @out.print("<a href=\"JavaScript:goLibCard();\" id=\"goAZLibCard\">���}���J�[�h</a>")
-    @out.print("<script type=\"text/javascript\" src=\"../../contents.js\"></script>\r\n")
-    @out.print("<script type=\"text/javascript\" src=\"../../golibcard.js\"></script>\r\n")
-    @out.print("</div>")
+    @out.print "<div id=\"card\">\r\n<hr />\r\n<br />\r\n" +
+               "<a href=\"JavaScript:goLibCard();\" id=\"goAZLibCard\">���}���J�[�h</a>" +
+               "<script type=\"text/javascript\" src=\"../../contents.js\"></script>\r\n" +
+               "<script type=\"text/javascript\" src=\"../../golibcard.js\"></script>\r\n" +
+               "</div>"
   end
 
-  def close ()
+  def close
     @stream.close
     @out.close
   end
-  
-  def convert_indent_type (type)
-    case type
-    when :jisage
-      "������"
-    when :chitsuki
-      "�n�t��"
-    when :keigakomi
-      "�r�͂�"
-    when :caption
-      "�L���v�V����"
-    when :jizume
-      "���l��"
-    when :futoji
-      "����"
-    when :shatai
-      "�Α�"
-    when :sho
-      "�����ȕ���"
-    when :dai
-      "�傫�ȕ���"
-    else
-      type
-    end
+
+  def convert_indent_type(type)
+    INDENT_TYPE[type] || type
   end
 
-  def check_close_match (type)
+  def check_close_match(type)
     ind = if @indent_stack.last.is_a?(String)
             @noprint = true
             :jisage
@@ -966,9 +214,9 @@ class Aozora2Html
     end
   end
 
-  def implicit_close (type)
+  def implicit_close(type)
     if @indent_stack.last
-      if n = check_close_match(type)
+      if check_close_match(type)
         # ok, nested multiline tags, go ahead
       else
         # not nested, please close
@@ -982,19 +230,20 @@ class Aozora2Html
 
   def ensure_close
     if n = @indent_stack.last
-      raise Aozora_Error.new("#{convert_indent_type(n)}���ɖ{�����I�����܂���")
+      raise Aozora2Html::Error, "#{convert_indent_type(n)}���ɖ{�����I�����܂���"
     end
-  end 
-  
-  def explicit_close (type)
-    if n = check_close_match(type)
-      raise Aozora_Error.new("#{n}��‚��悤�Ƃ��܂������A#{n}���ł͂���܂���")                            
+  end
+
+  def explicit_close(type)
+    n = check_close_match(type)
+    if n
+      raise Aozora2Html::Error, "#{n}��‚��悤�Ƃ��܂������A#{n}���ł͂���܂���"
     end
     if tag = @tag_stack.pop
       push_chars(tag)
     end
   end
-  
+
   # main loop
   def parse
     case @section
@@ -1009,175 +258,50 @@ class Aozora2Html
     when :tail
       parse_tail
     else
-      Aozora_Error.new("encount undefined condition")
+      raise Aozora2Html::Error, "encount undefined condition"
     end
   end
 
   def judge_chuuki
     # ���L�����邩�ǂ����`�F�b�N
-    i=0
-    loop{
+    i = 0
+    loop do
       case @stream.peek_char(i)
       when "-"
-        i=i+1
+        i += 1
       when "\r\n"
-        @section = :chuuki
-        return
+        if i == 0 && @stream.peek_char(1) == "\r\n"
+          @section = :body
+          return
+        else
+          @section = :chuuki
+          return
+        end
       else
         @section = :body
         @out.print("<br />\r\n")
         return
       end
-    }
+    end
   end
 
   # header�͈�s���“ǂ�
   def parse_header
     string = read_line
     # refine from Tomita 09/06/14
-    if (string == "") # ��s������΁A�����Ńw�b�_�[�I���Ƃ݂Ȃ�
+    if string == ""  # ��s������΁A�����Ńw�b�_�[�I���Ƃ݂Ȃ�
       @section = :head_end
-      process_header
+      @out.print @header.to_html
     else
-      string.gsub!(/�b/,"")
+      string.gsub!(RUBY_PREFIX,"")
       string.gsub!(/�s.*?�t/,"")
       @header.push(string)
     end
   end
-  
-  def html_title_push (string, hash, attr)
-    found = hash[attr]
-    if found
-      if found != ""
-        string + " " + found
-      else
-        found
-      end
-    else
-      string
-    end
-  end
-  
-  def out_header_info (hash, attr, true_name = nil)
-    found = hash[attr]
-    if found
-      @out.print("<h2 class=\"#{true_name or attr}\">#{found}</h2>\r\n")
-    end
-  end
-  
-  def header_element_type (string)
-    original = true
-    string.each_char{|x|
-      code = x.unpack("H*")[0]
-      if ("00" <= code and code <= "7f") or # 1byte
-          ("8140" <= code and code <= "8258") or # 1-1, 3-25
-          ("839f" <= code and code <= "8491") # 6-1, 7-81
-        # continue
-      else
-        original = false
-        break
-      end
-    }
-    if original
-      :original
-    elsif string.match(/[�Z��|��|�ҏW|�ҏW�Z��|�Z���ҏW]$/)
-      :editor
-    elsif string.match(/�Җ�$/)
-      :henyaku
-    elsif string.match(/��$/)
-      :translator
-    end
-  end      
-  
-  def process_person (string,header_info)
-    type = header_element_type(string)
-    case type
-    when :editor
-      header_info[:editor] = string
-    when :translator
-      header_info[:translator] = string
-    when :henyaku
-      header_info[:henyaku] = string
-    else
-      type = :author
-      header_info[:author] = string
-    end
-    type
-  end
-  
-  def process_header()
-    header_info = {:title=>@header[0]}
-    case @header.length
-    when 2
-      process_person(@header[1],header_info)
-    when 3
-      if header_element_type(@header[1]) == :original
-        header_info[:original_title] = @header[1]
-        process_person(@header[2],header_info)
-      elsif process_person(@header[2],header_info) == :author
-        header_info[:subtitle] = @header[1]
-      else
-        header_info[:author] = @header[1]
-      end      
-    when 4
-      if header_element_type(@header[1]) == :original
-        header_info[:original_title] = @header[1]
-      else
-        header_info[:subtitle] = @header[1]
-      end
-      if process_person(@header[3],header_info) == :author
-        header_info[:subtitle] = @header[2]
-      else
-        header_info[:author] = @header[2]
-      end
-    when 5
-      header_info[:original_title] = @header[1]
-      header_info[:subtitle] = @header[2]
-      header_info[:author] = @header[3]
-      if process_person(@header[4],header_info) == :author
-        raise Aozora_Error.new("parser encounted author twice")
-      end      
-    when 6
-      header_info[:original_title] = @header[1]
-      header_info[:subtitle] = @header[2]
-      header_info[:original_subtitle] = @header[3]
-      header_info[:author] = @header[4]
-      if process_person(@header[5],header_info) == :author
-        raise Aozora_Error.new("parser encounted author twice")
-      end
-    end
-
-    # <title> �s���\�z
-    html_title = "<title>#{header_info[:author]}"
-    html_title = html_title_push(html_title, header_info, :translator)
-    html_title = html_title_push(html_title, header_info, :editor)
-    html_title = html_title_push(html_title, header_info, :henyaku)
-    html_title = html_title_push(html_title, header_info, :title)
-    html_title = html_title_push(html_title, header_info, :original_title)
-    html_title = html_title_push(html_title, header_info, :subtitle)
-    html_title = html_title_push(html_title, header_info, :original_subtitle)
-    html_title += "</title>"
-    
-    # �o��
-    @out.print("<?xml version=\"1.0\" encoding=\"Shift_JIS\"?>\r\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"\r\n    \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\r\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"ja\" >\r\n<head>\r\n	<meta http-equiv=\"Content-Type\" content=\"text/html;charset=Shift_JIS\" />\r\n	<meta http-equiv=\"content-style-type\" content=\"text/css\" />\r\n")
-    $css_files.each{|css|
-      @out.print("\t<link rel=\"stylesheet\" type=\"text/css\" href=\"" + css + "\" />\r\n")
-    }
-    @out.print("\t#{html_title}\r\n	<script type=\"text/javascript\" src=\"../../jquery-1.4.2.min.js\"></script>\r\n  <link rel=\"Schema.DC\" href=\"http://purl.org/dc/elements/1.1/\" />\r\n	<meta name=\"DC.Title\" content=\"#{header_info[:title]}\" />\r\n	<meta name=\"DC.Creator\" content=\"#{header_info[:author]}\" />\r\n	<meta name=\"DC.Publisher\" content=\"�‹󕶌�\" />\r\n</head>\r\n<body>\r\n<div class=\"metadata\">\r\n")
-    @out.print("<h1 class=\"title\">#{header_info[:title]}</h1>\r\n")
-    out_header_info(header_info, :original_title)
-    out_header_info(header_info, :subtitle)
-    out_header_info(header_info, :original_subtitle)
-    out_header_info(header_info, :author)
-    out_header_info(header_info, :editor)
-    out_header_info(header_info, :translator)
-    out_header_info(header_info, :henyaku, "editor-translator")
-    @out.print("<br />\r\n<br />\r\n</div>\r\n<div id=\"contents\" style=\"display:none\"></div><div class=\"main_text\">")
-  end
 
   def parse_chuuki
     string = read_line
-    if (string.match(/^\-+$/))
+    if string.match(/^\-+$/)
       case @section
       when :chuuki
         @section = :chuuki_in
@@ -1187,39 +311,39 @@ class Aozora2Html
     end
   end
 
-  def illegal_char_check (char)
+  def illegal_char_check(char, line)
     if char.is_a?(String)
       code = char.unpack("H*")[0]
-      if code == "21" or 
+      if (code == "21" or
           code == "23" or
-          ("a1" <= code and code <= "a5") or 
-          ("28" <= code and code<= "29") or
+          ("a1" <= code and code <= "a5") or
+          ("28" <= code and code <= "29") or
           code == "5b" or
           code == "5d" or
           code == "3d" or
           code == "3f" or
           code == "2b" or
-          ("7b" <= code and code <= "7d")      
-        puts "�x��(#{scount}�s��):1�o�C�g�́u#{char}�v���g���Ă��܂�"
+          ("7b" <= code and code <= "7d"))
+        puts "�x��(#{line}�s��):1�o�C�g�́u#{char}�v���g���Ă��܂�"
       end
 
       if code == "81f2"
-        puts "�x��(#{scount}�s��):���L�L���̌�p�̉”\��������A�u#{char}�v���g���Ă��܂�"
+        puts "�x��(#{line}�s��):���L�L���̌�p�̉”\��������A�u#{char}�v���g���Ă��܂�"
       end
-      
-      if ("81ad" <=  code and code <= "81b7") or
+
+      if (("81ad" <=  code and code <= "81b7") or
           ("81c0" <=  code and code <= "81c7") or
           ("81cf" <=  code and code <= "81d9") or
           ("81e9" <=  code and code <= "81ef") or
           ("81f8" <=  code and code <= "81fb") or
-          ("8240" <=  code and code <= "824e") or 
-          ("8259" <=  code and code <= "825f") or 
-          ("827a" <=  code and code <= "8280") or 
+          ("8240" <=  code and code <= "824e") or
+          ("8259" <=  code and code <= "825f") or
+          ("827a" <=  code and code <= "8280") or
           ("829b" <=  code and code <= "829e") or
-          ("82f2" <=  code and code <= "82fc") or 
-          ("8397" <=  code and code <= "839e") or  
-          ("83b7" <=  code and code <= "83be") or 
-          ("83d7" <=  code and code <= "83fc") or 
+          ("82f2" <=  code and code <= "82fc") or
+          ("8397" <=  code and code <= "839e") or
+          ("83b7" <=  code and code <= "83be") or
+          ("83d7" <=  code and code <= "83fc") or
           ("8461" <=  code and code <= "846f") or
           ("8492" <=  code and code <= "849e") or
           ("84bf" <=  code and code <= "84fc") or
@@ -1233,16 +357,17 @@ class Aozora2Html
           ("ec40" <=  code and code <= "ecfc") or
           ("ed40" <=  code and code <= "edfc") or
           ("ee40" <=  code and code <= "eefc") or
-          ("ef40" <=  code and code <= "effc")
-        puts "�x��(#{scount}�s��):JIS�O���u#{char}�v���g���Ă��܂�"
+          ("ef40" <=  code and code <= "effc"))
+        puts "�x��(#{line}�s��):JIS�O���u#{char}�v���g���Ă��܂�"
       end
     end
   end
 
   # �{�̉�͕�
+  #
   # 1�������“ǂݍ��݁Adispatch����@buffer,@ruby_buf�ւ��܂�
   # ���s�R�[�h�ɓ��������痭�ߍ��񂾂��̂�general_output����
-  
+
   def parse_body
     char = read_char
     check = true
@@ -1258,60 +383,52 @@ class Aozora2Html
       char = dispatch_gaiji
     when "�m"
       char = dispatch_aozora_command
-    when @@ku
+    when KU
       assign_kunoji
     when "�s"
       char = apply_ruby
     end
-    if char == "\r\n"
+
+    case char
+    when "\r\n"
       general_output
-    elsif char == "�b"
-      ruby_buf_dump
-      @ruby_buf_protected = true
-    elsif char == @endchar
+    when RUBY_PREFIX
+      @ruby_buf.dump(@buffer)
+      @ruby_buf.protected = true
+    when @endchar
       # suddenly finished the file
-      puts "�x��(#{scount}�s��):�\�����ʃt�@�C���I�["
-        throw :terminate
-    elsif char != nil
+      puts "�x��(#{line_number}�s��):�\�����ʃt�@�C���I�["
+      throw :terminate
+    when nil
+      # noop
+    else
       if check
-        illegal_char_check(char)
+        illegal_char_check(char, line_number)
       end
       push_chars(char)
     end
   end
-  
+
   def ending_check
+    # `��{�F`�Ńt�b�^(:tail)�ɑJ��
     if @stream.peek_char(0) == "�{" and @stream.peek_char(1) == "�F"
       @section = :tail
       ensure_close
       @out.print "</div>\r\n<div class=\"bibliographical_information\">\r\n<hr />\r\n<br />\r\n"
     end
   end
-  
-  # buffer management
-  def ruby_buf_dump
-    if @ruby_buf_protected
-      @ruby_buf.unshift("�b")
-      @ruby_buf_protected = nil
-    end
-    top = @ruby_buf[0]
-    if top.is_a?(String) and @buffer.last.is_a?(String)
-      @buffer.last.concat(top)
-      @buffer = @buffer + @ruby_buf[1,@ruby_buf.length]
-    else
-      @buffer = @buffer + @ruby_buf
-    end
-    @ruby_buf = [""]
-  end    
 
-  def push_chars (obj)
+  # Original Aozora2Html#push_chars does not convert "'" into '&#39;'; it's old behaivor
+  # of CGI.escapeHTML().
+  #
+  def push_chars(obj)
     if obj.is_a?(Array)
       obj.each{|x|
         push_chars(x)
       }
     elsif obj.is_a?(String)
       if obj.length == 1
-        obj = CGI.escapeHTML(obj)
+        obj = obj.gsub(/[&\"<>]/, {'&' => '&amp;', '"' => '&quot;', '<' => '&lt;', '>' => '&gt;'})
       end
       obj.each_char{|x|
         push_char(x)
@@ -1321,46 +438,48 @@ class Aozora2Html
     end
   end
 
-  def push_char (char) 
+  def push_char(char)
    ctype = char_type(char)
-    if ctype == :hankaku_terminate and @ruby_buf_type == :hankaku
-      if @ruby_buf.last.is_a?(String)
-        @ruby_buf.last.concat(char)
+    if ctype == :hankaku_terminate and @ruby_buf.char_type == :hankaku
+      if @ruby_buf.last_is_string?
+        @ruby_buf.last_concat(char)
       else
         @ruby_buf.push(char)
       end
-      @ruby_buf_type = :else
-    elsif @ruby_buf_protected or (ctype != :else and ctype == @ruby_buf_type)
-      if char.is_a?(String) and @ruby_buf.last.is_a?(String)
-        @ruby_buf.last.concat(char)
+      @ruby_buf.char_type = :else
+    elsif @ruby_buf.protected or (ctype != :else and ctype == @ruby_buf.char_type)
+      if char.is_a?(String) and @ruby_buf.last_is_string?
+        @ruby_buf.last_concat(char)
       else
         @ruby_buf.push(char)
         @ruby_buf.push("")
       end
     else
-      ruby_buf_dump
-      @ruby_buf_type = ctype
-      @ruby_buf = [char]
+      @ruby_buf.dump(@buffer)
+      @ruby_buf.clear(char)
+      @ruby_buf.char_type = ctype
     end
   end
-  
-  def buf_is_blank? (buf)
+
+  def buf_is_blank?(buf)
     buf.each{|token|
       if token.is_a?(String) and not(token=="")
         return false
-      elsif token.is_a?(Oneline_Indent_tag)
+      elsif token.is_a?(Aozora2Html::Tag::OnelineIndent)
         return :inline
       end
     }
     true
   end
-  
-  def terpri? (buf)
+
+  # �s����<br />���o�͂���ׂ����ǂ����̔��ʗp
+  #
+  def terpri?(buf)
     flag = true
     buf.each{|x|
-      if x.is_a?(Multiline_tag)
+      if x.is_a?(Aozora2Html::Tag::Multiline)
         flag = false
-      elsif (x.is_a?(String) and x == "") 
+      elsif (x.is_a?(String) and x == "")
         nil
       else
         return true
@@ -1369,18 +488,24 @@ class Aozora2Html
     flag
   end
 
+  # �ǂݍ��񂾍s�̏o�͂��s��
+  #
+  # parser�����s������ǂݍ��񂾂�Ă΂��
+  # @ruby_buf��@buffer�͏���������
+  #
   def general_output
     if @style_stack.last
-      raise Aozora_Error.new("#{@style_stack.last[0]}���ɉ��s����܂����B���s���܂����v�f�ɂ̓u���b�N�\�L��p���Ă�������")
+      raise Aozora2Html::Error, "#{@style_stack.last_command}���ɉ��s����܂����B���s���܂����v�f�ɂ̓u���b�N�\�L��p���Ă�������"
     end
     # buffer�ɃC���f���g�^�O����������������s���Ȃ��I
     if @noprint
       @noprint = false
       return
     end
-    ruby_buf_dump
+    @ruby_buf.dump(@buffer)
     buf = @buffer
-    @ruby_buf = [""]; @ruby_buf_mode = nil; @buffer = []
+    @ruby_buf.clear
+    @buffer = []
     tail = []
 
     indent_type = buf_is_blank?(buf)
@@ -1390,26 +515,22 @@ class Aozora2Html
     if @indent_stack.last.is_a?(String) and not(indent_type)
       @out.print @indent_stack.last
     end
-    
+
     buf.each{|s|
-      if s.is_a?(Oneline_Indent_tag)
+      if s.is_a?(Aozora2Html::Tag::OnelineIndent)
         tail.unshift(s.close_tag)
-      elsif s.is_a?(UnEmbed_Gaiji_tag) and not(s.escaped?)
+      elsif s.is_a?(Aozora2Html::Tag::UnEmbedGaiji) and !s.escaped?
         # �����Ă��������𕜊�������
         @out.print "��"
-      elsif s.is_a?(Multiline_Chitsuki_tag)
-      elsif s.is_a?(String) and s.match("</em")
       end
       @out.print s.to_s
     }
+
+    # �Ō��CRLF���o�͂���
     if @indent_stack.last.is_a?(String)
       # �Ԃ牺��indent
       # tail always active
-      if tail.last
-        tail.each{|s|
-          @out.print s.to_s
-        }
-      end
+      @out.print tail.map{|s| s.to_s}.join("")
       if indent_type == :inline
         @out.print "\r\n"
       elsif indent_type and terprip
@@ -1417,25 +538,23 @@ class Aozora2Html
       else
         @out.print "</div>\r\n"
       end
-    elsif tail.last
-      tail.each{|s|
-        @out.print s.to_s
-      }
-      @out.print "\r\n"
-    elsif terprip
+    elsif tail.empty? and terprip
       @out.print "<br />\r\n"
     else
+      @out.print tail.map{|s| s.to_s}.join("")
       @out.print "\r\n"
     end
   end
-  
+
   # �O���Q�Ƃ̔��� Ruby,style�d�˂������X�̂��߁A�v�f�̔z��ŕԂ�
-  def search_front_reference (string)
+  #
+  # �O���Q�Ƃ�`�����m���u�����v�ɖT�_�n`�A`�����m���u���v�Ɂu�}�}�v�̒��L�n`�Ƃ������\�L
+  def search_front_reference(string)
     if string.length == 0
       return false
     end
-    searching_buf = if @ruby_buf.length != 0
-                      @ruby_buf
+    searching_buf = if @ruby_buf.present?
+                      @ruby_buf.to_a
                     else
                       @buffer
                     end
@@ -1444,7 +563,7 @@ class Aozora2Html
       if last_string == ""
         searching_buf.pop
         search_front_reference(string.sub(Regexp.new(Regexp.quote(last_string)+"$"),""))
-      elsif match = last_string.match(Regexp.new(Regexp.quote(string)+"$"))
+      elsif last_string.match(Regexp.new(Regexp.quote(string)+"$"))
         # ���S��v
         # start = match.begin(0)
         # tail = match.end(0)
@@ -1463,7 +582,7 @@ class Aozora2Html
           false
         end
       end
-    elsif last_string.is_a?(Reference_mentioned_tag)
+    elsif last_string.is_a?(Aozora2Html::Tag::ReferenceMentioned)
       inner = last_string.target_string
       if inner == string
         # ���S��v
@@ -1484,15 +603,15 @@ class Aozora2Html
       false
     end
   end
-  
+
   # ���������O���Q�Ƃ����ɖ߂�
-  def recovery_front_reference (reference)
+  def recovery_front_reference(reference)
     reference.each{|elt|
-#      if @ruby_buf_protected
-      if @ruby_buf.length > 0
-        if @ruby_buf.last.is_a?(String)
+#      if @ruby_buf.protected
+      if @ruby_buf.present?
+        if @ruby_buf.last_is_string?
           if elt.is_a?(String)
-            @ruby_buf.last.concat(elt)
+            @ruby_buf.last_concat(elt)
           else
             @ruby_buf.push(elt)
           end
@@ -1512,8 +631,8 @@ class Aozora2Html
       end
     }
   end
-  
-  def convert_japanese_number (command)
+
+  def convert_japanese_number(command)
     tmp = command.tr("�O-�X", "0-9")
     tmp.tr!("���O�l�ܘZ������Z","1234567890")
     tmp.gsub!(/(\d)�\(\d)/){"#{$1}#{$2}"}
@@ -1523,29 +642,29 @@ class Aozora2Html
     tmp
   end
 
-  def kuten2png (substring)
+  def kuten2png(substring)
     desc = substring.gsub(/�u���v[��|��]/,"")
     match = desc.match(/[12]\-\d{1,2}\-\d{1,2}/)
     if (match and not(desc.match(/��0213�O��/)) and not(desc.match(/��.*��/)))
       @chuuki_table[:newjis] = true
       codes = match[0].split("-")
-      folder = sprintf("%1d-%02d",*codes)
+      folder = sprintf("%1d-%02d", codes[0], codes[1])
       code = sprintf("%1d-%02d-%02d",*codes)
-       Embed_Gaiji_tag.new(self, folder,code,desc.gsub!("��",""))
-     else
-       substring
-     end
+      Aozora2Html::Tag::EmbedGaiji.new(self, folder, code, desc.gsub!("��",""))
+    else
+      substring
+    end
   end
 
-  def escape_gaiji (command)
-    whole, kanji, line = command.match(/(?:��)(.*)(?:�A)(.*)/).to_a
+  def escape_gaiji(command)
+    _whole, kanji, line = command.match(/(?:��)(.*)(?:�A)(.*)/).to_a
     tmp = @images.assoc(kanji)
     if tmp
       tmp.push(line)
     else
-      @images.push([kanji,line])
+      @images.push([kanji, line])
     end
-    UnEmbed_Gaiji_tag.new(self, command)
+    Aozora2Html::Tag::UnEmbedGaiji.new(self, command)
   end
 
   def dispatch_gaiji
@@ -1553,19 +672,22 @@ class Aozora2Html
     if hook ==  "�m"
       read_char
       # embed?
-      command,raw = read_to_nest("�n")
+      command, _raw = read_to_nest("�n")
       try_emb = kuten2png(command)
-      if try_emb == command
+      if try_emb != command
+        try_emb
+      elsif command.match(/U\+([0-9A-F]{4,5})/) && Aozora2Html::Tag::EmbedGaiji.use_unicode
+        unicode_num = $1
+        Aozora2Html::Tag::EmbedGaiji.new(self, nil, nil, command, unicode_num)
+      else
         # Unemb
         escape_gaiji(command)
-      else
-        try_emb
       end
     else
       "��"
     end
   end
-  
+
   def dispatch_aozora_command
     if @stream.peek_char(0) != "��"
       "�m"
@@ -1577,13 +699,13 @@ class Aozora2Html
         apply_burasage(command)
 
       elsif command.match(/^��������/)
-        exec_block_start_command(command.sub(/^��������/,""))
+        exec_block_start_command(command)
       elsif command.match(/^������/)
-        exec_block_end_command(command.sub(/^������/,""))
+        exec_block_end_command(command)
 
       elsif command.match(/���蒍/)
         apply_warichu(command)
-      elsif command.match(/������/) 
+      elsif command.match(/������/)
         apply_jisage(command)
       elsif command.match(/fig(\d)+_(\d)+\.png/)
         exec_img_command(command,raw)
@@ -1598,9 +720,9 @@ class Aozora2Html
       elsif command.match(/1-7-8[2345]/)
         apply_dakuten_katakana(command)
       elsif command.match(/^([���O�l�ܘZ������\���㒆���b�������V�n�l]+)$/)
-        Kaeriten_tag.new(self, command)
+        Aozora2Html::Tag::Kaeriten.new(self, command)
       elsif command.match(/^�i(.+)�j$/)
-        Okurigana_tag.new(self, command.gsub!(/[�i�j]/,""))
+        Aozora2Html::Tag::Okurigana.new(self, command.gsub!(/[�i�j]/,""))
       elsif command.match(/(�n�t��|���グ)(�I���)*$/)
         apply_chitsuki(command)
       elsif exec_inline_start_command(command)
@@ -1611,7 +733,7 @@ class Aozora2Html
     end
   end
 
-  def apply_burasage (command)
+  def apply_burasage(command)
     tag = nil
     if implicit_close(:jisage)
       @terprip = false
@@ -1632,21 +754,21 @@ class Aozora2Html
     @tag_stack.push("") # dummy
     nil
   end
-  
-  def jisage_width (command)
+
+  def jisage_width(command)
     convert_japanese_number(command).match(/(\d*)(?:������)/)[1]
   end
-  
-  def apply_jisage (command)
+
+  def apply_jisage(command)
     if command.match(/�܂�/) or command.match(/�I���/)
       # �������I���
-      explicit_close(:jisage) 
+      explicit_close(:jisage)
       @indent_stack.pop
       nil
     else
       if command.match(/���̍s/)
         # 1�s����
-        @buffer.unshift(Oneline_Jisage_tag.new(self, jisage_width(command)))
+        @buffer.unshift(Aozora2Html::Tag::OnelineJisage.new(self, jisage_width(command)))
         nil
       else
         if @buffer.length == 0 and @stream.peek_char(0) == "\r\n"
@@ -1656,28 +778,25 @@ class Aozora2Html
           # adhook hack
           @noprint = false
           @indent_stack.push(:jisage)
-          Multiline_Jisage_tag.new(self, jisage_width(command))
+          Aozora2Html::Tag::MultilineJisage.new(self, jisage_width(command))
         else
-          @buffer.unshift(Oneline_Jisage_tag.new(self, jisage_width(command)))
+          @buffer.unshift(Aozora2Html::Tag::OnelineJisage.new(self, jisage_width(command)))
           nil
         end
       end
     end
   end
 
-  def apply_warichu (command)
+  def apply_warichu(command)
     if command.match(/�I���/)
-      check = @stream.peek_char(0)
-      if check == "�j"
-        push_chars('</span>')
-      else
+      if @stream.peek_char(0) != "�j"
         push_chars('�j')
-        push_chars('</span>')
       end
+      push_chars('</span>')
     else
-    check = @ruby_buf.last
-    if check.is_a?(String) and check.match(/�i$/)
-      push_chars('<span class="warichu">')
+      check = @ruby_buf.last
+      if check.is_a?(String) and check.match(/�i$/)
+        push_chars('<span class="warichu">')
       else
         push_chars('<span class="warichu">')
         push_chars('�i')
@@ -1686,7 +805,7 @@ class Aozora2Html
     nil
   end
 
-  def chitsuki_length (command)
+  def chitsuki_length(command)
     command = convert_japanese_number(command)
     if match = command.match(/([0-9]+)��/)
       match[1]
@@ -1694,8 +813,8 @@ class Aozora2Html
       "0"
     end
   end
-  
-  def apply_chitsuki (string, multiline = false)
+
+  def apply_chitsuki(string, multiline = false)
     if string.match(/�����Œn�t���I���/) or
         string.match(/�����Ŏ��グ�I���/)
       explicit_close(:chitsuki)
@@ -1707,15 +826,29 @@ class Aozora2Html
         # �����s�w��
         implicit_close(:chitsuki)
         @indent_stack.push(:chitsuki)
-        Multiline_Chitsuki_tag.new(self, l)
+        Aozora2Html::Tag::MultilineChitsuki.new(self, l)
       else
         # 1�s�̂�
-        Oneline_Chitsuki_tag.new(self, l)
+        Aozora2Html::Tag::OnelineChitsuki.new(self, l)
       end
     end
   end
 
-  def new_midashi_id(inc)
+  def new_midashi_id(size)
+    inc = 1
+    if size.kind_of?(String)
+      if size.match(SIZE_SMALL)
+        inc = 1
+      elsif size.match(SIZE_MIDDLE)
+        inc = 10
+      elsif size.match(SIZE_LARGE)
+        inc = 100
+      else
+        raise Aozora2Html::Error, I18n.t(:undefined_header)
+      end
+    else
+      inc = size
+    end
     @midashi_id += inc
   end
 
@@ -1724,41 +857,41 @@ class Aozora2Html
       midashi_type = :normal
       if command.match(/���s/)
         midashi_type = :dogyo
-      elsif command.match (/��/)
+      elsif command.match(/��/)
         midashi_type = :mado
       else
         @terprip = false
       end
-    Multiline_midashi_tag.new(self,command,midashi_type)
+    Aozora2Html::Tag::MultilineMidashi.new(self,command,midashi_type)
   end
 
   def apply_yokogumi(command)
     @indent_stack.push(:yokogumi)
-    Multiline_yokogumi_tag.new(self)
+    Aozora2Html::Tag::MultilineYokogumi.new(self)
   end
 
   def apply_keigakomi(command)
     @indent_stack.push(:keigakomi)
-    Keigakomi_tag.new(self)
+    Aozora2Html::Tag::Keigakomi.new(self)
   end
 
   def apply_caption(command)
     @indent_stack.push(:caption)
-    Multiline_caption_tag.new(self)
+    Aozora2Html::Tag::MultilineCaption.new(self)
   end
 
   def apply_jizume(command)
     w = convert_japanese_number(command).match(/(\d*)(?:���l��)/)[1]
     @indent_stack.push(:jizume)
-    Jizume_tag.new(self, w)
+    Aozora2Html::Tag::Jizume.new(self, w)
   end
-  
-  def push_block_tag (tag,closing)
+
+  def push_block_tag(tag,closing)
     push_chars(tag)
     closing.concat(tag.close_tag)
   end
 
-  def exec_inline_start_command (command)
+  def exec_inline_start_command(command)
     case command
     when "���L�t��"
       @style_stack.push([command,'</ruby>'])
@@ -1775,6 +908,9 @@ class Aozora2Html
     when "�L���v�V����"
       @style_stack.push([command,'</span>'])
       push_chars('<span class="caption">')
+    when "����"
+      @style_stack.push([command,'</span>'])
+      push_chars('<span class="warigaki">')
     when "�匩�o��"
       @style_stack.push([command,'</a></h3>'])
       @terprip = false
@@ -1808,7 +944,7 @@ class Aozora2Html
     else
       if command.match(/(.*)�i�K(..)�ȕ���/)
         @style_stack.push([command,'</span>'])
-        whole, nest, style = command.match(/(.*)�i�K(..)�ȕ���/).to_a
+        _whole, nest, style = command.match(/(.*)�i�K(..)�ȕ���/).to_a
         times = convert_japanese_number(nest).to_i
         daisho = if style.match("��")
                    :sho
@@ -1816,30 +952,14 @@ class Aozora2Html
                    :dai
                  end
         html_class = daisho.to_s + times.to_s
-        size = case times
-               when 1
-                 ""
-               when 2
-                 "x-"
-               else
-                 if times >= 3
-                   "xx-"
-                 else
-                   raise Aozora_Error.new("�����T�C�Y�̎w�肪�s���ł�")
-                 end
-               end + case daisho
-                     when :dai
-                       "large"
-                     when :sho
-                       "small"
-                     end
+        size = Utils.create_font_size(times, daisho)
         push_chars("<span class=\"#{html_class}\" style=\"font-size: #{size};\">")
       else
         ## Decoration ##
         key = command
         filter = lambda{|x| x}
         if command.match(/(�E|��|��|��)��(.*)/)
-          whole, dir, com = command.match(/(�E|��|��|��)��(.*)/).to_a
+          _whole, dir, com = command.match(/(�E|��|��|��)��(.*)/).to_a
           # renew command
           key = com
           if command.match(/�_/)
@@ -1854,23 +974,23 @@ class Aozora2Html
             end
           end
         end
-        
-        found = @@command_table[key]
+
+        found = COMMAND_TABLE[key]
         # found = [class, tag]
         if found
           @style_stack.push([command,"</#{found[1]}>"])
-          if found[1] == "em" # or found[1] == "strong" 
-            @chuuki_table[:em] = true
-          end
           push_chars("<#{found[1]} class=\"#{filter.call(found[0])}\">")
         else
+          if $DEBUG
+            puts "�x��(#{line_number}�s��):�u#{key}�v�͖��Ή��̃R�}���h�̂��ߖ������܂�"
+          end
           nil
         end
       end
     end
   end
 
-  def exec_inline_end_command (command)
+  def exec_inline_end_command(command)
     encount = command.sub("�I���","")
     if encount == "�{��"
       # force to finish main_text
@@ -1878,19 +998,21 @@ class Aozora2Html
       ensure_close
       @noprint = true
       @out.print "</div>\r\n<div class=\"after_text\">\r\n<hr />\r\n"
-    elsif encount.match("���L�t��") and @style_stack.last[0] == "���L�t��"
+    elsif encount.match("���L�t��") and @style_stack.last_command == "���L�t��"
       # special inline ruby
       @style_stack.pop
-      whole, ruby = encount.match("�u(.*)�v�̒��L�t��").to_a
+      _whole, ruby = encount.match("�u(.*)�v�̒��L�t��").to_a
       push_char("</rb><rp>�i</rp><rt>#{ruby}</rt><rp>�j</rp></ruby>")
-    elsif @style_stack.last[0].match(encount)
+    elsif @style_stack.last_command.match(encount)
       push_chars(@style_stack.pop[1])
     else
-      raise Aozora_Error.new("#{encount}���I�����悤�Ƃ��܂������A#{@style_stack.last[0]}���ł�")
+      raise Aozora2Html::Error, "#{encount}���I�����悤�Ƃ��܂������A#{@style_stack.last_command}���ł�"
     end
   end
 
-  def exec_block_start_command (command)
+  def exec_block_start_command(command)
+    original_command = command.dup
+    command.sub!(/^��������/, "")
     match = ""
     if command.match(/������/)
       push_block_tag(apply_jisage(command),match)
@@ -1929,24 +1051,24 @@ class Aozora2Html
       end
       push_block_tag(apply_caption(command),match)
     end
-    
+
     if command.match(/����/)
       if match != ""
         @indent_stack.pop
       end
-      push_block_tag(Multiline_style_tag.new(self, "futoji"),match)
+      push_block_tag(Aozora2Html::Tag::MultilineStyle.new(self, "futoji"),match)
       @indent_stack.push(:futoji)
     end
     if command.match(/�Α�/)
       if match != ""
         @indent_stack.pop
       end
-      push_block_tag(Multiline_style_tag.new(self, "shatai"),match)
+      push_block_tag(Aozora2Html::Tag::MultilineStyle.new(self, "shatai"),match)
       @indent_stack.push(:shatai)
-    end     
+    end
 
     if command.match(/(.*)�i�K(..)�ȕ���/)
-      whole, nest, style = command.match(/(.*)�i�K(..)�ȕ���/).to_a
+      _whole, nest, style = command.match(/(.*)�i�K(..)�ȕ���/).to_a
       if match != ""
         @indent_stack.pop
       end
@@ -1955,76 +1077,86 @@ class Aozora2Html
                else
                  :dai
                end
-      push_block_tag(Font_size_tag.new(self,
-                                       convert_japanese_number(nest).to_i,
-                                       daisho),match)
+      push_block_tag(Aozora2Html::Tag::FontSize.new(self,
+                                                    convert_japanese_number(nest).to_i,
+                                                    daisho),
+                     match)
       @indent_stack.push(daisho)
     end
 
     if match == ""
-      apply_rest_notes("��������" + command)
+      apply_rest_notes(original_command)
     else
       @tag_stack.push(match)
       nil
     end
   end
 
-  def exec_block_end_command (command)
+  def detect_command_mode(command)
+    if command.match(/������/)
+      :jisage
+    elsif command.match(/(�n�t��|���グ)�I���$/)
+      :chitsuki
+    elsif command.match(/���o��/)
+      :midashi
+    elsif command.match(/���l��/)
+      :jizume
+    elsif command.match(/���g��/)
+      :yokogumi
+    elsif command.match(/�r�͂�/)
+      :keigakomi
+    elsif command.match(/�L���v�V����/)
+      :caption
+    elsif command.match(/����/)
+      :futoji
+    elsif command.match(/�Α�/)
+      :shatai
+    elsif command.match(/�傫�ȕ���/)
+      :dai
+    elsif command.match(/�����ȕ���/)
+      :sho
+    else
+      nil
+    end
+  end
+
+  def exec_block_end_command(command)
+    original_command = command.dup
+    command.sub!(/^������/, "")
     match = false
-    if mode = if command.match(/������/)
-                :jisage
-              elsif command.match(/(�n�t��|���グ)�I���$/)
-                :chitsuki
-              elsif command.match(/���o��/)
-                :midashi
-              elsif command.match(/���l��/)
-                :jizume
-              elsif command.match(/���g��/)
-                :yokogumi
-              elsif command.match(/�r�͂�/)
-                :keigakomi
-              elsif command.match(/�L���v�V����/)
-                :caption
-              elsif command.match(/����/)
-                :futoji
-              elsif command.match(/�Α�/)
-                :shatai
-              elsif command.match(/�傫�ȕ���/)
-                :dai
-              elsif command.match(/�����ȕ���/)
-                :sho
-              end
+    mode = detect_command_mode(command)
+    if mode
       explicit_close(mode)
       match = @indent_stack.pop
     end
-    
+
     if match
-      if not(match.is_a?(String))
+      if !match.is_a?(String)
         @terprip = false
       end
       nil
     else
-      apply_rest_notes("������" + command)
+      apply_rest_notes(original_command)
     end
   end
-  
-  def exec_img_command (command,raw)
+
+  def exec_img_command(command,raw)
     match = raw.match(/(.*)�i(fig.+\.png)(�A��([0-9]+)�~�c([0-9]+))*�j����/)
     if match
-      whole, alt, src, wh, width, height = match.to_a
+      _whole, alt, src, _wh, width, height = match.to_a
       css_class = if alt.match(/�ʐ^/)
                     "photo"
                   else
                     "illustration"
                   end
-      Img_tag.new(self, src, css_class, alt, width, height)
+      Aozora2Html::Tag::Img.new(self, src, css_class, alt, width, height)
     else
       apply_rest_notes(command)
     end
   end
 
-  def exec_frontref_command (command)
-    whole, reference, spec1, spec2 = command.match(/�u([^�u�v]*(?:�u.+�v)*[^�u�v]*)�v[��|��|��](�u.+�v��)*(.+)/).to_a
+  def exec_frontref_command(command)
+    _whole, reference, spec1, spec2 = command.match(/�u([^�u�v]*(?:�u.+�v)*[^�u�v]*)�v[�ɂ͂�](�u.+�v��)*(.+)/).to_a
     spec = if spec1
              spec1 + spec2
            else
@@ -2042,37 +1174,37 @@ class Aozora2Html
     apply_rest_notes(command)
   end
 
-  def multiply (bouki, times)
+  def multiply(bouki, times)
     s = ""
     (times-1).times{
       s += bouki
-      s += "<!>"
+      s += "&nbsp;"
     }
     s + bouki
   end
 
-  def include_ruby? (array)
+  def include_ruby?(array)
     array.index{|elt|
-      if elt.is_a?(Ruby_tag)
+      if elt.is_a?(Aozora2Html::Tag::Ruby)
         true
-      elsif elt.is_a?(Reference_mentioned_tag)
+      elsif elt.is_a?(Aozora2Html::Tag::ReferenceMentioned)
         if elt.target.is_a?(Array)
           include_ruby?(elt.target)
         else
-          elt.target.is_a?(Ruby_tag)
+          elt.target.is_a?(Aozora2Html::Tag::Ruby)
         end
       end
     }
   end
-  
+
   # complex ruby wrap up utilities -- don't erase! we will use soon ...
-  def rearrange_ruby_tag (targets, upper_ruby, under_ruby = "")
+  def rearrange_ruby_tag(targets, upper_ruby, under_ruby = "")
     target,upper,under = rearrange_ruby(targets, upper_ruby, under_ruby)
-    Ruby_tag.new(self, target,upper,under)
+    Aozora2Html::Tag::Ruby.new(self, target,upper,under)
   end
-  
+
   # ruby�^�O�̍Ċ��蓖��
-  def rearrange_ruby (targets, upper_ruby, under_ruby = "")
+  def rearrange_ruby(targets, upper_ruby, under_ruby = "")
     if include_ruby?(targets)
       new_targets = []
       new_upper = if upper_ruby != ""
@@ -2086,31 +1218,31 @@ class Aozora2Html
                     []
                   end
       if new_upper.length > 1 and new_under.length > 1
-        raise Aozora_Error.new("1�‚̒P���3�‚̃��r�͂‚����܂���")
+        raise Aozora2Html::Error, "1�‚̒P���3�‚̃��r�͂‚����܂���"
       end
-    
+
       targets.each{|x|
-        if x.is_a?(Ruby_tag)
+        if x.is_a?(Aozora2Html::Tag::Ruby)
           if x.target.is_a?(Array)
-            # inner Ruby_tag is already complex ... give up
-            raise Aozora_Error.new("�����ӏ���2�‚̃��r�͂‚����܂���")
+            # inner Aozora2Html::Tag::Ruby is already complex ... give up
+            raise Aozora2Html::Error, "�����ӏ���2�‚̃��r�͂‚����܂���"
           else
             if x.ruby != ""
               if new_upper.is_a?(Array)
                 new_upper.push(x.ruby)
               else
-              raise Aozora_Error.new("�����ӏ���2�‚̃��r�͂‚����܂���")
+              raise Aozora2Html::Error, "�����ӏ���2�‚̃��r�͂‚����܂���"
               end
             else
               if new_under.is_a?(Array)
               new_under.push(x.under_ruby)
               else
-                raise Aozora_Error.new("�����ӏ���2�‚̃��r�͂‚����܂���")
+                raise Aozora2Html::Error, "�����ӏ���2�‚̃��r�͂‚����܂���"
               end
             end
             new_targets.push(x.target)
           end
-        elsif x.is_a?(Reference_mentioned_tag)
+        elsif x.is_a?(Aozora2Html::Tag::ReferenceMentioned)
           if x.target.is_a?(Array)
             # recursive
             tar,up,un = rearrange_ruby(x.target,"","")
@@ -2122,12 +1254,12 @@ class Aozora2Html
             if new_under.is_a?(Array)
               new_under.concat(un)
             elsif un.to_s.length > 0
-              raise Aozora_Error.new("�����ӏ���2�‚̃��r�͂‚����܂���")
+              raise Aozora2Html::Error, "�����ӏ���2�‚̃��r�͂‚����܂���"
             end
             if new_upper.is_a?(Array)
               new_upper.concat(up)
             elsif up.to_s.length > 0
-              raise Aozora_Error.new("�����ӏ���2�‚̃��r�͂‚����܂���")
+              raise Aozora2Html::Error, "�����ӏ���2�‚̃��r�͂‚����܂���"
             end
           else
             new_targets.push(x)
@@ -2153,36 +1285,36 @@ class Aozora2Html
       [targets, upper_ruby, under_ruby]
     end
   end
-  
-  def exec_style (targets, command)
+
+  def exec_style(targets, command)
     try_kuten = kuten2png(command)
     if try_kuten != command
       try_kuten
     elsif command.match(/�c����/)
-      Dir_tag.new(self, targets)
+      Aozora2Html::Tag::Dir.new(self, targets)
     elsif command.match(/���g��/)
-      Inline_yokogumi_tag.new(self, targets)
+      Aozora2Html::Tag::InlineYokogumi.new(self, targets)
     elsif command.match(/�r�͂�/)
-      Inline_keigakomi_tag.new(self, targets)
+      Aozora2Html::Tag::InlineKeigakomi.new(self, targets)
     elsif command.match(/�L���v�V����/)
-      Inline_caption_tag.new(self, targets)
+      Aozora2Html::Tag::InlineCaption.new(self, targets)
     elsif command.match(/�Ԃ�_/)
-      Kaeriten_tag.new(self, targets)
+      Aozora2Html::Tag::Kaeriten.new(self, targets)
     elsif command.match(/�P�_���艼��/)
-      Okurigana_tag.new(self, targets)
+      Aozora2Html::Tag::Okurigana.new(self, targets)
     elsif command.match(/���o��/)
       midashi_type = :normal
       if command.match(/���s/)
         midashi_type = :dogyo
-      elsif command.match (/��/)
+      elsif command.match(/��/)
         midashi_type = :mado
       else
         @terprip = false
       end
-      Midashi_tag.new(self, targets, command, midashi_type)
+      Aozora2Html::Tag::Midashi.new(self, targets, command, midashi_type)
     elsif command.match(/(.*)�i�K(..)�ȕ���/)
-      whole, nest, style = command.match(/(.*)�i�K(..)�ȕ���/).to_a
-      Inline_font_size_tag.new(self,targets,
+      _whole, nest, style = command.match(/(.*)�i�K(..)�ȕ���/).to_a
+      Aozora2Html::Tag::InlineFontSize.new(self,targets,
                                convert_japanese_number(nest).to_i,
                                if style.match("��")
                                  :sho
@@ -2190,14 +1322,14 @@ class Aozora2Html
                                  :dai
                                end)
     elsif command.match(/(��|��)�Ɂu([^�v]*)�v��(���r|���L)/)
-      whole, dir, under = command.match(/(��|��)�Ɂu([^�v]*)�v��(���r|���L)/).to_a
-      if targets.length == 1 and targets[0].is_a?(Ruby_tag)
+      _whole, dir, under = command.match(/(��|��)�Ɂu([^�v]*)�v��(���r|���L)/).to_a
+      if targets.length == 1 and targets[0].is_a?(Aozora2Html::Tag::Ruby)
         tag = targets[0]
         if tag.under_ruby == ""
           tag.under_ruby = under
           tag
         else
-          raise Aozora_Error.new("1�‚̒P���3�‚̃��r�͂‚����܂���")
+          raise Aozora2Html::Error, "1�‚̒P���3�‚̃��r�͂‚����܂���"
         end
       else
         rearrange_ruby_tag(targets,"",under)
@@ -2205,12 +1337,12 @@ class Aozora2Html
     elsif command.match(/�u(.+?)�v�̒��L/)
       rearrange_ruby_tag(targets,/�u(.+?)�v�̒��L/.match(command).to_a[1])
     elsif command.match(/�u(.)�v�̖T�L/)
-      rearrange_ruby_tag(targets,multiply( /�u(.)�v�̖T�L/.match(command).to_a[1], target.length))
+      rearrange_ruby_tag(targets,multiply( /�u(.)�v�̖T�L/.match(command).to_a[1], targets.to_s.length))
     else
       ## direction fix! ##
       filter = lambda{|x| x}
       if command.match(/(�E|��|��|��)��(.*)/)
-        whole, dir, com = command.match(/(�E|��|��|��)��(.*)/).to_a
+        _whole, dir, com = command.match(/(�E|��|��|��)��(.*)/).to_a
         # renew command
         command = com
         if command.match(/�_/)
@@ -2225,81 +1357,73 @@ class Aozora2Html
           end
         end
       end
-     
-      found = @@command_table[command]
+
+      found = COMMAND_TABLE[command]
       # found = [class, tag]
       if found
-        if found[1] == "em" # or found[1] == "strong" 
-          @chuuki_table[:em] = true
-        end
-        Decorate_tag.new(self, targets, filter.call(found[0]), found[1])
+        Aozora2Html::Tag::Decorate.new(self, targets, filter.call(found[0]), found[1])
       else
         nil
       end
     end
   end
 
-  def apply_dakuten_katakana (command)
+  def apply_dakuten_katakana(command)
     n = command.match(/1-7-8([2345])/).to_a[1]
-    frontref =
-      case n
-        when "2"
-        "���J"
-        when "3"
-        "���J"
-        when "4"
-        "���J"
-        when "5"
-        "���J"
-      end
+    frontref = DAKUTEN_KATAKANA_TABLE[n]
     if found = search_front_reference(frontref)
-      Dakuten_katakana_tag.new(self, n,found.join)
+      Aozora2Html::Tag::DakutenKatakana.new(self, n,found.join)
     else
       apply_rest_notes(command)
     end
   end
 
+  # ���̎��_�̏���
+  #
+  # ���̎��_�͌��󂻂̂܂܏o�͂���̂Ńt�b�^�́u�\�L�ɂ‚��āv�ŏo�͂��邩�ǂ����̃t���O���������s��
   def assign_kunoji
     second = @stream.peek_char(0)
     case second
-    when @@noji
+    when NOJI
       @chuuki_table[:kunoji] = true
-    when @@dakuten
-      if @stream.peek_char(1) == @@noji
+    when DAKUTEN
+      if @stream.peek_char(1) == NOJI
         @chuuki_table[:dakutenkunoji] = true
       end
     end
   end
 
-  def apply_rest_notes (command)
+  def apply_rest_notes(command)
     @chuuki_table[:chuki] = true
-    Editor_note_tag.new(self, command)
+    Aozora2Html::Tag::EditorNote.new(self, command)
   end
 
   # �b�������Ƃ��͕�����𖳎�����ruby_buf�����Ȃ��Ⴂ���Ȃ�
   def apply_ruby
-    @ruby_buf_protected = nil
-    ruby,raw = read_to_nest("�t")
+    @ruby_buf.protected = nil
+    ruby, _raw = read_to_nest("�t")
     if ruby.length == 0
       # escaped ruby character
       return "�s�t"
     end
     ans = ""
     notes = []
-    @ruby_buf.each{|token|
-      if token.is_a?(UnEmbed_Gaiji_tag)
+    @ruby_buf.each do |token|
+      if token.is_a?(Aozora2Html::Tag::UnEmbedGaiji)
         ans.concat("��")
         token.escape!
         notes.push(token)
       else
         ans.concat(token.to_s)
-      end}
-    @buffer.push(Ruby_tag.new(self, ans, ruby))
+      end
+    end
+    @buffer.push(Aozora2Html::Tag::Ruby.new(self, ans, ruby))
     @buffer = @buffer + notes
-    @ruby_buf = [""]
+    @ruby_buf.clear
     nil
   end
 
+  # parse_body�̃t�b�^��
   def parse_tail
     char = read_char
     check = true
@@ -2308,33 +1432,39 @@ class Aozora2Html
       check = false
       char = read_accent
     when @endchar
-        throw :terminate
+      throw :terminate
     when "��"
       char = dispatch_gaiji
     when "�m"
       char = dispatch_aozora_command
-    when @@ku
-        assign_kunoji
+    when KU
+      assign_kunoji
     when "�s"
       char = apply_ruby
     end
-    if char == "\r\n"
+
+    case char
+    when "\r\n"
       tail_output
-    elsif char == "�b"
-      ruby_buf_dump
-      @ruby_buf_protected = true
-    elsif char != nil
+    when RUBY_PREFIX
+      @ruby_buf.dump(@buffer)
+      @ruby_buf.protected = true
+    when nil
+      # noop
+    else
       if check
-        illegal_char_check(char)
+        illegal_char_check(char, line_number)
       end
       push_chars(char)
     end
   end
 
+  # general_output�̃t�b�^��
   def tail_output
-    ruby_buf_dump
+    @ruby_buf.dump(@buffer)
     string = @buffer.join
-    @ruby_buf = [""]; @ruby_buf_mode = nil; @buffer = []
+    @ruby_buf.clear
+    @buffer = []
     string.gsub!("info@aozora.gr.jp",'<a href="mailto: info@aozora.gr.jp">info@aozora.gr.jp</a>')
     string.gsub!("�‹󕶌Ɂihttp://www.aozora.gr.jp/�j"){"<a href=\"http://www.aozora.gr.jp/\">#{$&}</a>"}
     if string.match(/(<br \/>$|<\/p>$|<\/h\d>$|<div.*>$|<\/div>$|^<[^>]*>$)/)
@@ -2343,8 +1473,9 @@ class Aozora2Html
       @out.print string, "<br />\r\n"
     end
   end
-  
-  def hyoki ()
+
+  # `���\�L�ɂ‚���`�Ŏg�p�������L�����o�͂���
+  def hyoki
     # <br /> times fix
     @out.print "<br />\r\n</div>\r\n<div class=\"notation_notes\">\r\n<hr />\r\n<br />\r\n���\�L�ɂ‚���<br />\r\n<ul>\r\n"
     @out.print "\t<li>���̃t�@�C���� W3C ���� XHTML1.1 �ɂ������`���ō쐬����Ă��܂��B</li>\r\n"
@@ -2353,22 +1484,19 @@ class Aozora2Html
     end
     if @chuuki_table[:kunoji]
       if @chuuki_table[:dakutenkunoji]
-        @out.print "\t<li>�u���̎��_�v�́u#{@@ku}#{@@noji}�v�ŁA�u���_�t�����̎��_�v�́u#{@@ku}#{@@dakuten}#{@@noji}�v�ŕ\���܂����B</li>\r\n"
+        @out.print "\t<li>�u���̎��_�v�́u#{KU}#{NOJI}�v�ŁA�u���_�t�����̎��_�v�́u#{KU}#{DAKUTEN}#{NOJI}�v�ŕ\���܂����B</li>\r\n"
       else
-        @out.print "\t<li>�u���̎��_�v�́u#{@@ku}#{@@noji}�v�ŕ\���܂����B</li>\r\n"
+        @out.print "\t<li>�u���̎��_�v�́u#{KU}#{NOJI}�v�ŕ\���܂����B</li>\r\n"
       end
     elsif @chuuki_table[:dakutenkunoji]
-      @out.print "\t<li>�u���_�t�����̎��_�v�́u#{@@ku}#{@@dakuten}#{@@noji}�v�ŕ\���܂����B</li>\r\n"
+      @out.print "\t<li>�u���_�t�����̎��_�v�́u#{KU}#{DAKUTEN}#{NOJI}�v�ŕ\���܂����B</li>\r\n"
     end
-    if @chuuki_table[:newjis]
+    if @chuuki_table[:newjis] && !Aozora2Html::Tag::EmbedGaiji.use_jisx0213
       @out.print "\t<li>�u���̎��_�v���̂���JIS X 0213�ɂ��镶���́A�摜�����Ė��ߍ��݂܂����B</li>\r\n"
     end
-    if @chuuki_table[:accent]
+    if @chuuki_table[:accent] && !Aozora2Html::Tag::Accent.use_jisx0213
       @out.print "\t<li>�A�N�Z���g�����t�����e�������́A�摜�����Ė��ߍ��݂܂����B</li>\r\n"
     end
-#    if @chuuki_table[:em]
-#      @out.print "\t<li>�T�_�⌗�_�A�T���̕t���������́A�����\���ɂ��܂����B</li>\r\n"
-#   end
     if @images[0]
       @out.print "\t<li>���̍�i�ɂ́AJIS X 0213�ɂȂ��A�ȉ��̕������p�����Ă��܂��B�i�����́A��{���̏o���u�y�[�W-�s�v���B�j�����̕����͖{�����ł́u���m���c�n�v�̌`�Ŏ����܂����B</li>\r\n</ul>\r\n<br />\r\n\t\t<table class=\"gaiji_list\">\r\n"
       @images.each{|cell|
@@ -2396,139 +1524,6 @@ class Aozora2Html
   end
 end
 
-# �‹�L�@�̓���q�ɑΉ��i�H�j
-class Aozora_tag_parser < Aozora2Html
-  def initialize (input, endchar, chuuki, image)
-    if not(input.is_a?(Jstream))
-      raise ArgumentError, "tag_parser must supply Jstream as input"
-    end
-    @stream = input;
-    @buffer = []; @ruby_buf = [""]; @ruby_char_type = nil
-    @chuuki_table = chuuki; @images = image; # global�Ȋ‹����L�^����A�C�e���͋��L����K�v����
-    @endchar = endchar # ���s���z����ׂ����ۂ��c
-    @section = :tail # ���������ƋL�@���̓C���f���g�����Ȃ��̂œ���
-    @raw = "" # �O���ϊ��O�̐��e�L�X�g���c���������Ƃ�����炵��
-  end
-
-  def read_char # method override!
-    c = @stream.read_char
-    @raw.concat(c)
-    c
-  end
-
-  def read_to_nest(endchar)
-    ans = super(endchar)
-    @raw.concat(ans[1])
-    ans
-  end
-
-  def general_output # �o�͂�[String,String]�Ԃ��ŁI
-    ruby_buf_dump
-    ans=""
-    @buffer.each{|s|
-      if s.is_a?(UnEmbed_Gaiji_tag) and not(s.escaped?)
-        # �����Ă��������𕜊�������
-        ans.concat("��")
-      end
-      ans.concat(s.to_s)
-    }
-    [ans,@raw]
-  end
-  
-  def process ()
-    catch(:terminate){
-      loop{
-          parse
-      }
-    }
-    general_output
-  end
-end
-
-# accent���ꕶ���𐶂������߂̍ċA�Ăяo��
-class Aozora_accent_parser < Aozora2Html
-  def initialize (input, endchar, chuuki, image)
-    if not(input.is_a?(Jstream))
-      raise ArgumentError, "tag_parser must supply Jstream as input"
-    end
-    @stream = input
-    @buffer = []; @ruby_buf = [""]; @ruby_char_type = nil
-    @chuuki_table = chuuki; @images = image; # global�Ȋ‹����L�^����A�C�e���͋��L����K�v����
-    @endchar = endchar # ���s�͉z�����Ȃ� <br />���o�͂��Ă����Ȃ�
-    @closed = nil # ���s�ł̋����P�ރ`�F�b�N�t���O
-    @encount_accent = nil
-  end
-
-  def general_output # �o�͔͂z��ŕԂ�
-    ruby_buf_dump
-    if not(@encount_accent)
-      @buffer.unshift("�k")
-    end
-    if @closed and not(@encount_accent)
-      @buffer.push("�l")
-    elsif not(@closed)
-      @buffer.push("<br />\r\n")
-    end
-    @buffer
-  end
-  
-  def parse
-    first = read_char
-    if found = @@accent_table[first]
-      if found2 = found[@stream.peek_char(0)]
-        if found2.is_a?(Hash)
-          if found3 = found2[@stream.peek_char(1)]
-            first = Accent_tag.new(self, *found3)
-            @encount_accent = true
-            @chuuki_table[:accent] = true
-            read_char
-            read_char
-          end
-        elsif found2
-          first = Accent_tag.new(self, *found2)
-          @encount_accent = true
-          read_char
-          @chuuki_table[:accent] = true
-        end
-      end
-    end
-    case first
-    when "��"
-      first = dispatch_gaiji
-    when "�m"
-      first = dispatch_aozora_command
-    when @@ku
-      assign_kunoji
-    when "�s"
-      first = apply_ruby
-    end
-    if first == "\r\n"
-      if @encount_accent
-        puts "�x��(#{scount}�s��):�A�N�Z���g�����̋T�b���ʂ̎n�߂ƏI��肪�A�s���ő����Ă��܂���"
-      end
-      throw :terminate
-    elsif first == "�l"
-      @closed = true
-      throw :terminate
-    elsif first == "�b"
-      ruby_buf_dump
-      @ruby_buf_protected = true
-    elsif first != "" and first != nil
-      illegal_char_check(first)
-      push_chars(first)
-    end
-  end
-  
-  def process ()
-    catch(:terminate){
-      loop{
-          parse
-      }
-    }
-    general_output
-  end
-end
-
 if $0 == __FILE__
   # todo: �����`�F�b�N�Ƃ�
   Aozora2Html.new($*[0],$*[1]).process