From b36dcd9859e8d5209a08186555b8f799ad2c8b0f Mon Sep 17 00:00:00 2001 From: Jaro Date: Fri, 12 May 2023 04:33:59 +0200 Subject: [PATCH] Describe box edges with extensible type. --- .../loremIpsum20em.golden | 22 +++--- .../spannedArabicFiller20em.golden | 28 +++---- .../paragraphLayout/arabicFiller20em.golden | 8 +- .golden/paragraphLayout/czechHello.golden | 2 +- .../czechHelloParagraphNarrow.golden | 10 +-- .../czechHelloParagraphUltraNarrow.golden | 22 +++--- .golden/paragraphLayout/devanagari.golden | 2 +- .../paragraphLayout/devanagariAccent.golden | 2 +- .../devanagariPrefixedAccent.golden | 2 +- .golden/paragraphLayout/hardBreaksLTR.golden | 18 ++--- .golden/paragraphLayout/hardBreaksRTL.golden | 18 ++--- .golden/paragraphLayout/ligature.golden | 2 +- .../ligatureParagraphBreak1.golden | 6 +- .../ligatureParagraphBreak2.golden | 6 +- .../paragraphLayout/lineHeightLarger.golden | 2 +- .../paragraphLayout/lineHeightNormal.golden | 2 +- .../paragraphLayout/lineHeightSmaller.golden | 2 +- .../paragraphLayout/loremIpsum100em.golden | 6 +- .golden/paragraphLayout/loremIpsum20em.golden | 22 +++--- .golden/paragraphLayout/manySpaces.golden | 8 +- .../paragraphLayout/mixedLanguageLTR.golden | 4 +- .../paragraphLayout/mixedScriptWords.golden | 46 ++++++------ .../spannedArabicFiller20em.golden | 28 +++---- .../spannedLoremIpsum20em.golden | 60 +++++++-------- .../hardBoxBreakLTR.golden | 8 +- .../hardBoxBreakRTL.golden | 8 +- .../richParagraphLayout/mixedScript.golden | 10 +-- .../mixedScriptWrap.golden | 14 ++-- .golden/richParagraphLayout/mixedSizes.golden | 4 +- .../richParagraphLayout/nestedBoxes.golden | 6 +- lib/Data/Text/ParagraphLayout/Plain.hs | 9 ++- lib/Data/Text/ParagraphLayout/Rich.hs | 9 ++- .../ParagraphLayout/Internal/AncestorBox.hs | 75 ++++++++++++------- .../Text/ParagraphLayout/Internal/Layout.hs | 36 ++++----- 34 files changed, 265 insertions(+), 242 deletions(-) diff --git a/.golden/paginatedParagraphLayout/loremIpsum20em.golden b/.golden/paginatedParagraphLayout/loremIpsum20em.golden index 3091fcb..6f95cd4 100644 --- a/.golden/paginatedParagraphLayout/loremIpsum20em.golden +++ b/.golden/paginatedParagraphLayout/loremIpsum20em.golden @@ -6,7 +6,7 @@ { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 18310, y_size = -1121} , fragmentPen = (0, -932) @@ -56,7 +56,7 @@ { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1121, x_size = 17443, y_size = -1121} , fragmentPen = (0, -932) @@ -112,7 +112,7 @@ { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 19791, y_size = -1121} , fragmentPen = (0, -932) @@ -167,7 +167,7 @@ { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1121, x_size = 17562, y_size = -1121} , fragmentPen = (0, -932) @@ -215,7 +215,7 @@ { fragmentUserData = () , fragmentLine = 5 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -2242, x_size = 18769, y_size = -1121} , fragmentPen = (0, -932) @@ -270,7 +270,7 @@ { fragmentUserData = () , fragmentLine = 6 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -3363, x_size = 19226, y_size = -1121} , fragmentPen = (0, -932) @@ -321,7 +321,7 @@ { fragmentUserData = () , fragmentLine = 7 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -4484, x_size = 17973, y_size = -1121} , fragmentPen = (0, -932) @@ -373,7 +373,7 @@ { fragmentUserData = () , fragmentLine = 8 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -5605, x_size = 18971, y_size = -1121} , fragmentPen = (0, -932) @@ -435,7 +435,7 @@ { fragmentUserData = () , fragmentLine = 9 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 17239, y_size = -1121} , fragmentPen = (0, -932) @@ -483,7 +483,7 @@ { fragmentUserData = () , fragmentLine = 10 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1121, x_size = 19199, y_size = -1121} , fragmentPen = (0, -932) @@ -536,7 +536,7 @@ { fragmentUserData = () , fragmentLine = 11 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -2242, x_size = 12076, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/paginatedParagraphLayout/spannedArabicFiller20em.golden b/.golden/paginatedParagraphLayout/spannedArabicFiller20em.golden index 07df1d7..7337884 100644 --- a/.golden/paginatedParagraphLayout/spannedArabicFiller20em.golden +++ b/.golden/paginatedParagraphLayout/spannedArabicFiller20em.golden @@ -6,7 +6,7 @@ { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 12652, y_origin = 0, x_size = 7198, y_size = -1500} , fragmentPen = (0, -1085) @@ -38,7 +38,7 @@ { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 7060, y_origin = 0, x_size = 5592, y_size = -1500} , fragmentPen = (0, -1085) @@ -63,7 +63,7 @@ { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 7060, y_size = -1500} , fragmentPen = (0, -1085) @@ -96,7 +96,7 @@ { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 14850, y_origin = -1500, x_size = 4045, y_size = -1500} , fragmentPen = (0, -1085) @@ -120,7 +120,7 @@ { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 9168, y_origin = -1500, x_size = 5682, y_size = -1500} , fragmentPen = (0, -1085) @@ -150,7 +150,7 @@ { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 3213, y_origin = -1500, x_size = 5955, y_size = -1500} , fragmentPen = (0, -1085) @@ -180,7 +180,7 @@ { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1500, x_size = 3213, y_size = -1500} , fragmentPen = (0, -1085) @@ -240,7 +240,7 @@ { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 14300, y_origin = 0, x_size = 4862, y_size = -1500} , fragmentPen = (0, -1085) @@ -267,7 +267,7 @@ { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 10225, y_origin = 0, x_size = 4075, y_size = -1500} , fragmentPen = (0, -1085) @@ -290,7 +290,7 @@ { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 3898, y_origin = 0, x_size = 6327, y_size = -1500} , fragmentPen = (0, -1085) @@ -320,7 +320,7 @@ { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 3898, y_size = -1500} , fragmentPen = (0, -1085) @@ -339,7 +339,7 @@ { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 12238, y_origin = -1500, x_size = 2357, y_size = -1500} , fragmentPen = (0, -1085) @@ -359,7 +359,7 @@ { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 5880, y_origin = -1500, x_size = 6358, y_size = -1500} , fragmentPen = (0, -1085) @@ -390,7 +390,7 @@ { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1500, x_size = 5880, y_size = -1500} , fragmentPen = (0, -1085) diff --git a/.golden/paragraphLayout/arabicFiller20em.golden b/.golden/paragraphLayout/arabicFiller20em.golden index f33ae64..4ff13dc 100644 --- a/.golden/paragraphLayout/arabicFiller20em.golden +++ b/.golden/paragraphLayout/arabicFiller20em.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 19850, y_size = -1500} , fragmentPen = (0, -1085) @@ -65,7 +65,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1500, x_size = 18895, y_size = -1500} , fragmentPen = (0, -1085) @@ -127,7 +127,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -3000, x_size = 19162, y_size = -1500} , fragmentPen = (0, -1085) @@ -184,7 +184,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -4500, x_size = 14595, y_size = -1500} , fragmentPen = (0, -1085) diff --git a/.golden/paragraphLayout/czechHello.golden b/.golden/paragraphLayout/czechHello.golden index 43d44f9..38e20a4 100644 --- a/.golden/paragraphLayout/czechHello.golden +++ b/.golden/paragraphLayout/czechHello.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 5274, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/paragraphLayout/czechHelloParagraphNarrow.golden b/.golden/paragraphLayout/czechHelloParagraphNarrow.golden index 75a6d74..12d50f8 100644 --- a/.golden/paragraphLayout/czechHelloParagraphNarrow.golden +++ b/.golden/paragraphLayout/czechHelloParagraphNarrow.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 1234, y_size = -1121} , fragmentPen = (0, -932) @@ -19,7 +19,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1121, x_size = 1089, y_size = -1121} , fragmentPen = (0, -932) @@ -33,7 +33,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -2242, x_size = 948, y_size = -1121} , fragmentPen = (0, -932) @@ -46,7 +46,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -3363, x_size = 961, y_size = -1121} , fragmentPen = (0, -932) @@ -59,7 +59,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 5 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -4484, x_size = 835, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/paragraphLayout/czechHelloParagraphUltraNarrow.golden b/.golden/paragraphLayout/czechHelloParagraphUltraNarrow.golden index e440321..0cca3b0 100644 --- a/.golden/paragraphLayout/czechHelloParagraphUltraNarrow.golden +++ b/.golden/paragraphLayout/czechHelloParagraphUltraNarrow.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 663, y_size = -1121} , fragmentPen = (0, -932) @@ -18,7 +18,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1121, x_size = 571, y_size = -1121} , fragmentPen = (0, -932) @@ -30,7 +30,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -2242, x_size = 590, y_size = -1121} , fragmentPen = (0, -932) @@ -42,7 +42,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -3363, x_size = 253, y_size = -1121} , fragmentPen = (0, -932) @@ -54,7 +54,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 5 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -4484, x_size = 246, y_size = -1121} , fragmentPen = (0, -932) @@ -66,7 +66,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 6 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -5605, x_size = 446, y_size = -1121} , fragmentPen = (0, -932) @@ -78,7 +78,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 7 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -6726, x_size = 502, y_size = -1121} , fragmentPen = (0, -932) @@ -90,7 +90,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 8 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -7847, x_size = 559, y_size = -1121} , fragmentPen = (0, -932) @@ -102,7 +102,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 9 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -8968, x_size = 402, y_size = -1121} , fragmentPen = (0, -932) @@ -114,7 +114,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 10 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -10089, x_size = 559, y_size = -1121} , fragmentPen = (0, -932) @@ -126,7 +126,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 11 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -11210, x_size = 276, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/paragraphLayout/devanagari.golden b/.golden/paragraphLayout/devanagari.golden index 4a8dad8..5606f66 100644 --- a/.golden/paragraphLayout/devanagari.golden +++ b/.golden/paragraphLayout/devanagari.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 8640, y_size = -1630} , fragmentPen = (0, -1171) diff --git a/.golden/paragraphLayout/devanagariAccent.golden b/.golden/paragraphLayout/devanagariAccent.golden index ef53225..eb86353 100644 --- a/.golden/paragraphLayout/devanagariAccent.golden +++ b/.golden/paragraphLayout/devanagariAccent.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 645, y_size = -1000} , fragmentPen = (0, -500) diff --git a/.golden/paragraphLayout/devanagariPrefixedAccent.golden b/.golden/paragraphLayout/devanagariPrefixedAccent.golden index c1ee255..0842111 100644 --- a/.golden/paragraphLayout/devanagariPrefixedAccent.golden +++ b/.golden/paragraphLayout/devanagariPrefixedAccent.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 0, y_size = -1000} , fragmentPen = (0, -500) diff --git a/.golden/paragraphLayout/hardBreaksLTR.golden b/.golden/paragraphLayout/hardBreaksLTR.golden index d497255..c0edcee 100644 --- a/.golden/paragraphLayout/hardBreaksLTR.golden +++ b/.golden/paragraphLayout/hardBreaksLTR.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 1563, y_size = -1121} , fragmentPen = (0, -932) @@ -23,7 +23,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1121, x_size = 3357, y_size = -1121} , fragmentPen = (0, -932) @@ -47,7 +47,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -2242, x_size = 1563, y_size = -1121} , fragmentPen = (0, -932) @@ -64,7 +64,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -3363, x_size = 4305, y_size = -1121} , fragmentPen = (0, -932) @@ -80,7 +80,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 5 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -4484, x_size = 861, y_size = -1121} , fragmentPen = (0, -932) @@ -92,7 +92,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 6 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -5605, x_size = 1563, y_size = -1121} , fragmentPen = (0, -932) @@ -109,7 +109,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 7 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -6726, x_size = 0, y_size = -1121} , fragmentPen = (0, -932) @@ -120,7 +120,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 8 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -7847, x_size = 3675, y_size = -1121} , fragmentPen = (0, -932) @@ -136,7 +136,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 9 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -8968, x_size = 1722, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/paragraphLayout/hardBreaksRTL.golden b/.golden/paragraphLayout/hardBreaksRTL.golden index ee81129..335209b 100644 --- a/.golden/paragraphLayout/hardBreaksRTL.golden +++ b/.golden/paragraphLayout/hardBreaksRTL.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 2808, y_size = -1500} , fragmentPen = (0, -1085) @@ -23,7 +23,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1500, x_size = 5852, y_size = -1500} , fragmentPen = (0, -1085) @@ -47,7 +47,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -3000, x_size = 2808, y_size = -1500} , fragmentPen = (0, -1085) @@ -64,7 +64,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -4500, x_size = 4884, y_size = -1500} , fragmentPen = (0, -1085) @@ -81,7 +81,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 5 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -6000, x_size = 1211, y_size = -1500} , fragmentPen = (0, -1085) @@ -93,7 +93,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 6 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -7500, x_size = 2808, y_size = -1500} , fragmentPen = (0, -1085) @@ -110,7 +110,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 7 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -9000, x_size = 0, y_size = -1500} , fragmentPen = (0, -1085) @@ -121,7 +121,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 8 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -10500, x_size = 4156, y_size = -1500} , fragmentPen = (0, -1085) @@ -137,7 +137,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 9 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -12000, x_size = 1960, y_size = -1500} , fragmentPen = (0, -1085) diff --git a/.golden/paragraphLayout/ligature.golden b/.golden/paragraphLayout/ligature.golden index 6984e92..4d4e5c4 100644 --- a/.golden/paragraphLayout/ligature.golden +++ b/.golden/paragraphLayout/ligature.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 4672, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/paragraphLayout/ligatureParagraphBreak1.golden b/.golden/paragraphLayout/ligatureParagraphBreak1.golden index f956762..49733eb 100644 --- a/.golden/paragraphLayout/ligatureParagraphBreak1.golden +++ b/.golden/paragraphLayout/ligatureParagraphBreak1.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 2162, y_size = -1121} , fragmentPen = (0, -932) @@ -21,7 +21,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1121, x_size = 2104, y_size = -1121} , fragmentPen = (0, -932) @@ -37,7 +37,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -2242, x_size = 402, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/paragraphLayout/ligatureParagraphBreak2.golden b/.golden/paragraphLayout/ligatureParagraphBreak2.golden index efed7c6..7b32c0b 100644 --- a/.golden/paragraphLayout/ligatureParagraphBreak2.golden +++ b/.golden/paragraphLayout/ligatureParagraphBreak2.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 1772, y_size = -1121} , fragmentPen = (0, -932) @@ -21,7 +21,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1121, x_size = 1361, y_size = -1121} , fragmentPen = (0, -932) @@ -35,7 +35,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -2242, x_size = 1535, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/paragraphLayout/lineHeightLarger.golden b/.golden/paragraphLayout/lineHeightLarger.golden index 22f1175..c9a7c93 100644 --- a/.golden/paragraphLayout/lineHeightLarger.golden +++ b/.golden/paragraphLayout/lineHeightLarger.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 522, y_size = -1600} , fragmentPen = (0, -1172) diff --git a/.golden/paragraphLayout/lineHeightNormal.golden b/.golden/paragraphLayout/lineHeightNormal.golden index 68de8fd..94ab5aa 100644 --- a/.golden/paragraphLayout/lineHeightNormal.golden +++ b/.golden/paragraphLayout/lineHeightNormal.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 522, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/paragraphLayout/lineHeightSmaller.golden b/.golden/paragraphLayout/lineHeightSmaller.golden index ccb8a86..d0880c1 100644 --- a/.golden/paragraphLayout/lineHeightSmaller.golden +++ b/.golden/paragraphLayout/lineHeightSmaller.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 522, y_size = -599} , fragmentPen = (0, -671) diff --git a/.golden/paragraphLayout/loremIpsum100em.golden b/.golden/paragraphLayout/loremIpsum100em.golden index 4256a8e..dc7a62c 100644 --- a/.golden/paragraphLayout/loremIpsum100em.golden +++ b/.golden/paragraphLayout/loremIpsum100em.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 95412, y_size = -1121} , fragmentPen = (0, -932) @@ -229,7 +229,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1121, x_size = 98954, y_size = -1121} , fragmentPen = (0, -932) @@ -461,7 +461,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -2242, x_size = 4041, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/paragraphLayout/loremIpsum20em.golden b/.golden/paragraphLayout/loremIpsum20em.golden index 8c3f949..e28361a 100644 --- a/.golden/paragraphLayout/loremIpsum20em.golden +++ b/.golden/paragraphLayout/loremIpsum20em.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 18310, y_size = -1121} , fragmentPen = (0, -932) @@ -56,7 +56,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1121, x_size = 17443, y_size = -1121} , fragmentPen = (0, -932) @@ -105,7 +105,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -2242, x_size = 19791, y_size = -1121} , fragmentPen = (0, -932) @@ -160,7 +160,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -3363, x_size = 17562, y_size = -1121} , fragmentPen = (0, -932) @@ -208,7 +208,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 5 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -4484, x_size = 18769, y_size = -1121} , fragmentPen = (0, -932) @@ -263,7 +263,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 6 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -5605, x_size = 19226, y_size = -1121} , fragmentPen = (0, -932) @@ -314,7 +314,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 7 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -6726, x_size = 17973, y_size = -1121} , fragmentPen = (0, -932) @@ -366,7 +366,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 8 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -7847, x_size = 18971, y_size = -1121} , fragmentPen = (0, -932) @@ -421,7 +421,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 9 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -8968, x_size = 17239, y_size = -1121} , fragmentPen = (0, -932) @@ -469,7 +469,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 10 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -10089, x_size = 19199, y_size = -1121} , fragmentPen = (0, -932) @@ -522,7 +522,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 11 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -11210, x_size = 12076, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/paragraphLayout/manySpaces.golden b/.golden/paragraphLayout/manySpaces.golden index ae88182..99295e9 100644 --- a/.golden/paragraphLayout/manySpaces.golden +++ b/.golden/paragraphLayout/manySpaces.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 3132, y_size = -1121} , fragmentPen = (0, -932) @@ -23,7 +23,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1121, x_size = 3132, y_size = -1121} , fragmentPen = (0, -932) @@ -40,7 +40,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -2242, x_size = 3132, y_size = -1121} , fragmentPen = (0, -932) @@ -57,7 +57,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -3363, x_size = 3132, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/paragraphLayout/mixedLanguageLTR.golden b/.golden/paragraphLayout/mixedLanguageLTR.golden index 2e89bdd..e204fea 100644 --- a/.golden/paragraphLayout/mixedLanguageLTR.golden +++ b/.golden/paragraphLayout/mixedLanguageLTR.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 4837, y_size = -1121} , fragmentPen = (0, -932) @@ -31,7 +31,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 4837, y_origin = 0, x_size = 1276, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/paragraphLayout/mixedScriptWords.golden b/.golden/paragraphLayout/mixedScriptWords.golden index b9035b6..ebe4f67 100644 --- a/.golden/paragraphLayout/mixedScriptWords.golden +++ b/.golden/paragraphLayout/mixedScriptWords.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 777, y_size = -1121} , fragmentPen = (0, -932) @@ -20,7 +20,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 777, y_origin = 0, x_size = 2335, y_size = -1121} , fragmentPen = (0, -932) @@ -34,7 +34,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 3112, y_origin = 0, x_size = 777, y_size = -1121} , fragmentPen = (0, -932) @@ -48,7 +48,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1121, x_size = 777, y_size = -1121} , fragmentPen = (0, -932) @@ -62,7 +62,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 777, y_origin = -1121, x_size = 2335, y_size = -1121} , fragmentPen = (0, -932) @@ -76,7 +76,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 3112, y_origin = -1121, x_size = 777, y_size = -1121} , fragmentPen = (0, -932) @@ -90,7 +90,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -2242, x_size = 2335, y_size = -1121} , fragmentPen = (0, -932) @@ -104,7 +104,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 2335, y_origin = -2242, x_size = 777, y_size = -1121} , fragmentPen = (0, -932) @@ -118,7 +118,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 3112, y_origin = -2242, x_size = 2335, y_size = -1121} , fragmentPen = (0, -932) @@ -132,7 +132,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -3363, x_size = 2335, y_size = -1121} , fragmentPen = (0, -932) @@ -146,7 +146,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 2335, y_origin = -3363, x_size = 777, y_size = -1121} , fragmentPen = (0, -932) @@ -160,7 +160,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 3112, y_origin = -3363, x_size = 2335, y_size = -1121} , fragmentPen = (0, -932) @@ -174,7 +174,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 5 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -4484, x_size = 253, y_size = -1121} , fragmentPen = (0, -932) @@ -186,7 +186,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 5 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 253, y_origin = -4484, x_size = 763, y_size = -1121} , fragmentPen = (0, -932) @@ -198,7 +198,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 5 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 1016, y_origin = -4484, x_size = 737, y_size = -1121} , fragmentPen = (0, -932) @@ -212,7 +212,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 5 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 1753, y_origin = -4484, x_size = 763, y_size = -1121} , fragmentPen = (0, -932) @@ -224,7 +224,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 5 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 2516, y_origin = -4484, x_size = 484, y_size = -1121} , fragmentPen = (0, -932) @@ -237,7 +237,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 5 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 3000, y_origin = -4484, x_size = 763, y_size = -1121} , fragmentPen = (0, -932) @@ -249,7 +249,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 5 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 3763, y_origin = -4484, x_size = 253, y_size = -1121} , fragmentPen = (0, -932) @@ -261,7 +261,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 5 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 4016, y_origin = -4484, x_size = 763, y_size = -1121} , fragmentPen = (0, -932) @@ -273,7 +273,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 6 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -5605, x_size = 763, y_size = -1121} , fragmentPen = (0, -932) @@ -285,7 +285,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 6 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 763, y_origin = -5605, x_size = 253, y_size = -1121} , fragmentPen = (0, -932) @@ -297,7 +297,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 6 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 1016, y_origin = -5605, x_size = 763, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/paragraphLayout/spannedArabicFiller20em.golden b/.golden/paragraphLayout/spannedArabicFiller20em.golden index 01d3f56..dca6979 100644 --- a/.golden/paragraphLayout/spannedArabicFiller20em.golden +++ b/.golden/paragraphLayout/spannedArabicFiller20em.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 12652, y_origin = 0, x_size = 7198, y_size = -1500} , fragmentPen = (0, -1085) @@ -38,7 +38,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 7060, y_origin = 0, x_size = 5592, y_size = -1500} , fragmentPen = (0, -1085) @@ -63,7 +63,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 7060, y_size = -1500} , fragmentPen = (0, -1085) @@ -96,7 +96,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 14850, y_origin = -1500, x_size = 4045, y_size = -1500} , fragmentPen = (0, -1085) @@ -120,7 +120,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 9168, y_origin = -1500, x_size = 5682, y_size = -1500} , fragmentPen = (0, -1085) @@ -150,7 +150,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 3213, y_origin = -1500, x_size = 5955, y_size = -1500} , fragmentPen = (0, -1085) @@ -180,7 +180,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1500, x_size = 3213, y_size = -1500} , fragmentPen = (0, -1085) @@ -200,7 +200,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 14300, y_origin = -3000, x_size = 4862, y_size = -1500} , fragmentPen = (0, -1085) @@ -227,7 +227,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 10225, y_origin = -3000, x_size = 4075, y_size = -1500} , fragmentPen = (0, -1085) @@ -250,7 +250,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 3898, y_origin = -3000, x_size = 6327, y_size = -1500} , fragmentPen = (0, -1085) @@ -280,7 +280,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -3000, x_size = 3898, y_size = -1500} , fragmentPen = (0, -1085) @@ -299,7 +299,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 12238, y_origin = -4500, x_size = 2357, y_size = -1500} , fragmentPen = (0, -1085) @@ -319,7 +319,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 5880, y_origin = -4500, x_size = 6358, y_size = -1500} , fragmentPen = (0, -1085) @@ -350,7 +350,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -4500, x_size = 5880, y_size = -1500} , fragmentPen = (0, -1085) diff --git a/.golden/paragraphLayout/spannedLoremIpsum20em.golden b/.golden/paragraphLayout/spannedLoremIpsum20em.golden index 8736bff..6dce77d 100644 --- a/.golden/paragraphLayout/spannedLoremIpsum20em.golden +++ b/.golden/paragraphLayout/spannedLoremIpsum20em.golden @@ -6,7 +6,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 8747, y_size = -1121} , fragmentPen = (0, -932) @@ -38,7 +38,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 8747, y_origin = 0, x_size = 9563, y_size = -1121} , fragmentPen = (0, -932) @@ -73,7 +73,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1121, x_size = 8553, y_size = -1121} , fragmentPen = (0, -932) @@ -108,7 +108,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 8553, y_origin = -1121, x_size = 8890, y_size = -1121} , fragmentPen = (0, -932) @@ -139,7 +139,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -2242, x_size = 9114, y_size = -1121} , fragmentPen = (0, -932) @@ -174,7 +174,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 9114, y_origin = -2242, x_size = 7467, y_size = -1121} , fragmentPen = (0, -932) @@ -203,7 +203,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 16581, y_origin = -2242, x_size = 3210, y_size = -1121} , fragmentPen = (0, -932) @@ -222,7 +222,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -3363, x_size = 3799, y_size = -1121} , fragmentPen = (0, -932) @@ -244,7 +244,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 3799, y_origin = -3363, x_size = 7878, y_size = -1121} , fragmentPen = (0, -932) @@ -274,7 +274,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 4 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 11677, y_origin = -3363, x_size = 5885, y_size = -1121} , fragmentPen = (0, -932) @@ -298,7 +298,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 5 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -4484, x_size = 5686, y_size = -1121} , fragmentPen = (0, -932) @@ -325,7 +325,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 5 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 5686, y_origin = -4484, x_size = 8592, y_size = -1121} , fragmentPen = (0, -932) @@ -359,7 +359,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 5 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 14278, y_origin = -4484, x_size = 4491, y_size = -1121} , fragmentPen = (0, -932) @@ -381,7 +381,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 6 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -5605, x_size = 1301, y_size = -1121} , fragmentPen = (0, -932) @@ -398,7 +398,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 6 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 1301, y_origin = -5605, x_size = 11041, y_size = -1121} , fragmentPen = (0, -932) @@ -433,7 +433,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 6 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 12342, y_origin = -5605, x_size = 6884, y_size = -1121} , fragmentPen = (0, -932) @@ -463,7 +463,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 7 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -6726, x_size = 10089, y_size = -1121} , fragmentPen = (0, -932) @@ -499,7 +499,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 7 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 10089, y_origin = -6726, x_size = 7884, y_size = -1121} , fragmentPen = (0, -932) @@ -532,7 +532,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 8 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -7847, x_size = 8158, y_size = -1121} , fragmentPen = (0, -932) @@ -564,7 +564,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 8 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 8158, y_origin = -7847, x_size = 6988, y_size = -1121} , fragmentPen = (0, -932) @@ -595,7 +595,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 8 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 15146, y_origin = -7847, x_size = 3825, y_size = -1121} , fragmentPen = (0, -932) @@ -615,7 +615,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 9 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -8968, x_size = 4594, y_size = -1121} , fragmentPen = (0, -932) @@ -638,7 +638,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 9 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 4594, y_origin = -8968, x_size = 10907, y_size = -1121} , fragmentPen = (0, -932) @@ -677,7 +677,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 9 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 15501, y_origin = -8968, x_size = 1738, y_size = -1121} , fragmentPen = (0, -932) @@ -691,7 +691,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 10 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -10089, x_size = 6426, y_size = -1121} , fragmentPen = (0, -932) @@ -719,7 +719,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 10 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 6426, y_origin = -10089, x_size = 5590, y_size = -1121} , fragmentPen = (0, -932) @@ -747,7 +747,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 10 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 12016, y_origin = -10089, x_size = 7183, y_size = -1121} , fragmentPen = (0, -932) @@ -772,7 +772,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 11 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 0, y_origin = -11210, x_size = 2652, y_size = -1121} , fragmentPen = (0, -932) @@ -792,7 +792,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 11 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 2652, y_origin = -11210, x_size = 5383, y_size = -1121} , fragmentPen = (0, -932) @@ -819,7 +819,7 @@ ParagraphLayout { fragmentUserData = () , fragmentLine = 11 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = (), boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = (), boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 8035, y_origin = -11210, x_size = 4041, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/richParagraphLayout/hardBoxBreakLTR.golden b/.golden/richParagraphLayout/hardBoxBreakLTR.golden index 43350ff..6ae0005 100644 --- a/.golden/richParagraphLayout/hardBoxBreakLTR.golden +++ b/.golden/richParagraphLayout/hardBoxBreakLTR.golden @@ -21,8 +21,8 @@ ParagraphLayout { fragmentUserData = "text2" , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box2", boxLeftSpacing = Just 150, boxRightSpacing = Nothing, boxStartSpacing = Just 150, boxEndSpacing = Nothing} - , AncestorBox {boxUserData = "box1", boxLeftSpacing = Just 50, boxRightSpacing = Nothing, boxStartSpacing = Just 50, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = "box2", boxLeftEdge = SpacedEdge 150, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 150, boxEndEdge = NoEdge} + , AncestorBox {boxUserData = "box1", boxLeftEdge = SpacedEdge 50, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 50, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 3533, y_origin = 0, x_size = 2222, y_size = -1121} , fragmentPen = (0, -932) @@ -37,8 +37,8 @@ ParagraphLayout { fragmentUserData = "text2" , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box2", boxLeftSpacing = Nothing, boxRightSpacing = Just 200, boxStartSpacing = Nothing, boxEndSpacing = Just 200} - , AncestorBox {boxUserData = "box1", boxLeftSpacing = Nothing, boxRightSpacing = Just 100, boxStartSpacing = Nothing, boxEndSpacing = Just 100} + [ AncestorBox {boxUserData = "box2", boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 200, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 200} + , AncestorBox {boxUserData = "box1", boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 100, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 100} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1121, x_size = 2222, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/richParagraphLayout/hardBoxBreakRTL.golden b/.golden/richParagraphLayout/hardBoxBreakRTL.golden index 7423738..ecc4181 100644 --- a/.golden/richParagraphLayout/hardBoxBreakRTL.golden +++ b/.golden/richParagraphLayout/hardBoxBreakRTL.golden @@ -5,8 +5,8 @@ ParagraphLayout { fragmentUserData = "text2" , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box2", boxLeftSpacing = Nothing, boxRightSpacing = Just 200, boxStartSpacing = Just 200, boxEndSpacing = Nothing} - , AncestorBox {boxUserData = "box1", boxLeftSpacing = Nothing, boxRightSpacing = Just 100, boxStartSpacing = Just 100, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = "box2", boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 200, boxStartEdge = SpacedEdge 200, boxEndEdge = NoEdge} + , AncestorBox {boxUserData = "box1", boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 100, boxStartEdge = SpacedEdge 100, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = 0, x_size = 1632, y_size = -1500} , fragmentPen = (0, -1085) @@ -53,8 +53,8 @@ ParagraphLayout { fragmentUserData = "text2" , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box2", boxLeftSpacing = Just 150, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Just 150} - , AncestorBox {boxUserData = "box1", boxLeftSpacing = Just 50, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Just 50} + [ AncestorBox {boxUserData = "box2", boxLeftEdge = SpacedEdge 150, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 150} + , AncestorBox {boxUserData = "box1", boxLeftEdge = SpacedEdge 50, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 50} ] , fragmentRect = Rect {x_origin = 2355, y_origin = -1500, x_size = 1000, y_size = -1500} , fragmentPen = (0, -1085) diff --git a/.golden/richParagraphLayout/mixedScript.golden b/.golden/richParagraphLayout/mixedScript.golden index 337456d..e611d70 100644 --- a/.golden/richParagraphLayout/mixedScript.golden +++ b/.golden/richParagraphLayout/mixedScript.golden @@ -31,7 +31,7 @@ ParagraphLayout { fragmentUserData = "text2" , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box1", boxLeftSpacing = Just 50, boxRightSpacing = Nothing, boxStartSpacing = Just 50, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = "box1", boxLeftEdge = SpacedEdge 50, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 50, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 3162, y_origin = 0, x_size = 777, y_size = -1121} , fragmentPen = (0, -932) @@ -45,7 +45,7 @@ ParagraphLayout { fragmentUserData = "text2" , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box1", boxLeftSpacing = Nothing, boxRightSpacing = Just 100, boxStartSpacing = Nothing, boxEndSpacing = Just 100} + [ AncestorBox {boxUserData = "box1", boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 100, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 100} ] , fragmentRect = Rect {x_origin = 3939, y_origin = 0, x_size = 2335, y_size = -1121} , fragmentPen = (0, -932) @@ -72,7 +72,7 @@ ParagraphLayout { fragmentUserData = "text4" , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box2", boxLeftSpacing = Just 150, boxRightSpacing = Nothing, boxStartSpacing = Just 150, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = "box2", boxLeftEdge = SpacedEdge 150, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 150, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 8859, y_origin = 0, x_size = 2335, y_size = -1121} , fragmentPen = (0, -932) @@ -86,7 +86,7 @@ ParagraphLayout { fragmentUserData = "text4" , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box2", boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = "box2", boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 11194, y_origin = 0, x_size = 777, y_size = -1121} , fragmentPen = (0, -932) @@ -100,7 +100,7 @@ ParagraphLayout { fragmentUserData = "text4" , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box2", boxLeftSpacing = Nothing, boxRightSpacing = Just 200, boxStartSpacing = Nothing, boxEndSpacing = Just 200} + [ AncestorBox {boxUserData = "box2", boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 200, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 200} ] , fragmentRect = Rect {x_origin = 11971, y_origin = 0, x_size = 2335, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/richParagraphLayout/mixedScriptWrap.golden b/.golden/richParagraphLayout/mixedScriptWrap.golden index 8557fe7..fc2e710 100644 --- a/.golden/richParagraphLayout/mixedScriptWrap.golden +++ b/.golden/richParagraphLayout/mixedScriptWrap.golden @@ -31,7 +31,7 @@ ParagraphLayout { fragmentUserData = "text2" , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box1", boxLeftSpacing = Just 50, boxRightSpacing = Nothing, boxStartSpacing = Just 50, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = "box1", boxLeftEdge = SpacedEdge 50, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 50, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 3162, y_origin = 0, x_size = 777, y_size = -1121} , fragmentPen = (0, -932) @@ -45,7 +45,7 @@ ParagraphLayout { fragmentUserData = "text2" , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box1", boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = "box1", boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 3939, y_origin = 0, x_size = 763, y_size = -1121} , fragmentPen = (0, -932) @@ -57,7 +57,7 @@ ParagraphLayout { fragmentUserData = "text2" , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box1", boxLeftSpacing = Nothing, boxRightSpacing = Just 100, boxStartSpacing = Nothing, boxEndSpacing = Just 100} + [ AncestorBox {boxUserData = "box1", boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 100, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 100} ] , fragmentRect = Rect {x_origin = 0, y_origin = -1121, x_size = 1549, y_size = -1121} , fragmentPen = (0, -932) @@ -83,7 +83,7 @@ ParagraphLayout { fragmentUserData = "text4" , fragmentLine = 2 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box2", boxLeftSpacing = Just 150, boxRightSpacing = Nothing, boxStartSpacing = Just 150, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = "box2", boxLeftEdge = SpacedEdge 150, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 150, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 4134, y_origin = -1121, x_size = 763, y_size = -1121} , fragmentPen = (0, -932) @@ -95,7 +95,7 @@ ParagraphLayout { fragmentUserData = "text4" , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box2", boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = "box2", boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 0, y_origin = -2242, x_size = 1549, y_size = -1121} , fragmentPen = (0, -932) @@ -108,7 +108,7 @@ ParagraphLayout { fragmentUserData = "text4" , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box2", boxLeftSpacing = Nothing, boxRightSpacing = Nothing, boxStartSpacing = Nothing, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = "box2", boxLeftEdge = NoEdge, boxRightEdge = NoEdge, boxStartEdge = NoEdge, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 1549, y_origin = -2242, x_size = 777, y_size = -1121} , fragmentPen = (0, -932) @@ -122,7 +122,7 @@ ParagraphLayout { fragmentUserData = "text4" , fragmentLine = 3 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box2", boxLeftSpacing = Nothing, boxRightSpacing = Just 200, boxStartSpacing = Nothing, boxEndSpacing = Just 200} + [ AncestorBox {boxUserData = "box2", boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 200, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 200} ] , fragmentRect = Rect {x_origin = 2326, y_origin = -2242, x_size = 2335, y_size = -1121} , fragmentPen = (0, -932) diff --git a/.golden/richParagraphLayout/mixedSizes.golden b/.golden/richParagraphLayout/mixedSizes.golden index 753cd74..0dd4406 100644 --- a/.golden/richParagraphLayout/mixedSizes.golden +++ b/.golden/richParagraphLayout/mixedSizes.golden @@ -19,7 +19,7 @@ ParagraphLayout { fragmentUserData = "smallText1" , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "smallBox1", boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = "smallBox1", boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 1651, y_origin = 0, x_size = 1956, y_size = -841} , fragmentPen = (0, -699) @@ -50,7 +50,7 @@ ParagraphLayout { fragmentUserData = "smallText2" , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "smallBox2", boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = "smallBox2", boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 5258, y_origin = 0, x_size = 1956, y_size = -841} , fragmentPen = (0, -699) diff --git a/.golden/richParagraphLayout/nestedBoxes.golden b/.golden/richParagraphLayout/nestedBoxes.golden index 860f61e..65f1855 100644 --- a/.golden/richParagraphLayout/nestedBoxes.golden +++ b/.golden/richParagraphLayout/nestedBoxes.golden @@ -34,8 +34,8 @@ ParagraphLayout { fragmentUserData = "text2" , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box3", boxLeftSpacing = Just 0, boxRightSpacing = Just 0, boxStartSpacing = Just 0, boxEndSpacing = Just 0} - , AncestorBox {boxUserData = "box2", boxLeftSpacing = Just 0, boxRightSpacing = Nothing, boxStartSpacing = Just 0, boxEndSpacing = Nothing} + [ AncestorBox {boxUserData = "box3", boxLeftEdge = SpacedEdge 0, boxRightEdge = SpacedEdge 0, boxStartEdge = SpacedEdge 0, boxEndEdge = SpacedEdge 0} + , AncestorBox {boxUserData = "box2", boxLeftEdge = SpacedEdge 0, boxRightEdge = NoEdge, boxStartEdge = SpacedEdge 0, boxEndEdge = NoEdge} ] , fragmentRect = Rect {x_origin = 8569, y_origin = 0, x_size = 3350, y_size = -1121} , fragmentPen = (0, -932) @@ -53,7 +53,7 @@ ParagraphLayout { fragmentUserData = "text3" , fragmentLine = 1 , fragmentAncestorBoxes = - [ AncestorBox {boxUserData = "box2", boxLeftSpacing = Nothing, boxRightSpacing = Just 0, boxStartSpacing = Nothing, boxEndSpacing = Just 0} + [ AncestorBox {boxUserData = "box2", boxLeftEdge = NoEdge, boxRightEdge = SpacedEdge 0, boxStartEdge = NoEdge, boxEndEdge = SpacedEdge 0} ] , fragmentRect = Rect {x_origin = 11919, y_origin = 0, x_size = 2657, y_size = -1121} , fragmentPen = (0, -932) diff --git a/lib/Data/Text/ParagraphLayout/Plain.hs b/lib/Data/Text/ParagraphLayout/Plain.hs index 1a65cfb..1f631cc 100644 --- a/lib/Data/Text/ParagraphLayout/Plain.hs +++ b/lib/Data/Text/ParagraphLayout/Plain.hs @@ -43,11 +43,12 @@ module Data.Text.ParagraphLayout.Plain , AncestorBox ( AncestorBox , boxUserData - , boxLeftSpacing - , boxRightSpacing - , boxStartSpacing - , boxEndSpacing + , boxLeftEdge + , boxRightEdge + , boxStartEdge + , boxEndEdge ) + , BoxEdge (NoEdge, SpacedEdge) ) where diff --git a/lib/Data/Text/ParagraphLayout/Rich.hs b/lib/Data/Text/ParagraphLayout/Rich.hs index 45236ad..fb17846 100644 --- a/lib/Data/Text/ParagraphLayout/Rich.hs +++ b/lib/Data/Text/ParagraphLayout/Rich.hs @@ -55,11 +55,12 @@ module Data.Text.ParagraphLayout.Rich , AncestorBox ( AncestorBox , boxUserData - , boxLeftSpacing - , boxRightSpacing - , boxStartSpacing - , boxEndSpacing + , boxLeftEdge + , boxRightEdge + , boxStartEdge + , boxEndEdge ) + , BoxEdge (NoEdge, SpacedEdge) ) where diff --git a/src/Data/Text/ParagraphLayout/Internal/AncestorBox.hs b/src/Data/Text/ParagraphLayout/Internal/AncestorBox.hs index 44911a1..4b99d0a 100644 --- a/src/Data/Text/ParagraphLayout/Internal/AncestorBox.hs +++ b/src/Data/Text/ParagraphLayout/Internal/AncestorBox.hs @@ -1,12 +1,12 @@ module Data.Text.ParagraphLayout.Internal.AncestorBox ( AncestorBox (..) + , BoxEdge (..) , totalLeftSpacing , totalRightSpacing ) where import Data.Int (Int32) -import Data.Maybe (catMaybes) -- | Describes the relationship of a fragment to an inline box that contains it. -- @@ -20,51 +20,72 @@ data AncestorBox d = AncestorBox { boxUserData :: d -- ^ User-defined data associated with the inline box. - , boxLeftSpacing :: Maybe Int32 - -- ^ `Just` an amount of empty space to add to the left side - -- of the fragment on account of this inline box, or `Nothing` - -- if this is not the leftmost fragment of this inline box. + , boxLeftEdge :: BoxEdge + -- ^ Describes the left edge of the inline box. + -- Typically applied to the leftmost fragment in the box, + -- and set to `NoEdge` for all other fragments. -- - -- Equal to `boxStartSpacing` for LTR boxes. + -- Equal to `boxStartEdge` for LTR boxes. -- - -- Equal to `boxEndSpacing` for RTL boxes. + -- Equal to `boxEndEdge` for RTL boxes. - , boxRightSpacing :: Maybe Int32 - -- ^ `Just` an amount of empty space to add to the right side - -- of the fragment on account of this inline box, or `Nothing` - -- if this is not the rightmost fragment of this inline box. + , boxRightEdge :: BoxEdge + -- ^ Describes the right edge of the inline box. + -- Typically applied to the rightmost fragment in the box, + -- and set to `NoEdge` for all other fragments. -- - -- Equal to `boxStartSpacing` for RTL boxes. + -- Equal to `boxStartEdge` for RTL boxes. -- - -- Equal to `boxEndSpacing` for LTR boxes. + -- Equal to `boxEndEdge` for LTR boxes. - , boxStartSpacing :: Maybe Int32 - -- ^ `Just` an amount of empty space to add to the start side - -- of the fragment on account of this inline box, or `Nothing` - -- if this is not the startmost fragment of this inline box. + , boxStartEdge :: BoxEdge + -- ^ Describes the start edge of the inline box. + -- Typically applied to the startmost fragment in the box, + -- and set to `NoEdge` for all other fragments. -- - -- Equal to `boxLeftSpacing` for LTR boxes. + -- Equal to `boxLeftEdge` for LTR boxes. -- - -- Equal to `boxRightSpacing` for RTL boxes. + -- Equal to `boxRightEdge` for RTL boxes. - , boxEndSpacing :: Maybe Int32 - -- ^ `Just` an amount of empty space to add to the end side - -- of the fragment on account of this inline box, or `Nothing` - -- if this is not the endmost fragment of this inline box. + , boxEndEdge :: BoxEdge + -- ^ Describes the end edge of the inline box. + -- Typically applied to the endmost fragment in the box, + -- and set to `NoEdge` for all other fragments. -- - -- Equal to `boxLeftSpacing` for RTL boxes. + -- Equal to `boxLeftEdge` for RTL boxes. -- - -- Equal to `boxRightSpacing` for LTR boxes. + -- Equal to `boxRightEdge` for LTR boxes. } deriving (Eq, Read, Show) +-- | Describes either the absence, or the presence and size, of a box edge at a +-- given position. +data BoxEdge + + = NoEdge + -- ^ The given box does not have an edge here. + -- + -- This typically means that the box was fragmented and that the given edge + -- is associated with another fragment. + + | SpacedEdge Int32 + -- ^ The given box has an edge here, adding a given amount of empty space + -- from the `Data.Text.ParagraphLayout.Rich.fragmentRect` outward. + + deriving (Eq, Read, Show) + +-- | Amount of empty space to add on account of the given `BoxEdge`. +edgeSpacing :: BoxEdge -> Int32 +edgeSpacing NoEdge = 0 +edgeSpacing (SpacedEdge s) = s + -- | Amount of empty space to add to the left side -- on account of all given boxes in sum. totalLeftSpacing :: [AncestorBox d] -> Int32 -totalLeftSpacing bs = sum $ catMaybes $ map boxLeftSpacing bs +totalLeftSpacing bs = sum $ map (edgeSpacing . boxLeftEdge) bs -- | Amount of empty space to add to the right side -- on account of all given boxes in sum. totalRightSpacing :: [AncestorBox d] -> Int32 -totalRightSpacing bs = sum $ catMaybes $ map boxRightSpacing bs +totalRightSpacing bs = sum $ map (edgeSpacing . boxRightEdge) bs diff --git a/src/Data/Text/ParagraphLayout/Internal/Layout.hs b/src/Data/Text/ParagraphLayout/Internal/Layout.hs index 30c12cb..bf8f5c6 100644 --- a/src/Data/Text/ParagraphLayout/Internal/Layout.hs +++ b/src/Data/Text/ParagraphLayout/Internal/Layout.hs @@ -150,31 +150,31 @@ ancestorBoxes leftBoxes rightBoxes rs = map ancestorBox $ RS.spanBoxes rs ancestorBox b = case RB.boxDirection b of DirLTR -> AncestorBox { boxUserData = RB.boxUserData b - , boxLeftSpacing = leftSpacing b - , boxRightSpacing = rightSpacing b - , boxStartSpacing = leftSpacing b - , boxEndSpacing = rightSpacing b + , boxLeftEdge = leftEdge b + , boxRightEdge = rightEdge b + , boxStartEdge = leftEdge b + , boxEndEdge = rightEdge b } DirRTL -> AncestorBox { boxUserData = RB.boxUserData b - , boxLeftSpacing = leftSpacing b - , boxRightSpacing = rightSpacing b - , boxStartSpacing = rightSpacing b - , boxEndSpacing = leftSpacing b + , boxLeftEdge = leftEdge b + , boxRightEdge = rightEdge b + , boxStartEdge = rightEdge b + , boxEndEdge = leftEdge b } _ -> AncestorBox { boxUserData = RB.boxUserData b - , boxLeftSpacing = Nothing - , boxRightSpacing = Nothing - , boxStartSpacing = Nothing - , boxEndSpacing = Nothing + , boxLeftEdge = NoEdge + , boxRightEdge = NoEdge + , boxStartEdge = NoEdge + , boxEndEdge = NoEdge } - leftSpacing b = if b `elem` leftBoxes - then Just $ RB.boxLeftSpacing b - else Nothing - rightSpacing b = if b `elem` rightBoxes - then Just $ RB.boxRightSpacing b - else Nothing + leftEdge b = if b `elem` leftBoxes + then SpacedEdge $ RB.boxLeftSpacing b + else NoEdge + rightEdge b = if b `elem` rightBoxes + then SpacedEdge $ RB.boxRightSpacing b + else NoEdge -- | Calculate layout for multiple horizontal runs, breaking them as necessary -- to fit as much content as possible without exceeding the maximum line width, -- 2.30.2