@@ 364,12 364,12 @@ layoutRunH (WithSpan rs run) = WithSpan rs pf
glyphs = shapeRun (WithSpan rs run)
dir = runDirection run
lvl = runLevel run
- vo = verticalOffsets rs dir
+ vo = verticalOffsets (RS.spanTextOptions rs) dir
hard = runHardBreak run
-- | Vertical offsets for the given fragment, with baseline set to 0.
-verticalOffsets :: RS.ResolvedSpan d -> Direction -> VO.VerticalOffsets
-verticalOffsets rs dir = VO.VerticalOffsets
+verticalOffsets :: TextOptions -> Direction -> VO.VerticalOffsets
+verticalOffsets opts dir = VO.VerticalOffsets
{ VO.layoutTop = ascent + topHalfLeading
, VO.fontTop = ascent
, VO.baseline = 0
@@ 391,7 391,6 @@ verticalOffsets rs dir = VO.VerticalOffsets
lineHeight = case textLineHeight opts of
Normal -> normalLineHeight
Absolute h -> h
- opts = RS.spanTextOptions rs
-- | Calculate layout for the given run independently of its position.
shapeRun :: WithSpan d Run -> [(GlyphInfo, GlyphPos)]