diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2016-10-18 22:03:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-18 22:03:45 +0200 |
| commit | 4a2a7a21e5e8bf0d11abd214d372729eb9eb8d0c (patch) | |
| tree | 2c572ae48210a5935b1746d85a6674b91e1a8306 | |
| parent | 0cd11b3e5404fa6fca7538098bcf315343d1a237 (diff) | |
| parent | c74c5fdd97e8bf4c160a42dff72e3a521294bcda (diff) | |
| download | pandoc-4a2a7a21e5e8bf0d11abd214d372729eb9eb8d0c.tar.gz | |
Merge pull request #3166 from hubertp-lshift/bug/3134
Issue 3143: Don't duplicate text for anchors
| -rw-r--r-- | src/Text/Pandoc/Readers/Odt/ContentReader.hs | 5 | ||||
| -rw-r--r-- | tests/odt/native/referenceToText.native | 2 | ||||
| -rw-r--r-- | tests/odt/odt/referenceToText.odt | bin | 10179 -> 10208 bytes |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Readers/Odt/ContentReader.hs b/src/Text/Pandoc/Readers/Odt/ContentReader.hs index 11d39498c..0b152268f 100644 --- a/src/Text/Pandoc/Readers/Odt/ContentReader.hs +++ b/src/Text/Pandoc/Readers/Odt/ContentReader.hs @@ -810,9 +810,8 @@ maybeAddAnchorFrom anchorReader = >>> proc (inlines, fAnchorElem) -> do case fAnchorElem of - Right anchorElem -> - arr (anchorElem <>) -<< inlines - Left _ -> returnA -< inlines + Right anchorElem -> returnA -< anchorElem + Left _ -> returnA -< inlines where toAnchorElem :: Anchor -> Inlines toAnchorElem anchorID = spanWith (anchorID, [], []) mempty diff --git a/tests/odt/native/referenceToText.native b/tests/odt/native/referenceToText.native index 1d80e2d0d..a2c3e588d 100644 --- a/tests/odt/native/referenceToText.native +++ b/tests/odt/native/referenceToText.native @@ -1 +1 @@ -[Para [Span ("an anchor",[],[]) [],Str "Some",Space,Str "text."],Para [Str "A",Space,Str "reference",Space,Str "to",Space,Link ("",[],[]) [Str "Some",Space,Str "text"] ("#an anchor",""),Str "."]] +[Para [Span ("an anchor",[],[]) [],Str "Some",Space,Str "text."],Para [Str "A",Space,Str "reference",Space,Str "to",Space,Link ("",[],[]) [Str "Some",Space,Str "text"] ("#an anchor",""),Str "."],Para [Str "Some",Space,Str "text",LineBreak,Str "Another",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "link",Span ("anchor",[],[]) []]] diff --git a/tests/odt/odt/referenceToText.odt b/tests/odt/odt/referenceToText.odt Binary files differindex 281055aa0..19237e6f1 100644 --- a/tests/odt/odt/referenceToText.odt +++ b/tests/odt/odt/referenceToText.odt |