1 files changed, 24 insertions, 0 deletions
diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs
index 9ec84b3f6..a9bafb03b 100644
--- a/src/Text/Pandoc/Readers/LaTeX.hs
+++ b/src/Text/Pandoc/Readers/LaTeX.hs
@@ -1333,11 +1333,20 @@ inlineCommands = M.fromList $
   , ("nohyphens", tok)
   , ("textnhtt", ttfamily)
   , ("nhttfamily", ttfamily)
+  -- LaTeX colors
+  , ("textcolor", coloredInline "color")
+  , ("colorbox", coloredInline "background-color")
   -- fontawesome
   , ("faCheck", lit "\10003")
   , ("faClose", lit "\10007")
   ]
 
+coloredInline :: PandocMonad m => String -> LP m Inlines
+coloredInline stylename = do
+    skipopts 
+    color <- braced
+    spanWith ("",[],[("style",stylename ++ ": " ++ toksToString color)]) <$> tok
+
 ttfamily :: PandocMonad m => LP m Inlines
 ttfamily = (code . stringify . toList) <$> tok
 
@@ -1703,6 +1712,9 @@ blockCommands = M.fromList $
    , ("graphicspath", graphicsPath)
    -- hyperlink
    , ("hypertarget", try $ braced >> grouped block)
+   -- LaTeX colors
+   , ("textcolor", coloredBlock "color")
+   , ("colorbox", coloredBlock "background-color")
    ]
 
 
@@ -1866,6 +1878,18 @@ addImageCaption = walkM go
                Nothing  -> Image attr alt (src,tit)
         go x = return x
 
+coloredBlock :: PandocMonad m => String -> LP m Blocks
+coloredBlock stylename = do
+  skipopts 
+  color <- braced
+  let constructor = divWith ("",[],[("style",stylename ++ ": " ++ toksToString color)])
+  inlineContents <|> constructor <$> blockContents
+  where inlineContents = do 
+                            ils <- grouped inline
+                            rest <- inlines
+                            return (para (ils <> rest))
+        blockContents = grouped block
+
 graphicsPath :: PandocMonad m => LP m Blocks
 graphicsPath = do
   ps <- map toksToString <$> (bgroup *> manyTill braced egroup)