Commit `d1d98c0638`

d1d98c06381f4baa32d06f47e21e1f491771c259

parent: 032cfe34d5

Unsigned

cmc <hello@cleberg.net> · 2026-08-31 18:10 UTC

Give every inline run its block's font

The styler set a font only on runs it modified, so a run with no emphasis
carried none and inherited whatever font the surrounding view had. Headings
rendered at body size and weight, and so did table cells, footnotes and
captions. Every run now carries the font of the block it sits in, and
headings are bold.

Found rendering krz/gitbay's README in the app.

Layout: unified · split

Sources/OrgSwiftUI/OrgInlineStyler.swift +14 −8

     /// - Parameter style: the text style of the block this run sits in, so emphasis inside a
     ///   heading bolds the heading's font rather than the body font.
+    /// - Parameters:
+    ///   - style: the text style of the block this run sits in, so emphasis inside a heading
+    ///     bolds the heading's font rather than the body font.
+    ///   - bold: forces every run bold, for headings.
     func attributed(
-        _ objects: [OrgObject], _ notes: inout OrgFootnotes, style: Font.TextStyle = .body
+        _ objects: [OrgObject], _ notes: inout OrgFootnotes,
+        style: Font.TextStyle = .body, bold forceBold: Bool = false
     ) -> AttributedString {
         var string = renderer.inline(objects, &notes)
             var textStyle = style
             var monospaced = false
-            var bold = false
+            var bold = forceBold
             var italic = false
             if intents.contains(.stronglyEmphasized) { bold = true }
                 break
             }
-            if bold || italic || monospaced || textStyle != style {
+            // Always set the font, never only on modified runs: a run with no emphasis
-                var font = Font.system(textStyle, design: monospaced ? .monospaced : .default)
+            // would otherwise inherit the surrounding view's font and a heading, table cell
-                if bold { font = font.bold() }
+            // or footnote would render at body size.
-                if italic { font = font.italic() }
+            var font = Font.system(textStyle, design: monospaced ? .monospaced : .default)
-                string[range].font = font
+            if bold { font = font.bold() }
-            }
+            if italic { font = font.italic() }
+            string[range].font = font
         }
         return string
     }

Sources/OrgSwiftUI/OrgLayoutBuilder.swift +4 −3

     }
     private func text(
-        _ objects: [OrgObject], _ notes: inout OrgFootnotes, style: Font.TextStyle = .body
+        _ objects: [OrgObject], _ notes: inout OrgFootnotes,
+        style: Font.TextStyle = .body, bold: Bool = false
     ) -> AttributedString {
-        inline.attributed(objects, &notes, style: style)
+        inline.attributed(objects, &notes, style: style, bold: bold)
     }
     /// One element to zero or more blocks. Zero for a footnote definition (it moves to the
                 title += cookie
             }
             let level = min(6, max(1, heading.level + options.headingLevelOffset))
-            title += text(heading.title, &notes, style: Self.headingStyle(level))
+            title += text(heading.title, &notes, style: Self.headingStyle(level), bold: true)
             for tag in heading.tags {
                 var chip = AttributedString("  \(tag)")
                 chip.foregroundColor = .secondary

Tests/OrgSwiftUITests/OrgLayoutTests.swift +22

	@@ -179,6 +179,28 @@ struct OrgLayoutTests {
179	#expect(layout("#+begin_export latex\n\\emph{hi}\n#+end_export").blocks.isEmpty)	179	#expect(layout("#+begin_export latex\n\\emph{hi}\n#+end_export").blocks.isEmpty)
180	}	180	}
181		181
		182	/// Every run carries a font, not only the emphasised ones. A plain heading run with no
		183	/// font would inherit the surrounding view's and render at body size.
		184	@Test
		185	func everyRunCarriesItsBlockFont() {
		186	guard case .heading(let title, _) = layout("* Plain heading").blocks.first else {
		187	Issue.record("expected a heading"); return
		188	}
		189	#expect(title.runs.allSatisfy { $0.font != nil })
		190	#expect(title.runs.contains { $0.font == Font.system(.title, design: .default).bold() })
		191
		192	// Same for the blocks that render at a non-body style.
		193	guard case .table(let table) = layout("\| a \|\n\|---\|\n\| b \|").blocks.first else {
		194	Issue.record("expected a table"); return
		195	}
		196	#expect(table.rows.allSatisfy { $0.cells.allSatisfy { cell in
		197	cell.text.runs.allSatisfy { $0.font != nil }
		198	} })
		199
		200	let notes = layout("Claim[fn:a]\n\n[fn:a] note").footnotes
		201	#expect(notes.first?.text.runs.allSatisfy { $0.font != nil } == true)
		202	}
		203
182	/// Emphasis nests, and the styler turns intents into fonts rather than dropping them.	204	/// Emphasis nests, and the styler turns intents into fonts rather than dropping them.
183	@Test	205	@Test
184	func inlineStylingCarriesNestedEmphasis() {	206	func inlineStylingCarriesNestedEmphasis() {

Commit d1d98c0638

Commit `d1d98c0638`