GenericHighlighter: Update from latest KTextEditor source

Change-Id: I0caf19cd7698c9934655483304314b5653b69f21
Reviewed-by: David Schulz <david.schulz@qt.io>

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="1.11" kateversion="3.1" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" hidden="true">
+<language version="2" kateversion="3.1" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" hidden="true">
   <highlighting>
     <list name="alerts_hi">
       <item> ALERT </item>

src/share/3rdparty/generic-highlighter/bash.xml

@@ -8,7 +8,7 @@
         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
 ]>
-<language name="Bash" version="2.18" kateversion="5.0" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="Bash" version="3" kateversion="5.0" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
@@ -312,6 +312,14 @@
       <item> gawk </item>
       <item> gc </item>
       <item> gcc </item>
+      <item> clang </item>
+      <item> valgrind </item>
+      <item> xdg-open </item>
+      <item> cmake </item>
+      <item> qmake </item>
+      <item> svn </item>
+      <item> git </item>
+      <item> rsync </item>
       <item> gdb </item>
       <item> getent </item>
       <item> getopt </item>

src/share/3rdparty/generic-highlighter/cmake.xml

@@ -28,7 +28,7 @@
 <!-- generated for "cmake version 2.8.12.1, 3.0.2, 3.1.2 and 3.3.0" -->
 <language
     name="CMake"
-    version="1.36"
+    version="2"
     kateversion="5.0"
     section="Other"
     extensions="CMakeLists.txt;*.cmake;*.cmake.in"

src/share/3rdparty/generic-highlighter/css.xml

@@ -12,6 +12,9 @@ Kate CSS syntax highlighting definition
 
 Changelog:
 
+- Version 2.13, by Guo Yunhe
+- Add all W3C Work Draft properties
+
 - Version 2.06, by Mte90:
 - CSS3 tag
 
@@ -23,60 +26,142 @@ Changelog:
 
 -->
 
-<language name="CSS" version="2.12" kateversion="5.0" section="Markup" extensions="*.css" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="CSS" version="3" kateversion="5.0" section="Markup" extensions="*.css" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
     <highlighting>
         <list name="properties">
-			<!-- CSS2 -->
+            <!-- W3C > Work Draft, from https://www.w3.org/Style/CSS/all-properties -->
             <item> azimuth </item>
+            <item> align-content </item>
+            <item> align-items </item>
+            <item> align-self </item>
+            <item> alignment-baseline </item>
+            <item> all </item>
+            <item> animation-name </item>
+            <item> animation-duration </item>
+            <item> animation-iteration-count </item>
+            <item> animation-direction </item>
+            <item> animation-delay </item>
+            <item> animation-play-state </item>
+            <item> animation-fill-mode </item>
+            <item> animation-timing-function </item>
+            <item> backface-visibility </item>
             <item> background </item>
             <item> background-attachment </item>
+            <item> background-blend-mode </item>
             <item> background-break </item>
             <item> background-clip </item>
             <item> background-color </item>
             <item> background-image </item>
-			<item> background-position </item>
             <item> background-origin </item>
+            <item> background-position </item>
             <item> background-repeat </item>
+            <item> background-size </item>
+            <item> baseline-shift </item>
+            <item> bookmark-label </item>
+            <item> bookmark-level </item>
+            <item> bookmark-level </item>
             <item> border </item>
             <item> border-bottom </item>
             <item> border-bottom-color </item>
+            <item> border-bottom-image </item>
             <item> border-bottom-style </item>
             <item> border-bottom-width </item>
+            <item> border-bottom-left-image </item>
+            <item> border-bottom-left-radius </item>
+            <item> border-bottom-right-image </item>
+            <item> border-bottom-right-radius </item>
+            <item> border-boundary </item>
             <item> border-collapse </item>
             <item> border-color </item>
+            <item> border-corner-image </item>
+            <item> border-image </item>
+            <item> border-image-outset </item>
+            <item> border-image-repeat </item>
+            <item> border-image-slice </item>
+            <item> border-image-source </item>
+            <item> border-image-width </item>
             <item> border-left </item>
             <item> border-left-color </item>
+            <item> border-left-image </item>
             <item> border-left-style </item>
             <item> border-left-width </item>
