From 43cfafa4d773e0f213d3b6da23e0d35363bda0ca Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Tue, 3 Jun 2014 11:56:45 +0900
Subject: [PATCH] Kate syntax highlighting files update - Jun 2014 (cherry
 picked from commit 790fe12d34447ad8549fcb75acf05d056e6743c6)

---
 kate/data/ada.xml              |  8 +++++++-
 kate/data/coffee.xml           |  4 ++--
 kate/data/euphoria.xml         |  4 ++--
 kate/data/html-php.xml         |  4 ++--
 kate/data/html.xml             |  4 ++--
 kate/data/javascript-php.xml   | 14 +++++++++++++-
 kate/data/javascript.xml       | 13 ++++++++++++-
 kate/data/mako.xml             |  6 +++---
 kate/data/maxima.xml           |  4 ++--
 kate/data/php.xml              |  6 +++---
 kate/data/prolog.xml           |  6 +++---
 kate/data/rhtml.xml            |  4 ++--
 kate/data/template-toolkit.xml |  4 ++--
 kate/data/update-files.xml     | 26 +++++++++++++-------------
 14 files changed, 68 insertions(+), 39 deletions(-)

diff --git a/kate/data/ada.xml b/kate/data/ada.xml
index 9bc6b7633..f2f753c5f 100644
--- a/kate/data/ada.xml
+++ b/kate/data/ada.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Ada" version="1.07" kateversion="2.4" section="Sources" extensions="*.adb;*.ads;*.ada;*.a" mimetype="text/x-adasrc">
+<language name="Ada"
+          version="1.08"
+          kateversion="2.5"
+          section="Sources"
+          extensions="*.adb;*.ads;*.ada;*.a"
+          indenter="ada"
+          mimetype="text/x-adasrc">
   <highlighting>
     <list name="keywords">
       <item> abort </item>
diff --git a/kate/data/coffee.xml b/kate/data/coffee.xml
index 043e51bd5..dc0f1c541 100644
--- a/kate/data/coffee.xml
+++ b/kate/data/coffee.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE language SYSTEM "language.dtd">
 
 <language name="CoffeeScript"
-          version="1.4"
+          version="1.5"
           kateversion="2.4"
           section="Scripts"
           extensions="Cakefile;*.coffee;*.coco"
@@ -223,7 +223,7 @@
       <context name="Javascript" attribute="Javascript" lineEndContext="#stay" noIndentationBasedFolding="1">
         <DetectChar attribute="Javascript" context="#pop" char="`" endRegion="Javascript"/>
         <!-- NOTE: This hides errors where a backtick is embedded in a JS string. -->
-        <IncludeRules context="##JavaScript" includeAttrib="true"/>
+        <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
       </context>
     </contexts>
     <!-- Style mappings. -->
diff --git a/kate/data/euphoria.xml b/kate/data/euphoria.xml
index 4c00a56b1..431a2dc63 100644
--- a/kate/data/euphoria.xml
+++ b/kate/data/euphoria.xml
@@ -27,9 +27,9 @@
 
 -->
 
-<!-- Store this in /usr/share/apps/katepart/syntax -->
+<!-- Store this in ~/.trinity/share/apps/katepart/syntax, -->
 
-<language name="Euphoria" version="2.08-1" kateversion="2.4" section="Scripts" extensions="*.e;*.ex;*.exw;*.exu" mimetype="text/x-euphoria" author="Irv Mullins (irvm@ellijay.com)" license="LGPL">
+<language name="Euphoria" version="2.08-2" kateversion="2.4" section="Scripts" extensions="*.e;*.ex;*.exw;*.exu" mimetype="text/x-euphoria" author="Irv Mullins (irvm@ellijay.com)" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item> abort </item>
diff --git a/kate/data/html-php.xml b/kate/data/html-php.xml
index 7a5215fbc..4b18b99fd 100644
--- a/kate/data/html-php.xml
+++ b/kate/data/html-php.xml
@@ -10,7 +10,7 @@
 
 
 
