#BUGFIX
authorStefan Vogel <sv@exept.de>
Sun, 04 Oct 2015 22:47:48 +0200
changeset 6961 29c66fcf1f94
parent 6960 d26b0f5856db
child 6962 e310074c6d77
#BUGFIX class: FontDescription changed: #family:face:style:size:sizeUnit:encoding: #sizeUnit make #= work
FontDescription.st
--- a/FontDescription.st	Sun Oct 04 21:22:15 2015 +0200
+++ b/FontDescription.st	Sun Oct 04 22:47:48 2015 +0200
@@ -714,19 +714,22 @@
     self assert:(self fontId isNil). "/ cannot change an instantiated font
 
     family := familyString asSymbol.
-    (faceString notNil and:[faceString notEmpty]) ifTrue:[
+    faceString notEmptyOrNil ifTrue:[
         face := faceString asSymbol.
     ].
-    (styleString notNil and:[styleString notEmpty]) ifTrue:[
+    styleString notEmptyOrNil ifTrue:[
         style := styleString asSymbol.
     ].
     sizeUnit := sizeUnitArg.
     sizeUnit == #px ifTrue:[
         pixelSize := sizeArg.
     ] ifFalse:[
+        sizeUnit isNil ifTrue:[
+            sizeUnit := #pt.
+        ].
         size := sizeArg ? 0.
     ].
-    (encodingString notNil and:[encodingString notEmpty]) ifTrue:[
+    encodingString notEmptyOrNil ifTrue:[
         encoding := encodingString asSymbol.
     ]
 
@@ -870,7 +873,7 @@
 sizeUnit
     "currently returns one of #pt or #px (internal use only)"
 
-    ^ sizeUnit ? #pt
+    ^ sizeUnit
 !
 
 slant