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

[<ct...@us...>]

Revision: 1942
          http://sourceforge.net/p/colorer/svn/1942
Author:   ctapmex
Date:     2013-04-15 05:07:24 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
xml format error

Modified Paths:
--------------
    trunk/schemes/hrc/changelog
    trunk/schemes/hrc/hrc/CHANGELOG
    trunk/schemes/hrc/hrc/base/d.hrc
    trunk/schemes/hrc/hrc/rare/ie-weidu/dialog.hrc
    trunk/schemes/hrc/hrc/rare/mako.hrc
    trunk/schemes/hrc/hrc/rare/modula.hrc
    trunk/schemes/hrc/hrc/rare/ubasic.hrc
    trunk/schemes/hrc/hrc/scripts/graphviz.hrc
    trunk/schemes/hrc/hrc/scripts/ini/reg.hrc
    trunk/schemes/hrc/hrc/xml/dtdcatalog.hrc
    trunk/schemes/hrc/test/_valid/reg/far.reg.html
    trunk/schemes/hrc/test/_valid/reg/test.reg.html

Modified: trunk/schemes/hrc/changelog
===================================================================
--- trunk/schemes/hrc/changelog	2013-04-15 04:16:02 UTC (rev 1941)
+++ trunk/schemes/hrc/changelog	2013-04-15 05:07:24 UTC (rev 1942)
@@ -1,5 +1,10 @@
 $Revision$
        $Author$ $Date$
+        - исправления в hrc файлов ошибок, свзяанных с форматом xml
+        - ошибка в modula.hrc
+
+#Revision: 1933
+       #Author: ctapmex Date: 2013-03-13 13:35:53 +0600 (Ср, 13 мар 2013)
         - дополнен modula.hrc ( Alexander Naumov)
 
 #Revision: 1932
Modified: trunk/schemes/hrc/hrc/CHANGELOG
===================================================================
--- trunk/schemes/hrc/hrc/CHANGELOG	2013-04-15 04:16:02 UTC (rev 1941)
+++ trunk/schemes/hrc/hrc/CHANGELOG	2013-04-15 05:07:24 UTC (rev 1942)
@@ -1,3 +1,8 @@
+2013-04-15
+  Fixed:
+    - d.hrc, ie-weidu/dialog.hrc, mako.hrc, ubasic.hrc, graphiz.hrc, reg.hrc, dtdcatalog.hrc - fix error in xml format
+    - modula - fix error
+
 2013-03-29
   Fixed:
     - c# - point in a method name (Roman Kuzmin)

Modified: trunk/schemes/hrc/hrc/base/d.hrc
===================================================================
--- trunk/schemes/hrc/hrc/base/d.hrc	2013-04-15 04:16:02 UTC (rev 1941)
+++ trunk/schemes/hrc/hrc/base/d.hrc	2013-04-15 05:07:24 UTC (rev 1942)
@@ -292,10 +292,10 @@
 	</block>
 	
 	<block scheme='def:empty' region='string.delimited'>
-		<start match='/(q)("(\<))/' 
+		<start match='/(q)("(&lt;))/' 
 			region0='string.quote' region1='string.pref' region2='def:PairStart' region3='string.delimited.name'
 		/>
-		<end match='/((\>)")/' region0='string.quote' region1='def:PairEnd' region2='string.delimited.name'/>
+		<end match='/((&gt;)")/' region0='string.quote' region1='def:PairEnd' region2='string.delimited.name'/>
 	</block>
 
 	<block scheme='def:empty' region='string.delimited'>

Modified: trunk/schemes/hrc/hrc/rare/ie-weidu/dialog.hrc
===================================================================
--- trunk/schemes/hrc/hrc/rare/ie-weidu/dialog.hrc	2013-04-15 04:16:02 UTC (rev 1941)
+++ trunk/schemes/hrc/hrc/rare/ie-weidu/dialog.hrc	2013-04-15 05:07:24 UTC (rev 1942)
@@ -462,11 +462,11 @@
 	/>
 	
 	<block start='/\b(CHAIN)\s+(IF\s+)?!(IF_FILE_EXISTS\s+)?(%label;\s+(?{chain.out}%label;))/' end='/^\M%action;/' scheme='chain.text'
-		region01='key' region03='key.check' region04='label' end='/^\M%action;/'
+		region01='key' region03='key.check' region04='label'
 	/>
 	
 	<block start='/\bCHAIN\b/' end='/^\M%action;/' scheme='chain'
-		region00='key' end='/^\M%action;/'
+		region00='key'
 	/>
 	
 	<block start='/\b(INTERJECT(_COPY_TRANS[234]?)?|I_C_T[234]?)\s+\M(?{inter.out}[\S]+)/' 

