GenericHighlighter: Update from KSyntaxHighlighting

Change-Id: I2fdf7f48494e2de3ef8ec64260c4f194ab5f959d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>

7 files changed, 309 insertions, 23 deletions

diff --git a/src/share/3rdparty/generic-highlighter/alert.xml b/src/share/3rdparty/generic-highlighter/alert.xml
index 3ed783b35d..942983ac37 100644
--- a/src/share/3rdparty/generic-highlighter/alert.xml
+++ b/src/share/3rdparty/generic-highlighter/alert.xml
@@ -30,7 +30,7 @@
   Introduce 3 alert levels and sort keywords according importance.
   Few more keywords has been added.
 -->
-<language version="2" kateversion="3.1" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" hidden="true">
+<language version="3" kateversion="3.1" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPLv2+" hidden="true">
   <highlighting>
     <list name="alerts_hi">
       <item> ALERT </item>
diff --git a/src/share/3rdparty/generic-highlighter/cmake.xml b/src/share/3rdparty/generic-highlighter/cmake.xml
index c907c32e7e..3269a2e038 100644
--- a/src/share/3rdparty/generic-highlighter/cmake.xml
+++ b/src/share/3rdparty/generic-highlighter/cmake.xml
@@ -28,14 +28,14 @@
 <!-- generated for "cmake version 2.8.12.1, 3.0.2, 3.1.2 and 3.3.0" -->
 <language
     name="CMake"
-    version="2"
+    version="3"
     kateversion="5.0"
     section="Other"
     extensions="CMakeLists.txt;*.cmake;*.cmake.in"
     style="CMake"
     mimetype="text/x-cmake"
     author="Alexander Neundorf (neundorf@kde.org)"
-    license="LGPL"
+    license="LGPLv2+"
   >
   <highlighting>
 
diff --git a/src/share/3rdparty/generic-highlighter/doxygen.xml b/src/share/3rdparty/generic-highlighter/doxygen.xml
index d07c1650b4..c4d31a2572 100644
--- a/src/share/3rdparty/generic-highlighter/doxygen.xml
+++ b/src/share/3rdparty/generic-highlighter/doxygen.xml
@@ -29,13 +29,13 @@
  -->
 
 <language name="Doxygen"
-          version="2"
+          version="3"
           kateversion="5.0"
           section="Markup"
           extensions="*.dox;*.doxygen"
           mimetype="text/x-doxygen"
           author="Dominik Haumann (dhdev@gmx.de)"
-          license="LGPL"
+          license="LGPLv2+"
           priority="9">
   <highlighting>
     <!-- NOTE: all tags may begin with a \ or @ char
diff --git a/src/share/3rdparty/generic-highlighter/makefile.xml b/src/share/3rdparty/generic-highlighter/makefile.xml
index 9baeb508ec..30e27022db 100644
--- a/src/share/3rdparty/generic-highlighter/makefile.xml
+++ b/src/share/3rdparty/generic-highlighter/makefile.xml
@@ -7,24 +7,123 @@
 <!-- small priority to allow for example Makefile.cpp to be detected as cpp file -->
 <!-- v2.1 by Alex Turbov <i.zaufi@gmail.com>
      improve comments handling -->
+<!-- v4 by Alex Richardson <arichardson.kde@gmail.com>
+     added bmake support -->
 <language name="Makefile" section="Other"
-          version="3" kateversion="3.4"
+          version="4" kateversion="3.4"
           extensions="GNUmakefile;Makefile;makefile;GNUmakefile.*;Makefile.*;makefile.*;*.mk"
-          mimetype="text/x-makefile"
+          mimetype="text/x-makefile" priority="11"
           author="Per Wigren (wigren@home.se)" license="">
   <highlighting>
-    <list name = "keywords">
+    <list name = "keywords" >
       <item> include </item>
+      <item> -include </item>
       <item> define </item>
-      <item> else </item>
       <item> endef </item>
