@@ -113,7 +113,7 @@ static void print_html_element(GString *out, element *elt, bool obfuscate) { g_string_append_printf(out, "%s", elt->contents.str); break; case LINEBREAK: - g_string_append_printf(out, "<br/>"); + g_string_append_printf(out, "<br/>\n"); break; case STR: print_html_string(out, elt->contents.str, obfuscate); @@ -564,7 +564,7 @@ static void print_groff_mm_element(GString *out, element *elt, int count) { break; case LINEBREAK: pad(out, 1); - g_string_append_printf(out, ".br"); + g_string_append_printf(out, ".br\n"); padded = 0; break; case STR: markdown_output.c @@ -329,7 +329,6 @@ Inlines = a:StartList ( !Endline Inline { a = cons($$, a); } { $$ = mk_list(LIST, a); } Inline = Str - | LineBreak | Endline | UlOrStarLine | Space @@ -359,7 +358,7 @@ EscapedChar = '\\' !Newline < . > Entity = ( HexEntity | DecEntity | CharEntity ) { $$ = mk_str(yytext); $$->key = HTML; } -Endline = TerminalEndline | NormalEndline +Endline = LineBreak | TerminalEndline | NormalEndline NormalEndline = Sp Newline !BlankLine !BlockQuote !AtxStart !(Line ("===" '='* | "---" '-'*) Newline) @@ -369,7 +368,7 @@ NormalEndline = Sp Newline !BlankLine !BlockQuote !AtxStart TerminalEndline = Sp Newline Eof { $$ = NULL; } -LineBreak = " " Endline +LineBreak = " " NormalEndline { $$ = mk_element(LINEBREAK); } Symbol = < SpecialChar > markdown_parser.leg 98f54c734ee6bd00455622fb13b29f31769158fe John MacFarlane jgm@berkeley.edu http://github.com/jgm/peg-markdown/commit/c731b2d0feb5991b02a35c4637f003b7f1ed98f4 c731b2d0feb5991b02a35c4637f003b7f1ed98f4 2008-11-17T22:25:57-08:00 2008-11-17T22:25:57-08:00 Fixed parsing of markdown line breaks. Line breaks are now handled in the Endline parser. 7527f1cfe2dc7a2358edf1d2dd09180ada0d146e John MacFarlane jgm@berkeley.edu