fix font-face, font-weight; bump 0.0.19

README.md

@@ -5,7 +5,7 @@
 ### Usage
 
 ```nim
-requires "https://github.com/Quamolit/json-paint.nim#v0.0.18"
+requires "https://github.com/Quamolit/json-paint.nim#v0.0.19"
 ```
 
 ```nim
@@ -64,7 +64,8 @@ x: 1
 y: 1
 text: 'DEMO'
 'font-size': 14
-'font-family': 'Arial'
+'font-face': 'Arial'
+'font-weight': 'normal',
 color: Color
 align: "center" # 'left' | 'center' | 'right'
 ```

json_paint.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.0.18"
+version       = "0.0.19"
 author        = "jiyinyiyong"
 description   = "JSON DSL for canvas rendering"
 license       = "MIT"

src/json_paint/shape_renderer.nim

@@ -133,9 +133,12 @@ proc renderText(ctx: ptr Context, tree: JsonNode, base: TreeContext) =
   let fontSize = if tree.contains("font-size"): tree["font-size"].getFloat else: 14
   let text = if tree.contains("text"): tree["text"].getStr else: "TEXT"
   let align = if tree.contains("align"): tree["align"].getStr else: "left"
-  let fontFamily = if tree.contains("font-family"): tree["font-family"].getStr else: "Arial"
+  let fontFace = if tree.contains("font-face"): tree["font-face"].getStr else: "Arial"
   let color = if tree.contains("color"): readJsonColor(tree["color"]) else: failedColor
-  ctx.selectFontFace text.cstring, FontSlantNormal, FontWeightNormal
+  var weight = FontWeightNormal
+  if tree.contains("font-weight") and tree["font-weight"].getStr() == "bold":
+    weight = FontWeightBold
+  ctx.selectFontFace fontFace.cstring, FontSlantNormal, weight
   ctx.setFontSize fontSize
   ctx.setSourceRgba(color.r, color.g, color.b, color.a)
   var extents: TextExtents

tests/demo.nim

@@ -51,6 +51,8 @@ proc renderSomething() =
         "type": "text",
         "text": "this is a demo",
         "align": "center",
+        "font-face": "Menlo",
+        "font-weight": "normal",
         "x": 40,
         "y": 40,
         "color": [140, 80, 76]