🐛 Fix regression in drawn text leading

README.rst

@@ -109,6 +109,7 @@ Features:
  - 🚧 Avoiding orphaned/widowed lines
  - 🚧 Tex-style line breaking
  - 🚧 Broader unicode support in text wrapping
+ - 🚧 Headings (which stick to their paragraphs)
 - Drawing operations
  - ✅ Lines
  - ✅ Rectangles

src/pdfje/draw.py

@@ -18,7 +18,7 @@
 )
 from .fonts.registry import Registry
 from .style import Span, Style, StyledMixin, StyleFull, StyleLike
-from .typeset.common import Command, State, Stretch, splitlines
+from .typeset.common import Command, State, Stretch, max_lead, splitlines
 from .typeset.lines import Line as TextLine
 from .typeset.words import parse as parse_words
 
@@ -367,8 +367,10 @@ def render(self, r: Registry, s: StyleFull, /) -> Streamable:
  state = s.as_state(r)
  yield b"BT\n%g %g Td\n" % self.loc.astuple()
  yield from state
+ stretches = list(self.flatten(r, s))
+ lead = max_lead(stretches, state)
  yield from _pick_renderer(self.align)(
- into_lines(splitlines(self.flatten(r, s)), state), state.lead, 0
+ into_lines(splitlines(stretches), state), lead, 0
  )
  yield b"ET\n"
 

src/pdfje/typeset/common.py

@@ -190,6 +190,16 @@ class Stretch(NamedTuple):
  txt: str
 
 
+def max_lead(s: Iterable[Stretch], state: State) -> Pt:
+ # FUTURE: we apply commands elsewhere, so doing it also here
+ # is perhaps a bit wasteful
+ lead = state.lead
+ for cmd, _ in s:
+ state = cmd.apply(state)
+ lead = max(lead, state.lead)
+ return lead
+
+
 def _encode_kerning(
  txt: str,
  kerning: Sequence[Kern],

src/pdfje/typeset/lines.py

@@ -5,7 +5,7 @@
 
 from ..atoms import LiteralStr, Real
 from ..common import BranchableIterator, Pt, Streamable, add_slots
-from .common import State, Stretch
+from .common import State, Stretch, max_lead
 from .words import WithCmd, Word
 from .words import parse as parse_words
 from .words import render_kerned
@@ -61,16 +61,6 @@ def _indent_first(
  yield from it
 
 
-def _max_lead(s: Iterable[Stretch], state: State) -> Pt:
- # TODO: we apply commands elsewhere, so doing it also here
- # is perhaps a bit wasteful
- lead = state.lead
- for cmd, _ in s:
- state = cmd.apply(state)
- lead = max(lead, state.lead)
- return lead
-
-
 @add_slots
 @dataclass(frozen=True)
 class Wrapper:
@@ -94,7 +84,7 @@ def start(
  return Wrapper(
  BranchableIterator(_indent_first(words, indent)),
  cmd.apply(state),
- _max_lead(it, state),
+ max_lead(it, state),
  )
 
  def line(self, width: Pt) -> tuple[Line, Wrapper | WrapDone]:

tests/test_document.py

@@ -271,106 +271,6 @@ def test_draw(outfile):
  [
  Page([Text((250, 400), "First!", Style(size=50))]),
  Page([Text((50, 720), ZEN_OF_PYTHON)]),
- Page(
- [
- Rect((50, 720), 72, -800),
- Text(
- (50, 720),
- """\
-In olden times
-when wishing
-still helped
-one, there
-lived a king
-whose daugh-
-ters were all
-beautiful, but
-the young-
-est was so
-beautiful that
-the sun itself,
-which has
-seen so much,
-was astonished
-whenever it
-shone in her
-face. Close by
-the king’s cas-
-tle lay a
-great dark for-
-est, and under
-an old lime-
-tree in the
-forest was a
-well, and when
-the day was
-very warm, the
-king’s child
-went out into
-the forest and
-sat down by
-the side of the
-cool fountain,
-and when she
-was bored she
-took a golden
-ball, and threw
-it up on high
-and caught it,
-and this ball
-was her favo-
-rite plaything.""",
- style=times_roman,
- ),
- Rect((150, 720), 72, -800),
- Text(
- (150, 720),
- """\
-In olden times
-when wishing
-still helped
-one, there lived
-a king whose
-daughters were
-all beautiful,
-but the young-
-est was so
-beautiful that
-the sun itself,
-which has
-seen so much,
-was astonished
-whenever it
-shone in her
-face. Close by
-the king’s cas-
-tle lay a great
-dark forest, and
-under an old
-lime-tree in the
-forest was a
-well, and when
-the day was
-very warm, the
-king’s child
-went out into
-the forest and
-sat down by
-the side of the
-cool fountain,
-and when she
-was bored she
-took a golden
-ball, and threw
-it up on high
-and caught it,
-and this ball
-was her favo-
-rite plaything.""",
- style=times_roman,
- ),
- ]
- ),
  Page(
  [
  Polyline(