simplified "lexer.test..." macros using the $$ return command

 * this is slightly more efficient than using repeated conditionals
 * the last :EN does not require a conditional, as its return
   value can simply be forwarded.
 * even without $$, this could have been done easier using
   a once-only loop and breaking out of the loop if :EN fails using :;.
   The last :EN result is still stored in QReg "_".
 * :EN could also be used to match header lines if lexer.tes would
   leave the first line (header line) in some Q-Reg, like the local
   .[header].
   However, repeated :ENs would be necessary as globbing currently
   does not support {...,...} expansions.
   Since sooner or later, the header line must be evaluated for some
   lexer.set macro, this is probably more efficient than the current
   solution using SciTECO patterns and [lexer.checkheader] could be removed
   as well.

42 files changed, 186 insertions, 186 deletions

diff --git a/lib/lexers/abaqus.tes b/lib/lexers/abaqus.tes
index 3c522ca..48f6431 100644
--- a/lib/lexers/abaqus.tes
+++ b/lib/lexers/abaqus.tes
@@ -1,10 +1,10 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.abaqus]{
-  :EN*.inpQ*U.r
-  Q.r"F :EN*.datQ*U.r '
-  Q.r"F :EN*.msgQ*U.r '
-Q.r}
+  :EN*.inpQ*"S -1 '
+  :EN*.datQ*"S -1 '
+  :EN*.msgQ*
+}
 
 @[lexer.set.abaqus]{
   ESSETLEXERLANGUAGEabaqus
diff --git a/lib/lexers/ada.tes b/lib/lexers/ada.tes
index 6183052..f972f15 100644
--- a/lib/lexers/ada.tes
+++ b/lib/lexers/ada.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.ada]{
-  :EN*.adsQ*U.r
-  Q.r"F :EN*.adbQ*U.r '
-Q.r}
+  :EN*.adsQ*"S -1 '
+  :EN*.adbQ*
+}
 
 @[lexer.set.ada]{
   ESSETLEXERLANGUAGEada
diff --git a/lib/lexers/asl.tes b/lib/lexers/asl.tes
index 425260e..342cd35 100644
--- a/lib/lexers/asl.tes
+++ b/lib/lexers/asl.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.asl]{
-  :EN*.aslQ*U.r
-  Q.r"F :EN*.dslQ*U.r '
-Q.r}
+  :EN*.aslQ*"S -1 '
+  :EN*.dslQ*
+}
 
 @[lexer.set.asl]{
   ESSETLEXERLANGUAGEcpp
diff --git a/lib/lexers/avs.tes b/lib/lexers/avs.tes
index f783c5b..ca652bd 100644
--- a/lib/lexers/avs.tes
+++ b/lib/lexers/avs.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.avs]{
-  :EN*.avsQ*U.r
-  Q.r"F :EN*.avsiQ*U.r '
-Q.r}
+  :EN*.avsQ*"S -1 '
+  :EN*.avsiQ*
+}
 
 @[lexer.set.avs]{
   ESSETLEXERLANGUAGEavs
diff --git a/lib/lexers/baan.tes b/lib/lexers/baan.tes
index 2b33d84..4d5b9d6 100644
--- a/lib/lexers/baan.tes
+++ b/lib/lexers/baan.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.baan]{
-  :EN*.bcQ*U.r
-  Q.r"F :EN*.clnQ*U.r '
-Q.r}
+  :EN*.bcQ*"S -1 '
+  :EN*.clnQ*
+}
 
 @[lexer.set.baan]{
   ESSETLEXERLANGUAGEbaan
diff --git a/lib/lexers/bash.tes b/lib/lexers/bash.tes
index b93a3c4..b66d6e3 100644
--- a/lib/lexers/bash.tes
+++ b/lib/lexers/bash.tes
@@ -3,12 +3,12 @@
   internally !
 
 @[lexer.test.bash]{
-  _#!M[sh,bash,ksh]M[lexer.checkheader]U.r
-  Q.r"F :EN*.shQ*U.r '
-  Q.r"F :EN*.bshQ*U.r '
-  Q.r"F :EN*/configureQ*U.r '
-  Q.r"F :EN*.kshQ*U.r '
-Q.r}
+  _#!M[sh,bash,ksh]M[lexer.checkheader]"S -1 '
+  :EN*.shQ*"S -1 '
+  :EN*.bshQ*"S -1 '
+  :EN*/configureQ*"S -1 '
+  :EN*.kshQ*
+}
 
 @[lexer.set.bash]{
   ESSETLEXERLANGUAGEbash
diff --git a/lib/lexers/batch.tes b/lib/lexers/batch.tes
index 204687c..0a9890d 100644
--- a/lib/lexers/batch.tes
+++ b/lib/lexers/batch.tes
@@ -1,10 +1,10 @@
 ! DOS, Windows, OS/2 Batch Files !
 
 @[lexer.test.batch]{
-  :EN*.batQ*U.r
-  Q.r"F :EN*.cmdQ*U.r '
-  Q.r"F :EN*.ntQ*U.r '
-Q.r}
+  :EN*.batQ*"S -1 '
+  :EN*.cmdQ*"S -1 '
+  :EN*.ntQ*
+}
 
 @[lexer.set.batch]{
   ESSETLEXERLANGUAGEbatch
diff --git a/lib/lexers/caml.tes b/lib/lexers/caml.tes
index dcbca11..d7b1838 100644
--- a/lib/lexers/caml.tes
+++ b/lib/lexers/caml.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.caml]{
-  :EN*.mlQ*U.r
-  Q.r"F :EN*.mliQ*U.r '
-Q.r}
+  :EN*.mlQ*"S -1 '
+  :EN*.mliQ*
+}
 
 @[lexer.set.caml]{
   ESSETLEXERLANGUAGEcaml
diff --git a/lib/lexers/ch.tes b/lib/lexers/ch.tes
index efd876f..6781659 100644
--- a/lib/lexers/ch.tes
+++ b/lib/lexers/ch.tes
@@ -1,10 +1,10 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.ch]{
-  :EN*.chQ*U.r
-  Q.r"F :EN*.chfQ*U.r '
-  Q.r"F :EN*.chsQ*U.r '
-Q.r}
+  :EN*.chQ*"S -1 '
+  :EN*.chfQ*"S -1 '
+  :EN*.chsQ*
+}
 
 @[lexer.set.ch]{
   ESSETLEXERLANGUAGEcpp
diff --git a/lib/lexers/cmake.tes b/lib/lexers/cmake.tes
index 2fa08d1..14d5a15 100644
--- a/lib/lexers/cmake.tes
+++ b/lib/lexers/cmake.tes
@@ -1,10 +1,10 @@
 ! CMake Lexing !
 
 @[lexer.test.cmake]{
-  :EN*/CMakeLists.txtQ*U.r
-  Q.r"F :EN*.cmake*Q*U.r '
-  Q.r"F :EN*.ctest*Q*U.r '
-Q.r}
+  :EN*/CMakeLists.txtQ*"S -1 '
+  :EN*.cmake*Q*"S -1 '
+  :EN*.ctest*Q*
+}
 
 @[lexer.set.cmake]{
   ESSETLEXERLANGUAGEcmake
diff --git a/lib/lexers/cpp.tes b/lib/lexers/cpp.tes
index 1f8f49e..4a3a181 100644
--- a/lib/lexers/cpp.tes
+++ b/lib/lexers/cpp.tes
@@ -1,19 +1,19 @@
 ! C/C++ Lexing !
 
 @[lexer.test.cpp]{
-  :EN*.cQ*U.r
-  Q.r"F :EN*.ccQ*U.r '
-  Q.r"F :EN*.cppQ*U.r '
-  Q.r"F :EN*.cxxQ*U.r '
-  Q.r"F :EN*.hQ*U.r '
-  Q.r"F :EN*.hhQ*U.r '
-  Q.r"F :EN*.hppQ*U.r '
-  Q.r"F :EN*.hxxQ*U.r '
-  Q.r"F :EN*.ippQ*U.r '
-  Q.r"F :EN*.mQ*U.r '
-  Q.r"F :EN*.mmQ*U.r '
-  Q.r"F :EN*.smaQ*U.r '
-Q.r}
+  :EN*.cQ*"S -1 '
+  :EN*.ccQ*"S -1 '
+  :EN*.cppQ*"S -1 '
+  :EN*.cxxQ*"S -1 '
+  :EN*.hQ*"S -1 '
+  :EN*.hhQ*"S -1 '
+  :EN*.hppQ*"S -1 '
+  :EN*.hxxQ*"S -1 '
+  :EN*.ippQ*"S -1 '
+  :EN*.mQ*"S -1 '
+  :EN*.mmQ*"S -1 '
+  :EN*.smaQ*
+}
 
 @[lexer.set.cpp]{
   ESSETLEXERLANGUAGEcpp
diff --git a/lib/lexers/diff.tes b/lib/lexers/diff.tes
index ae9ba7e..ff3c6af 100644
--- a/lib/lexers/diff.tes
+++ b/lib/lexers/diff.tes
@@ -1,9 +1,9 @@
 ! Patch/Diff Files !
 
 @[lexer.test.diff]{
-  :EN*.diffQ*U.r
-  Q.r"F :EN*.patchQ*U.r '
-Q.r}
+  :EN*.diffQ*"S -1 '
+  :EN*.patchQ*
+}
 
 @[lexer.set.diff]{
   ESSETLEXERLANGUAGEdiff
diff --git a/lib/lexers/f77.tes b/lib/lexers/f77.tes
index 93c6726..22e7ca1 100644
--- a/lib/lexers/f77.tes
+++ b/lib/lexers/f77.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.f77]{
-  :EN*.fQ*U.r
-  Q.r"F :EN*.forQ*U.r '
-Q.r}
+  :EN*.fQ*"S -1 '
+  :EN*.forQ*
+}
 
 @[lexer.set.f77]{
   ESSETLEXERLANGUAGEf77
diff --git a/lib/lexers/f95.tes b/lib/lexers/f95.tes
index b68a3ce..73cc766 100644
--- a/lib/lexers/f95.tes
+++ b/lib/lexers/f95.tes
@@ -1,10 +1,10 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.f95]{
-  :EN*.f90Q*U.r
-  Q.r"F :EN*.f95Q*U.r '
-  Q.r"F :EN*.f2kQ*U.r '
-Q.r}
+  :EN*.f90Q*"S -1 '
+  :EN*.f95Q*"S -1 '
+  :EN*.f2kQ*
+}
 
 @[lexer.set.f95]{
   ESSETLEXERLANGUAGEfortran
diff --git a/lib/lexers/flash.tes b/lib/lexers/flash.tes
index 7034613..8e9b83f 100644
--- a/lib/lexers/flash.tes
+++ b/lib/lexers/flash.tes
@@ -1,10 +1,10 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.flash]{
-  :EN*.asQ*U.r
-  Q.r"F :EN*.ascQ*U.r '
-  Q.r"F :EN*.jsflQ*U.r '
-Q.r}
+  :EN*.asQ*"S -1 '
+  :EN*.ascQ*"S -1 '
+  :EN*.jsflQ*
+}
 
 @[lexer.set.flash]{
   ESSETLEXERLANGUAGEcpp
diff --git a/lib/lexers/freebasic.tes b/lib/lexers/freebasic.tes
index 83b6d8f..2e15ed3 100644
--- a/lib/lexers/freebasic.tes
+++ b/lib/lexers/freebasic.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.freebasic]{
-  :EN*.basQ*U.r
-  Q.r"F :EN*.biQ*U.r '
-Q.r}
+  :EN*.basQ*"S -1 '
+  :EN*.biQ*
+}
 
 @[lexer.set.freebasic]{
   ESSETLEXERLANGUAGEfreebasic
diff --git a/lib/lexers/gap.tes b/lib/lexers/gap.tes
index d0534ef..75985f4 100644
--- a/lib/lexers/gap.tes
+++ b/lib/lexers/gap.tes
@@ -1,10 +1,10 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.gap]{
-  :EN*.gQ*U.r
-  Q.r"F :EN*.gdQ*U.r '
-  Q.r"F :EN*.giQ*U.r '
-Q.r}
+  :EN*.gQ*"S -1 '
+  :EN*.gdQ*"S -1 '
+  :EN*.giQ*
+}
 
 @[lexer.set.gap]{
   ESSETLEXERLANGUAGEgap
diff --git a/lib/lexers/html.tes b/lib/lexers/html.tes
index 6c111c2..79b6a4a 100644
--- a/lib/lexers/html.tes
+++ b/lib/lexers/html.tes
@@ -1,22 +1,22 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.html]{
-  :EN*.htmlQ*U.r
-  Q.r"F :EN*.htmQ*U.r '
-  Q.r"F :EN*.aspQ*U.r '
-  Q.r"F :EN*.shtmlQ*U.r '
-  Q.r"F :EN*.htdQ*U.r '
-  Q.r"F :EN*.jspQ*U.r '
-  Q.r"F :EN*.xhtmlQ*U.r '
-  Q.r"F :EN*.php3Q*U.r '
-  Q.r"F :EN*.phtmlQ*U.r '
-  Q.r"F :EN*.phpQ*U.r '
-  Q.r"F :EN*.httQ*U.r '
-  Q.r"F :EN*.cfmQ*U.r '
-  Q.r"F :EN*.tplQ*U.r '
-  Q.r"F :EN*.dtdQ*U.r '
-  Q.r"F :EN*.htaQ*U.r '
-Q.r}
+  :EN*.htmlQ*"S -1 '
+  :EN*.htmQ*"S -1 '
+  :EN*.aspQ*"S -1 '
+  :EN*.shtmlQ*"S -1 '
+  :EN*.htdQ*"S -1 '
+  :EN*.jspQ*"S -1 '
+  :EN*.xhtmlQ*"S -1 '
+  :EN*.php3Q*"S -1 '
+  :EN*.phtmlQ*"S -1 '
+  :EN*.phpQ*"S -1 '
+  :EN*.httQ*"S -1 '
+  :EN*.cfmQ*"S -1 '
+  :EN*.tplQ*"S -1 '
+  :EN*.dtdQ*"S -1 '
+  :EN*.htaQ*
+}
 
 @[lexer.set.html]{
   ESSETLEXERLANGUAGEhypertext
diff --git a/lib/lexers/idl.tes b/lib/lexers/idl.tes
index 1aedc51..fdfda09 100644
--- a/lib/lexers/idl.tes
+++ b/lib/lexers/idl.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.idl]{
-  :EN*.idlQ*U.r
-  Q.r"F :EN*.odlQ*U.r '
-Q.r}
+  :EN*.idlQ*"S -1 '
+  :EN*.odlQ*
+}
 
 @[lexer.set.idl]{
   ESSETLEXERLANGUAGEcpp
diff --git a/lib/lexers/inno.tes b/lib/lexers/inno.tes
index 51518df..ddd0e66 100644
--- a/lib/lexers/inno.tes
+++ b/lib/lexers/inno.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.inno]{
-  :EN*.issQ*U.r
-  Q.r"F :EN*.islQ*U.r '
-Q.r}
+  :EN*.issQ*"S -1 '
+  :EN*.islQ*
+}
 
 @[lexer.set.inno]{
   ESSETLEXERLANGUAGEinno
diff --git a/lib/lexers/java.tes b/lib/lexers/java.tes
index 5679aee..83560e5 100644
--- a/lib/lexers/java.tes
+++ b/lib/lexers/java.tes
@@ -1,10 +1,10 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.java]{
-  :EN*.javaQ*U.r
-  Q.r"F :EN*.jadQ*U.r '
-  Q.r"F :EN*.pdeQ*U.r '
-Q.r}
+  :EN*.javaQ*"S -1 '
+  :EN*.jadQ*"S -1 '
+  :EN*.pdeQ*
+}
 
 @[lexer.set.java]{
   ESSETLEXERLANGUAGEcpp
diff --git a/lib/lexers/js.tes b/lib/lexers/js.tes
index 809346c..5968f9c 100644
--- a/lib/lexers/js.tes
+++ b/lib/lexers/js.tes
@@ -1,10 +1,10 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.js]{
-  :EN*.jsQ*U.r
-  Q.r"F :EN*.esQ*U.r '
-  Q.r"F :EN*.jsonQ*U.r '
-Q.r}
+  :EN*.jsQ*"S -1 '
+  :EN*.esQ*"S -1 '
+  :EN*.jsonQ*
+}
 
 @[lexer.set.js]{
   ESSETLEXERLANGUAGEcpp
diff --git a/lib/lexers/lisp.tes b/lib/lexers/lisp.tes
index ed36193..e96ed41 100644
--- a/lib/lexers/lisp.tes
+++ b/lib/lexers/lisp.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.lisp]{
-  :EN*.lspQ*U.r
-  Q.r"F :EN*.lispQ*U.r '
-Q.r}
+  :EN*.lspQ*"S -1 '
+  :EN*.lispQ*
+}
 
 @[lexer.set.lisp]{
   ESSETLEXERLANGUAGElisp
diff --git a/lib/lexers/lua.tes b/lib/lexers/lua.tes
index 0976fd3..0330414 100644
--- a/lib/lexers/lua.tes
+++ b/lib/lexers/lua.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.lua]{
-  _#!M[lua,lua5.1,lua5.2]M[lexer.checkheader]U.r
-  Q.r"F :EN*.luaQ*U.r '
-Q.r}
+  _#!M[lua,lua5.1,lua5.2]M[lexer.checkheader]"S -1 '
+  :EN*.luaQ*
+}
 
 @[lexer.set.lua]{
   ESSETLEXERLANGUAGElua
diff --git a/lib/lexers/make.tes b/lib/lexers/make.tes
index f9dba5f..eb5c383 100644
--- a/lib/lexers/make.tes
+++ b/lib/lexers/make.tes
@@ -1,10 +1,10 @@
 ! Makefile Lexing !
 
 @[lexer.test.make]{
-  :EN*/MakefileQ*U.r
-  Q.r"F :EN*/makefileQ*U.r '
-  Q.r"F :EN*.makQ*U.r '
-Q.r}
+  :EN*/MakefileQ*"S -1 '
+  :EN*/makefileQ*"S -1 '
+  :EN*.makQ*
+}
 
 @[lexer.set.make]{
   ESSETLEXERLANGUAGEmakefile
diff --git a/lib/lexers/mako.tes b/lib/lexers/mako.tes
index 89ad1be..381f380 100644
--- a/lib/lexers/mako.tes
+++ b/lib/lexers/mako.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.mako]{
-  :EN*.makQ*U.r
-  Q.r"F :EN*.makoQ*U.r '
-Q.r}
+  :EN*.makQ*"S -1 '
+  :EN*.makoQ*
+}
 
 @[lexer.set.mako]{
   ESSETLEXERLANGUAGEhypertext
diff --git a/lib/lexers/pascal.tes b/lib/lexers/pascal.tes
index 20d1a51..e78f383 100644
--- a/lib/lexers/pascal.tes
+++ b/lib/lexers/pascal.tes
@@ -1,12 +1,12 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.pascal]{
-  :EN*.dprQ*U.r
-  Q.r"F :EN*.pasQ*U.r '
-  Q.r"F :EN*.dfmQ*U.r '
-  Q.r"F :EN*.incQ*U.r '
-  Q.r"F :EN*.ppQ*U.r '
-Q.r}
+  :EN*.dprQ*"S -1 '
+  :EN*.pasQ*"S -1 '
+  :EN*.dfmQ*"S -1 '
+  :EN*.incQ*"S -1 '
+  :EN*.ppQ*
+}
 
 @[lexer.set.pascal]{
   ESSETLEXERLANGUAGEpascal
diff --git a/lib/lexers/perl.tes b/lib/lexers/perl.tes
index 2ed1bd1..7c966b4 100644
--- a/lib/lexers/perl.tes
+++ b/lib/lexers/perl.tes
@@ -1,11 +1,11 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.perl]{
-  _#!M[perl,pl]M[lexer.checkheader]U.r
-  Q.r"F :EN*.plQ*U.r '
-  Q.r"F :EN*.pmQ*U.r '
-  Q.r"F :EN*.podQ*U.r '
-Q.r}
+  _#!M[perl,pl]M[lexer.checkheader]"S -1 '
+  :EN*.plQ*"S -1 '
+  :EN*.pmQ*"S -1 '
+  :EN*.podQ*
+}
 
 @[lexer.set.perl]{
   ESSETLEXERLANGUAGEperl
diff --git a/lib/lexers/php.tes b/lib/lexers/php.tes
index 85d8dc4..fe6acc3 100644
--- a/lib/lexers/php.tes
+++ b/lib/lexers/php.tes
@@ -1,10 +1,10 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.php]{
-  :EN*.php3Q*U.r
-  Q.r"F :EN*.phtmlQ*U.r '
-  Q.r"F :EN*.phpQ*U.r '
-Q.r}
+  :EN*.php3Q*"S -1 '
+  :EN*.phtmlQ*"S -1 '
+  :EN*.phpQ*
+}
 
 @[lexer.set.php]{
   ESSETLEXERLANGUAGEhypertext
diff --git a/lib/lexers/pov.tes b/lib/lexers/pov.tes
index 1a92000..133e70e 100644
--- a/lib/lexers/pov.tes
+++ b/lib/lexers/pov.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.pov]{
-  :EN*.povQ*U.r
-  Q.r"F :EN*.incQ*U.r '
-Q.r}
+  :EN*.povQ*"S -1 '
+  :EN*.incQ*
+}
 
 @[lexer.set.pov]{
   ESSETLEXERLANGUAGEpov
diff --git a/lib/lexers/r.tes b/lib/lexers/r.tes
index 48933f8..75f9a2f 100644
--- a/lib/lexers/r.tes
+++ b/lib/lexers/r.tes
@@ -1,10 +1,10 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.r]{
-  :EN*.RQ*U.r
-  Q.r"F :EN*.rsourceQ*U.r '
-  Q.r"F :EN*.SQ*U.r '
-Q.r}
+  :EN*.RQ*"S -1 '
+  :EN*.rsourceQ*"S -1 '
+  :EN*.SQ*
+}
 
 @[lexer.set.r]{
   ESSETLEXERLANGUAGEr
diff --git a/lib/lexers/rc.tes b/lib/lexers/rc.tes
index debea46..940a11b 100644
--- a/lib/lexers/rc.tes
+++ b/lib/lexers/rc.tes
@@ -1,10 +1,10 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.rc]{
-  :EN*.rcQ*U.r
-  Q.r"F :EN*.rc2Q*U.r '
-  Q.r"F :EN*.dlgQ*U.r '
-Q.r}
+  :EN*.rcQ*"S -1 '
+  :EN*.rc2Q*"S -1 '
+  :EN*.dlgQ*
+}
 
 @[lexer.set.rc]{
   ESSETLEXERLANGUAGEcpp
diff --git a/lib/lexers/rebol.tes b/lib/lexers/rebol.tes
index e01acca..c2555e8 100644
--- a/lib/lexers/rebol.tes
+++ b/lib/lexers/rebol.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.rebol]{
-  :EN*.rQ*U.r
-  Q.r"F :EN*.rebQ*U.r '
-Q.r}
+  :EN*.rQ*"S -1 '
+  :EN*.rebQ*
+}
 
 @[lexer.set.rebol]{
   ESSETLEXERLANGUAGErebol
diff --git a/lib/lexers/scheme.tes b/lib/lexers/scheme.tes
index 878c253..d56f45d 100644
--- a/lib/lexers/scheme.tes
+++ b/lib/lexers/scheme.tes
@@ -1,10 +1,10 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.scheme]{
-  :EN*.scmQ*U.r
-  Q.r"F :EN*.smdQ*U.r '
-  Q.r"F :EN*.ssQ*U.r '
-Q.r}
+  :EN*.scmQ*"S -1 '
+  :EN*.smdQ*"S -1 '
+  :EN*.ssQ*
+}
 
 @[lexer.set.scheme]{
   ESSETLEXERLANGUAGElisp
diff --git a/lib/lexers/spice.tes b/lib/lexers/spice.tes
index a0a55cb..4e15a95 100644
--- a/lib/lexers/spice.tes
+++ b/lib/lexers/spice.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.spice]{
-  :EN*.scpQ*U.r
-  Q.r"F :EN*.outQ*U.r '
-Q.r}
+  :EN*.scpQ*"S -1 '
+  :EN*.outQ*
+}
 
 @[lexer.set.spice]{
   ESSETLEXERLANGUAGEspice
diff --git a/lib/lexers/systemverilog.tes b/lib/lexers/systemverilog.tes
index 399e552..76e7aad 100644
--- a/lib/lexers/systemverilog.tes
+++ b/lib/lexers/systemverilog.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.systemverilog]{
-  :EN*.svQ*U.r
-  Q.r"F :EN*.svhQ*U.r '
-Q.r}
+  :EN*.svQ*"S -1 '
+  :EN*.svhQ*
+}
 
 @[lexer.set.systemverilog]{
   ESSETLEXERLANGUAGEverilog
diff --git a/lib/lexers/tcl.tes b/lib/lexers/tcl.tes
index b7310d9..13e1bb1 100644
--- a/lib/lexers/tcl.tes
+++ b/lib/lexers/tcl.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.tcl]{
-  :EN*.tclQ*U.r
-  Q.r"F :EN*.expQ*U.r '
-Q.r}
+  :EN*.tclQ*"S -1 '
+  :EN*.expQ*
+}
 
 @[lexer.set.tcl]{
   ESSETLEXERLANGUAGEtcl
diff --git a/lib/lexers/test.tes b/lib/lexers/test.tes
index 4d67d8c..9670b4c 100644
--- a/lib/lexers/test.tes
+++ b/lib/lexers/test.tes
@@ -1,10 +1,10 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.test]{
-  :EN*.plnQ*U.r
-  Q.r"F :EN*.incQ*U.r '
-  Q.r"F :EN*.tQ*U.r '
-Q.r}
+  :EN*.plnQ*"S -1 '
+  :EN*.incQ*"S -1 '
+  :EN*.tQ*
+}
 
 @[lexer.set.test]{
   ESSETLEXERLANGUAGEcpp
diff --git a/lib/lexers/vb.tes b/lib/lexers/vb.tes
index e4e06d3..bf8eae4 100644
--- a/lib/lexers/vb.tes
+++ b/lib/lexers/vb.tes
@@ -1,15 +1,15 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.vb]{
-  :EN*.vbQ*U.r
-  Q.r"F :EN*.basQ*U.r '
-  Q.r"F :EN*.frmQ*U.r '
-  Q.r"F :EN*.clsQ*U.r '
-  Q.r"F :EN*.ctlQ*U.r '
-  Q.r"F :EN*.pagQ*U.r '
-  Q.r"F :EN*.dsrQ*U.r '
-  Q.r"F :EN*.dobQ*U.r '
-Q.r}
+  :EN*.vbQ*"S -1 '
+  :EN*.basQ*"S -1 '
+  :EN*.frmQ*"S -1 '
+  :EN*.clsQ*"S -1 '
+  :EN*.ctlQ*"S -1 '
+  :EN*.pagQ*"S -1 '
+  :EN*.dsrQ*"S -1 '
+  :EN*.dobQ*
+}
 
 @[lexer.set.vb]{
   ESSETLEXERLANGUAGEvb
diff --git a/lib/lexers/verilog.tes b/lib/lexers/verilog.tes
index 354c60d..33e47a9 100644
--- a/lib/lexers/verilog.tes
+++ b/lib/lexers/verilog.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.verilog]{
-  :EN*.vQ*U.r
-  Q.r"F :EN*.vhQ*U.r '
-Q.r}
+  :EN*.vQ*"S -1 '
+  :EN*.vhQ*
+}
 
 @[lexer.set.verilog]{
   ESSETLEXERLANGUAGEverilog
diff --git a/lib/lexers/vhdl.tes b/lib/lexers/vhdl.tes
index 3887d8a..a762b24 100644
--- a/lib/lexers/vhdl.tes
+++ b/lib/lexers/vhdl.tes
@@ -1,9 +1,9 @@
 ! AUTO-GENERATED FROM SCITE PROPERTY SET !
 
 @[lexer.test.vhdl]{
-  :EN*.vhdQ*U.r
-  Q.r"F :EN*.vhdlQ*U.r '
-Q.r}
+  :EN*.vhdQ*"S -1 '
+  :EN*.vhdlQ*
+}
 
 @[lexer.set.vhdl]{
   ESSETLEXERLANGUAGEvhdl
diff --git a/lib/lexers/xml.tes b/lib/lexers/xml.tes
index d56e7d6..3b6ae41 100644
--- a/lib/lexers/xml.tes
+++ b/lib/lexers/xml.tes
@@ -1,17 +1,17 @@
 ! Lexing for XML and its applications !
 
 @[lexer.test.xml]{
-  :EN*.xmlQ*U.r
-  Q.r"F :EN*.xslQ*U.r '
-  Q.r"F :EN*.svgQ*U.r '
-  Q.r"F :EN*.xulQ*U.r '
-  Q.r"F :EN*.xsdQ*U.r '
-  Q.r"F :EN*.dtdQ*U.r '
-  Q.r"F :EN*.xsltQ*U.r '
-  Q.r"F :EN*.axlQ*U.r '
-  Q.r"F :EN*.xrcQ*U.r '
-  Q.r"F :EN*.rdfQ*U.r '
-Q.r}
+  :EN*.xmlQ*"S -1 '
+  :EN*.xslQ*"S -1 '
+  :EN*.svgQ*"S -1 '
+  :EN*.xulQ*"S -1 '
+  :EN*.xsdQ*"S -1 '
+  :EN*.dtdQ*"S -1 '
+  :EN*.xsltQ*"S -1 '
+  :EN*.axlQ*"S -1 '
+  :EN*.xrcQ*"S -1 '
+  :EN*.rdfQ*
+}
 
 @[lexer.set.xml]{
   ESSETLEXERLANGUAGExml