xmode: update xmode.dtd

diff --git a/basis/xmode/xmode.dtd b/basis/xmode/xmode.dtd
index d96df445fa4cf1cd58396c4b8df7f2b77e9768b3..d00507070f82359e18cb8e07fc301da94b9131c2 100644 (file)
--- a/basis/xmode/xmode.dtd
+++ b/basis/xmode/xmode.dtd
@@ -1,166 +1,167 @@
-<!-- Syntax tokens -->\r
-<!ENTITY % token_values "NULL | COMMENT1 | COMMENT2 | COMMENT3 | COMMENT4 |\r
-       DIGIT | FUNCTION | INVALID | KEYWORD1 | KEYWORD2 | KEYWORD3 | KEYWORD4 |\r
-       LABEL | LITERAL1 | LITERAL2 | LITERAL3 | LITERAL4 | MARKUP | OPERATOR" >\r
-<!ENTITY % tokens "( %token_values; )" >\r
-\r
-<!-- Entities for attributes shared by multiple rules -->\r
-<!ENTITY % att-bool '( TRUE | FALSE ) #IMPLIED' >\r
-<!ENTITY % att-type 'TYPE %tokens; #IMPLIED' >\r
-<!ENTITY % att-position-mix 'AT_LINE_START %att-bool;\r
-       AT_WHITESPACE_END %att-bool;\r
-       AT_WORD_START %att-bool; ' >\r
-<!ENTITY % att-match-type 'MATCH_TYPE ( %token_values; | CONTEXT | RULE ) #IMPLIED' >\r
-<!ENTITY % att-delegate 'DELEGATE CDATA #IMPLIED' >\r
-<!ENTITY % att-span-mix 'NO_LINE_BREAK %att-bool;\r
-       NO_WORD_BREAK %att-bool;\r
-       NO_ESCAPE %att-bool; '>\r
-<!ENTITY % att-hash-char 'HASH_CHAR CDATA #IMPLIED\r
-       HASH_CHARS CDATA #IMPLIED' >\r
-\r
-<!-- MODE element -->\r
-<!ELEMENT MODE ( PROPS?, RULES* ) >\r
-\r
-<!-- MODE children -->\r
-<!-- PROPS element -->\r
-<!ELEMENT PROPS ( PROPERTY+ ) >\r
-\r
-<!-- PROPS children -->\r
-<!ELEMENT PROPERTY EMPTY >\r
-<!ATTLIST PROPERTY\r
-       NAME CDATA #REQUIRED\r
-       VALUE CDATA #REQUIRED >\r
-\r
-<!-- RULES element -->\r
-<!ELEMENT RULES ( PROPS?, ( IMPORT | TERMINATE | SEQ | SEQ_REGEXP | SPAN\r
-       | SPAN_REGEXP | EOL_SPAN | EOL_SPAN_REGEXP | MARK_PREVIOUS\r
-       | MARK_FOLLOWING )*, KEYWORDS? ) >\r
-\r
-<!-- RULES attributes -->\r
-<!ATTLIST RULES\r
-       SET CDATA #IMPLIED\r
-       IGNORE_CASE %att-bool;\r
-       HIGHLIGHT_DIGITS %att-bool;\r
-       DIGIT_RE CDATA #IMPLIED\r
-       ESCAPE CDATA #IMPLIED\r
-       DEFAULT %tokens; #IMPLIED\r
-       NO_WORD_SEP CDATA #IMPLIED >\r
-\r
-<!-- IMPORT element -->\r
-<!ELEMENT IMPORT EMPTY >\r
-<!ATTLIST IMPORT DELEGATE CDATA #REQUIRED >\r
-\r
-<!-- TERMINATE element -->\r
-<!ELEMENT TERMINATE EMPTY >\r
-<!ATTLIST TERMINATE AT_CHAR CDATA #REQUIRED >\r
-\r
-<!-- SEQ element -->\r
-<!ELEMENT SEQ ( #PCDATA ) >\r
-\r
-<!-- SEQ attributes -->\r
-<!ATTLIST SEQ\r
-       %att-type;\r
-       %att-position-mix;\r
-       %att-delegate; >\r
-\r
-<!-- SEQ_REGEXP element -->\r
-<!ELEMENT SEQ_REGEXP ( #PCDATA ) >\r
-\r
-<!-- SEQ_REGEXP attributes -->\r
-<!ATTLIST SEQ_REGEXP\r
-       %att-hash-char;\r
-       %att-type;\r
-       %att-position-mix;\r
-       %att-delegate; >\r
-\r
-<!-- SPAN element -->\r
-<!ELEMENT SPAN ( BEGIN, END ) >\r
-\r
-<!-- SPAN attributes -->\r
-<!ATTLIST SPAN\r
-       %att-type;\r
-       %att-position-mix;\r
-       %att-span-mix;\r
-       %att-match-type;\r
-       %att-delegate; >\r
-\r
-<!-- SPAN_REGEXP element -->\r
-<!ELEMENT SPAN_REGEXP ( BEGIN, END ) >\r
-\r
-<!-- SPAN_REGEXP attributes -->\r
-<!ATTLIST SPAN_REGEXP\r
-       %att-hash-char;\r
-       %att-type;\r
-       %att-position-mix;\r
-       %att-span-mix;\r
-       %att-match-type;\r
-       %att-delegate; >\r
-\r
-<!-- SPAN and SPAN_REGEXP children -->\r
-<!ELEMENT BEGIN ( #PCDATA ) >\r
-<!ATTLIST BEGIN %att-position-mix; >\r
-<!ELEMENT END ( #PCDATA ) >\r
-<!ATTLIST END %att-position-mix; >\r
-\r
-<!-- EOL_SPAN element -->\r
-<!ELEMENT EOL_SPAN ( #PCDATA ) >\r
-\r
-<!-- EOL_SPAN attributes -->\r
-<!ATTLIST EOL_SPAN\r
-       %att-type;\r
-       %att-position-mix;\r
-       %att-match-type;\r
-       %att-delegate; >\r
-\r
-<!-- EOL_SPAN_REGEXP element -->\r
-<!ELEMENT EOL_SPAN_REGEXP ( #PCDATA ) >\r
-\r
-<!-- EOL_SPAN_REGEXP attributes -->\r
-<!ATTLIST EOL_SPAN_REGEXP\r
-       %att-hash-char;\r
-       %att-type;\r
-       %att-position-mix;\r
-       %att-match-type;\r
-       %att-delegate; >\r
-\r
-<!-- MARK_FOLLOWING element -->\r
-<!ELEMENT MARK_FOLLOWING ( #PCDATA ) >\r
-\r
-<!-- MARK_FOLLOWING attributes -->\r
-<!ATTLIST MARK_FOLLOWING\r
-       %att-type;\r
-       %att-position-mix;\r
-       %att-match-type; >\r
-\r
-<!-- MARK_PREVIOUS element -->\r
-<!ELEMENT MARK_PREVIOUS ( #PCDATA ) >\r
-\r
-<!-- MARK_PREVIOUS attributes -->\r
-<!ATTLIST MARK_PREVIOUS\r
-       %att-type;\r
-       %att-position-mix;\r
-       %att-match-type; >\r
-\r
-<!-- KEYWORDS element -->\r
-<!ELEMENT KEYWORDS (%tokens;)+ >\r
-\r
-<!-- KEYWORDS children -->\r
-<!ELEMENT COMMENT1 ( #PCDATA ) >\r
-<!ELEMENT COMMENT2 ( #PCDATA ) >\r
-<!ELEMENT COMMENT3 ( #PCDATA ) >\r
-<!ELEMENT COMMENT4 ( #PCDATA ) >\r
-<!ELEMENT DIGIT ( #PCDATA ) >\r
-<!ELEMENT FUNCTION ( #PCDATA ) >\r
-<!ELEMENT KEYWORD1 ( #PCDATA ) >\r
-<!ELEMENT KEYWORD2 ( #PCDATA ) >\r
-<!ELEMENT KEYWORD3 ( #PCDATA ) >\r
-<!ELEMENT KEYWORD4 ( #PCDATA ) >\r
-<!ELEMENT LABEL ( #PCDATA ) >\r
-<!ELEMENT LITERAL1 ( #PCDATA ) >\r
-<!ELEMENT LITERAL2 ( #PCDATA ) >\r
-<!ELEMENT LITERAL3 ( #PCDATA ) >\r
-<!ELEMENT LITERAL4 ( #PCDATA ) >\r
-<!ELEMENT MARKUP ( #PCDATA ) >\r
-<!ELEMENT NULL ( #PCDATA ) >\r
-<!ELEMENT OPERATOR ( #PCDATA ) >\r
-<!ELEMENT INVALID ( #PCDATA ) >\r
+<!-- Syntax tokens -->
+<!ENTITY % token_values "NULL | COMMENT1 | COMMENT2 | COMMENT3 | COMMENT4 |
+       DIGIT | FUNCTION | INVALID | KEYWORD1 | KEYWORD2 | KEYWORD3 | KEYWORD4 |
+       LABEL | LITERAL1 | LITERAL2 | LITERAL3 | LITERAL4 | MARKUP | OPERATOR" >
+<!ENTITY % tokens "( %token_values; )" >
+
+<!-- Entities for attributes shared by multiple rules -->
+<!ENTITY % att-bool '( TRUE | FALSE ) #IMPLIED' >
+<!ENTITY % att-type 'TYPE %tokens; #IMPLIED' >
+<!ENTITY % att-position-mix 'AT_LINE_START %att-bool;
+       AT_WHITESPACE_END %att-bool;
+       AT_WORD_START %att-bool; ' >
+<!ENTITY % att-match-type 'MATCH_TYPE ( %token_values; | CONTEXT | RULE ) #IMPLIED' >
+<!ENTITY % att-delegate 'DELEGATE CDATA #IMPLIED' >
+<!ENTITY % att-span-mix 'NO_LINE_BREAK %att-bool;
+       NO_WORD_BREAK %att-bool;
+    ESCAPE CDATA #IMPLIED '>
+<!ENTITY % att-hash-char 'HASH_CHAR CDATA #IMPLIED
+       HASH_CHARS CDATA #IMPLIED' >
+
+<!-- MODE element -->
+<!ELEMENT MODE ( PROPS?, RULES* ) >
+
+<!-- MODE children -->
+<!-- PROPS element -->
+<!ELEMENT PROPS ( PROPERTY+ ) >
+
+<!-- PROPS children -->
+<!ELEMENT PROPERTY EMPTY >
+<!ATTLIST PROPERTY
+       NAME CDATA #REQUIRED
+       VALUE CDATA #REQUIRED >
+
+<!-- RULES element -->
+<!ELEMENT RULES ( PROPS?, ( IMPORT | TERMINATE | SEQ | SEQ_REGEXP | SPAN
+       | SPAN_REGEXP | EOL_SPAN | EOL_SPAN_REGEXP | MARK_PREVIOUS
+       | MARK_FOLLOWING )*, KEYWORDS? ) >
+
+<!-- RULES attributes -->
+<!ATTLIST RULES
+       SET CDATA #IMPLIED
+       IGNORE_CASE %att-bool;
+       HIGHLIGHT_DIGITS %att-bool;
+       DIGIT_RE CDATA #IMPLIED
+       ESCAPE CDATA #IMPLIED
+       DEFAULT %tokens; #IMPLIED
+       NO_WORD_SEP CDATA #IMPLIED >
+
+<!-- IMPORT element -->
+<!ELEMENT IMPORT EMPTY >
+<!ATTLIST IMPORT DELEGATE CDATA #REQUIRED >
+
+<!-- TERMINATE element -->
+<!ELEMENT TERMINATE EMPTY >
+<!ATTLIST TERMINATE AT_CHAR CDATA #REQUIRED >
+
+<!-- SEQ element -->
+<!ELEMENT SEQ ( #PCDATA ) >
+
+<!-- SEQ attributes -->
+<!ATTLIST SEQ
+       %att-type;
+       %att-position-mix;
+       %att-delegate; >
+
+<!-- SEQ_REGEXP element -->
+<!ELEMENT SEQ_REGEXP ( #PCDATA ) >
+
+<!-- SEQ_REGEXP attributes -->
+<!ATTLIST SEQ_REGEXP
+       %att-hash-char;
+       %att-type;
+       %att-position-mix;
+       %att-delegate; >
+
+<!-- SPAN element -->
+<!ELEMENT SPAN ( BEGIN, END ) >
+
+<!-- SPAN attributes -->
+<!ATTLIST SPAN
+       %att-type;
+       %att-position-mix;
+       %att-span-mix;
+       %att-match-type;
+       %att-delegate; >
+
+<!-- SPAN_REGEXP element -->
+<!ELEMENT SPAN_REGEXP ( BEGIN, END ) >
+
+<!-- SPAN_REGEXP attributes -->
+<!ATTLIST SPAN_REGEXP
+       %att-hash-char;
+       %att-type;
+       %att-position-mix;
+       %att-span-mix;
+       %att-match-type;
+       %att-delegate; >
+
+<!-- SPAN and SPAN_REGEXP children -->
+<!ELEMENT BEGIN ( #PCDATA ) >
+<!ELEMENT END ( #PCDATA ) >
+<!ATTLIST END
+       %att-position-mix;
+       REGEXP %att-bool; >
+
+<!-- EOL_SPAN element -->
+<!ELEMENT EOL_SPAN ( #PCDATA ) >
+
+<!-- EOL_SPAN attributes -->
+<!ATTLIST EOL_SPAN
+       %att-type;
+       %att-position-mix;
+       %att-match-type;
+       %att-delegate; >
+
+<!-- EOL_SPAN_REGEXP element -->
+<!ELEMENT EOL_SPAN_REGEXP ( #PCDATA ) >
+
+<!-- EOL_SPAN_REGEXP attributes -->
+<!ATTLIST EOL_SPAN_REGEXP
+       %att-hash-char;
+       %att-type;
+       %att-position-mix;
+       %att-match-type;
+       %att-delegate; >
+
+<!-- MARK_FOLLOWING element -->
+<!ELEMENT MARK_FOLLOWING ( #PCDATA ) >
+
+<!-- MARK_FOLLOWING attributes -->
+<!ATTLIST MARK_FOLLOWING
+       %att-type;
+       %att-position-mix;
+       %att-match-type; >
+
+<!-- MARK_PREVIOUS element -->
+<!ELEMENT MARK_PREVIOUS ( #PCDATA ) >
+
+<!-- MARK_PREVIOUS attributes -->
+<!ATTLIST MARK_PREVIOUS
+       %att-type;
+       %att-position-mix;
+       %att-match-type; >
+
+<!-- KEYWORDS element -->
+<!ELEMENT KEYWORDS (%tokens;)+ >
+
+<!-- KEYWORDS children -->
+<!ELEMENT COMMENT1 ( #PCDATA ) >
+<!ELEMENT COMMENT2 ( #PCDATA ) >
+<!ELEMENT COMMENT3 ( #PCDATA ) >
+<!ELEMENT COMMENT4 ( #PCDATA ) >
+<!ELEMENT DIGIT ( #PCDATA ) >
+<!ELEMENT FUNCTION ( #PCDATA ) >
+<!ELEMENT KEYWORD1 ( #PCDATA ) >
+<!ELEMENT KEYWORD2 ( #PCDATA ) >
+<!ELEMENT KEYWORD3 ( #PCDATA ) >
+<!ELEMENT KEYWORD4 ( #PCDATA ) >
+<!ELEMENT LABEL ( #PCDATA ) >
+<!ELEMENT LITERAL1 ( #PCDATA ) >
+<!ELEMENT LITERAL2 ( #PCDATA ) >
+<!ELEMENT LITERAL3 ( #PCDATA ) >
+<!ELEMENT LITERAL4 ( #PCDATA ) >
+<!ELEMENT MARKUP ( #PCDATA ) >
+<!ELEMENT NULL ( #PCDATA ) >
+<!ELEMENT OPERATOR ( #PCDATA ) >
+<!ELEMENT INVALID ( #PCDATA ) >