text-hyphen 1.0.0 → 1.0.2

data/README.txt

@@ -0,0 +1,82 @@
+== text-hyphen
+
+http://rubyforge.org/projects/text-format/
+http://github.com/halostatue/text-hyphen/
+
+== DESCRIPTION:
+
+Text::Hyphen will hyphenate words using modified versions of TeX hyphenation
+patterns.
+
+Text::Hyphen will properly hyphenate various words according to the rules of
+the language the word is written in. The algorithm is based on that of the TeX
+typesetting system by Donald E. Knuth. This is based on the Perl implementation
+of TeX::Hyphen[1] and the Ruby port[2]. The language hyphenation pattern files
+are based on the sources available from CTAN[3] as of 2004.12.19 and have been
+translated by Austin Ziegler.
+
+This release is 1.0.2. It is a minor bugfix for the RubyGem release of
+Text::Hyphen to enable the hyphen command-line program. Text::Hyphen represents
+a significant improvement over its predecessor, TeX::Hyphen.
+
+== SYNOPSIS:
+
+    require 'text/hyphen'
+    hh = Text::Hyphen.new(:language => 'en_us', :left => 2, :right => 2)
+    # Defaults to the above
+    hh = TeX::Hyphen.new
+    
+    word = "representation"
+    points = hyp.hyphenate(word)  #=> [3, 5, 8, 10]
+    puts hyp.visualize(word)      #=> rep-re-sen-ta-tion
+
+Text::Hyphen is truly multilingual[4]. As an example, consider the difference
+between the following:
+
+    require 'text/hyphen'
+    # Using left and right minimum values of 0 ensures that you will
+    # see all possible hyphenation points, not just those that meet
+    # the minimum width requirements.
+    en = Text::Hyphen.new(:left => 0, :right => 0)
+    fr = Text::Hyphen.new(:language = "fr", :left => 0, :right => 0)
+
+    puts en.visualise("organiser")      #=> or-gan-iser
+    puts fr.visualise("organiser")      #=> or-ga-ni-ser
+
+As you can see, the hyphenation is distinct between the two hyphenators.
+Additional improvements over TeX::Hyphen include thread safety (except for
+debug control) and (minimal) support for UTF-8.
+
+== FUTURE ENHANCEMENTS:
+
+* Ruby 1.9 compatibility.
+
+== INSTALL:
+
+* This release of text-hyphen is only installed with RubyGems.
+
+== DEVELOPERS:
+
+After checking out the source, run:
+
+  $ rake newb
+
+This task will install any missing dependencies, run the tests/specs,
+and generate the RDoc.
+
+== LICENSE:
+
+The licensing for Text::Hyphen is complex and somewhat dependent upon the
+languages being used during hyphenation; some languages are held under a more
+strict licence than that granted in the LICENCE file.
+
+Copyright 2004 - 2005 Austin Ziegler <austin@rubyforge.org>
+See the LICENCE.txt file for more information.
+
+[1] <http://search.cpan.org/author/JANPAZ/TeX-Hyphen-0.140/lib/TeX/Hyphen.pm>
+    Maintained by Jan Pazdziora.
+[2] Available at <http://rubyforge.org/projects/text-format>.
+[3] <http://www.ctan.org>
+[4] There are some bugs and design decisions in the original Perl
+    implementation of TeX::Hyphen that make it unsuitable for most multilingual
+    implementations that carried over to the Ruby port of TeX::Hyphen.

data/Rakefile

@@ -1,116 +1,24 @@
-#! /usr/bin/env rake
-$LOAD_PATH.unshift('lib')
+# -*- ruby -*-
 
 require 'rubygems'
-require 'rake/gempackagetask'
-require 'text/hyphen'
-require 'archive/tar/minitar'
-require 'zlib'
+require 'hoe'
+require 'rubyforge'
 
-DISTDIR = "text-hyphen-#{Text::Hyphen::VERSION}"
-TARDIST = "../#{DISTDIR}.tar.gz"
+Hoe.plugin :doofus
+Hoe.plugin :gemspec
+Hoe.plugin :git
+Hoe.plugin :rubyforge
 
