From f3e8274d0425b3bf7a2459a2d88af585b491507f Mon Sep 17 00:00:00 2001 From: Nikolay Yakimov Date: Sat, 21 Mar 2015 22:39:07 +0300 Subject: LaTeX Reader: check for block-level newcommand aliases in blockCommand --- tests/latex-reader.latex | 19 +++++++++++++++++++ tests/latex-reader.native | 6 +++++- 2 files changed, 24 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/latex-reader.latex b/tests/latex-reader.latex index 2ebdfed99..0e5983d6a 100644 --- a/tests/latex-reader.latex +++ b/tests/latex-reader.latex @@ -845,4 +845,23 @@ indented. \$ \% \& \# \_ \{ \} +\section{Block newcommands} + +See e.g. issues #1866, #1835 + +\newcommand{\FIG}[3]{ + \begin{figure}[h!] + \centering + \includegraphics[width=#2\columnwidth,angle=0]{#1} + \caption{#3} + \label{fig:#1} + \end{figure} +} + +\newcommand{\separator}{\vspace{4em}} + +\separator + +\FIG{lalune.jpg}{0.5}{Test caption} + \end{document} diff --git a/tests/latex-reader.native b/tests/latex-reader.native index abc4b05a7..2cc6508de 100644 --- a/tests/latex-reader.native +++ b/tests/latex-reader.native @@ -372,4 +372,8 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Spa [[Para [Str "And",Space,Str "in",Space,Str "list",Space,Str "items.",Note [Para [Str "In",Space,Str "list."]]]]] ,Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented."] ,Header 1 ("escaped-characters",[],[]) [Str "Escaped",Space,Str "characters"] -,Para [Str "$",Space,Str "%",Space,Str "&",Space,Str "#",Space,Str "_",Space,Str "{",Space,Str "}"]] +,Para [Str "$",Space,Str "%",Space,Str "&",Space,Str "#",Space,Str "_",Space,Str "{",Space,Str "}"] +,Header 1 ("block-newcommands",[],[]) [Str "Block",Space,Str "newcommands"] +,Para [Str "See",Space,Str "e.g.",Space,Str "issues",Space,Str "#1866,",Space,Str "#1835"] +,RawBlock (Format "latex") "\\vspace{4em}" +,Para [RawInline (Format "latex") "\\centering",Image [Str "Test",Space,Str "caption",Span ("",[],[("data-label","fig:lalune.jpg")]) []] ("lalune.jpg","fig:")]] -- cgit v1.2.3 From 8981856aadf5e01dbd8eb590c5f9bff1d9220d6e Mon Sep 17 00:00:00 2001 From: Nikolay Yakimov Date: Mon, 30 Mar 2015 06:16:22 +0300 Subject: Latex Reader: Test for para starting with latex macro --- tests/latex-reader.latex | 4 ++++ tests/latex-reader.native | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/latex-reader.latex b/tests/latex-reader.latex index 0e5983d6a..b5a4a8add 100644 --- a/tests/latex-reader.latex +++ b/tests/latex-reader.latex @@ -864,4 +864,8 @@ See e.g. issues #1866, #1835 \FIG{lalune.jpg}{0.5}{Test caption} +\newcommand{\wbal}{The Wikibook about \LaTeX} + +\wbal is a good resource for learning \LaTeX. + \end{document} diff --git a/tests/latex-reader.native b/tests/latex-reader.native index 2cc6508de..49b483500 100644 --- a/tests/latex-reader.native +++ b/tests/latex-reader.native @@ -376,4 +376,5 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Spa ,Header 1 ("block-newcommands",[],[]) [Str "Block",Space,Str "newcommands"] ,Para [Str "See",Space,Str "e.g.",Space,Str "issues",Space,Str "#1866,",Space,Str "#1835"] ,RawBlock (Format "latex") "\\vspace{4em}" -,Para [RawInline (Format "latex") "\\centering",Image [Str "Test",Space,Str "caption",Span ("",[],[("data-label","fig:lalune.jpg")]) []] ("lalune.jpg","fig:")]] +,Para [RawInline (Format "latex") "\\centering",Image [Str "Test",Space,Str "caption",Span ("",[],[("data-label","fig:lalune.jpg")]) []] ("lalune.jpg","fig:")] +,Para [Span ("",[],[]) [Str "The",Space,Str "Wikibook",Space,Str "about",Space,Str "LaTeX"],Str "is",Space,Str "a",Space,Str "good",Space,Str "resource",Space,Str "for",Space,Str "learning",Space,Str "LaTeX."]] -- cgit v1.2.3 From 96438b11e0c5b8ad4a384eede0cba164153e8c5a Mon Sep 17 00:00:00 2001 From: Nikolay Yakimov Date: Mon, 30 Mar 2015 06:40:01 +0300 Subject: Latex Reader: More tests for corner cases --- tests/latex-reader.latex | 4 ++++ tests/latex-reader.native | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/latex-reader.latex b/tests/latex-reader.latex index b5a4a8add..4324dbfbe 100644 --- a/tests/latex-reader.latex +++ b/tests/latex-reader.latex @@ -868,4 +868,8 @@ See e.g. issues #1866, #1835 \wbal is a good resource for learning \LaTeX. +\separator with trailing inlines + +\FIG{lalune.jpg}{0.5}{Test caption} with trailing inlines + \end{document} diff --git a/tests/latex-reader.native b/tests/latex-reader.native index 49b483500..fbc191125 100644 --- a/tests/latex-reader.native +++ b/tests/latex-reader.native @@ -377,4 +377,8 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Spa ,Para [Str "See",Space,Str "e.g.",Space,Str "issues",Space,Str "#1866,",Space,Str "#1835"] ,RawBlock (Format "latex") "\\vspace{4em}" ,Para [RawInline (Format "latex") "\\centering",Image [Str "Test",Space,Str "caption",Span ("",[],[("data-label","fig:lalune.jpg")]) []] ("lalune.jpg","fig:")] -,Para [Span ("",[],[]) [Str "The",Space,Str "Wikibook",Space,Str "about",Space,Str "LaTeX"],Str "is",Space,Str "a",Space,Str "good",Space,Str "resource",Space,Str "for",Space,Str "learning",Space,Str "LaTeX."]] +,Para [Span ("",[],[]) [Str "The",Space,Str "Wikibook",Space,Str "about",Space,Str "LaTeX"],Str "is",Space,Str "a",Space,Str "good",Space,Str "resource",Space,Str "for",Space,Str "learning",Space,Str "LaTeX."] +,RawBlock (Format "latex") "\\vspace{4em}" +,Para [Str "with",Space,Str "trailing",Space,Str "inlines"] +,Para [RawInline (Format "latex") "\\centering",Image [Str "Test",Space,Str "caption",Span ("",[],[("data-label","fig:lalune.jpg")]) []] ("lalune.jpg","fig:")] +,Para [Str "with",Space,Str "trailing",Space,Str "inlines"]] -- cgit v1.2.3