!157 · krz/orgstar

Sources/OrgApp/DocumentSession.swift +8

	@@ -82,6 +82,14 @@ public final class DocumentSession {
82	DocumentState(bytes: bytes, defaults: defaults.resolvingSetupFiles(in: SourceText(bytes: bytes).text, path: path, read: readText))	82	DocumentState(bytes: bytes, defaults: defaults.resolvingSetupFiles(in: SourceText(bytes: bytes).text, path: path, read: readText))
83	}	83	}
84		84
		85	/// The settings of the file at `path` as the editor sees them: its open buffer's, or its
		86	/// text on disk with the defaults and the setup files it names.
		87	public func settings(for path: String) -> OrgSettings? {
		88	if let entry = entry(path) { return entry.buffer.document.tree.settings }
		89	guard let bytes = (try? fileSystem.read(URL(fileURLWithPath: path))).flatMap({ $0 }) else { return nil }
		90	return loaded(bytes, path: path).tree.settings
		91	}
		92
85	/// A file's text, for setup files.	93	/// A file's text, for setup files.
86	func readText(_ file: String) -> String? {	94	func readText(_ file: String) -> String? {
87	(try? fileSystem.read(URL(fileURLWithPath: file))).flatMap { $0 }.flatMap { String(bytes: $0, encoding: .utf8) }	95	(try? fileSystem.read(URL(fileURLWithPath: file))).flatMap { $0 }.flatMap { String(bytes: $0, encoding: .utf8) }

Sources/OrgApp/OrgPreferences.swift +9 −2

         return settings
     }
-    /// What commands run from the agenda and capture follow: logging and tags.
+    /// The editing options, as the Mac's Settings apply them.
     public static func options(_ defaults: UserDefaults = .standard) -> EditingOptions {
         var options = EditingOptions(
             tagsColumn: integer("tagsColumn", defaults), insertHeadingRespectContent: bool("headingAfterSubtree", defaults),
+            metaReturnMaySplitLine: bool("splitLine", defaults),
             listAllowAlphabetical: bool("alphabeticalLists", defaults), fillColumn: integer("fillColumn", defaults),
+            hideEmphasisMarkers: bool("hiddenMarkers", defaults), prettyEntities: bool("prettyEntities", defaults), subSuperscriptsNeedBraces: true,
             logDone: LogHow(rawValue: string("logDone", defaults)), logIntoDrawer: string("logIntoDrawer", defaults).nonEmpty,
-            logReschedule: LogHow(rawValue: string("logReschedule", defaults)), logRedeadline: LogHow(rawValue: string("logRedeadline", defaults))
+            hideDrawerStartup: bool("hideDrawerStartup", defaults), hideBlockStartup: bool("hideBlockStartup", defaults),
+            logReschedule: LogHow(rawValue: string("logReschedule", defaults)), logRedeadline: LogHow(rawValue: string("logRedeadline", defaults)),
+            useSpeedCommands: bool("useSpeedCommands", defaults), startupWithInlineImages: bool("startupWithInlineImages", defaults),
+            startupIndented: bool("startupIndented", defaults), hideLeadingStars: bool("hideLeadingStars", defaults),
+            startupAlignAllTables: bool("startupAlignAllTables", defaults), startupTruncated: bool("startupTruncated", defaults),
+            spellCheck: bool("spellCheck", defaults)
         )
         options.electricPair = bool("electricPair", defaults)
         return options

Sources/OrgstarMobile/AgendaScreen.swift +3 −5

             }
         case .failed(let text):
             message = text
-        case .external:
+        case .external(let request):
-            message = "\(command.title) needs Emacs, which runs on the Mac."
+            message = MobileEditor.unavailable(request, title: command.title)
         case .commit:
             message = nil
         }
     /// The first done keyword of the item's TODO sequence.
     private func doneKeyword(for item: AgendaItem) -> String? {
-        guard let todo = item.todo, let path = item.path else { return nil }
+        guard let todo = item.todo, let path = item.path, let settings = session.settings(for: path) else { return nil }
-        let text = session.openTexts[path] ?? (try? String(contentsOfFile: path, encoding: .utf8)) ?? ""
-        let settings = OrgParser.parse(text).settings
         return settings.todoSequences.first { ($0.active + $0.done).contains { $0.name == todo } }?.done.first?.name
     }

