265b9d6362 · krz/orgstar

Sources/OrgApp/EmacsImport.swift +2 −1

             guard let n = value.integer else { return note("not a number") }
             add(name, .integer(n))
         case "org-insert-heading-respect-content", "org-list-allow-alphabetical", "org-hide-emphasis-markers", "org-pretty-entities",
-             "org-cycle-hide-drawer-startup", "org-cycle-hide-block-startup", "org-use-speed-commands", "org-startup-with-inline-images":
+             "org-cycle-hide-drawer-startup", "org-cycle-hide-block-startup", "org-use-speed-commands", "org-startup-with-inline-images",
+             "org-startup-indented", "org-hide-leading-stars", "org-startup-align-all-tables":
             add(name, .bool(truthy))
         case "org-hide-drawer-startup", "org-hide-block-startup":
             add(name == "org-hide-drawer-startup" ? "org-cycle-hide-drawer-startup" : "org-cycle-hide-block-startup", .bool(truthy))

Sources/OrgApp/UserConfig.swift +6

                 fallback: .string("nil"), comment: "nil, time or note: log changing or removing a DEADLINE", legacy: ""),
         Setting(section: "", key: "org-log-into-drawer", defaultsKey: "logIntoDrawer", kind: .string, fallback: .string(""),
                 comment: "the drawer state notes go in (\"LOGBOOK\" is Emacs's t); \"\" for none", legacy: ""),
+        Setting(section: "", key: "org-startup-indented", defaultsKey: "startupIndented", kind: .bool, fallback: .bool(true),
+                comment: "indent bodies under their headings (org-indent-mode); #+STARTUP: (no)indent overrides", legacy: ""),
+        Setting(section: "", key: "org-hide-leading-stars", defaultsKey: "hideLeadingStars", kind: .bool, fallback: .bool(false),
+                comment: "show only a heading's last star without indentation; #+STARTUP: hidestars/showstars overrides", legacy: ""),
+        Setting(section: "", key: "org-startup-align-all-tables", defaultsKey: "startupAlignAllTables", kind: .bool, fallback: .bool(false),
+                comment: "align every table when a file opens; #+STARTUP: (no)align overrides", legacy: ""),
         Setting(section: "", key: "org-startup-with-inline-images", defaultsKey: "startupWithInlineImages", kind: .bool, fallback: .bool(false),
                 comment: "show image links as images when a file opens; #+STARTUP: (no)inlineimages overrides", legacy: ""),
         Setting(section: "", key: "org-use-speed-commands", defaultsKey: "useSpeedCommands", kind: .bool, fallback: .bool(false),

Sources/OrgCore/Commands/Command.swift +11 −1

     public var useSpeedCommands: Bool
     /// `org-startup-with-inline-images`.
     public var startupWithInlineImages: Bool
+    /// `org-startup-indented`: org-indent's virtual indentation.
+    public var startupIndented = true
+    /// `org-hide-leading-stars`; org-indent hides them too.
+    public var hideLeadingStars = false
+    /// `org-startup-align-all-tables`.
+    public var startupAlignAllTables = false
     /// `org-cycle-hide-drawer-startup`: drawers are folded when a file opens.
     public var hideDrawerStartup: Bool
     /// `org-cycle-hide-block-startup`: blocks are folded when a file opens.
         hideEmphasisMarkers: Bool = false, prettyEntities: Bool = false, subSuperscriptsNeedBraces: Bool = false,
         logDone: LogHow? = nil, logIntoDrawer: String? = nil, fastTodoSelection: Bool = true,
         hideDrawerStartup: Bool = true, hideBlockStartup: Bool = false, logReschedule: LogHow? = nil, logRedeadline: LogHow? = nil,
-        useSpeedCommands: Bool = false, startupWithInlineImages: Bool = false
+        useSpeedCommands: Bool = false, startupWithInlineImages: Bool = false,
+        startupIndented: Bool = true, hideLeadingStars: Bool = false, startupAlignAllTables: Bool = false
     ) {
+        self.startupIndented = startupIndented
+        self.hideLeadingStars = hideLeadingStars
+        self.startupAlignAllTables = startupAlignAllTables
         self.useSpeedCommands = useSpeedCommands
         self.startupWithInlineImages = startupWithInlineImages
         self.logReschedule = logReschedule

Sources/OrgCore/Commands/Table.swift +25

	@@ -620,6 +620,31 @@ public struct TableCommand: OrgCommand {
620	}	620	}
621	}	621	}
622		622
		623	/// `#+STARTUP: align` (`org-startup-align-all-tables`): every table aligned.
		624	public struct AlignAllTables: OrgCommand {
		625	public init() {}
		626	public var id: String { "org.table.align-all" }
		627	public var title: String { "Align All Tables" }
		628	public func applies(in context: EditContext) -> Bool { true }
		629	public func run(in context: EditContext) -> CommandStep {
		630	let starts = context.tree.root.descendants().filter { $0.kind == .table }.map(\.range.lowerBound)
		631	guard !starts.isEmpty else { return .commit(EditResult(baseRevision: context.revision, edits: [])) }
		632	return commitBuffer(context) { buffer in
		633	let caret = buffer.marker(buffer.point)
		634	defer {
		635	buffer.point = caret.position
		636	buffer.release(caret)
		637	}
		638	for start in starts.reversed() {
		639	buffer.point = start
		640	buffer.skipForward([32, 9])
		641	buffer.point += 1
		642	buffer.tableAlign()
		643	}
		644	}
		645	}
		646	}
		647