-      <item> endif </item>
-      <item> ifdef </item>
-      <item> ifeq </item>
-      <item> ifndef </item>
-      <item> ifneq </item>
-      <item> override </item>
     </list>
+    <!-- https://www.gnu.org/software/make/manual/html_node/Conditional-Syntax.html -->
+    <list name="gmake_if_keywords">
+      <item>if</item>
+      <item>ifeq</item>
+      <item>ifneq</item>
+      <item>ifdef</item>
+      <item>ifndef</item>
+    </list>
+    <list name="gmake_else_keywords"><item>else</item></list>
+    <list name="gmake_endif_keywords"><item>endif</item></list>
+    <!-- bmake statements: https://www.freebsd.org/cgi/man.cgi?make(1)#INCLUDE_STATEMENTS,_CONDITIONALS_AND_FOR_LOOPS -->
+    <list name="bmake_if_keywords">
+      <item> .if </item>
+      <item> .ifdef </item>
+      <item> .ifndef </item>
+      <item> .ifmake </item>
+      <item> .ifnmake </item>
+    </list>
+    <list name="bmake_else_keywords">
+      <item> .elif </item>
+      <item> .elifdef </item>
+      <item> .elifndef </item>
+      <item> .elifmake </item>
+      <item> .elifnmake </item>
+      <item> .else </item> <!-- TODO: anything following .else should be highlighted as an error -->
+    </list>
+    <list name="bmake_endif_keywords"><item>.endif</item></list>
+
+    <list name="bmake_expressions">
+      <item>defined</item>
+      <item>empty</item>
+      <item>exists</item>
+      <item>target</item>
+      <item>commands</item>
+    </list>
+
+    <list name="bmake_include_stmt">
+      <item>.include</item>
+      <item>.-include</item>
+      <item>.sinclude</item>
+      <!-- For compat bmake also handles include but this is already highlighted. <item>include</item> -->
+    </list>
+    <list name="bmake_message_stmt">
+      <item> .info </item>
+      <item> .warning </item>
+      <item> .error </item>
+    </list>
+    <!-- Use single element list here so that .for/.endfor also shows up in code completion -->
+    <list name="bmake_for_stmt"><item>.for</item></list>
+    <list name="bmake_endfor_stmt"><item>.endfor</item></list>
+
+    <!-- https://www.freebsd.org/cgi/man.cgi?make(1)#SPECIAL_TARGETS -->
+    <list name="bmake_special_targets">
+      <item> .BEGIN </item>
+      <item> .DEFAULT </item>
+      <item> .END </item>
+      <item> .ERROR </item>
+      <item> .IGNORE </item>
+      <item> .INTERRUPT </item>
+      <item> .MAIN </item>
+      <item> .MAKEFLAGS </item>
+      <item> .NOPATH </item>
+      <item> .NOTPARALLEL </item>
+      <item> .NO_PARALLEL </item>
+      <item> .OBJDIR </item>
+      <item> .ORDER </item>
+      <item> .PATH </item>
+      <item> .PHONY </item>
+      <item> .PRECIOUS </item>
+      <item> .SHELL </item>
+      <item> .SILENT </item>
+      <item> .STALE </item>
+      <item> .SUFFIXES </item>
+    </list>
+    <!-- https://www.freebsd.org/cgi/man.cgi?make(1)#SPECIAL_SOURCES_(ATTRIBUTES) -->
+    <list name="bmake_special_sources">
+      <item> .EXEC </item>
+      <item> .IGNORE </item>
+      <item> .MADE </item>
+      <item> .MAKE </item>
+      <item> .META </item>
+      <item> .NOMETA </item>
+      <item> .NOMETA_CMP </item>
+      <item> .NOPATH </item>
+      <item> .NOTMAIN </item>
+      <item> .OPTIONAL </item>
+      <item> .PHONY </item>
+      <item> .PRECIOUS </item>
+      <item> .RECURSIVE </item>
+      <item> .SILENT </item>
+      <item> .USE </item>
+      <item> .USEBEFORE </item>
+      <item> .WAIT </item>
+    </list>
+
+    <list name="bmake_other_stmts">
+      <item> .unexport-env </item>
+      <item> .unexport </item>
+      <item> .undef </item>
+      <item> .export-env </item>
+      <item> .export </item>
+    </list>
+
     <list name = "functions">
       <item> call </item>
       <item> subst </item>
