Use comma separated strings

diff --git a/Map.xcodeproj/project.pbxproj b/Map.xcodeproj/project.pbxproj
index f1387469f52ceffe2cbb641e8fa3b4a8319e3f44..7dc8883d30711d677b7397d9719de3f6392eb006 100644 (file)
--- a/Map.xcodeproj/project.pbxproj
+++ b/Map.xcodeproj/project.pbxproj
@@ -653,7 +653,7 @@
                                CODE_SIGN_ENTITLEMENTS = Map/Map.entitlements;
                                CODE_SIGN_STYLE = Automatic;
                                COMBINE_HIDPI_IMAGES = YES;
                                CODE_SIGN_ENTITLEMENTS = Map/Map.entitlements;
                                CODE_SIGN_STYLE = Automatic;
                                COMBINE_HIDPI_IMAGES = YES;

-                               CURRENT_PROJECT_VERSION = 3;
+                               CURRENT_PROJECT_VERSION = 4;

                                DEVELOPMENT_ASSET_PATHS = "\"Map/Preview Content\"";
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                ENABLE_HARDENED_RUNTIME = YES;
                                DEVELOPMENT_ASSET_PATHS = "\"Map/Preview Content\"";
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                ENABLE_HARDENED_RUNTIME = YES;


@@ -667,7 +667,7 @@
                                        "@executable_path/../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 14.0;
                                        "@executable_path/../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 14.0;

-                               MARKETING_VERSION = 3.0.0;
+                               MARKETING_VERSION = 3.0.1;

                                PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SWIFT_EMIT_LOC_STRINGS = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SWIFT_EMIT_LOC_STRINGS = YES;


@@ -683,7 +683,7 @@
                                CODE_SIGN_ENTITLEMENTS = Map/Map.entitlements;
                                CODE_SIGN_STYLE = Automatic;
                                COMBINE_HIDPI_IMAGES = YES;
                                CODE_SIGN_ENTITLEMENTS = Map/Map.entitlements;
                                CODE_SIGN_STYLE = Automatic;
                                COMBINE_HIDPI_IMAGES = YES;

-                               CURRENT_PROJECT_VERSION = 3;
+                               CURRENT_PROJECT_VERSION = 4;

                                DEVELOPMENT_ASSET_PATHS = "\"Map/Preview Content\"";
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                ENABLE_HARDENED_RUNTIME = YES;
                                DEVELOPMENT_ASSET_PATHS = "\"Map/Preview Content\"";
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                ENABLE_HARDENED_RUNTIME = YES;


@@ -697,7 +697,7 @@
                                        "@executable_path/../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 14.0;
                                        "@executable_path/../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 14.0;

-                               MARKETING_VERSION = 3.0.0;
+                               MARKETING_VERSION = 3.0.1;

                                PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SWIFT_EMIT_LOC_STRINGS = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/Map/Logic/MapParser/Strategies/GroupParserStrategy.swift b/Map/Logic/MapParser/Strategies/GroupParserStrategy.swift
index ea5e0f373b1f1e21c88410ab5a11949cb9cb540c..d1acec2764f70a4d78bbf3e67c673c8eed335103 100644 (file)
--- a/Map/Logic/MapParser/Strategies/GroupParserStrategy.swift
+++ b/Map/Logic/MapParser/Strategies/GroupParserStrategy.swift
@@ -32,8 +32,10 @@ struct GroupParserStrategy: MapParserStrategy {
     let match = matches[0]
     var groupVertices: [Vertex] = []
     let vertexIdString = String(line[Range(match.range(at: 2), in: line)!])
     let match = matches[0]
     var groupVertices: [Vertex] = []
     let vertexIdString = String(line[Range(match.range(at: 2), in: line)!])

-    let vertexIds = vertexIdString.split(separator: " ", omittingEmptySubsequences: true).map(
-      String.init)
+    let vertexIds = vertexIdString.split(separator: ",", omittingEmptySubsequences: true).map(
+      String.init).map({ vertexId in
+        vertexId.trimmingCharacters(in: .whitespacesAndNewlines)
+      })

 
     for vertexId in vertexIds {
       if let vertex = vertices[vertexId] {
 
     for vertexId in vertexIds {
       if let vertex = vertices[vertexId] {

diff --git a/README.md b/README.md
index d8713cbf0cb6f637356055da911a1da53d7aaa44..e64c16a39b59d86d8e3e32824d12e0659cb4b030 100644 (file)
--- a/README.md
+++ b/README.md
@@ -65,9 +65,10 @@ you'll get some rendering issues.
 
 ### Groups
 
 
 ### Groups
 

-You can group nodes together by using `[Group] NodeA NodeB...`. eg.
+You can group nodes together by using `[Group] NodeA, NodeB...`. eg.

 
 

-- `[Group] Tinker Tailor Soldier`
+- `[Group] Tinker, Tailor, Soldier`
+- `[Group] Two Words, Three Words Here`

 
 ### Notes
 
 
 ### Notes