diff -r 686c0f0acb90 -r 53011d5d5c04 CharacterSetView.st --- a/CharacterSetView.st Tue Feb 24 14:43:46 2004 +0100 +++ b/CharacterSetView.st Tue Feb 24 22:34:49 2004 +0100 @@ -120,15 +120,21 @@ codePointLabel label:clickLabel ] ifFalse:[ selectedChar := Character value:selectedCodePoint. - isLetter := selectedChar isNationalLetter. - isDigit := selectedChar isNationalDigit. - isUppercase := selectedChar isUppercase. - isLowercase := selectedChar isLowercase. + (#('unicde' 'iso10646-1' 'iso8859-1' 'ascii') includes:(v font encoding)) + ifTrue:[ + isLetter := selectedChar isNationalLetter. + isDigit := selectedChar isNationalDigit. + isUppercase := selectedChar isUppercase. + isLowercase := selectedChar isLowercase. + ] ifFalse:[ + isLetter := isDigit := isUppercase := isLowercase := false. "/ actually: unknown + ]. codePointLabel label: - ('Selected: u%1 %2 %3' + ('Selected: u%1 %2 %3 %4' bindWith:((selectedCodePoint printStringRadix:16) leftPaddedTo:4 with:$0) - with:(isUppercase ifTrue:'Uppercase' ifFalse:[isLowercase ifTrue:'lowercase' ifFalse:'']) + with:((selectedCodePoint printString) leftPaddedTo:5) + with:(isUppercase ifTrue:'Uc' ifFalse:[isLowercase ifTrue:'lc' ifFalse:'']) with:(isLetter ifTrue:'Letter' ifFalse:[(isDigit ifTrue:'Digit' ifFalse:'')]) ). ]. @@ -435,5 +441,5 @@ !CharacterSetView class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg2/CharacterSetView.st,v 1.13 2004-02-24 10:30:09 cg Exp $' + ^ '$Header: /cvs/stx/stx/libwidg2/CharacterSetView.st,v 1.14 2004-02-24 21:34:49 cg Exp $' ! !