@@ -62,13 +161,30 @@
       <item> warning </item>
       <item> info </item>
     </list>
-
     <contexts>
       <context name="normal" attribute="Normal" lineEndContext="#stay">
         <DetectSpaces/>
         <DetectChar attribute="Comment" context="Comment" char="#"/>
+        <keyword attribute="ControlFlow" String="bmake_if_keywords" context="bmake_conditional" beginRegion="bmake_if" firstNonSpace="true"/>
+        <!--TODO: trailing non-space after .else should be highlighted as an error -->
+        <keyword attribute="ControlFlow" String="bmake_else_keywords" context="bmake_conditional" endRegion="bmake_if" beginRegion="bmake_if" firstNonSpace="true"/>
+        <keyword attribute="ControlFlow" String="bmake_endif_keywords" context="#stay" endRegion="bmake_if"/>
+
+        <keyword attribute="ControlFlow" String="gmake_if_keywords" context="#stay" beginRegion="gmake_if" firstNonSpace="true"/>
+        <!--TODO: trailing non-space after .else should be highlighted as an error -->
+        <keyword attribute="ControlFlow" String="gmake_else_keywords" context="gmake_else" endRegion="gmake_if" beginRegion="gmake_if" firstNonSpace="true"/>
+        <keyword attribute="ControlFlow" String="gmake_endif_keywords" context="#stay" endRegion="gmake_if"/>
+
         <keyword attribute="Keyword"  context="#stay" String="keywords"/>
-        <RegExpr attribute="Variable" context="assign" String="[^\s:+?]*\s*(?=:=|=|\+=|\?=)"/>
+        <keyword attribute="Keyword"  context="bmake_other_stmts" String="bmake_other_stmts" firstNonSpace="true"/>
+        <RegExpr attribute="Variable" context="assign" String="[^\s:?]*\s*(?=:=|=|\+=|\?=)"/>
+        <keyword attribute="SpecialTarget" context="bmake_special_target" String="bmake_special_targets" firstNonSpace="true"/>
+        <RegExpr attribute="SpecialTarget" context="prereq" String="\.PATH\.[^:]*:" firstNonSpace="true"/>
+        <keyword attribute="Keyword" context="bmake_include" String="bmake_include_stmt" firstNonSpace="true"/>
+        <keyword attribute="Keyword" context="bmake_message" String="bmake_message_stmt" firstNonSpace="true"/>
+        <keyword attribute="Keyword" context="bmake_for_loop" String="bmake_for_stmt" firstNonSpace="true" beginRegion="for"/>
+        <keyword attribute="Keyword" context="#stay" String="bmake_endfor_stmt" firstNonSpace="true" endRegion="for"/>
+
         <RegExpr attribute="Section"  context="prereq" String="^\.[^.][^:]*:"/>
         <RegExpr attribute="Target"   context="prereq" String="^[^:]*:"/>
         <DetectIdentifier/>
@@ -80,8 +196,73 @@
         <AnyChar attribute="Operator" context="silent" String="@-" firstNonSpace="1"/>
       </context>
 
