Return full name for font instead of user input

nicklockwood · nicklockwood · commit 29c6e27d5aa5 · 2025-10-12T17:54:06.000+01:00
diff --git a/ShapeScript/EvaluationContext.swift b/ShapeScript/EvaluationContext.swift
@@ -312,15 +312,15 @@ extension EvaluationContext {
         guard [".otf", ".ttf", ".ttc"].contains(where: {
             name.lowercased().hasSuffix($0)
         }) else {
-            guard CGFont(name as CFString) != nil else {
+            guard let font = CGFont(name as CFString) else {
                 var options = [String]()
                 options += CTFontManagerCopyAvailablePostScriptNames() as? [String] ?? []
                 options += CTFontManagerCopyAvailableFontFamilyNames() as? [String] ?? []
                 // TODO: Work around silly race condition where font may have
                 // been imported by another file in the meantime
                 throw RuntimeErrorType.unknownFont(name, options: options)
             }
-            return name
+            return font.fullName as String? ?? name
         }
         let url = try resolveURL(for: name)
         guard let dataProvider = CGDataProvider(url: url as CFURL) else {
diff --git a/ShapeScriptTests/StandardLibraryTests.swift b/ShapeScriptTests/StandardLibraryTests.swift
@@ -691,29 +691,46 @@ final class StandardLibraryTests: XCTestCase {
         XCTAssertNoThrow(try program.evaluate(in: context))
     }
 
-    func testFontNameMember() throws {
+    func testFontReturnsFullName() throws {
         let program = try parse("""
         font "Times"
-        print font.name
+        print font
         """)
         let delegate = TestDelegate()
         let context = EvaluationContext(source: program.source, delegate: delegate)
         XCTAssertNoThrow(try program.evaluate(in: context))
+        #if os(iOS)
+        XCTAssertEqual(delegate.log, ["Times New Roman"])
+        #elseif os(macOS)
+        XCTAssertEqual(delegate.log, ["Times Roman"])
+        #else
         XCTAssertEqual(delegate.log, ["Times"])
+        #endif
+    }
+
+    func testFontNameMember() throws {
+        let program = try parse("""
+        font "Arial"
+        print font.name
+        """)
+        let delegate = TestDelegate()
+        let context = EvaluationContext(source: program.source, delegate: delegate)
+        XCTAssertNoThrow(try program.evaluate(in: context))
+        XCTAssertEqual(delegate.log, ["Arial"])
     }
 
     func testFontInBlock() throws {
         let program = try parse("""
         define foo {
-            font "Times"
+            font "Arial"
             print font
         }
         foo
         """)
         let delegate = TestDelegate()
         let context = EvaluationContext(source: program.source, delegate: delegate)
         XCTAssertNoThrow(try program.evaluate(in: context))
-        XCTAssertEqual(delegate.log, ["Times"])
+        XCTAssertEqual(delegate.log, ["Arial"])
     }
 
     func testFontInBlockCallScope() throws {
@@ -722,14 +739,14 @@ final class StandardLibraryTests: XCTestCase {
             print font
         }
         group {
-            font "Times"
+            font "Arial"
             foo
         }
         """)
         let delegate = TestDelegate()
         let context = EvaluationContext(source: program.source, delegate: delegate)
         XCTAssertNoThrow(try program.evaluate(in: context))
-        XCTAssertEqual(delegate.log, ["Times"])
+        XCTAssertEqual(delegate.log, ["Arial"])
     }
 
     func testFontInBlockCall() throws {
@@ -738,13 +755,13 @@ final class StandardLibraryTests: XCTestCase {
             print font
         }
         foo {
-            font "Times"
+            font "Arial"
         }
         """)
         let delegate = TestDelegate()
         let context = EvaluationContext(source: program.source, delegate: delegate)
         XCTAssertNoThrow(try program.evaluate(in: context))
-        XCTAssertEqual(delegate.log, ["Times"])
+        XCTAssertEqual(delegate.log, ["Arial"])
     }
 
     // MARK: Strings
