875e33e · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Muse reader: allow footnotes to start with empty line

875e33eAlexander Krotov8 years ago

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

compare with master

unifiedsplit

@@ -492,9 +492,10 @@ amuseNoteBlockUntil :: PandocMonad m

492 -> MuseParser m (F Blocks, a)

493amuseNoteBlockUntil end = try $ do

494 guardEnabled Ext_amuse

495− ref <- noteMarker <* spaceChar

495+ ref <- noteMarker

496 pos <- getPosition

497+ void spaceChar <|> lookAhead eol

497− (content, e) <- allowPara $ listItemContentsUntil (sourceColumn pos - 1) (fail "x") end

498+ (content, e) <- allowPara $ listItemContentsUntil (sourceColumn pos) (fail "x") end

498 addNote ref pos content

499 addNote ref pos content

499 return (mempty, e)

500 return (mempty, e)

500

501

test/Tests/Readers/Muse.hs+17

@@ -797,6 +797,23 @@ tests =

797 , "baz"

798 ] =?>

799 para (str "Foo" <> note (lineBlock ["bar"])) <> para (str "baz")

800+

801+ , "Footnote starting with empty line" =:

802+ T.unlines [ "Foo[1]"

803+ , ""

804+ , "[1]" -- No space character after note marker

805+ , ""

806+ , " Bar"

807+ ] =?>

808+ para (str "Foo" <> note (para $ text "Bar"))

809+ , "Indentation in footnote starting with empty line" =:

810+ T.unlines [ "Foo[1]"

811+ , ""

812+ , "[1]" -- No space character after note marker

813+ , ""

814+ , " Bar"

815+ ] =?>

816+ para (str "Foo" <> note mempty) <> blockQuote (para $ text "Bar")

800 , test emacsMuse "Emacs multiparagraph footnotes"

817 , test emacsMuse "Emacs multiparagraph footnotes"

801 (T.unlines

818 (T.unlines

802 [ "First footnote reference[1] and second footnote reference[2]."

819 [ "First footnote reference[1] and second footnote reference[2]."