Sources/OrgstarMobile/CaptureScreen.swift +1

	@@ -65,6 +65,7 @@ struct CaptureScreen: View {
65	templates = loaded.templates	65	templates = loaded.templates
66	problem = loaded.problems.first	66	problem = loaded.problems.first
67	key = request.template.flatMap { wanted in templates.first { $0.key == wanted }?.key } ?? templates.first?.key	67	key = request.template.flatMap { wanted in templates.first { $0.key == wanted }?.key } ?? templates.first?.key
		68	if let wanted = request.template, !templates.contains(where: { $0.key == wanted }) { problem = "No capture template \"\(wanted)\"" }
68	}	69	}
69	.onChange(of: key, initial: true) { choose() }	70	.onChange(of: key, initial: true) { choose() }
70	}	71	}

Sources/OrgstarMobile/MobileEditor.swift +15 −8

 final class MobileEditor: NSObject, DocumentBuffer {
     private(set) var document: DocumentState
     let textView: UITextView
-    var options: EditingOptions = .org
+    var options: EditingOptions = .org {
+        didSet { textView.spellCheckingType = options.spellCheck ? .yes : .no }
+    }
     var keymap = KeymapPreset.emacs.keymap
     var onChange: (() -> Void)?
     var onMessage: ((String) -> Void)?
         textView.smartQuotesType = .no
         textView.smartDashesType = .no
         textView.smartInsertDeleteType = .no
-        textView.spellCheckingType = .yes
+        textView.spellCheckingType = options.spellCheck ? .yes : .no
         textView.keyboardDismissMode = .interactive
         textView.alwaysBounceVertical = true
         textView.textContainerInset = UIEdgeInsets(top: 12, left: 8, bottom: 24, right: 8)
             onTangle?(scope)
         case .external(.agenda(let start, let count)) where onAgenda != nil:
             onAgenda?(start, count)
-        case .external(.emacsTable(_, _, _, let reason, _)):
+        case .external(let request):
-            onMessage?("This table needs Emacs, which runs on the Mac: \(reason).")
+            onMessage?(Self.unavailable(request, title: command.title))
-        case .external:
-            onMessage?("\(command.title) needs Emacs, which runs on the Mac.")
         }
         return step
     }
+    /// Why a request the app doesn't handle did nothing: only table recalculation needs Emacs.
+    static func unavailable(_ request: ExternalRequest, title: String) -> String {
+        if case .emacsTable(_, _, _, let reason, _) = request { return "This table needs Emacs, which runs on the Mac: \(reason)." }
+        return "\(title) isn't available on iPhone and iPad."
+    }
     // MARK: - Commands by name and key
     /// Runs what `keys` (as `C-c C-t`) is bound to in the Emacs keymap, for the caret's context.
             let runnable = candidates.first { binding in
                 (binding.when.map { KeyContext.holds($0, in: context) } ?? true) && applies(binding.command, in: context)
             }
-            guard let binding = runnable else { return keys.count > 1 }
+            // A sequence runs its command even where it doesn't apply, which says why, as on the Mac.
-            if binding.command.hasPrefix("edit."), !["edit.undo", "edit.redo"].contains(binding.command) { return keys.count > 1 }
+            guard let binding = runnable ?? (keys.count > 1 ? candidates.first : nil) else { return false }
+            if keys.count == 1, binding.command.hasPrefix("edit."), !["edit.undo", "edit.redo"].contains(binding.command) { return false }
             run(binding.command)
             return true
         }

Sources/OrgstarMobile/SettingsScreen.swift +9 −1

             Section("In use") {
                 let _ = model.settingsVersion
                 LabeledContent("TODO keywords", value: todoKeywords)
-                LabeledContent("Agenda", value: "\(OrgPreferences.agendaSpan()) days from \(OrgPreferences.agendaStartOffset())d")
+                LabeledContent("Agenda", value: agenda)
                 LabeledContent("Reminders", value: OrgPreferences.reminders() ? "\(OrgPreferences.reminderLead()) min before" : "Off")
                 LabeledContent("Capture templates", value: CaptureTemplates.load().templates.map(\.key).joined(separator: " "))
             }
         }
     }
