CharacterArray.st
changeset 17165 1e2822c3c74c
parent 17158 d21b6be88f32
child 17183 f86492476cc5
--- a/CharacterArray.st	Sat Nov 29 19:16:33 2014 +0100
+++ b/CharacterArray.st	Sat Nov 29 19:20:34 2014 +0100
@@ -283,6 +283,7 @@
     "Created: 3.8.1997 / 18:16:40 / cg"
 ! !
 
+
 !CharacterArray class methodsFor:'cleanup'!
 
 lowSpaceCleanup
@@ -4269,6 +4270,8 @@
 ! !
 
 
+
+
 !CharacterArray methodsFor:'matching - glob expressions'!
 
 compoundMatch:aString
@@ -4952,6 +4955,7 @@
 ! !
 
 
+
 !CharacterArray methodsFor:'padded copying'!
 
 centerPaddedTo:newSize
@@ -5114,7 +5118,7 @@
      The original code only looked at the first character being a vowel;
      this has been enhanced by some heuristics - not perfect, still."
 
-    |firstChar|
+    |firstChar secondChar|
 
     firstChar := (self at:1) asLowercase.
     ((firstChar isVowel and:[firstChar ~~ $u]) or:[firstChar == $x]) ifTrue:[
@@ -5122,8 +5126,9 @@
     ].
 
     (self size >= 3) ifTrue:[
+        secondChar := (self at:2) asLowercase.
         (firstChar isVowel not
-        and:[(self at:2) isVowel not       
+        and:[(secondChar isVowel or:[secondChar == $y]) not       
         and:[(self at:3) isVowel not ]]) ifTrue:[
             "/ exceptions: 3 non-vowels in a row: looks like an abbreviation
             (self size > 4) ifTrue:[
@@ -5149,6 +5154,7 @@
         'scrs' article.     
         'cvs' article.     
         'cvssource' article.     
+        'symbol' article.     
     "
 !
 
@@ -7177,14 +7183,15 @@
     ^ aVisitor visitString:self with:aParameter
 ! !
 
+
 !CharacterArray class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.554 2014-11-28 15:15:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.555 2014-11-29 18:20:34 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.554 2014-11-28 15:15:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.555 2014-11-29 18:20:34 cg Exp $'
 ! !