~ser/rml commit - sourcehut hg

2 files changed, 5 insertions(+), 6 deletions(-)

M markup.txt
M parser.rb

M markup.txt +1 -2

@@ 2,6 2,7 @@ 
 Markup
 #################
 
+.. :index:
 
 Headers
 =================

          
@@ 538,5 539,3 @@ Predefined directives also begin with a 
 
 
 .. :glossary:
-
-.. :index:

M parser.rb +4 -4

@@ 410,10 410,10 @@ module RML
 		Footnote    = %r%\{(\d+|#)( +.*?)?\}\B%m
 
 		OLIST     = '(?:#|[0-9]+|[A-Za-z])\.'
-		LINE      = %r%(?:(?![ \t]*(?:[*-]|(?:#{OLIST})|\[[_X]\])[ \t])[^\n]+\n)%
+		LINE      = %r%(?![ \t]*(?:[*-]|(?:#{OLIST})|\[[_X]\])[ \t])[^\n]+\n%
 
-		RULES     = %r%(####+|\-\-\-\-+|~~~~+|\+\+\+\++|\^\^\^\^+|====+)%
-		PbHeading = %r%\A(([ \t]*)#{RULES})\n(\2[ \t]*)(#{LINE})\1[ \t]*\n%m
+		RULES     = %r%####+|\-\-\-\-+|~~~~+|\+\+\+\++|\^\^\^\^+|====+%
+		PbHeading = %r%\A(([ \t]*)(#{RULES}))\n(\2[ \t]*)(#{LINE})\1[ \t]*\n%m
 		HEAD      = %r%([ \t]*)(#{LINE})([ \t]*)(#{RULES})[ \t]*%m
 		NHeading  = %r%\A([ \t]*)(([0-9]+|#)\.[ \t])#{HEAD}\n%m
 		Heading   = %r%\A#{HEAD}\n%m

          
@@ 435,7 435,7 @@ module RML
 		Quote     = %r%\A(#{ATTRIBUTION})?(#{QUOTE}+)%m
 		Comment   = %r%\A#([ \t]+.*)\n%
 
-		Definition  = %r%\A(?![ \t#{RULES}])(#{LINE})([ \t]+)(#{LINE}(?:\2#{LINE})*)%m
+		Definition  = %r%\A(?![ \t]|#{RULES})(#{LINE})([ \t]+)(#{LINE}(?:\2#{LINE})*)%m
 
 		# Justification requires post-processing interpretation
 		# Sidebar requires post-processing interpretation