introduced true block and EOL comments

* The previous convention of !* ... *! are now true block comments,
  i.e. they are parsed faster, don't spam the goto table and allow
  embedding of exclamation marks - only "*!" terminates the comment.
* It is therefore now forbidden to have goto labels beginning with "*".
* Also support "!!" to introduce EOL comments (like C++'s //).
  This disallows empty labels, but they weren't useful anyway.
  This is the shortest way to begin a comment.
* All comment labels have been converted to true comments, to ensure
  that syntax highlighting works correctly.
  EOL comments are used for single line commented-out code, since it's
  easiest to uncomment - you don't have to jump to the line end.
  This is a pure convention / coding style.
  Other people might do it differently.
* It's of course still possible to abuse goto labels as comments
  as TECO did for ages.
* In lexing / syntax highlighting, labels and comments are highlighted differently.
* When syntax highlighting, a single "!" will first be highlighted as a label
  since it's not yet unambiguous. Once you type the second character (* or !),
  the first character is retroactively styled as a comment as well.

72 files changed, 109 insertions, 99 deletions

diff --git a/lib/lexers/abaqus.tes b/lib/lexers/abaqus.tes
index a21c847..f2b6c03 100644
--- a/lib/lexers/abaqus.tes
+++ b/lib/lexers/abaqus.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.abaqus]{
   :EN*.inpQ*"S -1 '
diff --git a/lib/lexers/ada.tes b/lib/lexers/ada.tes
index 318a1e3..3ee5011 100644
--- a/lib/lexers/ada.tes
+++ b/lib/lexers/ada.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.ada]{
   :EN*.adsQ*"S -1 '
diff --git a/lib/lexers/asl.tes b/lib/lexers/asl.tes
index 9a5888c..9d2ed65 100644
--- a/lib/lexers/asl.tes
+++ b/lib/lexers/asl.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.asl]{
   :EN*.aslQ*"S -1 '
diff --git a/lib/lexers/asm.tes b/lib/lexers/asm.tes
index 816a7e2..7fe8dad 100644
--- a/lib/lexers/asm.tes
+++ b/lib/lexers/asm.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.asm]{
   :EN*.asmQ*
diff --git a/lib/lexers/ave.tes b/lib/lexers/ave.tes
index 81b72b2..def268c 100644
--- a/lib/lexers/ave.tes
+++ b/lib/lexers/ave.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.ave]{
   :EN*.aveQ*
diff --git a/lib/lexers/avs.tes b/lib/lexers/avs.tes
index 935ba90..1c3b4d3 100644
--- a/lib/lexers/avs.tes
+++ b/lib/lexers/avs.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.avs]{
   :EN*.avsQ*"S -1 '
diff --git a/lib/lexers/awk.tes b/lib/lexers/awk.tes
index 75cf3f0..fd85d4c 100644
--- a/lib/lexers/awk.tes
+++ b/lib/lexers/awk.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.awk]{
   :EN*.awkQ*
diff --git a/lib/lexers/baan.tes b/lib/lexers/baan.tes
index 87634ca..3e827c6 100644
--- a/lib/lexers/baan.tes
+++ b/lib/lexers/baan.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.baan]{
   :EN*.bcQ*"S -1 '
diff --git a/lib/lexers/bash.tes b/lib/lexers/bash.tes
index 33d6664..862a0c1 100644
--- a/lib/lexers/bash.tes
+++ b/lib/lexers/bash.tes
@@ -1,6 +1,8 @@
-! Unix Shell
-  It's called bash.tes only because SciTE calls it this way
-  internally !
+!*
+ * Unix Shell
+ * It's called bash.tes only because SciTE calls it this way
+ * internally
+ *!
 
 @[lexer.test.bash]{
   _#!M[sh,bash,ksh]:M[lexer.checkheader]"S -1 '
@@ -35,8 +37,8 @@
   :M[color.string],5M[color.set]
   :M[color.string],6M[color.set]
   :M[color.operator],7M[color.set]
-  :M[color.target],8M[color.set] ! Identifiers, e.g. FOO=... !
+  :M[color.target],8M[color.set] !* Identifiers, e.g. FOO=... *!
   :M[color.variable],9M[color.set]
   :M[color.variable],10M[color.set]
-  :M[color.string2],11M[color.set] ! Backticks !
+  :M[color.string2],11M[color.set] !* Backticks *!
 }
diff --git a/lib/lexers/batch.tes b/lib/lexers/batch.tes
index a3a2a80..dddd802 100644
--- a/lib/lexers/batch.tes
+++ b/lib/lexers/batch.tes
@@ -1,4 +1,4 @@
-! DOS, Windows, OS/2 Batch Files !
+!* DOS, Windows, OS/2 Batch Files *!
 
 @[lexer.test.batch]{
   :EN*.batQ*"S -1 '
@@ -15,9 +15,9 @@
     color copy defined else not start
   :M[color.comment],1M[color.set]
   :M[color.keyword],2M[color.set]
-  :M[color.target],3M[color.set] ! Labels !
-  :M[color.preproc],4M[color.set] ! Hide Cmd @ !
-  :M[color.preproc2],5M[color.set] ! External Cmd !
+  :M[color.target],3M[color.set] !* Labels *!
+  :M[color.preproc],4M[color.set] !* Hide Cmd @ *!
+  :M[color.preproc2],5M[color.set] !* External Cmd *!
   :M[color.variable],6M[color.set]
   :M[color.operator],7M[color.set]
 }
diff --git a/lib/lexers/blitzbasic.tes b/lib/lexers/blitzbasic.tes
index fee1f96..88f99f9 100644
--- a/lib/lexers/blitzbasic.tes
+++ b/lib/lexers/blitzbasic.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.blitzbasic]{
   :EN*.bbQ*
diff --git a/lib/lexers/c.tes b/lib/lexers/c.tes
index 7ed79d2..c0acea2 100644
--- a/lib/lexers/c.tes
+++ b/lib/lexers/c.tes
@@ -41,7 +41,7 @@
   0ESSETKEYWORDS
     Q[lexer.c.basekeywords] _Alignas _Alignof _Atomic
     _Bool _Complex _Generic _Imaginary _Noreturn _Static_assert _Thread_local
-  ! Doxygen keywords !
+  !* Doxygen keywords *!
   2ESSETKEYWORDSQ[lexer.c.doxygenkeywords]
   :M[color.comment],1M[color.set]
   :M[color.comment],2M[color.set]
diff --git a/lib/lexers/caml.tes b/lib/lexers/caml.tes
index 0b681a1..3735eee 100644
--- a/lib/lexers/caml.tes
+++ b/lib/lexers/caml.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.caml]{
   :EN*.mlQ*"S -1 '
diff --git a/lib/lexers/ch.tes b/lib/lexers/ch.tes
index b0a1f4d..ea33b2c 100644
--- a/lib/lexers/ch.tes
+++ b/lib/lexers/ch.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.ch]{
   :EN*.chQ*"S -1 '
diff --git a/lib/lexers/cmake.tes b/lib/lexers/cmake.tes
index 3b7c5f7..198ad32 100644
--- a/lib/lexers/cmake.tes
+++ b/lib/lexers/cmake.tes
@@ -1,4 +1,4 @@
-! CMake Lexing !
+!* CMake Lexing *!
 
 @[lexer.test.cmake]{
   :EN*/CMakeLists.txtQ*"S -1 '
@@ -8,7 +8,7 @@
 
 @[lexer.set.cmake]{
   ESSETILEXERcmake
-  ! Commands !
+  !* Commands *!
   0ESSETKEYWORDS
     add_custom_command add_custom_target add_definitions add_dependencies
     add_executable add_library add_subdirectory add_test aux_source_directory build_command
@@ -25,7 +25,7 @@
     site_name source_group string subdir_depends subdirs target_link_libraries try_compile
     try_run use_mangled_mesa utility_source variable_requires vtk_make_instantiator
     vtk_wrap_java vtk_wrap_python vtk_wrap_tcl while write_file
-  ! Special command arguments !
+  !* Special command arguments *!
   1ESSETKEYWORDS
     ABSOLUTE ABSTRACT ADDITIONAL_MAKE_CLEAN_FILES ALL AND APPEND ARGS ASCII
     BEFORE CACHE CACHE_VARIABLES CLEAR COMMAND COMMANDS COMMAND_NAME COMMENT COMPARE
diff --git a/lib/lexers/cobol.tes b/lib/lexers/cobol.tes
index 7d9b6cb..921d948 100644
--- a/lib/lexers/cobol.tes
+++ b/lib/lexers/cobol.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.cobol]{
   :EN*.cobQ*
diff --git a/lib/lexers/cpp.tes b/lib/lexers/cpp.tes
index 5c3ce4a..0f6a01a 100644
--- a/lib/lexers/cpp.tes
+++ b/lib/lexers/cpp.tes
@@ -12,7 +12,7 @@
   :EN*.hppQ*"S -1 '
   :EN*.hxxQ*"S -1 '
   :EN*.ippQ*"S -1 '
-  !*:EN*.mmQ*"S -1 '*!
+  !!:EN*.mmQ*"S -1 '
   :EN*.smaQ*"S -1 '
   :EN*.inoQ*
 }
@@ -25,7 +25,7 @@
     explicit export friend mutable namespace new not not_eq operator or or_eq
     private protected public reinterpret_cast static_cast template this
     throw try typeid typename using virtual xor xor_eq
-  ! Doxygen keywords !
+  !* Doxygen keywords *!
   2ESSETKEYWORDSQ[lexer.c.doxygenkeywords]
   :M[color.comment],1M[color.set]
   :M[color.comment],2M[color.set]
diff --git a/lib/lexers/cs.tes b/lib/lexers/cs.tes
index 592332a..1721130 100644
--- a/lib/lexers/cs.tes
+++ b/lib/lexers/cs.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.cs]{
   :EN*.csQ*
diff --git a/lib/lexers/d.tes b/lib/lexers/d.tes
index 9a00fc9..b0f310a 100644
--- a/lib/lexers/d.tes
+++ b/lib/lexers/d.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.d]{
   :EN*.dQ*
diff --git a/lib/lexers/diff.tes b/lib/lexers/diff.tes
index a254f49..db658b4 100644
--- a/lib/lexers/diff.tes
+++ b/lib/lexers/diff.tes
@@ -1,4 +1,4 @@
-! Patch/Diff Files !
+!* Patch/Diff Files *!
 
 @[lexer.test.diff]{
   :EN*.diffQ*"S -1 '
@@ -8,9 +8,9 @@
 @[lexer.set.diff]{
   ESSETILEXERdiff
   :M[color.comment],1M[color.set]
-  :M[color.keyword],2M[color.set] ! Command !
-  :M[color.preproc],3M[color.set] ! Source/Dest !
-  :M[color.operator],4M[color.set] ! Position @@ !
+  :M[color.keyword],2M[color.set] !* Command *!
+  :M[color.preproc],3M[color.set] !* Source/Dest *!
+  :M[color.operator],4M[color.set] !* Position @@ *!
   :M[color.deletion],5M[color.set]
   :M[color.addition],6M[color.set]
   :M[color.change],7M[color.set]
diff --git a/lib/lexers/docbook.tes b/lib/lexers/docbook.tes
index ea60702..e5f3687 100644
--- a/lib/lexers/docbook.tes
+++ b/lib/lexers/docbook.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.docbook]{
   :EN*.docbookQ*
diff --git a/lib/lexers/eiffel.tes b/lib/lexers/eiffel.tes
index c22f5df..a932588 100644
--- a/lib/lexers/eiffel.tes
+++ b/lib/lexers/eiffel.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.eiffel]{
   :EN*.eQ*
diff --git a/lib/lexers/f77.tes b/lib/lexers/f77.tes
index e06243c..83feb85 100644
--- a/lib/lexers/f77.tes
+++ b/lib/lexers/f77.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.f77]{
   :EN*.fQ*"S -1 '
diff --git a/lib/lexers/f95.tes b/lib/lexers/f95.tes
index 7544375..5c9e2c3 100644
--- a/lib/lexers/f95.tes
+++ b/lib/lexers/f95.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.f95]{
   :EN*.f90Q*"S -1 '
diff --git a/lib/lexers/flagship.tes b/lib/lexers/flagship.tes
index 485d351..66a7c92 100644
--- a/lib/lexers/flagship.tes
+++ b/lib/lexers/flagship.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.flagship]{
   :EN*.prgQ*
diff --git a/lib/lexers/flash.tes b/lib/lexers/flash.tes
index 27be2bf..6464254 100644
--- a/lib/lexers/flash.tes
+++ b/lib/lexers/flash.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.flash]{
   :EN*.asQ*"S -1 '
diff --git a/lib/lexers/freebasic.tes b/lib/lexers/freebasic.tes
index 16b7ace..c333c55 100644
--- a/lib/lexers/freebasic.tes
+++ b/lib/lexers/freebasic.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.freebasic]{
   :EN*.basQ*"S -1 '
diff --git a/lib/lexers/gap.tes b/lib/lexers/gap.tes
index 7a680c7..cf3081b 100644
--- a/lib/lexers/gap.tes
+++ b/lib/lexers/gap.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.gap]{
   :EN*.gQ*"S -1 '
diff --git a/lib/lexers/git.tes b/lib/lexers/git.tes
index 567859b..d4c3aa2 100644
--- a/lib/lexers/git.tes
+++ b/lib/lexers/git.tes
@@ -1,4 +1,9 @@
-!* Git commit and rebase messages *!
+!*
+ * Git commit and rebase messages
+ *
+ * NOTE: This is not a real lexer.
+ * It only styles the document once.
+ *!
 
 @[lexer.test.git]{
   :EN*/COMMIT_EDITMSGQ*"S -1 '
diff --git a/lib/lexers/go.tes b/lib/lexers/go.tes
index a637b5c..319af88 100644
--- a/lib/lexers/go.tes
+++ b/lib/lexers/go.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.go]{
   :EN*.goQ*
diff --git a/lib/lexers/idl.tes b/lib/lexers/idl.tes
index 9180ae0..088b72a 100644
--- a/lib/lexers/idl.tes
+++ b/lib/lexers/idl.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.idl]{
   :EN*.idlQ*"S -1 '
diff --git a/lib/lexers/inno.tes b/lib/lexers/inno.tes
index c963b1d..1d0b7eb 100644
--- a/lib/lexers/inno.tes
+++ b/lib/lexers/inno.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.inno]{
   :EN*.issQ*"S -1 '
diff --git a/lib/lexers/java.tes b/lib/lexers/java.tes
index a9a592a..1462a51 100644
--- a/lib/lexers/java.tes
+++ b/lib/lexers/java.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.java]{
   :EN*.javaQ*"S -1 '
diff --git a/lib/lexers/js.tes b/lib/lexers/js.tes
index 3e8ed8e..75bb500 100644
--- a/lib/lexers/js.tes
+++ b/lib/lexers/js.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.js]{
   :EN*.jsQ*"S -1 '
diff --git a/lib/lexers/kix.tes b/lib/lexers/kix.tes
index f63b5c5..0030c66 100644
--- a/lib/lexers/kix.tes
+++ b/lib/lexers/kix.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.kix]{
   :EN*.kixQ*
diff --git a/lib/lexers/lisp.tes b/lib/lexers/lisp.tes
index c17196a..60ce61c 100644
--- a/lib/lexers/lisp.tes
+++ b/lib/lexers/lisp.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.lisp]{
   :EN*.lspQ*"S -1 '
diff --git a/lib/lexers/lout.tes b/lib/lexers/lout.tes
index cb161b7..baa4e71 100644
--- a/lib/lexers/lout.tes
+++ b/lib/lexers/lout.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.lout]{
   :EN*.ltQ*
@@ -23,7 +23,7 @@
     @SysPrependGraphic @Target @Null @PageLabel @Galley @ForceGalley @LInput @Split @Tag @Key
     @Optimize @Merge @Enclose @Begin @End @Moment @Second @Minute @Hour @Day @Month @Year
     @Century @WeekDay @YearDay @DaylightSaving @SetContext @GetContext
-  ! NOTE: carets are doubled to escape them !
+  !* NOTE: carets are doubled to escape them *!
   1ESSETKEYWORDS
     &&& && & ^^// ^^/ ^^|| ^^| ^^& // / || |
   2ESSETKEYWORDS
diff --git a/lib/lexers/lua.tes b/lib/lexers/lua.tes
index 7ffe54a..0cf898a 100644
--- a/lib/lexers/lua.tes
+++ b/lib/lexers/lua.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.lua]{
   _#!Mlua:M[lexer.checkheader]"S -1 '
diff --git a/lib/lexers/make.tes b/lib/lexers/make.tes
index 2e1d661..4ff519a 100644
--- a/lib/lexers/make.tes
+++ b/lib/lexers/make.tes
@@ -1,4 +1,4 @@
-! Makefile Lexing !
+!* Makefile Lexing *!
 
 @[lexer.test.make]{
   :EN*/MakefileQ*"S -1 '
diff --git a/lib/lexers/mako.tes b/lib/lexers/mako.tes
index 5cbf9fd..b38ee13 100644
--- a/lib/lexers/mako.tes
+++ b/lib/lexers/mako.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.mako]{
   :EN*.makQ*"S -1 '
diff --git a/lib/lexers/matlab.tes b/lib/lexers/matlab.tes
index d63a6f8..c8dc44d 100644
--- a/lib/lexers/matlab.tes
+++ b/lib/lexers/matlab.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.matlab]{
   :EN*.m.matlabQ*
diff --git a/lib/lexers/mmixal.tes b/lib/lexers/mmixal.tes
index 7f7df43..e9047cb 100644
--- a/lib/lexers/mmixal.tes
+++ b/lib/lexers/mmixal.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.mmixal]{
   :EN*.mmsQ*
diff --git a/lib/lexers/octave.tes b/lib/lexers/octave.tes
index 2df769a..41c0563 100644
--- a/lib/lexers/octave.tes
+++ b/lib/lexers/octave.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.octave]{
   :EN*.m.octaveQ*
diff --git a/lib/lexers/oscript.tes b/lib/lexers/oscript.tes
index 949e564..d4f2eb8 100644
--- a/lib/lexers/oscript.tes
+++ b/lib/lexers/oscript.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.oscript]{
   :EN*.osxQ*
diff --git a/lib/lexers/pascal.tes b/lib/lexers/pascal.tes
index 66e705c..57bd3e8 100644
--- a/lib/lexers/pascal.tes
+++ b/lib/lexers/pascal.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.pascal]{
   :EN*.dprQ*"S -1 '
diff --git a/lib/lexers/perl.tes b/lib/lexers/perl.tes
index 213dd4b..44d7148 100644
--- a/lib/lexers/perl.tes
+++ b/lib/lexers/perl.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.perl]{
   _#!M[perl,pl]:M[lexer.checkheader]"S -1 '
diff --git a/lib/lexers/php.tes b/lib/lexers/php.tes
index e60c769..7265408 100644
--- a/lib/lexers/php.tes
+++ b/lib/lexers/php.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.php]{
   :EN*.php3Q*"S -1 '
diff --git a/lib/lexers/pike.tes b/lib/lexers/pike.tes
index 9686fe2..c530622 100644
--- a/lib/lexers/pike.tes
+++ b/lib/lexers/pike.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.pike]{
   :EN*.pikeQ*
diff --git a/lib/lexers/pov.tes b/lib/lexers/pov.tes
index 257ce19..90fe0f8 100644
--- a/lib/lexers/pov.tes
+++ b/lib/lexers/pov.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.pov]{
   :EN*.povQ*"S -1 '
diff --git a/lib/lexers/powerpro.tes b/lib/lexers/powerpro.tes
index e487604..fac1ef8 100644
--- a/lib/lexers/powerpro.tes
+++ b/lib/lexers/powerpro.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.powerpro]{
   :EN*.powerproQ*
diff --git a/lib/lexers/purebasic.tes b/lib/lexers/purebasic.tes
index e9e20a7..6f98975 100644
--- a/lib/lexers/purebasic.tes
+++ b/lib/lexers/purebasic.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.purebasic]{
   :EN*.pbQ*
diff --git a/lib/lexers/r.tes b/lib/lexers/r.tes
index 9fb393e..5ecaa86 100644
--- a/lib/lexers/r.tes
+++ b/lib/lexers/r.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.r]{
   :EN*.RQ*"S -1 '
diff --git a/lib/lexers/rc.tes b/lib/lexers/rc.tes
index db2203d..132f9c9 100644
--- a/lib/lexers/rc.tes
+++ b/lib/lexers/rc.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.rc]{
   :EN*.rcQ*"S -1 '
diff --git a/lib/lexers/rebol.tes b/lib/lexers/rebol.tes
index cef071c..1a310bb 100644
--- a/lib/lexers/rebol.tes
+++ b/lib/lexers/rebol.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.rebol]{
   :EN*.rQ*"S -1 '
diff --git a/lib/lexers/rust.tes b/lib/lexers/rust.tes
index 4ffd9b5..06a0154 100644
--- a/lib/lexers/rust.tes
+++ b/lib/lexers/rust.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.rust]{
   :EN*.rsQ*
diff --git a/lib/lexers/scheme.tes b/lib/lexers/scheme.tes
index 31af808..3f5e8fe 100644
--- a/lib/lexers/scheme.tes
+++ b/lib/lexers/scheme.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.scheme]{
   :EN*.scmQ*"S -1 '
diff --git a/lib/lexers/sciteco.tes b/lib/lexers/sciteco.tes
index b611875..106c12b 100644
--- a/lib/lexers/sciteco.tes
+++ b/lib/lexers/sciteco.tes
@@ -11,10 +11,11 @@
   1ESSETIDENTIFIER
   :M[color.keyword],1M[color.set]
   :M[color.operator],2M[color.set]
-  !*:M[color.variable],3M[color.set]*!
+  !!:M[color.variable],3M[color.set]
   :M[color.string],4M[color.set]
   :M[color.number],5M[color.set]
-  :M[color.comment],6M[color.set] !* labels *!
+  :M[color.preproc],6M[color.set] !* labels *!
   :M[color.comment],7M[color.set]
+  !* invalid commands or byte sequences *!
   :M[color.error],8M[color.set]
 }
diff --git a/lib/lexers/specman.tes b/lib/lexers/specman.tes
index 3d83590..0710679 100644
--- a/lib/lexers/specman.tes
+++ b/lib/lexers/specman.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.specman]{
   :EN*.eQ*
diff --git a/lib/lexers/spice.tes b/lib/lexers/spice.tes
index 5178d01..8883239 100644
--- a/lib/lexers/spice.tes
+++ b/lib/lexers/spice.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.spice]{
   :EN*.scpQ*"S -1 '
diff --git a/lib/lexers/swift.tes b/lib/lexers/swift.tes
index 4a20509..a2466c9 100644
--- a/lib/lexers/swift.tes
+++ b/lib/lexers/swift.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.swift]{
   :EN*.swiftQ*
diff --git a/lib/lexers/systemverilog.tes b/lib/lexers/systemverilog.tes
index 3df1225..4edbde1 100644
--- a/lib/lexers/systemverilog.tes
+++ b/lib/lexers/systemverilog.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.systemverilog]{
   :EN*.svQ*"S -1 '
diff --git a/lib/lexers/tacl.tes b/lib/lexers/tacl.tes
index a0d5bc9..faa9e3d 100644
--- a/lib/lexers/tacl.tes
+++ b/lib/lexers/tacl.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.tacl]{
   :EN*.taclQ*
diff --git a/lib/lexers/tal.tes b/lib/lexers/tal.tes
index 247c451..8dc56a4 100644
--- a/lib/lexers/tal.tes
+++ b/lib/lexers/tal.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.tal]{
   :EN*.talQ*
diff --git a/lib/lexers/tcl.tes b/lib/lexers/tcl.tes
index d5fd022..102cb11 100644
--- a/lib/lexers/tcl.tes
+++ b/lib/lexers/tcl.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.tcl]{
   :EN*.tclQ*"S -1 '
diff --git a/lib/lexers/test.tes b/lib/lexers/test.tes
index cc719db..adac64f 100644
--- a/lib/lexers/test.tes
+++ b/lib/lexers/test.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.test]{
   :EN*.plnQ*"S -1 '
diff --git a/lib/lexers/troff.tes b/lib/lexers/troff.tes
index a10d3e9..fe8063f 100644
--- a/lib/lexers/troff.tes
+++ b/lib/lexers/troff.tes
@@ -69,8 +69,10 @@
   2ESSETKEYWORDSel nop
   !* Requests and commands, initiating ignore blocks *!
   3ESSETKEYWORDSig
-  !* Requests and commands with end-macros.
-     Mom macros alias MAC to de. *!
+  !*
+   * Requests and commands with end-macros.
+   * Mom macros alias MAC to de.
+   *!
   4ESSETKEYWORDSam am1 de de1 MAC
 
   :M[color.keyword],1M[color.set]
@@ -79,7 +81,7 @@
   :M[color.operator],4M[color.set]
   :M[color.string],5M[color.set]
   :M[color.comment],6M[color.set]
-  !*:M[color.comment],7M[color.set]*!
+  !!:M[color.comment],7M[color.set]
   7U.i 20<:M[color.variable],%.iM[color.set]>
   :M[color.preproc2],17M[color.set]
 }
diff --git a/lib/lexers/vala.tes b/lib/lexers/vala.tes
index 85b9ceb..d5329d2 100644
--- a/lib/lexers/vala.tes
+++ b/lib/lexers/vala.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.vala]{
   :EN*.valaQ*
diff --git a/lib/lexers/vb.tes b/lib/lexers/vb.tes
index c37752b..8bb82fb 100644
--- a/lib/lexers/vb.tes
+++ b/lib/lexers/vb.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.vb]{
   :EN*.vbQ*"S -1 '
diff --git a/lib/lexers/verilog.tes b/lib/lexers/verilog.tes
index 23f874f..f8fea22 100644
--- a/lib/lexers/verilog.tes
+++ b/lib/lexers/verilog.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.verilog]{
   :EN*.vQ*"S -1 '
diff --git a/lib/lexers/vhdl.tes b/lib/lexers/vhdl.tes
index 37fe9bf..a13ba71 100644
--- a/lib/lexers/vhdl.tes
+++ b/lib/lexers/vhdl.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.vhdl]{
   :EN*.vhdQ*"S -1 '
diff --git a/lib/lexers/vxml.tes b/lib/lexers/vxml.tes
index 60dc060..c044824 100644
--- a/lib/lexers/vxml.tes
+++ b/lib/lexers/vxml.tes
@@ -1,4 +1,4 @@
-! AUTO-GENERATED FROM SCITE PROPERTY SET !
+!* AUTO-GENERATED FROM SCITE PROPERTY SET *!
 
 @[lexer.test.vxml]{
   :EN*.vxmlQ*
diff --git a/lib/lexers/xml.tes b/lib/lexers/xml.tes
index 87ed9b7..081c2ec 100644
--- a/lib/lexers/xml.tes
+++ b/lib/lexers/xml.tes
@@ -1,4 +1,4 @@
-! Lexing for XML and its applications !
+!* Lexing for XML and its applications *!
 
 @[lexer.test.xml]{
   :EN*.xmlQ*"S -1 '
@@ -16,20 +16,20 @@
 @[lexer.set.xml]{
   ESSETILEXERxml
   0ESSETKEYWORDS 
-  ! DTD keywords !
+  !* DTD keywords *!
   5ESSETKEYWORDS
     ELEMENT DOCTYPE ATTLIST ENTITY NOTATION
-  :M[color.keyword],1M[color.set] ! Tags !
-  :M[color.keyword],2M[color.set] ! Tags !
-  :M[color.variable],3M[color.set] ! Attributes !
-  :M[color.variable],4M[color.set] ! Attributes !
+  :M[color.keyword],1M[color.set] !* Tags *!
+  :M[color.keyword],2M[color.set] !* Tags *!
+  :M[color.variable],3M[color.set] !* Attributes *!
+  :M[color.variable],4M[color.set] !* Attributes *!
   :M[color.number],5M[color.set]
   :M[color.string],6M[color.set]
   :M[color.string],7M[color.set]
   :M[color.comment],9M[color.set]
-  :M[color.preproc],10M[color.set] ! Entities !
-  :M[color.keyword],11M[color.set] ! Tag Ends /> !
-  :M[color.preproc2],12M[color.set] ! PI !
-  :M[color.preproc2],13M[color.set] ! PI !
-  :M[color.string2],14M[color.set] ! CDATA !
+  :M[color.preproc],10M[color.set] !* Entities *!
+  :M[color.keyword],11M[color.set] !* Tag Ends /> *!
+  :M[color.preproc2],12M[color.set] !* PI *!
+  :M[color.preproc2],13M[color.set] !* PI *!
+  :M[color.string2],14M[color.set] !* CDATA *!
 }