2 files changed, 11 insertions, 13 deletions
diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs
index 6298e0b2f..3408201eb 100644
--- a/src/Text/Pandoc/Readers/LaTeX.hs
+++ b/src/Text/Pandoc/Readers/LaTeX.hs
@@ -2105,7 +2105,7 @@ environments = M.fromList
           resetCaption *> simpTable "longtable" False >>= addTableCaption)
    , ("table",  env "table" $
           resetCaption *> skipopts *> blocks >>= addTableCaption)
-   , ("tabular*", env "tabular" $ simpTable "tabular*" True)
+   , ("tabular*", env "tabular*" $ simpTable "tabular*" True)
    , ("tabularx", env "tabularx" $ simpTable "tabularx" True)
    , ("tabular", env "tabular"  $ simpTable "tabular" False)
    , ("quote", blockQuote <$> env "quote" blocks)
diff --git a/src/Text/Pandoc/Readers/Muse.hs b/src/Text/Pandoc/Readers/Muse.hs
index 8bef5b539..4c6d1278e 100644
--- a/src/Text/Pandoc/Readers/Muse.hs
+++ b/src/Text/Pandoc/Readers/Muse.hs
@@ -467,27 +467,25 @@ orderedList = try $ do
   rest <- many $ listItem (col - 1) (void (orderedListMarker style delim))
   return $ B.orderedListWith p <$> sequence (first : rest)
 
-definitionListItem :: PandocMonad m => MuseParser m (F (Inlines, [Blocks]))
-definitionListItem = try $ do
-  many spaceChar
-  startPos <- getPosition
-  (guardDisabled Ext_amuse) <|> (guard (sourceColumn startPos /= 1)) -- Initial space is required by Amusewiki, but not Emacs Muse
+definitionListItem :: PandocMonad m => Int -> MuseParser m (F (Inlines, [Blocks]))
+definitionListItem n = try $ do
+  count n spaceChar
   pos <- getPosition
   term <- trimInlinesF . mconcat <$> manyTill (choice inlineList) (string "::")
   void spaceChar <|> lookAhead eol
   contents <- listItemContents' $ sourceColumn pos
-  optionMaybe blankline
   pure $ do lineContent' <- contents
             term' <- term
             pure (term', [lineContent'])
 
-definitionListItems :: PandocMonad m => MuseParser m (F [(Inlines, [Blocks])])
-definitionListItems = sequence <$> many1 definitionListItem
-
 definitionList :: PandocMonad m => MuseParser m (F Blocks)
-definitionList = do
-  items <- definitionListItems
-  return $ B.definitionList <$> items
+definitionList = try $ do
+  many spaceChar
+  pos <- getPosition
+  (guardDisabled Ext_amuse) <|> (guard (sourceColumn pos /= 1)) -- Initial space is required by Amusewiki, but not Emacs Muse
+  first <- definitionListItem 0
+  rest <- many $ try (optionMaybe blankline >> definitionListItem (sourceColumn pos - 1))
+  return $ B.definitionList <$> sequence (first : rest)
 
 --
 -- tables