@@ -4,7 +4,8 @@
44{- |
55 Module : Text.Pandoc.Readers.Docx.Combine
66 Copyright : © 2014-2020 Jesse Rosenthal <jrosenthal@jhu.edu>,
7− 2014-2020 John MacFarlane <jgm@berkeley.edu>
7+ 2014-2020 John MacFarlane <jgm@berkeley.edu>,
8+ 2020 Nikolay Yakimov <root@livid.pp.ru>
89 License : GNU GPL, version 2 or above
910
1011 Maintainer : Jesse Rosenthal <jrosenthal@jhu.edu>
@@ -59,7 +60,9 @@ module Text.Pandoc.Readers.Docx.Combine ( smushInlines
5960 where
6061
6162import Data.List
62−import Data.Sequence (ViewL (..), ViewR (..), viewl, viewr, (><), (|>))
63+import Data.Bifunctor
64+import Data.Sequence ( ViewL (..), ViewR (..), viewl, viewr, spanr, spanl
65+ , (><), (|>) )
6366import qualified Data.Sequence as Seq (null)
6467import Text.Pandoc.Builder
6568
@@ -80,14 +83,14 @@ spaceOutInlinesR ms = (stackInlines fs (l <> m'), r)
8083spaceOutInlines :: Inlines -> (Inlines, Inlines, Inlines)
8184spaceOutInlines ils =
8285 let (fs, ils') = unstackInlines ils
83− contents = unMany ils'
84− left = case viewl contents of
85− (Space :< _) -> space
86− _ -> mempty
87− right = case viewr contents of
88− (_ :> Space) -> space
89− _ -> mempty in
90− (left, stackInlines fs $ trimInlines . Many $ contents, right)
86+ (left, (right, contents')) = second (spanr isSpace) $ spanl isSpace $ unMany ils'
87+ -- NOTE: spanr counterintuitively returns suffix as the FIRST tuple element
88+ in (Many left, stackInlines fs $ Many contents', Many right)
89+
90+isSpace :: Inline -> Bool
91+isSpace Space = True
92+isSpace SoftBreak = True
93+isSpace _ = False
9194
9295stackInlines :: [Modifier Inlines] -> Inlines -> Inlines
9396stackInlines [] ms = ms
@@ -99,39 +102,24 @@ stackInlines (Modifier f : fs) ms =
99102stackInlines (AttrModifier f attr : fs) ms = f attr $ stackInlines fs ms
100103
101104unstackInlines :: Inlines -> ([Modifier Inlines], Inlines)
102−unstackInlines ms = case ilModifier ms of
103− NullModifier -> ([], ms)
104− _ -> (f : fs, ms') where
105− f = ilModifier ms
106− (fs, ms') = unstackInlines $ ilInnards ms
107−
108−ilModifier :: Inlines -> Modifier Inlines
109−ilModifier ils = case viewl (unMany ils) of
110− (x :< xs) | Seq.null xs -> case x of
111− (Emph _) -> Modifier emph
112− (Strong _) -> Modifier strong
113− (SmallCaps _) -> Modifier smallcaps
114− (Strikeout _) -> Modifier strikeout
115− (Superscript _) -> Modifier superscript
116− (Subscript _) -> Modifier subscript
117− (Link attr _ tgt) -> Modifier $ linkWith attr (fst tgt) (snd tgt)
118− (Span attr _) -> AttrModifier spanWith attr
119− _ -> NullModifier
120− _ -> NullModifier
121−
122−ilInnards :: Inlines -> Inlines
123−ilInnards ils = case viewl (unMany ils) of
124− (x :< xs) | Seq.null xs -> case x of
125− (Emph lst) -> fromList lst
126− (Strong lst) -> fromList lst
127− (SmallCaps lst) -> fromList lst
128− (Strikeout lst) -> fromList lst
129− (Superscript lst) -> fromList lst
130− (Subscript lst) -> fromList lst
131− (Link _ lst _) -> fromList lst
132− (Span _ lst) -> fromList lst
133− _ -> ils
134− _ -> ils
105+unstackInlines ms = case ilModifierAndInnards ms of
106+ (NullModifier, _) -> ([], ms)
107+ (f, innards ) -> first (f :) $ unstackInlines innards
108+
109+ilModifierAndInnards :: Inlines -> (Modifier Inlines, Inlines)
110+ilModifierAndInnards ils = case viewl $ unMany ils of
111+ x :< xs | Seq.null xs -> case x of
112+ Emph lst -> (Modifier emph, fromList lst)
113+ Strong lst -> (Modifier strong, fromList lst)
114+ SmallCaps lst -> (Modifier smallcaps, fromList lst)
115+ Strikeout lst -> (Modifier strikeout, fromList lst)
116+ Underline lst -> (Modifier underline, fromList lst)
117+ Superscript lst -> (Modifier superscript, fromList lst)
118+ Subscript lst -> (Modifier subscript, fromList lst)
119+ Link attr lst tgt -> (Modifier $ linkWith attr (fst tgt) (snd tgt), fromList lst)
120+ Span attr lst -> (AttrModifier spanWith attr, fromList lst)
121+ _ -> (NullModifier, ils)
122+ _ -> (NullModifier, ils)
135123
136124inlinesL :: Inlines -> (Inlines, Inlines)
137125inlinesL ils = case viewl $ unMany ils of
@@ -162,7 +150,7 @@ combineSingletonInlines x y =
162150 in
163151 case null shared of
164152 True | isEmpty xs && isEmpty ys ->
165− stackInlines (x_rem_attr ++ y_rem_attr) mempty
153+ stackInlines (x_rem_attr <> y_rem_attr) mempty
166154 | isEmpty xs ->
167155 let (sp, y') = spaceOutInlinesL y in
168156 stackInlines x_rem_attr mempty <> sp <> y'