+      <context name="strings_and_vars" attribute="Normal" lineEndContext="#pop">
+        <DetectChar attribute="Operator" context="dollar" char="$"/>
+        <DetectChar attribute="String" context="string&quot;" char="&quot;"/>
+        <DetectChar attribute="String" context="string'" char="'"/>
+        <DetectChar attribute="Comment" context="Comment" char="#"/>
+      </context>
+
+      <context name="gmake_else" attribute="Error" lineEndContext="#pop">
+        <DetectSpaces attribute="Normal"/>
+        <keyword attribute="ControlFlow" String="gmake_if_keywords" context="#stay"/>
+        <IncludeRules context="strings_and_vars"/>
+      </context>
+
+      <context name="bmake_include" attribute="Normal" lineEndContext="#pop">
+        <DetectSpaces />
+        <RangeDetect char="&lt;"  char1="&gt;" context="#stay" attribute="Include" />
+        <RangeDetect char="&quot;"  char1="&quot;" context="#stay" attribute="Include" />
+      </context>
+
+
+      <context name="bmake_conditional" attribute="Normal" lineEndContext="#pop">
+        <DetectSpaces/>
+        <IncludeRules context="strings_and_vars"/>
+        <keyword attribute="Builtin"  context="bmake_expression" String="bmake_expressions"/>
+        <Detect2Chars attribute="RealOperator" context="#stay" char="&amp;" char1="&amp;"/>
+        <Detect2Chars attribute="RealOperator" context="#stay" char="|" char1="|"/>
+        <Detect2Chars attribute="RealOperator" context="#stay" char="!" char1="="/>
+        <Detect2Chars attribute="RealOperator" context="#stay" char="=" char1="="/>
+        <DetectChar attribute="RealOperator" context="#stay" char="!"/>
+        <HlCHex attribute="Number" context="#stay"/>
+        <Int attribute="Number" context="#stay"/>
+        <DetectIdentifier attribute="Variable" context="#stay"/>
+        <LineContinue attribute="Operator" context="#stay"/>
+      </context>
+
+      <context name="bmake_for_loop" attribute="Variable" lineEndContext="#pop">
+        <DetectSpaces/>
+        <IncludeRules context="strings_and_vars"/>
+        <WordDetect attribute="RealOperator" context="#stay" String="in" />
+      </context>
+
+      <context name="bmake_other_stmts" attribute="Variable" lineEndContext="#pop">
+        <DetectSpaces/>
+        <IncludeRules context="strings_and_vars"/>
+      </context>
+
+      <context name="bmake_expression" attribute="Variable" lineEndContext="#pop">
+        <DetectSpaces/>
+        <IncludeRules context="strings_and_vars"/>
+        <DetectChar attribute="Normal" context="#stay" char="("/>
+        <DetectChar attribute="Normal" context="#pop" char=")"/>
+        <DetectIdentifier attribute="Variable"/>
+      </context>
+
+      <context name="bmake_special_target" attribute="Error" lineEndContext="rule">
+        <!-- anything but spaces before the : should be an error -->
+        <DetectSpaces attribute="Normal" />
+        <DetectChar attribute="SpecialTarget" context="#pop!prereq" char=":"/>
+      </context>
+
+      <context name="bmake_message" attribute="String" lineEndContext="#pop">
+        <DetectChar attribute="Operator" context="dollar" char="$"/>
+      </context>
+
       <context name="prereq" attribute="Prereq" lineEndContext="rule">
         <DetectSpaces/>
+        <keyword attribute="SpecialPrereq" context="#stay" String="bmake_special_sources"/>
         <DetectIdentifier/>
         <LineContinue attribute="Operator" context="#stay"/>
         <DetectChar attribute="Operator" context="dollar" char="$"/>
@@ -167,7 +348,104 @@
         <DetectChar attribute="Operator" char="}" context="#pop#pop#pop"/>
         <DetectChar attribute="Operator" context="dollar" char="$"/>
         <DetectSpaces attribute="Error" context="#stay"/>
