[rkward-cvs] rkward/rkward r.xml,1.11,1.12

[Thomas Friedrichsmeier]

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

Modified Files:
	r.xml 
Log Message:
More cosmetics

Index: r.xml
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/r.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** r.xml	12 Sep 2006 12:32:47 -0000	1.11
--- r.xml	12 Sep 2006 12:34:07 -0000	1.12
***************
*** 41,46 ****
  			<Float attribute="Float" context="#stay"/>
  			<Int attribute="Int" context="#stay"/>
! 		<RegExpr attribute="Error" context="#stay" String="[+\-*]="/>
! 		<RegExpr attribute="Error" context="#stay" String="=[+\-*]"/>
  			<RegExpr attribute="Keyword" context="#stay" String="[a-zA-Z_]+[a-zA-Z_\.0-9]*(?=[\s]*[(])"/>
  			<RegExpr attribute="Keyword" context="#stay" String="\.[a-zA-Z_\.]+[a-zA-Z_\.0-9]*(?=[\s]*[(])"/>
--- 41,46 ----
  			<Float attribute="Float" context="#stay"/>
  			<Int attribute="Int" context="#stay"/>
! 			<RegExpr attribute="Error" context="#stay" String="[+\-*]="/>
! 			<RegExpr attribute="Error" context="#stay" String="=[+\-*]"/>
  			<RegExpr attribute="Keyword" context="#stay" String="[a-zA-Z_]+[a-zA-Z_\.0-9]*(?=[\s]*[(])"/>
  			<RegExpr attribute="Keyword" context="#stay" String="\.[a-zA-Z_\.]+[a-zA-Z_\.0-9]*(?=[\s]*[(])"/>
***************
*** 50,54 ****
  			<RegExpr attribute="Assign" context="#stay" String="[<]{1,2}\-"/>
  			<RegExpr attribute="Assign" context="#stay" String="\-[>]{1,2}"/>
! 		<RegExpr attribute="Assign" context="#stay" String="[^=!><+\-*]=[^=!><+\-*]"/>
  			<AnyChar attribute="Operator" context="#stay" String="+-*/^:$~!&|=><@"/>
  			<RegExpr attribute="Operator" context="#stay" String="%[^%]*%"/>
--- 50,54 ----
  			<RegExpr attribute="Assign" context="#stay" String="[<]{1,2}\-"/>
  			<RegExpr attribute="Assign" context="#stay" String="\-[>]{1,2}"/>
! 			<RegExpr attribute="Assign" context="#stay" String="[^=!><+\-*]=[^=!><+\-*]"/>
  			<AnyChar attribute="Operator" context="#stay" String="+-*/^:$~!&|=><@"/>
  			<RegExpr attribute="Operator" context="#stay" String="%[^%]*%"/>
***************
*** 68,75 ****
  			<Float attribute="Float" context="#stay"/>
  			<Int attribute="Int" context="#stay"/>
! 		<RegExpr attribute="Error" context="#stay" String="[+\-*]="/>
! 		<RegExpr attribute="Error" context="#stay" String="=[+\-*]"/>
! 		<RegExpr attribute="Keyword" context="#stay" String="[a-zA-Z_]+[a-zA-Z_\.0-9]*(?=[\s]*[(])"/>
! 		<RegExpr attribute="Keyword" context="#stay" String="\.[a-zA-Z_\.]+[a-zA-Z_\.0-9]*(?=[\s]*[(])"/>
  			<RegExpr attribute="Keyword" context="parenthesis" String="\("/>
  			<StringDetect attribute="Headline" context="Headline" String="##"/>
--- 68,75 ----
  			<Float attribute="Float" context="#stay"/>
  			<Int attribute="Int" context="#stay"/>
! 			<RegExpr attribute="Error" context="#stay" String="[+\-*]="/>
! 			<RegExpr attribute="Error" context="#stay" String="=[+\-*]"/>
! 			<RegExpr attribute="Keyword" context="#stay" String="[a-zA-Z_]+[a-zA-Z_\.0-9]*(?=[\s]*[(])"/>
! 			<RegExpr attribute="Keyword" context="#stay" String="\.[a-zA-Z_\.]+[a-zA-Z_\.0-9]*(?=[\s]*[(])"/>
  			<RegExpr attribute="Keyword" context="parenthesis" String="\("/>
  			<StringDetect attribute="Headline" context="Headline" String="##"/>