+            <item> border-radius </item>
             <item> border-right </item>
             <item> border-right-color </item>
+            <item> border-right-image </item>
             <item> border-right-style </item>
             <item> border-right-width </item>
             <item> border-spacing </item>
             <item> border-style </item>
             <item> border-top </item>
             <item> border-top-color </item>
+            <item> border-top-image </item>
             <item> border-top-style </item>
             <item> border-top-width </item>
+            <item> border-top-left-image </item>
+            <item> border-top-left-radius </item>
+            <item> border-top-right-image </item>
+            <item> border-top-right-radius </item>
             <item> border-width </item>
             <item> bottom </item>
+            <item> box-align </item>
+            <item> box-decoration-break </item>
+            <item> box-direction </item>
+            <item> box-flex </item>
+            <item> box-shadow </item>
+            <item> box-sizing </item>
+            <item> box-snap </item>
+            <item> box-suppress </item>
+            <item> break-after </item>
+            <item> break-before </item>
+            <item> break-inside </item>
+            <item> caret-color </item>
             <item> caption-side </item>
+            <item> chains </item>
             <item> clear </item>
             <item> clip </item>
+            <item> clip-path </item>
+            <item> clip-rule </item>
             <item> color </item>
+            <item> color-interpolation-filters </item>
+            <item> column-count </item>
+            <item> column-fill </item>
+            <item> column-gap </item>
+            <item> column-rule </item>
+            <item> column-rule-color </item>
+            <item> column-rule-style </item>
+            <item> column-rule-width </item>
+            <item> column-span </item>
+            <item> column-width </item>
+            <item> columns </item>
             <item> content </item>
             <item> counter-increment </item>
             <item> counter-reset </item>
+            <item> counter-set </item>
             <item> cue </item>
             <item> cue-after </item>
             <item> cue-before </item>
             <item> cursor </item>
             <item> direction </item>
             <item> display </item>
+            <item> dominant-baseline </item>
             <item> elevation </item>
             <item> empty-cells </item>
+            <item> filter </item>
+            <item> flex </item>
+            <item> flex-basis </item>
+            <item> flex-direction </item>
+            <item> flex-flow </item>
+            <item> flex-grow </item>
+            <item> flex-shrink </item>
+            <item> flex-wrap </item>
             <item> float </item>
+            <item> flood-color </item>
+            <item> flood-opacity </item>
+            <item> flow </item>
+            <item> flow-from </item>
+            <item> flow-into </item>
             <item> font </item>
             <item> font-family </item>
             <item> font-size </item>
@@ -86,10 +171,57 @@ Changelog:
             <item> font-variant </item>
             <item> font-weight </item>
             <item> font-stretch </item>
+            <item> font-feature-settings </item>
+            <item> font-kerning </item>
+            <item> font-language-override </item>
+            <item> font-synthesis </item>
+            <item> font-variant-alternates </item>
+            <item> font-variant-caps </item>
+            <item> font-variant-east-asian </item>
+            <item> font-variant-ligatures </item>
+            <item> font-variant-numeric </item>
+            <item> font-variant-position </item>
+            <item> footnote-display </item>
+            <item> footnote-policy </item>
+            <item> glyph-orientation-vertical </item>
+            <item> grid </item>
+            <item> grid-area </item>
+            <item> grid-auto-columns </item>
+            <item> grid-auto-flow </item>
+            <item> grid-auto-rows </item>
+            <item> grid-column </item>
+            <item> grid-column-end </item>
+            <item> grid-column-gap </item>
+            <item> grid-column-start </item>
+            <item> grid-gap </item>
+            <item> grid-row </item>
+            <item> grid-row-end </item>
+            <item> grid-row-gap </item>
+            <item> grid-row-start </item>
+            <item> grid-template </item>
+            <item> grid-template-areas </item>
+            <item> grid-template-columns </item>
+            <item> grid-template-rows </item>
+            <item> hanging-punctuation </item>
             <item> height </item>
+            <item> hyphens </item>
+            <item> image-orientation </item>
+            <item> image-rendering </item>
+            <item> image-resolution </item>
+            <item> initial-letter </item>
+            <item> initial-letter-align </item>
+            <item> initial-letter-wrap </item>
+            <item> isolation </item>
+            <item> justify-content </item>
+            <item> justify-items </item>
+            <item> justify-self </item>
             <item> left </item>
             <item> letter-spacing </item>