-        <AnyChar attribute="Error" context="#stay" String="=#:"/>
+        <!-- Handle bmake Variable modifiers: ${variable[:modifier[:...]]} -->
+        <Detect2Chars context="#stay" char="\" char1=":"/>
+        <!-- modifiers without arguments-->
+        <keyword attribute="Keyword"  context="#pop!expect}" String="bmake_var_modifiers_noarg"/>
+        <!-- with arguments -->
+        <keyword attribute="Keyword"  context="#pop!bmake_var_modifier_arg" String="bmake_var_modifiers_with_arg"/>
+        <!-- other modifiers -->
+        <DetectChar attribute="RealOperator" context="bmake_var_modifier" char=":"/>
+        <AnyChar attribute="Error" context="#stay" String="=#"/>
+      </context>
+
+      <context name="bmake_var_modifier_arg" attribute="VarModifier" lineEndContext="#pop">
+        <DetectChar attribute="Operator" context="dollar" char="$"/>
+        <Detect2Chars context="#stay" char="\" char1="}"/>
+        <DetectChar attribute="Operator" char="}" context="#pop#pop#pop#pop"/>
+        <Detect2Chars context="#stay" char="\" char1=":"/>
+        <DetectChar attribute="RealOperator" context="#pop!bmake_var_modifier" char=":"/>
+      </context>
+
+      <!-- TODO: once all modifiers are properly handled change fallthroughContext to "expect}" -->
+      <context name="bmake_var_modifier" attribute="VarModifier" lineEndContext="#pop" fallthroughContext="#pop!bmake_var_modifier_arg" fallthrough="true">
+        <DetectChar attribute="Operator" context="dollar" char="$"/>
+
+                    <!--
+          TODO :?true_string:false_string
+          TODO :old_string=new_string This is the AT&T System V UNIX style variable substitution.
+          TODO :@temp@string@ This is the loop expansion mechanism from the OSF Development Environment (ODE) make.
+          TODO :!cmd! The output of running cmd is the value.
+          TODO :[range]
+        -->
+        <!--  Modifiers without arguments:-->
+        <!--
+          :E Replaces each word in the variable with its suffix.
+          :H Replaces each word in the variable with everything but the last component.
+          :O   Order every word in variable alphabetically.
+          :Q   Quotes every shell meta-character in the variable
+          :R   Replaces each word in the variable with everything but its suffix.
+          :T   Replaces each word in the variable with its last component.
+          :u   Remove adjacent duplicate words (like uniq(1)).
+          :L The name of the variable is the value.
+          :P The path of the node which has the same name as the variable is the value.
+        -->
+        <AnyChar    attribute="Builtin" context="#pop!expect}" String="EHOQRTuLP"/>
+        <!-- :sh  If the variable is non-empty it is run as a command and the output becomes the new value. -->
+        <Detect2Chars attribute="Builtin" context="#pop!expect}" char="s" char1="h"/>
+        <!-- :Ox  Randomize words in variable. -->
+        <Detect2Chars attribute="Builtin" context="#pop!expect}" char="O" char1="x"/>
+        <!-- :tA  Attempt to convert variable to an absolute path using realpath(3),-->
+        <Detect2Chars attribute="Builtin" context="#pop!expect}" char="t" char1="A"/>
+        <!-- :tl  Converts variable to lower-case letters.-->
+        <Detect2Chars attribute="Builtin" context="#pop!expect}" char="t" char1="L"/>
+        <!--  :gmtime The value is a format string for strftime(3), using the current gmtime(3). -->
+        <StringDetect attribute="Builtin" String="gmtime" context="#pop!expect}" />
+        <!-- :hash Compute a 32bit hash of the value and encode it as hex digits. -->
+        <StringDetect attribute="Builtin" String="hash" context="#pop!expect}" />
+        <!-- :localtime The value is a format string for strftime(3), using the current localtime(3). -->
+        <StringDetect attribute="Builtin" String="localtime" context="#pop!expect}" />
+        <!--Now the modifiers with arguments:-->
+        <!--
+          :Mpattern Select only those words that match pattern.
+          :Npattern This is identical to `:M', but selects all words which do not match pattern.
+          :Dnewval If the variable is defined newval is the value.
+          :Unewval If the variable is undefined newval is the value.
+        -->
+        <AnyChar    attribute="Builtin" context="#pop!bmake_var_modifier_arg" String="MNDU"/>
+        <!-- TODO: add new context to highligh old_string and new_string differently
+          :S/old_string/new_string/[1gW]
+          :C/pattern/replacement/[1gW]
+        -->
+        <AnyChar attribute="Builtin" context="#pop!bmake_var_modifier_arg" String="SC"/>
+        <!-- ::=str The variable is assigned the value str after substitution. -->
+        <Detect2Chars attribute="Builtin" context="#pop!bmake_var_modifier_arg" char=":" char1="="/>
+        <!-- ::?=str As for ::= but only if the variable does not already have a value. -->
+        <StringDetect attribute="Builtin" String=":?=" context="#pop!bmake_var_modifier_arg" />
+        <!-- ::+=str Append str to the variable. -->
+        <StringDetect attribute="Builtin" String=":+=" context="#pop!bmake_var_modifier_arg" />
+        <!-- ::!=cmd Assign the output of cmd to the variable. -->
+        <StringDetect attribute="Builtin" String=":!=" context="#pop!bmake_var_modifier_arg" />
+        <!-- :tu  Converts variable to upper-case letters. -->
+        <Detect2Chars attribute="Builtin" context="#pop!bmake_var_modifier_arg" char="t" char1="u"/>
+        <!-- :tW  Causes the value to be treated as a single word.  See also `:[*]'. -->
+        <Detect2Chars attribute="Builtin" context="#pop!bmake_var_modifier_arg" char="t" char1="W"/>
+        <!-- :tw  Causes the value to be treated as a sequence of words delimited by white space.  See also `:[@]'.-->
+        <Detect2Chars attribute="Builtin" context="#pop!bmake_var_modifier_arg" char="t" char1="w"/>
+        <!-- :tsc Words in the variable are normally separated by a space on
+          expansion.  This modifier sets the separator to the character c.  If
+          c is omitted, then no separator is used.  The common escapes
+          (including octal numeric codes), work as expected. -->
+        <Detect2Chars attribute="Builtin" context="#pop!bmake_var_modifier_arg" char="t" char1="s"/>
+        <RegExpr String=""/>
+
+
+        <IncludeRules context="bmake_var_modifier_arg"/>
+      </context>
+
+      <context name="expect}" attribute="Error" lineEndContext="#pop#pop#pop#pop">
+        <Detect2Chars context="#stay" char="\" char1="}"/>
+        <DetectChar attribute="Operator" char="}" context="#pop#pop#pop#pop"/>
       </context>
 
       <context name="callFunc(" attribute="FuncParam" lineEndContext="#stay">
@@ -205,6 +483,14 @@
       <itemData name="Silent"    defStyleNum="dsFunction" spellChecking="0"/>
       <itemData name="Special"   defStyleNum="dsFloat" spellChecking="0"/>
       <itemData name="Error"     defStyleNum="dsError" spellChecking="0"/>
+      <itemData name="Builtin"   defStyleNum="dsBuiltIn" spellChecking="0"/>
+      <itemData name="Number"    defStyleNum="dsDecVal" spellChecking="0"/>
+      <itemData name="Include"   defStyleNum="dsImport" spellChecking="0"/>
+      <itemData name="ControlFlow" defStyleNum="dsControlFlow" spellChecking="0"/>
+      <itemData name="VarModifier" defStyleNum="dsSpecialString" spellChecking="0"/>
+      <itemData name="RealOperator" defStyleNum="dsKeyword" spellChecking="0"/>
+      <itemData name="SpecialTarget" defStyleNum="dsOthers" spellChecking="0" bold="1"/>
+      <itemData name="SpecialPrereq" defStyleNum="dsDataType" spellChecking="0" bold="1"/>
     </itemDatas>
   </highlighting>
   <general>
@@ -212,7 +498,7 @@
       <comment name = "singleLine" start = "#"/>
     </comments>
     <!-- '-' is not a deliminator in function filter-out -->
-    <keywords casesensitive="1" weakDeliminator = "-"/>
+    <keywords casesensitive="1" weakDeliminator = ".-"/>
   </general>
 </language>
 <!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/src/share/3rdparty/generic-highlighter/perl.xml b/src/share/3rdparty/generic-highlighter/perl.xml
index a3c6bdb21b..e9fb42fac4 100644
--- a/src/share/3rdparty/generic-highlighter/perl.xml
+++ b/src/share/3rdparty/generic-highlighter/perl.xml
@@ -39,7 +39,7 @@
 
    Enhance tr/// and y/// support.
 -->
-<language name="Perl" version="2" kateversion="2.4" section="Scripts" extensions="*.pl;*.PL;*.pm" mimetype="application/x-perl;text/x-perl" priority="5" author="Anders Lund (anders@alweb.dk)" license="LGPL">
+<language name="Perl" version="3" kateversion="2.4" section="Scripts" extensions="*.pl;*.PL;*.pm" mimetype="application/x-perl;text/x-perl" priority="5" author="Anders Lund (anders@alweb.dk)" license="LGPLv2">
   <highlighting>
     <list name="keywords">
       <item> if </item>
diff --git a/src/share/3rdparty/generic-highlighter/ruby.xml b/src/share/3rdparty/generic-highlighter/ruby.xml
index 5c6dca335b..faf1dd3c40 100644
--- a/src/share/3rdparty/generic-highlighter/ruby.xml
+++ b/src/share/3rdparty/generic-highlighter/ruby.xml
@@ -31,11 +31,11 @@
 
 <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". -->
 <language name="Ruby" section="Scripts"
-	  version="2" kateversion="3.3"
+	  version="3" kateversion="3.3"
 	  extensions="*.rb;*.rjs;*.rxml;*.xml.erb;*.js.erb;*.rake;Rakefile;Gemfile;*.gemspec;Vagrantfile"
 	  mimetype="application/x-ruby"
 	  style="ruby" indenter="ruby"
-	  author="Stefan Lang (langstefan@gmx.at), Sebastian Vuorinen (sebastian.vuorinen@helsinki.fi), Robin Pedersen (robinpeder@gmail.com), Miquel Sabaté (mikisabate@gmail.com)" license="LGPL">
+	  author="Stefan Lang (langstefan@gmx.at), Sebastian Vuorinen (sebastian.vuorinen@helsinki.fi), Robin Pedersen (robinpeder@gmail.com), Miquel Sabaté (mikisabate@gmail.com)" license="LGPLv2+">
 
 	<highlighting>
 
diff --git a/src/share/3rdparty/generic-highlighter/xml.xml b/src/share/3rdparty/generic-highlighter/xml.xml
index 622c2a41e7..9c52be3af6 100644
--- a/src/share/3rdparty/generic-highlighter/xml.xml
+++ b/src/share/3rdparty/generic-highlighter/xml.xml
@@ -6,7 +6,7 @@
 	<!ENTITY name    "(?![0-9])[\w_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
 ]>
-<language name="XML" version="4" kateversion="3.4" section="Markup" extensions="*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf;*.xsd;*.svg;*.ui;*.kcfg;*.qrc;*.wsdl" mimetype="text/xml;text/book;text/daml;text/rdf;application/rss+xml;application/xspf+xml;image/svg+xml;application/x-designer;application/xml" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="XML" version="5" kateversion="3.4" section="Markup" extensions="*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf;*.xsd;*.svg;*.ui;*.kcfg;*.qrc;*.wsdl;*.scxml" mimetype="text/xml;text/book;text/daml;text/rdf;application/rss+xml;application/xspf+xml;image/svg+xml;application/x-designer;application/xml;application/scxml+xml" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 <highlighting>
 <contexts>