From: Ruben Beltran del Rio Date: Mon, 16 Sep 2024 10:28:22 +0000 (+0200) Subject: Use comma separated strings X-Git-Tag: 3.0.1 X-Git-Url: https://git.r.bdr.sh/rbdr/map/commitdiff_plain/8a50aceaf20dd2e9c06b278c8b252ebee91b6174?ds=inline Use comma separated strings --- diff --git a/Map.xcodeproj/project.pbxproj b/Map.xcodeproj/project.pbxproj index f138746..7dc8883 100644 --- 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; - CURRENT_PROJECT_VERSION = 3; + CURRENT_PROJECT_VERSION = 4; 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; - 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; @@ -683,7 +683,7 @@ 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; @@ -697,7 +697,7 @@ "@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; diff --git a/Map/Logic/MapParser/Strategies/GroupParserStrategy.swift b/Map/Logic/MapParser/Strategies/GroupParserStrategy.swift index ea5e0f3..d1acec2 100644 --- 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 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] { diff --git a/README.md b/README.md index d8713cb..e64c16a 100644 --- a/README.md +++ b/README.md @@ -65,9 +65,10 @@ you'll get some rendering issues. ### 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