+            <item> lighting-color </item>
+            <item> linear-gradient </item>
+            <item> line-grid </item>
             <item> line-height </item>
+            <item> line-snap </item>
             <item> list-style </item>
             <item> list-style-image </item>
             <item> list-style-keyword </item>
@@ -101,16 +233,57 @@ Changelog:
             <item> margin-right </item>
             <item> margin-top </item>
             <item> marker-offset </item>
+            <item> marker-side </item>
+            <item> marquee-direction </item>
+            <item> marquee-loop </item>
+            <item> marquee-speed </item>
+            <item> marquee-style </item>
+            <item> mask </item>
+            <item> mask-border </item>
+            <item> mask-border-mode </item>
+            <item> mask-border-outset </item>
+            <item> mask-border-repeat </item>
+            <item> mask-border-slice </item>
+            <item> mask-border-source </item>
+            <item> mask-border-width </item>
+            <item> mask-clip </item>
+            <item> mask-composite </item>
+            <item> mask-image </item>
+            <item> mask-mode </item>
+            <item> mask-origin </item>
+            <item> mask-position </item>
+            <item> mask-repeat </item>
+            <item> mask-size </item>
+            <item> mask-type </item>
             <item> max-height </item>
+            <item> max-lines </item>
             <item> max-width </item>
             <item> min-height </item>
             <item> min-width </item>
+            <item> mix-blend-mode </item>
+            <item> nav-down </item>
+            <item> nav-left </item>
+            <item> nav-right </item>
+            <item> nav-up </item>
+            <item> object-fit </item>
+            <item> object-position </item>
+            <item> offset-after </item>
+            <item> offset-before </item>
+            <item> offset-end </item>
+            <item> offset-start </item>
+            <item> opacity </item>
+            <item> order </item>
             <item> orphans </item>
             <item> outline </item>
             <item> outline-color </item>
+            <item> outline-offset </item>
             <item> outline-style </item>
             <item> outline-width </item>
             <item> overflow </item>
+            <item> overflow-style </item>
+            <item> overflow-wrap </item>
+            <item> overflow-x </item>
+            <item> overflow-y </item>
             <item> padding </item>
             <item> padding-bottom </item>
             <item> padding-left </item>
@@ -123,99 +296,124 @@ Changelog:
             <item> pause </item>
             <item> pause-after </item>
             <item> pause-before </item>
+            <item> perspective </item>
+            <item> perspective-origin </item>
             <item> pitch </item>
             <item> pitch-range </item>
             <item> play-during </item>
+            <item> pointer-events </item>
+            <item> polar-anchor </item>
+            <item> polar-angle </item>
+            <item> polar-distance </item>
+            <item> polar-origin </item>
             <item> position </item>
+            <item> presentation-level </item>
             <item> quotes </item>
+            <item> resize </item>
+            <item> rest </item>
+            <item> rest-after </item>
+            <item> rest-before </item>
             <item> richness </item>
             <item> right </item>
+            <item> rotation </item>
+            <item> rotation-point </item>
+            <item> ruby-align </item>
+            <item> ruby-merge </item>
+            <item> ruby-position </item>
+            <item> running </item>
+            <item> scroll-behavior </item>
+            <item> scroll-snap-align </item>
+            <item> scroll-snap-margin </item>
+            <item> scroll-snap-margin-block </item>
+            <item> scroll-snap-margin-block-end </item>
+            <item> scroll-snap-margin-block-start </item>
+            <item> scroll-snap-margin-bottom </item>
+            <item> scroll-snap-margin-inline </item>
+            <item> scroll-snap-margin-inline-end </item>
+            <item> scroll-snap-margin-inline-start </item>
+            <item> scroll-snap-margin-left </item>
+            <item> scroll-snap-margin-right </item>
+            <item> scroll-snap-margin-top </item>
+            <item> scroll-snap-padding </item>
+            <item> scroll-snap-padding-block </item>
+            <item> scroll-snap-padding-block-end </item>
+            <item> scroll-snap-padding-block-start </item>
+            <item> scroll-snap-padding-bottom </item>
+            <item> scroll-snap-padding-inline </item>
+            <item> scroll-snap-padding-inline-end </item>
+            <item> scroll-snap-padding-inline-start </item>
+            <item> scroll-snap-padding-left </item>
+            <item> scroll-snap-padding-right </item>
+            <item> scroll-snap-padding-top </item>
+            <item> scroll-snap-stop </item>
+            <item> scroll-snap-type </item>
+            <item> shape-image-threshold </item>
+            <item> shape-inside </item>
+            <item> shape-margin </item>
+            <item> shape-outside </item>
             <item> size </item>
             <item> speak </item>
