xmode.modes: updating with recent xmode files

[factor.git] / basis / xmode / modes / shtml.xml

diff --git a/basis/xmode/modes/shtml.xml b/basis/xmode/modes/shtml.xml
index b5ee02e8ca1f8ab65e2595fffb61c2d14da7b279..8d35606189d5b2bac802fdd4d8e02a6e66ac4be3 100644 (file)
--- a/basis/xmode/modes/shtml.xml
+++ b/basis/xmode/modes/shtml.xml
@@ -1,117 +1,117 @@
-<?xml version="1.0"?>\r
-\r
-<!DOCTYPE MODE SYSTEM "xmode.dtd">\r
-\r
-<MODE>\r
-       <PROPS>\r
-               <PROPERTY NAME="commentStart" VALUE="&lt;!--" />\r
-               <PROPERTY NAME="commentEnd" VALUE="--&gt;" />\r
-       </PROPS>\r
-       <RULES IGNORE_CASE="TRUE">\r
-               <!-- SSI -->\r
-               <!-- SSI directives should ALWAYS end like this, with a space\r
-                       before the tag end, so let's make it colorize poorly otherwise -->\r
-               <!-- ... or really? see bug report 964860 -->\r
-               <SPAN TYPE="KEYWORD3" DELEGATE="SSI">\r
-                       <BEGIN>&lt;!--#</BEGIN>\r
-                       <END>--&gt;</END>\r
-               </SPAN>\r
-\r
-               <!-- SGML comment -->\r
-               <SPAN TYPE="COMMENT1">\r
-                       <BEGIN>&lt;!--</BEGIN>\r
-                       <END>--&gt;</END>\r
-               </SPAN>\r
-\r
-               <!-- JavaScript -->\r
-               <SPAN TYPE="MARKUP" DELEGATE="html::JAVASCRIPT">\r
-                       <BEGIN>&lt;SCRIPT</BEGIN>\r
-                       <END>&lt;/SCRIPT&gt;</END>\r
-               </SPAN>\r
-\r
-               <!-- stylesheet -->\r
-               <SPAN TYPE="MARKUP" DELEGATE="html::CSS">\r
-                       <BEGIN>&lt;STYLE</BEGIN>\r
-                       <END>&lt;/STYLE&gt;</END>\r
-               </SPAN>\r
-\r
-               <!-- DTD instructions -->\r
-               <SPAN TYPE="KEYWORD2" DELEGATE="xml::DTD-TAGS">\r
-                       <BEGIN>&lt;!</BEGIN>\r
-                       <END>&gt;</END>\r
-               </SPAN>\r
-\r
-               <!-- markup tags -->\r
-               <SPAN TYPE="MARKUP" DELEGATE="TAGS">\r
-                       <BEGIN>&lt;</BEGIN>\r
-                       <END>&gt;</END>\r
-               </SPAN>\r
-\r
-               <!-- SGML entities -->\r
-               <SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">\r
-                       <BEGIN>&amp;</BEGIN>\r
-                       <END>;</END>\r
-               </SPAN>\r
-       </RULES>\r
-\r
-       <RULES SET="TAGS" DEFAULT="MARKUP">\r
-               <SPAN TYPE="LITERAL1">\r
-                       <BEGIN>"</BEGIN>\r
-                       <END>"</END>\r
-               </SPAN>\r
-\r
-               <SPAN TYPE="LITERAL1">\r
-                       <BEGIN>'</BEGIN>\r
-                       <END>'</END>\r
-               </SPAN>\r
-\r
-               <SEQ TYPE="OPERATOR">=</SEQ>\r
-       </RULES>\r
-\r
-       <RULES SET="SSI" DEFAULT="KEYWORD3">\r
-               <SPAN TYPE="LITERAL1" MATCH_TYPE="OPERATOR" DELEGATE="SSI-EXPRESSION">\r
-                       <BEGIN>"</BEGIN>\r
-                       <END>"</END>\r
-               </SPAN>\r
-\r
-               <!-- MD: i don't think this is valid\r
-               <SPAN TYPE="LITERAL1" MATCH_TYPE="OPERATOR" DELEGATE="SSI-EXPRESSION">\r
-                       <BEGIN>'</BEGIN>\r
-                       <END>'</END>\r
-               </SPAN>\r
-               -->\r
-\r
-               <SEQ TYPE="OPERATOR">=</SEQ>\r
-\r
-               <KEYWORDS>\r
-                       <KEYWORD1>config</KEYWORD1>\r
-                       <KEYWORD1>echo</KEYWORD1>\r
-                       <KEYWORD1>exec</KEYWORD1>\r
-                       <KEYWORD1>flastmod</KEYWORD1>\r
-                       <KEYWORD1>fsize</KEYWORD1>\r
-                       <KEYWORD1>include</KEYWORD1>\r
-\r
-                       <KEYWORD2>cgi</KEYWORD2>\r
-                       <KEYWORD2>errmsg</KEYWORD2>\r
-                       <KEYWORD2>file</KEYWORD2>\r
-                       <KEYWORD2>sizefmt</KEYWORD2>\r
-                       <KEYWORD2>timefmt</KEYWORD2>\r
-                       <KEYWORD2>var</KEYWORD2>\r
-                       <KEYWORD2>cmd</KEYWORD2>\r
-               </KEYWORDS>\r
-       </RULES>\r
-\r
-       <RULES SET="SSI-EXPRESSION" DEFAULT="LITERAL1" ESCAPE="\">\r
-\r
-               <MARK_FOLLOWING TYPE="KEYWORD2">$</MARK_FOLLOWING>\r
-\r
-               <SEQ TYPE="OPERATOR">=</SEQ>\r
-               <SEQ TYPE="OPERATOR">!=</SEQ>\r
-               <SEQ TYPE="OPERATOR">&lt;</SEQ>\r
-               <SEQ TYPE="OPERATOR">&lt;=</SEQ>\r
-               <SEQ TYPE="OPERATOR">&gt;</SEQ>\r
-               <SEQ TYPE="OPERATOR">&gt;=</SEQ>\r
-               <SEQ TYPE="OPERATOR">&amp;&amp;</SEQ>\r
-               <SEQ TYPE="OPERATOR">||</SEQ>\r
-       </RULES>\r
-</MODE>\r
+<?xml version="1.0"?>
+
+<!DOCTYPE MODE SYSTEM "xmode.dtd">
+
+<MODE>
+       <PROPS>
+               <PROPERTY NAME="commentStart" VALUE="&lt;!--" />
+               <PROPERTY NAME="commentEnd" VALUE="--&gt;" />
+       </PROPS>
+       <RULES IGNORE_CASE="TRUE">
+               <!-- SSI -->
+               <!-- SSI directives should ALWAYS end like this, with a space
+                       before the tag end, so let's make it colorize poorly otherwise -->
+               <!-- ... or really? see bug report 964860 -->
+               <SPAN TYPE="KEYWORD3" DELEGATE="SSI">
+                       <BEGIN>&lt;!--#</BEGIN>
+                       <END>--&gt;</END>
+               </SPAN>
+
+               <!-- SGML comment -->
+               <SPAN TYPE="COMMENT1">
+                       <BEGIN>&lt;!--</BEGIN>
+                       <END>--&gt;</END>
+               </SPAN>
+
+               <!-- JavaScript -->
+               <SPAN TYPE="MARKUP" DELEGATE="html::JAVASCRIPT">
+                       <BEGIN>&lt;SCRIPT</BEGIN>
+                       <END>&lt;/SCRIPT&gt;</END>
+               </SPAN>
+
+               <!-- stylesheet -->
+               <SPAN TYPE="MARKUP" DELEGATE="html::CSS">
+                       <BEGIN>&lt;STYLE</BEGIN>
+                       <END>&lt;/STYLE&gt;</END>
+               </SPAN>
+
+               <!-- DTD instructions -->
+               <SPAN TYPE="KEYWORD2" DELEGATE="xml::DTD-TAGS">
+                       <BEGIN>&lt;!</BEGIN>
+                       <END>&gt;</END>
+               </SPAN>
+
+               <!-- markup tags -->
+               <SPAN TYPE="MARKUP" DELEGATE="TAGS">
+                       <BEGIN>&lt;</BEGIN>
+                       <END>&gt;</END>
+               </SPAN>
+
+               <!-- SGML entities -->
+               <SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
+                       <BEGIN>&amp;</BEGIN>
+                       <END>;</END>
+               </SPAN>
+       </RULES>
+
+       <RULES SET="TAGS" DEFAULT="MARKUP">
+               <SPAN TYPE="LITERAL1">
+                       <BEGIN>"</BEGIN>
+                       <END>"</END>
+               </SPAN>
+
+               <SPAN TYPE="LITERAL1">
+                       <BEGIN>'</BEGIN>
+                       <END>'</END>
+               </SPAN>
+
+               <SEQ TYPE="OPERATOR">=</SEQ>
+       </RULES>
+
+       <RULES SET="SSI" DEFAULT="KEYWORD3">
+               <SPAN TYPE="LITERAL1" MATCH_TYPE="OPERATOR" DELEGATE="SSI-EXPRESSION">
+                       <BEGIN>"</BEGIN>
+                       <END>"</END>
+               </SPAN>
+
+               <!-- MD: i don't think this is valid
+               <SPAN TYPE="LITERAL1" MATCH_TYPE="OPERATOR" DELEGATE="SSI-EXPRESSION">
+                       <BEGIN>'</BEGIN>
+                       <END>'</END>
+               </SPAN>
+               -->
+
+               <SEQ TYPE="OPERATOR">=</SEQ>
+
+               <KEYWORDS>
+                       <KEYWORD1>config</KEYWORD1>
+                       <KEYWORD1>echo</KEYWORD1>
+                       <KEYWORD1>exec</KEYWORD1>
+                       <KEYWORD1>flastmod</KEYWORD1>
+                       <KEYWORD1>fsize</KEYWORD1>
+                       <KEYWORD1>include</KEYWORD1>
+
+                       <KEYWORD2>cgi</KEYWORD2>
+                       <KEYWORD2>errmsg</KEYWORD2>
+                       <KEYWORD2>file</KEYWORD2>
+                       <KEYWORD2>sizefmt</KEYWORD2>
+                       <KEYWORD2>timefmt</KEYWORD2>
+                       <KEYWORD2>var</KEYWORD2>
+                       <KEYWORD2>cmd</KEYWORD2>
+               </KEYWORDS>
+       </RULES>
+
+       <RULES SET="SSI-EXPRESSION" DEFAULT="LITERAL1" ESCAPE="\">
+
+               <MARK_FOLLOWING TYPE="KEYWORD2">$</MARK_FOLLOWING>
+
+               <SEQ TYPE="OPERATOR">=</SEQ>
+               <SEQ TYPE="OPERATOR">!=</SEQ>
+               <SEQ TYPE="OPERATOR">&lt;</SEQ>
+               <SEQ TYPE="OPERATOR">&lt;=</SEQ>
+               <SEQ TYPE="OPERATOR">&gt;</SEQ>
+               <SEQ TYPE="OPERATOR">&gt;=</SEQ>
+               <SEQ TYPE="OPERATOR">&amp;&amp;</SEQ>
+               <SEQ TYPE="OPERATOR">||</SEQ>
+       </RULES>
+</MODE>