summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Schreiber <marc.schreiber@fh-aachen.de>2017-05-03 13:39:38 +0200
committerMarc Schreiber <marc.schreiber@fh-aachen.de>2017-05-03 13:39:38 +0200
commit1728d4e60983e050be4bfb5b8c2e6065b4dd198a (patch)
tree08c1676949702de6635a37c286aab414c9c634e1
parentd9439808f2fe226aad027c8c9d0a38217a1e8c34 (diff)
\textcolor works as inline and block command
-rw-r--r--src/Text/Pandoc/Readers/LaTeX.hs2
-rw-r--r--test/command/textcolor.md20
2 files changed, 13 insertions, 9 deletions
diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs
index 1c1aa4c62..58ed97b04 100644
--- a/src/Text/Pandoc/Readers/LaTeX.hs
+++ b/src/Text/Pandoc/Readers/LaTeX.hs
@@ -420,7 +420,7 @@ blockTextcolor :: PandocMonad m => LP m Blocks
blockTextcolor = do
skipopts
color <- braced
- return <$> divWith ("",[],[("style","color: " ++ color)]) $ block
+ divWith ("",[],[("style","color: " ++ color)]) <$> grouped block
graphicsPath :: PandocMonad m => LP m Blocks
graphicsPath = do
diff --git a/test/command/textcolor.md b/test/command/textcolor.md
index 013e55d67..aa3593822 100644
--- a/test/command/textcolor.md
+++ b/test/command/textcolor.md
@@ -1,24 +1,28 @@
```
% pandoc -f latex -t native
-\textcolor{red}{Hello World}
+Hello \textcolor{red}{World}
^D
-[Para [Span ("",[],[("style","color: red")]) [Str "Hello",Space,Str "World"]]]
+[Para [Str "Hello",Space,Span ("",[],[("style","color: red")]) [Str "World"]]]
```
```
% pandoc -f latex -t native
-\textcolor{blue}{Hello \textbf{World}}
+Hello \textcolor{blue}{\textbf{World}}
^D
-[Para [Span ("",[],[("style","color: blue")]) [Str "Hello",Space,Strong [Str "World"]]]]
+[Para [Str "Hello",Space,Span ("",[],[("style","color: blue")]) [Strong [Str "World"]]]]
```
```
% pandoc -f latex -t native
\textcolor{orange}{
- \begin{itemize}
- \item Test
- \end{itemize}
+\begin{itemize}
+ \item Item 1
+ \item Item 2
+\end{itemize}
}
^D
-
+[Div ("",[],[("style","color: orange")])
+ [BulletList
+ [[Para [Str "Item",Space,Str "1"]]
+ ,[Para [Str "Item",Space,Str "2"]]]]]
```