-DATE_RE = %r<(\d{4})[./-]?(\d{2})[./-]?(\d{2})(?:[\sT]?(\d{2})[:.]?(\d{2})[:.]?(\d{2})?)?>
+Hoe.spec 'text-hyphen' do
+  developer('Austin Ziegler', 'austin@rubyforge.org')
+  self.rubyforge_name = 'text-format'
 
-if ENV['RELEASE_DATE']
-  year, month, day, hour, minute, second = DATE_RE.match(ENV['RELEASE_DATE']).captures
-  year ||= 0
-  month ||= 0
-  day ||= 0
-  hour ||= 0
-  minute ||= 0
-  second ||= 0
-  ReleaseDate = Time.mktime(year, month, day, hour, minute, second)
-else
-  ReleaseDate = nil
-end
-
-task :test do |t|
-  require 'test/unit/testsuite'
-  require 'test/unit/ui/console/testrunner'
-
-  runner = Test::Unit::UI::Console::TestRunner
-
-  $LOAD_PATH.unshift('tests')
-  $stderr.puts "Checking for test cases:" if t.verbose
-  Dir['tests/tc_*.rb'].each do |testcase|
-    $stderr.puts "\t#{testcase}" if t.verbose
-    load testcase
-  end
-
-  suite = Test::Unit::TestSuite.new("Text::Hyphen")
+  self.spec_extras[:required_ruby_version] = '< 1.9'
 
