FontDescription.st
branchjv
changeset 9068 f596aa87b5b1
parent 8420 76e39223f5ab
--- a/FontDescription.st	Tue Feb 22 11:15:02 2022 +0000
+++ b/FontDescription.st	Mon Jun 20 10:22:21 2022 +0200
@@ -1,6 +1,7 @@
 "
  COPYRIGHT (c) 1994 by Claus Gittinger
  COPYRIGHT (c) 2016 Jan Vrany
+ COPYRIGHT (c) 2022 Patrik Svestka
 	      All Rights Reserved
 
  This software is furnished under a license and may be used
@@ -32,6 +33,7 @@
 "
  COPYRIGHT (c) 1994 by Claus Gittinger
  COPYRIGHT (c) 2016 Jan Vrany
+ COPYRIGHT (c) 2022 Patrik Svestka
 	      All Rights Reserved
 
  This software is furnished under a license and may be used
@@ -662,7 +664,10 @@
 face
     "return the face, a string"
 
+    face isNil ifTrue:[^ self class defaultFace].
     ^ face
+
+    "Modified (format): / 20-06-2022 / 09:06:36 / Patrik Svestka <patrik.svestka@gmail.com>"
 !
 
 face:aString
@@ -900,7 +905,10 @@
 style
     "return the style, a string"
 
+    style isNil ifTrue:[^ self class defaultStyle]. 
     ^ style
+
+    "Modified (format): / 20-06-2022 / 09:06:43 / Patrik Svestka <patrik.svestka@gmail.com>"
 !
 
 style:aString
@@ -972,7 +980,7 @@
 
     "Modified: / 29-02-2016 / 08:30:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
  
-!    
+!
 
 sameFamily: otherFamily face: otherFace style: otherStyle size: otherSize unit: otherSizeUnit pixelSize: otherPixelSize encoding: otherEncoding
     (family = otherFamily) ifFalse:[ ^ false ].
@@ -1562,7 +1570,10 @@
 size
     "return the size, a number"
 
+    size isNil ifTrue:[ ^ self class defaultSize ]. 
     ^ size
+
+    "Modified: / 20-06-2022 / 09:58:36 / Patrik Svestka <patrik.svestka@gmail.com>"
 !
 
 species
@@ -1822,6 +1833,11 @@
 
 version_CVS
     ^ '$Header$'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 ! !