fixed monospaced fonts

creativescala · Aug 31, 2024 · 7444aac · 7444aac
1 parent 9f057c0
commit 7444aac
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/svg/shared/src/main/scala/doodle/svg/algebra/Svg.scala b/svg/shared/src/main/scala/doodle/svg/algebra/Svg.scala
@@ -23,9 +23,9 @@ import cats.effect.IO
 import doodle.algebra.Picture
 import doodle.algebra.generic.Fill
 import doodle.algebra.generic.Stroke
-import doodle.core.*
+import doodle.core._
 import doodle.core.font.FontSize.Points
-import doodle.core.font.*
+import doodle.core.font._
 import doodle.svg.effect.Size
 
 import scala.collection.mutable
@@ -116,7 +116,7 @@ trait SvgModule { self: Base =>
         font.family match {
           case FontFamily.Serif       => "serif"
           case FontFamily.SansSerif   => "sans-serif"
-          case FontFamily.Monospaced  => "monospaced"
+          case FontFamily.Monospaced  => "monospace"
           case FontFamily.Named(name) => name
         }
 

diff --git a/svg/shared/src/test/scala/doodle/svg/effect/SvgSpec.scala b/svg/shared/src/test/scala/doodle/svg/effect/SvgSpec.scala
@@ -18,8 +18,8 @@ package doodle
 package svg
 package effect
 
-import doodle.algebra.generic.*
-import doodle.core.*
+import doodle.algebra.generic._
+import doodle.core._
 import doodle.language.Basic
 import munit.CatsEffectSuite
 
@@ -82,6 +82,19 @@ class SvgSpec
     )
   }
 
+  test("monospaced fonts render correctly") {
+    import doodle.core.font.Font
+    import doodle.core.font.FontFamily
+
+    assertEquals(
+      Svg
+        .textTag("abc", Font.defaultSansSerif.family(FontFamily.monospaced))
+        .toString,
+      """<text font-family="monospace" style="font-style: normal;" font-size="12pt" font-weight="normal">abc</text>"""
+    )
+
+  }
+
   test("paths of points render correctly") {
     val path1 = "M 5,5 L 10,10 L 20,20 "
     val path2 = "M 5,5 L 10,10 L 20,20 Z"