diff options
author | Yan Pashkovsky <Yanpas@users.noreply.github.com> | 2018-05-09 19:48:34 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-09 19:48:34 +0300 |
commit | a337685fe0ab9c63b9456f27787bbe4f0d785a94 (patch) | |
tree | e9fc4dfc0802f8acd97f06a8cc8d7c89b5a988ab /test/command | |
parent | 8e9973b9f761262b6871206f741ac3f2a25aa6bb (diff) | |
parent | 5f33d2e0cd9f19566904c93be04f586de811dd75 (diff) | |
download | pandoc-a337685fe0ab9c63b9456f27787bbe4f0d785a94.tar.gz |
Merge branch 'master' into groff_reader
Diffstat (limited to 'test/command')
-rw-r--r-- | test/command/1710.md | 5 | ||||
-rw-r--r-- | test/command/2649.md | 20 | ||||
-rw-r--r-- | test/command/3348.md | 2 | ||||
-rw-r--r-- | test/command/3510-src.hs.orig | 1 | ||||
-rw-r--r-- | test/command/3587.md | 36 | ||||
-rw-r--r-- | test/command/3675.md | 4 | ||||
-rw-r--r-- | test/command/4016.md | 5 | ||||
-rw-r--r-- | test/command/4320.md | 15 | ||||
-rw-r--r-- | test/command/4424.md | 10 | ||||
-rw-r--r-- | test/command/4454.md | 9 | ||||
-rw-r--r-- | test/command/4513.md | 9 | ||||
-rw-r--r-- | test/command/4527.md | 21 | ||||
-rw-r--r-- | test/command/4529.md | 36 | ||||
-rw-r--r-- | test/command/4550.md | 7 | ||||
-rw-r--r-- | test/command/4576.md | 6 | ||||
-rw-r--r-- | test/command/4578.md | 14 | ||||
-rw-r--r-- | test/command/4579.md | 16 | ||||
-rw-r--r-- | test/command/4589.md | 14 | ||||
-rw-r--r-- | test/command/4594.md | 24 | ||||
-rw-r--r-- | test/command/4598.md | 10 | ||||
-rw-r--r-- | test/command/sloppypar.md | 23 |
21 files changed, 269 insertions, 18 deletions
diff --git a/test/command/1710.md b/test/command/1710.md index d14f1217f..d20dfe191 100644 --- a/test/command/1710.md +++ b/test/command/1710.md @@ -54,9 +54,8 @@ ok </div> </div> ^D -\begin{frame}{% -\protect\hypertarget{slide-one}{% -Slide one}} +\begin{frame}{Slide one} +\protect\hypertarget{slide-one}{} \begin{columns}[T] \begin{column}{0.40\textwidth} diff --git a/test/command/2649.md b/test/command/2649.md index 8f594cfe1..52ae16ce4 100644 --- a/test/command/2649.md +++ b/test/command/2649.md @@ -67,7 +67,8 @@ ! Aantal |- | 1 -|align=left| {{FR-VLAG}} [[Sébastien Loeb]] | 78 +|align=left| {{FR-VLAG}} [[Sébastien Loeb]] +| 78 |- | 2 |align=left| {{FR-VLAG}} '''[[Sébastien Ogier]]''' @@ -79,24 +80,25 @@ |} ^D <table> +<thead> +<tr class="header"> +<th><p>Plaats</p></th> +<th><p>Rijder</p></th> +<th><p>Aantal</p></th> +</tr> +</thead> <tbody> <tr class="odd"> -<td></td> -<td><p>Plaats</p></td> -<td><p>Rijder</p></td> -<td><p>Aantal</p></td> -</tr> -<tr class="even"> <td><p>1</p></td> <td><p><a href="Sébastien_Loeb" title="wikilink">Sébastien Loeb</a></p></td> <td><p>78</p></td> </tr> -<tr class="odd"> +<tr class="even"> <td><p>2</p></td> <td><p><strong><a href="Sébastien_Ogier" title="wikilink">Sébastien Ogier</a></strong></p></td> <td><p>38</p></td> </tr> -<tr class="even"> +<tr class="odd"> <td><p>10</p></td> <td><p><a href="Hannu_Mikkola" title="wikilink">Hannu Mikkola</a></p></td> <td><p>18</p></td> diff --git a/test/command/3348.md b/test/command/3348.md index 1457373c8..6e0c07033 100644 --- a/test/command/3348.md +++ b/test/command/3348.md @@ -7,7 +7,7 @@ line of text ----- ------------------------------------------------ ^D -[Table [] [AlignRight,AlignLeft] [8.333333333333333e-2,0.6666666666666666] +[Table [] [AlignRight,AlignLeft] [8.333333333333333e-2,0.6805555555555556] [[] ,[]] [[[Plain [Str "foo"]] diff --git a/test/command/3510-src.hs.orig b/test/command/3510-src.hs.orig new file mode 100644 index 000000000..ad5744b80 --- /dev/null +++ b/test/command/3510-src.hs.orig @@ -0,0 +1 @@ +putStrLn outString diff --git a/test/command/3587.md b/test/command/3587.md index addb6c582..414593b39 100644 --- a/test/command/3587.md +++ b/test/command/3587.md @@ -19,3 +19,39 @@ ^D [Para [Str "{}\160{}\160{}"]] ``` + +``` +% pandoc -f latex -t native +\SI{30}{\milli\meter} +^D +[Para [Str "30\160mm"]] +``` + +``` +% pandoc -f latex -t native +\SI{6}{\gram} +^D +[Para [Str "6\160g"]] +``` + +``` +% pandoc -f latex -t native +\SI{25}{\square\meter} +^D +[Para [Str "25\160m\178"]] +``` + +``` +% pandoc -f latex -t native +\SI{18.2}{\degreeCelsius} +^D +[Para [Str "18.2\160\176C"]] +``` + +``` +% pandoc -f latex -t native +\SI{18.2}{\celsius} +^D +[Para [Str "18.2\160\176C"]] +``` + diff --git a/test/command/3675.md b/test/command/3675.md index b129c7a63..f75721b56 100644 --- a/test/command/3675.md +++ b/test/command/3675.md @@ -7,9 +7,9 @@ print("hello") ^D .. code:: python - print("hello") + print("hello") .. - block quote + block quote ```` diff --git a/test/command/4016.md b/test/command/4016.md index 69ad1c911..3918251c6 100644 --- a/test/command/4016.md +++ b/test/command/4016.md @@ -13,9 +13,8 @@ pandoc -t beamer </div> </div> ^D -\begin{frame}{% -\protect\hypertarget{level-2-blocks}{% -Level 2 blocks}} +\begin{frame}{Level 2 blocks} +\protect\hypertarget{level-2-blocks}{} \begin{columns}[T] \begin{column}{0.40\textwidth} diff --git a/test/command/4320.md b/test/command/4320.md new file mode 100644 index 000000000..732b30a3e --- /dev/null +++ b/test/command/4320.md @@ -0,0 +1,15 @@ +``` +% pandoc -f native -t rst --wrap=none +[Table [] [AlignDefault,AlignDefault] [0.47368421052631576,0.5263157894736842] + [[Plain [Str "one"]] + ,[Plain [Str "two"]]] + [[[Plain [Str "ports"]] + ,[BlockQuote + [Para [Strong [Str "thisIsGoingToBeTooLongAnyway"]]]]]]] +^D ++-------+-------------------------------------+ +| one | two | ++=======+=====================================+ +| ports | **thisIsGoingToBeTooLongAnyway** | ++-------+-------------------------------------+ +``` diff --git a/test/command/4424.md b/test/command/4424.md new file mode 100644 index 000000000..b0b95510b --- /dev/null +++ b/test/command/4424.md @@ -0,0 +1,10 @@ +``` +% pandoc -f latex -t native +\documentclass{article} +\usepackage[sortlocale=en_GB]{biblatex} +\begin{document} +Test +\end{document} +^D +[Para [Str "Test"]] +``` diff --git a/test/command/4454.md b/test/command/4454.md new file mode 100644 index 000000000..db0b0a406 --- /dev/null +++ b/test/command/4454.md @@ -0,0 +1,9 @@ +``` +% pandoc -f rst -t native +• a +• b +^D +[BulletList + [[Plain [Str "a"]] + ,[Plain [Str "b"]]]] +``` diff --git a/test/command/4513.md b/test/command/4513.md new file mode 100644 index 000000000..e4a4406e4 --- /dev/null +++ b/test/command/4513.md @@ -0,0 +1,9 @@ +``` +% pandoc -f textile -t native +|_. heading 1 |_. heading 2| +^D +[Table [] [AlignDefault,AlignDefault] [0.0,0.0] + [[Plain [Str "heading",Space,Str "1"]] + ,[Plain [Str "heading",Space,Str "2"]]] + []] +``` diff --git a/test/command/4527.md b/test/command/4527.md new file mode 100644 index 000000000..984333559 --- /dev/null +++ b/test/command/4527.md @@ -0,0 +1,21 @@ +# Raw TeX blocks in CommonMark with and without raw_tex + +``` +% pandoc -f latex -t commonmark-raw_tex +\someunknowncommand + +Hello. +^D +Hello. +``` + +``` +% pandoc -f latex -t commonmark+raw_tex +\someunknowncommand + +Hello. +^D +\someunknowncommand + +Hello. +``` diff --git a/test/command/4529.md b/test/command/4529.md new file mode 100644 index 000000000..4a2125b9c --- /dev/null +++ b/test/command/4529.md @@ -0,0 +1,36 @@ +``` +% pandoc -f latex -t plain +\chapter{First chapter}\label{sec:chp1} +The next chapter is Chapter~\ref{sec:chp2}. +\section{First section}\label{sec:chp1sec1} +The next section is Section~\ref{sec:chp2sec1}. + +\chapter{Second chapter}\label{sec:chp2} +The previous chapter is Chapter~\ref{sec:chp1}. +\section{First section}\label{sec:chp2sec1} +The previous section is Section~\ref{sec:chp1sec1}. +^D + + +FIRST CHAPTER + + +The next chapter is Chapter 2. + + +First section + +The next section is Section 2.1. + + + +SECOND CHAPTER + + +The previous chapter is Chapter 1. + + +First section + +The previous section is Section 1.1. +``` diff --git a/test/command/4550.md b/test/command/4550.md new file mode 100644 index 000000000..bf3afce5b --- /dev/null +++ b/test/command/4550.md @@ -0,0 +1,7 @@ +``` +% pandoc -f markdown-smart -t ms +A ‘simple’ example +^D +.LP +A ‘simple’ example +``` diff --git a/test/command/4576.md b/test/command/4576.md new file mode 100644 index 000000000..1c82b96eb --- /dev/null +++ b/test/command/4576.md @@ -0,0 +1,6 @@ +``` +% pandoc -f latex -t native +$\rho_\text{D$_2$O}=866$ +^D +[Para [Math InlineMath "\\rho_\\text{D$_2$O}=866"]] +``` diff --git a/test/command/4578.md b/test/command/4578.md new file mode 100644 index 000000000..8f12d0bf2 --- /dev/null +++ b/test/command/4578.md @@ -0,0 +1,14 @@ +``` +% pandoc -t markdown + ------ ------- --------------- --------------------- + One row 12.0 Example of a row that + spans multiple lines. + + ------ ------- --------------- --------------------- +^D + ------ ------- --------------- --------------------- + One row 12.0 Example of a row that + spans multiple lines. + + ------ ------- --------------- --------------------- +``` diff --git a/test/command/4579.md b/test/command/4579.md new file mode 100644 index 000000000..80f0f58c2 --- /dev/null +++ b/test/command/4579.md @@ -0,0 +1,16 @@ +``` +% pandoc -f rst -t native +.. list-table:: + :header-rows: 1 + + * - Foo + - Bar + * - spam + - ham +^D +[Table [] [AlignDefault,AlignDefault] [0.0,0.0] + [[Plain [Str "Foo"]] + ,[Plain [Str "Bar"]]] + [[[Plain [Str "spam"]] + ,[Plain [Str "ham"]]]]] +``` diff --git a/test/command/4589.md b/test/command/4589.md new file mode 100644 index 000000000..ffbe6fe6f --- /dev/null +++ b/test/command/4589.md @@ -0,0 +1,14 @@ +``` +% pandoc -f markdown -t latex +\newcommand{\one}[1]{#1} +\newcommand{\two}[1]{#1} + +Formatting *is* working **here**. But sticking \one{two }\two{commands} +together *breaks* formatting. +^D +\newcommand{\one}[1]{#1} +\newcommand{\two}[1]{#1} + +Formatting \emph{is} working \textbf{here}. But sticking two commands +together \emph{breaks} formatting. +``` diff --git a/test/command/4594.md b/test/command/4594.md new file mode 100644 index 000000000..3f08b6c12 --- /dev/null +++ b/test/command/4594.md @@ -0,0 +1,24 @@ +``` +% pandoc -f markdown -t latex +Some **bold** text here. + +\begin{figure}[htbp] +\centering +\def\svgwidth{\columnwidth} +\import{img/}{vectors.pdf_tex} +\caption{Some caption.} +\end{figure} + +Some *italic* text here. +^D +Some \textbf{bold} text here. + +\begin{figure}[htbp] +\centering +\def\svgwidth{\columnwidth} +\import{img/}{vectors.pdf_tex} +\caption{Some caption.} +\end{figure} + +Some \emph{italic} text here. +``` diff --git a/test/command/4598.md b/test/command/4598.md new file mode 100644 index 000000000..fedfe888a --- /dev/null +++ b/test/command/4598.md @@ -0,0 +1,10 @@ +``` +% pandoc -f rst +`x`__ + +__ `xy`_ + +.. _`xy`: http://xy.org +^D +<p><a href="http://xy.org">x</a></p> +``` diff --git a/test/command/sloppypar.md b/test/command/sloppypar.md new file mode 100644 index 000000000..e2ff4d550 --- /dev/null +++ b/test/command/sloppypar.md @@ -0,0 +1,23 @@ +``` +% pandoc -f latex+raw_tex -t native +\begin{sloppypar} +Sequi id qui facere et incidunt ut. Et fuga ut voluptate enim qui. Odit unde magni ipsam dicta modi. Modi soluta velit est aut aut possimus. + +Qui et temporibus explicabo. Esse ab ut quidem. Vel qui perspiciatis quae odio consectetur alias non sed. Quo consectetur libero omnis quos eius ad vel. +\end{sloppypar} +^D +[Para [Str "Sequi",Space,Str "id",Space,Str "qui",Space,Str "facere",Space,Str "et",Space,Str "incidunt",Space,Str "ut.",Space,Str "Et",Space,Str "fuga",Space,Str "ut",Space,Str "voluptate",Space,Str "enim",Space,Str "qui.",Space,Str "Odit",Space,Str "unde",Space,Str "magni",Space,Str "ipsam",Space,Str "dicta",Space,Str "modi.",Space,Str "Modi",Space,Str "soluta",Space,Str "velit",Space,Str "est",Space,Str "aut",Space,Str "aut",Space,Str "possimus."] +,Para [Str "Qui",Space,Str "et",Space,Str "temporibus",Space,Str "explicabo.",Space,Str "Esse",Space,Str "ab",Space,Str "ut",Space,Str "quidem.",Space,Str "Vel",Space,Str "qui",Space,Str "perspiciatis",Space,Str "quae",Space,Str "odio",Space,Str "consectetur",Space,Str "alias",Space,Str "non",Space,Str "sed.",Space,Str "Quo",Space,Str "consectetur",Space,Str "libero",Space,Str "omnis",Space,Str "quos",Space,Str "eius",Space,Str "ad",Space,Str "vel."]] +``` + +``` +% pandoc -f latex -t native +\begin{sloppypar} +Sequi id qui facere et incidunt ut. Et fuga ut voluptate enim qui. Odit unde magni ipsam dicta modi. Modi soluta velit est aut aut possimus. + +Qui et temporibus explicabo. Esse ab ut quidem. Vel qui perspiciatis quae odio consectetur alias non sed. Quo consectetur libero omnis quos eius ad vel. +\end{sloppypar} +^D +[Para [Str "Sequi",Space,Str "id",Space,Str "qui",Space,Str "facere",Space,Str "et",Space,Str "incidunt",Space,Str "ut.",Space,Str "Et",Space,Str "fuga",Space,Str "ut",Space,Str "voluptate",Space,Str "enim",Space,Str "qui.",Space,Str "Odit",Space,Str "unde",Space,Str "magni",Space,Str "ipsam",Space,Str "dicta",Space,Str "modi.",Space,Str "Modi",Space,Str "soluta",Space,Str "velit",Space,Str "est",Space,Str "aut",Space,Str "aut",Space,Str "possimus."] +,Para [Str "Qui",Space,Str "et",Space,Str "temporibus",Space,Str "explicabo.",Space,Str "Esse",Space,Str "ab",Space,Str "ut",Space,Str "quidem.",Space,Str "Vel",Space,Str "qui",Space,Str "perspiciatis",Space,Str "quae",Space,Str "odio",Space,Str "consectetur",Space,Str "alias",Space,Str "non",Space,Str "sed.",Space,Str "Quo",Space,Str "consectetur",Space,Str "libero",Space,Str "omnis",Space,Str "quos",Space,Str "eius",Space,Str "ad",Space,Str "vel."]] +``` |