-<language name="PHP (HTML)" version="2.0" kateversion="2.4" section="Scripts" extensions="*.php;*.php3;*.wml;*.phtml;*.phtm;*.inc" mimetype="text/x-php4-src;text/x-php3-src;text/vnd.wap.wml;application/x-php"  author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL" priority="10">
+<language name="PHP (HTML)" version="2.1" kateversion="2.4" section="Scripts" extensions="*.php;*.php3;*.wml;*.phtml;*.phtm;*.inc" mimetype="text/x-php4-src;text/x-php3-src;text/vnd.wap.wml;application/x-php"  author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL" priority="10">
 
 <highlighting>
 <contexts>
@@ -199,7 +199,7 @@
 <IncludeRules context="FindPHP" />
     <RegExpr attribute="Element" context="El Close 2" String="&lt;/script\b" insensitive="TRUE" endRegion="script" />
     <RegExpr attribute="Comment" context="JS comment close" String="//(?=.*&lt;/script\b)" insensitive="TRUE" />
-    <IncludeRules context="##JavaScript/PHP" includeAttrib="true"/>
+    <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
   </context>
 
   <context name="JS comment close" attribute="Comment" lineEndContext="#pop">
diff --git a/kate/data/html.xml b/kate/data/html.xml
index 756fa8f8e..653fdb2b0 100644
--- a/kate/data/html.xml
+++ b/kate/data/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.0" kateversion="2.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="2.1" kateversion="2.4" section="Markup" extensions="*.htm;*.html;*.shtml;*.shtm" mimetype="text/html"  author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL" priority="10">
 
 <highlighting>
 <contexts>
@@ -171,7 +171,7 @@
   <context name="JS content" attribute="Other Text" lineEndContext="#stay">
     <RegExpr attribute="Element" context="El Close 2" String="&lt;/script\b" insensitive="TRUE" endRegion="script" />
     <RegExpr attribute="Comment" context="JS comment close" String="//(?=.*&lt;/script\b)" insensitive="TRUE" />
-    <IncludeRules context="##JavaScript" includeAttrib="true"/>
+    <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
   </context>
 
   <context name="JS comment close" attribute="Comment" lineEndContext="#pop">
diff --git a/kate/data/javascript-php.xml b/kate/data/javascript-php.xml
index d61b07663..a4ff01233 100644
--- a/kate/data/javascript-php.xml
+++ b/kate/data/javascript-php.xml
@@ -9,7 +9,7 @@
 
 
 
-<language name="JavaScript/PHP" hidden="true" version="1.22" kateversion="2.4" section="Other" extensions=""
+<language name="JavaScript/PHP" hidden="true" version="1.23" kateversion="2.4" section="Other" extensions=""
           mimetype="" indenter="cstyle"
           author="Anders Lund (anders@alweb.dk), Joseph Wenninger (jowenn@kde.org), Whitehawk Stormchaser (zerokode@gmx.net)" license="">
   <highlighting>
@@ -70,6 +70,18 @@
       <item> undefined </item>
     </list>
     <contexts>
+
+      <!-- Shebang: ("#!") Detect shebang and fallthrough to Normal -->
+      <!-- Based on the similar clause from prolog.xml, which notes the following BUG:
+        If the file starts with whitespace and a shebang on a line other than the first line,
+        this rule will still match it as a shebang, even tough the shebang is only valid on
+        the very first line.
+      -->
+      <context name="Shebang" lineEndContext="Normal" attribute="Syntax Error" fallthrough="true" fallthroughContext="Normal" >
+<IncludeRules context="FindPHP" />
+        <Detect2Chars column="0" char="#" char1="!" context="Comment" attribute="Comment" />
+      </context>
+
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
 <IncludeRules context="FindPHP" />
         <DetectSpaces/>
diff --git a/kate/data/javascript.xml b/kate/data/javascript.xml
index 260aa721a..dc124041e 100644
--- a/kate/data/javascript.xml
+++ b/kate/data/javascript.xml
@@ -3,7 +3,7 @@
 <!-- Author: Anders Lund <anders@alweb.dk> //-->
 <!-- Minor changes: Joseph Wenninger <jowenn@kde.org> //-->
 <!-- Full JavaScript 1.0 support by Whitehawk Stormchaser //-->
-<language name="JavaScript" version="1.22" kateversion="2.4" section="Scripts" extensions="*.js;*.kwinscript"
+<language name="JavaScript" version="1.23" kateversion="2.4" section="Scripts" extensions="*.js;*.kwinscript"
           mimetype="text/x-javascript;application/x-javascript" indenter="cstyle"
           author="Anders Lund (anders@alweb.dk), Joseph Wenninger (jowenn@kde.org), Whitehawk Stormchaser (zerokode@gmx.net)" license="">
   <highlighting>
