aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolay Yakimov <[email protected]>2020-07-07 12:28:38 +0300
committerJohn MacFarlane <[email protected]>2020-07-18 13:04:42 -0700
commit52d94063c3c5ad59e68d566ad2cd3f3d8ec79df8 (patch)
treeefeacf4dded54c45cba1f69d1753d24b58294eda
parent76c765a38b6d1c50443374532d3645d76abde261 (diff)
[Docx Reader] Remove no-op stack/unstackInlines in Readers.Docx.Combine
-rw-r--r--src/Text/Pandoc/Readers/Docx/Combine.hs10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/Text/Pandoc/Readers/Docx/Combine.hs b/src/Text/Pandoc/Readers/Docx/Combine.hs
index c095adc2b..22541097c 100644
--- a/src/Text/Pandoc/Readers/Docx/Combine.hs
+++ b/src/Text/Pandoc/Readers/Docx/Combine.hs
@@ -71,20 +71,18 @@ data Modifier a = Modifier (a -> a)
spaceOutInlinesL :: Inlines -> (Inlines, Inlines)
spaceOutInlinesL ms = (l, stackInlines fs (m' <> r))
- where (l, m, r) = spaceOutInlines ms
- (fs, m') = unstackInlines m
+ where (l, (fs, m'), r) = spaceOutInlines ms
spaceOutInlinesR :: Inlines -> (Inlines, Inlines)
spaceOutInlinesR ms = (stackInlines fs (l <> m'), r)
- where (l, m, r) = spaceOutInlines ms
- (fs, m') = unstackInlines m
+ where (l, (fs, m'), r) = spaceOutInlines ms
-spaceOutInlines :: Inlines -> (Inlines, Inlines, Inlines)
+spaceOutInlines :: Inlines -> (Inlines, ([Modifier Inlines], Inlines), Inlines)
spaceOutInlines ils =
let (fs, ils') = unstackInlines ils
(left, (right, contents')) = second (spanr isSpace) $ spanl isSpace $ unMany ils'
-- NOTE: spanr counterintuitively returns suffix as the FIRST tuple element
- in (Many left, stackInlines fs $ Many contents', Many right)
+ in (Many left, (fs, Many contents'), Many right)
isSpace :: Inline -> Bool
isSpace Space = True