xmode.modes: updating with recent xmode files

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

diff --git a/basis/xmode/modes/jhtml.xml b/basis/xmode/modes/jhtml.xml
index 5a15907f3b17fd28827e6a7607350686506d31fe..72d03bb71a376114626e72b7c7a60fcaed1c1a98 100644 (file)
--- a/basis/xmode/modes/jhtml.xml
+++ b/basis/xmode/modes/jhtml.xml
@@ -1,144 +1,144 @@
-<?xml version="1.0"?>\r
-\r
-<!DOCTYPE MODE SYSTEM "xmode.dtd">\r
-\r
-<!--\r
-  JHTML mode by Will Sargent <wsargent@atg.com>\r
--->\r
-\r
-<MODE>\r
-       <PROPS>\r
-               <PROPERTY NAME="commentStart" VALUE="&lt;!--" />\r
-               <PROPERTY NAME="commentEnd" VALUE="--&gt;" />\r
-                               <!-- Indent droplets and oparams -->\r
-                               <PROPERTY NAME="indentNextLines"\r
-                                VALUE="\s*(&lt;\s*(droplet|oparam))\s+.*" />\r
-                               <!-- Sadly, there doesn't seem to be a way to\r
-                                        undent when we see a /oparam> tag... -->\r
-       </PROPS>\r
-       <RULES IGNORE_CASE="TRUE">\r
-                               <!-- Allow for Dynamo SSI -->\r
-                               <SPAN TYPE="NULL">\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
-               <!-- markup tags -->\r
-               <SPAN TYPE="MARKUP" DELEGATE="java::MAIN">\r
-                       <BEGIN>`</BEGIN>\r
-                       <END>`</END>\r
-               </SPAN>\r
-\r
-                               <!-- Embedded Java -->\r
-               <SPAN TYPE="MARKUP" DELEGATE="java::MAIN">\r
-                       <BEGIN>&lt;java&gt;</BEGIN>\r
-                       <END>&lt;/java&gt;</END>\r
-               </SPAN>\r
-\r
-                               <!-- Don't know how to do this correctly.\r
-                               <SPAN TYPE="MARKUP" DELEGATE="java::MAIN">\r
-                                               <BEGIN>&lt;java type=</BEGIN>\r
-                                               <END>&lt;/java&gt;</END>\r
-                               </SPAN>\r
-                               -->\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
-                               <!-- All markup defaults to JHTML. -->\r
-               <SPAN TYPE="MARKUP" DELEGATE="JHTML">\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="JHTML" DEFAULT="MARKUP">\r
-               <!-- SGML comment -->\r
-               <SPAN TYPE="COMMENT1">\r
-                       <BEGIN>&lt;!--</BEGIN>\r
-                       <END>--&gt;</END>\r
-               </SPAN>\r
-\r
-               <SPAN TYPE="LITERAL1" DELEGATE="ATTRVALUE">\r
-                       <BEGIN>"</BEGIN>\r
-                       <END>"</END>\r
-               </SPAN>\r
-\r
-               <SPAN TYPE="LITERAL1" DELEGATE="ATTRVALUE">\r
-                       <BEGIN>'</BEGIN>\r
-                       <END>'</END>\r
-               </SPAN>\r
-\r
-               <SEQ TYPE="MARKUP">/</SEQ>\r
-\r
-               <KEYWORDS>\r
-                       <KEYWORD1>importbean</KEYWORD1>\r
-                       <KEYWORD1>droplet</KEYWORD1>\r
-                       <KEYWORD1>param</KEYWORD1>\r
-                       <KEYWORD1>oparam</KEYWORD1>\r
-                       <KEYWORD1>valueof</KEYWORD1>\r
-                       <KEYWORD1>setvalue</KEYWORD1>\r
-                       <KEYWORD1>servlet</KEYWORD1>\r
-                       <KEYWORD2>bean</KEYWORD2>\r
-                       <KEYWORD2>submitvalue</KEYWORD2>\r
-                       <KEYWORD2>declareparam</KEYWORD2>\r
-                       <KEYWORD2>synchronized</KEYWORD2>\r
-                       <KEYWORD2>priority</KEYWORD2>\r
-\r
-                       <!-- standard converters -->\r
-                       <KEYWORD2>converter</KEYWORD2>\r
-                       <KEYWORD2>date</KEYWORD2>\r
-                       <KEYWORD2>number</KEYWORD2>\r
-                       <KEYWORD2>required</KEYWORD2>\r
-                       <KEYWORD2>nullable</KEYWORD2>\r
-                       <KEYWORD2>currency</KEYWORD2>\r
-                       <KEYWORD2>currencyConversion</KEYWORD2>\r
-                       <KEYWORD2>euro</KEYWORD2>\r
-                       <KEYWORD2>locale</KEYWORD2>\r
-                       <KEYWORD2>symbol</KEYWORD2>\r
-\r
-                       <!-- Can't use this because of image src... -->\r
-                       <!-- <KEYWORD2>src</KEYWORD2> -->\r
-               </KEYWORDS>\r
-       </RULES>\r
-\r
-       <RULES SET="ATTRVALUE" DEFAULT="LITERAL1" HIGHLIGHT_DIGITS="TRUE">\r
-               <!-- backticks are java -->\r
-               <SPAN TYPE="MARKUP" DELEGATE="java::MAIN">\r
-                       <BEGIN>`</BEGIN>\r
-                       <END>`</END>\r
-               </SPAN>\r
-\r
-                               <!-- Allow param: and bean: properties to be marked up -->\r
-                               <SEQ TYPE="LABEL">param:</SEQ>\r
-                               <SEQ TYPE="LABEL">bean:</SEQ>\r
-       </RULES>\r
-\r
-</MODE>\r
+<?xml version="1.0"?>
+
+<!DOCTYPE MODE SYSTEM "xmode.dtd">
+
+<!--
+  JHTML mode by Will Sargent <wsargent@atg.com>
+-->
+
+<MODE>
+       <PROPS>
+               <PROPERTY NAME="commentStart" VALUE="&lt;!--" />
+               <PROPERTY NAME="commentEnd" VALUE="--&gt;" />
+                               <!-- Indent droplets and oparams -->
+                               <PROPERTY NAME="indentNextLines"
+                                VALUE="\s*(&lt;\s*(droplet|oparam))\s+.*" />
+                               <!-- Sadly, there doesn't seem to be a way to
+                                        undent when we see a /oparam> tag... -->
+       </PROPS>
+       <RULES IGNORE_CASE="TRUE">
+                               <!-- Allow for Dynamo SSI -->
+                               <SPAN TYPE="NULL">
+                       <BEGIN>&lt;!--#</BEGIN>
+                       <END>--&gt;</END>
+                               </SPAN>
+
+               <!-- SGML comment -->
+               <SPAN TYPE="COMMENT1">
+                       <BEGIN>&lt;!--</BEGIN>
+                       <END>--&gt;</END>
+               </SPAN>
+
+               <!-- markup tags -->
+               <SPAN TYPE="MARKUP" DELEGATE="java::MAIN">
+                       <BEGIN>`</BEGIN>
+                       <END>`</END>
+               </SPAN>
+
+                               <!-- Embedded Java -->
+               <SPAN TYPE="MARKUP" DELEGATE="java::MAIN">
+                       <BEGIN>&lt;java&gt;</BEGIN>
+                       <END>&lt;/java&gt;</END>
+               </SPAN>
+
+                               <!-- Don't know how to do this correctly.
+                               <SPAN TYPE="MARKUP" DELEGATE="java::MAIN">
+                                               <BEGIN>&lt;java type=</BEGIN>
+                                               <END>&lt;/java&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>
+
+                               <!-- All markup defaults to JHTML. -->
+               <SPAN TYPE="MARKUP" DELEGATE="JHTML">
+                       <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="JHTML" DEFAULT="MARKUP">
+               <!-- SGML comment -->
+               <SPAN TYPE="COMMENT1">
+                       <BEGIN>&lt;!--</BEGIN>
+                       <END>--&gt;</END>
+               </SPAN>
+
+               <SPAN TYPE="LITERAL1" DELEGATE="ATTRVALUE">
+                       <BEGIN>"</BEGIN>
+                       <END>"</END>
+               </SPAN>
+
+               <SPAN TYPE="LITERAL1" DELEGATE="ATTRVALUE">
+                       <BEGIN>'</BEGIN>
+                       <END>'</END>
+               </SPAN>
+
+               <SEQ TYPE="MARKUP">/</SEQ>
+
+               <KEYWORDS>
+                       <KEYWORD1>importbean</KEYWORD1>
+                       <KEYWORD1>droplet</KEYWORD1>
+                       <KEYWORD1>param</KEYWORD1>
+                       <KEYWORD1>oparam</KEYWORD1>
+                       <KEYWORD1>valueof</KEYWORD1>
+                       <KEYWORD1>setvalue</KEYWORD1>
+                       <KEYWORD1>servlet</KEYWORD1>
+                       <KEYWORD2>bean</KEYWORD2>
+                       <KEYWORD2>submitvalue</KEYWORD2>
+                       <KEYWORD2>declareparam</KEYWORD2>
+                       <KEYWORD2>synchronized</KEYWORD2>
+                       <KEYWORD2>priority</KEYWORD2>
+
+                       <!-- standard converters -->
+                       <KEYWORD2>converter</KEYWORD2>
+                       <KEYWORD2>date</KEYWORD2>
+                       <KEYWORD2>number</KEYWORD2>
+                       <KEYWORD2>required</KEYWORD2>
+                       <KEYWORD2>nullable</KEYWORD2>
+                       <KEYWORD2>currency</KEYWORD2>
+                       <KEYWORD2>currencyConversion</KEYWORD2>
+                       <KEYWORD2>euro</KEYWORD2>
+                       <KEYWORD2>locale</KEYWORD2>
+                       <KEYWORD2>symbol</KEYWORD2>
+
+                       <!-- Can't use this because of image src... -->
+                       <!-- <KEYWORD2>src</KEYWORD2> -->
+               </KEYWORDS>
+       </RULES>
+
+       <RULES SET="ATTRVALUE" DEFAULT="LITERAL1" HIGHLIGHT_DIGITS="TRUE">
+               <!-- backticks are java -->
+               <SPAN TYPE="MARKUP" DELEGATE="java::MAIN">
+                       <BEGIN>`</BEGIN>
+                       <END>`</END>
+               </SPAN>
+
+                               <!-- Allow param: and bean: properties to be marked up -->
+                               <SEQ TYPE="LABEL">param:</SEQ>
+                               <SEQ TYPE="LABEL">bean:</SEQ>
+       </RULES>
+
+</MODE>