Add generic font-families for serif and sans-serif (#65)

Add generic font-families for serif and sans-serif
hpi-swa-teaching · Jul 7, 2022 · 8bcca05 · 8bcca05
1 parent 3a2fa53
commit 8bcca05
Show file tree

Hide file tree

Showing 10 changed files with 22,666 additions and 9,823 deletions.
diff --git a/packages/SVG-Morphic.package/TextStyle.extension/class/defaultSVGTextStyle.st b/packages/SVG-Morphic.package/TextStyle.extension/class/defaultSVGTextStyle.st
@@ -2,4 +2,4 @@
 defaultSVGTextStyle
 
 	self installDefaultSVGTextStyle.
-	^ self named: #OpenSans
+	^ self named: #'sans-serif'
diff --git a/packages/SVG-Morphic.package/TextStyle.extension/class/installDefaultSVGTextStyle.st b/packages/SVG-Morphic.package/TextStyle.extension/class/installDefaultSVGTextStyle.st
@@ -1,7 +1,8 @@
 *SVG-Morphic
 installDefaultSVGTextStyle
 
-	(self actualTextStyles includesKey: #OpenSans)
+	((self actualTextStyles includesKey: #serif) and: [self actualTextStyles includesKey: #'sans-serif'])
 	ifTrue: [^ self].
 
-	TTCFont newTextStyleFromTTStream: (ReadStream on:(TextStyle openSansData base64Decoded asByteArray))
+	TTCFont newTextStyleFromTTStream: (ReadStream on:(TextStyle sansData base64Decoded asByteArray)).
+	TTCFont newTextStyleFromTTStream: (ReadStream on:(TextStyle serifData base64Decoded asByteArray))
diff --git a/packages/SVG-Morphic.package/TextStyle.extension/class/openSansData.st b/packages/SVG-Morphic.package/TextStyle.extension/class/openSansData.st
diff --git a/packages/SVG-Morphic.package/TextStyle.extension/class/sansData.st b/packages/SVG-Morphic.package/TextStyle.extension/class/sansData.st
diff --git a/packages/SVG-Morphic.package/TextStyle.extension/class/serifData.st b/packages/SVG-Morphic.package/TextStyle.extension/class/serifData.st
diff --git a/packages/SVG-Morphic.package/TextStyle.extension/methodProperties.json b/packages/SVG-Morphic.package/TextStyle.extension/methodProperties.json
@@ -1,8 +1,9 @@
 {
 	"class" : {
 		"defaultSVGFont" : "tw 5/31/2022 16:51",
-		"defaultSVGTextStyle" : "tw 5/31/2022 16:51",
-		"installDefaultSVGTextStyle" : "tw 5/31/2022 16:51",
-		"openSansData" : "tw 5/31/2022 16:34" },
+		"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" },
 	"instance" : {
 		 } }
diff --git a/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/defaultFont.st b/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/defaultFont.st
@@ -1,4 +1,4 @@
 defaultFont
 defaultFont
 
-	^ 'OpenSans'
+	^ 'sans-serif'
diff --git a/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/knownFontTextSVG.st b/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/knownFontTextSVG.st
@@ -2,6 +2,6 @@ resources
 knownFontTextSVG
 
 	^ '<svg>
-		<text font-family="OpenSans" x="60" y="34">OpenSans</text>
+		<text font-family="Accujen" x="60" y="34">Accujen</text>
 		<text font-family="Atlanta" x="60" y="80">Atlanta</text>
-	</svg>'
+	</svg>'
diff --git a/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testKnownFont.st b/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testKnownFont.st
@@ -4,6 +4,6 @@ testKnownFont
 	|knownFonts svgTextMorph|
 
 	svgTextMorph := SVGMorph fromString: self knownFontTextSVG.
-	knownFonts := OrderedCollection newFrom: {'Atlanta'. 'OpenSans'}.
+	knownFonts := OrderedCollection newFrom: {'Atlanta'. 'Accujen'}.
 
 	(1 to: 2) do: [:i | self assert: (knownFonts at: i) equals: (svgTextMorph submorphs at: i) fontToUse familyName]
diff --git a/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/methodProperties.json b/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/methodProperties.json
@@ -6,13 +6,13 @@
 		"basicSizeTextSVG" : "tw 6/2/2022 12:05",
 		"basicTextSVG" : "tw 6/2/2022 13:06",
 		"defaultColor" : "tw 6/2/2022 12:12",
-		"defaultFont" : "AS 6/21/2022 12:26",
+		"defaultFont" : "AS 7/4/2022 14:18",
 		"defaultFontSize" : "tw 6/2/2022 21:31",
 		"knownFontTextSVG" : "lra 6/23/2022 19:13",
 		"scalingTextSVG" : "tw 6/2/2022 11:59",
 		"testDefaultFont" : "AS 6/21/2022 12:26",
 		"testDefaultFontInSVGText" : "lra 6/23/2022 18:55",
-		"testKnownFont" : "lra 6/23/2022 18:51",
+		"testKnownFont" : "AS 7/7/2022 16:41",
 		"testTextColor" : "lra 6/23/2022 18:55",
 		"testTextScaling" : "lra 6/23/2022 18:55",
 		"testTextSize" : "lra 6/23/2022 18:55",