[clr-ci] SF.net SVN: colorer:[1886] trunk/schemes

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 1886
          http://colorer.svn.sourceforge.net/colorer/?rev=1886&view=rev
Author:   ctapmex
Date:     2012-11-15 09:46:12 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
fix regions and escape %

Modified Paths:
--------------
    trunk/schemes/hrc/changelog
    trunk/schemes/hrc/hrc/CHANGELOG
    trunk/schemes/hrc/hrc/inet/html-css.hrc
    trunk/schemes/hrc/hrc/rare/cobolfr.hrc
    trunk/schemes/hrc/hrc/rare/llvm.hrc
    trunk/schemes/hrc/hrc/rare/pl1.hrc
    trunk/schemes/hrd/hrd/catalog-console.xml

Modified: trunk/schemes/hrc/changelog
===================================================================

--- trunk/schemes/hrc/changelog	2012-11-15 09:11:20 UTC (rev 1885)
+++ trunk/schemes/hrc/changelog	2012-11-15 09:46:12 UTC (rev 1886)
@@ -1,9 +1,16 @@
 $Revision$
         $Author$ $Date$
+        - в pl1.hrc исправлены ошибки неэкранированного %
+	- в llvm.hrc добавлен пропущенный регион
+	- в html-css.hrc добавлен пропущенный регион
+	- в cobolfr.hrc добавлен пропущенный регион
+
+#Revision: 1875
+        #Author: ctapmex Date: 2012-10-08 11:57:44 +0600 (Пн, 08 окт 2012) $
         - слито с branches/lazyeugene
 				
-№Revision: 1865
-        №Author: ctapmex Date: 2012-06-16 21:00:20 +0600 (Сб, 16 июн 2012)
+#Revision: 1865
+        #Author: ctapmex Date: 2012-06-16 21:00:20 +0600 (Сб, 16 июн 2012)
         - graphviz - updated for Graphviz 2.28 (Roman Kuzmin)
         - json (Aliaksei Chapyzhenka)
         - LLVM IR (Aliaksei Chapyzhenka)
Modified: trunk/schemes/hrc/hrc/CHANGELOG
===================================================================
--- trunk/schemes/hrc/hrc/CHANGELOG	2012-11-15 09:11:20 UTC (rev 1885)
+++ trunk/schemes/hrc/hrc/CHANGELOG	2012-11-15 09:46:12 UTC (rev 1886)
@@ -1,3 +1,8 @@
+2012-15-11
+  Fixed:
+    - pl1 - fix not escaped %
+    - llvm, html-css, cobolfr - Added missing regions
+
 2012-10-08 r1876 (FarColorer 1.0.3.12)
   New:
     - powershell (Roman Kuzmin)

Modified: trunk/schemes/hrc/hrc/inet/html-css.hrc
===================================================================
--- trunk/schemes/hrc/hrc/inet/html-css.hrc	2012-11-15 09:11:20 UTC (rev 1885)
+++ trunk/schemes/hrc/hrc/inet/html-css.hrc	2012-11-15 09:46:12 UTC (rev 1886)
@@ -39,6 +39,7 @@
 
 <type name="html-css">
 
+<region name="msie" parent="def:DeprecatedKeyword"/>
 <region name="PropertyValue" parent="def:Parameter"/>
 
 <scheme name="PropertyNames"> 

Modified: trunk/schemes/hrc/hrc/rare/cobolfr.hrc
===================================================================
--- trunk/schemes/hrc/hrc/rare/cobolfr.hrc	2012-11-15 09:11:20 UTC (rev 1885)
+++ trunk/schemes/hrc/hrc/rare/cobolfr.hrc	2012-11-15 09:46:12 UTC (rev 1886)
@@ -30,6 +30,7 @@
       <region name="Exec"      parent="def:StringEdge"/>
       <region name="Number"    parent="def:Number"/>
       <region name="String"    parent="def:String"/>
+      <region name="Ident"     parent="def:Text"/>
 
       <region name="start" parent="def:PairStart"/>
       <region name="end"   parent="def:PairEnd"/>

Modified: trunk/schemes/hrc/hrc/rare/llvm.hrc
===================================================================
--- trunk/schemes/hrc/hrc/rare/llvm.hrc	2012-11-15 09:11:20 UTC (rev 1885)
+++ trunk/schemes/hrc/hrc/rare/llvm.hrc	2012-11-15 09:46:12 UTC (rev 1886)
@@ -23,7 +23,8 @@
     <region name="llvmNumBin"    parent="NumberBin"/>
     <region name="llvmNumHex"    parent="NumberHex"/>
     <region name="llvmNumDec"    parent="NumberDec"/>
-    <region name="llvmNumOct"    parent="NumberOct"/>
+    <region name="llvmNumOct"    parent="NumberOct"/> 
+    <region name="LabelOutline"  parent="Outlined"/>
 
     <scheme name="llvm">
       <!-- labels -->

Modified: trunk/schemes/hrc/hrc/rare/pl1.hrc
===================================================================
--- trunk/schemes/hrc/hrc/rare/pl1.hrc	2012-11-15 09:11:20 UTC (rev 1885)
+++ trunk/schemes/hrc/hrc/rare/pl1.hrc	2012-11-15 09:46:12 UTC (rev 1886)
@@ -71,7 +71,7 @@
          <!-- Strings -->
          <block start="/(?{start}(\x22|\'))/" end="/(?{end}\Y1)/" scheme="def:empty" region="String"/>
          <!-- %-directives -->