623	/// C-c \|: `org-table-create` with a size prompt.	648	/// C-c \|: `org-table-create` with a size prompt.
624	public struct CreateTable: OrgCommand {	649	public struct CreateTable: OrgCommand {
625	public init() {}	650	public init() {}

Sources/OrgEditorAppKit/OrgEditor.swift +20 −1

         // Files open at their start, as in Emacs; replacing the storage leaves it at the end.
         textView.setSelectedRange(NSRange(location: 0, length: 0))
         if isOrg {
+            let words = Presentation.startupOptions(document.tree).map { $0.lowercased() }
+            indented = words.contains("indent") ? true : words.contains("noindent") ? false : options.startupIndented
+            hideStars = words.contains("hidestars") ? true : words.contains("showstars") ? false : options.hideLeadingStars
             var startup = Presentation.startupFoldState(document.tree) ?? FoldState()
+            // VISIBILITY properties and archived trees, unless everything shows.
+            if Presentation.startupFoldState(document.tree) != nil, !words.contains("showeverything") {
+                startup = Presentation.applyVisibilityProperties(startup, in: document.tree)
+            }
             let wrappers = Presentation.startupWrappers(document.tree, hideDrawers: options.hideDrawerStartup, hideBlocks: options.hideBlockStartup)
             startup.wrapperFolds = Set(wrappers.map(\.start))
             if startup != FoldState() { setFolds(startup, wrappers: wrappers) }
             shrinkAtStartup()
             if InlineImages.startup(document.tree) ?? options.startupWithInlineImages { showsImages = true }
+            if words.contains("align") || (options.startupAlignAllTables && !words.contains("noalign")) {
+                _ = perform(AlignAllTables())
+            }
+            if !indented || !hideStars { restyleOutsideEditing(0..<utf16Length) }
         }
     }
         }
     }
+    // MARK: - STARTUP display
+    /// `org-indent-mode`: headings' bodies indented under their titles (`#+STARTUP: indent`).
+    private var indented = true
+    /// `org-hide-leading-stars` (`#+STARTUP: hidestars`); org-indent hides them as well.
+    private var hideStars = false
     // MARK: - Inline images
     /// `org-toggle-inline-images`: lines that are only an image link show the image.
             return
         }
         let text = storage.string as NSString
