[rkward-cvs] rkward/rkward r.xml, 1.10, 1.11 rkconsole.cpp, 1.29, 1.30
Thomas Friedrichsmeier
tfry at users.sourceforge.net
Tue Sep 12 12:32:50 UTC 2006
Update of /cvsroot/rkward/rkward/rkward
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12233
Modified Files:
r.xml rkconsole.cpp
Log Message:
Cosmetics only
Index: rkconsole.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkconsole.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** rkconsole.cpp 11 Sep 2006 09:52:40 -0000 1.29
--- rkconsole.cpp 12 Sep 2006 12:32:47 -0000 1.30
***************
*** 467,471 ****
}
! int RKConsole::currentCursorPosition(){
uint para=0; uint p=0;
view->cursorPosition (¶, &p);
--- 467,471 ----
}
! int RKConsole::currentCursorPosition (){
uint para=0; uint p=0;
view->cursorPosition (¶, &p);
***************
*** 473,477 ****
}
! bool RKConsole::hasSelectedText() {
RK_TRACE (APP);
return (selectionInterface (doc)->hasSelection ());
--- 473,477 ----
}
! bool RKConsole::hasSelectedText () {
RK_TRACE (APP);
return (selectionInterface (doc)->hasSelection ());
Index: r.xml
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/r.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** r.xml 10 Aug 2006 09:12:20 -0000 1.10
--- r.xml 12 Sep 2006 12:32:47 -0000 1.11
***************
*** 1,124 ****
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
! <!-- Kate 2.5 (KDE 3.5) highlighting module for R
! based on an earlier version by E.L. Willighagen.
! version 0.4: (c) 2006 Thomas Friedrichsmeier, Arne Henningsen, and the RKWard Team
! license: GPL v2
! Kate : http://kate.kde.org/
! 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">
! <highlighting>
! <list name="controls">
! <item> for </item>
! <item> in </item>
! <item> next </item>
! <item> break </item>
! <item> while </item>
! <item> repeat </item>
! <item> if </item>
! <item> else </item>
! <item> switch </item>
! <item> function </item>
! </list>
! <list name="words">
! <item> TRUE </item>
! <item> FALSE </item>
! <item> NULL </item>
! <item> NA </item>
! <item> Inf </item>
! <item> NaN </item>
! </list>
! <contexts>
! <context attribute="Normal Text" lineEndContext="#stay" name="ctx0">
! <DetectChar attribute="String" context="string" char="""/>
! <keyword attribute="Control Structure" context="#stay" String="controls"/>
! <keyword attribute="Reserved Words" context="#stay" String="words"/>
! <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="##"/>
! <DetectChar attribute="Comment" context="Comment" char="#"/>
! <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="%[^%]*%"/>
! <!-- for code folding (from Ben Goodrich) -->
! <DetectChar attribute="Symbol" context="ctx0" char="{" beginRegion="Brace1" name="FoldingStart" />
! <DetectChar attribute="Symbol" context="#pop" char="}" endRegion="Brace1" name="FoldingEnd" />
! </context>
! <context attribute="In Parenthesis" lineEndContext="#stay" name="parenthesis">
! <LineContinue attribute="Boolean" context="#stay"/>
! <DetectChar attribute="Keyword" context="#pop" char=")"/>
! <!-- The following are copied from the ctx0 context -->
! <DetectChar attribute="String" context="string" char="""/>
! <keyword attribute="Control Structure" context="#stay" String="controls"/>
! <keyword attribute="Reserved Words" context="#stay" String="words"/>
! <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="##"/>
! <DetectChar attribute="Comment" context="Comment" char="#"/>
! <RegExpr attribute="Assign" context="#stay" String="[<]{1,2}\-"/>
! <RegExpr attribute="Assign" context="#stay" String="\-[>]{1,2}"/>
! <!-- 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>
! <context attribute="String" lineEndContext="#stay" name="string">
! <DetectChar attribute="String" context="#pop" char="""/>
! <HlCStringChar attribute="String Char" context="#stay"/>
! </context>
! <context attribute="Headline" lineEndContext="#pop" name="Headline"/>
! <context attribute="Comment" lineEndContext="#pop" name="Comment"/>
! </contexts>
! <itemDatas>
! <!-- KDE default colors: http://accessibility.kde.org/oxygen.php?color=white -->
! <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"/>
! <itemData name="Int" defStyleNum="dsDecVal"/>
! </itemDatas>
! </highlighting>
! <general>
! <comments>
! <comment name="singleLine" start="#" end=""/>
! </comments>
! <keywords casesensitive="1" />
! </general>
</language>
--- 1,124 ----
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
! <!-- Kate 2.5 (KDE 3.5) highlighting module for R
! based on an earlier version by E.L. Willighagen.
! version 0.4: (c) 2006 Thomas Friedrichsmeier, Arne Henningsen, and the RKWard Team
! license: GPL v2
! Kate : http://kate.kde.org/
! 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">
! <highlighting>
! <list name="controls">
! <item> for </item>
! <item> in </item>
! <item> next </item>
! <item> break </item>
! <item> while </item>
! <item> repeat </item>
! <item> if </item>
! <item> else </item>
! <item> switch </item>
! <item> function </item>
! </list>
! <list name="words">
! <item> TRUE </item>
! <item> FALSE </item>
! <item> NULL </item>
! <item> NA </item>
! <item> Inf </item>
! <item> NaN </item>
! </list>
! <contexts>
! <context attribute="Normal Text" lineEndContext="#stay" name="ctx0">
! <DetectChar attribute="String" context="string" char="""/>
! <keyword attribute="Control Structure" context="#stay" String="controls"/>
! <keyword attribute="Reserved Words" context="#stay" String="words"/>
! <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="##"/>
! <DetectChar attribute="Comment" context="Comment" char="#"/>
! <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="%[^%]*%"/>
! <!-- for code folding (from Ben Goodrich) -->
! <DetectChar attribute="Symbol" context="ctx0" char="{" beginRegion="Brace1" name="FoldingStart" />
! <DetectChar attribute="Symbol" context="#pop" char="}" endRegion="Brace1" name="FoldingEnd" />
! </context>
! <context attribute="In Parenthesis" lineEndContext="#stay" name="parenthesis">
! <LineContinue attribute="Boolean" context="#stay"/>
! <DetectChar attribute="Keyword" context="#pop" char=")"/>
! <!-- The following are copied from the ctx0 context -->
! <DetectChar attribute="String" context="string" char="""/>
! <keyword attribute="Control Structure" context="#stay" String="controls"/>
! <keyword attribute="Reserved Words" context="#stay" String="words"/>
! <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="##"/>
! <DetectChar attribute="Comment" context="Comment" char="#"/>
! <RegExpr attribute="Assign" context="#stay" String="[<]{1,2}\-"/>
! <RegExpr attribute="Assign" context="#stay" String="\-[>]{1,2}"/>
! <!-- 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>
! <context attribute="String" lineEndContext="#stay" name="string">
! <DetectChar attribute="String" context="#pop" char="""/>
! <HlCStringChar attribute="String Char" context="#stay"/>
! </context>
! <context attribute="Headline" lineEndContext="#pop" name="Headline"/>
! <context attribute="Comment" lineEndContext="#pop" name="Comment"/>
! </contexts>
! <itemDatas>
! <!-- KDE default colors: http://accessibility.kde.org/oxygen.php?color=white -->
! <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"/>
! <itemData name="Int" defStyleNum="dsDecVal"/>
! </itemDatas>
! </highlighting>
! <general>
! <comments>
! <comment name="singleLine" start="#" end=""/>
! </comments>
! <keywords casesensitive="1" />
! </general>
</language>
More information about the rkward-tracker
mailing list