[rkward-cvs] rkward/rkward rkward.xml,1.1,1.2

[Thomas Friedrichsmeier]

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

Modified Files:
	rkward.xml 
Log Message:
Deal better with multi-line strings

Index: rkward.xml
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rkward.xml	5 Apr 2006 07:44:04 -0000	1.1
--- rkward.xml	5 Apr 2006 12:29:56 -0000	1.2
***************
*** 36,40 ****
  	 <Detect2Chars attribute="Normal Text" context="ctx0" firstNonSpace="true" char="+" char1=" "/>
         </context>
!        <context attribute="Normal Text" lineEndContext="#pop" name="ctx0">
           <keyword attribute="Control Structure" context="#stay" String="controls"/>
           <keyword attribute="Reserved Words" context="#stay" String="words"/>
--- 36,43 ----
  	 <Detect2Chars attribute="Normal Text" context="ctx0" firstNonSpace="true" char="+" char1=" "/>
         </context>
!        <context attribute="Normal Text" lineEndContext="#stay" name="ctx0">
!          <!-- We pop at line starts manually. If we are in a String subcontext (ctx1), using lineEndContext="#pop" would still pop the
!                Normal Text (ctx0) parent context, which is not what we want. -->
!          <RegExpr attribute="Normal Text" context="#pop" String="^." lookAhead="true"/>
           <keyword attribute="Control Structure" context="#stay" String="controls"/>
           <keyword attribute="Reserved Words" context="#stay" String="words"/>
***************
*** 44,59 ****
           <Float attribute="Float" context="#stay"/>
           <Int attribute="Int" context="#stay"/>
-          <RegExpr attribute="Comment" context="#stay" String="#.*$"/>
           <AnyChar attribute="Operators" context="#stay" String="+-*/^:$~!&|=><@"/>
           <RegExpr attribute="Operators" context="#stay" String="%[a-zA-Z_]*%"/>
         </context>
!    
         <context attribute="String" lineEndContext="#stay" name="ctx1">
           <DetectChar attribute="String" context="#pop" char="""/>
           <HlCStringChar attribute="String Char" context="#stay"/>
         </context>
-    
      </contexts>
!     
      <itemDatas>
        <itemData name="Output" defStyleNum="dsOthers"/>
--- 47,63 ----
           <Float attribute="Float" context="#stay"/>
           <Int attribute="Int" context="#stay"/>
           <AnyChar attribute="Operators" context="#stay" String="+-*/^:$~!&|=><@"/>
           <RegExpr attribute="Operators" context="#stay" String="%[a-zA-Z_]*%"/>
+          <RegExpr attribute="Comment" context="#stay" String="#.*$"/>
         </context>
! 
         <context attribute="String" lineEndContext="#stay" name="ctx1">
+          <Detect2Chars attribute="Normal Text" context="#pop#pop" firstNonSpace="true" char=">" char1=" " lookAhead="true"/>
+          <Detect2Chars attribute="Normal Text" context="#stay" firstNonSpace="true" char="+" char1=" "/>
           <DetectChar attribute="String" context="#pop" char="""/>
           <HlCStringChar attribute="String Char" context="#stay"/>
         </context>
      </contexts>
! 
      <itemDatas>
        <itemData name="Output" defStyleNum="dsOthers"/>