[rkward-cvs] rkward/rkward rkward.xml,1.8,1.9

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2983

Modified Files:
	rkward.xml 
Log Message:
Fix detection of begin/end of command blocks

Index: rkward.xml
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** rkward.xml	13 Sep 2006 21:18:23 -0000	1.8
--- rkward.xml	14 Sep 2006 08:48:06 -0000	1.9
***************
*** 34,42 ****
  	
  	<contexts>
! 		<context attribute="Normal Text" lineEndContext="#stay" name="ctxnorm">
! 			<RegExpr attribute="LineStart" context="#stay" String="^> " beginRegion="command" endRegion="command"/>
! 			<RegExpr attribute="LineStart" context="#stay" String="^\+ "/>
  			<RegExpr attribute="Normal Text" context="output" String="^([^>\+]|$)" lookAhead="true"/>
  
  			<IncludeRules context="CommonRules"/>
  		</context>
--- 34,45 ----
  	
  	<contexts>
! 		<!-- This context dispatches to the two main contexts output or command -->
! 		<context attribute="LineStart" lineEndContext="#stay" name="ctxbase">
! 			<RegExpr attribute="LineStart" context="command" String="^> " beginRegion="command"/>
  			<RegExpr attribute="Normal Text" context="output" String="^([^>\+]|$)" lookAhead="true"/>
+ 		</context>
  
+ 		<context attribute="Normal Text" lineEndContext="#stay" name="command">
+ 			<IncludeRules context="CommandContinuationCheck"/>
  			<IncludeRules context="CommonRules"/>
  		</context>
***************
*** 59,63 ****
  		
  		<context attribute="Output" lineEndContext="#stay" name="output">
! 			<Detect2Chars attribute="LineStart" context="#pop" lookAhead="true" firstNonSpace="true" char=">" char1=" "/>
  		</context>
  		<context attribute="Headline" lineEndContext="#pop" name="Headline"/>
--- 62,66 ----
  		
  		<context attribute="Output" lineEndContext="#stay" name="output">
! 			<RegExpr attribute="LineStart" context="#pop" String="^> " lookAhead="true"/>
  		</context>
  		<context attribute="Headline" lineEndContext="#pop" name="Headline"/>
***************
*** 66,70 ****
  		<!-- This context is not really used, but meant to be included. It checks whether a new line is a continuation of a command. If so, it eats the "+ " at the line start. Else it tries to pop back to the top level -->
  		<context attribute="Normal Text" name="CommandContinuationCheck">
! 			<RegExpr attribute="Normal Text" context="#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop" String="^([^\+]|$)" lookAhead="true"/>		<!-- This should pop us back into ctxnorm, which will then most likely take us to output -->
  			<RegExpr attribute="LineStart" context="#stay" String="^\+ "/>
  		</context>
--- 69,73 ----
  		<!-- This context is not really used, but meant to be included. It checks whether a new line is a continuation of a command. If so, it eats the "+ " at the line start. Else it tries to pop back to the top level -->
  		<context attribute="Normal Text" name="CommandContinuationCheck">
! 			<RegExpr attribute="Normal Text" context="#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop" String="^([^\+]|$)" lookAhead="true" endRegion="command"/>		<!-- This should pop us back into ctxbase, which will then most likely take us to output -->
  			<RegExpr attribute="LineStart" context="#stay" String="^\+ "/>
  		</context>
***************
*** 120,123 ****
--- 123,127 ----
  		<itemData name="Float" defStyleNum="dsFloat"/>
  		<itemData name="Int" defStyleNum="dsDecVal"/>
+ 		<itemData name="Test" defStyleNum="dsAlert"/>
  	</itemDatas>
  </highlighting>