Modified: trunk/schemes/hrc/hrc/rare/mako.hrc
===================================================================
--- trunk/schemes/hrc/hrc/rare/mako.hrc	2013-04-15 04:16:02 UTC (rev 1941)
+++ trunk/schemes/hrc/hrc/rare/mako.hrc	2013-04-15 05:07:24 UTC (rev 1942)
@@ -33,13 +33,13 @@
         <block start="/##/" end="/$/" scheme="def:Comment" region="def:LineComment"/>
 
         <!-- python colorization to mako tags -->
-        <block start="/(?{def:PairStart}\<%def.*\>)/" end="/(?{def:PairEnd}\</%def\>)/" scheme="mako" region="MakoTag"/>
-        <block start="/(?{def:PairStart}\<%(doc|textpage|include|namespace|inherit|call))/" 
-               end="/(?{def:PairEnd}(\>|$))/" 
+        <block start="/(?{def:PairStart}&lt;%def.*&gt;)/" end="/(?{def:PairEnd}&lt;/%def&gt;)/" scheme="mako" region="MakoTag"/>
+        <block start="/(?{def:PairStart}&lt;%(doc|textpage|include|namespace|inherit|call))/" 
+               end="/(?{def:PairEnd}(&gt;|$))/" 
                scheme="python:python" region="MakoTag"/>
 
         <!-- Python blocks --> 
-        <block start="/(?{def:PairStart}\<%)/" end="/(?{def:PairEnd}%\>)/" scheme="python:python" region="PythonBlock"/>
+        <block start="/(?{def:PairStart}&lt;%)/" end="/(?{def:PairEnd}%&gt;)/" scheme="python:python" region="PythonBlock"/>
         <block start="/(?{def:PairStart}\$\{)/" end="/(?{def:PairEnd}\})/" scheme="python:python" region="PythonBlock"/>
         <block start="/^\s*%/" end="/$/" scheme="python:python" region="PythonBlock"/>
         

Modified: trunk/schemes/hrc/hrc/rare/modula.hrc
===================================================================
--- trunk/schemes/hrc/hrc/rare/modula.hrc	2013-04-15 04:16:02 UTC (rev 1941)
+++ trunk/schemes/hrc/hrc/rare/modula.hrc	2013-04-15 05:07:24 UTC (rev 1942)
@@ -36,8 +36,8 @@
       <scheme name="modula2">
 <!-- Comments -->
          <block start="/\(\*/" end="/\*\)/" scheme="NestedComment" region="Comment" region00="PairStart" region10="PairEnd"/>
-         <block start="/&lt;\*/" end="/\*&gt;/" scheme="Comment" region="def:Directive" region00="PairStart" region10="PairEnd"/>
-         <block start="/--/" end="/$/" scheme="Comment" region="def:LineComment"/>
+         <block start="/&lt;\*/" end="/\*&gt;/" scheme="def:Comment" region="def:Directive" region00="PairStart" region10="PairEnd"/>
+         <block start="/--/" end="/$/" scheme="def:Comment" region="def:LineComment"/>
 <!-- paired -->
          <block start="/(\()/" end="/(\))/" scheme="modula2" region00="Symbol" region01="PairStart" region10="Symbol" region11="PairEnd"/>
          <block start="/(\[)/" end="/(\])/" scheme="modula2" region00="Symbol" region01="PairStart" region10="Symbol" region11="PairEnd"/>

Modified: trunk/schemes/hrc/hrc/rare/ubasic.hrc
===================================================================
--- trunk/schemes/hrc/hrc/rare/ubasic.hrc	2013-04-15 04:16:02 UTC (rev 1941)
+++ trunk/schemes/hrc/hrc/rare/ubasic.hrc	2013-04-15 05:07:24 UTC (rev 1942)
@@ -99,7 +99,7 @@
          		 region1="ubWord" region3="ubId" region4="ubSymb" 
          		 region6="ubNumb" region7="ubSymb" region8="ubSymb" region9="ubSymb"/>
          
-         <regexp match="/\b(\w[\w\d\._]+)\b\M(\<.*\>)? \s*(:|\+|\-|)?(\=|\#)\s*\w/x"
+         <regexp match="/\b(\w[\w\d\._]+)\b\M(&lt;.*&gt;)? \s*(:|\+|\-|)?(\=|\#)\s*\w/x"
          		 region1="ubId" />
          
          <regexp match="/^\s*(\$(?:\*|CHAIN|INCLUDE|INSERT))\b\s+(\w[\w\d._]+)(?:\s+(\w[\w\d._]+))?/"

