[rkward-cvs] SF.net SVN: rkward: [774] trunk/rkward/rkward/syntax

[tfry at users.sourceforge.net]

Revision: 774
          http://svn.sourceforge.net/rkward/?rev=774&view=rev
Author:   tfry
Date:     2006-09-28 04:16:20 -0700 (Thu, 28 Sep 2006)

Log Message:
-----------
Fix r.xml and rkward.xml to validate against language.dtd. r.xml is as accepted into KDE SVN

Modified Paths:
--------------
    trunk/rkward/rkward/syntax/r.xml
    trunk/rkward/rkward/syntax/rkward.xml

Modified: trunk/rkward/rkward/syntax/r.xml
===================================================================
--- trunk/rkward/rkward/syntax/r.xml	2006-09-28 08:09:39 UTC (rev 773)
+++ trunk/rkward/rkward/syntax/r.xml	2006-09-28 11:16:20 UTC (rev 774)
@@ -8,8 +8,7 @@
 	R      : http://www.r-project.org/
 	RKWard : http://rkward.sourceforge.net/
 	-->
-<language version="2.0" kateversion="2.5" name="R Script" section="Scripts"
-extensions="*.R;*.r;*.S;*.s;*.q" mimetype="" license="GPL">
+<language version="2.00" kateversion="2.5" name="R Script" section="Scripts" extensions="*.R;*.r;*.S;*.s;*.q" mimetype="" license="GPL">
 <highlighting>
 
 	<list name="controls">
@@ -45,7 +44,7 @@
 		<context attribute="Normal Text" lineEndContext="#stay" name="ctx0">
 			<IncludeRules context="CommonRules"/>
 
-			<DetectChar attribute="Symbol" context="#pop" char="}" endRegion="Brace1" name="FoldingEnd" />
+			<DetectChar attribute="Symbol" context="#pop" char="}" endRegion="Brace1" />
 			<DetectChar attribute="Error" context="#stay" char=")"/>
 		</context>
 
@@ -68,7 +67,7 @@
 		<context attribute="Comment" lineEndContext="#pop" name="Comment"/>
 
 		<!-- This context is not really used, but contains the common rules -->
-		<context name="CommonRules">
+		<context name="CommonRules" lineEndContext="#stay" attribute="Normal Text" >
 			<DetectChar attribute="String" context="string" char="""/>
 			<keyword attribute="Control Structure" context="#stay" String="controls"/>
 			<keyword attribute="Reserved Words" context="#stay" String="words"/>
@@ -96,7 +95,7 @@
 			<RegExpr attribute="Error" context="#stay" String="(\+|\-|\*|/|<=|>=|={1,2}|\!=|\|{1,2}|&{1,2}|:{1,2}|\^|@|\$|~){2,}"/>	
 			<RegExpr attribute="Operator" context="#stay" String="%[^%]*%"/>
 			
-			<DetectChar attribute="Symbol" context="ctx0" char="{" beginRegion="Brace1" name="FoldingStart" />
+			<DetectChar attribute="Symbol" context="ctx0" char="{" beginRegion="Brace1" />
 		</context>
 	</contexts>
 

Modified: trunk/rkward/rkward/syntax/rkward.xml
===================================================================
--- trunk/rkward/rkward/syntax/rkward.xml	2006-09-28 08:09:39 UTC (rev 773)
+++ trunk/rkward/rkward/syntax/rkward.xml	2006-09-28 11:16:20 UTC (rev 774)
@@ -80,7 +80,7 @@
 		<context attribute="Comment" lineEndContext="#pop" name="Comment"/>
 
 		<!-- 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">
+		<context attribute="Normal Text" name="CommandContinuationCheck" lineEndContext="#stay">
 			<!-- Since this rule is included in every (relevant) context, this will unwind the entire context stack back to ctxbase. -->
 			<RegExpr attribute="Prompt" context="#pop" String="^> " lookAhead="true" endRegion="commandRegion"/>
 			<!-- See above -->
@@ -89,7 +89,7 @@
 		</context>
 
 		<!-- This context is not really used, but contains the common rules -->
-		<context attribute="Normal Text" name="CommonRules">
+		<context attribute="Normal Text" name="CommonRules" lineEndContext="#stay">
 			<DetectChar attribute="String" context="string" char="""/>
 			<keyword attribute="Control Structure" context="#stay" String="controls"/>
 			<keyword attribute="Reserved Words" context="#stay" String="words"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.