7680e9b · typeable/pandoc

git.iko.soy/typeable/pandoc

Muse reader: require only one space for nested definition list indentation

commit7680e9b9642c1bade4152e4c833003688c439ca1 authorAlexander Krotov <ilabdsf@gmail.com> dateFri 19 Jan 2018, 14:16 (9 years ago) parent4a5801b

2 files changed+5−1

unifiedsplit

src/Text/Pandoc/Readers/Muse.hs+2−1

@@ -469,8 +469,9 @@ orderedList = try $ do

469469

470470definitionListItem :: PandocMonad m => MuseParser m (F (Inlines, [Blocks]))

471471definitionListItem = try $ do

472− guardDisabled Ext_amuse <|> void spaceChar -- Initial space is required by Amusewiki, but not Emacs Muse

473472 many spaceChar

473+ startPos <- getPosition

474+ (guardDisabled Ext_amuse) <|> (guard (sourceColumn startPos /= 1)) -- Initial space is required by Amusewiki, but not Emacs Muse

474475 pos <- getPosition

475476 term <- trimInlinesF . mconcat <$> manyTill (choice inlineList) (string "::")

476477 void spaceChar <|> lookAhead eol

test/Tests/Readers/Muse.hs+3

@@ -960,6 +960,9 @@ tests =

960960 definitionList [ ("Term1", [ para "This is a first definition\nAnd it has two lines;\nno, make that three."])

961961 , ("Term2", [ para "This is a second definition"])

962962 ])

963+ , "Nested definition list" =:

964+ " Foo :: bar :: baz" =?>

965+ definitionList [ ("Foo", [ definitionList [ ("bar", [ para "baz" ])]])]

963966 , "Two blank lines separate definition lists" =:

964967 T.unlines

965968 [ " First :: list"