--- a/XftFontDescription.st Thu Mar 17 06:55:03 2016 +0100
+++ b/XftFontDescription.st Fri Mar 18 07:49:36 2016 +0000
@@ -359,39 +359,41 @@
self assert:(self fontId isNil). "/ cannot change an instantiated font
- aNumber == FC_WEIGHT_THIN ifTrue:[ face := 'thin'. ^ self].
- aNumber == FC_WEIGHT_EXTRALIGHT ifTrue:[ face := 'extralight'. ^ self].
- aNumber == FC_WEIGHT_LIGHT ifTrue:[ face := 'light'. ^ self].
- aNumber == FC_WEIGHT_BOOK ifTrue:[ face := 'book'. ^ self].
- aNumber == FC_WEIGHT_REGULAR ifTrue:[ face := 'regular'. ^ self].
- aNumber == FC_WEIGHT_MEDIUM ifTrue:[ face := 'medium'. ^ self].
- aNumber == FC_WEIGHT_DEMIBOLD ifTrue:[ face := 'demibold'. ^ self].
- aNumber == FC_WEIGHT_BOLD ifTrue:[ face := 'bold'. ^ self].
- aNumber == FC_WEIGHT_EXTRABOLD ifTrue:[ face := 'extrabold'. ^ self].
- aNumber == FC_WEIGHT_BLACK ifTrue:[ face := 'black'. ^ self].
- aNumber == FC_WEIGHT_EXTRABLACK ifTrue:[ face := 'extrablack'. ^ self].
+ weight := aNumber.
+
+ aNumber == FC_WEIGHT_THIN ifTrue:[ face := #thin. ^ self].
+ aNumber == FC_WEIGHT_EXTRALIGHT ifTrue:[ face := #extralight. ^ self].
+ aNumber == FC_WEIGHT_LIGHT ifTrue:[ face := #light. ^ self].
+ aNumber == FC_WEIGHT_BOOK ifTrue:[ face := #book. ^ self].
+ aNumber == FC_WEIGHT_REGULAR ifTrue:[ face := #regular. ^ self].
+ aNumber == FC_WEIGHT_MEDIUM ifTrue:[ face := #medium. ^ self].
+ aNumber == FC_WEIGHT_DEMIBOLD ifTrue:[ face := #demibold. ^ self].
+ aNumber == FC_WEIGHT_BOLD ifTrue:[ face := #bold. ^ self].
+ aNumber == FC_WEIGHT_EXTRABOLD ifTrue:[ face := #extrabold. ^ self].
+ aNumber == FC_WEIGHT_BLACK ifTrue:[ face := #black. ^ self].
+ aNumber == FC_WEIGHT_EXTRABLACK ifTrue:[ face := #extrablack. ^ self].
aNumber <= (FC_WEIGHT_EXTRALIGHT + FC_WEIGHT_LIGHT // 2) ifTrue:[
- face := 'extralight'.
+ face := #extralight.
^ self.
].
aNumber <= (FC_WEIGHT_LIGHT + FC_WEIGHT_BOOK // 2) ifTrue:[
- face := 'light'.
+ face := #light.
^ self.
].
aNumber <= (FC_WEIGHT_MEDIUM + FC_WEIGHT_DEMIBOLD // 2) ifTrue:[
- face := 'medium'.
+ face := #medium.
^ self.
].
aNumber <= (FC_WEIGHT_DEMIBOLD + FC_WEIGHT_BOLD // 2) ifTrue:[
- face := 'demibold'.
+ face := #demibold.
^ self.
].
aNumber <= (FC_WEIGHT_BOLD + FC_WEIGHT_BLACK // 2) ifTrue:[
- face := 'bold'.
+ face := #bold.
^ self.
].
- face := 'extrabold'.
+ face := #extrabold.
^ self
"/ FC_WEIGHT_THIN := 0.