+    /// The span and start day, worded as the Mac's Settings word the start.
+    private var agenda: String {
+        func days(_ count: Int) -> String { count == 1 ? "1 day" : "\(count) days" }
+        let offset = OrgPreferences.agendaStartOffset()
+        let start = offset == 0 ? "today" : offset < 0 ? "\(days(-offset)) before today" : "\(days(offset)) after today"
+        return "\(days(OrgPreferences.agendaSpan())), starting \(start)"
+    }
     private var todoKeywords: String {
         OrgPreferences.orgSettings().todoSequences.map { ($0.active.map(\.name) + ["|"] + $0.done.map(\.name)).joined(separator: " ") }
             .joined(separator: "; ")

Tests/OrgAppTests/AppTests.swift +14

	@@ -226,6 +226,20 @@ struct DocumentSessionTests {
226	#expect(session.document?.tree.settings.todoKeywordNames.contains("NEXT") == true)	226	#expect(session.document?.tree.settings.todoKeywordNames.contains("NEXT") == true)
227	}	227	}
228		228
		229	@Test func settingsForAFileUseDefaultsAndSetupFiles() throws {
		230	let notes = try Folder()
		231	try notes.write("setup.org", "#+TODO: NEXT \| FINISHED\n")
		232	let viaSetup = try notes.write("a.org", "#+SETUPFILE: setup.org\n* NEXT One\n")
		233	let plain = try notes.write("b.org", "* WAIT Two\n")
		234	let session = DocumentSession(recovery: FileRecoveryStore(directory: notes.url.appendingPathComponent(".r")))
		235	session.defaults = try #require(OrgSettings.default.withTodoKeywords("WAIT \| OK"))
		236	#expect(session.settings(for: viaSetup.path)?.todoSequences.first?.done.first?.name == "FINISHED")
		237	#expect(session.settings(for: plain.path)?.todoSequences.first?.done.first?.name == "OK")
		238	session.open(plain.path)
		239	#expect(session.settings(for: plain.path)?.todoSequences.first?.done.first?.name == "OK")
		240	#expect(session.settings(for: notes.url.appendingPathComponent("missing.org").path) == nil)
		241	}
		242
229	@Test func keywordCtrlCCtrlCRereadsSetupFiles() throws {	243	@Test func keywordCtrlCCtrlCRereadsSetupFiles() throws {
230	let notes = try Folder()	244	let notes = try Folder()
231	try notes.write("setup.org", "#+TODO: NEXT \| DONE\n")	245	try notes.write("setup.org", "#+TODO: NEXT \| DONE\n")

Tests/OrgAppTests/OrgPreferencesTests.swift +7

         #expect(OrgPreferences.options(defaults).logDone == nil && OrgPreferences.options(defaults).tagsColumn == -77)
         #expect(OrgPreferences.agendaSpan(defaults) == 10 && OrgPreferences.agendaStartOffset(defaults) == -3)
         #expect(OrgPreferences.reminders(defaults) && OrgPreferences.reminderLead(defaults) == 12)
+        let fallbacks = OrgPreferences.options(defaults)
+        #expect(!fallbacks.metaReturnMaySplitLine && fallbacks.hideEmphasisMarkers && fallbacks.prettyEntities && fallbacks.subSuperscriptsNeedBraces)
+        #expect(fallbacks.startupIndented && !fallbacks.spellCheck && fallbacks.hideDrawerStartup && !fallbacks.hideBlockStartup)
         let problems = UserConfig.apply("""
             org-todo-keywords = "TODO NEXT | DONE"
             org-agenda-span = 7
             org-agenda-start-day = "-1d"
             appt-message-warning-time = 30
+            org-M-RET-may-split-line = true
+            org-hide-emphasis-markers = false
+            org-pretty-entities = false
             [orgstar]
             reminders = false
             """, to: defaults)
         #expect(OrgPreferences.orgSettings(defaults).todoSequences.first?.active.map(\.name) == ["TODO", "NEXT"])
         let options = OrgPreferences.options(defaults)
         #expect(options.logDone == .time && options.logIntoDrawer == "LOGBOOK")
+        #expect(options.metaReturnMaySplitLine && !options.hideEmphasisMarkers && !options.prettyEntities)
         #expect(OrgPreferences.agendaSpan(defaults) == 7 && OrgPreferences.agendaStartOffset(defaults) == -1)
         #expect(!OrgPreferences.reminders(defaults) && OrgPreferences.reminderLead(defaults) == 30)
     }

iOS fixes from the manual review !157