spanish 0.0.2 → 0.0.3

data/lib/spanish.rb

@@ -21,8 +21,12 @@ module Spanish
   # Get an array of Phonology::Sounds from the string.
   def get_sounds(string, *rules)
     sequence = Orthography.translator.translate(string)
-    Phonology.rules.values.each do |rule|
-      sequence.apply_rule!(rule)
+    Syllabifier.syllabify(sequence)
+    Phonology.general_rules.values.each do |rule|
+      rule.apply(sequence)
+    end
+    rules.each do |rule|
+      Phonology.optional_rules[rule.to_sym].apply(sequence)
     end
     sequence
   end
@@ -32,8 +36,16 @@ module Spanish
   #
   #     Spanish.get_ipa("chavo")
   #     # => 't͡ʃaβo
-  def get_ipa(string)
-    get_sounds(string).to_s
+  def get_ipa(string, *rules)
+    get_sounds(string, *rules).to_s
+  end
+
+  def get_syllables(string, *rules)
+    get_sounds(string, *rules).map(&:syllable).uniq
   end
 
+  def get_syllables_ipa(string, *rules)
+    syllables = get_syllables(string, *rules)
+    syllables.map {|s| syllables.length == 1 ? s.to_s(false) : s.to_s }.join(" ")
+  end
 end

data/lib/spanish/orthography.rb

@@ -1,13 +1,9 @@
 # encoding: utf-8
 module Spanish
   module Orthography
-
     extend self
-
     LETTERS = /ch|ll|ñ|á|é|í|ó|ú|ü|[\w]/
-
     SCANNER = lambda {|string| string.downcase.scan(/rr|ch|ll|ñ|á|é|í|ó|ú|ü|\w/)}
-
     SOUNDS = ::Phonology::Inventory.from_ipa(
       "m", "n", "ɲ", "ŋ", "p", "b", "t", "d", "k", "ɡ", "β", "f", "v", "ð", "s",
       "z", "ʒ", "ʝ", "x", "ɣ", "j", "r", "ɾ", "l", "w", "i", "u", "e", "o", "a",
@@ -78,9 +74,8 @@ module Spanish
         if initial?
           get(:unvoiced, :velar, :fricative)
         else
-          [get(:unvoiced, :velar, :plosive), Phonology::Sound.new("s")]
+          [get(:unvoiced, :velar, :plosive), ::Phonology::Sound.new("s")]
         end
-
       when "y"
         if initial? && final?
           get(:close, :front)
@@ -93,7 +88,10 @@ module Spanish
         elsif !precedes(vowel)
           get(:palatal, :approximant)
         end
-      when "z" then get(:unvoiced, :dental, :fricative)
+      when "z"
+        # Spanish final "z" indicates stress: i.e. "madures" vs. "madurez"
+        last_sound.hint(:primary_stress) if final? and follows(vowel)
+        get(:unvoiced, :dental, :fricative)
       end
     }
 
@@ -106,7 +104,5 @@ module Spanish
       orth.rules   = RULES
       orth
     end
-
   end
-
-end
+end

data/lib/spanish/phonology.rb

@@ -5,9 +5,10 @@ module Spanish
 
     extend self
 
-    attr_reader :rules
+    attr_reader :general_rules
+    attr_reader :optional_rules
 
