Commit `f095381f67`

f095381f674d2b6644376d22bf3e0832f69740a8

parent: 3605fe1062

Verified · cmc

cmc <hello@cleberg.net> · 2026-10-09 01:28 UTC

iOS reader honours the display settings

Hidden markup, hidden emphasis markers and pretty entities follow Show
Markup and the settings; src blocks are highlighted; org-indent,
hidestars, inline images and truncation follow #+STARTUP and the
settings; VISIBILITY properties apply only when #+STARTUP sets a
visibility, as in the editors.

Layout: unified · split

Sources/OrgPresentation/ReadingText.swift +51 −6

	@@ -12,12 +12,30 @@ public enum ReadingText {
12	public var link: OrgLink?	12	public var link: OrgLink?
13	/// Where the text starts in the file.	13	/// Where the text starts in the file.
14	public var offset: Int	14	public var offset: Int
		15	/// A pretty sub/superscript's body: true raised, false lowered.
		16	public var superscript: Bool?
		17	}
		18
		19	/// How the text shows, as the editor's display settings make it.
		20	public struct Display: Sendable {
		21	/// Link brackets and targets, and emphasis markers, shown; no pretty entities.
		22	public var showMarkup = false
		23	/// `org-hide-emphasis-markers`, `org-pretty-entities` and its braces.
		24	public var options = EditingOptions.org
		25	/// Colors code in src blocks.
		26	public var highlighter: (any CodeHighlighter)?
		27
		28	public init(showMarkup: Bool = false, options: EditingOptions = .org, highlighter: (any CodeHighlighter)? = nil) {
		29	self.showMarkup = showMarkup
		30	self.options = options
		31	self.highlighter = highlighter
		32	}
15	}	33	}
16		34
17	/// `folded` are drawers' and blocks' hidden ranges (`Wrapper.hidden`).	35	/// `folded` are drawers' and blocks' hidden ranges (`Wrapper.hidden`).
18	public static func segments(_ tree: OrgTree, in range: Range<Int>, folded: [Range<Int>] = []) -> [Segment] {	36	public static func segments(_ tree: OrgTree, in range: Range<Int>, folded: [Range<Int>] = [], display: Display = Display()) -> [Segment] {
19	let text = tree.text as NSString	37	let text = tree.text as NSString
20	let runs = Presentation.styles(tree, in: range)	38	let runs = Presentation.styles(tree, in: range, highlighter: display.highlighter)
21	// A fold hides from the end of the opening line through the closing line, so the	39	// A fold hides from the end of the opening line through the closing line, so the
22	// marker sits on the opening line.	40	// marker sits on the opening line.
23	let folds = folded.compactMap { r -> Range<Int>? in	41	let folds = folded.compactMap { r -> Range<Int>? in
	@@ -25,16 +43,40 @@ public enum ReadingText {
25	let end = r.upperBound > r.lowerBound && r.upperBound <= text.length && text.character(at: r.upperBound - 1) == 10 ? r.upperBound - 1 : r.upperBound	43	let end = r.upperBound > r.lowerBound && r.upperBound <= text.length && text.character(at: r.upperBound - 1) == 10 ? r.upperBound - 1 : r.upperBound
26	return (r.lowerBound - 1)..<min(end, range.upperBound)	44	return (r.lowerBound - 1)..<min(end, range.upperBound)
27	}	45	}
28	let hidden = runs.filter { $0.role == .linkMarkup }.map(\.range) + folds	46	var hidden = runs.filter { !display.showMarkup && Presentation.hidesWithMarkup($0.role, options: display.options) }.map(\.range) + folds
		47	// `org-pretty-entities`: an entity's last character shows its character, the rest hidden.
		48	var replaced: [Int: String] = [:]
		49	var scripts: [(range: Range<Int>, superscript: Bool)] = []
		50	if !display.showMarkup, display.options.prettyEntities {
		51	let blocks = Presentation.shadedBlocks(tree)
		52	let pretty = Presentation.prettyRuns(
		53	text, in: range, revealedLine: nil, inBlock: { offset in blocks.contains { $0.contains(offset) } },
		54	scriptExclusions: runs.filter { Presentation.excludesScripts($0.role) }.map(\.range),
		55	subSuperscriptsNeedBraces: display.options.subSuperscriptsNeedBraces
		56	)
		57	for (lineStart, run) in pretty {
		58	switch run {
		59	case .entity(let r, let shown):
		60	let last = lineStart + r.upperBound - 1
		61	hidden.append((lineStart + r.lowerBound)..<last)
		62	replaced[last] = shown
		63	case .script(let markers, let body, let superscript):
		64	hidden += markers.map { (lineStart + $0.lowerBound)..<(lineStart + $0.upperBound) }
		65	scripts.append(((lineStart + body.lowerBound)..<(lineStart + body.upperBound), superscript))
		66	}
		67	}
		68	}
29	var bounds: Set<Int> = [range.lowerBound, range.upperBound]	69	var bounds: Set<Int> = [range.lowerBound, range.upperBound]
30	for r in runs.map(\.range) + hidden {	70	let replacedRanges = replaced.keys.map { $0..<($0 + 1) }
		71	for r in runs.map(\.range) + hidden + replacedRanges + scripts.map(\.range) {
31	bounds.insert(max(range.lowerBound, min(range.upperBound, r.lowerBound)))	72	bounds.insert(max(range.lowerBound, min(range.upperBound, r.lowerBound)))
32	bounds.insert(max(range.lowerBound, min(range.upperBound, r.upperBound)))	73	bounds.insert(max(range.lowerBound, min(range.upperBound, r.upperBound)))
33	}	74	}
34	let points = bounds.sorted()	75	let points = bounds.sorted()
35	var segments: [Segment] = []	76	var segments: [Segment] = []
36	func append(_ segment: Segment) {	77	func append(_ segment: Segment) {
37	if var last = segments.last, last.roles == segment.roles, last.link == segment.link, last.offset + (last.text as NSString).length == segment.offset {	78	if var last = segments.last, last.roles == segment.roles, last.link == segment.link, last.superscript == segment.superscript,
		79	last.offset + (last.text as NSString).length == segment.offset {
38	last.text += segment.text	80	last.text += segment.text
39	segments[segments.count - 1] = last	81	segments[segments.count - 1] = last
40	} else {	82	} else {
	@@ -48,7 +90,10 @@ public enum ReadingText {
48	if hidden.contains(where: { $0.lowerBound <= a && b <= $0.upperBound }) { continue }	90	if hidden.contains(where: { $0.lowerBound <= a && b <= $0.upperBound }) { continue }
49	let roles = Set(runs.filter { $0.range.lowerBound <= a && b <= $0.range.upperBound }.map(\.role))	91	let roles = Set(runs.filter { $0.range.lowerBound <= a && b <= $0.range.upperBound }.map(\.role))
50	let link = roles.contains(.link) ? Links.link(at: a, text: tree.text, tree: tree)?.link : nil	92	let link = roles.contains(.link) ? Links.link(at: a, text: tree.text, tree: tree)?.link : nil
51	append(Segment(text: text.substring(with: NSRange(location: a, length: b - a)), roles: roles, link: link, offset: a))	93	let superscript = scripts.first { $0.range.lowerBound <= a && b <= $0.range.upperBound }?.superscript
		94	let shown = replaced[a] ?? text.substring(with: NSRange(location: a, length: b - a))
		95	let segment = Segment(text: shown, roles: roles, link: link, offset: a, superscript: superscript)
		96	if replaced[a] != nil { segments.append(segment) } else { append(segment) }
52	}	97	}
53	return segments	98	return segments
54	}	99	}

Sources/OrgstarMobile/ReaderScreen.swift +95 −22

     @State private var fold = FoldState()
     @State private var folded: [Range<Int>] = []
     @State private var loadedPath: String?
+    /// The file's display: indentation, leading stars, inline images, truncation.
+    @State private var startup: StartupDisplay?
     @State private var showingOutline = false
     @State private var message: String?
     @Environment(\.openURL) private var openURL
         // Read again when settings or the Dynamic Type size change.
         let _ = model.settingsVersion
         let theme = MobileTheme(model.theme)
+        let truncated = startup?.truncated ?? false
         ScrollViewReader { proxy in
-            ScrollView {
+            ScrollView(truncated ? [.vertical, .horizontal] : .vertical) {
                 LazyVStack(alignment: .leading, spacing: 8) {
                     if let tree = session.document?.tree {
                         let preambleEnd = outline.first?.start ?? (tree.text as NSString).length
                                 heading(tree, entry, theme).id(entry.start)
                                 if !fold.folds.contains(entry.start), !fold.bodyFolds.contains(entry.start) {
                                     let body = bodyRange(index, tree)
-                                    if !body.isEmpty { textView(tree, body, theme).padding(.leading, indent(entry)) }
+                                    if !body.isEmpty { textView(tree, body, theme).padding(.leading, bodyIndent(entry, theme)) }
                                 }
                             }
                         }
                     }
                 }
                 .padding()
-                .frame(maxWidth: .infinity, alignment: .leading)
+                .frame(maxWidth: truncated ? nil : .infinity, alignment: .leading)
             }
             .background(theme.swiftColor("background") ?? Color(uiColor: .systemBackground))
             .onChange(of: session.revealRequest?.id) {
         .onAppear(perform: open)
         .onChange(of: session.path) { loadFolds() }
         .onChange(of: session.editVersion) { loadFolds() }
+        .onChange(of: model.settingsVersion) { loadFolds() }
     }
     // MARK: - Content
     private func indent(_ entry: OutlineEntry) -> CGFloat { CGFloat(entry.level - 1) * 14 }
+    private var indented: Bool { startup?.indented ?? true }
+    /// The text as the editor's display settings show it.
+    private var display: ReadingText.Display {
+        ReadingText.Display(showMarkup: model.showMarkup, options: session.options, highlighter: MobileEditor.highlighter)
+    }
+    /// org-indent: a heading's text and its body start past its stars, at level + 1 columns,
+    /// the fold mark standing where the last star and its space would. Without it nothing is
+    /// indented and the stars show.
+    private func headingIndent(_ entry: OutlineEntry, _ theme: MobileTheme) -> CGFloat {
+        indented ? CGFloat(entry.level - 1) * theme.column : 0
+    }
+    private func bodyIndent(_ entry: OutlineEntry, _ theme: MobileTheme) -> CGFloat {
+        indented ? CGFloat(entry.level + 1) * theme.column : 0
+    }
     /// Hidden under a folded ancestor.
     private func isShown(_ index: Int) -> Bool {
         var parent = outline[index].parent
     private func heading(_ tree: OrgTree, _ entry: OutlineEntry, _ theme: MobileTheme) -> some View {
         let ns = tree.text as NSString
-        var line = ns.lineRange(for: NSRange(location: entry.start, length: 0))
+        let line = ns.lineRange(for: NSRange(location: entry.start, length: 0))
-        let title = min(entry.start + entry.level + 1, NSMaxRange(line))
+        let start = indented ? min(entry.start + entry.level + 1, NSMaxRange(line)) : entry.start
-        line.length = NSMaxRange(line) - title
+        let text = attributed(ReadingText.segments(tree, in: start..<NSMaxRange(line), display: display), heading: entry.level, theme)
-        let text = attributed(ReadingText.segments(tree, in: title..<(title + line.length)), heading: entry.level, theme)
+        let hasContent = entry.end > NSMaxRange(line)
-        let hasContent = entry.end > NSMaxRange(ns.lineRange(for: NSRange(location: entry.start, length: 0)))
         let foldedMark = fold.folds.contains(entry.start) && hasContent
-        return HStack(alignment: .firstTextBaseline, spacing: 6) {
+        return HStack(alignment: .firstTextBaseline, spacing: 0) {
             Image(systemName: foldedMark ? "chevron.right" : "chevron.down")
                 .font(.caption.weight(.semibold)).foregroundStyle(theme.swiftColor("markup") ?? Color(uiColor: .tertiaryLabel))
                 .opacity(hasContent ? 1 : 0)
-            Text(text.trimmingTrailingNewlines()).lineSpacing(CGFloat(max(0, theme.spec.lineSpacing)))
+                .frame(width: 2 * theme.column, alignment: .leading)
-                .frame(maxWidth: .infinity, alignment: .leading)
+            lineText(text.trimmingTrailingNewlines(), theme)
         }
-        .padding(.leading, indent(entry))
+        .padding(.leading, headingIndent(entry, theme))
         .padding(.top, entry.level == 1 ? 6 : 0)
         .contentShape(Rectangle())
         .onTapGesture { fold = Presentation.cycle(entry.start, in: tree, fold) }
     }
     private func textView(_ tree: OrgTree, _ range: Range<Int>, _ theme: MobileTheme) -> some View {
-        Text(attributed(ReadingText.segments(tree, in: range, folded: folded), heading: nil, theme).trimmingTrailingNewlines())
+        VStack(alignment: .leading, spacing: 4) {
+            ForEach(parts(tree, range), id: \.range.lowerBound) { part in
+                if let image = part.image {
+                    Image(uiImage: image.picture).resizable().scaledToFit()
+                        .frame(maxWidth: image.width.map { CGFloat($0) } ?? image.picture.size.width, alignment: .leading)
+                        .accessibilityLabel((image.path as NSString).lastPathComponent)
+                } else {
+                    lineText(attributed(ReadingText.segments(tree, in: part.range, folded: folded, display: display), heading: nil, theme).trimmingTrailingNewlines(), theme)
+                        .textSelection(.enabled)
+                }
+            }
+        }
+    }
+    /// Wrapped to the view's width, or on one line each, scrolling sideways, while truncated.
+    private func lineText(_ text: AttributedString, _ theme: MobileTheme) -> some View {
+        Text(text)
             .lineSpacing(CGFloat(max(0, theme.spec.lineSpacing)))
-            .textSelection(.enabled)
+            .fixedSize(horizontal: startup?.truncated ?? false, vertical: false)
-            .frame(maxWidth: .infinity, alignment: .leading)
+            .frame(maxWidth: startup?.truncated == true ? nil : .infinity, alignment: .leading)
+    }
+    private struct Part {
+        let range: Range<Int>
+        var image: (picture: UIImage, path: String, width: Int?)?
+    }
+    /// Text, and with inline images on, lines that are only an image link shown as the image.
+    private func parts(_ tree: OrgTree, _ range: Range<Int>) -> [Part] {
+        guard startup?.inlineImages == true, let path = session.path else { return [Part(range: range)] }
+        let base = URL(fileURLWithPath: path).deletingLastPathComponent()
+        let ns = tree.text as NSString
+        var parts: [Part] = []
+        var textStart = range.lowerBound
+        var location = range.lowerBound
+        while location < range.upperBound {
+            let line = ns.lineRange(for: NSRange(location: location, length: 0))
+            location = NSMaxRange(line)
+            guard folded.allSatisfy({ !$0.contains(line.location) }), let image = InlineImages.image(atLine: line.location, in: ns),
+                  let picture = MobileEditor.loadImage(image.path, relativeTo: base) else { continue }
+            if textStart < line.location { parts.append(Part(range: textStart..<line.location)) }
+            parts.append(Part(range: line.location..<min(NSMaxRange(line), range.upperBound), image: (picture, image.path, image.width)))
+            textStart = min(NSMaxRange(line), range.upperBound)
+        }
+        if textStart < range.upperBound { parts.append(Part(range: textStart..<range.upperBound)) }
+        return parts
     }
     /// Segments as styled text in the theme's font and colors, as the editor styles them;
                 case .verbatim, .code, .inlineSource:
                     if let background = theme.color("inline-background") { part.backgroundColor = Color(uiColor: background) }
                     fg(role == .verbatim ? "verbatim" : "code")
-                case .markup, .linkMarkup, .leadingStars: fg("markup")
+                case .markup, .linkMarkup: fg("markup")
+                case .leadingStars:
+                    // As the editor hides them; shown in the heading's color unless hidden.
+                    if !Presentation.skipsLeadingStars(role, indented: indented, hideStars: startup?.hideStars ?? false) { color = .clear }
+                case .syntax(let category): if let key = category.themeKey { fg(key) }
                 case .timestamp: fg("timestamp")
                 case .comment: fg("comment")
                 case .keyword: fg("keyword")
                 case .link:
                     part.underlineStyle = .single
                     fg("link")
-                case .heading, .block, .syntax: break
+                case .heading, .block: break
                 }
             }
             if segment.link != nil {
                 // Found again by position when followed.
                 part.link = URL(string: "orgstar-link:\(segment.offset)")
             }
+            if let superscript = segment.superscript {
+                // Raised or lowered as the editor draws `org-pretty-entities` scripts.
+                part.baselineOffset = (superscript ? 0.3 : -0.3) * font.pointSize
+                font = font.withSize(font.pointSize * 0.7)
+            }
             part.font = Font(font as CTFont)
             part.foregroundColor = Color(uiColor: color)
             result += part
         loadFolds()
     }
-    /// The file's startup visibility, kept while the same file is open.
+    /// The file's startup display, as the editor opens it; its heading folds are kept while
+    /// the same file is open.
     private func loadFolds() {
         guard let tree = session.document?.tree else { return }
-        folded = Presentation.startupWrappers(
+        let display = Presentation.startupDisplay(tree, options: session.options)
-            tree, hideDrawers: session.options.hideDrawerStartup, hideBlocks: session.options.hideBlockStartup
+        startup = display
-        ).map(\.hidden)
+        folded = display.wrappers.map(\.hidden)
         guard loadedPath != session.path else { return }
         loadedPath = session.path
-        fold = Presentation.applyVisibilityProperties(Presentation.startupFoldState(tree) ?? FoldState(), in: tree)
+        fold = display.folds
     }
     /// Unfolds the way to the heading containing `offset` and scrolls to it.

Tests/OrgPresentationTests/ReadingTextTests.swift +36

	@@ -18,4 +18,40 @@ struct ReadingTextTests {
18	// Offsets point into the file.	18	// Offsets point into the file.
19	#expect(site.map { (text as NSString).substring(with: NSRange(location: $0.offset, length: 8)) } == "the site")	19	#expect(site.map { (text as NSString).substring(with: NSRange(location: $0.offset, length: 8)) } == "the site")
20	}	20	}
		21
		22	static func shown(_ text: String, _ display: ReadingText.Display) -> [ReadingText.Segment] {
		23	ReadingText.segments(OrgParser.parse(text), in: 0..<(text as NSString).length, display: display)
		24	}
		25
		26	@Test func showMarkupShowsLinkBracketsAndEmphasisMarkers() {
		27	var options = EditingOptions.org
		28	options.hideEmphasisMarkers = true
		29	let text = "a b [[c.org][d]]\n"
		30	#expect(Self.shown(text, .init(options: options)).map(\.text).joined() == "a b d\n")
		31	#expect(Self.shown(text, .init(showMarkup: false)).map(\.text).joined() == "a b d\n")
		32	#expect(Self.shown(text, .init(showMarkup: true, options: options)).map(\.text).joined() == text)
		33	}
		34
		35	@Test func prettyEntitiesShowTheirCharactersAndRaiseScripts() {
		36	var options = EditingOptions.org
		37	options.prettyEntities = true
		38	options.subSuperscriptsNeedBraces = true
		39	let text = "\\alpha and x^{2}\n#+begin_example\n\\beta\n#+end_example\n"
		40	let segments = Self.shown(text, .init(options: options))
		41	#expect(segments.map(\.text).joined() == "α and x2\n#+begin_example\n\\beta\n#+end_example\n")
		42	#expect(segments.first { $0.text == "2" }?.superscript == true)
		43	#expect(Self.shown(text, .init(showMarkup: true, options: options)).map(\.text).joined() == text)
		44	}
		45
		46	struct Words: CodeHighlighter {
		47	func highlights(language: String, code: String) -> [(range: Range<Int>, category: SyntaxCategory)] {
		48	[(0..<4, .keyword)]
		49	}
		50	}
		51
		52	@Test func highlightsSrcBlocks() {
		53	let text = "#+begin_src sh\necho hi\n#+end_src\n"
		54	let segments = Self.shown(text, .init(highlighter: Words()))
		55	#expect(segments.first { $0.text == "echo" }?.roles.contains(.syntax(.keyword)) == true)
		56	}
21	}	57	}

Commit f095381f67

Commit `f095381f67`