From 9b03c9f4a0b2fe7401baaf0b0191ecdf95c0c437 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <pgesang@ix.urz.uni-heidelberg.de>
Date: Fri, 17 Sep 2010 11:12:15 +0200
Subject: using fancybreaks module for transitions. fixed section/transition
 matching (hope so).

---
 rst_parser.lua | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'rst_parser.lua')

diff --git a/rst_parser.lua b/rst_parser.lua
index a83209a..b17e2fd 100644
--- a/rst_parser.lua
+++ b/rst_parser.lua
@@ -129,8 +129,8 @@ local parser = P{
           + Cs(V"list")        / rst.escape
           + Cs(V"line_block")  / rst.escape
           + Cs(V"table_block") / rst.escape
+          + V"transition"    --/ rst.escape
           + Cs(V"section")     / rst.escape
-          + Cs(V"transition")  --/ rst.escape
           + V"literal_block"
           + Cs(V"block_quote") / rst.escape
           + V"comment_block"
@@ -928,10 +928,10 @@ local parser = P{
 
     transition_line = C(V"adornment_char"^4),
 
-    transition = V"eol"^0
-               * V"transition_line"
+    transition = V"transition_line" * V"eol"
                * V"end_block"
-               /rst.transition,
+               / rst.transition
+               ,
 
 --------------------------------------------------------------------------------
 -- Sectioning
@@ -1299,6 +1299,8 @@ local function get_setups ()
 %{                           Setups                            }%
 %~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% General                                                       %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \setupcolors[state=start]
 \setupinteraction[state=start,focus=standard,color=darkgreen,contrastcolor=darkgreen]
@@ -1306,6 +1308,12 @@ local function get_setups ()
 \sethyphenatedurlnormal{:=?&}
 \sethyphenatedurlbefore{?&}
 \sethyphenatedurlafter {:=/-}
+
+\doifundefined{startparagraph}{% -->mkii
+  \let\startparagraph\relax
+  \let\stopparagraph\endgraf
+}
+
 ]]
 
     for item, _ in next, state.addme do
-- 
cgit v1.2.3