spanish 0.0.4 → 0.0.5

data/lib/spanish/orthography.rb

@@ -47,7 +47,12 @@ module Spanish
       when "ñ"  then get(:palatal, :nasal)
       when "ó"  then get(:close_mid, :back).hint(:primary_stress)
       when "o"  then get(:close_mid, :back)
-      when "p"  then get(:unvoiced, :bilabial, :plosive)
+      when "p"
+        if initial? and precedes("s")
+          anticipate {|sound| sound.orthography.insert(0, "p")}
+        else
+          get(:unvoiced, :bilabial, :plosive)
+        end
       when "q"  then get(:unvoiced, :velar, :plosive)
       when "r"  then initial? ? get(:trill) : get(:flap)
       when "rr" then get(:trill)
@@ -71,7 +76,7 @@ module Spanish
       when "v"  then get(:voiced, :bilabial, :plosive)
       when "w"  then get(:velar, :approximant)
       when "x"
-        if initial?
+        if initial? or context("me", "ic") or context("mé", "ic") or context("qui", "ot") # exceptions for "México and Quixote"
           get(:unvoiced, :velar, :fricative)
         else
           [get(:unvoiced, :velar, :plosive), ::Phonology::Sound.new("s")]
@@ -105,4 +110,4 @@ module Spanish
       orth
     end
   end
-end
+end

data/lib/spanish/phonology.rb

@@ -30,7 +30,7 @@ module Spanish
         voice if alveolar? and fricative? and precedes(:voiced, :non_vocoid)
       },
       :aspiration => ::Phonology::Rule.new {
-        if syllable_final? and alveolar? and fricative? and follows(:vocoid)
+        if syllable_final? and alveolar? and fricative? and follows(:vocoid) and !final?
           devoice
           add :glottal
           add! :approximant

data/lib/spanish/version.rb

@@ -1,3 +1,3 @@
 module Spanish
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/phonology_test.rb

@@ -53,6 +53,17 @@ class PhonologyTest < Test::Unit::TestCase
     assert_sound "pinɡwino", "pingüino"
   end
 
+  test "word-initial ps" do
+    assert_sound "sikoloxia", "psicología"
+  end
+
+  test "x archaism" do
+    assert_sound "mexiko", "México"
+    assert_sound "eksmexikano", "exmexicano"
+    assert_sound "kixote", "Quixote"
+    assert_sound "kixotesko", "quixotesco"
+  end
+
   test "diphthongs" do
     assert_sound "buo", "buho"
     assert_sound "pua", "púa"

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+$KCODE = "U" if RUBY_VERSION < "1.9"
 require "rubygems"
 require "bundler"
 Bundler.setup

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: spanish
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Norman Clarke
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-10 00:00:00 -03:00
+date: 2010-07-13 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +25,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 0
-        - 8
-        version: 0.0.8
+        - 9
+        version: 0.0.9
   type: :runtime
   version_requirements: *id001
 description: A Spanish phonology, orthography and grammar library for Ruby.
@@ -68,7 +66,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
       segments: 
       - 1
       - 8
@@ -79,7 +76,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"