diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2017-12-08 16:33:29 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2017-12-08 16:34:15 -0800 |
| commit | 67b6abc8065a290517ff1486d09b4e57fce19733 (patch) | |
| tree | 2c7125ad85ab3d3954b99ffed8a21d633627709f | |
| parent | 677ff2aaea256b0793ab471aded7fdc72d47046f (diff) | |
| download | pandoc-67b6abc8065a290517ff1486d09b4e57fce19733.tar.gz | |
LaTeX reader: fix \ before newline.
This should be a nonbreaking space, as long as it's not
followed by a blank line. This has been fixed at the tokenizer
level.
Closes #4134.
| -rw-r--r-- | src/Text/Pandoc/Readers/LaTeX.hs | 17 | ||||
| -rw-r--r-- | test/command/4134.md | 25 |
2 files changed, 39 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs index d1d9682c3..90d0fe5d1 100644 --- a/src/Text/Pandoc/Readers/LaTeX.hs +++ b/src/Text/Pandoc/Readers/LaTeX.hs @@ -332,9 +332,20 @@ totoks pos t = in Tok pos (CtrlSeq ws) ("\\" <> ws <> ss) : totoks (incSourceColumn pos (1 + T.length ws + T.length ss)) rest''' - | d == '\t' || d == '\n' -> - Tok pos Symbol "\\" - : totoks (incSourceColumn pos 1) rest + | isSpaceOrTab d || d == '\n' -> + let (w1, r1) = T.span isSpaceOrTab rest + (w2, (w3, r3)) = case T.uncons r1 of + Just ('\n', r2) + -> (T.pack "\n", + T.span isSpaceOrTab r2) + _ -> (mempty, (w1, r1)) + in case T.uncons r3 of + Just ('\n', _) -> + Tok pos (CtrlSeq " ") ("\\" <> w1) + : totoks (incSourceColumn pos 1) r1 + _ -> + Tok pos (CtrlSeq " ") ("\\" <> w1 <> w2 <> w3) + : totoks (incSourceColumn pos 1) r3 | otherwise -> Tok pos (CtrlSeq (T.singleton d)) (T.pack [c,d]) : totoks (incSourceColumn pos 2) rest' diff --git a/test/command/4134.md b/test/command/4134.md new file mode 100644 index 000000000..b5473d948 --- /dev/null +++ b/test/command/4134.md @@ -0,0 +1,25 @@ +``` +% pandoc -f latex -t native +Hello.\ +world. +^D +[Para [Str "Hello.\160world."]] +``` + +``` +% pandoc -f latex -t native +Hello.\ + world. +^D +[Para [Str "Hello.\160world."]] +``` + +``` +% pandoc -f latex -t native +Hello.\ + +World. +^D +[Para [Str "Hello.\160"] +,Para [Str "World."]] +``` |