diff --git a/src/parser/drawer.rs b/src/parser/drawer.rs index 4e6307d..69ebd4a 100644 --- a/src/parser/drawer.rs +++ b/src/parser/drawer.rs @@ -5,6 +5,7 @@ use nom::bytes::complete::take_while; use nom::character::complete::line_ending; use nom::character::complete::space0; use nom::combinator::eof; +use nom::combinator::not; use nom::combinator::recognize; use nom::multi::many_till; use nom::sequence::tuple; @@ -55,20 +56,24 @@ pub fn drawer<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, let element_matcher = parser_with_context!(element(true))(&parser_context); let exit_matcher = parser_with_context!(exit_matcher_parser)(&parser_context); - let (remaining, children) = - match tuple((blank_line, many_till(blank_line, exit_matcher)))(remaining) { - Ok((remain, (first_line, (_trailing_whitespace, _exit_contents)))) => { - let mut element = Element::Paragraph(Paragraph::of_text(first_line)); - let source = get_consumed(remaining, remain); - element.set_source(source); - (remain, vec![element]) - } - Err(_) => { - let (remaining, (children, _exit_contents)) = - many_till(element_matcher, exit_matcher)(remaining)?; - (remaining, children) - } - }; + let (remaining, children) = match tuple(( + not(exit_matcher), + blank_line, + many_till(blank_line, exit_matcher), + ))(remaining) + { + Ok((remain, (_not_immediate_exit, first_line, (_trailing_whitespace, _exit_contents)))) => { + let mut element = Element::Paragraph(Paragraph::of_text(first_line)); + let source = get_consumed(remaining, remain); + element.set_source(source); + (remain, vec![element]) + } + Err(_) => { + let (remaining, (children, _exit_contents)) = + many_till(element_matcher, exit_matcher)(remaining)?; + (remaining, children) + } + }; let (remaining, _end) = drawer_end(&parser_context, remaining)?; let source = get_consumed(input, remaining); diff --git a/toy_language.txt b/toy_language.txt index 6c2c984..ecf1b97 100644 --- a/toy_language.txt +++ b/toy_language.txt @@ -1 +1,6 @@ -foo *bar* baz +[fn:1] footnote. +:drawername: + + +:end: +Is this still in the footnote?