From ec7dbffb15a99faa6c366a049ed3fdf919a51aaf Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Wed, 22 Sep 2010 22:07:51 +0200 Subject: fixed literal blocks --- rst_parser.lua | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'rst_parser.lua') diff --git a/rst_parser.lua b/rst_parser.lua index bbe1f15..23aa042 100644 --- a/rst_parser.lua +++ b/rst_parser.lua @@ -127,13 +127,13 @@ local parser = P{ block = V"explicit_markup" + V"target_block" + + V"literal_block" + Cs(V"list") / rst.escape + Cs(V"line_block") / rst.escape + Cs(V"table_block") / rst.escape + V"transition" --/ rst.escape + V"comment_block" + Cs(V"section") / rst.escape - + V"literal_block" + Cs(V"block_quote") / rst.escape + Cs(V"paragraph") / rst.escape , @@ -609,12 +609,8 @@ local parser = P{ -- Literal blocks -------------------------------------------------------------------------------- - literal_block = V"unquoted_literal_block" - + V"quoted_literal_block", - literal_block = V"literal_block_marker" - * Cs(V"literal_block_lines" - * (V"blank_line"^1 * V"literal_block_lines")^0) + * Cs(V"literal_block_lines") * V"end_block" / rst.literal_block, @@ -624,12 +620,12 @@ local parser = P{ + V"quoted_literal_block_lines", unquoted_literal_block_lines = V"literal_block_first" - * (V"literal_block_other" - - V"blank_line")^0, + * (V"blank_line"^-1 * V"literal_block_other")^0 + , quoted_literal_block_lines = V"quoted_literal_block_first" - * (V"quoted_literal_block_other" - - V"blank_line")^0, + * (V"blank_line"^-1 * V"quoted_literal_block_other")^0 + , literal_block_first = Cmt(V"space"^1, function (s, i, indent) warn("lbk-f", #indent, "", "", i) -- cgit v1.2.3