+            <item> speak-as </item>
             <item> speak-header </item>
             <item> speak-numeral </item>
             <item> speak-punctuation </item>
             <item> speech-rate </item>
             <item> stress </item>
+            <item> string-set </item>
+            <item> tab-size </item>
             <item> table-layout </item>
             <item> text-align </item>
+            <item> text-align-last </item>
+            <item> text-combine-upright </item>
             <item> text-decoration </item>
             <item> text-decoration-color </item>
+            <item> text-decoration-line </item>
+            <item> text-decoration-skip </item>
+            <item> text-decoration-style </item>
+            <item> text-emphasis </item>
+            <item> text-emphasis-color </item>
+            <item> text-emphasis-position </item>
+            <item> text-emphasis-style </item>
             <item> text-indent </item>
+            <item> text-justify </item>
+            <item> text-orientation </item>
+            <item> text-overflow </item>
             <item> text-shadow </item>
             <item> text-transform </item>
+            <item> text-underline-position </item>
+            <item> text-wrap </item>
             <item> top </item>
+            <item> transform </item>
+            <item> transform-origin </item>
+            <item> transform-style </item>
+            <item> transition </item>
+            <item> transition-delay </item>
+            <item> transition-property </item>
+            <item> transition-duration </item>
+            <item> transition-timing-function </item>
             <item> unicode-bidi </item>
             <item> vertical-align </item>
             <item> visibility </item>
+            <item> voice-balance </item>
+            <item> voice-duration </item>
             <item> voice-family </item>
+            <item> voice-pitch </item>
+            <item> voice-range </item>
+            <item> voice-rate </item>
+            <item> voice-stress </item>
+            <item> voice-volume </item>
             <item> volume </item>
             <item> white-space </item>
             <item> widows </item>
             <item> width </item>
-			<item> word-spacing </item>
+            <item> will-change </item>
-			<item> z-index </item>
-
-			<!-- CSS3 -->
-			<item> animation-name </item>
-			<item> animation-duration </item>
-			<item> animation-iteration </item>
-			<item> animation-direction </item>
-			<item> animation-delay </item>
-			<item> animation-play-state </item>
-			<item> animation-fill-mode </item>
-			<item> animation-timing-function </item>
-			<item> background-size </item>
-			<item> border-bottom-image </item>
-			<item> border-bottom-left-image </item>
-			<item> border-bottom-left-radius </item>
-			<item> border-bottom-right-image </item>
-			<item> border-bottom-right-radius </item>
-			<item> border-collapse </item>
-			<item> border-corner-image </item>
-			<item> border-image </item>
-			<item> border-left-image </item>
-			<item> border-radius </item>
-			<item> border-right-image </item>
-			<item> border-top-image </item>
-			<item> border-top-left-image </item>
-			<item> border-top-left-radius </item>
-			<item> border-top-right-image </item>
-			<item> border-top-right-radius </item>
-			<item> box-align </item>
-			<item> box-direction </item>
-			<item> box-flex </item>
-			<item> box-shadow </item>
-			<item> box-sizing </item>
-			<item> column-count </item>
-			<item> column-fill </item>
-			<item> column-gap </item>
-			<item> column-rule-color </item>
-			<item> column-rule-style </item>
-			<item> column-rule-width </item>
-			<item> column-span </item>
-			<item> column-width </item>
-			<item> hyphens </item>
-			<item> linear-gradient </item>
-			<item> opacity </item>
-			<item> outline </item>
-			<item> outline-offset </item>
-			<item> overflow-x </item>
-			<item> overflow-y </item>
-			<item> pointer-events </item>
-			<item> resize </item>
-			<item> rotation </item>
-			<item> rotation-point </item>
-			<item> table-layout </item>
-			<item> text-overflow </item>
-			<item> text-shadow </item>
-			<item> text-wrap </item>
-			<item> transform-origin </item>
-			<item> transition </item>
-			<item> transition-property </item>
-			<item> transition-duration </item>
             <item> word-break </item>
