Commit `674de54223`

674de542235029741e65b44cbb458b8846dec924

parent: 9abba9cfc5

Verified · cmc

cmc <hello@cleberg.net> · 2026-10-08 03:34 UTC

Apply every editing setting on iOS

OrgPreferences.options now carries org-M-RET-may-split-line,
org-hide-emphasis-markers, org-pretty-entities, braced sub/superscripts,
the startup options and spell checking, with the Mac's defaults. The iOS
editor turns spell checking on only when the setting is on.

Layout: unified · split

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/MobileEditor.swift +4 −2

 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)

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)
     }

Commit 674de54223

Commit `674de54223`