@@ -64,6 +64,17 @@
       <item> undefined </item>
     </list>
     <contexts>
+
+      <!-- Shebang: ("#!") Detect shebang and fallthrough to Normal -->
+      <!-- Based on the similar clause from prolog.xml, which notes the following BUG:
+        If the file starts with whitespace and a shebang on a line other than the first line,
+        this rule will still match it as a shebang, even tough the shebang is only valid on
+        the very first line.
+      -->
+      <context name="Shebang" lineEndContext="Normal" attribute="Syntax Error" fallthrough="true" fallthroughContext="Normal" >
+        <Detect2Chars column="0" char="#" char1="!" context="Comment" attribute="Comment" />
+      </context>
+
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
         <DetectSpaces/>
         <StringDetect attribute="Region Marker" context="region_marker" String="//BEGIN" beginRegion="Region1" />
diff --git a/kate/data/mako.xml b/kate/data/mako.xml
index cfac8394e..86acdf95c 100644
--- a/kate/data/mako.xml
+++ b/kate/data/mako.xml
@@ -4,7 +4,7 @@
 	<!ENTITY name    "[A-Za-z_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
 ]>
-<language name="Mako" version="1.0" kateversion="2.4" section="Markup" extensions="*.mako;*.mak" author="Massimiliano Torromeo (massimiliano.torromeo@gmail.com)" license="LGPL">
+<language name="Mako" version="1.1" kateversion="2.4" section="Markup" extensions="*.mako;*.mak" author="Massimiliano Torromeo (massimiliano.torromeo@gmail.com)" license="LGPL">
 
 <highlighting>
 <list name="flow">
@@ -47,7 +47,7 @@
 
 	<context name="NoMakoJS" attribute="Normal Text" lineEndContext="#stay">
 		<StringDetect attribute="MakoKeyword" context="#pop" String="&lt;/%text&gt;" endRegion="nomako" />
-		<IncludeRules context="##JavaScript" includeAttrib="true"/>
+		<IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
 	</context>
 
 	<context name="FindHTML" attribute="Normal Text" lineEndContext="#stay">
@@ -192,7 +192,7 @@
 		<RegExpr attribute="Comment" context="JS comment close" String="//(?=.*&lt;/script\b)" insensitive="TRUE" />
 		<RegExpr attribute="MakoKeyword" context="NoMakoJS" String="&lt;%text(?:\s+[^&gt;]*)?&gt;" beginRegion="nomako" />
 		<IncludeRules context="FindMako" />
-		<IncludeRules context="##JavaScript" includeAttrib="true"/>
+		<IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
 	</context>
 
 	<context name="JS comment close" attribute="Comment" lineEndContext="#pop">
diff --git a/kate/data/maxima.xml b/kate/data/maxima.xml
index a9ae298c6..cbf765794 100644
--- a/kate/data/maxima.xml
+++ b/kate/data/maxima.xml
@@ -16,12 +16,12 @@
     You should have received a copy of the GNU General Public License
     along with the maxima.xml. If not, see <http://www.gnu.org/licenses/>.
 
-    Usage: place maxima.xml in $KDEDIR/share/apps/katepart/syntax.
+    Usage: place maxima.xml in ~/.trinity/share/apps/katepart/syntax/.
 -->
 
 <!DOCTYPE language SYSTEM "language.dtd">
 
-<language name="Maxima" version="0.16-1" kateversion="2.0" section="Scientific" extensions="*.mac;*.MAC;*.dem;*.DEM" casesensitive="1" author="Alexey Beshenov &lt;al@beshenov.ru>" license="LGPL">
+<language name="Maxima" version="0.16-2" kateversion="2.0" section="Scientific" extensions="*.mac;*.MAC;*.dem;*.DEM" casesensitive="1" author="Alexey Beshenov &lt;al@beshenov.ru>" license="LGPL">
     <highlighting>
 
         <list name="MaximaKeyword">