+            <item> word-spacing </item>
             <item> word-wrap </item>
+            <item> wrap-flow </item>
+            <item> wrap-through </item>
+            <item> writing-mode </item>
+            <item> z-index </item>
 
             <!-- Gecko rendering engine CSS property extensions -->
             <item> -moz-animation-name </item>
@@ -319,7 +517,6 @@ Changelog:
             <item> -webkit-transition-duration </item>
 
             <!-- Trident (a.k.a., MSHTML) CSS property extensions -->
-			<item> filter </item>
             <item> zoom </item>
             <item> -ms-animation-name </item>
             <item> -ms-animation-duration </item>
@@ -553,7 +750,6 @@ Changelog:
             <item> -epub-hyphens </item>
         </list>
 
-
         <list name="colors">
             <item> aqua </item>
             <item> black </item>
@@ -893,6 +1089,7 @@ Changelog:
             </context>
 
         </contexts>
+
         <itemDatas>
             <itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/>
             <itemData name="Property"  defStyleNum="dsKeyword" spellChecking="false"/>
@@ -911,10 +1108,12 @@ Changelog:
             <itemData name="Error" defStyleNum="dsError" spellChecking="false"/>
         </itemDatas>
     </highlighting>
+
     <general>
         <keywords casesensitive="0" weakDeliminator="-%"/>
         <comments>
             <comment name="multiLine" start="/*" end="*/" />
         </comments>
     </general>
-	</language>
+
+</language>

src/share/3rdparty/generic-highlighter/doxygen.xml

@@ -29,7 +29,7 @@
  -->
 
 <language name="Doxygen"
-          version="1.41"
+          version="2"
           kateversion="5.0"
           section="Markup"
           extensions="*.dox;*.doxygen"
@@ -278,7 +278,7 @@
         <DetectIdentifier />
         <StringDetect attribute="HTML Comment" context="SL_htmlcomment" String="&lt;!--" />
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
-        <RegExpr attribute="HTML Tag" context="SL_htmltag" String="&lt;\/?[a-zA-Z_:][a-zA-Z0-9._:-]*" />
+        <RegExpr attribute="HTML Tag" context="SL_htmltag" String="&lt;\/?[\w0-9._:-@]+" />
       </context>
       <context attribute="Comment" lineEndContext="#stay" name="BlockComment">
         <DetectSpaces />
@@ -297,7 +297,7 @@
         <DetectIdentifier />
         <RegExpr attribute="Tags" context="#stay" String="\\(&lt;|&gt;)" />
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
-        <RegExpr attribute="HTML Tag" context="ML_htmltag" String="&lt;\/?[a-zA-Z_:][a-zA-Z0-9._:-]*" />
+        <RegExpr attribute="HTML Tag" context="ML_htmltag" String="&lt;\/?[\w0-9._:-@]+" />
         <StringDetect attribute="HTML Comment" context="ML_htmlcomment" String="&lt;!--" />
       </context>
 
@@ -339,7 +339,7 @@
         <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
         <StringDetect attribute="HTML Comment" context="ML_htmlcomment" String="&lt;!--" />
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
-        <RegExpr attribute="HTML Tag" context="ML_htmltag" String="&lt;\/?[a-zA-Z_:][a-zA-Z0-9._:-]*" />
+        <RegExpr attribute="HTML Tag" context="ML_htmltag" String="&lt;\/?[\w0-9._:-@]+" />
         <RegExpr attribute="Description" context="#stay" String="." />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="ML_TagWordString">
@@ -405,7 +405,7 @@
         <DetectSpaces />
         <StringDetect attribute="HTML Comment" context="SL_htmlcomment" String="&lt;!--" />
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
-        <RegExpr attribute="HTML Tag" context="SL_htmltag" String="&lt;\/?[a-zA-Z_:][a-zA-Z0-9._:-]*" />
+        <RegExpr attribute="HTML Tag" context="SL_htmltag" String="&lt;\/?[\w0-9._:-@]+" />
         <RegExpr attribute="Description" context="#stay" String="." />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="SL_TagWordString">

