Patch #3466 2013-05-23 00:46

marphod

Make the existing lexer<foo>.xml files conformant
Download
3466-Make_the_exist.patch (18.5 KB)
Category
Lexer
Status
Accepted
Close date
2013-05-25 20:01
Assigned to
alpha0010
Index: src/sdk/resources/lexers/lexer_angelscript.xml
===================================================================
--- src/sdk/resources/lexers/lexer_angelscript.xml    (revision 9111)
+++ src/sdk/resources/lexers/lexer_angelscript.xml    (working copy)
@@ -79,7 +79,7 @@
                                 p page par param post pre ref relates remarks return retval
                                 sa section see showinitializer since skip skipline struct subsection
                                 test throw todo typedef union until
-                                var verbatim verbinclude version warning weakgroup $ @ \ & < > # { }"/>
+                                var verbatim verbinclude version warning weakgroup $ @ \ &amp; &lt; &gt;  # { }"/>
                 </Keywords>
                 <SampleCode value="lexer_angelscript.sample"/>
                 <LanguageAttributes
Index: src/sdk/resources/lexers/lexer_cpp.xml
===================================================================
--- src/sdk/resources/lexers/lexer_cpp.xml    (revision 9111)
+++ src/sdk/resources/lexers/lexer_cpp.xml    (working copy)
@@ -178,7 +178,7 @@
                                    ref relates remarks return retval sa section see showinitializer
                                    since skip skipline struct subsection test throw todo typedef
                                    union until var verbatim verbinclude version warning weakgroup
-                                   $ @ \ & < > # { }"/>
+                                   $ @ \ &amp; &lt; &gt;  # { }"/>
                         <!-- wxSmith block identifiers -->
                         <Set index="5"
                             value="^AppHeaders ^AppInitialize ^Declarations ^Destroy ^EventTable ^Handlers
Index: src/sdk/resources/lexers/lexer_glsl.xml
===================================================================
--- src/sdk/resources/lexers/lexer_glsl.xml    (revision 9111)
+++ src/sdk/resources/lexers/lexer_glsl.xml    (working copy)
@@ -159,7 +159,7 @@
                                 p page par param post pre ref relates remarks return retval
                                 sa section see showinitializer since skip skipline struct subsection
                                 test throw todo typedef union until
-                                var verbatim verbinclude version warning weakgroup $ @ \ & < > # { }
+                                var verbatim verbinclude version warning weakgroup $ @ \ &amp; &lt; &gt; # { }
                                 "/>
 
                 </Keywords>
Index: src/sdk/resources/lexers/lexer_html.xml
===================================================================
--- src/sdk/resources/lexers/lexer_html.xml    (revision 9111)
+++ src/sdk/resources/lexers/lexer_html.xml    (working copy)
@@ -57,92 +57,92 @@
 
                 <Style name="Unquoted values" index="19" fg="255,0,255" bg="255,232,255" />
                 <Style name="JSP Comment" index="20" fg="0,0,0" bg="255,255,200" />
-                <Style name="SGML tags" index=21 fg="0,0,127" bg="240,240,255"  />
-                <Style name="SGML command" index=22 fg="0,0,127" bg="240,240,255" bold="1" />
-                <Style name="SGML 1st param" index=23 fg="0,90,0" bg="240,240,255"  />
-                <Style name="SGML double string" index=24 fg="127,0,0" bg="240,240,255"  />
-                <Style name="SGML single string" index=25 fg="160,55,0" bg="240,240,255"  />
-                <Style name="SGML error" index=26 fg="128,0,0" bg="255,100,100"  />
-                <Style name="SGML special (#xxxx type)" index=27 fg="50,100,255" bg="240,240,255"  />
-                <Style name="SGML entity" index=28 fg="60,60,60" bg="240,240,255"  />
-                <Style name="SGML comment" index=29 fg="128,128,0" bg="240,240,255"  />
-                <Style name="SGML block" index=31 fg="0,0,100" bg="192,192,235"  />
-                <Style name="Matched Operators" index=34 fg="0,0,255" bold="0" />
-                <Style name="Matched Operators 2" index=35 fg="255,0,0" bold="0" />
+                <Style name="SGML tags" index="21" fg="0,0,127" bg="240,240,255"  />
+                <Style name="SGML command" index="22" fg="0,0,127" bg="240,240,255" bold="1" />
+                <Style name="SGML 1st param" index="23" fg="0,90,0" bg="240,240,255"  />
+                <Style name="SGML double string" index="24" fg="127,0,0" bg="240,240,255"  />
+                <Style name="SGML single string" index="25" fg="160,55,0" bg="240,240,255"  />
+                <Style name="SGML error" index="26" fg="128,0,0" bg="255,100,100"  />
+                <Style name="SGML special (#xxxx type)" index="27" fg="50,100,255" bg="240,240,255"  />
+                <Style name="SGML entity" index="28" fg="60,60,60" bg="240,240,255"  />
+                <Style name="SGML comment" index="29" fg="128,128,0" bg="240,240,255"  />
+                <Style name="SGML block" index="31" fg="0,0,100"
download for full patch...
marphod 2013-05-23 00:48

When writing a script to do some automatic syntax highlighting management, I discovered there were a number of non-conformant XML files. The 2 issues were (1) Some attributes were unquoted and (2) there were occasional ampersands and angle braces that were unescaped.

This fixes those issues.