***************
*** 79,88 ****
  			<!-- no traditional assignment with "=" inside parentheses! See "Identifier below" -->
  			<AnyChar attribute="Operator" context="#stay" String="+-*/^:$~!&|=><@"/>
! 		<RegExpr attribute="Operator" context="#stay" String="%[^%]*%"/>
  			<!--  for code folding (from Ben Goodrich) -->
  			<DetectChar attribute="Symbol" context="ctx0" char="{" beginRegion="Brace1" name="FoldingStart" />
  			<!-- no need to define brace end here, as we've already jumped to ctx0 at the brace start -->
  
! 		<RegExpr attribute="Identifier" context="#stay" String="[a-zA-Z_\.][0-9a-zA-Z_\.]*[\s]*=(?=[^=])"/>
  		</context>
  
--- 79,88 ----
  			<!-- no traditional assignment with "=" inside parentheses! See "Identifier below" -->
  			<AnyChar attribute="Operator" context="#stay" String="+-*/^:$~!&|=><@"/>
! 			<RegExpr attribute="Operator" context="#stay" String="%[^%]*%"/>
  			<!--  for code folding (from Ben Goodrich) -->
  			<DetectChar attribute="Symbol" context="ctx0" char="{" beginRegion="Brace1" name="FoldingStart" />
  			<!-- no need to define brace end here, as we've already jumped to ctx0 at the brace start -->
  
! 			<RegExpr attribute="Identifier" context="#stay" String="[a-zA-Z_\.][0-9a-zA-Z_\.]*[\s]*=(?=[^=])"/>
  		</context>
  
***************
*** 101,113 ****
  		<itemData name="Normal Text" defStyleNum="dsNormal"/>
  		<itemData name="Keyword" defStyleNum="dsKeyword"/>
! 	<itemData name="Identifier" defStyleNum="dsDataType"/>
  		<itemData name="String" defStyleNum="dsString"/>
! 	<itemData name="Headline" defStyleNum="dsNormal" color="#b00000" selColor="#b00000" bold="1" italic="0"/> <!-- KDE default color: text 5 -->
  		<itemData name="Comment" defStyleNum="dsComment"/>
! 	<itemData name="Assign" defStyleNum="dsNormal" color="#336366" selColor="#cc9c099" bold="1" italic="0"/> <!-- KDE default color: text 7 -->
! 	<itemData name="Control Structure" defStyleNum="dsNormal" color="#0000bf" selColor="#bfbf00"/> <!-- KDE default color: text 2 -->
  		<itemData name="Reserved Words" defStyleNum="dsOthers"/>
  		<itemData name="Error" defStyleNum="dsError"/>
! 	<itemData name="Operator" defStyleNum="dsNormal"  color="#803f00" selColor="#000077" bold="0" italic="0"/> <!-- KDE default color: focussed text -->
  		<itemData name="String Char"  defStyleNum="dsChar"/>
  		<itemData name="Float" defStyleNum="dsFloat"/>
--- 101,113 ----
  		<itemData name="Normal Text" defStyleNum="dsNormal"/>
  		<itemData name="Keyword" defStyleNum="dsKeyword"/>
! 		<itemData name="Identifier" defStyleNum="dsDataType"/>
  		<itemData name="String" defStyleNum="dsString"/>
! 		<itemData name="Headline" defStyleNum="dsNormal" color="#b00000" selColor="#b00000" bold="1" italic="0"/> <!-- KDE default color: text 5 -->
  		<itemData name="Comment" defStyleNum="dsComment"/>
! 		<itemData name="Assign" defStyleNum="dsNormal" color="#336366" selColor="#cc9c099" bold="1" italic="0"/> <!-- KDE default color: text 7 -->
! 		<itemData name="Control Structure" defStyleNum="dsNormal" color="#0000bf" selColor="#bfbf00"/> <!-- KDE default color: text 2 -->
  		<itemData name="Reserved Words" defStyleNum="dsOthers"/>
  		<itemData name="Error" defStyleNum="dsError"/>
! 		<itemData name="Operator" defStyleNum="dsNormal"  color="#803f00" selColor="#000077" bold="0" italic="0"/> <!-- KDE default color: focussed text -->
  		<itemData name="String Char"  defStyleNum="dsChar"/>
  		<itemData name="Float" defStyleNum="dsFloat"/>