Modified: trunk/schemes/hrc/hrc/scripts/graphviz.hrc
===================================================================
--- trunk/schemes/hrc/hrc/scripts/graphviz.hrc	2013-04-15 04:16:02 UTC (rev 1941)
+++ trunk/schemes/hrc/hrc/scripts/graphviz.hrc	2013-04-15 05:07:24 UTC (rev 1942)
@@ -51,7 +51,7 @@
         <regexp match="/\\./" region="LabelContent"/>
         <regexp match="/\\n/" region="LabelContent"/>
         <regexp match="/\}/" region="LabelContent"/>
-        <regexp match="/\|?[\{\|]\s*\<[\w]+\>/" region="LabelContent"/>
+        <regexp match="/\|?[\{\|]\s*&lt;[\w]+&gt;/" region="LabelContent"/>
     </scheme>
 
     <scheme name="id_content_html">

Modified: trunk/schemes/hrc/hrc/scripts/ini/reg.hrc
===================================================================
--- trunk/schemes/hrc/hrc/scripts/ini/reg.hrc	2013-04-15 04:16:02 UTC (rev 1941)
+++ trunk/schemes/hrc/hrc/scripts/ini/reg.hrc	2013-04-15 05:07:24 UTC (rev 1942)
@@ -129,9 +129,7 @@
   region00="def:PairStart" region10="def:PairEnd"
   region01="def:StringEdge" region11="def:StringEdge" 
  /> 
- <regexp match="/\-\s*$/" region="type.dword"
-  region="ini:SymbolStrong"
- />
+ <regexp match="/\-\s*$/" region="type.dword"/>
  <inherit scheme="ini:comment"/>
  <inherit scheme="ini:error"/>
 </scheme>

Modified: trunk/schemes/hrc/hrc/xml/dtdcatalog.hrc
===================================================================
--- trunk/schemes/hrc/hrc/xml/dtdcatalog.hrc	2013-04-15 04:16:02 UTC (rev 1941)
+++ trunk/schemes/hrc/hrc/xml/dtdcatalog.hrc	2013-04-15 05:07:24 UTC (rev 1942)
@@ -63,7 +63,7 @@
 	<block start='/(--)/' end='/(--)/' 
 		scheme='def:Comment' region='Comment'
 		region00='Comment.start' region10='Comment.end'
-		region01='def:PairStart' region10='def:PairEnd'
+		region01='def:PairStart' region11='def:PairEnd'
 	/>
 </scheme>
 

Modified: trunk/schemes/hrc/test/_valid/reg/far.reg.html
===================================================================
--- trunk/schemes/hrc/test/_valid/reg/far.reg.html	2013-04-15 04:16:02 UTC (rev 1941)
+++ trunk/schemes/hrc/test/_valid/reg/far.reg.html	2013-04-15 05:07:24 UTC (rev 1942)
@@ -32,10 +32,10 @@
  31: 
  32: <span class='ini-comment def-Comment def-Syntax'>;\xF3\xE4\xE0\xEB\xE5\xED\xE8\xE5 \xE7\xED\xE0\xF7\xE5\xED\xE8\xFF</span>
  33: <span class='ini-group-quot def-OpenTag def-Tag'>[</span><span class='reg-group-name ini-group-name-defined def-Keyword'>HKEY_CURRENT_USER</span><span class='def-SymbolStrong def-Symbol'>\</span><span class='ini-group-name def-Tag'>Software</span><span class='def-SymbolStrong def-Symbol'>\</span><span class='ini-group-name def-Tag'>Far2</span><span class='def-SymbolStrong def-Symbol'>\</span><span class='ini-group-name def-Tag'>Colors</span><span class='def-SymbolStrong def-Symbol'>\</span><span class='ini-group-name def-Tag'>Highlight</span><span class='def-SymbolStrong def-Symbol'>\</span><span class='ini-group-name def-Tag'>Group2</span><span class='ini-group-quot def-OpenTag def-Tag'>]</span>