src/share/3rdparty/generic-highlighter/dtd.xml

@@ -3,7 +3,7 @@
   <!ENTITY nmtoken "[\-\w\d\.:_]+">
   <!ENTITY entref  "(#[0-9]+|#[xX][0-9A-Fa-f]+|&nmtoken;);">
 ]>
-<language name="DTD" version="1.02" kateversion="3.4" section="Markup" extensions="*.dtd" mimetype="application/xml-dtd" author="Andriy Lesyuk (s-andy@in.if.ua)" license="LGPL">
+<language name="DTD" version="2" kateversion="3.4" section="Markup" extensions="*.dtd" mimetype="application/xml-dtd" author="Andriy Lesyuk (s-andy@in.if.ua)" license="LGPL">
   <highlighting>
 
     <list name="Category">

src/share/3rdparty/generic-highlighter/html.xml

@@ -4,7 +4,7 @@
 	<!ENTITY name    "[A-Za-z_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
 ]>
-<language name="HTML" version="2.1" kateversion="3.4" section="Markup" extensions="*.htm;*.html;*.shtml;*.shtm" mimetype="text/html"  author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL" priority="10">
+<language name="HTML" version="4" kateversion="3.4" section="Markup" extensions="*.htm;*.html;*.shtml;*.shtm" mimetype="text/html"  author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL" priority="10">
 
 <highlighting>
 <contexts>
@@ -211,7 +211,7 @@
   <itemData name="Doctype" defStyleNum="dsDataType" bold="1" spellChecking="false" />
   <itemData name="Element" defStyleNum="dsKeyword" spellChecking="false" />
   <itemData name="Attribute" defStyleNum="dsOthers" spellChecking="false" />
-  <itemData name="Value" defStyleNum="dsString" color="#a00" spellChecking="false" />
+  <itemData name="Value" defStyleNum="dsString" spellChecking="false" />
   <itemData name="EntityRef" defStyleNum="dsDecVal" spellChecking="false" />
   <itemData name="PEntityRef" defStyleNum="dsDecVal" spellChecking="false" />
   <itemData name="Error" defStyleNum="dsError" spellChecking="false" />

src/share/3rdparty/generic-highlighter/ini.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="INI Files" section="Configuration" extensions="*.ini;*.pls;*.kcfgc" mimetype="" version="1.1" kateversion="2.4" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
+<language name="INI Files" section="Configuration" extensions="*.ini;*.pls;*.kcfgc" mimetype="" version="2" kateversion="2.4" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
 
 <highlighting>
 <list name="keywords">
@@ -34,7 +34,7 @@
 
 <contexts>
  <context name="ini" attribute="Normal Text" lineEndContext="#stay">
-  <RangeDetect attribute="Section" context="#pop" char="["  char1="]" beginRegion="Section" endRegion="Section" />
+  <RangeDetect attribute="Section" context="#stay" char="["  char1="]" beginRegion="Section" endRegion="Section" />
   <DetectChar attribute="Assignment" context="Value" char="=" />
   <DetectChar char=";" attribute="Comment" context="Comment" firstNonSpace="true" />
   <DetectChar char="#" attribute="Comment" context="Comment" firstNonSpace="true" />

src/share/3rdparty/generic-highlighter/java.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Java" version="1.22" kateversion="5.0" section="Sources" extensions="*.java" mimetype="text/x-java" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
+<language name="Java" version="2" kateversion="5.0" section="Sources" extensions="*.java" mimetype="text/x-java" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
 	<highlighting>
 		<list name="java15">
 			<item> ACTIVE </item>

src/share/3rdparty/generic-highlighter/javadoc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Javadoc" version="1.05" kateversion="2.4" section="Markup" extensions="" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
+<language name="Javadoc" version="2" kateversion="2.4" section="Markup" extensions="" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
 	<highlighting>
 		<contexts>
 			<context name="Start" attribute="Normal Text" lineEndContext="#stay">

src/share/3rdparty/generic-highlighter/makefile.xml