diff --git a/kate/data/php.xml b/kate/data/php.xml
index b7d30b7b7..f195b956e 100644
--- a/kate/data/php.xml
+++ b/kate/data/php.xml
@@ -64,7 +64,7 @@ Changes:
   <!ENTITY types "int|integer|bool|boolean|float|double|real|string|array|object">
 ]>
 
-<language name="PHP/PHP" indenter="cstyle" version="1.44" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
+<language name="PHP/PHP" indenter="cstyle" version="1.45" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
   <highlighting>
     <list name="control structures">
       <item>as</item>
@@ -5559,7 +5559,7 @@ Changes:
       <context name="javascriptheredoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
         <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
         <IncludeRules context="commonheredoc" />
-        <IncludeRules context="##JavaScript" />
+        <IncludeRules context="Normal##JavaScript" />
       </context>
       <context name="heredoc" attribute="String" lineEndContext="#stay" dynamic="true">
         <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
@@ -5588,7 +5588,7 @@ Changes:
       <context name="javascriptnowdoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
         <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
         <IncludeRules context="commonnowdoc" />
-        <IncludeRules context="##JavaScript" />
+        <IncludeRules context="Normal##JavaScript" />
       </context>
       <context name="nowdoc" attribute="String" lineEndContext="#stay" dynamic="true">
         <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
diff --git a/kate/data/prolog.xml b/kate/data/prolog.xml
index e8e57fa5e..269c30776 100644
--- a/kate/data/prolog.xml
+++ b/kate/data/prolog.xml
@@ -105,7 +105,7 @@ to make the rules more expressive. -->
     <!ENTITY bs         "\">
 ]>
 <language name="Prolog" section="Sources"
-	  version="1.1-1" kateversion="2.3"
+	  version="1.1-2" kateversion="2.3"
 	  mimetype="text/x-prolog"
 	  extensions="*.prolog;*.dcg;*.pro"
 	  author="Torsten Eichstädt (torsten.eichstaedt@web.de)"
@@ -196,7 +196,7 @@ AL GUSTO (simple changes):
   The simplified syntax below should highlight 99.999% of ISO-Prolog texts
 correctly, as well as many non-ISO Prolog texts.
   Else modify this file.  Save with new name in your HOME directory to
-.kde/share/apps/katepart/syntax/prolog-xy.xml You may read the NOTE at the end
+.trinity/share/apps/katepart/syntax/prolog.xml You may read the NOTE at the end
 of this file.  WARNING: Be careful, though: the highlighting works according to
 it's program code, not neccessarily it's documentation...
 
@@ -1106,7 +1106,7 @@ TODO sorted by priority
 	(don't use a space between the two - [author: dashes/minus]
 	That's just because XML comments don't allow that:-(
 
-    To use your syntax file, copy it to .kde/share/apps/katepart/syntax/ in
+    To use your syntax file, copy it to .trinity/share/apps/katepart/syntax/ in
     your home directory. You have to open a new instance of kwrite/kate to use
     the new syntax file.
 -->
diff --git a/kate/data/rhtml.xml b/kate/data/rhtml.xml
index d4a21ba50..19fa0ace8 100644
--- a/kate/data/rhtml.xml
+++ b/kate/data/rhtml.xml
@@ -44,7 +44,7 @@
 -->
 	
 <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". -->
-<language name="Ruby/Rails/RHTML" version="1.01" kateversion="2.4" section="Markup" extensions="*.rhtml;*.html.erb" mimetype="" author="Richard Dale rdale@foton.es" license="LGPL">
+<language name="Ruby/Rails/RHTML" version="1.02" kateversion="2.4" section="Markup" extensions="*.rhtml;*.html.erb" mimetype="" author="Richard Dale rdale@foton.es" license="LGPL">
 	
 	<highlighting>
 	
@@ -487,7 +487,7 @@
 				
 				<RegExpr attribute="Element" context="El Close 2" String="&lt;/script\b" insensitive="TRUE" endRegion="script" />
 				<RegExpr attribute="Comment" context="JS comment close" String="//(?=.*&lt;/script\b)" insensitive="TRUE" />
-				<IncludeRules context="##JavaScript" includeAttrib="true"/>
+				<IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
 			</context>
 			
 			<context name="JS comment close" attribute="Comment" lineEndContext="#pop">
diff --git a/kate/data/template-toolkit.xml b/kate/data/template-toolkit.xml
index b87112379..7e6821001 100644
--- a/kate/data/template-toolkit.xml
+++ b/kate/data/template-toolkit.xml
@@ -6,7 +6,7 @@
 ]>
 <!--
     Copyright (C) 2007 Красимир Беров <k.berov@gmail.com>
-    Put this file in your $KDIR/share/apps/katepart/syntax,
+    Put this file in your ~/.trinity/share/apps/katepart/syntax,
     then restart Кate/KDevelop/Quanta... whatever using katepart.
     That's it. You have Template Toolkit Syntax highliting.
     Enjoy!!!
@@ -16,7 +16,7 @@
     Changelog :)
     0.02 Added highliting for interpolated variables
         -->
