diff --git a/packages/SVG-Morphic.package/TextStyle.extension/class/installDefaultSVGTextStyle.st b/packages/SVG-Morphic.package/TextStyle.extension/class/installDefaultSVGTextStyle.st index aea1cc40..7f349633 100644 --- a/packages/SVG-Morphic.package/TextStyle.extension/class/installDefaultSVGTextStyle.st +++ b/packages/SVG-Morphic.package/TextStyle.extension/class/installDefaultSVGTextStyle.st @@ -3,6 +3,7 @@ installDefaultSVGTextStyle ((self actualTextStyles includesKey: #serif) and: [self actualTextStyles includesKey: #'sans-serif']) ifTrue: [^ self]. - - TTCFont newTextStyleFromTTStream: (ReadStream on:(TextStyle sansData base64Decoded asByteArray)). - TTCFont newTextStyleFromTTStream: (ReadStream on:(TextStyle serifData base64Decoded asByteArray)) + + self + installFontFrom: TextStyle sansData; + installFontFrom: TextStyle serifData. diff --git a/packages/SVG-Morphic.package/TextStyle.extension/class/installFontFrom..st b/packages/SVG-Morphic.package/TextStyle.extension/class/installFontFrom..st new file mode 100644 index 00000000..00b20bfe --- /dev/null +++ b/packages/SVG-Morphic.package/TextStyle.extension/class/installFontFrom..st @@ -0,0 +1,4 @@ +*SVG-Morphic +installFontFrom: aBase64Font + + TTCFont newTextStyleFromTTStream: (ReadStream on:(aBase64Font base64Decoded asByteArray)). \ No newline at end of file diff --git a/packages/SVG-Morphic.package/TextStyle.extension/class/sansData.st b/packages/SVG-Morphic.package/TextStyle.extension/class/sansData.st index 9ae41ac3..ce6b09d7 100644 --- a/packages/SVG-Morphic.package/TextStyle.extension/class/sansData.st +++ b/packages/SVG-Morphic.package/TextStyle.extension/class/sansData.st @@ -1,5 +1,7 @@ *SVG-Morphic sansData +"OpenSans encoded in base64" + ^'AAEAAAASAQAABAAgR0RFRrTIsWAAAbBwAAABvkdQT1Opq6PmAAGyMAAAOXRHU1VCNybAFwAB 66QAAA8GT1MvMpZAgywAAAGoAAAAYFNUQVRe+0M1AAH6rAAAAF5jbWFwwzgfgAAAE9gAAAP2 Y3Z0ID0/LMgAACoEAAAA/GZwZ23iGZ5aAAAX0AAAD5RnYXNwABUAIwABsGAAAAAQZ2x5Zrc6 diff --git a/packages/SVG-Morphic.package/TextStyle.extension/class/serifData.st b/packages/SVG-Morphic.package/TextStyle.extension/class/serifData.st index fe6edd3d..d4a0f2d5 100644 --- a/packages/SVG-Morphic.package/TextStyle.extension/class/serifData.st +++ b/packages/SVG-Morphic.package/TextStyle.extension/class/serifData.st @@ -1,5 +1,7 @@ *SVG-Morphic serifData +"OpenSerif encoded in base64" + ^'AAEAAAARAQAABAAQR0RFRpxLYw4AAz48AAAEskdQT1PQyXO4AANC8AAH++RHU1VC6P9qUAAL PtQABW80T1MvMuW6tH8AAAGYAAAAYGNtYXCvBi8sAAAUHAAAGDRjdnQgBfgXewAAOxwAAABi ZnBnbWIu/30AACxQAAAODGdhc3AAAAAQAAM+NAAAAAhnbHlmQtGclQAATagAAuuuaGVhZCbE diff --git a/packages/SVG-Morphic.package/TextStyle.extension/methodProperties.json b/packages/SVG-Morphic.package/TextStyle.extension/methodProperties.json index d077a614..90ccdebd 100644 --- a/packages/SVG-Morphic.package/TextStyle.extension/methodProperties.json +++ b/packages/SVG-Morphic.package/TextStyle.extension/methodProperties.json @@ -2,8 +2,9 @@ "class" : { "defaultSVGFont" : "tw 5/31/2022 16:51", "defaultSVGTextStyle" : "AS 7/3/2022 21:31", - "installDefaultSVGTextStyle" : "AS 7/3/2022 21:30", - "sansData" : "AS 7/3/2022 21:30", - "serifData" : "AS 7/3/2022 21:28" }, + "installDefaultSVGTextStyle" : "tw 8/3/2022 13:59", + "installFontFrom:" : "tw 8/3/2022 13:58", + "sansData" : "tw 8/3/2022 13:56", + "serifData" : "tw 8/3/2022 13:56" }, "instance" : { } }