--- a/Character.st	Wed Apr 22 07:33:07 2015 +0100
+++ b/Character.st	Thu Apr 23 08:04:13 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1988 by Claus Gittinger
 	      All Rights Reserved
@@ -324,6 +326,7 @@
     ^ self codePoint:anInteger
 ! !
 
+
 !Character class methodsFor:'accessing untypeable characters'!
 
 controlCharacter:char
@@ -370,6 +373,7 @@
     ^ self codePoint:41
 ! !
 
+
 !Character class methodsFor:'constants'!
 
 backspace
@@ -607,6 +611,7 @@
     "
 ! !
 
+
 !Character methodsFor:'Compatibility-Dolphin'!
 
 isAlphaNumeric
@@ -654,6 +659,7 @@
       or:[ (asciivalue == 247 ) ]]]]]
 ! !
 
+
 !Character methodsFor:'accessing'!
 
 codePoint
@@ -1455,7 +1461,7 @@
     ^ s contents
 
     "
-	'ä' utf8Encoded
+	'ä' utf8Encoded
     "
 ! !
 
@@ -2501,18 +2507,17 @@
 
     "
      $e asNonDiacritical
-     $é asNonDiacritical
-     $ä asNonDiacritical
-     $å asNonDiacritical
+     $é asNonDiacritical
+     $ä asNonDiacritical
+     $Ã¥ asNonDiacritical
     "
 !
 
 isNationalAlphaNumeric
-    "return true, if the receiver is a letter or digit in the
-     current language (Language variable)"
-
-    self isNationalLetter ifTrue:[^ true].
-    ^ self isNationalDigit
+    "return true, if the receiver is a letter or digit.
+     This assumes unicode encoding."
+
+    ^ self isNationalLetter or:[self isNationalDigit]
 !
 
 isNationalDigit
@@ -2525,12 +2530,10 @@
     codePoint := asciivalue.
 
     codePoint <= 16rFF ifTrue:[                "/ u00xx - unicode latin1 page
-	(codePoint between:($0 codePoint) and:($9 codePoint)) ifTrue:[^ true].
-	^ false
+        ^ codePoint between:$0 codePoint and:$9 codePoint.
     ].
 
-    (codePoint between:16rFF10 and:16rFF19) ifTrue:[ ^ true].
-    ^ false.
+    ^ codePoint between:16rFF10 and:16rFF19
 !
 
 isNationalLetter
@@ -3035,9 +3038,10 @@
 !Character class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Character.st,v 1.161 2015-04-20 10:48:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Character.st,v 1.162 2015-04-22 17:38:30 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Character.st,v 1.161 2015-04-20 10:48:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Character.st,v 1.162 2015-04-22 17:38:30 stefan Exp $'
 ! !
+