-         <regexp match="/%\s*(INCLUDE|LINE|NOPRINT|NOTE|PAGE|POP|PRINT|PUSH|SKIP)%b2;/i" region0="Prepro"/>
+         <regexp match="/\%\s*(INCLUDE|LINE|NOPRINT|NOTE|PAGE|POP|PRINT|PUSH|SKIP)%b2;/i" region0="Prepro"/>
          <!-- Symbols -->
          <keywords region="Symbol">
             <symb name="="/>
@@ -100,25 +100,25 @@
       <scheme name="prepro">
          <inherit scheme="common"/>
          <!-- Special preprocessor comments -->
-         <block start="/^.\s*(?{start}(%\s*IF\s+0(?:\s*=\s*1)?\s+%?\s*THEN\s+%?\s*DO)(;)?)%b2;/i"
-                end="/^.\s*(?{end}%\s*END)%b2;/i"
+         <block start="/^.\s*(?{start}(\%\s*IF\s+0(?:\s*=\s*1)?\s+\%?\s*THEN\s+\%?\s*DO)(;)?)%b2;/i"
+                end="/^.\s*(?{end}\%\s*END)%b2;/i"
                 scheme="def:empty" region="Comment" region01="Prepro" region02="Semicolon" region10="Prepro"/>
          <!-- %comment -->
-         <regexp match="/%b1;(%)(\s*\/\*)?=/" region1="Prepro"/>
+         <regexp match="/%b1;(\%)(\s*\/\*)?=/" region1="Prepro"/>
          <!-- %assignment statement -->
-         <regexp match="/%b1;(%)(\s*%ident;\s*=)?=/" region1="Prepro"/>
+         <regexp match="/%b1;(\%)(\s*%ident;\s*=)?=/" region1="Prepro"/>
          <!-- Statements with labels -->
-         <regexp match="/(%)\s*(?:%label1;)?(DEACT(?:IVATE)?|IF|NOTE|REPLACE)%b2;/i" region1="Prepro" region2="Prepro"/>
-         <regexp match="/(%)\s*(?:%label1;)?(GO\ *TO|ITERATE|LEAVE)(?:%label2;)?%b2;/i" region1="Prepro" region2="Prepro"/>
+         <regexp match="/(\%)\s*(?:%label1;)?(DEACT(?:IVATE)?|IF|NOTE|REPLACE)%b2;/i" region1="Prepro" region2="Prepro"/>
+         <regexp match="/(\%)\s*(?:%label1;)?(GO\ *TO|ITERATE|LEAVE)(?:%label2;)?%b2;/i" region1="Prepro" region2="Prepro"/>
          <!-- Statements with labels and paired -->
-         <block start="/(?{start}(%)\s*(?:%label1;)?(DO|SELECT))%b2;/i"
-                end="/(?{end}(%)\s*(?:%label1;)?(END)(?:%label2;)?)%b2;/i"
+         <block start="/(?{start}(\%)\s*(?:%label1;)?(DO|SELECT))%b2;/i"
+                end="/(?{end}(\%)\s*(?:%label1;)?(END)(?:%label2;)?)%b2;/i"
                 scheme="pl1" region01="Prepro" region02="Prepro" region11="Prepro" region12="Prepro"/>
-         <block start="/(?{start}(%)\s*(?:%label1;)?(PROC(?:EDURE)?))%b2;/i"
-                end="/(?{end}(%)\s*(?:%label1;)?(END)(?:%label2;)?)%b2;/i"
+         <block start="/(?{start}(\%)\s*(?:%label1;)?(PROC(?:EDURE)?))%b2;/i"
+                end="/(?{end}(\%)\s*(?:%label1;)?(END)(?:%label2;)?)%b2;/i"
                 scheme="preproc" region01="Prepro" region02="Prepro" region03="def:LabelStrong" region11="Prepro" region12="Prepro"/>
          <!-- %-statements (except those defined previously!) -->
-         <regexp match="/%\s*(ACT(IVATE)?|DECLARE|DCL|THEN|ELSE|INCLUDE|INSCAN|WHEN|OTHERWISE|XINCLUDE|XINSCAN)%b2;/i" region0="Prepro"/>
+         <regexp match="/\%\s*(ACT(IVATE)?|DECLARE|DCL|THEN|ELSE|INCLUDE|INSCAN|WHEN|OTHERWISE|XINCLUDE|XINSCAN)%b2;/i" region0="Prepro"/>
          <inherit scheme="prekey"/>
          <inherit scheme="prefun"/>
       </scheme>

Modified: trunk/schemes/hrd/hrd/catalog-console.xml
===================================================================
--- trunk/schemes/hrd/hrd/catalog-console.xml	2012-11-15 09:11:20 UTC (rev 1885)
+++ trunk/schemes/hrd/hrd/catalog-console.xml	2012-11-15 09:46:12 UTC (rev 1886)
@@ -55,7 +55,7 @@
       <location link="&hrd;/console/contrib/visual.hrd"/>
     </hrd>
     <hrd class="console" name="take4" description="Classic take4 like by Sim">
-      <location link="&hrd;/console/contrib/visual.hrd"/>
+      <location link="&hrd;/console/contrib/take4.hrd"/>
     </hrd>
     
     <hrd class="console" name="mirror-conemu" description="Support ConEmu extends">

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



