diff -r e5d7fb9ba201 -r e1df0f1d5153 FontDescription.st --- a/FontDescription.st Mon Feb 17 21:35:19 2014 +0100 +++ b/FontDescription.st Mon Feb 17 21:37:18 2014 +0100 @@ -653,7 +653,7 @@ face:aString "set the face, a string such as 'bold'" - self assert:(self fontId isNil). "/ cannot change an instanciated font + self assert:(self fontId isNil). "/ cannot change an instantiated font face := aString "Created: 25.1.1997 / 03:12:12 / cg" @@ -668,7 +668,7 @@ family:aString "set the family, a string" - self assert:(self fontId isNil). "/ cannot change an instanciated font + self assert:(self fontId isNil). "/ cannot change an instantiated font family := aString "Created: 25.1.1997 / 03:12:12 / cg" @@ -690,7 +690,7 @@ family:familyString face:faceString style:styleString size:sizeArg sizeUnit:sizeUnitArg encoding:encodingString "set the instance values" - self assert:(self fontId isNil). "/ cannot change an instanciated font + self assert:(self fontId isNil). "/ cannot change an instantiated font family := familyString asSymbol. (faceString notNil and:[faceString notEmpty]) ifTrue:[ @@ -712,6 +712,13 @@ "Modified: 20.4.1996 / 23:19:25 / cg" ! +file:aNumber + "set the file" + + self assert:(self fontId isNil). "/ cannot change an instantiated font +"/ file := aNumber +! + flags ^ flags ! @@ -720,6 +727,13 @@ flags := anInteger. ! +fontFormat:aString + "set the fontFormat" + + self assert:(self fontId isNil). "/ cannot change an instantiated font +"/ fontFormat := aString +! + fontId "return the device-dependent font-id" @@ -728,6 +742,13 @@ ! +fontVersion:aNumber + "set the fontVersion" + + self assert:(self fontId isNil). "/ cannot change an instantiated font +"/ fontVersion := aNumber +! + foundry "return the manufacturer/foundry" @@ -779,6 +800,12 @@ "Modified (comment): / 27-07-2013 / 15:39:50 / cg" ! +isOutlineFont:aBoolean + "set whether this is an outline font (currently for XftFonts only)" + + flags := (flags ? 0) changeMask:OutlineFlag to:aBoolean +! + isScalableFont:aBoolean "set whether this is a scalable font (currently for XftFonts only)" @@ -824,7 +851,7 @@ slant:aNumber "set the slant" - self assert:(self fontId isNil). "/ cannot change an instanciated font + self assert:(self fontId isNil). "/ cannot change an instantiated font "/ slant := aNumber ! @@ -837,7 +864,7 @@ spacing:aNumber "set the spacing" - self assert:(self fontId isNil). "/ cannot change an instanciated font + self assert:(self fontId isNil). "/ cannot change an instantiated font "/ spacing := aNumber ! @@ -845,6 +872,27 @@ "return the style, a string" ^ style +! + +style:aString + "set the style" + + self assert:(self fontId isNil). "/ cannot change an instantiated font + style := aString +! + +weight:aNumber + "set the weight" + + self assert:(self fontId isNil). "/ cannot change an instantiated font +"/ weight := aNumber +! + +width:aNumber + "set the width" + + self assert:(self fontId isNil). "/ cannot change an instantiated font +"/ width := aNumber ! ! !FontDescription methodsFor:'comparing'! @@ -1618,11 +1666,11 @@ !FontDescription class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libview/FontDescription.st,v 1.84 2014-02-17 18:20:42 cg Exp $' + ^ '$Header: /cvs/stx/stx/libview/FontDescription.st,v 1.85 2014-02-17 20:37:18 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libview/FontDescription.st,v 1.84 2014-02-17 18:20:42 cg Exp $' + ^ '$Header: /cvs/stx/stx/libview/FontDescription.st,v 1.85 2014-02-17 20:37:18 cg Exp $' ! !