-<language version="0.03-1" kateversion="2.4"
+<language version="0.03-2" kateversion="2.4"
           author="Красимир Беров (k.berov@gmail.com)" license="Artistic"
           name="TT2" section="Markup" extensions="*.tt*;" casesensitive="TRUE">
 <highlighting>
diff --git a/kate/data/update-files.xml b/kate/data/update-files.xml
index 702a6e0d2..075a75ff8 100644
--- a/kate/data/update-files.xml
+++ b/kate/data/update-files.xml
@@ -3,7 +3,7 @@
 <Definition name="ABAP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/abap.xml" version="1.00"/>
 <Definition name="ABC" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/abc.xml" version="1.10"/>
 <Definition name="ActionScript 2.0" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/actionscript.xml" version="1.0"/>
-<Definition name="Ada" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ada.xml" version="1.07"/>
+<Definition name="Ada" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ada.xml" version="1.08"/>
 <Definition name="AHDL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ahdl.xml" version="1.04"/>
 <Definition name="AutoHotKey" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ahk.xml" version="1.0"/>
 <Definition name="Alerts_indent" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/alert_indent.xml" version="1.09-1"/>
@@ -32,7 +32,7 @@
 <Definition name="Clipper" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/clipper.xml" version="1.05"/>
 <Definition name="Clojure" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/clojure.xml" version="2-1"/>
 <Definition name="CMake" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cmake.xml" version="1.29-1"/>
-<Definition name="CoffeeScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/coffee.xml" version="1.4"/>
+<Definition name="CoffeeScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/coffee.xml" version="1.5"/>
 <Definition name="ColdFusion" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/coldfusion.xml" version="1.04"/>
 <Definition name="Common Lisp" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/commonlisp.xml" version="1.05-1"/>
 <Definition name="Component-Pascal" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/component-pascal.xml" version="1.05"/>
@@ -59,7 +59,7 @@
 <Definition name="Eiffel" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/eiffel.xml" version="1.02"/>
 <Definition name="Email" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/email.xml" version="1.00"/>
 <Definition name="Erlang" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/erlang.xml" version="1.03"/>
-<Definition name="Euphoria" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/euphoria.xml" version="2.08-1"/>
+<Definition name="Euphoria" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/euphoria.xml" version="2.08-2"/>
 <Definition name="E Language" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/e.xml" version="0.22"/>
 <Definition name="ferite" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ferite.xml" version="1.04"/>
 <Definition name="4GL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/fgl-4gl.xml" version="1.02"/>
@@ -82,8 +82,8 @@
 <Definition name="KDev-PG[-Qt] Grammar" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/grammar.xml" version="0.24-1"/>
 <Definition name="Haml" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/haml.xml" version="1.1"/>
 <Definition name="Haskell" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/haskell.xml" version="2.2"/>
-<Definition name="PHP (HTML)" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/html-php.xml" version="2.0"/>
-<Definition name="HTML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/html.xml" version="2.0"/>
+<Definition name="PHP (HTML)" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/html-php.xml" version="2.1"/>
+<Definition name="HTML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/html.xml" version="2.1"/>
 <Definition name="Quake Script" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/idconsole.xml" version="1.02"/>
 <Definition name="IDL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/idl.xml" version="1.07"/>
 <Definition name="ILERPG" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ilerpg.xml" version="1.05-1"/>
@@ -92,8 +92,8 @@
 <Definition name="ISO C++" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/isocpp.xml" version="2.1-1"/>
 <Definition name="Jam" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/jam.xml" version="0.3"/>
 <Definition name="Javadoc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javadoc.xml" version="1.04"/>
