[rkward-cvs] rkward/rkward rkward.xml,1.5,1.6

[Thomas Friedrichsmeier]

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

Modified Files:
	rkward.xml 
Log Message:
Some corrections to console highlighting and allow folding of commands and output

Index: rkward.xml
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rkward.xml	12 Sep 2006 16:37:40 -0000	1.5
--- rkward.xml	13 Sep 2006 21:08:18 -0000	1.6
***************
*** 35,46 ****
  	<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"/>
  
  			<IncludeRules context="CommonRules"/>
  		</context>
  
! 		<context attribute="In Parenthesis" lineEndContext="#stay" name="parenthesis">
  			<IncludeRules context="CommandContinuationCheck"/>
  			<LineContinue attribute="Boolean" context="#stay"/>
--- 35,46 ----
  	<contexts>
  		<context attribute="Normal Text" lineEndContext="#stay" name="ctxnorm">
! 			<RegExpr attribute="LineStart" context="#stay" String="^> "/>
! 			<RegExpr attribute="LineStart" context="#stay" String="^\+ "/>
! 			<RegExpr attribute="Normal Text" context="output" String="^([^>\+]|$)" lookAhead="true" endRegion="command" beginRegion="output"/>
  
  			<IncludeRules context="CommonRules"/>
  		</context>
  
! 		<context attribute="Normal Text" lineEndContext="#stay" name="parenthesis">
  			<IncludeRules context="CommandContinuationCheck"/>
  			<LineContinue attribute="Boolean" context="#stay"/>
***************
*** 60,64 ****
  		
  		<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"/>
--- 60,64 ----
  		
  		<context attribute="Output" lineEndContext="#stay" name="output">
! 			<Detect2Chars attribute="LineStart" context="#pop" lookAhead="true" firstNonSpace="true" char=">" char1=" " endRegion="output" beginRegion="command"/>
  		</context>
  		<context attribute="Headline" lineEndContext="#pop" name="Headline"/>
***************
*** 67,76 ****
  		<!-- 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">
! 			<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=" "/>
  		</context>
  
  		<!-- This context is not really used, but contains the common rules -->
! 		<context name="CommonRules">
  			<DetectChar attribute="String" context="string" char="""/>
  			<keyword attribute="Control Structure" context="#stay" String="controls"/>
--- 67,76 ----
  		<!-- 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" 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>
  
  		<!-- This context is not really used, but contains the common rules -->
! 		<context attribute="Normal Text" name="CommonRules">
  			<DetectChar attribute="String" context="string" char="""/>
  			<keyword attribute="Control Structure" context="#stay" String="controls"/>
***************
*** 107,110 ****
--- 107,111 ----
  		<!-- KDE default colors: http://accessibility.kde.org/oxygen.php?color=white -->
  		<itemData name="Normal Text" defStyleNum="dsNormal"/>
+ 		<itemData name="LineStart" defStyleNum="dsNormal"/>
  		<itemData name="Keyword" defStyleNum="dsKeyword"/>
  		<itemData name="Identifier" defStyleNum="dsDataType"/>