-    @rules = {
+    @general_rules = {
       :sprinantization => ::Phonology::Rule.new {
         if voiced? and plosive? and !initial? and precedes(:vocoid) and !follows(:nasal)
           if non_coronal?
@@ -17,11 +18,42 @@ module Spanish
           end
         end
       },
+      :nasal_assimilation => ::Phonology::Rule.new {
+        add :bilabial if nasal? and precedes :bilabial
+      }
+    }
+    @optional_rules = {
       :seseo => ::Phonology::Rule.new {
         add :alveolar if dental? and unvoiced?
       },
       :voicing => ::Phonology::Rule.new {
         voice if alveolar? and fricative? and precedes(:voiced, :non_vocoid)
+      },
+      :aspiration => ::Phonology::Rule.new {
+        if syllable_final? and alveolar? and fricative? and follows(:vocoid)
+          devoice
+          add :glottal
+          add! :approximant
+        end
+      },
+      :yeismo => ::Phonology::Rule.new {
+        if palatal? and (lateral_approximant? or fricative?)
+          add :palatal, :fricative
+        end
+      },
+      :lleismo => ::Phonology::Rule.new {
+        add :lateral_approximant if (palatal? and fricative?)
+      },
+      :zheismo => ::Phonology::Rule.new {
+        if palatal? and (lateral_approximant? or fricative?)
+          add :postalveolar, :fricative
+        end
+      },
+      :sheismo => ::Phonology::Rule.new {
+        if palatal? and (lateral_approximant? or fricative?)
+          add :postalveolar, :fricative
+          delete :voiced
+        end
       }
     }
 

data/lib/spanish/syllable.rb

@@ -1,37 +1,5 @@
-# @TODO
-# Problem words: insubstancialidad, descouella
 module Spanish
-  class Syllable
-
-    attr_accessor :onset, :coda, :nucleus, :stress
-
-    def initialize(sound = nil)
-      @onset = []
-      @nucleus = []
-      @coda = []
-      add sound if sound
-    end
-
-    def to_a
-      [onset, rime].flatten
-    end
-
-    def valid?
-      !nucleus.empty?
-    end
-
-    def rime
-      [nucleus, coda]
-    end
-
-    def to_s
-      string = to_a.map(&:symbol).join
-      (stress ? "\u02c8" : "") + string
-    end
-
-    def wants?(sound)
-      onset_wants?(sound) or nucleus_wants?(sound) or coda_wants?(sound)
-    end
+  class Syllable < ::Phonology::Syllable
 
     def onset_wants?(sound)
       if !nucleus.empty? || sound.vocalic?
@@ -58,6 +26,8 @@ module Spanish
     def coda_wants?(sound)
       if nucleus.empty?
         false
+      elsif !coda.empty?
+        false if coda.last.approximant?
       else
         # Codas don't want a rising dipthong but will accept one at the end of words.
         sound.consonantal? && !(sound.approximant? && sound.palatal?)
@@ -66,19 +36,15 @@ module Spanish
 
     def <<(sound)
       @stress = true if sound.hints.include?(:primary_stress)
-      if onset_wants?(sound)
-        @onset << sound
-      elsif nucleus_wants?(sound)
-        @nucleus << sound
-      else
-        @coda << sound
-      end
+      super
     end
-    alias add <<
+  end
 
-    def empty?
-      onset.empty? && nucleus.empty? && coda.empty?
-    end
+  class Syllabifier
+
+    include Enumerable
+
+    attr :index, :sounds, :syllable
 
     def self.apply_stress(syllables)
       if syllables.detect {|s| s.stress}
@@ -98,78 +64,71 @@ module Spanish
 
     def self.syllabify(arg)
       arg = arg.kind_of?(String) ? Spanish.get_sounds(arg) : arg
-      apply_stress(Syllables.new(arg).entries)
+      apply_stress(new(arg).entries)
     end
 
-    class Syllables
-
-      include Enumerable
-
-      attr :index, :sounds, :syllable
-
-      def initialize(sounds)
-        @sounds = sounds
-      end
-
-      def each(&block)
-        begin
-          sounds.each_index { |i| @index = i; append or do_yield(&block) }
-          do_yield(&block)
-        ensure
-          @index = 0
-          @syllable = nil
-        end
-      end
-
-      private
+    def initialize(sounds)
+      @sounds = sounds
+    end
 
-      def do_yield(&block)
-        yield syllable
-        @syllable = Syllable.new(curr)
+    def each(&block)
+      begin
+        sounds.each_index { |i| @index = i; append or do_yield(&block) }
+        do_yield(&block)
+      ensure
+        @index = 0
+        @syllable = nil
       end
+    end
 
-      def syllable
-        @syllable ||= Syllable.new
-      end
+    private
 
-      def append
-        return if !curr
-        # Final consonantal has nowhere else to go.
-        if !nex && curr.consonantal?
-          syllable << curr
-        # If there's no room in the syllable, we're forced to start a new one.
-        elsif !syllable.wants? curr
-          false
-        # Spanish has a strong aversion to syllable-initial consonant clusters
-        # beginning with "s".
-        elsif syllable.wants?(curr) && nex && curr.alveolar? && curr.fricative? && nex.non_vocoid?
-          syllable << curr
-        # Otherwise, the preference is to be the onset of a new syllable. This
-        # is only possible when the syllable we would create has sonority rising
-        # towards the nucleus.
-        elsif nex && syllable.valid? && (nex.sonority - curr.sonority > 1)
-          false
-        # Default action is to append to current syllable.
-        else
-          syllable << curr
-        end
-      end
+    def do_yield(&block)
+      yield syllable
+      # For final syllables, this will only create a new syllable for one-vowel final syllables,
+      # Honestly, I'm a little lost as to why that happens, probably need a code improvement
+      # in some other place.
+      @syllable = Syllable.new(curr) unless !nex && curr.syllable
+    end
 
-      def curr
-        @sounds[index]
-      end
+    def syllable
+      @syllable ||= Syllable.new
+    end
 
-      def prev
-        @sounds[index - 1] unless index == 0
+    def append
+      return if !curr
+      # Final consonantal has nowhere else to go.
+      if !nex && curr.consonantal?
+        syllable << curr
+      # If there's no room in the syllable, we're forced to start a new one.
+      elsif !syllable.wants? curr
+        false
+      # Spanish has a strong aversion to syllable-initial consonant clusters
+      # beginning with "s".
+      elsif syllable.wants?(curr) && nex && curr.alveolar? && curr.fricative? && nex.non_vocoid?
+        syllable << curr
+      # Otherwise, the preference is to be the onset of a new syllable. This
+      # is only possible when the syllable we would create has sonority rising
+      # towards the nucleus.
+      elsif nex && syllable.valid? && (nex.sonority - curr.sonority > 1)
+        false
+      # Default action is to append to current syllable.
+      else
+        syllable << curr
       end
+    end
 
-      def nex
-        @sounds[index + 1]
-      end
+    def curr
+      @sounds[index]
+    end
 
+    def prev
+      @sounds[index - 1] unless index == 0
     end
 
+    def nex
+      @sounds[index + 1]
+    end
 
   end
-
 end

data/lib/spanish/version.rb

@@ -1,3 +1,3 @@
 module Spanish
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/phonology_test.rb

@@ -5,7 +5,7 @@ class PhonologyTest < Test::Unit::TestCase
 
   test "c as s or k" do
     assert_sound "kasa", "casa"
-    assert_sound "bisi", "bici"
+    assert_sound "biθi", "bici"
     assert_sound "fɾanko", "franco"
   end
 
@@ -30,13 +30,13 @@ class PhonologyTest < Test::Unit::TestCase
   test "y" do
     assert_sound "i", "y"
     assert_sound "kaʝo", "cayó"
-    assert_sound "iɣwasu", "yguazú"
+    assert_sound "iɣwaθu", "yguazú"
     assert_sound "doj", "doy"
   end
 
   test "voicing" do
-    assert_sound "razɣo", "rasgo"
-    assert_sound "xazmin", "jazmín"
+    assert_sound "rasɣo", "rasgo"
+    assert_sound "xaθmin", "jazmín"
   end
 
   test "trilled r and flap r" do

data/test/syllabification_test.rb

@@ -3,41 +3,40 @@ require File.expand_path("../test_helper", __FILE__)
 
 class SyllabificationTest < Test::Unit::TestCase
 
-  include Phonology
   include Spanish
 
   test "should add consonant to empty onset" do
     s = Syllable.new
-    assert s.onset_wants? Sound.new("t")
-    assert s.onset_wants? Sound.new("l")
-    assert s.onset_wants? Sound.new("w")
+    assert s.onset_wants? Phonology::Sound.new("t")
+    assert s.onset_wants? Phonology::Sound.new("l")
+    assert s.onset_wants? Phonology::Sound.new("w")
   end
 
   test "should not add vowel to empty onsent" do
     s = Syllable.new
-    assert !s.onset_wants?(Sound.new("o"))
+    assert !s.onset_wants?(Phonology::Sound.new("o"))
   end
 
   test "can append consonant to onset if liquid" do
     s = Syllable.new
-    s.onset << Sound.new("t")
-    assert s.onset_wants? Sound.new("l")
-    assert s.onset_wants? Sound.new("ɾ")
+    s.onset << Phonology::Sound.new("t")
+    assert s.onset_wants? Phonology::Sound.new("l")
+    assert s.onset_wants? Phonology::Sound.new("ɾ")
   end
 
   test "can append consonant to onset if approximant" do
     s = Syllable.new
-    s.onset << Sound.new("k")
-    assert s.onset_wants? Sound.new("w")
+    s.onset << Phonology::Sound.new("k")
+    assert s.onset_wants? Phonology::Sound.new("w")
   end
 
   test "can not append sound to onset if non-liquid and non-approximant" do
     s = Syllable.new
-    s.onset << Sound.new("k")
-    assert !s.onset_wants?(Sound.new("n"))
-    assert !s.onset_wants?(Sound.new("r"))
-    assert !s.onset_wants?(Sound.new("s"))
-    assert !s.onset_wants?(Sound.new("a"))
+    s.onset << Phonology::Sound.new("k")
+    assert !s.onset_wants?(Phonology::Sound.new("n"))
+    assert !s.onset_wants?(Phonology::Sound.new("r"))
+    assert !s.onset_wants?(Phonology::Sound.new("s"))
+    assert !s.onset_wants?(Phonology::Sound.new("a"))
   end
 
 end

data/test/test_helper.rb

@@ -1,3 +1,6 @@
+require "rubygems"
+require "bundler"
+Bundler.setup
 require "test/unit"
 require File.expand_path("../../lib/spanish", __FILE__)
 include Spanish

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Norman Clarke
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-20 00:00:00 -03:00
+date: 2010-07-09 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: phonology
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -61,6 +62,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -69,6 +71,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 9
       version: "1.9"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -78,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: "[none]"
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Spanish phonology, orthography and grammar library for Ruby.