-<Definition name="JavaScript/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javascript-php.xml" version="1.22"/>
-<Definition name="JavaScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javascript.xml" version="1.22"/>
+<Definition name="JavaScript/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javascript-php.xml" version="1.23"/>
+<Definition name="JavaScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javascript.xml" version="1.23"/>
 <Definition name="Java" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/java.xml" version="1.21"/>
 <Definition name="JSON" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/json.xml" version="1.3"/>
 <Definition name="JSP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/jsp.xml" version="1.02"/>
@@ -113,11 +113,11 @@
 <Definition name="GNU M4" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/m4.xml" version="1.1-1"/>
 <Definition name="MAB-DB" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mab.xml" version="1.03"/>
 <Definition name="Makefile" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/makefile.xml" version="2.0"/>
-<Definition name="Mako" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mako.xml" version="1.0"/>
+<Definition name="Mako" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mako.xml" version="1.1"/>
 <Definition name="Mason" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mason.xml" version="1.06"/>
 <Definition name="Mathematica" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mathematica.xml" version="8.0.4"/>
 <Definition name="Matlab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/matlab.xml" version="1.31-1"/>
-<Definition name="Maxima" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/maxima.xml" version="0.16-1"/>
+<Definition name="Maxima" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/maxima.xml" version="0.16-2"/>
 <Definition name="MediaWiki" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mediawiki.xml" version="1.10"/>
 <Definition name="MEL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mel.xml" version="1.01"/>
 <Definition name="mergetag text" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mergetagtext.xml" version="0.1"/>
@@ -142,7 +142,7 @@
 <Definition name="Pascal" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pascal.xml" version="1.23"/>
 <Definition name="Perl" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/perl.xml" version="1.29-1"/>
 <Definition name="PGN" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pgn.xml" version="2.01-1"/>
-<Definition name="PHP/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/php.xml" version="1.44"/>
+<Definition name="PHP/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/php.xml" version="1.45"/>
 <Definition name="PicAsm" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/picsrc.xml" version="1.07"/>
 <Definition name="Pig" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pig.xml" version="3.0"/>
 <Definition name="Pike" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pike.xml" version="1.07"/>
@@ -150,7 +150,7 @@
 <Definition name="POV-Ray" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/povray.xml" version="1.2.1"/>
 <Definition name="PostScript Printer Description" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ppd.xml" version="0.1"/>
 <Definition name="progress" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/progress.xml" version="1.10"/>
-<Definition name="Prolog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/prolog.xml" version="1.1-1"/>
+<Definition name="Prolog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/prolog.xml" version="1.1-2"/>
 <Definition name="Protobuf" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/protobuf.xml" version="2.40"/>
 <Definition name="Puppet" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/puppet.xml" version="1.18"/>
 <Definition name="PureBasic" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/purebasic.xml" version="3.91"/>
@@ -164,7 +164,7 @@
 <Definition name="Restructured Text" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/restructuredtext.xml" version="1.0"/>
 <Definition name="reStructuredText" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rest.xml" version="1.02"/>
 <Definition name="REXX" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rexx.xml" version="1.01"/>
-<Definition name="Ruby/Rails/RHTML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rhtml.xml" version="1.01"/>
+<Definition name="Ruby/Rails/RHTML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rhtml.xml" version="1.02"/>
 <Definition name="RenderMan RIB" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rib.xml" version="1.00"/>
 <Definition name="RPM Spec" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rpmspec.xml" version="2.03"/>
 <Definition name="RSI IDL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rsiidl.xml" version="1.04"/>
@@ -190,7 +190,7 @@
 <Definition name="TADS 3" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/tads3.xml" version="1.0"/>
 <Definition name="Tcl/Tk" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/tcl.xml" version="1.11"/>
 <Definition name="Tcsh" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/tcsh.xml" version="0.2-1"/>
-<Definition name="TT2" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/template-toolkit.xml" version="0.03-1"/>
+<Definition name="TT2" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/template-toolkit.xml" version="0.03-2"/>
 <Definition name="Texinfo" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/texinfo.xml" version="0.2"/>
 <Definition name="Textile" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/textile.xml" version="1.1"/>
 <Definition name="TI Basic" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/tibasic.xml" version="1.01"/>