[rkward-cvs] rkward/rkward rkward.xml,1.10,1.11

[Thomas Friedrichsmeier]

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

Modified Files:
	rkward.xml 
Log Message:
finally some cosmetics and comments

Index: rkward.xml
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** rkward.xml	14 Sep 2006 09:03:28 -0000	1.10
--- rkward.xml	14 Sep 2006 09:09:44 -0000	1.11
***************
*** 35,43 ****
  	<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"/>
--- 35,49 ----
  	<contexts>
  		<!-- This context dispatches to the two main contexts output or command -->
! 		<context attribute="Prompt" lineEndContext="#stay" name="ctxbase">
! 			<RegExpr attribute="Prompt" context="command" String="^> " beginRegion="command"/>
  			<RegExpr attribute="Normal Text" context="output" String="^([^>\+]|$)" lookAhead="true"/>
  		</context>
  
+ 		<!-- The output context does no highlighting. If a "> " is encountered at line start, pop back to ctxbase (and to command from there) --> 
+ 		<context attribute="Output" lineEndContext="#stay" name="output">
+ 			<RegExpr attribute="Prompt" context="#pop" String="^> " lookAhead="true" endRegion="command"/>
+ 		</context>
+ 
+ 		<!-- The base context in command mode -->
  		<context attribute="Normal Text" lineEndContext="#stay" name="command">
  			<IncludeRules context="CommandContinuationCheck"/>
***************
*** 60,67 ****
  		</context>
  
- 		
- 		<context attribute="Output" lineEndContext="#stay" name="output">
- 			<RegExpr attribute="LineStart" context="#pop" String="^> " lookAhead="true" endRegion="command"/>
- 		</context>
  		<context attribute="Headline" lineEndContext="#pop" name="Headline"/>
  		<context attribute="Comment" lineEndContext="#pop" name="Comment"/>
--- 66,69 ----
***************
*** 69,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">
  			<!-- This should pop us back into ctxbase, which will then most likely take us to output -->
- 			<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"/>
  			<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"/>
! 			<RegExpr attribute="LineStart" context="#stay" String="^\+ "/>
  		</context>
  
--- 71,79 ----
  		<!-- 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">
+ 			<!-- This should pop us back into ctxbase, which will then take us to the next command -->
+ 			<RegExpr attribute="Prompt" 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="Normal Text" context="#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop#pop" String="^([^\+]|$)" lookAhead="true"/>
! 			<RegExpr attribute="Prompt" context="#stay" String="^\+ "/>
  		</context>
  
***************
*** 104,108 ****
  			<RegExpr attribute="Operator" context="#stay" String="%[^%]*%"/>
  		</context>
- 
  	</contexts>
  
--- 107,110 ----
***************
*** 111,115 ****
  		<!-- 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"/>
--- 113,117 ----
  		<!-- KDE default colors: http://accessibility.kde.org/oxygen.php?color=white -->
  		<itemData name="Normal Text" defStyleNum="dsNormal"/>
! 		<itemData name="Prompt" defStyleNum="dsNormal"/>
  		<itemData name="Keyword" defStyleNum="dsKeyword"/>
  		<itemData name="Identifier" defStyleNum="dsDataType"/>
***************
*** 125,129 ****
  		<itemData name="Float" defStyleNum="dsFloat"/>
  		<itemData name="Int" defStyleNum="dsDecVal"/>
- 		<itemData name="Test" defStyleNum="dsAlert"/>
  	</itemDatas>
  </highlighting>
--- 127,130 ----