Support dashed strokes in (lispkit draw). Bump LispKit version to 1.5.0 and LispKit Shell version to 2.0.1.

Author: objecthub

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.5.0 (2018-08-10)
+- Allow importing multiple libraries with one `import` invocation
+- Mark continuations correctly and fix `continuation?`
+- Turn `current-input-port`, `current-output-port`, and `current-error-port` into parameter objects
+- New library: `(lispkit draw)`
+- New SRFI libraries: SRFI 111, SRFI 112, SRFI 113
+- Fixed bugs in SRFI 69
+- Extend `(lispkit test)` to be more compatible to similar libraries
+
 ## 1.4.1 (2018-06-23)
 - Fix memory leaks
 - Provide a comfortable command-line interface supporting both a read-eval-print loop and the execution of scripts

Sources/LispKit/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.1</string>
+	<string>1.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Sources/LispKit/Primitives/DrawingLibrary.swift

@@ -123,6 +123,7 @@ public final class DrawingLibrary: NativeLibrary {
     self.define(Procedure("enable-transformation", enableTransformation))
     self.define(Procedure("disable-transformation", disableTransformation))
     self.define(Procedure("draw", draw))
+    self.define(Procedure("draw-dashed", drawDashed))
     self.define(Procedure("fill", fill))
     self.define(Procedure("draw-text", drawText))
     self.define(Procedure("draw-image", drawImage))
@@ -326,9 +327,9 @@ public final class DrawingLibrary: NativeLibrary {
       throw RuntimeError.eval(.invalidSize, size)
     }
     try self.drawing(from: drawing).append(.setShadow(try self.color(from: color),
-                                                         dx: w,
-                                                         dy: h,
-                                                         blurRadius: try r.asDouble(coerce: true)))
+                                                      dx: w,
+                                                      dy: h,
+                                                      blurRadius: try r.asDouble(coerce: true)))
     return .void
   }
 
@@ -353,6 +354,28 @@ public final class DrawingLibrary: NativeLibrary {
     return .void
   }
 
+  private func drawDashed(shape: Expr,
+                          lengths: Expr,
+                          phase: Expr,
+                          width: Expr?,
+                          drawing: Expr?) throws -> Expr {
+    let shape = try self.shape(from: shape)
+    var dashLengths: [Double] = []
+    var list = lengths
+    while case .pair(let len, let rest) = list {
+      dashLengths.append(try len.asDouble(coerce: true))
+      list = rest
+    }
+    guard list.isNull else {
+      throw RuntimeError.type(lengths, expected: [.properListType])
+    }
+    let phase = try phase.asDouble(coerce: true)
+    let width = try width?.asDouble(coerce: true) ?? 1.0
+    try self.drawing(from: drawing).append(
+      .strokeDashed(shape, width: width, lengths: dashLengths, phase: phase))
+    return .void
+  }
+  
   private func fill(shape: Expr, drawing: Expr?) throws -> Expr {
     try self.drawing(from: drawing).append(.fill(try self.shape(from: shape)))
     return .void

Sources/LispKitRepl/AppInfo.swift

@@ -32,7 +32,7 @@ public struct AppInfo {
   // Version of the application
   public static let version =
     (Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String) ??
-    "2.0.0"
+    "2.0.1"
 
   // Copyright message
   public static let copyright =

Sources/LispKitRepl/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
+	<string>2.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Sources/LispKitRepl/main.swift

@@ -123,7 +123,7 @@ var cmdLineArgs = flags.parameters.isEmpty ? [CommandLine.arguments.first!] : fl
 #if SPM
   let context = Context(console: console,
                         implementationName: "LispKit",
-                        implementationVersion: "1.4.1",
+                        implementationVersion: "1.5.0",
                         commandLineArguments: cmdLineArgs,
                         includeInternalResources: false,
                         includeDocumentPath: searchDocs.wasSet ? "LispKit" : nil)