-        for run in Presentation.indents(document.tree, in: range) {
+        for run in Presentation.indents(document.tree, in: range) where indented {
             guard let clipped = clip(run.range, to: range) else { continue }
             guard run.firstLine == run.wrapped else {
                 storage.addAttribute(.paragraphStyle, value: paragraphStyle(run.firstLine, run.wrapped), range: clipped)
         var scriptExclusions: [Range<Int>] = []
         for run in Presentation.styles(document.tree, in: range, highlighter: highlighter) {
             guard let clipped = clip(run.range, to: range) else { continue }
+            if run.role == .leadingStars, !indented, !hideStars { continue }
             if !showMarkup, hides(run.role), NSIntersectionRange(clipped, revealed).length == 0 {
                 storage.addAttributes(theme.hidden, range: clipped)
             } else {

Sources/OrgPresentation/Folding.swift +36

	@@ -153,6 +153,42 @@ extension Presentation {
153	}	153	}
154	}	154	}
155		155
		156	/// `org-cycle-set-visibility-according-to-property` and `org-cycle-hide-archived-subtrees`
		157	/// after the startup visibility: each heading's `VISIBILITY` (`folded`, `children`, `content`,
		158	/// `all`) in turn, then ARCHIVE-tagged subtrees folded.
		159	public static func applyVisibilityProperties(_ state: FoldState, in tree: OrgTree) -> FoldState {
		160	let outline = outline(tree)
		161	let model = DocumentModel(tree: tree)
		162	var next = state
		163	for (index, heading) in model.headings.enumerated() {
		164	guard index < outline.count,
		165	let value = heading.properties.last(where: { $0.key.uppercased() == "VISIBILITY" })?.value.lowercased() else { continue }
		166	let entry = outline[index]
		167	let descendants = outline.filter { $0.start > entry.start && $0.start < entry.end }.map(\.start)
		168	let children = outline.enumerated().filter { $0.element.parent == index }.map(\.element.start)
		169	switch value {
		170	case "folded":
		171	next.folds.insert(entry.start)
		172	case "children":
		173	next.folds.remove(entry.start)
		174	next.bodyFolds.remove(entry.start)
		175	next.folds.formUnion(children)
		176	case "content":
		177	next.folds.subtract([entry.start] + descendants)
		178	next.bodyFolds.formUnion([entry.start] + descendants)
		179	case "all", "showall":
		180	next.folds.subtract([entry.start] + descendants)
		181	next.bodyFolds.subtract([entry.start] + descendants)
		182	default:
		183	break
		184	}
		185	}
		186	for (index, heading) in model.headings.enumerated() where index < outline.count && heading.localTags.contains("ARCHIVE") {
		187	next.folds.insert(outline[index].start)
		188	}
		189	return next
		190	}
		191
156	/// Headings of levels 1 through `levels` visible, no bodies.	192	/// Headings of levels 1 through `levels` visible, no bodies.
157	public static func foldState(showingLevels levels: Int, in tree: OrgTree) -> FoldState {	193	public static func foldState(showingLevels levels: Int, in tree: OrgTree) -> FoldState {
158	let outline = outline(tree)	194	let outline = outline(tree)

Sources/Orgstar/ContentView.swift +5 −1

     @AppStorage("logRedeadline") private var logRedeadline = "nil"
     @AppStorage("useSpeedCommands") private var useSpeedCommands = false
     @AppStorage("startupWithInlineImages") private var startupWithInlineImages = false
+    @AppStorage("startupIndented") private var startupIndented = true
+    @AppStorage("hideLeadingStars") private var hideLeadingStars = false
+    @AppStorage("startupAlignAllTables") private var startupAlignAllTables = false
     @AppStorage("hideDrawerStartup") private var hideDrawerStartup = true
     @AppStorage("hideBlockStartup") private var hideBlockStartup = false
             tagsColumn: tagsColumn, headingAfterSubtree: headingAfterSubtree, splitLine: splitLine, alphabeticalLists: alphabeticalLists,
             fillColumn: fillColumn, hiddenMarkers: hiddenMarkers, prettyEntities: prettyEntities, logDone: logDone, logIntoDrawer: logIntoDrawer,
             hideDrawerStartup: hideDrawerStartup, hideBlockStartup: hideBlockStartup, logReschedule: logReschedule, logRedeadline: logRedeadline,
-            useSpeedCommands: useSpeedCommands, startupWithInlineImages: startupWithInlineImages
+            useSpeedCommands: useSpeedCommands, startupWithInlineImages: startupWithInlineImages,
+            startupIndented: startupIndented, hideLeadingStars: hideLeadingStars, startupAlignAllTables: startupAlignAllTables
         )
     }
     /// A block being edited apart (`org-edit-special`).

Sources/Orgstar/Preferences.swift +4 −2

     static func options(
         tagsColumn: Int, headingAfterSubtree: Bool, splitLine: Bool, alphabeticalLists: Bool, fillColumn: Int,
         hiddenMarkers: Bool, prettyEntities: Bool, logDone: String, logIntoDrawer: String,
-        hideDrawerStartup: Bool, hideBlockStartup: Bool, logReschedule: String, logRedeadline: String, useSpeedCommands: Bool, startupWithInlineImages: Bool
+        hideDrawerStartup: Bool, hideBlockStartup: Bool, logReschedule: String, logRedeadline: String, useSpeedCommands: Bool, startupWithInlineImages: Bool,
+        startupIndented: Bool, hideLeadingStars: Bool, startupAlignAllTables: Bool
     ) -> EditingOptions {
         EditingOptions(
             tagsColumn: tagsColumn, insertHeadingRespectContent: headingAfterSubtree,
             logDone: LogHow(rawValue: logDone), logIntoDrawer: logIntoDrawer.isEmpty ? nil : logIntoDrawer,
             hideDrawerStartup: hideDrawerStartup, hideBlockStartup: hideBlockStartup,
             logReschedule: LogHow(rawValue: logReschedule), logRedeadline: LogHow(rawValue: logRedeadline),
-            useSpeedCommands: useSpeedCommands, startupWithInlineImages: startupWithInlineImages
+            useSpeedCommands: useSpeedCommands, startupWithInlineImages: startupWithInlineImages,
+            startupIndented: startupIndented, hideLeadingStars: hideLeadingStars, startupAlignAllTables: startupAlignAllTables
         )
     }
 }

Tests/OrgPresentationTests/VisibilityPropertyTests.swift added +30

@@ -0,0 +1,30 @@
	1	import Foundation
	2	import Testing
	3	import OrgCore
	4	@testable import OrgPresentation
	5
	6	struct VisibilityPropertyTests {
	7	static let text = "#+STARTUP: overview\n* A\n:PROPERTIES:\n:VISIBILITY: children\n:END:\nbody a\n A1\na1 body\n* A11\n** A2\n* B\n:PROPERTIES:\n:VISIBILITY: content\n:END:\nbody b\n B1\nb1 body\n* B11\nb11\n* C\n:PROPERTIES:\n:VISIBILITY: all\n:END:\nbody c\n** C1\nc1\n* D :ARCHIVE:\n** D1\n* E\n:PROPERTIES:\n:VISIBILITY: folded\n:END:\n** E1\n"
	8
	9	/// Line visibility after opening the file, as Emacs 31.1 / Org 9.8.7 shows it, except that
	10	/// Emacs leaves B's `:PROPERTIES:` line (line 12) showing under `content`.
	11	static let emacs = "111001100110000101011001111010000"
	12
	13	@Test func foldsByVisibilityProperties() {
	14	let tree = OrgParser.parse(Self.text)
	15	var state = Presentation.applyVisibilityProperties(Presentation.startupFoldState(tree)!, in: tree)
	16	let wrappers = Presentation.startupWrappers(tree)
	17	state.wrapperFolds = Set(wrappers.map(\.start))
	18	let hidden = Presentation.hiddenRanges(tree, folds: state.folds, bodyFolds: state.bodyFolds, wrapperRanges: wrappers.map(\.hidden))
	19	let ns = Self.text as NSString
	20	var visibility = ""
	21	var offset = 0
	22	while offset < ns.length {
	23	visibility += hidden.contains { $0.contains(offset) } ? "0" : "1"
	24	offset = NSMaxRange(ns.lineRange(for: NSRange(location: offset, length: 0)))
	25	}
	26	var expected = Array(Self.emacs)
	27	expected[11] = "0"
	28	#expect(visibility == String(expected))
	29	}
	30	}

Commit 265b9d6362

Commit `265b9d6362`