git.iko.soy/typeable/pandoc
on master help sign in
[Docx Reader] Remove no-op stack/unstackInlines in Readers.Docx.Combine
commit52d94063c3c5ad59e68d566ad2cd3f3d8ec79df8 authorNikolay Yakimov <root@livid.pp.ru> dateTue 7 Jul 2020, 12:28 (6 years ago) parent76c765a
1 file changed+4−6
src/Text/Pandoc/Readers/Docx/Combine.hs+4−6
src/Text/Pandoc/Readers/Docx/Combine.hs+4−6
@@ -71,20 +71,18 @@ data Modifier a = Modifier (a -> a)
7171
7272spaceOutInlinesL :: Inlines -> (Inlines, Inlines)
7373spaceOutInlinesL ms = (l, stackInlines fs (m' <> r))
74− where (l, m, r) = spaceOutInlines ms
75− (fs, m') = unstackInlines m
74+ where (l, (fs, m'), r) = spaceOutInlines ms
7675
7776spaceOutInlinesR :: Inlines -> (Inlines, Inlines)
7877spaceOutInlinesR ms = (stackInlines fs (l <> m'), r)
79− where (l, m, r) = spaceOutInlines ms
80− (fs, m') = unstackInlines m
78+ where (l, (fs, m'), r) = spaceOutInlines ms
8179
82−spaceOutInlines :: Inlines -> (Inlines, Inlines, Inlines)
80+spaceOutInlines :: Inlines -> (Inlines, ([Modifier Inlines], Inlines), Inlines)
8381spaceOutInlines ils =
8482 let (fs, ils') = unstackInlines ils
8583 (left, (right, contents')) = second (spanr isSpace) $ spanl isSpace $ unMany ils'
8684 -- NOTE: spanr counterintuitively returns suffix as the FIRST tuple element
87− in (Many left, stackInlines fs $ Many contents', Many right)
85+ in (Many left, (fs, Many contents'), Many right)
8886
8987isSpace :: Inline -> Bool
9088isSpace Space = True