- 34: <span class='reg-param-quote ini-param-name def-ParameterUnknown def-ParameterStrong def-Parameter'>"</span><span class='ini-String def-String'>Mask</span><span class='reg-param-quote ini-param-name def-ParameterUnknown def-ParameterStrong def-Parameter'>"</span><span class='ini-param-equ ini-Symbol def-Symbol'>=</span><span class='ini-SymbolStrong def-SymbolStrong def-Symbol'>-</span>
+ 34: <span class='reg-param-quote ini-param-name def-ParameterUnknown def-ParameterStrong def-Parameter'>"</span><span class='ini-String def-String'>Mask</span><span class='reg-param-quote ini-param-name def-ParameterUnknown def-ParameterStrong def-Parameter'>"</span><span class='ini-param-equ ini-Symbol def-Symbol'>=</span><span class='reg-type-dword def-NumberHex def-Number'>-</span>
  35: <span class='ini-comment def-Comment def-Syntax'>;jjj</span>
  36: <span class='ini-group-quot def-OpenTag def-Tag'>[</span><span class='reg-group-name ini-group-name-defined def-Keyword'>HKEY_CURRENT_USER</span><span class='def-SymbolStrong def-Symbol'>\</span><span class='ini-group-name def-Tag'>Software</span><span class='def-SymbolStrong def-Symbol'>\</span><span class='ini-group-name def-Tag'>Far2</span><span class='def-SymbolStrong def-Symbol'>\</span><span class='ini-group-name def-Tag'>Colors</span><span class='def-SymbolStrong def-Symbol'>\</span><span class='ini-group-name def-Tag'>Highlight</span><span class='def-SymbolStrong def-Symbol'>\</span><span class='ini-group-name def-Tag'>Group2</span><span class='ini-group-quot def-OpenTag def-Tag'>]</span>
- 37: <span class='reg-param-quote ini-param-name def-ParameterUnknown def-ParameterStrong def-Parameter'>"</span><span class='ini-String def-String'>Mask</span><span class='reg-param-quote ini-param-name def-ParameterUnknown def-ParameterStrong def-Parameter'>"</span><span class='ini-param-equ ini-Symbol def-Symbol'>=</span><span class='def-Error'>-</span><span class='def-Error'>-</span><span class='def-Error'>-</span><span class='ini-SymbolStrong def-SymbolStrong def-Symbol'>-</span>
+ 37: <span class='reg-param-quote ini-param-name def-ParameterUnknown def-ParameterStrong def-Parameter'>"</span><span class='ini-String def-String'>Mask</span><span class='reg-param-quote ini-param-name def-ParameterUnknown def-ParameterStrong def-Parameter'>"</span><span class='ini-param-equ ini-Symbol def-Symbol'>=</span><span class='def-Error'>-</span><span class='def-Error'>-</span><span class='def-Error'>-</span><span class='reg-type-dword def-NumberHex def-Number'>-</span>
  38: 
  39: 
  40: <span class='ini-comment def-Comment def-Syntax'>;hex \xE7\xED\xE0\xF7\xE5\xED\xE8\xE9\xFF</span>

Modified: trunk/schemes/hrc/test/_valid/reg/test.reg.html
===================================================================
--- trunk/schemes/hrc/test/_valid/reg/test.reg.html	2013-04-15 04:16:02 UTC (rev 1941)
+++ trunk/schemes/hrc/test/_valid/reg/test.reg.html	2013-04-15 05:07:24 UTC (rev 1942)
@@ -1,5 +1,5 @@
  0: <span class='ini-group-quot def-OpenTag def-Tag'>[</span><span class='reg-group-name ini-group-name-defined def-Keyword'>HKEY_CURRENT_USER</span><span class='def-SymbolStrong def-Symbol'>\</span><span class='ini-group-name def-Tag'>Software</span><span class='def-SymbolStrong def-Symbol'>\</span><span class='ini-group-name def-Tag'>Microsoft</span><span class='def-SymbolStrong def-Symbol'>\</span><span class='ini-group-name def-Tag'>Windows</span><span class='def-SymbolStrong def-Symbol'>\</span><span class='ini-group-name def-Tag'>CurrentVersion</span><span class='def-SymbolStrong def-Symbol'>\</span><span class='ini-group-name def-Tag'>Run</span><span class='ini-group-quot def-OpenTag def-Tag'>]</span>
- 1: <span class='reg-param-quote ini-param-name def-ParameterUnknown def-ParameterStrong def-Parameter'>"</span><span class='ini-String def-String'>ctfmon.exe</span><span class='reg-param-quote ini-param-name def-ParameterUnknown def-ParameterStrong def-Parameter'>"</span><span class='ini-param-equ ini-Symbol def-Symbol'>=</span><span class='ini-SymbolStrong def-SymbolStrong def-Symbol'>-</span>
+ 1: <span class='reg-param-quote ini-param-name def-ParameterUnknown def-ParameterStrong def-Parameter'>"</span><span class='ini-String def-String'>ctfmon.exe</span><span class='reg-param-quote ini-param-name def-ParameterUnknown def-ParameterStrong def-Parameter'>"</span><span class='ini-param-equ ini-Symbol def-Symbol'>=</span><span class='reg-type-dword def-NumberHex def-Number'>-</span>
  2: 
  3: <span class='ini-comment def-Comment def-Syntax'>;The minus sign at the end is marked as an error. It is however a correct syntax </span>
  4: <span class='ini-comment def-Comment def-Syntax'>;for .REG file. An old version of the Colorer plugin (from 2001) did not have this error.</span>

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