@@ -8,7 +8,7 @@
 <!-- v2.1 by Alex Turbov <i.zaufi@gmail.com>
      improve comments handling -->
 <language name="Makefile" section="Other"
-          version="2.1" kateversion="3.4"
+          version="3" kateversion="3.4"
           extensions="GNUmakefile;Makefile;makefile;GNUmakefile.*;Makefile.*;makefile.*;*.mk"
           mimetype="text/x-makefile"
           author="Per Wigren (wigren@home.se)" license="">

src/share/3rdparty/generic-highlighter/perl.xml

@@ -39,7 +39,7 @@
 
    Enhance tr/// and y/// support.
 -->
-<language name="Perl" version="1.32" 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="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">
   <highlighting>
     <list name="keywords">
       <item> if </item>

src/share/3rdparty/generic-highlighter/ruby.xml

@@ -31,7 +31,7 @@
 
 <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". -->
 <language name="Ruby" section="Scripts"
-	  version="1.29" kateversion="3.3"
+	  version="2" kateversion="3.3"
 	  extensions="*.rb;*.rjs;*.rxml;*.xml.erb;*.js.erb;*.rake;Rakefile;Gemfile;*.gemspec;Vagrantfile"
 	  mimetype="application/x-ruby"
 	  style="ruby" indenter="ruby"

src/share/3rdparty/generic-highlighter/valgrind-suppression.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Valgrind Suppression" section="Other" extensions="*.supp;" mimetype="" version="1.0" kateversion="2.4" author="Milian Wolff (mail@milianw.de)" license="LGPL">
+<language name="Valgrind Suppression" section="Other" extensions="*.supp;" mimetype="" version="2" kateversion="2.4" author="Milian Wolff (mail@milianw.de)" license="LGPL">
 <highlighting>
 <contexts>
   <context name="File" attribute="Normal Text" lineEndContext="#stay">

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="2.03" 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="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">
 
 <highlighting>
 <contexts>
@@ -134,7 +134,7 @@
   <itemData name="Doctype" defStyleNum="dsDataType" bold="1" spellChecking="false" />
   <itemData name="Element" defStyleNum="dsKeyword" spellChecking="false" />
   <itemData name="Attribute" defStyleNum="dsOthers" spellChecking="false" />
-  <itemData name="Value" defStyleNum="dsString" color="#a00" spellChecking="false" />
+  <itemData name="Value" defStyleNum="dsString" spellChecking="false" />
   <itemData name="EntityRef" defStyleNum="dsDecVal" spellChecking="false" />
   <itemData name="PEntityRef" defStyleNum="dsDecVal" spellChecking="false" />
   <itemData name="Error" defStyleNum="dsError" spellChecking="false" />

src/share/3rdparty/generic-highlighter/yacc.xml

@@ -25,7 +25,7 @@ This code is released under the LGPL as part of kdelibs/kate.
 
 ========================================================================
 -->
-<language name="Yacc/Bison" version="1.04" kateversion="2.4" section="Sources" extensions="*.y;*.yy" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
+<language name="Yacc/Bison" version="3" kateversion="2.4" section="Sources" extensions="*.y;*.yy" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
 
 <highlighting>
 <contexts>
@@ -92,7 +92,7 @@ This code is released under the LGPL as part of kdelibs/kate.
     <IncludeRules context="Comment" />
     <RegExpr attribute="Normal Text" context="Percent Command In" String="\W" lookAhead="true" />
   </context>
-  <context name="Percent Command In" attribute="NormalText" lineEndContext="#pop#pop">
+  <context name="Percent Command In" attribute="Normal Text" lineEndContext="#pop#pop">
     <IncludeRules context="StringOrChar" />
     <DetectChar attribute="Data Type" context="PC type" char="&lt;" />
   </context>
@@ -112,7 +112,7 @@ This code is released under the LGPL as part of kdelibs/kate.
     <RegExpr attribute="Comment" context="#pop" String="[^\\]$" />
   </context>
 
-  <context name="StringOrChar" attribute="NormalText" lineEndContext="#stay">
+  <context name="StringOrChar" attribute="Normal Text" lineEndContext="#stay">
     <DetectChar attribute="String Char" context="Char" char="'" />
     <DetectChar attribute="String" context="String" char="&quot;" />
   </context>