[rkward-cvs] rkward/rkward rkward.xml,1.3,1.4

[Thomas Friedrichsmeier]

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

Modified Files:
	rkward.xml 
Log Message:
Changing hierarchy of contexts

Index: rkward.xml
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rkward.xml	12 Sep 2006 14:58:39 -0000	1.3
--- rkward.xml	12 Sep 2006 15:48:59 -0000	1.4
***************
*** 34,46 ****
  	
  	<contexts>
- 		<context attribute="Output" lineEndContext="#stay" name="ctx0">
- 			<Detect2Chars attribute="Normal Text" context="ctxnorm" firstNonSpace="true" char=">" char1=" "/>
- 			<Detect2Chars attribute="Normal Text" context="ctxnorm" firstNonSpace="true" char="+" char1=" "/>
- 		</context>
- 
  		<context attribute="Normal Text" lineEndContext="#stay" name="ctxnorm">
! 			<!-- We pop at line starts manually. If we are in a String subcontext (ctx1), using lineEndContext="#pop" would still pop the
! 				Normal Text (ctx0) parent context, which is not what we want. -->
! 			<RegExpr attribute="Normal Text" context="#pop" String="^." lookAhead="true"/>
  
  			<DetectChar attribute="String" context="string" char="""/>
--- 34,41 ----
  	
  	<contexts>
  		<context attribute="Normal Text" lineEndContext="#stay" name="ctxnorm">
! 			<RegExpr attribute="Normal Text" context="#stay" String="^> " lookAhead="false"/>
! 			<RegExpr attribute="Normal Text" context="#stay" String="^+ " lookAhead="false"/>
! 			<RegExpr attribute="Normal Text" context="output" String="^." lookAhead="true"/>
  
  			<DetectChar attribute="String" context="string" char="""/>
***************
*** 73,77 ****
  
  		<context attribute="In Parenthesis" lineEndContext="#stay" name="parenthesis">
! 			<Detect2Chars attribute="Normal Text" context="#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop" firstNonSpace="true" char=">" char1=" " lookAhead="true"/>
  			<Detect2Chars attribute="Normal Text" context="#stay" firstNonSpace="true" char="+" char1=" "/>
  			<LineContinue attribute="Boolean" context="#stay"/>
--- 68,72 ----
  
  		<context attribute="In Parenthesis" lineEndContext="#stay" name="parenthesis">
! 			<Detect2Chars attribute="Normal Text" context="#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop" firstNonSpace="true" char=">" char1=" " lookAhead="true"/>
  			<Detect2Chars attribute="Normal Text" context="#stay" firstNonSpace="true" char="+" char1=" "/>
  			<LineContinue attribute="Boolean" context="#stay"/>
***************
*** 115,118 ****
--- 110,116 ----
  		</context>
  
+ 		<context attribute="Output" lineEndContext="#stay" name="output">
+ 			<Detect2Chars attribute="Normal Text" context="#pop" lookAhead="true" firstNonSpace="true" char=">" char1=" "/>
+ 		</context>
  		<context attribute="Headline" lineEndContext="#pop" name="Headline"/>
  		<context attribute="Comment" lineEndContext="#pop" name="Comment"/>