-  ObjectSpace.each_object(Class) do |testcase|
-    suite << testcase.suite if testcase < Test::Unit::TestCase
-  end
-
-  runner.run(suite)
-end
-
-spec = eval(File.read("text-hyphen.gemspec"))
-spec.version = Text::Hyphen::VERSION
-desc "Build the RubyGem for Text::Hyphen"
-task :gem => [ :test ]
-Rake::GemPackageTask.new(spec) do |g|
-  g.need_tar    = false
-  g.need_zip    = false
-  g.package_dir = ".."
-end
-
-desc "Build a Text::Hyphen .tar.gz distribution."
-task :tar => [ TARDIST ]
-file TARDIST => [ :test ] do |t|
-  current = File.basename(Dir.pwd)
-  Dir.chdir("..") do
-    begin
-      files = Dir["#{current}/**/*"].select { |dd| dd !~ %r{(?:/CVS/?|~$)} }
-      files.map! do |dd|
-        ddnew = dd.gsub(/^#{current}/, DISTDIR)
-        mtime = ReleaseDate || File.stat(dd).mtime
-        if File.directory?(dd)
-          { :name => ddnew, :mode => 0755, :dir => true, :mtime => mtime }
-        else
-          if dd =~ %r{bin/}
-            mode = 0755
-          else
-            mode = 0644
-          end
-          data = File.read(dd)
-          { :name => ddnew, :mode => mode, :data => data, :size => data.size,
-            :mtime => mtime }
-        end
-      end
-
-      ff = File.open(t.name.gsub(%r{^\.\./}o, ''), "wb")
-      gz = Zlib::GzipWriter.new(ff)
-      tw = Archive::Tar::Minitar::Writer.new(gz)
-
-      files.each do |entry|
-        if entry[:dir]
-          tw.mkdir(entry[:name], entry)
-        else
-          tw.add_file_simple(entry[:name], entry) { |os| os.write(entry[:data]) }
-        end
-      end
-    ensure
-      tw.close if tw
-      gz.close if gz
-    end
-  end
-end
-task TARDIST => [ :test ]
-
-def sign(file)
-  system %("C:/Program Files/Windows Privacy Tools/GnuPG/gpg.exe" -ba #{file}).gsub(%r{/}) { "\\" }
-  raise "Error signing with GPG." unless File.exists?("#{file}.asc")
-end
-
-task :signtar => [ :tar ] do
-  sign TARDIST
-end
-task :signgem => [ :gem ] do
-  sign "../#{DISTDIR}.gem"
+  self.extra_dev_deps << ['hoe-doofus', '~> 1.0']
+  self.extra_dev_deps << ['hoe-gemspec', '~> 1.0']
+  self.extra_dev_deps << ['hoe-git', '~> 1.0']
+  self.extra_dev_deps << ['hoe-seattlerb', '~> 1.0']
 end
 
-desc "Build everything."
-task :default => [ :signtar, :signgem ]
+# vim: syntax=ruby

data/bin/hyphen

@@ -4,7 +4,7 @@
 #
 # Licensed under the same terms as Ruby.
 #
-# $Id: hyphen,v 1.2 2004/12/20 22:43:03 austin Exp $
+# $Id$
 #++
 
 require 'optparse'
@@ -84,6 +84,7 @@ when :visualise
     size -= (vis.size + 1)
     print "#{vis} "
   end
+  puts
 when :hyphenate
   ARGV.each do |word|
     hyp = hyphenator.hyphenate(word)
@@ -102,6 +103,7 @@ when :hyphenate_to
     size -= (vis.size + 1)
     print "#{vis} "
   end
+  puts
 when :stats
   puts hyphenator.stats
 end

data/lib/text-hyphen.rb

@@ -0,0 +1 @@
+require 'text/hyphen'

data/lib/text/hyphen.rb

@@ -1,120 +1,116 @@
 module Text; end
 
-  # = Introduction
-  # Text::Hyphen -- hyphenate words using modified versions of TeX
-  # hyphenation patterns.
-  #
-  # == Usage
-  #   require 'text/hyphen'
-  #   hh = Text::Hyphen.new(:language => 'en_us', :left => 2, :right => 2)
-  #     # Defaults to the above
-  #   hh = TeX::Hyphen.new
-  #
-  #   word = "representation"
-  #   points = hyp.hyphenate(word)    #=> [3, 5, 8, 10]
-  #   puts hyp.visualize(word)        #=> rep-re-sen-ta-tion
-  #   
-  #   en = Text::Hyphen.new(:left => 0, :right => 0)
-  #   fr = Text::Hyphen.new(:language = "fr", :left => 0, :right => 0)
-  #   puts en.visualise("organiser")  #=> or-gan-iser
-  #   puts fr.visualise("organiser")  #=> or-ga-ni-ser
-  #
-  # == Description
-  # Creates a new Hyphen object and loads the language patterns into
-  # memory. The hyphenator can then be asked for the hyphenation of
-  # a word. If no language is specified, then the language en_us (EN_US)
-  # is used by default.
-  #
-  # Copyright::   Copyright (c) 2004 Austin Ziegler
-  # Version::     1.0.0
-  # Based On::    <tt>TeX::Hyphen</tt> 0.4 Copyright (c) 2003 - 2004
-  #               Martin DeMello and Austin Ziegler, in turn based on
-  #               Perl's <tt>TeX::Hyphen</tt>
-  #               [http://search.cpan.org/author/JANPAZ/TeX-Hyphen-0.140/lib/TeX/Hyphen.pm]
-  #               Copyright (c) 1997 - 2002 Jan Pazdziora
-  #
-  # == Licence
-  # Licensing for Text::Hyphen is unfortunately complex because of the
-  # various copyrights and licences of the source hyphenation files. Some of
-  # these files are available only under the TeX licence and others are
-  # available only under the GNU GPL while others are public domain. Each
-  # language file has these licences embedded within the file. Please
-  # consult each file's licence to ensure that it is compatible with your
-  # application.
-  #
-  # The copyright on the Text::Hyphen application/library and the Ruby
-  # translations of hyphenation files belongs to Austin Ziegler. All other
-  # copyrights on original versions still stand; Text::Hyphen is a derivative
-  # work of these and other projects.
-  #
-  # === Application and Compilation Licences
-  # Text::Hyphen, the application/library is licensed under the same terms
-  # as Ruby. Note that this specifically refers to the contents of
-  # bin/hyphen, lib/text/hyphen.rb, and lib/text/hyphen/language.rb.
-  #
-  # Individual language hyphenation files are NOT licensed under these
-  # terms, but under the following MIT-style licence and the original
-  # hyphenation pattern licenses. The copyright for the original TeX
-  # hyphenation files is held by the original authors; any mistakes in
-  # conversion of these files to Ruby is attributable to the contributors to
-  # the Text::Hyphen package only.
-  #
-  # The compilation package Text::Hyphen is licensed under the same terms as
-  # Ruby.
-  #
-  # === Blanket Language Hyphenation File Licence
-  # Permission is hereby granted, free of charge, to any person obtaining
-  # a copy of this software and associated documentation files (the
-  # "Software"), to deal in the Software without restriction, including
-  # without limitation the rights to use, copy, modify, merge, publish,
-  # distribute, sublicense, and/or sell copies of the Software, and to
-  # permit persons to whom the Software is furnished to do so, subject to
-  # the following conditions:
-  #
-  # The above copyright notice and this permission notice shall be included
-  # in all copies or substantial portions of the Software.
-  #
-  # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-  # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-  # IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-  # CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-  # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-  # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# = Introduction
+# Text::Hyphen -- hyphenate words using modified versions of TeX hyphenation
+# patterns.
+#
+# == Usage
+#   require 'text/hyphen'
+#   hh = Text::Hyphen.new(:language => 'en_us', :left => 2, :right => 2)
+#     # Defaults to the above
+#   hh = TeX::Hyphen.new
+#
+#   word = "representation"
+#   points = hyp.hyphenate(word)    #=> [3, 5, 8, 10]
+#   puts hyp.visualize(word)        #=> rep-re-sen-ta-tion
+#   
+#   en = Text::Hyphen.new(:left => 0, :right => 0)
+#   fr = Text::Hyphen.new(:language = "fr", :left => 0, :right => 0)
+#   puts en.visualise("organiser")  #=> or-gan-iser
+#   puts fr.visualise("organiser")  #=> or-ga-ni-ser
+#
+# == Description
+# Creates a new Hyphen object and loads the language patterns into memory.
+# The hyphenator can then be asked for the hyphenation of a word. If no
+# language is specified, then the language en_us (EN_US) is used by default.
+#
+# Copyright::   Copyright (c) 2004 - 2005 Austin Ziegler
+# Version::     1.0.2
+# Based On::    <tt>TeX::Hyphen</tt> 0.4 Copyright (c) 2003 - 2004
+#               Martin DeMello and Austin Ziegler, in turn based on
+#               Perl's <tt>TeX::Hyphen</tt>
+#               [http://search.cpan.org/author/JANPAZ/TeX-Hyphen-0.140/lib/TeX/Hyphen.pm]
+#               Copyright (c) 1997 - 2002 Jan Pazdziora
+#
+# == Licence
+# Licensing for Text::Hyphen is unfortunately complex because of the various
+# copyrights and licences of the source hyphenation files. Some of these
+# files are available only under the TeX licence and others are available
+# only under the GNU GPL while others are public domain. Each language file
+# has these licences embedded within the file. Please consult each file's
+# licence to ensure that it is compatible with your application.
+#
+# The copyright on the Text::Hyphen application/library and the Ruby
+# translations of hyphenation files belongs to Austin Ziegler. All other
+# copyrights on original versions still stand; Text::Hyphen is a derivative
+# work of these and other projects.
+#
+# === Application and Compilation Licences
+# Text::Hyphen, the application/library is licensed under the same terms as
+# Ruby. Note that this specifically refers to the contents of bin/hyphen,
+# lib/text/hyphen.rb, and lib/text/hyphen/language.rb.
+#
+# Individual language hyphenation files are NOT licensed under these terms,
+# but under the following MIT-style licence and the original hyphenation
+# pattern licenses. The copyright for the original TeX hyphenation files is
+# held by the original authors; any mistakes in conversion of these files to
+# Ruby is attributable to the contributors to the Text::Hyphen package only.
+#
+# The compilation package Text::Hyphen is licensed under the same terms as
+# Ruby.
+#
+# === Blanket Language Hyphenation File Licence
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
 class Text::Hyphen
   DEBUG   = false
-  VERSION = '1.0.0'
+  VERSION = '1.0.2'
 
   DEFAULT_MIN_LEFT  = 2
   DEFAULT_MIN_RIGHT = 2
 
-    # No fewer than this number of letters will show up to the left of the
-    # hyphen. This overrides the default specified in the language.
+  # No fewer than this number of letters will show up to the left of the
+  # hyphen. This overrides the default specified in the language.
   attr_accessor :left
-    # No fewer than this number of letters will show up to the right of the
-    # hyphen. This overrides the default specified in the language.
+  # No fewer than this number of letters will show up to the right of the
+  # hyphen. This overrides the default specified in the language.
   attr_accessor :right
-    # The name of the language to be used in hyphenating words. This will be
-    # a two or three character ISO 639 code, with the two character form
-    # being the canonical resource name. This will load the language
-    # hyphenation definitions from text/hyphen/language/&lt;code&gt; as
-    # a Ruby class. The resource 'text/hyphen/language/en_us' defines the
-    # language class Text::Hyphen::Language::EN_US. It also defines the
-    # secondary forms Text::Hyphen::Language::EN and
-    # Text::Hyphen::Language::ENG_US.
-    #
-    # Minimal transformations will be performed on the language code
-    # provided, such that any dashes are converted to underscores (e.g.,
-    # 'en-us' becomes 'en_us') and all characters are regularised. Resource
-    # names will be downcased and class names will be upcased (e.g., 'Pt'
-    # for the Portuguese language becomes 'pt' and 'PT', respectively).
-    #
-    # The language may also be specified as an instance of
-    # Text::Hyphen::Language.
+  # The name of the language to be used in hyphenating words. This will be a
+  # two or three character ISO 639 code, with the two character form being
+  # the canonical resource name. This will load the language hyphenation
+  # definitions from text/hyphen/language/&lt;code&gt; as a Ruby class. The
+  # resource 'text/hyphen/language/en_us' defines the language class
+  # Text::Hyphen::Language::EN_US. It also defines the secondary forms
+  # Text::Hyphen::Language::EN and Text::Hyphen::Language::ENG_US.
+  #
+  # Minimal transformations will be performed on the language code provided,
+  # such that any dashes are converted to underscores (e.g., 'en-us' becomes
+  # 'en_us') and all characters are regularised. Resource names will be
+  # downcased and class names will be upcased (e.g., 'Pt' for the Portuguese
+  # language becomes 'pt' and 'PT', respectively).
+  #
+  # The language may also be specified as an instance of
+  # Text::Hyphen::Language.
   attr_accessor :language
-  def language=(lang) #:nodoc:
+  undef :language=
+  def language=(lang)
     require 'text/hyphen/language' unless defined?(Text::Hyphen::Language)
-    if lang.kind_of?(Text::Hyphen::Language)
+    if lang.kind_of? Text::Hyphen::Language
       @iso_language = lang.to_s.split(%r{::}o)[-1].downcase
       @language     = lang
     else
@@ -123,17 +119,18 @@ class Text::Hyphen
     end
     @iso_language
   end
-    # Returns the language's ISO 639 ID, e.g., "en_us" or "pt".
+  # Returns the language's ISO 639 ID, e.g., "en_us" or "pt".
   attr_reader   :iso_language
 
-    # The following initializations are equivalent:
-    #
-    #   hyp = TeX::Hyphenate.new(:language => "EU")
-    #   hyp = TeX::Hyphenate.new { |h| h.language = "EU" }
+  # The following initializations are equivalent:
+  #
+  #   hyp = TeX::Hyphenate.new(:language => "EU")
+  #   hyp = TeX::Hyphenate.new { |h| h.language = "EU" }
   def initialize(options = {}) # :yields self:
     @iso_language = options[:language]
     @left         = options[:left]
     @right        = options[:right]
+    @language     = nil
 
     @cache        = {}
     @vcache       = {}
@@ -154,12 +151,12 @@ class Text::Hyphen
     @right      ||= DEFAULT_MIN_RIGHT
   end
 
-    # Returns a list of places where the word can be divided, as
-    #
-    #   hyp.hyphenate('representation')
-    #
-    # returns [3, 5, 8, 10]. If the word has been hyphenated previously, it
-    # will be returned from a per-instance cache.
+  # Returns a list of places where the word can be divided, as
+  #
+  #   hyp.hyphenate('representation')
+  #
+  # returns [3, 5, 8, 10]. If the word has been hyphenated previously, it
+  # will be returned from a per-instance cache.
   def hyphenate(word)
     word = word.downcase
     $stderr.puts "Hyphenating #{word}" if DEBUG
@@ -199,13 +196,13 @@ class Text::Hyphen
     @cache[word] = make_result_list(result)
   end
 
-    # Returns a visualization of the hyphenation points, so:
-    #
-    #   hyp.visualize('representation')
-    #
-    # returns <tt>rep-re-sen-ta-tion</tt>, at least for English patterns. If
-    # the word has been visualised previously, it will be returned from
-    # a per-instance cache.
+  # Returns a visualization of the hyphenation points, so:
+  #
+  #   hyp.visualize('representation')
+  #
+  # returns <tt>rep-re-sen-ta-tion</tt>, at least for English patterns. If
+  # the word has been visualised previously, it will be returned from a
+  # per-instance cache.
   def visualise(word)
     return @vcache[word] if @vcache.has_key?(word)
     w = word.dup
@@ -214,7 +211,6 @@ class Text::Hyphen
     end
     @vcache[word] = w
   end
-
   alias visualize visualise
 
   def clear_cache!
@@ -222,8 +218,8 @@ class Text::Hyphen
     @vcache.clear
   end
 
-    # This function will hyphenate a word so that the first point is at most
-    # +size+ characters.
+  # This function will hyphenate a word so that the first point is at most
+  # +size+ characters.
   def hyphenate_to(word, size)
     point = hyphenate(word).delete_if { |e| e >= size }.max
     if point.nil?
@@ -233,7 +229,7 @@ class Text::Hyphen
     end
   end
 
-    # Returns statistics
+  # Returns statistics
   def stats
     _b = @language.both.size
     _s = @language.start.size
@@ -255,8 +251,7 @@ EOS
     s % [ @iso_language, _T, _s, _e, _b, _h, _x ]
   end
 
-private
-  def updateresult(hash, str, pos) #:nodoc:
+  def updateresult(hash, str, pos)
     if hash.has_key?(str)
       STDERR.print "#{pos}: #{str}: #{hash[str]}" if DEBUG
       hash[str].split('').each_with_index do |c, i| 
@@ -266,24 +261,30 @@ private
       STDERR.puts ": #{@result}" if DEBUG
     end
   end
+  private :updateresult
 
-  def make_result_list(res) #:nodoc:
+  def make_result_list(res)
     r = []
     res.each_with_index { |c, i| r <<  i * (c.to_i % 2) }
     r.reject { |i| i.to_i == 0 }
   end
+  private :make_result_list
 
   def load_language
     return if @first_load
 
     @iso_language ||= "en_us"
 
-    require "text/hyphen/language/#{@iso_language}"
+    unless @language
+      require "text/hyphen/language/#{@iso_language}"
+      @language = Text::Hyphen::Language.const_get(@iso_language.upcase)
+      @iso_language = @language.isocode if @language.isocode
+    end
 
-    @language   = Text::Hyphen::Language.const_get(@iso_language.upcase)
-    @left     ||= @language.left
-    @right    ||= @language.right
+    @left ||= @language.left
+    @right ||= @language.right
 
     @iso_language
   end
+  private :load_language
 end