Attachment 1747 Details for Bug 1779 – Patch to update kate syntax files

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Patch to update kate syntax files

tdelibs-kate-syntax.diff (text/plain), 965.66 KB, created by Darrell on 2013-12-26 13:33:37 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Darrell

Created: 2013-12-26 13:33:37 CST

Size: 965.66 KB

patch

obsolete

>diff -urN tdelibs/kate/data/abap.xml tdelibs.new/kate/data/abap.xml
>--- tdelibs/kate/data/abap.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/abap.xml	2013-12-26 13:26:41.153326577 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="ABAP" version="1.00" kateversion="2.4" section="Sources" extensions="*.abap;*.ABAP" mimetype="text/x-abap-src" priority="5" author="Marcos Antonio Alvarez Costales (busgosin@hotmail.com)" license="GPL">
>+<language name="ABAP" version="1.00" kateversion="2.5" section="Sources" extensions="*.abap;*.ABAP" mimetype="text/x-abap-src" priority="5" author="Marcos Antonio Alvarez Costales (busgosin@hotmail.com)" license="GPL">
>   <highlighting>
> 
>     <list name="keywords">
>diff -urN tdelibs/kate/data/abc.xml tdelibs.new/kate/data/abc.xml
>--- tdelibs/kate/data/abc.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/abc.xml	2013-12-26 13:26:41.041327055 -0600
>@@ -2,7 +2,7 @@
> <!DOCTYPE language SYSTEM "language.dtd">
> 
>-<language name="ABC" version="1.10" kateversion="2.4" section="Other" extensions="*.abc;*.ABC" mimetype="text/vnd.abc" casesensitive="1" author="Andrea Primiani (primiani@dag.it)" license="LGPL">
>+<language name="ABC" version="1.10" kateversion="2.5" section="Other" extensions="*.abc;*.ABC" mimetype="text/vnd.abc" casesensitive="1" author="Andrea Primiani (primiani@dag.it)" license="LGPL">
>     <highlighting>
>         <contexts>
>            <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
>diff -urN tdelibs/kate/data/actionscript.xml tdelibs.new/kate/data/actionscript.xml
>--- tdelibs/kate/data/actionscript.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/actionscript.xml	2013-12-26 13:26:41.190326418 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="ActionScript 2.0" version="1.0" kateversion="2.4" section="Sources" extensions="*.as" mimetype="text/x-actionscript" license="LGPL" author="Aaron Miller (armantic101@gmail.com)"> 
>+<language name="ActionScript 2.0" version="1.0" kateversion="2.5" section="Sources" extensions="*.as" mimetype="text/x-actionscript" license="LGPL" author="Aaron Miller (armantic101@gmail.com)"> 
>   <highlighting>
>     
>     <list name="properties">
>diff -urN tdelibs/kate/data/ada.xml tdelibs.new/kate/data/ada.xml
>--- tdelibs/kate/data/ada.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/ada.xml	2013-12-26 13:26:40.482329440 -0600
>@@ -1,6 +1,6 @@
> <?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.07" kateversion="2.5" section="Sources" extensions="*.adb;*.ads;*.ada;*.a" mimetype="text/x-adasrc">
>   <highlighting>
>     <list name="keywords">
>       <item> abort </item>
>diff -urN tdelibs/kate/data/ahdl.xml tdelibs.new/kate/data/ahdl.xml
>--- tdelibs/kate/data/ahdl.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/ahdl.xml	2013-12-26 13:26:41.231326244 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="AHDL" version="1.04" kateversion="2.4" section="Hardware" extensions="*.ahdl;*.tdf" mimetype="text/x-ahdl" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL">
>+<language name="AHDL" version="1.04" kateversion="2.5" section="Hardware" extensions="*.ahdl;*.tdf" mimetype="text/x-ahdl" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL">
>   <highlighting>
>     <list name="keywords">
>       <item> assert </item>
>diff -urN tdelibs/kate/data/ahk.xml tdelibs.new/kate/data/ahk.xml
>--- tdelibs/kate/data/ahk.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/ahk.xml	2013-12-26 13:26:40.978327323 -0600
>@@ -0,0 +1,1139 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd">
>+<language name="AutoHotKey" section="Scripts"
>+          version="1.0" kateversion="2.5"
>+          indenter="cstyle"
>+          extensions="*.ahk;*.iahk"
>+          priority="9">
>+
>+  <highlighting>
>+    <list name="flowofcontrol">
>+	<item> if </item>
>+	<item> ifequal </item>
>+	<item> ifexist </item>
>+	<item> ifgreater </item>
>+	<item> ifgreaterorequal </item>
>+	<item> ifinstring </item>
>+	<item> ifless </item>
>+	<item> iflessorequal </item>
>+	<item> ifmsgbox </item>
>+	<item> ifnotequal </item>
>+	<item> ifnotexist </item>
>+	<item> ifnotinstring </item>
>+	<item> ifwinactive </item>
>+	<item> ifwinexist </item>
>+	<item> ifwinnotactive </item>
>+	<item> ifwinnotexist </item>
>+	<item> break </item>
>+	<item> continue </item>
>+	<item> else </item>
>+	<item> exit </item>
>+	<item> exitapp </item>
>+	<item> gosub </item>
>+	<item> goto </item>
>+	<item> loop </item>
>+	<item> onexit </item>
>+	<item> pause </item>
>+	<item> repeat </item>
>+	<item> return </item>
>+	<item> settimer </item>
>+	<item> sleep </item>
>+	<item> suspend </item>
>+	<item> static </item>
>+	<item> global </item>
>+	<item> local </item>
>+	<item> byref </item>
>+	<item> while </item>
>+	<item> until </item>
>+	<item> for </item>
>+    </list>
>+    <list name="commands">
>+	<item> autotrim </item>
>+	<item> blockinput </item>
>+	<item> clipwait </item>
>+	<item> control </item>
>+	<item> controlclick </item>
>+	<item> controlfocus </item>
>+	<item> controlget </item>
>+	<item> controlgetfocus </item>
>+	<item> controlgetpos </item>
>+	<item> controlgettext </item>
>+	<item> controlmove </item>
>+	<item> controlsend </item>
>+	<item> controlsendraw </item>
>+	<item> controlsettext </item>
>+	<item> coordmode </item>
>+	<item> critical </item>
>+	<item> detecthiddentext </item>
>+	<item> detecthiddenwindows </item>
>+	<item> drive </item>
>+	<item> driveget </item>
>+	<item> drivespacefree </item>
>+	<item> edit </item>
>+	<item> endrepeat </item>
>+	<item> envadd </item>
>+	<item> envdiv </item>
>+	<item> envget </item>
>+	<item> envmult </item>
>+	<item> envset </item>
>+	<item> envsub </item>
>+	<item> envupdate </item>
>+	<item> fileappend </item>
>+	<item> filecopy </item>
>+	<item> filecopydir </item>
>+	<item> filecreatedir </item>
>+	<item> filecreateshortcut </item>
>+	<item> filedelete </item>
>+	<item> filegetattrib </item>
>+	<item> filegetshortcut </item>
>+	<item> filegetsize </item>
>+	<item> filegettime </item>
>+	<item> filegetversion </item>
>+	<item> fileinstall </item>
>+	<item> filemove </item>
>+	<item> filemovedir </item>
>+	<item> fileread </item>
>+	<item> filereadline </item>
>+	<item> filerecycle </item>
>+	<item> filerecycleempty </item>
>+	<item> fileremovedir </item>
>+	<item> fileselectfile </item>
>+	<item> fileselectfolder </item>
>+	<item> filesetattrib </item>
>+	<item> filesettime </item>
>+	<item> formattime </item>
>+	<item> getkeystate </item>
>+	<item> groupactivate </item>
>+	<item> groupadd </item>
>+	<item> groupclose </item>
>+	<item> groupdeactivate </item>
>+	<item> gui </item>
>+	<item> guicontrol </item>
>+	<item> guicontrolget </item>
>+	<item> hideautoitwin </item>
>+	<item> hotkey </item>
>+	<item> imagesearch </item>
>+	<item> inidelete </item>
>+	<item> iniread </item>
>+	<item> iniwrite </item>
>+	<item> input </item>
>+	<item> inputbox </item>
>+	<item> keyhistory </item>
>+	<item> keywait </item>
>+	<item> listhotkeys </item>
>+	<item> listlines </item>
>+	<item> listvars </item>
>+	<item> menu </item>
>+	<item> mouseclick </item>
>+	<item> mouseclickdrag </item>
>+	<item> mousegetpos </item>
>+	<item> mousemove </item>
>+	<item> msgbox </item>
>+	<item> outputdebug </item>
>+	<item> pixelgetcolor </item>
>+	<item> pixelsearch </item>
>+	<item> postmessage </item>
>+	<item> process </item>
>+	<item> progress </item>
>+	<item> random </item>
>+	<item> regdelete </item>
>+	<item> regread </item>
>+	<item> regwrite </item>
>+	<item> reload </item>
>+	<item> run </item>
>+	<item> runas </item>
>+	<item> runwait </item>
>+	<item> send </item>
>+	<item> sendevent </item>
>+	<item> sendinput </item>
>+	<item> sendmessage </item>
>+	<item> sendmode </item>
>+	<item> sendplay </item>
>+	<item> sendraw </item>
>+	<item> setbatchlines </item>
>+	<item> setcapslockstate </item>
>+	<item> setcontroldelay </item>
>+	<item> setdefaultmousespeed </item>
>+	<item> setenv </item>
>+	<item> setformat </item>
>+	<item> setkeydelay </item>
>+	<item> setmousedelay </item>
>+	<item> setnumlockstate </item>
>+	<item> setscrolllockstate </item>
>+	<item> setstorecapslockmode </item>
>+	<item> settitlematchmode </item>
>+	<item> setwindelay </item>
>+	<item> setworkingdir </item>
>+	<item> shutdown </item>
>+	<item> sort </item>
>+	<item> soundbeep </item>
>+	<item> soundget </item>
>+	<item> soundgetwavevolume </item>
>+	<item> soundplay </item>
>+	<item> soundset </item>
>+	<item> soundsetwavevolume </item>
>+	<item> splashimage </item>
>+	<item> splashtextoff </item>
>+	<item> splashtexton </item>
>+	<item> splitpath </item>
>+	<item> statusbargettext </item>
>+	<item> statusbarwait </item>
>+	<item> stringcasesense </item>
>+	<item> stringgetpos </item>
>+	<item> stringleft </item>
>+	<item> stringlen </item>
>+	<item> stringlower </item>
>+	<item> stringmid </item>
>+	<item> stringreplace </item>
>+	<item> stringright </item>
>+	<item> stringsplit </item>
>+	<item> stringtrimleft </item>
>+	<item> stringtrimright </item>
>+	<item> stringupper </item>
>+	<item> sysget </item>
>+	<item> thread </item>
>+	<item> tooltip </item>
>+	<item> transform </item>
>+	<item> traytip </item>
>+	<item> urldownloadtofile </item>
>+	<item> winactivate </item>
>+	<item> winactivatebottom </item>
>+	<item> winclose </item>
>+	<item> winget </item>
>+	<item> wingetactivestats </item>
>+	<item> wingetactivetitle </item>
>+	<item> wingetclass </item>
>+	<item> wingetpos </item>
>+	<item> wingettext </item>
>+	<item> wingettitle </item>
>+	<item> winhide </item>
>+	<item> winkill </item>
>+	<item> winmaximize </item>
>+	<item> winmenuselectitem </item>
>+	<item> winminimize </item>
>+	<item> winminimizeall </item>
>+	<item> winminimizeallundo </item>
>+	<item> winmove </item>
>+	<item> winrestore </item>
>+	<item> winset </item>
>+	<item> winsettitle </item>
>+	<item> winshow </item>
>+	<item> winwait </item>
>+	<item> winwaitactive </item>
>+	<item> winwaitclose </item>
>+	<item> winwaitnotactive </item>
>+	<item> fileencoding </item>
>+    </list>
>+    <list name="functions">
>+	<item> abs </item>
>+	<item> acos </item>
>+	<item> asc </item>
>+	<item> asin </item>
>+	<item> atan </item>
>+	<item> ceil </item>
>+	<item> chr </item>
>+	<item> cos </item>
>+	<item> dllcall </item>
>+	<item> exp </item>
>+	<item> fileexist </item>
>+	<item> floor </item>
>+	<item> getkeystate </item>
>+	<item> numget </item>
>+	<item> numput </item>
>+	<item> registercallback </item>
>+	<item> il_add </item>
>+	<item> il_create </item>
>+	<item> il_destroy </item>
>+	<item> instr </item>
>+	<item> islabel </item>
>+	<item> isfunc </item>
>+	<item> ln </item>
>+	<item> log </item>
>+	<item> lv_add </item>
>+	<item> lv_delete </item>
>+	<item> lv_deletecol </item>
>+	<item> lv_getcount </item>
>+	<item> lv_getnext </item>
>+	<item> lv_gettext </item>
>+	<item> lv_insert </item>
>+	<item> lv_insertcol </item>
>+	<item> lv_modify </item>
>+	<item> lv_modifycol </item>
>+	<item> lv_setimagelist </item>
>+	<item> mod </item>
>+	<item> onmessage </item>
>+	<item> round </item>
>+	<item> regexmatch </item>
>+	<item> regexreplace </item>
>+	<item> sb_seticon </item>
>+	<item> sb_setparts </item>
>+	<item> sb_settext </item>
>+	<item> sin </item>
>+	<item> sqrt </item>
>+	<item> strlen </item>
>+	<item> substr </item>
>+	<item> tan </item>
>+	<item> tv_add </item>
>+	<item> tv_delete </item>
>+	<item> tv_getchild </item>
>+	<item> tv_getcount </item>
>+	<item> tv_getnext </item>
>+	<item> tv_get </item>
>+	<item> tv_getparent </item>
>+	<item> tv_getprev </item>
>+	<item> tv_getselection </item>
>+	<item> tv_gettext </item>
>+	<item> tv_modify </item>
>+	<item> varsetcapacity </item>
>+	<item> winactive </item>
>+	<item> winexist </item>
>+	<item> trim </item>
>+	<item> ltrim </item>
>+	<item> rtrim </item>
>+	<item> fileopen </item>
>+	<item> strget </item>
>+	<item> strput </item>
>+	<item> object </item>
>+	<item> array </item>
>+	<item> isobject </item>
>+	<item> objinsert </item>
>+	<item> objremove </item>
>+	<item> objminindex </item>
>+	<item> objmaxindex </item>
>+	<item> objsetcapacity </item>
>+	<item> objgetcapacity </item>
>+	<item> objgetaddress </item>
>+	<item> objnewenum </item>
>+	<item> objaddref </item>
>+	<item> objrelease </item>
>+	<item> objhaskey </item>
>+	<item> objclone </item>
>+	<item> _insert </item>
>+	<item> _remove </item>
>+	<item> _minindex </item>
>+	<item> _maxindex </item>
>+	<item> _setcapacity </item>
>+	<item> _getcapacity </item>
>+	<item> _getaddress </item>
>+	<item> _newenum </item>
>+	<item> _addref </item>
>+	<item> _release </item>
>+	<item> _haskey </item>
>+	<item> _clone </item>
>+	<item> comobjcreate </item>
>+	<item> comobjget </item>
>+	<item> comobjconnect </item>
>+	<item> comobjerror </item>
>+	<item> comobjactive </item>
>+	<item> comobjenwrap </item>
>+	<item> comobjunwrap </item>
>+	<item> comobjparameter </item>
>+	<item> comobjmissing </item>
>+	<item> comobjtype </item>
>+	<item> comobjvalue </item>
>+	<item> comobjarray </item>
>+	<item> comobjquery </item>
>+	<item> comobjflags </item>
>+    </list>
>+    <list name="directives">
>+	<item> allowsamelinecomments </item>
>+	<item> clipboardtimeout </item>
>+	<item> commentflag </item>
>+	<item> errorstdout </item>
>+	<item> escapechar </item>
>+	<item> hotkeyinterval </item>
>+	<item> hotkeymodifiertimeout </item>
>+	<item> hotstring </item>
>+	<item> if </item>
>+	<item> iftimeout </item>
>+	<item> ifwinactive </item>
>+	<item> ifwinexist </item>
>+	<item> include </item>
>+	<item> includeagain </item>
>+	<item> installkeybdhook </item>
>+	<item> installmousehook </item>
>+	<item> keyhistory </item>
>+	<item> ltrim </item>
>+	<item> maxhotkeysperinterval </item>
>+	<item> maxmem </item>
>+	<item> maxthreads </item>
>+	<item> maxthreadsbuffer </item>
>+	<item> maxthreadsperhotkey </item>
>+	<item> menumaskkey </item>
>+	<item> noenv </item>
>+	<item> notrayicon </item>
>+	<item> persistent </item>
>+	<item> singleinstance </item>
>+	<item> usehook </item>
>+	<item> warn </item>
>+	<item> winactivateforce </item>
>+      </list>
>+    <list name="keysandbuttons">
>+	<item> shift </item>
>+	<item> lshift </item>
>+	<item> rshift </item>
>+	<item> alt </item>
>+	<item> lalt </item>
>+	<item> ralt </item>
>+	<item> control </item>
>+	<item> lcontrol </item>
>+	<item> rcontrol </item>
>+	<item> ctrl </item>
>+	<item> lctrl </item>
>+	<item> rctrl </item>
>+	<item> lwin </item>
>+	<item> rwin </item>
>+	<item> appskey </item>
>+	<item> altdown </item>
>+	<item> altup </item>
>+	<item> shiftdown </item>
>+	<item> shiftup </item>
>+	<item> ctrldown </item>
>+	<item> ctrlup </item>
>+	<item> lwindown </item>
>+	<item> lwinup </item>
>+	<item> rwindown </item>
>+	<item> rwinup </item>
>+	<item> lbutton </item>
>+	<item> rbutton </item>
>+	<item> mbutton </item>
>+	<item> wheelup </item>
>+	<item> wheeldown </item>
>+	<item> xbutton1 </item>
>+	<item> xbutton2 </item>
>+	<item> joy1 </item>
>+	<item> joy2 </item>
>+	<item> joy3 </item>
>+	<item> joy4 </item>
>+	<item> joy5 </item>
>+	<item> joy6 </item>
>+	<item> joy7 </item>
>+	<item> joy8 </item>
>+	<item> joy9 </item>
>+	<item> joy10 </item>
>+	<item> joy11 </item>
>+	<item> joy12 </item>
>+	<item> joy13 </item>
>+	<item> joy14 </item>
>+	<item> joy15 </item>
>+	<item> joy16 </item>
>+	<item> joy17 </item>
>+	<item> joy18 </item>
>+	<item> joy19 </item>
>+	<item> joy20 </item>
>+	<item> joy21 </item>
>+	<item> joy22 </item>
>+	<item> joy23 </item>
>+	<item> joy24 </item>
>+	<item> joy25 </item>
>+	<item> joy26 </item>
>+	<item> joy27 </item>
>+	<item> joy28 </item>
>+	<item> joy29 </item>
>+	<item> joy30 </item>
>+	<item> joy31 </item>
>+	<item> joy32 </item>
>+	<item> joyx </item>
>+	<item> joyy </item>
>+	<item> joyz </item>
>+	<item> joyr </item>
>+	<item> joyu </item>
>+	<item> joyv </item>
>+	<item> joypov </item>
>+	<item> joyname </item>
>+	<item> joybuttons </item>
>+	<item> joyaxes </item>
>+	<item> joyinfo </item>
>+	<item> space </item>
>+	<item> tab </item>
>+	<item> enter </item>
>+	<item> escape </item>
>+	<item> esc </item>
>+	<item> backspace </item>
>+	<item> bs </item>
>+	<item> delete </item>
>+	<item> del </item>
>+	<item> insert </item>
>+	<item> ins </item>
>+	<item> pgup </item>
>+	<item> pgdn </item>
>+	<item> home </item>
>+	<item> end </item>
>+	<item> up </item>
>+	<item> down </item>
>+	<item> left </item>
>+	<item> right </item>
>+	<item> printscreen </item>
>+	<item> ctrlbreak </item>
>+	<item> pause </item>
>+	<item> scrolllock </item>
>+	<item> capslock </item>
>+	<item> numlock </item>
>+	<item> numpad0 </item>
>+	<item> numpad1 </item>
>+	<item> numpad2 </item>
>+	<item> numpad3 </item>
>+	<item> numpad4 </item>
>+	<item> numpad5 </item>
>+	<item> numpad6 </item>
>+	<item> numpad7 </item>
>+	<item> numpad8 </item>
>+	<item> numpad9 </item>
>+	<item> numpadmult </item>
>+	<item> numpadadd </item>
>+	<item> numpadsub </item>
>+	<item> numpaddiv </item>
>+	<item> numpaddot </item>
>+	<item> numpaddel </item>
>+	<item> numpadins </item>
>+	<item> numpadclear </item>
>+	<item> numpadup </item>
>+	<item> numpaddown </item>
>+	<item> numpadleft </item>
>+	<item> numpadright </item>
>+	<item> numpadhome </item>
>+	<item> numpadend </item>
>+	<item> numpadpgup </item>
>+	<item> numpadpgdn </item>
>+	<item> numpadenter </item>
>+	<item> f1 </item>
>+	<item> f2 </item>
>+	<item> f3 </item>
>+	<item> f4 </item>
>+	<item> f5 </item>
>+	<item> f6 </item>
>+	<item> f7 </item>
>+	<item> f8 </item>
>+	<item> f9 </item>
>+	<item> f10 </item>
>+	<item> f11 </item>
>+	<item> f12 </item>
>+	<item> f13 </item>
>+	<item> f14 </item>
>+	<item> f15 </item>
>+	<item> f16 </item>
>+	<item> f17 </item>
>+	<item> f18 </item>
>+	<item> f19 </item>
>+	<item> f20 </item>
>+	<item> f21 </item>
>+	<item> f22 </item>
>+	<item> f23 </item>
>+	<item> f24 </item>
>+	<item> browser_back </item>
>+	<item> browser_forward </item>
>+	<item> browser_refresh </item>
>+	<item> browser_stop </item>
>+	<item> browser_search </item>
>+	<item> browser_favorites </item>
>+	<item> browser_home </item>
>+	<item> volume_mute </item>
>+	<item> volume_down </item>
>+	<item> volume_up </item>
>+	<item> media_next </item>
>+	<item> media_prev </item>
>+	<item> media_stop </item>
>+	<item> media_play_pause </item>
>+	<item> launch_mail </item>
>+	<item> launch_media </item>
>+	<item> launch_app1 </item>
>+	<item> launch_app2 </item>
>+	<item> blind </item>
>+	<item> click </item>
>+	<item> raw </item>
>+	<item> wheelleft </item>
>+	<item> wheelright </item>
>+    </list>
>+    <list name="variables">
>+	<item> a_ahkpath </item>
>+	<item> a_ahkversion </item>
>+	<item> a_appdata </item>
>+	<item> a_appdatacommon </item>
>+	<item> a_autotrim </item>
>+	<item> a_batchlines </item>
>+	<item> a_caretx </item>
>+	<item> a_carety </item>
>+	<item> a_computername </item>
>+	<item> a_controldelay </item>
>+	<item> a_cursor </item>
>+	<item> a_dd </item>
>+	<item> a_ddd </item>
>+	<item> a_dddd </item>
>+	<item> a_defaultmousespeed </item>
>+	<item> a_desktop </item>
>+	<item> a_desktopcommon </item>
>+	<item> a_detecthiddentext </item>
>+	<item> a_detecthiddenwindows </item>
>+	<item> a_endchar </item>
>+	<item> a_eventinfo </item>
>+	<item> a_exitreason </item>
>+	<item> a_formatfloat </item>
>+	<item> a_formatinteger </item>
>+	<item> a_gui </item>
>+	<item> a_guievent </item>
>+	<item> a_guicontrol </item>
>+	<item> a_guicontrolevent </item>
>+	<item> a_guiheight </item>
>+	<item> a_guiwidth </item>
>+	<item> a_guix </item>
>+	<item> a_guiy </item>
>+	<item> a_hour </item>
>+	<item> a_iconfile </item>
>+	<item> a_iconhidden </item>
>+	<item> a_iconnumber </item>
>+	<item> a_icontip </item>
>+	<item> a_index </item>
>+	<item> a_ipaddress1 </item>
>+	<item> a_ipaddress2 </item>
>+	<item> a_ipaddress3 </item>
>+	<item> a_ipaddress4 </item>
>+	<item> a_isadmin </item>
>+	<item> a_iscompiled </item>
>+	<item> a_issuspended </item>
>+	<item> a_keydelay </item>
>+	<item> a_language </item>
>+	<item> a_lasterror </item>
>+	<item> a_linefile </item>
>+	<item> a_linenumber </item>
>+	<item> a_loopfield </item>
>+	<item> a_loopfileattrib </item>
>+	<item> a_loopfiledir </item>
>+	<item> a_loopfileext </item>
>+	<item> a_loopfilefullpath </item>
>+	<item> a_loopfilelongpath </item>
>+	<item> a_loopfilename </item>
>+	<item> a_loopfileshortname </item>
>+	<item> a_loopfileshortpath </item>
>+	<item> a_loopfilesize </item>
>+	<item> a_loopfilesizekb </item>
>+	<item> a_loopfilesizemb </item>
>+	<item> a_loopfiletimeaccessed </item>
>+	<item> a_loopfiletimecreated </item>
>+	<item> a_loopfiletimemodified </item>
>+	<item> a_loopreadline </item>
>+	<item> a_loopregkey </item>
>+	<item> a_loopregname </item>
>+	<item> a_loopregsubkey </item>
>+	<item> a_loopregtimemodified </item>
>+	<item> a_loopregtype </item>
>+	<item> a_mday </item>
>+	<item> a_min </item>
>+	<item> a_mm </item>
>+	<item> a_mmm </item>
>+	<item> a_mmmm </item>
>+	<item> a_mon </item>
>+	<item> a_mousedelay </item>
>+	<item> a_msec </item>
>+	<item> a_mydocuments </item>
>+	<item> a_now </item>
>+	<item> a_nowutc </item>
>+	<item> a_numbatchlines </item>
>+	<item> a_ostype </item>
>+	<item> a_osversion </item>
>+	<item> a_priorhotkey </item>
>+	<item> a_programfiles </item>
>+	<item> a_programs </item>
>+	<item> a_programscommon </item>
>+	<item> a_screenheight </item>
>+	<item> a_screenwidth </item>
>+	<item> a_scriptdir </item>
>+	<item> a_scriptfullpath </item>
>+	<item> a_scriptname </item>
>+	<item> a_sec </item>
>+	<item> a_space </item>
>+	<item> a_startmenu </item>
>+	<item> a_startmenucommon </item>
>+	<item> a_startup </item>
>+	<item> a_startupcommon </item>
>+	<item> a_stringcasesense </item>
>+	<item> a_tab </item>
>+	<item> a_temp </item>
>+	<item> a_thishotkey </item>
>+	<item> a_thismenu </item>
>+	<item> a_thismenuitem </item>
>+	<item> a_thismenuitempos </item>
>+	<item> a_tickcount </item>
>+	<item> a_timeidle </item>
>+	<item> a_timeidlephysical </item>
>+	<item> a_timesincepriorhotkey </item>
>+	<item> a_timesincethishotkey </item>
>+	<item> a_titlematchmode </item>
>+	<item> a_titlematchmodespeed </item>
>+	<item> a_username </item>
>+	<item> a_wday </item>
>+	<item> a_windelay </item>
>+	<item> a_windir </item>
>+	<item> a_workingdir </item>
>+	<item> a_yday </item>
>+	<item> a_year </item>
>+	<item> a_yweek </item>
>+	<item> a_yyyy </item>
>+	<item> clipboard </item>
>+	<item> clipboardall </item>
>+	<item> comspec </item>
>+	<item> errorlevel </item>
>+	<item> programfiles </item>
>+	<item> true </item>
>+	<item> false </item>
>+	<item> a_thisfunc </item>
>+	<item> a_thislabel </item>
>+	<item> a_ispaused </item>
>+	<item> a_iscritical </item>
>+	<item> a_isunicode </item>
>+	<item> a_ptrsize </item>
>+    </list>
>+    <list name="keywords">
>+	<item> ltrim </item>
>+	<item> rtrim </item>
>+	<item> join </item>
>+	<item> ahk_id </item>
>+	<item> ahk_pid </item>
>+	<item> ahk_class </item>
>+	<item> ahk_group </item>
>+	<item> processname </item>
>+	<item> minmax </item>
>+	<item> controllist </item>
>+	<item> statuscd </item>
>+	<item> filesystem </item>
>+	<item> setlabel </item>
>+	<item> alwaysontop </item>
>+	<item> mainwindow </item>
>+	<item> nomainwindow </item>
>+	<item> useerrorlevel </item>
>+	<item> altsubmit </item>
>+	<item> hscroll </item>
>+	<item> vscroll </item>
>+	<item> imagelist </item>
>+	<item> wantctrla </item>
>+	<item> wantf2 </item>
>+	<item> vis </item>
>+	<item> visfirst </item>
>+	<item> wantreturn </item>
>+	<item> backgroundtrans </item>
>+	<item> minimizebox </item>
>+	<item> maximizebox </item>
>+	<item> sysmenu </item>
>+	<item> toolwindow </item>
>+	<item> exstyle </item>
>+	<item> check3 </item>
>+	<item> checkedgray </item>
>+	<item> readonly </item>
>+	<item> notab </item>
>+	<item> lastfound </item>
>+	<item> lastfoundexist </item>
>+	<item> alttab </item>
>+	<item> shiftalttab </item>
>+	<item> alttabmenu </item>
>+	<item> alttabandmenu </item>
>+	<item> alttabmenudismiss </item>
>+	<item> controllisthwnd </item>
>+	<item> hwnd </item>
>+	<item> deref </item>
>+	<item> pow </item>
>+	<item> bitnot </item>
>+	<item> bitand </item>
>+	<item> bitor </item>
>+	<item> bitxor </item>
>+	<item> bitshiftleft </item>
>+	<item> bitshiftright </item>
>+	<item> sendandmouse </item>
>+	<item> mousemove </item>
>+	<item> mousemoveoff </item>
>+	<item> hkey_local_machine </item>
>+	<item> hkey_users </item>
>+	<item> hkey_current_user </item>
>+	<item> hkey_classes_root </item>
>+	<item> hkey_current_config </item>
>+	<item> hklm </item>
>+	<item> hku </item>
>+	<item> hkcu </item>
>+	<item> hkcr </item>
>+	<item> hkcc </item>
>+	<item> reg_sz </item>
>+	<item> reg_expand_sz </item>
>+	<item> reg_multi_sz </item>
>+	<item> reg_dword </item>
>+	<item> reg_qword </item>
>+	<item> reg_binary </item>
>+	<item> reg_link </item>
>+	<item> reg_resource_list </item>
>+	<item> reg_full_resource_descriptor </item>
>+	<item> reg_resource_requirements_list </item>
>+	<item> reg_dword_big_endian </item>
>+	<item> regex </item>
>+	<item> pixel </item>
>+	<item> mouse </item>
>+	<item> screen </item>
>+	<item> relative </item>
>+	<item> rgb </item>
>+	<item> low </item>
>+	<item> belownormal </item>
>+	<item> normal </item>
>+	<item> abovenormal </item>
>+	<item> high </item>
>+	<item> realtime </item>
>+	<item> between </item>
>+	<item> contains </item>
>+	<item> in </item>
>+	<item> is </item>
>+	<item> integer </item>
>+	<item> float </item>
>+	<item> number </item>
>+	<item> digit </item>
>+	<item> xdigit </item>
>+	<item> integerfast </item>
>+	<item> floatfast </item>
>+	<item> alpha </item>
>+	<item> upper </item>
>+	<item> lower </item>
>+	<item> alnum </item>
>+	<item> time </item>
>+	<item> date </item>
>+	<item> not </item>
>+	<item> or </item>
>+	<item> and </item>
>+	<item> topmost </item>
>+	<item> top </item>
>+	<item> bottom </item>
>+	<item> transparent </item>
>+	<item> transcolor </item>
>+	<item> redraw </item>
>+	<item> region </item>
>+	<item> id </item>
>+	<item> idlast </item>
>+	<item> count </item>
>+	<item> list </item>
>+	<item> capacity </item>
>+	<item> eject </item>
>+	<item> lock </item>
>+	<item> unlock </item>
>+	<item> label </item>
>+	<item> serial </item>
>+	<item> type </item>
>+	<item> status </item>
>+	<item> seconds </item>
>+	<item> minutes </item>
>+	<item> hours </item>
>+	<item> days </item>
>+	<item> read </item>
>+	<item> parse </item>
>+	<item> logoff </item>
>+	<item> close </item>
>+	<item> error </item>
>+	<item> single </item>
>+	<item> shutdown </item>
>+	<item> menu </item>
>+	<item> exit </item>
>+	<item> reload </item>
>+	<item> tray </item>
>+	<item> add </item>
>+	<item> rename </item>
>+	<item> check </item>
>+	<item> uncheck </item>
>+	<item> togglecheck </item>
>+	<item> enable </item>
>+	<item> disable </item>
>+	<item> toggleenable </item>
>+	<item> default </item>
>+	<item> nodefault </item>
>+	<item> standard </item>
>+	<item> nostandard </item>
>+	<item> color </item>
>+	<item> delete </item>
>+	<item> deleteall </item>
>+	<item> icon </item>
>+	<item> noicon </item>
>+	<item> tip </item>
>+	<item> click </item>
>+	<item> show </item>
>+	<item> edit </item>
>+	<item> progress </item>
>+	<item> hotkey </item>
>+	<item> text </item>
>+	<item> picture </item>
>+	<item> pic </item>
>+	<item> groupbox </item>
>+	<item> button </item>
>+	<item> checkbox </item>
>+	<item> radio </item>
>+	<item> dropdownlist </item>
>+	<item> ddl </item>
>+	<item> combobox </item>
>+	<item> statusbar </item>
>+	<item> treeview </item>
>+	<item> listbox </item>
>+	<item> listview </item>
>+	<item> datetime </item>
>+	<item> monthcal </item>
>+	<item> updown </item>
>+	<item> slider </item>
>+	<item> tab </item>
>+	<item> tab2 </item>
>+	<item> iconsmall </item>
>+	<item> tile </item>
>+	<item> report </item>
>+	<item> sortdesc </item>
>+	<item> nosort </item>
>+	<item> nosorthdr </item>
>+	<item> grid </item>
>+	<item> hdr </item>
>+	<item> autosize </item>
>+	<item> range </item>
>+	<item> xm </item>
>+	<item> ym </item>
>+	<item> ys </item>
>+	<item> xs </item>
>+	<item> xp </item>
>+	<item> yp </item>
>+	<item> font </item>
>+	<item> resize </item>
>+	<item> owner </item>
>+	<item> submit </item>
>+	<item> nohide </item>
>+	<item> minimize </item>
>+	<item> maximize </item>
>+	<item> restore </item>
>+	<item> noactivate </item>
>+	<item> na </item>
>+	<item> cancel </item>
>+	<item> destroy </item>
>+	<item> center </item>
>+	<item> margin </item>
>+	<item> owndialogs </item>
>+	<item> guiescape </item>
>+	<item> guiclose </item>
>+	<item> guisize </item>
>+	<item> guicontextmenu </item>
>+	<item> guidropfiles </item>
>+	<item> tabstop </item>
>+	<item> section </item>
>+	<item> wrap </item>
>+	<item> border </item>
>+	<item> top </item>
>+	<item> bottom </item>
>+	<item> buttons </item>
>+	<item> expand </item>
>+	<item> first </item>
>+	<item> lines </item>
>+	<item> number </item>
>+	<item> uppercase </item>
>+	<item> lowercase </item>
>+	<item> limit </item>
>+	<item> password </item>
>+	<item> multi </item>
>+	<item> group </item>
>+	<item> background </item>
>+	<item> bold </item>
>+	<item> italic </item>
>+	<item> strike </item>
>+	<item> underline </item>
>+	<item> norm </item>
>+	<item> theme </item>
>+	<item> caption </item>
>+	<item> delimiter </item>
>+	<item> flash </item>
>+	<item> style </item>
>+	<item> checked </item>
>+	<item> password </item>
>+	<item> hidden </item>
>+	<item> left </item>
>+	<item> right </item>
>+	<item> center </item>
>+	<item> section </item>
>+	<item> move </item>
>+	<item> focus </item>
>+	<item> hide </item>
>+	<item> choose </item>
>+	<item> choosestring </item>
>+	<item> text </item>
>+	<item> pos </item>
>+	<item> enabled </item>
>+	<item> disabled </item>
>+	<item> visible </item>
>+	<item> notimers </item>
>+	<item> interrupt </item>
>+	<item> priority </item>
>+	<item> waitclose </item>
>+	<item> unicode </item>
>+	<item> tocodepage </item>
>+	<item> fromcodepage\ </item>
>+	<item> yes </item>
>+	<item> no </item>
>+	<item> ok </item>
>+	<item> cancel </item>
>+	<item> abort </item>
>+	<item> retry </item>
>+	<item> ignore </item>
>+	<item> force </item>
>+	<item> on </item>
>+	<item> off </item>
>+	<item> all </item>
>+	<item> send </item>
>+	<item> wanttab </item>
>+	<item> monitorcount </item>
>+	<item> monitorprimary </item>
>+	<item> monitorname </item>
>+	<item> monitorworkarea </item>
>+	<item> pid </item>
>+	<item> base </item>
>+	<item> __get </item>
>+	<item> __set </item>
>+	<item> __call </item>
>+	<item> __delete </item>
>+	<item> useunsetlocal </item>
>+	<item> useunsetglobal </item>
>+	<item> useenv </item>
>+	<item> localsameasglobal </item>
>+    </list>
>+    <contexts>
>+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
>+        <DetectSpaces />
>+        <RegExpr attribute="Preprocessor" context="Outscoped" String="#\s*if\s+0\s*$" beginRegion="PP" firstNonSpace="true" />
>+        <DetectChar context="AfterHash" char="#" firstNonSpace="true" lookAhead="true" />
>+        <StringDetect attribute="Region Marker" context="Region Marker" String="//BEGIN" beginRegion="Region1" firstNonSpace="true" />
>+        <StringDetect attribute="Region Marker" context="Region Marker" String="//END" endRegion="Region1" firstNonSpace="true" />
>+        <keyword attribute="Flow of control" context="#stay" String="flowofcontrol" />
>+        <keyword attribute="Commands" context="#stay" String="commands" />
>+        <keyword attribute="Functions" context="#stay" String="functions" />
>+        <keyword attribute="Directives" context="#stay" String="directives" />
>+        <keyword attribute="Keys and buttons" context="#stay" String="keysandbuttons" />
>+        <keyword attribute="Variables" context="#stay" String="variables" />
>+        <keyword attribute="Keywords" context="#stay" String="keywords" />
>+        <HlCChar attribute="Char" context="#stay"/>
>+        <DetectChar attribute="String" context="String" char="&quot;"/>
>+        <DetectIdentifier />
>+        <Float attribute="Float" context="#stay">
>+          <AnyChar String="fF" attribute="Float" context="#stay"/>
>+        </Float>
>+        <HlCOct attribute="Octal" context="#stay"/>
>+        <HlCHex attribute="Hex" context="#stay"/>
>+        <Int attribute="Decimal" context="#stay">
>+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
>+        </Int>
>+        <IncludeRules context="##Doxygen" />
>+        <DetectChar attribute="Comment" context="Commentar 1" char=";"/>
>+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
>+        <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
>+        <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
>+        <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]{|}~^&#59;"/>
>+      </context>
>+
>+      <context attribute="String" lineEndContext="#pop" name="String">
>+        <LineContinue attribute="String" context="#stay"/>
>+        <HlCStringChar attribute="String Char" context="#stay"/>
>+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
>+      </context>
>+
>+      <context attribute="Region Marker" lineEndContext="#pop" name="Region Marker">
>+      </context>
>+
>+      <context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
>+        <LineContinue attribute="Comment" context="#stay"/>
>+        <DetectSpaces />
>+        <IncludeRules context="##Alerts" />
>+        <DetectIdentifier />
>+      </context>
>+
>+      <context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
>+        <DetectSpaces />
>+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
>+        <IncludeRules context="##Alerts" />
>+        <DetectIdentifier />
>+      </context>
>+
>+      <context attribute="Error" lineEndContext="#pop" name="AfterHash">
>+        
>+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*if(?:def|ndef)?(?=\s+\S)" insensitive="true" beginRegion="PP" firstNonSpace="true" />
>+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*endif" insensitive="true" endRegion="PP" firstNonSpace="true" />
>+        <RegExpr attribute="Preprocessor" context="Define" String="#\s*define.*((?=\\))" insensitive="true" firstNonSpace="true" />
>+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*(?:el(?:se|if)|include(?:_next)?|define|undef|line|error|warning|pragma)" insensitive="true" firstNonSpace="true" />
>+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s+[0-9]+" insensitive="true" firstNonSpace="true" />
>+      </context>
>+
>+      <context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor">
>+        <LineContinue attribute="Preprocessor" context="#stay"/>
>+        <RangeDetect attribute="Prep. Lib" context="#stay" char="&quot;" char1="&quot;"/>
>+        <RangeDetect attribute="Prep. Lib" context="#stay" char="&lt;" char1="&gt;"/>
>+        <IncludeRules context="##Doxygen" />
>+        <Detect2Chars attribute="Comment" context="Commentar/Preprocessor" char="/" char1="*" beginRegion="Comment2" />
>+        <DetectChar attribute="Comment" context="Commentar 1" char=";"/>
>+      </context>
>+
>+      <context attribute="Preprocessor" lineEndContext="#pop" name="Define">
>+        <LineContinue attribute="Preprocessor" context="#stay"/>
>+      </context>
>+
>+      <context attribute="Comment" lineEndContext="#stay" name="Commentar/Preprocessor">
>+        <DetectSpaces />
>+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment2" />
>+        <DetectIdentifier />
>+      </context>
>+
>+      <context attribute="Comment" lineEndContext="#stay" name="Outscoped" >
>+        <DetectSpaces />
>+        <IncludeRules context="##Alerts" />
>+        <DetectIdentifier />
>+        <IncludeRules context="##Doxygen" />
>+        <DetectChar attribute="Comment" context="Commentar 1" char=";"/>
>+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
>+        <RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="PP" firstNonSpace="true" />
>+        <RegExpr attribute="Preprocessor" context="#pop" String="#\s*el(?:se|if)" firstNonSpace="true" />
>+        <RegExpr attribute="Preprocessor" context="#pop" String="#\s*endif" endRegion="PP" firstNonSpace="true" />
>+      </context>
>+
>+      <context attribute="Comment" lineEndContext="#stay" name="Outscoped intern">
>+        <DetectSpaces />
>+        <IncludeRules context="##Alerts" />
>+        <DetectIdentifier />
>+        <DetectChar attribute="String" context="String" char="&quot;"/>
>+        <IncludeRules context="##Doxygen" />
>+        <DetectChar attribute="Comment" context="Commentar 1" char=";"/>
>+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
>+        <RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="PP" firstNonSpace="true" />
>+        <RegExpr attribute="Comment" context="#pop" String="#\s*endif" endRegion="PP" firstNonSpace="true" />
>+      </context>
>+    </contexts>
>+    <itemDatas>
>+	<itemData name="Flow of control"      defStyleNum="dsKeyword"  color="#FF0900" />
>+	<itemData name="Commands"             defStyleNum="dsKeyword"  color="#FF6827" />
>+	<itemData name="Functions"            defStyleNum="dsFunction" color="#0000ff" italic="1" bold="1" selColor="#00ff00" />
>+	<itemData name="Directives"           defStyleNum="dsNormal"   color="#663300" bold="1" />
>+	<itemData name="Keys and buttons"     defStyleNum="dsNormal"   color="#2313D4" />
>+	<itemData name="Variables"            defStyleNum="dsKeyword"  color="#5127B2" />
>+	<itemData name="Keywords"             defStyleNum="dsKeyword"  color="#FF6827" />
>+      <itemData name="Normal Text"  defStyleNum="dsNormal" spellChecking="false"/>
>+      <itemData name="Decimal"      defStyleNum="dsDecVal" spellChecking="false"/>
>+      <itemData name="Octal"        defStyleNum="dsBaseN" spellChecking="false"/>
>+      <itemData name="Hex"          defStyleNum="dsBaseN" spellChecking="false"/>
>+      <itemData name="Float"        defStyleNum="dsFloat" spellChecking="false"/>
>+      <itemData name="Char"         defStyleNum="dsChar" spellChecking="false"/>
>+      <itemData name="String"       defStyleNum="dsString"/>
>+      <itemData name="String Char"  defStyleNum="dsChar"/>
>+      <itemData name="Comment"      defStyleNum="dsComment"/>
>+      <itemData name="Symbol"       defStyleNum="dsNormal" spellChecking="false"/>
>+      <itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/>
>+      <itemData name="Prep. Lib"    defStyleNum="dsOthers" spellChecking="false"/>
>+      <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
>+      <itemData name="Error"        defStyleNum="dsError" spellChecking="false"/>
>+    </itemDatas>
>+  </highlighting>
>+  <general>
>+    <comments>
>+      <comment name="singleLine" start=";" />
>+      <comment name="multiLine" start="/*" end="*/" region="Comment"/>
>+    </comments>
>+    <keywords casesensitive="0" />
>+  </general>
>+</language>
>diff -urN tdelibs/kate/data/alert.xml tdelibs.new/kate/data/alert.xml
>--- tdelibs/kate/data/alert.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/alert.xml	2013-12-26 13:26:41.941323213 -0600
>@@ -26,7 +26,7 @@
>  This file is included in every file that highlights the "alerts" keywords.
>  That's why extensions and mimetype are empty.
> -->
>-<language version="1.08" kateversion="2.3" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" hidden="true">
>+<language version="1.08" kateversion="2.5" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" hidden="true">
>   <highlighting>
>     <list name="alerts">
>       <item> ### </item>
>diff -urN tdelibs/kate/data/alert_indent.xml tdelibs.new/kate/data/alert_indent.xml
>--- tdelibs/kate/data/alert_indent.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/alert_indent.xml	2013-12-26 13:26:41.868323526 -0600
>@@ -26,37 +26,15 @@
>  This file is included in every file that highlights the "alerts" keywords.
>  That's why extensions and mimetype are empty.
> -->
>-<language version="1.08" kateversion="2.3" name="Alerts_indent" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" hidden="true">
>+<language version="1.09" kateversion="2.5" name="Alerts_indent" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" hidden="true">
>   <highlighting>
>-    <list name="alerts">
>-      <item> ### </item>
>-      <item> ALERT </item>
>-      <item> BUG </item>
>-      <item> DANGER </item>
>-      <item> DEPRECATED </item>
>-      <item> FIXME </item>
>-      <item> HACK </item>
>-      <item> NOTE </item>
>-      <item> NOTICE </item>
>-      <item> SECURITY </item>
>-      <item> TASK </item>
>-      <item> TEST </item>
>-      <item> TESTING </item>
>-      <item> TODO </item>
>-      <item> WARNING </item>
>-    </list>
>     <contexts>
>       <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
>-        <keyword attribute="Alert" context="#stay" String="alerts" />
>+        <IncludeRules context="##Alerts" />
>       </context>
>     </contexts>
>-    <itemDatas>
>-      <itemData name="Normal Text" defStyleNum="dsNormal"/>
>-      <itemData name="Alert" defStyleNum="dsAlert"/>
>-    </itemDatas>
>   </highlighting>
>   <general>
>     <folding indentationsensitive="1" />
>-    <keywords casesensitive="1"/>
>   </general>
> </language>
>diff -urN tdelibs/kate/data/ample.xml tdelibs.new/kate/data/ample.xml
>--- tdelibs/kate/data/ample.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/ample.xml	2013-12-26 13:26:40.772328201 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="AMPLE" version="0.2" kateversion="2.4" section="Scripts" extensions="*.ample;*.menu;*.startup" mimetype="text/x-amplesrc" priority="5" author="Christian Parg (cparg@gmx.de)" license="Apache &amp; LGPL" >
>+<language name="AMPLE" version="0.2" kateversion="2.5" section="Scripts" extensions="*.ample;*.menu;*.startup" mimetype="text/x-amplesrc" priority="5" author="Christian Parg (cparg@gmx.de)" license="Apache &amp; LGPL" >
> 
> <language name="ANSI C89" section="Sources"
>-          version="1.10" kateversion="2.4"
>+          version="1.10" kateversion="2.5"
>           indenter="cstyle"
>           extensions="*.c;*.C;*.h"
>           mimetype="text/x-csrc;text/x-c++src;text/x-chdr"
>diff -urN tdelibs/kate/data/ansys.xml tdelibs.new/kate/data/ansys.xml
>--- tdelibs/kate/data/ansys.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/ansys.xml	2013-12-26 13:26:41.322325855 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Ansys" version="1.1" section="Scientific" extensions="*.ans" author="Giovanni Bacci (giovanni@castellodilari.it)" license="LGPL" >
>+<language name="Ansys" version="1.2" kateversion="2.5" section="Scientific" extensions="*.ans" author="Giovanni Bacci (giovanni@castellodilari.it)" license="LGPL" >
> <highlighting>
> 	<list name="session_cmds">
> 		<item>/BATCH</item>
>@@ -851,7 +851,7 @@
> 		<item>FSSTAT</item>
> 		<item>FSTI</item>
> 		<item>FSTR</item>
>-	</list>	
>+	</list>
> 	<list name="solution_commands">
> 		<item>ABEXTRACT</item>
> 		<item>ADAMS</item>
>@@ -1218,7 +1218,7 @@
> 		<item>MFTIME</item>
> 		<item>MFTOL</item>
> 		<item>MFVOLUME</item>
>-	</list>	
>+	</list>
> 	<list name="POST1_commands">
> 		<item>APPEND</item>
> 		<item>DETAB</item>
>@@ -1967,14 +1967,14 @@
> 	</list>
> 
> 	<contexts>
>-		<context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
>+		<context attribute="Normal Text" lineEndContext="#stay" name="Normal Text" >
> 			<StringDetect attribute="comment" context="comment" String="C***" insensitive="true" firstNonSpace="true" />
> 			<DetectChar attribute ="comment" context="comment" char="!" />
> 			<keyword attribute="MatProp" context="#stay" String="various_labels" />
> 			<RangeDetect attribute="Normal Text" context="#stay" char="(" char1=")" />
> 			<DetectChar attribute="error" context="open_parentesis" char="(" />
> 			
>-			<RegExpr attribute="Normal Text" context="#stay" String="^[A-Za-Z0-9]+\=" />
>+			<RegExpr attribute="Normal Text" context="#stay" String="^[A-Za-z0-9]+\=" />
> 			<keyword attribute="Keyword" context="#stay" String="elements" />
> 			<keyword attribute="MatProp" context="#stay" String="material_properties" />
> 			<keyword attribute="Labels" context="#stay" String="force-displacement-labels" />
>diff -urN tdelibs/kate/data/apache.xml tdelibs.new/kate/data/apache.xml
>--- tdelibs/kate/data/apache.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/apache.xml	2013-12-26 13:26:42.035322811 -0600
>@@ -13,7 +13,7 @@
> -->
> 
> <language name="Apache Configuration" section="Configuration"
>-          version="1.11" kateversion="2.0"
>+          version="1.11" kateversion="2.5"
>           extensions="httpd.conf;httpd2.conf;apache.conf;apache2.conf;.htaccess*;.htpasswd*"
>           mimetype=""
>           author="Jan Janssen (medhefgo@googlemail.com)" license="LGPL">
>diff -urN tdelibs/kate/data/asm-avr.xml tdelibs.new/kate/data/asm-avr.xml
>--- tdelibs/kate/data/asm-avr.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/asm-avr.xml	2013-12-26 13:26:41.383325593 -0600
>@@ -33,7 +33,7 @@
> 
> -->
> 
>-<language name="AVR Assembler" version="1.04" kateversion="2.4" section="Assembler" extensions="*.asm;*.ASM;*.asm-avr" mimetype="text/x-asm;text/x-asm-avr" author="Roland Nagy" license="GPL">
>+<language name="AVR Assembler" version="1.04" kateversion="2.5" section="Assembler" extensions="*.asm;*.ASM;*.asm-avr" mimetype="text/x-asm;text/x-asm-avr" author="Roland Nagy" license="GPL">
>   <highlighting>
>     <list name="keywords">
>       <item> adc</item>
>diff -urN tdelibs/kate/data/asm-dsp56k.xml tdelibs.new/kate/data/asm-dsp56k.xml
>--- tdelibs/kate/data/asm-dsp56k.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/asm-dsp56k.xml	2013-12-26 13:26:42.115322471 -0600
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
> 
>-<language name="Motorola DSP56k" section="Assembler" version="1.00" kateversion="2.4"  extensions="*.asm;*.inc;*.ASM;*.INC" author="Miro Kropacek (miro.kropacek@gmail.com)" license="LGPL">
>+<language name="Motorola DSP56k" section="Assembler" version="1.01" kateversion="2.5"  extensions="*.asm;*.inc;*.ASM;*.INC" author="Miro Kropacek (miro.kropacek@gmail.com)" license="LGPL">
> 
>   <highlighting>
>     <list name="Data Registers">
>@@ -219,18 +219,18 @@
> 
>     <contexts>
>       
>-      <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
>-	<RegExpr attribute="Memory" context="#pop" String="[xylpXYLP]:"/>
>-	<keyword attribute="Data Registers" context="#pop" String="Data Registers"/>
>-	<keyword attribute="Address Registers" context="#pop" String="Address Registers"/>
>-	<keyword attribute="Offset Registers" context="#pop" String="Offset Registers"/>
>-	<keyword attribute="Modifier Registers" context="#pop" String="Modifier Registers"/>
>-	<keyword attribute="Control Registers" context="#pop" String="Control Registers"/>
>-	<keyword attribute="Instructions" context="#pop" String="Instructions"/>
>-	<keyword attribute="Directives" context="#pop" String="Directives"/>
>+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal Text" >
>+	<RegExpr attribute="Memory" context="#stay" String="[xylpXYLP]:"/>
>+	<keyword attribute="Data Registers" context="#stay" String="Data Registers"/>
>+	<keyword attribute="Address Registers" context="#stay" String="Address Registers"/>
>+	<keyword attribute="Offset Registers" context="#stay" String="Offset Registers"/>
>+	<keyword attribute="Modifier Registers" context="#stay" String="Modifier Registers"/>
>+	<keyword attribute="Control Registers" context="#stay" String="Control Registers"/>
>+	<keyword attribute="Instructions" context="#stay" String="Instructions"/>
>+	<keyword attribute="Directives" context="#stay" String="Directives"/>
> 
>-	<RegExpr attribute="Label" context="#pop" String="^[A-Za-z][A-Za-z_.0-9]*:?"/>
>-	<RegExpr attribute="Local label" context="#pop" String="^_[A-Za-z_][A-Za-z_.0-9]*:?"/>
>+	<RegExpr attribute="Label" context="#stay" String="^[A-Za-z][A-Za-z_.0-9]*:?"/>
>+	<RegExpr attribute="Local label" context="#stay" String="^_[A-Za-z_][A-Za-z_.0-9]*:?"/>
> 
> 	<DetectChar attribute="Comment" context="Comment" char=";"/>
> 	<DetectChar attribute="Comment" context="Comment" char="*" firstNonSpace="true"/>
>@@ -238,9 +238,9 @@
> 	<DetectChar attribute="BaseN" context="Number16" char="$"/>
> 	<DetectChar attribute="BaseN" context="Number2" char="%"/>
> 	<DetectChar attribute="BaseN" context="Number8" char="@"/>
>-	<Float attribute="Float" context="#pop"/>
>-	<Int attribute="Number" context="#pop"/>
>-	<RangeDetect attribute="Char" context="#pop" char="'"  char1="'"/>
>+	<Float attribute="Float" context="#stay"/>
>+	<Int attribute="Number" context="#stay"/>
>+	<RangeDetect attribute="Char" context="#stay" char="'"  char1="'"/>
> 	<AnyChar attribute="String" context="String" String="&quot;'"/>
>       </context>
> 
>diff -urN tdelibs/kate/data/asm-m68k.xml tdelibs.new/kate/data/asm-m68k.xml
>--- tdelibs/kate/data/asm-m68k.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/asm-m68k.xml	2013-12-26 13:26:41.798323822 -0600
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
> 
>-<language name="Motorola 68k (VASM/Devpac)" section="Assembler" version="1.00" kateversion="2.4"  extensions="*.s;*.i;*.S;*.I" author="Miro Kropacek (miro.kropacek@gmail.com)" license="LGPL">
>+<language name="Motorola 68k (VASM/Devpac)" section="Assembler" version="1.01" kateversion="2.5"  extensions="*.s;*.i;*.S;*.I" author="Miro Kropacek (miro.kropacek@gmail.com)" license="LGPL">
> 
>   <highlighting>
>     <list name="Data Registers">
>@@ -530,27 +530,27 @@
> 
>     <contexts>
>       
>-      <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
>-	<keyword attribute="Data Registers" context="#pop" String="Data Registers"/>
>-	<keyword attribute="Address Registers" context="#pop" String="Address Registers"/>
>-	<keyword attribute="Control Registers" context="#pop" String="Control Registers"/>
>-	<keyword attribute="FPU Registers" context="#pop" String="FPU Registers"/>
>-	<keyword attribute="Instructions (CPU)" context="#pop" String="Instructions (CPU)"/>
>-	<keyword attribute="Instructions (FPU)" context="#pop" String="Instructions (FPU)"/>
>-	<keyword attribute="Directives" context="#pop" String="Directives"/>
>+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal Text" >
>+	<keyword attribute="Data Registers" context="#stay" String="Data Registers"/>
>+	<keyword attribute="Address Registers" context="#stay" String="Address Registers"/>
>+	<keyword attribute="Control Registers" context="#stay" String="Control Registers"/>
>+	<keyword attribute="FPU Registers" context="#stay" String="FPU Registers"/>
>+	<keyword attribute="Instructions (CPU)" context="#stay" String="Instructions (CPU)"/>
>+	<keyword attribute="Instructions (FPU)" context="#stay" String="Instructions (FPU)"/>
>+	<keyword attribute="Directives" context="#stay" String="Directives"/>
> 
> 	
>-	<RegExpr attribute="Label" context="#pop" String="^[A-Za-z_][A-Za-z_.0-9]*:?"/>
>-	<RegExpr attribute="Local label" context="#pop" String="^\.[A-Za-z_][A-Za-z_.0-9]*:?"/>
>+	<RegExpr attribute="Label" context="#stay" String="^[A-Za-z_][A-Za-z_.0-9]*:?"/>
>+	<RegExpr attribute="Local label" context="#stay" String="^\.[A-Za-z_][A-Za-z_.0-9]*:?"/>
> 
>-	<RegExpr attribute="Operand sizes (CPU)" context="#pop" insensitive="true" String="\.b[\s,]"/>
>-	<RegExpr attribute="Operand sizes (CPU)" context="#pop" insensitive="true" String="\.w[\s,]"/>
>-	<RegExpr attribute="Operand sizes (CPU)" context="#pop" insensitive="true" String="\.l[\s,]"/>
>-	<RegExpr attribute="Operand sizes (FPU)" context="#pop" insensitive="true" String="\.s[\s,]"/>
>-	<RegExpr attribute="Operand sizes (FPU)" context="#pop" insensitive="true" String="\.d[\s,]"/>
>-	<RegExpr attribute="Operand sizes (FPU)" context="#pop" insensitive="true" String="\.p[\s,]"/>
>-	<RegExpr attribute="Operand sizes (FPU)" context="#pop" insensitive="true" String="\.q[\s,]"/>
>-	<RegExpr attribute="Operand sizes (FPU)" context="#pop" insensitive="true" String="\.x[\s,]"/>
>+	<RegExpr attribute="Operand sizes (CPU)" context="#stay" insensitive="true" String="\.b[\s,]"/>
>+	<RegExpr attribute="Operand sizes (CPU)" context="#stay" insensitive="true" String="\.w[\s,]"/>
>+	<RegExpr attribute="Operand sizes (CPU)" context="#stay" insensitive="true" String="\.l[\s,]"/>
>+	<RegExpr attribute="Operand sizes (FPU)" context="#stay" insensitive="true" String="\.s[\s,]"/>
>+	<RegExpr attribute="Operand sizes (FPU)" context="#stay" insensitive="true" String="\.d[\s,]"/>
>+	<RegExpr attribute="Operand sizes (FPU)" context="#stay" insensitive="true" String="\.p[\s,]"/>
>+	<RegExpr attribute="Operand sizes (FPU)" context="#stay" insensitive="true" String="\.q[\s,]"/>
>+	<RegExpr attribute="Operand sizes (FPU)" context="#stay" insensitive="true" String="\.x[\s,]"/>
> 
> 	<DetectChar attribute="Comment" context="Comment" char=";"/>
> 	<DetectChar attribute="Comment" context="Comment" char="*" firstNonSpace="true"/>
>@@ -558,9 +558,9 @@
> 	<DetectChar attribute="BaseN" context="Number16" char="$"/>
> 	<DetectChar attribute="BaseN" context="Number2" char="%"/>
> 	<DetectChar attribute="BaseN" context="Number8" char="@"/>
>-	<Float attribute="Float" context="#pop"/>
>-	<Int attribute="Number" context="#pop"/>
>-	<RangeDetect attribute="Char" context="#pop" char="'"  char1="'"/>
>+	<Float attribute="Float" context="#stay"/>
>+	<Int attribute="Number" context="#stay"/>
>+	<RangeDetect attribute="Char" context="#stay" char="'"  char1="'"/>
> 	<AnyChar attribute="String" context="String" String="&quot;'"/>
>       </context>
> 
>diff -urN tdelibs/kate/data/asm6502.xml tdelibs.new/kate/data/asm6502.xml
>--- tdelibs/kate/data/asm6502.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/asm6502.xml	2013-12-26 13:26:40.398329798 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Asm6502" version="1.04" kateversion="2.1" section="Assembler" extensions="*.asm" mimetype="text/x-asm6502">
>+<language name="Asm6502" version="1.04" kateversion="2.5" section="Assembler" extensions="*.asm" mimetype="text/x-asm6502">
>         <highlighting>
> 
>                 <contexts>
>diff -urN tdelibs/kate/data/asn1.xml tdelibs.new/kate/data/asn1.xml
>--- tdelibs/kate/data/asn1.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/asn1.xml	2013-12-26 13:26:40.820327998 -0600
>@@ -13,7 +13,7 @@
> 
>         You'll find the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php
> -->
>-<language name="ASN.1" section="Markup" version="1.00" kateversion="2.3" extensions="*.asn*.asn1" mimetype="" author="Philippe Rigault" license="GPL">
>+<language name="ASN.1" section="Markup" version="1.01" kateversion="2.5" extensions="*.asn;*.asn1" mimetype="" author="Philippe Rigault" license="GPL">
>   <highlighting>
>     <list name="keywords">
>       <item> DEFINITIONS </item>
>diff -urN tdelibs/kate/data/asp.xml tdelibs.new/kate/data/asp.xml
>--- tdelibs/kate/data/asp.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/asp.xml	2013-12-26 13:26:42.048322757 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE  language SYSTEM "language.dtd">
>-<language name="ASP" version="1.04" kateversion="2.1" section="Markup" extensions="*.asp;" mimetype="text/x-asp-src;text/x-asp-src" author="Antonio Salazar (savedfastcool@gmail.com)" license="LGPL">
>+<language name="ASP" version="1.04" kateversion="2.5" section="Markup" extensions="*.asp;" mimetype="text/x-asp-src;text/x-asp-src" author="Antonio Salazar (savedfastcool@gmail.com)" license="LGPL">
>     <highlighting>
>         <list name="control structures">
>             <item>select</item>
>diff -urN tdelibs/kate/data/asterisk.xml tdelibs.new/kate/data/asterisk.xml
>--- tdelibs/kate/data/asterisk.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/asterisk.xml	2013-12-26 13:26:41.125326697 -0600
>@@ -16,7 +16,7 @@
> 
> -->
> 
>-<language name="Asterisk" version="1.00" kateversion="2.4" section="Configuration" extensions="*asterisk/*.conf" mimetype="" author="UNGAR Didier" license="GPL">
>+<language name="Asterisk" version="1.00" kateversion="2.5" section="Configuration" extensions="*asterisk/*.conf" mimetype="" author="UNGAR Didier" license="GPL">
> 	<highlighting>
> 		<list name="keywords">
> 			<item>AGI</item>
>diff -urN tdelibs/kate/data/awk.xml tdelibs.new/kate/data/awk.xml
>--- tdelibs/kate/data/awk.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/awk.xml	2013-12-26 13:26:40.924327554 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="AWK" version="0.91" kateversion="2.3" section="Scripts" extensions="*.awk" mimetype="text/x-awk">
>+<language name="AWK" version="0.92" kateversion="2.5" section="Scripts" extensions="*.awk" mimetype="text/x-awk">
>   <highlighting>
>     <list name="keywords">
>       <item>if</item>
>@@ -77,6 +77,7 @@
>         <Float attribute="Float"   context="#stay"/>
>         <Int   attribute="Decimal" context="#stay"/>
>         <RegExpr String="\$[A-Za-z0-9_]+" attribute="Field" context="#stay"/>
>+        <HlCStringChar attribute="Base" context="#stay"/>
>       </context>
> 
>       <context name="String" attribute="String" lineEndContext="#stay">
>diff -urN tdelibs/kate/data/bash.xml tdelibs.new/kate/data/bash.xml
>--- tdelibs/kate/data/bash.xml	2013-12-25 16:25:23.000000000 -0600
>+++ tdelibs.new/kate/data/bash.xml	2013-12-26 13:26:41.283326021 -0600
>@@ -8,11 +8,12 @@
>         <!ENTITY noword   "(?![\w$+-])">                
>         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     
> ]>
>-<language name="Bash" version="2.14" kateversion="2.4" 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="2.17" kateversion="2.5" 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">
> 
> 
> 
>   <highlighting>
>@@ -337,7 +338,7 @@
>       <item> libtool </item>
>       <item> ln </item>
>       <item> locate </item>
>-      <item> lockfile </item>
>+      <item> loctdefile </item>
>       <item> logname </item>
>       <item> lp </item>
>       <item> lpr </item>
>@@ -479,6 +480,7 @@
>       </context>
>       <context attribute="Comment" lineEndContext="#pop" name="Comment">
>         <IncludeRules context="##Alerts" />
>+        <IncludeRules context="##Modelines" />
>       </context>
> 
>       
>@@ -504,6 +506,10 @@
> 
>       
>       <context attribute="Normal Text" lineEndContext="#stay" name="FindCommands">
>+        <IncludeRules context="FindSpecialCommands" />
>+        <IncludeRules context="FindNormalCommands" />
>+      </context>
>+      <context attribute="Normal Text" lineEndContext="#stay" name="FindSpecialCommands">
>         
>         <Detect2Chars attribute="Keyword" context="ExprDblParen" char="(" char1="(" beginRegion="expression" />
>         
>@@ -523,20 +529,17 @@
>         <RegExpr attribute="Keyword" context="#stay" String="\bfi&noword;" endRegion="if" />
>         
>         <RegExpr attribute="Keyword" context="Case" String="\bcase&noword;" beginRegion="case" />
>-        
>-        <RegExpr attribute="Option" context="#stay" String="-[A-Za-z0-9][A-Za-z0-9_]*" />
>-        <RegExpr attribute="Option" context="#stay" String="--[a-z][A-Za-z0-9_-]*" />
>         
>         <RegExpr attribute="Variable" context="Assign" String="\b&varname;\+?=" />
>         <RegExpr attribute="Variable" context="AssignSubscr" String="\b&varname;(?=\[.+\]\+?=)" />
>         
>         <StringDetect attribute="Function" context="#stay" String=":()" />
>         <RegExpr attribute="Keyword" context="FunctionDef" String="\bfunction\b" />
>+        
>+        <RegExpr attribute="Function" context="#stay" String="&funcname;\s*" />
>         
>         <keyword attribute="Keyword" context="#stay" String="keywords" />
>         <RegExpr attribute="Builtin" context="#stay" String="\.(?=\s)" />
>-        <keyword attribute="Builtin" context="#stay" String="builtins" />
>-        <keyword attribute="Command" context="#stay" String="unixcommands" />
>         
>         <keyword attribute="Builtin" context="VarName" String="builtins_var" />
>         
>@@ -549,10 +552,60 @@
>         <RegExpr attribute="Redirection" context="#stay" String="([0-9]*(&gt;{1,2}|&lt;)(&amp;[0-9]+-?)?|&amp;&gt;|&gt;&amp;|[0-9]*&lt;&gt;)" />
>         
>         <RegExpr attribute="Control" context="#stay" String="([|&amp;])\1?" />
>-        
>-        <RegExpr attribute="Function" context="#stay" String="&funcname;\s*" />
>+      </context>      
>+      <context attribute="Normal Text" lineEndContext="#stay" name="FindNormalCommands">
>+        <keyword attribute="Builtin" context="CommandArgs" String="builtins" />
>+        <keyword attribute="Command" context="CommandArgs" String="unixcommands" />
>+        <RegExpr attribute="OtherCommand" context="#stay" String="&pathpart;*(?=/)" />
>+        <RegExpr attribute="OtherCommand" context="#stay" String="~\w*" />
>+        <RegExpr attribute="OtherCommand" context="#stay" String="/&pathpart;*(?=([/);$`'&quot;]|$))" />
>+        <RegExpr attribute="OtherCommand" context="CommandArgs" String="/&pathpart;*(?=([\s);$`'&quot;]|$))" />
>+        
>+        <RegExpr attribute="OtherCommand" context="CommandArgs" String="&pathpart;*" />        
>+      </context>
>+      
>+      
>+      <context attribute="Normal Text" lineEndContext="#pop" name="CommandArgs">  
>+        <LineContinue />
>+        <IncludeRules context="FindMost" />
>+        <RegExpr attribute="Keyword" context="#stay" String="\\$" />
>+        
>+        <RegExpr attribute="Option" context="#stay" String="\.(?=\s)" />
>+        
>+        <RegExpr attribute="Redirection" context="#stay" String="\d*&lt;&lt;&lt;" />
>+        
>+        <StringDetect attribute="Redirection" context="HereDoc" String="&lt;&lt;" lookAhead="true" />
>+        
>+        <RegExpr attribute="Redirection" context="ProcessSubst" String="[&lt;&gt;]\(" />
>+        
>+        <RegExpr attribute="Redirection" context="#stay" String="([0-9]*(&gt;{1,2}|&lt;)(&amp;[0-9]+-?)?|&amp;&gt;|&gt;&amp;|[0-9]*&lt;&gt;)" />
>+        
>+        <RegExpr attribute="Control" context="#pop" String="([|&amp;;])\1?" />        
>+        <RegExpr attribute="Option" context="#stay" String="-?-[a-z][A-Za-z0-9_-]*" />
>+        <keyword attribute="Option" context="#stay" String="keywords" />
>+        <AnyChar String=")}" context="#pop" lookAhead="true"/>
>+      </context>
>+      
>+      
>+      <context attribute="Normal Text" lineEndContext="#stay" name="FindCommandsBackq">
>+        <IncludeRules context="FindSpecialCommands" />
>+        <IncludeRules context="FindNormalCommandsBackq" />
>+      </context>
>+      <context attribute="Normal Text" lineEndContext="#stay" name="FindNormalCommandsBackq">
>+        <keyword attribute="Builtin" context="CommandArgsBackq" String="builtins" />
>+        <keyword attribute="Command" context="CommandArgsBackq" String="unixcommands" />
>+        <RegExpr attribute="OtherCommand" context="#stay" String="&pathpart;*(?=/)" />
>+        <RegExpr attribute="OtherCommand" context="#stay" String="~\w*" />
>+        <RegExpr attribute="OtherCommand" context="#stay" String="/&pathpart;*(?=([/);$`'&quot;]|$))" />
>+        <RegExpr attribute="OtherCommand" context="CommandArgsBackq" String="/&pathpart;*(?=([\s);$`'&quot;]|$))" />
>+        <RegExpr attribute="OtherCommand" context="CommandArgsBackq" String="&pathpart;*" />
>+      </context>
>+      <context attribute="Normal Text" lineEndContext="#pop" name="CommandArgsBackq"> 
>+        <LineContinue />
>+        <DetectChar attribute="Keyword" context="#pop" char="`" lookAhead="true"/>
>+        <IncludeRules context="CommandArgs" />
>       </context>
>-
>+          
>       
>       <context attribute="Normal Text" lineEndContext="#stay" name="FindOthers">
>         <RegExpr attribute="Escape" context="#stay" String="\\[][;\\$`{}()|&amp;&lt;&gt;* ]" />
>@@ -803,7 +856,7 @@
>       <context attribute="Normal Text" lineEndContext="#stay" name="SubstBackq">
>         <DetectChar attribute="Backquote" context="#pop" char="`" />
>         <IncludeRules context="FindCommentsBackq" />
>-        <IncludeRules context="FindCommands" />
>+        <IncludeRules context="FindCommandsBackq" />
>         <IncludeRules context="FindStrings" />
>         <IncludeRules context="FindSubstitutions" />
>         <IncludeRules context="FindOthers" />
>@@ -875,23 +928,24 @@
>     <itemDatas>
>       <itemData name="Normal Text"	defStyleNum="dsNormal" />
>       <itemData name="Comment"		defStyleNum="dsComment" />
>-      <itemData name="Keyword" 		defStyleNum="dsKeyword" />
>-      <itemData name="Control" 		defStyleNum="dsKeyword" />
>-      <itemData name="Builtin" 		defStyleNum="dsKeyword" color="#808" />
>-      <itemData name="Command" 		defStyleNum="dsKeyword" color="#c0c" />
>-      <itemData name="Redirection" 	defStyleNum="dsKeyword" color="#238" />
>-      <itemData name="Escape" 		defStyleNum="dsDataType" />
>-      <itemData name="String SingleQ" 	defStyleNum="dsString" />
>-      <itemData name="String DoubleQ" 	defStyleNum="dsString" />
>-      <itemData name="Backquote" 	defStyleNum="dsKeyword" />
>-      <itemData name="String Transl." 	defStyleNum="dsString" />
>-      <itemData name="String Escape" 	defStyleNum="dsDataType" />
>+      <itemData name="Keyword"		defStyleNum="dsKeyword" />
>+      <itemData name="Control"		defStyleNum="dsKeyword" />
>+      <itemData name="Builtin"		defStyleNum="dsKeyword" color="#808" />
>+      <itemData name="Command"		defStyleNum="dsKeyword" color="#c0c" />
>+      <itemData name="OtherCommand"	defStyleNum="dsKeyword" color="#303" />
>+      <itemData name="Redirection"	defStyleNum="dsKeyword" color="#238" />
>+      <itemData name="Escape"		defStyleNum="dsDataType" />
>+      <itemData name="String SingleQ"	defStyleNum="dsString" />
>+      <itemData name="String DoubleQ"	defStyleNum="dsString" />
>+      <itemData name="Backquote"	defStyleNum="dsKeyword" />
>+      <itemData name="String Transl."	defStyleNum="dsString" />
>+      <itemData name="String Escape"	defStyleNum="dsDataType" />
>       <itemData name="Variable" 	defStyleNum="dsOthers" />
>-      <itemData name="Expression" 	defStyleNum="dsOthers" />
>+      <itemData name="Expression"	defStyleNum="dsOthers" />
>       <itemData name="Function" 	defStyleNum="dsFunction" />
>-      <itemData name="Path" 		defStyleNum="dsNormal" />
>-      <itemData name="Option" 		defStyleNum="dsNormal" />
>-      <itemData name="Error"            defStyleNum="dsError" />
>+      <itemData name="Path"		defStyleNum="dsNormal" />
>+      <itemData name="Option"		defStyleNum="dsNormal" />
>+      <itemData name="Error"		defStyleNum="dsError" />
>     </itemDatas>
>   </highlighting>
>   <general>
>diff -urN tdelibs/kate/data/bibtex.xml tdelibs.new/kate/data/bibtex.xml
>--- tdelibs/kate/data/bibtex.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/bibtex.xml	2013-12-26 13:26:40.714328449 -0600
>@@ -6,7 +6,7 @@
> 	  <!ENTITY latexCmd	  	"\\([a-zA-Z@]+|[^ ])">
> 	  <!ENTITY refKeyFormat  	"[a-zA-Z0-9_@\\-\\:]+"> 
> 	  ]>
>-<language name="BibTeX" version="1.17" kateversion="2.3" extensions="*.bib" section="Markup" mimetype="text/x-bib" casesensitive="1" author="Jeroen Wijnhout (Jeroen.Wijnhout@kdemail.net)+Thomas Braun (thomas.braun@virtuell-zuhause.de)" license="LGPL">
>+<language name="BibTeX" version="1.17" kateversion="2.5" extensions="*.bib" section="Markup" mimetype="text/x-bib" casesensitive="1" author="Jeroen Wijnhout (Jeroen.Wijnhout@kdemail.net)+Thomas Braun (thomas.braun@virtuell-zuhause.de)" license="LGPL">
>   <highlighting>
>     <list name="kw_entry">
>       <item>@article</item> 
>diff -urN tdelibs/kate/data/bmethod.xml tdelibs.new/kate/data/bmethod.xml
>--- tdelibs/kate/data/bmethod.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/bmethod.xml	2013-12-26 13:26:40.950327442 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="B-Method" version="0.1" kateversion="2.4" section="Scientific" extensions="*.mch;*.imp;*.ref" author="Ivo Anjo (knuckles@gmail.com)" license="LGPL">
>+<language name="B-Method" version="0.2" kateversion="2.5" section="Scientific" extensions="*.mch;*.imp;*.ref" author="Ivo Anjo (knuckles@gmail.com)" license="LGPL">
> 
> <highlighting>
> 	<list name="sections">
>@@ -59,7 +59,7 @@
> 		<item> NAT1 </item>
> 	</list>
> 	<contexts>
>-		<context attribute="Normal Text" lineEndContext="#pop" name="Normal Text">
>+		<context attribute="Normal Text" lineEndContext="#stay" name="Normal Text">
> 			<keyword attribute="SectionKeyword" context="#stay" String="sections" column="0"/>
> 			<keyword attribute="SectionKeyword" context="#stay" String="sectionsBlockStart" column="0" beginRegion="sectionsBlock"/>
> 			<keyword attribute="SectionKeyword" context="#stay" String="sectionsBlockEnd" column="0" endRegion="sectionsBlock"/>
>@@ -93,4 +93,4 @@
> 	<keywords casesensitive="1"/>
> </general>
> 
>-</language>
>\ No newline at end of file
>+</language>
>diff -urN tdelibs/kate/data/c.xml tdelibs.new/kate/data/c.xml
>--- tdelibs/kate/data/c.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/c.xml	2013-12-26 13:26:41.037327071 -0600
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
> <language name="C" section="Sources"
>-          version="1.44" kateversion="2.4"
>+          version="1.45" kateversion="2.5"
>           indenter="cstyle"
>           extensions="*.c;*.C;*.h"
>           mimetype="text/x-csrc;text/x-c++src;text/x-chdr"
>@@ -123,6 +123,11 @@
>         <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*if(?:def|ndef)?(?=\s+\S)" insensitive="true" beginRegion="PP" firstNonSpace="true" />
>         <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*endif" insensitive="true" endRegion="PP" firstNonSpace="true" />
>         <RegExpr attribute="Preprocessor" context="Define" String="#\s*define.*((?=\\))" insensitive="true" firstNonSpace="true" />
>+        
>+        
>+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*pragma\s+mark\s+-\s*$" insensitive="true" firstNonSpace="true" endRegion="pragma_mark" />
>+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*pragma\s+mark" insensitive="true" firstNonSpace="true" endRegion="pragma_mark" beginRegion="pragma_mark" />
>+        
>         <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*(?:el(?:se|if)|include(?:_next)?|define|undef|line|error|warning|pragma)" insensitive="true" firstNonSpace="true" />
>         <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s+[0-9]+" insensitive="true" firstNonSpace="true" />
>       </context>
>@@ -133,6 +138,7 @@
>         <RangeDetect attribute="Prep. Lib" context="#stay" char="&lt;" char1="&gt;"/>
>         <IncludeRules context="##Doxygen" />
>         <Detect2Chars attribute="Comment" context="Commentar/Preprocessor" char="/" char1="*" beginRegion="Comment2" />
>+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/" />
>       </context>
> 
>       <context attribute="Preprocessor" lineEndContext="#pop" name="Define">
>diff -urN tdelibs/kate/data/ccss.xml tdelibs.new/kate/data/ccss.xml
>--- tdelibs/kate/data/ccss.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/ccss.xml	2013-12-26 13:26:41.417325448 -0600
>@@ -0,0 +1,653 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd">
>+
>+<language name="CleanCSS" version="1.0" kateversion="2.5" section="Markup" extensions="*.ccss" author="Massimiliano Torromeo" license="BSD">
>+
>+<highlighting>
>+	<list name="properties">
>+		
>+		<item> azimuth </item>
>+		<item> background </item>
>+		<item> background-attachment </item>
>+		<item> background-color </item>
>+		<item> background-image </item>
>+		<item> background-position </item>
>+		<item> background-repeat </item>
>+		<item> border </item>
>+		<item> border-bottom </item>
>+		<item> border-bottom-color </item>
>+		<item> border-bottom-style </item>
>+		<item> border-bottom-width </item>
>+		<item> border-collapse </item>
>+		<item> border-color </item>
>+		<item> border-left </item>
>+		<item> border-left-color </item>
>+		<item> border-left-style </item>
>+		<item> border-left-width </item>
>+		<item> border-right </item>
>+		<item> border-right-color </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-style </item>
>+		<item> border-top-width </item>
>+		<item> border-width </item>
>+		<item> bottom </item>
>+		<item> caption-side </item>
>+		<item> clear </item>
>+		<item> clip </item>
>+		<item> color </item>
>+		<item> content </item>
>+		<item> counter-increment </item>
>+		<item> counter-reset </item>
>+		<item> cue </item>
>+		<item> cue-after </item>
>+		<item> cue-before </item>
>+		<item> cursor </item>
>+		<item> direction </item>
>+		<item> display </item>
>+		<item> elevation </item>
>+		<item> empty-cells </item>
>+		<item> float </item>
>+		<item> font </item>
>+		<item> font-family </item>
>+		<item> font-size </item>
>+		<item> font-size-adjust </item>
>+		<item> font-stretch </item>
>+		<item> font-style </item>
>+		<item> font-variant </item>
>+		<item> font-weight </item>
>+		<item> height </item>
>+		<item> left </item>
>+		<item> letter-spacing </item>
>+		<item> line-height </item>
>+		<item> list-style </item>
>+		<item> list-style-image </item>
>+		<item> list-style-keyword </item>
>+		<item> list-style-position </item>
>+		<item> list-style-type  </item>
>+		<item> margin </item>
>+		<item> margin-bottom </item>
>+		<item> margin-left </item>
>+		<item> margin-right </item>
>+		<item> margin-top </item>
>+		<item> marker-offset </item>
>+		<item> max-height </item>
>+		<item> max-width </item>
>+		<item> min-height </item>
>+		<item> min-width </item>
>+		<item> orphans </item>
>+		<item> outline </item>
>+		<item> outline-color </item>
>+		<item> outline-style </item>
>+		<item> outline-width </item>
>+		<item> overflow </item>
>+		<item> padding </item>
>+		<item> padding-bottom </item>
>+		<item> padding-left </item>
>+		<item> padding-right </item>
>+		<item> padding-top </item>
>+		<item> page </item>
>+		<item> page-break-after </item>
>+		<item> page-break-before </item>
>+		<item> page-break-inside </item>
>+		<item> pause </item>
>+		<item> pause-after </item>
>+		<item> pause-before </item>
>+		<item> pitch </item>
>+		<item> pitch-range </item>
>+		<item> play-during </item>
>+		<item> position </item>
>+		<item> quotes </item>
>+		<item> richness </item>
>+		<item> right </item>
>+		<item> size </item>
>+		<item> speak </item>
>+		<item> speak-header </item>
>+		<item> speak-numeral </item>
>+		<item> speak-punctuation </item>
>+		<item> speech-rate </item>
>+		<item> stress </item>
>+		<item> table-layout </item>
>+		<item> text-align </item>
>+		<item> text-decoration </item>
>+		<item> text-decoration-color </item>
>+		<item> text-indent </item>
>+		<item> text-shadow </item>
>+		<item> text-transform </item>
>+		<item> top </item>
>+		<item> unicode-bidi </item>
>+		<item> vertical-align </item>
>+		<item> visibility </item>
>+		<item> voice-family </item>
>+		<item> volume </item>
>+		<item> white-space </item>
>+		<item> widows </item>
>+		<item> width </item>
>+		<item> word-spacing </item>
>+		<item> z-index </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-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-shadow </item>
>+		<item> box-sizing </item>
>+		<item> box-orient </item>
>+		<item> box-pack </item>
>+		<item> opacity </item>
>+		<item> outline-offset </item>
>+		<item> overflow-x </item>
>+		<item> overflow-y </item>
>+		<item> text-overflow </item>
>+		<item> text-shadow </item>
>+
>+		
>+		<item> -moz-border-bottom-colors </item>
>+		<item> -moz-border-left-colors </item>
>+		<item> -moz-border-radius </item>
>+		<item> -moz-border-right-colors </item>
>+		<item> -moz-border-top-colors </item>
>+		<item> -moz-box-flex </item>
>+
>+		
>+		<item> -o-background-size </item>
>+		<item> -o-text-overflow </item>
>+
>+		
>+		<item> -tdehtml-background-size </item>
>+		<item> konq_bgpos_x </item>
>+		<item> konq_bgpos_y </item>
>+
>+		
>+		<item> -webkit-background-size </item>
>+		<item> -webkit-border-radius </item>
>+
>+		
>+		<item> filter </item>
>+		<item> -ms-filter </item>
>+
>+		
>+		<item> font-family </item>
>+		<item> font-size </item>
>+		<item> font-stretch </item>
>+		<item> font-style </item>
>+		<item> font-variant </item>
>+		<item> font-weight </item>
>+		<item> unicode-range </item>
>+		<item> units-per-em </item>
>+		<item> src </item>
>+		<item> panose-1 </item>
>+		<item> stemv </item>
>+		<item> stemh </item>
>+		<item> slope </item>
>+		<item> cap-height </item>
>+		<item> x-height </item>
>+		<item> ascent </item>
>+		<item> descent </item>
>+		<item> widths </item>
>+		<item> bbox </item>
>+		<item> definition-src </item>
>+		<item> baseline </item>
>+		<item> centerline </item>
>+		<item> mathline </item>
>+		<item> topline </item>
>+	</list>
>+
>+	<list name="types">
>+		<item> inherit </item>
>+		<item> none </item>
>+		<item> hidden </item>
>+		<item> dotted </item>
>+		<item> dashed </item>
>+		<item> solid </item>
>+		<item> double </item>
>+		<item> groove </item>
>+		<item> ridge </item>
>+		<item> inset </item>
>+		<item> outset </item>
>+		<item> xx-small </item>
>+		<item> x-small </item>
>+		<item> small </item>
>+		<item> medium </item>
>+		<item> large </item>
>+		<item> x-large </item>
>+		<item> xx-large </item>
>+		<item> smaller </item>
>+		<item> larger </item>
>+		<item> italic </item>
>+		<item> oblique </item>
>+		<item> small-caps </item>
>+		<item> normal </item>
>+		<item> bold </item>
>+		<item> bolder </item>
>+		<item> lighter </item>
>+		<item> light </item>
>+		<item> 100 </item>
>+		<item> 200 </item>
>+		<item> 300 </item>
>+		<item> 400 </item>
>+		<item> 500 </item>
>+		<item> 600 </item>
>+		<item> 700 </item>
>+		<item> 800 </item>
>+		<item> 900 </item>
>+		<item> transparent </item>
>+		<item> repeat </item>
>+		<item> repeat-x </item>
>+		<item> repeat-y </item>
>+		<item> no-repeat </item>
>+		<item> baseline </item>
>+		<item> sub </item>
>+		<item> super </item>
>+		<item> top </item>
>+		<item> text-top </item>
>+		<item> middle </item>
>+		<item> bottom </item>
>+		<item> text-bottom </item>
>+		<item> left </item>
>+		<item> right </item>
>+		<item> center </item>
>+		<item> justify </item>
>+		<item> konq-center </item>
>+		<item> disc </item>
>+		<item> circle </item>
>+		<item> square </item>
>+		<item> box </item>
>+		<item> decimal </item>
>+		<item> decimal-leading-zero </item>
>+		<item> lower-roman </item>
>+		<item> upper-roman </item>
>+		<item> lower-greek </item>
>+		<item> lower-alpha </item>
>+		<item> lower-latin </item>
>+		<item> upper-alpha </item>
>+		<item> upper-latin </item>
>+		<item> hebrew </item>
>+		<item> armenian </item>
>+		<item> georgian </item>
>+		<item> cjk-ideographic </item>
>+		<item> hiragana </item>
>+		<item> katakana </item>
>+		<item> hiragana-iroha </item>
>+		<item> katakana-iroha </item>
>+		<item> inline </item>
>+		<item> inline-block </item>
>+		<item> block </item>
>+		<item> list-item </item>
>+		<item> run-in </item>
>+		<item> compact </item>
>+		<item> marker </item>
>+		<item> table </item>
>+		<item> inline-table </item>
>+		<item> table-row-group </item>
>+		<item> table-header-group </item>
>+		<item> table-footer-group </item>
>+		<item> table-row </item>
>+		<item> table-column-group </item>
>+		<item> table-column </item>
>+		<item> table-cell </item>
>+		<item> table-caption </item>
>+		<item> auto </item>
>+		<item> crosshair </item>
>+		<item> default </item>
>+		<item> pointer </item>
>+		<item> move </item>
>+		<item> e-resize </item>
>+		<item> ne-resize </item>
>+		<item> nw-resize </item>
>+		<item> n-resize </item>
>+		<item> se-resize </item>
>+		<item> sw-resize </item>
>+		<item> s-resize </item>
>+		<item> w-resize </item>
>+		<item> text </item>
>+		<item> wait </item>
>+		<item> help </item>
>+		<item> above </item>
>+		<item> absolute </item>
>+		<item> always </item>
>+		<item> avoid </item>
>+		<item> below </item>
>+		<item> bidi-override </item>
>+		<item> blink </item>
>+		<item> both </item>
>+		<item> capitalize </item>
>+		<item> caption </item>
>+		<item> clip </item>
>+		<item> close-quote </item>
>+		<item> collapse </item>
>+		<item> condensed </item>
>+		<item> crop </item>
>+		<item> cross </item>
>+		<item> ellipsis </item>
>+		<item> ellipsis-word </item>
>+		<item> embed </item>
>+		<item> expanded </item>
>+		<item> extra-condensed </item>
>+		<item> extra-expanded </item>
>+		<item> fixed </item>
>+		<item> hand </item>
>+		<item> hide </item>
>+		<item> higher </item>
>+		<item> icon </item>
>+		<item> inside </item>
>+		<item> invert </item>
>+		<item> landscape </item>
>+		<item> level </item>
>+		<item> line-through </item>
>+		<item> loud </item>
>+		<item> lower </item>
>+		<item> lowercase </item>
>+		<item> ltr </item>
>+		<item> menu </item>
>+		<item> message-box </item>
>+		<item> mix </item>
>+		<item> narrower </item>
>+		<item> no-close-quote </item>
>+		<item> no-open-quote </item>
>+		<item> nowrap </item>
>+		<item> open-quote </item>
>+		<item> outside </item>
>+		<item> overline </item>
>+		<item> portrait </item>
>+		<item> pre </item>
>+		<item> pre-line </item>
>+		<item> pre-wrap </item>
>+		<item> relative </item>
>+		<item> rtl </item>
>+		<item> scroll </item>
>+		<item> semi-condensed </item>
>+		<item> semi-expanded </item>
>+		<item> separate </item>
>+		<item> show </item>
>+		<item> small-caption </item>
>+		<item> static </item>
>+		<item> static-position </item>
>+		<item> status-bar </item>
>+		<item> thick </item>
>+		<item> thin </item>
>+		<item> ultra-condensed </item>
>+		<item> ultra-expanded </item>
>+		<item> underline </item>
>+		<item> uppercase </item>
>+		<item> visible </item>
>+		<item> wider </item>
>+		<item> break </item>
>+		<item> serif </item>
>+		<item> sans-serif </item>
>+		<item> cursive </item>
>+		<item> fantasy </item>
>+		<item> monospace </item>
>+		<item> border-box </item>
>+		<item> content-box </item>
>+		<item> horizontal </item>
>+
>+		
>+		<item> -moz-box </item>
>+
>+		
>+		<item> linear </item>
>+		<item> radial </item>
>+
>+	</list>
>+
>+
>+	<list name="colors">
>+		<item> aqua </item>
>+		<item> black </item>
>+		<item> blue </item>
>+		<item> fuchsia </item>
>+		<item> gray </item>
>+		<item> green </item>
>+		<item> lime </item>
>+		<item> maroon </item>
>+		<item> navy </item>
>+		<item> olive </item>
>+		<item> purple </item>
>+		<item> red </item>
>+		<item> silver </item>
>+		<item> teal </item>
>+		<item> white </item>
>+		<item> yellow </item>
>+		<item> ActiveBorder  </item>
>+		<item> ActiveCaption  </item>
>+		<item> AppWorkspace  </item>
>+		<item> Background  </item>
>+		<item> ButtonFace  </item>
>+		<item> ButtonHighlight  </item>
>+		<item> ButtonShadow  </item>
>+		<item> ButtonText  </item>
>+		<item> CaptionText  </item>
>+		<item> GrayText  </item>
>+		<item> Highlight  </item>
>+		<item> HighlightText  </item>
>+		<item> InactiveBorder  </item>
>+		<item> InactiveCaption  </item>
>+		<item> InactiveCaptionText  </item>
>+		<item> InfoBackground  </item>
>+		<item> InfoText  </item>
>+		<item> Menu  </item>
>+		<item> MenuText  </item>
>+		<item> Scrollbar  </item>
>+		<item> ThreeDDarkShadow  </item>
>+		<item> ThreeDFace  </item>
>+		<item> ThreeDHighlight  </item>
>+		<item> ThreeDLightShadow  </item>
>+		<item> ThreeDShadow  </item>
>+		<item> Window  </item>
>+		<item> WindowFrame  </item>
>+		<item> WindowText  </item>
>+	</list>
>+
>+	<list name="paren">
>+		<item> url </item>
>+		<item> attr </item>
>+		<item> rect </item>
>+		<item> rgb </item>
>+		<item> rgba </item>
>+		<item> hsl </item>
>+		<item> hsla </item>
>+		<item> counter </item>
>+		<item> counters </item>
>+
>+		
>+		<item> local </item>
>+		<item> format </item>
>+
>+		
>+		<item> -webkit-gradient </item>
>+		<item> color-stop </item>
>+
>+		
>+		<item> -moz-linear-gradient </item>
>+		<item> -moz-radial-gradient </item>
>+
>+		
>+		<item> expression </item>
>+		<item> progid:DXImageTransform.Microsoft.gradient </item>
>+
>+	</list>
>+
>+	<list name="mediatypes">
>+		<item> all </item>
>+		<item> aural </item>
>+		<item> braille </item>
>+		<item> embossed </item>
>+		<item> handheld </item>
>+		<item> print </item>
>+		<item> projection </item>
>+		<item> screen </item>
>+		<item> tty </item>
>+		<item> tv </item>
>+	</list>
>+
>+	<list name="pseudoclasses">
>+		<item> hover </item>
>+		<item> link </item>
>+		<item> visited </item>
>+		<item> active </item>
>+		<item> focus </item>
>+		<item> first-child </item>
>+		<item> last-child </item>
>+		<item> only-child </item>
>+		<item> first-of-type </item>
>+		<item> last-of-type </item>
>+		<item> only-of-type </item>
>+		<item> first-letter </item>
>+		<item> first-line </item>
>+		<item> before </item>
>+		<item> after </item>
>+		<item> selection </item>
>+		<item> root </item>
>+		<item> empty </item>
>+		<item> target </item>
>+		<item> enabled </item>
>+		<item> disabled </item>
>+		<item> checked </item>
>+		<item> indeterminate </item>
>+		<item> nth-child </item>
>+		<item> nth-last-child </item>
>+		<item> nth-of-type </item>
>+		<item> nth-last-of-type </item>
>+		<item> not </item>
>+	</list>
>+
>+	<contexts>
>+		<context name="Normal" attribute="Normal Text" lineEndContext="#stay">
>+			<Detect2Chars attribute="Comment" char="/" char1="/" context="Comment" />
>+			<RegExpr attribute="Normal Text" String=".*\S.*:\s*$" context="Selector" lookAhead="true" />
>+			<RegExpr attribute="Normal Text" String=".*\S.*:.*\S.*$" context="RuleSet" lookAhead="true" />
>+			<RegExpr attribute="Property" String="[a-z\-]+-&gt;\s*$" context="#stay" />
>+			<RegExpr attribute="Error" context="#stay" String="\S" />
>+			
>+			
>+			
>+		</context>
>+
>+		<context name="Comment" attribute="Comment" lineEndContext="#pop" />
>+
>+		<context name="Selector" attribute="Normal Text" lineEndContext="#pop">
>+			<DetectChar attribute="Selector Attr" context="SelAttr" char="[" />
>+			<RegExpr attribute="Selector Id" context="#stay" String="#([a-zA-Z0-9\-_]|[\x80-\xFF]|\\[0-9A-Fa-f]{1,6})*" />
>+			<RegExpr attribute="Selector Class" context="#stay" String="\.([a-zA-Z0-9\-_]|[\x80-\xFF]|\\[0-9A-Fa-f]{1,6})*" />
>+			<DetectChar attribute="Selector Pseudo" context="SelPseudo" char=":" />
>+			<keyword attribute="Media" context="#stay" String="mediatypes" />
>+		</context>
>+
>+		<context name="SelAttr" attribute="Selector Attr" lineEndContext="#pop">
>+			<DetectChar attribute="Selector Attr" context="#pop" char="]" />
>+			<IncludeRules context="FindStrings" />
>+		</context>
>+
>+		<context name="SelPseudo" attribute="Selector Pseudo" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
>+			<keyword attribute="Selector Pseudo" context="#pop" String="pseudoclasses" />
>+		</context>
>+
>+		<context name="RuleSet" attribute="Normal Text" lineEndContext="#pop">
>+			<keyword attribute="Property" context="Rule" String="properties" />
>+			<RegExpr attribute="Unknown Property" context="Rule" String="-?[A-Za-z_-]+(?=\s*:)" />
>+			<RegExpr attribute="Error" context="#stay" String="\S" />
>+		</context>
>+
>+		<context name="Rule" attribute="Normal Text" lineEndContext="#pop">
>+			<DetectChar attribute="Property" context="Rule2" char=":" />
>+			<RegExpr attribute="Error" context="#stay" String="\S" />
>+		</context>
>+
>+		<context name="Rule2" attribute="Normal Text" lineEndContext="#pop">
>+			<keyword attribute="Value" context="#stay" String="types" />
>+			<keyword attribute="Value" context="#stay" String="colors" />
>+			<RegExpr attribute="Value" context="#stay" String="#([0-9A-Fa-f]{3}){1,4}\b" />
>+			<keyword attribute="Value" context="PropParen" String="paren" />
>+			<RegExpr attribute="Important" context="#stay" String="!important\b" />
>+			<IncludeRules context="FindValues" />
>+			<IncludeRules context="FindStrings" />
>+		</context>
>+
>+		<context name="PropParen" attribute="Normal Text" lineEndContext="#pop">
>+			<DetectChar attribute="Value" context="PropParen2" char="(" />
>+			<RegExpr attribute="Error" context="#stay" String="\S" />
>+		</context>
>+
>+		<context name="PropParen2" attribute="Normal Text" lineEndContext="#pop">
>+			<IncludeRules context="Rule2" />
>+			<DetectChar attribute="Value" context="#pop#pop" char=")" />
>+			<IncludeRules context="FindValues" />
>+			<IncludeRules context="FindStrings" />
>+		</context>
>+
>+	<context attribute="Normal Text" lineEndContext="#stay" name="FindValues">
>+		<RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+(em|ex|px|in|cm|mm|pt|pc|deg|rad|grad|ms|s|Hz|kHz)\b" />
>+		<RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+[%]?" />
>+		<RegExpr attribute="Normal Text" context="#stay" String="[\w\-]+" />
>+	</context>
>+
>+		<context name="FindStrings" attribute="Normal Text" lineEndContext="#pop">
>+			<DetectChar attribute="String" context="StringDQ" char="&quot;" />
>+			<DetectChar attribute="String" context="StringSQ" char="'" />
>+		</context>
>+
>+      
>+		<context name="StringDQ" attribute="String" lineEndContext="#pop">
>+			<DetectChar attribute="String" context="#pop" char="&quot;" />
>+			<IncludeRules context="InsideString" />
>+		</context>
>+
>+		<context name="StringSQ" attribute="String" lineEndContext="#pop">
>+			<DetectChar attribute="String" context="#pop" char="'" />
>+			<IncludeRules context="InsideString" />
>+		</context>
>+
>+		<context name="InsideString" attribute="String" lineEndContext="#pop">
>+			<RegExpr attribute="String" context="#stay" String="\\[&quot;']" />
>+			<DetectIdentifier/>
>+		</context>
>+	</contexts>
>+
>+	<itemDatas>
>+		<itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/>
>+		<itemData name="Property"  defStyleNum="dsKeyword" spellChecking="false"/>
>+		<itemData name="Unknown Property"  defStyleNum="dsKeyword" italic="1" spellChecking="false"/>
>+		<itemData name="Media"  defStyleNum="dsDecVal" bold="1" spellChecking="false"/>
>+		<itemData name="At Rule"  defStyleNum="dsDecVal" spellChecking="false"/>
>+		<itemData name="String"  defStyleNum="dsString"/>
>+		<itemData name="Value"  defStyleNum="dsDataType" spellChecking="false"/>
>+		<itemData name="Important" defStyleNum="dsKeyword" spellChecking="false"/>
>+		<itemData name="Selector Attr" defStyleNum="dsChar" spellChecking="false"/>
>+		<itemData name="Selector Id"  defStyleNum="dsFloat" bold="1" spellChecking="false"/>
>+		<itemData name="Selector Class"  defStyleNum="dsFloat" spellChecking="false"/>
>+		<itemData name="Selector Pseudo"  defStyleNum="dsDecVal" spellChecking="false"/>
>+		<itemData name="Comment" defStyleNum="dsComment" />
>+		<itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
>+		<itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/>
>+		<itemData name="Error" defStyleNum="dsError" spellChecking="false"/>
>+	</itemDatas>
>+</highlighting>
>+<general>
>+	<folding indentationsensitive="1" />
>+	<keywords casesensitive="0" weakDeliminator="-%"/>
>+	<comments>
>+		<comment name="singleLine" start="#" position="afterwhitespace"/>
>+		<comment name="singleLine" start="//" position="afterwhitespace"/>
>+	</comments>
>+</general>
>+</language>
>diff -urN tdelibs/kate/data/cg.xml tdelibs.new/kate/data/cg.xml
>--- tdelibs/kate/data/cg.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/cg.xml	2013-12-26 13:26:41.212326325 -0600
>@@ -20,7 +20,7 @@
> 	* Added FACE sementic for the new fp40 profile
> -->
> 
>-<language name="Cg" section="Sources" extensions="*.cg" mimetype="text/x-cgsrc" version="1.11" kateversion="2.4" author="Florian Schanda (florian.schanda@schanda.de)" license="LGPL">
>+<language name="Cg" section="Sources" extensions="*.cg" mimetype="text/x-cgsrc" version="1.11" kateversion="2.5" author="Florian Schanda (florian.schanda@schanda.de)" license="LGPL">
> 	<highlighting>
> 		<list name="binding">
> 			<item>POSITION</item>
>diff -urN tdelibs/kate/data/cgis.xml tdelibs.new/kate/data/cgis.xml
>--- tdelibs/kate/data/cgis.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/cgis.xml	2013-12-26 13:26:41.019327147 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="CGiS" version="1.02" kateversion="2.4" section="Sources" extensions="*.cgis" mimetype="">
>+<language name="CGiS" version="1.02" kateversion="2.5" section="Sources" extensions="*.cgis" mimetype="">
>   <highlighting>
>     <list name="keywords">
>       <item> 1D </item>
>diff -urN tdelibs/kate/data/changelog.xml tdelibs.new/kate/data/changelog.xml
>--- tdelibs/kate/data/changelog.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/changelog.xml	2013-12-26 13:26:40.868327793 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="ChangeLog" version="1.04" kateversion="2.4" section="Other" extensions="ChangeLog" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL">
>+<language name="ChangeLog" version="1.04" kateversion="2.5" section="Other" extensions="ChangeLog" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL">
>   <highlighting>
>     <contexts>
>       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
>diff -urN tdelibs/kate/data/chicken.xml tdelibs.new/kate/data/chicken.xml
>--- tdelibs/kate/data/chicken.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/chicken.xml	2013-12-26 13:26:41.440325350 -0600
>@@ -0,0 +1,437 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd">
>+
>+<language version="1.12" kateversion="2.5" 
>+          name="Chicken" section="Scripts"
>+          extensions="*.chicken;*.scm;*.ss;*.scheme;*.meta" 
>+          indenter="lisp"
>+          mimetype="text/x-scheme" 
>+          author="Dominik Haumann (dhdev@gmx.de) [modified for Chicken by Nick Zarczynski (jacktradespublic@gmail.com)]"
>+          license="LGPL">
>+  <highlighting>
>+    <list name="operators">
>+      <item> &lt;= </item>
>+      <item> &lt; </item>
>+      <item> = </item>
>+      <item> =&gt; </item>
>+      <item> &gt;= </item>
>+      <item> &gt; </item>
>+      <item> - </item>
>+      <item> / </item>
>+      <item> *,* </item>
>+      <item> *) </item>
>+      <item> + </item>
>+    </list>
>+    <list name="characters">
>+      <item> #\nul </item>
>+      <item> #\soh </item>
>+      <item> #\stx </item>
>+      <item> #\etx </item>
>+      <item> #\eot </item>
>+      <item> #\enq </item>
>+      <item> #\ack </item>
>+      <item> #\bel </item>
>+      <item> #\bs </item>
>+      <item> #\ht </item>
>+      <item> #\nl </item>
>+      <item> #\vt </item>
>+      <item> #\np </item>
>+      <item> #\cr </item>
>+      <item> #\so </item>
>+      <item> #\si </item>
>+      <item> #\dle </item>
>+      <item> #\dc1 </item>
>+      <item> #\dc2 </item>
>+      <item> #\dc3 </item>
>+      <item> #\dc4 </item>
>+      <item> #\nak </item>
>+      <item> #\syn </item>
>+      <item> #\etb </item>
>+      <item> #\can </item>
>+      <item> #\em </item>
>+      <item> #\sub </item>
>+      <item> #\esc </item>
>+      <item> #\fs </item>
>+      <item> #\gs </item>
>+      <item> #\rs </item>
>+      <item> #\us </item>
>+      <item> #\space </item>
>+      <item> #\sp </item>
>+      <item> #\newline </item>
>+      <item> #\nl </item>
>+      <item> #\tab </item>
>+      <item> #\ht </item>
>+      <item> #\backspace </item>
>+      <item> #\bs </item>
>+      <item> #\return </item>
>+      <item> #\cr </item>
>+      <item> #\page </item>
>+      <item> #\np </item>
>+      <item> #\null </item>
>+      <item> #\nul </item>
>+    </list>
>+    <list name="defines">
>+      <item> define </item>
>+      <item> define* </item>
>+      <item> define-accessor </item>
>+      <item> define-class </item>
>+      <item> defined? </item>
>+      <item> define-generic </item>
>+      <item> define-macro </item>
>+      <item> define-method </item>
>+      <item> define-module </item>
>+      <item> define-private </item>
>+      <item> define-public </item>
>+      <item> define*-public </item>
>+      <item> define-reader-ctor </item>
>+      <item> define-syntax </item>
>+      <item> define-syntax-macro </item>
>+      <item> defmacro </item>
>+      <item> defmacro* </item>
>+      <item> defmacro*-public </item>
>+    </list>
>+    <list name="keywords">
>+      <item> abs </item>
>+      <item> acos </item>
>+      <item> and </item>
>+      <item> angle </item>
>+      <item> append </item>
>+      <item> applymap </item>
>+      <item> asin </item>
>+      <item> assoc </item>
>+      <item> assq </item>
>+      <item> assv </item>
>+      <item> atan </item>
>+      <item> begin </item>
>+      <item> boolean? </item>
>+      <item> break </item>
>+      <item> caaaar </item>
>+      <item> caaadr </item>
>+      <item> caaar </item>
>+      <item> caadar </item>
>+      <item> caaddr </item>
>+      <item> caadr </item>
>+      <item> caar </item>
>+      <item> cadaar </item>
>+      <item> cadadr </item>
>+      <item> cadar </item>
>+      <item> caddar </item>
>+      <item> cadddr </item>
>+      <item> caddr </item>
>+      <item> cadr </item>
>+      <item> call/cc </item>
>+      <item> call-with-current-continuation </item>
>+      <item> call-with-input-file </item>
>+      <item> call-with-output-file </item>
>+      <item> call-with-values </item>
>+      <item> car </item>
>+      <item> case </item>
>+      <item> catch </item>
>+      <item> cdaaar </item>
>+      <item> cdaadr </item>
>+      <item> cdaar </item>
>+      <item> cdadar </item>
>+      <item> cdaddr </item>
>+      <item> cdadr </item>
>+      <item> cdar </item>
>+      <item> cddaar </item>
>+      <item> cddadr </item>
>+      <item> cddar </item>
>+      <item> cdddar </item>
>+      <item> cddddr </item>
>+      <item> cdddr </item>
>+      <item> cddr </item>
>+      <item> cdr </item>
>+      <item> ceiling </item>
>+      <item> char-alphabetic? </item>
>+      <item> char-ci&gt;=? </item>
>+      <item> char-ci&gt;? </item>
>+      <item> char-ci=? </item>
>+      <item> char-ci&lt;=? </item>
>+      <item> char-downcase </item>
>+      <item> char-&gt;integer </item>
>+      <item> char&gt;=? </item>
>+      <item> char&gt;? </item>
>+      <item> char=? </item>
>+      <item> char? </item>
>+      <item> char-lower-case? </item>
>+      <item> char&lt;?c </item>
>+      <item> char&lt;=? </item>
>+      <item> char-numeric? </item>
>+      <item> char-ready? </item>
>+      <item> char-upcase </item>
>+      <item> char-upper-case? </item>
>+      <item> char-whitespace? </item>
>+      <item> close-input-port </item>
>+      <item> close-output-port </item>
>+      <item> complex? </item>
>+      <item> cond </item>
>+      <item> cons </item>
>+      <item> continue </item>
>+      <item> cos </item>
>+      <item> current-input-port </item>
>+      <item> current-output-port </item>
>+      <item> denominator </item>
>+      <item> display </item>
>+      <item> do </item>
>+      <item> dynamic-wind </item>
>+      <item> else </item>
>+      <item> eof-object? </item>
>+      <item> eq? </item>
>+      <item> equal? </item>
>+      <item> eqv? </item>
>+      <item> eval </item>
>+      <item> even? </item>
>+      <item> exact->inexact </item>
>+      <item> exact? </item>
>+      <item> exp </item>
>+      <item> expt </item>
>+      <item> floor </item>
>+      <item> force </item>
>+      <item> for-each </item>
>+      <item> gcd </item>
>+      <item> har-ci&lt;? </item>
>+      <item> if </item>
>+      <item> imag-part </item>
>+      <item> inexact-&gt;exact </item>
>+      <item> inexact? </item>
>+      <item> input-port? </item>
>+      <item> integer-&gt;char </item>
>+      <item> integer? </item>
>+      <item> interaction-environment </item>
>+      <item> lambda </item>
>+      <item> lcm </item>
>+      <item> length </item>
>+      <item> let </item>
>+      <item> let* </item>
>+      <item> letrec </item>
>+      <item> letrec-syntax </item>
>+      <item> let-syntax </item>
>+      <item> list-&gt;string </item>
>+      <item> list </item>
>+      <item> list? </item>
>+      <item> list-ref </item>
>+      <item> list-tail </item>
>+      <item> load </item>
>+      <item> log </item>
>+      <item> magnitude </item>
>+      <item> make-polar </item>
>+      <item> make-rectangular </item>
>+      <item> make-string </item>
>+      <item> make-vector </item>
>+      <item> max </item>
>+      <item> member </item>
>+      <item> memq </item>
>+      <item> memv </item>
>+      <item> min </item>
>+      <item> modulo </item>
>+      <item> negative? </item>
>+      <item> newline </item>
>+      <item> not </item>
>+      <item> null-environment </item>
>+      <item> null? </item>
>+      <item> number? </item>
>+      <item> number->string </item>
>+      <item> numerator </item>
>+      <item> odd? </item>
>+      <item> open-input-file </item>
>+      <item> open-output-file </item>
>+      <item> or </item>
>+      <item> output-port? </item>
>+      <item> pair? </item>
>+      <item> peek-char </item>
>+      <item> port? </item>
>+      <item> positive? </item>
>+      <item> procedure? </item>
>+      <item> quotient </item>
>+      <item> rational? </item>
>+      <item> rationalize </item>
>+      <item> read-char </item>
>+      <item> read </item>
>+      <item> real? </item>
>+      <item> real-part </item>
>+      <item> remainder </item>
>+      <item> reverse </item>
>+      <item> round </item>
>+      <item> scheme-report-environment </item>
>+      <item> set-car! </item>
>+      <item> set-cdr! </item>
>+      <item> sin </item>
>+      <item> sqrt </item>
>+      <item> string-append </item>
>+      <item> string-ci&gt;=? </item>
>+      <item> string-ci&gt;? </item>
>+      <item> string-ci=? </item>
>+      <item> string-ci&lt;=? </item>
>+      <item> string-ci&lt;? </item>
>+      <item> string-copy </item>
>+      <item> string-fill! </item>
>+      <item> string&gt;=? </item>
>+      <item> string&gt;? </item>
>+      <item> string-&gt;list </item>
>+      <item> string-&gt;number </item>
>+      <item> string-&gt;symbol </item>
>+      <item> string=? </item>
>+      <item> string </item>
>+      <item> string? </item>
>+      <item> string-length </item>
>+      <item> string&lt;=? </item>
>+      <item> string&lt;? </item>
>+      <item> string-ref </item>
>+      <item> string-set! </item>
>+      <item> substring </item>
>+      <item> symbol-&gt;string </item>
>+      <item> symbol? </item>
>+      <item> syntax-rules </item>
>+      <item> tan </item>
>+      <item> transcript-off </item>
>+      <item> transcript-on </item>
>+      <item> truncate </item>
>+      <item> values </item>
>+      <item> vector-fill! </item>
>+      <item> vector-&gt;listlist->vector </item>
>+      <item> vector </item>
>+      <item> vector? </item>
>+      <item> vector-length </item>
>+      <item> vector-ref </item>
>+      <item> vector-set! </item>
>+      <item> while </item>
>+      <item> with-input-from-file </item>
>+      <item> with-output-to-file </item>
>+      <item> write-char </item>
>+      <item> write </item>
>+      <item> zero? </item>
>+    </list>
>+    <contexts>
>+      <context name="Level0" attribute="Normal" lineEndContext="#stay">
>+            <DetectChar attribute="Brackets1" context="Level1" char="("/>
>+            <IncludeRules context="Default" />
>+      </context>
>+      <context name="Default" attribute="Normal" lineEndContext="#stay">
>+        <RegExpr attribute="Region Marker" context="#stay" String=";+\s*BEGIN.*$" beginRegion="region"/>
>+        <RegExpr attribute="Region Marker" context="#stay" String=";+\s*END.*$" endRegion="region"/>
>+        <RegExpr attribute="Comment" context="#stay" String=";.*$"/>
>+        <keyword attribute="Keyword" context="#stay" String="keywords"/>
>+        <keyword attribute="Operator" context="#stay" String="operators"/>
>+        <keyword attribute="Definition" context="function_decl" String="defines"/>
>+        <keyword attribute="Char" context="#stay" String="characters"/>
>+        <RegExpr attribute="Char" context="#stay" String="#\\."/>
>+        <DetectChar attribute="String" context="String" char="&quot;"/>
>+        <RegExpr attribute="Char" context="SpecialNumber" String="#[bodxei]"/>
>+        <RegExpr attribute="Decimal" context="#stay" String="#[tf]"/>
>+        <Float attribute="Float" context="#stay"/>
>+        <Int attribute="Decimal" context="#stay"/>
>+        <DetectChar attribute="Brackets1" context="Level1" char="("/>
>+      </context>
>+      <context name="SpecialNumber" attribute="Normal" fallthrough="true" lineEndContext="#pop">
>+        <RegExpr attribute="Decimal" context="#pop" String="\d*(\.\d+)?"/>
>+      </context>
>+      <context name="String" attribute="String" lineEndContext="#stay">
>+        <keyword attribute="Char" context="#stay" String="characters"/>
>+        <RegExpr attribute="Char" context="#stay" String="#\\."/>
>+        <Detect2Chars attribute="Char" context="#stay" char="\" char1="&quot;"/>
>+        <Detect2Chars attribute="Char" context="#stay" char="\" char1="\"/>
>+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
>+      </context>
>+      <context name="function_decl" attribute="Function" lineEndContext="#stay">
>+        <RegExpr attribute="Function" context="#pop" String="\s*[A-Za-z0-9-+\&lt;\&gt;//\*]*\s*" />
>+      </context>
>+      <context name="Level1" attribute="Normal" lineEndContext="#stay">
>+           <DetectChar attribute="Brackets2" context="Level2" char="("/>
>+           <DetectChar attribute="Brackets1" context="#pop" char=")" />
>+           <IncludeRules context="Default" />
>+      </context>
>+      <context name="Level2" attribute="Normal" lineEndContext="#stay">
>+           <DetectChar attribute="Brackets3" context="Level3" char="("/>
>+           <DetectChar attribute="Brackets2" context="#pop" char=")" />
>+           <IncludeRules context="Default" />
>+      </context>
>+      <context name="Level3" attribute="Normal" lineEndContext="#stay">
>+           <DetectChar attribute="Brackets4" context="Level4" char="("/>
>+           <DetectChar attribute="Brackets3" context="#pop" char=")" />
>+           <IncludeRules context="Default" />
>+      </context>
>+      <context name="Level4" attribute="Normal" lineEndContext="#stay">
>+           <DetectChar attribute="Brackets5" context="Level5" char="("/>
>+           <DetectChar attribute="Brackets4" context="#pop" char=")" />
>+           <IncludeRules context="Default" />
>+      </context>
>+      <context name="Level5" attribute="Normal" lineEndContext="#stay">
>+           <DetectChar attribute="Brackets6" context="Level6" char="("/>
>+           <DetectChar attribute="Brackets5" context="#pop" char=")" />
>+           <IncludeRules context="Default" />
>+      </context>
>+      <context name="Level6" attribute="Normal" lineEndContext="#stay">
>+           <DetectChar attribute="Brackets1" context="Level1" char="("/>
>+           <DetectChar attribute="Brackets6" context="#pop" char=")" />
>+           <IncludeRules context="Default" />
>+      </context>
>+    </contexts>
>+    <itemDatas>
>+      <itemData name="Normal"      defStyleNum="dsNormal"/>
>+      <itemData name="Keyword"     defStyleNum="dsKeyword"/>
>+      <itemData name="Definition"  defStyleNum="dsKeyword" color="#d22811"/>
>+      <itemData name="Operator"    defStyleNum="dsKeyword" color="#d22811"/>
>+      <itemData name="Function"    defStyleNum="dsFunction"/>
>+      <itemData name="Data"        defStyleNum="dsDataType"/>
>+      <itemData name="Decimal"     defStyleNum="dsDecVal"/>
>+      <itemData name="BaseN"       defStyleNum="dsBaseN"/>
>+      <itemData name="Float"       defStyleNum="dsFloat"/>
>+      <itemData name="Char"        defStyleNum="dsChar"/>
>+      <itemData name="String"      defStyleNum="dsString"/>
>+      <itemData name="Comment"     defStyleNum="dsComment"/>
>+      <itemData name="Region Marker" defStyleNum="dsRegionMarker"/>
>+      <itemData name="Brackets1"    defStyleNum="dsNormal" color="#ff0000" selColor="#000000" bold="1" italic="0"/>
>+      <itemData name="Brackets2"    defStyleNum="dsNormal" color="#ff8800" selColor="#000000" bold="1" italic="0"/>
>+      <itemData name="Brackets3"    defStyleNum="dsNormal" color="#888800" selColor="#000000" bold="1" italic="0"/>
>+      <itemData name="Brackets4"    defStyleNum="dsNormal" color="#008800" selColor="#000000" bold="1" italic="0"/>
>+      <itemData name="Brackets5"    defStyleNum="dsNormal" color="#000088" selColor="#000000" bold="1" italic="0"/>
>+      <itemData name="Brackets6"    defStyleNum="dsNormal" color="#880088" selColor="#000000" bold="1" italic="0"/>
>+    </itemDatas>
>+  </highlighting>
>+  <general>
>+    <keywords casesensitive="1" weakDeliminator="-+*?!&lt;&gt;=/:#\"/>
>+    <comments>
>+      <comment name="singleLine" start=";;" />
>+    </comments>
>+  </general>
>+</language>
>\ No newline at end of file
>diff -urN tdelibs/kate/data/cisco.xml tdelibs.new/kate/data/cisco.xml
>--- tdelibs/kate/data/cisco.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/cisco.xml	2013-12-26 13:26:41.075326910 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Cisco" version="1.10" kateversion="2.4" section="Configuration" extensions="*.cis" mimetype="text/cisco" author="RaphaÃ«l GRAPINET" license="LGPL">
>+<language name="Cisco" version="1.10" kateversion="2.5" section="Configuration" extensions="*.cis" mimetype="text/cisco" author="RaphaÃ«l GRAPINET" license="LGPL">
> 	<highlighting>
> 		<list name = "commands">
> 			<item> aaa </item>
>diff -urN tdelibs/kate/data/clipper.xml tdelibs.new/kate/data/clipper.xml
>--- tdelibs/kate/data/clipper.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/clipper.xml	2013-12-26 13:26:40.906327630 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Clipper" version="1.05" kateversion="2.3" section="Sources" extensions="*.prg;*.PRG;*.ch" mimetype="text/x-clipper-src" priority="2" author="Andrey Cherepanov (sibskull@mail.ru)" license="GPL">
>+<language name="Clipper" version="1.05" kateversion="2.5" section="Sources" extensions="*.prg;*.PRG;*.ch" mimetype="text/x-clipper-src" priority="2" author="Andrey Cherepanov (sibskull@mail.ru)" license="GPL">
>   <highlighting>
> 
>     <list name="keywords">
>diff -urN tdelibs/kate/data/clojure.xml tdelibs.new/kate/data/clojure.xml
>--- tdelibs/kate/data/clojure.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/clojure.xml	2013-12-26 13:26:41.246326179 -0600
>@@ -22,7 +22,7 @@
>  * Boston, MA  02110-1301, USA.                                       *
>  **********************************************************************
>  -->
>-<language version="2" kateversion="2.3" name="Clojure" section="Sources" extensions="*.clj" mimetype="" author="Dominik Haumann [lisp] modified for clojure by Caspar Hasenclever" license="LGPL">
>+<language version="2" kateversion="2.5" name="Clojure" section="Sources" extensions="*.clj" mimetype="" author="Dominik Haumann [lisp] modified for clojure by Caspar Hasenclever" license="LGPL">
>   <highlighting>
>     <list name="definitions">
>       <item> def </item>
>diff -urN tdelibs/kate/data/cmake.xml tdelibs.new/kate/data/cmake.xml
>--- tdelibs/kate/data/cmake.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/cmake.xml	2013-12-26 13:26:41.272326067 -0600
>@@ -6,6 +6,7 @@
>   Copyright 2004 Alexander Neundorf (neundorf@kde.org)
>   Copyright 2005 Dominik Haumann (dhdev@gmx.de)
>   Copyright 2007,2008 Matthew Woehlke (mw_triad@users.sourceforge.net)
>+  Copyright 2013 Alex Turbov (i.zaufi@gmail.com)
> 
>  **********************************************************************
>  * This library is free software; you can redistribute it and/or      *
>@@ -24,10 +25,11 @@
>  * Boston, MA  02110-1301, USA.                                       *
>  **********************************************************************
>  -->
>-
>-<language name="CMake" version="1.13" kateversion="2.4" section="Other" extensions="CMakeLists.txt;*.cmake;" mimetype="" author="Alexander Neundorf (neundorf@kde.org)" license="LGPL">
>+
>+<language name="CMake" version="1.23" kateversion="2.5" section="Other" extensions="CMakeLists.txt;*.cmake;" mimetype="" author="Alexander Neundorf (neundorf@kde.org)" license="LGPL">
>   <highlighting>
> 
>+    
>     <list name = "commands">
>       
>       <item> add_custom_command </item>
>@@ -115,6 +117,8 @@
>       <item> string </item>
>       <item> subdir_depends </item>
>       <item> subdirs </item>
>+      <item> target_compile_definitions </item>
>+      <item> target_include_directories </item>
>       <item> target_link_libraries </item>
>       <item> try_compile </item>
>       <item> try_run </item>
>@@ -135,24 +139,24 @@
>       <item> vtk_wrap_tcl </item>
>     </list>
> 
>+    
>     <list name="special_args">
>       
>-      <item> A </item>
>-      <item> ABSOLUTE </item>
>       <item> AFTER </item>
>       <item> ALL </item>
>       <item> ALPHABET </item>
>       <item> AND </item>
>       <item> APPEND </item>
>+      <item> APPEND_STRING </item>
>       <item> ARCHIVE </item>
>       <item> ARGS </item>
>       <item> ASCII </item>
>       <item> AUTHOR_WARNING </item>
>-      <item> B </item>
>       <item> BEFORE </item>
>       <item> BRIEF_DOCS </item>
>       <item> BUNDLE </item>
>       <item> CACHE </item>
>+      <item> CACHED_VARIABLE </item>
>       <item> CLEAR </item>
>       <item> CMAKE_FIND_ROOT_PATH_BOTH </item>
>       <item> CMAKE_FLAGS </item>
>@@ -166,12 +170,15 @@
>       <item> COMPILE_RESULT_VAR </item>
>       <item> COMPONENT </item>
>       <item> COMPONENTS </item>
>+      <item> CONFIG </item>
>       <item> CONFIGS </item>
>       <item> CONFIGURATION </item>
>       <item> CONFIGURATIONS </item>
>       <item> CONFIGURE </item>
>+      <item> COPY </item>
>       <item> COPYONLY </item>
>       <item> COPY_FILE </item>
>+      <item> CRLF </item>
>       <item> DEFINED </item>
>       <item> DEFINITION </item>
>       <item> DEPENDS </item>
>@@ -179,6 +186,7 @@
>       <item> DIRECTORY </item>
>       <item> DIRECTORY_PERMISSIONS </item>
>       <item> DOC </item>
>+      <item> DOS </item>
>       <item> DOWNLOAD </item>
>       <item> ENV </item>
>       <item> EQUAL </item>
>@@ -191,9 +199,10 @@
>       <item> EXCLUDE </item>
>       <item> EXCLUDE_FROM_ALL </item>
>       <item> EXISTS </item>
>+      <item> EXPECTED_HASH </item>
>+      <item> EXPECTED_MD5 </item>
>       <item> EXPORT </item>
>       <item> EXPR </item>
>-      <item> EXT </item>
>       <item> EXTRA_INCLUDE </item>
>       <item> FATAL_ERROR </item>
>       <item> FILE </item>
>@@ -208,19 +217,24 @@
>       <item> FUNCTION </item>
>       <item> GET </item>
>       <item> GLOB </item>
>+      <item> GLOBAL </item>
>       <item> GLOB_RECURSE </item>
>       <item> GREATER </item>
>       <item> GROUP_EXECUTE </item>
>       <item> GROUP_READ </item>
>+      <item> GUID </item>
>       <item> HEX </item>
>       <item> HINTS </item>
>       <item> IMPLICIT_DEPENDS </item>
>       <item> IMPORTED </item>
>       <item> IN </item>
>+      <item> INACTIVITY_TIMEOUT </item>
>       <item> INCLUDE_INTERNALS </item>
>       <item> INHERITED </item>
>       <item> INPUT_FILE </item>
>       <item> INSERT </item>
>+      <item> INSTALL </item>
>+      <item> INTERFACE </item>
>       <item> IS_ABSOLUTE </item>
>       <item> IS_DIRECTORY </item>
>       <item> IS_NEWER_THAN </item>
>@@ -230,12 +244,16 @@
>       <item> LENGTH_MAXIMUM </item>
>       <item> LENGTH_MINIMUM </item>
>       <item> LESS </item>
>+      <item> LF </item>
>       <item> LIBRARY </item>
>       <item> LIMIT </item>
>       <item> LIMIT_COUNT </item>
>       <item> LIMIT_INPUT </item>
>       <item> LIMIT_OUTPUT </item>
>       <item> LINK_INTERFACE_LIBRARIES </item>
>+      <item> LINK_LIBRARIES </item>
>+      <item> LINK_PRIVATE </item>
>+      <item> LINK_PUBLIC </item>
>       <item> LISTS </item>
>       <item> LOG </item>
>       <item> MACOSX_BUNDLE </item>
>@@ -244,15 +262,17 @@
>       <item> MATCH </item>
>       <item> MATCHALL </item>
>       <item> MATCHES </item>
>+      <item> MD5 </item>
>       <item> MODULE </item>
>       <item> NAME </item>
>       <item> NAMELINK_ONLY </item>
>       <item> NAMELINK_SKIP </item>
>       <item> NAMES </item>
>       <item> NAMESPACE </item>
>-      <item> NAME_WE </item>
>+      <item> NAMES_PER_DIR </item>
>       <item> NEW </item>
>       <item> NEWLINE_CONSUME </item>
>+      <item> NEWLINE_STYLE </item>
>       <item> NOT </item>
>       <item> NOTEQUAL </item>
>       <item> NO_CMAKE_BUILDS_PATH </item>
>@@ -260,6 +280,7 @@
>       <item> NO_CMAKE_FIND_ROOT_PATH </item>
>       <item> NO_CMAKE_PACKAGE_REGISTRY </item>
>       <item> NO_CMAKE_PATH </item>
>+      <item> NO_CMAKE_SYSTEM_PACKAGE_REGISTRY </item>
>       <item> NO_CMAKE_SYSTEM_PATH </item>
>       <item> NO_DEFAULT_PATH </item>
>       <item> NO_HEX_CONVERSION </item>
>@@ -267,10 +288,12 @@
>       <item> NO_POLICY_SCOPE </item>
>       <item> NO_SOURCE_PERMISSIONS </item>
>       <item> NO_SYSTEM_ENVIRONMENT_PATH </item>
>+      <item> OBJECT </item>
>       <item> OFFSET </item>
>       <item> OLD </item>
>       <item> ONLY_CMAKE_FIND_ROOT_PATH </item>
>       <item> OPTIONAL </item>
>+      <item> OPTIONAL_COMPONENTS </item>
>       <item> OR </item>
>       <item> OUTPUT </item>
>       <item> OUTPUT_DIRECTORY </item>
>@@ -283,18 +306,19 @@
>       <item> OWNER_WRITE </item>
>       <item> PACKAGE </item>
>       <item> PARENT_SCOPE </item>
>-      <item> PATH </item>
>       <item> PATHS </item>
>       <item> PATH_SUFFIXES </item>
>       <item> PATH_TO_MESA </item>
>       <item> PATTERN </item>
>       <item> PERMISSIONS </item>
>+      <item> PLATFORM </item>
>       <item> POLICY </item>
>       <item> POP </item>
>       <item> POST_BUILD </item>
>       <item> PREORDER </item>
>       <item> PRE_BUILD </item>
>       <item> PRE_LINK </item>
>+      <item> PRIVATE </item>
>       <item> PRIVATE_HEADER </item>
>       <item> PROGRAM </item>
>       <item> PROGRAMS </item>
>@@ -302,6 +326,7 @@
>       <item> PROJECT_NAME </item>
>       <item> PROPERTIES </item>
>       <item> PROPERTY </item>
>+      <item> PUBLIC </item>
>       <item> PUBLIC_HEADER </item>
>       <item> PUSH </item>
>       <item> QUIET </item>
>@@ -310,7 +335,6 @@
>       <item> RANGE </item>
>       <item> READ </item>
>       <item> READ_WITH_PREFIX </item>
>-      <item> REALPATH </item>
>       <item> REGEX </item>
>       <item> REGULAR_EXPRESSION </item>
>       <item> RELATIVE </item>
>@@ -337,7 +361,13 @@
>       <item> SCRIPT </item>
>       <item> SEND_ERROR </item>
>       <item> SET </item>
>+      <item> SHA1 </item>
>+      <item> SHA224 </item>
>+      <item> SHA256 </item>
>+      <item> SHA384 </item>
>+      <item> SHA512 </item>
>       <item> SHARED </item>
>+      <item> SHOW_PROGRESS </item>
>       <item> SORT </item>
>       <item> SOURCE </item>
>       <item> SOURCES </item>
>@@ -355,14 +385,21 @@
>       <item> TEST </item>
>       <item> TEST_VARIABLE </item>
>       <item> TIMEOUT </item>
>+      <item> TIMESTAMP </item>
>+      <item> TLS_CAINFO </item>
>+      <item> TLS_VERIFY </item>
>       <item> TOLOWER </item>
>       <item> TOUPPER </item>
>       <item> TO_CMAKE_PATH </item>
>       <item> TO_NATIVE_PATH </item>
>+      <item> TYPE </item>
>+      <item> UNIX </item>
>+      <item> UNIX_COMMAND </item>
>+      <item> UNKNOWN </item>
>+      <item> UPLOAD </item>
>       <item> USE_SOURCE_PERMISSIONS </item>
>+      <item> UTC </item>
>       <item> VALUE </item>
>-      <item> VAR </item>
>-      <item> VAR2 </item>
>       <item> VARIABLE </item>
>       <item> VERBATIM </item>
>       <item> VERSION </item>
>@@ -371,16 +408,29 @@
>       <item> VERSION_LESS </item>
>       <item> WARNING </item>
>       <item> WIN32 </item>
>+      <item> WINDOWS_COMMAND </item>
>       <item> WORKING_DIRECTORY </item>
>       <item> WRITE </item>
>     </list>
> 
>     
>     <list name="extra_special_args">
>-      <item> GLOBAL </item>
>+      
>+      <item> PATH </item>
>+      <item> NAME </item>
>+      <item> EXT </item>
>+      <item> NAME_WE </item>
>+      <item> ABSOLUTE </item>
>+      <item> REALPATH </item>
>+      
>+      <item> FILEPATH </item>
>+      
>+      <item> STRING </item>
>+      <item> BOOL </item>
>       <item> INTERNAL </item>
>     </list>
> 
>+    
>     <list name="properties">
>       
>       <item> ABSTRACT </item>
>@@ -391,9 +441,15 @@
>       <item> ARCHIVE_OUTPUT_NAME </item>
>       <item> ATTACHED_FILES </item>
>       <item> ATTACHED_FILES_ON_FAIL </item>
>+      <item> AUTOMOC </item>
>+      <item> AUTOMOC_MOC_OPTIONS </item>
>       <item> BUILD_WITH_INSTALL_RPATH </item>
>+      <item> BUNDLE </item>
>+      <item> BUNDLE_EXTENSION </item>
>       <item> CACHE_VARIABLES </item>
>       <item> CLEAN_NO_CUSTOM </item>
>+      <item> COMPATIBLE_INTERFACE_BOOL </item>
>+      <item> COMPATIBLE_INTERFACE_STRING </item>
>       <item> COMPILE_DEFINITIONS </item>
>       <item> COMPILE_FLAGS </item>
>       <item> COST </item>
>@@ -408,17 +464,21 @@
>       <item> ENABLE_EXPORTS </item>
>       <item> ENVIRONMENT </item>
>       <item> EXCLUDE_FROM_ALL </item>
>+      <item> EXCLUDE_FROM_DEFAULT_BUILD </item>
>       <item> EXTERNAL_OBJECT </item>
>       <item> EchoString </item>
>       <item> FAIL_REGULAR_EXPRESSION </item>
>       <item> FIND_LIBRARY_USE_LIB64_PATHS </item>
>       <item> FIND_LIBRARY_USE_OPENBSD_VERSIONING </item>
>+      <item> FOLDER </item>
>       <item> FRAMEWORK </item>
>+      <item> Fortran_FORMAT </item>
>       <item> Fortran_MODULE_DIRECTORY </item>
>       <item> GENERATED </item>
>       <item> GENERATOR_FILE_NAME </item>
>       <item> GLOBAL_DEPENDS_DEBUG_MODE </item>
>       <item> GLOBAL_DEPENDS_NO_CYCLES </item>
>+      <item> GNUtoMS </item>
>       <item> HAS_CXX </item>
>       <item> HEADER_FILE_ONLY </item>
>       <item> HELPSTRING </item>
>@@ -431,6 +491,7 @@
>       <item> IMPORTED_LINK_INTERFACE_LIBRARIES </item>
>       <item> IMPORTED_LINK_INTERFACE_MULTIPLICITY </item>
>       <item> IMPORTED_LOCATION </item>
>+      <item> IMPORTED_NO_SONAME </item>
>       <item> IMPORTED_SONAME </item>
>       <item> IMPORT_PREFIX </item>
>       <item> IMPORT_SUFFIX </item>
>@@ -439,6 +500,9 @@
>       <item> INSTALL_NAME_DIR </item>
>       <item> INSTALL_RPATH </item>
>       <item> INSTALL_RPATH_USE_LINK_PATH </item>
>+      <item> INTERFACE_COMPILE_DEFINITIONS </item>
>+      <item> INTERFACE_INCLUDE_DIRECTORIES </item>
>+      <item> INTERFACE_POSITION_INDEPENDENT_CODE </item>
>       <item> INTERPROCEDURAL_OPTIMIZATION </item>
>       <item> IN_TRY_COMPILE </item>
>       <item> KEEP_EXTENSION </item>
>@@ -447,11 +511,15 @@
>       <item> LIBRARY_OUTPUT_DIRECTORY </item>
>       <item> LIBRARY_OUTPUT_NAME </item>
>       <item> LINKER_LANGUAGE </item>
>+      <item> LINK_DEPENDS </item>
>+      <item> LINK_DEPENDS_NO_SHARED </item>
>       <item> LINK_DIRECTORIES </item>
>       <item> LINK_FLAGS </item>
>       <item> LINK_INTERFACE_LIBRARIES </item>
>       <item> LINK_INTERFACE_MULTIPLICITY </item>
>+      <item> LINK_LIBRARIES </item>
>       <item> LINK_SEARCH_END_STATIC </item>
>+      <item> LINK_SEARCH_START_STATIC </item>
>       <item> LISTFILE_STACK </item>
>       <item> LOCATION </item>
>       <item> MACOSX_BUNDLE </item>
>@@ -461,6 +529,7 @@
>       <item> MACROS </item>
>       <item> MEASUREMENT </item>
>       <item> MODIFIED </item>
>+      <item> NO_SONAME </item>
>       <item> OBJECT_DEPENDS </item>
>       <item> OBJECT_OUTPUTS </item>
>       <item> OSX_ARCHITECTURES </item>
>@@ -469,7 +538,11 @@
>       <item> PACKAGES_NOT_FOUND </item>
>       <item> PARENT_DIRECTORY </item>
>       <item> PASS_REGULAR_EXPRESSION </item>
>+      <item> PDB_NAME </item>
>+      <item> PDB_OUTPUT_DIRECTORY </item>
>+      <item> POSITION_INDEPENDENT_CODE </item>
>       <item> POST_INSTALL_SCRIPT </item>
>+      <item> PREDEFINED_TARGETS_FOLDER </item>
>       <item> PREFIX </item>
>       <item> PRE_INSTALL_SCRIPT </item>
>       <item> PRIVATE_HEADER </item>
>@@ -479,6 +552,7 @@
>       <item> REPORT_UNDEFINED_PROPERTIES </item>
>       <item> REQUIRED_FILES </item>
>       <item> RESOURCE </item>
>+      <item> RESOURCE_LOCK </item>
>       <item> RULE_LAUNCH_COMPILE </item>
>       <item> RULE_LAUNCH_CUSTOM </item>
>       <item> RULE_LAUNCH_LINK </item>
>@@ -498,15 +572,23 @@
>       <item> TEST_INCLUDE_FILE </item>
>       <item> TIMEOUT </item>
>       <item> TYPE </item>
>+      <item> USE_FOLDERS </item>
>       <item> VALUE </item>
>       <item> VARIABLES </item>
>       <item> VERSION </item>
>+      <item> VS_DOTNET_REFERENCES </item>
>+      <item> VS_GLOBAL_KEYWORD </item>
>+      <item> VS_GLOBAL_PROJECT_TYPES </item>
>       <item> VS_KEYWORD </item>
>+      <item> VS_SCC_AUXPATH </item>
>       <item> VS_SCC_LOCALPATH </item>
>       <item> VS_SCC_PROJECTNAME </item>
>       <item> VS_SCC_PROVIDER </item>
>+      <item> VS_WINRT_EXTENSIONS </item>
>+      <item> VS_WINRT_REFERENCES </item>
>       <item> WILL_FAIL </item>
>       <item> WIN32_EXECUTABLE </item>
>+      <item> WORKING_DIRECTORY </item>
>       <item> WRAP_EXCLUDE </item>
>       <item> __CMAKE_DELETE_CACHE_CHANGE_VARS_ </item>
>     </list>
>@@ -517,9 +599,218 @@
>       <item> DEFINITION </item>
>     </list>
> 
>+    
>+    <list name="cmake_vars">
>+      
>+      <item> APPLE </item>
>+      <item> BORLAND </item>
>+      <item> BUILD_SHARED_LIBS </item>
>+      <item> CMAKE_ABSOLUTE_DESTINATION_FILES </item>
>+      <item> CMAKE_AR </item>
>+      <item> CMAKE_ARCHIVE_OUTPUT_DIRECTORY </item>
>+      <item> CMAKE_ARGC </item>
>+      <item> CMAKE_ARGV0 </item>
>+      <item> CMAKE_AUTOMOC </item>
>+      <item> CMAKE_AUTOMOC_MOC_OPTIONS </item>
>+      <item> CMAKE_AUTOMOC_RELAXED_MODE </item>
>+      <item> CMAKE_BACKWARDS_COMPATIBILITY </item>
>+      <item> CMAKE_BINARY_DIR </item>
>+      <item> CMAKE_BUILD_TOOL </item>
>+      <item> CMAKE_BUILD_TYPE </item>
>+      <item> CMAKE_BUILD_WITH_INSTALL_RPATH </item>
>+      <item> CMAKE_CACHEFILE_DIR </item>
>+      <item> CMAKE_CACHE_MAJOR_VERSION </item>
>+      <item> CMAKE_CACHE_MINOR_VERSION </item>
>+      <item> CMAKE_CACHE_PATCH_VERSION </item>
>+      <item> CMAKE_CFG_INTDIR </item>
>+      <item> CMAKE_CL_64 </item>
>+      <item> CMAKE_COLOR_MAKEFILE </item>
>+      <item> CMAKE_COMMAND </item>
>+      <item> CMAKE_COMPILER_2005 </item>
>+      <item> CMAKE_CONFIGURATION_TYPES </item>
>+      <item> CMAKE_CROSSCOMPILING </item>
>+      <item> CMAKE_CTEST_COMMAND </item>
>+      <item> CMAKE_CURRENT_BINARY_DIR </item>
>+      <item> CMAKE_CURRENT_LIST_DIR </item>
>+      <item> CMAKE_CURRENT_LIST_FILE </item>
>+      <item> CMAKE_CURRENT_LIST_LINE </item>
>+      <item> CMAKE_CURRENT_SOURCE_DIR </item>
>+      <item> CMAKE_DEBUG_POSTFIX </item>
>+      <item> CMAKE_DEBUG_TARGET_PROPERTIES </item>
>+      <item> CMAKE_DL_LIBS </item>
>+      <item> CMAKE_EDIT_COMMAND </item>
>+      <item> CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION </item>
>+      <item> CMAKE_EXECUTABLE_SUFFIX </item>
>+      <item> CMAKE_EXE_LINKER_FLAGS </item>
>+      <item> CMAKE_EXTRA_GENERATOR </item>
>+      <item> CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES </item>
>+      <item> CMAKE_FIND_LIBRARY_PREFIXES </item>
>+      <item> CMAKE_FIND_LIBRARY_SUFFIXES </item>
>+      <item> CMAKE_FIND_PACKAGE_WARN_NO_MODULE </item>
>+      <item> CMAKE_Fortran_FORMAT </item>
>+      <item> CMAKE_Fortran_MODDIR_DEFAULT </item>
>+      <item> CMAKE_Fortran_MODDIR_FLAG </item>
>+      <item> CMAKE_Fortran_MODOUT_FLAG </item>
>+      <item> CMAKE_Fortran_MODULE_DIRECTORY </item>
>+      <item> CMAKE_GENERATOR </item>
>+      <item> CMAKE_GENERATOR_TOOLSET </item>
>+      <item> CMAKE_GNUtoMS </item>
>+      <item> CMAKE_HOME_DIRECTORY </item>
>+      <item> CMAKE_HOST_APPLE </item>
>+      <item> CMAKE_HOST_SYSTEM </item>
>+      <item> CMAKE_HOST_SYSTEM_NAME </item>
>+      <item> CMAKE_HOST_SYSTEM_PROCESSOR </item>
>+      <item> CMAKE_HOST_SYSTEM_VERSION </item>
>+      <item> CMAKE_HOST_UNIX </item>
>+      <item> CMAKE_HOST_WIN32 </item>
>+      <item> CMAKE_IGNORE_PATH </item>
>+      <item> CMAKE_IMPORT_LIBRARY_PREFIX </item>
>+      <item> CMAKE_IMPORT_LIBRARY_SUFFIX </item>
>+      <item> CMAKE_INCLUDE_CURRENT_DIR </item>
>+      <item> CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE </item>
>+      <item> CMAKE_INCLUDE_PATH </item>
>+      <item> CMAKE_INSTALL_DEFAULT_COMPONENT_NAME </item>
>+      <item> CMAKE_INSTALL_NAME_DIR </item>
>+      <item> CMAKE_INSTALL_PREFIX </item>
>+      <item> CMAKE_INSTALL_RPATH </item>
>+      <item> CMAKE_INSTALL_RPATH_USE_LINK_PATH </item>
>+      <item> CMAKE_INTERNAL_PLATFORM_ABI </item>
>+      <item> CMAKE_LIBRARY_ARCHITECTURE </item>
>+      <item> CMAKE_LIBRARY_ARCHITECTURE_REGEX </item>
>+      <item> CMAKE_LIBRARY_OUTPUT_DIRECTORY </item>
>+      <item> CMAKE_LIBRARY_PATH </item>
>+      <item> CMAKE_LIBRARY_PATH_FLAG </item>
>+      <item> CMAKE_LINK_DEF_FILE_FLAG   </item>
>+      <item> CMAKE_LINK_DEPENDS_NO_SHARED </item>
>+      <item> CMAKE_LINK_INTERFACE_LIBRARIES </item>
>+      <item> CMAKE_LINK_LIBRARY_FILE_FLAG </item>
>+      <item> CMAKE_LINK_LIBRARY_FLAG </item>
>+      <item> CMAKE_LINK_LIBRARY_SUFFIX </item>
>+      <item> CMAKE_MACOSX_BUNDLE </item>
>+      <item> CMAKE_MAJOR_VERSION </item>
>+      <item> CMAKE_MAKE_PROGRAM </item>
>+      <item> CMAKE_MFC_FLAG </item>
>+      <item> CMAKE_MINOR_VERSION </item>
>+      <item> CMAKE_MODULE_PATH </item>
>+      <item> CMAKE_NOT_USING_CONFIG_FLAGS </item>
>+      <item> CMAKE_NO_BUILTIN_CHRPATH </item>
>+      <item> CMAKE_OBJECT_PATH_MAX </item>
>+      <item> CMAKE_PARENT_LIST_FILE </item>
>+      <item> CMAKE_PATCH_VERSION </item>
>+      <item> CMAKE_PDB_OUTPUT_DIRECTORY </item>
>+      <item> CMAKE_POSITION_INDEPENDENT_CODE </item>
>+      <item> CMAKE_PREFIX_PATH </item>
>+      <item> CMAKE_PROGRAM_PATH </item>
>+      <item> CMAKE_PROJECT_NAME </item>
>+      <item> CMAKE_RANLIB </item>
>+      <item> CMAKE_ROOT </item>
>+      <item> CMAKE_RUNTIME_OUTPUT_DIRECTORY </item>
>+      <item> CMAKE_SCRIPT_MODE_FILE </item>
>+      <item> CMAKE_SHARED_LIBRARY_PREFIX </item>
>+      <item> CMAKE_SHARED_LIBRARY_SUFFIX </item>
>+      <item> CMAKE_SHARED_MODULE_PREFIX </item>
>+      <item> CMAKE_SHARED_MODULE_SUFFIX </item>
>+      <item> CMAKE_SIZEOF_VOID_P </item>
>+      <item> CMAKE_SKIP_BUILD_RPATH </item>
>+      <item> CMAKE_SKIP_INSTALL_ALL_DEPENDENCY </item>
>+      <item> CMAKE_SKIP_INSTALL_RPATH </item>
>+      <item> CMAKE_SKIP_RPATH </item>
>+      <item> CMAKE_SOURCE_DIR </item>
>+      <item> CMAKE_STANDARD_LIBRARIES </item>
>+      <item> CMAKE_STATIC_LIBRARY_PREFIX </item>
>+      <item> CMAKE_STATIC_LIBRARY_SUFFIX </item>
>+      <item> CMAKE_SYSTEM </item>
>+      <item> CMAKE_SYSTEM_IGNORE_PATH </item>
>+      <item> CMAKE_SYSTEM_INCLUDE_PATH </item>
>+      <item> CMAKE_SYSTEM_LIBRARY_PATH </item>
>+      <item> CMAKE_SYSTEM_NAME </item>
>+      <item> CMAKE_SYSTEM_PREFIX_PATH </item>
>+      <item> CMAKE_SYSTEM_PROCESSOR </item>
>+      <item> CMAKE_SYSTEM_PROGRAM_PATH </item>
>+      <item> CMAKE_SYSTEM_VERSION </item>
>+      <item> CMAKE_TRY_COMPILE_CONFIGURATION </item>
>+      <item> CMAKE_TWEAK_VERSION </item>
>+      <item> CMAKE_USER_MAKE_RULES_OVERRIDE </item>
>+      <item> CMAKE_USE_RELATIVE_PATHS </item>
>+      <item> CMAKE_VERBOSE_MAKEFILE </item>
>+      <item> CMAKE_VERSION </item>
>+      <item> CMAKE_VS_PLATFORM_TOOLSET </item>
>+      <item> CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION </item>
>+      <item> CMAKE_WIN32_EXECUTABLE </item>
>+      <item> CMAKE_XCODE_PLATFORM_TOOLSET </item>
>+      <item> CYGWIN </item>
>+      <item> EXECUTABLE_OUTPUT_PATH </item>
>+      <item> LIBRARY_OUTPUT_PATH </item>
>+      <item> MSVC </item>
>+      <item> MSVC10 </item>
>+      <item> MSVC11 </item>
>+      <item> MSVC60 </item>
>+      <item> MSVC70 </item>
>+      <item> MSVC71 </item>
>+      <item> MSVC80 </item>
>+      <item> MSVC90 </item>
>+      <item> MSVC_IDE </item>
>+      <item> MSVC_VERSION </item>
>+      <item> PROJECT_BINARY_DIR </item>
>+      <item> PROJECT_NAME </item>
>+      <item> PROJECT_SOURCE_DIR </item>
>+      <item> UNIX </item>
>+      <item> WIN32 </item>
>+      <item> XCODE_VERSION </item>
>+    </list>
>+
>+    <list name="simple_generator_expr">
>+      <item> CONFIGURATION </item>
>+      <item> ANGLE-R </item>
>+      <item> COMMA </item>
>+      <item> SEMICOLON </item>
>+      <item> INSTALL_PREFIX </item>
>+    </list>
>+
>+    <list name="generator_expr">
>+      <item> 0 </item>
>+      <item> 1 </item>
>+      <item> CONFIG </item>
>+      <item> BOOL </item>
>+      <item> STREQUAL </item>
>+      <item> TARGET_NAME </item>
>+      <item> INSTALL_INTERFACE </item>
>+      <item> BUILD_INTERFACE </item>
>+      <item> TARGET_FILE </item>
>+      <item> TARGET_LINKER_FILE </item>
>+      <item> TARGET_SONAME_FILE </item>
>+      <item> TARGET_DIR </item>
>+      <item> TARGET_LINKER_DIR </item>
>+      <item> TARGET_SONAME_DIR </item>
>+      <item> TARGET_PROPERTY </item>
>+      <item> TARGET_POLICY </item>
>+      <item> AND </item>
>+      <item> OR </item>
>+      <item> NOT </item>
>+    </list>
>+
>     <contexts>
>       <context attribute="Normal Text" lineEndContext="#stay" name="Normal Text">
>         <DetectSpaces/>
>+
>+        
>+        <RegExpr String="\bif\b" attribute="Commands" context="Command Args" beginRegion="ifthenelse" insensitive="true" />
>+        <RegExpr String="\belse\b" attribute="Commands" context="Command Args" endRegion="ifthenelse" beginRegion="ifthenelse" insensitive="true" />
>+        <RegExpr String="\belseif\b" attribute="Commands" context="Command Args" endRegion="ifthenelse" beginRegion="ifthenelse" insensitive="true" />
>+        <RegExpr String="\bendif\b" attribute="Commands" context="Command Args" endRegion="ifthenelse" insensitive="true" />
>+
>+        
>+        <RegExpr String="\bmacro\b" attribute="Commands" context="Command Args" beginRegion="macro" insensitive="true" />
>+        <RegExpr String="\bendmacro\b" attribute="Commands" context="Command Args" endRegion="macro" insensitive="true" />
>+
>+        
>+        <RegExpr String="\bforeach\b" attribute="Commands" context="Command Args" beginRegion="foreach" insensitive="true" />
>+        <RegExpr String="\bendforeach\b" attribute="Commands" context="Command Args" endRegion="foreach" insensitive="true" />
>+
>+        
>+        <RegExpr String="\bwhile\b" attribute="Commands" context="Command Args" beginRegion="while" insensitive="true" />
>+        <RegExpr String="\bendwhile\b" attribute="Commands" context="Command Args" endRegion="while" insensitive="true" />
>+
>         <keyword attribute="Commands" context="Command Args" String="commands" insensitive="true"/>
>         <keyword attribute="Third-Party Commands" context="#stay" String="itkvtk_commands" insensitive="true"/>
>         <RegExpr attribute="Region Marker" context="#stay" String="#\s*BEGIN.*$" beginRegion="block" firstNonSpace="true"/>
>@@ -528,47 +819,122 @@
>         <IncludeRules context="Detect Variables"/>
>         <RegExpr attribute="Macros" context="Macro Args" String="\w+\s*(?=\()"/>
>       </context>
>+      
>+      <context attribute="Normal Text" lineEndContext="#stay" name="Detect More Builtin Variables">
>+        
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_COMPILER_IS_GNU[A-Za-z_][A-Za-z_0-9]*\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_DISABLE_FIND_PACKAGE_[A-Za-z_][A-Za-z_0-9]*\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_EXE_LINKER_FLAGS_[A-Za-z_][A-Za-z_0-9]*\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_POLICY_DEFAULT_CMP[0-9]+\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_USER_MAKE_RULES_OVERRIDE_[A-Za-z_][A-Za-z_0-9]*\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_ARCHIVE_APPEND\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_ARCHIVE_CREATE\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_ARCHIVE_FINISH\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_COMPILER\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_COMPILER_ABI\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_COMPILER_ID\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_COMPILER_LOADED\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_COMPILER_VERSION\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_COMPILE_OBJECT\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_CREATE_SHARED_LIBRARY\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_CREATE_SHARED_MODULE\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_CREATE_STATIC_LIBRARY\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_FLAGS_DEBUG\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_FLAGS_MINSIZEREL\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_FLAGS_RELEASE\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_FLAGS_RELWITHDEBINFO\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_IGNORE_EXTENSIONS\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_IMPLICIT_INCLUDE_DIRECTORIES\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_IMPLICIT_LINK_DIRECTORIES\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_IMPLICIT_LINK_LIBRARIES\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_LIBRARY_ARCHITECTURE\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_LINKER_PREFERENCE\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_LINKER_PREFERENCE_PROPAGATES\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_LINK_EXECUTABLE \b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_OUTPUT_EXTENSION\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_PLATFORM_ID\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_POSTFIX\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_SIZEOF_DATA_PTR\b" />
>+        <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_SOURCE_FILE_EXTENSIONS\b" />
>+      </context>
>+      <context attribute="Normal Text" lineEndContext="#stay" name="Detect Builtin Variables">
>+        <keyword attribute="Builtin CMake Variable" context="#stay" String="cmake_vars" insensitive="false"/>
>+        <IncludeRules context="Detect More Builtin Variables" />
>+      </context>
>+      <context attribute="CMake Variable" lineEndContext="#pop" name="VarSubst">
>+        <IncludeRules context="Detect Builtin Variables"/>
>+        <DetectIdentifier />
>+        <DetectChar attribute="CMake Variable" context="#pop" char="}"/>
>+        <IncludeRules context="Detect Variables"/>
>+      </context>
>       <context attribute="Normal Text" lineEndContext="#stay" name="Detect Variables">
>-        <RegExpr attribute="Environment Variable" context="#stay" String="\$ENV\{\s*\w+\s*\}"/>
>-        <RegExpr attribute="CMake Variable" context="#stay" String="\$\{\s*\w+\s*\}"/>
>+        <RegExpr attribute="Environment Variable" context="#stay" String="\$ENV\{\s*[\w-]+\s*\}"/>
>+        <Detect2Chars attribute="CMake Variable" context="VarSubst" char="$" char1="{" />
>+      </context>
>+      <context attribute="Generator Expression" lineEndContext="#pop#pop" name="DetectSimpleGEEnd">
>+        <DetectChar attribute="Generator Expression" context="#pop#pop" char="&gt;"/>
>+      </context>
>+      <context attribute="Generator Expression" lineEndContext="#pop" name="Generator Expression">
>+        <IncludeRules context="Detect Generator Expressions"/>
>+        <DetectChar attribute="Generator Expression" context="#pop" char="&gt;"/>
>+        <keyword attribute="Generator Expression Keyword" context="DetectSimpleGEEnd" String="simple_generator_expr" insensitive="false"/>
>+        <keyword attribute="Generator Expression Keyword" context="#stay" String="generator_expr" insensitive="false"/>
>+        <IncludeRules context="Detect Variables"/>
>+      </context>
>+      <context attribute="Normal Text" lineEndContext="#stay" name="Detect Generator Expressions">
>+        <Detect2Chars attribute="Generator Expression" context="Generator Expression" char="$" char1="&lt;" />
>       </context>
>       <context attribute="Normal Text" lineEndContext="#stay" name="Command Args">
>         <keyword attribute="Special Args" context="#stay" String="special_args"/>
>         <keyword attribute="Special Args" context="#stay" String="extra_special_args"/>
>+        
>+        <RegExpr attribute="Special Args" context="#stay" String="\bCMP[0-9]+\b" />
>         <keyword attribute="Properties" context="#stay" String="properties"/>
>         <keyword attribute="Properties" context="#stay" String="extra_properties"/>
>+        <IncludeRules context="Detect Builtin Variables"/>
>         <IncludeRules context="Macro Args"/>
>       </context>
>       <context attribute="Normal Text" lineEndContext="#stay" name="Macro Args">
>         <DetectChar attribute="Normal Text" context="#pop" char=")"/>
>+        
>         <StringDetect attribute="Escapes" context="#stay" String="\&quot;"/>
>         <DetectChar attribute="Strings" context="String" char="&quot;"/>
>-        <RegExpr attribute="Comment" context="#stay" String="#.*$"/>
>+        <DetectChar attribute="Comment" context="Comment" char="#"/>
>+        <IncludeRules context="Detect Builtin Variables"/>
>         <IncludeRules context="Detect Variables"/>
>+        <IncludeRules context="Detect Generator Expressions"/>
>       </context>
>       <context attribute="Comment" lineEndContext="#pop" name="Comment">
>         <IncludeRules context="##Alerts" />
>+        <IncludeRules context="##Modelines" />
>       </context>
>       <context attribute="Strings" lineEndContext="#stay" name="String">
>         <RegExpr attribute="Strings" context="#pop" String="&quot;(?=[ );]|$)" />
>         <RegExpr attribute="Escapes" context="#stay" String="\\[&quot;$n\\]" />
>         <IncludeRules context="Detect Variables"/>
>+        <IncludeRules context="Detect Generator Expressions"/>
>       </context>
> 
>     </contexts>
>     <itemDatas>
>-      <itemData name="Normal Text" defStyleNum="dsNormal"/>
>-      <itemData name="Special Args" defStyleNum="dsOthers"/>
>-      <itemData name="Properties" defStyleNum="dsOthers"/>
>-      <itemData name="Commands" defStyleNum="dsKeyword"/>
>-      <itemData name="Third-Party Commands" defStyleNum="dsFunction"/>
>-      <itemData name="Macros"  defStyleNum="dsFunction"/>
>-      <itemData name="Strings" defStyleNum="dsString"/>
>-      <itemData name="Escapes" defStyleNum="dsChar"/>
>-      <itemData name="CMake Variable" defStyleNum="dsDecVal"/>
>-      <itemData name="Environment Variable" defStyleNum="dsFloat"/>
>-      <itemData name="Comment" defStyleNum="dsComment"/>
>-      <itemData name="Region Marker" defStyleNum="dsRegionMarker"/>
>+      <itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false" />
>+      <itemData name="Special Args" defStyleNum="dsOthers" spellChecking="false" />
>+      <itemData name="Properties" defStyleNum="dsOthers" spellChecking="false" />
>+      <itemData name="Commands" defStyleNum="dsKeyword" spellChecking="false" />
>+      <itemData name="Third-Party Commands" defStyleNum="dsFunction" spellChecking="false" />
>+      <itemData name="Macros"  defStyleNum="dsFunction" spellChecking="false" />
>+      <itemData name="Strings" defStyleNum="dsString" spellChecking="true" />
>+      <itemData name="Escapes" defStyleNum="dsChar" spellChecking="false" />
>+      <itemData name="Builtin CMake Variable" defStyleNum="dsDecVal" color="#c09050" selColor="#c09050" spellChecking="false" />
>+      
>+      <itemData name="CMake Variable" defStyleNum="dsDecVal" spellChecking="false" />
>+      
>+      <itemData name="Environment Variable" defStyleNum="dsFloat" spellChecking="false" />
>+      <itemData name="Generator Expression Keyword" defStyleNum="dsKeyword" color="#b84040" selColor="#b84040" spellChecking="false" />
>+      <itemData name="Generator Expression" defStyleNum="dsOthers" color="#b86050" selColor="#b86050" spellChecking="false" />
>+      <itemData name="Comment" defStyleNum="dsComment" spellChecking="true" />
>+      <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false" />
>     </itemDatas>
>   </highlighting>
> 
>diff -urN tdelibs/kate/data/coffee.xml tdelibs.new/kate/data/coffee.xml
>--- tdelibs/kate/data/coffee.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/coffee.xml	2013-12-26 13:26:41.844323628 -0600
>@@ -2,8 +2,8 @@
> <!DOCTYPE language SYSTEM "language.dtd">
> 
> <language name="CoffeeScript"
>-          version="1.3"
>-          kateversion="2.4"
>+          version="1.4"
>+          kateversion="2.5"
>           section="Scripts"
>           extensions="Cakefile;*.coffee;*.coco"
>           mimetype="text/x-coffeescript;application/x-coffeescript"
>@@ -44,6 +44,7 @@
>       <item>and</item>
>       <item>or</item>
>       <item>in</item>
>+      <item>do</item>
>       <item>of</item>
>       <item>by</item>
>       <item>is</item>
>diff -urN tdelibs/kate/data/coldfusion.xml tdelibs.new/kate/data/coldfusion.xml
>--- tdelibs/kate/data/coldfusion.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/coldfusion.xml	2013-12-26 13:26:40.594328962 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="ColdFusion" version="1.04" kateversion="2.3" section="Markup" extensions="*.cfm;*.cfc;*.cfml;*.dbm" mimetype="text/x-coldfusion">
>+<language name="ColdFusion" version="1.04" kateversion="2.5" section="Markup" extensions="*.cfm;*.cfc;*.cfml;*.dbm" mimetype="text/x-coldfusion">
> 
> 	<highlighting>
> 
>diff -urN tdelibs/kate/data/commonlisp.xml tdelibs.new/kate/data/commonlisp.xml
>--- tdelibs/kate/data/commonlisp.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/commonlisp.xml	2013-12-26 13:26:40.816328014 -0600
>@@ -23,7 +23,7 @@
>  * Boston, MA  02110-1301, USA.                                       *
>  **********************************************************************
>  -->
>-<language version="1.05" kateversion="2.3" name="Common Lisp" section="Sources" extensions="*.lisp;*.cl;*.lsp" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL">
>+<language version="1.05" kateversion="2.5" name="Common Lisp" section="Sources" extensions="*.lisp;*.cl;*.lsp" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL">
>   <highlighting>
>     <list name="symbols">
>       <item> &lt; </item>
>diff -urN tdelibs/kate/data/component-pascal.xml tdelibs.new/kate/data/component-pascal.xml
>--- tdelibs/kate/data/component-pascal.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/component-pascal.xml	2013-12-26 13:26:40.633328795 -0600
>@@ -10,7 +10,7 @@
> 
> 
> 
>-<language name="Component-Pascal" version="1.05" kateversion="2.1" section="Sources" extensions="*.cp;*.bro" mimetype="text/x-component-pascal" author="Werner Braun (wb@o3-software.de)" license="">
>+<language name="Component-Pascal" version="1.05" kateversion="2.5" section="Sources" extensions="*.cp;*.bro" mimetype="text/x-component-pascal" author="Werner Braun (wb@o3-software.de)" license="">
> 	<highlighting>
> 		<list name="keywords">
> 			<item> BEGIN </item>
>diff -urN tdelibs/kate/data/context.xml tdelibs.new/kate/data/context.xml
>--- tdelibs/kate/data/context.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/context.xml	2013-12-26 13:26:40.797328095 -0600
>@@ -0,0 +1,132 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd">
>+<language name="ConTeXt" version="1.1" section="Markup" kateversion="2.5" priority="8" extensions="*.ctx" mimetype="text/x-tex" casesensitive="1" author="Philipp A. (flying-sheep@web.de)" license="GPL" >
>+	<highlighting>
>+		<list name="titles">
>+			<item>\part</item>
>+			<item>\chapter</item>
>+			<item>\section</item>
>+			<item>\subsection</item>
>+			<item>\subsubsection</item>
>+			<item>\title</item>
>+			<item>\subject</item>
>+			<item>\subsubject</item>
>+			<item>\subsubsubject</item>
>+		</list>
>+		<contexts>
>+			
>+			<context name="Normal Text" attribute="Normal Text" lineEndContext="#stay">
>+				<DetectChar   char="$"               attribute="Block" context="MathMode"/>
>+				<Detect2Chars char="$" char1="$"     attribute="Block" context="MathModeDisplay"/>
>+				<RegExpr String="\\math(ematics)?"   attribute="Block" context="MathModeMacroFind"/>
>+				<StringDetect String="\startformula" attribute="Block" context="MathModeFormula"/>
>+				<StringDetect String="\starttyping"  attribute="Block" context="Verbatim"/>
>+				<keyword String="titles"             attribute="Section" context="#stay"/>
>+				<IncludeRules context="Common"/>
>+			</context>
>+
>+			
>+			<context name="Macro" attribute="Macro" lineEndContext="#stay">
>+				<RegExpr String="[a-zA-Z_]+[a-zA-Z@_]*" attribute="Macro" context="#pop"/>
>+				<RegExpr String="[^a-zA-Z_]"            attribute="Macro" context="#pop"/>
>+			</context>
>+
>+			
>+			<context name="Comment" attribute="Comment" lineEndContext="#pop">
>+				<RegExpr String="(FIXME|TODO):?" attribute="Alert" context="#stay"/>
>+			</context>
>+
>+			
>+			<context name="MathMode" attribute="Math" lineEndContext="#pop">
>+				<DetectChar   char="$"               attribute="Block" context="#pop"/>
>+				<Detect2Chars char="$" char1="$"     attribute="Error" context="#stay"/>
>+				<StringDetect String="\stopformula"  attribute="Error" context="#stay"/>
>+				<IncludeRules context="MathModeCommon"/>
>+			</context>
>+			<context name="MathModeMacroFind" attribute="Math" lineEndContext="#stay">
>+				<DetectChar   char="{"               attribute="Brace" context="#popMathModeMacro"/>
>+			</context>
>+			<context name="MathModeMacro" attribute="Math" lineEndContext="#stay">
>+				<DetectChar   char="{"               attribute="Brace" context="MathModeMacro"/>
>+				<DetectChar   char="}"               attribute="Brace" context="#pop"/>
>+				<DetectChar   char="$"               attribute="Error" context="#stay"/>
>+				<Detect2Chars char="$" char1="$"     attribute="Error" context="#stay"/>
>+				<StringDetect String="\stopformula"  attribute="Error" context="#stay"/>
>+				<IncludeRules context="MathModeCommon"/>
>+			</context>
>+			<context name="MathModeDisplay" attribute="Math" lineEndContext="#stay">
>+				<DetectChar   char="$"               attribute="Error" context="#stay"/>
>+				<Detect2Chars char="$" char1="$"     attribute="Block" context="#pop"/>
>+				<StringDetect String="\stopformula"  attribute="Error" context="#stay"/>
>+				<IncludeRules context="MathModeCommon"/>
>+			</context>
>+			<context name="MathModeFormula" attribute="Math" lineEndContext="#stay">
>+				<DetectChar   char="$"               attribute="Error" context="#stay"/>
>+				<Detect2Chars char="$" char1="$"     attribute="Error" context="#stay"/>
>+				<StringDetect String="\stopformula"  attribute="Block" context="#pop"/>
>+				<IncludeRules context="MathModeCommon"/>
>+			</context>
>+			<context name="MathModeCommon" attribute="Error" lineEndContext="#stay">
>+				<DetectChar   char="^"               attribute="Brace" context="#stay"/>
>+				<DetectChar   char="_"               attribute="Brace" context="#stay"/>
>+				<StringDetect String="\startformula" attribute="Error" context="#stay"/>
>+				<StringDetect String="\text"         attribute="Block" context="MathModeTextFind"/>
>+				<IncludeRules context="Common"/>
>+			</context>
>+			
>+			<context name="MathModeTextFind" attribute="Normal Text" lineEndContext="#stay" >
>+				<DetectChar char="{" attribute="Brace" context="#popMathModeText"/>
>+			</context>
>+			<context name="MathModeText" attribute="Normal Text" lineEndContext="#stay" >
>+				<DetectChar char="{" attribute="Brace" context="MathModeText"/>
>+				<DetectChar char="}" attribute="Brace" context="#pop"/>
>+				<IncludeRules context="Normal Text"/>
>+			</context>
>+
>+			
>+			<context name="Verbatim" attribute="Verbatim" lineEndContext="#stay">
>+				<StringDetect String="\stoptyping"  attribute="Block" context="#pop"/>
>+			</context>
>+
>+			
>+			<context name="Common" attribute="Error" lineEndContext="#stay">
>+				<DetectChar char="%" attribute="Comment" context="Comment"/>
>+				<RegExpr String="\\start([a-zA-Z_]+)" attribute="Block" context="#stay" beginRegion="block"/>
>+				<RegExpr String="\\stop([a-zA-Z_]+)"  attribute="Block" context="#stay" endRegion="block"/>
>+				<DetectChar char="\" attribute="Macro"   context="Macro"/>
>+				<DetectChar char="{" attribute="Brace"   context="#stay" beginRegion="block"/>
>+				<DetectChar char="}" attribute="Brace"   context="#stay" endRegion="block"/>
>+			</context>
>+		</contexts>
>+
>+		<itemDatas>
>+			<itemData name="Normal Text" defStyleNum="dsNormal"                            />
>+			<itemData name="Comment"     defStyleNum="dsComment"                           />
>+			<itemData name="Section"     defStyleNum="dsKeyword"                           />
>+			<itemData name="Alert"       defStyleNum="dsAlert"        spellChecking="false"/>
>+			<itemData name="Brace"       defStyleNum="dsChar"         spellChecking="false"/>
>+			<itemData name="Math"        defStyleNum="dsOthers"       spellChecking="false"/>
>+			<itemData name="Macro"       defStyleNum="dsFunction"     spellChecking="false"/>
>+			<itemData name="Label Ref"   defStyleNum="dsRegionMarker" spellChecking="false"/>
>+			<itemData name="Block"       defStyleNum="dsRegionMarker" spellChecking="false"/>
>+			<itemData name="Error"       defStyleNum="dsError"        spellChecking="false"/>
>+			<itemData name="Verbatim"    defStyleNum="dsString"       spellChecking="false"/>
>+		</itemDatas>
>+	</highlighting>
>+
>+	<general>
>+		<keywords weakDeliminator="\" wordWrapDeliminator=",{}[]"/>
>+		<comments>
>+			<comment name="singleLine" start="%" />
>+		</comments>
>+	</general>
>+
>+	<spellchecking>
>+		<configuration encodingReplacementPolicy="EncodeWhenPresent"/>
>+		<encodings>
>+			<encoding string="''" ignored="true" />
>+		</encodings>
>+	</spellchecking>
>+</language>
>+
>+
>diff -urN tdelibs/kate/data/cpp.xml tdelibs.new/kate/data/cpp.xml
>--- tdelibs/kate/data/cpp.xml	2012-10-21 13:11:21.000000000 -0500
>+++ tdelibs.new/kate/data/cpp.xml	2013-12-26 13:26:40.543329180 -0600
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
> <language name="C++" section="Sources"
>-          version="1.55" kateversion="2.4"
>+          version="1.55" kateversion="2.5"
>           indenter="cstyle"
>           mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr"
>           extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc"
>@@ -91,7 +91,7 @@
>       <item> Q_ASSERT </item>
>       <item> Q_ASSERT_X </item>
>       <item> Q_CHECK_PTR </item>
>-      <item> TQ_CLASSINFO </item>
>+      <item> Q_CLASSINFO </item>
>       <item> Q_CLEANUP_RESOURCE </item>
>       <item> Q_D </item>
>       <item> Q_DECLARE_FLAGS </item>
>@@ -105,7 +105,7 @@
>       <item> Q_DECLARE_TYPEINFO </item>
>       <item> Q_DISABLE_COPY </item>
>       <item> Q_EMIT </item>
>-      <item> TQ_ENUMS </item>
>+      <item> Q_ENUMS </item>
>       <item> Q_EXPORT </item>
>       <item> Q_FLAGS </item>
>       <item> Q_FOREACH </item>
>@@ -118,13 +118,13 @@
>       <item> Q_INVOKABLE </item>
>       <item> Q_NOREPLY </item>
>       <item> Q_OBJECT </item>
>-      <item> TQ_OVERRIDE </item>
>+      <item> Q_OVERRIDE </item>
>       <item> Q_PRIVATE_SLOT </item>
>-      <item> TQ_PROPERTY </item>
>+      <item> Q_PROPERTY </item>
>       <item> Q_Q </item>
>       <item> Q_RETURN_ARG </item>
>       <item> Q_SCRIPTABLE </item>
>-      <item> TQ_SETS </item>
>+      <item> Q_SETS </item>
>       <item> Q_SIGNALS </item>
>       <item> Q_SLOTS </item>
>       <item> Q_UNUSED </item>
>@@ -132,6 +132,53 @@
>       <item> SLOT </item>
>       <item> TRUE </item>
>       <item> FALSE </item>
>+      <item> Q_ARG </item>
>+      <item> Q_ASSERT </item>
>+      <item> Q_ASSERT_X </item>
>+      <item> Q_CHECK_PTR </item>
>+      <item> Q_CLASSINFO </item>
>+      <item> Q_CLEANUP_RESOURCE </item>
>+      <item> Q_D </item>
>+      <item> Q_DECLARE_FLAGS </item>
>+      <item> Q_DECLARE_INTERFACE </item>
>+      <item> Q_DECLARE_METATYPE </item>
>+      <item> Q_DECLARE_OPERATORS_FOR_FLAGS </item>
>+      <item> Q_DECLARE_PRIVATE </item>
>+      <item> Q_DECLARE_PUBLIC </item>
>+      <item> Q_DECLARE_SHARED </item>
>+      <item> Q_DECLARE_TYPEINFO </item>
>+      <item> Q_DISABLE_COPY </item>
>+      <item> Q_EMIT </item>
>+      <item> Q_ENUMS </item>
>+      <item> Q_EXPORT </item>
>+      <item> Q_FLAGS </item>
>+      <item> Q_FOREACH </item>
>+      <item> Q_FOREVER </item>
>+      <item> Q_GADGET </item>
>+      <item> Q_GLOBAL_STATIC </item>
>+      <item> Q_GLOBAL_STATIC_WITH_ARGS </item>
>+      <item> Q_INIT_RESOURCE </item>
>+      <item> Q_INTERFACES </item>
>+      <item> Q_INVOKABLE </item>
>+      <item> Q_NOREPLY </item>
>+      <item> Q_OBJECT </item>
>+      <item> Q_OVERRIDE </item>
>+      <item> Q_PRIVATE_SLOT </item>
>+      <item> Q_PROPERTY </item>
>+      <item> Q_Q </item>
>+      <item> Q_RETURN_ARG </item>
>+      <item> Q_SCRIPTABLE </item>
>+      <item> Q_SETS </item>
>+      <item> Q_SIGNAL </item>
>+      <item> Q_SIGNALS </item>
>+      <item> Q_SLOT </item>
>+      <item> Q_SLOTS </item>
>+      <item> Q_UNUSED </item>
>+      <item> TQ_CLASSINFO </item>
>+      <item> TQ_ENUMS </item>
>+      <item> TQ_OVERRIDE </item>
>+      <item> TQ_PROPERTY </item>
>+      <item> TQ_SETS </item>
>       <item> TQ_ARG </item>
>       <item> TQ_ASSERT </item>
>       <item> TQ_ASSERT_X </item>
>diff -urN tdelibs/kate/data/cpp11.xml tdelibs.new/kate/data/cpp11.xml
>--- tdelibs/kate/data/cpp11.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/cpp11.xml	2013-12-26 13:26:41.825323707 -0600
>@@ -0,0 +1,489 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd"
>+[
>+    <!ENTITY space " ">
>+    <!ENTITY separators ",&#59;">
>+    <!ENTITY ns_punctuators "!&#37;&space;&amp;()+-/.*&lt;=&gt;?[]{|}~^&separators;">
>+    <!ENTITY punctuators ":&ns_punctuators;">
>+    
>+    <!ENTITY convspec "diouxXeEfFgGaAcsP&#37;">
>+]>
>+<language
>+    name="C++11"
>+    section="Sources"
>+    version="1.62"
>+    kateversion="2.5"
>+    indenter="cppstyle"
>+    mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr"
>+    extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc"
>+    author="Alex Turbov (i.zaufi@gmail.com)"
>+    license="LGPL"
>+    priority="7"
>+  >
>+  
>+  <highlighting>
>+    <list name="keywords">
>+      <item> alignof </item>
>+      <item> alignas </item>
>+      <item> asm </item>
>+      <item> auto </item>
>+      <item> break </item>
>+      <item> case </item>
>+      <item> catch </item>
>+      <item> class </item>
>+      <item> constexpr </item>
>+      <item> const_cast </item>
>+      <item> continue </item>
>+      <item> decltype </item>
>+      <item> default </item>
>+      <item> delete </item>
>+      <item> do </item>
>+      <item> dynamic_cast</item>
>+      <item> else </item>
>+      <item> enum </item>
>+      <item> explicit </item>
>+      <item> export </item> 
>+      <item> false </item>
>+      <item> final </item> 
>+      <item> friend </item>
>+      <item> for </item>
>+      <item> goto </item>
>+      <item> if </item>
>+      <item> inline </item>
>+      <item> namespace </item>
>+      <item> new </item>
>+      <item> noexcept </item>
>+      <item> nullptr </item>
>+      <item> operator </item>
>+      <item> override </item> 
>+      <item> private </item>
>+      <item> protected </item>
>+      <item> public </item>
>+      <item> reinterpret_cast </item>
>+      <item> return </item>
>+      <item> sizeof </item>
>+      <item> static_assert </item>
>+      <item> static_cast </item>
>+      <item> struct </item>
>+      <item> switch </item>
>+      <item> template </item>
>+      <item> this </item>
>+      <item> throw </item>
>+      <item> true </item>
>+      <item> try </item>
>+      <item> typedef </item>
>+      <item> typeid </item>
>+      <item> typename </item>
>+      <item> union </item>
>+      <item> using </item>
>+      <item> virtual </item>
>+      <item> while </item>
>+      
>+      <item> and </item>
>+      <item> and_eq </item>
>+      <item> bitand </item>
>+      <item> bitor </item>
>+      <item> compl </item>
>+      <item> not </item>
>+      <item> not_eq </item>
>+      <item> or </item>
>+      <item> or_eq </item>
>+      <item> xor </item>
>+      <item> xor_eq </item>
>+    </list>
>+    
>+    <list name="template">
>+      <item> template </item>
>+    </list>
>+
>+    
>+    <list name="attributes">
>+      <item> noreturn </item>
>+      <item> carries_dependency </item>
>+    </list>
>+
>+    <list name="types">
>+      <item> bool </item>
>+      <item> char </item>
>+      <item> char16_t </item>
>+      <item> char32_t </item>
>+      <item> double </item>
>+      <item> float </item>
>+      <item> int </item>
>+      <item> long </item>
>+      <item> short </item>
>+      <item> signed </item>
>+      <item> unsigned </item>
>+      <item> void </item>
>+      <item> int8_t </item>
>+      <item> int16_t </item>
>+      <item> int32_t </item>
>+      <item> int64_t </item>
>+      <item> uint8_t </item>
>+      <item> uint16_t </item>
>+      <item> uint32_t </item>
>+      <item> uint64_t </item>
>+      <item> wchar_t </item>
>+    </list>
>+    <list name="modifiers">
>+      <item> const </item>
>+      <item> extern </item>
>+      <item> mutable </item>
>+      <item> register </item>
>+      <item> static </item>
>+      <item> thread_local </item>
>+      <item> volatile </item>
>+    </list>
>+    <list name="StdMacros">
>+      <item> __FILE__ </item>
>+      <item> __LINE__ </item>
>+      <item> __DATE__ </item>
>+      <item> __TIME__ </item>
>+      <item> __STDC__ </item>
>+      <item> __STDC_VERSION__ </item>
>+      <item> __STDC_HOSTED__ </item>
>+      <item> __STDC_ISO_10646__ </item>
>+      <item> __STDC_MB_MIGHT_NEQ_WC__ </item>
>+      <item> __cplusplus </item>
>+      <item> __func__ </item>
>+    </list>
>+
>+    <contexts>
>+      <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectSpaces />
>+        <RegExpr attribute="Preprocessor" context="Outscoped" String="(#|%\:|\?\?=)\s*if\s+(0|false)\s*" beginRegion="PP" firstNonSpace="true" insensitive="false" />
>+        <RegExpr attribute="Preprocessor" context="Inscoped" String="(#|%\:|\?\?=)\s*if\s+(1|true)\s*" beginRegion="PP" firstNonSpace="true" insensitive="false" />
>+        <IncludeRules context="Main" />
>+      </context>
>+
>+      <context name="Main" attribute="Normal Text" lineEndContext="#stay">
>+        
>+        <DetectChar context="AfterHash" char="#" firstNonSpace="true" lookAhead="true" />
>+        <Detect2Chars context="AfterHash" char="%" char1=":" firstNonSpace="true" lookAhead="true" />
>+        <StringDetect context="AfterHash" String="??=" firstNonSpace="true" lookAhead="true" />
>+        <Detect2Chars attribute="Error" context="#stay" char="%" char1=":" />
>+        <StringDetect attribute="Error" String="??=" context="#stay" />
>+        
>+        <StringDetect attribute="Region Marker" context="Region Marker" String="//BEGIN" beginRegion="Region1" firstNonSpace="true" />
>+        <StringDetect attribute="Region Marker" context="Region Marker" String="//END" endRegion="Region1" firstNonSpace="true" />
>+        
>+        <RegExpr attribute="Normal Text" context="UDLOperator" String="operator\s*&quot;&quot; _[_0-9A-Za-z]*\b" lookAhead="true" />
>+        <RegExpr attribute="Error" context="#stay" String="operator\s*&quot;&quot; [_0-9A-Za-z]*\b" />
>+        
>+        <keyword attribute="Keyword" context="#stay" String="keywords" />
>+        
>+        <Detect2Chars attribute="Normal Text" context="Attribute" char="[" char1="[" />
>+        
>+        <IncludeRules context="DetectGccExtensions##GCCExtensions" />
>+        
>+        
>+        
>+        <RegExpr attribute="Hex" context="#stay" String="[\+\-]?0x[0-9A-Fa-f]+([Uu][Ll]{0,2}|[Ll]{0,2}[Uu]?|_[_0-9A-Za-z]*)?\b" />
>+        <RegExpr attribute="Float" context="#stay" String="[\+\-]?([0-9]+[Ee][\+\-]?[0-9]+|([0-9]+\.|\.[0-9]+|[0-9]+\.[0-9]+)([Ee][\+\-]?[0-9]+)?)[FfLl]?" />
>+        <RegExpr attribute="Octal" context="#stay" String="[\+\-]?0[0-7]+([Uu][Ll]{0,2}|[Ll]{0,2}[Uu]?|_[_0-9A-Za-z]*)?\b" />
>+        <RegExpr attribute="Decimal" context="#stay" String="[\+\-]?(0|[1-9][0-9]*)([Uu][Ll]{0,2}|[Ll]{0,2}[Uu]?|_[_0-9A-Za-z]*)?\b" />
>+        <RegExpr attribute="Error" context="#stay" String="[\+\-]?(0|[1-9][0-9]*)[0-9A-Za-z][_0-9A-Za-z]*\b" />
>+        
>+        <DetectChar attribute="String" context="String" char="&quot;" />
>+        <Detect2Chars attribute="String" context="String" char="U" char1="&quot;" />
>+        <Detect2Chars attribute="String" context="String" char="u" char1="&quot;" />
>+        <Detect2Chars attribute="String" context="String" char="L" char1="&quot;" />
>+        <StringDetect attribute="String" context="String" String="u8&quot;" />
>+        <RegExpr attribute="String" context="RawString" String="(u|u8|U|L)?R&quot;([^\(]{0,16})\(" lookAhead="true" />
>+        <RegExpr attribute="Error" context="#stay" String="(u|u8|U|L)?R&quot;([^\(]{16,})\(" />
>+        <DetectChar attribute="String" context="Char Literal" char="'" />
>+        <Detect2Chars attribute="String" context="Char Literal" char="L" char1="'" />
>+        <Detect2Chars attribute="String" context="U-Char Literal" char="u" char1="'" />
>+        <Detect2Chars attribute="String" context="U-Char Literal" char="U" char1="'" />
>+        
>+        <StringDetect attribute="Standard Classes" context="Standard Classes" String="std::" />
>+        <StringDetect attribute="Boost Stuff" context="Boost Stuff" String="boost::" />
>+        <StringDetect attribute="Boost Stuff" context="Boost Stuff" String="BOOST_" />
>+        <StringDetect attribute="Internals" context="InternalsNS" String="detail::" />
>+        <StringDetect attribute="Internals" context="InternalsNS" String="details::" />
>+        <StringDetect attribute="Internals" context="InternalsNS" String="aux::" />
>+        <StringDetect attribute="Internals" context="InternalsNS" String="internals::" />
>+        <keyword attribute="Data Type" context="#stay" String="types" />
>+        <keyword attribute="Type Modifiers" context="#stay" String="modifiers" />
>+        <keyword attribute="Standard Macros" context="#stay" String="StdMacros" />
>+        <RegExpr attribute="Internals" context="#stay" String="_[a-zA-Z0-9_]+" />
>+        <RegExpr attribute="Internals" context="#stay" String="[a-zA-Z][a-zA-Z0-9_]*__\b" />
>+        <RegExpr attribute="Data Members (m_*)" context="#stay" String="[a-z][a-zA-Z0-9_]*_\b" />
>+        <RegExpr attribute="Data Members (m_*)" context="#stay" String="m_[a-zA-Z0-9_]+" />
>+        <RegExpr attribute="Globals (g_*)" context="#stay" String="g_[a-zA-Z0-9_]+" />
>+        <RegExpr attribute="Statics (s_*)" context="#stay" String="s_[a-zA-Z0-9_]+" />
>+        <RegExpr attribute="CONSTS/MACROS" context="#stay" String="[A-Z][A-Z0-9_]{2,}\b" />
>+        <RegExpr attribute="Types (*_t/*_type)" context="#stay" String="[a-zA-Z][a-zA-Z0-9_]*_t(ype)?\b" />
>+        <DetectIdentifier />
>+        
>+        <IncludeRules context="##Doxygen" />
>+        <IncludeRules context="AlignedComments" />
>+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment" />
>+        
>+        <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
>+        <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
>+        
>+        <AnyChar attribute="Separator Symbol" context="#stay" String="&separators;" />
>+        <AnyChar attribute="Symbol" context="#stay" String="&punctuators;" />
>+        
>+        <DetectChar attribute="Error" context="#stay" char="#" />
>+        <DetectChar attribute="Error" context="#stay" char="$" />
>+        <DetectChar attribute="Error" context="#stay" char="@" />
>+        <DetectChar attribute="Error" context="#stay" char="`" />
>+      </context>
>+
>+      <context name="UDLOperator" attribute="Normal Text" lineEndContext="#pop">
>+        <StringDetect attribute="Keyword" context="#stay" String="operator" />
>+        <StringDetect attribute="String" context="#stay" String="&quot;&quot;" />
>+        <DetectIdentifier context="#pop" />
>+      </context>
>+
>+      <context name="Char Literal" attribute="String" lineEndContext="#pop">
>+        <IncludeRules context="Universal Char" />
>+        <DetectChar attribute="String Char" context="Simple Esc" char="\" />
>+        <DetectChar attribute="String" context="#pop" char="'" />
>+      </context>
>+
>+      <context name="U-Char Literal" attribute="String" lineEndContext="#pop">
>+        <IncludeRules context="Universal Char" />
>+        <DetectChar attribute="String Char" context="Simple Esc" char="\" />
>+        <DetectChar attribute="String" context="#pop" char="'" />
>+        <RegExpr attribute="Error" context="#stay" String="[^']{2,}" />
>+        <RegExpr attribute="String" context="#stay" String=".{1}" />
>+      </context>
>+
>+      <context  name="Simple Esc" attribute="String Char" lineEndContext="#pop">
>+        <AnyChar attribute="String Char" context="#pop" String="tnvbrfa'&quot;\" />
>+        <RegExpr attribute="String Char" context="#pop" String="[0-7]{1,3}" />
>+        <RegExpr attribute="String Char" context="#pop" String="x[0-9A-Fa-f]{1,}" />
>+        <RegExpr attribute="String" context="#pop" String="." />
>+      </context>
>+
>+      <context name="Universal Char" attribute="String Char" lineEndContext="#pop">
>+        <RegExpr attribute="String Char" context="#stay" String="\\u[0-9A-Fa-f]{4}" />
>+        <RegExpr attribute="Error" context="#stay" String="\\u.{0,3}" />
>+        <RegExpr attribute="String Char" context="#stay" String="\\U[0-9A-Fa-f]{8}" />
>+        <RegExpr attribute="Error" context="#stay" String="\\U.{0,7}" />
>+      </context>
>+
>+      <context name="String" attribute="String" lineEndContext="#pop">
>+        <LineContinue attribute="String" context="#stay" />
>+        <HlCStringChar attribute="String Char" context="#stay" />
>+        <IncludeRules context="Universal Char" />
>+        <RegExpr attribute="String Char" context="#stay" String="%[^&quot;&convspec;]*[&convspec;]" />
>+        <DetectChar attribute="String" context="UDLStringSuffix" char="&quot;" />
>+      </context>
>+
>+      <context name="UDLStringSuffix" attribute="String" lineEndContext="#pop#pop">
>+        <RegExpr attribute="String" context="#pop#pop" String="_[_0-9A-Z-a-z]*\b" />
>+        
>+        <RegExpr context="#pop#pop" String=".*" lookAhead="true" />
>+      </context>
>+
>+      <context name="Attribute" attribute="Attribute" lineEndContext="#stay">
>+        <keyword attribute="Attribute" context="#stay" String="attributes" />
>+        <Detect2Chars attribute="Normal Text" context="#pop" char="]" char1="]" />
>+        <DetectIdentifier context="#stay" attribute="Error" />
>+      </context>
>+
>+      <context name="RawString" attribute="String" lineEndContext="#stay" dynamic="true">
>+        <LineContinue attribute="String" context="#stay" />
>+        <RegExpr attribute="String Char" context="#stay" String="%[^&quot;&convspec;]*[&convspec;]" />
>+        <RegExpr attribute="String" context="#pop" String="\)%2&quot;" dynamic="true"/>
>+      </context>
>+
>+      <context name="DetectIdentifierEnd" attribute="Normal Text" lineEndContext="#pop">
>+        <AnyChar context="#pop" String="&punctuators;" attribute="Symbol" />
>+      </context>
>+
>+      <context name="Region Marker" attribute="Region Marker" lineEndContext="#pop" />
>+
>+      <context name="DetectNSEnd" attribute="Normal Text" lineEndContext="#pop">
>+        <keyword attribute="Keyword" context="#stay" String="template" />
>+        <DetectIdentifier context="#stay" />
>+        <AnyChar context="#pop" String="&separators;" attribute="Separator Symbol" />
>+        <AnyChar context="#pop" String="&ns_punctuators;" attribute="Symbol" />
>+        <AnyChar context="#stay" String="&space;" attribute="Normal Text" />
>+      </context>
>+
>+      <context name="Standard Classes" attribute="Standard Classes" lineEndContext="#pop">
>+        <IncludeRules context="DetectNSEnd" />
>+      </context>
>+
>+      <context name="Boost Stuff" attribute="Boost Stuff" lineEndContext="#pop">
>+        <IncludeRules context="DetectNSEnd" />
>+      </context>
>+
>+      <context name="InternalsNS" attribute="Internals" lineEndContext="#pop">
>+        <IncludeRules context="DetectNSEnd" />
>+      </context>
>+
>+      <context name="Commentar 1" attribute="Comment" lineEndContext="#pop">
>+        <LineContinue attribute="Comment" context="#stay" />
>+        <DetectSpaces />
>+        <IncludeRules context="##Alerts" />
>+        <IncludeRules context="##Modelines" />
>+        <DetectIdentifier />
>+      </context>
>+
>+      <context name="Commentar 2" attribute="Comment" lineEndContext="#stay">
>+        <DetectSpaces />
>+        <LineContinue attribute="Comment" context="#stay" />
>+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment" />
>+        <IncludeRules context="##Alerts" />
>+        <IncludeRules context="##Modelines" />
>+        <DetectIdentifier />
>+      </context>
>+
>+      <context name="AfterHash" attribute="Error" lineEndContext="#pop">
>+        
>+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="(#|%\:|\?\?=)\s*if(?:def|ndef)?(?=(?:$|\s+)\S)" beginRegion="PP" firstNonSpace="true" insensitive="false" />
>+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="(#|%\:|\?\?=)\s*endif" endRegion="PP" firstNonSpace="true" insensitive="false" />
>+        
>+        <RegExpr attribute="Preprocessor" context="Define" String="(#|%\:|\?\?=)\s*(cmake)?define.*((?=\$)" firstNonSpace="true" lookAhead="true" insensitive="false" />
>+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="(#|%\:|\?\?=)\s*(?:el(?:se|if)|include(?:_next)?|(cmake)?define|undef|line|error|warning|pragma)" insensitive="false" firstNonSpace="true" />
>+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="(#|%\:|\?\?=)\s+[0-9]+" firstNonSpace="true" insensitive="false" />
>+      </context>
>+
>+      <context name="Preprocessor" attribute="Preprocessor" lineEndContext="#pop">
>+        <LineContinue attribute="Preprocessor" context="#stay" />
>+        <keyword attribute="Standard Macros" context="#stay" String="StdMacros" />
>+        <IncludeRules context="GNUMacros##GCCExtensions" />
>+        <RangeDetect attribute="Prep. Lib" context="#stay" char="&quot;" char1="&quot;" />
>+        <RangeDetect attribute="Prep. Lib" context="#stay" char="&lt;" char1="&gt;" />
>+        <IncludeRules context="##Doxygen" />
>+        <Detect2Chars attribute="Comment" context="Commentar/Preprocessor" char="/" char1="*" beginRegion="Comment2" />
>+        <IncludeRules context="AlignedComments" />
>+      </context>
>+
>+      <context name="Define" attribute="Preprocessor" lineEndContext="#pop">
>+        <LineContinue attribute="Separator Symbol" context="#stay" />
>+        <DetectChar attribute="Error" context="#stay" char="\\" />
>+        <keyword attribute="Standard Macros" context="#stay" String="StdMacros" />
>+        <IncludeRules context="GNUMacros##GCCExtensions" />
>+      </context>
>+
>+      <context name="Commentar/Preprocessor" attribute="Comment" lineEndContext="#stay">
>+        <DetectSpaces />
>+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment2" />
>+        <DetectIdentifier />
>+      </context>
>+
>+      <context name="Outscoped Common" attribute="Comment" lineEndContext="#stay">
>+        <DetectSpaces />
>+        <IncludeRules context="##Alerts" />
>+        <IncludeRules context="##Modelines" />
>+        <DetectIdentifier />
>+        <IncludeRules context="##Doxygen" />
>+        <IncludeRules context="AlignedComments" />
>+        
>+        <RegExpr attribute="Comment" context="Outscoped intern" String="(#|%\:|\?\?=)\s*if" beginRegion="PP" firstNonSpace="true" insensitive="false" />
>+        <LineContinue context="#stay" />
>+      </context>
>+
>+      <context name="Outscoped" attribute="Comment" lineEndContext="#stay">
>+        <IncludeRules context="Outscoped Common" />
>+        <RegExpr attribute="Preprocessor" context="#pop" String="(#|%\:|\?\?=)\s*el(?:se|if)" firstNonSpace="true" insensitive="false" />
>+        <RegExpr attribute="Preprocessor" context="#pop" String="(#|%\:|\?\?=)\s*endif" endRegion="PP" firstNonSpace="true" insensitive="false" />
>+      </context>
>+
>+      <context name="Outscoped 2" attribute="Comment" lineEndContext="#stay">
>+        <IncludeRules context="Outscoped Common" />
>+        <RegExpr attribute="Preprocessor" context="#pop#pop" String="(#|%\:|\?\?=)\s*endif" endRegion="PP" firstNonSpace="true" insensitive="false" />
>+      </context>
>+
>+      <context name="Inscoped" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectSpaces />
>+        <RegExpr attribute="Preprocessor" context="Outscoped" String="(#|%\:|\?\?=)\s*if\s+(0|false)\s*" beginRegion="PP" firstNonSpace="true" insensitive="false" />
>+        <RegExpr attribute="Preprocessor" context="Outscoped 2" String="(#|%\:|\?\?=)\s*el(?:se|if)" firstNonSpace="true" insensitive="false" />
>+        <IncludeRules context="Main" />
>+      </context>
>+
>+      <context name="Outscoped intern" attribute="Comment" lineEndContext="#stay">
>+        <DetectSpaces />
>+        <IncludeRules context="##Alerts" />
>+        <IncludeRules context="##Modelines" />
>+        <DetectIdentifier />
>+        <IncludeRules context="##Doxygen" />
>+        <IncludeRules context="AlignedComments" />
>+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment" />
>+        <RegExpr attribute="Comment" context="Outscoped intern" String="(#|%\:|\?\?=)\s*if" beginRegion="PP" firstNonSpace="true" insensitive="false" />
>+        <RegExpr attribute="Comment" context="#pop" String="(#|%\:|\?\?=)\s*endif" endRegion="PP" firstNonSpace="true" insensitive="false" />
>+      </context>
>+
>+      <context name="AlignedComments" lineEndContext="#stay" attribute="Comment">
>+        <Detect2Chars attribute="Region Marker" context="Commentar 1" column="0" char="/" char1="/" />
>+        <Detect2Chars attribute="Region Marker" context="Commentar 1" column="4" char="/" char1="/" />
>+        <Detect2Chars attribute="Region Marker" context="Commentar 1" column="8" char="/" char1="/" />
>+        <Detect2Chars attribute="Region Marker" context="Commentar 1" column="12" char="/" char1="/" />
>+        <Detect2Chars attribute="Region Marker" context="Commentar 1" column="16" char="/" char1="/" />
>+        <Detect2Chars attribute="Region Marker" context="Commentar 1" column="20" char="/" char1="/" />
>+        <Detect2Chars attribute="Region Marker" context="Commentar 1" column="24" char="/" char1="/" />
>+        <Detect2Chars attribute="Region Marker" context="Commentar 1" column="28" char="/" char1="/" />
>+        <Detect2Chars attribute="Region Marker" context="Commentar 1" column="32" char="/" char1="/" />
>+        <Detect2Chars attribute="Region Marker" context="Commentar 1" column="36" char="/" char1="/" />
>+        <Detect2Chars attribute="Region Marker" context="Commentar 1" column="40" char="/" char1="/" />
>+        <Detect2Chars attribute="Region Marker" context="Commentar 1" column="44" char="/" char1="/" />
>+        <Detect2Chars attribute="Region Marker" context="Commentar 1" column="48" char="/" char1="/" />
>+        <Detect2Chars attribute="Region Marker" context="Commentar 1" column="52" char="/" char1="/" />
>+        <Detect2Chars attribute="Region Marker" context="Commentar 1" column="56" char="/" char1="/" />
>+        <Detect2Chars attribute="Region Marker" context="Commentar 1" column="60" char="/" char1="/" />
>+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/" />
>+      </context>
>+    </contexts>
>+
>+    <itemDatas>
>+      <itemData name="Normal Text"        defStyleNum="dsNormal"   spellChecking="false" />
>+      <itemData name="Keyword"            defStyleNum="dsKeyword"  spellChecking="false" />
>+      <itemData name="Data Type"          defStyleNum="dsDataType" spellChecking="false" />
>+      <itemData name="Type Modifiers"     defStyleNum="dsDataType" spellChecking="false" />
>+      <itemData name="Attribute"          defStyleNum="dsKeyword"  spellChecking="false" bold="false" italic="true" />
>+      <itemData name="Decimal"            defStyleNum="dsDecVal"   spellChecking="false" />
>+      <itemData name="Octal"              defStyleNum="dsBaseN"    spellChecking="false" />
>+      <itemData name="Hex"                defStyleNum="dsBaseN"    spellChecking="false" />
>+      <itemData name="Float"              defStyleNum="dsFloat"    spellChecking="false" />
>+      <itemData name="Char"               defStyleNum="dsChar"     spellChecking="false" />
>+      <itemData name="String"             defStyleNum="dsString"   spellChecking="true"  />
>+      <itemData name="String Char"        defStyleNum="dsChar"     spellChecking="false" />
>+      <itemData name="Comment"            defStyleNum="dsComment"  spellChecking="true"  />
>+      <itemData name="Symbol"             defStyleNum="dsNormal"   spellChecking="false" />
>+      <itemData name="Separator Symbol"   defStyleNum="dsNormal"   spellChecking="false" />
>+      <itemData name="Data Members (m_*)" defStyleNum="dsNormal"   spellChecking="false" />
>+      <itemData name="Globals (g_*)"      defStyleNum="dsNormal"   spellChecking="false" />
>+      <itemData name="Statics (s_*)"      defStyleNum="dsNormal"   spellChecking="false" />
>+      <itemData name="Types (*_t/*_type)" defStyleNum="dsNormal"   spellChecking="false" />
>+      <itemData name="CONSTS/MACROS"      defStyleNum="dsNormal"   spellChecking="false" />
>+      <itemData name="Preprocessor"       defStyleNum="dsOthers"   spellChecking="false" />
>+      <itemData name="Prep. Lib"          defStyleNum="dsOthers"   spellChecking="false" />
>+      <itemData name="Standard Macros"    defStyleNum="dsOthers"   spellChecking="false" />
>+      <itemData name="Standard Classes"   defStyleNum="dsNormal"   spellChecking="false" color="#59ff00" selColor="#59ff00" />
>+      <itemData name="Boost Stuff"        defStyleNum="dsNormal"   spellChecking="false" color="#23a45b" selColor="#23a45b" />
>+      <itemData name="Internals"          defStyleNum="dsNormal"   spellChecking="false" color="#808080" selColor="#808080" />
>+      <itemData name="Region Marker"      defStyleNum="dsRegionMarker" spellChecking="false" />
>+      <itemData name="Error"              defStyleNum="dsError"    spellChecking="false" />
>+    </itemDatas>
>+  </highlighting>
>+  <general>
>+    <comments>
>+      <comment name="singleLine" start="//" />
>+      <comment name="multiLine" start="/*" end="*/" region="Comment" />
>+    </comments>
>+    <keywords casesensitive="1" />
>+  </general>
>+</language>
>+
>diff -urN tdelibs/kate/data/crk.xml tdelibs.new/kate/data/crk.xml
>--- tdelibs/kate/data/crk.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/crk.xml	2013-12-26 13:26:41.221326286 -0600
>@@ -1,5 +1,5 @@
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Crack" version="1.1" kateversion="2.3" section="Sources" extensions="*.crk" mimetype="">
>+<language name="Crack" version="1.1" kateversion="2.5" section="Sources" extensions="*.crk" mimetype="">
>   <highlighting>
>     <list name="keywords">
>       <item> break</item>
>diff -urN tdelibs/kate/data/cs.xml tdelibs.new/kate/data/cs.xml
>--- tdelibs/kate/data/cs.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/cs.xml	2013-12-26 13:26:40.381329870 -0600
>@@ -1,5 +1,5 @@
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="C#" version="1.15" kateversion="2.3" section="Sources" extensions="*.cs" mimetype="text/x-csharp-src;text/x-csharp-hde">
>+<language name="C#" version="1.15" kateversion="2.5" section="Sources" extensions="*.cs" mimetype="text/x-csharp-src;text/x-csharp-hde">
>   <highlighting>
>     <list name="keywords">
>       <item> abstract</item>
>diff -urN tdelibs/kate/data/css-php.xml tdelibs.new/kate/data/css-php.xml
>--- tdelibs/kate/data/css-php.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/css-php.xml	2013-12-26 13:26:40.934327510 -0600
>@@ -0,0 +1,855 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd">
>+
>+
>+
>+
>+
>+
>+
>+
>+
>+<language name="CSS/PHP" hidden="true" version="2.06" kateversion="2.5" section="Other" extensions="" indenter="cstyle" mimetype="" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
>+
>+	<highlighting>
>+		<list name="properties">
>+			
>+			<item> azimuth </item>
>+			<item> background </item>
>+			<item> background-attachment </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-repeat </item>
>+			<item> border </item>
>+			<item> border-bottom </item>
>+			<item> border-bottom-color </item>
>+			<item> border-bottom-style </item>
>+			<item> border-bottom-width </item>
>+			<item> border-collapse </item>
>+			<item> border-color </item>
>+			<item> border-left </item>
>+			<item> border-left-color </item>
>+			<item> border-left-style </item>
>+			<item> border-left-width </item>
>+			<item> border-right </item>
>+			<item> border-right-color </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-style </item>
>+			<item> border-top-width </item>
>+			<item> border-width </item>
>+			<item> bottom </item>
>+			<item> caption-side </item>
>+			<item> clear </item>
>+			<item> clip </item>
>+			<item> color </item>
>+			<item> content </item>
>+			<item> counter-increment </item>
>+			<item> counter-reset </item>
>+			<item> cue </item>
>+			<item> cue-after </item>
>+			<item> cue-before </item>
>+			<item> cursor </item>
>+			<item> direction </item>
>+			<item> display </item>
>+			<item> elevation </item>
>+			<item> empty-cells </item>
>+			<item> float </item>
>+			<item> font </item>
>+			<item> font-family </item>
>+			<item> font-size </item>
>+			<item> font-size-adjust </item>
>+			<item> font-stretch </item>
>+			<item> font-style </item>
>+			<item> font-variant </item>
>+			<item> font-weight </item>
>+			<item> font-stretch </item>
>+			<item> height </item>
>+			<item> left </item>
>+			<item> letter-spacing </item>
>+			<item> line-height </item>
>+			<item> list-style </item>
>+			<item> list-style-image </item>
>+			<item> list-style-keyword </item>
>+			<item> list-style-position </item>
>+			<item> list-style-type  </item>
>+			<item> margin </item>
>+			<item> margin-bottom </item>
>+			<item> margin-left </item>
>+			<item> margin-right </item>
>+			<item> margin-top </item>
>+			<item> marker-offset </item>
>+			<item> max-height </item>
>+			<item> max-width </item>
>+			<item> min-height </item>
>+			<item> min-width </item>
>+			<item> orphans </item>
>+			<item> outline </item>
>+			<item> outline-color </item>
>+			<item> outline-style </item>
>+			<item> outline-width </item>
>+			<item> overflow </item>
>+			<item> padding </item>
>+			<item> padding-bottom </item>
>+			<item> padding-left </item>
>+			<item> padding-right </item>
>+			<item> padding-top </item>
>+			<item> page </item>
>+			<item> page-break-after </item>
>+			<item> page-break-before </item>
>+			<item> page-break-inside </item>
>+			<item> pause </item>
>+			<item> pause-after </item>
>+			<item> pause-before </item>
>+			<item> pitch </item>
>+			<item> pitch-range </item>
>+			<item> play-during </item>
>+			<item> position </item>
>+			<item> quotes </item>
>+			<item> richness </item>
>+			<item> right </item>
>+			<item> size </item>
>+			<item> speak </item>
>+			<item> speak-header </item>
>+			<item> speak-numeral </item>
>+			<item> speak-punctuation </item>
>+			<item> speech-rate </item>
>+			<item> stress </item>
>+			<item> table-layout </item>
>+			<item> text-align </item>
>+			<item> text-decoration </item>
>+			<item> text-decoration-color </item>
>+			<item> text-indent </item>
>+			<item> text-shadow </item>
>+			<item> text-transform </item>
>+			<item> top </item>
>+			<item> unicode-bidi </item>
>+			<item> vertical-align </item>
>+			<item> visibility </item>
>+			<item> voice-family </item>
>+			<item> volume </item>
>+			<item> white-space </item>
>+			<item> widows </item>
>+			<item> width </item>
>+			<item> word-spacing </item>
>+			<item> z-index </item>
>+
>+			
>+			<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-wisth </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-wrap </item>
>+
>+			
>+			<item> -moz-animation-name </item>
>+			<item> -moz-animation-duration </item>
>+			<item> -moz-animation-iteration </item>
>+			<item> -moz-animation-direction </item>
>+			<item> -moz-animation-delay </item>
>+			<item> -moz-animation-play-state </item>
>+			<item> -moz-animation-fill-mode </item>
>+			<item> -moz-background-size </item>
>+			<item> -moz-border-image </item>
>+			<item> -moz-border-bottom-colors </item>
>+			<item> -moz-border-left-colors </item>
>+			<item> -moz-border-radius </item>
>+			<item> -moz-border-radius-topleft </item>
>+			<item> -moz-border-radius-topright </item>
>+			<item> -moz-border-radius-bottomleft </item>
>+			<item> -moz-border-radius-bottomright </item>
>+			<item> -moz-border-right-colors </item>
>+			<item> -moz-border-top-colors </item>
>+			<item> -moz-box </item>
>+			<item> -moz-box-flex </item>
>+			<item> -moz-box-shadow </item>
>+			<item> -moz-box-sizing </item>
>+			<item> -moz-column-count </item>
>+			<item> -moz-column-gap </item>
>+			<item> -moz-hyphens </item>
>+			<item> -moz-linear-gradient </item>
>+			<item> -moz-opacity </item>
>+			<item> -moz-outline-style </item>
>+			<item> -moz-perspective </item>
>+			<item> -moz-radial-gradient </item>
>+			<item> -moz-resize </item>
>+			<item> -moz-transform </item>
>+			<item> -moz-transform-origin </item>
>+			<item> -moz-transform-style </item>
>+			<item> -moz-transition </item>
>+			<item> -moz-transition-property </item>
>+			<item> -moz-transition-duration </item>
>+
>+			
>+			<item> -o-background-size </item>
>+			<item> -o-linear-gradient </item>
>+			<item> -o-text-overflow </item>
>+			<item> -o-transition </item>
>+			<item> -o-transform-origin </item>
>+
>+			
>+			<item> konq_bgpos_x </item>
>+			<item> konq_bgpos_y </item>
>+			<item> -tdehtml-background-size </item>
>+			<item> -tdehtml-border-top-left-radius </item>
>+			<item> -tdehtml-border-top-right-radius </item>
>+			<item> -tdehtml-border-bottom-left-radius </item>
>+			<item> -tdehtml-border-bottom-right-radius </item>
>+			<item> -tdehtml-border-radius </item>
>+			<item> -tdehtml-box-shadow </item>
>+			<item> -tdehtml-opacity </item>
>+
>+			
>+			<item> -webkit-appearance </item>
>+			<item> -webkit-animation-name </item>
>+			<item> -webkit-animation-duration </item>
>+			<item> -webkit-animation-iteration </item>
>+			<item> -webkit-animation-direction </item>
>+			<item> -webkit-animation-delay </item>
>+			<item> -webkit-animation-play-state </item>
>+			<item> -webkit-animation-fill-mode </item>
>+			<item> -webkit-background-size </item>
>+			<item> -webkit-border-image </item>
>+			<item> -webkit-border-bottom-colors </item>
>+			<item> -webkit-border-left-colors </item>
>+			<item> -webkit-border-radius </item>
>+			<item> -webkit-border-right-colors </item>
>+			<item> -webkit-border-top-colors </item>
>+			<item> -webkit-border-top-left-radius </item>
>+			<item> -webkit-border-top-right-radius </item>
>+			<item> -webkit-border-bottom-left-radius </item>
>+			<item> -webkit-border-bottom-right-radius </item>
>+			<item> -webkit-border-radius-bottomleft </item>
>+			<item> -webkit-border-radius-bottomright </item>
>+			<item> -webkit-box-flex </item>
>+			<item> -webkit-box-reflect</item>
>+			<item> -webkit-box-shadow </item>
>+			<item> -webkit-box-sizing </item>
>+			<item> -webkit-column-count </item>
>+			<item> -webkit-column-gap </item>
>+			<item> -webkit-hyphens </item>
>+			<item> -webkit-linear-gradient </item>
>+			<item> -webkit-gradient </item>
>+			<item> -webkit-perspective </item>
>+			<item> -webkit-text-fill-color </item>
>+			<item> -webkit-text-stroke-color </item>
>+			<item> -webkit-text-stroke-width </item>
>+			<item> -webkit-text-size-adjust </item>
>+			<item> -webkit-transform </item>
>+			<item> -webkit-transform-origin </item>
>+			<item> -webkit-transform-style </item>
>+			<item> -webkit-transition </item>
>+			<item> -webkit-transition-property </item>
>+			<item> -webkit-transition-duration </item>
>+
>+			
>+			<item> filter </item>
>+			<item> zoom </item>
>+			<item> -ms-animation-name </item>
>+			<item> -ms-animation-duration </item>
>+			<item> -ms-animation-iteration </item>
>+			<item> -ms-animation-direction </item>
>+			<item> -ms-animation-delay </item>
>+			<item> -ms-animation-play-state </item>
>+			<item> -ms-animation-fill-mode </item>
>+			<item> -ms-box-sizing </item>
>+			<item> -ms-filter </item>
>+			<item> -ms-interpolation-mode </item>
>+			<item> -ms-linear-gradient </item>
>+			<item> -ms-text-size-adjust </item>
>+			<item> -ms-transform </item>
>+			<item> -ms-transition </item>
>+
>+			
>+			<item> font-family </item>
>+			<item> font-size </item>
>+			<item> font-stretch </item>
>+			<item> font-style </item>
>+			<item> font-variant </item>
>+			<item> font-weight </item>
>+			<item> unicode-range </item>
>+			<item> units-per-em </item>
>+			<item> src </item>
>+			<item> panose-1 </item>
>+			<item> stemv </item>
>+			<item> stemh </item>
>+			<item> slope </item>
>+			<item> cap-height </item>
>+			<item> x-height </item>
>+			<item> ascent </item>
>+			<item> descent </item>
>+			<item> widths </item>
>+			<item> bbox </item>
>+			<item> definition-src </item>
>+			<item> baseline </item>
>+			<item> centerline </item>
>+			<item> mathline </item>
>+			<item> topline </item>
>+		</list>
>+
>+		<list name="types">
>+			<item> inherit </item>
>+			<item> none </item>
>+			<item> hidden </item>
>+			<item> dotted </item>
>+			<item> dashed </item>
>+			<item> solid </item>
>+			<item> double </item>
>+			<item> groove </item>
>+			<item> ridge </item>
>+			<item> inset </item>
>+			<item> outset </item>
>+			<item> xx-small </item>
>+			<item> x-small </item>
>+			<item> small </item>
>+			<item> medium </item>
>+			<item> large </item>
>+			<item> x-large </item>
>+			<item> xx-large </item>
>+			<item> smaller </item>
>+			<item> larger </item>
>+			<item> italic </item>
>+			<item> oblique </item>
>+			<item> small-caps </item>
>+			<item> normal </item>
>+			<item> bold </item>
>+			<item> bolder </item>
>+			<item> lighter </item>
>+			<item> light </item>
>+			<item> 100 </item>
>+			<item> 200 </item>
>+			<item> 300 </item>
>+			<item> 400 </item>
>+			<item> 500 </item>
>+			<item> 600 </item>
>+			<item> 700 </item>
>+			<item> 800 </item>
>+			<item> 900 </item>
>+			<item> transparent </item>
>+			<item> repeat </item>
>+			<item> repeat-x </item>
>+			<item> repeat-y </item>
>+			<item> no-repeat </item>
>+			<item> baseline </item>
>+			<item> sub </item>
>+			<item> super </item>
>+			<item> top </item>
>+			<item> text-top </item>
>+			<item> middle </item>
>+			<item> bottom </item>
>+			<item> text-bottom </item>
>+			<item> left </item>
>+			<item> right </item>
>+			<item> center </item>
>+			<item> justify </item>
>+			<item> konq-center </item>
>+			<item> disc </item>
>+			<item> circle </item>
>+			<item> square </item>
>+			<item> box </item>
>+			<item> decimal </item>
>+			<item> decimal-leading-zero </item>
>+			<item> lower-roman </item>
>+			<item> upper-roman </item>
>+			<item> lower-greek </item>
>+			<item> lower-alpha </item>
>+			<item> lower-latin </item>
>+			<item> upper-alpha </item>
>+			<item> upper-latin </item>
>+			<item> hebrew </item>
>+			<item> armenian </item>
>+			<item> georgian </item>
>+			<item> cjk-ideographic </item>
>+			<item> hiragana </item>
>+			<item> katakana </item>
>+			<item> hiragana-iroha </item>
>+			<item> katakana-iroha </item>
>+			<item> inline </item>
>+			<item> inline-block </item>
>+			<item> block </item>
>+			<item> list-item </item>
>+			<item> run-in </item>
>+			<item> compact </item>
>+			<item> marker </item>
>+			<item> table </item>
>+			<item> inline-table </item>
>+			<item> table-row-group </item>
>+			<item> table-header-group </item>
>+			<item> table-footer-group </item>
>+			<item> table-row </item>
>+			<item> table-column-group </item>
>+			<item> table-column </item>
>+			<item> table-cell </item>
>+			<item> table-caption </item>
>+			<item> auto </item>
>+			<item> crosshair </item>
>+			<item> default </item>
>+			<item> pointer </item>
>+			<item> move </item>
>+			<item> e-resize </item>
>+			<item> ne-resize </item>
>+			<item> nw-resize </item>
>+			<item> n-resize </item>
>+			<item> se-resize </item>
>+			<item> sw-resize </item>
>+			<item> s-resize </item>
>+			<item> w-resize </item>
>+			<item> text </item>
>+			<item> wait </item>
>+			<item> help </item>
>+			<item> above </item>
>+			<item> absolute </item>
>+			<item> always </item>
>+			<item> avoid </item>
>+			<item> below </item>
>+			<item> bidi-override </item>
>+			<item> blink </item>
>+			<item> both </item>
>+			<item> capitalize </item>
>+			<item> caption </item>
>+			<item> clip </item>
>+			<item> close-quote </item>
>+			<item> collapse </item>
>+			<item> condensed </item>
>+			<item> crop </item>
>+			<item> cross </item>
>+			<item> ellipsis </item>
>+			<item> ellipsis-word </item>
>+			<item> embed </item>
>+			<item> expanded </item>
>+			<item> extra-condensed </item>
>+			<item> extra-expanded </item>
>+			<item> fixed </item>
>+			<item> hand </item>
>+			<item> hide </item>
>+			<item> higher </item>
>+			<item> icon </item>
>+			<item> inside </item>
>+			<item> invert </item>
>+			<item> landscape </item>
>+			<item> level </item>
>+			<item> line-through </item>
>+			<item> loud </item>
>+			<item> lower </item>
>+			<item> lowercase </item>
>+			<item> ltr </item>
>+			<item> menu </item>
>+			<item> message-box </item>
>+			<item> mix </item>
>+			<item> narrower </item>
>+			<item> no-close-quote </item>
>+			<item> no-open-quote </item>
>+			<item> nowrap </item>
>+			<item> open-quote </item>
>+			<item> outside </item>
>+			<item> overline </item>
>+			<item> portrait </item>
>+			<item> pre </item>
>+			<item> pre-line </item>
>+			<item> pre-wrap </item>
>+			<item> relative </item>
>+			<item> rtl </item>
>+			<item> scroll </item>
>+			<item> semi-condensed </item>
>+			<item> semi-expanded </item>
>+			<item> separate </item>
>+			<item> show </item>
>+			<item> small-caption </item>
>+			<item> static </item>
>+			<item> static-position </item>
>+			<item> status-bar </item>
>+			<item> thick </item>
>+			<item> thin </item>
>+			<item> ultra-condensed </item>
>+			<item> ultra-expanded </item>
>+			<item> underline </item>
>+			<item> uppercase </item>
>+			<item> visible </item>
>+			<item> wider </item>
>+			<item> break </item>
>+			<item> serif </item>
>+			<item> sans-serif </item>
>+			<item> cursive </item>
>+			<item> fantasy </item>
>+			<item> monospace </item>
>+			<item> border-box </item>
>+			<item> content-box </item>
>+			<item> -epub-hyphens </item>
>+		</list>
>+
>+
>+		<list name="colors">
>+			<item> aqua </item>
>+			<item> black </item>
>+			<item> blue </item>
>+			<item> cyan </item>
>+			<item> fuchsia </item>
>+			<item> gray </item>
>+			<item> green </item>
>+			<item> lime </item>
>+			<item> maroon </item>
>+			<item> navy </item>
>+			<item> olive </item>
>+			<item> purple </item>
>+			<item> red </item>
>+			<item> silver </item>
>+			<item> teal </item>
>+			<item> white </item>
>+			<item> yellow </item>
>+			<item> ActiveBorder  </item>
>+			<item> ActiveCaption  </item>
>+			<item> AppWorkspace  </item>
>+			<item> Background  </item>
>+			<item> ButtonFace  </item>
>+			<item> ButtonHighlight  </item>
>+			<item> ButtonShadow  </item>
>+			<item> ButtonText  </item>
>+			<item> CaptionText  </item>
>+			<item> GrayText  </item>
>+			<item> Highlight  </item>
>+			<item> HighlightText  </item>
>+			<item> InactiveBorder  </item>
>+			<item> InactiveCaption  </item>
>+			<item> InactiveCaptionText  </item>
>+			<item> InfoBackground  </item>
>+			<item> InfoText  </item>
>+			<item> Menu  </item>
>+			<item> MenuText  </item>
>+			<item> Scrollbar  </item>
>+			<item> ThreeDDarkShadow  </item>
>+			<item> ThreeDFace  </item>
>+			<item> ThreeDHighlight  </item>
>+			<item> ThreeDLightShadow  </item>
>+			<item> ThreeDShadow  </item>
>+			<item> Window  </item>
>+			<item> WindowFrame  </item>
>+			<item> WindowText  </item>
>+		</list>
>+
>+		<list name="paren">
>+			<item> url </item>
>+			<item> attr </item>
>+			<item> rect </item>
>+			<item> rgb </item>
>+			<item> rgba </item>
>+			<item> hsl </item>
>+			<item> hsla </item>
>+			<item> counter </item>
>+			<item> counters </item>
>+
>+			
>+			<item> local </item>
>+			<item> format </item>
>+
>+			
>+			<item> expression </item>
>+
>+		</list>
>+
>+		<list name="mediatypes">
>+			<item> all </item>
>+			<item> aural </item>
>+			<item> braille </item>
>+			<item> embossed </item>
>+			<item> handheld </item>
>+			<item> print </item>
>+			<item> projection </item>
>+			<item> screen </item>
>+			<item> tty </item>
>+			<item> tv </item>
>+		</list>
>+
>+		<list name="pseudoclasses">
>+			<item> hover </item>
>+			<item> link </item>
>+			<item> visited </item>
>+			<item> active </item>
>+			<item> focus </item>
>+			<item> first-child </item>
>+			<item> last-child </item>
>+			<item> only-child </item>
>+			<item> first-of-type </item>
>+			<item> last-of-type </item>
>+			<item> only-of-type </item>
>+			<item> first-letter </item>
>+			<item> first-line </item>
>+			<item> before </item>
>+			<item> after </item>
>+			<item> selection </item>
>+			<item> root </item>
>+			<item> empty </item>
>+			<item> target </item>
>+			<item> enabled </item>
>+			<item> disabled </item>
>+			<item> checked </item>
>+			<item> indeterminate </item>
>+			<item> nth-child </item>
>+			<item> nth-last-child </item>
>+			<item> nth-of-type </item>
>+			<item> nth-last-of-type </item>
>+			<item> not </item>
>+		</list>
>+
>+		<contexts>
>+			<context attribute="Normal Text" lineEndContext="#stay" name="Base">
>+<IncludeRules context="FindPHP" />
>+				<LineContinue/>
>+				<DetectSpaces/>
>+				<IncludeRules context="FindRuleSets" />
>+			</context>
>+
>+			
>+			
>+			<context attribute="Normal Text" lineEndContext="#stay" name="FindRuleSets">
>+<IncludeRules context="FindPHP" />
>+				<RegExpr attribute="Media" context="Media" String="@media\b" />
>+				<RegExpr attribute="At Rule" context="Import" String="@import\b" />
>+				<RegExpr attribute="At Rule" context="#stay" String="@(font-face|charset)\b" />
>+				<DetectChar attribute="Property" context="RuleSet" char="{" beginRegion="ruleset" />
>+				
>+				<DetectChar attribute="Selector Attr" context="SelAttr" char="[" />
>+				<RegExpr attribute="Selector Id" context="#stay" String="#([a-zA-Z0-9\-_]|[\x80-\xFF]|\\[0-9A-Fa-f]{1,6})*" />
>+				<RegExpr attribute="Selector Class" context="#stay" String="\.([a-zA-Z0-9\-_]|[\x80-\xFF]|\\[0-9A-Fa-f]{1,6})*" />
>+				<RegExpr attribute="Selector Pseudo" context="#stay" String=":lang$[\w_-]+$" />
>+				<DetectChar attribute="Selector Pseudo" context="SelPseudo" char=":" />
>+				<IncludeRules context="FindStrings" />
>+				<IncludeRules context="FindComments" />
>+			</context>
>+
>+			
>+			<context attribute="Normal Text" lineEndContext="#stay" name="FindValues">
>+<IncludeRules context="FindPHP" />
>+				<RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+(em|ex|ch|rem|vw|vh|vm|px|in|cm|mm|pt|pc|deg|rad|grad|turn|ms|s|Hz|kHz)\b" />
>+				<RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+[%]?" />
>+				<RegExpr attribute="Normal Text" context="#stay" String="[\w\-]+" />
>+			</context>
>+
>+			
>+			<context attribute="Normal Text" lineEndContext="#stay" name="FindStrings">
>+<IncludeRules context="FindPHP" />
>+				<DetectChar attribute="String" context="StringDQ" char="&quot;" />
>+				<DetectChar attribute="String" context="StringSQ" char="'" />
>+			</context>
>+
>+			
>+			<context attribute="Normal Text" lineEndContext="#stay" name="FindComments">
>+<IncludeRules context="FindPHP" />
>+				<RegExpr attribute="Region Marker" context="#stay" String="/\*BEGIN.*\*/" beginRegion="UserDefined" />
>+				<RegExpr attribute="Region Marker" context="#stay" String="/\*END.*\*/" endRegion="UserDefined" />
>+				<Detect2Chars attribute="Comment" context="Comment" char="/" char1="*" beginRegion="comment" />
>+			</context>
>+
>+			
>+			<context attribute="Normal Text" lineEndContext="#stay" name="Media">
>+<IncludeRules context="FindPHP" />
>+				<DetectChar attribute="Media" context="Media2" char="{" beginRegion="media" />
>+				<keyword attribute="Media" context="#stay" String="mediatypes" />
>+				<DetectChar attribute="Media" context="#stay" char="," />
>+				<IncludeRules context="FindComments" />
>+				<RegExpr attribute="Error" context="#stay" String="\S+" />
>+			</context>
>+
>+			<context attribute="Normal Text" lineEndContext="#stay" name="Media2">
>+<IncludeRules context="FindPHP" />
>+				<DetectChar attribute="Media" context="#pop#pop" char="}" endRegion="media" />
>+				<IncludeRules context="FindRuleSets" />
>+			</context>
>+
>+			<context attribute="Selector Attr" lineEndContext="#stay" name="SelAttr">
>+<IncludeRules context="FindPHP" />
>+				<DetectChar attribute="Selector Attr" context="#pop" char="]" />
>+				<IncludeRules context="FindStrings" />
>+			</context>
>+
>+			<context attribute="Selector Pseudo" lineEndContext="#pop" name="SelPseudo"
>+					fallthrough="true" fallthroughContext="#pop">
>+<IncludeRules context="FindPHP" />
>+					<keyword attribute="Selector Pseudo" context="#pop" String="pseudoclasses" />
>+				</context>
>+
>+				<context attribute="Normal Text" lineEndContext="#stay" name="Import">
>+<IncludeRules context="FindPHP" />
>+					<DetectChar attribute="At Rule" context="#pop" char=";" />
>+					<keyword attribute="Media" context="#stay" String="mediatypes" />
>+					<IncludeRules context="FindValues" />
>+					<IncludeRules context="FindStrings" />
>+					<IncludeRules context="FindComments" />
>+				</context>
>+
>+				<context attribute="Comment" lineEndContext="#stay" name="Comment">
>+<IncludeRules context="FindPHP" />
>+					<DetectSpaces/>
>+					<Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="comment" />
>+					<IncludeRules context="##Alerts" />
>+					<DetectIdentifier/>
>+				</context>
>+
>+				<context attribute="Normal Text" lineEndContext="#stay" name="RuleSet">
>+<IncludeRules context="FindPHP" />
>+					<DetectChar attribute="Property" context="#pop" char="}" endRegion="ruleset" />
>+					<keyword attribute="Property" context="Rule" String="properties" />
>+					<RegExpr attribute="Unknown Property" context="Rule" String="-?[A-Za-z_-]+(?=\s*:)" />
>+					<IncludeRules context="FindComments" />
>+					<RegExpr attribute="Error" context="#stay" String="\S" />
>+				</context>
>+
>+				<context attribute="Normal Text" lineEndContext="#stay" name="Rule">
>+<IncludeRules context="FindPHP" />
>+					<DetectChar attribute="Property" context="Rule2" char=":" />
>+					<RegExpr attribute="Error" context="#stay" String="\S" />
>+				</context>
>+
>+				<context attribute="Normal Text" lineEndContext="#stay" name="Rule2">
>+<IncludeRules context="FindPHP" />
>+					<DetectChar attribute="Property" context="#pop#pop" char=";" />
>+					<DetectChar attribute="Property" context="#pop#pop#pop" char="}" endRegion="ruleset" />
>+					
>+					<keyword attribute="Value" context="#stay" String="types" />
>+					<keyword attribute="Value" context="#stay" String="colors" />
>+					<RegExpr attribute="Value" context="#stay" String="#([0-9A-Fa-f]{3}){1,4}\b" />
>+					<keyword attribute="Value" context="PropParen" String="paren" />
>+					<RegExpr attribute="Important" context="#stay" String="!important\b" />
>+					<IncludeRules context="FindValues" />
>+					<IncludeRules context="FindStrings" />
>+					<IncludeRules context="FindComments" />
>+				</context>
>+
>+				<context attribute="Normal Text" lineEndContext="#stay" name="PropParen">
>+<IncludeRules context="FindPHP" />
>+					<DetectChar attribute="Value" context="PropParen2" char="(" />
>+					<IncludeRules context="FindComments" />
>+					<RegExpr attribute="Error" context="#stay" String="\S" />
>+				</context>
>+
>+				<context attribute="Normal Text" lineEndContext="#stay" name="PropParen2">
>+<IncludeRules context="FindPHP" />
>+					<DetectChar attribute="Value" context="#pop#pop" char=")" />
>+					<IncludeRules context="FindValues" />
>+					<IncludeRules context="FindStrings" />
>+					<IncludeRules context="FindComments" />
>+				</context>
>+
>+				
>+				<context attribute="String" lineEndContext="#stay" name="StringDQ">
>+<IncludeRules context="FindPHP" />
>+					<DetectChar attribute="String" context="#pop" char="&quot;" />
>+					<IncludeRules context="InsideString" />
>+				</context>
>+
>+				<context attribute="String" lineEndContext="#stay" name="StringSQ">
>+<IncludeRules context="FindPHP" />
>+					<DetectChar attribute="String" context="#pop" char="'" />
>+					<IncludeRules context="InsideString" />
>+				</context>
>+
>+				<context attribute="String" lineEndContext="#stay" name="InsideString">
>+<IncludeRules context="FindPHP" />
>+					<RegExpr attribute="String" context="#stay" String="\\[&quot;']" />
>+					<DetectIdentifier/>
>+				</context>
>+
>+			<context name="FindPHP">
>+<RegExpr context="##PHP/PHP" String="&lt;\?(?:=|php)?" lookAhead="true" />
>+</context>
>+</contexts>
>+			<itemDatas>
>+				<itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/>
>+				<itemData name="Property"  defStyleNum="dsKeyword" spellChecking="false"/>
>+				<itemData name="Unknown Property"  defStyleNum="dsKeyword" italic="1" spellChecking="false"/>
>+				<itemData name="Media"  defStyleNum="dsDecVal" bold="1" spellChecking="false"/>
>+				<itemData name="At Rule"  defStyleNum="dsDecVal" spellChecking="false"/>
>+				<itemData name="String"  defStyleNum="dsString"/>
>+				<itemData name="Value"  defStyleNum="dsDataType" spellChecking="false"/>
>+				<itemData name="Important" defStyleNum="dsKeyword" spellChecking="false"/>
>+				<itemData name="Selector Attr" defStyleNum="dsChar" spellChecking="false"/>
>+				<itemData name="Selector Id"  defStyleNum="dsFloat" bold="1" spellChecking="false"/>
>+				<itemData name="Selector Class"  defStyleNum="dsFloat" spellChecking="false"/>
>+				<itemData name="Selector Pseudo"  defStyleNum="dsDecVal" spellChecking="false"/>
>+				<itemData name="Comment" defStyleNum="dsComment" />
>+				<itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
>+				<itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/>
>+				<itemData name="Error" defStyleNum="dsError" spellChecking="false"/>
>+			</itemDatas>
>+		</highlighting>
>+		<general>
>+			<keywords casesensitive="0" weakDeliminator="-%"/>
>+			<comments>
>+				<comment name="multiLine" start="/*" end="*/" />
>+			</comments>
>+		</general>
>+	</language>
>+
>+
>diff -urN tdelibs/kate/data/css.xml tdelibs.new/kate/data/css.xml
>--- tdelibs/kate/data/css.xml	2013-03-02 15:57:35.000000000 -0600
>+++ tdelibs.new/kate/data/css.xml	2013-12-26 13:26:40.877327754 -0600
>@@ -1,5 +1,10 @@
> <?xml version="1.0" encoding="UTF-8"?>
>-<!DOCTYPE language SYSTEM "language.dtd">
>+<!DOCTYPE language SYSTEM "language.dtd"
>+[
>+  
>+  <!ENTITY nmstart "[_a-zA-Z]|(\\[0-9a-fA-F]{1,6})|(\\[^\n\r\f0-9a-fA-F])">
>+  <!ENTITY nmchar  "[_a-zA-Z0-9-]|(\\[0-9a-fA-F]{1,6})|(\\[^\n\r\f0-9a-fA-F])">
>+]>
> 
> 
> 
>-<language name="CSS" version="2.05" kateversion="2.4" section="Markup" extensions="*.css" indenter="cstyle"
>+<language name="CSS" version="2.06" kateversion="2.5" section="Markup" extensions="*.css" indenter="cstyle"
>           mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
> 
>   <highlighting>
>@@ -552,7 +557,7 @@
>         <DetectChar attribute="Property" context="RuleSet" char="{" beginRegion="ruleset" />
>         
> 	<DetectChar attribute="Selector Attr" context="SelAttr" char="[" />
>-	<RegExpr attribute="Selector Id" context="#stay" String="#([a-zA-Z0-9\-_]|[\x80-\xFF]|\\[0-9A-Fa-f]{1,6})*" />
>+	<RegExpr attribute="Selector Id" context="#stay" String="#(-)?(&nmstart;)(&nmchar;)*" />
> 	<RegExpr attribute="Selector Class" context="#stay" String="\.([a-zA-Z0-9\-_]|[\x80-\xFF]|\\[0-9A-Fa-f]{1,6})*" />
> 	<RegExpr attribute="Selector Pseudo" context="#stay" String=":lang$[\w_-]+$" />
> 	<DetectChar attribute="Selector Pseudo" context="SelPseudo" char=":" />
>diff -urN tdelibs/kate/data/cue.xml tdelibs.new/kate/data/cue.xml
>--- tdelibs/kate/data/cue.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/cue.xml	2013-12-26 13:26:40.492329396 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="CUE Sheet" version="0.91" kateversion="2.1" section="Other" extensions="*.cue" mimetype="application/x-cue">
>+<language name="CUE Sheet" version="0.91" kateversion="2.5" section="Other" extensions="*.cue" mimetype="application/x-cue">
>   <highlighting>
>     <list name="keywords">
>       <item> CATALOG </item>
>diff -urN tdelibs/kate/data/curry.xml tdelibs.new/kate/data/curry.xml
>--- tdelibs/kate/data/curry.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/curry.xml	2013-12-26 13:26:41.903323375 -0600
>@@ -0,0 +1,364 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd"
>+[
>+  
>+  <!ENTITY qualify     "([A-Z][a-zA-Z0-9_']*\.)*">
>+  
>+  <!ENTITY ident       "[a-z][a-zA-Z0-9_']*">
>+  
>+  <!ENTITY type        "[A-Z][a-zA-Z0-9_']*">
>+  
>+  <!ENTITY infixchar   "~!@#\$&#37;\^&amp;\*\+\-=&lt;&gt;\?\./\|&backslash;:">
>+  
>+  <!ENTITY prefixIdent "(&ident;|$[&infixchar;]+$)">
>+
>+  
>+  <!ENTITY escSeqChar  "abfnrtv\&quot;'" >
>+  
>+  <!ENTITY escSeqAscii "NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL" >
>+  
>+  <!ENTITY escSeqCntrl "\^[A-Z@\[&backslash;\]\^_]" >
>+
>+  
>+  <!ENTITY octal       "[0-7]+" >
>+  
>+  <!ENTITY decimal     "[0-9]+" >
>+  
>+  <!ENTITY hexadecimal "[0-9a-fA-F]+" >
>+  
>+  <!ENTITY backslash   "\\" >
>+  
>+  <!ENTITY currydoc    "---" >
>+]>
>+<language name="Curry" version="0.3" kateversion="2.5"
>+          section="Sources" extensions="*.curry" mimetype="text/x-curry"
>+          author="BjÃ¶rn PeemÃ¶ller (bjp@informatik.uni-kiel.de)" license="LGPL"
>+          indenter="haskell">
>+  <highlighting>
>+  <list name="keywords">
>+    <item> case </item>
>+    <item> data </item>
>+    <item> do </item>
>+    <item> else </item>
>+    <item> external </item>
>+    <item> fcase </item>
>+    <item> free </item>
>+    <item> if </item>
>+
>+    <item> in </item>
>+    <item> infix </item>
>+    <item> infixl </item>
>+    <item> infixr </item>
>+    <item> let </item>
>+    <item> module </item>
>+    <item> of </item>
>+    <item> then </item>
>+    <item> type </item>
>+    <item> where </item>
>+  </list>
>+  <list name="Prelude Func">
>+    <item> and </item>
>+    <item> all </item>
>+    <item> any </item>
>+    <item> appendFile </item>
>+    <item> best </item>
>+    <item> break </item>
>+    <item> browse </item>
>+    <item> browseList </item>
>+    <item> chr </item>
>+    <item> concat </item>
>+    <item> concatMap </item>
>+    <item> const </item>
>+    <item> curry </item>
>+    <item> div </item>
>+    <item> done </item>
>+    <item> doSolve </item>
>+    <item> drop </item>
>+    <item> dropWhile </item>
>+    <item> either </item>
>+    <item> elem </item>
>+    <item> ensureNotFree </item>
>+    <item> ensureSpine </item>
>+    <item> enumFrom </item>
>+    <item> enumFromThen </item>
>+    <item> enumFromTo </item>
>+    <item> enumFromThenTo </item>
>+    <item> error </item>
>+    <item> failed </item>
>+    <item> filter </item>
>+    <item> findall </item>
>+    <item> flip </item>
>+    <item> foldl </item>
>+    <item> foldl1 </item>
>+    <item> foldr </item>
>+    <item> foldr1 </item>
>+    <item> fst </item>
>+    <item> getChar </item>
>+    <item> getLine </item>
>+    <item> id </item>
>+    <item> if_then_else </item>
>+    <item> iterate </item>
>+    <item> head </item>
>+    <item> length </item>
>+    <item> lines </item>
>+    <item> lookup </item>
>+    <item> map </item>
>+    <item> mapIO </item>
>+    <item> mapIO_ </item>
>+    <item> max </item>
>+    <item> maybe </item>
>+    <item> min </item>
>+    <item> mod </item>
>+    <item> negate </item>
>+    <item> not </item>
>+    <item> notElem </item>
>+    <item> null </item>
>+    <item> once </item>
>+    <item> or </item>
>+    <item> ord </item>
>+    <item> otherwise </item>
>+    <item> print </item>
>+    <item> putChar </item>
>+    <item> putStr </item>
>+    <item> putStrLn </item>
>+    <item> readFile </item>
>+    <item> repeat </item>
>+    <item> replicate </item>
>+    <item> return </item>
>+    <item> reverse </item>
>+    <item> seq </item>
>+    <item> sequenceIO </item>
>+    <item> sequenceIO_ </item>
>+    <item> show </item>
>+    <item> snd </item>
>+    <item> solveAll </item>
>+    <item> span </item>
>+    <item> splitAt </item>
>+    <item> success </item>
>+    <item> tail </item>
>+    <item> take </item>
>+    <item> takeWhile </item>
>+    <item> try </item>
>+    <item> uncurry </item>
>+    <item> unknown </item>
>+    <item> unlines </item>
>+    <item> unpack </item>
>+    <item> until </item>
>+    <item> unwords </item>
>+    <item> unzip </item>
>+    <item> unzip3 </item>
>+    <item> writeFile </item>
>+    <item> words </item>
>+    <item> zip </item>
>+    <item> zip3 </item>
>+    <item> zipWith </item>
>+    <item> zipWith3 </item>
>+  </list>
>+  <list name="Prelude Type">
>+    <item> Bool </item>
>+    <item> Char </item>
>+    <item> Either </item>
>+    <item> Float </item>
>+    <item> Int </item>
>+    <item> IO </item>
>+    <item> Maybe </item>
>+    <item> Ordering </item>
>+    <item> String </item>
>+    <item> Success </item>
>+  </list>
>+  <list name="Prelude Cons">
>+    <item> False </item>
>+    <item> True </item>
>+    <item> Left </item>
>+    <item> Right </item>
>+    <item> Just </item>
>+    <item> Nothing </item>
>+    <item> EQ </item>
>+    <item> LT </item>
>+    <item> GT </item>
>+  </list>
>+  <contexts>
>+    <context name="Normal" attribute="Normal" lineEndContext="#stay">
>+      
>+      <StringDetect attribute="Pragma"   context="Pragma"            String="{-#"        beginRegion="Pragma"  />
>+      <Detect2Chars attribute="Comment"  context="Multiline Comment" char="{" char1="-"  beginRegion="Multiline Comment" />
>+      <StringDetect attribute="Currydoc" context="Currydoc"          String="&currydoc;" />
>+      <Detect2Chars attribute="Comment"  context="Comment"           char="-" char1="-"  />
>+
>+      
>+      <keyword      attribute="Keyword"             context="#stay"   String="keywords" />
>+      <keyword      attribute="Prelude Function"    context="#stay"   String="Prelude Func" />
>+      <keyword      attribute="Prelude Type"        context="#stay"   String="Prelude Type" />
>+      <keyword      attribute="Prelude Constructor" context="#stay"   String="Prelude Cons" />
>+      <RegExpr      attribute="Keyword"             context="Import"  String="import\s+(qualified)?" />
>+
>+      
>+      <Float        attribute="Float"   context="#stay"   />
>+      <RegExpr      attribute="Octal"   context="#stay"   String="0(o|O)&octal;" />
>+      <HlCHex       attribute="Hex"     context="#stay"   />
>+      <Int          attribute="Decimal" context="#stay"   />
>+      <DetectChar   attribute="Char"    context="Char"    char="'" />
>+      <DetectChar   attribute="String"  context="String"  char="&quot;" />
>+
>+      
>+      <RegExpr      attribute="Special Symbol"    context="#stay"   String="(::|:=|:&gt;|\-&gt;|&lt;\-|\.\.)" />
>+      <RegExpr      attribute="Signature"         context="#stay"   String="\s*&prefixIdent;\s*(,\s*&prefixIdent;)*\s*(?=::[^&infixchar;])" />
>+      <RegExpr      attribute="Function"          context="#stay"   String="&qualify;&ident;" />
>+      <RegExpr      attribute="Operator"          context="#stay"   String="&qualify;[&infixchar;]+" />
>+      <RegExpr      attribute="Type, Constructor" context="#stay"   String="&qualify;&type;" />
>+      <DetectChar   attribute="Infix Application" context="Infix"   char="`" />
>+
>+      
>+      <DetectChar char="(" context="#stay" beginRegion="nested" attribute="Braces" />
>+      <DetectChar char=")" context="#stay" endRegion="nested"   attribute="Braces" />
>+      <DetectChar char="[" context="#stay" beginRegion="list"   attribute="Braces" />
>+      <DetectChar char="]" context="#stay" endRegion="list"     attribute="Braces" />
>+      <DetectChar char="{" context="#stay" beginRegion="curly"  attribute="Braces" />
>+      <DetectChar char="}" context="#stay" endRegion="curly"    attribute="Braces" />
>+    </context>
>+
>+    
>+    <context name="Pragma" attribute="Pragma" lineEndContext="#stay" >
>+      <StringDetect attribute="Pragma" context="#pop" String="#-}" endRegion="Pragma" />
>+    </context>
>+
>+    
>+    <context name="Multiline Comment" attribute="Comment" lineEndContext="#stay" >
>+      <Detect2Chars attribute="Comment" context="#pop" char="-" char1="}" endRegion="Multiline Comment" />
>+    </context>
>+
>+    
>+    <context name="Currydoc" attribute="Currydoc" lineEndContext="#pop" />
>+
>+    
>+    <context name="Comment" attribute="Comment" lineEndContext="#pop" />
>+
>+    
>+    <context name="Import" attribute="Normal" lineEndContext="#pop" >
>+      
>+      <StringDetect attribute="Pragma"   context="Pragma"            String="{-#"        beginRegion="Pragma"  />
>+      <Detect2Chars attribute="Comment"  context="Multiline Comment" char="{" char1="-"  beginRegion="Multiline Comment" />
>+      <StringDetect attribute="Currydoc" context="Currydoc"          String="&currydoc;" />
>+      <Detect2Chars attribute="Comment"  context="Comment"           char="-" char1="-"  />
>+
>+      <RegExpr      attribute="Type, Constructor" context="#stay" String="&qualify;&type;" />
>+      <Detect2Chars attribute="Keyword"           context="#stay" char="a" char1="s" />
>+      <StringDetect attribute="Keyword"           context="#stay" String="hiding" />
>+      
>+      <DetectChar   attribute="Braces"            context="#pop"   char="(" beginRegion="nested" />
>+      <RegExpr      attribute="Syntax Error"      context="#stay"  String="\S+" />
>+    </context>
>+
>+    
>+    <context name="Char" attribute="Char" lineEndContext="CharSyntaxError" >
>+      <DetectChar attribute="Syntax Error" context="#pop"       char="'" />
>+      <DetectChar attribute="Char"         context="CharEscape" char="\" />
>+      <RegExpr    attribute="Char"         context="CharEnd"    String="[^'&backslash;]" />
>+    </context>
>+
>+    
>+    <context name="CharEscape" attribute="Char" lineEndContext="#popCharSyntaxError" >
>+      <AnyChar attribute="Char"         context="#popCharEnd" String="&escSeqChar;"   />
>+      <RegExpr attribute="Char"         context="#popCharEnd" String="o&octal;"       />
>+      <RegExpr attribute="Char"         context="#popCharEnd" String="&decimal;"      />
>+      <RegExpr attribute="Char"         context="#popCharEnd" String="x&hexadecimal;" />
>+      <RegExpr attribute="Char"         context="#popCharEnd" String="&escSeqCntrl;"  />
>+      <RegExpr attribute="Char"         context="#popCharEnd" String="&escSeqAscii;"  />
>+      <RegExpr attribute="Syntax Error" context="#popCharEnd" String="."              />
>+    </context>
>+
>+    
>+    <context name="CharEnd" attribute="Char" lineEndContext="#popCharSyntaxError" >
>+      <DetectChar attribute="Char"         context="#pop#pop" char="'" />
>+      <RegExpr    attribute="Syntax Error" context="#stay"    String="." />
>+    </context>
>+
>+    
>+    <context name="CharSyntaxError" attribute="Syntax Error" lineEndContext="#stay" >
>+      <DetectChar attribute="Syntax Error" context="#pop#pop" char="'" />
>+    </context>
>+
>+    
>+    <context name="String" attribute="String" lineEndContext="StringSyntaxError" >
>+      <DetectChar   attribute="String"        context="#pop"         char="&quot;" />
>+      <DetectChar   attribute="String Escape" context="StringEscape" char="\" />
>+      <RegExpr      attribute="String"        context="#stay"        String="[^&quot;&backslash;]*" />
>+    </context>
>+
>+    
>+    <context name="StringEscape" attribute="String" lineEndContext="StringGap" >
>+      <AnyChar      attribute="String Escape"  context="#pop"      String="&escSeqChar;&amp;" />
>+      <RegExpr      attribute="String Escape"  context="#pop"      String="o&octal;"          />
>+      <RegExpr      attribute="String Escape"  context="#pop"      String="&decimal;"         />
>+      <RegExpr      attribute="String Escape"  context="#pop"      String="x&hexadecimal;"    />
>+      <RegExpr      attribute="String Escape"  context="#pop"      String="&escSeqCntrl;"     />
>+      <RegExpr      attribute="String Escape"  context="#pop"      String="&escSeqAscii;"     />
>+      <DetectSpaces attribute="String Escape"  context="StringGap"                            />
>+      <RegExpr      attribute="Syntax Error"   context="#pop"      String="."                 />
>+    </context>
>+
>+    <context name="StringGap" attribute="String" lineEndContext="#stay" >
>+      <DetectSpaces attribute="String Escape" context="#stay" />
>+      <DetectChar   attribute="String Escape" context="#pop#pop#popString" char="\"      />
>+      <DetectChar   attribute="Syntax Error"  context="#pop#pop#pop"       char="&quot;" />
>+      <RegExpr      attribute="Syntax Error"  context="#stay"              String="."    />
>+    </context>
>+
>+    
>+    <context name="StringSyntaxError" attribute="Syntax Error" lineEndContext="#stay" >
>+      <DetectChar attribute="Syntax Error" context="#pop#pop" char="&quot;" />
>+    </context>
>+
>+    
>+    <context name="Infix" attribute="Infix Application" lineEndContext="#stay" >
>+      <DetectChar attribute="Infix Application" context="#pop" char="`"/>
>+    </context>
>+  </contexts>
>+
>+  <itemDatas>
>+    <itemData name="Normal"              defStyleNum="dsNormal"   spellChecking="false" />
>+
>+    
>+    <itemData name="Pragma"              defStyleNum="dsOthers"   spellChecking="false" />
>+    <itemData name="Comment"             defStyleNum="dsComment"  />
>+    <itemData name="Currydoc"            defStyleNum="dsComment"  color="#008000" selColor="#FFFFFF"/>
>+
>+    
>+    <itemData name="Keyword"             defStyleNum="dsKeyword"  spellChecking="false" />
>+    <itemData name="Prelude Type"        defStyleNum="dsDataType" spellChecking="false" />
>+    <itemData name="Prelude Function"    defStyleNum="dsFunction" spellChecking="false" />
>+    <itemData name="Prelude Constructor" defStyleNum="dsKeyword"  spellChecking="false" />
>+
>+    
>+    <itemData name="Float"               defStyleNum="dsFloat"    spellChecking="false" />
>+    <itemData name="Octal"               defStyleNum="dsBaseN"    spellChecking="false" />
>+    <itemData name="Hex"                 defStyleNum="dsBaseN"    spellChecking="false" />
>+    <itemData name="Decimal"             defStyleNum="dsDecVal"   spellChecking="false" />
>+    <itemData name="Char"                defStyleNum="dsChar"     spellChecking="false" />
>+    <itemData name="String Escape"       defStyleNum="dsChar"     spellChecking="false" />
>+    <itemData name="String"              defStyleNum="dsString"   />
>+
>+    
>+    <itemData name="Braces"              defStyleNum="dsNormal"   spellChecking="false" />
>+    <itemData name="Signature"           defStyleNum="dsOthers"   spellChecking="false" />
>+    <itemData name="Function"            defStyleNum="dsNormal"   spellChecking="false" />
>+    <itemData name="Operator"            defStyleNum="dsFunction" spellChecking="false" />
>+    <itemData name="Type, Constructor"   defStyleNum="dsDataType" spellChecking="false" />
>+    <itemData name="Special Symbol"      defStyleNum="dsOthers"   spellChecking="false" />
>+    <itemData name="Infix Application"   defStyleNum="dsOthers"   spellChecking="false" />
>+    <itemData name="Syntax Error"        defStyleNum="dsError"    spellChecking="false" />
>+  </itemDatas>
>+  </highlighting>
>+  <general>
>+    <folding indentationsensitive="1"/>
>+    <comments>
>+      <comment name="singleLine" start="--" />
>+      <comment name="multiLine" start="{-" end="-}" region="Multiline Comment" />
>+    </comments>
>+    <keywords casesensitive="1" />
>+  </general>
>+</language>
>diff -urN tdelibs/kate/data/debianchangelog.xml tdelibs.new/kate/data/debianchangelog.xml
>--- tdelibs/kate/data/debianchangelog.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/debianchangelog.xml	2013-12-26 13:26:41.959323136 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Debian Changelog" version="0.66" kateversion="2.4" section="Other" extensions="" mimetype="">
>+<language name="Debian Changelog" version="0.68" kateversion="2.5" section="Other" extensions="" mimetype="">
>     <highlighting>
>         <list name="keywords">
>             <item>urgency</item>
>@@ -12,23 +12,36 @@
>             <item>oldstable-proposed-updates</item>
>             <item>stable</item>
>             <item>stable-security</item>
>+            <item>stable-proposed-updates</item>
>             <item>testing</item>
>             <item>testing-security</item>
>             <item>testing-proposed-updates</item>
>             <item>frozen</item>
>             <item>unstable</item>
>+            <item>sid</item>
>             <item>experimental</item>
>             <item>UNRELEASED</item>
>             
>+            <item>sarge</item>
>             <item>sarge-backports</item>
>             <item>sarge-volatile</item>
>+            <item>etch</item>
>             <item>etch-backports</item>
>             <item>etch-volatile</item>
>+            <item>lenny</item>
>             <item>lenny-backports</item>
>             <item>lenny-backports-sloppy</item>
>             <item>lenny-volatile</item>
>+            <item>squeeze</item>
>             <item>squeeze-backports</item>
>+            <item>squeeze-backports-sloppy</item>
>             <item>squeeze-volatile</item>
>+            <item>wheezy</item>
>+            <item>wheezy-backports</item>
>+            <item>wheezy-backports-sloppy</item>
>+            <item>jessie</item>
>+            <item>jessie-backports</item>
>+            <item>jessie-backports-sloppy</item>
>             
>             <item>dapper</item>
>             <item>dapper-security</item>
>@@ -102,6 +115,21 @@
>             <item>precise-proposed</item>
>             <item>precise-updates</item>
>             <item>precise-backports</item>
>+            <item>quantal</item>
>+            <item>quantal-security</item>
>+            <item>quantal-proposed</item>
>+            <item>quantal-updates</item>
>+            <item>quantal-backports</item>
>+            <item>raring</item>
>+            <item>raring-security</item>
>+            <item>raring-proposed</item>
>+            <item>raring-updates</item>
>+            <item>raring-backports</item>
>+            <item>saucy</item>
>+            <item>saucy-security</item>
>+            <item>saucy-proposed</item>
>+            <item>saucy-updates</item>
>+            <item>saucy-backports</item>
>         </list>
> 
>         <list name="urgencies">
>diff -urN tdelibs/kate/data/debiancontrol.xml tdelibs.new/kate/data/debiancontrol.xml
>--- tdelibs/kate/data/debiancontrol.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/debiancontrol.xml	2013-12-26 13:26:41.433325382 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Debian Control" version="0.84" kateversion="2.4" section="Other" extensions="control" mimetype="">
>+<language name="Debian Control" version="0.84" kateversion="2.5" section="Other" extensions="control" mimetype="">
>     <highlighting>
>         <contexts>
>             <context attribute="Normal Text" lineEndContext="#stay" name="INIT">
>diff -urN tdelibs/kate/data/desktop.xml tdelibs.new/kate/data/desktop.xml
>--- tdelibs/kate/data/desktop.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/desktop.xml	2013-12-26 13:26:40.885327719 -0600
>@@ -1,6 +1,8 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name=".desktop" version="1.04" kateversion="2.4" section="Configuration" extensions="*.desktop;*.kdelnk" mimetype="application/x-desktop">
>+<language name=".desktop" version="1.05" kateversion="2.5"
>+          section="Configuration" extensions="*.desktop;*.kdelnk;*.desktop.cmake"
>+          mimetype="application/x-desktop">
>   <highlighting>
>     <contexts>
>       <context attribute="Key" lineEndContext="#stay" name="Normal">
>diff -urN tdelibs/kate/data/diff.xml tdelibs.new/kate/data/diff.xml
>--- tdelibs/kate/data/diff.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/diff.xml	2013-12-26 13:26:41.162326537 -0600
>@@ -15,7 +15,7 @@
>     2008-02-13: 1.11 Eduardo Robles Elvira <edulix AT gmail DOT com>
>      Fixed folding.
> -->
>-<language name="Diff" version="1.11" kateversion="2.1" section="Other" extensions="*.diff;*patch" mimetype="text/x-patch">
>+<language name="Diff" version="1.11" kateversion="2.5" section="Other" extensions="*.diff;*patch" mimetype="text/x-patch">
> 
>   <highlighting>
> 
>diff -urN tdelibs/kate/data/djangotemplate.xml tdelibs.new/kate/data/djangotemplate.xml
>--- tdelibs/kate/data/djangotemplate.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/djangotemplate.xml	2013-12-26 13:26:40.700328509 -0600
>@@ -4,7 +4,7 @@
> 	<!ENTITY name    "[A-Za-z_:][\w.:_-]*">
> 	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
> ]>
>-<language name="Django HTML Template" version="1.3" kateversion="2.4" section="Markup" extensions="*.htm;*.html" mimetype="text/html"  author="Matthew Marshall (matthew@matthewmarshall.org)" license="LGPL" priority="9">
>+<language name="Django HTML Template" version="1.3" kateversion="2.5" section="Markup" extensions="*.htm;*.html" mimetype="text/html"  author="Matthew Marshall (matthew@matthewmarshall.org)" license="LGPL" priority="9">
> 
> 
>         <!ENTITY pathpart "[^\s\\&#37;;/:\*\?&quot;&gt;&lt;\|]"> 
> ]>
>-<language name="MS-DOS Batch" version="0.30" kateversion="2.4" section="Scripts" extensions="*.bat" mimetype="application/x-dos" casesensitive="0" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="LGPL">
>+<language name="MS-DOS Batch" version="0.30" kateversion="2.5" section="Scripts" extensions="*.bat" mimetype="application/x-dos" casesensitive="0" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="LGPL">
> 
> 
>diff -urN tdelibs/kate/data/dot.xml tdelibs.new/kate/data/dot.xml
>--- tdelibs/kate/data/dot.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/dot.xml	2013-12-26 13:26:40.570329064 -0600
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
> 
>-<language name="dot" version="1.1" kateversion="2.4" section="Scientific" extensions="*.dot" mimetype="text/x-dot" author="Postula LoÃ¯s (lois.postula@live.be)" priority="0">
>+<language name="dot" version="1.1" kateversion="2.5" section="Scientific" extensions="*.dot" mimetype="text/x-dot" author="Postula LoÃ¯s (lois.postula@live.be)" priority="0">
> 
>   <highlighting>
> 
>diff -urN tdelibs/kate/data/doxygen.xml tdelibs.new/kate/data/doxygen.xml
>--- tdelibs/kate/data/doxygen.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/doxygen.xml	2013-12-26 13:26:40.425329684 -0600
>@@ -8,7 +8,7 @@
> 
>   Copyright 2004 Dominik Haumann (dhdev@gmx.de)
>   Copyright 2007 Matthew Woehlke (mw_triad@users.sourceforge.net)
>-  Copyright 2009-2012 Alex Turbov (I.zaufi@gmail.com)
>+  Copyright 2009-2013 Alex Turbov (I.zaufi@gmail.com)
> 
>  **********************************************************************
>  * This library is free software; you can redistribute it and/or      *
>@@ -29,8 +29,8 @@
>  -->
> 
> <language name="Doxygen"
>-          version="1.33"
>-          kateversion="2.4"
>+          version="1.35"
>+          kateversion="2.5"
>           section="Markup"
>           extensions="*.dox;*.doxygen"
>           mimetype="text/x-doxygen"
>@@ -48,7 +48,6 @@
>       <item> \author </item>           <item> @author </item>
>       <item> \authors </item>          <item> @authors </item>
>       <item> \brief </item>            <item> @brief </item>
>-      <item> \bug </item>              <item> @bug </item>
>       <item> \callgraph </item>        <item> @callgraph </item>
>       <item> \callergraph </item>      <item> @callergraph </item>
>       <item> \date </item>             <item> @date </item>
>@@ -219,6 +218,7 @@
>     </list>
>     <list name="Attention">
>       <item> \attention </item>        <item> @attention </item>
>+      <item> \bug </item>              <item> @bug </item>
>     </list>
>     <list name="Todo">
>       <item> \todo </item>             <item> @todo </item>
>@@ -267,8 +267,8 @@
>         <DetectSpaces />
>         <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="BlockComment" />
>         <IncludeRules context="##Alerts" />
>-        <Detect2Chars attribute="Region" context="#stay" char="@" char1="{" />
>-        <Detect2Chars attribute="Region" context="#stay" char="@" char1="}" />
>+        <Detect2Chars attribute="Region" context="#stay" char="@" char1="{" beginRegion="Group" />
>+        <Detect2Chars attribute="Region" context="#stay" char="@" char1="}" endRegion="Group" />
>         <IncludeRules context="SL_DetectEnv" />
>         <keyword attribute="Tags" context="#stay" String="TagOnly" />
>         <keyword attribute="Tags" context="ML_TagWord" String="TagWord" />
>@@ -474,7 +474,7 @@
>       <itemData name="HTML Tag"     defStyleNum="dsKeyword" color="#000000" bold="1" italic="0" />
>       <itemData name="Entities"     defStyleNum="dsOthers" color="#4086C0" bold="1" italic="1" />
>       <itemData name="Description"  defStyleNum="dsString"  color="#ff0000" />
>-      <itemData name="Comment"      defStyleNum="dsComment" color="#0000ff" italic="1" />
>+      <itemData name="Comment"      defStyleNum="dsComment" />
>       <itemData name="Region"       defStyleNum="dsRegionMarker" />
>       <itemData name="Identifier"   defStyleNum="dsOthers" />
>       <itemData name="HTML Comment" defStyleNum="dsComment" />
>diff -urN tdelibs/kate/data/doxygenlua.xml tdelibs.new/kate/data/doxygenlua.xml
>--- tdelibs/kate/data/doxygenlua.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/doxygenlua.xml	2013-12-26 13:26:42.088322586 -0600
>@@ -27,7 +27,7 @@
>  * Boston, MA  02110-1301, USA.                                       *
>  **********************************************************************
>  -->
>-<language name="DoxygenLua" version="1.01" kateversion="2.4" section="Markup" extensions="*.dox;*.doxygen" mimetype="text/x-doxygen" author="Bruno Massa (brmassa@gmail.com)" license="LGPL">
>+<language name="DoxygenLua" version="1.01" kateversion="2.5" section="Markup" extensions="*.dox;*.doxygen" mimetype="text/x-doxygen" author="Bruno Massa (brmassa@gmail.com)" license="LGPL">
>   <highlighting>
>     
>diff -urN tdelibs/kate/data/dtd.xml tdelibs.new/kate/data/dtd.xml
>--- tdelibs/kate/data/dtd.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/dtd.xml	2013-12-26 13:26:40.946327458 -0600
>@@ -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="2.4" section="Markup" extensions="*.dtd" mimetype="application/xml-dtd" author="Andriy Lesyuk (s-andy@in.if.ua)" license="LGPL">
>+<language name="DTD" version="1.02" kateversion="2.5" section="Markup" extensions="*.dtd" mimetype="application/xml-dtd" author="Andriy Lesyuk (s-andy@in.if.ua)" license="LGPL">
>   <highlighting>
> 
>     <list name="Category">
>diff -urN tdelibs/kate/data/e.xml tdelibs.new/kate/data/e.xml
>--- tdelibs/kate/data/e.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/e.xml	2013-12-26 13:26:41.886323448 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="E Language" version="0.22" kateversion="2.3" section="Sources" extensions="*.e" mimetype="text/x-e-src">
>+<language name="E Language" version="0.22" kateversion="2.5" section="Sources" extensions="*.e" mimetype="text/x-e-src">
>     <highlighting>
>         <list name="Type">
>             <item> FALSE </item>
>diff -urN tdelibs/kate/data/eiffel.xml tdelibs.new/kate/data/eiffel.xml
>--- tdelibs/kate/data/eiffel.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/eiffel.xml	2013-12-26 13:26:41.623324571 -0600
>@@ -10,7 +10,7 @@
> 
> Author of version 1.02: Sebastian Vuorinen
> -->
>-<language name="Eiffel" version="1.02" kateversion="2.1" section="Sources" extensions="*.e" mimetype="text/x-eiffel-src" author="Sebastian Vuorinen" license="">
>+<language name="Eiffel" version="1.02" kateversion="2.5" section="Sources" extensions="*.e" mimetype="text/x-eiffel-src" author="Sebastian Vuorinen" license="">
> 	<highlighting>
> 		<list name="keywords">
> 			<item> agent </item>
>diff -urN tdelibs/kate/data/email.xml tdelibs.new/kate/data/email.xml
>--- tdelibs/kate/data/email.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/email.xml	2013-12-26 13:26:40.412329738 -0600
>@@ -3,7 +3,7 @@
> 
>-<language name="Email" version="1.00" kateversion="2.4" extensions="*.eml" section="Other" mimetype="message/rfc822" casesensitive="0" author="Carl A Joslin (carl.joslin@joslin.dyndns.org)" license="GPL">
>+<language name="Email" version="1.00" kateversion="2.5" extensions="*.eml" section="Other" mimetype="message/rfc822" casesensitive="0" author="Carl A Joslin (carl.joslin@joslin.dyndns.org)" license="GPL">
>   <highlighting>
>     <contexts>      
>       <context name="headder" attribute="Normal Text" lineEndContext="#stay" casesensitive="0">
>diff -urN tdelibs/kate/data/erlang.xml tdelibs.new/kate/data/erlang.xml
>--- tdelibs/kate/data/erlang.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/erlang.xml	2013-12-26 13:26:40.418329713 -0600
>@@ -36,7 +36,7 @@
>                                    - fixed highlighting problem when '@' at end of atom/variable
> -->
> 
>-<language name="Erlang" version="1.02" kateversion="2.5" section="Scripts" extensions="*.erl" mimetype="" author="Bill Ross (bill@emailme.net.au)" license="LGPL">
>+<language name="Erlang" version="1.03" kateversion="2.5" section="Scripts" extensions="*.erl" mimetype="" author="Bill Ross (bill@emailme.net.au)" license="LGPL">
>   <highlighting>
>     <list name="keywords">
>       
>@@ -164,7 +164,7 @@
>       <item>whereis</item>
>    </list>
>     <contexts>
>-      <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
>+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal Text" >
>         <RegExpr attribute="Pragma" context="#stay" column="0" String="&pragmas;" />
>         <keyword attribute="Keyword" context="#stay" String="keywords" />
>         <keyword attribute="Operator" context="#stay" String="operators" />
>@@ -176,26 +176,26 @@
> 
>         
>         
>-        <RegExpr attribute="Function" context="#pop" String="&atomstr;:&atomstr;" />
>-        <RegExpr attribute="Functon" context="isfunction" String="&atomstr;\(" lookAhead="true" />
>+        <RegExpr attribute="Function" context="#stay" String="&atomstr;:&atomstr;" />
>+        <RegExpr attribute="Function" context="isfunction" String="&atomstr;\(" lookAhead="true" />
> 
>         
>-        <RegExpr attribute="Variable" context="#pop" String="&varstr;" />
>+        <RegExpr attribute="Variable" context="#stay" String="&varstr;" />
> 
>         
>         <DetectChar attribute="Atom" context="atomquote" char="'" /> 
>-        <RegExpr attribute="Atom" context="#pop" String="&atomstr;" />
>+        <RegExpr attribute="Atom" context="#stay" String="&atomstr;" />
>         
>         <DetectChar attribute="String" context="stringquote" char="&quot;" />
>         
>         
>         
>         
>-        <RegExpr attribute="Float" context="#pop" String="[0-9]+\.[0-9]+(?:[eE][+-]?[0-9]+)?" />
>-        <RegExpr attribute="Number" context="#pop" String="\d+#[a-zA-Z0-9]+" />
>-        <RegExpr attribute="Integer" context="#pop" String="\$\S" />
>-        <RegExpr attribute="Integer" context="#pop" String="[0-9]+" />
>+        <RegExpr attribute="Float" context="#stay" String="[0-9]+\.[0-9]+(?:[eE][+-]?[0-9]+)?" />
>+        <RegExpr attribute="Number" context="#stay" String="\d+#[a-zA-Z0-9]+" />
>+        <RegExpr attribute="Integer" context="#stay" String="\$\S" />
>+        <RegExpr attribute="Integer" context="#stay" String="[0-9]+" />
> 
>       </context>
> 
>diff -urN tdelibs/kate/data/euphoria.xml tdelibs.new/kate/data/euphoria.xml
>--- tdelibs/kate/data/euphoria.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/euphoria.xml	2013-12-26 13:26:40.394329814 -0600
>@@ -2,7 +2,7 @@
> <!DOCTYPE language SYSTEM "language.dtd">
> 
> 
>-<language name="Euphoria" version="2.08" 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" kateversion="2.5" 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 -urN tdelibs/kate/data/ferite.xml tdelibs.new/kate/data/ferite.xml
>--- tdelibs/kate/data/ferite.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/ferite.xml	2013-12-26 13:26:42.066322680 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="ferite" version="1.04" kateversion="2.4" section="Scripts" extensions="*.fe;*.feh" mimetype="text/x-ferite-src">
>+<language name="ferite" version="1.04" kateversion="2.5" section="Scripts" extensions="*.fe;*.feh" mimetype="text/x-ferite-src">
>   <highlighting>
>     <list name="keywords">
>       <item> break </item>
>diff -urN tdelibs/kate/data/fortran.xml tdelibs.new/kate/data/fortran.xml
>--- tdelibs/kate/data/fortran.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/fortran.xml	2013-12-26 13:26:40.641328761 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Fortran" version="1.13" kateversion="2.4" section="Sources" extensions="*.f;*.F;*.for;*.FOR;*.f90;*.F90;*.fpp;*.FPP;*.f95;*.F95;" mimetype="text/x-fortran-src" casesensitive="0" author="Franchin Matteo (fnch@libero.it)" license="LGPL" priority="9">
>+<language name="Fortran" version="1.13" kateversion="2.5" section="Sources" extensions="*.f;*.F;*.for;*.FOR;*.f90;*.F90;*.fpp;*.FPP;*.f95;*.F95;" mimetype="text/x-fortran-src" casesensitive="0" author="Franchin Matteo (fnch@libero.it)" license="LGPL" priority="9">
> 
>   <highlighting>
> 
>diff -urN tdelibs/kate/data/freebasic.xml tdelibs.new/kate/data/freebasic.xml
>--- tdelibs/kate/data/freebasic.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/freebasic.xml	2013-12-26 13:26:40.459329536 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="FreeBASIC" version="0.14" kateversion="2.3" section="Sources" extensions="*.bas;*.bi;*.BAS;*.BI" mimetype="text/x-freebasic" author="Chris Neugebauer (chrisjrn@gmail.com)" license="GPL">
>+<language name="FreeBASIC" version="0.14" kateversion="2.5" section="Sources" extensions="*.bas;*.bi;*.BAS;*.BI" mimetype="text/x-freebasic" author="Chris Neugebauer (chrisjrn@gmail.com)" license="GPL">
>   <highlighting>
>     <list name="preproc">
>     
>diff -urN tdelibs/kate/data/fsharp.xml tdelibs.new/kate/data/fsharp.xml
>--- tdelibs/kate/data/fsharp.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/fsharp.xml	2013-12-26 13:26:42.003322949 -0600
>@@ -9,7 +9,7 @@
> <!ENTITY ESC    "(\\[ntbr'&quot;\\]|\\[0-9]{3}|\\x[0-9A-Fa-f]{2})"> 
> <!ENTITY DEC    "[0-9][0-9_]*">                                     
> ]>
>-<language name="FSharp" version="0.0.1" kateversion="2.4" section="Sources" extensions="*.fs;*.fsi;*.fsx" mimetype="" priority="10" author="Bas Bossink (bas.bossink@gmail.com)" license="LGPL">
>+<language name="FSharp" version="0.0.1" kateversion="2.5" section="Sources" extensions="*.fs;*.fsi;*.fsx" mimetype="" priority="10" author="Bas Bossink (bas.bossink@gmail.com)" license="LGPL">
> 
>   <highlighting>
>     <list name="keywords">
>diff -urN tdelibs/kate/data/fstab.xml tdelibs.new/kate/data/fstab.xml
>--- tdelibs/kate/data/fstab.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/fstab.xml	2013-12-26 13:26:41.986323020 -0600
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
> 
>-<language name="fstab" version="1.00" kateversion="2.4" section="Configuration" extensions="fstab;mtab" author="Diego Iastrubni (elcuco@kde.org)" license="Public Domain" >
>+<language name="fstab" version="1.00" kateversion="2.5" section="Configuration" extensions="fstab;mtab" author="Diego Iastrubni (elcuco@kde.org)" license="Public Domain" >
> 	<highlighting>
> 		<list name="valid_fs">
> 			<item> ext2 </item>
>diff -urN tdelibs/kate/data/gap.xml tdelibs.new/kate/data/gap.xml
>--- tdelibs/kate/data/gap.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/gap.xml	2013-12-26 13:26:41.508325061 -0600
>@@ -14,7 +14,7 @@
> 	-->
> 
> 
>-<language name="GAP" section="Scientific" extensions="*.gd;*.gi;*.g" mimetype="text/gap" version="0.2" kateversion="2.4" author="Jose Joao Morais" license="GPL">
>+<language name="GAP" section="Scientific" extensions="*.gd;*.gi;*.g" mimetype="text/gap" version="0.2" kateversion="2.5" author="Jose Joao Morais" license="GPL">
> 
> 	<highlighting>
> 
>diff -urN tdelibs/kate/data/gcc.xml tdelibs.new/kate/data/gcc.xml
>--- tdelibs/kate/data/gcc.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/gcc.xml	2013-12-26 13:26:40.560329108 -0600
>@@ -0,0 +1,574 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd"
>+[
>+    <!ENTITY space " ">
>+    <!ENTITY separators ",&#59;">
>+    <!ENTITY ns_punctuators "!&#37;&space;&amp;()+-/.*&lt;=&gt;?[]{|}~^&separators;">
>+    <!ENTITY punctuators ":&ns_punctuators;">
>+]>
>+
>+<language
>+    name="GCCExtensions"
>+    version="0.3"
>+    kateversion="2.5"
>+    section="Sources"
>+    extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.h++;*.hxx;*.hpp;*.hcc;"
>+    mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr;text/x-csrc"
>+    author="Alex Turbov (i.zaufi@gmail.com)"
>+    license="LGPL"
>+    hidden="true"
>+    priority="5"
>+  >
>+
>+<highlighting>
>+  <list name="GNUTypes">
>+    
>+    <item> __float80 </item>
>+    <item> __float128 </item>
>+    
>+    <item> _Decimal32 </item>
>+    <item> _Decimal64 </item>
>+    <item> _Decimal128 </item>
>+    
>+    <item> __int128 </item>
>+    
>+    <item> __fp16 </item>
>+    
>+    <item> _Fract </item>
>+    <item> _Sat </item>
>+    <item> _Accum </item>
>+  </list>
>+  <list name="GNUKeywords">
>+    
>+    <item> __asm__ </item>
>+    <item> __const__ </item>
>+    <item> __extension__ </item>
>+    <item> __inline__ </item>
>+    <item> __label__ </item>
>+    <item> __complex__ </item>
>+    <item> __real__ </item>
>+    <item> __restrict__ </item>
>+    <item> __restrict </item>
>+    <item> __imag__ </item>
>+    
>+    <item> __typeof__ </item>
>+    <item> typeof </item>
>+    
>+    <item> __alignof__ </item>
>+    
>+    <item> __thread </item>
>+  </list>
>+  
>+  <list name="GNUFunctions">
>+    
>+    <item> __has_nothrow_assign </item>
>+    <item> __has_nothrow_copy </item>
>+    <item> __has_nothrow_constructor </item>
>+    <item> __has_trivial_assign </item>
>+    <item> __has_trivial_copy </item>
>+    <item> __has_trivial_constructor </item>
>+    <item> __has_trivial_destructor </item>
>+    <item> __has_virtual_destructor </item>
>+    <item> __is_abstract </item>
>+    <item> __is_base_of </item>
>+    <item> __is_class </item>
>+    <item> __is_empty </item>
>+    <item> __is_enum </item>
>+    <item> __is_pod </item>
>+    <item> __is_polymorphic </item>
>+    <item> __is_union </item>
>+    
>+    <item> __sync_fetch_and_add </item>
>+    <item> __sync_fetch_and_sub </item>
>+    <item> __sync_fetch_and_or </item>
>+    <item> __sync_fetch_and_and </item>
>+    <item> __sync_fetch_and_xor </item>
>+    <item> __sync_fetch_and_nand </item>
>+    <item> __sync_add_and_fetch </item>
>+    <item> __sync_sub_and_fetch </item>
>+    <item> __sync_or_and_fetch </item>
>+    <item> __sync_and_and_fetch </item>
>+    <item> __sync_xor_and_fetch </item>
>+    <item> __sync_nand_and_fetch </item>
>+    <item> __sync_bool_compare_and_swap </item>
>+    <item> __sync_val_compare_and_swap </item>
>+    <item> __sync_synchronize </item>
>+    <item> __sync_lock_test_and_set </item>
>+    <item> __sync_lock_release </item>
>+    
>+    <item> __atomic_load_n </item>
>+    <item> __atomic_load </item>
>+    <item> __atomic_store_n </item>
>+    <item> __atomic_store </item>
>+    <item> __atomic_exchange_n </item>
>+    <item> __atomic_exchange </item>
>+    <item> __atomic_compare_exchange_n </item>
>+    <item> __atomic_compare_exchange </item>
>+    <item> __atomic_add_fetch </item>
>+    <item> __atomic_sub_fetch </item>
>+    <item> __atomic_and_fetch </item>
>+    <item> __atomic_or_fetch </item>
>+    <item> __atomic_xor_fetch </item>
>+    <item> __atomic_nand_fetch </item>
>+    <item> __atomic_fetch_add </item>
>+    <item> __atomic_fetch_sub </item>
>+    <item> __atomic_fetch_and </item>
>+    <item> __atomic_fetch_or </item>
>+    <item> __atomic_fetch_xor </item>
>+    <item> __atomic_fetch_nand </item>
>+    <item> __atomic_test_and_set </item>
>+    <item> __atomic_clear </item>
>+    <item> __atomic_thread_fence </item>
>+    <item> __atomic_always_lock_free </item>
>+    <item> __atomic_is_lock_free </item>
>+  </list>
>+  
>+  <list name="GNUMacros">
>+    <item> _FORTIFY_SOURCE </item>
>+    <item> _GNU_SOURCE </item>
>+    <item> _ILP32 </item>
>+    <item> _LP64 </item>
>+    <item> _REENTRANT </item>
>+    <item> _STDC_PREDEF_H </item>
>+    <item> __3dNOW_A__ </item>
>+    <item> __3dNOW__ </item>
>+    <item> __ABM__ </item>
>+    <item> __ADX__ </item>
>+    <item> __AES__ </item>
>+    <item> __ATOMIC_ACQUIRE </item>
>+    <item> __ATOMIC_ACQ_REL </item>
>+    <item> __ATOMIC_CONSUME </item>
>+    <item> __ATOMIC_HLE_ACQUIRE </item>
>+    <item> __ATOMIC_HLE_RELEASE </item>
>+    <item> __ATOMIC_RELAXED </item>
>+    <item> __ATOMIC_RELEASE </item>
>+    <item> __ATOMIC_SEQ_CST </item>
>+    <item> __AVX2__ </item>
>+    <item> __AVX__ </item>
>+    <item> __BASE_FILE__ </item>
>+    <item> __BIGGEST_ALIGNMENT__ </item>
>+    <item> __BMI2__ </item>
>+    <item> __BMI__ </item>
>+    <item> __BYTE_ORDER__ </item>
>+    <item> __CHAR16_TYPE__ </item>
>+    <item> __CHAR32_TYPE__ </item>
>+    <item> __CHAR_BIT__ </item>
>+    <item> __CHAR_UNSIGNED__ </item>
>+    <item> __COUNTER__ </item>
>+    <item> __DBL_DECIMAL_DIG__ </item>
>+    <item> __DBL_DENORM_MIN__ </item>
>+    <item> __DBL_DIG__ </item>
>+    <item> __DBL_EPSILON__ </item>
>+    <item> __DBL_HAS_DENORM__ </item>
>+    <item> __DBL_HAS_INFINITY__ </item>
>+    <item> __DBL_HAS_QUIET_NAN__ </item>
>+    <item> __DBL_MANT_DIG__ </item>
>+    <item> __DBL_MAX_10_EXP__ </item>
>+    <item> __DBL_MAX_EXP__ </item>
>+    <item> __DBL_MAX__ </item>
>+    <item> __DBL_MIN_10_EXP__ </item>
>+    <item> __DBL_MIN_EXP__ </item>
>+    <item> __DBL_MIN__ </item>
>+    <item> __DEC128_EPSILON__ </item>
>+    <item> __DEC128_MANT_DIG__ </item>
>+    <item> __DEC128_MAX_EXP__ </item>
>+    <item> __DEC128_MAX__ </item>
>+    <item> __DEC128_MIN_EXP__ </item>
>+    <item> __DEC128_MIN__ </item>
>+    <item> __DEC128_SUBNORMAL_MIN__ </item>
>+    <item> __DEC32_EPSILON__ </item>
>+    <item> __DEC32_MANT_DIG__ </item>
>+    <item> __DEC32_MAX_EXP__ </item>
>+    <item> __DEC32_MAX__ </item>
>+    <item> __DEC32_MIN_EXP__ </item>
>+    <item> __DEC32_MIN__ </item>
>+    <item> __DEC32_SUBNORMAL_MIN__ </item>
>+    <item> __DEC64_EPSILON__ </item>
>+    <item> __DEC64_MANT_DIG__ </item>
>+    <item> __DEC64_MAX_EXP__ </item>
>+    <item> __DEC64_MAX__ </item>
>+    <item> __DEC64_MIN_EXP__ </item>
>+    <item> __DEC64_MIN__ </item>
>+    <item> __DEC64_SUBNORMAL_MIN__ </item>
>+    <item> __DECIMAL_BID_FORMAT__ </item>
>+    <item> __DECIMAL_DIG__ </item>
>+    <item> __DEC_EVAL_METHOD__ </item>
>+    <item> __DEPRECATED </item>
>+    <item> __ELF__ </item>
>+    <item> __EXCEPTIONS </item>
>+    <item> __F16C__ </item>
>+    <item> __FAST_MATH__ </item>
>+    <item> __FINITE_MATH_ONLY__ </item>
>+    <item> __FLOAT_WORD_ORDER__ </item>
>+    <item> __FLT_DECIMAL_DIG__ </item>
>+    <item> __FLT_DENORM_MIN__ </item>
>+    <item> __FLT_DIG__ </item>
>+    <item> __FLT_EPSILON__ </item>
>+    <item> __FLT_EVAL_METHOD__ </item>
>+    <item> __FLT_HAS_DENORM__ </item>
>+    <item> __FLT_HAS_INFINITY__ </item>
>+    <item> __FLT_HAS_QUIET_NAN__ </item>
>+    <item> __FLT_MANT_DIG__ </item>
>+    <item> __FLT_MAX_10_EXP__ </item>
>+    <item> __FLT_MAX_EXP__ </item>
>+    <item> __FLT_MAX__ </item>
>+    <item> __FLT_MIN_10_EXP__ </item>
>+    <item> __FLT_MIN_EXP__ </item>
>+    <item> __FLT_MIN__ </item>
>+    <item> __FLT_RADIX__ </item>
>+    <item> __FMA4__ </item>
>+    <item> __FMA__ </item>
>+    <item> __FP_FAST_FMA </item>
>+    <item> __FP_FAST_FMAF </item>
>+    <item> __FSGSBASE__ </item>
>+    <item> __FUNCTION__ </item>
>+    <item> __FXSR__ </item>
>+    <item> __GCC_ATOMIC_BOOL_LOCK_FREE </item>
>+    <item> __GCC_ATOMIC_CHAR16_T_LOCK_FREE </item>
>+    <item> __GCC_ATOMIC_CHAR32_T_LOCK_FREE </item>
>+    <item> __GCC_ATOMIC_CHAR_LOCK_FREE </item>
>+    <item> __GCC_ATOMIC_INT_LOCK_FREE </item>
>+    <item> __GCC_ATOMIC_LLONG_LOCK_FREE </item>
>+    <item> __GCC_ATOMIC_LONG_LOCK_FREE </item>
>+    <item> __GCC_ATOMIC_POINTER_LOCK_FREE </item>
>+    <item> __GCC_ATOMIC_SHORT_LOCK_FREE </item>
>+    <item> __GCC_ATOMIC_TEST_AND_SET_TRUEVAL </item>
>+    <item> __GCC_ATOMIC_WCHAR_T_LOCK_FREE </item>
>+    <item> __GCC_HAVE_DWARF2_CFI_ASM </item>
>+    <item> __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 </item>
>+    <item> __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16 </item>
>+    <item> __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 </item>
>+    <item> __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 </item>
>+    <item> __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 </item>
>+    <item> __GFORTRAN__ </item>
>+    <item> __GNUC_GNU_INLINE__ </item>
>+    <item> __GNUC_MINOR__ </item>
>+    <item> __GNUC_PATCHLEVEL__ </item>
>+    <item> __GNUC_STDC_INLINE__ </item>
>+    <item> __GNUC__ </item>
>+    <item> __GNUG__ </item>
>+    <item> __GXX_ABI_VERSION </item>
>+    <item> __GXX_EXPERIMENTAL_CXX0X__ </item>
>+    <item> __GXX_RTTI </item>
>+    <item> __GXX_WEAK__ </item>
>+    <item> __ILP32__ </item>
>+    <item> __INCLUDE_LEVEL__ </item>
>+    <item> __INT16_C </item>
>+    <item> __INT16_MAX__ </item>
>+    <item> __INT16_TYPE__ </item>
>+    <item> __INT32_C </item>
>+    <item> __INT32_MAX__ </item>
>+    <item> __INT32_TYPE__ </item>
>+    <item> __INT64_C </item>
>+    <item> __INT64_MAX__ </item>
>+    <item> __INT64_TYPE__ </item>
>+    <item> __INT8_C </item>
>+    <item> __INT8_MAX__ </item>
>+    <item> __INT8_TYPE__ </item>
>+    <item> __INTMAX_C </item>
>+    <item> __INTMAX_MAX__ </item>
>+    <item> __INTMAX_TYPE__ </item>
>+    <item> __INTPTR_MAX__ </item>
>+    <item> __INTPTR_TYPE__ </item>
>+    <item> __INT_FAST16_MAX__ </item>
>+    <item> __INT_FAST16_TYPE__ </item>
>+    <item> __INT_FAST32_MAX__ </item>
>+    <item> __INT_FAST32_TYPE__ </item>
>+    <item> __INT_FAST64_MAX__ </item>
>+    <item> __INT_FAST64_TYPE__ </item>
>+    <item> __INT_FAST8_MAX__ </item>
>+    <item> __INT_FAST8_TYPE__ </item>
>+    <item> __INT_LEAST16_MAX__ </item>
>+    <item> __INT_LEAST16_TYPE__ </item>
>+    <item> __INT_LEAST32_MAX__ </item>
>+    <item> __INT_LEAST32_TYPE__ </item>
>+    <item> __INT_LEAST64_MAX__ </item>
>+    <item> __INT_LEAST64_TYPE__ </item>
>+    <item> __INT_LEAST8_MAX__ </item>
>+    <item> __INT_LEAST8_TYPE__ </item>
>+    <item> __INT_MAX__ </item>
>+    <item> __LDBL_DENORM_MIN__ </item>
>+    <item> __LDBL_DIG__ </item>
>+    <item> __LDBL_EPSILON__ </item>
>+    <item> __LDBL_HAS_DENORM__ </item>
>+    <item> __LDBL_HAS_INFINITY__ </item>
>+    <item> __LDBL_HAS_QUIET_NAN__ </item>
>+    <item> __LDBL_MANT_DIG__ </item>
>+    <item> __LDBL_MAX_10_EXP__ </item>
>+    <item> __LDBL_MAX_EXP__ </item>
>+    <item> __LDBL_MAX__ </item>
>+    <item> __LDBL_MIN_10_EXP__ </item>
>+    <item> __LDBL_MIN_EXP__ </item>
>+    <item> __LDBL_MIN__ </item>
>+    <item> __LONG_LONG_MAX__ </item>
>+    <item> __LONG_MAX__ </item>
>+    <item> __LP64__ </item>
>+    <item> __LWP__ </item>
>+    <item> __LZCNT__ </item>
>+    <item> __MMX__ </item>
>+    <item> __NEXT_RUNTIME__ </item>
>+    <item> __NO_INLINE__ </item>
>+    <item> __OPTIMIZE_SIZE__ </item>
>+    <item> __OPTIMIZE__ </item>
>+    <item> __ORDER_BIG_ENDIAN__ </item>
>+    <item> __ORDER_LITTLE_ENDIAN__ </item>
>+    <item> __ORDER_PDP_ENDIAN__ </item>
>+    <item> __PCLMUL__ </item>
>+    <item> __PIC__ </item>
>+    <item> __PIE__ </item>
>+    <item> __POPCNT__ </item>
>+    <item> __PRAGMA_REDEFINE_EXTNAME </item>
>+    <item> __PRETTY_FUNCTION__ </item>
>+    <item> __PRFCHW__ </item>
>+    <item> __PTRDIFF_MAX__ </item>
>+    <item> __PTRDIFF_TYPE__ </item>
>+    <item> __RDRND__ </item>
>+    <item> __RDSEED__ </item>
>+    <item> __REGISTER_PREFIX__ </item>
>+    <item> __RTM__ </item>
>+    <item> __SANITIZE_ADDRESS__ </item>
>+    <item> __SCHAR_MAX__ </item>
>+    <item> __SHRT_MAX__ </item>
>+    <item> __SIG_ATOMIC_MAX__ </item>
>+    <item> __SIG_ATOMIC_MIN__ </item>
>+    <item> __SIG_ATOMIC_TYPE__ </item>
>+    <item> __SIZEOF_DOUBLE__ </item>
>+    <item> __SIZEOF_FLOAT__ </item>
>+    <item> __SIZEOF_INT128__ </item>
>+    <item> __SIZEOF_INT__ </item>
>+    <item> __SIZEOF_LONG_DOUBLE__ </item>
>+    <item> __SIZEOF_LONG_LONG__ </item>
>+    <item> __SIZEOF_LONG__ </item>
>+    <item> __SIZEOF_POINTER__ </item>
>+    <item> __SIZEOF_PTRDIFF_T__ </item>
>+    <item> __SIZEOF_SHORT__ </item>
>+    <item> __SIZEOF_SIZE_T__ </item>
>+    <item> __SIZEOF_WCHAR_T__ </item>
>+    <item> __SIZEOF_WINT_T__ </item>
>+    <item> __SIZE_MAX__ </item>
>+    <item> __SIZE_TYPE__ </item>
>+    <item> __SSE2_MATH__ </item>
>+    <item> __SSE2__ </item>
>+    <item> __SSE3__ </item>
>+    <item> __SSE4A__ </item>
>+    <item> __SSE4_1__ </item>
>+    <item> __SSE4_2__ </item>
>+    <item> __SSE_MATH__ </item>
>+    <item> __SSE__ </item>
>+    <item> __SSP_ALL__ </item>
>+    <item> __SSP__ </item>
>+    <item> __SSSE3__ </item>
>+    <item> __STDC_HOSTED__ </item>
>+    <item> __STDC_IEC_559_COMPLEX__ </item>
>+    <item> __STDC_IEC_559__ </item>
>+    <item> __STDC_ISO_10646__ </item>
>+    <item> __STDC_NO_THREADS__ </item>
>+    <item> __STDC_UTF_16__ </item>
>+    <item> __STDC_UTF_32__ </item>
>+    <item> __STDC_VERSION__ </item>
>+    <item> __STDC__ </item>
>+    <item> __STRICT_ANSI__ </item>
>+    <item> __TBM__ </item>
>+    <item> __TIMESTAMP__ </item>
>+    <item> __UINT16_C </item>
>+    <item> __UINT16_MAX__ </item>
>+    <item> __UINT16_TYPE__ </item>
>+    <item> __UINT32_C </item>
>+    <item> __UINT32_MAX__ </item>
>+    <item> __UINT32_TYPE__ </item>
>+    <item> __UINT64_C </item>
>+    <item> __UINT64_MAX__ </item>
>+    <item> __UINT64_TYPE__ </item>
>+    <item> __UINT8_C </item>
>+    <item> __UINT8_MAX__ </item>
>+    <item> __UINT8_TYPE__ </item>
>+    <item> __UINTMAX_C </item>
>+    <item> __UINTMAX_MAX__ </item>
>+    <item> __UINTMAX_TYPE__ </item>
>+    <item> __UINTPTR_MAX__ </item>
>+    <item> __UINTPTR_TYPE__ </item>
>+    <item> __UINT_FAST16_MAX__ </item>
>+    <item> __UINT_FAST16_TYPE__ </item>
>+    <item> __UINT_FAST32_MAX__ </item>
>+    <item> __UINT_FAST32_TYPE__ </item>
>+    <item> __UINT_FAST64_MAX__ </item>
>+    <item> __UINT_FAST64_TYPE__ </item>
>+    <item> __UINT_FAST8_MAX__ </item>
>+    <item> __UINT_FAST8_TYPE__ </item>
>+    <item> __UINT_LEAST16_MAX__ </item>
>+    <item> __UINT_LEAST16_TYPE__ </item>
>+    <item> __UINT_LEAST32_MAX__ </item>
>+    <item> __UINT_LEAST32_TYPE__ </item>
>+    <item> __UINT_LEAST64_MAX__ </item>
>+    <item> __UINT_LEAST64_TYPE__ </item>
>+    <item> __UINT_LEAST8_MAX__ </item>
>+    <item> __UINT_LEAST8_TYPE__ </item>
>+    <item> __USER_LABEL_PREFIX__ </item>
>+    <item> __USING_SJLJ_EXCEPTIONS__ </item>
>+    <item> __VA_ARGS__ </item>
>+    <item> __VERSION__ </item>
>+    <item> __WCHAR_MAX__ </item>
>+    <item> __WCHAR_MIN__ </item>
>+    <item> __WCHAR_TYPE__ </item>
>+    <item> __WCHAR_UNSIGNED__ </item>
>+    <item> __WINT_MAX__ </item>
>+    <item> __WINT_MIN__ </item>
>+    <item> __WINT_TYPE__ </item>
>+    <item> __XOP__ </item>
>+    <item> __XSAVEOPT__ </item>
>+    <item> __XSAVE__ </item>
>+    <item> __amd64 </item>
>+    <item> __amd64__ </item>
>+    <item> __amdfam10 </item>
>+    <item> __amdfam10__ </item>
>+    <item> __athlon </item>
>+    <item> __athlon__ </item>
>+    <item> __athlon_sse__ </item>
>+    <item> __atom </item>
>+    <item> __atom__ </item>
>+    <item> __bdver1 </item>
>+    <item> __bdver1__ </item>
>+    <item> __bdver2 </item>
>+    <item> __bdver2__ </item>
>+    <item> __bdver3 </item>
>+    <item> __bdver3__ </item>
>+    <item> __btver1 </item>
>+    <item> __btver1__ </item>
>+    <item> __btver2 </item>
>+    <item> __btver2__ </item>
>+    <item> __code_model_32__ </item>
>+    <item> __code_model_small__ </item>
>+    <item> __core2 </item>
>+    <item> __core2__ </item>
>+    <item> __core_avx2 </item>
>+    <item> __core_avx2__ </item>
>+    <item> __corei7 </item>
>+    <item> __corei7__ </item>
>+    <item> __cplusplus </item>
>+    <item> __geode </item>
>+    <item> __geode__ </item>
>+    <item> __gnu_linux__ </item>
>+    <item> __i386 </item>
>+    <item> __i386__ </item>
>+    <item> __i486 </item>
>+    <item> __i486__ </item>
>+    <item> __i586 </item>
>+    <item> __i586__ </item>
>+    <item> __i686 </item>
>+    <item> __i686__ </item>
>+    <item> __k6 </item>
>+    <item> __k6_2__ </item>
>+    <item> __k6_3__ </item>
>+    <item> __k6__ </item>
>+    <item> __k8 </item>
>+    <item> __k8__ </item>
>+    <item> __linux </item>
>+    <item> __linux__ </item>
>+    <item> __nocona </item>
>+    <item> __nocona__ </item>
>+    <item> __pentium </item>
>+    <item> __pentium4 </item>
>+    <item> __pentium4__ </item>
>+    <item> __pentium__ </item>
>+    <item> __pentium_mmx__ </item>
>+    <item> __pentiumpro </item>
>+    <item> __pentiumpro__ </item>
>+    <item> __pic__ </item>
>+    <item> __pie__ </item>
>+    <item> __tune_amdfam10__ </item>
>+    <item> __tune_athlon__ </item>
>+    <item> __tune_athlon_sse__ </item>
>+    <item> __tune_atom__ </item>
>+    <item> __tune_bdver1__ </item>
>+    <item> __tune_bdver2__ </item>
>+    <item> __tune_bdver3__ </item>
>+    <item> __tune_btver1__ </item>
>+    <item> __tune_btver2__ </item>
>+    <item> __tune_core2__ </item>
>+    <item> __tune_core_avx2__ </item>
>+    <item> __tune_corei7__ </item>
>+    <item> __tune_geode__ </item>
>+    <item> __tune_i386__ </item>
>+    <item> __tune_i486__ </item>
>+    <item> __tune_i586__ </item>
>+    <item> __tune_i686__ </item>
>+    <item> __tune_k6_2__ </item>
>+    <item> __tune_k6_3__ </item>
>+    <item> __tune_k6__ </item>
>+    <item> __tune_k8__ </item>
>+    <item> __tune_nocona__ </item>
>+    <item> __tune_pentium2__ </item>
>+    <item> __tune_pentium3__ </item>
>+    <item> __tune_pentium4__ </item>
>+    <item> __tune_pentium__ </item>
>+    <item> __tune_pentium_mmx__ </item>
>+    <item> __tune_pentiumpro__ </item>
>+    <item> __unix </item>
>+    <item> __unix__ </item>
>+    <item> __x86_64 </item>
>+    <item> __x86_64__ </item>
>+    <item> i386 </item>
>+    <item> linux </item>
>+    <item> unix </item>
>+  </list>
>+  <contexts>
>+    <context name="DetectGccExtensions" attribute="Normal Text" lineEndContext="#stay">
>+      <keyword attribute="GNU Macros" context="#stay" String="GNUMacros" />
>+      <keyword attribute="GNU Functions" context="#stay" String="GNUFunctions" />
>+      <keyword attribute="GNU Types" context="#stay" String="GNUTypes" />
>+      <StringDetect attribute="GNU Extensions" context="AttrArgs" String="__attribute__" />
>+      <StringDetect attribute="GNU Extensions" context="AttrArgs" String="__declspec" />
>+      <keyword attribute="GNU Extensions" context="#stay" String="GNUKeywords" />
>+      <RegExpr attribute="GNU Functions" context="#stay" String="__builtin_[a-zA-Z0-9_]+" />
>+      
>+      <RegExpr attribute="GNU Extensions" context="#stay" String="0[Bb][01]+([Uu][Ll]{0,2}|[Ll]{0,2}[Uu]?|_[_0-9A-Za-z]*)?\b" />
>+    </context>
>+
>+    <context name="GNUMacros" attribute="Normal Text" lineEndContext="#stay">
>+      <keyword attribute="GNU Macros" context="#stay" String="GNUMacros" />
>+    </context>
>+
>+    <context name="AttrArgs" attribute="GNU Extensions" lineEndContext="#pop">
>+      <Detect2Chars attribute="GNU Extensions" context="#stay" char="(" char1="(" />
>+      <Detect2Chars attribute="GNU Extensions" context="#pop" char=")" char1=")" />
>+      <DetectChar attribute="GNU Extensions" context="Close" char="(" />
>+    </context>
>+
>+    <context name="Close" attribute="GNU Extensions" lineEndContext="#stay">
>+      <DetectChar attribute="GNU Extensions" context="#pop" char=")" />
>+    </context>
>+
>+  </contexts>
>+
>+  <itemDatas>
>+    <itemData name="Normal Text"    defStyleNum="dsNormal" spellChecking="false" />
>+    <itemData name="GNU Extensions" defStyleNum="dsOthers" spellChecking="false" italic="1" />
>+    <itemData name="GNU Functions"  defStyleNum="dsOthers" spellChecking="false" />
>+    <itemData name="GNU Macros"     defStyleNum="dsOthers" spellChecking="false" />
>+    <itemData name="GNU Types"      defStyleNum="dsOthers" spellChecking="false" />
>+  </itemDatas>
>+</highlighting>
>+
>+<general>
>+  <comments>
>+    <comment name="singleLine" start="//"/>
>+  </comments>
>+  <keywords casesensitive="1"/>
>+</general>
>+</language>
>+
>diff -urN tdelibs/kate/data/gdb.xml tdelibs.new/kate/data/gdb.xml
>--- tdelibs/kate/data/gdb.xml	2013-03-02 15:57:35.000000000 -0600
>+++ tdelibs.new/kate/data/gdb.xml	2013-12-26 13:26:41.578324761 -0600
>@@ -8,7 +8,7 @@
> -->
> 
> <language name="GDB Backtrace" section="Other"
>-          version="1.0" kateversion="2.4"
>+          version="1.0" kateversion="2.5"
>           extensions="*.kcrash;*.crash;*.bt"
>           mimetype=""
>           author="Milian Wolff (mail@milianw.de)" license="LGPL">
>diff -urN tdelibs/kate/data/gdl.xml tdelibs.new/kate/data/gdl.xml
>--- tdelibs/kate/data/gdl.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/gdl.xml	2013-12-26 13:26:41.897323401 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="GDL" version="1.01" kateversion="2.0" section="Scientific" extensions="*.gdl;*.vcg;*.GDL;*.VCG" mimetype="">
>+<language name="GDL" version="1.01" kateversion="2.5" section="Scientific" extensions="*.gdl;*.vcg;*.GDL;*.VCG" mimetype="">
>  <highlighting>
>   <list name="colors">
>    <item> white </item>
>diff -urN tdelibs/kate/data/gettext.xml tdelibs.new/kate/data/gettext.xml
>--- tdelibs/kate/data/gettext.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/gettext.xml	2013-12-26 13:26:41.429325398 -0600
>@@ -23,7 +23,7 @@
>   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
>   Boston, MA  02110-1301, USA.
>  -->
>-<language name="GNU Gettext" version="2.00" kateversion="2.4" section="Markup" extensions="*.po;*.pot" mimetype="text/x-gettext-translation" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL">
>+<language name="GNU Gettext" version="2.00" kateversion="2.5" section="Markup" extensions="*.po;*.pot" mimetype="text/x-gettext-translation" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL">
>   <highlighting>
> 
>     <contexts>
>diff -urN tdelibs/kate/data/git-rebase.xml tdelibs.new/kate/data/git-rebase.xml
>--- tdelibs/kate/data/git-rebase.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/git-rebase.xml	2013-12-26 13:26:41.341325775 -0600
>@@ -0,0 +1,65 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd">
>+<language name="Git Rebase" version="1.00" kateversion="2.5" section="Other" extensions="git-rebase-todo" license="LGPL" mimetype="text/vnd.git.rebase" author="Orgad Shaneh (orgads@gmail.com)">
>+  <highlighting>
>+    <list name="pick">
>+      <item>p</item>
>+      <item>pick</item>
>+    </list>
>+    <list name="reword">
>+      <item>r</item>
>+      <item>reword</item>
>+    </list>
>+    <list name="edit">
>+      <item>e</item>
>+      <item>edit</item>
>+    </list>
>+    <list name="squash">
>+      <item>s</item>
>+      <item>squash</item>
>+    </list>
>+    <list name="fixup">
>+      <item>f</item>
>+      <item>fixup</item>
>+    </list>
>+    <list name="exec">
>+      <item>x</item>
>+      <item>exec</item>
>+    </list>
>+    <contexts>
>+      <context attribute="Normal Text" lineEndContext="#pop" name="Normal">
>+    <DetectChar char="#" attribute="Comment" context="Comment" column="0"/>
>+    <keyword attribute="Pick" context="Commit" String="pick" />
>+    <keyword attribute="Reword" context="Commit" String="reword" />
>+    <keyword attribute="Edit" context="Commit" String="edit" />
>+    <keyword attribute="Squash" context="Commit" String="squash" />
>+    <keyword attribute="Fixup" context="Commit" String="fixup" />
>+    <keyword attribute="Exec" context="Commit" String="exec" />
>+      </context>
>+      <context attribute="Commit" lineEndContext="#pop" name="Commit">
>+        <RegExpr attribute="Commit" context="Summary" String="[0-9a-f]{7,40}" />
>+      </context>
>+      <context attribute="Summary" lineEndContext="#pop" name="Summary" />
>+      <context attribute="Comment" lineEndContext="#pop" name="Comment">
>+        <RegExpr attribute="Commit" context="#stay" String="[0-9a-f]{7,40}" />
>+      </context>
>+    </contexts>
>+    <itemDatas>
>+      <itemData name="Normal Text" defStyleNum="dsNormal"/>
>+      <itemData name="Pick"  defStyleNum="dsKeyword"/>
>+      <itemData name="Reword"  defStyleNum="dsDecVal"/>
>+      <itemData name="Edit"  defStyleNum="dsDataType"/>
>+      <itemData name="Squash"  defStyleNum="dsChar"/>
>+      <itemData name="Fixup"  defStyleNum="dsBaseN"/>
>+      <itemData name="Exec"  defStyleNum="dsOthers"/>
>+      <itemData name="Commit" defStyleNum="dsFunction"/>
>+      <itemData name="Summary" defStyleNum="dsString"/>
>+      <itemData name="Comment" defStyleNum="dsComment"/>
>+    </itemDatas>
>+  </highlighting>
>+  <general>
>+    <comments>
>+      <comment name="singleLine" start="#"/>
>+    </comments>
>+  </general>
>+</language>
>diff -urN tdelibs/kate/data/glosstex.xml tdelibs.new/kate/data/glosstex.xml
>--- tdelibs/kate/data/glosstex.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/glosstex.xml	2013-12-26 13:26:42.080322620 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="GlossTex" version="0.01" kateversion="2.1" extensions="*.gdf" section="Markup" mimetype="text/x-gdf" casesensitive="1" author="Thomas Braun(braun@physik.fu-berlin.de)" license="LGPL">
>+<language name="GlossTex" version="0.01" kateversion="2.5" extensions="*.gdf" section="Markup" mimetype="text/x-gdf" casesensitive="1" author="Thomas Braun(braun@physik.fu-berlin.de)" license="LGPL">
>   <highlighting>
>     <contexts>
>       <context name="Comment" attribute="Comment" lineEndContext="#stay">
>diff -urN tdelibs/kate/data/glsl.xml tdelibs.new/kate/data/glsl.xml
>--- tdelibs/kate/data/glsl.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/glsl.xml	2013-12-26 13:26:41.108326769 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="GLSL" section="Sources" extensions="*.glsl;*.vert;*.frag;*.geom" mimetype="text/x-glslsrc" version="1.03" kateversion="2.4" author="Oliver Richers (o.richers@tu-bs.de)" license="LGPL">
>+<language name="GLSL" section="Sources" extensions="*.glsl;*.vert;*.frag;*.geom" mimetype="text/x-glslsrc" version="1.03" kateversion="2.5" author="Oliver Richers (o.richers@tu-bs.de)" license="LGPL">
> 	<highlighting>
> 		<list name="keywords">
> 			<item>break</item>
>diff -urN tdelibs/kate/data/gnuassembler.xml tdelibs.new/kate/data/gnuassembler.xml
>--- tdelibs/kate/data/gnuassembler.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/gnuassembler.xml	2013-12-26 13:26:42.041322786 -0600
>@@ -43,7 +43,7 @@
> 
> -->
> 
>-<language name="GNU Assembler" version="1.10" kateversion="2.4" section="Assembler" extensions="*.s;*.S" mimetype="text/x-asm" author="John Zaitseff (J.Zaitseff@zap.org.au), Roland Pabel (roland@pabel.name), Miquel SabatÃ© (mikisabate@gmail.com)" license="GPL">
>+<language name="GNU Assembler" version="1.10" kateversion="2.5" section="Assembler" extensions="*.s;*.S" mimetype="text/x-asm" author="John Zaitseff (J.Zaitseff@zap.org.au), Roland Pabel (roland@pabel.name), Miquel SabatÃ© (mikisabate@gmail.com)" license="GPL">
>   <highlighting>
>     <list name="keywords">
>       <item>.abort</item>
>diff -urN tdelibs/kate/data/gnuplot.xml tdelibs.new/kate/data/gnuplot.xml
>--- tdelibs/kate/data/gnuplot.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/gnuplot.xml	2013-12-26 13:26:41.333325809 -0600
>@@ -0,0 +1,888 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd">
>+<language name="Gnuplot" version="0.1" kateversion="2.5" section="Scripts" extensions="*.gnuplot;*.gp;*.gplt" casesensitive="1" >
>+  <highlighting>
>+   <list name="set_no_keywords">
>+       <item> noarrow </item>
>+       <item> noborder </item>
>+       <item> noclabel </item>
>+       <item> noclip </item>
>+       <item> nocontour </item>
>+       <item> nodgrid3d </item>
>+       <item> nogrid </item>
>+       <item> nohidden3d </item>
>+       <item> nokey </item>
>+       <item> nolabel </item>
>+       <item> nolinestyle </item>
>+       <item> nomultiplot </item>
>+       <item> nomx2tics </item>
>+       <item> nomxtics </item>
>+       <item> nomy2tics </item>
>+       <item> nomytics </item>
>+       <item> nomztics </item>
>+       <item> nooffsets </item>
>+       <item> noparametric </item>
>+       <item> nopolar </item>
>+       <item> nosurface </item>
>+       <item> notimestamp </item>
>+       <item> nox2dtics </item>
>+       <item> nox2mtics </item>
>+       <item> nox2tics </item>
>+       <item> nox2zeroaxis </item>
>+       <item> noxdtics </item>
>+       <item> noxmtics </item>
>+       <item> noxtics </item>
>+       <item> noxzeroaxis </item>
>+       <item> noy2dtics </item>
>+       <item> noy2mtics </item>
>+       <item> noy2tics </item>
>+       <item> noy2zeroaxis </item>
>+       <item> noydtics </item>
>+       <item> noymtics </item>
>+       <item> noytics </item>
>+       <item> noyzeroaxis </item>
>+       <item> nozdtics </item>
>+       <item> nozeroaxis </item>
>+       <item> nozmtics </item>
>+       <item> noztics </item>
>+   </list>
>+
>+   <list name="set_simple_keywords">
>+       <item> grid </item>
>+       <item> parametric </item>
>+   </list>
>+
>+   <list name="showkeywords">
>+      <item> angles </item>
>+      <item> arrow </item>
>+      <item> bar </item>
>+      <item> border </item>
>+      <item> boxwidth </item>
>+      <item> clip </item>
>+      <item> cntrparam </item>
>+      <item> data </item>
>+      <item> dgrid3d </item>
>+      <item> dummy </item>
>+      <item> encoding </item>
>+      <item> format </item>
>+      <item> function </item>
>+      <item> functions </item>
>+      <item> hidden3d </item>
>+      <item> isosamples </item>
>+      <item> label </item>
>+      <item> linestyle </item>
>+      <item> mapping </item>
>+      <item> margin </item>
>+      <item> mx2tics </item>
>+      <item> mxtics </item>
>+      <item> my2tics </item>
>+      <item> mytics </item>
>+      <item> mztics </item>
>+      <item> offsets </item>
>+      <item> origin </item>
>+      <item> parametric </item>
>+      <item> pointsize </item>
>+      <item> polar </item>
>+      <item> samples </item>
>+      <item> size </item>
>+      <item> data style </item>
>+      <item> function style </item>
>+      <item> surface </item>
>+      <item> tics </item>
>+      <item> ticscale </item>
>+      <item> ticslevel </item>
>+      <item> timefmt </item>
>+      <item> timestamp </item>
>+      <item> variables </item>
>+      <item> version </item>
>+      <item> view </item>
>+      <item> x2data </item>
>+      <item> x2dtics </item>
>+      <item> x2label </item>
>+      <item> x2mtics </item>
>+      <item> x2tics </item>
>+      <item> x2zeroaxis </item>
>+      <item> xdata </item>
>+      <item> xdtics </item>
>+      <item> xmtics </item>
>+      <item> xtics </item>
>+      <item> xzeroaxis </item>
>+      <item> y2data </item>
>+      <item> y2dtics </item>
>+      <item> y2mtics </item>
>+      <item> y2tics </item>
>+      <item> y2zeroaxis </item>
>+      <item> ydata </item>
>+      <item> ydtics </item>
>+      <item> ymtics </item>
>+      <item> ytics </item>
>+      <item> yzeroaxis </item>
>+      <item> zdata </item>
>+      <item> zdtics </item>
>+      <item> zero </item>
>+      <item> zeroaxis </item>
>+      <item> zmtics </item>
>+      <item> ztics </item>
>+   </list>
>+
>+   <list name="set_label_keywords">
>+      <item> clabel </item>
>+      <item> title </item>
>+      <item> xlabel </item>
>+      <item> x2label </item>
>+      <item> ylabel </item>
>+      <item> y2label </item>
>+      <item> zlabel </item>
>+   </list>
>+
>+   <list name="set_range_keywords">
>+      <item> rrange </item>
>+      <item> trange </item>
>+      <item> urange </item>
>+      <item> vrange </item>
>+      <item> x2range </item>
>+      <item> xrange </item>
>+      <item> y2range </item>
>+      <item> yrange </item>
>+      <item> zrange </item>
>+   </list>
>+
>+   <list name="set_contour_keywords">
>+      <item> base </item>
>+      <item> surface </item>
>+      <item> both </item>
>+   </list>
>+
>+   <list name="set_key_keywords">
>+      <item> left </item>
>+      <item> right </item>
>+      <item> top </item>
>+      <item> bottom </item>
>+      <item> outside </item>
>+      <item> below </item>
>+      <item> Left </item>
>+      <item> Right </item>
>+      <item> noreverse </item>
>+      <item> reverse </item>
>+   </list>
>+
>+   <list name="set_scale_keywords">
>+      <item> noautoscale </item>
>+      <item> autoscale </item>
>+      <item> nologscale </item>
>+   </list>
>+
>+   <list name="set_scale_axes_keywords">
>+      <item> x </item>
>+      <item> y </item>
>+      <item> z </item>
>+      <item> x2 </item>
>+      <item> y2 </item>
>+      <item> xy </item>
>+   </list>
>+
>+   <list name="set_terminal_keywords">
>+      <item> aed512 </item>
>+      <item> aed767 </item>
>+      <item> aifm </item>
>+      <item> bitgraph </item>
>+      <item> cgm </item>
>+      <item> dumb </item>
>+      <item> dxf </item>
>+      <item> dxy800a </item>
>+      <item> eepic </item>
>+      <item> epson-180dpi </item>
>+      <item> epson-60dpi </item>
>+      <item> epson-lx800 </item>
>+      <item> excl </item>
>+      <item> gpic </item>
>+      <item> hp2623a </item>
>+      <item> hp2648 </item>
>+      <item> kc-tek40xx </item>
>+      <item> km-tek40xx </item>
>+      <item> kyo </item>
>+      <item> mf </item>
>+      <item> mif </item>
>+      <item> mp </item>
>+      <item> nec-cp6 </item>
>+      <item> okidata </item>
>+      <item> prescribe </item>
>+      <item> pstricks </item>
>+      <item> qms </item>
>+      <item> regis </item>
>+      <item> rgip </item>
>+      <item> selanar </item>
>+      <item> starc </item>
>+      <item> table </item>
>+      <item> tandy-60dpi </item>
>+      <item> tek40xx </item>
>+      <item> tek410x </item>
>+      <item> texdraw </item>
>+      <item> uniplex </item>
>+      <item> unixplot </item>
>+      <item> vttek </item>
>+      <item> vx384 </item>
>+      <item> x11 </item>
>+   </list>
>+
>+   <list name="set_terminal_ps_keywords">
>+      <item> landscape </item>
>+      <item> portrait </item>
>+      <item> eps </item>
>+      <item> default </item>
>+      <item> enhanced </item>
>+      <item> noenhanced </item>
>+      <item> solid </item>
>+      <item> dashed </item>
>+      <item> defaultplex </item>
>+      <item> simplex </item>
>+      <item> duplex </item>
>+   </list>
>+
>+   <list name="set_terminal_latex_keywords">
>+      <item> courier </item>
>+      <item> roman </item>
>+      <item> default </item>
>+   </list>
>+
>+   <list name="set_terminal_pstex_keywords">
>+      <item> color </item>
>+      <item> monochrome </item>
>+      <item> dashed </item>
>+      <item> rotate </item>
>+      <item> norotate </item>
>+      <item> auxfile </item>
>+   </list>
>+
>+   <list name="set_terminal_png_keywords">
>+      <item> transparent </item>
>+      <item> notransparent </item>
>+   </list>
>+
>+   <list name="set_terminal_pbm_keywords">
>+      <item> small </item>
>+      <item> medium </item>
>+      <item> large </item>
>+      <item> monochrome </item>
>+      <item> gray </item>
>+      <item> color </item>
>+   </list>
>+
>+   <list name="set_terminal_tgif_keywords">
>+      <item> landscape </item>
>+      <item> portrait </item>
>+      <item> solid </item>
>+      <item> dashed </item>
>+   </list>
>+
>+   <list name="set_terminal_fig_keywords">
>+      <item> monochrome </item>
>+      <item> color </item>
>+      <item> small </item>
>+      <item> big </item>
>+      <item> pointsmax </item>
>+      <item> landscape </item>
>+      <item> portrait </item>
>+      <item> metric </item>
>+      <item> inches </item>
>+      <item> fontsize </item>
>+      <item> size </item>
>+      <item> thickness </item>
>+      <item> depth </item>
>+   </list>
>+
>+   <list name="set_terminal_corel_keywords">
>+      <item> monochrome </item>
>+      <item> color </item>
>+   </list>
>+
>+   <list name="set_terminal_hppj_keywords">
>+      <item> FNT5X9 </item>
>+      <item> FNT9X17 </item>
>+      <item> FNT13X25 </item>
>+   </list>
>+
>+   <list name="set_terminal_pcl5_keywords">
>+      <item> mode </item>
>+      <item> landscape </item>
>+      <item> portrait </item>
>+      <item> monochrome </item>
>+      <item> color </item>
>+      <item> solid </item>
>+      <item> dashed </item>
>+      <item> letter </item>
>+      <item> legal </item>
>+      <item> noextended </item>
>+      <item> extended </item>
>+      <item> stick </item>
>+      <item> univers </item>
>+      <item> cg_times </item>
>+      <item> zapf_dingbats </item>
>+      <item> antique_olive </item>
>+      <item> arial </item>
>+      <item> courier </item>
>+      <item> garamond_antigua </item>
>+      <item> letter_gothic </item>
>+      <item> cg_omega </item>
>+      <item> albertus </item>
>+      <item> times_new_roman </item>
>+      <item> clarendon </item>
>+      <item> coronet </item>
>+      <item> marigold </item>
>+      <item> truetype_symbols </item>
>+      <item> wingdings </item>
>+   </list>
>+
>+   <list name="set_terminal_hpdj_keywords">
>+      <item> 75 </item>
>+      <item> 100 </item>
>+      <item> 150 </item>
>+      <item> 300 </item>
>+   </list>
>+
>+   <list name="set_terminal_imagen_keywords">
>+      <item> landscape </item>
>+      <item> portrait </item>
>+   </list>
>+
>+   <list name="plot_smooth_keywords">
>+       <item> acsplines </item>
>+       <item> bezier </item>
>+       <item> csplines </item>
>+       <item> sbezier </item>
>+       <item> unique </item>
>+   </list>
>+
>+   <list name="plot_axes_keywords">
>+       <item> x1y1 </item>
>+       <item> x2y1 </item>
>+       <item> x1y2 </item>
>+       <item> x2y2 </item>
>+   </list>
>+
>+   <list name="splot_style_keywords">
>+      <item> lines </item>
>+      <item> l </item>
>+      <item> points </item>
>+      <item> p </item>
>+      <item> linespoints </item>
>+      <item> linesp </item>
>+      <item> impulses </item>
>+      <item> i </item>
>+      <item> dots </item>
>+      <item> d </item>
>+      <item> steps </item>
>+      <item> fsteps </item>
>+      <item> histeps </item>
>+    </list>
>+
>+    <list name="plot_style_keywords">
>+      <item> errorbars </item>
>+      <item> xerrorbars </item>
>+      <item> yerrorbars </item>
>+      <item> xyerrorbars </item>
>+      <item> boxes </item>
>+      <item> boxerrorbars </item>
>+      <item> boxxyerrorbars </item>
>+      <item> financebars </item>
>+      <item> candlesticks </item>
>+      <item> vector </item>
>+   </list>
>+
>+   <list name="plot_astyle_keywords">
>+      <item> linestyle </item>
>+      <item> ls </item>
>+      <item> linetype </item>
>+      <item> lt </item>
>+      <item> linewidth </item>
>+      <item> lw </item>
>+      <item> pointtype </item>
>+      <item> pt </item>
>+      <item> pointsize </item>
>+      <item> ps </item>
>+  </list>
>+
>+   <list name="simple_commands">
>+      <item> replot </item>
>+      <item> exit </item>
>+      <item> quit </item>
>+      <item> clear </item>
>+      <item> reset </item>
>+   </list>
>+
>+   <contexts>
>+      <context attribute="Normal Text" name="default" lineEndContext="#stay">
>+          <RegExpr attribute="Keyword" context="#stay" String="^#!\/.*" />
>+          <StringDetect attribute="Keyword" context="show" String="show" />
>+	  <StringDetect attribute="Keyword" context="set" String="set" />
>+          <StringDetect attribute="Keyword" context="plot" String="plot" />
>+	  <StringDetect attribute="Keyword" context="splot" String="splot" />
>+	  <StringDetect attribute="Keyword" context="pause" String="pause"/>
>+	  <keyword attribute="Keyword" context="#stay" String="simple_commands"/>
>+          <StringDetect attribute="Keyword" context="pause_1" String="load"/>
>+	  <StringDetect attribute="Keyword" context="save" String="save"/>
>+	  <RegExpr attribute="Comment" context="comment" String="#" />
>+      </context>
>+
>+      <context attribute="Normal Text" name="pause" lineEndContext="default">
>+          <Int attribute="Decimal" context="pause_1" />
>+	  <Detect2Chars attribute="Decimal" context="pause_1" char="-" char1="1" />
>+      </context>
>+      <context attribute="Normal Text" name="pause_1" lineEndContext="default">
>+         <DetectChar attribute="Data Type" context="label_string1" char="'"/>
>+	 <DetectChar attribute="Data Type" context="label_string2" char="&quot;"/>
>+      </context>
>+
>+      <context attribute="Normal Text" name="save" lineEndContext="default">
>+         <StringDetect attribute="Funktion" context="save1" String="functions"/>
>+         <StringDetect attribute="Funktion" context="save1" String="var"/>
>+         <StringDetect attribute="Funktion" context="save1" String="variables"/>
>+	 <StringDetect attribute="Funktion" context="save1" String="set"/>
>+         <DetectChar attribute="Data Type" context="label_string1" char="'"/>
>+	 <DetectChar attribute="Data Type" context="label_string2" char="&quot;"/>
>+      </context>
>+
>+      <context attribute="Normal Text" name="save1" lineEndContext="default">
>+         <DetectChar attribute="Data Type" context="label_string1" char="'"/>
>+	 <DetectChar attribute="Data Type" context="label_string2" char="&quot;"/>
>+      </context>
>+
>+      <context attribute="Normal Text" name="show" lineEndContext="default">
>+          <keyword attribute="Funktion" context="default" String="showkeywords" />
>+          <keyword attribute="Funktion" context="default" String="set_label_keywords" />
>+	  <keyword attribute="Funktion" context="default" String="set_simple_keywords" />
>+          <keyword attribute="Funktion" context="default" String="set_range_keywords" />
>+          <StringDetect attribute="Funktion" context="default" String="contour" />
>+	  <StringDetect attribute="Funktion" context="default" String="terminal" />
>+          <StringDetect attribute="Funktion" context="default" String="term" />
>+	  <StringDetect attribute="Funktion" context="default" String="all" />
>+	  <StringDetect attribute="Funktion" context="default" String="autoscale" />
>+	  <StringDetect attribute="Funktion" context="default" String="logscale" />
>+	  <StringDetect attribute="Funktion" context="default" String="key" />
>+      </context>
>+
>+      <context attribute="Normal Text" name="set" lineEndContext="default">
>+          <keyword attribute="Funktion" context="set_2" String="showkeywords" />
>+          <keyword attribute="Funktion" context="set_label" String="set_label_keywords" />
>+	  <keyword attribute="Funktion" context="set_range" String="set_range_keywords" />
>+	  <keyword attribute="Funktion" context="default" String="set_simple_keywords" />
>+	  <keyword attribute="Funktion" context="default" String="set_no_keywords" />
>+	  <keyword attribute="Funktion" context="set_autoscale" String="set_scale_keywords" />  <StringDetect attribute="Funktion" context="set_contour" String="contour" />
>+          <StringDetect attribute="Funktion" context="set_terminal" String="terminal" />
>+          <StringDetect attribute="Funktion" context="set_terminal" String="term" />
>+	  <StringDetect attribute="Funktion" context="set_logscale" String="logscale" />
>+	  <StringDetect attribute="Funktion" context="set_key" String="key" />
>+      </context>
>+
>+      <context attribute="Data Type" name="set_2" lineEndContext="default" />
>+
>+      <context attribute="Normal Text" name="set_label" lineEndContext="default">
>+         <DetectChar attribute="Data Type" context="label_string1" char="'"/>
>+	 <DetectChar attribute="Data Type" context="label_string2" char="&quot;"/>
>+      </context>
>+      <context attribute="Data Type" name="label_string1" lineEndContext="#stay">
>+         <DetectChar attribute="Data Type" context="default" char="'"/>
>+      </context>
>+      <context attribute="Data Type" name="label_string2" lineEndContext="#stay">
>+         <DetectChar attribute="Data Type" context="default" char="&quot;"/>
>+      </context>
>+
>+      <context attribute="Normal Text" name="set_range" lineEndContext="default">
>+         <DetectChar attribute="Data Type" context="set_range_1" char="["/>
>+      </context>
>+      <context attribute="Data Type" name="set_range_1" lineEndContext="default">
>+         <DetectChar attribute="Data Type" context="default" char="]"/>
>+      </context>
>+
>+      <context attribute="Normal Text" name="set_key" lineEndContext="default">
>+         <keyword attribute="Data Type" context="#stay" String="set_key_keywords" />
>+         <StringDetect attribute="Funktion" context="set_key_1" String="samplen" />
>+         <StringDetect attribute="Funktion" context="set_key_2" String="spacing" />
>+         <StringDetect attribute="Funktion" context="set_key_3" String="with" />
>+         <StringDetect attribute="Funktion" context="set_key_4" String="title" />
>+	 <StringDetect attribute="Funktion" context="default" String="nobox" />
>+         <StringDetect attribute="Funktion" context="set_key_5" String="box" />
>+      </context>
>+      <context attribute="Normal Text" name="set_key_1" lineEndContext="default">
>+         <Int attribute="Data Type" context="set_key_11" />
>+	 <Float attribute="Data Type" context="set_key_11" />
>+      </context>
>+      <context attribute="Normal Text" name="set_key_11" lineEndContext="default">
>+         <StringDetect attribute="Funktion" context="set_key_2" String="spacing" />
>+         <StringDetect attribute="Funktion" context="set_key_3" String="with" />
>+         <StringDetect attribute="Funktion" context="set_key_4" String="title" />
>+	 <StringDetect attribute="Funktion" context="default" String="nobox" />
>+         <StringDetect attribute="Funktion" context="set_key_5" String="box" />
>+      </context>
>+      <context attribute="Normal Text" name="set_key_2" lineEndContext="default">
>+         <Int attribute="Data Type" context="set_key_21" />
>+	 <Float attribute="Data Type" context="set_key_21" />
>+      </context>
>+      <context attribute="Normal Text" name="set_key_21" lineEndContext="default">
>+         <StringDetect attribute="Funktion" context="set_key_3" String="with" />
>+         <StringDetect attribute="Funktion" context="set_key_4" String="title" />
>+	 <StringDetect attribute="Funktion" context="default" String="nobox" />
>+         <StringDetect attribute="Funktion" context="set_key_5" String="box" />
>+      </context>
>+      <context attribute="Normal Text" name="set_key_3" lineEndContext="default">
>+         <Int attribute="Data Type" context="set_key_31" />
>+	 <Float attribute="Data Type" context="set_key_31" />
>+      </context>
>+      <context attribute="Normal Text" name="set_key_31" lineEndContext="default">
>+         <StringDetect attribute="Funktion" context="set_key_4" String="title" />
>+	 <StringDetect attribute="Funktion" context="default" String="nobox" />
>+         <StringDetect attribute="Funktion" context="set_key_5" String="box" />
>+      </context>
>+      <context attribute="Normal Text" name="set_key_4" lineEndContext="default">
>+         <DetectChar attribute="Data Type" context="set_key_41" char="&quot;"/>
>+      </context>
>+      <context attribute="Data Type" name="set_key_41" lineEndContext="default">
>+         <DetectChar attribute="Data Type" context="set_key_42" char="&quot;"/>
>+      </context>
>+      <context attribute="Data Type" name="set_key_42" lineEndContext="default">
>+	 <StringDetect attribute="Funktion" context="default" String="nobox" />
>+         <StringDetect attribute="Funktion" context="set_key_5" String="box" />
>+      </context>
>+      <context attribute="Normal Text" name="set_key_5" lineEndContext="default">
>+         <keyword attribute="Data Type" context="#stay" String="plot_astyle_keywords" />
>+	 <Int attribute="Data Type" context="#stay" />
>+      </context>
>+
>+      <context attribute="Normal Text" name="set_contour" lineEndContext="default">
>+         <keyword attribute="Data Type" context="default" String="set_contour_keywords" />
>+      </context>
>+
>+      <context attribute="Normal Text" name="set_autoscale" lineEndContext="default">
>+         <keyword attribute="Data Type" context="set_autoscale_1" String="set_scale_axes_keywords"/>
>+      </context>
>+      <context attribute="Normal Text" name="set_autoscale_1" lineEndContext="default">
>+          <StringDetect attribute="Data Type" context="default" String="min" />
>+          <StringDetect attribute="Data Type" context="default" String="max" />
>+      </context>
>+
>+      <context attribute="Normal Text" name="set_logscale" lineEndContext="default">
>+         <keyword attribute="Data Type" context="#stay" String="set_scale_axes_keywords"/>
>+	 <Int attribute="Data Type" context="default" />
>+	 <Float attribute="Data Type" context="default" />
>+      </context>
>+
>+      <context attribute="Normal Text" name="set_terminal" lineEndContext="default">
>+         <keyword attribute="Data Type" context="default" String="set_terminal_keywords" />
>+         <StringDetect attribute="Data Type" context="set_terminal_ps" String="postscript" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_ps" String="post" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_latex" String="latex" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_latex" String="emtex" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_pstex" String="pslatex" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_pstex" String="pstex" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_tpic" String="tpic" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_png" String="png" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_pbm" String="pbm" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_tgif" String="tgif" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_fig" String="fig" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_corel" String="corel" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_hpgl" String="hpgl" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_pcl5" String="pcl5" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_hpdj" String="hpdj" />
>+         <StringDetect attribute="Data Type" context="set_terminal_hpdj" String="hpljii" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_hp500c" String="hp500c" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_hppj" String="hppj" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_imagen" String="imagen" />
>+	 <StringDetect attribute="Data Type" context="set_terminal_tkcanvas" String="tkcanvas" />
>+	 </context>
>+
>+      <context attribute="Normal Text" name="set_terminal_ps" lineEndContext="default">
>+         <keyword attribute="Data Type" context="#stay" String="set_terminal_ps_keywords" />
>+	 <Int attribute="Decimal" context="default" />
>+         <DetectChar attribute="Data Type" context="set_terminal_ps_font" char="&quot;"/>
>+      </context>
>+      <context attribute="Data Type" name="set_terminal_ps_font" lineEndContext="#stay">
>+	      <DetectChar attribute="Data Type" context="#pop" char="&quot;"/>
>+      </context>
>+      <context attribute="Normal Text" name="set_terminal_latex" lineEndContext="default">
>+         <keyword attribute="Data Type" context="#stay" String="set_terminal_latex_keywords" />
>+	 <Int attribute="Decimal" context="default" />
>+      </context>
>+      <context attribute="Normal Text" name="set_terminal_png" lineEndContext="default">
>+         <keyword attribute="Data Type" context="#stay" String="set_terminal_png_keywords" />
>+	 <keyword attribute="Data Type" context="#stay" String="set_terminal_pbm_keywords" />
>+      </context>
>+      <context attribute="Normal Text" name="set_terminal_pbm" lineEndContext="default">
>+	  <keyword attribute="Data Type" context="#stay" String="set_terminal_pbm_keywords" />
>+      </context>
>+      <context attribute="Normal Text" name="set_terminal_pstex" lineEndContext="default">
>+         <keyword attribute="Data Type" context="#stay" String="set_terminal_pstex_keywords" />
>+	 <Int attribute="Decimal" context="default" />
>+      </context>
>+      <context attribute="Normal Text" name="set_terminal_tgif" lineEndContext="default">
>+         <keyword attribute="Data Type" context="#stay" String="set_terminal_tgif_keywords" />
>+	 <Int attribute="Decimal" context="default" />
>+         <DetectChar attribute="Data Type" context="set_terminal_ps_font" char="&quot;"/>
>+      </context>
>+      <context attribute="Normal Text" name="set_terminal_tpic" lineEndContext="default">
>+	 <Int attribute="Decimal" context="#stay" />
>+	 <Float attribute="Decimal" context="#stay" />
>+      </context>
>+      <context attribute="Normal Text" name="set_terminal_fig" lineEndContext="default">
>+         <keyword attribute="Data Type" context="#stay" String="set_terminal_fig_keywords" />
>+	 <Int attribute="Decimal" context="#stay" />
>+      </context>
>+      <context attribute="Normal Text" name="set_terminal_corel" lineEndContext="default">
>+         <keyword attribute="Data Type" context="#stay" String="set_terminal_corel_keywords" />
>+	 <Int attribute="Decimal" context="#stay" />
>+	 <Float attribute="Decimal" context="#stay" />
>+	 <DetectChar attribute="Data Type" context="set_terminal_ps_font" char="&quot;"/>
>+      </context>
>+      <context attribute="Normal Text" name="set_terminal_hpgl" lineEndContext="default">
>+         <StringDetect  attribute="Data Type" context="default" String="eject" />
>+	 <Int attribute="Decimal" context="#stay" />
>+      </context>
>+      <context attribute="Normal Text" name="set_terminal_pcl5" lineEndContext="default">
>+         <keyword attribute="Data Type" context="#stay" String="set_terminal_pcl5_keywords" />
>+	 <Int attribute="Decimal" context="#stay" />
>+      </context>
>+      <context attribute="Normal Text" name="set_terminal_hpdj" lineEndContext="default">
>+         <keyword attribute="Data Type" context="#stay" String="set_terminal_hpdj_keywords" />
>+      </context>
>+      <context attribute="Normal Text" name="set_terminal_hp500c" lineEndContext="default">
>+         <keyword attribute="Data Type" context="#stay" String="set_terminal_hpdj_keywords" />
>+         <StringDetect  attribute="Data Type" context="#stay" String="color" />
>+         <StringDetect  attribute="Data Type" context="#stay" String="compression" />
>+      </context>
>+      <context attribute="Normal Text" name="set_terminal_hppj" lineEndContext="default">
>+         <keyword attribute="Data Type" context="default" String="set_terminal_hppj_keywords" />
>+      </context>
>+      <context attribute="Normal Text" name="set_terminal_imagen" lineEndContext="default">
>+         <keyword attribute="Data Type" context="#stay" String="set_terminal_imagen_keywords" />
>+	 <Int attribute="Decimal" context="#stay" />
>+         <DetectChar attribute="Decimal" context="#stay" char="["/>
>+	 <DetectChar attribute="Decimal" context="default" char="]"/>
>+      </context>
>+      <context attribute="Normal Text" name="set_terminal_tkcanvas" lineEndContext="default">
>+         <StringDetect  attribute="Data Type" context="#stay" String="perltk" />
>+         <StringDetect  attribute="Data Type" context="#stay" String="interactive" />
>+      </context>
>+
>+      <context attribute="FloatFunc" name="plot" lineEndContext="default">
>+         <DetectChar attribute="Data Type" context="plot_range" char="["/>
>+         <DetectChar attribute="String" context="plot_string1" char="'"/>
>+	 <DetectChar attribute="String" context="plot_string2" char="&quot;"/>
>+	 <StringDetect attribute="Funktion" context="plot_axes" String="axes"/>
>+	 <StringDetect attribute="Funktion" context="plot_axes" String=" a "/>
>+         <StringDetect attribute="Funktion" context="plot_title" String="title"/>
>+	 <StringDetect attribute="Funktion" context="plot_title" String=" t "/>
>+         <StringDetect attribute="Funktion" context="plot_label_end" String="notitle"/>
>+	 <StringDetect attribute="Funktion" context="plot_with" String="with"/>
>+	 <StringDetect attribute="Funktion" context="plot_with" String=" w \"/>
>+	 <DetectChar attribute="Keyword" context="#stay" char=","/>
>+      </context>
>+      <context attribute="Data Type" name="plot_range" lineEndContext="default">
>+         <DetectChar attribute="Data Type" context="#pop" char="]"/>
>+      </context>
>+
>+      <context attribute="String" name="plot_string1" lineEndContext="default">
>+         <DetectChar attribute="String" context="plot_string_end" char="'"/>
>+      </context>
>+      <context attribute="String" name="plot_string2" lineEndContext="default">
>+         <DetectChar attribute="String" context="plot_string_end" char="&quot;"/>
>+      </context>
>+      <context attribute="String" name="plot_string_end" lineEndContext="default">
>+         <StringDetect attribute="Funktion" context="plot_index" String="index"/>
>+         <StringDetect attribute="Funktion" context="plot_using" String="using"/>
>+	 <StringDetect attribute="Funktion" context="plot_using" String=" u "/>
>+         <StringDetect attribute="Funktion" context="plot_smooth" String="smooth"/>
>+	 <StringDetect attribute="Funktion" context="plot_smooth" String=" s "/>
>+	 <StringDetect attribute="Funktion" context="plot_axes" String="axes"/>
>+	 <StringDetect attribute="Funktion" context="plot_axes" String=" a "/>
>+         <StringDetect attribute="Funktion" context="plot_title" String="title"/>
>+	 <StringDetect attribute="Funktion" context="plot_title" String=" t "/>
>+	 <StringDetect attribute="Funktion" context="plot_label_end" String="notitle"/>
>+	 <StringDetect attribute="Funktion" context="plot_with" String="with"/>
>+	 <StringDetect attribute="Funktion" context="plot_with" String=" w "/>
>+         <DetectChar attribute="Keyword" context="plot" char=","/>
>+      </context>
>+
>+      <context attribute="Normal Text" name="plot_using" lineEndContext="default">
>+         <Int attribute="Data Type" context="#stay" />
>+         <DetectChar attribute="Data Type" context="#stay" char=":"/>
>+	 <StringDetect attribute="Funktion" context="plot_index" String="index"/>
>+         <StringDetect attribute="Funktion" context="plot_smooth" String="smooth"/>
>+	 <StringDetect attribute="Funktion" context="plot_smooth" String=" s "/>
>+	 <StringDetect attribute="Funktion" context="plot_axes" String="axes"/>
>+	 <StringDetect attribute="Funktion" context="plot_axes" String=" a "/>
>+         <StringDetect attribute="Funktion" context="plot_title" String="title"/>
>+	 <StringDetect attribute="Funktion" context="plot_title" String=" t "/>
>+	 <StringDetect attribute="Funktion" context="plot_label_end" String="notitle"/>
>+         <StringDetect attribute="Funktion" context="plot_with" String="with"/>
>+	 <StringDetect attribute="Funktion" context="plot_with" String=" w "/>
>+         <DetectChar attribute="Keyword" context="plot" char=","/>
>+      </context>
>+
>+      <context attribute="Normal Text" name="plot_index" lineEndContext="default">
>+         <Int attribute="Data Type" context="#stay" />
>+         <DetectChar attribute="Data Type" context="#stay" char=":"/>
>+	 <StringDetect attribute="Funktion" context="plot_using" String="using"/>
>+         <StringDetect attribute="Funktion" context="plot_smooth" String="smooth"/>
>+	 <StringDetect attribute="Funktion" context="plot_smooth" String=" s "/>
>+	 <StringDetect attribute="Funktion" context="plot_axes" String="axes"/>
>+	 <StringDetect attribute="Funktion" context="plot_axes" String=" a "/>
>+         <StringDetect attribute="Funktion" context="plot_title" String="title"/>
>+	 <StringDetect attribute="Funktion" context="plot_title" String=" t "/>
>+	 <StringDetect attribute="Funktion" context="plot_label_end" String="notitle"/>
>+         <StringDetect attribute="Funktion" context="plot_with" String="with"/>
>+	 <StringDetect attribute="Funktion" context="plot_with" String=" w "/>
>+         <DetectChar attribute="Keyword" context="plot" char=","/>
>+      </context>
>+
>+      <context attribute="Normal Text" name="plot_smooth" lineEndContext="default">
>+         <keyword attribute="Data Type" context="plot_smooth_end" String="plot_smooth_keywords" />
>+      </context>
>+      <context attribute="Normal Text" name="plot_smooth_end" lineEndContext="default">
>+         <StringDetect attribute="Funktion" context="plot_axes" String="axes"/>
>+	 <StringDetect attribute="Funktion" context="plot_axes" String=" a "/>
>+         <StringDetect attribute="Funktion" context="plot_title" String="title"/>
>+	 <StringDetect attribute="Funktion" context="plot_title" String=" t "/>
>+	 <StringDetect attribute="Funktion" context="plot_label_end" String="notitle"/>
>+         <StringDetect attribute="Funktion" context="plot_with" String="with"/>
>+	 <StringDetect attribute="Funktion" context="plot_with" String=" w "/>
>+         <DetectChar attribute="Keyword" context="plot" char=","/>
>+      </context>
>+
>+      <context attribute="Normal Text" name="plot_axes" lineEndContext="default">
>+         <keyword attribute="Data Type" context="plot_axes_end" String="plot_axes_keywords" />
>+      </context>
>+      <context attribute="Normal Text" name="plot_axes_end" lineEndContext="default">
>+         <StringDetect attribute="Funktion" context="plot_title" String="title"/>
>+	 <StringDetect attribute="Funktion" context="plot_title" String=" t "/>
>+	 <StringDetect attribute="Funktion" context="plot_label_end" String="notitle"/>
>+         <StringDetect attribute="Funktion" context="plot_with" String="with"/>
>+	 <StringDetect attribute="Funktion" context="plot_with" String=" w "/>
>+         <DetectChar attribute="Keyword" context="plot" char=","/>
>+      </context>
>+
>+      <context attribute="Normal Text" name="plot_title" lineEndContext="default">
>+         <DetectChar attribute="Data Type" context="plot_label_string1" char="'"/>
>+         <DetectChar attribute="Data Type" context="plot_label_string2" char="&quot;"/>
>+      </context>
>+      <context attribute="Data Type" name="plot_label_string1" lineEndContext="default">
>+         <DetectChar attribute="Data Type" context="plot_label_end" char="'"/>
>+      </context>
>+      <context attribute="Data Type" name="plot_label_string2" lineEndContext="default">
>+         <DetectChar attribute="Data Type" context="plot_label_end" char="&quot;"/>
>+      </context>
>+      <context attribute="Normal Text" name="plot_label_end" lineEndContext="default">
>+         <StringDetect attribute="Funktion" context="plot_with" String="with"/>
>+	 <StringDetect attribute="Funktion" context="plot_with" String=" w "/>
>+	 <DetectChar attribute="Keyword" context="plot" char=","/>
>+      </context>
>+
>+      <context attribute="Normal Text" name="plot_with" lineEndContext="default">
>+         <keyword attribute="Data Type" context="plot_with_1" String="plot_style_keywords" />
>+	 <keyword attribute="Data Type" context="plot_with_1" String="splot_style_keywords" />
>+      </context>
>+
>+      <context attribute="Normal Text" name="plot_with_1" lineEndContext="default">
>+         <keyword attribute="Data Type" context="#stay" String="plot_astyle_keywords" />
>+	 <Int attribute="Data Type" context="#stay" />
>+         <DetectChar attribute="Keyword" context="plot" char=","/>
>+      </context>
>+
>+      <context attribute="FloatFunc" name="splot" lineEndContext="default">
>+         <DetectChar attribute="Data Type" context="plot_range" char="["/>
>+         <DetectChar attribute="String" context="splot_string1" char="'"/>
>+	 <DetectChar attribute="String" context="splot_string2" char="&quot;"/>
>+      </context>
>+
>+      <context attribute="String" name="splot_string1" lineEndContext="default">
>+         <DetectChar attribute="String" context="splot_string_end" char="'"/>
>+      </context>
>+      <context attribute="String" name="splot_string2" lineEndContext="default">
>+         <DetectChar attribute="String" context="splot_string_end" char="&quot;"/>
>+      </context>
>+      <context attribute="String" name="splot_string_end" lineEndContext="default">
>+      <StringDetect attribute="Funktion" context="#stay" String="binary"/>
>+      <StringDetect attribute="Funktion" context="#stay" String="matrix"/>
>+      <StringDetect attribute="Funktion" context="splot_index" String="index"/>
>+      <StringDetect attribute="Funktion" context="splot_using" String="using"/>
>+      <StringDetect attribute="Funktion" context="splot_title" String="title"/>
>+      <StringDetect attribute="Funktion" context="splot_title" String=" t "/>
>+      <StringDetect attribute="Funktion" context="splot_title_end" String="notitle"/>
>+      <StringDetect attribute="Funktion" context="splot_with" String="with"/>
>+      <StringDetect attribute="Funktion" context="splot_with" String=" w "/>
>+      <DetectChar attribute="Keyword" context="splot" char=","/>
>+      </context>
>+
>+      <context attribute="Normal Text" name="splot_using" lineEndContext="default">
>+         <Int attribute="Data Type" context="#stay" />
>+         <DetectChar attribute="Data Type" context="#stay" char=":"/>
>+	 <StringDetect attribute="Funktion" context="splot_index" String="index"/>
>+         <StringDetect attribute="Funktion" context="splot_title" String="title"/>
>+	 <StringDetect attribute="Funktion" context="splot_title" String=" t "/>
>+	 <StringDetect attribute="Funktion" context="splot_title_end" String="notitle"/>
>+         <StringDetect attribute="Funktion" context="splot_with" String="with"/>
>+	 <StringDetect attribute="Funktion" context="splot_with" String=" w "/>
>+         <DetectChar attribute="Keyword" context="splot" char=","/>
>+      </context>
>+
>+      <context attribute="Normal Text" name="splot_index" lineEndContext="default">
>+         <Int attribute="Data Type" context="#stay" />
>+         <DetectChar attribute="Data Type" context="#stay" char=":"/>
>+	 <StringDetect attribute="Funktion" context="splot_using" String="using"/>
>+         <StringDetect attribute="Funktion" context="splot_title" String="title"/>
>+	 <StringDetect attribute="Funktion" context="splot_title" String=" t "/>
>+	 <StringDetect attribute="Funktion" context="splot_title_end" String="notitle"/>
>+         <StringDetect attribute="Funktion" context="splot_with" String="with"/>
>+	 <StringDetect attribute="Funktion" context="splot_with" String=" w "/>
>+         <DetectChar attribute="Keyword" context="splot" char=","/>
>+      </context>
>+
>+      <context attribute="Normal Text" name="splot_title" lineEndContext="default">
>+         <DetectChar attribute="Data Type" context="splot_label_string1" char="'"/>
>+         <DetectChar attribute="Data Type" context="splot_label_string2" char="&quot;"/>
>+      </context>
>+      <context attribute="Data Type" name="splot_label_string1" lineEndContext="default">
>+         <DetectChar attribute="Data Type" context="splot_title_end" char="'"/>
>+      </context>
>+      <context attribute="Data Type" name="splot_label_string2" lineEndContext="default">
>+         <DetectChar attribute="Data Type" context="splot_title_end" char="&quot;"/>
>+      </context>
>+      <context attribute="Normal Text" name="splot_title_end" lineEndContext="default">
>+         <StringDetect attribute="Funktion" context="splot_with" String="with"/>
>+	 <StringDetect attribute="Funktion" context="splot_with" String=" w "/>
>+	 <DetectChar attribute="Keyword" context="splot" char=","/>
>+      </context>
>+
>+      <context attribute="Normal Text" name="splot_with" lineEndContext="default">
>+	 <keyword attribute="Data Type" context="splot_with_1" String="splot_style_keywords" />
>+      </context>
>+
>+      <context attribute="Normal Text" name="splot_with_1" lineEndContext="default">
>+	 <Int attribute="Data Type" context="#stay" />
>+         <DetectChar attribute="Keyword" context="splot" char=","/>
>+      </context>
>+
>+      <context attribute="Comment" name="comment" lineEndContext="default" />
>+
>+   </contexts>
>+
>+   <itemDatas>
>+         <itemData name="Normal Text"               defStyleNum="dsNormal" />
>+         <itemData name="Keyword"                   defStyleNum="dsKeyword" />
>+	 <itemData name="Funktion"                  defStyleNum="dsOthers" />
>+	 <itemData name="Data Type"                 defStyleNum="dsDataType" />
>+	 <itemData name="String"                    defStyleNum="dsBaseN" />
>+	 <itemData name="Decimal"                   defStyleNum="dsDecVal" />
>+	 <itemData name="FloatFunc"                 defStyleNum="dsFloat" />
>+         <itemData name="Comment"                   defStyleNum="dsComment" />
>+   </itemDatas>
>+
>+   </highlighting>
>+
>+   <general>
>+     <comments>
>+       <comment name="singleLine" start="#" />
>+     </comments>
>+     <keywords casesensitive="1" />
>+   </general>
>+
>+ </language>
>+
>diff -urN tdelibs/kate/data/go.xml tdelibs.new/kate/data/go.xml
>--- tdelibs/kate/data/go.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/go.xml	2013-12-26 13:26:41.364325677 -0600
>@@ -2,7 +2,7 @@
> <!DOCTYPE language SYSTEM "language.dtd">
> 
> 
> 
> 
>-<language name="Go" version="1.01" kateversion="2.4" section="Sources" indenter="cstyle" extensions="*.go" author="Miquel SabatÃ© (mikisabate@gmail.com)" license="GPL">
>+<language name="Go" version="1.04" kateversion="2.5" section="Sources" indenter="cstyle" extensions="*.go" author="Miquel SabatÃ© (mikisabate@gmail.com)" license="GPL">
>     <highlighting>
>     <list name="keywords">
> 
>@@ -62,7 +62,6 @@
>       <item>complex64</item>
>       <item>complex128</item>
>       <item>error</item>
>-      <item>float</item>
>       <item>float32</item>
>       <item>float64</item>
>       <item>int</item>
>@@ -73,26 +72,28 @@
>       <item>rune</item>
>       <item>string</item>
>       <item>uint</item>
>+      <item>uintptr</item>
>       <item>uint8</item>
>       <item>uint16</item>
>       <item>uint32</item>
>       <item>uint64</item>
>     </list>
>     <list name="builtin">
>-      <item> append </item>
>-      <item> cap </item>
>-      <item> close </item>
>-      <item> complex </item>
>-      <item> copy </item>
>-      <item> imag </item>
>-      <item> len </item>
>-      <item> make </item>
>-      <item> new </item>
>-      <item> panic </item>
>-      <item> print </item>
>-      <item> println </item>
>-      <item> real </item>
>-      <item> recover </item>
>+      <item>append</item>
>+      <item>cap</item>
>+      <item>close</item>
>+      <item>complex</item>
>+      <item>copy</item>
>+      <item>delete</item>
>+      <item>imag</item>
>+      <item>len</item>
>+      <item>make</item>
>+      <item>new</item>
>+      <item>panic</item>
>+      <item>print</item>
>+      <item>println</item>
>+      <item>real</item>
>+      <item>recover</item>
>     </list>
>     <list name="predeclared">
>       <item>false</item>
>@@ -114,7 +115,7 @@
>       <HlCHex attribute="Hex" context="#stay"/>
>       <HlCChar attribute="Char" context="#stay" />
>       <DetectChar attribute="String" context="String" char="&quot;" />
>-      <DetectChar attribute="Multiline String" context="Multiline String" char="`"/>
>+      <DetectChar attribute="String" context="Multiline String" char="`"/>
>       <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
>       </context>
> 
>diff -urN tdelibs/kate/data/haml.xml tdelibs.new/kate/data/haml.xml
>--- tdelibs/kate/data/haml.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/haml.xml	2013-12-26 13:26:40.500329364 -0600
>@@ -0,0 +1,523 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd">
>+<language name="Haml" version="1.1" kateversion="2.5" section="Markup"
>+          extensions="*.haml"
>+          author="Cies Breijs (cies_at_kde_nl)" license="LGPL"
>+          mimetype="text/x-haml">
>+
>+
>+
>+
>+
>+
>+
>+
>+
>+
>+  <highlighting>
>+
>+    <list name="keywords">
>+      <item> BEGIN </item>
>+      <item> END </item>
>+      <item> and </item>
>+      <item> begin </item>
>+      <item> break </item>
>+      <item> case </item>
>+      <item> defined? </item>
>+      <item> do </item>
>+      <item> else </item>
>+      <item> elsif </item>
>+      <item> end </item>
>+      <item> ensure </item>
>+      <item> for </item>
>+      <item> if </item>
>+      <item> in </item>
>+      <item> include </item>
>+      <item> next </item>
>+      <item> not </item>
>+      <item> or </item>
>+      <item> redo </item>
>+      <item> rescue </item>
>+      <item> retry </item>
>+      <item> return </item>
>+      <item> then </item>
>+      <item> unless </item>
>+      <item> until </item>
>+      <item> when </item>
>+      <item> while </item>
>+      <item> yield </item>
>+    </list>
>+
>+    <list name="access-control">
>+      <item> private_class_method </item>
>+      <item> private </item>
>+      <item> protected </item>
>+      <item> public_class_method </item>
>+      <item> public </item>
>+    </list>
>+
>+    <list name="attribute-definitions">
>+      <item> attr_reader </item>
>+      <item> attr_writer </item>
>+      <item> attr_accessor </item>
>+    </list>
>+
>+    <list name="definitions">
>+      <item> alias </item>
>+      <item> module </item>
>+      <item> class </item>
>+      <item> def </item>
>+      <item> undef </item>
>+    </list>
>+
>+    <list name="pseudo-variables">
>+      <item> self </item>
>+      <item> super </item>
>+      <item> nil </item>
>+      <item> false </item>
>+      <item> true </item>
>+      <item> caller </item>
>+      <item> __FILE__ </item>
>+      <item> __LINE__ </item>
>+    </list>
>+
>+    <list name="default-globals">
>+      <item> $stdout </item>
>+      <item> $defout </item>
>+      <item> $stderr </item>
>+      <item> $deferr </item>
>+      <item> $stdin </item>
>+    </list>
>+
>+    
>+    <list name="kernel-methods">
>+      
>+      <item> abort </item>
>+      <item> at_exit </item>
>+      <item> autoload </item>
>+      <item> autoload? </item>
>+      <item> binding </item>
>+      <item> block_given? </item>
>+      <item> callcc </item>
>+      <item> caller </item>
>+      <item> catch </item>
>+      <item> chomp </item>
>+      <item> chomp! </item>
>+      <item> chop </item>
>+      <item> chop! </item>
>+      <item> eval </item>
>+      <item> exec </item>
>+      <item> exit </item>
>+      <item> exit! </item>
>+      <item> fail </item>
>+      <item> fork </item>
>+      <item> format </item>
>+      <item> getc </item>
>+      <item> gets </item>
>+      <item> global_variables </item>
>+      <item> gsub </item>
>+      <item> gsub! </item>
>+      <item> iterator? </item>
>+      <item> lambda </item>
>+      <item> load </item>
>+      <item> local_variables </item>
>+      <item> loop </item>
>+      <item> method_missing </item>
>+      <item> open </item>
>+      <item> p </item>
>+      <item> print </item>
>+      <item> printf </item>
>+      <item> proc </item>
>+      <item> putc </item>
>+      <item> puts </item>
>+      <item> raise </item>
>+      <item> rand </item>
>+      <item> readline </item>
>+      <item> readlines </item>
>+      <item> require </item>
>+      <item> scan </item>
>+      <item> select </item>
>+      <item> set_trace_func </item>
>+      <item> sleep </item>
>+      <item> split </item>
>+      <item> sprintf </item>
>+      <item> srand </item>
>+      <item> sub </item>
>+      <item> sub! </item>
>+      <item> syscall </item>
>+      <item> system </item>
>+      <item> test </item>
>+      <item> throw </item>
>+      <item> trace_var </item>
>+      <item> trap </item>
>+      <item> untrace_var </item>
>+      <item> warn </item>
>+    </list>
>+
>+    <list name="attention">
>+      <item> TODO </item>
>+      <item> FIXME </item>
>+      <item> NOTE </item>
>+    </list>
>+
>+    <contexts>
>+      <context attribute="Normal Text" lineEndContext="#stay" name="normal" >
>+        <RegExpr attribute="Error" firstNonSpace="false" context="#stay" String="^[ ]{1}([ ]{2})*[^ ]+" />
>+        <RegExpr attribute="Doctype" context="#stay" String="^!!!.*$"/>
>+
>+
>+
>+
>+
>+
>+
>+        <DetectSpaces/>
>+        <DetectChar attribute="Escaped Text" context="escaped" char="\" />
>+        <DetectChar attribute="Comment" context="comment" char="/" />
>+
>+        <Detect2Chars attribute="Keyword" context="unquoted" char="=" char1="=" />
>+        <DetectChar attribute="Keyword" context="rubysourceline" char="=" />
>+        <DetectChar attribute="Keyword" context="rubysourceline" char="-" />
>+        <DetectChar attribute="Keyword" context="rubysourceline" char="~" />
>+        <Detect2Chars attribute="Keyword" context="rubysourceline" char="!" char1="=" />
>+        <Detect2Chars attribute="Keyword" context="rubysourceline" char="&amp;" char1="=" />
>+
>+        <DetectChar attribute="Operator" context="array" char="[" beginRegion="Array" />
>+        <DetectChar attribute="Operator" context="hash" char="{" beginRegion="Hash" />
>+
>+        <RegExpr attribute="Filter" firstNonSpace="true" context="#stay" String=":[a-zA-Z0-9_\-]*" />
>+        <RegExpr attribute="Tag" firstNonSpace="true" context="#stay" String="%[a-zA-Z_][a-zA-Z0-9_\-]*" />
>+        <RegExpr attribute="Div Id" firstNonSpace="true" context="#stay" String="#[a-zA-Z_][a-zA-Z0-9_\-]*" />
>+        <RegExpr attribute="Div Class" firstNonSpace="true" context="#stay" String="\.[a-zA-Z_][a-zA-Z0-9_\-]*" />
>+        <RegExpr attribute="Element Id" context="#stay" String="#[a-zA-Z_][a-zA-Z0-9_\-]*" />
>+        <RegExpr attribute="Element Class" context="#stay" String="\.[a-zA-Z_][a-zA-Z0-9_\-]*" />
>+        <RegExpr attribute="Entity" context="#stay" String="&amp;[a-zA-Z]+;" />
>+      </context>
>+
>+      <context attribute="Array" lineEndContext="#stay" name="array">
>+        <DetectSpaces/>
>+        <DetectChar attribute="Operator" context="#pop" char="]" endRegion="Array" />
>+        <IncludeRules context="rubysourceline" />
>+      </context>
>+
>+      <context attribute="Hash" lineEndContext="#stay" name="hash">
>+        <DetectSpaces/>
>+        <DetectChar attribute="Operator" context="#pop" char="}" endRegion="Hash" />
>+        <IncludeRules context="rubysourceline" />
>+      </context>
>+
>+      <context attribute="Unquoted String" lineEndContext="#pop" name="unquoted">
>+        <IncludeRules context="Quoted String" />
>+      </context>
>+
>+      <context attribute="String" lineEndContext="#stay" name="string">
>+        <DetectIdentifier />
>+        <DetectChar attribute="String" context="#pop" char="'" endRegion="String" />
>+      </context>
>+
>+      <context attribute="String" lineEndContext="#stay" name="stringx">
>+        <DetectIdentifier />
>+        <DetectChar attribute="String" context="#pop" char="&quot;" endRegion="String" />
>+      </context>
>+
>+      <context attribute="Comment" lineEndContext="#pop" name="comment0">
>+        <DetectSpaces/>
>+        <IncludeRules context="##Alerts" />
>+        <DetectIdentifier/>
>+
>+      </context>
>+
>+      <context attribute="Comment" lineEndContext="#pop" name="comment2">
>+        <DetectSpaces/>
>+        <IncludeRules context="##Alerts" />
>+        <DetectIdentifier/>
>+        <RegExpr attribute="Comment" context="#pop" String="^[ ]{2}[^ /]" endRegion="comment" />
>+      </context>
>+
>+
>+      <context attribute="Comment" lineEndContext="#pop" name="comment">
>+        <DetectSpaces/>
>+        <IncludeRules context="##Alerts" />
>+        <DetectIdentifier/>
>+        <StringDetect attribute="Comment" context="#pop" String="--&gt;" endRegion="comment" />
>+      </context>
>+
>+      <context attribute="Escaped Text" lineEndContext="#pop" name="escaped">
>+      </context>
>+
>+      <context name="rubysourceline" attribute="Ruby embedded in haml" lineEndContext="#pop">
>+        <IncludeRules context="rubysource" />
>+      </context>
>+
>+      <context name="rubysource" attribute="Ruby embedded in haml"  lineEndContext="#stay">
>+        
>+        <LineContinue attribute="Ruby Normal Text" context="Line Continue"/>
>+
>+        
>+        
>+        <RegExpr attribute="Keyword" String="(\=|\(|\[|\{)\s*(if|unless|while|until)\b" context="#stay" beginRegion="def block"/>
>+        <RegExpr attribute="Keyword" String="(while|until)\b(?!.*\bdo\b)" context="#stay" beginRegion="def block" firstNonSpace="true"/>
>+        <RegExpr attribute="Keyword" String="\;\s*(while|until)\b(?!.*\bdo\b)" context="#stay" beginRegion="def block"/>
>+        <RegExpr attribute="Keyword" String="(if|unless)\b" context="#stay" beginRegion="def block" firstNonSpace="true"/>
>+        <RegExpr attribute="Keyword" String="\;\s*(if|unless)\b" context="#stay" beginRegion="def block"/>
>+        <RegExpr attribute="Keyword" String="\bclass\b" context="#stay" beginRegion="def block"/>
>+        <RegExpr attribute="Keyword" String="\bmodule\b" context="#stay" beginRegion="def block"/>
>+        <RegExpr attribute="Keyword" String="\bbegin\b" context="#stay" beginRegion="def block"/>
>+        <RegExpr attribute="Keyword" String="\bfor\b(?!.*\bdo\b)" context="#stay" beginRegion="def block"/>
>+        <RegExpr attribute="Keyword" String="\bcase\b" context="#stay" beginRegion="def block"/>
>+        <RegExpr attribute="Keyword" String="\bdo\b" context="#stay" beginRegion="def block"/>
>+        <RegExpr attribute="Keyword" String="\bdef\b" context="#stay" beginRegion="def block"/>
>+        <RegExpr attribute="Keyword" String="\bend\b" context="#stay" endRegion="def block"/>
>+        
>+        <RegExpr attribute="Keyword" String="(\b|^\s*)(else|elsif|rescue|ensure)(\s+|$)" context="#stay" endRegion="def block" beginRegion="def block"/>
>+
>+        <StringDetect attribute="Operator" String="..." context="#stay"/>
>+        <Detect2Chars attribute="Operator" char="." char1="." context="#stay"/>
>+
>+        
>+        <RegExpr attribute="Message" String="\.[_a-z][_a-zA-Z0-9]*(\?|\!|\b)" context="#stay"/>
>+
>+        
>+        <RegExpr attribute="Dec" String="\s\?(\\M\-)?(\\C\-)?\\?\S" context="#stay"/>
>+
>+        <keyword attribute="Keyword" String="keywords" context="#stay"/>
>+        <keyword attribute="Attribute Definition" String="attribute-definitions"  context="#stay"/>
>+        <keyword attribute="Access Control" String="access-control" context="#stay"/>
>+        <keyword attribute="Definition" String="definitions"  context="#stay" />
>+        <keyword attribute="Pseudo variable" String="pseudo-variables"  context="#stay"/>
>+        <keyword attribute="Default globals" String="default-globals" context="#stay"/>
>+        <keyword attribute="Kernel methods" String="kernel-methods" context="#stay"/>
>+
>+        
>+        <RegExpr attribute="Global Variable" String="\$[a-zA-Z_0-9]+" context="#stay"/>
>+        <RegExpr attribute="Global Variable" String="\$\-[a-zA-z_]\b" context="#stay"/>
>+        
>+        <RegExpr attribute="Default globals" String="\$[\d_*`\!:?'/\\\-\&amp;]" context="#stay"/>
>+        <RegExpr attribute="Global Constant" String="\b[_A-Z]+[A-Z_0-9]+\b" context="#stay"/>
>+        
>+        <RegExpr attribute="Constant" String="\b[A-Z]+_*([0-9]|[a-z])[_a-zA-Z0-9]*\b" context="#stay"/>
>+
>+        <RegExpr attribute="Hex" String="\b\-?0[xX][_0-9a-fA-F]+" context="#stay"/>
>+        <RegExpr attribute="Bin" String="\b\-?0[bB][_01]+" context="#stay"/>
>+        <RegExpr attribute="Octal" String="\b\-?0[1-7][_0-7]*" context="#stay"/>
>+        <RegExpr attribute="Float" String="\b\-?[0-9][0-9_]*\.[0-9][0-9_]*([eE]\-?[1-9][0-9]*(\.[0-9]*)?)?" context="#stay"/>
>+        <RegExpr attribute="Dec" String="\b\-?[1-9][0-9_]*\b" context="#stay"/>
>+        <Int attribute="Dec" context="#stay"/>
>+        <HlCChar attribute="Char" context="#stay"/>
>+
>+        
>+        <StringDetect attribute="Blockcomment" String="=begin" context="Embedded documentation" beginRegion="comment block" column="0"/>
>+
>+        <DetectChar attribute="Operator" char="." context="#stay"/>
>+        <Detect2Chars attribute="Operator" char="&amp;" char1="&amp;" context="#stay"/>
>+        <Detect2Chars attribute="Operator" char="|" char1="|" context="#stay"/>
>+        <RegExpr attribute="Operator" String="\s[\?\:\%/]\s" context="#stay"/>
>+        <RegExpr attribute="Operator" String="[|&amp;&lt;&gt;\^\+*~\-=]+" context="#stay"/>
>+        
>+        <RegExpr attribute="Operator" String="\s!" context="#stay"/>
>+        <RegExpr attribute="Operator" String="/=\s" context="#stay" insensitive="0"/>
>+        <StringDetect attribute="Operator" String="%=" context="#stay" insensitive="0"/>
>+        <Detect2Chars attribute="Operator" char=":" char1=":" context="Member Access"/>
>+
>+        <RegExpr attribute="Symbol" String=":[a-zA-Z_][a-zA-Z0-9_]*" context="#stay"/>
>+
>+        <DetectChar attribute="String" char="&quot;" context="Quoted String"/>
>+        <DetectChar attribute="Raw String" char="'" context="Apostrophed String"/>
>+        <DetectChar attribute="Command" char="`" context="Command String"/>
>+
>+        <StringDetect attribute="Normal Text" String="?#" context="#stay"/>
>+
>+        <RegExpr attribute="Comment" String="#\s*BEGIN.*$"  context="#stay" beginRegion="marker" column="0"/>
>+        <RegExpr attribute="Comment" String="#\s*END.*$"  context="#stay" endRegion="marker" column="0"/>
>+        <RegExpr attribute="Comment" String="#"  context="General Comment"/>
>+
>+        <RegExpr attribute="Delimiter" String="[\[\]]+"  context="#stay"/>
>+        <DetectChar attribute="Delimiter" char="{" context="#stay" beginRegion="def block"/>
>+        <DetectChar attribute="Delimiter" char="}" context="#stay" endRegion="def block"/>
>+
>+        <RegExpr attribute="Instance Variable" String="@[a-zA-Z_0-9]+" context="#stay"/>
>+        <RegExpr attribute="Class Variable" String="@@[a-zA-Z_0-9]+" context="#stay"/>
>+
>+        
>+        <DetectChar attribute="Regular Expression" char="/" context="RegEx 1"/>
>+      </context>
>+
>+      <context name="Line Continue" attribute="Ruby Normal Text" lineEndContext="#pop">
>+        <RegExpr attribute="Keyword" String="(while|until)\b(?!.*\bdo\b)" context="#stay" firstNonSpace="true"/>
>+        <RegExpr attribute="Keyword" String="(if|unless)\b" context="#stay" firstNonSpace="true"/>
>+        <IncludeRules context="rubysource"/>
>+      </context>
>+
>+      <context name="Quoted String" attribute="String" lineEndContext="#stay">
>+        <StringDetect attribute="String" String="\\" context="#stay"/>
>+        <RegExpr attribute="String" String="\\\&quot;" context="#stay"/>
>+        <RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
>+        <Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
>+        
>+        <DetectChar char="&quot;" attribute="String" context="#pop"/>
>+      </context>
>+
>+      <context name="Apostrophed String" attribute="Raw String" lineEndContext="#stay">
>+        
>+        <StringDetect attribute="String" String="\\" context="#stay"/>
>+        <RegExpr attribute="String" String="\\\'" context="#stay"/>
>+        <DetectChar char="'" attribute="Raw String" context="#pop"/>
>+      </context>
>+
>+      <context name="Command String" attribute="Command" lineEndContext="#stay">
>+        <StringDetect attribute="String" String="\\" context="#stay"/>
>+        <RegExpr attribute="String" String="\\\`" context="#stay"/>
>+        <RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
>+        <Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
>+        <HlCChar attribute="Char" context="#pop"/>
>+        <DetectChar char="`" attribute="Command" context="#pop"/>
>+      </context>
>+
>+      <context name="Embedded documentation" attribute="Ruby Comment" lineEndContext="#stay">
>+        <StringDetect attribute="Ruby Comment" String="=end" context="#pop" endRegion="comment block" column="0"/>
>+      </context>
>+
>+      <context name="RegEx 1" attribute="Regular Expression" lineEndContext="#stay">
>+        <RegExpr attribute="Regular Expression" String="\\\/" context="#stay"/>
>+        <RegExpr attribute="Regular Expression" String="[^\\]$" context="#pop"/>
>+        <RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
>+        <Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
>+        <RegExpr attribute="Regular Expression" String="/[uiomxn]*" context="#pop"/>
>+      </context>
>+
>+      
>+      <context name="Subst" attribute="Ruby Normal Text" lineEndContext="#stay">
>+        <DetectChar attribute="Substitution" char="}" context="#pop"/>
>+        
>+        <IncludeRules context="rubysource"/>
>+      </context>
>+
>+      <context name="Short Subst" attribute="Substitution" lineEndContext="#pop">
>+        
>+        <RegExpr attribute="Substitution" String="#@{1,2}" context="#stay"/>
>+        <RegExpr attribute="Substitution" String="\w(?!\w)" context="#pop"/>
>+      </context>
>+
>+      
>+      <context name="Member Access" attribute="Member" lineEndContext="#pop">
>+        
>+        <RegExpr attribute="Message" String="\.?[_a-z]\w*(\?|\!)?(?=[^\w\d\.\:])" context="#pop"/>
>+        <RegExpr attribute="Message" String="\.?[_a-z]\w*(\?|\!)?" context="#stay"/>
>+        <RegExpr attribute="Constant" String="[A-Z]+_*(\d|[a-z])\w*(?=[^\w\d\.\:])" context="#pop"/>
>+        <RegExpr attribute="Constant" String="[A-Z]+_*([0-9]|[a-z])\w*" context="#stay"/>
>+        <RegExpr attribute="Constant Value" String="[_A-Z][_A-Z0-9]*(?=[^\w\d\.\:])" context="#pop"/>
>+        <RegExpr attribute="Constant Value" String="[_A-Z][_A-Z0-9]*" context="#stay"/>
>+        <Detect2Chars attribute="Operator" char=":" char1=":" context="#stay"/>
>+        <DetectChar attribute="Member" char="." context="#stay"/>
>+
>+        <AnyChar attribute="Operator" String="=+-*/%|&amp;[]{}~" context="#pop"/>
>+        <DetectChar attribute="Ruby Comment" char="#" context="#pop"/>
>+        <AnyChar attribute="Ruby Normal Text" String="()\" context="#pop"/>
>+        <RegExpr attribute="Member" String="\W" context="#pop"/>
>+      </context>
>+
>+      <context name="Comment Line" attribute="Ruby Comment" lineEndContext="#pop">
>+        <keyword attribute="Alert" String="attention" context="#stay"/>
>+        <RegExpr attribute="Keyword" context="#pop#pop" String="-?%&gt;" />
>+      </context>
>+
>+      <context name="General Comment" attribute="Ruby Comment" lineEndContext="#pop">
>+        <keyword attribute="Dec" String="attention" context="#stay"/>
>+      </context>
>+    </contexts>
>+
>+
>+
>+
>+    <itemDatas>
>+    
>+      <itemData name="Ruby Normal Text" defStyleNum="dsNormal"/>
>+
>+      <itemData name="Keyword" defStyleNum="dsKeyword"/>
>+      <itemData name="Attribute Definition" defStyleNum="dsOthers"/>
>+      <itemData name="Access Control" defStyleNum="dsKeyword" color="#0000FF"/>
>+      <itemData name="Definition" defStyleNum="dsKeyword"/>
>+      <itemData name="Pseudo variable" defStyleNum="dsDecVal"/>
>+
>+      <itemData name="Dec" defStyleNum="dsDecVal"/>
>+      <itemData name="Float" defStyleNum="dsFloat"/>
>+      <itemData name="Char" defStyleNum="dsChar"/>
>+      <itemData name="Octal" defStyleNum="dsBaseN"/>
>+      <itemData name="Hex" defStyleNum="dsBaseN"/>
>+      <itemData name="Bin" defStyleNum="dsBaseN"/>
>+
>+      <itemData name="Symbol" defStyleNum="dsString" color="#D40000"/>
>+      <itemData name="String" defStyleNum="dsString"/>
>+      <itemData name="Unquoted String" defStyleNum="dsString"/>
>+      <itemData name="Raw String" defStyleNum="dsString" color="#DD4A4A" selColor="#DD4A4A"/>
>+      <itemData name="Command" defStyleNum="dsString" color="#AA3000"/>
>+      <itemData name="Message" defStyleNum="dsNormal" color="#4000A7"/> 
>+      <itemData name="Regular Expression" defStyleNum="dsOthers" color="#4A5704"/>
>+      <itemData name="Substitution" defStyleNum="dsOthers"/>
>+      <itemData name="Data" defStyleNum="dsNormal"/>
>+      
>+      <itemData name="GDL input" defStyleNum="dsOthers" />
>+
>+      <itemData name="Default globals" defStyleNum="dsDataType" color="#C00000" bold="1"/>
>+      <itemData name="Global Variable" defStyleNum="dsDataType" color="#C00000"/>
>+      <itemData name="Global Constant" defStyleNum="dsDataType" color="#bb1188" bold="1"/>
>+      <itemData name="Constant" defStyleNum="dsDataType"/>
>+      <itemData name="Constant Value" defStyleNum="dsDataType" color="#bb1188"/>
>+      <itemData name="Kernel methods" defStyleNum="dsNormal" color="#000080" selColor="#ffffff"/> 
>+      <itemData name="Member" defStyleNum="dsNormal"/>
>+      <itemData name="Instance Variable" defStyleNum="dsOthers"/>
>+      <itemData name="Class Variable" defStyleNum="dsOthers"/>
>+
>+      <itemData name="Ruby Comment" defStyleNum="dsComment"/>
>+      <itemData name="Blockcomment" defStyleNum="dsComment"/>
>+      <itemData name="Region Marker" defStyleNum="dsNormal" color="#0000ff"/>
>+      <itemData name="RDoc Value" defStyleNum="dsOthers"/>
>+
>+      
>+      <itemData name="Error" defStyleNum="dsError" />
>+      <itemData name="Alert" defStyleNum="dsAlert" />
>+
>+      <itemData name="Delimiter" defStyleNum="dsChar"/>
>+      <itemData name="Expression" defStyleNum="dsOthers"/>
>+      <itemData name="Operator" defStyleNum="dsChar"/>
>+
>+     
>+
>+      <itemData name="Normal Text" defStyleNum="dsNormal" />
>+      <itemData name="Hash" defStyleNum="dsNormal" />
>+      <itemData name="Comment" defStyleNum="dsComment" />
>+      <itemData name="Symbol" defStyleNum="dsDataType" />
>+      <itemData name="Doctype" defStyleNum="dsDataType" bold="1" />
>+      <itemData name="Filter" defStyleNum="dsOthers" />
>+      <itemData name="Element Id" defStyleNum="dsFloat" bold="1" />
>+      <itemData name="Element Class" defStyleNum="dsFloat" />
>+      <itemData name="Div Id" defStyleNum="dsDecVal" bold="1" />
>+      <itemData name="Div Class" defStyleNum="dsDecVal" />
>+      <itemData name="String" defStyleNum="dsNormal" />
>+      <itemData name="Tag" defStyleNum="dsKeyword" />
>+      <itemData name="Keyword" defStyleNum="dsKeyword" />
>+      <itemData name="Entity" defStyleNum="dsDecVal" />
>+    </itemDatas>
>+  </highlighting>
>+  <general>
>+    <folding indentationsensitive="1" />
>+    <emptyLines>
>+      <emptyLine regexpr="\s+" casesensitive="false"/>
>+    </emptyLines>
>+    <comments>
>+      <comment name="singleLine" start="/"/>
>+    </comments>
>+    <keywords casesensitive="1"/>
>+  </general>
>+</language>
>diff -urN tdelibs/kate/data/haskell.xml tdelibs.new/kate/data/haskell.xml
>--- tdelibs/kate/data/haskell.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/haskell.xml	2013-12-26 13:26:40.892327690 -0600
>@@ -1,18 +1,15 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Haskell" version="2.0.3" kateversion="2.3" section="Sources" extensions="*.hs" mimetype="text/x-haskell" author="Nicolas Wu (zenzike@gmail.com)" license="LGPL" indenter="haskell">
>+<language name="Haskell" version="2.2" kateversion="2.5" section="Sources" extensions="*.hs;*.chs" mimetype="text/x-haskell" author="Nicolas Wu (zenzike@gmail.com)" license="LGPL" indenter="haskell">
>   <highlighting>
>   <list name="keywords">
>-    <item> as </item>
>     <item> case </item>
>     <item> class </item>
>     <item> data </item>
>     <item> deriving </item>
>     <item> do </item>
>     <item> else </item>
>-    <item> hiding </item>
>     <item> if </item>
>-    <item> import </item>
>     <item> in </item>
>     <item> infixl </item>
>     <item> infixr </item>
>@@ -22,7 +19,6 @@
>     <item> newtype </item>
>     <item> of </item>
>     <item> primitive </item>
>-    <item> qualified </item>
>     <item> then </item>
>     <item> type </item>
>     <item> where </item>
>@@ -298,17 +294,46 @@
>     <item> LT </item>
>     <item> GT </item>
>   </list>
>+  <list name="class">
>+    <item> Applicative </item>
>+    <item> Foldable </item>
>+    <item> Traversable </item>
>+  </list>
>+  <list name="c2hs_keywords">
>+    <item> qualified </item>
>+    <item> lib </item>
>+    <item> prefix </item>
>+    <item> as </item>
>+    <item> with </item>
>+    <item> call </item>
>+    <item> pure </item>
>+    <item> unsafe </item>
>+    <item> get </item>
>+    <item> set </item>
>+    <item> foreign </item>
>+    <item> stable </item>
>+    <item> nocode </item>
>+  </list>
>+  <list name="import_keywords">
>+    <item> as </item>
>+    <item> qualified </item>
>+    <item> hiding </item>
>+  </list>
>   <contexts>
>     <context attribute="Normal" lineEndContext="#stay" name="code">
>       <RegExpr attribute="Pragma"  context="#stay" String="\{-#.*#-\}"/>
>       <RegExpr attribute="Comment" context="comments" String="\{-[^#]?" />
>       <RegExpr attribute="Comment" context="comment"  String="--[^\-!#\$%&amp;\*\+/&lt;=&gt;\?&#92;@\^\|~\.:].*$" />
>+      <RegExpr attribute="Keyword" context="import"   String="import\s+" />
>+      <RegExpr attribute="C2HS Directive"  context="c2hs directive" String="\{#"/>
>+      <RegExpr attribute="C2HS Directive"  context="c2hs include" String="#"/>
> 
>       <keyword attribute="Keyword"          context="#stay" String="keywords" />
>       <keyword attribute="Function Prelude" context="#stay" String="prelude function" />
>       <keyword attribute="Type Prelude"     context="#stay" String="prelude type" />
>       <keyword attribute="Data Prelude"     context="#stay" String="prelude data" />
>       <keyword attribute="Class Prelude"    context="#stay" String="prelude class" />
>+      <keyword attribute="Class Prelude"    context="#stay" String="class" />
> 
>       <RegExpr attribute="Special"          context="#stay" String="(::|=&gt;|\-&gt;|&lt;\-)" />
>       <AnyChar attribute="Special"          context="#stay" String="â·âââââ" />
>@@ -342,6 +367,51 @@
>     <context attribute="Function Infix" lineEndContext="#stay" name="infix">
>       <DetectChar attribute="Function Infix" context="#pop" char="`"/>
>     </context>
>+    <context attribute="Import Statement" lineEndContext="#pop" name="import">
>+      <keyword attribute="Keyword"          context="#stay" String="import_keywords" />
>+      <RegExpr attribute="Function"         context="#stay" String="([A-Z][a-zA-Z0-9_']*\.)*[a-z][a-zA-Z0-9_']*" />
>+      <RegExpr attribute="Type"             context="#stay" String="([A-Z][a-zA-Z0-9_']*\.)*[A-Z][a-zA-Z0-9_']*" />
>+
>+      <RegExpr attribute="Pragma"  context="#stay" String="\{-#.*#-\}"/>
>+      <RegExpr attribute="Comment" context="comments" String="\{-[^#]?" />
>+      <RegExpr attribute="Comment" context="comment"  String="--[^\-!#\$%&amp;\*\+/&lt;=&gt;\?&#92;@\^\|~\.:].*$" />
>+    </context>
>+    
>+    <context attribute="C2HS Directive" lineEndContext="#stay" name="c2hs directive">
>+      <Detect2Chars attribute="C2HS Directive" context="#pop" char="#" char1="}" />
>+      <keyword attribute="Keyword" context="#stay"          String="c2hs_keywords" />
>+      <RegExpr attribute="Keyword" context="#stay"          String="context" />
>+      <RegExpr attribute="Keyword" context="#stay"          String="call" />
>+      <RegExpr attribute="Keyword" context="#stay"          String="sizeof" />
>+      <RegExpr attribute="Keyword" context="#stay"          String="alignof" />
>+      <RegExpr attribute="Keyword" context="c2hs fun"       String="fun" />
>+      <RegExpr attribute="Keyword" context="c2hs pointer"   String="pointer" />
>+      <RegExpr attribute="Keyword" context="c2hs enum"      String="enum" />
>+      <RegExpr attribute="Keyword" context="c2hs import"    String="import" />
>+    </context>
>+    <context attribute="C2HS Directive" lineEndContext="#stay" name="c2hs import">
>+      <RegExpr attribute="Type"    context="#stay" String="([A-Z][a-zA-Z0-9_']*\.)*[A-Z][a-zA-Z0-9_']*" />
>+      <Detect2Chars attribute="C2HS Directive" context="#pop#pop" char="#" char1="}" />
>+    </context>
>+    <context attribute="C2HS Directive" lineEndContext="#pop" name="c2hs include">
>+      <RegExpr attribute="Keyword" context="#stay" String="include" />
>+      <RegExpr                     context="#stay" String="*.>$" />
>+    </context>
>+    <context attribute="C2HS Directive" lineEndContext="#stay" name="c2hs pointer">
>+      <keyword attribute="Keyword" context="#stay" String="c2hs_keywords" />
>+      <RegExpr attribute="Keyword" context="#stay" String="newtype" />
>+      <RegExpr attribute="Type"    context="#stay" String="([A-Z][a-zA-Z0-9_']*\.)*[A-Z][a-zA-Z0-9_']*" />
>+      <Detect2Chars attribute="C2HS Directive" context="#pop#pop" char="#" char1="}" />
>+    </context>
>+    <context attribute="C2HS Directive" lineEndContext="#stay" name="c2hs fun">
>+      <keyword attribute="Keyword" context="#stay" String="c2hs_keywords" />
>+      <RegExpr attribute="Type" context="#stay" String="`[^']*'" />
>+      <Detect2Chars attribute="C2HS Directive" context="#pop#pop" char="#" char1="}" />
>+    </context>
>+    <context attribute="C2HS Directive" lineEndContext="#stay" name="c2hs enum">
>+      <RegExpr attribute="Type"             context="#stay" String="([A-Z][a-zA-Z0-9_']*\.)*[A-Z][a-zA-Z0-9_']*" />
>+      <Detect2Chars attribute="C2HS Directive" context="#pop#pop" char="#" char1="}" />
>+    </context>
>   </contexts>
>   <itemDatas>
>     <itemData name="Normal"           defStyleNum="dsNormal"   spellChecking="false" />
>@@ -367,6 +437,8 @@
> 
>     <itemData name="Function Infix"   defStyleNum="dsOthers"   spellChecking="false" />
>     <itemData name="EnumFromTo"       defStyleNum="dsOthers"   spellChecking="false" />
>+    
>+    <itemData name="C2HS Directive"   defStyleNum="dsString"   spellChecking="false" />
>   </itemDatas>
>   </highlighting>
>   <general>
>diff -urN tdelibs/kate/data/html.xml tdelibs.new/kate/data/html.xml
>--- tdelibs/kate/data/html.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/html.xml	2013-12-26 13:26:40.404329772 -0600
>@@ -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="1.99" 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="1.99" kateversion="2.5" section="Markup" extensions="*.htm;*.html;*.shtml;*.shtm" mimetype="text/html"  author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL" priority="10">
> 
> <highlighting>
> <contexts>
>diff -urN tdelibs/kate/data/idconsole.xml tdelibs.new/kate/data/idconsole.xml
>--- tdelibs/kate/data/idconsole.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/idconsole.xml	2013-12-26 13:26:41.864323542 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Quake Script" version="1.02" kateversion="2.1" section="Scripts" extensions="*.cfg" mimetype="">
>+<language name="Quake Script" version="1.02" kateversion="2.5" section="Scripts" extensions="*.cfg" mimetype="">
> 
> <highlighting>
> <list name="Commands">
>diff -urN tdelibs/kate/data/idl.xml tdelibs.new/kate/data/idl.xml
>--- tdelibs/kate/data/idl.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/idl.xml	2013-12-26 13:26:41.938323227 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="IDL" version="1.07" kateversion="2.4" section="Sources" extensions="*.idl" mimetype="text/x-idl-src">
>+<language name="IDL" version="1.07" kateversion="2.5" section="Sources" extensions="*.idl" mimetype="text/x-idl-src">
>   <highlighting>
>     <list name="keywords">
>       <item> any </item>
>diff -urN tdelibs/kate/data/ilerpg.xml tdelibs.new/kate/data/ilerpg.xml
>--- tdelibs/kate/data/ilerpg.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/ilerpg.xml	2013-12-26 13:26:40.580329021 -0600
>@@ -45,7 +45,7 @@
> 
> -->
> 
>-<language name="ILERPG" version="1.05" kateversion="2.1" section="Sources" extensions="QRPG*.*;qrpg*.*" mimetype="text/x-ilerpg-src" casesensitive="0">
>+<language name="ILERPG" version="1.05" kateversion="2.5" section="Sources" extensions="QRPG*.*;qrpg*.*" mimetype="text/x-ilerpg-src" casesensitive="0">
>     <highlighting>
>     <list name="dkeywords">
> 	    <item> EXTPROC </item>
>diff -urN tdelibs/kate/data/inform.xml tdelibs.new/kate/data/inform.xml
>--- tdelibs/kate/data/inform.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/inform.xml	2013-12-26 13:26:41.115326739 -0600
>@@ -2,7 +2,7 @@
> <!DOCTYPE language SYSTEM "language.dtd">
> 
> 
>-<language name="Inform" version="1.23" kateversion="2.3" section="Sources" extensions="*.inf;*.h" mimetype="text/x-inform-src" author="Giancarlo Niccolai (giancarlo@niccolai.ws)" license="GPL">
>+<language name="Inform" version="1.23" kateversion="2.5" section="Sources" extensions="*.inf;*.h" mimetype="text/x-inform-src" author="Giancarlo Niccolai (giancarlo@niccolai.ws)" license="GPL">
> <highlighting>
>    <list name="keywords">
>       <item> if </item>
>diff -urN tdelibs/kate/data/ini.xml tdelibs.new/kate/data/ini.xml
>--- tdelibs/kate/data/ini.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/ini.xml	2013-12-26 13:26:41.872323506 -0600
>@@ -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.0" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
>+<language name="INI Files" section="Configuration" extensions="*.ini;*.pls;*.kcfgc" mimetype="" version="1.1" kateversion="2.5" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
> 
> <highlighting>
> <list name="keywords">
>diff -urN tdelibs/kate/data/jam.xml tdelibs.new/kate/data/jam.xml
>--- tdelibs/kate/data/jam.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/jam.xml	2013-12-26 13:26:40.803328071 -0600
>@@ -21,7 +21,7 @@
> FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> IN THE SOFTWARE.
> -->
>-<language name="Jam" version="0.3" kateversion="2.3" section="Other" extensions="Jam*;*.jam" mimetype="text/x-jam;text/x-Jamfile;text/x-Jamrules;text/x-Jambase">
>+<language name="Jam" version="0.3" kateversion="2.5" section="Other" extensions="Jam*;*.jam" mimetype="text/x-jam;text/x-Jamfile;text/x-Jamrules;text/x-Jambase">
>   
>+
>+
>+
>+
>+
>+
>+
>+
>+<language name="JavaScript/PHP" hidden="true" version="1.22" kateversion="2.5" section="Other" extensions=""
>+          mimetype="" indenter="cstyle"
>+          author="Anders Lund (anders@alweb.dk), Joseph Wenninger (jowenn@kde.org), Whitehawk Stormchaser (zerokode@gmx.net)" license="">
>+  <highlighting>
>+    <list name="keywords">
>+      <item> break </item>
>+      <item> case </item>
>+      <item> catch </item>
>+      <item> const </item>
>+      <item> continue </item>
>+      <item> debugger </item>
>+      <item> default </item>
>+      <item> delete </item>
>+      <item> do </item>
>+      <item> else </item>
>+      <item> finally </item>
>+      <item> for </item>
>+      <item> function </item>
>+      <item> if </item>
>+      <item> in </item>
>+      <item> instanceof </item>
>+      <item> new </item>
>+      <item> return </item>
>+      <item> switch </item>
>+      <item> this </item>
>+      <item> throw </item>
>+      <item> try </item>
>+      <item> typeof </item>
>+      <item> var </item>
>+      <item> void </item>
>+      <item> while </item>
>+      <item> with </item>
>+    </list>
>+    <list name="reserved">
>+      <item> class </item>
>+      <item> enum </item>
>+      <item> export </item>
>+      <item> extends </item>
>+      <item> import </item>
>+      <item> super </item>
>+
>+      
>+      <item> implements </item>
>+      <item> interface </item>
>+      <item> let </item>
>+      <item> package </item>
>+      <item> private </item>
>+      <item> protected </item>
>+      <item> public </item>
>+      <item> static </item>
>+      <item> yield </item>
>+    </list>
>+    <list name="primitives">
>+      <item> Infinity </item>
>+      <item> NaN </item>
>+      <item> false </item>
>+      <item> null </item>
>+      <item> true </item>
>+      <item> undefined </item>
>+    </list>
>+    <contexts>
>+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
>+<IncludeRules context="FindPHP" />
>+        <DetectSpaces/>
>+        <StringDetect attribute="Region Marker" context="region_marker" String="//BEGIN" beginRegion="Region1" />
>+        <StringDetect attribute="Region Marker" context="region_marker" String="//END" endRegion="Region1" />
>+
>+        <Float attribute="Float" context="NoRegExp" />
>+        <HlCOct attribute="Octal" context="NoRegExp" />
>+        <HlCHex attribute="Hex" context="NoRegExp" />
>+        <Int attribute="Decimal" context="NoRegExp" />
>+        <AnyChar context="NoRegExp" String="])" />
>+
>+        <keyword attribute="Keyword" String="keywords" />
>+        <keyword attribute="Reserved" String="reserved" />
>+        <keyword attribute="Keyword" context="NoRegExp" String="primitives" />
>+
>+        
>+        <RegExpr attribute="Objects" context="Object Member" String="[a-zA-Z_$][\w$]*(?=\s*\.)" />
>+        
>+        <RegExpr attribute="Object Member" context="NoRegExp" String="[a-zA-Z_$][\w$]*(?=\s*\()" />
>+        <DetectChar context="Object Member" char="." />
>+        
>+        <RegExpr context="NoRegExp" String="[a-zA-Z_$][\w$]*" />
>+
>+        <DetectChar attribute="String" context="String" char="&quot;" />
>+        <DetectChar attribute="String" context="String SQ" char="'" />
>+
>+        <IncludeRules context="##Doxygen" />
>+        <Detect2Chars attribute="Comment" context="Comment" char="/" char1="/" />
>+        <Detect2Chars attribute="Comment" context="Multi/inline Comment" char="/" char1="*" beginRegion="Comment" />
>+
>+        <DetectChar attribute="Regular Expression" context="(regex caret first check)" char="/" />
>+
>+        <DetectChar attribute="Symbol" context="Object" char="{" beginRegion="Brace" />
>+        <DetectChar attribute="Symbol" context="Conditional Expression" char="?" />
>+
>+        <AnyChar attribute="Symbol" String=":!%&amp;+,-/.*&lt;=&gt;?|~^&#59;" />
>+      </context>
>+
>+      <context attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop" name="Object Member">
>+<IncludeRules context="FindPHP" />
>+        <DetectChar char="." />
>+        
>+        <RegExpr attribute="Objects" context="Object Member" String="[a-zA-Z_$][\w$]*(?=\s*\.)" />
>+        
>+        <RegExpr attribute="Object Member" String="[a-zA-Z_$][\w$]*" />
>+        
>+        <Detect2Chars context="#pop" lookAhead="true" char="/" char1="/" />
>+        <Detect2Chars context="#pop" lookAhead="true" char="/" char1="*" />
>+        <DetectChar context="#pop" char="/" />
>+      </context>
>+
>+      <context attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop" name="NoRegExp">
>+<IncludeRules context="FindPHP" />
>+        <Detect2Chars context="#pop" lookAhead="true" char="/" char1="/" />
>+        <Detect2Chars context="#pop" lookAhead="true" char="/" char1="*" />
>+        <DetectChar context="#pop" char="/" />
>+        <DetectSpaces/>
>+      </context>
>+
>+      <context attribute="Normal Text" lineEndContext="#stay" name="Conditional Expression">
>+<IncludeRules context="FindPHP" />
>+        <DetectChar context="#pop" char=":" />
>+        <IncludeRules context="Normal" />
>+      </context>
>+
>+      <context attribute="Normal Text" lineEndContext="#stay" name="Object">
>+<IncludeRules context="FindPHP" />
>+        
>+        <keyword attribute="Keyword" String="keywords" />
>+        
>+        <RegExpr attribute="JSON" String="[a-zA-Z_$][\w$]*\s*(?=:)" />
>+        <DetectChar attribute="Symbol" char="}" endRegion="Brace" context="#pop" />
>+        <IncludeRules context="Normal" />
>+      </context>
>+
>+      <context attribute="String" lineEndContext="#pop" name="String">
>+<IncludeRules context="FindPHP" />
>+        <HlCStringChar attribute="Char" />
>+        <LineContinue/>
>+        <DetectChar attribute="String" context="#pop" char="&quot;" />
>+      </context>
>+      <context attribute="String" lineEndContext="#pop" name="String SQ">
>+<IncludeRules context="FindPHP" />
>+        <HlCStringChar attribute="Char" />
>+        <LineContinue/>
>+        <DetectChar attribute="String" context="#pop" char="'" />
>+      </context>
>+
>+      <context attribute="Comment" lineEndContext="#pop" name="Comment">
>+<IncludeRules context="FindPHP" />
>+        <IncludeRules context="##Alerts" />
>+        <IncludeRules context="##Modelines" />
>+      </context>
>+      <context attribute="Comment" lineEndContext="#stay" name="Multi/inline Comment">
>+<IncludeRules context="FindPHP" />
>+        <IncludeRules context="##Alerts" />
>+        <IncludeRules context="##Modelines" />
>+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment" />
>+      </context>
>+
>+      <context attribute="Regular Expression" lineEndContext="#stay" name="Regular Expression">
>+<IncludeRules context="FindPHP" />
>+        <RegExpr attribute="Regular Expression" context="#pop#pop" String="/\w*" />
>+        <RegExpr attribute="Pattern Internal Operator" String="\{[\d, ]+\}" />
>+        <RegExpr attribute="Pattern Internal Operator" String="\\[bB]" />
>+        <RegExpr attribute="Pattern Character Class" String="\\[nrtvfDdSsWw]" />
>+        <DetectChar attribute="Pattern Character Class" context="(charclass caret first check)" char="[" />
>+        <RegExpr attribute="Pattern Internal Operator" String="\\." />
>+        <RegExpr attribute="Pattern Internal Operator" String="\$(?=/)" />
>+        <AnyChar attribute="Pattern Internal Operator" String="?+*()|" />
>+      </context>
>+      <context attribute="Pattern Character Class" lineEndContext="#stay" name="Regular Expression Character Class">
>+<IncludeRules context="FindPHP" />
>+        <RegExpr String="\\[\[\]]" />
>+        <RegExpr attribute="Pattern Internal Operator" String="\\." />
>+        <DetectChar attribute="Pattern Character Class" context="#pop#pop" char="]" />
>+      </context>
>+      <context attribute="Pattern Internal Operator" lineEndContext="#pop" name="(regex caret first check)" fallthrough="true" fallthroughContext="Regular Expression">
>+<IncludeRules context="FindPHP" />
>+        <DetectChar attribute="Pattern Internal Operator" context="Regular Expression" char="^" />
>+      </context>
>+      <context attribute="Pattern Internal Operator" lineEndContext="#pop" name="(charclass caret first check)" fallthrough="true" fallthroughContext="Regular Expression Character Class">
>+<IncludeRules context="FindPHP" />
>+        <DetectChar attribute="Pattern Internal Operator" context="Regular Expression Character Class" char="^" />
>+      </context>
>+
>+      <context name="region_marker" attribute="Region Marker" lineEndContext="#pop" >
>+<IncludeRules context="FindPHP" />
>+        <DetectIdentifier/>
>+        <DetectSpaces/>
>+      </context>
>+    <context name="FindPHP">
>+<RegExpr context="##PHP/PHP" String="&lt;\?(?:=|php)?" lookAhead="true" />
>+</context>
>+</contexts>
>+    <itemDatas>
>+      <itemData name="Normal Text"  defStyleNum="dsNormal"  spellChecking="false" />
>+      <itemData name="Keyword"      defStyleNum="dsKeyword" spellChecking="false" />
>+      <itemData name="Reserved"     defStyleNum="dsKeyword" italic="true" spellChecking="false" />
>+      <itemData name="Function"     defStyleNum="dsFunction" spellChecking="false" />
>+      <itemData name="Objects"      defStyleNum="dsOthers" spellChecking="false" />
>+      <itemData name="Object Member" defStyleNum="dsFunction" spellChecking="false" />
>+
>+      <itemData name="Decimal"      defStyleNum="dsDecVal" spellChecking="false" />
>+      <itemData name="Octal"        defStyleNum="dsBaseN" spellChecking="false" />
>+      <itemData name="Hex"          defStyleNum="dsBaseN" spellChecking="false" />
>+      <itemData name="Float"        defStyleNum="dsFloat" spellChecking="false" />
>+      <itemData name="Char"         defStyleNum="dsChar" spellChecking="false" />
>+      <itemData name="String"       defStyleNum="dsString" />
>+
>+      <itemData name="Comment"      defStyleNum="dsComment" />
>+      <itemData name="Symbol"       defStyleNum="dsNormal" spellChecking="false" />
>+      <itemData name="Regular Expression" defStyleNum="dsOthers" spellChecking="false" />
>+      <itemData name="Pattern Internal Operator" defStyleNum="dsFloat" spellChecking="false" />
>+      <itemData name="Pattern Character Class" defStyleNum="dsBaseN" spellChecking="false" />
>+      <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false" />
>+      <itemData name="JSON"         defStyleNum="dsDataType" spellChecking="false" />
>+    </itemDatas>
>+  </highlighting>
>+  <general>
>+    <comments>
>+      <comment name="singleLine" start="//" />
>+      <comment name="multiLine" start="/*" end="*/" />
>+    </comments>
>+    <keywords casesensitive="1" />
>+  </general>
>+</language>
>+
>+
>+
>diff -urN tdelibs/kate/data/javascript.xml tdelibs.new/kate/data/javascript.xml
>--- tdelibs/kate/data/javascript.xml	2013-09-04 12:47:15.000000000 -0500
>+++ tdelibs.new/kate/data/javascript.xml	2013-12-26 13:26:41.256326135 -0600
>@@ -3,203 +3,172 @@
> 
> 
> 
>-<language name="JavaScript" version="1.19" kateversion="2.4" section="Scripts" extensions="*.js;*.twinscript"
>+<language name="JavaScript" version="1.22" kateversion="2.5" 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>
>     <list name="keywords">
>-        <item> if </item>
>-        <item> else </item>
>-        <item> for </item>
>-        <item> in </item>
>-        <item> while </item>
>-        <item> do </item>
>-        <item> continue </item>
>-        <item> break </item>
>-        <item> with </item>
>-        <item> try </item>
>-        <item> catch </item>
>-        <item> finally </item>
>-        <item> switch </item>
>-        <item> case </item>
>-        <item> new </item>
>-        <item> var </item>
>-        <item> function </item>
>-        <item> return </item>
>-        <item> delete </item>
>-        <item> true </item>
>-        <item> false </item>
>-        <item> void </item>
>-        <item> throw </item>
>-        <item> typeof </item>
>-        <item> const </item>
>-        <item> default </item>
>+      <item> break </item>
>+      <item> case </item>
>+      <item> catch </item>
>+      <item> const </item>
>+      <item> continue </item>
>+      <item> debugger </item>
>+      <item> default </item>
>+      <item> delete </item>
>+      <item> do </item>
>+      <item> else </item>
>+      <item> finally </item>
>+      <item> for </item>
>+      <item> function </item>
>+      <item> if </item>
>+      <item> in </item>
>+      <item> instanceof </item>
>+      <item> new </item>
>+      <item> return </item>
>+      <item> switch </item>
>+      <item> this </item>
>+      <item> throw </item>
>+      <item> try </item>
>+      <item> typeof </item>
>+      <item> var </item>
>+      <item> void </item>
>+      <item> while </item>
>+      <item> with </item>
>     </list>
>-    <list name="functions">
>-        <item> escape </item>
>-        <item> isFinite </item>
>-        <item> isNaN </item>
>-        <item> Number </item>
>-        <item> parseFloat </item>
>-        <item> parseInt </item>
>-        <item> reload </item>
>-        <item> taint </item>
>-        <item> unescape </item>
>-        <item> untaint </item>
>-        <item> write </item>
>-        </list>
>-    <list name="objects">
>-        <item>Anchor</item>
>-        <item>Applet</item>
>-        <item>Area</item>
>-        <item>Array</item>
>-        <item>Boolean</item>
>-        <item>Button</item>
>-        <item>Checkbox</item>
>-        <item>Date</item>
>-        <item>document</item>
>-        <item>window</item>
>-        <item>Image</item>
>-        <item>FileUpload</item>
>-        <item>Form</item>
>-        <item>Frame</item>
>-        <item>Function</item>
>-        <item>Hidden</item>
>-        <item>Link</item>
>-        <item>MimeType</item>
>-        <item>Math</item>
>-        <item>Max</item>
>-        <item>Min</item>
>-        <item>Layer</item>
>-        <item>navigator</item>
>-        <item>Object</item>
>-        <item>Password</item>
>-        <item>Plugin</item>
>-        <item>Radio</item>
>-        <item>RegExp</item>
>-        <item>Reset</item>
>-        <item>Screen</item>
>-        <item>Select</item>
>-        <item>String</item>
>-        <item>Text</item>
>-        <item>Textarea</item>
>-        <item>this</item>
>-        <item>Window</item>
>-        </list>
>-    <list name="math">
>-        <item> abs </item>
>-        <item> acos </item>
>-        <item> asin </item>
>-        <item> atan </item>
>-        <item> atan2 </item>
>-        <item> ceil </item>
>-        <item> cos </item>
>-        <item> ctg </item>
>-        <item> E </item>
>-        <item> exp </item>
>-        <item> floor </item>
>-        <item> LN2 </item>
>-        <item> LN10 </item>
>-        <item> log </item>
>-        <item> LOG2E </item>
>-        <item> LOG10E </item>
>-        <item> PI </item>
>-        <item> pow </item>
>-        <item> round </item>
>-        <item> sin </item>
>-        <item> sqrt </item>
>-        <item> SQRT1_2 </item>
>-        <item> SQRT2 </item>
>-        <item> tan </item>
>+    <list name="reserved">
>+      <item> class </item>
>+      <item> enum </item>
>+      <item> export </item>
>+      <item> extends </item>
>+      <item> import </item>
>+      <item> super </item>
>+
>+      
>+      <item> implements </item>
>+      <item> interface </item>
>+      <item> let </item>
>+      <item> package </item>
>+      <item> private </item>
>+      <item> protected </item>
>+      <item> public </item>
>+      <item> static </item>
>+      <item> yield </item>
>     </list>
>-    <list name="events">
>-         <item>onAbort</item>
>-         <item>onBlur</item>
>-         <item>onChange</item>
>-         <item>onClick</item>
>-         <item>onError</item>
>-         <item>onFocus</item>
>-         <item>onLoad</item>
>-         <item>onMouseOut</item>
>-         <item>onMouseOver</item>
>-         <item>onReset</item>
>-         <item>onSelect</item>
>-         <item>onSubmit</item>
>-         <item>onUnload</item>
>+    <list name="primitives">
>+      <item> Infinity </item>
>+      <item> NaN </item>
>+      <item> false </item>
>+      <item> null </item>
>+      <item> true </item>
>+      <item> undefined </item>
>     </list>
>     <contexts>
>       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
>-	<DetectSpaces/>
>-        <StringDetect attribute="Region Marker" context="region_marker" String="//BEGIN" beginRegion="Region1"/>
>-        <StringDetect attribute="Region Marker" context="region_marker" String="//END" endRegion="Region1"/>
>-        <Float attribute="Float" context="#stay" />
>-        <Int attribute="Decimal" context="#stay" />
>-        <RegExpr attribute="JSON" context="#stay" String="\b[\w\.]+\b\s*(?=:)" />
>-
>-        <keyword attribute="Keyword" context="#stay" String="keywords" />
>-        <keyword attribute="Function" context="#stay" String="functions" />
>-        <keyword attribute="Objects" context="#stay" String="objects" />
>-        <keyword attribute="Math" context="#stay" String="math" />
>-        <keyword attribute="Events" context="#stay" String="events" />
>-
>-        <DetectChar context="ObjectMember" char="." />
>-        <RegExpr attribute="Objects" context="ObjectMember" String="\b[\w\.]+(?=\.)" />
>-
>-	<DetectIdentifier/>
>-        <DetectChar attribute="String" context="String" char="&quot;"/>
>-        <DetectChar attribute="String Char" context="String 1" char="'"/>
>-        <Detect2Chars attribute="Comment" context="Comment" char="/" char1="/"/>
>-        <Detect2Chars attribute="Comment" context="Multi/inline Comment" char="/" char1="*" beginRegion="Comment"/>
>-        <RegExpr attribute="Normal Text" context="(Internal regex catch)" String="[=?:]" />
>-        <RegExpr attribute="Normal Text" context="(Internal regex catch)" String="\(" />
>-        <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
>-        <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
>-        <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;+,-/.*&lt;=&gt;?[]|~^&#59;"/>
>+        <DetectSpaces/>
>+        <StringDetect attribute="Region Marker" context="region_marker" String="//BEGIN" beginRegion="Region1" />
>+        <StringDetect attribute="Region Marker" context="region_marker" String="//END" endRegion="Region1" />
>+
>+        <Float attribute="Float" context="NoRegExp" />
>+        <HlCOct attribute="Octal" context="NoRegExp" />
>+        <HlCHex attribute="Hex" context="NoRegExp" />
>+        <Int attribute="Decimal" context="NoRegExp" />
>+        <AnyChar context="NoRegExp" String="])" />
>+
>+        <keyword attribute="Keyword" String="keywords" />
>+        <keyword attribute="Reserved" String="reserved" />
>+        <keyword attribute="Keyword" context="NoRegExp" String="primitives" />
>+
>+        
>+        <RegExpr attribute="Objects" context="Object Member" String="[a-zA-Z_$][\w$]*(?=\s*\.)" />
>+        
>+        <RegExpr attribute="Object Member" context="NoRegExp" String="[a-zA-Z_$][\w$]*(?=\s*\()" />
>+        <DetectChar context="Object Member" char="." />
>+        
>+        <RegExpr context="NoRegExp" String="[a-zA-Z_$][\w$]*" />
>+
>+        <DetectChar attribute="String" context="String" char="&quot;" />
>+        <DetectChar attribute="String" context="String SQ" char="'" />
>+
>+        <IncludeRules context="##Doxygen" />
>+        <Detect2Chars attribute="Comment" context="Comment" char="/" char1="/" />
>+        <Detect2Chars attribute="Comment" context="Multi/inline Comment" char="/" char1="*" beginRegion="Comment" />
>+
>+        <DetectChar attribute="Regular Expression" context="(regex caret first check)" char="/" />
>+
>+        <DetectChar attribute="Symbol" context="Object" char="{" beginRegion="Brace" />
>+        <DetectChar attribute="Symbol" context="Conditional Expression" char="?" />
>+
>+        <AnyChar attribute="Symbol" String=":!%&amp;+,-/.*&lt;=&gt;?|~^&#59;" />
>       </context>
> 
>-      <context attribute="String" lineEndContext="#pop" name="String">
>-	<DetectIdentifier/>
>-        <HlCStringChar attribute="String Char" context="#stay"/>
>-        <LineContinue attribute="String" context="#stay"/>
>-        <DetectChar attribute="String" context="#pop" char="&quot;"/>
>+      <context attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop" name="Object Member">
>+        <DetectChar char="." />
>+        
>+        <RegExpr attribute="Objects" context="Object Member" String="[a-zA-Z_$][\w$]*(?=\s*\.)" />
>+        
>+        <RegExpr attribute="Object Member" String="[a-zA-Z_$][\w$]*" />
>+        
>+        <Detect2Chars context="#pop" lookAhead="true" char="/" char1="/" />
>+        <Detect2Chars context="#pop" lookAhead="true" char="/" char1="*" />
>+        <DetectChar context="#pop" char="/" />
>+      </context>
>+
>+      <context attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop" name="NoRegExp">
>+        <Detect2Chars context="#pop" lookAhead="true" char="/" char1="/" />
>+        <Detect2Chars context="#pop" lookAhead="true" char="/" char1="*" />
>+        <DetectChar context="#pop" char="/" />
>+        <DetectSpaces/>
>+      </context>
>+
>+      <context attribute="Normal Text" lineEndContext="#stay" name="Conditional Expression">
>+        <DetectChar context="#pop" char=":" />
>+        <IncludeRules context="Normal" />
>+      </context>
>+
>+      <context attribute="Normal Text" lineEndContext="#stay" name="Object">
>+        
>+        <keyword attribute="Keyword" String="keywords" />
>+        
>+        <RegExpr attribute="JSON" String="[a-zA-Z_$][\w$]*\s*(?=:)" />
>+        <DetectChar attribute="Symbol" char="}" endRegion="Brace" context="#pop" />
>+        <IncludeRules context="Normal" />
>       </context>
>-      <context attribute="String Char" lineEndContext="#pop" name="String 1">
>-        <DetectIdentifier/>
>-        <HlCStringChar attribute="String Char" context="#stay"/>
>-        <LineContinue attribute="String" context="#stay"/>
>-        <DetectChar attribute="String Char" context="#pop" char="'"/>
>+
>+      <context attribute="String" lineEndContext="#pop" name="String">
>+        <HlCStringChar attribute="Char" />
>+        <LineContinue/>
>+        <DetectChar attribute="String" context="#pop" char="&quot;" />
>+      </context>
>+      <context attribute="String" lineEndContext="#pop" name="String SQ">
>+        <HlCStringChar attribute="Char" />
>+        <LineContinue/>
>+        <DetectChar attribute="String" context="#pop" char="'" />
>       </context>
> 
>       <context attribute="Comment" lineEndContext="#pop" name="Comment">
>-        <DetectSpaces />
>         <IncludeRules context="##Alerts" />
>-        <DetectIdentifier />
>+        <IncludeRules context="##Modelines" />
>       </context>
>       <context attribute="Comment" lineEndContext="#stay" name="Multi/inline Comment">
>         <IncludeRules context="##Alerts" />
>-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
>+        <IncludeRules context="##Modelines" />
>+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment" />
>       </context>
> 
>       <context attribute="Regular Expression" lineEndContext="#stay" name="Regular Expression">
>-        <RegExpr attribute="Regular Expression" context="#pop#pop#pop" String="/[ig]{0,2}" />
>-        <RegExpr attribute="Pattern Internal Operator" context="#stay" String="\{[\d, ]+\}" />
>-        <RegExpr attribute="Pattern Internal Operator" context="#stay" String="\\[bB]" />
>-        <RegExpr attribute="Pattern Character Class" context="#stay" String="\\[nrtvfDdSsWw]" />
>+        <RegExpr attribute="Regular Expression" context="#pop#pop" String="/\w*" />
>+        <RegExpr attribute="Pattern Internal Operator" String="\{[\d, ]+\}" />
>+        <RegExpr attribute="Pattern Internal Operator" String="\\[bB]" />
>+        <RegExpr attribute="Pattern Character Class" String="\\[nrtvfDdSsWw]" />
>         <DetectChar attribute="Pattern Character Class" context="(charclass caret first check)" char="[" />
>-        <RegExpr attribute="Pattern Internal Operator" context="#stay" String="\\." />
>-        <RegExpr attribute="Pattern Internal Operator" context="#stay" String="\$(?=/)" />
>-        <AnyChar attribute="Pattern Internal Operator" context="#stay" String="?+*()|" />
>-      </context>
>-      <context attribute="Normal Text" lineEndContext="#stay" name="(Internal regex catch)" fallthrough="true" fallthroughContext="#pop">
>-        <RegExpr attribute="Normal Text" context="#stay" String="\s*" />
>-        <RegExpr attribute="Regular Expression" context="#pop" String="//(?=;)" />
>-        <Detect2Chars attribute="Comment" context="Comment" char="/" char1="/" />
>-        <Detect2Chars attribute="Comment" context="Multi/inline Comment" char="/" char1="*" />
>-        <DetectChar attribute="Regular Expression" context="(regex caret first check)" char="/" />
>+        <RegExpr attribute="Pattern Internal Operator" String="\\." />
>+        <RegExpr attribute="Pattern Internal Operator" String="\$(?=/)" />
>+        <AnyChar attribute="Pattern Internal Operator" String="?+*()|" />
>       </context>
>       <context attribute="Pattern Character Class" lineEndContext="#stay" name="Regular Expression Character Class">
>-        <RegExpr attribute="Pattern Character Class" context="#stay" String="\\[\[\]]" />
>-        <RegExpr attribute="Pattern Internal Operator" context="#stay" String="\\." />
>+        <RegExpr String="\\[\[\]]" />
>+        <RegExpr attribute="Pattern Internal Operator" String="\\." />
>         <DetectChar attribute="Pattern Character Class" context="#pop#pop" char="]" />
>       </context>
>       <context attribute="Pattern Internal Operator" lineEndContext="#pop" name="(regex caret first check)" fallthrough="true" fallthroughContext="Regular Expression">
>@@ -210,37 +179,32 @@
>       </context>
> 
>       <context name="region_marker" attribute="Region Marker" lineEndContext="#pop" >
>-	<DetectIdentifier />
>-	<DetectSpaces />
>-      </context>
>-
>-      <context name="ObjectMember" attribute="Normal Text" lineEndContext="#stay">
>-        <DetectChar context="#stay" char="." />
>-        <DetectIdentifier attribute="Object Member" />
>-        <DetectSpaces context="#pop" />
>-        <AnyChar lookAhead="true" context="#pop" String="(){}:!%&amp;+,-/.*&lt;=&gt;?[]|~^&#59;"/>
>+        <DetectIdentifier/>
>+        <DetectSpaces/>
>       </context>
>     </contexts>
>     <itemDatas>
>-      <itemData name="Normal Text"  defStyleNum="dsNormal"  spellChecking="false"/>
>-      <itemData name="Keyword"      defStyleNum="dsKeyword" spellChecking="false"/>
>-      <itemData name="Function" defStyleNum="dsFunction" spellChecking="false"/>
>-      <itemData name="Objects" defStyleNum="dsKeyword" color="#008000" selColor="#00ffff" bold="0" italic="0" spellChecking="false"/>
>-      <itemData name="Object Member" defStyleNum="dsFunction" spellChecking="false"/>
>-      <itemData name="Math" defStyleNum="dsKeyword" color="#DBA716" selColor="#00ffff" bold="0" italic="0" spellChecking="false"/>
>-      <itemData name="Events" defStyleNum="dsKeyword" color="#F766D5" selColor="#00ffff" bold="0" italic="0" spellChecking="false"/>
>-      <itemData name="Decimal"      defStyleNum="dsDecVal" spellChecking="false"/>
>-      <itemData name="Float"        defStyleNum="dsFloat" spellChecking="false"/>
>-      <itemData name="Char"         defStyleNum="dsChar" spellChecking="false"/>
>-      <itemData name="String"       defStyleNum="dsString"/>
>-      <itemData name="String Char"  defStyleNum="dsChar" spellChecking="false"/>
>-      <itemData name="Comment"      defStyleNum="dsComment"/>
>-      <itemData name="Symbol"       defStyleNum="dsNormal" spellChecking="false"/>
>-      <itemData name="Regular Expression" defStyleNum="dsOthers" spellChecking="false"/>
>-      <itemData name="Pattern Internal Operator" defStyleNum="dsFloat" spellChecking="false"/>
>-      <itemData name="Pattern Character Class" defStyleNum="dsBaseN" spellChecking="false"/>
>-      <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
>-      <itemData name="JSON" defStyleNum="dsDataType" spellChecking="false"/>
>+      <itemData name="Normal Text"  defStyleNum="dsNormal"  spellChecking="false" />
>+      <itemData name="Keyword"      defStyleNum="dsKeyword" spellChecking="false" />
>+      <itemData name="Reserved"     defStyleNum="dsKeyword" italic="true" spellChecking="false" />
>+      <itemData name="Function"     defStyleNum="dsFunction" spellChecking="false" />
>+      <itemData name="Objects"      defStyleNum="dsOthers" spellChecking="false" />
>+      <itemData name="Object Member" defStyleNum="dsFunction" spellChecking="false" />
>+
>+      <itemData name="Decimal"      defStyleNum="dsDecVal" spellChecking="false" />
>+      <itemData name="Octal"        defStyleNum="dsBaseN" spellChecking="false" />
>+      <itemData name="Hex"          defStyleNum="dsBaseN" spellChecking="false" />
>+      <itemData name="Float"        defStyleNum="dsFloat" spellChecking="false" />
>+      <itemData name="Char"         defStyleNum="dsChar" spellChecking="false" />
>+      <itemData name="String"       defStyleNum="dsString" />
>+
>+      <itemData name="Comment"      defStyleNum="dsComment" />
>+      <itemData name="Symbol"       defStyleNum="dsNormal" spellChecking="false" />
>+      <itemData name="Regular Expression" defStyleNum="dsOthers" spellChecking="false" />
>+      <itemData name="Pattern Internal Operator" defStyleNum="dsFloat" spellChecking="false" />
>+      <itemData name="Pattern Character Class" defStyleNum="dsBaseN" spellChecking="false" />
>+      <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false" />
>+      <itemData name="JSON"         defStyleNum="dsDataType" spellChecking="false" />
>     </itemDatas>
>   </highlighting>
>   <general>
>diff -urN tdelibs/kate/data/json.xml tdelibs.new/kate/data/json.xml
>--- tdelibs/kate/data/json.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/json.xml	2013-12-26 13:26:40.584329005 -0600
>@@ -12,7 +12,7 @@
>  ** http://tools.ietf.org/html/rfc4627
>  ***************************************************************************
> -->
>-<language name="JSON" section="Markup" version="1.2" kateversion="2.3" extensions="*.json" mimetype="application/json" author="Sebastian Pipping (sebastian@pipping.org)" license="GPL">
>+<language name="JSON" section="Markup" version="1.2" kateversion="2.5" extensions="*.json" mimetype="application/json" author="Sebastian Pipping (sebastian@pipping.org)" license="GPL">
>   <highlighting>
>     <list name="Constants">
>       <item>null</item>
>diff -urN tdelibs/kate/data/jsp.xml tdelibs.new/kate/data/jsp.xml
>--- tdelibs/kate/data/jsp.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/jsp.xml	2013-12-26 13:26:41.560324839 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language version="1.02" kateversion="2.4" name="JSP" section="Markup" extensions="*.jsp;*.JSP" mimetype="text/html" casesensitive="false" author="Rob Martin (rob@gamepimp.com)" license="LGPL">
>+<language version="1.02" kateversion="2.5" name="JSP" section="Markup" extensions="*.jsp;*.JSP" mimetype="text/html" casesensitive="false" author="Rob Martin (rob@gamepimp.com)" license="LGPL">
>   <highlighting>
> 
>     <list name="java-1.4.2-classes">
>diff -urN tdelibs/kate/data/julia.xml tdelibs.new/kate/data/julia.xml
>--- tdelibs/kate/data/julia.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/julia.xml	2013-12-26 13:26:41.425325414 -0600
>@@ -0,0 +1,291 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+
>+
>+<!DOCTYPE language SYSTEM "language.dtd">
>+
>+<language name="Julia" section="Sources" version="0.2" kateversion="2.5" extensions="*.jl" casesensitive="1" priority="5" license="MIT">
>+
>+  <highlighting>
>+    <list name="block_begin">
>+      <item> begin </item>
>+      <item> do </item>
>+      <item> for </item>
>+      <item> function </item>
>+      <item> if </item>
>+      <item> let </item>
>+      <item> quote </item>
>+      <item> try </item>
>+      <item> type </item>
>+      <item> while </item>
>+    </list>
>+    <list name="block_eb">
>+      <item> catch </item>
>+      <item> else </item>
>+      <item> elseif </item>
>+    </list>
>+    <list name="block_end">
>+      <item> end </item>
>+    </list>
>+    <list name="keywords">
>+      <item> abstract </item>
>+      <item> bitstype </item>
>+      <item> break </item>
>+      <item> ccall </item>
>+      <item> const </item>
>+      <item> continue </item>
>+      <item> export </item>
>+      <item> global </item>
>+      <item> import </item>
>+      <item> in </item>
>+      <item> local </item>
>+      <item> macro </item>
>+      <item> module </item>
>+      <item> return </item>
>+      <item> typealias </item>
>+    </list>
>+    <list name="types">
>+      <item> AbstractArray </item>
>+      <item> AbstractMatrix </item>
>+      <item> AbstractVector </item>
>+      <item> Any </item>
>+      <item> Array </item>
>+      <item> ASCIIString </item>
>+      <item> Associative </item>
>+      <item> Bool </item>
>+      <item> ByteString </item>
>+      <item> Char </item>
>+      <item> Complex </item>
>+      <item> Complex64 </item>
>+      <item> Complex128 </item>
>+      <item> ComplexPair </item>
>+      <item> DArray </item>
>+      <item> Dict </item>
>+      <item> Exception </item>
>+      <item> Expr </item>
>+      <item> Float </item>
>+      <item> Float32 </item>
>+      <item> Float64 </item>
>+      <item> Function </item>
>+      <item> ObjectIdDict </item>
>+      <item> Int </item>
>+      <item> Int8 </item>
>+      <item> Int16 </item>
>+      <item> Int32 </item>
>+      <item> Int64 </item>
>+      <item> Integer </item>
>+      <item> IntSet </item>
>+      <item> IO </item>
>+      <item> IOStream </item>
>+      <item> Matrix </item>
>+      <item> Nothing </item>
>+      <item> None </item>
>+      <item> NTuple </item>
>+      <item> Number </item>
>+      <item> Ptr </item>
>+      <item> Range </item>
>+      <item> Range1 </item>
>+      <item> Ranges </item>
>+      <item> Rational </item>
>+      <item> Real </item>
>+      <item> Regex </item>
>+      <item> RegexMatch </item>
>+      <item> Set </item>
>+      <item> Signed </item>
>+      <item> StridedArray </item>
>+      <item> StridedMatrix </item>
>+      <item> StridedVecOrMat </item>
>+      <item> StridedVector </item>
>+      <item> String </item>
>+      <item> SubArray </item>
>+      <item> SubString </item>
>+      <item> Symbol </item>
>+      <item> Task </item>
>+      <item> Tuple </item>
>+      <item> Type </item>
>+      <item> Uint </item>
>+      <item> Uint8 </item>
>+      <item> Uint16 </item>
>+      <item> Uint32 </item>
>+      <item> Uint64 </item>
>+      <item> Union </item>
>+      <item> Unsigned </item>
>+      <item> UTF8String </item>
>+      <item> VecOrMat </item>
>+      <item> Vector </item>
>+      <item> Void </item>
>+      <item> WeakRef </item>
>+    </list>
>+    <contexts>
>+
>+      <context name="_normal" attribute="Normal Text" lineEndContext="#stay">
>+
>+	<DetectSpaces />
>+
>+        
>+        <keyword context="#stay" attribute="Keyword" String="block_begin" 
>+beginRegion="block" />
>+        <keyword context="#stay" attribute="Keyword" String="block_eb" 
>+endRegion="block" beginRegion="block" />
>+        <keyword context="#stay" attribute="Keyword" String="block_end" 
>+endRegion="block" />
>+        <StringDetect String="#BEGIN" context="region_marker" attribute="FoldingComment" beginRegion="user_region" />
>+        <StringDetect String="#END" context="region_marker" attribute="FoldingComment" endRegion="user_region" />
>+
>+        
>+        <keyword context="#stay" attribute="Keyword" String="keywords" />
>+        <keyword context="#stay" attribute="Data Type" String="types" />
>+        <DetectChar char="#" context="1-comment" attribute="Comment"/>
>+
>+	
>+        
>+
>+        
>+	<DetectChar attribute="String" context="String" char="&quot;"/>
>+
>+        
>+        <StringDetect context="#stay" attribute="Operator" String="..."/>
>+        <StringDetect context="#stay" attribute="Operator" String="::"/>
>+        <StringDetect context="#stay" attribute="Operator" String="&gt;&gt;&gt;"/>
>+        <StringDetect context="#stay" attribute="Operator" String="&gt;&gt;"/>
>+        <StringDetect context="#stay" attribute="Operator" String="&lt;&lt;"/>
>+        <StringDetect context="#stay" attribute="Operator" String="=="/>
>+        <StringDetect context="#stay" attribute="Operator" String="!="/>
>+        <StringDetect context="#stay" attribute="Operator" String="&lt;="/>
>+        <StringDetect context="#stay" attribute="Operator" String="&gt;="/>
>+        <StringDetect context="#stay" attribute="Operator" String="&amp;&amp;"/>
>+        <StringDetect context="#stay" attribute="Operator" String="||"/>
>+        <StringDetect context="#stay" attribute="Operator" String=".*"/>
>+        <StringDetect context="#stay" attribute="Operator" String=".^"/>
>+        <StringDetect context="#stay" attribute="Operator" String="./"/>
>+        <StringDetect context="#stay" attribute="Operator" String=".'"/>
>+        <StringDetect context="#stay" attribute="Operator" String="+="/>
>+        <StringDetect context="#stay" attribute="Operator" String="-="/>
>+        <StringDetect context="#stay" attribute="Operator" String="*="/>
>+        <StringDetect context="#stay" attribute="Operator" String="/="/>
>+        <StringDetect context="#stay" attribute="Operator" String="&amp;="/>
>+        <StringDetect context="#stay" attribute="Operator" String="|="/>
>+        <StringDetect context="#stay" attribute="Operator" String="$="/>
>+        <StringDetect context="#stay" attribute="Operator" String="&gt;&gt;&gt;="/>
>+        <StringDetect context="#stay" attribute="Operator" String="&gt;&gt;="/>
>+        <StringDetect context="#stay" attribute="Operator" String="&lt;&lt;="/>
>+
>+        
>+        <RegExpr context="_adjoint" attribute="Variable" String="[a-zA-Z]\w*(?=')" />
>+        <RegExpr context="_adjoint" attribute="Float" String="(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?(im)?(?=')" />
>+        <RegExpr context="_adjoint" attribute="Delimiter" String="[\)\]}](?=')" />
>+        <RegExpr context="_adjoint" attribute="Operator" String="\.'(?=')" />
>+
>+        
>+        <RegExpr context="#stay" attribute="Char" String="'[^']*(''[^']*)*'(?=[^']|$)" />
>+        <RegExpr context="#stay" attribute="Incomplete Char" String="'[^']*(''[^']*)*" />
>+
>+        
>+        
>+        <DetectIdentifier context="#stay" attribute="Variable" />
>+        <RegExpr context="#stay" attribute="Hex" String="0x[0-9a-fA-F]+(im)?" />
>+        <RegExpr context="#stay" attribute="Float" String="(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?(im)?" />
>+        <AnyChar context="#stay" attribute="Delimiter" String="()[]{}"/>
>+
>+        
>+        <AnyChar context="#stay" attribute="Operator" String="*+-/\&amp;|&lt;&gt;~$!^=,;:@"/>
>+
>+      </context>
>+
>+      
>+      <context name="region_marker" lineEndContext="#pop" attribute="FoldingComment" >
>+        <IncludeRules context="1-comment" />
>+      </context>
>+
>+      
>+      <context name="nested" attribute="Normal text" lineEndContext="#stay">
>+        <DetectChar char=")" context="#pop" endRegion="nested" attribute="Delimiter" />
>+      </context>
>+      <context name="squared" attribute="Normal text" lineEndContext="#stay">
>+        <DetectChar char="]" context="#pop" endRegion="squared" attribute="Delimiter" />
>+      </context>
>+      <context name="curly" attribute="Normal text" lineEndContext="#stay">
>+        <DetectChar char="}" context="#pop" endRegion="curly" attribute="Delimiter" />
>+      </context>
>+
>+      
>+      <context name="_adjoint" attribute="Operator" lineEndContext="#pop">
>+        <RegExpr context="#pop" attribute="Operator" String="'+" />
>+      </context>
>+
>+      
>+      <context attribute="String" lineEndContext="#pop" name="String">
>+        <DetectSpaces />
>+        <DetectIdentifier />
>+        <LineContinue attribute="String" context="#stay"/>
>+        <HlCStringChar attribute="String Char" context="#stay"/>
>+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
>+      </context>
>+
>+      
>+      <context name="1-comment" lineEndContext="#pop" attribute="Comment">
>+        <DetectSpaces />
>+        <DetectIdentifier />
>+      </context>
>+
>+    </contexts>
>+
>+    <itemDatas>
>+      <itemData name="Normal Text" defStyleNum="dsNormal" />
>+      <itemData name="Variable" defStyleNum="dsNormal" />
>+      <itemData name="Operator" defStyleNum="dsNormal"/>
>+      <itemData name="Decimal" defStyleNum="dsDecVal" />
>+      <itemData name="Float" defStyleNum="dsFloat" />
>+      <itemData name="Hex" defStyleNum="dsBaseN" />
>+      <itemData name="Delimiter" defStyleNum="dsNormal" />
>+      <itemData name="String" defStyleNum="dsString"/>
>+      <itemData name="Char" defStyleNum="dsChar"/>
>+      <itemData name="Incomplete Char" defStyleNum="dsChar"/>
>+      <itemData name="System" defStyleNum="dsBaseN"/>
>+      <itemData name="Keyword" defStyleNum="dsKeyword"/>
>+      <itemData name="Data Type" defStyleNum="dsDataType"/>
>+      <itemData name="Comment" defStyleNum="dsComment"/>
>+      <itemData name="Comment" defStyleNum="dsComment"/>
>+      <itemData name="FoldingComment" defStyleNum="dsComment" />
>+    </itemDatas>
>+
>+  </highlighting>
>+
>+  <general>
>+    <comments>
>+      <comment name="singleLine" start="#" />
>+    </comments>
>+    <keywords casesensitive="1" weakDeliminator=""/>
>+  </general>
>+
>+</language>
>+
>+
>+
>diff -urN tdelibs/kate/data/kbasic.xml tdelibs.new/kate/data/kbasic.xml
>--- tdelibs/kate/data/kbasic.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/kbasic.xml	2013-12-26 13:26:41.950323173 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="KBasic" version="1.02" kateversion="2.1" section="Sources" extensions="*.kbasic" mimetype="text/x-kbasic-src">
>+<language name="KBasic" version="1.02" kateversion="2.5" section="Sources" extensions="*.kbasic" mimetype="text/x-kbasic-src">
>     <highlighting>
>         <list name="keywords">
>         <item> For </item>
>diff -urN tdelibs/kate/data/latex.xml tdelibs.new/kate/data/latex.xml
>--- tdelibs/kate/data/latex.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/latex.xml	2013-12-26 13:26:40.435329639 -0600
>@@ -1,17 +1,19 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="LaTeX" version="1.48" section="Markup" kateversion="2.3" priority="10" extensions="*.tex;*.ltx;*.dtx;*.sty;*.cls;*.bbx;*.cbx;*.lbx;" mimetype="text/x-tex" casesensitive="1" author="Jeroen Wijnhout (Jeroen.Wijnhout@kdemail.net)+Holger Danielsson (holger.danielsson@versanet.de)+Michel Ludwig (michel.ludwig@kdemail.net)+Thomas Braun (thomas.braun@virtuell-zuhause.de)" license="LGPL" >
>+<language name="LaTeX" version="1.55" section="Markup" kateversion="2.5" priority="10" extensions="*.tex;*.ltx;*.dtx;*.sty;*.cls;*.bbx;*.cbx;*.lbx;*.tikz" mimetype="text/x-tex" casesensitive="1" author="Jeroen Wijnhout (Jeroen.Wijnhout@kdemail.net)+Holger Danielsson (holger.danielsson@versanet.de)+Michel Ludwig (michel.ludwig@kdemail.net)+Thomas Braun (thomas.braun@virtuell-zuhause.de)" license="LGPL" >
>   <highlighting>
>     <contexts>
>       
>       <context name="Normal Text" attribute="Normal Text" lineEndContext="#stay">
>         <RegExpr String="\\begin(?=[^a-zA-Z])" attribute="Structure" context="FindBeginEnvironment" beginRegion="block" />
>         <RegExpr String="\\end(?=[^a-zA-Z])" attribute="Structure" context="FindEndEnvironment" />
>-	<RegExpr String="\\(cite|parencite|autocite|Autocite|citetitle)\*(?=[^a-zA-Z])" attribute="Structure" context="Label"/>
>+	<RegExpr String="\\(cite|citet|citep|parencite|autocite|Autocite|citetitle)\*(?=[^a-zA-Z])" attribute="Structure" context="Label"/>
>+	<RegExpr String="\\(documentclass|includegraphics|include|usepackage|bibliography|bibliographystyle)(?=[^a-zA-Z])" attribute="Structure Keyword" context="FancyLabel"/>
> 	<RegExpr String="\\(cites|Cites|parencites|Parencites|autocites|Autocites|supercites|footcites|Footcites)(?=[^a-zA-Z])" attribute="Structure" context="FancyLabel"/>
>-	<RegExpr String="\\(cite|nocite|Cite|parencite|Parencite|footcite|Footcite|textcite|Textcite|supercite|autocite|Autocite|citeauthor|Citeauthor|citetitle|citeyear|citeurl|nocite|fullcite|footfullcite)(?=[^a-zA-Z])" attribute="Structure" context="Label"/>
>+	<RegExpr String="\\(cite|citet|citep|nocite|Cite|parencite|Parencite|footcite|Footcite|textcite|Textcite|supercite|autocite|Autocite|citeauthor|Citeauthor|citetitle|citeyear|citeurl|nocite|fullcite|footfullcite)(?=[^a-zA-Z])" attribute="Structure" context="Label"/>
> 	<RegExpr String="\\(subref\*?|cref\*?|label|pageref|autoref|ref|vpageref|vref|pagecite|eqref)(?=[^a-zA-Z])" attribute="Structure" context="Label"/>
>         <RegExpr String="\\(part|chapter|section|subsection|subsubsection|paragraph|subparagraph)\*?\s*(?=[\{\[])" attribute="Structure" context="Sectioning"/>
>+	<RegExpr String="\\(input|hspace|hspace\*|vspace|vspace\*|rule|special|setlength|newboolean|setboolean|setcounter|geometry|textcolor|definecolor|column)(?=[^a-zA-Z])" attribute="Keyword" context="SpecialCommand"/>
>         <RegExpr String="\\(footnote)\*?\s*(?=[\{\[])" attribute="Keyword" context="Footnoting"/>
> 	<RegExpr String="\\(renewcommand|providenewcommand|newcommand)\*?(?=[^a-zA-Z])" attribute="Keyword" context="NewCommand"/>
>         <RegExpr String="\\(e|g|x)?def(?=[^a-zA-Z])" attribute="Keyword" context="DefCommand"/>
>@@ -96,7 +98,8 @@
> 
>       
>       <context name="NewCommand" attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop">
>-        <RegExpr String="\s*\{\s*\\[a-zA-Z]+\s*\}(\[\d\](\[[^\]]*\])?)?\{" attribute="Normal Text" context="CommandParameterStart"/>
>+          <RegExpr String="\s*\{\s*" attribute="Normal Text" context="LabelParameter"/>
>+          <RegExpr String="\s*(\[\d\](\[[^\]]*\])?)?\{" attribute="Normal Text" context="LabelParameter"/>
>         <DetectChar char="}" attribute="Error" context="#pop"/>
>       </context>
> 
>@@ -123,7 +126,9 @@
>       
>       <context name="ContrSeq" attribute="Keyword" lineEndContext="#pop">
>         <StringDetect String="verb*" attribute="Keyword" context="Verb"/>
>-        <RegExpr String="(Verb|verb|lstinline)(?=[^a-zA-Z])" attribute="Keyword" context="Verb"/>
>+        <RegExpr String="(Verb|verb)(?=[^a-zA-Z])" attribute="Keyword" context="Verb"/>
>+        <RegExpr String="(lstinline)(?=[^a-zA-Z])" attribute="Keyword" context="Lstinline"/>
>+        <RegExpr String="mint(?=[^a-zA-Z])" attribute="Keyword" context="MintParam"/>
>         <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
>         <RegExpr String="[a-zA-Z@]+(\+?|\*{0,3})" attribute="Keyword" context="#pop"/>
>         <RegExpr String="[^a-zA-Z]" attribute="Keyword" context="#pop" />
>@@ -131,6 +136,13 @@
>       <context name="ToEndOfLine" attribute="Normal Text" lineEndContext="#pop">
>       </context>
> 
>+      
>+      <context name="MintParam" attribute="Normal Text" lineEndContext="#stay">
>+        <Detect2Chars char="}" char1="[" attribute="Normal Text" context="#stay"/>
>+        <DetectChar char="}" attribute="Normal Text" context="Verb"/>
>+        <DetectChar char="]" attribute="Normal Text" context="Verb"/>
>+      </context>
>+
>       
>       <context name="Verb" attribute="Verbatim" lineEndContext="#pop#pop" >
>         <RegExpr String="(.)" attribute="Normal Text" dynamic="true" context="VerbEnd" />
>@@ -141,6 +153,21 @@
>         <RegExpr String="[^%1\xd7]*" attribute="Verbatim" context="#stay" dynamic="true" />
>       </context>
> 
>+      
>+      <context name="Lstinline" attribute="Verbatim" lineEndContext="#pop#pop" >
>+        <RegExpr String="\s*\[\s*" attribute="Normal Text" context="FancyLabelOption"/>
>+        <RegExpr String="\s*\{\s*" attribute="Normal Text" context="LstinlineParameter"/>
>+        <RegExpr String="(.)" attribute="Normal Text" dynamic="true" context="LstinlineEnd" />
>+      </context>
>+      <context name="LstinlineEnd" attribute="Verbatim" lineEndContext="#pop#pop#pop" dynamic="true" >
>+        <StringDetect String="%1" attribute="Normal Text" context="#pop#pop#pop" dynamic="true" />
>+        <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
>+        <RegExpr String="[^%1\xd7]*" attribute="Verbatim" context="#stay" dynamic="true" />
>+      </context>
>+      <context name="LstinlineParameter" attribute="Verbatim" lineEndContext="#stay">
>+        <RegExpr String="\s*\}\s*" attribute="Normal Text" context="#pop#pop#pop"/>
>+      </context>
>+
>       
>       <context name="Label" attribute="Normal Text" lineEndContext="#stay">
>         <RegExpr String="\s*\{\s*" attribute="Normal Text" context="LabelParameter"/>
>@@ -165,15 +192,28 @@
>       
>       <context name="FancyLabel" attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop">
> 	      <RegExpr String="\s*\{\s*" attribute="Normal Text" context="FancyLabelParameter"/>
>-	      <RegExpr String="\s*\[\s*" attribute="Normal Text" context="LabelOption"/>
>+	      <RegExpr String="\s*\[\s*" attribute="Normal Text" context="FancyLabelOption"/>
> 	      <RegExpr String="\s*\(\s*" attribute="Normal Text" context="FancyLabelRoundBrackets"/>
>       </context>
> 
>       <context name="FancyLabelParameter" attribute="Environment" lineEndContext="#stay">
>-	      <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
>-	      <RegExpr String="\s*\}\s*" attribute="Normal Text" context="#pop"/>
>+        <StringDetect String="\(" attribute="Math" context="MathMode" />
>+        <DetectChar char="\" attribute="Keyword" context="ContrSeq"/>
>+        <DetectChar char="$" attribute="Math" context="MathMode" />
>+        <DetectChar char="%" attribute="Comment" context="Comment"/>
>+        <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
>+        <RegExpr String="\s*\}\s*" attribute="Normal Text" context="#pop"/>
>       </context>
> 
>+      <context name="FancyLabelOption" attribute="Option Text" lineEndContext="#stay">
>+        <StringDetect String="$" attribute="Math" context="MathMode" />
>+        <DetectChar char="\" attribute="Keyword" context="ContrSeq"/>
>+        <DetectChar char="$" attribute="Math" context="MathMode" />
>+        <DetectChar char="%" attribute="Comment" context="Comment"/>
>+        <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
>+        <RegExpr String="\s*\]\s*" attribute="Normal Text" context="#pop"/>
>+      </context>
>+      
>       <context name="FancyLabelRoundBrackets" attribute="Normal Text" lineEndContext="#stay">
> 	      <StringDetect String="\(" attribute="Math" context="MathMode" />
> 	      <DetectChar char="\" attribute="Keyword" context="ContrSeq"/>
>@@ -183,6 +223,20 @@
> 	      <RegExpr String="\s*$\s*" attribute="Normal Text" context="#pop"/>
>       </context>
> 
>+      
>+      <context name="SpecialCommand" attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop">
>+	      <RegExpr String="\s*\{\s*" attribute="Normal Text" context="SpecialCommandParameterOption"/>
>+      </context>
>+
>+      <context name="SpecialCommandParameterOption" attribute="Option Text" lineEndContext="#stay">
>+        <StringDetect String="\(" attribute="Math" context="MathMode" />
>+        <DetectChar char="\" attribute="Keyword" context="ContrSeq"/>
>+        <DetectChar char="$" attribute="Math" context="MathMode" />
>+        <DetectChar char="%" attribute="Comment" context="Comment"/>
>+        <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
>+        <RegExpr String="\s*\}\s*" attribute="Normal Text" context="#pop"/>
>+      </context>
>+
>       
>       <context name="FindEndEnvironment" attribute="Normal Text" lineEndContext="#stay">
>         <DetectChar char="{" attribute="Normal Text" context="EndEnvironment"/>
>@@ -210,11 +264,13 @@
> 
>       
>       <context name="BeginEnvironment" attribute="Environment" lineEndContext="#stay">
>-        <RegExpr String="(lstlisting|(B|L)?Verbatim)" attribute="Environment" context="VerbatimEnvParam"/>
>+        <StringDetect String="lstlisting" attribute="Environment" context="ListingsEnvParam"/>
>+        <StringDetect String="minted" attribute="Environment" context="MintedEnvParam"/>
>+        <RegExpr String="((B|L)?Verbatim)" attribute="Environment" context="VerbatimEnvParam"/>
>         <RegExpr String="(verbatim|boxedverbatim)" attribute="Environment" context="VerbatimEnv"/>
>         <RegExpr String="comment" attribute="Environment" context="CommentEnv"/>
>         <RegExpr String="(alignat|xalignat|xxalignat)" attribute="Environment" context="MathEnvParam"/>
>-        <RegExpr String="(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|flalign|IEEEeqnarray|IEEEeqnarraybox|smallmatrix|pmatrix|bmatrix|Bmatrix|vmatrix|Vmatrix)" attribute="Environment" context="MathEnv"/>
>+        <RegExpr String="(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|flalign|IEEEeqnarray|IEEEeqnarraybox|smallmatrix|pmatrix|bmatrix|Bmatrix|vmatrix|Vmatrix|cases)" attribute="Environment" context="MathEnv"/>
>         <RegExpr String="(tabularx|tabular|supertabular|mpsupertabular|xtabular|mpxtabular|longtable)" attribute="Environment" context="TabEnv"/>
>         <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
>         <RegExpr String="[a-zA-Z]" attribute="Environment" context="LatexEnv"/>
>@@ -244,16 +300,62 @@
>         <DetectChar char="]" attribute="Normal Text" context="Verbatim"/>
>       </context>
> 
>+      
>+      <context name="ListingsEnvParam" attribute="Normal Text" fallthrough="true" fallthroughContext="Verbatim" lineEndContext="#stay">
>+        <Detect2Chars char="}" char1="[" attribute="Normal Text" context="#stay" />
>+        <RegExpr String="language\s*=\s*(?=[^,]+)" minimal="true" attribute="Normal Text" context="HighlightningSelector"/>
>+        <DetectChar char="}" attribute="Normal Text" context="Verbatim"/>
>+        <DetectChar char="]" attribute="Normal Text" context="Verbatim"/>
>+      </context>
>+
>+      
>+      <context name="MintedEnvParam" attribute="Normal Text" lineEndContext="#stay">
>+        <Detect2Chars char="}" char1="[" attribute="Normal Text" context="#stay" />
>+        <Detect2Chars char="}" char1="{" attribute="Normal Text" context="HighlightningSelector"/>
>+        <Detect2Chars char="]" char1="{" attribute="Normal Text" context="HighlightningSelector"/>
>+        <DetectChar char="}" attribute="Normal Text" context="Verbatim"/>
>+      </context>
>+
>+      
>+      <context name="HighlightningSelector" attribute="Normal Text" lineEndContext="#stay">
>+        <StringDetect String="C++" insensitive="true" context="HighlightningBeginC++"/>
>+        <StringDetect String="Python" insensitive="true" context="HighlightningBeginPython"/>
>+        <RegExpr String=".*(?=\}|\])" context="#pop"/>
>+      </context>
>+
>+      <context name="HighlightningCommon" attribute="Normal Text" lineEndContext="#stay">
>+        <RegExpr String="\\end\s*\{(lstlisting|minted)\*?\}" attribute="Structure" lookAhead="true" context="#pop#pop#pop#pop#pop#pop"/>
>+      </context>
>+
>+      <context name="HighlightningBeginC++" attribute="Normal Text" lineEndContext="#stay">
>+       
>+        <RegExpr String=".*(\}|\])" context="HighlightningC++"/>
>+      </context>
>+
>+      <context name="HighlightningC++" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="HighlightningCommon"/>
>+        <IncludeRules context="##C++" includeAttrib="true"/>
>+      </context>
>+
>+      <context name="HighlightningBeginPython" attribute="Normal Text" lineEndContext="#stay">
>+        <RegExpr String=".*(\}|\])" context="HighlightningPython"/>
>+      </context>
>+
>+      <context name="HighlightningPython" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="HighlightningCommon"/>
>+        <IncludeRules context="##Python"/>
>+      </context>
>+
>       
>       <context name="Verbatim" attribute="Verbatim" lineEndContext="#stay">
>         <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
>-        <RegExpr String="\\end(?=\s*\{(verbatim|lstlisting|boxedverbatim|(B|L)?Verbatim)\*?\})" attribute="Structure"  context="VerbFindEnd"/>
>+        <RegExpr String="\\end(?=\s*\{(verbatim|lstlisting|boxedverbatim|(B|L)?Verbatim|minted)\*?\})" attribute="Structure"  context="VerbFindEnd"/>
>       </context>
> 
>       
>       <context name="VerbFindEnd" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
>         <RegExpr String="\s*\{" attribute="Normal Text" context="#stay"/>
>-        <RegExpr String="(verbatim|lstlisting|boxedverbatim|(B|L)?Verbatim)\*?" attribute="Environment" context="#stay"/>
>+        <RegExpr String="(verbatim|lstlisting|boxedverbatim|(B|L)?Verbatim|minted)\*?" attribute="Environment" context="#stay"/>
>         <DetectChar char="}" attribute="Normal Text" context="#pop#pop#pop#pop#pop" endRegion="block"/>
>       </context>
> 
>@@ -321,7 +423,7 @@
>       
>       <context name="MathFindEnd" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
>         <RegExpr String="\s*\{" attribute="Normal Text" context="#stay"/>
>-        <RegExpr String="(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|flalign|alignat|xalignat|xxalignat|IEEEeqnarray|IEEEeqnarraybox|smallmatrix|pmatrix|bmatrix|Bmatrix|vmatrix|Vmatrix)\*?" attribute="Environment" context="#stay"/>
>+        <RegExpr String="(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|flalign|alignat|xalignat|xxalignat|IEEEeqnarray|IEEEeqnarraybox|smallmatrix|pmatrix|bmatrix|Bmatrix|vmatrix|Vmatrix|cases)\*?" attribute="Environment" context="#stay"/>
>         <DetectChar char="}" attribute="Normal Text" context="#pop#pop#pop#pop#pop"  endRegion="block"/>
>       </context>
> 
>@@ -446,8 +548,9 @@
> 
>     <itemDatas>
>       <itemData name="Normal Text" defStyleNum="dsNormal"/>
>+      <itemData name="Option Text" defStyleNum="dsNormal" spellChecking="false"/>
>       <itemData name="Keyword" defStyleNum="dsNormal" color="#800000" selColor="#60FFFF" bold="0" italic="0" spellChecking="false"/>
>-      <itemData name="Comment" defStyleNum="dsComment"/>
>+      <itemData name="Comment" defStyleNum="dsComment" spellChecking="false"/>
>       <itemData name="Error" defStyleNum="dsAlert" spellChecking="false"/>
>       <itemData name="Math" defStyleNum="dsNormal" color="#00A000" selColor="#FF40FF"  bold="0" italic="0" spellChecking="false"/>
>       <itemData name="Structure" defStyleNum="dsNormal" color="#F00000" selColor="#80FFD0" bold="0" italic="0" spellChecking="false"/>
>diff -urN tdelibs/kate/data/ldif.xml tdelibs.new/kate/data/ldif.xml
>--- tdelibs/kate/data/ldif.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/ldif.xml	2013-12-26 13:26:40.388329841 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="LDIF" version="1.02" kateversion="2.4" section="Database" extensions="*.ldif" mimetype="application/directory" author="Andreas Hochsteger (e9625392@student.tuwien.ac.at)" license="">
>+<language name="LDIF" version="1.02" kateversion="2.5" section="Database" extensions="*.ldif" mimetype="application/directory" author="Andreas Hochsteger (e9625392@student.tuwien.ac.at)" license="">
> 	<highlighting>
> 		<list name="attributetypes">
> 			<item>IPPhone</item>
>diff -urN tdelibs/kate/data/less.xml tdelibs.new/kate/data/less.xml
>--- tdelibs/kate/data/less.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/less.xml	2013-12-26 13:26:41.881323470 -0600
>@@ -0,0 +1,674 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd">
>+<language name="LessCSS" version="0.1" kateversion="2.5" section="Markup" extensions="*.less" indenter="cstyle" author="Massimiliano Torromeo (massimiliano.torromeo@gmail.com)" license="LGPL">
>+
>+<highlighting>
>+	<list name="properties">
>+		
>+		<item> azimuth </item>
>+		<item> background </item>
>+		<item> background-attachment </item>
>+		<item> background-color </item>
>+		<item> background-image </item>
>+		<item> background-position </item>
>+		<item> background-repeat </item>
>+		<item> border </item>
>+		<item> border-bottom </item>
>+		<item> border-bottom-color </item>
>+		<item> border-bottom-style </item>
>+		<item> border-bottom-width </item>
>+		<item> border-collapse </item>
>+		<item> border-color </item>
>+		<item> border-left </item>
>+		<item> border-left-color </item>
>+		<item> border-left-style </item>
>+		<item> border-left-width </item>
>+		<item> border-right </item>
>+		<item> border-right-color </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-style </item>
>+		<item> border-top-width </item>
>+		<item> border-width </item>
>+		<item> bottom </item>
>+		<item> caption-side </item>
>+		<item> clear </item>
>+		<item> clip </item>
>+		<item> color </item>
>+		<item> content </item>
>+		<item> counter-increment </item>
>+		<item> counter-reset </item>
>+		<item> cue </item>
>+		<item> cue-after </item>
>+		<item> cue-before </item>
>+		<item> cursor </item>
>+		<item> direction </item>
>+		<item> display </item>
>+		<item> elevation </item>
>+		<item> empty-cells </item>
>+		<item> float </item>
>+		<item> font </item>
>+		<item> font-family </item>
>+		<item> font-size </item>
>+		<item> font-size-adjust </item>
>+		<item> font-stretch </item>
>+		<item> font-style </item>
>+		<item> font-variant </item>
>+		<item> font-weight </item>
>+		<item> height </item>
>+		<item> left </item>
>+		<item> letter-spacing </item>
>+		<item> line-height </item>
>+		<item> list-style </item>
>+		<item> list-style-image </item>
>+		<item> list-style-keyword </item>
>+		<item> list-style-position </item>
>+		<item> list-style-type  </item>
>+		<item> margin </item>
>+		<item> margin-bottom </item>
>+		<item> margin-left </item>
>+		<item> margin-right </item>
>+		<item> margin-top </item>
>+		<item> marker-offset </item>
>+		<item> max-height </item>
>+		<item> max-width </item>
>+		<item> min-height </item>
>+		<item> min-width </item>
>+		<item> orphans </item>
>+		<item> outline </item>
>+		<item> outline-color </item>
>+		<item> outline-style </item>
>+		<item> outline-width </item>
>+		<item> overflow </item>
>+		<item> padding </item>
>+		<item> padding-bottom </item>
>+		<item> padding-left </item>
>+		<item> padding-right </item>
>+		<item> padding-top </item>
>+		<item> page </item>
>+		<item> page-break-after </item>
>+		<item> page-break-before </item>
>+		<item> page-break-inside </item>
>+		<item> pause </item>
>+		<item> pause-after </item>
>+		<item> pause-before </item>
>+		<item> pitch </item>
>+		<item> pitch-range </item>
>+		<item> play-during </item>
>+		<item> position </item>
>+		<item> quotes </item>
>+		<item> richness </item>
>+		<item> right </item>
>+		<item> size </item>
>+		<item> speak </item>
>+		<item> speak-header </item>
>+		<item> speak-numeral </item>
>+		<item> speak-punctuation </item>
>+		<item> speech-rate </item>
>+		<item> stress </item>
>+		<item> table-layout </item>
>+		<item> text-align </item>
>+		<item> text-decoration </item>
>+		<item> text-decoration-color </item>
>+		<item> text-indent </item>
>+		<item> text-shadow </item>
>+		<item> text-transform </item>
>+		<item> top </item>
>+		<item> unicode-bidi </item>
>+		<item> vertical-align </item>
>+		<item> visibility </item>
>+		<item> voice-family </item>
>+		<item> volume </item>
>+		<item> white-space </item>
>+		<item> widows </item>
>+		<item> width </item>
>+		<item> word-spacing </item>
>+		<item> z-index </item>
>+
>+		
>+		<item> box-sizing </item>
>+		<item> opacity </item>
>+		<item> text-shadow </item>
>+
>+		
>+		<item> konq_bgpos_x </item>
>+		<item> konq_bgpos_y </item>
>+
>+		
>+		<item> font-family </item>
>+		<item> font-size </item>
>+		<item> font-stretch </item>
>+		<item> font-style </item>
>+		<item> font-variant </item>
>+		<item> font-weight </item>
>+		<item> unicode-range </item>
>+		<item> units-per-em </item>
>+		<item> src </item>
>+		<item> panose-1 </item>
>+		<item> stemv </item>
>+		<item> stemh </item>
>+		<item> slope </item>
>+		<item> cap-height </item>
>+		<item> x-height </item>
>+		<item> ascent </item>
>+		<item> descent </item>
>+		<item> widths </item>
>+		<item> bbox </item>
>+		<item> definition-src </item>
>+		<item> baseline </item>
>+		<item> centerline </item>
>+		<item> mathline </item>
>+		<item> topline </item>
>+	</list>
>+
>+	<list name="types">
>+		<item> inherit </item>
>+		<item> none </item>
>+		<item> hidden </item>
>+		<item> dotted </item>
>+		<item> dashed </item>
>+		<item> solid </item>
>+		<item> double </item>
>+		<item> groove </item>
>+		<item> ridge </item>
>+		<item> inset </item>
>+		<item> outset </item>
>+		<item> xx-small </item>
>+		<item> x-small </item>
>+		<item> small </item>
>+		<item> medium </item>
>+		<item> large </item>
>+		<item> x-large </item>
>+		<item> xx-large </item>
>+		<item> smaller </item>
>+		<item> larger </item>
>+		<item> italic </item>
>+		<item> oblique </item>
>+		<item> small-caps </item>
>+		<item> normal </item>
>+		<item> bold </item>
>+		<item> bolder </item>
>+		<item> lighter </item>
>+		<item> light </item>
>+		<item> 100 </item>
>+		<item> 200 </item>
>+		<item> 300 </item>
>+		<item> 400 </item>
>+		<item> 500 </item>
>+		<item> 600 </item>
>+		<item> 700 </item>
>+		<item> 800 </item>
>+		<item> 900 </item>
>+		<item> transparent </item>
>+		<item> repeat </item>
>+		<item> repeat-x </item>
>+		<item> repeat-y </item>
>+		<item> no-repeat </item>
>+		<item> baseline </item>
>+		<item> sub </item>
>+		<item> super </item>
>+		<item> top </item>
>+		<item> text-top </item>
>+		<item> middle </item>
>+		<item> bottom </item>
>+		<item> text-bottom </item>
>+		<item> left </item>
>+		<item> right </item>
>+		<item> center </item>
>+		<item> justify </item>
>+		<item> konq-center </item>
>+		<item> disc </item>
>+		<item> circle </item>
>+		<item> square </item>
>+		<item> box </item>
>+		<item> decimal </item>
>+		<item> decimal-leading-zero </item>
>+		<item> lower-roman </item>
>+		<item> upper-roman </item>
>+		<item> lower-greek </item>
>+		<item> lower-alpha </item>
>+		<item> lower-latin </item>
>+		<item> upper-alpha </item>
>+		<item> upper-latin </item>
>+		<item> hebrew </item>
>+		<item> armenian </item>
>+		<item> georgian </item>
>+		<item> cjk-ideographic </item>
>+		<item> hiragana </item>
>+		<item> katakana </item>
>+		<item> hiragana-iroha </item>
>+		<item> katakana-iroha </item>
>+		<item> inline </item>
>+		<item> inline-block </item>
>+		<item> block </item>
>+		<item> list-item </item>
>+		<item> run-in </item>
>+		<item> compact </item>
>+		<item> marker </item>
>+		<item> table </item>
>+		<item> inline-table </item>
>+		<item> table-row-group </item>
>+		<item> table-header-group </item>
>+		<item> table-footer-group </item>
>+		<item> table-row </item>
>+		<item> table-column-group </item>
>+		<item> table-column </item>
>+		<item> table-cell </item>
>+		<item> table-caption </item>
>+		<item> auto </item>
>+		<item> crosshair </item>
>+		<item> default </item>
>+		<item> pointer </item>
>+		<item> move </item>
>+		<item> e-resize </item>
>+		<item> ne-resize </item>
>+		<item> nw-resize </item>
>+		<item> n-resize </item>
>+		<item> se-resize </item>
>+		<item> sw-resize </item>
>+		<item> s-resize </item>
>+		<item> w-resize </item>
>+		<item> text </item>
>+		<item> wait </item>
>+		<item> help </item>
>+		<item> above </item>
>+		<item> absolute </item>
>+		<item> always </item>
>+		<item> avoid </item>
>+		<item> below </item>
>+		<item> bidi-override </item>
>+		<item> blink </item>
>+		<item> both </item>
>+		<item> capitalize </item>
>+		<item> caption </item>
>+		<item> close-quote </item>
>+		<item> collapse </item>
>+		<item> condensed </item>
>+		<item> crop </item>
>+		<item> cross </item>
>+		<item> embed </item>
>+		<item> expanded </item>
>+		<item> extra-condensed </item>
>+		<item> extra-expanded </item>
>+		<item> fixed </item>
>+		<item> hand </item>
>+		<item> hide </item>
>+		<item> higher </item>
>+		<item> icon </item>
>+		<item> inside </item>
>+		<item> invert </item>
>+		<item> landscape </item>
>+		<item> level </item>
>+		<item> line-through </item>
>+		<item> loud </item>
>+		<item> lower </item>
>+		<item> lowercase </item>
>+		<item> ltr </item>
>+		<item> menu </item>
>+		<item> message-box </item>
>+		<item> mix </item>
>+		<item> narrower </item>
>+		<item> no-close-quote </item>
>+		<item> no-open-quote </item>
>+		<item> nowrap </item>
>+		<item> open-quote </item>
>+		<item> outside </item>
>+		<item> overline </item>
>+		<item> portrait </item>
>+		<item> pre </item>
>+		<item> pre-line </item>
>+		<item> pre-wrap </item>
>+		<item> relative </item>
>+		<item> rtl </item>
>+		<item> scroll </item>
>+		<item> semi-condensed </item>
>+		<item> semi-expanded </item>
>+		<item> separate </item>
>+		<item> show </item>
>+		<item> small-caption </item>
>+		<item> static </item>
>+		<item> static-position </item>
>+		<item> status-bar </item>
>+		<item> thick </item>
>+		<item> thin </item>
>+		<item> ultra-condensed </item>
>+		<item> ultra-expanded </item>
>+		<item> underline </item>
>+		<item> uppercase </item>
>+		<item> visible </item>
>+		<item> wider </item>
>+		<item> break </item>
>+		<item> serif </item>
>+		<item> sans-serif </item>
>+		<item> cursive </item>
>+		<item> fantasy </item>
>+		<item> monospace </item>
>+		<item> border-box </item>
>+		<item> content-box </item>
>+	</list>
>+
>+
>+	<list name="colors">
>+		<item> aqua </item>
>+		<item> black </item>
>+		<item> blue </item>
>+		<item> fuchsia </item>
>+		<item> gray </item>
>+		<item> green </item>
>+		<item> lime </item>
>+		<item> maroon </item>
>+		<item> navy </item>
>+		<item> olive </item>
>+		<item> purple </item>
>+		<item> red </item>
>+		<item> silver </item>
>+		<item> teal </item>
>+		<item> white </item>
>+		<item> yellow </item>
>+		<item> ActiveBorder  </item>
>+		<item> ActiveCaption  </item>
>+		<item> AppWorkspace  </item>
>+		<item> Background  </item>
>+		<item> ButtonFace  </item>
>+		<item> ButtonHighlight  </item>
>+		<item> ButtonShadow  </item>
>+		<item> ButtonText  </item>
>+		<item> CaptionText  </item>
>+		<item> GrayText  </item>
>+		<item> Highlight  </item>
>+		<item> HighlightText  </item>
>+		<item> InactiveBorder  </item>
>+		<item> InactiveCaption  </item>
>+		<item> InactiveCaptionText  </item>
>+		<item> InfoBackground  </item>
>+		<item> InfoText  </item>
>+		<item> Menu  </item>
>+		<item> MenuText  </item>
>+		<item> Scrollbar  </item>
>+		<item> ThreeDDarkShadow  </item>
>+		<item> ThreeDFace  </item>
>+		<item> ThreeDHighlight  </item>
>+		<item> ThreeDLightShadow  </item>
>+		<item> ThreeDShadow  </item>
>+		<item> Window  </item>
>+		<item> WindowFrame  </item>
>+		<item> WindowText  </item>
>+	</list>
>+
>+	<list name="paren">
>+		<item> url </item>
>+		<item> attr </item>
>+		<item> rect </item>
>+		<item> rgb </item>
>+		<item> counter </item>
>+		<item> counters </item>
>+
>+		
>+		<item> local </item>
>+		<item> format </item>
>+	</list>
>+
>+	<list name="mediatypes">
>+		<item> all </item>
>+		<item> aural </item>
>+		<item> braille </item>
>+		<item> embossed </item>
>+		<item> handheld </item>
>+		<item> print </item>
>+		<item> projection </item>
>+		<item> screen </item>
>+		<item> tty </item>
>+		<item> tv </item>
>+	</list>
>+
>+	<list name="pseudoclasses">
>+		<item> hover </item>
>+		<item> link </item>
>+		<item> visited </item>
>+		<item> active </item>
>+		<item> focus </item>
>+		<item> first-child </item>
>+		<item> last-child </item>
>+		<item> only-child </item>
>+		<item> first-of-type </item>
>+		<item> last-of-type </item>
>+		<item> only-of-type </item>
>+		<item> first-letter </item>
>+		<item> first-line </item>
>+		<item> before </item>
>+		<item> after </item>
>+		<item> selection </item>
>+		<item> root </item>
>+		<item> empty </item>
>+		<item> target </item>
>+		<item> enabled </item>
>+		<item> disabled </item>
>+		<item> checked </item>
>+		<item> indeterminate </item>
>+		<item> nth-child </item>
>+		<item> nth-last-child </item>
>+		<item> nth-of-type </item>
>+		<item> nth-last-of-type </item>
>+		<item> not </item>
>+	</list>
>+
>+	<contexts>
>+		<context attribute="Normal Text" lineEndContext="#stay" name="Base">
>+			<LineContinue/>
>+			<DetectSpaces/>
>+			<IncludeRules context="FindRuleSets" />
>+		</context>
>+
>+		
>+		<context attribute="Normal Text" lineEndContext="#stay" name="FindRuleSets">
>+			<RegExpr attribute="Media" context="Media" String="@media\b" />
>+			<RegExpr attribute="At Rule" context="Import" String="@import\b" />
>+			<RegExpr attribute="At Rule" context="#stay" String="@(font-face|charset)\b" />
>+			<RegExpr attribute="Variable" context="Variable Declaration" String="@[A-Za-z0-9_-]+(?=\s*:)" />
>+			<DetectChar attribute="Property" context="RuleSet" char="{" beginRegion="ruleset" />
>+			
>+			<DetectChar attribute="Selector Attr" context="SelAttr" char="[" />
>+			<RegExpr attribute="Selector Id" context="#stay" String="#[A-Za-z0-9][\w\-]*" />
>+			<RegExpr attribute="Selector Class" context="#stay" String="\.[A-Za-z0-9][\w\-]*" />
>+			<RegExpr attribute="Selector Pseudo" context="#stay" String=":lang$[\w_-]+$" />
>+			<DetectChar attribute="Selector Pseudo" context="SelPseudo" char=":" />
>+			<IncludeRules context="FindStrings" />
>+			<IncludeRules context="FindComments" />
>+		</context>
>+
>+		
>+		<context attribute="Normal Text" lineEndContext="#stay" name="FindValues">
>+			<RegExpr attribute="Variable" context="#stay" String="@[A-Za-z0-9_-]+" />
>+			<RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+(em|ex|px|in|cm|mm|pt|pc|deg|rad|grad|ms|s|Hz|kHz)\b" />
>+			<RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+[%]?" />
>+			<RegExpr attribute="Normal Text" context="#stay" String="[\w\-]+" />
>+		</context>
>+
>+		
>+		<context attribute="Normal Text" lineEndContext="#stay" name="FindStrings">
>+			<DetectChar attribute="String" context="StringDQ" char="&quot;" />
>+			<DetectChar attribute="String" context="StringSQ" char="'" />
>+		</context>
>+
>+		
>+		<context attribute="Normal Text" lineEndContext="#stay" name="FindComments">
>+			<RegExpr attribute="Region Marker" context="#stay" String="/\*BEGIN.*\*/" beginRegion="UserDefined" />
>+			<RegExpr attribute="Region Marker" context="#stay" String="/\*END.*\*/" endRegion="UserDefined" />
>+			<Detect2Chars attribute="Comment" context="Comment" char="/" char1="/"/>
>+			<Detect2Chars attribute="Comment" context="Multi/inline Comment" char="/" char1="*" beginRegion="comment" />
>+		</context>
>+
>+		
>+		<context attribute="Normal Text" lineEndContext="#stay" name="Media">
>+			<DetectChar attribute="Media" context="Media2" char="{" beginRegion="media" />
>+			<keyword attribute="Media" context="#stay" String="mediatypes" />
>+			<DetectChar attribute="Media" context="#stay" char="," />
>+			<IncludeRules context="FindComments" />
>+			<RegExpr attribute="Error" context="#stay" String="\S+" />
>+		</context>
>+
>+		<context attribute="Normal Text" lineEndContext="#stay" name="Media2">
>+			<DetectChar attribute="Media" context="#pop#pop" char="}" endRegion="media" />
>+			<IncludeRules context="FindRuleSets" />
>+		</context>
>+
>+		<context attribute="Normal Text" lineEndContext="#stay" name="Variable Declaration">
>+			<DetectChar attribute="Property" context="Variable Declaration 2" char=":" />
>+			<RegExpr attribute="Error" context="#stay" String="\S" />
>+		</context>
>+
>+		<context attribute="Normal Text" lineEndContext="#stay" name="Variable Declaration 2">
>+			<DetectChar attribute="Property" context="#pop#pop" char=";" />
>+			<IncludeRules context="FindPropertyValues" />
>+			<IncludeRules context="FindComments" />
>+		</context>
>+
>+		<context attribute="Selector Attr" lineEndContext="#stay" name="SelAttr">
>+			<DetectChar attribute="Selector Attr" context="#pop" char="]" />
>+			<IncludeRules context="FindStrings" />
>+		</context>
>+
>+		<context attribute="Selector Pseudo" lineEndContext="#pop" name="SelPseudo" fallthrough="true" fallthroughContext="#pop">
>+			<keyword attribute="Selector Pseudo" context="#pop" String="pseudoclasses" />
>+			<RegExpr attribute="Unknown Selector Pseudo" context="#pop" String="[A-Za-z_-]+(?=\s*\{)" />
>+		</context>
>+
>+		<context attribute="Normal Text" lineEndContext="#stay" name="Import">
>+			<DetectChar attribute="At Rule" context="#pop" char=";" />
>+			<keyword attribute="Media" context="#stay" String="mediatypes" />
>+			<IncludeRules context="FindValues" />
>+			<IncludeRules context="FindStrings" />
>+			<IncludeRules context="FindComments" />
>+		</context>
>+
>+		<context attribute="Comment" lineEndContext="#stay" name="Multi/inline Comment">
>+			<DetectSpaces/>
>+			<Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="comment" />
>+			<IncludeRules context="##Alerts" />
>+			<DetectIdentifier/>
>+		</context>
>+
>+		<context attribute="Comment" lineEndContext="#pop" name="Comment">
>+			<DetectSpaces />
>+			<IncludeRules context="##Alerts" />
>+			<DetectIdentifier />
>+		</context>
>+
>+		<context attribute="Normal Text" lineEndContext="#stay" name="RuleSet">
>+			<DetectChar attribute="Property" context="#pop" char="}" endRegion="ruleset" />
>+			<keyword attribute="Property" context="Rule" String="properties" />
>+			<RegExpr attribute="Mixin" context="Mixin" String="\.[A-Za-z_-]+(?=\s*\()" />
>+			<RegExpr attribute="Unknown Property" context="Rule" String="[A-Za-z_-]+(?=\s*:)" />
>+			<IncludeRules context="FindComments" />
>+			<IncludeRules context="FindRuleSets" />
>+			<RegExpr attribute="Error" context="#stay" String="\S" />
>+		</context>
>+
>+		<context attribute="Normal Text" lineEndContext="#stay" name="Rule">
>+			<DetectChar attribute="Property" context="Rule2" char=":" />
>+			<RegExpr attribute="Error" context="#stay" String="\S" />
>+		</context>
>+
>+		<context attribute="Normal Text" lineEndContext="#stay" name="Rule2">
>+			<DetectChar attribute="Property" context="#pop#pop" char=";" />
>+			<DetectChar attribute="Property" context="#pop#pop#pop" char="}" endRegion="ruleset" />
>+			<IncludeRules context="FindPropertyValues" />
>+			<IncludeRules context="FindComments" />
>+		</context>
>+
>+		<context attribute="Normal Text" lineEndContext="#stay" name="FindPropertyValues">
>+			<keyword attribute="Value" context="#stay" String="types" />
>+			<keyword attribute="Value" context="#stay" String="colors" />
>+			<RegExpr attribute="Value" context="#stay" String="#([0-9A-Fa-f]{3}){1,4}\b" />
>+			<keyword attribute="Value" context="PropParen" String="paren" />
>+			<RegExpr attribute="Important" context="#stay" String="!important\b" />
>+			<IncludeRules context="FindValues" />
>+			<IncludeRules context="FindStrings" />
>+		</context>
>+
>+		<context attribute="Normal Text" lineEndContext="#stay" name="Mixin">
>+			<DetectChar attribute="Mixin" context="Mixin2" char="(" />
>+			<DetectChar attribute="Property" context="#pop" char=";" />
>+			<RegExpr attribute="Error" context="#stay" String="\S" />
>+		</context>
>+
>+		<context attribute="Normal Text" lineEndContext="#stay" name="Mixin2">
>+			<DetectChar attribute="Mixin" context="#pop" char=")" />
>+			<DetectChar attribute="Mixin" context="#pop#pop#pop" char="}" endRegion="ruleset" />
>+			
>+			<keyword attribute="Value" context="#stay" String="types" />
>+			<keyword attribute="Value" context="#stay" String="colors" />
>+			<RegExpr attribute="Value" context="#stay" String="#([0-9A-Fa-f]{3}){1,4}\b" />
>+			<keyword attribute="Value" context="PropParen" String="paren" />
>+			<RegExpr attribute="Important" context="#stay" String="!important\b" />
>+			<IncludeRules context="FindValues" />
>+			<IncludeRules context="FindStrings" />
>+			<IncludeRules context="FindComments" />
>+		</context>
>+
>+		<context attribute="Normal Text" lineEndContext="#stay" name="PropParen">
>+			<DetectChar attribute="Value" context="PropParen2" char="(" />
>+			<IncludeRules context="FindComments" />
>+			<RegExpr attribute="Error" context="#stay" String="\S" />
>+		</context>
>+
>+		<context attribute="Normal Text" lineEndContext="#stay" name="PropParen2">
>+			<DetectChar attribute="Value" context="#pop#pop" char=")" />
>+			<IncludeRules context="FindValues" />
>+			<IncludeRules context="FindStrings" />
>+			<IncludeRules context="FindComments" />
>+		</context>
>+
>+		
>+		<context attribute="String" lineEndContext="#stay" name="StringDQ">
>+			<DetectChar attribute="String" context="#pop" char="&quot;" />
>+			<IncludeRules context="InsideString" />
>+		</context>
>+
>+		<context attribute="String" lineEndContext="#stay" name="StringSQ">
>+			<DetectChar attribute="String" context="#pop" char="'" />
>+			<IncludeRules context="InsideString" />
>+		</context>
>+
>+		<context attribute="String" lineEndContext="#stay" name="InsideString">
>+			<RegExpr attribute="String" context="#stay" String="\\[&quot;']" />
>+			<DetectIdentifier/>
>+		</context>
>+
>+	</contexts>
>+
>+	<itemDatas>
>+		<itemData name="Normal Text" defStyleNum="dsNormal"/>
>+		<itemData name="Property"  defStyleNum="dsKeyword"/>
>+		<itemData name="Unknown Property"  defStyleNum="dsKeyword" italic="1"/>
>+		<itemData name="Media"  defStyleNum="dsDecVal" bold="1"/>
>+		<itemData name="At Rule"  defStyleNum="dsDecVal" />
>+		<itemData name="String"  defStyleNum="dsString" />
>+		<itemData name="Value"  defStyleNum="dsDataType" />
>+		<itemData name="Variable"  defStyleNum="dsDataType" bold="1" />
>+		<itemData name="Important" defStyleNum="dsKeyword" />
>+		<itemData name="Mixin" defStyleNum="dsKeyword" bold="1" />
>+		<itemData name="Selector Attr" defStyleNum="dsChar" />
>+		<itemData name="Selector Id"  defStyleNum="dsFloat" bold="1"/>
>+		<itemData name="Selector Class"  defStyleNum="dsFloat" />
>+		<itemData name="Selector Pseudo"  defStyleNum="dsDecVal" />
>+		<itemData name="Unknown Selector Pseudo"  defStyleNum="dsDecVal" italic="1" />
>+		<itemData name="Comment" defStyleNum="dsComment" />
>+		<itemData name="Region Marker" defStyleNum="dsRegionMarker"/>
>+		<itemData name="Alert" defStyleNum="dsAlert"/>
>+		<itemData name="Error" defStyleNum="dsError"/>
>+	</itemDatas>
>+</highlighting>
>+
>+<general>
>+	<keywords casesensitive="0" weakDeliminator="-%"/>
>+	<comments>
>+		<comment name="singleLine" start="//" />
>+		<comment name="multiLine" start="/*" end="*/" />
>+	</comments>
>+</general>
>+</language>
>\ No newline at end of file
>diff -urN tdelibs/kate/data/lex.xml tdelibs.new/kate/data/lex.xml
>--- tdelibs/kate/data/lex.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/lex.xml	2013-12-26 13:26:41.991323000 -0600
>@@ -20,7 +20,7 @@
>   
>   ========================================================================
> -->
>-<language name="Lex/Flex" version="1.01" kateversion="2.4" section="Sources" extensions="*.l;*.lex;*.flex" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
>+<language name="Lex/Flex" version="1.01" kateversion="2.5" section="Sources" extensions="*.l;*.lex;*.flex" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
> 
> <highlighting>
> <contexts>
>diff -urN tdelibs/kate/data/lilypond.xml tdelibs.new/kate/data/lilypond.xml
>--- tdelibs/kate/data/lilypond.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/lilypond.xml	2013-12-26 13:26:40.786328142 -0600
>@@ -20,7 +20,7 @@
>   <!ENTITY schemename "[a-zA-Z#][^\s(){}[\];$&quot;]*">
>   <!ENTITY schemefunc "\b(define|defined\?|define\*(-public)?|define-(\*|builtin-markup-(list-)?command|class|(extra-)?display-method|fonts?|grob-property|ly-syntax(-loc|-simple)?|macro(-public)?|markup-(list-)command|method|module|music-function|post-event-display-method|public(-macro|-toplevel)?|safe-public|span-event-display-method)|defmacro(\*(-public)?)?|lambda\*?|and|or|if|cond|case|let\*?|letrec|begin|do|delay|set!|else|(quasi)?quote|unquote(-splicing)?|(define|let|letrec)-syntax|syntax-rules|not|boolean\?|eq\?|eqv\?|equal\?|pair\?|cons|set-c[ad]r!|c[ad]{1,4}r|null\?|list\?|list|length|append|reverse|list-ref|mem[qv]|member|ass[qv]|assoc|symbol\?|symbol-&gt;string|string-&gt;symbol|number\?|complex\?|real\?|rational\?|integer\?|exact\?|inexact\?|zero\?|positive\?|negative\?|odd\?|even\?|max|min|abs|quotient|remainder|modulo|gcd|lcm|numerator|denominator|floor|ceiling|truncate|round|rationalize|exp|log|sin|cos|tan|asin|acos|atan|sqrt|expt|make-rectangular|make-polar|real-part|imag-part|magnitude|angle|exact-&gt;inexact|inexact-&gt;exact|number-&gt;string|string-&gt;number|char((-ci)?(=\?|&lt;\?|&gt;\?|&lt;=\?|&gt;=\?)|-alphabetic\?|\?|-numeric\?|-whitespace\?|-upper-case\?|-lower-case\?|-&gt;integer|-upcase|-downcase|-ready\?)|integer-&gt;char|make-string|string(\?|-copy|-fill!|-length|-ref|-set!|(-ci)?(=\?|&lt;\?|&gt;\?|&lt;=\?|&gt;=\?)|-append)|substring|make-vector|vector(\?|-length|-ref|-set!|-fill!)?|procedure\?|apply|map|for-each|force|call-with-(current-continuation|(in|out)put-file)|(in|out)put-port\?|current-(in|out)put-port|open-(in|out)put-file|close-(in|out)put-port|eof-object\?|read|(read|peek)-char|write(-char)?|display|newline|call/cc|list-tail|string-&gt;list|list-&gt;string|vector-&gt;list|list-&gt;vector|with-input-from-file|with-output-to-file|load|transcript-(on|off)|eval|dynamic-wind|port\?|values|call-with-values|(scheme-report-|null-|interaction-)environment)(?=($|\s|\)))">
> ]>
>-<language name="LilyPond" section="Other" version="2.20" kateversion="2.4" extensions="*.ly;*.LY;*.ily;*.ILY" mimetype="text/x-lilypond" author="Wilbert Berendsen (info@wilbertberendsen.nl)" license="LGPL">
>+<language name="LilyPond" section="Other" version="2.20" kateversion="2.5" extensions="*.ly;*.LY;*.ily;*.ILY" mimetype="text/x-lilypond" author="Wilbert Berendsen (info@wilbertberendsen.nl)" license="LGPL">
> 
>   
>+      <DetectChar attribute="BirdTrack" context="Code" char="&gt;" column="0"/>
>+      <DetectChar attribute="BirdTrack" context="Code" char="&lt;" column="0"/>
>+      
>+      <StringDetect attribute="Text" context="normals" String="&#92;begin&#123;code&#125;"/>
>+      <StringDetect attribute="Text" context="normals" String="&#92;begin&#123;spec&#125;"/>
>+    </context>
>+
>+    <context attribute="Normal" lineEndContext="#pop" name="Code">
>+      <RegExpr attribute="Comment" context="multiline" String="\{-[^#]" />
>+      <IncludeRules context="##Curry" />
>+    </context>
>+
>+    <context attribute="Normal" lineEndContext="#stay" name="normals">
>+      <StringDetect attribute="Normal" context="#pop" String="&#92;end&#123;code&#125;"/>
>+      <StringDetect attribute="Normal" context="#pop" String="&#92;end&#123;spec&#125;"/>
>+      <IncludeRules context="##Curry" />
>+    </context>
>+
>+    
>+    <context attribute="Comment" lineEndContext="lineend" name="multiline" >
>+      <Detect2Chars attribute="Comment" context="#pop" char="-" char1="}" />
>+    </context>
>+
>+    <context attribute="Text" lineEndContext="#stay" name="lineend">
>+      <DetectChar attribute="BirdTrack" context="restart" char="&gt;" column="0"/>
>+      <DetectChar attribute="BirdTrack" context="restart" char="&lt;" column="0"/>
>+    </context>
>+
>+    <context attribute="Comment" lineEndContext="#pop" name="restart">
>+      <Detect2Chars attribute="Comment" context="#pop#pop#pop" char="-" char1="}" />
>+    </context>
>+  </contexts>
>+  <itemDatas>
>+    <itemData name="Text"      defStyleNum="dsNormal"  spellChecking="true"  />
>+    <itemData name="BirdTrack" defStyleNum="dsOthers"  spellChecking="false" />
>+    <itemData name="Comment"   defStyleNum="dsComment" />
>+  </itemDatas>
>+  </highlighting>
>+</language>
>diff -urN tdelibs/kate/data/literate-haskell.xml tdelibs.new/kate/data/literate-haskell.xml
>--- tdelibs/kate/data/literate-haskell.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/literate-haskell.xml	2013-12-26 13:26:40.852327862 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Literate Haskell" version="2.0.1" kateversion="2.3" section="Sources" extensions="*.lhs" mimetype="text/x-haskell" author="Nicolas Wu (zenzike@gmail.com)" license="LGPL" indenter="haskell">
>+<language name="Literate Haskell" version="2.0.1" kateversion="2.5" section="Sources" extensions="*.lhs" mimetype="text/x-haskell" author="Nicolas Wu (zenzike@gmail.com)" license="LGPL" indenter="haskell">
>   <highlighting>
>   <contexts>
>     <context attribute="Text" lineEndContext="#stay" name="text">
>diff -urN tdelibs/kate/data/logtalk.xml tdelibs.new/kate/data/logtalk.xml
>--- tdelibs/kate/data/logtalk.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/logtalk.xml	2013-12-26 13:26:40.842327902 -0600
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
> 
>-<language name="Logtalk" version="1.51" kateversion="2.4" section="Sources" extensions="*.lgt;*.config" mimetype="text/x-logtalk" author="Paulo Moura (pmoura@logtalk.org)" license="Artistic License 2.0">
>+<language name="Logtalk" version="1.51" kateversion="2.5" section="Sources" extensions="*.lgt;*.config" mimetype="text/x-logtalk" author="Paulo Moura (pmoura@logtalk.org)" license="Artistic License 2.0">
> 
> 	<highlighting>
> 
>diff -urN tdelibs/kate/data/lpc.xml tdelibs.new/kate/data/lpc.xml
>--- tdelibs/kate/data/lpc.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/lpc.xml	2013-12-26 13:26:41.830323687 -0600
>@@ -16,7 +16,7 @@
> -->
> 
> 
>-<language name="LPC" version="0.76" kateversion="2.4" section="Sources" extensions="*.c;*.h;*.inc;*.o" author="Andreas Klauer (Andreas.Klauer@metamorpher.de)" license="Artistic" >
>+<language name="LPC" version="0.76" kateversion="2.5" section="Sources" extensions="*.c;*.h;*.inc;*.o" author="Andreas Klauer (Andreas.Klauer@metamorpher.de)" license="Artistic" >
> 
>   <highlighting>
> 
>diff -urN tdelibs/kate/data/lua.xml tdelibs.new/kate/data/lua.xml
>--- tdelibs/kate/data/lua.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/lua.xml	2013-12-26 13:26:40.858327834 -0600
>@@ -35,7 +35,7 @@
>     - improved highlighting
> 
>     -->
>-<language name="Lua" version="1.05" indenter="lua" kateversion="2.4" section="Scripts" extensions="*.lua" mimetype="text/x-lua">
>+<language name="Lua" version="1.06" indenter="lua" kateversion="2.5" section="Scripts" extensions="*.lua" mimetype="text/x-lua">
>   <highlighting>
>     <list name="keywords">
>       <item> and </item>
>@@ -249,7 +249,7 @@
>         <Detect2Chars attribute="Error"    context="#stay" char="+" char1="="/>
>         <Detect2Chars attribute="Error"    context="#stay" char="+" char1="+"/>
>         <Detect2Chars attribute="Error"    context="#stay" char="." char1="="/>
>-        <AnyChar      attribute="Symbols"  context="#stay" String="[]().=~+-*/^&gt;&lt;#;" />
>+        <AnyChar      attribute="Symbols"  context="#stay" String="[]().,=~+-*/^&gt;&lt;#;" />
>       </context>
>       <context name="Comment"       attribute="Comment"     lineEndContext="#pop">
>         <Detect2Chars attribute="Alerts"   context="#stay" char="-" char1="-" />
>@@ -276,18 +276,18 @@
>       </context>
>     </contexts>
>     <itemDatas>
>-      <itemData name="Alerts"          defStyleNum="dsAlert" />
>-      <itemData name="BFunc"           defStyleNum="dsFunction"/>
>+      <itemData name="Normal Text"     defStyleNum="dsNormal" spellChecking="false"/>
>+      <itemData name="Alerts"          defStyleNum="dsAlert" spellChecking="false"/>
>+      <itemData name="BFunc"           defStyleNum="dsFunction" spellChecking="false"/>
>       <itemData name="Comment"         defStyleNum="dsComment"/>
>-      <itemData name="Constant"        defStyleNum="dsKeyword"/>
>-      <itemData name="Control"         defStyleNum="dsKeyword" color="#A1A100" selColor="#ffffff" bold="0" italic="0"/>
>-      <itemData name="Error"           defStyleNum="dsError"/>
>-      <itemData name="Keyword"         defStyleNum="dsKeyword"/>
>-      <itemData name="Normal Text"     defStyleNum="dsNormal"/>
>-      <itemData name="Numbers"         defStyleNum="dsDecVal"/>
>+      <itemData name="Constant"        defStyleNum="dsKeyword" spellChecking="false"/>
>+      <itemData name="Control"         defStyleNum="dsKeyword" color="#A1A100" selColor="#ffffff" bold="0" italic="0" spellChecking="false"/>
>+      <itemData name="Error"           defStyleNum="dsError" spellChecking="false"/>
>+      <itemData name="Keyword"         defStyleNum="dsKeyword" spellChecking="false"/>
>+      <itemData name="Numbers"         defStyleNum="dsDecVal" spellChecking="false"/>
>       <itemData name="Strings"         defStyleNum="dsString"/>
>-      <itemData name="Symbols"         defStyleNum="dsOthers"/>
>-      <itemData name="Variable"        defStyleNum="dsKeyword" color="#5555FF" selColor="#ffffff" bold="0" italic="0" />
>+      <itemData name="Symbols"         defStyleNum="dsOthers" spellChecking="false"/>
>+      <itemData name="Variable"        defStyleNum="dsKeyword" color="#5555FF" selColor="#ffffff" bold="0" italic="0" spellChecking="false"/>
>     </itemDatas>
>   </highlighting>
>   <general>
>diff -urN tdelibs/kate/data/m4.xml tdelibs.new/kate/data/m4.xml
>--- tdelibs/kate/data/m4.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/m4.xml	2013-12-26 13:26:40.654328706 -0600
>@@ -6,7 +6,7 @@
>   Corresponds to GNU M4 version 1.4.16.
> 
>   For KatePart (Kate, KWrite etc) copy this file to
>-    $TDEHOME/share/apps/katepart/syntax/
>+    ~/.trinity/share/apps/katepart/syntax/
> 
>   For Qt Creator copy this file to
>     ~/.config/Nokia/qtcreator/generic-highlighter/
>@@ -38,7 +38,7 @@
>   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> -->
>-<language name="GNU M4" version="1.0" section="Sources" kateversion="2.5" extensions="*.m4;" author="Jaak Ristioja" license="New BSD License">
>+<language name="GNU M4" version="1.1" section="Sources" kateversion="2.5" extensions="*.m4;" author="Jaak Ristioja" license="New BSD License">
>   <highlighting>
>     <list name="optbuiltins">
>       <item> __gnu__ </item>
>@@ -153,7 +153,7 @@
>       <item> m4_undivert </item>
>     </list>
>     <contexts>
>-      <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text">
>+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal Text">
>         <keyword attribute="Builtins" String="builtins" context="#stay"/>
>         <keyword attribute="Builtins (prefixed with m4_)" String="m4_builtins" context="#stay"/>
>         <keyword attribute="Optional builtins" String="optbuiltins" context="#stay"/>
>diff -urN tdelibs/kate/data/mab.xml tdelibs.new/kate/data/mab.xml
>--- tdelibs/kate/data/mab.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/mab.xml	2013-12-26 13:26:42.006322934 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="MAB-DB" version="1.03" kateversion="2.4" extensions="*.mab;*.MAB;*.Mab" section="Markup" mimetype="text/x-mab" casesensitive="0">
>+<language name="MAB-DB" version="1.03" kateversion="2.5" extensions="*.mab;*.MAB;*.Mab" section="Markup" mimetype="text/x-mab" casesensitive="0">
>   <highlighting>
>     <contexts>
>       <context attribute="Normal Text" name="Section" lineEndContext="#stay" >
>diff -urN tdelibs/kate/data/makefile.xml tdelibs.new/kate/data/makefile.xml
>--- tdelibs/kate/data/makefile.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/makefile.xml	2013-12-26 13:26:41.140326633 -0600
>@@ -3,8 +3,13 @@
> 
> 
> 
>+
> 
>-<language name="Makefile" version="1.12" kateversion="2.4" section="Other" extensions="GNUmakefile;Makefile;makefile;GNUmakefile.*;Makefile.*;makefile.*" mimetype="text/x-makefile" author="Per Wigren (wigren@home.se)" license="">
>+<language name="Makefile" section="Other"
>+          version="2.0" kateversion="2.5"
>+          extensions="GNUmakefile;Makefile;makefile;GNUmakefile.*;Makefile.*;makefile.*"
>+          mimetype="text/x-makefile"
>+          author="Per Wigren (wigren@home.se)" license="">
>   <highlighting>
>     <list name = "keywords">
>       <item> include </item>
>@@ -16,128 +21,189 @@
>       <item> ifeq </item>
>       <item> ifndef </item>
>       <item> ifneq </item>
>+      <item> override </item>
>     </list>
>     <list name = "functions">
>-        <item> call </item>
>-        <item> subst </item>
>-        <item> patsubst </item>
>-        <item> strip </item>
>-        <item> findstring </item>
>-        <item> filter </item>
>-        <item> filter-out </item>
>-        <item> sort </item>
>-        <item> word </item>
>-        <item> wordlist </item>
>-        <item> words </item>
>-        <item> firstword </item>
>-        <item> lastword </item>
>-        <item> dir </item>
>-        <item> notdir </item>
>-        <item> suffix </item>
>-        <item> basename </item>
>-        <item> addsuffix </item>
>-        <item> addprefix </item>
>-        <item> join </item>
>-        <item> wildcard </item>
>-        <item> realpath </item>
>-        <item> abspath </item>
>-        <item> if </item>
>-        <item> or </item>
>-        <item> and </item>
>-        <item> foreach </item>
>-        <item> value </item>
>-        <item> eval </item>
>-        <item> origin </item>
>-        <item> flavor </item>
>-        <item> shell </item>
>-        <item> error </item>
>-        <item> warning </item>
>-        <item> info </item>
>+      <item> call </item>
>+      <item> subst </item>
>+      <item> patsubst </item>
>+      <item> strip </item>
>+      <item> findstring </item>
>+      <item> filter </item>
>+      <item> filter-out </item>
>+      <item> sort </item>
>+      <item> word </item>
>+      <item> wordlist </item>
>+      <item> words </item>
>+      <item> firstword </item>
>+      <item> lastword </item>
>+      <item> dir </item>
>+      <item> notdir </item>
>+      <item> suffix </item>
>+      <item> basename </item>
>+      <item> addsuffix </item>
>+      <item> addprefix </item>
>+      <item> join </item>
>+      <item> wildcard </item>
>+      <item> realpath </item>
>+      <item> abspath </item>
>+      <item> if </item>
>+      <item> or </item>
>+      <item> and </item>
>+      <item> foreach </item>
>+      <item> value </item>
>+      <item> eval </item>
>+      <item> origin </item>
>+      <item> flavor </item>
>+      <item> shell </item>
>+      <item> error </item>
>+      <item> warning </item>
>+      <item> info </item>
>     </list>
> 
>     <contexts>
>-      <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
>+      <context name="normal" attribute="Normal" lineEndContext="#stay">
>+        <DetectSpaces/>
>         <keyword attribute="Keyword"  context="#stay" String="keywords"/>
>-        <RegExpr attribute="Variable" context="Value" String="[_\w\d]*\s*(?=:=|=|\+=|\?=)"/>
>-        <RegExpr attribute="Target"   context="#stay" String="[_\w\d-]*\s*:" firstNonSpace="true"/>
>-        <RegExpr attribute="Section"  context="#stay" String="^[.].*:"/>
>-        <DetectChar attribute="String" context="String" char="&quot;"/>
>-        <Detect2Chars attribute="Operator" context="VarFromNormal{" char="$" char1="{"/>
>-        <Detect2Chars attribute="Operator" context="VarFromNormal(" char="$" char1="("/>
>+        <RegExpr attribute="Variable" context="assign" String="[^\s:+?]*\s*(?=:=|=|\+=|\?=)"/>
>+        <RegExpr attribute="Section"  context="prereq" String="^[.].*:"/>
>+        <RegExpr attribute="Target"   context="prereq" String="^.*:"/>
>+        <DetectIdentifier/>
>+        <DetectChar attribute="String" context="string&quot;" char="&quot;"/>
>+        <DetectChar attribute="String" context="string'" char="'"/>
>+        <DetectChar attribute="Operator" context="dollar" char="$"/>
>         <Detect2Chars attribute="Special" context="#stay" char="\" char1="#"/>
>         <Detect2Chars attribute="Special" context="#stay" char="\" char1="\"/>
>-        <AnyChar attribute="Operator" context="#stay" String="+*=%$():\&#059;"/>
>-        <AnyChar attribute="Operator" context="Commands" String="@-" firstNonSpace="true"/>
>+        <AnyChar attribute="Operator" context="silent" String="@-" firstNonSpace="1"/>
>         <RegExpr attribute="Comment"  context="#stay" String="#.*$"/>
>       </context>
> 
>-      <context attribute="String" lineEndContext="#pop" name="String">
>-        <LineContinue attribute="String" context="#stay"/>
>+      <context name="prereq" attribute="Prereq" lineEndContext="rule">
>+        <DetectSpaces/>
>+        <DetectIdentifier/>
>+        <DetectChar attribute="Operator" context="dollar" char="$"/>
>+        <Detect2Chars attribute="Special" context="#stay" char="\" char1="#"/>
>+        <Detect2Chars attribute="Special" context="#stay" char="\" char1="\"/>
>+        <RegExpr attribute="Comment"  context="#stay" String="#.*$"/>
>+      </context>
>+
>+      <context name="rule" attribute="Normal" lineEndContext="#stay">
>+        <LineContinue attribute="Operator" context="#stay"/>
>+        
>+        <RegExpr attribute="Error" context="#pop#pop#pop" String="^ +" firstNonSpace="1"/>
>+        <RegExpr context="#pop#pop#pop" String="^[^\t]" lookAhead="1" firstNonSpace="1"/>
>+        <DetectSpaces/>
>+        <DetectIdentifier/>
>+        <DetectChar attribute="String" context="string&quot;" char="&quot;"/>
>+        <DetectChar attribute="String" context="string'" char="'"/>
>+        <DetectChar attribute="Operator" context="dollar" char="$"/>
>+        <Detect2Chars attribute="Special" context="#stay" char="\" char1="#"/>
>+        <Detect2Chars attribute="Special" context="#stay" char="\" char1="\"/>
>+        <AnyChar attribute="Operator" context="silent" String="@-" firstNonSpace="1"/>
>+        <RegExpr attribute="Comment" context="#stay" String="#.*$"/>
>+      </context>
>+
>+      <context name="silent" attribute="Silent" lineEndContext="#pop">
>+        <LineContinue attribute="Operator" context="#stay"/>
>+        <DetectSpaces/>
>+        <DetectIdentifier/>
>+        <DetectChar attribute="String" context="string&quot;" char="&quot;"/>
>+        <DetectChar attribute="String" context="string'" char="'"/>
>+        <DetectChar attribute="Operator" context="dollar" char="$"/>
>+        <Detect2Chars attribute="Special" context="#stay" char="\" char1="#"/>
>+        <Detect2Chars attribute="Special" context="#stay" char="\" char1="\"/>
>+        <RegExpr attribute="Comment" context="#stay" String="#.*$"/>
>+      </context>
>+
>+      <context name="string&quot;" attribute="String" lineEndContext="#pop">
>+        <LineContinue attribute="Operator" context="#stay"/>
>         <DetectChar attribute="String" context="#pop" char="&quot;"/>
>+        <DetectChar attribute="Operator" context="dollar" char="$"/>
>+      </context>
>+
>+      <context name="string'" attribute="String" lineEndContext="#pop">
>+        <LineContinue attribute="String" context="#stay"/>
>+        <DetectChar attribute="String" context="#pop" char="'"/>
>+        <DetectChar attribute="Operator" context="dollar" char="$"/>
>+      </context>
>+
>+      <context name="assign" attribute="Operator" lineEndContext="#pop">
>+        <DetectChar attribute="Operator" context="value" char="="/>
>       </context>
> 
>-      <context name="Value" attribute="String" lineEndContext="#pop">
>+      <context name="value" attribute="String" lineEndContext="#pop#pop">
>         <LineContinue attribute="Operator"/>
>-        <Detect2Chars attribute="Operator" context="VarFromValue{" char="$" char1="{"/>
>-        <Detect2Chars attribute="Operator" context="VarFromValue(" char="$" char1="("/>
>-        <RegExpr attribute="Special" context="#pop" String="@[-_\d\w]*@" />
>-        <DetectChar attribute="Operator" char="&#059;" context="#pop"/>
>+        <DetectChar attribute="Operator" context="dollar" char="$"/>
>+        <RegExpr attribute="Special" context="#pop#pop" String="@[-_\d\w]*@"/>
>+        <DetectChar attribute="Operator" char=";" context="#pop#pop"/>
>       </context>
> 
>-      <context name="VarFromValue(" attribute="Variable" lineEndContext="#stay">
>-        <DetectChar attribute="Operator" char=")" context="#pop"/>
>+      <context name="dollar" attribute="Operator" lineEndContext="#pop">
>+        <DetectChar attribute="Operator" context="call(" char="("/>
>+        <DetectChar attribute="Operator" context="call{" char="{"/>
>+        <RegExpr attribute="Operator" context="#pop" String="."/>
>       </context>
> 
>-      <context name="VarFromValue{" attribute="Variable" lineEndContext="#stay">
>-        <DetectChar attribute="Operator" char="}" context="#pop"/>
>+      <context name="call(" attribute="Variable" lineEndContext="#stay" fallthroughContext="callVar(" fallthrough="1">
>+        <keyword attribute="Keyword" context="callFunc(" String="functions"/>
>       </context>
> 
>-      <context name="VarFromNormal(" attribute="Variable" lineEndContext="#stay">
>-        <keyword attribute="Keyword" context="FunctionCall(" String="functions"/>
>-        <DetectChar attribute="Operator" char=")" context="#pop"/>
>+      <context name="call{" attribute="Variable" lineEndContext="#stay" fallthroughContext="callVar{" fallthrough="1">
>+        <keyword attribute="Keyword" context="callFunc{" String="functions"/>
>       </context>
> 
>-      <context name="VarFromNormal{" attribute="Variable" lineEndContext="#stay">
>-        <keyword attribute="Keyword" context="FunctionCall{" String="functions"/>
>-        <DetectChar attribute="Comment" char="}" context="#pop"/>
>+      <context name="callVar(" attribute="Variable" lineEndContext="#stay">
>+        <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="=#:"/>
>       </context>
> 
>-      <context name="FunctionCall(" attribute="String" lineEndContext="#stay">
>-        <Detect2Chars attribute="Operator" context="VarFromNormal{" char="$" char1="{"/>
>-        <Detect2Chars attribute="Operator" context="VarFromNormal(" char="$" char1="("/>
>-        <DetectChar attribute="Operator" char=")" context="#pop#pop"/>
>+      <context name="callVar{" attribute="Variable" lineEndContext="#stay">
>+        <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="=#:"/>
>       </context>
> 
>-      <context name="FunctionCall{" attribute="String" lineEndContext="#stay">
>-        <Detect2Chars attribute="Operator" context="VarFromNormal{" char="$" char1="{"/>
>-        <Detect2Chars attribute="Operator" context="VarFromNormal(" char="$" char1="("/>
>-        <DetectChar attribute="Operator" char="}" context="#pop#pop"/>
>+      <context name="callFunc(" attribute="FuncParam" lineEndContext="#stay">
>+        <DetectChar attribute="Operator" char=")" context="#pop#pop#pop"/>
>+        <DetectChar attribute="Operator" context="dollar" char="$"/>
>+        <DetectChar attribute="Keyword" context="#stay" char=","/>
>+        <DetectChar attribute="String" context="string'" char="'"/>
>       </context>
> 
>-      <context name="Commands" attribute="Normal Text" lineEndContext="#pop">
>-        <Detect2Chars attribute="Operator" context="VarFromNormal{" char="$" char1="{"/>
>-        <Detect2Chars attribute="Operator" context="VarFromNormal(" char="$" char1="("/>
>-        <RegExpr attribute="Commands" context="#pop" String="[_\w-]*\b"/>
>+      <context name="callFunc{" attribute="FuncParam" lineEndContext="#stay">
>+        <DetectChar attribute="Operator" char="}" context="#pop#pop#pop"/>
>+        <DetectChar attribute="Operator" context="dollar" char="$"/>
>+        <DetectChar attribute="Keyword" context="#stay" char=","/>
>+        <DetectChar attribute="String" context="string'" char="'"/>
>       </context>
> 
>     </contexts>
>     <itemDatas>
>-      <itemData name="Normal Text" defStyleNum="dsNormal"/>
>-      <itemData name="Keyword"     defStyleNum="dsKeyword"/>
>-      <itemData name="Comment"     defStyleNum="dsComment"/>
>-      <itemData name="String"      defStyleNum="dsString"/>
>-      <itemData name="Variable"    defStyleNum="dsDataType"/>
>-      <itemData name="Target"      defStyleNum="dsDecVal"/>
>-      <itemData name="Section"     defStyleNum="dsOthers"/>
>-      <itemData name="Operator"    defStyleNum="dsChar"/>
>-      <itemData name="Commands"    defStyleNum="dsBaseN"/>
>-      <itemData name="Special"     defStyleNum="dsFloat"/>
>+      <itemData name="Normal"    defStyleNum="dsNormal" spellChecking="0"/>
>+      <itemData name="Keyword"   defStyleNum="dsKeyword" spellChecking="0"/>
>+      <itemData name="Comment"   defStyleNum="dsComment"/>
>+      <itemData name="String"    defStyleNum="dsString" spellChecking="0"/>
>+      <itemData name="Variable"  defStyleNum="dsDataType" spellChecking="0"/>
>+      <itemData name="Target"    defStyleNum="dsDecVal" spellChecking="0"/>
>+      <itemData name="Section"   defStyleNum="dsOthers" spellChecking="0"/>
>+      <itemData name="Prereq"    defStyleNum="dsDataType" spellChecking="0"/>
>+      <itemData name="FuncParam" defStyleNum="dsString" spellChecking="0"/>
>+      <itemData name="Operator"  defStyleNum="dsChar" spellChecking="0"/>
>+      <itemData name="Silent"    defStyleNum="dsFunction" spellChecking="0"/>
>+      <itemData name="Special"   defStyleNum="dsFloat" spellChecking="0"/>
>+      <itemData name="Error"     defStyleNum="dsError" spellChecking="0"/>
>     </itemDatas>
>   </highlighting>
>   <general>
>     <comments>
>       <comment name = "singleLine" start = "#"/>
>     </comments>
>-    <keywords casesensitive = "1" />
>+    
>+    <keywords casesensitive="1" weakDeliminator = "-"/>
>   </general>
> </language>
>+
>diff -urN tdelibs/kate/data/mako.xml tdelibs.new/kate/data/mako.xml
>--- tdelibs/kate/data/mako.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/mako.xml	2013-12-26 13:26:41.064326957 -0600
>@@ -0,0 +1,255 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd"
>+[
>+	<!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.5" section="Markup" extensions="*.mako;*.mak" author="Massimiliano Torromeo (massimiliano.torromeo@gmail.com)" license="LGPL">
>+
>+<highlighting>
>+<list name="flow">
>+	<item> endfor </item>
>+	<item> endif </item>
>+</list>
>+<contexts>
>+	<context name="Start" attribute="Normal Text" lineEndContext="#stay">
>+		<IncludeRules context="FindMako" />
>+		<IncludeRules context="FindHTML" />
>+	</context>
>+
>+	<context name="FindMako" attribute="Normal Text" lineEndContext="#stay">
>+		<RegExpr attribute="MakoKeyword" context="NoMakoHTML" String="&lt;%text(?:\s+[^&gt;]*)?&gt;" beginRegion="nomako" />
>+		<Detect2Chars attribute="MakoKeyword" context="Mako" char="&lt;" char1="%" />
>+		<RegExpr attribute="MakoKeyword" context="Mako" String="&lt;/?%" />
>+		<RegExpr attribute="MakoKeyword" context="MakoOneLiner" String="^\s*% " />
>+		<Detect2Chars attribute="MakoKeyword" context="MakoPrint" char="$" char1="{" />
>+	</context>
>+
>+	<context name="Mako" attribute="Mako" lineEndContext="#stay">
>+		<RegExpr attribute="MakoKeyword" context="#pop" String="[%/]?&gt;" />
>+		<IncludeRules context="##Python" includeAttrib="true"/>
>+	</context>
>+
>+	<context name="MakoOneLiner" attribute="MakoKeyword" lineEndContext="#pop">
>+		<keyword attribute="Flow Control Keyword" String="flow" context="#stay"/>
>+		<IncludeRules context="##Python" includeAttrib="true"/>
>+	</context>
>+
>+	<context name="MakoPrint" attribute="Mako" lineEndContext="#stay">
>+		<DetectChar attribute="MakoKeyword" context="#pop" char="}" />
>+		<IncludeRules context="##Python" includeAttrib="true"/>
>+	</context>
>+
>+	<context name="NoMakoHTML" attribute="Normal Text" lineEndContext="#stay">
>+		<StringDetect attribute="MakoKeyword" context="#pop" String="&lt;/%text&gt;" endRegion="nomako" />
>+		<IncludeRules context="##HTML" includeAttrib="true"/>
>+	</context>
>+
>+	<context name="NoMakoJS" attribute="Normal Text" lineEndContext="#stay">
>+		<StringDetect attribute="MakoKeyword" context="#pop" String="&lt;/%text&gt;" endRegion="nomako" />
>+		<IncludeRules context="##JavaScript" includeAttrib="true"/>
>+	</context>
>+
>+	<context name="FindHTML" attribute="Normal Text" lineEndContext="#stay">
>+		<DetectSpaces/>
>+		<DetectIdentifier/>
>+		<StringDetect attribute="Comment" context="Comment" String="&lt;!--" beginRegion="comment" />
>+		<StringDetect attribute="CDATA" context="CDATA" String="&lt;![CDATA[" beginRegion="cdata" />
>+		<RegExpr attribute="Doctype" context="Doctype" String="&lt;!DOCTYPE\s+" beginRegion="doctype" />
>+		<RegExpr attribute="Processing Instruction" context="PI" String="&lt;\?[\w:-]*" beginRegion="pi" />
>+		<RegExpr attribute="Element" context="CSS" String="&lt;style\b" insensitive="TRUE" beginRegion="style" />
>+		<RegExpr attribute="Element" context="JS" String="&lt;script\b" insensitive="TRUE" beginRegion="script" />
>+		<RegExpr attribute="Element" context="El Open" String="&lt;pre\b" insensitive="TRUE" beginRegion="pre" />
>+		<RegExpr attribute="Element" context="El Open" String="&lt;div\b" insensitive="TRUE" beginRegion="div" />
>+		<RegExpr attribute="Element" context="El Open" String="&lt;table\b" insensitive="TRUE" beginRegion="table" />
>+		<RegExpr attribute="Element" context="El Open" String="&lt;ul\b" insensitive="TRUE" beginRegion="ul" />
>+		<RegExpr attribute="Element" context="El Open" String="&lt;ol\b" insensitive="TRUE" beginRegion="ol" />
>+		<RegExpr attribute="Element" context="El Open" String="&lt;dl\b" insensitive="TRUE" beginRegion="dl" />
>+		<RegExpr attribute="Element" context="El Open" String="&lt;&name;" />
>+		<RegExpr attribute="Element" context="El Close" String="&lt;/pre\b" insensitive="TRUE" endRegion="pre" />
>+		<RegExpr attribute="Element" context="El Close" String="&lt;/div\b" insensitive="TRUE" endRegion="div" />
>+		<RegExpr attribute="Element" context="El Close" String="&lt;/table\b" insensitive="TRUE" endRegion="table" />
>+		<RegExpr attribute="Element" context="El Close" String="&lt;/ul\b" insensitive="TRUE" endRegion="ul" />
>+		<RegExpr attribute="Element" context="El Close" String="&lt;/ol\b" insensitive="TRUE" endRegion="ol" />
>+		<RegExpr attribute="Element" context="El Close" String="&lt;/dl\b" insensitive="TRUE" endRegion="dl" />
>+		<RegExpr attribute="Element" context="El Close" String="&lt;/&name;" />
>+		<IncludeRules context="FindDTDRules" />
>+		<IncludeRules context="FindEntityRefs" />
>+	</context>
>+
>+	<context name="FindEntityRefs" attribute="Normal Text" lineEndContext="#stay">
>+		<RegExpr attribute="EntityRef" context="#stay" String="&entref;" />
>+		<AnyChar attribute="Error" context="#stay" String="&amp;&lt;" />
>+	</context>
>+
>+	<context name="FindPEntityRefs" attribute="Normal Text" lineEndContext="#stay">
>+		<RegExpr attribute="EntityRef" context="#stay" String="&entref;" />
>+		<RegExpr attribute="PEntityRef" context="#stay" String="%&name;;" />
>+		<AnyChar attribute="Error" context="#stay" String="&amp;%" />
>+	</context>
>+
>+	<context name="FindAttributes" attribute="Normal Text" lineEndContext="#stay">
>+		
>+		<RegExpr attribute="Attribute" context="#stay" String="&name;" />
>+		<DetectChar attribute="Attribute" context="Value" char="=" />
>+	</context>
>+
>+	<context name="FindDTDRules" attribute="Normal Text" lineEndContext="#stay">
>+		<RegExpr attribute="Doctype" context="Doctype Markupdecl" String="&lt;!(ELEMENT|ENTITY|ATTLIST|NOTATION)\b" />
>+	</context>
>+
>+	<context name="Comment" attribute="Comment" lineEndContext="#stay">
>+		<DetectSpaces/>
>+		<IncludeRules context="##Alerts" />
>+		<DetectIdentifier/>
>+		<StringDetect attribute="Comment" context="#pop" String="--&gt;" endRegion="comment" />
>+		<RegExpr attribute="Error" context="#stay" String="-(-(?!-&gt;))+" />
>+	</context>
>+
>+	<context name="CDATA" attribute="Normal Text" lineEndContext="#stay">
>+		<DetectSpaces/>
>+		<DetectIdentifier/>
>+		<StringDetect attribute="CDATA" context="#pop" String="]]&gt;" endRegion="cdata" />
>+		<StringDetect attribute="EntityRef" context="#stay" String="]]&amp;gt;" />
>+	</context>
>+
>+	<context name="PI" attribute="Normal Text" lineEndContext="#stay">
>+		<Detect2Chars attribute="Processing Instruction" context="#pop" char="?" char1="&gt;" endRegion="pi" />
>+	</context>
>+
>+	<context name="Doctype" attribute="Normal Text" lineEndContext="#stay">
>+		<DetectChar attribute="Doctype" context="#pop" char="&gt;" endRegion="doctype" />
>+		<DetectChar attribute="Doctype" context="Doctype Internal Subset" char="[" beginRegion="int_subset" />
>+	</context>
>+
>+	<context name="Doctype Internal Subset" attribute="Normal Text" lineEndContext="#stay">
>+		<DetectChar attribute="Doctype" context="#pop" char="]" endRegion="int_subset" />
>+		<IncludeRules context="FindDTDRules" />
>+		<StringDetect attribute="Comment" context="Comment" String="&lt;!--" beginRegion="comment" />
>+		<RegExpr attribute="Processing Instruction" context="PI" String="&lt;\?[\w:-]*" beginRegion="pi" />
>+		<IncludeRules context="FindPEntityRefs" />
>+	</context>
>+
>+	<context name="Doctype Markupdecl" attribute="Normal Text" lineEndContext="#stay">
>+		<DetectChar attribute="Doctype" context="#pop" char="&gt;" />
>+		<DetectChar attribute="Value" context="Doctype Markupdecl DQ" char="&quot;" />
>+		<DetectChar attribute="Value" context="Doctype Markupdecl SQ" char="&apos;" />
>+	</context>
>+
>+	<context name="Doctype Markupdecl DQ" attribute="Value" lineEndContext="#stay">
>+		<DetectChar attribute="Value" context="#pop" char="&quot;" />
>+		<IncludeRules context="FindPEntityRefs" />
>+	</context>
>+
>+	<context name="Doctype Markupdecl SQ" attribute="Value" lineEndContext="#stay">
>+		<DetectChar attribute="Value" context="#pop" char="&apos;" />
>+		<IncludeRules context="FindPEntityRefs" />
>+	</context>
>+
>+	<context name="El Open" attribute="Normal Text" lineEndContext="#stay">
>+		<Detect2Chars attribute="Element" context="#pop" char="/" char1="&gt;" />
>+		<DetectChar attribute="Element" context="#pop" char="&gt;" />
>+		<IncludeRules context="FindAttributes" />
>+		<IncludeRules context="FindMako" />
>+	</context>
>+
>+	<context name="El Close" attribute="Normal Text" lineEndContext="#stay">
>+		<DetectChar attribute="Element" context="#pop" char="&gt;" />
>+		<RegExpr attribute="Error" context="#stay" String="\S" />
>+	</context>
>+
>+	<context name="El Close 2" attribute="Normal Text" lineEndContext="#stay">
>+		<DetectChar attribute="Element" context="#pop#pop#pop" char="&gt;" />
>+		<RegExpr attribute="Error" context="#stay" String="\S" />
>+	</context>
>+
>+	<context name="El Close 3" attribute="Normal Text" lineEndContext="#stay">
>+		<DetectChar attribute="Element" context="#pop#pop#pop#pop" char="&gt;" />
>+		<RegExpr attribute="Error" context="#stay" String="\S" />
>+	</context>
>+
>+	<context name="CSS" attribute="Normal Text" lineEndContext="#stay">
>+		<Detect2Chars attribute="Element" context="#pop" char="/" char1="&gt;" endRegion="style" />
>+		<DetectChar attribute="Element" context="CSS content" char="&gt;" />
>+		<RegExpr attribute="Error" context="#stay" String="\S" />
>+	</context>
>+
>+	<context name="CSS content" attribute="Normal Text" lineEndContext="#stay">
>+		<RegExpr attribute="Element" context="El Close 2" String="&lt;/style\b" insensitive="TRUE" endRegion="style" />
>+		<IncludeRules context="##CSS" includeAttrib="true"/>
>+	</context>
>+
>+	<context name="JS" attribute="Normal Text" lineEndContext="#stay">
>+		<Detect2Chars attribute="Element" context="#pop" char="/" char1="&gt;" endRegion="script" />
>+		<DetectChar attribute="Element" context="JS content" char="&gt;" />
>+		<IncludeRules context="FindAttributes" />
>+		<RegExpr attribute="Error" context="#stay" String="\S" />
>+	</context>
>+
>+	<context name="JS content" attribute="Normal 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" />
>+		<RegExpr attribute="MakoKeyword" context="NoMakoJS" String="&lt;%text(?:\s+[^&gt;]*)?&gt;" beginRegion="nomako" />
>+		<IncludeRules context="FindMako" />
>+		<IncludeRules context="##JavaScript" includeAttrib="true"/>
>+	</context>
>+
>+	<context name="JS comment close" attribute="Comment" lineEndContext="#pop">
>+		<RegExpr attribute="Element" context="El Close 3" String="&lt;/script\b" insensitive="TRUE" endRegion="script" />
>+		<IncludeRules context="##Alerts" />
>+	</context>
>+
>+	<context name="Value" attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="Value NQ">
>+		<DetectChar attribute="Value" context="Value DQ" char="&quot;" />
>+		<DetectChar attribute="Value" context="Value SQ" char="&apos;" />
>+		<DetectSpaces />
>+	</context>
>+
>+	<context name="Value NQ" attribute="Normal Text" lineEndContext="#pop#pop" fallthrough="true" fallthroughContext="#pop#pop">
>+		<IncludeRules context="FindEntityRefs" />
>+		<RegExpr attribute="Value" context="#stay" String="/(?!&gt;)" />
>+		<RegExpr attribute="Value" context="#stay" String="[^/&gt;&lt;&quot;&apos;\s]" />
>+	</context>
>+
>+	<context name="Value DQ" attribute="Value" lineEndContext="#stay">
>+		<DetectChar attribute="Value" context="#pop#pop" char="&quot;" />
>+		<IncludeRules context="FindEntityRefs" />
>+		<IncludeRules context="FindMako" />
>+	</context>
>+
>+	<context name="Value SQ" attribute="Value" lineEndContext="#stay">
>+		<DetectChar attribute="Value" context="#pop#pop" char="&apos;" />
>+		<IncludeRules context="FindEntityRefs" />
>+		<IncludeRules context="FindMako" />
>+	</context>
>+
>+</contexts>
>+<itemDatas>
>+  <itemData name="Normal Text" defStyleNum="dsNormal" />
>+  <itemData name="Comment" defStyleNum="dsComment" />
>+  <itemData name="CDATA" defStyleNum="dsBaseN" bold="1" />
>+  <itemData name="Processing Instruction" defStyleNum="dsKeyword" />
>+  <itemData name="Doctype" defStyleNum="dsDataType" bold="1" />
>+  <itemData name="Element" defStyleNum="dsKeyword" />
>+  <itemData name="Flow Control Keyword" defStyleNum="dsKeyword" spellChecking="false"/>
>+  <itemData name="Attribute" defStyleNum="dsOthers" />
>+  <itemData name="Value" defStyleNum="dsString" color="#a00" />
>+  <itemData name="EntityRef" defStyleNum="dsDecVal" />
>+  <itemData name="PEntityRef" defStyleNum="dsDecVal" />
>+  <itemData name="Error" defStyleNum="dsError" />
>+  <itemData name="Mako" defStyleNum="dsDataType" />
>+  <itemData name="MakoVar" defStyleNum="dsOthers" bold="1" />
>+  <itemData name="MakoString" defStyleNum="dsString" />
>+  <itemData name="MakoKeyword" defStyleNum="dsDataType" bold="1" />
>+</itemDatas>
>+
>+</highlighting>
>+<general>
>+  <comments>
>+    <comment name="multiLine" start="&lt;!--" end="--&gt;" />
>+    <comment name="multiLine" start="&lt;%doc&gt;" end="&lt;/%doc&gt;" />
>+    <comment name="singleLine" start="##" position="afterwhitespace"/>
>+  </comments>
>+</general>
>+</language>
>diff -urN tdelibs/kate/data/mason.xml tdelibs.new/kate/data/mason.xml
>--- tdelibs/kate/data/mason.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/mason.xml	2013-12-26 13:26:40.565329084 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language version="1.05" kateversion="2.1" name="Mason" section="Scripts" extensions="*.html;" mimetype="">
>+<language version="1.06" kateversion="2.5" name="Mason" section="Scripts" extensions="*.html;" mimetype="">
> <highlighting>
> 	<list name="keywords">
> 		<item> sub </item>
>@@ -14,6 +14,7 @@
> 		<item> lt </item>
> 		<item> le </item>
> 		<item> local </item>
>+		<item> defined </item>
> 		<item> last </item>
> 		<item> ! </item>
> 		<item> || </item>
>@@ -68,14 +69,23 @@
> 	<contexts>
> 		<context  attribute="HTML" lineEndContext="#stay" name="HTML">
> 			<RegExpr attribute="Mason Tag" context="EmbeddedPerl" String="&lt;\%method[^&gt;]*&gt;" />
>+			<RegExpr attribute="Mason Tag" context="EmbeddedPerl" String="&lt;\%def[^&gt;]*&gt;" />
> 			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%method&gt;" insensitive="FALSE" />
> 			<StringDetect attribute="Comment" context="Documentation" String="&lt;%doc&gt;" insensitive="FALSE" />
> 
> 			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%perl&gt;" insensitive="FALSE" />
> 			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%init&gt;" insensitive="FALSE" />
>+			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%once&gt;" insensitive="FALSE" />
> 			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%args&gt;" insensitive="FALSE" />
>+			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%filter&gt;" insensitive="FALSE" />
>+			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%cleanup&gt;" insensitive="FALSE" />
>+			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%flags&gt;" insensitive="FALSE" />
>+			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%attr&gt;" insensitive="FALSE" />
>+			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%shared&gt;" insensitive="FALSE" />
>+			<StringDetect attribute="Mason Tag" context="UnparsedText" String="&lt;%text&gt;" insensitive="FALSE" />
> 			<Detect2Chars attribute="Mason Tag" context="EmbeddedPerl" char="&lt;" char1="%" />
> 			<Detect2Chars attribute="Mason Method" context="MethodCall" char="&lt;" char1="&amp;" />
>+			<StringDetect attribute="Mason Tag" context="#stay" String="&lt;/&amp;&gt;" />
> 			<RegExpr attribute="Mason Tag" context="PerlOneLiner" String="^%" />
> 		</context>
> 
>@@ -83,8 +93,15 @@
> 			<Detect2Chars attribute="Mason Tag" context="#pop" char="%" char1="&gt;" />
> 			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%perl&gt;" insensitive="FALSE" />
> 			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%method&gt;" insensitive="FALSE" />
>+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%def&gt;" insensitive="FALSE" />
> 			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%init&gt;" insensitive="FALSE" />
>+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%once&gt;" insensitive="FALSE" />
> 			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%args&gt;" insensitive="FALSE" />
>+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%filter&gt;" insensitive="FALSE" />
>+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%cleanup&gt;" insensitive="FALSE" />
>+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%flags&gt;" insensitive="FALSE" />
>+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%attr&gt;" insensitive="FALSE" />
>+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%shared&gt;" insensitive="FALSE" />
> 			<keyword attribute="Keyword" context="#stay" String="keywords"/>
> 			<keyword attribute="Data Type" context="#stay" String="types"/>
> 			<HlCOct attribute="Octal" context="#stay"/>
>@@ -99,10 +116,11 @@
> 			<Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*"/>
> 			<Detect2Chars attribute="Pattern" context="Pattern2" char="s" char1="/" />
> 			<DetectChar attribute="Pattern" context="Pattern" char="/" />
>-			<AnyChar attribute="Symbol" context="#stay" String="!%&amp;()+,-&lt;=&gt;?[]^{|}~"/>
>-			<RegExpr attribute="Decimal" context="#stay" String="\$[0-9]+" />
>-			<RegExpr attribute="Data Type" context="#stay" String="\$\#?[a-zA-Z_]+[a-zA-Z0-9_]*" />
>+			<DetectIdentifier attribute="normal" context="#stay" />
>+			<RegExpr attribute="Decimal" context="#stay" String="[0-9]+" />
>+			<AnyChar attribute="Data Type" context="Variable" String="$@%" />
> 			<RegExpr attribute="Pattern" context="#stay" String="\s+\:" />
>+			<AnyChar attribute="Symbol" context="#stay" String="!&amp;()+,-&lt;=&gt;?[]^{|}~"/> 
> 			<DetectChar attribute="Comment" context="Commentar 1" char="#" />
> 		</context>
> 
>@@ -110,8 +128,19 @@
> 			<LineContinue attribute="String" context="#stay"/>
> 			<HlCStringChar attribute="String Char" context="#stay"/>
> 			<DetectChar attribute="String" context="#pop" char="&quot;"/>
>-			<RegExpr attribute="Decimal" context="#stay" String="\$[0-9]+" />
>-			<RegExpr attribute="Data Type" context="#stay" String="\$[a-zA-Z_]*[a-zA-Z0-9_]*" />
>+			<RegExpr attribute="Decimal" context="#stay" String="[0-9]+" />
>+			<AnyChar attribute="Data Type" context="Variable" String="$@%" />
>+		</context>
>+		
>+		<context attribute="String" lineEndContext="#stay" name="UnparsedText">
>+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%text&gt;" insensitive="FALSE" />
>+		</context>
>+		
>+		<context attribute="Data Type" lineEndContext="#pop" name="Variable">
>+			<Detect2Chars attribute="normal" context="#stay" char="-" char1="&gt;" />
>+			<DetectChar attribute="String" context="String" char="&quot;" />
>+			<DetectChar attribute="String" context="String2" char="'" />
>+			<AnyChar attribute="normal" context="#pop" String=" &amp;	()+,-&lt;=&gt;?^|~" />
> 		</context>
> 
> 		<context attribute="Comment" lineEndContext="#pop" name="Commentar 1"/>
>@@ -148,7 +177,7 @@
> 			<DetectChar attribute="String" context="#pop" char="'"/>
> 		</context>
> 
>-		<context attribute="String" lineEndContext="#pop" name="PerlOneLiner">
>+		<context attribute="normal" lineEndContext="#pop" name="PerlOneLiner">
> 			<keyword attribute="Keyword" context="#stay" String="keywords"/>
> 			<keyword attribute="Data Type" context="#stay" String="types"/>
> 			<HlCOct attribute="Octal" context="#stay"/>
>@@ -162,9 +191,9 @@
> 			<Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
> 			<Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*"/>
> 			<Detect2Chars attribute="Pattern" context="Pattern2" char="s" char1="/" />
>+			<RegExpr attribute="Decimal" context="#stay" String="[0-9]+" />
>+			<AnyChar attribute="Data Type" context="Variable" String="$@%" />
> 			<AnyChar attribute="Symbol" context="#stay" String="!%&amp;()+,-&lt;=&gt;?[]^{|}~"/>
>-			<RegExpr attribute="Decimal" context="#stay" String="\$[0-9]+" />
>-			<RegExpr attribute="Data Type" context="#stay" String="\$\#?[a-zA-Z_]+[a-zA-Z0-9_]*" />
> 			<RegExpr attribute="Pattern" context="#stay" String="\s+\:" />
> 			<RegExpr attribute="Comment" context="#stay" String="\#.*" />
> 		</context>
>@@ -199,7 +228,7 @@
>   </highlighting>
>   <general>
>     <comments>
>-      <comment name="singleLine" start="#" />
>+	  <comment name="singleLine" start="#" />
> 	  <comment name="multiLine" start="&lt;%doc&gt;" end="&lt;%doc&gt;"/>
>      </comments>
>     <keywords casesensitive="1" />
>diff -urN tdelibs/kate/data/matlab.xml tdelibs.new/kate/data/matlab.xml
>--- tdelibs/kate/data/matlab.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/matlab.xml	2013-12-26 13:26:41.301325945 -0600
>@@ -57,7 +57,7 @@
> 
> <!DOCTYPE language SYSTEM "language.dtd">
> 
>-<language name="Matlab" version="1.30" kateversion="2.2" section="Scientific" extensions="*.m;*.M" mimetype="text/mfile" casesensitive="1">
>+<language name="Matlab" version="1.31" kateversion="2.5" section="Scientific" extensions="*.m;*.M" mimetype="text/mfile" casesensitive="1">
>   <highlighting>
> 
>     
>@@ -89,7 +89,7 @@
> 
>     <contexts>
> 
>-      <context name="_normal" attribute="Normal Text" lineEndContext="#pop">
>+      <context name="_normal" attribute="Normal Text" lineEndContext="#stay">
> 
>         
>         <RegExpr context="_adjoint" attribute="Variable" String="[a-zA-Z]\w*(?=')" />
>diff -urN tdelibs/kate/data/maxima.xml tdelibs.new/kate/data/maxima.xml
>--- tdelibs/kate/data/maxima.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/maxima.xml	2013-12-26 13:26:40.376329892 -0600
>@@ -21,7 +21,7 @@
> 
> <!DOCTYPE language SYSTEM "language.dtd">
> 
>-<language name="Maxima" version="0.16" 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" kateversion="2.5" section="Scientific" extensions="*.mac;*.MAC;*.dem;*.DEM" casesensitive="1" author="Alexey Beshenov &lt;al@beshenov.ru>" license="LGPL">
>     <highlighting>
> 
>         <list name="MaximaKeyword">
>diff -urN tdelibs/kate/data/mediawiki.xml tdelibs.new/kate/data/mediawiki.xml
>--- tdelibs/kate/data/mediawiki.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/mediawiki.xml	2013-12-26 13:26:42.061322702 -0600
>@@ -1,79 +1,384 @@
> <?xml version = '1.0' encoding = 'UTF-8'?>
>-<!DOCTYPE language SYSTEM "language.dtd">
>-<language name="MediaWiki" section="Markup" version="1.03" kateversion="2.4" extensions="" mimetype="" license="FDL" >
>+<!DOCTYPE language SYSTEM "language.dtd" [
>+  <!ENTITY url          "(http:|https:|ftp:|mailto:)[^]| ]*(?=$|[]|\s])">
>+  <!ENTITY htmlTagName  "(?![0-9])[\w_:][\w.:_-]*">
>+  <!ENTITY htmlEntity   "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&htmlTagName;);">
>+]>
>+<language name="MediaWiki" section="Markup" version="1.9" kateversion="2.5" extensions="*.mediawiki" mimetype="" license="FDL" >
>   <highlighting>
>     <contexts>
>       <context attribute="Normal" lineEndContext="#stay" name="normal" >
>         <StringDetect String="&lt;!--" context="comment" attribute="Comment" beginRegion="comment" />
>-        <RegExpr String="([=]{2,2}[^=]+[=]{2,2}|[=]{3,3}[^=]+[=]{3,3}|[=]{4,4}[^=]+[=]{4,4}|[=]{5,5}[^=]+[=]{5,5})" attribute="Section" column="0" />
>-        <RegExpr String="[~]{3,4}" attribute="Wiki-Tag" context="#stay" />
>-        <RegExpr String="[*#;:\s]*[*#:]+" attribute="Wiki-Tag" context="#stay" column="0" />
>-        <RegExpr String="[[](?![[])" attribute="Wiki-Tag" context="URL" />
>-        <RegExpr String="(http:|ftp:|mailto:)[\S]*($|[\s])" attribute="URL" context="#stay" />
>-        <RegExpr String="[']{2,}" attribute="Wiki-Tag" context="#stay" />
>-        <Detect2Chars char="{" char1="|" context="Table" attribute="Wiki-Tag" column="0" beginRegion="table" />
>-        <Detect2Chars char="{" char1="{" context="Template" attribute="Wiki-Tag" />
>-        <Detect2Chars char="[" char1="[" context="WikiLink" attribute="Wiki-Tag" />
>-        <RangeDetect char="&amp;" char1=";" attribute="HTML-Entity" context="#stay" />
>-        <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="Wiki-Tag" />
>-        <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HTML-Tag" />
>-        <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HTML-Tag" context="#stay" />
>+        <RegExpr String="[=]{5,5}(?!=)" context="Section5" attribute="Section" column="0" />
>+        <RegExpr String="[=]{4,4}(?!=)" context="Section4" attribute="Section" column="0" />
>+        <RegExpr String="[=]{3,3}(?!=)" context="Section3" attribute="Section" column="0" />
>+        <RegExpr String="[=]{2,2}(?!=)" context="Section2" attribute="Section" column="0" />
>+        <RegExpr String="[~]{3,4}" attribute="WikiTag" context="#stay" />
>+        <DetectChar char=";" attribute="WikiTag" context="DefinitionListHeader" column="0" />
>+        <IncludeRules context="FindListItem" />
>+        <IncludeRules context="FindUrl" />
>+        <IncludeRules context="FindTextDecorations" />
>+        <Detect2Chars char="{" char1="|" context="Table" attribute="WikiTag" column="0" beginRegion="table" />
>+        <StringDetect String="{{{" context="TemplateParameter" attribute="WikiTag" />
>+        <IncludeRules context="FindTemplate" />
>+        <Detect2Chars char="[" char1="[" context="WikiLink" attribute="WikiTag" />
>+        <RangeDetect char="&amp;" char1=";" attribute="HtmlEntity" context="#stay" />
>+        <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="WikiTag" />
>+        <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
>+        <IncludeRules context="FindSyntaxHighlightingHtmlElement" />
>+        <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
>         <RegExpr String="[\s]" context="Unformatted" column="0" />
>       </context>
>       <context attribute="Normal" lineEndContext="#stay" name="Table" >
>         <StringDetect String="&lt;!--" context="comment" attribute="Comment" />
>-        <RegExpr String="([=]{2,2}[^=]+[=]{2,2}|[=]{3,3}[^=]+[=]{3,3}|[=]{4,4}[^=]+[=]{4,4}|[=]{5,5}[^=]+[=]{5,5})" attribute="Section" context="#stay" column="0" />
>-        <RegExpr String="[*#;:\s]*[*#:]+" attribute="Wiki-Tag" context="#stay" column="0" />
>-        <RegExpr String="[[](?![[])" context="URL" attribute="Wiki-Tag" />
>-        <RegExpr String="(http:|ftp:|mailto:)[\S]*($|[\s])" attribute="URL" context="#stay" />
>-        <RegExpr String="[']{2,}" attribute="Wiki-Tag" context="#stay" />
>-        <Detect2Chars char="|" char1="}" context="#pop" attribute="Wiki-Tag" column="0" endRegion="table" />
>-        <DetectChar char="|" attribute="Wiki-Tag" context="#stay"/>
>-        <Detect2Chars char="{" char1="{" context="Template" attribute="Wiki-Tag" />
>-        <Detect2Chars char="[" char1="[" context="WikiLink" attribute="Wiki-Tag" />
>-        <RangeDetect char="&amp;" char1=";" attribute="HTML-Entity" context="#stay" />
>-        <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="Wiki-Tag" />
>-        <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HTML-Tag" />
>-        <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HTML-Tag" context="#stay" />
>+        <RegExpr String="[=]{5,5}(?!=)" context="Section5" attribute="Section" column="0" />
>+        <RegExpr String="[=]{4,4}(?!=)" context="Section4" attribute="Section" column="0" />
>+        <RegExpr String="[=]{3,3}(?!=)" context="Section3" attribute="Section" column="0" />
>+        <RegExpr String="[=]{2,2}(?!=)" context="Section2" attribute="Section" column="0" />
>+        <DetectChar char=";" attribute="WikiTag" context="DefinitionListHeader" column="0" />
>+        <IncludeRules context="FindListItem" />
>+        <IncludeRules context="FindUrl" />
>+        <IncludeRules context="FindTextDecorations" />
>+        <Detect2Chars char="{" char1="|" context="Table" attribute="WikiTag" column="0" beginRegion="table" />
>+        <Detect2Chars char="|" char1="}" context="#pop" attribute="WikiTag" column="0" endRegion="table" />
>+        <DetectChar char="|" attribute="WikiTag" context="#stay"/>
>+        <StringDetect String="{{{" context="TemplateParameter" attribute="WikiTag" />
>+        <IncludeRules context="FindTemplate" />
>+        <Detect2Chars char="[" char1="[" context="WikiLink" attribute="WikiTag" />
>+        <RangeDetect char="&amp;" char1=";" attribute="HtmlEntity" context="#stay" />
>+        <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="WikiTag" />
>+        <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
>+        <IncludeRules context="FindSyntaxHighlightingHtmlElement" />
>+        <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
>         <RegExpr String="[\s]" context="Unformatted" column="0" />
>-        <RegExpr String="[~]{3,4}" attribute="Wiki-Tag" context="#stay" />
>-        <RegExpr String="[-]{4,}" attribute="Wiki-Tag" context="#stay" />
>-        <DetectChar char="!" attribute="Wiki-Tag" context="#stay" column="0" />
>+        <RegExpr String="[~]{3,4}" attribute="WikiTag" context="#stay" />
>+        <RegExpr String="[-]{4,}" attribute="WikiTag" context="#stay" />
>+        <DetectChar char="!" attribute="WikiTag" context="#stay" column="0" />
>+      </context>
>+      <context attribute="Section" lineEndContext="#pop" name="Section5" >
>+        <StringDetect String="&lt;!--" context="comment" attribute="Comment" beginRegion="comment" />
>+        <RegExpr String="[~]{3,4}" attribute="WikiTag" context="#stay" />
>+        <IncludeRules context="FindUrl" />
>+        <IncludeRules context="FindTextDecorationsBeingBold" />
>+        <StringDetect String="{{{" context="TemplateParameter" attribute="WikiTag" />
>+        <IncludeRules context="FindTemplate" />
>+        <Detect2Chars char="[" char1="[" context="WikiLink" attribute="WikiTag" />
>+        <RangeDetect char="&amp;" char1=";" attribute="HtmlEntity" context="#stay" />
>+        <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="HtmlTag" />
>+        <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
>+        <IncludeRules context="FindSyntaxHighlightingHtmlElement" />
>+        <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
>+        <RegExpr String="={6,}$" context="#pop" attribute="Normal" />
>+        <RegExpr String="={5,5}$" context="#pop" attribute="Section" />
>+        <RegExpr String="={1,4}$" context="#pop" attribute="Normal" />
>+        <RegExpr String="={1,4}$" context="#pop" attribute="Normal" />
>+        <RegExpr String="=*[^=]+$" context="#pop" attribute="Normal" />
>+      </context>
>+      <context attribute="Section" lineEndContext="#pop" name="Section4" >
>+        <StringDetect String="&lt;!--" context="comment" attribute="Comment" beginRegion="comment" />
>+        <RegExpr String="[~]{3,4}" attribute="WikiTag" context="#stay" />
>+        <IncludeRules context="FindUrl" />
>+        <IncludeRules context="FindTextDecorationsBeingBold" />
>+        <StringDetect String="{{{" context="TemplateParameter" attribute="WikiTag" />
>+        <IncludeRules context="FindTemplate" />
>+        <Detect2Chars char="[" char1="[" context="WikiLink" attribute="WikiTag" />
>+        <RangeDetect char="&amp;" char1=";" attribute="HtmlEntity" context="#stay" />
>+        <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="HtmlTag" />
>+        <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
>+        <IncludeRules context="FindSyntaxHighlightingHtmlElement" />
>+        <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
>+        <RegExpr String="={5,}$" context="#pop" attribute="Normal" />
>+        <RegExpr String="={4,4}$" context="#pop" attribute="Section" />
>+        <RegExpr String="={1,3}$" context="#pop" attribute="Normal" />
>+        <RegExpr String="=*[^=]+$" context="#pop" attribute="Normal" />
>+      </context>
>+      <context attribute="Section" lineEndContext="#pop" name="Section3" >
>+        <StringDetect String="&lt;!--" context="comment" attribute="Comment" beginRegion="comment" />
>+        <RegExpr String="[~]{3,4}" attribute="WikiTag" context="#stay" />
>+        <IncludeRules context="FindUrl" />
>+        <IncludeRules context="FindTextDecorationsBeingBold" />
>+        <StringDetect String="{{{" context="TemplateParameter" attribute="WikiTag" />
>+        <IncludeRules context="FindTemplate" />
>+        <Detect2Chars char="[" char1="[" context="WikiLink" attribute="WikiTag" />
>+        <RangeDetect char="&amp;" char1=";" attribute="HtmlEntity" context="#stay" />
>+        <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="HtmlTag" />
>+        <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
>+        <IncludeRules context="FindSyntaxHighlightingHtmlElement" />
>+        <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
>+        <RegExpr String="={4,}$" context="#pop" attribute="Normal" />
>+        <RegExpr String="={3,3}$" context="#pop" attribute="Section" />
>+        <RegExpr String="={1,2}$" context="#pop" attribute="Normal" />
>+        <RegExpr String="=*[^=]+$" context="#pop" attribute="Normal" />
>+      </context>
>+      <context attribute="Section" lineEndContext="#pop" name="Section2" >
>+        <StringDetect String="&lt;!--" context="comment" attribute="Comment" beginRegion="comment" />
>+        <RegExpr String="[~]{3,4}" attribute="WikiTag" context="#stay" />
>+        <IncludeRules context="FindUrl" />
>+        <IncludeRules context="FindTextDecorationsBeingBold" />
>+        <StringDetect String="{{{" context="TemplateParameter" attribute="WikiTag" />
>+        <IncludeRules context="FindTemplate" />
>+        <Detect2Chars char="[" char1="[" context="WikiLink" attribute="WikiTag" />
>+        <RangeDetect char="&amp;" char1=";" attribute="HtmlEntity" context="#stay" />
>+        <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="HtmlTag" />
>+        <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
>+        <IncludeRules context="FindSyntaxHighlightingHtmlElement" />
>+        <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
>+        <RegExpr String="={3,}$" context="#pop" attribute="Normal" />
>+        <RegExpr String="={2,2}$" context="#pop" attribute="Section" />
>+        <RegExpr String="={1,1}$" context="#pop" attribute="Normal" />
>+        <RegExpr String="=*[^=]+$" context="#pop" attribute="Normal" />
>       </context>
>       <context attribute="Comment" lineEndContext="#stay" name="comment" >
>         <StringDetect String="--&gt;" context="#pop" attribute="Comment" endRegion="comment" />
>       </context>
>-      <context attribute="Link" lineEndContext="#stay" name="URL" >
>-        <DetectChar char="]" context="#pop" attribute="Wiki-Tag" />
>-
>+      <context attribute="Link" lineEndContext="#stay" name="DelimitedURL" >
>+        <DetectChar char="]" context="#pop" attribute="WikiTag" />
>+        <DetectChar char="[" context="#stay" attribute="WikiTag" />
>+        <RegExpr String="&url;" context="DelimitedUrlLink" lookAhead="true" />
>+        <DetectChar char=" " context="URLTag" attribute="WikiTag" />
>+      </context>
>+      <context attribute="Link" lineEndContext="#stay" name="DelimitedUrlLink" >
>+        <IncludeRules context="FindTemplate" />
>+        <DetectChar char=" " context="#pop" lookAhead="true" />
>+        <DetectChar char="]" context="#pop" lookAhead="true" />
>+      </context>
>+
>+      <context attribute="Link" lineEndContext="#pop" name="LooseURL" >
>+        <IncludeRules context="FindTemplate" />
>+        <DetectChar char=" " context="#pop" attribute="WikiTag" />
>+      </context>
>+      <context attribute="Link" lineEndContext="#pop" name="LooseURLWithinTemplate" >
>+        <IncludeRules context="FindTemplate" />
>+        <Detect2Chars char="}" char1="}" context="#pop" lookAhead="true" />
>+        <DetectChar char=" " context="#pop" attribute="WikiTag" />
>+      </context>
>+
>+      <context attribute="dsNormal" lineEndContext="#stay" name="URLTag" >
>+        <IncludeRules context="FindTextDecorations" />
>+        <IncludeRules context="FindTemplate" />
>+        <DetectChar char="]" context="#pop" lookAhead="true" />
>       </context>
>       <context attribute="Link" lineEndContext="#stay" name="WikiLink" >
>-        <DetectChar char="|" attribute="Wiki-Tag" context="WikiLinkDescription" />
>-        <Detect2Chars char="]" char1="]" context="#pop" attribute="Wiki-Tag" />
>-
>-      </context>
>-      <context attribute="Link" lineEndContext="#stay" name="WikiLinkDescription" >
>-        <Detect2Chars char="]" char1="]" context="#pop" attribute="Wiki-Tag" lookAhead="true" />
>-      </context>
>-      <context attribute="Template" lineEndContext="#stay" name="Link" >
>-        <Detect2Chars char="}" char1="}" context="#pop" attribute="Wiki-Tag" />
>-        <AnyChar String="'[]" context="Error" attribute="Error" />
>+        <IncludeRules context="FindTemplate" />
>+        <DetectChar char="#" attribute="WikiTag" context="#stay"/>
>+        <DetectChar char="|" attribute="WikiTag" context="WikiLinkDescription" />
>+        <Detect2Chars char="]" char1="]" context="#pop" attribute="WikiTag" />
>+      </context>
>+      <context attribute="dsNormal" lineEndContext="#stay" name="WikiLinkDescription" >
>+        <IncludeRules context="FindTemplate" />
>+        <Detect2Chars char="]" char1="]" context="#pop" attribute="WikiTag" lookAhead="true" />
>       </context>
>       <context attribute="Error" lineEndContext="#pop" name="Error" />
>-      <context attribute="Link" lineEndContext="#stay" name="Template" >
>-        <Detect2Chars char="}" char1="}" context="#pop" attribute="Wiki-Tag" />
>-
>+      <context attribute="TemplateName" lineEndContext="#stay" name="Template" >
>+        <StringDetect String="|" context="TemplateParameterSlot" attribute="WikiTag" />
>+        <Detect2Chars char="}" char1="}" context="#pop" attribute="WikiTag" endRegion="template" />
>+      </context>
>+      <context attribute="Normal" lineEndContext="#stay" name="TemplateParameterSlot" >
>+        <Detect2Chars char="}" char1="}" context="#pop" attribute="WikiTag" lookAhead="true" />
>+        <StringDetect String="&lt;!--" context="comment" attribute="Comment" beginRegion="comment" />
>+        <RegExpr String="[~]{3,4}" attribute="WikiTag" context="#stay" />
>+        <IncludeRules context="FindListItem" />
>+        <IncludeRules context="FindUrlWithinTemplate" />
>+        <IncludeRules context="FindTextDecorations" />
>+        <StringDetect String="{{{" context="TemplateParameter" attribute="WikiTag" />
>+        <IncludeRules context="FindTemplate" />
>+        <Detect2Chars char="[" char1="[" context="WikiLink" attribute="WikiTag" />
>+        <RangeDetect char="&amp;" char1=";" attribute="HtmlEntity" context="#stay" />
>+        <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="HtmlTag" />
>+        <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
>+        <IncludeRules context="FindSyntaxHighlightingHtmlElement" />
>+        <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
>+        <StringDetect String="|" context="#pop" attribute="WikiTag" lookAhead="true" />
>+        <RegExpr String="[^{}|=]+(?=[=])" attribute="Parameter" context="TemplateParameterSlotEqual" />
>+      </context>
>+      <context attribute="Normal" lineEndContext="#stay" name="TemplateParameterSlotEqual" >
>+        <Detect2Chars char="}" char1="}" context="#pop" attribute="WikiTag" lookAhead="true" />
>+        <StringDetect String="|" context="#pop" attribute="WikiTag" lookAhead="true" />
>+        <StringDetect String="=" context="TemplateParameterSlotValue" attribute="WikiTag" />
>+      </context>
>+      <context attribute="Normal" lineEndContext="#stay" name="TemplateParameterSlotValue" >
>+        <StringDetect String="&lt;!--" context="comment" attribute="Comment" beginRegion="comment" />
>+        <RegExpr String="[~]{3,4}" attribute="WikiTag" context="#stay" />
>+        <IncludeRules context="FindListItem" />
>+        <IncludeRules context="FindUrlWithinTemplate" />
>+        <IncludeRules context="FindTextDecorations" />
>+        <StringDetect String="{{{" context="TemplateParameter" attribute="WikiTag" />
>+        <IncludeRules context="FindTemplate" />
>+        <Detect2Chars char="[" char1="[" context="WikiLink" attribute="WikiTag" />
>+        <RangeDetect char="&amp;" char1=";" attribute="HtmlEntity" context="#stay" />
>+        <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="HtmlTag" />
>+        <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
>+        <IncludeRules context="FindSyntaxHighlightingHtmlElement" />
>+        <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
>+        <Detect2Chars char="}" char1="}" context="#pop" attribute="WikiTag" lookAhead="true" />
>+        <StringDetect String="|" context="#pop" attribute="WikiTag" lookAhead="true" />
>+      </context>
>+      <context attribute="Parameter" lineEndContext="#stay" name="TemplateParameter" >
>+        <StringDetect String="}}}" context="#pop" attribute="WikiTag" />
>       </context>
>       <context attribute="NoWiki" lineEndContext="#stay" name="NoWiki" >
>         <RegExpr String="&lt;!--[^-]*--&gt;" attribute="NoWiki" />
>-        <StringDetect String="&lt;/nowiki&gt;" context="#pop" attribute="Wiki-Tag" />
>-        <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HTML-Tag" context="#stay" />
>-        <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HTML-Tag" />
>+        <StringDetect String="&lt;/nowiki&gt;" context="#pop" attribute="HtmlTag" />
>+        <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
>+        <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
>       </context>
>       <context attribute="Unformatted" lineEndContext="#pop" name="Unformatted" />
>       <context attribute="NoWiki" lineEndContext="#stay" name="Pre" >
>-      <StringDetect String="&lt;/pre&gt;" context="#pop" attribute="Wiki-Tag" />
>+        <StringDetect String="&lt;/pre&gt;" context="#pop" attribute="HtmlTag" />
>+      </context>
>+
>+
>+
>+      
>+
>+      <context name="SourceStartTag" attribute="Normal" lineEndContext="#stay">
>+        <RegExpr String="(^|\s+)lang\=(&quot;javascript&quot;|&apos;javascript&apos;)" context="JavaScriptSourceStartTag" lookAhead="true" />
>+        <DetectChar attribute="HtmlTag" context="UnsupportedLanguageSourceStartTag" char="&gt;" lookAhead="true" />
>+        <IncludeRules context="FindHtmlStartTagAttributes" />
>+      </context>
>+      <context name="SyntaxHighlightStartTag" attribute="Normal" lineEndContext="#stay">
>+        <RegExpr String="(^|\s+)lang\=(&quot;javascript&quot;|&apos;javascript&apos;)" context="JavaScriptSyntaxHighlightStartTag" lookAhead="true" />
>+        <DetectChar attribute="HtmlTag" context="UnsupportedLanguageSyntaxHighlightStartTag" char="&gt;" lookAhead="true" />
>+        <IncludeRules context="FindHtmlStartTagAttributes" />
>+      </context>
>+
>+
>+      <context name="UnsupportedLanguageSourceStartTag" attribute="Normal" lineEndContext="#stay">
>+        <DetectChar attribute="HtmlTag" context="UnsupportedLanguageSourceContent" char="&gt;" />
>+        <IncludeRules context="FindHtmlStartTagAttributes" />
>+      </context>
>+      <context name="UnsupportedLanguageSyntaxHighlightStartTag" attribute="Normal" lineEndContext="#stay">
>+        <DetectChar attribute="HtmlTag" context="UnsupportedLanguageSyntaxHighlightContent" char="&gt;" />
>+        <IncludeRules context="FindHtmlStartTagAttributes" />
>+      </context>
>+
>+      <context name="JavaScriptSourceStartTag" attribute="Normal" lineEndContext="#stay">
>+        <DetectChar attribute="HtmlTag" context="JavaScriptSourceContent" char="&gt;" />
>+        <IncludeRules context="FindHtmlStartTagAttributes" />
>+      </context>
>+      <context name="JavaScriptSyntaxHighlightStartTag" attribute="Normal" lineEndContext="#stay">
>+        <DetectChar attribute="HtmlTag" context="JavaScriptSyntaxHighlightContent" char="&gt;" />
>+        <IncludeRules context="FindHtmlStartTagAttributes" />
>+      </context>
>+
>+
>+      <context name="UnsupportedLanguageSourceContent" attribute="NoWiki" lineEndContext="#stay">
>+        <IncludeRules context="SourceEnd" />
>+      </context>
>+      <context name="UnsupportedLanguageSyntaxHighlightContent" attribute="NoWiki" lineEndContext="#stay">
>+        <IncludeRules context="SyntaxHighlightEnd" />
>+      </context>
>+
>+      <context name="JavaScriptSourceContent" attribute="NoWiki" lineEndContext="#stay">
>+        <IncludeRules context="SourceEnd" />
>+        <IncludeRules context="##JavaScript" />
>+      </context>
>+      <context name="JavaScriptSyntaxHighlightContent" attribute="NoWiki" lineEndContext="#stay">
>+        <StringDetect String="&lt;/syntaxhighlight&gt;" context="#pop#pop#pop" attribute="HtmlTag" />
>+        <IncludeRules context="SyntaxHighlightEnd" />
>+        <IncludeRules context="##JavaScript" />
>+      </context>
>+
>+
>+      <context name="SourceEnd" >
>+        <StringDetect String="&lt;/source&gt;" context="#pop#pop#pop" attribute="HtmlTag" />
>+      </context>
>+      <context name="SyntaxHighlightEnd" >
>+        <StringDetect String="&lt;/syntaxhighlight&gt;" context="#pop#pop#pop" attribute="HtmlTag" />
>+      </context>
>+
>+
>+      <context name="HtmlAttribute" attribute="Normal" lineEndContext="#stay">
>+        <DetectChar attribute="HtmlAttribute" context="HtmlValue" char="=" />
>+        <RegExpr attribute="Error" context="#stay" String="\S" />
>+      </context>
>+      <context name="HtmlValue" attribute="Normal" lineEndContext="#stay">
>+        <DetectChar attribute="HtmlValue" context="ValueWithDoubleQuotes" char="&quot;" />
>+        <DetectChar attribute="HtmlValue" context="ValueWithSingleQuotes" char="&apos;" />
>+        <RegExpr attribute="Error" context="#stay" String="\S" />
>+      </context>
>+      <context name="ValueWithDoubleQuotes" attribute="HtmlValue" lineEndContext="#stay">
>+        <DetectChar attribute="HtmlValue" context="#pop#pop#pop" char="&quot;" />
>+        <IncludeRules context="FindHtmlEntities" />
>+      </context>
>+      <context name="ValueWithSingleQuotes" attribute="HtmlValue" lineEndContext="#stay">
>+        <DetectChar attribute="HtmlValue" context="#pop#pop#pop" char="&apos;" />
>+        <IncludeRules context="FindHtmlEntities" />
>+      </context>
>+
>+
>+
>+      <context attribute="DefinitionListHeader" lineEndContext="#pop" name="DefinitionListHeader" >
>+        <DetectChar char=":" context="#pop" attribute="WikiTag" />
>+      </context>
>+      <context attribute="Bold" lineEndContext="#pop" name="Bold" >
>+        <IncludeRules context="FindTemplate" />
>+        <StringDetect String="'''" context="#pop" attribute="WikiTag" />
>+        <StringDetect String="''" context="BoldItalic" attribute="WikiTag" />
>+      </context>
>+      <context attribute="Italic" lineEndContext="#pop" name="Italic" >
>+        <IncludeRules context="FindTemplate" />
>+        <StringDetect String="'''" context="ItalicBold" attribute="WikiTag" />
>+        <StringDetect String="''" context="#pop" attribute="WikiTag" />
>+      </context>
>+      <context attribute="BoldItalic" lineEndContext="#pop" name="BoldItalic" >
>+        <IncludeRules context="FindTemplate" />
>+        <StringDetect String="''" context="#pop" attribute="WikiTag" />
>+      </context>
>+      <context attribute="BoldItalic" lineEndContext="#pop" name="ItalicBold" >
>+        <IncludeRules context="FindTemplate" />
>+        <StringDetect String="'''" context="#pop" attribute="WikiTag" />
>+      </context>
>+      <context attribute="Underlined" lineEndContext="#stay" name="Underlined" >
>+        <IncludeRules context="FindTemplate" />
>+        <RegExpr String="&lt;/u *&gt;" context="#pop" attribute="HtmlTag" />
>+      </context>
>+
>+      
>+
>+      <context name="FindHtmlEntities" attribute="Normal" lineEndContext="#stay">
>+        <RegExpr attribute="HtmlEntity" context="#stay" String="&htmlEntity;" />
>+        <AnyChar attribute="Error" context="#stay" String="&amp;&lt;" />
>+      </context>
>+
>+      <context name="FindHtmlStartTagAttributes">
>+        <RegExpr attribute="HtmlAttribute" context="HtmlAttribute" String="^&htmlTagName;" />
>+        <RegExpr attribute="HtmlAttribute" context="HtmlAttribute" String="\s+&htmlTagName;" />
>+        <RegExpr attribute="Error" context="#stay" String="\S" />
>+      </context>
>+
>+      <context attribute="Normal" lineEndContext="#stay" name="FindListItem" >
>+        <RegExpr String="[*#;:\s]*[*#:]+" attribute="WikiTag" context="#stay" column="0" />
>+      </context>
>+
>+      <context attribute="Normal" lineEndContext="#stay" name="FindSyntaxHighlightingHtmlElement" >
>+        <RegExpr String="&lt;source(?=\s)" context="SourceStartTag" attribute="HtmlTag" />
>+        <RegExpr String="&lt;syntaxhighlight(?=\s)" context="SyntaxHighlightStartTag" attribute="HtmlTag" />
>+      </context>
>+
>+      <context attribute="Normal" lineEndContext="#stay" name="FindTemplate" >
>+        <Detect2Chars char="{" char1="{" context="Template" attribute="WikiTag" beginRegion="template" />
>+      </context>
>+
>+      <context attribute="Normal" lineEndContext="#stay" name="FindTextDecorations" >
>+        <StringDetect String="'''" attribute="WikiTag" context="Bold" />
>+        <StringDetect String="''" attribute="WikiTag" context="Italic" />
>+        <RegExpr String="&lt;u *&gt;" attribute="HtmlTag" context="Underlined" />
>+      </context>
>+      <context attribute="Normal" lineEndContext="#stay" name="FindTextDecorationsBeingBold" >
>+        <StringDetect String="'''" attribute="WikiTag" context="Bold" />
>+        <StringDetect String="''" attribute="WikiTag" context="BoldItalic" />
>+      </context>
>+
>+      <context attribute="Normal" lineEndContext="#stay" name="FindUrl" >
>+        <RegExpr String="\[&url;" attribute="WikiTag" context="DelimitedURL" lookAhead="true" />
>+        <RegExpr String="&url;" attribute="URL" context="LooseURL" lookAhead="true" />
>+      </context>
>+      <context attribute="Normal" lineEndContext="#stay" name="FindUrlWithinTemplate" >
>+        <RegExpr String="\[&url;" attribute="WikiTag" context="DelimitedURL" lookAhead="true" />
>+        <RegExpr String="&url;" attribute="URL" context="LooseURLWithinTemplate" lookAhead="true" />
>       </context>
>+
>     </contexts>
>     <itemDatas>
>       <itemData name="Normal" defStyleNum="dsNormal" />
>@@ -81,12 +386,21 @@
>       <itemData name="URL" defStyleNum="dsOthers" />
>       <itemData name="Comment" defStyleNum="dsComment" />
>       <itemData name="Section" defStyleNum="dsKeyword" />
>-      <itemData name="HTML-Entity" defStyleNum="dsDecVal" />
>-      <itemData name="HTML-Tag" defStyleNum="dsKeyword" />
>-      <itemData name="Wiki-Tag" defStyleNum="dsDecVal" bold="true" />
>+      <itemData name="DefinitionListHeader" defStyleNum="dsKeyword" />
>+      <itemData name="HtmlEntity" defStyleNum="dsDecVal" />
>+      <itemData name="HtmlTag" defStyleNum="dsKeyword" />
>+      <itemData name="WikiTag" defStyleNum="dsDecVal" bold="true" />
>       <itemData name="Error" defStyleNum="dsError" />
>       <itemData name="NoWiki" defStyleNum="dsNormal" />
>       <itemData name="Unformatted" defStyleNum="dsNormal" />
>+      <itemData name="Parameter" defStyleNum="dsNormal" bold="true" />
>+      <itemData name="TemplateName" defStyleNum="dsOthers" bold="true" />
>+      <itemData name="Bold" defStyleNum="dsNormal" bold="true" />
>+      <itemData name="Italic" defStyleNum="dsNormal" italic="true" />
>+      <itemData name="BoldItalic" defStyleNum="dsNormal" bold="true" italic="true" />
>+      <itemData name="Underlined" defStyleNum="dsNormal" underline="true" />
>+      <itemData name="HtmlAttribute" defStyleNum="dsOthers" spellChecking="false" />
>+      <itemData name="HtmlValue" defStyleNum="dsString" color="#a00" spellChecking="false" />
>     </itemDatas>
>   </highlighting>
>   <general>
>@@ -94,5 +408,6 @@
>       <comment end="//-->" start="&lt;!--" name="multiLine" />
>     </comments>
>     <keywords casesensitive="0" />
>+    <indentation mode="normal" />
>   </general>
> </language>
>diff -urN tdelibs/kate/data/mel.xml tdelibs.new/kate/data/mel.xml
>--- tdelibs/kate/data/mel.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/mel.xml	2013-12-26 13:26:40.449329580 -0600
>@@ -20,7 +20,7 @@
> 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> -->
> 
>-<language name="MEL" section="Scripts" version="1.00" kateversion="2.4" extensions="*.mel" mimetype="" author="Karl Erlandsen (karlerlandsen@yahoo.com)" license="GPL">
>+<language name="MEL" section="Scripts" version="1.01" kateversion="2.5" extensions="*.mel" mimetype="" author="Karl Erlandsen (karlerlandsen@yahoo.com)" license="GPL">
>   <highlighting>
>     <list name="keywords">
>       <item> break </item>
>@@ -1310,7 +1310,7 @@
>     </list>
>     
>     <contexts>
>-      <context attribute="Normal Text" lineEndContext="#pop" name="Normal" >
>+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal" >
>         <DetectSpaces />
>         <Detect2Chars attribute="Block comments" context="Block comments" char="/" char1="*" beginRegion="Block comments" />
>         <Detect2Chars attribute="Line comments" context="Line comments" char="/" char1="/" />
>diff -urN tdelibs/kate/data/mips.xml tdelibs.new/kate/data/mips.xml
>--- tdelibs/kate/data/mips.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/mips.xml	2013-12-26 13:26:40.996327246 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="MIPS Assembler" version="1.03" kateversion="2.4" section="Assembler" extensions="*.s;" mimetype="text/x-mips" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" priority="-1">
>+<language name="MIPS Assembler" version="1.03" kateversion="2.5" section="Assembler" extensions="*.s;" mimetype="text/x-mips" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" priority="-1">
>   <highlighting>
>     <list name="type">
>       <item> .align </item>
>diff -urN tdelibs/kate/data/modelica.xml tdelibs.new/kate/data/modelica.xml
>--- tdelibs/kate/data/modelica.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/modelica.xml	2013-12-26 13:26:41.196326394 -0600
>@@ -16,7 +16,7 @@
> -->
> 
> 
>-<language name="Modelica" version="3.1" kateversion="2.0" casesensitive="1" section="Sources" extensions="*.mo" author="Federico Zenith" >
>+<language name="Modelica" version="3.2" kateversion="2.5" casesensitive="1" section="Sources" extensions="*.mo" author="Federico Zenith" >
> 
> 	<highlighting>
> 		
> <language name="Modelines"
>-          version="0.3"
>-          kateversion="2.4"
>+          version="1.0"
>+          kateversion="2.5"
>           section="Other"
>           extensions=""
>           mimetype=""
>@@ -33,7 +33,8 @@
>   </list>
> 
>   <list name="Booleans">
>-    <item> auto-brackets </item>
>+    
>+    
>     <item> auto-insert-doxygen </item>
>     <item> backspace-indents </item>
>     <item> block-selection </item>
>@@ -41,12 +42,16 @@
>     <item> byte-order-marker </item>
>     <item> folding-markers </item>
>     <item> icon-border </item>
>+    
>+    <item> indent-pasted-text </item>
>     <item> keep-extra-spaces </item>
>     <item> line-numbers </item>
>-    <item> newline-at-eof </item>                           
>+    
>+    <item> newline-at-eof </item>
>     <item> overwrite-mode </item>
>     <item> persistent-selection </item>
>-    <item> remove-trailing-space </item>
>+    
>+    
>     <item> replace-tabs-save </item>
>     <item> replace-tabs </item>
>     <item> replace-trailing-space-save </item>
>@@ -96,6 +101,25 @@
>     <item> word-wrap-marker-color </item>
>   </list>
> 
>+  <list name="RemoveSpaces">
>+    <item> remove-trailing-spaces </item>
>+  </list>
>+
>+  <list name="RemoveSpacesOptions">
>+    <item> 0 </item>
>+    <item> - </item>
>+    <item> none </item>
>+
>+    <item> modified </item>
>+    <item> mod </item>
>+    <item> + </item>
>+    <item> 1 </item>
>+
>+    <item> all </item>
>+    <item> * </item>
>+    <item> 2 </item>
>+  </list>
>+
>   <contexts>
>     <context name="Normal" attribute="Comment" lineEndContext="#pop">
>       <DetectSpaces />
>@@ -108,13 +132,14 @@
>       <keyword String="Booleans" context="Booleans" attribute="Variable" />
>       <keyword String="Integrals" context="Integrals" attribute="Variable" />
>       <keyword String="Strings" context="Strings" attribute="Variable" />
>+      <keyword String="RemoveSpaces" context="RemoveSpaces" attribute="Variable" />
>       <LineContinue context="#pop" />
>     </context>
> 
>     <context name="Booleans" attribute="Comment" lineEndContext="#pop">
>       <DetectSpaces />
>-      <keyword String="True" attribute="Boolean True" context="#stay" />
>-      <keyword String="False" attribute="Boolean False" context="#stay" />
>+      <keyword String="True" attribute="Option ON" context="#stay" />
>+      <keyword String="False" attribute="Option OFF" context="#stay" />
>       <DetectChar char="&end;" context="#pop" attribute="Variable" />
>       <LineContinue context="#pop" />
>     </context>
>@@ -133,16 +158,24 @@
>       <LineContinue context="#pop" />
>     </context>
> 
>+    <context name="RemoveSpaces" attribute="Comment" lineEndContext="#pop">
>+      <DetectSpaces />
>+      <keyword String="RemoveSpacesOptions" attribute="Value" context="#pop" />
>+      <DetectChar char="&end;" context="#pop" attribute="Variable" />
>+      <LineContinue context="#pop" />
>+    </context>
>+
>   </contexts>
> 
>   <itemDatas>
>     <itemData name="Comment" defStyleNum="dsComment" spellChecking="true" />
>     <itemData name="Keyword" defStyleNum="dsKeyword" spellChecking="false" />
>     <itemData name="Variable" defStyleNum="dsFunction" spellChecking="false" />
>-    <itemData name="Boolean True" defStyleNum="dsOthers" spellChecking="false" />
>-    <itemData name="Boolean False" defStyleNum="dsOthers" spellChecking="false" />
>     <itemData name="Number" defStyleNum="dsDecVal" spellChecking="false" />
>     <itemData name="String" defStyleNum="dsString" spellChecking="false" />
>+    <itemData name="Value" defStyleNum="dsOthers" spellChecking="false" />
>+    <itemData name="Option ON" defStyleNum="dsOthers" spellChecking="false" />
>+    <itemData name="Option OFF" defStyleNum="dsOthers" spellChecking="false" />
>   </itemDatas>
> 
> </highlighting>
>diff -urN tdelibs/kate/data/modula-2.xml tdelibs.new/kate/data/modula-2.xml
>--- tdelibs/kate/data/modula-2.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/modula-2.xml	2013-12-26 13:26:41.261326115 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Modula-2" version="1.03" kateversion="2.1" section="Sources" extensions="*.mod;*.def;*.mi;*.md" mimetype="text/x-modula-2">
>+<language name="Modula-2" version="1.03" kateversion="2.5" section="Sources" extensions="*.mod;*.def;*.mi;*.md" mimetype="text/x-modula-2">
>   <highlighting>
>     <list name="directives">
>       <item> ASSEMBLER </item>
>diff -urN tdelibs/kate/data/monobasic.xml tdelibs.new/kate/data/monobasic.xml
>--- tdelibs/kate/data/monobasic.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/monobasic.xml	2013-12-26 13:26:41.025327123 -0600
>@@ -10,7 +10,7 @@
>     License: GNU General Public License
> -->
> 
>-<language name="MonoBasic" section="Sources" version="1.01" kateversion="2.3" extensions="*.vb" mimetype="" author="Davide Bettio (davide.bettio@kdemail.net)" license="GPL">
>+<language name="MonoBasic" section="Sources" version="1.01" kateversion="2.5" extensions="*.vb" mimetype="" author="Davide Bettio (davide.bettio@kdemail.net)" license="GPL">
>   <highlighting>
>      <list name="keywords">
>         <item> Option </item>
>diff -urN tdelibs/kate/data/mup.xml tdelibs.new/kate/data/mup.xml
>--- tdelibs/kate/data/mup.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/mup.xml	2013-12-26 13:26:41.355325715 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Music Publisher" version="1.06" kateversion="2.4" section="Other" extensions="*.mup;*.not" mimetype="text/x-mup;audio/x-mup;application/x-mup;audio/x-notes" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
>+<language name="Music Publisher" version="1.06" kateversion="2.5" section="Other" extensions="*.mup;*.not" mimetype="text/x-mup;audio/x-mup;application/x-mup;audio/x-notes" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
> 
>   <highlighting>
> 
>diff -urN tdelibs/kate/data/nasm.xml tdelibs.new/kate/data/nasm.xml
>--- tdelibs/kate/data/nasm.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/nasm.xml	2013-12-26 13:26:40.678328603 -0600
>@@ -40,7 +40,7 @@
> with this program; if not, write to the Free Software Foundation, Inc.,
> 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> -->
>-<language name="Intel x86 (NASM)" section="Assembler" version="1.40" kateversion="2.3" extensions="*.asm" mimetype="" author="Nicola Gigante (nicola.gigante@gmail.com)" license="GPL">
>+<language name="Intel x86 (NASM)" section="Assembler" version="1.40" kateversion="2.5" extensions="*.asm" mimetype="" author="Nicola Gigante (nicola.gigante@gmail.com)" license="GPL">
>   <highlighting>
>     <list name="registers">
>       
>diff -urN tdelibs/kate/data/nemerle.xml tdelibs.new/kate/data/nemerle.xml
>--- tdelibs/kate/data/nemerle.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/nemerle.xml	2013-12-26 13:26:41.814323754 -0600
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
> 
>-<language name="Nemerle" version="0.32" kateversion="2.4" section="Sources" extensions="*.n" mimetype="text/x-nemerle" casesensitive="1" author="caminoix + Kamil Skalski (Nazgul)" license="">
>+<language name="Nemerle" version="0.32" kateversion="2.5" section="Sources" extensions="*.n" mimetype="text/x-nemerle" casesensitive="1" author="caminoix + Kamil Skalski (Nazgul)" license="">
> 	<highlighting>
> 		<list name="Attributes">
> 			<item>abstract</item>
>diff -urN tdelibs/kate/data/nesc.xml tdelibs.new/kate/data/nesc.xml
>--- tdelibs/kate/data/nesc.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/nesc.xml	2013-12-26 13:26:40.357329972 -0600
>@@ -0,0 +1,192 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd">
>+<language name="nesC" author="Shakthi Kannan" license="GPLv2" version="1.00" kateversion="2.5" section="Sources" extensions="*.nc" mimetype="text/x-ncsrc" priority="5">
>+  <highlighting>
>+    <list name="keywords">
>+      <item> break </item>
>+      <item> case </item>
>+      <item> continue </item>
>+      <item> default </item>
>+      <item> do </item>
>+      <item> else </item>
>+      <item> enum </item>
>+      <item> extern </item>
>+      <item> for </item>
>+      <item> goto </item>
>+      <item> if </item>
>+      <item> inline </item>
>+      <item> return </item>
>+      <item> sizeof </item>
>+      <item> struct </item>
>+      <item> switch </item>
>+      <item> typedef </item>
>+      <item> union </item>
>+      <item> while </item>  <item> interface </item>
>+      <item> module </item>
>+      <item> configuration </item>
>+      <item> implementation </item>
>+      <item> components </item>
>+      <item> as </item>
>+      <item> uses </item>
>+      <item> provides </item>
>+      <item> includes </item>
>+      <item> command </item>
>+      <item> event </item>
>+      <item> async </item>
>+      <item> task </item>
>+      <item> norace </item>
>+      <item> default </item>
>+      <item> __attribute__ </item>
>+      <item> atomic </item>
>+      <item> call </item>
>+      <item> signal </item>
>+      <item> post </item>
>+      
>+    </list>
>+    <list name="types">
>+      <item> auto </item>
>+      <item> char </item>
>+      <item> const </item>
>+      <item> double </item>
>+      <item> float </item>
>+      <item> int </item>
>+      <item> long </item>
>+      <item> register </item>
>+      <item> restrict </item>
>+      <item> short </item>
>+      <item> signed </item>
>+      <item> static </item>
>+      <item> unsigned </item>
>+      <item> void </item>
>+      <item> volatile </item>
>+      <item> _Imaginary </item>
>+      <item> _Complex </item>
>+      <item> _Bool </item>
>+      <item> bool </item>
>+      <item> uint8_t </item>
>+      <item> uint16_t </item>
>+      <item> uint32_t </item>
>+      <item> uint64_t </item>
>+      <item> result_t </item>
>+      <item> SUCCESS </item>
>+      <item> FAIL </item>
>+      <item> TRUE </item>
>+      <item> FALSE </item>
>+      <item> TOSH_INTERRUPT </item>
>+      <item> TOSH_SIGNAL </item>
>+      <item> TOS_MsgPtr </item>
>+      <item> TOS_Msg </item>
>+    </list>
>+    <list name="attention">
>+      <item> FIXME </item>
>+      <item> TODO </item>
>+      <item> ### </item>
>+    </list>
>+    <contexts>
>+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
>+        <keyword attribute="Keyword" context="#stay" String="keywords"/>
>+        <keyword attribute="Data Type" context="#stay" String="types"/>
>+        <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1"/>
>+        <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1"/>
>+        <Float attribute="Float" context="#stay">
>+          <AnyChar String="fF" attribute="Float" context="#stay"/>
>+        </Float>
>+        <HlCOct attribute="Octal" context="#stay"/>
>+        <HlCHex attribute="Hex" context="#stay"/>
>+        <Int attribute="Decimal" context="#stay">
>+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
>+        </Int>
>+        <HlCChar attribute="Char" context="#stay"/>
>+        <DetectChar attribute="String" context="String" char="&quot;"/>
>+	<Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
>+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
>+        <StringDetect attribute="Preprocessor" context="Outscoped" String="#if 0" insensitive="FALSE"/>
>+        <DetectChar attribute="Preprocessor" context="Preprocessor" char="#"/>
>+        <RegExpr attribute="Function" context="#stay" String="\b[_\w][_\w\d]*(?=[\s]*[(])"/>
>+        <RegExpr attribute="Symbol" context="Member" String="[.]{1,1}"/>
>+        <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^;"/>
>+      </context>
>+      <context attribute="String" lineEndContext="#pop" name="String">
>+        <LineContinue attribute="String" context="#stay"/>
>+        <HlCStringChar attribute="String Char" context="#stay"/>
>+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
>+      </context>
>+      <context attribute="Normal Text" lineEndContext="#pop" name="Member">
>+        <RegExpr attribute="Function" context="#pop" String="\b[_\w][_\w\d]*(?=[\s]*)"/>
>+      </context>
>+      
>+            
>+      
>+      <context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
>+	      <IncludeRules context="##Alerts"/>
>+      </context>
>+      <context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
>+	      <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
>+	      <keyword attribute="Decimal" context="#stay" String="attention"/>
>+      </context>
>+      
>+      
>+      
>+      
>+      
>+      
>+      <context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor">
>+        <LineContinue attribute="Preprocessor" context="#stay"/>
>+        <RegExpr attribute="Preprocessor" context="Define" String="define.*((?=\\))"/>
>+        <RegExpr attribute="Preprocessor" context="#stay" String="define.*"/>
>+        <RangeDetect attribute="Prep. Lib" context="#stay" char="&quot;" char1="&quot;"/>
>+        <RangeDetect attribute="Prep. Lib" context="#stay" char="&lt;" char1="&gt;"/>
>+        <Detect2Chars attribute="Comment" context="Commentar/Preprocessor" char="/" char1="*" beginRegion="Comment2"/>
>+      </context>
>+      <context attribute="Preprocessor" lineEndContext="#pop" name="Define">
>+        <LineContinue attribute="Preprocessor" context="#stay"/>
>+      </context>
>+      <context attribute="Comment" lineEndContext="#stay" name="Commentar/Preprocessor">
>+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment2"/>
>+      </context>
>+      <context attribute="Normal Text" lineEndContext="#pop" name="Some Context"/>
>+      <context attribute="Normal Text" lineEndContext="#pop" name="Some Context2"/>
>+      <context attribute="Comment" lineEndContext="#stay" name="Outscoped">
>+        <keyword attribute="Decimal" context="#stay" String="attention"/>
>+        <RegExpr attribute="Comment" context="Outscoped intern" String="^#if"/>
>+        <RegExpr attribute="Preprocessor" context="#pop" String="#endif"/>
>+        <RegExpr attribute="Preprocessor" context="#pop" String="#else"/>
>+      </context>
>+      <context attribute="Comment" lineEndContext="#stay" name="Outscoped intern">
>+        <RegExpr attribute="Comment" context="Outscoped intern" String="#if"/>
>+        <RegExpr attribute="Comment" context="#pop" String="#endif"/>
>+      </context>
>+    </contexts>
>+    <itemDatas>
>+      <itemData name="Normal Text" defStyleNum="dsNormal"/>
>+      <itemData name="Keyword" defStyleNum="dsKeyword"/>
>+      <itemData name="Function" defStyleNum="dsKeyword" color="#000080" selColor="#ffffff" bold="0" italic="0"/>
>+      <itemData name="Data Type" defStyleNum="dsDataType"/>
>+      <itemData name="Decimal" defStyleNum="dsDecVal"/>
>+      <itemData name="Octal" defStyleNum="dsBaseN"/>
>+      <itemData name="Hex" defStyleNum="dsBaseN"/>
>+      <itemData name="Float" defStyleNum="dsFloat"/>
>+      <itemData name="Char" defStyleNum="dsChar"/>
>+      <itemData name="String" defStyleNum="dsString"/>
>+      <itemData name="String Char" defStyleNum="dsChar"/>
>+      <itemData name="Comment" defStyleNum="dsComment"/>
>+      <itemData name="Symbol" defStyleNum="dsNormal"/>
>+      <itemData name="Preprocessor" defStyleNum="dsOthers"/>
>+      <itemData name="Prep. Lib" defStyleNum="dsOthers"/> 
>+    </itemDatas>
>+  </highlighting>
>+  <general>
>+    <comments>
>+      <comment name="singleLine" start="//"/>
>+      <comment name="multiLine" start="/*" end="*/"/>
>+    </comments>
>+    <keywords casesensitive="1"/>
>+  </general>
>+</language>
>\ No newline at end of file
>diff -urN tdelibs/kate/data/noweb.xml tdelibs.new/kate/data/noweb.xml
>--- tdelibs/kate/data/noweb.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/noweb.xml	2013-12-26 13:26:40.551329144 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8" ?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="noweb" version="1.0" kateversion="2.4" section="Sources" extensions="*.w;*.nw" author="Scott Collins (scc@scottcollins.net)">
>+<language name="noweb" version="1.0" kateversion="2.5" section="Sources" extensions="*.w;*.nw" author="Scott Collins (scc@scottcollins.net)">
> 
> <!ENTITY DEC    "[0-9][0-9_]*">                                     
> ]>
>-<language name="Objective Caml" version="1.05" kateversion="2.4" section="Sources" extensions="*.ml;*.mli" mimetype="" priority="10" author="Glyn Webster (glyn@wave.co.nz)" license="LGPL">
>+<language name="Objective Caml" version="1.05" kateversion="2.5" section="Sources" extensions="*.ml;*.mli" mimetype="" priority="10" author="Glyn Webster (glyn@wave.co.nz)" license="LGPL">
> 
>   <highlighting>
>     
>diff -urN tdelibs/kate/data/octave.xml tdelibs.new/kate/data/octave.xml
>--- tdelibs/kate/data/octave.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/octave.xml	2013-12-26 13:26:41.733324100 -0600
>@@ -15,7 +15,7 @@
> -->
> 
> 
>-<language name="Octave" version="1.01" kateversion="2.3" section="Scientific" extensions="*.octave;*.m;*.M" mimetype="text/octave" casesensitive="1" license="GPL" author="Luis Silvestre and Federico Zenith">
>+<language name="Octave" version="1.01" kateversion="2.5" section="Scientific" extensions="*.octave;*.m;*.M" mimetype="text/octave" casesensitive="1" license="GPL" author="Luis Silvestre and Federico Zenith">
> 
>   <highlighting>
> 
>diff -urN tdelibs/kate/data/oors.xml tdelibs.new/kate/data/oors.xml
>--- tdelibs/kate/data/oors.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/oors.xml	2013-12-26 13:26:40.477329460 -0600
>@@ -1,15 +1,18 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="OORS" version="1.0" kateversion="2.4" section="Sources" extensions="*.oors" author="Gernot Gebhard (gebhard@cs.uni-sb.de)" license="LGPL">
>+<language name="OORS" version="1.1" kateversion="2.5" section="Sources" extensions="*.oors" author="Gernot Gebhard (gebhard@cs.uni-sb.de)" license="LGPL">
>   <highlighting>
>     <list name="oors">
>       <item>allow</item>
>       <item>apply</item>
>+      <item>backtrack</item>
>       <item>copy</item>
>       <item>condition</item>
>       <item>deny</item>
>       <item>extends</item>
>       <item>graph</item>
>+      <item>if</item>
>+      <item>else</item>
>       <item>linear</item>
>       <item>profile</item>
>       <item>rule</item>
>diff -urN tdelibs/kate/data/opal.xml tdelibs.new/kate/data/opal.xml
>--- tdelibs/kate/data/opal.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/opal.xml	2013-12-26 13:26:41.201326370 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="OPAL" version="1.1" kateversion="2.1" section="Sources" extensions="*.impl;*.sign" mimetype="" author="Sebastian Pipping (webmaster@hartwork.org)">
>+<language name="OPAL" version="1.1" kateversion="2.5" section="Sources" extensions="*.impl;*.sign" mimetype="" author="Sebastian Pipping (webmaster@hartwork.org)">
> 
> 	<highlighting>
> 
>diff -urN tdelibs/kate/data/opencl.xml tdelibs.new/kate/data/opencl.xml
>--- tdelibs/kate/data/opencl.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/opencl.xml	2013-12-26 13:26:40.528329244 -0600
>@@ -0,0 +1,257 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd">
>+<language name="OpenCL" section="Sources"
>+          version="1.44" kateversion="2.5"
>+          indenter="cstyle"
>+          extensions="*.cl"
>+          mimetype="text/x-clsrc"
>+          priority="5">
>+  <highlighting>
>+    <list name="keywords">
>+      <item> __constant </item>
>+      <item> __global </item>
>+      <item> __local </item>
>+      <item> __private </item>
>+      <item> __kernel </item>
>+      <item> __read_only </item>
>+      <item> __write_only </item>
>+      <item> constant </item>
>+      <item> global </item>
>+      <item> local </item>
>+      <item> private </item>
>+      <item> kernel </item>
>+      <item> read_only </item>
>+      <item> write_only </item>
>+      <item> break </item>
>+      <item> case </item>
>+      <item> continue </item>
>+      <item> default </item>
>+      <item> do </item>
>+      <item> else </item>
>+      <item> enum </item>
>+      <item> for </item>
>+      <item> goto </item>
>+      <item> if </item>
>+      <item> inline </item>
>+      <item> return </item>
>+      <item> sizeof </item>
>+      <item> struct </item>
>+      <item> switch </item>
>+      <item> typedef </item>
>+      <item> union </item>
>+      <item> while </item>
>+    </list>
>+    <list name="types">
>+      <item> bool </item>
>+      <item> uchar </item>
>+      <item> uchar2 </item>
>+      <item> uchar3 </item>
>+      <item> uchar4 </item>
>+      <item> uchar8 </item>
>+      <item> uchar16 </item>
>+      <item> char </item>
>+      <item> char2 </item>
>+      <item> char3 </item>
>+      <item> char4 </item>
>+      <item> char8 </item>
>+      <item> char16 </item>
>+      <item> const </item>
>+      <item> double </item>
>+      <item> double2 </item>
>+      <item> double3 </item>
>+      <item> double4 </item>
>+      <item> double8 </item>
>+      <item> double16 </item>
>+      <item> event_t </item>
>+      <item> float </item>
>+      <item> float2 </item>
>+      <item> float3 </item>
>+      <item> float4 </item>
>+      <item> float8 </item>
>+      <item> float16 </item>
>+      <item> half </item>
>+      <item> half2 </item>
>+      <item> half3 </item>
>+      <item> half4 </item>
>+      <item> half8 </item>
>+      <item> half16 </item>
>+      <item> image1d_t </item>
>+      <item> image2d_t </item>
>+      <item> image3d_t </item>
>+      <item> uint </item>
>+      <item> uint2 </item>
>+      <item> uint3 </item>
>+      <item> uint4 </item>
>+      <item> uint8 </item>
>+      <item> uint16 </item>
>+	  <item> int </item>
>+      <item> int2 </item>
>+      <item> int3 </item>
>+      <item> int4 </item>
>+      <item> int8 </item>
>+      <item> int16 </item>
>+      <item> ulong </item>
>+      <item> ulong2 </item>
>+      <item> ulong3 </item>
>+      <item> ulong4 </item>
>+      <item> ulong8 </item>
>+      <item> ulong16 </item>
>+      <item> long </item>
>+      <item> long2 </item>
>+      <item> long3 </item>
>+      <item> long4 </item>
>+      <item> long8 </item>
>+      <item> long16 </item>
>+      <item> restrict </item>
>+      <item> sampler_t </item>
>+      <item> ushort </item>
>+      <item> ushort2 </item>
>+      <item> ushort3 </item>
>+      <item> ushort4 </item>
>+      <item> ushort8 </item>
>+      <item> ushort16 </item>
>+      <item> short </item>
>+      <item> short2 </item>
>+      <item> short3 </item>
>+      <item> short4 </item>
>+      <item> short8 </item>
>+      <item> short16 </item>
>+      <item> signed </item>
>+      <item> static </item>
>+      <item> unsigned </item>
>+      <item> void </item>
>+      <item> volatile </item>
>+    </list>
>+    <contexts>
>+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
>+        <DetectSpaces />
>+	<RegExpr attribute="Preprocessor" context="Outscoped" String="#\s*if\s+0\s*$" beginRegion="PP" firstNonSpace="true" />
>+        <DetectChar context="AfterHash" char="#" firstNonSpace="true" lookAhead="true" />
>+        <StringDetect attribute="Region Marker" context="Region Marker" String="//BEGIN" beginRegion="Region1" firstNonSpace="true" />
>+        <StringDetect attribute="Region Marker" context="Region Marker" String="//END" endRegion="Region1" firstNonSpace="true" />
>+        <keyword attribute="Keyword" context="#stay" String="keywords"/>
>+        <keyword attribute="Data Type" context="#stay" String="types"/>
>+        <DetectIdentifier />
>+        <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
>+        <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
>+        <Float attribute="Float" context="#stay">
>+          <AnyChar String="fF" attribute="Float" context="#stay"/>
>+        </Float>
>+        <HlCOct attribute="Octal" context="#stay"/>
>+        <HlCHex attribute="Hex" context="#stay"/>
>+        <Int attribute="Decimal" context="#stay" >
>+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
>+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
>+        </Int>
>+        <HlCChar attribute="Char" context="#stay"/>
>+        <DetectChar attribute="String" context="String" char="&quot;"/>
>+        <IncludeRules context="##Doxygen" />
>+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
>+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
>+        <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
>+      </context>
>+
>+      <context attribute="String" lineEndContext="#pop" name="String">
>+        <LineContinue attribute="String" context="#stay"/>
>+        <HlCStringChar attribute="String Char" context="#stay"/>
>+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
>+      </context>
>+
>+      <context attribute="Region Marker" lineEndContext="#pop" name="Region Marker">
>+      </context>
>+
>+      <context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
>+        <LineContinue attribute="Comment" context="#stay"/>
>+        <IncludeRules context="##Alerts" />
>+      </context>
>+
>+      <context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
>+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
>+        <IncludeRules context="##Alerts" />
>+      </context>
>+
>+      <context attribute="Error" lineEndContext="#pop" name="AfterHash">
>+        
>+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*if(?:def|ndef)?(?=\s+\S)" insensitive="true" beginRegion="PP" firstNonSpace="true" />
>+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*endif" insensitive="true" endRegion="PP" firstNonSpace="true" />
>+        <RegExpr attribute="Preprocessor" context="Define" String="#\s*define.*((?=\\))" insensitive="true" firstNonSpace="true" />
>+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*(?:el(?:se|if)|include(?:_next)?|define|undef|line|error|warning|pragma)" insensitive="true" firstNonSpace="true" />
>+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s+[0-9]+" insensitive="true" firstNonSpace="true" />
>+      </context>
>+
>+      <context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor">
>+        <LineContinue attribute="Preprocessor" context="#stay"/>
>+        <RangeDetect attribute="Prep. Lib" context="#stay" char="&quot;" char1="&quot;"/>
>+        <RangeDetect attribute="Prep. Lib" context="#stay" char="&lt;" char1="&gt;"/>
>+        <IncludeRules context="##Doxygen" />
>+        <Detect2Chars attribute="Comment" context="Commentar/Preprocessor" char="/" char1="*" beginRegion="Comment2" />
>+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/" />
>+      </context>
>+
>+      <context attribute="Preprocessor" lineEndContext="#pop" name="Define">
>+        <LineContinue attribute="Preprocessor" context="#stay"/>
>+      </context>
>+
>+      <context attribute="Comment" lineEndContext="#stay" name="Commentar/Preprocessor">
>+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment2" />
>+      </context>
>+
>+      <context attribute="Comment" lineEndContext="#stay" name="Outscoped" >
>+        <DetectSpaces />
>+        <IncludeRules context="##Alerts" />
>+        <DetectIdentifier />
>+        <DetectChar attribute="String" context="String" char="&quot;"/>
>+        <IncludeRules context="##Doxygen" />
>+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
>+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
>+        <RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="PP" firstNonSpace="true" />
>+        <RegExpr attribute="Preprocessor" context="#pop" String="#\s*el(?:se|if)" firstNonSpace="true" />
>+        <RegExpr attribute="Preprocessor" context="#pop" String="#\s*endif" endRegion="PP" firstNonSpace="true" />
>+      </context>
>+
>+      <context attribute="Comment" lineEndContext="#stay" name="Outscoped intern">
>+        <DetectSpaces />
>+        <IncludeRules context="##Alerts" />
>+        <DetectIdentifier />
>+        <DetectChar attribute="String" context="String" char="&quot;"/>
>+        <IncludeRules context="##Doxygen" />
>+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
>+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
>+        <RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="PP" firstNonSpace="true" />
>+        <RegExpr attribute="Comment" context="#pop" String="#\s*endif" endRegion="PP" firstNonSpace="true" />
>+      </context>
>+    </contexts>
>+    <itemDatas>
>+      <itemData name="Normal Text"  defStyleNum="dsNormal" spellChecking="false"/>
>+      <itemData name="Keyword"      defStyleNum="dsKeyword" spellChecking="false"/>
>+      <itemData name="Data Type"    defStyleNum="dsDataType" spellChecking="false"/>
>+      <itemData name="Decimal"      defStyleNum="dsDecVal" spellChecking="false"/>
>+      <itemData name="Octal"        defStyleNum="dsBaseN" spellChecking="false"/>
>+      <itemData name="Hex"          defStyleNum="dsBaseN" spellChecking="false"/>
>+      <itemData name="Float"        defStyleNum="dsFloat" spellChecking="false"/>
>+      <itemData name="Char"         defStyleNum="dsChar" spellChecking="false"/>
>+      <itemData name="String"       defStyleNum="dsString"/>
>+      <itemData name="String Char"  defStyleNum="dsChar"/>
>+      <itemData name="Comment"      defStyleNum="dsComment"/>
>+      <itemData name="Symbol"       defStyleNum="dsNormal" spellChecking="false"/>
>+      <itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/>
>+      <itemData name="Prep. Lib"    defStyleNum="dsOthers" spellChecking="false"/> 
>+      <itemData name="Alert"        defStyleNum="dsAlert" spellChecking="false"/>
>+      <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
>+      <itemData name="Error"        defStyleNum="dsError" spellChecking="false"/>
>+    </itemDatas>
>+  </highlighting>
>+  <general>
>+    <comments>
>+      <comment name="singleLine" start="//" />
>+      <comment name="multiLine" start="/*" end="*/" />
>+    </comments>
>+    <keywords casesensitive="1" additionalDeliminator="'&quot;" />
>+  </general>
>+</language>
>diff -urN tdelibs/kate/data/pango.xml tdelibs.new/kate/data/pango.xml
>--- tdelibs/kate/data/pango.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/pango.xml	2013-12-26 13:26:40.955327422 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Pango" version="0.1" kateversion="2.4" section="Markup" extensions="" mimetype=""  author="Jonathan Schmidt-DomninÃ© &lt;devel@the-user.org&gt;" license="LGPL" priority="10">
>+<language name="Pango" version="0.1" kateversion="2.5" section="Markup" extensions="" mimetype=""  author="Jonathan Schmidt-DomninÃ© &lt;devel@the-user.org&gt;" license="LGPL" priority="10">
> 
> <highlighting>
>     
>diff -urN tdelibs/kate/data/pascal.xml tdelibs.new/kate/data/pascal.xml
>--- tdelibs/kate/data/pascal.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/pascal.xml	2013-12-26 13:26:40.984327297 -0600
>@@ -1,6 +1,15 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Pascal" version="1.22" kateversion="2.5.9" section="Sources" extensions="*.pp;*.pas;*.p" mimetype="text/x-pascal" author="Unnamed people and Liu Sizhuang(oldherl@gmail.com)">
>+<language name="Pascal"
>+          section="Sources" 
>+          version="1.23"
>+          kateversion="2.5" 
>+          extensions="*.p;*.pas;*.pp"
>+          mimetype="text/x-pascal" 
>+          priority="8"
>+	  indenter="pascal"
>+          author="Unnamed people and Liu Sizhuang(oldherl@gmail.com)"
>+          >
>   <highlighting>
>     <list name="keywords">
>       <item> and </item>
>diff -urN tdelibs/kate/data/perl.xml tdelibs.new/kate/data/perl.xml
>--- tdelibs/kate/data/perl.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/perl.xml	2013-12-26 13:26:41.982323038 -0600
>@@ -39,7 +39,7 @@
> 
>    Enhance tr/// and y/// support.
> -->
>-<language name="Perl" version="1.26" kateversion="2.4" section="Scripts" extensions="*.pl;*.pm" mimetype="application/x-perl;text/x-perl" author="Anders Lund (anders@alweb.dk)" license="LGPL">
>+<language name="Perl" version="1.29" kateversion="2.5" 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>
>@@ -350,9 +350,12 @@
>         <DetectSpaces />
>         <DetectChar attribute="Comment" context="comment" char="#" />
> 
>-        <HlCOct attribute="Octal" context="slash_safe_escape" />
>-        <HlCHex attribute="Hex" context="slash_safe_escape" />
>-        <Float attribute="Float" context="slash_safe_escape" />
>+        
>+        <RegExpr attribute="Hex" String="\b\-?0[xX]([0-9a-fA-F]|_[0-9a-fA-F])+" context="slash_safe_escape"/>
>+        <RegExpr attribute="Bin" String="\b\-?0[bB]([01]|_[01])+" context="slash_safe_escape"/>
>+        <RegExpr attribute="Octal" String="\b\-?0[1-7]([0-7]|_[0-7])*" context="slash_safe_escape"/>
>+        <RegExpr attribute="Float" String="\b\-?[0-9]([0-9]|_[0-9])*\.[0-9]([0-9]|_[0-9])*([eE]\-?[1-9]([0-9]|_[0-9])*(\.[0-9]*)?)?" context="slash_safe_escape"/>
>+        <RegExpr attribute="Decimal" String="\b\-?[1-9]([0-9]|_[0-9])*\b" context="slash_safe_escape"/>
>         <Int attribute="Decimal" context="slash_safe_escape" />
> 
>         <RegExpr attribute="Normal Text" context="#stay" String="\$[&quot;'])[^\1]" />
>@@ -382,7 +385,7 @@
>         <RegExpr attribute="Normal Text" context="#stay" String="[\w_]+\s*/" />
>         <RegExpr attribute="Normal Text" context="#stay" String="[&lt;&gt;&quot;':]/" />
>         <DetectChar attribute="Operator" context="pattern_slash" char="/" beginRegion="Pattern" />
>-        <RegExpr attribute="Operator" context="#stay" String="-[rwxoRWXOeszfdlpSbctugkTBMAC]" />
>+        <RegExpr attribute="Operator" context="#stay" String="-[rwxoRWXOeszfdlpSbctugkTBMAC]\b" />
> 
>         <DetectChar attribute="Normal Text" context="#stay" char="{" beginRegion="Block" />
>         <DetectChar attribute="Normal Text" context="#stay" char="}" endRegion="Block" />
>@@ -573,9 +576,9 @@
>       </context>
> 
>       <context name="tr" attribute="Pattern" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop" >
>-        <RegExpr attribute="Pattern" context="#pop" String="([^)]*$\s*$?:[^)]*$" />
>-        <RegExpr attribute="Pattern" context="#pop" String="{[^}]*\}\s*\{[^}]*\}" />
>-        <RegExpr attribute="Pattern" context="#pop" String="\[[^}]*\]\s*\[[^\]]*\]" />
>+        <RegExpr attribute="Pattern" context="#pop" String="$[^)]*$\s*$?:[^)]*$" />
>+        <RegExpr attribute="Pattern" context="#pop" String="\{[^}]*\}\s*\{[^}]*\}" />
>+        <RegExpr attribute="Pattern" context="#pop" String="\[[^]]*\]\s*\[[^\]]*\]" />
>         <RegExpr attribute="Pattern" context="#pop" String="([^a-zA-Z0-9_\s[\]{}()]).*\1.*\1" minimal="true"/>
>       </context>
> 
>@@ -815,6 +818,7 @@
>       <itemData name="Decimal"                   defStyleNum="dsDecVal" />
>       <itemData name="Octal"                     defStyleNum="dsBaseN" />
>       <itemData name="Hex"                       defStyleNum="dsBaseN" />
>+      <itemData name="Bin"                       defStyleNum="dsBaseN" />
>       <itemData name="Float"                     defStyleNum="dsFloat" />
>       <itemData name="String"                    defStyleNum="dsString" color="#FF6C6C" selColor="#FF6C6C" bold="0" italic="0" />
>       <itemData name="String (interpolated)"     defStyleNum="dsString" />
>diff -urN tdelibs/kate/data/pgn.xml tdelibs.new/kate/data/pgn.xml
>--- tdelibs/kate/data/pgn.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/pgn.xml	2013-12-26 13:26:41.098326811 -0600
>@@ -12,7 +12,7 @@
>     - Know bugs:
>     * None.
> -->
>-<language name="PGN" version="2.01" kateversion="2.4" section="Other" extensions="*.pgn;*.PGN" priority="5" mimetype="" casesensitive="1" author="Ruben Carlo Benante (dr.beco@gmail.com)" license="GNU/GPL">
>+<language name="PGN" version="2.01" kateversion="2.5" section="Other" extensions="*.pgn;*.PGN" priority="5" mimetype="" casesensitive="1" author="Ruben Carlo Benante (dr.beco@gmail.com)" license="GNU/GPL">
> <highlighting>
>   <list name="keywords_list">
>     <item> Event </item>
>diff -urN tdelibs/kate/data/php.xml tdelibs.new/kate/data/php.xml
>--- tdelibs/kate/data/php.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/php.xml	2013-12-26 13:26:41.788323866 -0600
>@@ -57,8 +57,11 @@
> - Added alternative syntax control structures, and named logical operators ("and", "or", and "xor") (by Nicola Gigante).
> 
> -->
>-<!DOCTYPE language SYSTEM "language.dtd">
>-<language name="PHP/PHP" indenter="cstyle" version="1.42" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
>+<!DOCTYPE language SYSTEM "language.dtd" [
>+  <!ENTITY types "int|integer|bool|boolean|float|double|real|string|array|object">
>+]>
>+
>+<language name="PHP/PHP" indenter="cstyle" version="1.44" kateversion="2.5" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
>   <highlighting>
>     <list name="control structures">
>       <item>as</item>
>@@ -88,6 +91,7 @@
>     </list>
>     <list name="keywords">
>       <item> abstract </item>
>+      <item> callable </item>
>       <item> catch </item>
>       <item> class </item>
>       <item> clone </item>
>@@ -96,8 +100,10 @@
>       <item> extends </item>
>       <item> final </item>
>       <item> function </item>
>+      <item> global </item>
>       <item> implements </item>
>       <item> instanceof </item>
>+      <item> insteadof </item>
>       <item> interface </item>
>       <item> new </item>
>       <item> self </item>
>@@ -108,11 +114,16 @@
>       <item> public </item>
>       <item> throw </item>
>       <item> try </item>
>+      <item> trait </item>
>       <item> and </item>
>       <item> or </item>
>       <item> xor </item>
>       <item> var </item>
>+      <item> namespace </item>
>+      <item> use </item>
>+    </list>
>       
>+    <list name="constants">
>       <item> __LINE__ </item>
>       <item> __FILE__ </item>
>       <item> __DIR__ </item>
>@@ -120,6 +131,8 @@
>       <item> __CLASS__ </item>
>       <item> __METHOD__ </item>
>       <item> __NAMESPACE__ </item>
>+      <item> __TRAIT__ </item>
>+      <item> __COMPILER_HALT_OFFSET__ </item>
> 
>       <item> ABDAY_1 </item>
>       <item> ABDAY_2 </item>
>@@ -278,6 +291,7 @@
>       <item> CURLINFO_CONTENT_TYPE </item>
>       <item> CURLINFO_EFFECTIVE_URL </item>
>       <item> CURLINFO_FILETIME </item>
>+      <item> CURLINFO_HEADER_OUT </item>
>       <item> CURLINFO_HEADER_SIZE </item>
>       <item> CURLINFO_HTTP_CODE </item>
>       <item> CURLINFO_NAMELOOKUP_TIME </item>
>@@ -410,6 +424,17 @@
>       <item> C_EXPLICIT_ABSTRACT </item>
>       <item> C_FINAL </item>
>       <item> C_IMPLICIT_ABSTRACT </item>
>+      <item> DATE_ATOM </item>
>+      <item> DATE_COOKIE </item>
>+      <item> DATE_ISO8601 </item>
>+      <item> DATE_RFC1036 </item>
>+      <item> DATE_RFC1123 </item>
>+      <item> DATE_RFC2822 </item>
>+      <item> DATE_RFC3339 </item>
>+      <item> DATE_RFC822 </item>
>+      <item> DATE_RFC850 </item>
>+      <item> DATE_RSS </item>
>+      <item> DATE_W3C </item>
>       <item> DAY_1 </item>
>       <item> DAY_2 </item>
>       <item> DAY_3 </item>
>@@ -499,10 +524,13 @@
>       <item> E_COMPILE_WARNING </item>
>       <item> E_CORE_ERROR </item>
>       <item> E_CORE_WARNING </item>
>+      <item> E_DEPRECATED </item>
>       <item> E_ERROR </item>
>       <item> E_NOTICE </item>
>       <item> E_PARSE </item>
>+      <item> E_RECOVERABLE_ERROR </item>
>       <item> E_STRICT </item>
>+      <item> E_USER_DEPRECATED </item>
>       <item> E_USER_ERROR </item>
>       <item> E_USER_NOTICE </item>
>       <item> E_USER_WARNING </item>
>@@ -565,6 +593,7 @@
>       <item> GMP_ROUND_MINUSINF </item>
>       <item> GMP_ROUND_PLUSINF </item>
>       <item> GMP_ROUND_ZERO </item>
>+      <item> HASH_HMAC </item>
>       <item> HTML_ENTITIES </item>
>       <item> HTML_SPECIALCHARS </item>
>       <item> ICONV_IMPL </item>
>@@ -668,6 +697,26 @@
>       <item> LDAP_OPT_SERVER_CONTROLS </item>
>       <item> LDAP_OPT_SIZELIMIT </item>
>       <item> LDAP_OPT_TIMELIMIT </item>
>+      <item> LIBXML_COMPACT </item>
>+      <item> LIBXML_DOTTED_VERSION </item>
>+      <item> LIBXML_DTDATTR </item>
>+      <item> LIBXML_DTDLOAD </item>
>+      <item> LIBXML_DTDVALID </item>
>+      <item> LIBXML_ERR_ERROR </item>
>+      <item> LIBXML_ERR_FATAL </item>
>+      <item> LIBXML_ERR_NONE </item>
>+      <item> LIBXML_ERR_WARNING </item>
>+      <item> LIBXML_NOBLANKS </item>
>+      <item> LIBXML_NOCDATA </item>
>+      <item> LIBXML_NOEMPTYTAG </item>
>+      <item> LIBXML_NOENT </item>
>+      <item> LIBXML_NOERROR </item>
>+      <item> LIBXML_NONET </item>
>+      <item> LIBXML_NOWARNING </item>
>+      <item> LIBXML_NOXMLDECL </item>
>+      <item> LIBXML_NSCLEAN </item>
>+      <item> LIBXML_VERSION </item>
>+      <item> LIBXML_XINCLUDE </item>
>       <item> LOCK_EX </item>
>       <item> LOCK_NB </item>
>       <item> LOCK_SH </item>
>@@ -825,6 +874,7 @@
>       <item> MYSQLI_REPORT_ERROR </item>
>       <item> MYSQLI_REPORT_INDEX </item>
>       <item> MYSQLI_REPORT_OFF </item>
>+      <item> MYSQLI_REPORT_STRICT </item>
>       <item> MYSQLI_RPL_ADMIN </item>
>       <item> MYSQLI_RPL_MASTER </item>
>       <item> MYSQLI_RPL_SLAVE </item>
>@@ -1037,6 +1087,39 @@
>       <item> NIL </item>
>       <item> NOEXPR </item>
>       <item> NULL </item>
>+      <item> OCI_ASSOC </item>
>+      <item> OCI_BOTH </item>
>+      <item> OCI_B_BFILE </item>
>+      <item> OCI_B_BIN </item>
>+      <item> OCI_B_BLOB </item>
>+      <item> OCI_B_CFILEE </item>
>+      <item> OCI_B_CLOB </item>
>+      <item> OCI_B_CURSOR </item>
>+      <item> OCI_B_INT </item>
>+      <item> OCI_B_NTY </item>
>+      <item> OCI_B_NUM </item>
>+      <item> OCI_B_ROWID </item>
>+      <item> OCI_COMMIT_ON_SUCCESS </item>
>+      <item> OCI_CRED_EXT </item>
>+      <item> OCI_DEFAULT </item>
>+      <item> OCI_DESCRIBE_ONLY </item>
>+      <item> OCI_DTYPE_FILE </item>
>+      <item> OCI_DTYPE_LOB </item>
>+      <item> OCI_DTYPE_ROWID </item>
>+      <item> OCI_FETCHSTATEMENT_BY_COLUMN </item>
>+      <item> OCI_FETCHSTATEMENT_BY_ROW </item>
>+      <item> OCI_LOB_BUFFER_FREE </item>
>+      <item> OCI_NO_AUTO_COMMIT </item>
>+      <item> OCI_NUM </item>
>+      <item> OCI_RETURN_LOBS </item>
>+      <item> OCI_RETURN_NULLS </item>
>+      <item> OCI_SEEK_CUR </item>
>+      <item> OCI_SEEK_END </item>
>+      <item> OCI_SEEK_SET </item>
>+      <item> OCI_SYSDBA </item>
>+      <item> OCI_SYSOPER </item>
>+      <item> OCI_TEMP_BLOB </item>
>+      <item> OCI_TEMP_CLOB </item>
>       <item> ODBC_BINMODE_CONVERT </item>
>       <item> ODBC_BINMODE_PASSTHRU </item>
>       <item> ODBC_BINMODE_RETURN </item>
>@@ -1081,6 +1164,7 @@
>       <item> PATHINFO_BASENAME </item>
>       <item> PATHINFO_DIRNAME </item>
>       <item> PATHINFO_EXTENSION </item>
>+      <item> PATHINFO_FILENAME </item>
>       <item> PATH_SEPARATOR </item>
>       <item> PEAR_EXTENSION_DIR </item>
>       <item> PEAR_INSTALL_DIR </item>
>@@ -1128,6 +1212,14 @@
>       <item> PHP_SAPI </item>
>       <item> PHP_SHLIB_SUFFIX </item>
>       <item> PHP_SYSCONFDIR </item>
>+      <item> PHP_URL_FRAGMENT </item>
>+      <item> PHP_URL_HOST </item>
>+      <item> PHP_URL_PASS </item>
>+      <item> PHP_URL_PATH </item>
>+      <item> PHP_URL_PORT </item>
>+      <item> PHP_URL_QUERY </item>
>+      <item> PHP_URL_SCHEME </item>
>+      <item> PHP_URL_USER </item>
>       <item> PHP_VERSION </item>
>       <item> PKCS7_BINARY </item>
>       <item> PKCS7_DETACHED </item>
>@@ -1385,6 +1477,17 @@
>       <item> SO_SNDLOWAT </item>
>       <item> SO_SNDTIMEO </item>
>       <item> SO_TYPE </item>
>+      <item> SQLITE3_ASSOC </item>
>+      <item> SQLITE3_BLOB </item>
>+      <item> SQLITE3_BOTH </item>
>+      <item> SQLITE3_FLOAT </item>
>+      <item> SQLITE3_INTEGER </item>
>+      <item> SQLITE3_NULL </item>
>+      <item> SQLITE3_NUM </item>
>+      <item> SQLITE3_OPEN_CREATE </item>
>+      <item> SQLITE3_OPEN_READONLY </item>
>+      <item> SQLITE3_OPEN_READWRITE </item>
>+      <item> SQLITE3_TEXT </item>
>       <item> SQLITE_ABORT </item>
>       <item> SQLITE_ASSOC </item>
>       <item> SQLITE_AUTH </item>
>@@ -1415,6 +1518,29 @@
>       <item> SQLITE_ROW </item>
>       <item> SQLITE_SCHEMA </item>
>       <item> SQLITE_TOOBIG </item>
>+      <item> SQLT_AFC </item>
>+      <item> SQLT_AVC </item>
>+      <item> SQLT_BDOUBLE </item>
>+      <item> SQLT_BFILEE </item>
>+      <item> SQLT_BFLOAT </item>
>+      <item> SQLT_BIN </item>
>+      <item> SQLT_BLOB </item>
>+      <item> SQLT_CFILEE </item>
>+      <item> SQLT_CHR </item>
>+      <item> SQLT_CLOB </item>
>+      <item> SQLT_FLT </item>
>+      <item> SQLT_INT </item>
>+      <item> SQLT_LBI </item>
>+      <item> SQLT_LNG </item>
>+      <item> SQLT_LVC </item>
>+      <item> SQLT_NTY </item>
>+      <item> SQLT_NUM </item>
>+      <item> SQLT_ODT </item>
>+      <item> SQLT_RDD </item>
>+      <item> SQLT_RSET </item>
>+      <item> SQLT_STR </item>
>+      <item> SQLT_UIN </item>
>+      <item> SQLT_VCS </item>
>       <item> SQL_BIGINT </item>
>       <item> SQL_BINARY </item>
>       <item> SQL_BIT </item>
>@@ -1451,6 +1577,9 @@
>       <item> SQL_TINYINT </item>
>       <item> SQL_VARBINARY </item>
>       <item> SQL_VARCHAR </item>
>+      <item> STDERR </item>
>+      <item> STDIN </item>
>+      <item> STDOUT </item>
>       <item> STREAM_CLIENT_ASYNC_CONNECT </item>
>       <item> STREAM_CLIENT_CONNECT </item>
>       <item> STREAM_CLIENT_PERSISTENT </item>
>@@ -1635,6 +1764,7 @@
>       <item> T_WHITESPACE </item>
>       <item> T_XOR_EQUAL </item>
>       <item> UNKNOWN_TYPE </item>
>+      <item> UPLOAD_ERR_CANT_WRITE </item>
>       <item> UPLOAD_ERR_FORM_SIZE </item>
>       <item> UPLOAD_ERR_INI_SIZE </item>
>       <item> UPLOAD_ERR_NO_FILE </item>
>@@ -1773,6 +1903,9 @@
>       <item> YPERR_YPERR </item>
>       <item> YPERR_YPSERV </item>
>       <item> ZEND_THREAD_SAFE </item>
>+      <item> false </item>
>+      <item> null </item>
>+      <item> true </item>
>     </list>
>     <list name="special_methods">
>       <item> __autoload </item>
>@@ -1781,6 +1914,7 @@
>       <item> __construct </item>
>       <item> __destruct </item>
>       <item> __get </item>
>+      <item> __halt_compiler </item>
>       <item> __isset </item>
>       <item> __set </item>
>       <item> __set_state </item>
>@@ -1790,6 +1924,7 @@
>       <item> __wakeup </item>
>     </list>
>     <list name="functions">
>+      <item> _ </item>
>       <item> abs </item>
>       <item> acos </item>
>       <item> acosh </item>
>@@ -1814,6 +1949,7 @@
>       <item> array_diff_uassoc </item>
>       <item> array_diff_ukey </item>
>       <item> array_fill </item>
>+      <item> array_fill_keys </item>
>       <item> array_filter </item>
>       <item> array_flip </item>
>       <item> array_intersect </item>
>@@ -1833,6 +1969,8 @@
>       <item> array_push </item>
>       <item> array_rand </item>
>       <item> array_reduce </item>
>+      <item> array_replace </item>
>+      <item> array_replace_recursive </item>
>       <item> array_reverse </item>
>       <item> array_search </item>
>       <item> array_shift </item>
>@@ -1898,8 +2036,6 @@
>       <item> cal_to_jd </item>
>       <item> call_user_func </item>
>       <item> call_user_func_array </item>
>-      <item> call_user_method </item>
>-      <item> call_user_method_array </item>
>       <item> ccvs_add </item>
>       <item> ccvs_auth </item>
>       <item> ccvs_command </item>
>@@ -2064,6 +2200,7 @@
>       <item> curl_multi_remove_handle </item>
>       <item> curl_multi_select </item>
>       <item> curl_setopt </item>
>+      <item> curl_setopt_array </item>
>       <item> curl_version </item>
>       <item> current </item>
>       <item> cybercash_base64_decode </item>
>@@ -2080,8 +2217,31 @@
>       <item> cyrus_query </item>
>       <item> cyrus_unbind </item>
>       <item> date </item>
>+      <item> date_add </item>
>+      <item> date_create </item>
>+      <item> date_create_from_format </item>
>+      <item> date_date_set </item>
>+      <item> date_default_timezone_get </item>
>+      <item> date_default_timezone_set </item>
>+      <item> date_diff </item>
>+      <item> date_format </item>
>+      <item> date_get_last_errors </item>
>+      <item> date_interval_create_from_date_string </item>
>+      <item> date_interval_format </item>
>+      <item> date_isodate_set </item>
>+      <item> date_modify </item>
>+      <item> date_offset_get </item>
>+      <item> date_parse </item>
>+      <item> date_parse_from_format </item>
>+      <item> date_sub </item>
>+      <item> date_sun_info </item>
>       <item> date_sunrise </item>
>       <item> date_sunset </item>
>+      <item> date_time_ set </item>
>+      <item> date_timestamp_get </item>
>+      <item> date_timestamp_set </item>
>+      <item> date_timezone_get </item>
>+      <item> date_timezone_set </item>
>       <item> dba_close </item>
>       <item> dba_delete </item>
>       <item> dba_exists </item>
>@@ -2179,8 +2339,6 @@
>       <item> debug_backtrace </item>
>       <item> debug_print_backtrace </item>
>       <item> debug_zval_dump </item>
>-      <item> debugger_off </item>
>-      <item> debugger_on </item>
>       <item> decbin </item>
>       <item> dechex </item>
>       <item> decoct </item>
>@@ -2188,7 +2346,6 @@
>       <item> define_syslog_variables </item>
>       <item> defined </item>
>       <item> deg2rad </item>
>-      <item> delete </item>
>       <item> dgettext </item>
>       <item> die </item>
>       <item> dio_close </item>
>@@ -2224,7 +2381,6 @@
>       <item> domxml_root </item>
>       <item> domxml_set_attribute </item>
>       <item> domxml_version </item>
>-      <item> dotnet_load </item>
>       <item> doubleval </item>
>       <item> each </item>
>       <item> easter_date </item>
>@@ -2233,10 +2389,7 @@
>       <item> echo </item>
>       <item> empty </item>
>       <item> end </item>
>-      <item> ereg </item>
>-      <item> ereg_replace </item>
>-      <item> eregi </item>
>-      <item> eregi_replace </item>
>+      <item> error_get_last </item>
>       <item> error_log </item>
>       <item> error_reporting </item>
>       <item> escapeshellarg </item>
>@@ -2343,7 +2496,6 @@
>       <item> fgetcsv </item>
>       <item> fgets </item>
>       <item> fgetss </item>
>-      <item> fgetwrapperdata </item>
>       <item> file </item>
>       <item> file_exists </item>
>       <item> file_get_contents </item>
>@@ -2364,6 +2516,13 @@
>       <item> filepro_rowcount </item>
>       <item> filesize </item>
>       <item> filetype </item>
>+      <item> filter_has_var </item>
>+      <item> filter_id </item>
>+      <item> filter_input </item>
>+      <item> filter_input_array </item>
>+      <item> filter_list </item>
>+      <item> filter_var </item>
>+      <item> filter_var_array </item>
>       <item> floatval </item>
>       <item> flock </item>
>       <item> floor </item>
>@@ -2371,8 +2530,11 @@
>       <item> fmod </item>
>       <item> fnmatch </item>
>       <item> fopen </item>
>+      <item> forward_static_call </item>
>+      <item> forward_static_call_array </item>
>       <item> fpassthru </item>
>       <item> fprintf </item>
>+      <item> fputcsv </item>
>       <item> fputs </item>
>       <item> fread </item>
>       <item> frenchtojd </item>
>@@ -2423,7 +2585,12 @@
>       <item> func_num_args </item>
>       <item> function_exists </item>
>       <item> fwrite </item>
>+      <item> gc_collect_cycles </item>
>+      <item> gc_disable </item>
>+      <item> gc_enable </item>
>+      <item> gc_enabled </item>
>       <item> gd_info </item>
>+      <item> get_called_class </item>
>       <item> get_browser </item>
>       <item> get_cfg_var </item>
>       <item> get_class </item>
>@@ -2455,6 +2622,7 @@
>       <item> gethostbyaddr </item>
>       <item> gethostbyname </item>
>       <item> gethostbynamel </item>
>+      <item> gethostname </item>
>       <item> getimagesize </item>
>       <item> getlastmod </item>
>       <item> getmxrr </item>
>@@ -2473,7 +2641,6 @@
>       <item> gettimeofday </item>
>       <item> gettype </item>
>       <item> glob </item>
>-      <item> global </item>
>       <item> gmdate </item>
>       <item> gmmktime </item>
>       <item> gmp_abs </item>
>@@ -2536,7 +2703,19 @@
>       <item> gztell </item>
>       <item> gzuncompress </item>
>       <item> gzwrite </item>
>+      <item> hash </item>
>+      <item> hash_algos </item>
>+      <item> hash_copy </item>
>+      <item> hash_file </item>
>+      <item> hash_final </item>
>+      <item> hash_hmac </item>
>+      <item> hash_hmac_file </item>
>+      <item> hash_init </item>
>+      <item> hash_update </item>
>+      <item> hash_update_file </item>
>+      <item> hash_update_stream </item>
>       <item> header </item>
>+      <item> header_remove </item>
>       <item> headers_list </item>
>       <item> headers_sent </item>
>       <item> hebrev </item>
>@@ -2547,6 +2726,7 @@
>       <item> html_entity_decode </item>
>       <item> htmlentities </item>
>       <item> htmlspecialchars </item>
>+      <item> htmlspecialchars_decode </item>
>       <item> http_build_query </item>
>       <item> hw_array2objrec </item>
>       <item> hw_changeobject </item>
>@@ -2655,6 +2835,10 @@
>       <item> iconv_mime_decode_headers </item>
>       <item> iconv_mime_encode </item>
>       <item> iconv_set_encoding </item>
>+      <item> iconv_strlen </item>
>+      <item> iconv_strpos </item>
>+      <item> iconv_strrpos </item>
>+      <item> iconv_substr </item>
>       <item> idate </item>
>       <item> ifx_affected_rows </item>
>       <item> ifx_blobinfile_mode </item>
>@@ -2696,6 +2880,7 @@
>       <item> ifxus_write_slob </item>
>       <item> ignore_user_abort </item>
>       <item> image2wbmp </item>
>+      <item> image_type_to_extension </item>
>       <item> image_type_to_mime_type </item>
>       <item> imagealphablending </item>
>       <item> imageantialias </item>
>@@ -2718,6 +2903,7 @@
>       <item> imagecolorsforindex </item>
>       <item> imagecolorstotal </item>
>       <item> imagecolortransparent </item>
>+      <item> imageconvolution </item>
>       <item> imagecopy </item>
>       <item> imagecopymerge </item>
>       <item> imagecopymergegray </item>
>@@ -2862,6 +3048,8 @@
>       <item> in_array </item>
>       <item> include </item>
>       <item> include_once </item>
>+      <item> inet_ntop </item>
>+      <item> inet_pton </item>
>       <item> ingres_autocommit </item>
>       <item> ingres_close </item>
>       <item> ingres_commit </item>
>@@ -2943,6 +3131,9 @@
>       <item> is_writable </item>
>       <item> is_writeable </item>
>       <item> isset </item>
>+      <item> iterator_apply </item>
>+      <item> iterator_count </item>
>+      <item> iterator_to_array </item>
>       <item> java_last_exception_clear </item>
>       <item> java_last_exception_get </item>
>       <item> jddayofweek </item>
>@@ -2955,12 +3146,18 @@
>       <item> jewishtojd </item>
>       <item> join </item>
>       <item> jpeg2wbmp </item>
>+      <item> json_decode </item>
>+      <item> json_encode </item>
>+      <item> json_last_error </item>
>       <item> juliantojd </item>
>       <item> key </item>
>       <item> key_exists </item>
>       <item> krsort </item>
>       <item> ksort </item>
>+      <item> lcfirst </item>
>       <item> lcg_value </item>
>+      <item> lchgrp </item>
>+      <item> lchown </item>
>       <item> ldap_8859_to_t61 </item>
>       <item> ldap_add </item>
>       <item> ldap_bind </item>
>@@ -3003,9 +3200,13 @@
>       <item> ldap_start_tls </item>
>       <item> ldap_t61_to_8859 </item>
>       <item> ldap_unbind </item>
>-      <item> leak </item>
>       <item> levenshtein </item>
>+      <item> libxml_clear_errors </item>
>+      <item> libxml_get_errors </item>
>+      <item> libxml_get_last_error </item>
>       <item> libxml_set_streams_context </item>
>+      <item> libxml_set_streams_context </item>
>+      <item> libxml_use_internal_errors </item>
>       <item> link </item>
>       <item> linkinfo </item>
>       <item> list </item>
>@@ -3033,6 +3234,7 @@
>       <item> mailparse_stream_encode </item>
>       <item> mailparse_uudecode_all </item>
>       <item> max </item>
>+      <item> mb_check_encoding </item>
>       <item> mb_convert_case </item>
>       <item> mb_convert_encoding </item>
>       <item> mb_convert_kana </item>
>@@ -3043,6 +3245,7 @@
>       <item> mb_detect_order </item>
>       <item> mb_encode_mimeheader </item>
>       <item> mb_encode_numericentity </item>
>+      <item> mb_encoding_aliases </item>
>       <item> mb_ereg </item>
>       <item> mb_ereg_match </item>
>       <item> mb_ereg_replace </item>
>@@ -3060,6 +3263,7 @@
>       <item> mb_http_output </item>
>       <item> mb_internal_encoding </item>
>       <item> mb_language </item>
>+      <item> mb_list_encodings </item>
>       <item> mb_output_handler </item>
>       <item> mb_parse_str </item>
>       <item> mb_preferred_mime_name </item>
>@@ -3069,14 +3273,21 @@
>       <item> mb_split </item>
>       <item> mb_strcut </item>
>       <item> mb_strimwidth </item>
>+      <item> mb_stripos </item>
>+      <item> mb_stristr </item>
>       <item> mb_strlen </item>
>       <item> mb_strpos </item>
>+      <item> mb_strrchr </item>
>+      <item> mb_strrichr </item>
>+      <item> mb_strripos </item>
>       <item> mb_strrpos </item>
>+      <item> mb_strstr </item>
>       <item> mb_strtolower </item>
>       <item> mb_strtoupper </item>
>       <item> mb_strwidth </item>
>       <item> mb_substitute_character </item>
>       <item> mb_substr </item>
>+      <item> mb_substr_count </item>
>       <item> mcal_append_event </item>
>       <item> mcal_close </item>
>       <item> mcal_create_calendar </item>
>@@ -3121,7 +3332,6 @@
>       <item> mcrypt_cfb </item>
>       <item> mcrypt_create_iv </item>
>       <item> mcrypt_decrypt </item>
>-      <item> mcrypt_ecb </item>
>       <item> mcrypt_enc_get_algorithms_name </item>
>       <item> mcrypt_enc_get_block_size </item>
>       <item> mcrypt_enc_get_iv_size </item>
>@@ -3156,6 +3366,7 @@
>       <item> md5 </item>
>       <item> md5_file </item>
>       <item> mdecrypt_generic </item>
>+      <item> memory_get_peak_usage </item>
>       <item> memory_get_usage </item>
>       <item> metaphone </item>
>       <item> method_exists </item>
>@@ -3279,17 +3490,12 @@
>       <item> muscat_setup_net </item>
>       <item> mysql </item>
>       <item> mysql_affected_rows </item>
>-      <item> mysql_change_user </item>
>-      <item> mysql_character_set_name </item>
>       <item> mysql_client_encoding </item>
>       <item> mysql_close </item>
>       <item> mysql_connect </item>
>-      <item> mysql_create_db </item>
>       <item> mysql_data_seek </item>
>       <item> mysql_db_name </item>
>       <item> mysql_db_query </item>
>-      <item> mysql_dbname </item>
>-      <item> mysql_drop_db </item>
>       <item> mysql_errno </item>
>       <item> mysql_error </item>
>       <item> mysql_escape_string </item>
>@@ -3305,13 +3511,7 @@
>       <item> mysql_field_seek </item>
>       <item> mysql_field_table </item>
>       <item> mysql_field_type </item>
>-      <item> mysql_fieldflags </item>
>-      <item> mysql_fieldlen </item>
>-      <item> mysql_fieldname </item>
>-      <item> mysql_fieldtable </item>
>-      <item> mysql_fieldtype </item>
>       <item> mysql_free_result </item>
>-      <item> mysql_freeresult </item>
>       <item> mysql_get_client_info </item>
>       <item> mysql_get_host_info </item>
>       <item> mysql_get_proto_info </item>
>@@ -3319,26 +3519,18 @@
>       <item> mysql_info </item>
>       <item> mysql_insert_id </item>
>       <item> mysql_list_dbs </item>
>-      <item> mysql_list_fields </item>
>       <item> mysql_list_processes </item>
>-      <item> mysql_list_tables </item>
>-      <item> mysql_listdbs </item>
>-      <item> mysql_listfields </item>
>-      <item> mysql_listtables </item>
>       <item> mysql_num_fields </item>
>       <item> mysql_num_rows </item>
>-      <item> mysql_numfields </item>
>-      <item> mysql_numrows </item>
>       <item> mysql_pconnect </item>
>       <item> mysql_ping </item>
>       <item> mysql_query </item>
>       <item> mysql_real_escape_string </item>
>       <item> mysql_result </item>
>       <item> mysql_select_db </item>
>-      <item> mysql_selectdb </item>
>+      <item> mysql_set_charset </item>
>       <item> mysql_stat </item>
>       <item> mysql_table_name </item>
>-      <item> mysql_tablename </item>
>       <item> mysql_thread_id </item>
>       <item> mysql_unbuffered_query </item>
>       <item> mysqli_affected_rows </item>
>@@ -3355,11 +3547,7 @@
>       <item> mysqli_connect_error </item>
>       <item> mysqli_data_seek </item>
>       <item> mysqli_debug </item>
>-      <item> mysqli_disable_reads_from_master </item>
>-      <item> mysqli_disable_rpl_parse </item>
>       <item> mysqli_dump_debug_info </item>
>-      <item> mysqli_enable_reads_from_master </item>
>-      <item> mysqli_enable_rpl_parse </item>
>       <item> mysqli_errno </item>
>       <item> mysqli_error </item>
>       <item> mysqli_escape_string </item>
>@@ -3377,7 +3565,9 @@
>       <item> mysqli_field_seek </item>
>       <item> mysqli_field_tell </item>
>       <item> mysqli_free_result </item>
>+      <item> mysqli_get_cache_stats </item>
>       <item> mysqli_get_client_info </item>
>+      <item> mysqli_get_client_stats </item>
>       <item> mysqli_get_client_version </item>
>       <item> mysqli_get_host_info </item>
>       <item> mysqli_get_metadata </item>
>@@ -3388,7 +3578,6 @@
>       <item> mysqli_init </item>
>       <item> mysqli_insert_id </item>
>       <item> mysqli_kill </item>
>-      <item> mysqli_master_query </item>
>       <item> mysqli_more_results </item>
>       <item> mysqli_multi_query </item>
>       <item> mysqli_next_result </item>
>@@ -3402,18 +3591,15 @@
>       <item> mysqli_real_connect </item>
>       <item> mysqli_real_escape_string </item>
>       <item> mysqli_real_query </item>
>+      <item> mysqli_refresh </item>
>       <item> mysqli_report </item>
>       <item> mysqli_rollback </item>
>-      <item> mysqli_rpl_parse_enabled </item>
>-      <item> mysqli_rpl_probe </item>
>-      <item> mysqli_rpl_query_type </item>
>       <item> mysqli_select_db </item>
>       <item> mysqli_send_long_data </item>
>-      <item> mysqli_send_query </item>
>+      <item> mysqli_set_charset </item>
>       <item> mysqli_set_local_infile_default </item>
>       <item> mysqli_set_local_infile_handler </item>
>       <item> mysqli_set_opt </item>
>-      <item> mysqli_slave_query </item>
>       <item> mysqli_sqlstate </item>
>       <item> mysqli_ssl_set </item>
>       <item> mysqli_stat </item>
>@@ -3430,6 +3616,7 @@
>       <item> mysqli_stmt_fetch </item>
>       <item> mysqli_stmt_field_count </item>
>       <item> mysqli_stmt_free_result </item>
>+      <item> mysqli_stmt_get_warnings </item>
>       <item> mysqli_stmt_init </item>
>       <item> mysqli_stmt_insert_id </item>
>       <item> mysqli_stmt_num_rows </item>
>@@ -3641,6 +3828,51 @@
>       <item> ob_implicit_flush </item>
>       <item> ob_list_handlers </item>
>       <item> ob_start </item>
>+      <item> oci_bind_array_by_name </item>
>+      <item> oci_bind_by_name </item>
>+      <item> oci_cancel </item>
>+      <item> oci_close </item>
>+      <item> oci_commit </item>
>+      <item> oci_connect </item>
>+      <item> oci_define_by_name </item>
>+      <item> oci_error </item>
>+      <item> oci_execute </item>
>+      <item> oci_fetch </item>
>+      <item> oci_fetch_all </item>
>+      <item> oci_fetch_array </item>
>+      <item> oci_fetch_assoc </item>
>+      <item> oci_fetch_object </item>
>+      <item> oci_fetch_row </item>
>+      <item> oci_field_is_null </item>
>+      <item> oci_field_name </item>
>+      <item> oci_field_precision </item>
>+      <item> oci_field_scale </item>
>+      <item> oci_field_size </item>
>+      <item> oci_field_type </item>
>+      <item> oci_field_type_raw </item>
>+      <item> oci_free_statement </item>
>+      <item> oci_internal_debug </item>
>+      <item> oci_lob_copy </item>
>+      <item> oci_lob_is_equal </item>
>+      <item> oci_new_collection </item>
>+      <item> oci_new_connect </item>
>+      <item> oci_new_cursor </item>
>+      <item> oci_new_descriptor </item>
>+      <item> oci_num_fields </item>
>+      <item> oci_num_rows </item>
>+      <item> oci_parse </item>
>+      <item> oci_password_change </item>
>+      <item> oci_pconnect </item>
>+      <item> oci_result </item>
>+      <item> oci_rollback </item>
>+      <item> oci_server_version </item>
>+      <item> oci_set_action </item>
>+      <item> oci_set_client_identifier </item>
>+      <item> oci_set_client_info </item>
>+      <item> oci_set_edition </item>
>+      <item> oci_set_module_name </item>
>+      <item> oci_set_prefetch </item>
>+      <item> oci_statement_type </item>
>       <item> ocibindbyname </item>
>       <item> ocicancel </item>
>       <item> ocicollappend </item>
>@@ -3662,7 +3894,6 @@
>       <item> ocierror </item>
>       <item> ociexecute </item>
>       <item> ocifetch </item>
>-      <item> ocifetchinto </item>
>       <item> ocifetchstatement </item>
>       <item> ocifreecollection </item>
>       <item> ocifreecursor </item>
>@@ -3769,29 +4000,6 @@
>       <item> openssl_x509_free </item>
>       <item> openssl_x509_parse </item>
>       <item> openssl_x509_read </item>
>-      <item> ora_bind </item>
>-      <item> ora_close </item>
>-      <item> ora_columnname </item>
>-      <item> ora_columnsize </item>
>-      <item> ora_columntype </item>
>-      <item> ora_commit </item>
>-      <item> ora_commitoff </item>
>-      <item> ora_commiton </item>
>-      <item> ora_do </item>
>-      <item> ora_error </item>
>-      <item> ora_errorcode </item>
>-      <item> ora_exec </item>
>-      <item> ora_fetch </item>
>-      <item> ora_fetch_into </item>
>-      <item> ora_getcolumn </item>
>-      <item> ora_logoff </item>
>-      <item> ora_logon </item>
>-      <item> ora_numcols </item>
>-      <item> ora_numrows </item>
>-      <item> ora_open </item>
>-      <item> ora_parse </item>
>-      <item> ora_plogon </item>
>-      <item> ora_rollback </item>
>       <item> ord </item>
>       <item> output_add_rewrite_var </item>
>       <item> output_reset_rewrite_vars </item>
>@@ -3818,6 +4026,7 @@
>       <item> ovrimos_rollback </item>
>       <item> pack </item>
>       <item> parse_ini_file </item>
>+      <item> parse_ini_string </item>
>       <item> parse_str </item>
>       <item> parse_url </item>
>       <item> passthru </item>
>@@ -3957,6 +4166,7 @@
>       <item> pfpro_process </item>
>       <item> pfpro_process_raw </item>
>       <item> pfpro_version </item>
>+      <item> pdo_drivers </item>
>       <item> pfsockopen </item>
>       <item> pg_affected_rows </item>
>       <item> pg_cancel_query </item>
>@@ -4053,8 +4263,8 @@
>       <item> pg_untrace </item>
>       <item> pg_update </item>
>       <item> pg_version </item>
>-      <item> php_check_syntax </item>
>       <item> php_egg_logo_guid </item>
>+      <item> php_ini_loaded_file </item>
>       <item> php_ini_scanned_files </item>
>       <item> php_logo_guid </item>
>       <item> php_real_logo_guid </item>
>@@ -4102,7 +4312,9 @@
>       <item> posix_ttyname </item>
>       <item> posix_uname </item>
>       <item> pow </item>
>+      <item> preg_filter </item>
>       <item> preg_grep </item>
>+      <item> preg_last_error </item>
>       <item> preg_match </item>
>       <item> preg_match_all </item>
>       <item> preg_quote </item>
>@@ -4149,6 +4361,7 @@
>       <item> proc_nice </item>
>       <item> proc_open </item>
>       <item> proc_terminate </item>
>+      <item> property_exists </item>
>       <item> pspell_add_to_personal </item>
>       <item> pspell_add_to_session </item>
>       <item> pspell_check </item>
>@@ -4170,6 +4383,7 @@
>       <item> qdom_error </item>
>       <item> qdom_tree </item>
>       <item> quoted_printable_decode </item>
>+      <item> quoted_printable_encode </item>
>       <item> quotemeta </item>
>       <item> rad2deg </item>
>       <item> rand </item>
>@@ -4190,6 +4404,8 @@
>       <item> readline_write_history </item>
>       <item> readlink </item>
>       <item> realpath </item>
>+      <item> realpath_cache_get </item>
>+      <item> realpath_cache_size </item>
>       <item> recode </item>
>       <item> recode_file </item>
>       <item> recode_string </item>
>@@ -4265,6 +4481,8 @@
>       <item> settype </item>
>       <item> sha1 </item>
>       <item> sha1_file </item>
>+      <item> sha256 </item>
>+      <item> sha256_file </item>
>       <item> shell_exec </item>
>       <item> shm_attach </item>
>       <item> shm_detach </item>
>@@ -4281,6 +4499,7 @@
>       <item> show_source </item>
>       <item> shuffle </item>
>       <item> similar_text </item>
>+      <item> simplexml_import_dom </item>
>       <item> simplexml_load_file </item>
>       <item> simplexml_load_string </item>
>       <item> sin </item>
>@@ -4318,22 +4537,13 @@
>       <item> socket_getopt </item>
>       <item> socket_getpeername </item>
>       <item> socket_getsockname </item>
>-      <item> socket_iovec_add </item>
>-      <item> socket_iovec_alloc </item>
>-      <item> socket_iovec_delete </item>
>-      <item> socket_iovec_fetch </item>
>-      <item> socket_iovec_free </item>
>-      <item> socket_iovec_set </item>
>       <item> socket_last_error </item>
>       <item> socket_listen </item>
>       <item> socket_read </item>
>-      <item> socket_readv </item>
>       <item> socket_recv </item>
>       <item> socket_recvfrom </item>
>-      <item> socket_recvmsg </item>
>       <item> socket_select </item>
>       <item> socket_send </item>
>-      <item> socket_sendmsg </item>
>       <item> socket_sendto </item>
>       <item> socket_set_block </item>
>       <item> socket_set_blocking </item>
>@@ -4344,14 +4554,17 @@
>       <item> socket_shutdown </item>
>       <item> socket_strerror </item>
>       <item> socket_write </item>
>-      <item> socket_writev </item>
>       <item> sort </item>
>       <item> soundex </item>
>+      <item> spl_autoload </item>
>+      <item> spl_autoload_call </item>
>+      <item> spl_autoload_extensions </item>
>+      <item> spl_autoload_functions </item>
>+      <item> spl_autoload_register </item>
>+      <item> spl_autoload_unregister </item>
>       <item> spl_classes </item>
>-      <item> split </item>
>-      <item> spliti </item>
>+      <item> spl_object_hash </item>
>       <item> sprintf </item>
>-      <item> sql_regcase </item>
>       <item> sqlite_array_query </item>
>       <item> sqlite_busy_timeout </item>
>       <item> sqlite_changes </item>
>@@ -4395,6 +4608,7 @@
>       <item> srand </item>
>       <item> sscanf </item>
>       <item> stat </item>
>+      <item> str_getcsv </item>
>       <item> str_ireplace </item>
>       <item> str_pad </item>
>       <item> str_repeat </item>
>@@ -4413,31 +4627,44 @@
>       <item> stream_bucket_new </item>
>       <item> stream_bucket_prepend </item>
>       <item> stream_context_create </item>
>+      <item> stream_context_get_default </item>
>       <item> stream_context_get_options </item>
>+      <item> stream_context_get_params </item>
>+      <item> stream_context_set_default </item>
>       <item> stream_context_set_option </item>
>       <item> stream_context_set_params </item>
>       <item> stream_copy_to_stream </item>
>       <item> stream_filter_append </item>
>       <item> stream_filter_prepend </item>
>       <item> stream_filter_register </item>
>+      <item> stream_filter_remove </item>
>       <item> stream_get_contents </item>
>       <item> stream_get_filters </item>
>       <item> stream_get_line </item>
>       <item> stream_get_meta_data </item>
>       <item> stream_get_transports </item>
>       <item> stream_get_wrappers </item>
>+      <item> stream_is_local </item>
>       <item> stream_register_wrapper </item>
>+      <item> stream_resolve_include_path </item>
>       <item> stream_select </item>
>       <item> stream_set_blocking </item>
>+      <item> stream_set_read_buffer </item>
>       <item> stream_set_timeout </item>
>       <item> stream_set_write_buffer </item>
>       <item> stream_socket_accept </item>
>       <item> stream_socket_client </item>
>+      <item> stream_socket_enable_crypto </item>
>       <item> stream_socket_get_name </item>
>+      <item> stream_socket_pair </item>
>       <item> stream_socket_recvfrom </item>
>       <item> stream_socket_sendto </item>
>       <item> stream_socket_server </item>
>+      <item> stream_socket_shutdown </item>
>+      <item> stream_supports_lock </item>
>       <item> stream_wrapper_register </item>
>+      <item> stream_wrapper_restore </item>
>+      <item> stream_wrapper_unregister </item>
>       <item> strftime </item>
>       <item> strip_tags </item>
>       <item> stripcslashes </item>
>@@ -4451,6 +4678,7 @@
>       <item> strncmp </item>
>       <item> strpbrk </item>
>       <item> strpos </item>
>+      <item> strptime </item>
>       <item> strrchr </item>
>       <item> strrev </item>
>       <item> strripos </item>
>@@ -4467,6 +4695,8 @@
>       <item> substr_compare </item>
>       <item> substr_count </item>
>       <item> substr_replace </item>
>+      <item> suhosin_encrypt_cookie </item>
>+      <item> suhosin_get_raw_cookies </item>
>       <item> swf_actiongeturl </item>
>       <item> swf_actiongotoframe </item>
>       <item> swf_actiongotolabel </item>
>@@ -4647,6 +4877,8 @@
>       <item> sybase_result </item>
>       <item> sybase_select_db </item>
>       <item> symlink </item>
>+      <item> sys_get_temp_dir </item>
>+      <item> sys_getloadavg </item>
>       <item> syslog </item>
>       <item> system </item>
>       <item> tan </item>
>@@ -4655,6 +4887,16 @@
>       <item> textdomain </item>
>       <item> time </item>
>       <item> time_nanosleep </item>
>+      <item> time_sleep_until </item>
>+      <item> timezone_abbreviations_list </item>
>+      <item> timezone_identifiers_list </item>
>+      <item> timezone_location_get </item>
>+      <item> timezone_name_from_abbr </item>
>+      <item> timezone_name_get </item>
>+      <item> timezone_offset_get </item>
>+      <item> timezone_open </item>
>+      <item> timezone_transitions_get </item>
>+      <item> timezone_version_get </item>
>       <item> tmpfile </item>
>       <item> token_get_all </item>
>       <item> token_name </item>
>@@ -4740,6 +4982,40 @@
>       <item> wddx_serialize_value </item>
>       <item> wddx_serialize_vars </item>
>       <item> wordwrap </item>
>+      <item> xdebug_break </item>
>+      <item> xdebug_call_class </item>
>+      <item> xdebug_call_file </item>
>+      <item> xdebug_call_function </item>
>+      <item> xdebug_call_line </item>
>+      <item> xdebug_clear_aggr_profiling_data </item>
>+      <item> xdebug_debug_zval </item>
>+      <item> xdebug_debug_zval_stdout </item>
>+      <item> xdebug_disable </item>
>+      <item> xdebug_dump_aggr_profiling_data </item>
>+      <item> xdebug_dump_superglobals </item>
>+      <item> xdebug_enable </item>
>+      <item> xdebug_get_code_coverage </item>
>+      <item> xdebug_get_collected_errors </item>
>+      <item> xdebug_get_declared_vars </item>
>+      <item> xdebug_get_formatted_function_stack </item>
>+      <item> xdebug_get_function_count </item>
>+      <item> xdebug_get_function_stack </item>
>+      <item> xdebug_get_headers </item>
>+      <item> xdebug_get_profiler_filename </item>
>+      <item> xdebug_get_stack_depth </item>
>+      <item> xdebug_get_tracefile_name </item>
>+      <item> xdebug_is_enabled </item>
>+      <item> xdebug_memory_usage </item>
>+      <item> xdebug_peak_memory_usage </item>
>+      <item> xdebug_print_function_stack </item>
>+      <item> xdebug_start_code_coverage </item>
>+      <item> xdebug_start_error_collection </item>
>+      <item> xdebug_start_trace </item>
>+      <item> xdebug_stop_code_coverage </item>
>+      <item> xdebug_stop_error_collection </item>
>+      <item> xdebug_stop_trace </item>
>+      <item> xdebug_time_index </item>
>+      <item> xdebug_var_dump </item>
>       <item> xml_error_string </item>
>       <item> xml_get_current_byte_index </item>
>       <item> xml_get_current_column_number </item>
>@@ -4779,6 +5055,48 @@
>       <item> xmlrpc_server_register_method </item>
>       <item> xmlrpc_set_type </item>
>       <item> xmltree </item>
>+      <item> xmlwriter_end_attribute </item>
>+      <item> xmlwriter_end_cdata </item>
>+      <item> xmlwriter_end_comment </item>
>+      <item> xmlwriter_end_document </item>
>+      <item> xmlwriter_end_dtd </item>
>+      <item> xmlwriter_end_dtd_attlist </item>
>+      <item> xmlwriter_end_dtd_element </item>
>+      <item> xmlwriter_end_dtd_entity </item>
>+      <item> xmlwriter_end_element </item>
>+      <item> xmlwriter_end_pi </item>
>+      <item> xmlwriter_flush </item>
>+      <item> xmlwriter_full_end_element </item>
>+      <item> xmlwriter_open_memory </item>
>+      <item> xmlwriter_open_uri </item>
>+      <item> xmlwriter_output_memory </item>
>+      <item> xmlwriter_set_indent </item>
>+      <item> xmlwriter_set_indent_string </item>
>+      <item> xmlwriter_start_attribute </item>
>+      <item> xmlwriter_start_attribute_ns </item>
>+      <item> xmlwriter_start_cdata </item>
>+      <item> xmlwriter_start_comment </item>
>+      <item> xmlwriter_start_document </item>
>+      <item> xmlwriter_start_dtd </item>
>+      <item> xmlwriter_start_dtd_attlist </item>
>+      <item> xmlwriter_start_dtd_element </item>
>+      <item> xmlwriter_start_dtd_entity </item>
>+      <item> xmlwriter_start_element </item>
>+      <item> xmlwriter_start_element_ns </item>
>+      <item> xmlwriter_start_pi </item>
>+      <item> xmlwriter_text </item>
>+      <item> xmlwriter_write_attribute </item>
>+      <item> xmlwriter_write_attribute_ns </item>
>+      <item> xmlwriter_write_cdata </item>
>+      <item> xmlwriter_write_comment </item>
>+      <item> xmlwriter_write_dtd </item>
>+      <item> xmlwriter_write_dtd_attlist </item>
>+      <item> xmlwriter_write_dtd_element </item>
>+      <item> xmlwriter_write_dtd_entity </item>
>+      <item> xmlwriter_write_element </item>
>+      <item> xmlwriter_write_element_ns </item>
>+      <item> xmlwriter_write_pi </item>
>+      <item> xmlwriter_write_raw </item>
>       <item> xpath_eval </item>
>       <item> xpath_eval_expression </item>
>       <item> xpath_new_context </item>
>@@ -4841,6 +5159,253 @@
>       <item> zip_read </item>
>       <item> zlib_get_coding_type </item>
>     </list>
>+    <list name="special-variables">
>+        <item> $GLOBALS </item>
>+        <item> $_COOKIE </item>
>+        <item> $_ENV </item>
>+        <item> $_FILES </item>
>+        <item> $_GET </item>
>+        <item> $_POST </item>
>+        <item> $_REQUEST </item>
>+        <item> $_SERVER </item>
>+        <item> $_SESSION </item>
>+        <item> $php_errormsg </item>
>+        <item> $this </item>
>+    </list>
>+    <list name="predefined-classes">
>+        <item> APCIterator </item>
>+        <item> AppendIterator </item>
>+        <item> ArrayAccess </item>
>+        <item> ArrayIterator </item>
>+        <item> ArrayObject </item>
>+        <item> BadFunctionCallException </item>
>+        <item> BadMethodCallException </item>
>+        <item> CachingIterator </item>
>+        <item> Closure </item>
>+        <item> Countable </item>
>+        <item> DOMAttr </item>
>+        <item> DOMCDATASection </item>
>+        <item> DOMCharacterData </item>
>+        <item> DOMComment </item>
>+        <item> DOMConfiguration </item>
>+        <item> DOMDocument </item>
>+        <item> DOMDocumentFragment </item>
>+        <item> DOMDocumentType </item>
>+        <item> DOMDomError </item>
>+        <item> DOMElement </item>
>+        <item> DOMEntity </item>
>+        <item> DOMEntityReference </item>
>+        <item> DOMErrorHandler </item>
>+        <item> DOMException </item>
>+        <item> DOMImplementation </item>
>+        <item> DOMImplementationList </item>
>+        <item> DOMImplementationSource </item>
>+        <item> DOMLocator </item>
>+        <item> DOMNameList </item>
>+        <item> DOMNameSpaceNode </item>
>+        <item> DOMNamedNodeMap </item>
>+        <item> DOMNode </item>
>+        <item> DOMNodeList </item>
>+        <item> DOMNotation </item>
>+        <item> DOMProcessingInstruction </item>
>+        <item> DOMStringExtend </item>
>+        <item> DOMStringList </item>
>+        <item> DOMText </item>
>+        <item> DOMTypeinfo </item>
>+        <item> DOMUserDataHandler </item>
>+        <item> DOMXPath </item>
>+        <item> DateInterval </item>
>+        <item> DatePeriod </item>
>+        <item> DateTime </item>
>+        <item> DateTimeZone </item>
>+        <item> Directory </item>
>+        <item> DirectoryIterator </item>
>+        <item> DomainException </item>
>+        <item> EmptyIterator </item>
>+        <item> ErrorException </item>
>+        <item> Exception </item>
>+        <item> FilesystemIterator </item>
>+        <item> FilterIterator </item>
>+        <item> GlobIterator </item>
>+        <item> InfiniteIterator </item>
>+        <item> InvalidArgumentException </item>
>+        <item> Iterator </item>
>+        <item> IteratorAggregate </item>
>+        <item> IteratorIterator </item>
>+        <item> LengthException </item>
>+        <item> LibXMLError </item>
>+        <item> LimitIterator </item>
>+        <item> LogicException </item>
>+        <item> MultipleIterator </item>
>+        <item> MySQLi </item>
>+        <item> MySQLi_Driver </item>
>+        <item> MySQLi_SQL_Exception </item>
>+        <item> MySQLi_Result </item>
>+        <item> MySQLi_STMT </item>
>+        <item> MySQLi_Warning </item>
>+        <item> NoRewindIterator </item>
>+        <item> OCI-Collection </item>
>+        <item> OCI-LOB </item>
>+        <item> OutOfBoundsException </item>
>+        <item> OutOfRangeException </item>
>+        <item> OuterIterator </item>
>+        <item> OverflowException </item>
>+        <item> PDO </item>
>+        <item> PDOException </item>
>+        <item> PDORow </item>
>+        <item> PDOStatement </item>
>+        <item> ParentIterator </item>
>+        <item> Phar </item>
>+        <item> PharData </item>
>+        <item> PharException </item>
>+        <item> PharFileInfo </item>
>+        <item> RangeException </item>
>+        <item> RecursiveArrayIterator </item>
>+        <item> RecursiveCachingIterator </item>
>+        <item> RecursiveDirectoryIterator </item>
>+        <item> RecursiveFilterIterator </item>
>+        <item> RecursiveIterator </item>
>+        <item> RecursiveIteratorIterator </item>
>+        <item> RecursiveRegexIterator </item>
>+        <item> RecursiveTreeIterator </item>
>+        <item> Reflection </item>
>+        <item> ReflectionClass </item>
>+        <item> ReflectionException </item>
>+        <item> ReflectionExtension </item>
>+        <item> ReflectionFunction </item>
>+        <item> ReflectionFunctionAbstract </item>
>+        <item> ReflectionMethod </item>
>+        <item> ReflectionObject </item>
>+        <item> ReflectionParameter </item>
>+        <item> ReflectionProperty </item>
>+        <item> Reflector </item>
>+        <item> RegexIterator </item>
>+        <item> RuntimeException </item>
>+        <item> SQLite3 </item>
>+        <item> SQLite3Result </item>
>+        <item> SQLite3Stmt </item>
>+        <item> SQLiteDatabase </item>
>+        <item> SQLiteException </item>
>+        <item> SQLiteResult </item>
>+        <item> SQLiteUnbuffered </item>
>+        <item> SeekableIterator </item>
>+        <item> Serializable </item>
>+        <item> SimpleXMLElement </item>
>+        <item> SimpleXMLIterator </item>
>+        <item> SplDoublyLinkedList </item>
>+        <item> SplFileInfo </item>
>+        <item> SplFileObject </item>
>+        <item> SplFixedArray </item>
>+        <item> SplHeap </item>
>+        <item> SplMaxHeap </item>
>+        <item> SplMinHeap </item>
>+        <item> SplObjectStorage </item>
>+        <item> SplObserver </item>
>+        <item> SplPriorityQueue </item>
>+        <item> SplQueue </item>
>+        <item> SplStack </item>
>+        <item> SplSubject </item>
>+        <item> SplTempFileObject </item>
>+        <item> Traversable </item>
>+        <item> UnderflowException </item>
>+        <item> UnexpectedValueException </item>
>+        <item> XMLReader </item>
>+        <item> XMLWriter </item>
>+        <item> XSLTProcessor </item>
>+        <item> ZipArchive </item>
>+        <item> __PHP_Incomplete_Class </item>
>+        <item> php_user_filter </item>
>+        <item> stdClass </item>
>+    </list>
>+    <list name="deprecated">
>+      
>+      <item> $HTTP_SERVER_VARS </item>
>+      <item> $HTTP_SESSION_VARS </item>
>+      <item> $HTTP_ENV_VARS </item>
>+      <item> $HTTP_POST_FILES </item>
>+      <item> $HTTP_COOKIE_VARS </item>
>+      <item> $HTTP_POST_VARS </item>
>+      <item> $HTTP_GET_VARS </item>
>+      <item> $DOCUMENT_ROOT </item>
>+
>+      
>+      <item> call_user_method </item>
>+      <item> call_user_method_array </item>
>+      <item> ereg </item>
>+      <item> ereg_replace </item>
>+      <item> eregi </item>
>+      <item> eregi_replace </item>
>+      <item> mcrypt_ecb </item>
>+      <item> mime_content_type </item>
>+      <item> mysql_create_db </item>
>+      <item> mysql_dbname </item>
>+      <item> mysql_drop_db </item>
>+      <item> mysql_fieldflags </item>
>+      <item> mysql_fieldlen </item>
>+      <item> mysql_fieldname </item>
>+      <item> mysql_fieldtable </item>
>+      <item> mysql_fieldtype </item>
>+      <item> mysql_freeresult </item>
>+      <item> mysql_list_fields </item>
>+      <item> mysql_list_tables </item>
>+      <item> mysql_listdbs </item>
>+      <item> mysql_listfields </item>
>+      <item> mysql_listtables </item>
>+      <item> mysql_numfields </item>
>+      <item> mysql_numrows </item>
>+      <item> mysql_selectdb </item>
>+      <item> mysql_tablename </item>
>+      <item> mysqli_disable_reads_from_master </item>
>+      <item> mysqli_disable_rpl_parse </item>
>+      <item> mysqli_enable_reads_from_master </item>
>+      <item> mysqli_enable_rpl_parse </item>
>+      <item> mysqli_master_query </item>
>+      <item> mysqli_rpl_parse_enabled </item>
>+      <item> mysqli_rpl_probe </item>
>+      <item> mysqli_rpl_query_type </item>
>+      <item> mysqli_send_query </item>
>+      <item> mysqli_slave_query </item>
>+      <item> ocifetchinto </item>
>+      <item> ora_bind </item>
>+      <item> ora_close </item>
>+      <item> ora_columnname </item>
>+      <item> ora_columnsize </item>
>+      <item> ora_columntype </item>
>+      <item> ora_commit </item>
>+      <item> ora_commitoff </item>
>+      <item> ora_commiton </item>
>+      <item> ora_do </item>
>+      <item> ora_error </item>
>+      <item> ora_errorcode </item>
>+      <item> ora_exec </item>
>+      <item> ora_fetch </item>
>+      <item> ora_fetch_into </item>
>+      <item> ora_getcolumn </item>
>+      <item> ora_logoff </item>
>+      <item> ora_logon </item>
>+      <item> ora_numcols </item>
>+      <item> ora_numrows </item>
>+      <item> ora_open </item>
>+      <item> ora_parse </item>
>+      <item> ora_plogon </item>
>+      <item> ora_rollback </item>
>+      <item> php_check_syntax </item>
>+      <item> split </item>
>+      <item> spliti </item>
>+      <item> sql_regcase </item>
>+
>+      
>+      <item> var </item>
>+     
>+      
>+      <item>OCI_DEFAULT</item>
>+      <item>OCI_D_FILE</item>
>+      <item>OCI_D_LOB</item>
>+      <item>OCI_D_ROWID</item>
>+      <item>OCI_EXACT_FETCH</item>
>+      <item>OCI_SYSDATE</item>
>+    </list>
>+
>     <contexts>
>       <context name="start" lineEndContext="#stay" attribute="Normal Text">
>         <RegExpr context="phpsource" attribute="Keyword" String="&lt;\?(?:=|php)?" insensitive="true" />
>@@ -4877,20 +5442,39 @@
>         <IncludeRules context="##Doxygen" />
>         <Detect2Chars attribute="Comment" context="onelinecomment" char="/" char1="/" />
>         <Detect2Chars attribute="Comment" context="twolinecomment" char="/" char1="*" beginRegion="Comment" />
>+        <keyword attribute="Error" context="#stay" String="deprecated"/>
>         <keyword attribute="Control Structures" context="#stay" String="control structures" />
>         <keyword attribute="Keyword" context="#stay" String="keywords" />
>-        <DetectChar attribute="Function" context="#stay" char="@" />
>+        <keyword attribute="Classes" context="#stay" String="predefined-classes"/>
>+        <DetectChar attribute="Error" context="#stay" char="@" />
>         <keyword attribute="Function" context="#stay" String="functions" />
>         <keyword attribute="Special method" context="#stay" String="special_methods" />
>+        <keyword attribute="Library Constant" context="#stay" String="constants"/>
>+        <RegExpr attribute="Constant" context="#stay" String="\b[A-Z_][A-Z_0-9]*\b"/>
>+
>+        
>+        <RegExpr attribute="Types" context="#stay" String="$\s*(&types;)\s*$"/>
>+
>         <DetectIdentifier />
>         <DetectChar attribute="String" context="doublequotestring" char="&quot;" />
>         <DetectChar attribute="String" context="backquotestring" char="`" />
>         <DetectChar attribute="String" context="singlequotestring" char="'" />
>+        <RegExpr attribute="Backslash Code" context="htmlheredoc" String="&lt;&lt;&lt;&quot;((EO)?HTML)&quot;" beginRegion="Heredoc" />
>+        <RegExpr attribute="Backslash Code" context="cssheredoc" String="&lt;&lt;&lt;&quot;((EO)?CSS)&quot;" beginRegion="Heredoc" />
>+        <RegExpr attribute="Backslash Code" context="javascriptheredoc" String="&lt;&lt;&lt;&quot;((EO)?JAVASCRIPT)&quot;" beginRegion="Heredoc" />
>+        <RegExpr attribute="Backslash Code" context="mysqlheredoc" String="&lt;&lt;&lt;&quot;((EO)?MYSQL)&quot;" beginRegion="Heredoc" />
>+        <RegExpr attribute="Backslash Code" context="heredoc" String="&lt;&lt;&lt;&quot;([A-Za-z_][A-Za-z0-9_]*)&quot;" beginRegion="Heredoc" />
>         <RegExpr attribute="Backslash Code" context="htmlheredoc" String="&lt;&lt;&lt;((EO)?HTML)\b" beginRegion="Heredoc" />
>         <RegExpr attribute="Backslash Code" context="cssheredoc" String="&lt;&lt;&lt;((EO)?CSS)\b" beginRegion="Heredoc" />
>         <RegExpr attribute="Backslash Code" context="javascriptheredoc" String="&lt;&lt;&lt;((EO)?JAVASCRIPT)\b" beginRegion="Heredoc" />
>         <RegExpr attribute="Backslash Code" context="mysqlheredoc" String="&lt;&lt;&lt;((EO)?MYSQL)\b" beginRegion="Heredoc" />
>         <RegExpr attribute="Backslash Code" context="heredoc" String="&lt;&lt;&lt;([A-Za-z_][A-Za-z0-9_]*)" beginRegion="Heredoc" />
>+        <RegExpr attribute="Backslash Code" context="htmlnowdoc" String="&lt;&lt;&lt;'((EO)?HTML)'" beginRegion="Nowdoc" />
>+        <RegExpr attribute="Backslash Code" context="cssnowdoc" String="&lt;&lt;&lt;'((EO)?CSS)'" beginRegion="Nowdoc" />
>+        <RegExpr attribute="Backslash Code" context="javascriptnowdoc" String="&lt;&lt;&lt;'((EO)?JAVASCRIPT)'" beginRegion="Nowdoc" />
>+        <RegExpr attribute="Backslash Code" context="mysqlnowdoc" String="&lt;&lt;&lt;'((EO)?MYSQL)'" beginRegion="Nowdoc" />
>+        <RegExpr attribute="Backslash Code" context="nowdoc" String="&lt;&lt;&lt;'([A-Za-z_][A-Za-z0-9_]*)'" beginRegion="Nowdoc" />
>+        <keyword attribute="Special Variable" context="#stay" String="special-variables"/>
>         <RegExpr attribute="Variable" context="#stay" String="\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*" />
>         <RegExpr attribute="String" context="#stay" String="[0123456789]*\.\.\.[0123456789]*" />
>         <HlCOct attribute="Octal" context="#stay" />
>@@ -4915,9 +5499,11 @@
> 
>       <context name="onelinecomment" attribute="Comment" lineEndContext="#pop">
>         <StringDetect attribute="Keyword" context="#pop" lookAhead="true" String="?&gt;" />
>+        <IncludeRules context="##Alerts" />
>       </context>
>       <context name="twolinecomment" attribute="Comment" lineEndContext="#stay">
>         <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment" />
>+        <IncludeRules context="##Alerts" />
>       </context>
>       <context name="doublebackquotestringcommon" attribute="String" lineEndContext="#stay">
>         
> 
>-<language name="PicAsm" version="1.07" kateversion="2.3" section="Assembler" extensions="*.src;*.SRC;*.asm;*.ASM;*.pic;*.PIC" mimetype="text/x-PicSrc;text/x-PicHdr" author="Alain GIBAUD (alain.gibaud@univ-valenciennes.fr)" license="LGPL">
>+<language name="PicAsm" version="1.07" kateversion="2.5" section="Assembler" extensions="*.src;*.SRC;*.asm;*.ASM;*.pic;*.PIC" mimetype="text/x-PicSrc;text/x-PicHdr" author="Alain GIBAUD (alain.gibaud@univ-valenciennes.fr)" license="LGPL">
>   
>   <highlighting>
>     <list name="directives">
>diff -urN tdelibs/kate/data/pig.xml tdelibs.new/kate/data/pig.xml
>--- tdelibs/kate/data/pig.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/pig.xml	2013-12-26 13:26:40.510329320 -0600
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
> 
>-<language name="Pig" version="3.0" kateversion="2.4" section="Scripts" extensions="*.pig" mimetype="application/x-pig;text/x-pig" casesensitive="0" author="Johannes Schwenk, johannes.schwenk@adition.com" license="GNU GPL">
>+<language name="Pig" version="3.0" kateversion="2.5" section="Scripts" extensions="*.pig" mimetype="application/x-pig;text/x-pig" casesensitive="0" author="Johannes Schwenk, johannes.schwenk@adition.com" license="GNU GPL">
> 	<highlighting>
> 		<list name="keywords">
> 			<item> load </item>
>diff -urN tdelibs/kate/data/pike.xml tdelibs.new/kate/data/pike.xml
>--- tdelibs/kate/data/pike.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/pike.xml	2013-12-26 13:26:41.216326306 -0600
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
> 
>-<language name="Pike" version="1.07" kateversion="2.4" section="Scripts" extensions="*.pike" mimetype="application/x-pike;text/x-pike" casesensitive="1" author="Paul Pogonyshev" license="">
>+<language name="Pike" version="1.07" kateversion="2.5" section="Scripts" extensions="*.pike" mimetype="application/x-pike;text/x-pike" casesensitive="1" author="Paul Pogonyshev" license="">
>   <highlighting>
>     <list name="keywords">
>       <item> break </item>
>diff -urN tdelibs/kate/data/postscript.xml tdelibs.new/kate/data/postscript.xml
>--- tdelibs/kate/data/postscript.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/postscript.xml	2013-12-26 13:26:40.865327806 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="PostScript" version="1.01" kateversion="2.1" section="Markup" extensions="*.ps;*.ai;*.eps" mimetype="application/postscript">
>+<language name="PostScript" version="1.01" kateversion="2.5" section="Markup" extensions="*.ps;*.ai;*.eps" mimetype="application/postscript">
> <highlighting>
> 	<list name="keywords">
> 		<item> abs </item>
>diff -urN tdelibs/kate/data/povray.xml tdelibs.new/kate/data/povray.xml
>--- tdelibs/kate/data/povray.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/povray.xml	2013-12-26 13:26:40.833327940 -0600
>@@ -5,7 +5,7 @@
> 
> 
> 
>-<language name="POV-Ray" version="1.1" kateversion="2.4" section="Other" extensions="*.inc;*.pov" mimetype="text/x-povray-script;text/x-povray-include" author="Christoph Hormann (chris_hormann@gmx.de)" license="LGPL" priority="2">
>+<language name="POV-Ray" version="1.1" kateversion="2.5" section="Other" extensions="*.inc;*.pov" mimetype="text/x-povray-script;text/x-povray-include" author="Christoph Hormann (chris_hormann@gmx.de)" license="LGPL" priority="2">
> 	<highlighting>
> 		<list name="keywords">
> 			<item> aa_threshold </item>
>diff -urN tdelibs/kate/data/ppd.xml tdelibs.new/kate/data/ppd.xml
>--- tdelibs/kate/data/ppd.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/ppd.xml	2013-12-26 13:26:41.147326601 -0600
>@@ -0,0 +1,48 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+
>+<!DOCTYPE language SYSTEM "language.dtd" []>
>+
>+
>+
>+<language name="PostScript Printer Description" version="0.1" kateversion="2.5" section="Markup" extensions="*.ppd" author="Lukas Sommer" mimetype="application/vnd.cups-ppd" license="public domain">
>+
>+    <highlighting>
>+
>+        <contexts>
>+            <context attribute="Option" lineEndContext="#stay" name="contextNormal">
>+                <Detect2Chars context="contextComment" char="*" char1="%" column="0"/>
>+                <DetectChar attribute="Colon" context="contextValue" char=":" />
>+                <StringDetect attribute="Keyword" String="*OpenUI" beginRegion="ui"/>
>+                <StringDetect attribute="Keyword" String="*CloseUI" endRegion="ui"/>
>+                <StringDetect attribute="Keyword" String="*OpenGroup" beginRegion="group"/>
>+                <StringDetect attribute="Keyword" String="*CloseGroup" endRegion="group"/>
>+                <RegExpr attribute="Keyword" String="\*[&#33;-&#46;&#48;-&#57;&#59;-&#126;]*"/> 
>+            </context>
>+            <context attribute="Comment" lineEndContext="#pop" name="contextComment">
>+                <IncludeRules context="##Alerts"/>
>+            </context>
>+            <context attribute="Value" lineEndContext="#pop" name="contextValue"></context>
>+        </contexts>
>+
>+        <itemDatas>
>+          <itemData name="Comment" defStyleNum="dsComment"/>
>+          <itemData name="Keyword" defStyleNum="dsKeyword"/>
>+          <itemData name="Colon"   defStyleNum="dsKeyword"/>
>+          <itemData name="Value"  defStyleNum="dsString"/>
>+          <itemData name="Option"  defStyleNum="dsOthers"/>
>+        </itemDatas>
>+
>+    </highlighting>
>+
>+    <general>
>+        <comments>
>+            <comment name="singleLine" start="*%"/>
>+        </comments>
>+    </general>
>+
>+</language>
>diff -urN tdelibs/kate/data/progress.xml tdelibs.new/kate/data/progress.xml
>--- tdelibs/kate/data/progress.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/progress.xml	2013-12-26 13:26:41.679324331 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="progress" version="1.10" kateversion="2.4" section="Database" extensions="*.p;*.w;*.i;*.cls;" author="Rares Stanciulescu (rstanciu@operamail.com)" license="GPL">
>+<language name="progress" version="1.10" kateversion="2.5" section="Database" extensions="*.p;*.w;*.i;*.cls;" author="Rares Stanciulescu (rstanciu@operamail.com)" license="GPL">
> 
> <highlighting>
> 
>diff -urN tdelibs/kate/data/prolog.xml tdelibs.new/kate/data/prolog.xml
>--- tdelibs/kate/data/prolog.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/prolog.xml	2013-12-26 13:26:41.093326833 -0600
>@@ -1,232 +1,1112 @@
>-<?xml version="1.0" encoding="UTF-8"?>
>-<!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Prolog" version="1.05" kateversion="2.1" section="Sources" extensions="*.prolog" mimetype="text/x-prolog">
>+ï»¿<?xml version="1.0" encoding="UTF-8"?>
>+
>+<!DOCTYPE language SYSTEM "language.dtd"
>+[
>+
>+
>+    <!ENTITY gr_char_iso    	"[#$&amp;*+\-./:&lt;=>?@^~\\]">
>+
>+
>+    <!ENTITY any_nw         "[^ \t]">
>+    <!ENTITY any            ".">
>+
>+
>+    <!ENTITY fullstop_iso          "\.(?!(\(|&gr_char_iso;))">
>+    <!ENTITY logic_control_ops_iso "(;|->|\\\+|:-|=|\\=)(?!&gr_char_iso;)">
>+
>+    
>+    <!ENTITY dcg_production_iso    "-->(?!&gr_char_iso;)">
>+
>+    
>+    <!ENTITY arith_compare_iso  "(=:=|=\\=|=&lt;|&lt;|>=|>)(?!&gr_char_iso;)">
>+    <!ENTITY arith_ops_mixed_iso      "(\+|-|\*|\^)(?!&gr_char_iso;)">
>+    <!ENTITY arith_ops_int_iso      "//(?!&gr_char_iso;)">
>+    <!ENTITY arith_ops_float_iso      "(/|\*\*)(?!&gr_char_iso;)">
>+    <!ENTITY arith_bogus_iso  "(/\\|\\/|\\|&lt;&lt;|>>)(?!&gr_char_iso;)">
>+
>+    
>+    <!ENTITY predefined_ops_iso "(\?-|==|\\==|@=&lt;|@&lt;|@>=|@>|=\.\.|@|:)(?!&gr_char_iso;)">
>+
>+    
>+    <!ENTITY float3_iso "[0-9]+E[+\-]?[0-9]+">
>+    <!ENTITY float2_iso "[0-9]+\.[0-9]+">
>+    <!ENTITY float1_iso "[0-9]+\.[0-9]+E[+\-]?[0-9]+">
>+
>+
>+    <!ENTITY esc_oct_iso	"\\[0-7]+\\">
>+    <!ENTITY esc_hex_iso	"\\x[a-fA-F0-9]+\\">
>+
>+
>+    
>+    <!ENTITY any_lower_iso         "abcdefghijklmnopqrstuvwxyz">
>+    <!ENTITY any_upper_under_iso   "ABCDEFGHIJKLMNOPQRSTUVWXYZ_">
>+    <!ENTITY any_bin_iso           "01">
>+    <!ENTITY any_oct_iso           "01234567">
>+    <!ENTITY any_dec_iso           "0123456789">
>+    <!ENTITY any_hex_iso           "0123456789abcdefABCDEF">
>+    <!ENTITY any_graphic_iso       "#$&amp;*+-./:&lt;=>?@^~\">
>+
>+    
>+    <!ENTITY any_esc_iso		"abfnrtv\'`&quot;]">
>+
>+    <!ENTITY dot        ".">
>+
>+    
>+    <!ENTITY comma	",">
>+    <!ENTITY cut        "!">
>+    <!ENTITY bar        "|">
>+    <!ENTITY tab	"	">
>+    <!ENTITY bs         "\">
>+]>
>+<language name="Prolog" section="Sources"
>+	  version="1.1" kateversion="2.5"
>+	  mimetype="text/x-prolog"
>+	  extensions="*.prolog;*.dcg;*.pro"
>+	  author="Torsten EichstÃ¤dt (torsten.eichstaedt@web.de)"
>+	  license="LGPL">
>+
>+
>+
>+
>     <highlighting>
>-        <list name="keywordl">
>-            <item> abstract </item>
>-            <item> align </item>
>-            <item> as </item>
>-            <item> and </item>
>-            <item> class </item>
>-            <item> clauses </item>
>-            <item> constants </item>
>-            <item> database </item>
>-            <item> determ </item>
>-            <item> domains </item>
>-            <item> elsedef </item>
>-            <item> endclass </item>
>-            <item> enddef </item>
>-            <item> erroneous </item>
>-            <item> facts </item>
>-            <item> failure </item>
>-            <item> global </item>
>-            <item> goal </item>
>-            <item> if </item>
>-            <item> ifdef </item>
>-            <item> ifndef </item>
>-            <item> implement </item>
>-            <item> include </item>
>-            <item> language </item>
>-            <item> multi </item>
>-            <item> nocopy </item>
>-            <item> nondeterm </item>
>-            <item> object </item>
>-            <item> or </item>
>-            <item> procedure </item>
>-            <item> protected </item>
>-            <item> predicates </item>
>-            <item> reference </item>
>-            <item> single </item>
>-            <item> static </item>
>-            <item> struct </item>
>-            <item> this </item>
>-        </list>
>+	
>+	<list name="error term ISO">
>+	    <item> error </item>
>+	</list>
>+	<list name="guru meditation terms ISO">
>+	    <item> instantiation_error </item>
>+	    <item> uninstantiation_error </item>
>+	    <item> type_error </item>
>+	    <item> domain_error </item>
>+	    <item> existence_error </item>
>+	    <item> permission_error </item>
>+	    <item> representation_error </item>
>+	    <item> evaluation_error </item>
>+	    <item> resource_error </item>
>+	    <item> syntax_error </item>
>+	    <item> system_error </item>
>+	</list>
> 
>-        <list name="keywordu">
>-            <item> ABSTRACT </item>
>-            <item> ALIGN </item>
>-            <item> AS </item>
>-            <item> AND </item>
>-            <item> CLASS </item>
>-            <item> CLAUSES </item>
>-            <item> CONSTANTS </item>
>-            <item> DATABASE </item>
>-            <item> DETERM </item>
>-            <item> DOMAINS </item>
>-            <item> ELSEDEF </item>
>-            <item> ENDCLASS </item>
>-            <item> ENDDEF </item>
>-            <item> ERRONEOUS </item>
>-            <item> FACTS </item>
>-            <item> FAILURE </item>
>-            <item> GLOBAL </item>
>-            <item> GOAL </item>
>-            <item> IF </item>
>-            <item> IFDEF </item>
>-            <item> IFNDEF </item>
>-            <item> IMPLEMENT </item>
>-            <item> INCLUDE </item>
>-            <item> LANGUAGE </item>
>-            <item> MULTI </item>
>-            <item> NOCOPY </item>
>-            <item> NONDETERM </item>
>-            <item> OBJECT </item>
>-            <item> OR </item>
>-            <item> PROCEDURE </item>
>-            <item> PROTECTED </item>
>-            <item> PREDICATES </item>
>-            <item> REFERENCE </item>
>-            <item> SINGLE </item>
>-            <item> STATIC </item>
>-            <item> STRUCT </item>
>-            <item> THIS </item>
>+	
>+	<list name="bogus ISO">
>+	    <item> char_conversion </item>
>+	    <item> current_char_conversion </item>
>+	    <item> include </item>
>+	    <item> ensure_loaded </item>
>+	    
>+	    <item> atan </item>
>+	    
>+	    <item> xor </item>
>+	</list>
>+	<list name="directives non-ISO">
>+	    
>+	    <item> consult </item>
>+	    <item> built_in </item>
>+
>+
>+
>+
>+
>+
>+
>         </list>
> 
>+        
>+        <list name="logic+control ISO">
>+	    <item> initialization </item>
>+
>+	    <item> fail </item>
>+	    <item> repeat </item>
>+	    <item> call </item>
>+            <item> catch </item>
>+	    <item> throw </item>
>+	    <item> true </item>
>+	    <item> false </item>
>+	    <item> once </item>
>+	</list>
> 
>-        <list name="special">
>-            <item> assert </item>
>-            <item> asserta </item>
>+	
>+        <list name="dyn clause mgmt ISO">
>+	    <item> dynamic </item>
>+	    <item> asserta </item>
>             <item> assertz </item>
>-            <item> bound </item>
>-            <item> chain_inserta </item>
>-            <item> chain_insertafter </item>
>-            <item> chain_insertz </item>
>-            <item> chain_terms </item>
>-            <item> consult </item>
>-            <item> db_btrees </item>
>-            <item> db_chains </item>
>-            <item> fail </item>
>-            <item> findall </item>
>-            <item> format </item>
>-            <item> free </item>
>-            <item> msgrecv </item>
>-            <item> msgsend </item>
>-            <item> nl </item>
>-            <item> not </item>
>-            <item> readterm </item>
>-            <item> ref_term </item>
>-            <item> retract </item>
>             <item> retractall </item>
>-            <item> save </item>
>-            <item> term_bin </item>
>-            <item> term_replace </item>
>-            <item> term_str </item>
>-            <item> trap </item>
>-            <item> write </item>
>-            <item> writef </item>
>-        </list>
>+	    <item> retract </item>
>+	    <item> abolish </item>
>+	    <item> clause </item>
>+
>+
>+	</list>
>+	<list name="listing non-ISO">
>+	    
>+	    <item> listing </item>
>+
>+	</list>
>+	<list name="terms ISO">
>+	    
>+	    <item> atom_concat </item>
>+	    <item> atom_length </item>
>+	    <item> atom_chars </item>
>+	    <item> atom_codes </item>
>+	    <item> arg </item>
>+	    <item> subsumes_term </item>
>+	    <item> acyclic_term </item>
>+	    <item> char_code </item>
>+	    <item> compare </item>
>+	    <item> copy_term </item>
>+	    <item> functor </item>
>+	    <item> number_chars </item>
>+	    <item> number_codes </item>
>+
>+	    <item> term_variables </item>
>+	    <item> unify_with_occurs_check </item>
>+	</list>
>+	<list name="terms non-ISO">
>+	    
>+	    <item> number_atom </item>
>+	    <item> expand_term </item>
>+	    <item> term_expansion </item>
> 
>-        <list name="compiler">
>-            <item> bgidriver </item>
>-            <item> bgifont </item>
>-            <item> check_determ </item>
>-            <item> code </item>
>-            <item> config </item>
>-            <item> diagnostics </item>
>-            <item> error </item>
>-            <item> errorlevel </item>
>-            <item> heap </item>
>-            <item> gstacksize </item>
>-            <item> nobreak </item>
>-            <item> nowarnings </item>
>-            <item> printermenu </item>
>-            <item> project </item>
>-        </list>
>+	    
>+	    <item> display </item>
>+	    <item> print </item>
>+	    <item> format </item>
>+	    <item> portray_clause </item>
>+	    <item> portray </item>
>+	    <item> term_expansion </item>
>+	</list>
>+	<list name="DCG non-ISO">
>+	    <item> phrase </item>
>+	</list>
>+	<list name="lists ISO">
>+	    <item> sort </item>
>+	    <item> keysort </item>
>+	</list>
>+	<list name="lists non-ISO">
>+	    <item> append </item>
>+	    <item> delete </item>
>+	    <item> length </item>
>+	    <item> last </item>
>+	    <item> map_list </item>
>+	    <item> min_list </item>
>+	    <item> maplist </item>
>+	    <item> msort </item>
>+	    <item> memberchk </item>
>+	    <item> member </item>
>+	    <item> nth </item>
>+	    <item> permutation </item>
>+	    <item> reverse </item>
>+	    <item> select </item>
>+	    <item> prefix </item>
>+	    <item> suffix </item>
>+	    <item> sublist </item>
>+	    <item> sum_list </item>
>+	</list>
>+	<list name="streams ISO">
>+	    <item> open </item>
>+
>+	    <item> set_stream_position </item>
>+	    <item> get_char </item>
>+	    <item> get_code </item>
>+	    <item> peek_char </item>
>+	    <item> peek_code </item>
>+	    <item> get_byte </item>
>+	    <item> peek_byte </item>
> 
>-        <list name="arith">
>-            <item> mod </item>
>-            <item> div </item>
>-            <item> abs </item>
>-            <item> exp </item>
>-            <item> ln </item>
>+	    <item> put_char </item>
>+	    <item> put_code </item>
>+	    <item> put_byte </item>
>+	    <item> nl </item>
>+
>+	    <item> read_term </item>
>+	    <item> read </item>
>+	    <item> write_canonical </item>
>+	    <item> writeq </item>
>+	    <item> write </item>
>+	</list>
>+	<list name="streams deprecated">
>+	    <item> append </item>
>+	    <item> seeing </item>
>+	    <item> seen </item>
>+	    <item> see </item>
>+	    <item> telling </item>
>+	    <item> tell </item>
>+	    <item> told </item>
>+	    <item> get0 </item>
>+	    <item> get </item>
>+	    <item> skip </item>
>+	    <item> put </item>
>+	    <item> tab </item>
>+	</list>
>+	<list name="arith eval ISO">
>+	    <item> is </item>
>+	</list>
>+	<list name="arith ops int ISO">
>+	    <item> rem </item>
>+	    <item> mod </item>
>+	    <item> div </item>
>+	</list>
>+        <list name="arith expr mixed ISO">
>+
>+
>+	    <item> abs </item>
>+	    <item> sign </item>
>+	    <item> min </item>
>+	    <item> max </item>
>+        </list>
>+        <list name="arith expr int ISO">
>+
>+
>+	    <item> ceiling </item>
>+	    <item> floor </item>
>+	    <item> round </item>
>+            <item> truncate </item>
>+
>+        </list>
>+        <list name="arith expr float ISO">
>+	    <item> pi </item>
>+
>+
>+	    <item> sqrt </item>
>+	    <item> tan </item>
>+	    <item> cos </item>
>+	    <item> sin </item>
>+	    <item> atan2 </item>
>+	    <item> acos </item>
>+	    <item> asin </item>
>+	    <item> exp </item>
>             <item> log </item>
>-            <item> sqrt </item>
>-            <item> round </item>
>-            <item> trunc </item>
>-            <item> val </item>
>-            <item> cos </item>
>-            <item> sin </item>
>-            <item> tan </item>
>-            <item> arctan </item>
>-            <item> random </item>
>-            <item> randominit </item>
>+	    <item> float </item>
>+	    <item> float_fractional_part </item>
>+            <item> float_integer_part </item>
>         </list>
> 
>-        <list name="basetype">
>-            <item> char </item>
>-            <item> real </item>
>-            <item> string </item>
>-            <item> symbol </item>
>-            <item> byte </item>
>-            <item> sbyte </item>
>-            <item> short </item>
>-            <item> ushort </item>
>-            <item> word </item>
>-            <item> integer </item>
>-            <item> unsigned </item>
>-            <item> dword </item>
>-            <item> long </item>
>-            <item> ulong </item>
>-            <item> binary </item>
>-            <item> ref </item>
>-        </list>
>+	
>+	<list name="prolog state ISO">
>+	    <item> multifile </item>
>+	    <item> discontigous </item>
>+	    <item> op </item>
>+	    <item> set_prolog_flag </item>
>+	</list>
>+	<list name="types ISO">
>+	    <item> var </item>
>+	    <item> nonvar </item>
>+	    <item> atom </item>
>+	    <item> integer </item>
>+	    <item> float </item>
>+	    <item> number </item>
>+	    <item> atomic </item>
>+	    <item> compound </item>
>+	    <item> callable </item>
>+	    <item> ground </item>
>+	</list>
>+	
>+	<list name="list+is_list non-ISO">
>+	    <item> list </item>
>+	    <item> is_list </item>
>+	
>+	    
>+	</list>
>+	<list name="built-ins ISO">
>+	    <item> current_op </item>
>+	    <item> current_prolog_flag </item>
>+	    <item> current_input </item>
>+	    <item> current_output </item>
> 
>-        <list name="keywords">
>-            <item> true </item>
>-            <item> false </item>
>-        </list>
>+	    
>+	    <item> set_input </item>
>+	    <item> set_output </item>
> 
>-        <contexts>
>-            <context name="normal" attribute="Symbol" lineEndContext="#stay">
>-                <keyword attribute="Keyword" context="#stay"  String="keywordl"/>
>-                <keyword attribute="Keyword" context="#stay"  String="keywordu"/>
>-                <keyword attribute="Arithmetic" context="#stay"  String="arith"/>
>-                <keyword attribute="Keyword" context="#stay"  String="compiler"/>
>-                <keyword attribute="Keyword" context="#stay"  String="special"/>
>-                <keyword attribute="Data Type" context="#stay"  String="basetype"/>
>-                <RegExpr String = "[A-Z_][A-Za-z0-9_]*" attribute = "Variable" context="#stay"/>
>-                <RegExpr String = "[a-z][A-Za-z0-9_]*" attribute = "Identifier" context="#stay"/>
>-                <DetectChar attribute="Comment" context="comment" char="%"/>
>-                <Detect2Chars attribute="Comment" context="comment region" char="/" char1="*"/>
>-                <Int attribute="Integer" context="#stay" />
>-                <DetectChar attribute="String" context="string" char="&quot;" />
>-                <DetectChar attribute="String" context="string2" char="'" />
>-                <AnyChar attribute="Symbol" context="#stay" String="~!^*()-+=[]|\:;,./?&amp;&lt;&gt;" />
>-            </context>
>-            <context name="comment" attribute="Comment" lineEndContext="#pop" />
>-            <context name="string" attribute="String" lineEndContext="#stay" >
>-                <HlCStringChar attribute="String" context="#stay" />
>-                <DetectChar attribute="String" context="#pop" char="&quot;" />
>-            </context>
>-            <context name="string2" attribute="String" lineEndContext="#stay">
>-                <HlCChar attribute="String" context="#stay" />
>-                <DetectChar attribute="String" context="#pop" char="'" />
>-            </context>
>-            <context name="comment region" attribute="Comment" lineEndContext="#stay">
>-                <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" />
>-            </context>
>-        </contexts>
>-        <itemDatas>
>-            <itemData name="Normal Text" defStyleNum="dsNormal" />
>-            <itemData name="Keyword" defStyleNum="dsKeyword" />
>-            <itemData name="Data Type" defStyleNum="dsDataType" />
>-            <itemData name="Comment" defStyleNum="dsComment" />
>-            <itemData name="Integer" defStyleNum="dsDecVal" />
>-            <itemData name="Symbol" defStyleNum="dsNormal" />
>-            <itemData name="String"  defStyleNum="dsString"/>
>-            <itemData name="Identifier"  defStyleNum="dsNormal"/>
>-            <itemData name="Variable"  defStyleNum="dsOthers"/>
>-            <itemData name="Arithmetic" defStyleNum="dsKeyword" />
>+	    
>+	    <item> close </item>
> 
>-        </itemDatas>
>-    </highlighting>
>-  <general>
>-    <keywords casesensitive="1" />
>-    <comments>
>-      <comment name="singleLine" start="%" />
>-      <comment name="multiLine" start="/*" end="*/" />
>-    </comments>
>+	    <item> flush_output </item>
>+
>+	    
>+	    <item> at_end_of_stream </item>
>+
>+	    <item> stream_property </item>
>+	</list>
>+
>+	
>+	<contexts>
>+	
>+	    
>+	    <context name="shebang" lineEndContext="clause" attribute="Syntax Error" >
>+		
>+		<Detect2Chars column="0" char="#" char1="!" context="1-comment" attribute="% italic predicates: w/ side effects" />
>+		
>+		<RegExpr String="&any;" lookAhead="true" context="clause" attribute="Syntax Error" />
>+	    </context>
>+
>+	    
>+	    <context name="syntax_error" lineEndContext="#stay" attribute="Syntax Error" noIndentationBasedFolding="true" >
>+		<DetectSpaces context="#pop" attribute="Syntax Error" />
>+		<DetectIdentifier context="#pop" attribute="Syntax Error" />
>+		<RegExpr String="&any;" context="#pop" attribute="Syntax Error" />
>+	    </context>
>+
>+	    
>+
>+	    <context name="clause" lineEndContext="#stay" attribute="Syntax Error" >
>+		<IncludeRules context="layout" />
>+		
>+		<RegExpr String="&fullstop_iso;" context="#stay" attribute="Warning (!use background)" />
>+
>+		<RegExpr lookAhead="true" String="&any;" context="term" beginRegion="clause" attribute="Syntax Error" />
>+	    </context>
> 
>-  </general>
>+	    
>+	    
>+	    <context name="term" lineEndContext="#stay" attribute="Syntax Error" noIndentationBasedFolding="true" >
>+		<IncludeRules context="layout" />
>+		<DetectChar char="(" context="nested" beginRegion="nested" attribute="( ) [ ]" />
>+		<DetectChar char="[" context="list" beginRegion="list" attribute="( ) [ ]" />
>+		<DetectChar char="{" context="curly" beginRegion="curly" attribute="{ DCG }" />
>+		<DetectChar char="&comma;" context="#stay" attribute="Logic &amp; Control" />
>+		<DetectChar char="&cut;" context="#stay" attribute="Logic &amp; Control" />
>+		<DetectChar char="&bar;" context="#stay" attribute="Normal Text" />
>+		
>+		<Detect2Chars lookAhead="true" char="&dot;" char1="(" context="list_functor" attribute="Syntax Error" />
>+
>+		<RegExpr String="&fullstop_iso;" context="#pop" endRegion="clause" attribute="Logic &amp; Control" />
>+		<IncludeRules context="atomic" />
>+		
>+	    </context>
>+	    <context name="nested" lineEndContext="#stay" attribute="Syntax Error" noIndentationBasedFolding="true" >
>+		<IncludeRules context="layout" />
>+		<DetectChar char=")" context="#pop" endRegion="nested" attribute="( ) [ ]" />
>+		<DetectChar char="(" context="nested" beginRegion="nested" attribute="( ) [ ]" />
>+		<DetectChar char="[" context="list" beginRegion="list" attribute="( ) [ ]" />
>+		<DetectChar char="{" context="curly" beginRegion="curly" attribute="{ DCG }" />
>+		<DetectChar char="&cut;" context="#stay" attribute="Logic &amp; Control" />
>+		<DetectChar char="&comma;" context="#stay" attribute="Logic &amp; Control" />
>+		<DetectChar char="&bar;" context="#stay" attribute="Normal Text" />
>+		<Detect2Chars lookAhead="true" char="&dot;" char1="(" context="list_functor" attribute="Normal Text" />
>+		<RegExpr String="&fullstop_iso;" context="#stay" attribute="Warning (!use background)" />
>+		<IncludeRules context="atomic" />
>+	    </context>
>+	    <context name="list" lineEndContext="#stay" attribute="Syntax Error" noIndentationBasedFolding="true" >
>+		<IncludeRules context="layout" />
>+		<DetectChar char="(" context="nested" beginRegion="nested" attribute="( ) [ ]" />
>+		<DetectChar char="]" context="#pop" endRegion="list" attribute="( ) [ ]" />
>+		<DetectChar char="[" context="list" beginRegion="list" attribute="( ) [ ]" />
>+		<DetectChar char="{" context="curly" beginRegion="curly" attribute="( ) [ ]" />
>+		<DetectChar char="&comma;" context="#stay" attribute="Normal Text" />
>+		<DetectChar char="&cut;" context="#stay" attribute="Normal Text" />
>+		<DetectChar char="&bar;" context="#stay" attribute="other built-in operator" />
>+		<Detect2Chars lookAhead="true" char="&dot;" char1="(" context="list_functor" attribute="Normal Text" />
>+		<RegExpr String="&fullstop_iso;" context="#stay" attribute="Warning (!use background)" />
>+		<IncludeRules context="atomic" />
>+	    </context>
>+	    <context name="curly" lineEndContext="#stay" attribute="Syntax Error" noIndentationBasedFolding="true" >
>+		<IncludeRules context="layout" />
>+		<DetectChar char="(" context="nested" beginRegion="nested" attribute="( ) [ ]" />
>+		<DetectChar char="[" context="list" beginRegion="list" attribute="( ) [ ]" />
>+		<DetectChar char="}" context="#pop" endRegion="curly" attribute="{ DCG }" />
>+		<DetectChar char="{" context="curly" beginRegion="curly" attribute="{ DCG }" />
>+		<DetectChar char="&comma;" context="#stay" attribute="Logic &amp; Control" />
>+		<DetectChar char="&cut;" context="#stay" attribute="Logic &amp; Control" />
>+		<DetectChar char="&bar;" context="#stay" attribute="Normal Text" />
>+		<Detect2Chars lookAhead="true" char="&dot;" char1="(" context="list_functor" attribute="Normal Text" />
>+		<RegExpr String="&fullstop_iso;" context="#stay" attribute="Warning (!use background)" />
>+		<IncludeRules context="atomic" />
>+	    </context>
>+
>+	    
>+	    <context name="arith_expr" lineEndContext="#stay" attribute="Syntax Error" noIndentationBasedFolding="true" >
>+		<DetectChar char="(" context="nested_expr" beginRegion="nested" attribute="( ) [ ]" />
>+		<DetectChar lookAhead="true" char=")" context="#pop" attribute="( ) [ ]" />
>+		<DetectChar lookAhead="true" char="}" context="#pop" attribute="{ DCG }" />
>+		<DetectChar lookAhead="true" char="]" context="#pop" attribute="( ) [ ]" />
>+		
>+		<DetectChar lookAhead="true" char="&cut;" context="#pop" attribute="Logic &amp; Control" />
>+		<DetectChar lookAhead="true" char="&comma;" context="#pop" attribute="Logic &amp; Control" />
>+		
>+		<DetectChar lookAhead="true" char="&bar;" context="#pop" attribute="other built-in operator" />
>+		<RegExpr lookAhead="true" String="&fullstop_iso;" context="#pop" attribute="Logic &amp; Control" />
>+		<RegExpr lookAhead="true" String="&logic_control_ops_iso;" context="#pop" attribute="Logic &amp; Control" />
>+		<IncludeRules context="arith_expr_common" />
>+	    </context>
>+	    <context name="nested_expr" lineEndContext="#stay" attribute="Syntax Error" noIndentationBasedFolding="true" >
>+		<DetectChar char="(" context="nested_expr" beginRegion="nested" attribute="( ) [ ]" />
>+		<DetectChar char=")" context="#pop" endRegion="nested" attribute="( ) [ ]" />
>+		
>+		<DetectChar char="&cut;" context="#stay" attribute="Normal Text" />
>+		<DetectChar char="&comma;" context="#stay" attribute="Syntax Error" />
>+		
>+		<DetectChar char="&bar;" context="#stay" attribute="Normal Text" />
>+		<RegExpr String="&fullstop_iso;" context="#stay" attribute="Warning (!use background)" />
>+		<RegExpr String="&logic_control_ops_iso;" context="#stay" attribute="other built-in operator" />
>+		<IncludeRules context="arith_expr_common" />
>+	    </context>
>+
>+	    
>+	    <context name="list_functor" lineEndContext="syntax_error" attribute="Syntax Error" >
>+		<DetectChar char="&dot;" context="#pop" attribute="other built-in predicate" />
>+	    </context>
>+
>+	    
>+	    <context name="sq" lineEndContext="#stay" attribute="'quo Ted'" noIndentationBasedFolding="true">
>+
>+		<IncludeRules context="quoted_1st"/>
>+		
>+		<RegExpr String="(''|&esc_oct_iso;|&esc_hex_iso;|\\&any;|[^'\\]+)$"
>+			context="syntax_error_sq" attribute="Syntax Error" />
>+		
>+		<Detect2Chars char="'" char1="'" context="#stay" attribute="escaped (!use background)" />
>+		<DetectChar char="'" context="#pop#pop" endRegion="quoted" attribute="'quo Ted'" />
>+		<IncludeRules context="quoted_last"/>
>+		
>+	    </context>
>+	    <context name="dq" lineEndContext="#stay" attribute="&quot;double-quoted&quot;" noIndentationBasedFolding="true" >
>+
>+		<IncludeRules context="quoted_1st"/>
>+		<RegExpr String="(&quot;&quot;|&esc_oct_iso;|&esc_hex_iso;|\\&any;|[^&quot;\\]+)$"
>+			context="syntax_error_dq" attribute="Syntax Error" />
>+		<Detect2Chars char="&quot;" char1="&quot;" context="#stay" attribute="escaped (!use background)" />
>+		<DetectChar char="&quot;" context="#pop#pop" endRegion="quoted" attribute="&quot;double-quoted&quot;" />
>+		<IncludeRules context="quoted_last"/>
>+	    </context>
>+	    <context name="bq" lineEndContext="#stay" attribute="`back-quoted`" noIndentationBasedFolding="true" >
>+
>+		<IncludeRules context="quoted_1st"/>
>+		<RegExpr String="(``|&esc_oct_iso;|&esc_hex_iso;|\\&any;|[^`\\]+)$"
>+			context="syntax_error_bq" attribute="Syntax Error" />
>+		<Detect2Chars char="`" char1="`" attribute="escaped (!use background)" />
>+		<DetectChar char="`" context="#pop#pop" endRegion="quoted" attribute="`back-quoted`" />
>+		<IncludeRules context="quoted_last"/>
>+	    </context>
>+	    <context name="single-quoted" lineEndContext="#stay" attribute="'quo Ted'" >
>+		<RegExpr String="'$" context="sq" beginRegion="quoted" attribute="Syntax Error" />
>+		<DetectChar char="'" context="sq" beginRegion="quoted" attribute="'quo Ted'" />
>+	    </context>
>+	    <context name="double-quoted" lineEndContext="#stay" attribute="&quot;double-quoted&quot;" >
>+		<RegExpr String="&quot;$" context="dq" beginRegion="quoted" attribute="Syntax Error" />
>+		<DetectChar char="&quot;" context="dq" beginRegion="quoted" attribute="&quot;double-quoted&quot;" />
>+	    </context>
>+	    <context name="back-quoted" lineEndContext="#stay" attribute="`back-quoted`" >
>+		<RegExpr String="`$" context="bq" beginRegion="quoted" attribute="Syntax Error" />
>+		<DetectChar char="`" context="bq" beginRegion="quoted" attribute="`back-quoted`" />
>+	    </context>
>+
>+	    
>+	    <context name="syntax_error_sq" lineEndContext="#stay" attribute="Syntax Error" noIndentationBasedFolding="true" >
>+		<Detect2Chars char="\" char1="'" context="#pop" attribute="Syntax Error" />
>+		<Detect2Chars char="'" char1="'" context="#pop" attribute="Syntax Error" />
>+		<DetectChar char="'" context="#pop#pop#pop" endRegion="quoted" attribute="Syntax Error" />
>+		<IncludeRules context="syntax_error"/>
>+	    </context>
>+	    <context name="syntax_error_dq" lineEndContext="#stay" attribute="Syntax Error" noIndentationBasedFolding="true" >
>+		<Detect2Chars char="\" char1="&quot;" context="#pop" attribute="Syntax Error" />
>+		<Detect2Chars char="&quot;" char1="&quot;" context="#pop" attribute="Syntax Error" />
>+		<DetectChar char="&quot;" context="#pop#pop#pop" endRegion="quoted" attribute="Syntax Error" />
>+		<IncludeRules context="syntax_error"/>
>+	    </context>
>+	    <context name="syntax_error_bq" lineEndContext="#stay" attribute="Syntax Error" noIndentationBasedFolding="true" >
>+		<Detect2Chars char="\" char1="`" context="#pop" attribute="Syntax Error" />
>+		<Detect2Chars char="`" char1="`" context="#pop" attribute="Syntax Error" />
>+		<DetectChar char="`" context="#pop#pop#pop" endRegion="quoted" attribute="Syntax Error" />
>+		<IncludeRules context="syntax_error"/>
>+	    </context>
>+
>+	    
>+	    <context name="char_code" lineEndContext="#pop" attribute="Syntax Error" >
>+		<Detect2Chars char="'" char1="'" context="#pop" attribute="escaped (!use background)" />
>+		<DetectChar char="'" context="#pop" attribute="Syntax Error" />
>+		<DetectChar char="&bs;" context="esc_seq_cc" attribute="escaped (!use background)" />
>+		<DetectChar char="&tab;" context="#pop" attribute="Warning (!use background)" />
>+		
>+		<RegExpr String="&any;" context="#pop" attribute="0'a (!use background)" />
>+	    </context>
>+	    
>+	    <context name="syntax_error_cc" lineEndContext="#stay" attribute="Syntax Error"
>+		    fallthrough="true" fallthroughContext="#pop" >
>+		<DetectSpaces context="#pop" attribute="Syntax Error" />
>+	    </context>
>+
>+	    
>+	    <context name="esc_seq_q" lineEndContext="syntax_error" attribute="Syntax Error" >
>+		<RegExpr String="&esc_oct_iso;" context="#pop" attribute="0'a (!use background)" />
>+		<RegExpr String="&esc_hex_iso;" context="#pop" attribute="0'a (!use background)" />
>+		<DetectChar char="&bs;" context="esc_seq_q2" attribute="escaped (!use background)" />
>+	    </context>
>+	    
>+	    <context name="esc_seq_cc" fallthrough="true" fallthroughContext="#pop"
>+		    lineEndContext="#pop#pop" attribute="Syntax Error" >
>+		<DetectChar char="&tab;" context="#pop#pop" attribute="Warning (!use background)" />
>+		<AnyChar String="&any_esc_iso;" context="#pop#pop" attribute="escaped (!use background)" />
>+	    </context>
>+	    
>+	    <context name="esc_seq_q2" fallthrough="true" fallthroughContext="#pop#pop"
>+		    lineEndContext="syntax_error" attribute="Syntax Error" >
>+		<DetectChar char="&tab;" context="#pop#pop" attribute="Warning (!use background)" />
>+		<AnyChar String="&any_esc_iso;" context="#pop#pop" attribute="escaped (!use background)" />
>+	    </context>
>+
>+	    
>+	    <context name="id" attribute="Syntax Error" >
>+		<DetectIdentifier context="#pop" attribute="Normal Text" />
>+	    </context>
>+	    <context name="var" attribute="Syntax Error" >
>+		<DetectIdentifier context="#pop" attribute="_VARIABLE" />
>+	    </context>
>+	    <context name="graphic" lineEndContext="#pop" attribute="Syntax Error" fallthrough="true" fallthroughContext="#pop" >
>+		<AnyChar String="&any_graphic_iso;" context="#stay" attribute="Normal Text" />
>+	    </context>
>+
>+	    
>+	    <context name="bin" lineEndContext="#pop" attribute="Syntax Error" fallthrough="true" fallthroughContext="#pop" >
>+		<AnyChar String="&any_bin_iso;" context="#stay" attribute="0b1001 0o007 0xF1" />
>+	    </context>
>+	    <context name="oct" lineEndContext="#pop" attribute="Syntax Error" fallthrough="true" fallthroughContext="#pop" >
>+		<AnyChar String="&any_oct_iso;" context="#stay" attribute="0b1001 0o007 0xF1" />
>+	    </context>
>+	    <context name="hex" lineEndContext="#pop" attribute="Syntax Error" fallthrough="true" fallthroughContext="#pop" >
>+		<AnyChar String="&any_hex_iso;" context="#stay" attribute="0b1001 0o007 0xF1" />
>+	    </context>
>+
>+	    
>+	    <context name="comment-iso" lineEndContext="#stay" attribute="% italic predicates: w/ side effects" >
>+	    
>+		<Detect2Chars char="*" char1="/" context="#pop" endRegion="comment"
>+			    attribute="% italic predicates: w/ side effects" />
>+		<DetectSpaces />
>+		<IncludeRules context="##Alerts_indent" />
>+		<DetectIdentifier />
>+	    </context>
>+
>+	    
>+	    
>+	    <context name="1-comment" lineEndContext="#pop" attribute="% italic predicates: w/ side effects" >
>+		<DetectSpaces />
>+		<IncludeRules context="##Alerts_indent" />
>+		<DetectIdentifier />
>+	    </context>
>+	    <context name="region_marker" lineEndContext="#pop" attribute="%BEGIN folding region" noIndentationBasedFolding="true" >
>+		<IncludeRules context="1-comment" />
>+	    </context>
>+	    <context name="layout_fold" lineEndContext="#stay" attribute="Syntax Error"
>+		    fallthrough="true" fallthroughContext="#pop" >
>+		<DetectSpaces attribute="Normal Text" />
>+		<StringDetect String="%BEGIN" context="region_marker" attribute="%BEGIN folding region"
>+			    firstNonSpace="true" beginRegion="user_region" />
>+		<StringDetect String="%END" context="region_marker" attribute="%BEGIN folding region"
>+			    firstNonSpace="true" endRegion="user_region" />
>+		<DetectChar firstNonSpace="true" char="%" context="1-comment" attribute="% italic predicates: w/ side effects" />
>+	    </context>
>+
>+
>+
>+	    
>+	    <context name="quoted_1st" lineEndContext="#stay" attribute="Syntax Error" >
>+		<LineContinue attribute="escaped (!use background)" />
>+		<DetectSpaces column="0" attribute="escaped (!use background)" />
>+	    </context>
>+	    <context name="quoted_last" lineEndContext="#stay" attribute="Syntax Error" >
>+		<DetectChar lookAhead="true" char="&bs;" context="esc_seq_q" attribute="Syntax Error" />
>+		<DetectChar char="&tab;" attribute="Warning (!use background)" />
>+		<DetectIdentifier />
>+		<DetectSpaces />
>+	    </context>
>+
>+	    
>+	    <context name="layout" lineEndContext="#stay" attribute="Syntax Error" >
>+		<DetectSpaces attribute="Normal Text" />
>+		<Detect2Chars char="/" char1="*" context="comment-iso" attribute="% italic predicates: w/ side effects"
>+			    beginRegion="comment" />
>+		<StringDetect String="%BEGIN" context="region_marker" attribute="%BEGIN folding region"
>+			    firstNonSpace="true" beginRegion="user_region" />
>+		<StringDetect String="%END" context="region_marker" attribute="%BEGIN folding region"
>+			    firstNonSpace="true" endRegion="user_region" />
>+		<DetectChar firstNonSpace="true" char="%" context="layout_fold" attribute="% italic predicates: w/ side effects"
>+			    lookAhead="true" />
>+		<DetectChar firstNonSpace="false" char="%" context="1-comment" attribute="% italic predicates: w/ side effects" />
>+	    </context>
>+
>+	    
>+	    
>+	    <context name="atomic" lineEndContext="#stay" attribute="Syntax Error" >
>+		
>+		<keyword String="logic+control ISO" context="#stay" attribute="Logic &amp; Control" />
>+		<keyword String="types ISO" context="#stay" attribute="Type Checking" />
>+		<keyword String="dyn clause mgmt ISO" context="#stay" attribute="Dynamic Clause Management" />
>+		<keyword String="streams ISO" context="#stay" attribute="Stream I/O" />
>+		<keyword String="terms ISO" context="#stay" attribute="other built-in predicate" />
>+		<keyword String="prolog state ISO" context="#stay" attribute="Prolog State" />
>+		<keyword String="DCG non-ISO" context="#stay" attribute="{ DCG }" />
>+		<keyword String="arith eval ISO" context="arith_expr" attribute="Arithmetics" />
>+		
>+
>+
>+
>+		<keyword String="built-ins ISO" context="#stay" attribute="other built-in predicate" />
>+		<keyword String="error term ISO" context="#stay" attribute="Guru Meditation" />
>+		<keyword String="guru meditation terms ISO" context="#stay" attribute="Guru Meditation Terms" />
>+		<keyword String="bogus ISO" context="#stay" attribute="ISO Bogus" />
>+
>+		
>+ 		<IncludeRules context="number" />
>+
>+		
>+		<DetectChar lookAhead="true" char="'" context="single-quoted" attribute="'quo Ted'" />
>+		<DetectChar lookAhead="true" char="`" context="back-quoted" attribute="`back-quoted`" />
>+		<DetectChar lookAhead="true" char="&quot;" context="double-quoted" attribute="&quot;double-quoted&quot;" />
>+
>+		
>+ 		<IncludeRules context="operator" />
>+		<AnyChar lookAhead="true" String="&any_lower_iso;" context="id" attribute="Normal Text" />
>+		<AnyChar lookAhead="true" String="&any_upper_under_iso;" context="var" attribute="_VARIABLE" />
>+		<AnyChar String="&any_graphic_iso;" context="graphic" attribute="Normal Text" />
>+	    </context> 
>+
>+	    
>+	    <context name="arith_expr_common" lineEndContext="#stay" attribute="Syntax Error" >
>+		<IncludeRules context="layout" />
>+		<IncludeRules context="number" />
>+		<keyword String="arith eval ISO" context="#pop" attribute="Syntax Error" />
>+		<keyword String="bogus ISO" context="#stay" attribute="ISO bogus" />
>+		<keyword String="arith expr mixed ISO" context="#stay" attribute="Arithmetics" />
>+		<keyword String="arith expr int ISO" context="#stay" attribute="Integer Arithmetics" />
>+		<keyword String="arith expr float ISO" context="#stay" attribute="Float Arithmetics" />
>+		<keyword String="arith ops int ISO" context="#stay" attribute="Integer Arithmetics" />
>+		<RegExpr String="&arith_compare_iso;" context="#pop" attribute="Syntax Error" />
>+		<RegExpr String="&arith_ops_mixed_iso;" context="#stay" attribute="Arithmetics" />
>+		<RegExpr String="&arith_ops_int_iso;" context="#stay" attribute="Integer Arithmetics" />
>+		<RegExpr String="&arith_ops_float_iso;" context="#stay" attribute="Float Arithmetics" />
>+		<RegExpr String="&arith_bogus_iso;" context="#stay" attribute="ISO bogus" />
>+		
>+ 		<IncludeRules context="operator" />
>+		<AnyChar lookAhead="true" String="&any_lower_iso;" context="id" attribute="Normal Text" />
>+		<AnyChar lookAhead="true" String="&any_upper_under_iso;" context="var" attribute="_VARIABLE" />
>+		<AnyChar String="&any_graphic_iso;" context="graphic" attribute="Normal Text" />
>+	    </context>
>+
>+	    
>+	    <context name="number" lineEndContext="#pop" attribute="Syntax Error" >
>+		
>+		
>+		<RegExpr String="0'\\?$" context="syntax_error_cc" attribute="Syntax Error" />
>+		<Detect2Chars char="0" char1="'" context="char_code" attribute="0'a (!use background)" />
>+
>+
>+		<Detect2Chars char="0" char1="b" context="bin" attribute="0b1001 0o007 0xF1" />
>+		<Detect2Chars char="0" char1="o" context="oct" attribute="0b1001 0o007 0xF1" />
>+		<Detect2Chars char="0" char1="x" context="hex" attribute="0b1001 0o007 0xF1" />
>+
>+		<RegExpr String="&float1_iso;" context="#stay" attribute="2.718281E-9" />
>+		<RegExpr String="&float2_iso;" context="#stay" attribute="2.718281E-9" />
>+		<RegExpr String="&float3_iso;" context="#stay" attribute="2.718281E-9" />
>+		<Int context="#stay" attribute="1  2  3  42" />
>+	    </context>
>+
>+	    
>+	    <context name="operator" lineEndContext="#pop" attribute="Syntax Error" >
>+		<keyword String="arith eval ISO" context="arith_expr" attribute="Arithmetics" />
>+		<keyword String="arith ops int ISO" context="#stay" attribute="other built-in operator" />
>+		<RegExpr String="&logic_control_ops_iso;" context="#stay" attribute="Logic &amp; Control" />
>+		<RegExpr String="&predefined_ops_iso;" context="#stay" attribute="other built-in operator" />
>+		<RegExpr String="&dcg_production_iso;" context="#stay" attribute="{ DCG }" />
>+		<RegExpr String="&arith_compare_iso;" context="arith_expr" attribute="Arithmetics" />
>+		<RegExpr String="&arith_ops_mixed_iso;" context="#stay" attribute="other built-in operator" />
>+		<RegExpr String="&arith_ops_int_iso;" context="#stay" attribute="other built-in operator" />
>+		<RegExpr String="&arith_ops_float_iso;" context="#stay" attribute="other built-in operator" />
>+		<RegExpr String="&arith_bogus_iso;" context="#stay" attribute="ISO bogus" />
>+	    </context>
>+
>+
>+	</contexts>
>+
>+	
>+	<itemDatas>
>+	    <itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false" />
>+	    <itemData name="_VARIABLE" defStyleNum="dsDataType" bold="false" spellChecking="false" />
>+	    <itemData name="'quo  Ted'" defStyleNum="dsString" />
>+	    <itemData name="`back-quoted`" defStyleNum="dsString" italic="true" />
>+	    
>+	    <itemData name="&quot;double-quoted&quot;" defStyleNum="dsOthers" />
>+	    <itemData name="escaped (!use background)" defStyleNum="dsChar" spellChecking="false"
>+			 backgroundColor="#0C0C0C" selBackgroundColor="#FFFFFF" />
>+
>+	    
>+	    <itemData name="2.718281E-9" defStyleNum="dsFloat" spellChecking="false" />
>+	    <itemData name="1  2  3  42" defStyleNum="dsDecVal" spellChecking="false" />
>+	    <itemData name="0b1001 0o007 0xF1" defStyleNum="dsBaseN" spellChecking="false" />
>+	    <itemData name="0'a (!use background)" defStyleNum="dsBaseN" spellChecking="false"
>+			 backgroundColor="#0C0C0C" selBackgroundColor="#FFFFFF" />
>+
>+	    <itemData name="( ) [ ]" defStyleNum="dsNormal" spellChecking="false" />
>+	    <itemData name="{ DCG }" defStyleNum="dsKeyword" spellChecking="false" />
>+	    <itemData name="Prolog State" defStyleNum="dsFunction" bold="true" spellChecking="false" />
>+	    <itemData name="Type Checking" defStyleNum="dsDataType" spellChecking="false" />
>+	    <itemData name="Logic &amp; Control" defStyleNum="dsKeyword" spellChecking="false" />
>+	    <itemData name="other built-in operator" defStyleNum="dsFunction" spellChecking="false" />
>+	    <itemData name="other built-in predicate" defStyleNum="dsFunction" spellChecking="false" />
>+
>+	    
>+	    <itemData name="% italic predicates: w/ side effects" defStyleNum="dsComment" />
>+	    <itemData name="/* !avoid leading * to have folding */" defStyleNum="dsComment" />
>+
>+	    
>+	    <itemData name="Dynamic Clause Management" defStyleNum="dsKeyword" italic="true" spellChecking="false" />
>+	    <itemData name="Stream I/O" defStyleNum="dsFunction" italic="true" spellChecking="false" />
>+
>+	    
>+	    <itemData name="Arithmetics" defStyleNum="dsDataType" bold="true" italic="true" spellChecking="false" />
>+	    <itemData name="Integer Arithmetics" defStyleNum="dsDecVal" bold="true" italic="true" spellChecking="false" />
>+	    <itemData name="Float Arithmetics" defStyleNum="dsFloat" bold="true" italic="true" spellChecking="false" />
>+	    <itemData name="ISO Bogus" defStyleNum="dsAlert" bold="true" italic="true" spellChecking="false" />
>+
>+	    
>+	    <itemData name="Guru Meditation" defStyleNum="dsNormal" spellChecking="false"
>+		    bold="true" italic="false" underline="false" color="#FF0000" selColor="#00FFFF" />
>+	    <itemData name="Guru Meditation Terms" defStyleNum="dsNormal" spellChecking="false"
>+		    bold="false" italic="true" underline="false" color="#FF0000" selColor="#00FFFF" />
>+	    <itemData name="Syntax Error" defStyleNum="dsError" spellChecking="false" />
>+	    <itemData name="Warning (!use background)" defStyleNum="dsAlert" spellChecking="false"
>+			backgroundColor="#FC000C" selBackgroundColor="#03FFF3" />
>+	    <itemData name="%BEGIN folding region" defStyleNum="dsRegionMarker" spellChecking="false" />
>+	</itemDatas>
>+    </highlighting>
>+    <general>
>+	<keywords casesensitive="true" additionalDeliminator="$#'&quot;`" />
>+	
>+	<folding indentationsensitive="true" />
>+
>+
>+
>+	<comments>
>+	    <comment name="singleLine" start="%" position="afterwhitespace" />
>+	    <comment name="multiLine" start="/*" end="*/" region="comment" />
>+	</comments>
>+    </general>
> </language>
>+
>diff -urN tdelibs/kate/data/protobuf.xml tdelibs.new/kate/data/protobuf.xml
>--- tdelibs/kate/data/protobuf.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/protobuf.xml	2013-12-26 13:26:41.134326657 -0600
>@@ -0,0 +1,121 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd">
>+<language name="Protobuf" version="2.40" kateversion="2.5" section="Sources" extensions="*.proto" mimetype="text/x-protobuf" author="Slawomir Mikula (slawek.mikula@gmail.com)" license="LGPL">
>+  <highlighting>
>+    <list name="keywords">
>+      <item> message </item>
>+      <item> required </item>
>+      <item> optional </item>
>+      <item> repeated </item>
>+      <item> packed </item>
>+      <item> enum </item>
>+      <item> default </item>
>+      <item> import </item>
>+      <item> public </item>
>+      <item> extensions </item>
>+      <item> package </item>
>+      <item> option </item>
>+      <item> deprecated </item>
>+      <item> extend </item>
>+    </list>
>+    <list name="operators">
>+      <item> = </item>
>+      <item> ; </item>
>+    </list>
>+    <list name="datatypes">
>+      <item> double </item>
>+      <item> float </item>
>+      <item> int32 </item>
>+      <item> int64 </item>
>+      <item> uint32 </item>
>+      <item> uint64 </item>
>+      <item> sint32 </item>
>+      <item> sint64 </item>
>+      <item> fixed32 </item>
>+      <item> fixed64 </item>
>+      <item> sfixed32 </item>
>+      <item> sfixed64 </item>
>+      <item> bool </item>
>+      <item> string </item>
>+      <item> bytes </item>
>+    </list>
>+
>+<contexts>
>+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
>+        <DetectSpaces />
>+        <keyword attribute="Keyword" context="#stay" String="keywords"/>
>+        <keyword attribute="Operator" context="#stay" String="operators"/>
>+        <keyword attribute="Data Type" context="#stay" String="datatypes"/>
>+        <RegExpr attribute="Keyword" context="Imports" String="\b(package|import)\b" />
>+        <DetectIdentifier />
>+        <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
>+        <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
>+        <DetectChar attribute="String" context="String" char="&quot;"/>
>+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
>+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
>+        <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
>+        <Float attribute="Float" context="#stay">
>+            <AnyChar String="fF" attribute="Float" context="#stay"/>
>+        </Float>
>+        <HlCOct attribute="Octal" context="#stay"/>
>+        <HlCHex attribute="Hex" context="#stay"/>
>+        <Int attribute="Decimal" context="#stay">
>+            <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
>+        </Int>
>+        <HlCChar attribute="Char" context="#stay"/>
>+        <RegExpr attribute="Char" context="#stay" String="'\\u[0-9a-fA-F]{4}'"/>
>+      </context>
>+
>+      <context attribute="String" lineEndContext="#pop" name="String">
>+        <LineContinue attribute="String" context="#stay"/>
>+        <HlCStringChar attribute="String Char" context="#stay"/>
>+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
>+      </context>
>+
>+      <context attribute="Normal Text" lineEndContext="#pop" name="Imports">
>+        <RegExpr attribute="Imports" context="#pop" String="\s*.*;" />
>+      </context>
>+
>+      <context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
>+        <LineContinue attribute="Comment" context="#stay"/>
>+        <IncludeRules context="##Alerts" />
>+      </context>
>+
>+      <context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
>+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
>+        <IncludeRules context="##Alerts" />
>+      </context>
>+
>+      <context attribute="Comment" lineEndContext="#stay" name="Commentar">
>+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment2" />
>+      </context>
>+
>+    </contexts>
>+    <itemDatas>
>+      <itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/>
>+      <itemData name="Keyword" defStyleNum="dsKeyword" spellChecking="false"/>
>+      <itemData name="Data Type" defStyleNum="dsDataType" spellChecking="false"/>
>+      <itemData name="Comment" defStyleNum="dsComment"/>
>+      <itemData name="Imports" defStyleNum="dsOthers"/>
>+
>+      <itemData name="Decimal" defStyleNum="dsDecVal" spellChecking="false"/>
>+      <itemData name="Octal" defStyleNum="dsBaseN" spellChecking="false"/>
>+      <itemData name="Hex" defStyleNum="dsBaseN" spellChecking="false"/>
>+      <itemData name="Float" defStyleNum="dsFloat" spellChecking="false"/>
>+      <itemData name="Char" defStyleNum="dsChar" spellChecking="false"/>
>+      <itemData name="String" defStyleNum="dsString"/>
>+      <itemData name="String Char" defStyleNum="dsChar"/>
>+
>+      <itemData name="Symbol" defStyleNum="dsNormal" spellChecking="false"/>
>+      <itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/>
>+      <itemData name="Error" defStyleNum="dsError" spellChecking="false"/>
>+    </itemDatas>
>+  </highlighting>
>+  <general>
>+    <comments>
>+      <comment name="singleLine" start="//" />
>+      <comment name="multiLine" start="/*" end="*/" />
>+    </comments>
>+    <keywords casesensitive="1" />
>+  </general>
>+</language>
>diff -urN tdelibs/kate/data/purebasic.xml tdelibs.new/kate/data/purebasic.xml
>--- tdelibs/kate/data/purebasic.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/purebasic.xml	2013-12-26 13:26:41.172326495 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="PureBasic" version="3.91" kateversion="2.3" section="Sources" extensions="*.pb" mimetype="text/x-purebasic" author="Sven Langenkamp (ace@kylixforum.de)" license="LGPL">
>+<language name="PureBasic" version="3.91" kateversion="2.5" section="Sources" extensions="*.pb" mimetype="text/x-purebasic" author="Sven Langenkamp (ace@kylixforum.de)" license="LGPL">
>   <highlighting>
>     <list name="keywords">
>       <item> For </item>
>diff -urN tdelibs/kate/data/python.xml tdelibs.new/kate/data/python.xml
>--- tdelibs/kate/data/python.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/python.xml	2013-12-26 13:26:41.657324425 -0600
>@@ -13,7 +13,7 @@
> 
> 
> 
>-<language name="Python" version="2.11" kateversion="2.4" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript" mimetype="application/x-python;text/x-python" casesensitive="1" author="Michael Bueker" license="">
>+<language name="Python" version="2.22" style="python" kateversion="2.5" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript" mimetype="application/x-python;text/x-python" casesensitive="1" author="Michael Bueker" license="">
> 	<highlighting>
> 		<list name="prep">
> 			<item> import </item>
>@@ -35,10 +35,6 @@
> 			<item> not </item>
> 			<item> or </item>
> 		</list>
>-		<list name="commands">
>-			<item> exec </item>
>-			<item> print </item>
>-		</list>
> 		<list name="flow">
> 			<item> assert </item>
> 			<item> break </item>
>@@ -58,17 +54,18 @@
> 			<item> yield </item>
> 		</list>
> 		<list name="builtinfuncs">
>-			<item> __future__ </item>
> 			<item> __import__ </item>
>-			<item> __name__ </item>
> 			<item> abs </item>
> 			<item> all </item>
> 			<item> any </item>
> 			<item> apply </item>
>+			<item> ascii </item>
> 			<item> basestring </item>
> 			<item> bin </item>
> 			<item> bool </item>
> 			<item> buffer </item>
>+			<item> bytearray </item>
>+			<item> bytes </item>
> 			<item> callable </item>
> 			<item> chr </item>
> 			<item> classmethod </item>
>@@ -82,6 +79,7 @@
> 			<item> divmod </item>
> 			<item> enumerate </item>
> 			<item> eval </item>
>+			<item> exec </item>
> 			<item> execfile </item>
> 			<item> file </item>
> 			<item> filter </item>
>@@ -107,6 +105,7 @@
> 			<item> long </item>
> 			<item> map </item>
> 			<item> max </item>
>+			<item> memoryview </item>
> 			<item> min </item>
> 			<item> next </item>
> 			<item> object </item>
>@@ -114,6 +113,7 @@
> 			<item> open </item>
> 			<item> ord </item>
> 			<item> pow </item>
>+			<item> print </item>
> 			<item> property </item>
> 			<item> range </item>
> 			<item> raw_input </item>
>@@ -147,6 +147,7 @@
> 			<item> Ellipsis </item>
> 			<item> __debug__ </item>
> 			<item> __file__ </item>
>+			<item> __name__ </item>
> 		</list>
> 		<list name="bindings">
> 			<item> SIGNAL </item>
>@@ -243,33 +244,60 @@
> 			<item>__coerce__</item>
> 			<item>__enter__</item>
> 			<item>__exit__</item>
>+			<item>__bytes__</item>
>+			<item>__format__</item>
>+			<item>__next__</item>
>+			<item>__dir__</item>
> 		</list>
> 		<list name="exceptions">
>+			
> 			<item>ArithmeticError</item>
> 			<item>AssertionError</item>
> 			<item>AttributeError</item>
> 			<item>BaseException</item>
>+			<item>BlockingIOError</item>
>+			<item>BrokenPipeError</item>
>+			<item>BufferError</item>
>+			<item>BytesWarning</item>
>+			<item>ChildProcessError</item>
>+			<item>ConnectionAbortedError</item>
>+			<item>ConnectionError</item>
>+			<item>ConnectionRefusedError</item>
>+			<item>ConnectionResetError</item>
> 			<item>DeprecationWarning</item>
> 			<item>EnvironmentError</item>
> 			<item>EOFError</item>
> 			<item>Exception</item>
>+			<item>FileExistsError</item>
>+			<item>FileNotFoundError</item>
> 			<item>FloatingPointError</item>
> 			<item>FutureWarning</item>
> 			<item>GeneratorExit</item>
>-			<item>IOError</item>
> 			<item>ImportError</item>
> 			<item>ImportWarning</item>
>+			<item>IndentationError</item>
> 			<item>IndexError</item>
>-			<item>KeyError</item>
>+			<item>InterruptedError</item>
>+			<item>IOError</item>
>+			<item>IsADirectoryError</item>
> 			<item>KeyboardInterrupt</item>
>+			<item>KeyError</item>
> 			<item>LookupError</item>
> 			<item>MemoryError</item>
> 			<item>NameError</item>
>+			<item>NotADirectoryError</item>
> 			<item>NotImplementedError</item>
> 			<item>OSError</item>
> 			<item>OverflowError</item>
> 			<item>PendingDeprecationWarning</item>
>+			<item>PermissionError</item>
>+			<item>ProcessLookupError</item>
> 			<item>ReferenceError</item>
>+			<item>ResourceWarning</item>
> 			<item>RuntimeError</item>
> 			<item>RuntimeWarning</item>
> 			<item>StandardError</item>
>@@ -278,14 +306,16 @@
> 			<item>SyntaxWarning</item>
> 			<item>SystemError</item>
> 			<item>SystemExit</item>
>+			<item>TabError</item>
>+			<item>TimeoutError</item>
> 			<item>TypeError</item>
> 			<item>UnboundLocalError</item>
>-			<item>UserWarning</item>
>-			<item>UnicodeError</item>
>-			<item>UnicodeWarning</item>
>-			<item>UnicodeEncodeError</item>
> 			<item>UnicodeDecodeError</item>
>+			<item>UnicodeEncodeError</item>
>+			<item>UnicodeError</item>
> 			<item>UnicodeTranslateError</item>
>+			<item>UnicodeWarning</item>
>+			<item>UserWarning</item>
> 			<item>ValueError</item>
> 			<item>Warning</item>
> 			<item>WindowsError</item>
>@@ -293,7 +323,6 @@
> 		</list>
> 		<contexts>
> 			<context name="Normal" attribute="Normal Text" lineEndContext="#stay">
>-				<LineContinue context="CheckForString" attribute="Normal Text"/>
> 				<keyword attribute="Preprocessor" String="prep" context="#stay"/>
> 				<keyword attribute="Definition Keyword" String="defs" context="#stay"/>
> 				<keyword attribute="Operator" String="operators" context="#stay"/>
>@@ -304,7 +333,7 @@
> 				<keyword attribute="Extensions" String="bindings" context="#stay"/>
> 				<keyword attribute="Exceptions" String="exceptions" context="#stay"/>
> 				<keyword attribute="Overloaders" String="overloaders" context="#stay"/>
>-				<RegExpr attribute="Normal" String="[a-zA-Z_][a-zA-Z_0-9]+" context="#stay"/>
>+				<RegExpr attribute="Normal" String="[a-zA-Z_][a-zA-Z_0-9]{2,}" context="#stay"/>
> 
> 				<RegExpr attribute="Complex" String=" ((([0-9]*\.[0-9]+|[0-9]+\.)|([0-9]+|([0-9]*\.[0-9]+|[0-9]+\.))[eE](\+|-)?[0-9]+)|[0-9]+)[jJ]" context="#stay"/>
> 				<Float attribute="Float" context="#stay" />
>@@ -314,54 +343,115 @@
> 					<StringDetect attribute="Int" String="L" insensitive="true" context="#stay"/>
> 				</Int>
> 
>-				<StringDetect attribute="Raw String" String="r'''" insensitive="true" context="Raw Tripple A-string"/>
>-				<StringDetect attribute="Raw String" String="r&quot;&quot;&quot;" insensitive="true" context="Raw Tripple Q-string"/>
>+				<DetectChar attribute="Normal Text" char="{" context="Dictionary" beginRegion="Dictionary"/>
>+				<DetectChar attribute="Normal Text" char="[" context="List" beginRegion="List"/>
>+				<DetectChar attribute="Normal Text" char="(" context="Tuple" beginRegion="Tuple"/>
> 
>-				<StringDetect attribute="Raw String" String="r'" insensitive="true" context="Raw A-string"/>
>-				<StringDetect attribute="Raw String" String="r&quot;" insensitive="true" context="Raw Q-string"/>
>+				<IncludeRules context="CommentVariants" />
> 
> 				<DetectChar attribute="Comment" char="#" context="Hash comment"/>
>-                                <RegExpr attribute="Comment" String="u?'''" firstNonSpace="true" context="Tripple A-comment" beginRegion="Tripple A-region"/>
>-                                <RegExpr attribute="Comment" String="u?&quot;&quot;&quot;" firstNonSpace="true" context="Tripple Q-comment" beginRegion="Tripple Q-region"/>
> 
>+				<IncludeRules context="StringVariants" />
>+
>+				<AnyChar attribute="Operator" String="+*/%\|=;\!&lt;&gt;!^&amp;~-" context="#stay"/>
>+				<RegExpr attribute="Decorator" String="@[_a-zA-Z][\._a-zA-Z0-9]*" firstNonSpace="true"/>
>+			</context>
>+
>+			<context name="#CheckForString" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
>+				<DetectSpaces/>
>+				<LineContinue attribute="Normal Text" context="CheckForStringNext"/>
>+			</context>
>+			
>+			<context name="CheckForStringNext" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
>+				<DetectSpaces/>
>+				<LineContinue attribute="Normal Text" context="CheckForStringNext"/>
>+				<IncludeRules context="StringVariants"/>
>+			</context>
>+
>+			<context name="StringVariants" attribute="Normal Text" lineEndContext="#stay">
>+				<DetectSpaces/>
> 				
> 				<StringDetect attribute="String" String="'''" context="Tripple A-string" beginRegion="Tripple A-region"/>
>-				<StringDetect attribute="String" String="u'''" context="Tripple A-string" beginRegion="Tripple A-region"/>
>+				<StringDetect attribute="String" String="u'''" insensitive="true" context="Tripple A-string" beginRegion="Tripple A-region"/>
> 				
> 				<StringDetect attribute="String" String="&quot;&quot;&quot;" context="Tripple Q-string" beginRegion="Tripple Q-region"/>
>-				<StringDetect attribute="String" String="u&quot;&quot;&quot;" context="Tripple Q-string" beginRegion="Tripple Q-region"/>
>+				<StringDetect attribute="String" String="u&quot;&quot;&quot;" insensitive="true" context="Tripple Q-string" beginRegion="Tripple Q-region"/>
> 				
> 				<DetectChar attribute="String" char="'" context="Single A-string"/>
>-				<Detect2Chars attribute="String" char="u" char1="'" context="Single A-string"/>
>+				<Detect2Chars attribute="String" char="u" char1="'" insensitive="true" context="Single A-string"/>
> 				
> 				<DetectChar attribute="String" char="&quot;" context="Single Q-string"/>
>-				<Detect2Chars attribute="String" char="u" char1="&quot;" context="Single Q-string"/>
>-
>-				<DetectChar attribute="Normal" char="(" context="parenthesised" beginRegion="parenthesis"/>
>-				<DetectChar attribute="Normal" char=")" context="#pop" endRegion="parenthesis"/>
>+				<Detect2Chars attribute="String" char="u" char1="&quot;" insensitive="true" context="Single Q-string"/>
> 
>-				<AnyChar attribute="Operator" String="+*/%\|=;\!&lt;&gt;!^&amp;~-" context="#stay"/>
>-				<RegExpr attribute="Decorator" String="@[_a-zA-Z][\._a-zA-Z0-9]*" firstNonSpace="true"/>
>+				
>+				<StringDetect attribute="Raw String" String="r'''" insensitive="true" context="Raw Tripple A-string" beginRegion="Tripple A-region"/>
>+				<StringDetect attribute="Raw String" String="ur'''" insensitive="true" context="Raw Tripple A-string" beginRegion="Tripple A-region"/>
>+				
>+				<StringDetect attribute="Raw String" String="r&quot;&quot;&quot;" insensitive="true" context="Raw Tripple Q-string" beginRegion="Tripple Q-region"/>
>+				<StringDetect attribute="Raw String" String="ur&quot;&quot;&quot;" insensitive="true" context="Raw Tripple Q-string" beginRegion="Tripple Q-region"/>
>+				
>+				<StringDetect attribute="Raw String" String="r'" insensitive="true" context="Raw A-string"/>
>+				<StringDetect attribute="Raw String" String="ur'" insensitive="true" context="Raw A-string"/>
>+				
>+				<StringDetect attribute="Raw String" String="r&quot;" insensitive="true" context="Raw Q-string"/>
>+				<StringDetect attribute="Raw String" String="ur&quot;" insensitive="true" context="Raw Q-string"/>
> 			</context>
>-			
>-			<context name="CheckForString" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
>+
>+			<context name="CommentVariants" attribute="Normal Text" lineEndContext="#stay">
> 				<DetectSpaces/>
>-				<StringDetect attribute="String" String="'''" context="Tripple A-string" beginRegion="Tripple A-region"/>
>-				<StringDetect attribute="String" String="u'''" context="Tripple A-string" beginRegion="Tripple A-region"/>
>+				
>+				<StringDetect attribute="Comment" String="'''" firstNonSpace="true" context="Tripple A-comment" beginRegion="Tripple A-region"/>
>+				<StringDetect attribute="Comment" String="u'''" insensitive="true" firstNonSpace="true" context="Tripple A-comment" beginRegion="Tripple A-region"/>
> 				
>-				<StringDetect attribute="String" String="&quot;&quot;&quot;" context="Tripple Q-string" beginRegion="Tripple Q-region"/>
>-				<StringDetect attribute="String" String="u&quot;&quot;&quot;" context="Tripple Q-string" beginRegion="Tripple Q-region"/>
>-			</context>
>+				<StringDetect attribute="Comment" String="&quot;&quot;&quot;" firstNonSpace="true" context="Tripple Q-comment" beginRegion="Tripple Q-region"/>
>+				<StringDetect attribute="Comment" String="u&quot;&quot;&quot;" insensitive="true" firstNonSpace="true" context="Tripple Q-comment" beginRegion="Tripple Q-region"/>
>+				
>+				<DetectChar attribute="Comment" char="'" firstNonSpace="true" context="Single A-comment"/>
>+				<Detect2Chars attribute="Comment" char="u" char1="'" insensitive="true" firstNonSpace="true" context="Single A-comment"/>
>+				
>+				<DetectChar attribute="Comment" char="&quot;" firstNonSpace="true" context="Single Q-comment"/>
>+				<Detect2Chars attribute="Comment" char="u" char1="&quot;" insensitive="true" firstNonSpace="true" context="Single Q-comment"/>
> 
>+				
>+				<StringDetect attribute="Comment" String="r'''" insensitive="true" firstNonSpace="true" context="Tripple A-comment" beginRegion="Tripple A-region"/>
>+				<StringDetect attribute="Comment" String="ur'''" insensitive="true" firstNonSpace="true" context="Tripple A-comment" beginRegion="Tripple A-region"/>
>+				
>+				<StringDetect attribute="Comment" String="r&quot;&quot;&quot;" insensitive="true" firstNonSpace="true" context="Tripple Q-comment" beginRegion="Tripple Q-region"/>
>+				<StringDetect attribute="Comment" String="ur&quot;&quot;&quot;" insensitive="true" firstNonSpace="true" context="Tripple Q-comment" beginRegion="Tripple Q-region"/>
>+				
>+				<StringDetect attribute="Comment" String="r'" insensitive="true" firstNonSpace="true" context="Single A-comment"/>
>+				<StringDetect attribute="Comment" String="ur'" insensitive="true" firstNonSpace="true" context="Single A-comment"/>
>+				
>+				<StringDetect attribute="Comment" String="r&quot;" insensitive="true" firstNonSpace="true" context="Single Q-comment"/>
>+				<StringDetect attribute="Comment" String="ur&quot;" insensitive="true" firstNonSpace="true" context="Single Q-comment"/>
>+			</context>
> 
>-			<context name="parenthesised" attribute="Normal Text" lineEndContext="#stay" noIndentationBasedFolding="true">
>+			<context name="Dictionary" attribute="Normal Text" lineEndContext="#stay" noIndentationBasedFolding="true">
>+				<DetectSpaces/>
>+				<DetectChar attribute="Normal Text" char="}" context="#pop" endRegion="Dictionary"/>
>+				<IncludeRules context="StringVariants" />
>+				<IncludeRules context="Normal" />
>+			</context>
>+			
>+			<context name="List" attribute="Normal Text" lineEndContext="#stay" noIndentationBasedFolding="true">
>+				<DetectSpaces/>
>+				<DetectChar attribute="Normal Text" char="]" context="#pop" endRegion="List"/>
>+				<IncludeRules context="StringVariants" />
>+				<IncludeRules context="Normal" />
>+			</context>
>+			
>+			<context name="Tuple" attribute="Normal Text" lineEndContext="#stay" noIndentationBasedFolding="true">
>+				<DetectSpaces/>
>+				<DetectChar attribute="Normal Text" char=")" context="#pop" endRegion="Tuple"/>
>+				<IncludeRules context="StringVariants" />
> 				<IncludeRules context="Normal" />
> 			</context>
> 
> 			
> 
> 			<context name="Hash comment" attribute="Comment" lineEndContext="#pop">
>-				<IncludeRules context="##Alerts_indent" />
>+				<IncludeRules context="##Alerts" />
>+        <IncludeRules context="##Modelines" />
> 			</context>
> 
> 			<context name="Tripple A-comment" attribute="Comment" lineEndContext="#stay" noIndentationBasedFolding="true">
>@@ -402,71 +492,88 @@
> 				     [Special cases: %prog and %default - see http://docs.python.org/library/optparse.html]
> 				-->
> 				<RegExpr attribute="String Substitution" String="%(($[a-zA-Z0-9_]+$)?[#0\- +]?([1-9][0-9]*|\*)?(\.([1-9][0-9]*|\*))?[hlL]?[crsdiouxXeEfFgG%]|prog|default)" context="#stay"/>
>+				
>+				<RegExpr attribute="String Substitution" String="\{([a-zA-Z0-9_]+|[0-9]+)(\.[a-zA-Z0-9_]+|\[[^ \]]+\])*(![rs])?(:([^}]?[&lt;&gt;=^])?[ +-]?#?0?[0-9]*(\.[0-9]+)?[bcdeEfFgGnosxX%]?)?\}" context="#stay"/>
>+				<Detect2Chars attribute="String Substitution" char="{" char1="{" context="#stay" />
>+				<Detect2Chars attribute="String Substitution" char="}" char1="}" context="#stay" />
> 			</context>
> 
> 			<context name="Tripple A-string" attribute="String" lineEndContext="#stay" noIndentationBasedFolding="true">
> 				<HlCStringChar attribute="String Char" context="#stay"/>
> 				<IncludeRules context="stringformat"/>
>-				<StringDetect attribute="String" String="'''" context="#pop" endRegion="Tripple A-region"/>
>+				<StringDetect attribute="String" String="'''" context="#pop#CheckForString" endRegion="Tripple A-region"/>
> 			</context>
> 
> 			<context name="Raw Tripple A-string" attribute="Raw String" lineEndContext="#stay" noIndentationBasedFolding="true">
> 				<HlCStringChar attribute="Raw String" context="#stay"/>
> 				<IncludeRules context="stringformat"/>
>-				<StringDetect attribute="String" String="'''" context="#pop" endRegion="Tripple A-region"/>
>+				<StringDetect attribute="String" String="'''" context="#pop#CheckForString" endRegion="Tripple A-region"/>
> 			</context>
> 
> 			<context name="Tripple Q-string" attribute="String" lineEndContext="#stay" noIndentationBasedFolding="true">
> 				<HlCStringChar attribute="String Char" context="#stay"/>
> 				<IncludeRules context="stringformat"/>
>-				<StringDetect attribute="String" String="&quot;&quot;&quot;" context="#pop" endRegion="Tripple Q-region"/>
>+				<StringDetect attribute="String" String="&quot;&quot;&quot;" context="#pop#CheckForString" endRegion="Tripple Q-region"/>
> 			</context>
> 
> 			<context name="Raw Tripple Q-string" attribute="Raw String" lineEndContext="#stay" noIndentationBasedFolding="true">
> 				<HlCStringChar attribute="Raw String" context="#stay"/>
> 				<IncludeRules context="stringformat"/>
>-				<StringDetect attribute="String" String="&quot;&quot;&quot;" context="#pop" endRegion="Tripple Q-region"/>
>+				<StringDetect attribute="String" String="&quot;&quot;&quot;" context="#pop#CheckForString" endRegion="Tripple Q-region"/>
> 			</context>
> 
> 
> 			<context name="Single A-string" attribute="String" lineEndContext="#stay">
> 				<HlCStringChar attribute="String Char" context="#stay"/>
> 				<IncludeRules context="stringformat"/>
>-				<DetectChar attribute="String" char="'" context="#pop"/>
>+				<DetectChar attribute="String" char="'" context="#pop#CheckForString"/>
> 			</context>
> 
> 			<context name="Single Q-string" attribute="String" lineEndContext="#stay">
> 				<HlCStringChar attribute="String Char" context="#stay"/>
> 				<IncludeRules context="stringformat"/>
>-				<DetectChar attribute="String" char="&quot;" context="#pop"/>
>+				<DetectChar attribute="String" char="&quot;" context="#pop#CheckForString"/>
> 			</context>
> 
> 			<context name="Raw A-string" attribute="Raw String" lineEndContext="#stay">
> 				<HlCStringChar attribute="Raw String" context="#stay"/>
> 				<IncludeRules context="stringformat"/>
>-				<DetectChar attribute="Raw String" char="'" context="#pop"/>
>+				<DetectChar attribute="Raw String" char="'" context="#pop#CheckForString"/>
> 			</context>
> 
> 			<context name="Raw Q-string" attribute="Raw String" lineEndContext="#stay">
> 				<HlCStringChar attribute="Raw String" context="#stay"/>
> 				<IncludeRules context="stringformat"/>
>-				<DetectChar attribute="Raw String" char="&quot;" context="#pop"/>
>+				<DetectChar attribute="Raw String" char="&quot;" context="#pop#CheckForString"/>
> 			</context>
>-
>-
> 		</contexts>
>+
> 		<itemDatas>
> 			<itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/>
> 			<itemData name="Definition Keyword" defStyleNum="dsKeyword" spellChecking="false"/>
> 			<itemData name="Operator" defStyleNum="dsNormal" bold="1" spellChecking="false"/>
>-			<itemData name="String Substitution" defStyleNum="dsOthers" color="#0057ae" selColor="#ffffff"  spellChecking="false"/>
>+			<itemData name="String Substitution" defStyleNum="dsOthers" color="#0057ae" selColor="#0057ae"  spellChecking="false"/>
> 			<itemData name="Command Keyword" defStyleNum="dsKeyword" spellChecking="false"/>
> 			<itemData name="Flow Control Keyword" defStyleNum="dsKeyword" spellChecking="false"/>
> 			<itemData name="Builtin Function" defStyleNum="dsDataType" spellChecking="false"/>
> 			<itemData name="Special Variable" defStyleNum="dsOthers" spellChecking="false"/>
>-			<itemData name="Extensions" defStyleNum="dsOthers" color="#0095ff" selColor="#ffffff" bold="1" italic="0" spellChecking="false"/>
>-			<itemData name="Exceptions" defStyleNum="dsOthers" color="#054d00" selColor="#ffffff" bold="1" italic="0" spellChecking="false"/>
>-			<itemData name="Overloaders" defStyleNum="dsOthers" color="#000e52" selColor="#ffffff" bold="1" italic="0" spellChecking="false"/>
>+			<itemData name="Extensions" defStyleNum="dsOthers" color="#0095ff" selColor="#0095ff" bold="1" italic="0" spellChecking="false"/>
>+			<itemData name="Exceptions" defStyleNum="dsOthers" color="#054d00" selColor="#054d00" bold="1" italic="0" spellChecking="false"/>
>+			<itemData name="Overloaders" defStyleNum="dsOthers" color="#000e52" selColor="#000e52" bold="1" italic="0" spellChecking="false"/>
> 			<itemData name="Preprocessor" defStyleNum="dsChar" spellChecking="false"/>
> 			<itemData name="String Char" defStyleNum="dsChar" spellChecking="false"/>
> 			<itemData name="Float" defStyleNum="dsFloat" spellChecking="false"/>
>@@ -477,7 +584,7 @@
> 			<itemData name="Comment" defStyleNum="dsComment"/>
> 			<itemData name="String" defStyleNum="dsString"/>
> 			<itemData name="Raw String" defStyleNum="dsString"/>
>-			<itemData name="Decorator" defStyleNum="dsOthers" color="#8f6b32" selColor="#ffffff" italic="0" spellChecking="false"/>
>+			<itemData name="Decorator" defStyleNum="dsOthers" color="#8f6b32" selColor="#8f6b32" italic="0" spellChecking="false"/>
> 		</itemDatas>
> 	</highlighting>
> 	<general>
>@@ -488,6 +595,9 @@
> 		<comments>
> 			<comment name="singleLine" start="#" position="afterwhitespace"/>
> 		</comments>
>+		<indentation mode="python" />
> 		<keywords casesensitive="1" additionalDeliminator="#'"/>
> 	</general>
> </language>
>+
>+
>diff -urN tdelibs/kate/data/qmake.xml tdelibs.new/kate/data/qmake.xml
>--- tdelibs/kate/data/qmake.xml	2012-10-19 22:45:15.000000000 -0500
>+++ tdelibs.new/kate/data/qmake.xml	2013-12-26 13:26:42.105322512 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="QMake" section="Other" extensions="*.pro;*.pri;*.prf;" mimetype="" version="1.2" kateversion="2.0" author="Milian Wolff (mail@milianw.de)" license="LGPL">
>+<language name="QMake" section="Other" extensions="*.pro;*.pri;*.prf;" mimetype="" version="1.2" kateversion="2.5" author="Milian Wolff (mail@milianw.de)" license="LGPL">
> 
> <highlighting>
>   <list name="variables">
>diff -urN tdelibs/kate/data/qml.xml tdelibs.new/kate/data/qml.xml
>--- tdelibs/kate/data/qml.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/qml.xml	2013-12-26 13:26:41.235326226 -0600
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
> 
>-<language name="QML" version="1.3" kateversion="2.4" section="Scripts" extensions="*.qml"
>+<language name="QML" version="1.3" kateversion="2.5" section="Scripts" extensions="*.qml"
>           mimetype="text/x-qml;application/x-qml" indenter="cstyle"
>           author="Milian Wolff (mail@milianw.de)" license="">
>   <highlighting>
>diff -urN tdelibs/kate/data/qt4.xml tdelibs.new/kate/data/qt4.xml
>--- tdelibs/kate/data/qt4.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/qt4.xml	2013-12-26 13:26:41.526324984 -0600
>@@ -0,0 +1,1602 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd"
>+[
>+    <!ENTITY space " ">
>+    <!ENTITY separators ",&#59;">
>+    <!ENTITY ns_punctuators "!&#37;&space;&amp;()+-/.*&lt;=&gt;?[]{|}~^&separators;">
>+]>
>+
>+<language
>+    name="C++11/Qt4"
>+    section="Sources"
>+    version="1.0"
>+    kateversion="2.5"
>+    indenter="cstyle"
>+    extensions="*.moc"
>+    mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr"
>+    author="Alex Turbov (i.zaufi@gmail.com)"
>+    license="LGPL"
>+    priority="6"
>+  >
>+
>+<highlighting>
>+  <list name="Qt4Extensions">
>+    <item> emit </item>
>+    <item> signals </item>
>+    <item> slots </item>
>+  </list>
>+
>+  <list name="Qt4Macros">
>+    <item> foreach </item>
>+    <item> forever </item>
>+    <item> SIGNAL </item>
>+    <item> SLOT </item>
>+    
>+    <item> qApp </item>
>+    
>+    <item> Q_DECLARE_TR_FUNCTIONS </item>
>+    
>+    <item> Q_CLASSINFO </item>
>+    <item> Q_DISABLE_COPY </item>
>+    <item> Q_EMIT </item>
>+    <item> Q_ENUMS </item>
>+    <item> Q_FLAGS </item>
>+    <item> Q_INTERFACES </item>
>+    <item> Q_INVOKABLE </item>
>+    <item> Q_OBJECT </item>
>+    <item> Q_PROPERTY </item>
>+    <item> Q_SIGNAL </item>
>+    <item> Q_SIGNALS </item>
>+    <item> Q_SLOT </item>
>+    <item> Q_SLOTS </item>
>+    
>+    <item> Q_DECLARE_METATYPE </item>
>+    <item> QT_NO_CAST_FROM_BYTEARRAY </item>
>+    <item> QT_NO_CAST_FROM_ASCII </item>
>+    <item> QT_NO_CAST_TO_ASCII </item>
>+    <item> QT_NO_URL_CAST_FROM_STRING </item>
>+    <item> QT_USE_QSTRINGBUILDER </item>
>+    
>+    <item> QBENCHMARK </item>
>+    <item> QBENCHMARK_ONCE </item>
>+    <item> QCOMPARE </item>
>+    <item> QEXPECT_FAIL </item>
>+    <item> QFAIL </item>
>+    <item> QFETCH </item>
>+    <item> QSKIP </item>
>+    <item> QTEST </item>
>+    <item> QTEST_APPLESS_MAIN </item>
>+    <item> QTEST_MAIN </item>
>+    <item> QTEST_NOOP_MAIN </item>
>+    <item> QVERIFY2 </item>
>+    <item> QVERIFY </item>
>+    <item> QWARN </item>
>+    
>+    <item> QAXCLASS </item>
>+    <item> QAXFACTORY_BEGIN </item>
>+    <item> QAXFACTORY_DEFAULT </item>
>+    <item> QAXFACTORY_END </item>
>+    <item> QAXFACTORY_EXPORT </item>
>+    <item> QAXTYPE </item>
>+    
>+    <item> QDESIGNER_WIDGET_EXPORT </item>
>+    
>+    <item> QML_DECLARE_TYPE </item>
>+    <item> QML_DECLARE_TYPEINFO </item>
>+    
>+    <item> QTWEBKIT_VERSION </item>
>+    <item> QTWEBKIT_VERSION_CHECK </item>
>+    <item> QTWEBKIT_VERSION_STR </item>
>+    
>+    <item> Q_ARG </item>
>+    <item> Q_RETURN_ARG </item>
>+    
>+    <item> Q_ATOMIC_INT_FETCH_AND_ADD_IS_ALWAYS_NATIVE </item>
>+    <item> Q_ATOMIC_INT_FETCH_AND_ADD_IS_NOT_NATIVE </item>
>+    <item> Q_ATOMIC_INT_FETCH_AND_ADD_IS_SOMETIMES_NATIVE </item>
>+    <item> Q_ATOMIC_INT_FETCH_AND_ADD_IS_WAIT_FREE </item>
>+    <item> Q_ATOMIC_INT_FETCH_AND_STORE_IS_ALWAYS_NATIVE </item>
>+    <item> Q_ATOMIC_INT_FETCH_AND_STORE_IS_NOT_NATIVE </item>
>+    <item> Q_ATOMIC_INT_FETCH_AND_STORE_IS_SOMETIMES_NATIVE </item>
>+    <item> Q_ATOMIC_INT_FETCH_AND_STORE_IS_WAIT_FREE </item>
>+    <item> Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE </item>
>+    <item> Q_ATOMIC_INT_REFERENCE_COUNTING_IS_NOT_NATIVE </item>
>+    <item> Q_ATOMIC_INT_REFERENCE_COUNTING_IS_SOMETIMES_NATIVE </item>
>+    <item> Q_ATOMIC_INT_REFERENCE_COUNTING_IS_WAIT_FREE </item>
>+    <item> Q_ATOMIC_INT_TEST_AND_SET_IS_ALWAYS_NATIVE </item>
>+    <item> Q_ATOMIC_INT_TEST_AND_SET_IS_NOT_NATIVE </item>
>+    <item> Q_ATOMIC_INT_TEST_AND_SET_IS_SOMETIMES_NATIVE </item>
>+    <item> Q_ATOMIC_INT_TEST_AND_SET_IS_WAIT_FREE </item>
>+    
>+    <item> Q_DECLARE_EXTENSION_INTERFACE </item>
>+    
>+    <item> Q_DECLARE_INTERFACE </item>
>+    <item> Q_EXPORT_PLUGIN2 </item>
>+    <item> Q_IMPORT_PLUGIN </item>
>+    
>+    <item> Q_NOREPLY </item>
>+    
>+    <item> Q_SCRIPT_DECLARE_QMETAOBJECT </item>
>+    
>+    <item> QWIDGETSIZE_MAX </item>
>+    
>+    <item> QT3_SUPPORT </item>
>+    <item> QT3_SUPPORT_CONSTRUCTOR </item>
>+    <item> QT3_SUPPORT_VARIABLE </item>
>+    <item> QT3_SUPPORT_WARNINGS </item>
>+    <item> QT_ARCH_X86_64 </item>
>+    <item> QT_ASCII_CAST_WARN </item>
>+    <item> QT_ASCII_CAST_WARN_CONSTRUCTOR </item>
>+    <item> QT_BUILD_KEY </item>
>+    <item> QT_BUILD_KEY_COMPAT </item>
>+    <item> QT_CATCH </item>
>+    <item> QT_COMPAT </item>
>+    <item> QT_COMPAT_WARNINGS </item>
>+    <item> QT_DEBUG </item>
>+    <item> QT_DEPRECATED </item>
>+    <item> QT_DEPRECATED_CONSTRUCTOR </item>
>+    <item> QT_DEPRECATED_VARIABLE </item>
>+    <item> QT_EDITION </item>
>+    <item> QT_EDITION_ACADEMIC </item>
>+    <item> QT_EDITION_CONSOLE </item>
>+    <item> QT_EDITION_DESKTOP </item>
>+    <item> QT_EDITION_DESKTOPLIGHT </item>
>+    <item> QT_EDITION_EDUCATIONAL </item>
>+    <item> QT_EDITION_EVALUATION </item>
>+    <item> QT_EDITION_OPENSOURCE </item>
>+    <item> QT_EDITION_UNIVERSAL </item>
>+    <item> QT_ENSURE_STACK_ALIGNED_FOR_SSE </item>
>+    <item> QT_FASTCALL </item>
>+    <item> QT_FORWARD_DECLARE_CLASS </item>
>+    <item> QT_FORWARD_DECLARE_STRUCT </item>
>+    <item> QT_HAVE_ARMV6 </item>
>+    <item> QT_LARGEFILE_SUPPORT </item>
>+    <item> QT_LICENSED_MODULE </item>
>+    <item> QT_LINKED_OPENSSL </item>
>+    <item> QT_LINUXBASE </item>
>+    <item> QT_MAC_USE_COCOA </item>
>+    <item> QT_MOC_COMPAT </item>
>+    <item> QT_MODULE </item>
>+    <item> QT_MODULE_ACTIVEQT </item>
>+    <item> QT_MODULE_CORE </item>
>+    <item> QT_MODULE_DBUS </item>
>+    <item> QT_MODULE_DECLARATIVE </item>
>+    <item> QT_MODULE_GRAPHICSVIEW </item>
>+    <item> QT_MODULE_GUI </item>
>+    <item> QT_MODULE_HELP </item>
>+    <item> QT_MODULE_MULTIMEDIA </item>
>+    <item> QT_MODULE_NETWORK </item>
>+    <item> QT_MODULE_OPENGL </item>
>+    <item> QT_MODULE_OPENVG </item>
>+    <item> QT_MODULE_QT3SUPPORT </item>
>+    <item> QT_MODULE_QT3SUPPORTLIGHT </item>
>+    <item> QT_MODULE_SCRIPT </item>
>+    <item> QT_MODULE_SCRIPTTOOLS </item>
>+    <item> QT_MODULE_SQL </item>
>+    <item> QT_MODULE_SVG </item>
>+    <item> QT_MODULE_TEST </item>
>+    <item> QT_MODULE_XML </item>
>+    <item> QT_MODULE_XMLPATTERNS </item>
>+    <item> QT_NO_ACCESSIBILITY </item>
>+    <item> QT_NO_ANIMATION </item>
>+    <item> QT_NO_ARM_EABI </item>
>+    <item> QT_NO_BEARERMANAGEMENT </item>
>+    <item> QT_NO_BUTTONGROUP </item>
>+    <item> QT_NO_CALENDARWIDGET </item>
>+    <item> QT_NO_CLIPBOARD </item>
>+    <item> QT_NO_CODECS </item>
>+    <item> QT_NO_COLORDIALOG </item>
>+    <item> QT_NO_COLUMNVIEW </item>
>+    <item> QT_NO_COMBOBOX </item>
>+    <item> QT_NO_COMPLETER </item>
>+    <item> QT_NO_CONCURRENT </item>
>+    <item> QT_NO_CONCURRENT_FILTER </item>
>+    <item> QT_NO_CONCURRENT_MAP </item>
>+    <item> QT_NO_CONTEXTMENU </item>
>+    <item> QT_NO_COP </item>
>+    <item> QT_NO_CRASHHANDLER </item>
>+    <item> QT_NO_CUPS </item>
>+    <item> QT_NO_DATAWIDGETMAPPER </item>
>+    <item> QT_NO_DATESTRING </item>
>+    <item> QT_NO_DATETIMEEDIT </item>
>+    <item> QT_NO_DBUS </item>
>+    <item> QT_NO_DEBUG </item>
>+    <item> QT_NO_DEBUG_STREAM </item>
>+    <item> QT_NO_DECLARATIVE </item>
>+    <item> QT_NO_DIAL </item>
>+    <item> QT_NO_DIRMODEL </item>
>+    <item> QT_NO_DOCKWIDGET </item>
>+    <item> QT_NO_DRAGANDDROP </item>
>+    <item> QT_NO_EGL </item>
>+    <item> QT_NO_ERRORMESSAGE </item>
>+    <item> QT_NO_EXCEPTIONS </item>
>+    <item> QT_NO_FILEDIALOG </item>
>+    <item> QT_NO_FILESYSTEMMODEL </item>
>+    <item> QT_NO_FONTCOMBOBOX </item>
>+    <item> QT_NO_FONTCONFIG </item>
>+    <item> QT_NO_FONTDIALOG </item>
>+    <item> QT_NO_FPU </item>
>+    <item> QT_NO_FSCOMPLETER </item>
>+    <item> QT_NO_FTP </item>
>+    <item> QT_NO_GETIFADDRS </item>
>+    <item> QT_NO_GRAPHICSEFFECT </item>
>+    <item> QT_NO_GRAPHICSSVGITEM </item>
>+    <item> QT_NO_GRAPHICSVIEW </item>
>+    <item> QT_NO_GSTREAMER </item>
>+    <item> QT_NO_HOSTINFO </item>
>+    <item> QT_NO_HTTP </item>
>+    <item> QT_NO_ICD </item>
>+    <item> QT_NO_IM </item>
>+    <item> QT_NO_IMAGEFORMAT_JPEG </item>
>+    <item> QT_NO_IMAGEFORMAT_MNG </item>
>+    <item> QT_NO_IMAGEFORMAT_PNG </item>
>+    <item> QT_NO_IMAGEFORMAT_TIFF </item>
>+    <item> QT_NO_IMAGEFORMAT_XPM </item>
>+    <item> QT_NO_INPUTDIALOG </item>
>+    <item> QT_NO_ITEMVIEWS </item>
>+    <item> QT_NO_LIBRARY </item>
>+    <item> QT_NO_LISTVIEW </item>
>+    <item> QT_NO_LISTWIDGET </item>
>+    <item> QT_NO_LPR </item>
>+    <item> QT_NO_MAINWINDOW </item>
>+    <item> QT_NO_MDIAREA </item>
>+    <item> QT_NO_MENU </item>
>+    <item> QT_NO_MENUBAR </item>
>+    <item> QT_NO_MITSHM </item>
>+    <item> QT_NO_MULTIMEDIA </item>
>+    <item> QT_NO_NAS </item>
>+    <item> QT_NO_NETWORKDISKCACHE </item>
>+    <item> QT_NO_OPENGL </item>
>+    <item> QT_NO_OPENVG </item>
>+    <item> QT_NO_PAINT_DEBUG </item>
>+    <item> QT_NO_PHONON </item>
>+    <item> QT_NO_PHONON_EFFECTWIDGET </item>
>+    <item> QT_NO_PHONON_PLATFORMPLUGIN </item>
>+    <item> QT_NO_PHONON_SEEKSLIDER </item>
>+    <item> QT_NO_PHONON_SETTINGSGROUP </item>
>+    <item> QT_NO_PHONON_VIDEOPLAYER </item>
>+    <item> QT_NO_PHONON_VOLUMEFADEREFFECT </item>
>+    <item> QT_NO_PHONON_VOLUMESLIDER </item>
>+    <item> QT_NO_PRINTDIALOG </item>
>+    <item> QT_NO_PRINTER </item>
>+    <item> QT_NO_PRINTPREVIEWDIALOG </item>
>+    <item> QT_NO_PRINTPREVIEWWIDGET </item>
>+    <item> QT_NO_PROCESS </item>
>+    <item> QT_NO_PROGRESSDIALOG </item>
>+    <item> QT_NO_PROXYMODEL </item>
>+    <item> QT_NO_PULSEAUDIO </item>
>+    <item> QT_NO_QDEBUG_MACRO </item>
>+    <item> QT_NO_QFUTURE </item>
>+    <item> QT_NO_QWARNING_MACRO </item>
>+    <item> QT_NO_QWS_CURSOR </item>
>+    <item> QT_NO_QWS_DECORATION_STYLED </item>
>+    <item> QT_NO_QWS_DECORATION_WINDOWS </item>
>+    <item> QT_NO_QWS_DYNAMICSCREENTRANSFORMATION </item>
>+    <item> QT_NO_QWS_INPUTMETHODS </item>
>+    <item> QT_NO_QWS_MANAGER </item>
>+    <item> QT_NO_QWS_MULTIPROCESS </item>
>+    <item> QT_NO_QWS_SOUNDSERVER </item>
>+    <item> QT_NO_QWS_TRANSFORMED </item>
>+    <item> QT_NO_QWS_VNC </item>
>+    <item> QT_NO_RAWFONT </item>
>+    <item> QT_NO_S60 </item>
>+    <item> QT_NO_SCRIPT </item>
>+    <item> QT_NO_SCRIPTTOOLS </item>
>+    <item> QT_NO_SCROLLAREA </item>
>+    <item> QT_NO_SCROLLBAR </item>
>+    <item> QT_NO_SESSIONMANAGER </item>
>+    <item> QT_NO_SHAPE </item>
>+    <item> QT_NO_SHAREDMEMORY </item>
>+    <item> QT_NO_SOCKS5 </item>
>+    <item> QT_NO_SOFTKEYMANAGER </item>
>+    <item> QT_NO_SORTFILTERPROXYMODEL </item>
>+    <item> QT_NO_SPINBOX </item>
>+    <item> QT_NO_SPLITTER </item>
>+    <item> QT_NO_STANDARDITEMMODEL </item>
>+    <item> QT_NO_STATEMACHINE </item>
>+    <item> QT_NO_STL_WCHAR </item>
>+    <item> QT_NO_STRINGLISTMODEL </item>
>+    <item> QT_NO_STYLE_CDE </item>
>+    <item> QT_NO_STYLE_CLEANLOOKS </item>
>+    <item> QT_NO_STYLE_GTK </item>
>+    <item> QT_NO_STYLE_PLASTIQUE </item>
>+    <item> QT_NO_STYLE_S60 </item>
>+    <item> QT_NO_STYLE_STYLESHEET </item>
>+    <item> QT_NO_STYLE_WINDOWSCE </item>
>+    <item> QT_NO_STYLE_WINDOWSMOBILE </item>
>+    <item> QT_NO_STYLE_WINDOWSVISTA </item>
>+    <item> QT_NO_STYLE_WINDOWSXP </item>
>+    <item> QT_NO_SVG </item>
>+    <item> QT_NO_SVGGENERATOR </item>
>+    <item> QT_NO_SVGRENDERER </item>
>+    <item> QT_NO_SVGWIDGET </item>
>+    <item> QT_NO_SXE </item>
>+    <item> QT_NO_SYNTAXHIGHLIGHTER </item>
>+    <item> QT_NO_SYSTEMSEMAPHORE </item>
>+    <item> QT_NO_TABBAR </item>
>+    <item> QT_NO_TABDIALOG </item>
>+    <item> QT_NO_TABLET </item>
>+    <item> QT_NO_TABLEVIEW </item>
>+    <item> QT_NO_TABLEWIDGET </item>
>+    <item> QT_NO_TABWIDGET </item>
>+    <item> QT_NO_TEMPLATE_TEMPLATE_PARAMETERS </item>
>+    <item> QT_NO_TEXTBROWSER </item>
>+    <item> QT_NO_TEXTCODECPLUGIN </item>
>+    <item> QT_NO_TEXTEDIT </item>
>+    <item> QT_NO_TEXTODFWRITER </item>
>+    <item> QT_NO_TOOLBAR </item>
>+    <item> QT_NO_TOOLBOX </item>
>+    <item> QT_NO_TOOLBUTTON </item>
>+    <item> QT_NO_TRANSLATION_UTF8 </item>
>+    <item> QT_NO_TREEVIEW </item>
>+    <item> QT_NO_TREEWIDGET </item>
>+    <item> QT_NO_UNDOGROUP </item>
>+    <item> QT_NO_UNDOSTACK </item>
>+    <item> QT_NO_UNDOVIEW </item>
>+    <item> QT_NO_WARNINGS </item>
>+    <item> QT_NO_WEBKIT </item>
>+    <item> QT_NO_WHATSTHIS </item>
>+    <item> QT_NO_WIN_ACTIVEQT </item>
>+    <item> QT_NO_WIZARD </item>
>+    <item> QT_NO_WORKSPACE </item>
>+    <item> QT_NO_XCURSOR </item>
>+    <item> QT_NO_XFIXES </item>
>+    <item> QT_NO_XINERAMA </item>
>+    <item> QT_NO_XINPUT </item>
>+    <item> QT_NO_XKB </item>
>+    <item> QT_NO_XMLPATTERNS </item>
>+    <item> QT_NO_XMLSTREAMREADER </item>
>+    <item> QT_NO_XMLSTREAMWRITER </item>
>+    <item> QT_NO_XRANDR </item>
>+    <item> QT_NO_XRENDER </item>
>+    <item> QT_NO_XSYNC </item>
>+    <item> QT_NO_XVIDEO </item>
>+    <item> QT_NO_ZLIB </item>
>+    <item> QT_PACKAGEDATE_STR </item>
>+    <item> QT_PACKAGE_TAG </item>
>+    <item> QT_POINTER_SIZE </item>
>+    <item> QT_PREPEND_NAMESPACE </item>
>+    <item> QT_PRODUCT_LICENSE </item>
>+    <item> QT_PRODUCT_LICENSEE </item>
>+    <item> QT_RETHROW </item>
>+    <item> QT_STATIC_CONST </item>
>+    <item> QT_STATIC_CONST_IMPL </item>
>+    <item> QT_STRINGIFY </item>
>+    <item> QT_STRINGIFY2 </item>
>+    <item> QT_SUPPORTS </item>
>+    <item> QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER </item>
>+    <item> QT_SYMBIAN_SUPPORTS_SGIMAGE </item>
>+    <item> QT_THROW </item>
>+    <item> QT_TRANSLATE_NOOP </item>
>+    <item> QT_TRANSLATE_NOOP3 </item>
>+    <item> QT_TRANSLATE_NOOP3_UTF8 </item>
>+    <item> QT_TRANSLATE_NOOP_UTF8 </item>
>+    <item> QT_TRAP_THROWING </item>
>+    <item> QT_TRID_NOOP </item>
>+    <item> QT_TRY </item>
>+    <item> QT_TRYCATCH_ERROR </item>
>+    <item> QT_TRYCATCH_LEAVING </item>
>+    <item> QT_TR_NOOP </item>
>+    <item> QT_TR_NOOP_UTF8 </item>
>+    <item> QT_USE_MATH_H_FLOATS </item>
>+    <item> QT_USE_NAMESPACE </item>
>+    <item> QT_VERSION </item>
>+    <item> QT_VERSION_CHECK </item>
>+    <item> QT_VERSION_STR </item>
>+    <item> QT_VISIBILITY_AVAILABLE </item>
>+    <item> QT_WA </item>
>+    <item> QT_WA_INLINE </item>
>+    <item> QT_WIN_CALLBACK </item>
>+    <item> Q_ALIGNOF </item>
>+    <item> Q_ASSERT </item>
>+    <item> Q_ASSERT_X </item>
>+    <item> Q_BIG_ENDIAN </item>
>+    <item> Q_BROKEN_DEBUG_STREAM </item>
>+    <item> Q_BROKEN_TEMPLATE_SPECIALIZATION </item>
>+    <item> Q_BYTE_ORDER </item>
>+    <item> Q_CANNOT_DELETE_CONSTANT </item>
>+    <item> Q_CC_BOR </item>
>+    <item> Q_CC_CDS </item>
>+    <item> Q_CC_CLANG </item>
>+    <item> Q_CC_COMEAU </item>
>+    <item> Q_CC_DEC </item>
>+    <item> Q_CC_DIAB </item>
>+    <item> Q_CC_EDG </item>
>+    <item> Q_CC_GCCE </item>
>+    <item> Q_CC_GHS </item>
>+    <item> Q_CC_GNU </item>
>+    <item> Q_CC_HIGHC </item>
>+    <item> Q_CC_HP </item>
>+    <item> Q_CC_HPACC </item>
>+    <item> Q_CC_INTEL </item>
>+    <item> Q_CC_KAI </item>
>+    <item> Q_CC_MINGW </item>
>+    <item> Q_CC_MIPS </item>
>+    <item> Q_CC_MSVC </item>
>+    <item> Q_CC_MSVC_NET </item>
>+    <item> Q_CC_MWERKS </item>
>+    <item> Q_CC_NOKIAX86 </item>
>+    <item> Q_CC_OC </item>
>+    <item> Q_CC_PGI </item>
>+    <item> Q_CC_RVCT </item>
>+    <item> Q_CC_SUN </item>
>+    <item> Q_CC_SYM </item>
>+    <item> Q_CC_USLC </item>
>+    <item> Q_CC_WAT </item>
>+    <item> Q_CC_XLC </item>
>+    <item> Q_CHECK_PTR </item>
>+    <item> Q_CLEANUP_RESOURCE </item>
>+    <item> Q_COMPILER_AUTO_TYPE </item>
>+    <item> Q_COMPILER_CLASS_ENUM </item>
>+    <item> Q_COMPILER_CONSTEXPR </item>
>+    <item> Q_COMPILER_DECLTYPE </item>
>+    <item> Q_COMPILER_DEFAULT_DELETE_MEMBERS </item>
>+    <item> Q_COMPILER_EXTERN_TEMPLATES </item>
>+    <item> Q_COMPILER_INITIALIZER_LISTS </item>
>+    <item> Q_COMPILER_LAMBDA </item>
>+    <item> Q_COMPILER_MANGLES_RETURN_TYPE </item>
>+    <item> Q_COMPILER_RVALUE_REFS </item>
>+    <item> Q_COMPILER_UNICODE_STRINGS </item>
>+    <item> Q_COMPILER_VARIADIC_TEMPLATES </item>
>+    <item> Q_CONSTRUCTOR_FUNCTION </item>
>+    <item> Q_CONSTRUCTOR_FUNCTION0 </item>
>+    <item> Q_C_CALLBACKS </item>
>+    <item> Q_D </item>
>+    <item> Q_DECLARE_FLAGS </item>
>+    <item> Q_DECLARE_INCOMPATIBLE_FLAGS </item>
>+    <item> Q_DECLARE_OPERATORS_FOR_FLAGS </item>
>+    <item> Q_DECLARE_PRIVATE </item>
>+    <item> Q_DECLARE_PRIVATE_D </item>
>+    <item> Q_DECLARE_PUBLIC </item>
>+    <item> Q_DECLARE_SHARED </item>
>+    <item> Q_DECLARE_SHARED_STL </item>
>+    <item> Q_DECLARE_TYPEINFO </item>
>+    <item> Q_DECLARE_TYPEINFO_BODY </item>
>+    <item> Q_DECL_ALIGN </item>
>+    <item> Q_DECL_CONSTEXPR </item>
>+    <item> Q_DECL_CONSTRUCTOR_DEPRECATED </item>
>+    <item> Q_DECL_DEPRECATED </item>
>+    <item> Q_DECL_HIDDEN </item>
>+    <item> Q_DECL_IMPORT </item>
>+    <item> Q_DECL_VARIABLE_DEPRECATED </item>
>+    <item> Q_DESTRUCTOR_FUNCTION </item>
>+    <item> Q_DESTRUCTOR_FUNCTION0 </item>
>+    <item> Q_DISABLE_COPY </item>
>+    <item> Q_DUMMY_COMPARISON_OPERATOR </item>
>+    <item> Q_FOREACH </item>
>+    <item> Q_FOREVER </item>
>+    <item> Q_FULL_TEMPLATE_INSTANTIATION </item>
>+    <item> Q_FUNC_INFO </item>
>+    <item> Q_GLOBAL_STATIC </item>
>+    <item> Q_GLOBAL_STATIC_INIT </item>
>+    <item> Q_GLOBAL_STATIC_WITH_ARGS </item>
>+    <item> Q_GLOBAL_STATIC_WITH_INITIALIZER </item>
>+    <item> Q_INIT_RESOURCE </item>
>+    <item> Q_INIT_RESOURCE_EXTERN </item>
>+    <item> Q_INLINE_TEMPLATE </item>
>+    <item> Q_INT64_C </item>
>+    <item> Q_LIKELY </item>
>+    <item> Q_LITTLE_ENDIAN </item>
>+    <item> Q_NO_BOOL_TYPE </item>
>+    <item> Q_NO_DATA_RELOCATION </item>
>+    <item> Q_NO_DECLARED_NOT_DEFINED </item>
>+    <item> Q_NO_DEPRECATED_CONSTRUCTORS </item>
>+    <item> Q_NO_EXPLICIT_KEYWORD </item>
>+    <item> Q_NO_PACKED_REFERENCE </item>
>+    <item> Q_NO_POSIX_SIGNALS </item>
>+    <item> Q_NO_TEMPLATE_FRIENDS </item>
>+    <item> Q_NO_USING_KEYWORD </item>
>+    <item> Q_OF_ELF </item>
>+    <item> Q_OS_AIX </item>
>+    <item> Q_OS_BSD4 </item>
>+    <item> Q_OS_BSDI </item>
>+    <item> Q_OS_CYGWIN </item>
>+    <item> Q_OS_DARWIN </item>
>+    <item> Q_OS_DARWIN32 </item>
>+    <item> Q_OS_DARWIN64 </item>
>+    <item> Q_OS_DGUX </item>
>+    <item> Q_OS_DYNIX </item>
>+    <item> Q_OS_FREEBSD </item>
>+    <item> Q_OS_HPUX </item>
>+    <item> Q_OS_HURD </item>
>+    <item> Q_OS_INTEGRITY </item>
>+    <item> Q_OS_IRIX </item>
>+    <item> Q_OS_LINUX </item>
>+    <item> Q_OS_LYNX </item>
>+    <item> Q_OS_MAC </item>
>+    <item> Q_OS_MAC32 </item>
>+    <item> Q_OS_MAC64 </item>
>+    <item> Q_OS_MACX </item>
>+    <item> Q_OS_MSDOS </item>
>+    <item> Q_OS_NACL </item>
>+    <item> Q_OS_NETBSD </item>
>+    <item> Q_OS_OPENBSD </item>
>+    <item> Q_OS_OS2 </item>
>+    <item> Q_OS_OS2EMX </item>
>+    <item> Q_OS_OSF </item>
>+    <item> Q_OS_QNX </item>
>+    <item> Q_OS_RELIANT </item>
>+    <item> Q_OS_SCO </item>
>+    <item> Q_OS_SOLARIS </item>
>+    <item> Q_OS_SYMBIAN </item>
>+    <item> Q_OS_ULTRIX </item>
>+    <item> Q_OS_UNIX </item>
>+    <item> Q_OS_UNIXWARE </item>
>+    <item> Q_OS_VXWORKS </item>
>+    <item> Q_OS_WIN </item>
>+    <item> Q_OS_WIN32 </item>
>+    <item> Q_OS_WIN64 </item>
>+    <item> Q_OS_WINCE </item>
>+    <item> Q_OUTOFLINE_TEMPLATE </item>
>+    <item> Q_PACKED </item>
>+    <item> Q_Q </item>
>+    <item> Q_REQUIRED_RESULT </item>
>+    <item> Q_SYMBIAN_FIXED_POINTER_CURSORS </item>
>+    <item> Q_SYMBIAN_HAS_EXTENDED_BITMAP_TYPE </item>
>+    <item> Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE </item>
>+    <item> Q_SYMBIAN_SUPPORTS_FIXNATIVEORIENTATION </item>
>+    <item> Q_SYMBIAN_SUPPORTS_MULTIPLE_SCREENS </item>
>+    <item> Q_SYMBIAN_SUPPORTS_SURFACES </item>
>+    <item> Q_SYMBIAN_TRANSITION_EFFECTS </item>
>+    <item> Q_SYMBIAN_WINDOW_SIZE_CACHE </item>
>+    <item> Q_TEMPLATEDLL </item>
>+    <item> Q_TYPENAME </item>
>+    <item> Q_TYPEOF </item>
>+    <item> Q_UINT64_C </item>
>+    <item> Q_UNLIKELY </item>
>+    <item> Q_UNUSED </item>
>+    <item> Q_WRONG_SB_CTYPE_MACROS </item>
>+    <item> Q_WS_MAC </item>
>+    <item> Q_WS_MAC32 </item>
>+    <item> Q_WS_MAC64 </item>
>+    <item> Q_WS_MACX </item>
>+    <item> Q_WS_PM </item>
>+    <item> Q_WS_S60 </item>
>+    <item> Q_WS_WIN </item>
>+    <item> Q_WS_WIN16 </item>
>+    <item> Q_WS_WIN32 </item>
>+    <item> Q_WS_WIN64 </item>
>+    <item> Q_WS_WINCE </item>
>+    <item> Q_WS_WINCE_WM </item>
>+    <item> Q_WS_X11 </item>
>+  </list>
>+
>+  <list name="Qt4Classes">
>+    
>+    <item> QAbstractAnimation </item>
>+    <item> QAbstractButton </item>
>+    <item> QAbstractEventDispatcher </item>
>+    <item> QAbstractExtensionFactory </item>
>+    <item> QAbstractExtensionManager </item>
>+    <item> QAbstractFileEngine </item>
>+    <item> QAbstractFileEngineHandler </item>
>+    <item> QAbstractFileEngineIterator </item>
>+    <item> QAbstractFontEngine </item>
>+    <item> QAbstractFormBuilder </item>
>+    <item> QAbstractGraphicsShapeItem </item>
>+    <item> QAbstractItemDelegate </item>
>+    <item> QAbstractItemModel </item>
>+    <item> QAbstractItemView </item>
>+    <item> QAbstractListModel </item>
>+    <item> QAbstractMessageHandler </item>
>+    <item> QAbstractNetworkCache </item>
>+    <item> QAbstractPrintDialog </item>
>+    <item> QAbstractProxyModel </item>
>+    <item> QAbstractScrollArea </item>
>+    <item> QAbstractSlider </item>
>+    <item> QAbstractSocket </item>
>+    <item> QAbstractSpinBox </item>
>+    <item> QAbstractState </item>
>+    <item> QAbstractTableModel </item>
>+    <item> QAbstractTextDocumentLayout </item>
>+    <item> QAbstractTransition </item>
>+    <item> QAbstractUriResolver </item>
>+    <item> QAbstractVideoBuffer </item>
>+    <item> QAbstractVideoSurface </item>
>+    <item> QAbstractXmlNodeModel </item>
>+    <item> QAbstractXmlReceiver </item>
>+    <item> QAccessible </item>
>+    <item> QAccessibleBridge </item>
>+    <item> QAccessibleBridgePlugin </item>
>+    <item> QAccessibleEvent </item>
>+    <item> QAccessibleInterface </item>
>+    <item> QAccessibleObject </item>
>+    <item> QAccessiblePlugin </item>
>+    <item> QAccessibleWidget </item>
>+    <item> QAction </item>
>+    <item> QActionEvent </item>
>+    <item> QActionGroup </item>
>+    <item> QAnimationGroup </item>
>+    <item> QApplication </item>
>+    <item> QAtomicInt </item>
>+    <item> QAtomicPointer </item>
>+    <item> QAudioDeviceInfo </item>
>+    <item> QAudioFormat </item>
>+    <item> QAudioInput </item>
>+    <item> QAudioOutput </item>
>+    <item> QAuthenticator </item>
>+    <item> QAxAggregated </item>
>+    <item> QAxBase </item>
>+    <item> QAxBindable </item>
>+    <item> QAxFactory </item>
>+    <item> QAxObject </item>
>+    <item> QAxScript </item>
>+    <item> QAxScriptEngine </item>
>+    <item> QAxScriptManager </item>
>+    <item> QAxWidget </item>
>+    <item> QBasicTimer </item>
>+    <item> QBitArray </item>
>+    <item> QBitmap </item>
>+    <item> QBoxLayout </item>
>+    <item> QBrush </item>
>+    <item> QBuffer </item>
>+    <item> QButtonGroup </item>
>+    <item> QByteArray </item>
>+    <item> QByteArrayMatcher </item>
>+    <item> QCache </item>
>+    <item> QCalendarWidget </item>
>+    <item> QCDEStyle </item>
>+    <item> QChar </item>
>+    <item> QCheckBox </item>
>+    <item> QChildEvent </item>
>+    <item> QCleanlooksStyle </item>
>+    <item> QClipboard </item>
>+    <item> QCloseEvent </item>
>+    <item> QColor </item>
>+    <item> QColorDialog </item>
>+    <item> QColormap </item>
>+    <item> QColumnView </item>
>+    <item> QComboBox </item>
>+    <item> QCommandLinkButton </item>
>+    <item> QCommonStyle </item>
>+    <item> QCompleter </item>
>+    <item> QConicalGradient </item>
>+    <item> QContextMenuEvent </item>
>+    <item> QContiguousCache </item>
>+    <item> QCopChannel </item>
>+    <item> QCoreApplication </item>
>+    <item> QCryptographicHash </item>
>+    <item> QCursor </item>
>+    <item> QCustomRasterPaintDevice </item>
>+    <item> QDataStream </item>
>+    <item> QDataWidgetMapper </item>
>+    <item> QDate </item>
>+    <item> QDateEdit </item>
>+    <item> QDateTime </item>
>+    <item> QDateTimeEdit </item>
>+    <item> QDBusAbstractAdaptor </item>
>+    <item> QDBusAbstractInterface </item>
>+    <item> QDBusArgument </item>
>+    <item> QDBusConnection </item>
>+    <item> QDBusConnectionInterface </item>
>+    <item> QDBusContext </item>
>+    <item> QDBusError </item>
>+    <item> QDBusInterface </item>
>+    <item> QDBusMessage </item>
>+    <item> QDBusObjectPath </item>
>+    <item> QDBusPendingCall </item>
>+    <item> QDBusPendingCallWatcher </item>
>+    <item> QDBusPendingReply </item>
>+    <item> QDBusReply </item>
>+    <item> QDBusServiceWatcher </item>
>+    <item> QDBusSignature </item>
>+    <item> QDBusUnixFileDescriptor </item>
>+    <item> QDBusVariant </item>
>+    <item> QDebug </item>
>+    <item> QDeclarativeComponent </item>
>+    <item> QDeclarativeContext </item>
>+    <item> QDeclarativeEngine </item>
>+    <item> QDeclarativeError </item>
>+    <item> QDeclarativeExpression </item>
>+    <item> QDeclarativeExtensionPlugin </item>
>+    <item> QDeclarativeImageProvider </item>
>+    <item> QDeclarativeItem </item>
>+    <item> QDeclarativeListProperty </item>
>+    <item> QDeclarativeListReference </item>
>+    <item> QDeclarativeNetworkAccessManagerFactory </item>
>+    <item> QDeclarativeParserStatus </item>
>+    <item> QDeclarativeProperty </item>
>+    <item> QDeclarativePropertyMap </item>
>+    <item> QDeclarativePropertyValueSource </item>
>+    <item> QDeclarativeScriptString </item>
>+    <item> QDeclarativeView </item>
>+    <item> QDecoration </item>
>+    <item> QDecorationDefault </item>
>+    <item> QDecorationFactory </item>
>+    <item> QDecorationPlugin </item>
>+    <item> QDesignerActionEditorInterface </item>
>+    <item> QDesignerContainerExtension </item>
>+    <item> QDesignerCustomWidgetCollectionInterface </item>
>+    <item> QDesignerCustomWidgetInterface </item>
>+    <item> QDesignerDynamicPropertySheetExtension </item>
>+    <item> QDesignerFormEditorInterface </item>
>+    <item> QDesignerFormWindowCursorInterface </item>
>+    <item> QDesignerFormWindowInterface </item>
>+    <item> QDesignerFormWindowManagerInterface </item>
>+    <item> QDesignerMemberSheetExtension </item>
>+    <item> QDesignerObjectInspectorInterface </item>
>+    <item> QDesignerPropertyEditorInterface </item>
>+    <item> QDesignerPropertySheetExtension </item>
>+    <item> QDesignerTaskMenuExtension </item>
>+    <item> QDesignerWidgetBoxInterface </item>
>+    <item> QDesktopServices </item>
>+    <item> QDesktopWidget </item>
>+    <item> QDial </item>
>+    <item> QDialog </item>
>+    <item> QDialogButtonBox </item>
>+    <item> QDir </item>
>+    <item> QDirectPainter </item>
>+    <item> QDirIterator </item>
>+    <item> QDockWidget </item>
>+    <item> QDomAttr </item>
>+    <item> QDomCDATASection </item>
>+    <item> QDomCharacterData </item>
>+    <item> QDomComment </item>
>+    <item> QDomDocument </item>
>+    <item> QDomDocumentFragment </item>
>+    <item> QDomDocumentType </item>
>+    <item> QDomElement </item>
>+    <item> QDomEntity </item>
>+    <item> QDomEntityReference </item>
>+    <item> QDomImplementation </item>
>+    <item> QDomNamedNodeMap </item>
>+    <item> QDomNode </item>
>+    <item> QDomNodeList </item>
>+    <item> QDomNotation </item>
>+    <item> QDomProcessingInstruction </item>
>+    <item> QDomText </item>
>+    <item> QDoubleSpinBox </item>
>+    <item> QDoubleValidator </item>
>+    <item> QDrag </item>
>+    <item> QDragEnterEvent </item>
>+    <item> QDragLeaveEvent </item>
>+    <item> QDragMoveEvent </item>
>+    <item> QDropEvent </item>
>+    <item> QDynamicPropertyChangeEvent </item>
>+    <item> QEasingCurve </item>
>+    <item> QElapsedTimer </item>
>+    <item> QErrorMessage </item>
>+    <item> QEvent </item>
>+    <item> QEventLoop </item>
>+    <item> QEventTransition </item>
>+    <item> QExplicitlySharedDataPointer </item>
>+    <item> QExtensionFactory </item>
>+    <item> QExtensionManager </item>
>+    <item> QFile </item>
>+    <item> QFileDialog </item>
>+    <item> QFileIconProvider </item>
>+    <item> QFileInfo </item>
>+    <item> QFileOpenEvent </item>
>+    <item> QFileSystemModel </item>
>+    <item> QFileSystemWatcher </item>
>+    <item> QFinalState </item>
>+    <item> QFlag </item>
>+    <item> QFlags </item>
>+    <item> QFocusEvent </item>
>+    <item> QFocusFrame </item>
>+    <item> QFont </item>
>+    <item> QFontComboBox </item>
>+    <item> QFontDatabase </item>
>+    <item> QFontDialog </item>
>+    <item> QFontEngineInfo </item>
>+    <item> QFontEnginePlugin </item>
>+    <item> QFontInfo </item>
>+    <item> QFontMetrics </item>
>+    <item> QFontMetricsF </item>
>+    <item> QFormBuilder </item>
>+    <item> QFormLayout </item>
>+    <item> QFrame </item>
>+    <item> QFSFileEngine </item>
>+    <item> QFtp </item>
>+    <item> QFuture </item>
>+    <item> QFutureIterator </item>
>+    <item> QFutureSynchronizer </item>
>+    <item> QFutureWatcher </item>
>+    <item> QGenericArgument </item>
>+    <item> QGenericMatrix </item>
>+    <item> QGenericPlugin </item>
>+    <item> QGenericPluginFactory </item>
>+    <item> QGenericReturnArgument </item>
>+    <item> QGesture </item>
>+    <item> QGestureEvent </item>
>+    <item> QGestureRecognizer </item>
>+    <item> QGLBuffer </item>
>+    <item> QGLColormap </item>
>+    <item> QGLContext </item>
>+    <item> QGLFormat </item>
>+    <item> QGLFramebufferObject </item>
>+    <item> QGLFramebufferObjectFormat </item>
>+    <item> QGLFunctions </item>
>+    <item> QGLPixelBuffer </item>
>+    <item> QGLShader </item>
>+    <item> QGLShaderProgram </item>
>+    <item> QGLWidget </item>
>+    <item> QGlyphRun </item>
>+    <item> QGradient </item>
>+    <item> QGraphicsAnchor </item>
>+    <item> QGraphicsAnchorLayout </item>
>+    <item> QGraphicsBlurEffect </item>
>+    <item> QGraphicsColorizeEffect </item>
>+    <item> QGraphicsDropShadowEffect </item>
>+    <item> QGraphicsEffect </item>
>+    <item> QGraphicsEllipseItem </item>
>+    <item> QGraphicsGridLayout </item>
>+    <item> QGraphicsItem </item>
>+    <item> QGraphicsItemAnimation </item>
>+    <item> QGraphicsItemGroup </item>
>+    <item> QGraphicsLayout </item>
>+    <item> QGraphicsLayoutItem </item>
>+    <item> QGraphicsLinearLayout </item>
>+    <item> QGraphicsLineItem </item>
>+    <item> QGraphicsObject </item>
>+    <item> QGraphicsOpacityEffect </item>
>+    <item> QGraphicsPathItem </item>
>+    <item> QGraphicsPixmapItem </item>
>+    <item> QGraphicsPolygonItem </item>
>+    <item> QGraphicsProxyWidget </item>
>+    <item> QGraphicsRectItem </item>
>+    <item> QGraphicsRotation </item>
>+    <item> QGraphicsScale </item>
>+    <item> QGraphicsScene </item>
>+    <item> QGraphicsSceneContextMenuEvent </item>
>+    <item> QGraphicsSceneDragDropEvent </item>
>+    <item> QGraphicsSceneEvent </item>
>+    <item> QGraphicsSceneHelpEvent </item>
>+    <item> QGraphicsSceneHoverEvent </item>
>+    <item> QGraphicsSceneMouseEvent </item>
>+    <item> QGraphicsSceneMoveEvent </item>
>+    <item> QGraphicsSceneResizeEvent </item>
>+    <item> QGraphicsSceneWheelEvent </item>
>+    <item> QGraphicsSimpleTextItem </item>
>+    <item> QGraphicsSvgItem </item>
>+    <item> QGraphicsTextItem </item>
>+    <item> QGraphicsTransform </item>
>+    <item> QGraphicsView </item>
>+    <item> QGraphicsWebView </item>
>+    <item> QGraphicsWidget </item>
>+    <item> QGridLayout </item>
>+    <item> QGroupBox </item>
>+    <item> QGtkStyle </item>
>+    <item> QHash </item>
>+    <item> QHashIterator </item>
>+    <item> QHBoxLayout </item>
>+    <item> QHeaderView </item>
>+    <item> QHelpContentItem </item>
>+    <item> QHelpContentModel </item>
>+    <item> QHelpContentWidget </item>
>+    <item> QHelpEngine </item>
>+    <item> QHelpEngineCore </item>
>+    <item> QHelpEvent </item>
>+    <item> QHelpIndexModel </item>
>+    <item> QHelpIndexWidget </item>
>+    <item> QHelpSearchEngine </item>
>+    <item> QHelpSearchQuery </item>
>+    <item> QHelpSearchQueryWidget </item>
>+    <item> QHelpSearchResultWidget </item>
>+    <item> QHideEvent </item>
>+    <item> QHistoryState </item>
>+    <item> QHostAddress </item>
>+    <item> QHostInfo </item>
>+    <item> QHoverEvent </item>
>+    <item> QHttpMultiPart </item>
>+    <item> QHttpPart </item>
>+    <item> QIcon </item>
>+    <item> QIconDragEvent </item>
>+    <item> QIconEngine </item>
>+    <item> QIconEnginePlugin </item>
>+    <item> QIconEnginePluginV2 </item>
>+    <item> QIconEngineV2 </item>
>+    <item> QIdentityProxyModel </item>
>+    <item> QImage </item>
>+    <item> QImageIOHandler </item>
>+    <item> QImageIOPlugin </item>
>+    <item> QImageReader </item>
>+    <item> QImageWriter </item>
>+    <item> QInputContext </item>
>+    <item> QInputContextFactory </item>
>+    <item> QInputContextPlugin </item>
>+    <item> QInputDialog </item>
>+    <item> QInputEvent </item>
>+    <item> QInputMethodEvent </item>
>+    <item> QIntValidator </item>
>+    <item> QIODevice </item>
>+    <item> QItemDelegate </item>
>+    <item> QItemEditorCreator </item>
>+    <item> QItemEditorCreatorBase </item>
>+    <item> QItemEditorFactory </item>
>+    <item> QItemSelection </item>
>+    <item> QItemSelectionModel </item>
>+    <item> QItemSelectionRange </item>
>+    <item> QKbdDriverFactory </item>
>+    <item> QKbdDriverPlugin </item>
>+    <item> QKeyEvent </item>
>+    <item> QKeyEventTransition </item>
>+    <item> QKeySequence </item>
>+    <item> QLabel </item>
>+    <item> QLatin1Char </item>
>+    <item> QLatin1String </item>
>+    <item> QLayout </item>
>+    <item> QLayoutItem </item>
>+    <item> QLCDNumber </item>
>+    <item> QLibrary </item>
>+    <item> QLibraryInfo </item>
>+    <item> QLine </item>
>+    <item> QLinearGradient </item>
>+    <item> QLineEdit </item>
>+    <item> QLineF </item>
>+    <item> QLinkedList </item>
>+    <item> QLinkedListIterator </item>
>+    <item> QList </item>
>+    <item> QListIterator </item>
>+    <item> QListView </item>
>+    <item> QListWidget </item>
>+    <item> QListWidgetItem </item>
>+    <item> QLocale </item>
>+    <item> QLocalServer </item>
>+    <item> QLocalSocket </item>
>+    <item> QMacCocoaViewContainer </item>
>+    <item> QMacNativeWidget </item>
>+    <item> QMacPasteboardMime </item>
>+    <item> QMacStyle </item>
>+    <item> QMainWindow </item>
>+    <item> QMap </item>
>+    <item> QMapIterator </item>
>+    <item> QMargins </item>
>+    <item> QMatrix4x4 </item>
>+    <item> QMdiArea </item>
>+    <item> QMdiSubWindow </item>
>+    <item> QMenu </item>
>+    <item> QMenuBar </item>
>+    <item> QMessageBox </item>
>+    <item> QMetaClassInfo </item>
>+    <item> QMetaEnum </item>
>+    <item> QMetaMethod </item>
>+    <item> QMetaObject </item>
>+    <item> QMetaProperty </item>
>+    <item> QMetaType </item>
>+    <item> QMimeData </item>
>+    <item> QModelIndex </item>
>+    <item> QMotifStyle </item>
>+    <item> QMouseDriverFactory </item>
>+    <item> QMouseDriverPlugin </item>
>+    <item> QMouseEvent </item>
>+    <item> QMouseEventTransition </item>
>+    <item> QMoveEvent </item>
>+    <item> QMovie </item>
>+    <item> QMultiHash </item>
>+    <item> QMultiMap </item>
>+    <item> QMutableHashIterator </item>
>+    <item> QMutableLinkedListIterator </item>
>+    <item> QMutableListIterator </item>
>+    <item> QMutableMapIterator </item>
>+    <item> QMutableSetIterator </item>
>+    <item> QMutableVectorIterator </item>
>+    <item> QMutex </item>
>+    <item> QMutexLocker </item>
>+    <item> QNetworkAccessManager </item>
>+    <item> QNetworkAddressEntry </item>
>+    <item> QNetworkCacheMetaData </item>
>+    <item> QNetworkConfiguration </item>
>+    <item> QNetworkConfigurationManager </item>
>+    <item> QNetworkCookie </item>
>+    <item> QNetworkCookieJar </item>
>+    <item> QNetworkDiskCache </item>
>+    <item> QNetworkInterface </item>
>+    <item> QNetworkProxy </item>
>+    <item> QNetworkProxyFactory </item>
>+    <item> QNetworkProxyQuery </item>
>+    <item> QNetworkReply </item>
>+    <item> QNetworkRequest </item>
>+    <item> QNetworkSession </item>
>+    <item> QObject </item>
>+    <item> QObjectCleanupHandler </item>
>+    <item> QPageSetupDialog </item>
>+    <item> QPaintDevice </item>
>+    <item> QPaintEngine </item>
>+    <item> QPaintEngineState </item>
>+    <item> QPainter </item>
>+    <item> QPainterPath </item>
>+    <item> QPainterPathStroker </item>
>+    <item> QPaintEvent </item>
>+    <item> QPair </item>
>+    <item> QPalette </item>
>+    <item> QPanGesture </item>
>+    <item> QParallelAnimationGroup </item>
>+    <item> QPauseAnimation </item>
>+    <item> QPen </item>
>+    <item> QPersistentModelIndex </item>
>+    <item> QPicture </item>
>+    <item> QPinchGesture </item>
>+    <item> QPixmap </item>
>+    <item> QPixmapCache </item>
>+    <item> QPlainTextDocumentLayout </item>
>+    <item> QPlainTextEdit </item>
>+    <item> QPlastiqueStyle </item>
>+    <item> QPlatformCursor </item>
>+    <item> QPlatformCursorImage </item>
>+    <item> QPlatformFontDatabase </item>
>+    <item> QPlatformWindowFormat </item>
>+    <item> QPluginLoader </item>
>+    <item> QPoint </item>
>+    <item> QPointer </item>
>+    <item> QPointF </item>
>+    <item> QPolygon </item>
>+    <item> QPolygonF </item>
>+    <item> QPrintDialog </item>
>+    <item> QPrintEngine </item>
>+    <item> QPrinter </item>
>+    <item> QPrinterInfo </item>
>+    <item> QPrintPreviewDialog </item>
>+    <item> QPrintPreviewWidget </item>
>+    <item> QProcess </item>
>+    <item> QProcessEnvironment </item>
>+    <item> QProgressBar </item>
>+    <item> QProgressDialog </item>
>+    <item> QPropertyAnimation </item>
>+    <item> QProxyScreen </item>
>+    <item> QProxyScreenCursor </item>
>+    <item> QProxyStyle </item>
>+    <item> QPushButton </item>
>+    <item> QQuaternion </item>
>+    <item> QQueue </item>
>+    <item> QRadialGradient </item>
>+    <item> QRadioButton </item>
>+    <item> QRasterPaintEngine </item>
>+    <item> QRawFont </item>
>+    <item> QReadLocker </item>
>+    <item> QReadWriteLock </item>
>+    <item> QRect </item>
>+    <item> QRectF </item>
>+    <item> QRegExp </item>
>+    <item> QRegExpValidator </item>
>+    <item> QRegion </item>
>+    <item> QResizeEvent </item>
>+    <item> QResource </item>
>+    <item> QRubberBand </item>
>+    <item> QRunnable </item>
>+    <item> QS60MainApplication </item>
>+    <item> QS60MainAppUi </item>
>+    <item> QS60MainDocument </item>
>+    <item> QS60Style </item>
>+    <item> QScopedArrayPointer </item>
>+    <item> QScopedPointer </item>
>+    <item> QScopedValueRollback </item>
>+    <item> QScreen </item>
>+    <item> QScreenCursor </item>
>+    <item> QScreenDriverFactory </item>
>+    <item> QScreenDriverPlugin </item>
>+    <item> QScriptable </item>
>+    <item> QScriptClass </item>
>+    <item> QScriptClassPropertyIterator </item>
>+    <item> QScriptContext </item>
>+    <item> QScriptContextInfo </item>
>+    <item> QScriptEngine </item>
>+    <item> QScriptEngineAgent </item>
>+    <item> QScriptEngineDebugger </item>
>+    <item> QScriptExtensionPlugin </item>
>+    <item> QScriptProgram </item>
>+    <item> QScriptString </item>
>+    <item> QScriptSyntaxCheckResult </item>
>+    <item> QScriptValue </item>
>+    <item> QScriptValueIterator </item>
>+    <item> QScrollArea </item>
>+    <item> QScrollBar </item>
>+    <item> QSemaphore </item>
>+    <item> QSequentialAnimationGroup </item>
>+    <item> QSessionManager </item>
>+    <item> QSet </item>
>+    <item> QSetIterator </item>
>+    <item> QSettings </item>
>+    <item> QSharedData </item>
>+    <item> QSharedDataPointer </item>
>+    <item> QSharedMemory </item>
>+    <item> QSharedPointer </item>
>+    <item> QShortcut </item>
>+    <item> QShortcutEvent </item>
>+    <item> QShowEvent </item>
>+    <item> QSignalMapper </item>
>+    <item> QSignalSpy </item>
>+    <item> QSignalTransition </item>
>+    <item> QSimpleXmlNodeModel </item>
>+    <item> QSize </item>
>+    <item> QSizeF </item>
>+    <item> QSizeGrip </item>
>+    <item> QSizePolicy </item>
>+    <item> QSlider </item>
>+    <item> QSocketNotifier </item>
>+    <item> QSortFilterProxyModel </item>
>+    <item> QSound </item>
>+    <item> QSourceLocation </item>
>+    <item> QSpacerItem </item>
>+    <item> QSpinBox </item>
>+    <item> QSplashScreen </item>
>+    <item> QSplitter </item>
>+    <item> QSplitterHandle </item>
>+    <item> QSqlDatabase </item>
>+    <item> QSqlDriver </item>
>+    <item> QSqlDriverCreator </item>
>+    <item> QSqlDriverCreatorBase </item>
>+    <item> QSqlDriverPlugin </item>
>+    <item> QSqlError </item>
>+    <item> QSqlField </item>
>+    <item> QSqlIndex </item>
>+    <item> QSqlQuery </item>
>+    <item> QSqlQueryModel </item>
>+    <item> QSqlRecord </item>
>+    <item> QSqlRelation </item>
>+    <item> QSqlRelationalDelegate </item>
>+    <item> QSqlRelationalTableModel </item>
>+    <item> QSqlResult </item>
>+    <item> QSqlTableModel </item>
>+    <item> QSslCertificate </item>
>+    <item> QSslCipher </item>
>+    <item> QSslConfiguration </item>
>+    <item> QSslError </item>
>+    <item> QSslKey </item>
>+    <item> QSslSocket </item>
>+    <item> QStack </item>
>+    <item> QStackedLayout </item>
>+    <item> QStackedWidget </item>
>+    <item> QStandardItem </item>
>+    <item> QStandardItemEditorCreator </item>
>+    <item> QStandardItemModel </item>
>+    <item> QState </item>
>+    <item> QStateMachine </item>
>+    <item> QStaticText </item>
>+    <item> QStatusBar </item>
>+    <item> QStatusTipEvent </item>
>+    <item> QString </item>
>+    <item> QStringList </item>
>+    <item> QStringListModel </item>
>+    <item> QStringMatcher </item>
>+    <item> QStringRef </item>
>+    <item> QStyle </item>
>+    <item> QStyledItemDelegate </item>
>+    <item> QStyleFactory </item>
>+    <item> QStyleHintReturn </item>
>+    <item> QStyleHintReturnMask </item>
>+    <item> QStyleHintReturnVariant </item>
>+    <item> QStyleOption </item>
>+    <item> QStyleOptionButton </item>
>+    <item> QStyleOptionComboBox </item>
>+    <item> QStyleOptionComplex </item>
>+    <item> QStyleOptionDockWidget </item>
>+    <item> QStyleOptionFocusRect </item>
>+    <item> QStyleOptionFrame </item>
>+    <item> QStyleOptionFrameV2 </item>
>+    <item> QStyleOptionFrameV3 </item>
>+    <item> QStyleOptionGraphicsItem </item>
>+    <item> QStyleOptionGroupBox </item>
>+    <item> QStyleOptionHeader </item>
>+    <item> QStyleOptionMenuItem </item>
>+    <item> QStyleOptionProgressBar </item>
>+    <item> QStyleOptionProgressBarV2 </item>
>+    <item> QStyleOptionQ3DockWindow </item>
>+    <item> QStyleOptionQ3ListView </item>
>+    <item> QStyleOptionQ3ListViewItem </item>
>+    <item> QStyleOptionRubberBand </item>
>+    <item> QStyleOptionSizeGrip </item>
>+    <item> QStyleOptionSlider </item>
>+    <item> QStyleOptionSpinBox </item>
>+    <item> QStyleOptionTab </item>
>+    <item> QStyleOptionTabBarBase </item>
>+    <item> QStyleOptionTabBarBaseV2 </item>
>+    <item> QStyleOptionTabV2 </item>
>+    <item> QStyleOptionTabV3 </item>
>+    <item> QStyleOptionTabWidgetFrame </item>
>+    <item> QStyleOptionTabWidgetFrameV2 </item>
>+    <item> QStyleOptionTitleBar </item>
>+    <item> QStyleOptionToolBar </item>
>+    <item> QStyleOptionToolBox </item>
>+    <item> QStyleOptionToolBoxV2 </item>
>+    <item> QStyleOptionToolButton </item>
>+    <item> QStyleOptionViewItem </item>
>+    <item> QStyleOptionViewItemV2 </item>
>+    <item> QStyleOptionViewItemV3 </item>
>+    <item> QStyleOptionViewItemV4 </item>
>+    <item> QStylePainter </item>
>+    <item> QStylePlugin </item>
>+    <item> QSupportedWritingSystems </item>
>+    <item> QSvgGenerator </item>
>+    <item> QSvgRenderer </item>
>+    <item> QSvgWidget </item>
>+    <item> QSwipeGesture </item>
>+    <item> QSymbianEvent </item>
>+    <item> QSymbianGraphicsSystemHelper </item>
>+    <item> QSyntaxHighlighter </item>
>+    <item> QSysInfo </item>
>+    <item> QSystemLocale </item>
>+    <item> QSystemSemaphore </item>
>+    <item> QSystemTrayIcon </item>
>+    <item> QTabBar </item>
>+    <item> QTabletEvent </item>
>+    <item> QTableView </item>
>+    <item> QTableWidget </item>
>+    <item> QTableWidgetItem </item>
>+    <item> QTableWidgetSelectionRange </item>
>+    <item> QTabWidget </item>
>+    <item> QTapAndHoldGesture </item>
>+    <item> QTapGesture </item>
>+    <item> QTcpServer </item>
>+    <item> QTcpSocket </item>
>+    <item> QTemporaryFile </item>
>+    <item> QTestEventList </item>
>+    <item> QTextBlock </item>
>+    <item> QTextBlockFormat </item>
>+    <item> QTextBlockGroup </item>
>+    <item> QTextBlockUserData </item>
>+    <item> QTextBoundaryFinder </item>
>+    <item> QTextBrowser </item>
>+    <item> QTextCharFormat </item>
>+    <item> QTextCodec </item>
>+    <item> QTextCodecPlugin </item>
>+    <item> QTextCursor </item>
>+    <item> QTextDecoder </item>
>+    <item> QTextDocument </item>
>+    <item> QTextDocumentFragment </item>
>+    <item> QTextDocumentWriter </item>
>+    <item> QTextEdit </item>
>+    <item> QTextEncoder </item>
>+    <item> QTextFormat </item>
>+    <item> QTextFragment </item>
>+    <item> QTextFrame </item>
>+    <item> QTextFrameFormat </item>
>+    <item> QTextImageFormat </item>
>+    <item> QTextInlineObject </item>
>+    <item> QTextItem </item>
>+    <item> QTextLayout </item>
>+    <item> QTextLength </item>
>+    <item> QTextLine </item>
>+    <item> QTextList </item>
>+    <item> QTextListFormat </item>
>+    <item> QTextObject </item>
>+    <item> QTextObjectInterface </item>
>+    <item> QTextOption </item>
>+    <item> QTextStream </item>
>+    <item> QTextTable </item>
>+    <item> QTextTableCell </item>
>+    <item> QTextTableCellFormat </item>
>+    <item> QTextTableFormat </item>
>+    <item> QThread </item>
>+    <item> QThreadPool </item>
>+    <item> QThreadStorage </item>
>+    <item> QTileRules </item>
>+    <item> QTime </item>
>+    <item> QTimeEdit </item>
>+    <item> QTimeLine </item>
>+    <item> QTimer </item>
>+    <item> QTimerEvent </item>
>+    <item> QToolBar </item>
>+    <item> QToolBox </item>
>+    <item> QToolButton </item>
>+    <item> QToolTip </item>
>+    <item> QTouchEvent </item>
>+    <item> QTransform </item>
>+    <item> QTranslator </item>
>+    <item> QTreeView </item>
>+    <item> QTreeWidget </item>
>+    <item> QTreeWidgetItem </item>
>+    <item> QTreeWidgetItemIterator </item>
>+    <item> QUdpSocket </item>
>+    <item> QUiLoader </item>
>+    <item> QUndoCommand </item>
>+    <item> QUndoGroup </item>
>+    <item> QUndoStack </item>
>+    <item> QUndoView </item>
>+    <item> QUrl </item>
>+    <item> QUrlInfo </item>
>+    <item> QUuid </item>
>+    <item> QValidator </item>
>+    <item> QVariant </item>
>+    <item> QVariantAnimation </item>
>+    <item> QVarLengthArray </item>
>+    <item> QVBoxLayout </item>
>+    <item> QVector </item>
>+    <item> QVector2D </item>
>+    <item> QVector3D </item>
>+    <item> QVector4D </item>
>+    <item> QVectorIterator </item>
>+    <item> QVideoFrame </item>
>+    <item> QVideoSurfaceFormat </item>
>+    <item> QWaitCondition </item>
>+    <item> QWeakPointer </item>
>+    <item> QWebDatabase </item>
>+    <item> QWebElement </item>
>+    <item> QWebElementCollection </item>
>+    <item> QWebFrame </item>
>+    <item> QWebHistory </item>
>+    <item> QWebHistoryInterface </item>
>+    <item> QWebHistoryItem </item>
>+    <item> QWebHitTestResult </item>
>+    <item> QWebInspector </item>
>+    <item> QWebPage </item>
>+    <item> QWebPluginFactory </item>
>+    <item> QWebSecurityOrigin </item>
>+    <item> QWebSettings </item>
>+    <item> QWebView </item>
>+    <item> QWhatsThis </item>
>+    <item> QWhatsThisClickedEvent </item>
>+    <item> QWheelEvent </item>
>+    <item> QWidget </item>
>+    <item> QWidgetAction </item>
>+    <item> QWidgetItem </item>
>+    <item> QWindowsMime </item>
>+    <item> QWindowsStyle </item>
>+    <item> QWindowStateChangeEvent </item>
>+    <item> QWindowsVistaStyle </item>
>+    <item> QWindowsXPStyle </item>
>+    <item> QWizard </item>
>+    <item> QWizardPage </item>
>+    <item> QWriteLocker </item>
>+    <item> QWSCalibratedMouseHandler </item>
>+    <item> QWSClient </item>
>+    <item> QWSEmbedWidget </item>
>+    <item> QWSEvent </item>
>+    <item> QWSGLWindowSurface </item>
>+    <item> QWSInputMethod </item>
>+    <item> QWSKeyboardHandler </item>
>+    <item> QWSMouseHandler </item>
>+    <item> QWSPointerCalibrationData </item>
>+    <item> QWSScreenSaver </item>
>+    <item> QWSServer </item>
>+    <item> QWSWindow </item>
>+    <item> QX11EmbedContainer </item>
>+    <item> QX11EmbedWidget </item>
>+    <item> QX11Info </item>
>+    <item> QXmlAttributes </item>
>+    <item> QXmlContentHandler </item>
>+    <item> QXmlDeclHandler </item>
>+    <item> QXmlDefaultHandler </item>
>+    <item> QXmlDTDHandler </item>
>+    <item> QXmlEntityResolver </item>
>+    <item> QXmlErrorHandler </item>
>+    <item> QXmlFormatter </item>
>+    <item> QXmlInputSource </item>
>+    <item> QXmlItem </item>
>+    <item> QXmlLexicalHandler </item>
>+    <item> QXmlLocator </item>
>+    <item> QXmlName </item>
>+    <item> QXmlNamePool </item>
>+    <item> QXmlNamespaceSupport </item>
>+    <item> QXmlNodeModelIndex </item>
>+    <item> QXmlParseException </item>
>+    <item> QXmlQuery </item>
>+    <item> QXmlReader </item>
>+    <item> QXmlResultItems </item>
>+    <item> QXmlSchema </item>
>+    <item> QXmlSchemaValidator </item>
>+    <item> QXmlSerializer </item>
>+    <item> QXmlSimpleReader </item>
>+    <item> QXmlStreamAttribute </item>
>+    <item> QXmlStreamAttributes </item>
>+    <item> QXmlStreamEntityDeclaration </item>
>+    <item> QXmlStreamEntityResolver </item>
>+    <item> QXmlStreamNamespaceDeclaration </item>
>+    <item> QXmlStreamNotationDeclaration </item>
>+    <item> QXmlStreamReader </item>
>+    <item> QXmlStreamWriter </item>
>+    
>+    <item> Qt </item>
>+    <item> QTest </item>
>+    <item> QtConcurrent </item>
>+    <item> Phonon </item>
>+    
>+    <item> QFileInfoList </item>
>+    <item> QMutableStringListIterator </item>
>+    <item> QTouchEventSequence </item>                      
>+    <item> QStringListIterator </item>
>+    <item> QStringBuilder </item>
>+    
>+    <item> QWidgetList </item>
>+  </list>
>+
>+  <list name="Qt4Func">
>+    
>+    <item> connect </item>
>+    <item> disconnect </item>
>+    <item> staticMetaObject </item>
>+    <item> tr </item>
>+    <item> trUtf8 </item>
>+    
>+    <item> qFindChildren</item>
>+    <item> qobject_cast </item>
>+    
>+    <item> qAbs </item>
>+    <item> qBound </item>
>+    <item> qCritical </item>
>+    <item> qDebug </item>
>+    <item> qFatal </item>
>+    <item> qFuzzyCompare </item>
>+    <item> qFuzzyCompare </item>
>+    <item> qInstallMsgHandler </item>
>+    <item> qMacVersion </item>
>+    <item> qMakePair </item>
>+    <item> qMax </item>
>+    <item> qMin </item>
>+    <item> qPrintable </item>
>+    <item> qRound64 </item>
>+    <item> qRound </item>
>+    <item> qVersion </item>
>+    <item> qWarning </item>
>+    <item> q_check_ptr </item>
>+    <item> qgetenv </item>
>+    <item> qrand </item>
>+    <item> qsrand </item>
>+    <item> qtTrId </item>
>+    <item> qt_set_sequence_auto_mnemonic </item>
>+    <item> qt_symbian_exception2Error </item>
>+    <item> qt_symbian_exception2LeaveL </item>
>+    <item> qt_symbian_throwIfError </item>
>+    
>+    <item> qBinaryFind </item>
>+    <item> qCopy </item>
>+    <item> qCopyBackward </item>
>+    <item> qCount </item>
>+    <item> qDeleteAll </item>
>+    <item> qEqual </item>
>+    <item> qFill </item>
>+    <item> qFind </item>
>+    <item> qGreater </item>
>+    <item> qLess </item>
>+    <item> qLowerBound </item>
>+    <item> qSort </item>
>+    <item> qStableSort </item>
>+    <item> qSwap </item>
>+    <item> qUpperBound </item>
>+    
>+    <item> qChecksum </item>
>+    <item> qCompress </item>
>+    <item> qUncompress </item>
>+    <item> qsnprintf </item>
>+    <item> qstrcmp </item>
>+    <item> qstrcpy </item>
>+    <item> qstrdup </item>
>+    <item> qstricmp </item>
>+    <item> qstrlen </item>
>+    <item> qstrncmp </item>
>+    <item> qstrncpy </item>
>+    <item> qstrnicmp </item>
>+    <item> qstrnlen </item>
>+    <item> qvsnprintf </item>
>+    
>+    <item> qHash </item>
>+    
>+    <item> qMetaTypeId </item>
>+    <item> qRegisterMetaType </item>
>+    <item> qRegisterMetaType </item>
>+    <item> qRegisterMetaTypeStreamOperators </item>
>+    
>+    <item> qAlpha </item>
>+    <item> qBlue </item>
>+    <item> qGray </item>
>+    <item> qGray </item>
>+    <item> qGreen </item>
>+    <item> qRed </item>
>+    <item> qRgb </item>
>+    <item> qRgba  </item>
>+    
>+    <item> qAddPostRoutine </item>
>+    
>+    <item> qmlInfo </item>
>+    <item> qmlRegisterInterface </item>
>+    <item> qmlRegisterType </item>
>+    <item> qmlRegisterType </item>
>+    <item> qmlRegisterTypeNotAvailable </item>
>+    <item> qmlRegisterUncreatableType </item>
>+    
>+    <item> qWebKitMajorVersion </item>
>+    <item> qWebKitMinorVersion </item>
>+    <item> qWebKitVersion </item>
>+    
>+    <item> qt_extension </item>
>+    
>+    <item> qDBusRegisterMetaType </item>
>+    <item> qdbus_cast </item>
>+  </list>
>+
>+  
>+  <list name="Qt4Types">
>+    <item> QtMsgHandler </item>
>+    <item> QtMsgType </item>
>+    <item> QObjectList </item>
>+    <item> qint8 </item>
>+    <item> qint16 </item>
>+    <item> qint32 </item>
>+    <item> qint64 </item>
>+    <item> qlonglong </item>
>+    <item> qptrdiff </item>
>+    <item> qreal </item>
>+    <item> quint8 </item>
>+    <item> quint16 </item>
>+    <item> quint32 </item>
>+    <item> quint64 </item>
>+    <item> quintptr </item>
>+    <item> qulonglong </item>
>+    <item> uchar </item>
>+    <item> uint </item>
>+    <item> ulong </item>
>+    <item> ushort </item>
>+    
>+    <item> Q_PID </item>
>+    
>+    <item> QRgb </item>
>+    
>+    <item> qScriptConnect </item>
>+    <item> qScriptDisconnect </item>
>+    <item> qScriptRegisterMetaType </item>
>+    <item> qScriptRegisterSequenceMetaType </item>
>+    <item> qScriptValueFromSequence </item>
>+    <item> qScriptValueToSequence </item>
>+    
>+    <item> WId </item>
>+  </list>
>+
>+  <contexts>
>+    
>+    <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
>+      <IncludeRules context="DetectQt4Extensions" />
>+      <IncludeRules context="##C++11" />
>+    </context>
>+
>+    
>+    <context attribute="Normal Text" lineEndContext="#stay" name="DetectQt4Extensions">
>+      <keyword attribute="Qt4 Extensions" context="#stay" String="Qt4Extensions" />
>+      <keyword attribute="Qt4 Types" context="#stay" String="Qt4Types" />
>+      <keyword attribute="Qt4 Classes" context="QtClassMember" String="Qt4Classes" />
>+      <keyword attribute="Qt4 Functions" context="#stay" String="Qt4Func" />
>+      <keyword attribute="Qt4 Macros" context="#stay" String="Qt4Macros" />
>+    </context>
>+
>+    <context attribute="Qt4 Classes" lineEndContext="#pop" name="QtClassMember">
>+      <IncludeRules context="DetectNSEnd" />
>+    </context>
>+
>+    <context lineEndContext="#pop" name="DetectNSEnd" attribute="Normal Text">
>+      <DetectIdentifier context="#stay" />
>+      <AnyChar context="#pop" String="&ns_punctuators;" lookAhead="true" />
>+      <AnyChar context="#stay" String="&space;" lookAhead="true" />
>+    </context>
>+
>+  </contexts>
>+
>+  <itemDatas>
>+    <itemData name="Normal Text"    defStyleNum="dsNormal" spellChecking="false" />
>+    <itemData name="Qt4 Extensions" defStyleNum="dsNormal" spellChecking="false" />
>+    <itemData name="Qt4 Types"      defStyleNum="dsNormal" spellChecking="false" />
>+    <itemData name="Qt4 Classes"    defStyleNum="dsNormal" spellChecking="false" />
>+    <itemData name="Qt4 Functions"  defStyleNum="dsNormal" spellChecking="false" />
>+    <itemData name="Qt4 Macros"     defStyleNum="dsNormal" spellChecking="false" />
>+  </itemDatas>
>+</highlighting>
>+
>+<general>
>+  <comments>
>+    <comment name="singleLine" start="//" />
>+    <comment name="multiLine" start="/*" end="*/" />
>+  </comments>
>+  <keywords casesensitive="1" />
>+</general>
>+
>+</language>
>+
>diff -urN tdelibs/kate/data/rapidq.xml tdelibs.new/kate/data/rapidq.xml
>--- tdelibs/kate/data/rapidq.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/rapidq.xml	2013-12-26 13:26:40.466329508 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="RapidQ" version="1.01" kateversion="2.1" section="Sources" extensions="*.rqb" author="Tiberiu Dragulinescu" license="LGPL">
>+<language name="RapidQ" version="1.01" kateversion="2.5" section="Sources" extensions="*.rqb" author="Tiberiu Dragulinescu" license="LGPL">
>     <highlighting>
>         <list name="keywords">
> 		<item>abs</item>
>diff -urN tdelibs/kate/data/relaxng.xml tdelibs.new/kate/data/relaxng.xml
>--- tdelibs/kate/data/relaxng.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/relaxng.xml	2013-12-26 13:26:40.710328465 -0600
>@@ -17,7 +17,7 @@
> -->
> 
> <language version="0.8"
>-          kateversion="2.1"
>+          kateversion="2.5"
>           name="RELAX NG"
>           section="Markup"
>           extensions="*.rng;*.RNG"
>diff -urN tdelibs/kate/data/relaxngcompact.xml tdelibs.new/kate/data/relaxngcompact.xml
>--- tdelibs/kate/data/relaxngcompact.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/relaxngcompact.xml	2013-12-26 13:26:40.942327478 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="RelaxNG-Compact" version="0.2" kateversion="2.4" section="Markup" extensions="*.rnc" casesensitive="1" author="Rintze Zelle" license="LGPL">
>+<language name="RelaxNG-Compact" version="0.2" kateversion="2.5" section="Markup" extensions="*.rnc" casesensitive="1" author="Rintze Zelle" license="LGPL">
>   <highlighting>
>     <list name="Keywords">
>       <item> default </item>
>diff -urN tdelibs/kate/data/rest.xml tdelibs.new/kate/data/rest.xml
>--- tdelibs/kate/data/rest.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/rest.xml	2013-12-26 13:26:40.938327494 -0600
>@@ -6,7 +6,7 @@
>         <!ENTITY SimpleReferenceNameChars "\w-_\.:\+">
> ]>
> 
>-<language name="reStructuredText" extensions="*.rst" section="Markup" mimetype="text/x-rst" version="1.01" kateversion="2.4" casesensitive="1">
>+<language name="reStructuredText" extensions="*.rst" section="Markup" mimetype="text/x-rst" version="1.01" kateversion="2.5" casesensitive="1">
> 	
> 	<highlighting>
> 		
>diff -urN tdelibs/kate/data/restructuredtext.xml tdelibs.new/kate/data/restructuredtext.xml
>--- tdelibs/kate/data/restructuredtext.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/restructuredtext.xml	2013-12-26 13:26:41.818323738 -0600
>@@ -0,0 +1,59 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd">
>+<language name="Restructured Text" version="1.0" kateversion="2.5" section="Markup" extensions="*.rst" author="Massimiliano Torromeo (massimiliano.torromeo@gmail.com)" license="LGPL">
>+
>+	<highlighting>
>+		<contexts>
>+			<context name="Normal" attribute="Normal Text" lineEndContext="#stay">
>+				<RegExpr attribute="Emphasys" String="\*[^* ].*\S\*" context="#stay" />
>+				<RegExpr attribute="Strong" String="\*\*\S.*\S\*\*" context="#stay" />
>+				<RegExpr attribute="Literal" String="``\S.*\S``" context="#stay" />
>+				<RegExpr attribute="Directive" String="^\.\. " context="Directive" />
>+				<RegExpr attribute="Title" String="^(#{3,}|\*{3,}|={3,}|-{3,}|\^{3,}|&quot;{3,}|&apos;{3,}|~{3,}|`{3,}|\+{3,})$" context="#stay" />
>+				<RegExpr attribute="OrderedList" String="[#0-9]\.\s" firstNonSpace="1" context="#stay" />
>+				<AnyChar attribute="UnorderedList" String="*+-" firstNonSpace="1" context="#stay" />
>+				<DetectChar attribute="Link" char="`" context="Link" />
>+				<RegExpr attribute="Code" String="::$" context="CodeBlock" />
>+			</context>
>+
>+			<context name="CodeBlock" attribute="Code" lineEndContext="#stay">
>+				<RegExpr attribute="Code" String="^\s" context="Code" />
>+			</context>
>+
>+			<context name="Code" attribute="Code" lineEndContext="#stay">
>+				<RegExpr attribute="Normal" String="^\S" lookAhead="true" context="#pop#pop" />
>+			</context>
>+
>+			<context name="Directive" attribute="Directive" lineEndContext="#pop">
>+				<RegExpr attribute="Keyword" String="\w+" context="#stay" />
>+			</context>
>+
>+			<context name="Link" attribute="Link" lineEndContext="#pop">
>+				<DetectChar attribute="Link" char="&lt;" context="URL" />
>+				<Detect2Chars attribute="Link" char="`" char1="_" context="#pop" />
>+			</context>
>+
>+			<context name="URL" attribute="LinkUrl" lineEndContext="#stay">
>+				<RegExpr attribute="LinkUrl" String="[^&gt;]+" context="#stay" />
>+				<DetectChar attribute="Link" char="&gt;" context="#pop" />
>+			</context>
>+		</contexts>
>+
>+		<itemDatas>
>+			<itemData name="Normal Text" defStyleNum="dsNormal" />
>+			<itemData name="Directive" defStyleNum="dsDecVal" />
>+			<itemData name="Emphasys" defStyleNum="dsNormal" italic="1" />
>+			<itemData name="Strong" defStyleNum="dsNormal" bold="1" />
>+			<itemData name="Literal" defStyleNum="dsDataType" />
>+			<itemData name="Keyword" defStyleNum="dsKeyword" />
>+			<itemData name="OrderedList" defStyleNum="dsDecVal" />
>+			<itemData name="UnorderedList" defStyleNum="dsFloat" />
>+			<itemData name="Link" defStyleNum="dsString" />
>+			<itemData name="LinkUrl" defStyleNum="dsString" bold="1" />
>+			<itemData name="Title" defStyleNum="dsKeyword" bold="1" />
>+			<itemData name="Code" defStyleNum="dsDataType" />
>+			<itemData name="Error" defStyleNum="dsError" />
>+		</itemDatas>
>+
>+	</highlighting>
>+</language>
>diff -urN tdelibs/kate/data/rexx.xml tdelibs.new/kate/data/rexx.xml
>--- tdelibs/kate/data/rexx.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/rexx.xml	2013-12-26 13:26:42.092322569 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="REXX" version="1.01" kateversion="2.3" section="Scripts" extensions="*.rex" mimetype="">
>+<language name="REXX" version="1.01" kateversion="2.5" section="Scripts" extensions="*.rex" mimetype="">
>   <highlighting>
>     <list name="instructions">
>       <item> arg </item>
>diff -urN tdelibs/kate/data/rhtml.xml tdelibs.new/kate/data/rhtml.xml
>--- tdelibs/kate/data/rhtml.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/rhtml.xml	2013-12-26 13:26:40.693328539 -0600
>@@ -44,7 +44,7 @@
> -->
> 	
> 
>-<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.01" kateversion="2.5" section="Markup" extensions="*.rhtml;*.html.erb" mimetype="" author="Richard Dale rdale@foton.es" license="LGPL">
> 	
> 	<highlighting>
> 	
>diff -urN tdelibs/kate/data/rib.xml tdelibs.new/kate/data/rib.xml
>--- tdelibs/kate/data/rib.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/rib.xml	2013-12-26 13:26:41.158326554 -0600
>@@ -5,7 +5,7 @@
> 
> 
> 
>-<language name="RenderMan RIB" version="1.00" kateversion="2.3" section="Other" mimetype="" extensions="*.rib" author="David Williams &lt;david@david-williams.info&gt;" license="LGPL">
>+<language name="RenderMan RIB" version="1.00" kateversion="2.5" section="Other" mimetype="" extensions="*.rib" author="David Williams &lt;david@david-williams.info&gt;" license="LGPL">
> 	<highlighting>
> 		<list name="Graphics States">
> 			<item> AreaLightSource </item>
>diff -urN tdelibs/kate/data/rpmspec.xml tdelibs.new/kate/data/rpmspec.xml
>--- tdelibs/kate/data/rpmspec.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/rpmspec.xml	2013-12-26 13:26:41.376325625 -0600
>@@ -8,7 +8,7 @@
>   <!ENTITY os_conditionals_names "(ifos|ifnos)">
>   <!ENTITY lookahead_whitespace_eol "(?=($| |\t))">
> ]>
>-<language name="RPM Spec" version="2.03" kateversion="2.4" section="Other" extensions="*.spec" mimetype="" license="public domain">
>+<language name="RPM Spec" version="2.03" kateversion="2.5" section="Other" extensions="*.spec" mimetype="" license="public domain">
> 
> 
> 
>diff -urN tdelibs/kate/data/rsiidl.xml tdelibs.new/kate/data/rsiidl.xml
>--- tdelibs/kate/data/rsiidl.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/rsiidl.xml	2013-12-26 13:26:41.575324775 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>   
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="RSI IDL" version="1.04" kateversion="2.1" section="Sources" extensions="*.pro" mimetype="text/x-rsiidl-src" author="Markus Fraenz (fraenz@linmpi.mpg.de)" license="">
>+<language name="RSI IDL" version="1.04" kateversion="2.5" section="Sources" extensions="*.pro" mimetype="text/x-rsiidl-src" author="Markus Fraenz (fraenz@linmpi.mpg.de)" license="">
>     <highlighting>
>         <list name="reserved words">
>         <item> For </item>
>diff -urN tdelibs/kate/data/ruby.xml tdelibs.new/kate/data/ruby.xml
>--- tdelibs/kate/data/ruby.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/ruby.xml	2013-12-26 13:26:41.698324251 -0600
>@@ -31,14 +31,14 @@
> 
> 
> <language name="Ruby" section="Scripts"
>-	  version="1.24" kateversion="2.4"
>+	  version="1.27" kateversion="2.5"
> 	  extensions="*.rb;*.rjs;*.rxml;*.xml.erb;*.js.erb;*.rake;Rakefile;Gemfile;*.gemspec"
> 	  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">
>-	
>+
> 	<highlighting>
>-	
>+
> 		<list name="keywords">
> 			<item> BEGIN </item>
> 			<item> END </item>
>@@ -55,7 +55,6 @@
> 			<item> for </item>
> 			<item> if </item>
> 			<item> in </item>
>-			<item> include </item>
> 			<item> next </item>
> 			<item> not </item>
> 			<item> or </item>
>@@ -69,7 +68,7 @@
> 			<item> when </item>
> 			<item> yield </item>
> 		</list>
>-		
>+
> 		<list name="access-control">
> 			<item> private_class_method </item>
> 			<item> private </item>
>@@ -83,7 +82,7 @@
> 			<item> attr_writer </item>
> 			<item> attr_accessor </item>
> 		</list>
>-		
>+
> 		<list name="definitions">
> 			<item> alias </item>
> 			<item> module </item>
>@@ -91,7 +90,7 @@
> 			<item> def </item>
> 			<item> undef </item>
> 		</list>
>-		
>+
> 		<list name="pseudo-variables">
> 			<item> self </item>
> 			<item> super </item>
>@@ -102,7 +101,7 @@
> 			<item> __FILE__ </item>
> 			<item> __LINE__ </item>
> 		</list>
>-		
>+
> 		<list name="default-globals">
> 			<item> $stdout </item>
> 			<item> $defout </item>
>@@ -110,7 +109,7 @@
> 			<item> $deferr </item>
> 			<item> $stdin </item>
> 		</list>
>-		
>+
> 		
> 				<LineContinue attribute="Normal Text" context="Line Continue"/>
>-				
>+
> 				
> 				<RegExpr attribute="Keyword" String="__END__$" context="DATA" column="0"/>
>-			
>+
> 				
> 				<RegExpr attribute="Keyword" String="#!\/.*" context="#stay" column="0"/>
>-				
>+
> 				
> 				
> 				<DetectChar attribute="Operator" char="{" context="Find closing block brace" beginRegion="def block"/>
>@@ -209,16 +214,16 @@
> 				<RegExpr attribute="Keyword" String="\bend\b" context="#stay" endRegion="def block"/>
> 				
> 				<RegExpr attribute="Keyword" String="\b(else|elsif|rescue|ensure)\b" context="#stay" endRegion="def block" beginRegion="def block"/>
>-				
>+
> 				<StringDetect attribute="Operator" String="..." context="#stay"/>
> 				<Detect2Chars attribute="Operator" char="." char1="." context="#stay"/>
>-				
>+
> 				
> 				<RegExpr attribute="Message" String="\.[_a-z][_a-zA-Z0-9]*(\?|\!|\b)" context="check_div_2"/>
>-				
>+
> 				
> 				<RegExpr attribute="Dec" String="\s\?(\\M\-)?(\\C\-)?\\?\S" context="check_div_1"/>
>-				
>+
> 				<keyword attribute="Keyword" String="keywords" context="#stay"/>
> 				<keyword attribute="Attribute Definition" String="attribute-definitions"  context="check_div_2"/>
> 				<keyword attribute="Access Control" String="access-control" context="check_div_2"/>
>@@ -226,39 +231,41 @@
> 				<keyword attribute="Pseudo variable" String="pseudo-variables"  context="check_div_1"/>
> 				<keyword attribute="Default globals" String="default-globals" context="check_div_2"/>
> 				<keyword attribute="Kernel methods" String="kernel-methods" context="check_div_2"/>
>-				
>+                                <keyword attribute="Module mixin methods" String="mixin-methods" context="check_div_2"/>
>+
> 				
> 				<RegExpr attribute="Global Variable" String="\$[a-zA-Z_0-9]+" context="check_div_1"/>
> 				<RegExpr attribute="Global Variable" String="\$\-[a-zA-z_]\b" context="check_div_1"/>
> 				
>-				<RegExpr attribute="Default globals" String="\$[\d_*`\!:?'/\\\-\&amp;&quot;]" context="check_div_1"/>
>+				<RegExpr attribute="Default globals" String="\$[\d_*`+@;,.~=\!\$:?'/\\\-\&amp;&quot;&gt;&lt;]" context="check_div_1"/>
> 				<RegExpr attribute="Global Constant" String="\b[_A-Z]+[A-Z_0-9]+\b" context="check_div_2"/>
> 				
> 				<RegExpr attribute="Constant" String="\b[A-Z]+_*([0-9]|[a-z])[_a-zA-Z0-9]*\b" context="check_div_2"/>
>-				
>-				<RegExpr attribute="Hex" String="\b\-?0[xX][_0-9a-fA-F]+" context="check_div_1"/>
>-				<RegExpr attribute="Bin" String="\b\-?0[bB][_01]+" context="check_div_1"/>
>-				<RegExpr attribute="Octal" String="\b\-?0[1-7][_0-7]*" context="check_div_1"/>
>-				<RegExpr attribute="Float" String="\b\-?[0-9][0-9_]*\.[0-9][0-9_]*([eE]\-?[1-9][0-9]*(\.[0-9]*)?)?" context="check_div_1"/>
>-				<RegExpr attribute="Dec" String="\b\-?[1-9][0-9_]*\b" context="check_div_1"/>
>+
>+				
>+				<RegExpr attribute="Hex" String="\b\-?0[xX]([0-9a-fA-F]|_[0-9a-fA-F])+" context="check_div_1"/>
>+				<RegExpr attribute="Bin" String="\b\-?0[bB]([01]|_[01])+" context="check_div_1"/>
>+				<RegExpr attribute="Octal" String="\b\-?0[1-7]([0-7]|_[0-7])*" context="check_div_1"/>
>+				<RegExpr attribute="Float" String="\b\-?[0-9]([0-9]|_[0-9])*\.[0-9]([0-9]|_[0-9])*([eE]\-?[1-9]([0-9]|_[0-9])*(\.[0-9]*)?)?" context="check_div_1"/>
>+				<RegExpr attribute="Dec" String="\b\-?[1-9]([0-9]|_[0-9])*\b" context="check_div_1"/>
> 				<Int attribute="Dec" context="check_div_1"/>
> 				<HlCChar attribute="Char" context="check_div_1"/>
>-				
>+
> 				
> 				<RegExpr attribute="Blockcomment" String="^=begin(?:\s|$)" context="Embedded documentation" beginRegion="comment block" column="0"/>
>-				
>+
> 				
> 				<RegExpr attribute="Operator" context="find_indented_heredoc" String="\s*&lt;&lt;-(?=\w+|[&quot;'])" beginRegion="HereDocument" />
> 				<RegExpr attribute="Operator" context="find_heredoc" String="\s*&lt;&lt;(?=\w+|[&quot;'])" beginRegion="HereDocument" />
>-				
>+
> 				<DetectChar attribute="Operator" char="." context="#stay"/>
> 				<Detect2Chars attribute="Operator" char="&amp;" char1="&amp;" context="#stay"/>
> 				<Detect2Chars attribute="Operator" char="|" char1="|" context="#stay"/>
>@@ -269,49 +276,49 @@
> 				<RegExpr attribute="Operator" String="/=\s" context="#stay" insensitive="0"/>
> 				<StringDetect attribute="Operator" String="%=" context="#stay" insensitive="0"/>
> 				<Detect2Chars attribute="Operator" char=":" char1=":" context="Member Access"/>
>-				
>+
> 				<RegExpr attribute="Symbol" String=":(@{1,2}|\$)?[a-zA-Z_][a-zA-Z0-9_]*[=?!]?" context="check_div_1"/>
>-				<RegExpr attribute="Symbol" String=":\[\]=?" contex="check_div_1"/>
>-				
>+				<RegExpr attribute="Symbol" String=":\[\]=?" context="check_div_1"/>
>+
> 				<DetectChar attribute="String" char="&quot;" context="Quoted String"/>
> 				<DetectChar attribute="Raw String" char="'" context="Apostrophed String"/>
> 				<DetectChar attribute="Command" char="`" context="Command String"/>
>-				
>+
> 				<StringDetect attribute="Normal Text" String="?#" context="#stay"/>
>-				
>+
> 				<RegExpr attribute="Comment" String="#\s*BEGIN.*$"  context="#stay" beginRegion="marker" column="0"/>
> 				<RegExpr attribute="Comment" String="#\s*END.*$"  context="#stay" endRegion="marker" column="0"/>
> 				<DetectChar attribute="Comment" char="#" context="General Comment"/>
>-				
>+
> 				<DetectChar attribute="Delimiter" char="["  context="#stay"/>
> 				<DetectChar attribute="Delimiter" char="]"  context="check_div_1"/>
> 				<DetectChar attribute="Delimiter" char="{" context="#stay" beginRegion="def block"/>
> 				<DetectChar attribute="Delimiter" char="}" context="check_div_1" endRegion="def block"/>
>-				
>+
> 				<RegExpr attribute="Instance Variable" String="@[a-zA-Z_0-9]+" context="check_div_1"/>
> 				<RegExpr attribute="Class Variable" String="@@[a-zA-Z_0-9]+" context="check_div_1"/>
>-				
>+
> 				
> 				<DetectChar attribute="Regular Expression" char="/" context="RegEx 1"/>
>-				
>+
> 				
> 				
> 				<RegExpr attribute="GDL input" context="find_gdl_input" String="\s*[%](?=[QqxwW]?[^\s])" beginRegion="GdlInput" />
>-				
>+
> 				<DetectChar attribute="Normal Text" char=")" context="check_div_1"/>
> 				<DetectIdentifier attribute="Normal Text" context="check_div_2"/>
> 
> 			</context>
>-			
>+
> 			
> 			
>-			
>+
> 			
> 			<context name="check_div_1" attribute="Normal Text" fallthrough="true" fallthroughContext="#pop" lineEndContext="#pop">
> 				<RegExpr attribute="Normal Text" String="\s*" context="#stay"/>
> 				<AnyChar attribute="Operator" String="/%" context="#pop"/>
> 			</context>
>-			
>+
> 			
> 			<context name="check_div_1_pop" attribute="Normal Text" fallthrough="true" fallthroughContext="#pop#pop" lineEndContext="#pop#pop">
> 				<RegExpr attribute="Normal Text" String="\s*" context="#stay"/>
>@@ -323,19 +330,19 @@
> 				<AnyChar attribute="Operator" String="/%" context="#pop"/>
> 				<RegExpr attribute="Normal Text" String="\s+" context="check_div_2_internal"/>
> 			</context>
>-			
>+
> 			
> 			<context name="check_div_2_internal" attribute="Normal Text" fallthrough="true" fallthroughContext="#pop#pop" lineEndContext="#pop#pop">
> 
> 				<RegExpr attribute="Operator" String="[/%](?=\s)" context="#pop#pop"/>
> 			</context>
>-			
>+
> 			
> 			<context name="check_div_2_pop" attribute="Normal Text" fallthrough="true" fallthroughContext="#pop#pop" lineEndContext="#pop#pop">
> 				<AnyChar attribute="Operator" String="/%" context="#pop#pop"/>
> 				<RegExpr attribute="Normal Text" String="\s+" context="check_div_2_pop_internal"/>
> 			</context>
>-			
>+
> 			
> 			<context name="check_div_2_pop_internal" attribute="Normal Text" fallthrough="true" fallthroughContext="#pop#pop#pop" lineEndContext="#pop#pop#pop">
> 				<DetectChar attribute="Operator" char="%" context="#pop#pop#pop"/>
>@@ -352,7 +359,7 @@
> 				<DetectChar attribute="Operator" char="}" context="check_div_1_pop" endRegion="def block"/>
> 				<IncludeRules context="Normal"/>
> 			</context>
>-			
>+
> 			<context name="Quoted String" attribute="String" lineEndContext="#stay">
> 				<StringDetect attribute="String" String="\\" context="#stay"/>
> 				<RegExpr attribute="String" String="\\\&quot;" context="#stay"/>
>@@ -360,13 +367,13 @@
> 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
> 				<DetectChar char="&quot;" attribute="String" context="check_div_1_pop"/>
> 			</context>
>-			
>+
> 			<context name="Apostrophed String" attribute="Raw String" lineEndContext="#stay">
> 				<StringDetect attribute="String" String="\\" context="#stay"/>
> 				<RegExpr attribute="String" String="\\\'" context="#stay"/>
> 				<DetectChar char="'" attribute="Raw String" context="check_div_1_pop"/>
> 			</context>
>-			
>+
> 			<context name="Command String" attribute="Command" lineEndContext="#stay">
> 				<StringDetect attribute="String" String="\\" context="#stay"/>
> 				<RegExpr attribute="String" String="\\\`" context="#stay"/>
>@@ -374,19 +381,19 @@
> 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
> 				<DetectChar char="`" attribute="Command" context="check_div_1_pop"/>
> 			</context>
>-			
>+
> 			<context name="Embedded documentation" attribute="Blockcomment" lineEndContext="#stay">
> 				<RegExpr attribute="Comment" String="^=end(?:\s.*|$)" context="#pop" endRegion="comment block" column="0"/>
> 				<IncludeRules context="##Alerts" />
> 			</context>
>-			
>+
> 			<context name="RegEx 1" attribute="Regular Expression" lineEndContext="#stay">
> 				<RegExpr attribute="Regular Expression" String="\\\/" context="#stay"/>
> 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
> 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
> 				<RegExpr attribute="Regular Expression" String="/[uiomxn]*" context="check_div_1_pop"/>
> 			</context>
>-			
>+
> 			
> 			<context name="Subst" attribute="Normal Text" lineEndContext="#stay">
> 				<DetectChar attribute="Substitution" char="}" context="#pop"/>
>@@ -399,7 +406,7 @@
> 				<RegExpr attribute="Substitution" String="#@{1,2}" context="#stay"/>
> 				<RegExpr attribute="Substitution" String="\w(?!\w)" context="#pop"/>
> 			</context>
>-			
>+
> 			
> 			<context name="Member Access" attribute="Member" lineEndContext="#pop">
> 				
>@@ -411,24 +418,24 @@
> 				<RegExpr attribute="Constant Value" String="[_A-Z][_A-Z0-9]*" context="#stay"/>
> 				<Detect2Chars attribute="Operator" char=":" char1=":" context="#stay"/>
> 				<DetectChar attribute="Member" char="." context="#stay"/>
>-				
>+
> 				<AnyChar attribute="Operator" String="=+-*/%|&amp;[]{}~" context="#pop"/>
> 				<DetectChar attribute="Comment" char="#" context="#pop"/>
> 				<AnyChar attribute="Normal Text" String="()\" context="#pop"/>
> 				<RegExpr attribute="Member" String="\W" context="#pop"/>
> 			</context>
>-			
>+
> 			<context name="Comment Line" attribute="Comment" lineEndContext="#pop">
> 				<RegExpr attribute="Comment" String="\w\:\:\s" context="RDoc Label"/>
> 				<IncludeRules context="##Alerts" />
> 			</context>
>-			
>+
> 			<context name="General Comment" attribute="Comment" lineEndContext="#pop">
> 				<IncludeRules context="##Alerts" />
> 			</context>
>-			
>+
> 			<context name="RDoc Label" attribute="RDoc Value" lineEndContext="#pop"/>
>-			
>+
> 			
>@@ -449,7 +456,7 @@
> 			<context name="apostrophed_indented_heredoc" attribute="Here Document" lineEndContext="#stay" dynamic="true">
> 				<RegExpr attribute="Keyword" context="#pop#pop" String="%1$" dynamic="true" endRegion="HereDocument" firstNonSpace="true"/>
> 			</context>
>-			
>+
> 			<context name="normal_heredoc" attribute="Here Document" lineEndContext="#stay" dynamic="true">
> 				<RegExpr attribute="Keyword" context="#pop#pop" String="%1$" dynamic="true" endRegion="HereDocument" column="0"/>
> 				<IncludeRules context="heredoc_rules" />
>@@ -457,18 +464,18 @@
> 			<context name="apostrophed_normal_heredoc" attribute="Here Document" lineEndContext="#stay" dynamic="true">
> 				<RegExpr attribute="Keyword" context="#pop#pop" String="%1$" dynamic="true" endRegion="HereDocument" column="0"/>
> 			</context>
>-			
>+
> 			
> 			<context name="heredoc_rules" attribute="Normal Text" lineEndContext="#stay">
> 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
> 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
> 			</context>
>-			
>+
> 			
> 			<context name="find_gdl_input" attribute="Normal Text" lineEndContext="#pop">
>-				
>+
> 				
> 				<RegExpr attribute="GDL input" context="gdl_token_array_1" String="w\(" />
> 				<RegExpr attribute="GDL input" context="gdl_token_array_2" String="w\{" />
>@@ -492,7 +499,7 @@
> 				<RegExpr attribute="GDL input" context="gdl_apostrophed_4" String="q&lt;" />
> 				
> 				<RegExpr attribute="GDL input" context="gdl_apostrophed_5" String="q([^\s\w])" />
>-				
>+
> 				
> 				<RegExpr attribute="GDL input" context="gdl_shell_command_1" String="x\(" />
> 				<RegExpr attribute="GDL input" context="gdl_shell_command_2" String="x\{" />
>@@ -500,7 +507,7 @@
> 				<RegExpr attribute="GDL input" context="gdl_shell_command_4" String="x&lt;" />
> 				
> 				<RegExpr attribute="GDL input" context="gdl_shell_command_5" String="x([^\s\w])" />
>-				
>+
> 				
> 				<RegExpr attribute="GDL input" context="gdl_regexpr_1" String="r\(" />
> 				<RegExpr attribute="GDL input" context="gdl_regexpr_2" String="r\{" />
>@@ -508,9 +515,9 @@
> 				<RegExpr attribute="GDL input" context="gdl_regexpr_4" String="r&lt;" />
> 				
> 				<RegExpr attribute="GDL input" context="gdl_regexpr_5" String="r([^\s\w])" />
>-				
>+
> 				
>-				
>@@ -520,7 +527,7 @@
> 				<RegExpr attribute="GDL input" context="gdl_dq_string_4" String="Q?&lt;" />
> 				
> 				<RegExpr attribute="GDL input" context="gdl_dq_string_5" String="Q?([^\s\w])" />
>-				
>+
> 			</context>
> 			
> 			<context name="gdl_dq_string_1" attribute="String" lineEndContext="#stay" >
>@@ -546,7 +553,7 @@
> 				<DetectChar attribute="String" context="#pop" char="}" />
> 				<IncludeRules context="dq_string_rules" />
> 			</context>
>-	
>+
> 			<context name="gdl_dq_string_3" attribute="String" lineEndContext="#stay" >
> 				<IncludeRules context="dq_string_rules" />
> 				<Detect2Chars attribute="String" char="\" char1="]" context="#stay"/>
>@@ -558,7 +565,7 @@
> 				<DetectChar attribute="String" context="#pop" char="]" />
> 				<IncludeRules context="dq_string_rules" />
> 			</context>
>-	
>+
> 			<context name="gdl_dq_string_4" attribute="String" lineEndContext="#stay" >
> 				<IncludeRules context="dq_string_rules" />
> 				<Detect2Chars attribute="String" char="\" char1="&gt;" context="#stay"/>
>@@ -570,8 +577,8 @@
> 				<DetectChar attribute="String" context="#pop" char="&gt;" />
> 				<IncludeRules context="dq_string_rules" />
> 			</context>
>-			
>-			
> 			<context name="gdl_dq_string_5" attribute="String" lineEndContext="#stay" dynamic="true">
>@@ -585,9 +592,9 @@
> 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
> 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
> 			</context>
>-			
>+
> 			
>-			
>+
> 			<context name="gdl_token_array_1" attribute="String" lineEndContext="#stay" >
> 				<IncludeRules context="token_array_rules" />
> 				<Detect2Chars attribute="String" char="\" char1=")" context="#stay"/>
>@@ -599,7 +606,7 @@
> 				<DetectChar attribute="String" context="gdl_token_array_1_nested" char="(" />
> 				<DetectChar attribute="String" context="#pop" char=")" />
> 			</context>
>-			
>+
> 			<context name="gdl_token_array_2" attribute="String" lineEndContext="#stay" >
> 				<IncludeRules context="token_array_rules" />
> 				<Detect2Chars attribute="String" char="\" char1="}" context="#stay"/>
>@@ -611,7 +618,7 @@
> 				<DetectChar attribute="String" context="gdl_token_array_2_nested" char="{" />
> 				<DetectChar attribute="String" context="#pop" char="}" />
> 			</context>
>-	
>+
> 			<context name="gdl_token_array_3" attribute="String" lineEndContext="#stay" >
> 				<IncludeRules context="token_array_rules" />
> 				<Detect2Chars attribute="String" char="\" char1="]" context="#stay"/>
>@@ -623,7 +630,7 @@
> 				<DetectChar attribute="String" context="gdl_token_array_3_nested" char="[" />
> 				<DetectChar attribute="String" context="#pop" char="]" />
> 			</context>
>-	
>+
> 			<context name="gdl_token_array_4" attribute="String" lineEndContext="#stay" >
> 				<IncludeRules context="token_array_rules" />
> 				<Detect2Chars attribute="String" char="\" char1="&gt;" context="#stay"/>
>@@ -635,8 +642,8 @@
> 				<DetectChar attribute="String" context="gdl_token_array_4_nested" char="&lt;" />
> 				<DetectChar attribute="String" context="#pop" char="&gt;" />
> 			</context>
>-			
>-			
> 			<context name="gdl_token_array_5" attribute="String" lineEndContext="#stay" dynamic="true">
>@@ -644,14 +651,14 @@
> 				<RegExpr attribute="String" String="\\%1" context="#stay" dynamic="true"/>
> 				<RegExpr attribute="GDL input" context="#pop#pop" String="\s*%1" dynamic="true" endRegion="GdlInput" />
> 			</context>
>-			
>+
> 			
> 			<context name="token_array_rules" attribute="String" lineEndContext="#stay" >
> 				<StringDetect attribute="String" String="\\" context="#stay"/>
> 			</context>
>-			
>+
> 			
>-			
>+
> 			<context name="gdl_apostrophed_1" attribute="Raw String" lineEndContext="#stay" >
> 				<IncludeRules context="apostrophed_rules" />
> 				<Detect2Chars attribute="Raw String" char="\" char1=")" context="#stay"/>
>@@ -663,7 +670,7 @@
> 				<DetectChar attribute="Raw String" context="gdl_apostrophed_1_nested" char="(" />
> 				<DetectChar attribute="Raw String" context="#pop" char=")" />
> 			</context>
>-			
>+
> 			<context name="gdl_apostrophed_2" attribute="Raw String" lineEndContext="#stay" >
> 				<IncludeRules context="apostrophed_rules" />
> 				<Detect2Chars attribute="Raw String" char="\" char1="}" context="#stay"/>
>@@ -675,7 +682,7 @@
> 				<DetectChar attribute="Raw String" context="gdl_apostrophed_2_nested" char="{" />
> 				<DetectChar attribute="Raw String" context="#pop" char="}" />
> 			</context>
>-	
>+
> 			<context name="gdl_apostrophed_3" attribute="Raw String" lineEndContext="#stay" >
> 				<IncludeRules context="apostrophed_rules" />
> 				<Detect2Chars attribute="Raw String" char="\" char1="]" context="#stay"/>
>@@ -687,7 +694,7 @@
> 				<DetectChar attribute="Raw String" context="gdl_apostrophed_3_nested" char="[" />
> 				<DetectChar attribute="Raw String" context="#pop" char="]" />
> 			</context>
>-	
>+
> 			<context name="gdl_apostrophed_4" attribute="Raw String" lineEndContext="#stay" >
> 				<IncludeRules context="apostrophed_rules" />
> 				<Detect2Chars attribute="Raw String" char="\" char1="&gt;" context="#stay"/>
>@@ -699,8 +706,8 @@
> 				<DetectChar attribute="Raw String" context="gdl_apostrophed_4_nested" char="&lt;" />
> 				<DetectChar attribute="Raw String" context="#pop" char="&gt;" />
> 			</context>
>-			
>-			
> 			<context name="gdl_apostrophed_5" attribute="Raw String" lineEndContext="#stay" dynamic="true">
>@@ -708,14 +715,14 @@
> 				<RegExpr attribute="Raw String" String="\\%1" context="#stay" dynamic="true"/>
> 				<RegExpr attribute="GDL input" context="#pop#pop" String="\s*%1" dynamic="true" endRegion="GdlInput" />
> 			</context>
>-			
>+
> 			
> 			<context name="apostrophed_rules" attribute="Raw String" lineEndContext="#stay" >
> 				<Detect2Chars attribute="Raw String" char="\" char1="\" context="#stay"/>
> 			</context>
>-			
>+
> 			
>-			
>+
> 			<context name="gdl_shell_command_1" attribute="Command" lineEndContext="#stay" >
> 				<IncludeRules context="shell_command_rules" />
> 				<Detect2Chars attribute="Command" char="\" char1=")" context="#stay"/>
>@@ -727,7 +734,7 @@
> 				<DetectChar attribute="Command" context="gdl_shell_command_1_nested" char="(" />
> 				<DetectChar attribute="Command" context="#pop" char=")" />
> 			</context>
>-			
>+
> 			<context name="gdl_shell_command_2" attribute="Command" lineEndContext="#stay" >
> 				<IncludeRules context="shell_command_rules" />
> 				<Detect2Chars attribute="Command" char="\" char1="}" context="#stay"/>
>@@ -739,7 +746,7 @@
> 				<DetectChar attribute="Command" context="gdl_shell_command_2_nested" char="{" />
> 				<DetectChar attribute="Command" context="#pop" char="}" />
> 			</context>
>-	
>+
> 			<context name="gdl_shell_command_3" attribute="Command" lineEndContext="#stay" >
> 				<IncludeRules context="shell_command_rules" />
> 				<Detect2Chars attribute="Command" char="\" char1="]" context="#stay"/>
>@@ -751,7 +758,7 @@
> 				<DetectChar attribute="Command" context="gdl_shell_command_3_nested" char="[" />
> 				<DetectChar attribute="Command" context="#pop" char="]" />
> 			</context>
>-	
>+
> 			<context name="gdl_shell_command_4" attribute="Command" lineEndContext="#stay" >
> 				<IncludeRules context="shell_command_rules" />
> 				<Detect2Chars attribute="Command" char="\" char1="&gt;" context="#stay"/>
>@@ -763,8 +770,8 @@
> 				<DetectChar attribute="Command" context="gdl_shell_command_4_nested" char="&lt;" />
> 				<DetectChar attribute="Command" context="#pop" char="&gt;" />
> 			</context>
>-			
>-			
> 			<context name="gdl_shell_command_5" attribute="Command" lineEndContext="#stay" dynamic="true">
>@@ -772,16 +779,16 @@
> 				<RegExpr attribute="Command" String="\\%1" context="#stay" dynamic="true" />
> 				<RegExpr attribute="GDL input" context="#pop#pop" String="\s*%1" dynamic="true" endRegion="GdlInput" />
> 			</context>
>-			
>+
> 			
> 			<context name="shell_command_rules" attribute="Command" lineEndContext="#stay" >
> 				<Detect2Chars attribute="Command" char="\" char1="\" context="#stay"/>
> 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
> 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
> 			</context>
>-			
>+
> 			
>-			
>+
> 			<context name="gdl_regexpr_1" attribute="Regular Expression" lineEndContext="#stay" >
> 				<IncludeRules context="regexpr_rules" />
> 				<Detect2Chars attribute="Regular Expression" char="\" char1=")" context="#stay"/>
>@@ -793,7 +800,7 @@
> 				<DetectChar attribute="Regular Expression" context="gdl_regexpr_1_nested" char="(" />
> 				<DetectChar attribute="Regular Expression" context="#pop" char=")" />
> 			</context>
>-			
>+
> 			<context name="gdl_regexpr_2" attribute="Regular Expression" lineEndContext="#stay" >
> 				<IncludeRules context="regexpr_rules" />
> 				<Detect2Chars attribute="Regular Expression" char="\" char1="}" context="#stay"/>
>@@ -805,7 +812,7 @@
> 				<DetectChar attribute="Regular Expression" context="gdl_regexpr_2_nested" char="{" />
> 				<DetectChar attribute="Regular Expression" context="#pop" char="}" />
> 			</context>
>-	
>+
> 			<context name="gdl_regexpr_3" attribute="Regular Expression" lineEndContext="#stay" >
> 				<IncludeRules context="regexpr_rules" />
> 				<Detect2Chars attribute="Regular Expression" char="\" char1="]" context="#stay"/>
>@@ -817,7 +824,7 @@
> 				<DetectChar attribute="Regular Expression" context="gdl_regexpr_3_nested" char="[" />
> 				<DetectChar attribute="Regular Expression" context="#pop" char="]" />
> 			</context>
>-	
>+
> 			<context name="gdl_regexpr_4" attribute="Regular Expression" lineEndContext="#stay" >
> 				<IncludeRules context="regexpr_rules" />
> 				<Detect2Chars attribute="Regular Expression" char="\" char1="&gt;" context="#stay"/>
>@@ -829,8 +836,8 @@
> 				<DetectChar attribute="Regular Expression" context="gdl_regexpr_4_nested" char="&lt;" />
> 				<DetectChar attribute="Regular Expression" context="#pop" char="&gt;" />
> 			</context>
>-			
>-			
> 			<context name="gdl_regexpr_5" attribute="Regular Expression" lineEndContext="#stay" dynamic="true">
>@@ -838,36 +845,36 @@
> 				<RegExpr attribute="Regular Expression" String="\\%1" context="#stay" dynamic="true" />
> 				<RegExpr attribute="GDL input" context="#pop#pop" String="\s*%1[uiomxn]*" dynamic="true" endRegion="GdlInput" />
> 			</context>
>-			
>+
> 			
> 			<context name="regexpr_rules" attribute="Regular Expression" lineEndContext="#stay" >
> 				<Detect2Chars attribute="Regular Expression" char="\" char1="\" context="#stay"/>
> 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
> 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
> 			</context>
>-			
>+
> 			
>-			
>+
> 			
> 			<context name="DATA" attribute="Data" lineEndContext="#stay"/>
> 		</contexts>
>-		
>+
> 		<itemDatas>
> 			<itemData name="Normal Text" defStyleNum="dsNormal"/>
>-			
>+
> 			<itemData name="Keyword" defStyleNum="dsKeyword"/>
> 			<itemData name="Attribute Definition" defStyleNum="dsOthers"/>
> 			<itemData name="Access Control" defStyleNum="dsKeyword" color="#0000FF"/>
> 			<itemData name="Definition" defStyleNum="dsKeyword"/>
> 			<itemData name="Pseudo variable" defStyleNum="dsDecVal"/>
>-			
>+
> 			<itemData name="Dec" defStyleNum="dsDecVal"/>
> 			<itemData name="Float" defStyleNum="dsFloat"/>
> 			<itemData name="Char" defStyleNum="dsChar"/>
> 			<itemData name="Octal" defStyleNum="dsBaseN"/>
> 			<itemData name="Hex" defStyleNum="dsBaseN"/>
> 			<itemData name="Bin" defStyleNum="dsBaseN"/>
>-			
>+
> 			<itemData name="Symbol" defStyleNum="dsString" color="#D40000"/>
> 			<itemData name="String" defStyleNum="dsString"/>
> 			<itemData name="Raw String" defStyleNum="dsString" color="#DD4A4A" selColor="#DD4A4A"/>
>@@ -878,27 +885,28 @@
> 			<itemData name="Data" defStyleNum="dsNormal"/>
> 			
> 			<itemData name="GDL input" defStyleNum="dsOthers" />
>-			
>+
> 			<itemData name="Default globals" defStyleNum="dsDataType" color="#C00000" bold="1"/>
> 			<itemData name="Global Variable" defStyleNum="dsDataType" color="#C00000"/>
> 			<itemData name="Global Constant" defStyleNum="dsDataType" color="#bb1188" bold="1"/>
> 			<itemData name="Constant" defStyleNum="dsDataType"/>
> 			<itemData name="Constant Value" defStyleNum="dsDataType" color="#bb1188"/>
> 			<itemData name="Kernel methods" defStyleNum="dsNormal" color="#000080" selColor="#ffffff"/> 
>+                        <itemData name="Module mixin methods" defStyleNum="dsNormal" color="#000080" selColor="#ffffff"/> 
> 			<itemData name="Member" defStyleNum="dsNormal"/>
> 			<itemData name="Instance Variable" defStyleNum="dsOthers"/>
> 			<itemData name="Class Variable" defStyleNum="dsOthers"/>
>-			
>+
> 			<itemData name="Comment" defStyleNum="dsComment"/>
> 			<itemData name="Blockcomment" defStyleNum="dsComment"/>
> 			<itemData name="Region Marker" defStyleNum="dsNormal" color="#0000ff"/>
> 			<itemData name="RDoc Value" defStyleNum="dsOthers"/>
>-			
>+
> 			<itemData name="Here Document" defStyleNum="dsOthers"/>
>-			
>+
> 			
> 			<itemData name="Error" defStyleNum="dsError" />
>-			
>+
> 			<itemData name="Delimiter" defStyleNum="dsNormal" color="#FF9FEC"/>
> 			<itemData name="Expression" defStyleNum="dsOthers"/>
> 			<itemData name="Operator" defStyleNum="dsNormal" color="#FF9FEC"/>
>@@ -908,6 +916,6 @@
> 		<comments>
> 			<comment name="singleLine" start="#"/>
> 		</comments>
>-		<keywords casesensitive="1" weakDeliminator="!?"/> 
>+		<keywords casesensitive="1" weakDeliminator="!?"/>
> 	</general>
> </language>
>diff -urN tdelibs/kate/data/sather.xml tdelibs.new/kate/data/sather.xml
>--- tdelibs/kate/data/sather.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/sather.xml	2013-12-26 13:26:41.946323193 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Sather" version="1.03" kateversion="2.1" section="Sources" extensions="*.sa" mimetype="text/x-sather-src" casesensitive="1">
>+<language name="Sather" version="1.03" kateversion="2.5" section="Sources" extensions="*.sa" mimetype="text/x-sather-src" casesensitive="1">
>         <highlighting>
>                 <list name="keywords">
>                         <item> and </item>
>diff -urN tdelibs/kate/data/scala.xml tdelibs.new/kate/data/scala.xml
>--- tdelibs/kate/data/scala.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/scala.xml	2013-12-26 13:26:40.628328815 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Scala" version="1.0" kateversion="2.4" section="Sources"
>+<language name="Scala" version="1.0" kateversion="2.5" section="Sources"
>           extensions="*.scala" mimetype="text/x-scala" license="LGPL"
>           author="Stephane Micheloud (stephane.micheloud@epfl.ch)">
> 
>-<language version="1.12" kateversion="2.4" name="Scheme" section="Scripts" extensions="*.scm;*.ss;*.scheme;*.guile" mimetype="text/x-scheme" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL">
>+<language version="1.13" kateversion="2.5" name="Scheme" section="Scripts" extensions="*.scm;*.ss;*.scheme;*.guile" mimetype="text/x-scheme" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" priority="9">
>   <highlighting>
>     <list name="operators">
>       <item> &lt;= </item>
>diff -urN tdelibs/kate/data/sci.xml tdelibs.new/kate/data/sci.xml
>--- tdelibs/kate/data/sci.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/sci.xml	2013-12-26 13:26:40.727328393 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="scilab" version="1.03" kateversion="2.3" section="Scientific" extensions="*.sci;*.sce" mimetype="text/x-sci">
>+<language name="scilab" version="1.03" kateversion="2.5" section="Scientific" extensions="*.sci;*.sce" mimetype="text/x-sci">
>   <highlighting>
>     <list name="Structure-keywords">
>       <item> do </item>
>diff -urN tdelibs/kate/data/scss.xml tdelibs.new/kate/data/scss.xml
>--- tdelibs/kate/data/scss.xml	2013-03-02 15:57:35.000000000 -0600
>+++ tdelibs.new/kate/data/scss.xml	2013-12-26 13:26:42.023322864 -0600
>@@ -21,7 +21,7 @@
> 
> -->
> 
>-<language name="SCSS" version="2.04" kateversion="2.4" section="Markup" extensions="*.scss" indenter="cstyle"
>+<language name="SCSS" version="2.04" kateversion="2.5" section="Markup" extensions="*.scss" indenter="cstyle"
>           mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
> 
>     <highlighting>
>diff -urN tdelibs/kate/data/sed.xml tdelibs.new/kate/data/sed.xml
>--- tdelibs/kate/data/sed.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/sed.xml	2013-12-26 13:26:41.121326713 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="sed" section="Scripts" version="1.0" kateversion="2.4" extensions="*.sed" mimetype="text/x-sed" author="Bart Sas (bart.sas@gmail.com)" license="GPL">
>+<language name="sed" section="Scripts" version="1.0" kateversion="2.5" extensions="*.sed" mimetype="text/x-sed" author="Bart Sas (bart.sas@gmail.com)" license="GPL">
>         <highlighting>
>                 <contexts>
>                         <context name="BeginningOfLine" attribute="Normal" lineEndContext="#stay">
>diff -urN tdelibs/kate/data/sgml.xml tdelibs.new/kate/data/sgml.xml
>--- tdelibs/kate/data/sgml.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/sgml.xml	2013-12-26 13:26:40.837327926 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="SGML" version="1.02" kateversion="2.1" section="Markup" extensions="*.sgml" mimetype="text/sgml">
>+<language name="SGML" version="1.02" kateversion="2.5" section="Markup" extensions="*.sgml" mimetype="text/sgml">
>   <highlighting>
>     <contexts>
>        <context attribute="Normal Text" lineEndContext="#stay" name="Normal Text" >
>diff -urN tdelibs/kate/data/sieve.xml tdelibs.new/kate/data/sieve.xml
>--- tdelibs/kate/data/sieve.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/sieve.xml	2013-12-26 13:26:40.910327614 -0600
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
> 
>-<language name="Sieve" version="1.05" kateversion="2.4" section="Scripts" extensions="*.siv" mimetype="application/sieve" priority="5" author="Petter E. Stokke" license="">
>+<language name="Sieve" version="1.05" kateversion="2.5" section="Scripts" extensions="*.siv" mimetype="application/sieve" priority="5" author="Petter E. Stokke" license="">
>   <highlighting>
>     <list name="keywords">
>       <item> require </item>
>diff -urN tdelibs/kate/data/sisu.xml tdelibs.new/kate/data/sisu.xml
>--- tdelibs/kate/data/sisu.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/sisu.xml	2013-12-26 13:26:41.206326350 -0600
>@@ -1,13 +1,13 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="SiSU" version="1.01" section="Markup" kateversion="2.4" extensions="*.sst;*.ssm;*.ssi;*._sst;*.-sst;" author="Ralph Amissah (ralph.amissah@gmail.com)" license="LGPL" >
>+<language name="SiSU" version="1.02" section="Markup" kateversion="2.5" extensions="*.sst;*.ssm;*.ssi;*._sst;*.-sst;" author="Ralph Amissah (ralph.amissah@gmail.com)" license="LGPL" >
>   <highlighting>
>     <list name="somename">
>       <item> class </item>
>       <item> const </item>
>     </list>
>     <contexts>
>-    <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
>+    <context attribute="Normal Text" lineEndContext="#stay" name="Normal Text" >
>       <keyword attribute="Keyword" context="#stay" String="somename" />
>       <DetectChar attribute="String" context="string" char="&quot;" />
>       <RegExpr String="^(0~\S+|@\S+)\s.+$" attribute="Header" context="#pop" />
>diff -urN tdelibs/kate/data/sml.xml tdelibs.new/kate/data/sml.xml
>--- tdelibs/kate/data/sml.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/sml.xml	2013-12-26 13:26:41.891323427 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="SML" version="1.06" kateversion="2.1" section="Sources" extensions="*.sml;*.ml" mimetype="" author="Christoph Cullmann (cullmann@kde.org)" license="LGPL">
>+<language name="SML" version="1.06" kateversion="2.5" section="Sources" extensions="*.sml;*.ml" mimetype="" author="Christoph Cullmann (cullmann@kde.org)" license="LGPL">
>   <highlighting>
>     <list name="keywords">
>       <item> abstype </item>
>diff -urN tdelibs/kate/data/spice.xml tdelibs.new/kate/data/spice.xml
>--- tdelibs/kate/data/spice.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/spice.xml	2013-12-26 13:26:41.144326613 -0600
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
> 
>-<language name="Spice" section="Hardware" version="1.01" kateversion="2.3" extensions="*.sp;*.hsp" mimetype="text/spice" author="Steven Robson (s.a.robson@sms.ed.ac.uk) and Anders Lund" license="LGPL">
>+<language name="Spice" section="Hardware" version="1.01" kateversion="2.5" extensions="*.sp;*.hsp" mimetype="text/spice" author="Steven Robson (s.a.robson@sms.ed.ac.uk) and Anders Lund" license="LGPL">
>     <highlighting>  
>           
>         <contexts>
>diff -urN tdelibs/kate/data/sql-mysql.xml tdelibs.new/kate/data/sql-mysql.xml
>--- tdelibs/kate/data/sql-mysql.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/sql-mysql.xml	2013-12-26 13:26:41.687324297 -0600
>@@ -5,7 +5,7 @@
>   original by Shane Wright (me@shanewright.co.uk)
>   modifications by Milian Wolff (mail@milianw.de)
> -->
>-<language name="SQL (MySQL)" version="1.13" kateversion="2.5" section="Database" extensions="*.sql;*.SQL" mimetype="text/x-sql" casesensitive="0" author="Shane Wright (me@shanewright.co.uk)" license="">
>+<language name="SQL (MySQL)" version="1.15" kateversion="2.5" section="Database" extensions="*.sql;*.SQL;*.ddl;*.DDL" mimetype="text/x-sql" casesensitive="0" author="Shane Wright (me@shanewright.co.uk)" license="">
>   <highlighting>
>     <list name="keywords">
>       <item> ACCESS </item>
>@@ -153,6 +153,7 @@
>       <item> VARYING </item>
>       <item> WHEN </item>
>       <item> WHERE </item>
>+      <item> WHILE </item>
>       <item> WITH </item>
>       <item> WRITE </item>
>       <item> XOR </item>
>diff -urN tdelibs/kate/data/sql-postgresql.xml tdelibs.new/kate/data/sql-postgresql.xml
>--- tdelibs/kate/data/sql-postgresql.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/sql-postgresql.xml	2013-12-26 13:26:42.076322638 -0600
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
> 
>-<language name="SQL (PostgreSQL)" version="1.10" kateversion="2.4" section="Database" extensions="*.sql;*.SQL" mimetype="text/x-sql" casesensitive="0" author="Shane Wright (me@shanewright.co.uk)" license="">
>+<language name="SQL (PostgreSQL)" version="1.12" kateversion="2.5" section="Database" extensions="*.sql;*.SQL;*.ddl;*.DDL" mimetype="text/x-sql" casesensitive="0" author="Shane Wright (me@shanewright.co.uk)" license="">
>   <highlighting>
>     <list name="keywords">
>       <item> ABORT </item>
>@@ -491,6 +491,7 @@
>       <item> WHEN </item>
>       <item> WHENEVER </item>
>       <item> WHERE </item>
>+      <item> WHILE </item>
>       <item> WITH </item>
>       <item> WITHOUT </item>
>       <item> WORK </item>
>diff -urN tdelibs/kate/data/sql.xml tdelibs.new/kate/data/sql.xml
>--- tdelibs/kate/data/sql.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/sql.xml	2013-12-26 13:26:41.295325970 -0600
>@@ -3,7 +3,7 @@
> 
> 
> 
>-<language name="SQL" version="1.14" kateversion="2.4" section="Database" extensions="*.sql;*.SQL" mimetype="text/x-sql" casesensitive="0" author="Yury Lebedev (yurylebedev@mail.ru)" license="LGPL">
>+<language name="SQL" version="1.16" kateversion="2.5" section="Database" extensions="*.sql;*.SQL;*.ddl;*.DDL" mimetype="text/x-sql" casesensitive="0" author="Yury Lebedev (yurylebedev@mail.ru)" license="LGPL">
>   <highlighting>
>     <list name="keywords">
>       <item> ACCESS </item>
>@@ -585,6 +585,7 @@
>       <item> WHEN </item>
>       <item> WHENEVER </item>
>       <item> WHERE </item>
>+      <item> WHILE </item>
>       <item> WITH </item>
>       <item> WITHOUT </item>
>       <item> WORK </item>
>diff -urN tdelibs/kate/data/stata.xml tdelibs.new/kate/data/stata.xml
>--- tdelibs/kate/data/stata.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/stata.xml	2013-12-26 13:26:41.933323247 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Stata" version="2.00" kateversion="2.4" section="Sources" extensions="*.do; *.ado; *.doh; *.DO; *.ADO; *.DOH"
>+<language name="Stata" version="2.00" kateversion="2.5" section="Sources" extensions="*.do; *.ado; *.doh; *.DO; *.ADO; *.DOH"
>  casesensitive="1" priority="5" author="Larry Radbill (Larry.Radbill gmail com)" license="LGPL" >
> 
>   <highlighting>
>diff -urN tdelibs/kate/data/syntax.template tdelibs.new/kate/data/syntax.template
>--- tdelibs/kate/data/syntax.template	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/syntax.template	2013-12-26 13:26:41.176326479 -0600
>@@ -13,7 +13,7 @@
> 
>         You'll find the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php
> -->
>-<language name="" section="" version="1.00" kateversion="2.3" extensions="" mimetype="" author="" license="">
>+<language name="" section="" version="1.00" kateversion="2.5" extensions="" mimetype="" author="" license="">
>   <highlighting>
>     <contexts>
>       <context name="Normal" attribute="Normal Text" lineEndContext="#stay"/>
>diff -urN tdelibs/kate/data/systemc.xml tdelibs.new/kate/data/systemc.xml
>--- tdelibs/kate/data/systemc.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/systemc.xml	2013-12-26 13:26:41.954323158 -0600
>@@ -7,7 +7,7 @@
> ================================================================================
>     July 17th 2008                            Initial version
> -->
>-<language name="SystemC" version="0.01" kateversion="2.4" section="Hardware" extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="1" author="Joseph Wenninger (jowenn@kde.org)" license="LGPL">
>+<language name="SystemC" version="0.01" kateversion="2.5" section="Hardware" extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="1" author="Joseph Wenninger (jowenn@kde.org)" license="LGPL">
> 
> <highlighting>
> <list name="systemc_keywords">
>diff -urN tdelibs/kate/data/systemverilog.xml tdelibs.new/kate/data/systemverilog.xml
>--- tdelibs/kate/data/systemverilog.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/systemverilog.xml	2013-12-26 13:26:40.351329999 -0600
>@@ -39,7 +39,7 @@
> 
> 
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="SystemVerilog" version="1.50" kateversion="2.4" section="Hardware" extensions="*.sv;*.svh" mimetype="text/x-systemverilog-src" author="Sean O'Boyle (seanoboyle@intelligentdv.com)" license="GPL">
>+<language name="SystemVerilog" version="1.50" kateversion="2.5" section="Hardware" extensions="*.sv;*.svh" mimetype="text/x-systemverilog-src" author="Sean O'Boyle (seanoboyle@intelligentdv.com)" license="GPL">
>   <highlighting>
>     <list name="key_deprecated">
>        <item> defparam </item>
>diff -urN tdelibs/kate/data/tads3.xml tdelibs.new/kate/data/tads3.xml
>--- tdelibs/kate/data/tads3.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/tads3.xml	2013-12-26 13:26:41.130326675 -0600
>@@ -3,7 +3,7 @@
> 
> 
> <language name="TADS 3" section="Sources"
>-          version="1.0" kateversion="2.4"
>+          version="1.0" kateversion="2.5"
>           indenter="cstyle"
>           extensions="*.t;*.h"
>           mimetype=""
>diff -urN tdelibs/kate/data/tcl.xml tdelibs.new/kate/data/tcl.xml
>--- tdelibs/kate/data/tcl.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/tcl.xml	2013-12-26 13:26:41.032327091 -0600
>@@ -8,6 +8,8 @@
>     Updated by Pawel Salawa (boogie at scripts dot one dot pl)
> 
>     Revision history:
>+        1.11:
>+            - added new commands of Tcl/tk 8.5, released in 2007
>         1.10:
>             - Fixed problem with single ':' character after variable name (it's no longer variable,
>               because only double-colon is namespace delimiter and can be part of variable name).
>@@ -26,7 +28,7 @@
> 	    - Fixed detection of varaibles with names containing serval namespace delimiters (::)
> -->
> 
>-<language name="Tcl/Tk" version="1.10" kateversion="2.4" section="Scripts" extensions="*.tcl;*.tk" mimetype="text/x-tcl">
>+<language name="Tcl/Tk" version="1.11" kateversion="2.5" section="Scripts" extensions="*.tcl;*.tk" mimetype="text/x-tcl">
>   <highlighting>
>     <list name="keywords">
>       <item> after </item>
>@@ -36,9 +38,13 @@
>       <item> argc  </item>
>       <item> array  </item>
>       <item> auto_execk  </item>
>+      <item> auto_execok </item>
>+      <item> auto_import </item>
>       <item> auto_load  </item>
>       <item> auto_mkindex  </item>
>+      <item> auto_mkindex_old </item>
>       <item> auto_path  </item>
>+      <item> auto_qualify </item>
>       <item> auto_reset  </item>
>       <item> beep  </item>
>       <item> bell  </item>
>@@ -52,15 +58,18 @@
>       <item> case  </item>
>       <item> catch  </item>
>       <item> cd  </item>
>+      <item> chan </item>
>       <item> checkbutton  </item>
>       <item> clipboard  </item>
>       <item> clock  </item>
>       <item> close  </item>
>+      <item> combobox </item>
>       <item> concat  </item>
>       <item> console  </item>
>       <item> continue  </item>
>       <item> dde  </item>
>       <item> destroy  </item>
>+      <item> dict </item>
>       <item> else  </item>
>       <item> elseif  </item>
>       <item> encoding  </item>
>@@ -100,7 +109,9 @@
>       <item> interp  </item>
>       <item> join  </item>
>       <item> label  </item>
>+      <item> labelframe </item>
>       <item> lappend  </item>
>+      <item> lassign </item>
>       <item> lindex  </item>
>       <item> linsert  </item>
>       <item> list  </item>
>@@ -109,23 +120,30 @@
>       <item> load  </item>
>       <item> lower  </item>
>       <item> lrange  </item>
>+      <item> lremove </item>
>+      <item> lrepeat </item>
>       <item> lreplace  </item>
>+      <item> lreverse </item>
>       <item> lsearch  </item>
>+      <item> lset </item>
>       <item> lsort  </item>
>       <item> menu  </item>
>       <item> menubutton  </item>
>       <item> message  </item>
>       <item> namespace  </item>
>+      <item> notebook </item>
>       <item> open  </item>
>       <item> option  </item>
>       <item> OptProc  </item>
>       <item> pack  </item>
>       <item> package  </item>
>+      <item> panedwindow </item>
>       <item> parray  </item>
>       <item> pid  </item>
>       <item> place  </item>
>-      <item> pkg_mkindex  </item>
>+      <item> pkg_mkIndex </item>
>       <item> proc  </item>
>+      <item> progressbar </item>
>       <item> puts  </item>
>       <item> pwd  </item>
>       <item> radiobutton  </item>
>@@ -143,11 +161,15 @@
>       <item> seek  </item>
>       <item> selection  </item>
>       <item> send  </item>
>+      <item> separator </item>
>       <item> set  </item>
>+      <item> sizegrip </item>
>       <item> socket  </item>
>       <item> source  </item>
>+      <item> spinbox </item>
>       <item> split  </item>
>       <item> string  </item>
>+      <item> style </item>
>       <item> subst  </item>
>       <item> switch  </item>
>       <item> tclLog  </item>
>@@ -180,15 +202,22 @@
>       <item> tk_getOpenFile  </item>
>       <item> tk_getSaveFile  </item>
>       <item> tk_library  </item>
>+      <item> tk_menuSetFocus </item>
>       <item> tk_messageBox  </item>
>       <item> tk_optionMenu  </item>
>       <item> tk_patchLevel  </item>
>       <item> tk_popup  </item>
>       <item> tk_strictMotif  </item>
>+      <item> tk_textCopy </item>
>+      <item> tk_textCut </item>
>+      <item> tk_textPaste </item>
>       <item> tk_version  </item>
>       <item> toplevel  </item>
>       <item> trace  </item>
>+      <item> traverseTo </item>
>+      <item> treeview </item>
>       <item> unknown  </item>
>+      <item> unload </item>
>       <item> unset  </item>
>       <item> update  </item>
>       <item> uplevel  </item>
>diff -urN tdelibs/kate/data/tcsh.xml tdelibs.new/kate/data/tcsh.xml
>--- tdelibs/kate/data/tcsh.xml	2013-12-25 16:25:23.000000000 -0600
>+++ tdelibs.new/kate/data/tcsh.xml	2013-12-26 13:26:40.664328662 -0600
>@@ -8,7 +8,7 @@
>         <!ENTITY noword   "(?![\w$+-])">		
>         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     
> ]>
>-<language name="Tcsh" version="0.1" kateversion="2.4" section="Scripts" extensions="*.csh;*.tcsh;csh.cshrc;csh.login;.tcshrc;.cshrc;.login" mimetype="application/x-csh" casesensitive="1" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="LGPL">
>+<language name="Tcsh" version="0.2" kateversion="2.5" section="Scripts" extensions="*.csh;*.tcsh;csh.cshrc;csh.login;.tcshrc;.cshrc;.login" mimetype="application/x-csh" casesensitive="1" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="LGPL">
> 
> 
>-<RegExpr attribute="Keyword" context="Cmd@" String="\b@\s" />
>-<RegExpr attribute="Keyword" context="CmdSet" String="\bset\s" />
>+<RegExpr attribute="Keyword" context="#stay" String="\b@\s" />
>+<RegExpr attribute="Keyword" context="#stay" String="\bset\s" />
>         <RegExpr attribute="Keyword" context="CmdSetEnv" String="\bsetenv\s" />
>         
> <StringDetect attribute="Function" context="#stay" String=":()" />
>@@ -583,8 +583,8 @@
>         <RegExpr attribute="Expression" context="#stay" String="-[rwxXeozsfdlbcpSugktRLDIFNZ](?=\s)"/>
>         <RegExpr attribute="Expression" context="#stay" String="-[AMCUG]:?(?=\s)"/>
>         <RegExpr attribute="Expression" context="#stay" String="-P[0-7]{,3}:?(?=\s)"/>
>-        <RegExpr attribute="Expression" context="#stay" String="([|&amp;=&gt;&lt;)\1"/>
>-        <RegExpr attribute="Expression" context="#stay" String="[|^&amp;&gt;&lt;+-*/%!~]"/>
>+        <RegExpr attribute="Expression" context="#stay" String="([|&amp;=&gt;&lt;])\1"/>
>+        <RegExpr attribute="Expression" context="#stay" String="[|^&amp;&gt;&lt;+\-*/%!~]"/>
>         <RegExpr attribute="Expression" context="#stay" String="([!=]~|[!&gt;&lt;]=)"/>
>       </context>
> 
>diff -urN tdelibs/kate/data/template-toolkit.xml tdelibs.new/kate/data/template-toolkit.xml
>--- tdelibs/kate/data/template-toolkit.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/template-toolkit.xml	2013-12-26 13:26:41.997322974 -0600
>@@ -0,0 +1,331 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd"
>+          [
>+          <!ENTITY var1    "\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff\.\-]*(\[[a-zA-Z0-9_]*\])*">
>+          <!ENTITY varwithbraces "\$\{[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff\.\-]*(\[[a-zA-Z0-9_]*\])*\}">
>+]>
>+
>+    
>+<language version="0.03" kateversion="2.5"
>+          author="ÐÑÐ°ÑÐ¸Ð¼Ð¸Ñ ÐÐµÑÐ¾Ð² (k.berov@gmail.com)" license="Artistic"
>+          name="TT2" section="Markup" extensions="*.tt*;" casesensitive="TRUE">
>+<highlighting>
>+    <list name="control structures">
>+        
>+        <item>SET</item>
>+        <item>GET</item>
>+        <item>CALL</item>
>+        <item>DEFAULT</item>
>+        <item>IF</item>
>+        <item>ELSIF</item>
>+        <item>ELSE</item>
>+        <item>UNLESS</item>
>+        <item>LAST</item>
>+        <item>NEXT</item>
>+        <item>FOR</item>
>+        <item>FOREACH</item>
>+        <item>WHILE</item>
>+        <item>SWITCH</item>
>+        <item>CASE</item>
>+        <item>PROCESS</item>
>+        <item>INCLUDE</item>
>+        <item>INSERT</item>
>+        <item>WRAPPER</item>
>+        <item>BLOCK</item>
>+        <item>MACRO</item>
>+        <item>END</item>
>+        <item>USE</item>
>+        <item>IN</item>
>+        <item>FILTER</item>
>+        <item>TRY</item>
>+        <item>THROW</item>
>+        <item>CATCH</item>
>+        <item>FINAL</item>
>+        <item>META</item>
>+        <item>TAGS</item>
>+        <item>DEBUG</item>
>+        <item>PERL</item>
>+    </list>
>+    <list name="keywords">
>+        
>+        <item>constants</item>
>+        
>+        <item>template</item>
>+        <item>component</item>
>+        <item>loop</item>
>+        <item>error</item>
>+        <item>content</item>
>+    </list>
>+    <list name="items">
>+        
>+        
>+        <item>defined</item>
>+        <item>length</item>
>+        <item>repeat</item>
>+        <item>replace</item>
>+        <item>match</item>
>+        <item>search</item>
>+        <item>split</item>
>+        <item>chunk</item>
>+        <item>list</item>
>+        <item>hash</item>
>+        <item>size</item>
>+        
>+        <item>keys</item>
>+        <item>values</item>
>+        <item>each</item>
>+        <item>sort</item>
>+        <item>nsort</item>
>+        <item>import</item>
>+        <item>defined</item>
>+        <item>exists</item>
>+        <item>item</item>
>+        
>+        <item>first</item>
>+        <item>last</item>
>+        <item>max</item>
>+        <item>reverse</item>
>+        <item>join</item>
>+        <item>grep</item>
>+        
>+        <item>unshift</item>
>+        <item>push</item>
>+        <item>shift</item>
>+        <item>pop</item>
>+        <item>unique</item>
>+        <item>merge</item>
>+        <item>slice</item>
>+        <item>splice</item>
>+        <item>count</item>
>+        
>+        <item>format</item>
>+        <item>upper</item>
>+        <item>lower</item>
>+        <item>ucfirst</item>
>+        <item>lcfirst</item>
>+        <item>trim</item>
>+        <item>collapse</item>
>+        <item>html</item>
>+        <item>html_entity</item>
>+        <item>html_para</item>
>+        <item>html_break</item>
>+        <item>html_para_break</item>
>+        <item>html_line_break</item>
>+        <item>uri</item>
>+        <item>url</item>
>+        <item>indent</item>
>+        <item>truncate</item>
>+        <item>repeat</item>
>+        <item>remove</item>
>+        <item>replace</item>
>+        <item>redirect</item>
>+        <item>eval</item>
>+        <item>evaltt</item>
>+        <item>perl</item>
>+        <item>evalperl</item>
>+        <item>stdout</item>
>+        <item>stderr</item>
>+        <item>null</item>
>+        <item>latex</item>
>+    </list>    
>+    <list name="operators">
>+        <item> = </item>
>+        <item> != </item>
>+        <item> ~= </item>
>+        <item> += </item>
>+        <item> -= </item>
>+        <item> *= </item>
>+        <item> /= </item>
>+        <item> **= </item>
>+        <item> |= </item>
>+        <item> ||= </item>
>+        <item> &amp;= </item>
>+        <item> &amp;&amp;= </item>
>+        <item> ?= </item>
>+        <item> + </item>
>+        <item> - </item>
>+        <item> * </item>
>+        
>+        <item> % </item>
>+        <item> || </item>
>+        <item> &amp;&amp; </item>
>+        <item> | </item>
>+        <item> &amp; </item>
>+        <item> &lt; </item>
>+        <item> &lt;&lt; </item>
>+        <item> &gt; </item>
>+        <item> &gt;&gt; </item>
>+        <item> ^ </item>
>+        <item> -&gt; </item>
>+        <item> =&gt; </item>
>+        <item> . </item>
>+        <item> , </item>
>+        <item> ; </item>
>+        <item> :: </item>
>+        <item> \ </item>
>+        <item> and </item>
>+        <item> or </item>
>+        <item> not </item>
>+        <item> eq </item>
>+        <item> ne </item>
>+    </list>
>+
>+    <contexts>
>+        <context name="nosource" attribute="Normal Text" lineEndContext="#stay">
>+            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
>+            <RegExpr attribute="HTML Tag" context="scripts" String="&lt;\s*script(\s|&gt;)" insensitive="TRUE" />
>+            <RegExpr attribute="HTML Tag" context="htmltag" String="&lt;\s*\/?\s*[a-zA-Z_:][a-zA-Z0-9._:-]*" />
>+            <StringDetect attribute="HTML Comment" context="htmlcomment" String="&lt;!--" />
>+            
>+            <RegExpr attribute="Variable" context="#stay" String="&var1;" />
>+            <RegExpr attribute="Variable" context="#stay" String="&varwithbraces;" />
>+        </context>
>+        
>+        <context name="tt2source" attribute="TT2 Text" lineEndContext="#stay">
>+            <StringDetect attribute="Keyword" context="#pop" String="%]" />
>+            <DetectChar attribute="Comment" context="tt2_onelinecomment" char="#" />
>+            <DetectChar attribute="String" context="doublequotestring" char="&quot;" />
>+            <DetectChar attribute="String" context="singlequotestring" char="&#39;" />
>+            <DetectChar attribute="Keyword" context="#stay" char="&amp;" />
>+            <keyword attribute="Operator" context="#stay" String="operators" />
>+            <keyword attribute="Function" context="#stay" String="functions" />
>+            <RegExpr attribute="String" context="" String="" />
>+            <RegExpr attribute="String" context="#stay" String="[0123456789]*\.\.\.[0123456789]*" />
>+            <HlCOct attribute="Octal" context="#stay" />
>+            <HlCHex attribute="Hex" context="#stay" />
>+            <Float attribute="Float" context="#stay" />
>+            <Int attribute="Decimal" context="#stay" />
>+            <AnyChar attribute="Other" context="#stay" String=";()}{:,[]" />
>+            <keyword attribute="Other" context="#stay" String="Others" />
>+            
>+            <RegExpr attribute="Control Structures" context="#stay" String="\bELSIF\b" insensitive="FALSE" beginRegion="iffi1" endRegion="iffi1"/>
>+            <RegExpr attribute="Control Structures" context="#stay" String="\bELSE\b" insensitive="FALSE" beginRegion="iffi1" endRegion="iffi1"/>
>+            <RegExpr attribute="Control Structures" context="#stay" String="\bIF\b" insensitive="FALSE" beginRegion="iffi1"/>
>+            <RegExpr attribute="Control Structures" context="#stay" String="\bEND\b" insensitive="FALSE" endRegion="iffi1"/>
>+
>+            <RegExpr attribute="Control Structures" context="#stay" String="\bFOREACH\b" insensitive="FALSE" beginRegion="foreachblock"/>
>+            <RegExpr attribute="Control Structures" context="#stay" String="\bEND\b" insensitive="FALSE" endRegion="foreachblock"/>
>+
>+            
>+            <keyword attribute="Keyword" context="#stay" String="keywords" />
>+            <keyword attribute="Control Structures" context="#stay" String="control structures" />
>+            <keyword attribute="Function" context="#stay" String="functions" />
>+        </context>
>+        <context name="tt2_onelinecomment" attribute="Comment" lineEndContext="#pop">
>+            <StringDetect attribute="Keyword" context="#pop#pop" String="%]" />
>+        </context>
>+        <context name="doublequotestring" attribute="String" lineEndContext="#stay">
>+            <Detect2Chars attribute="Escape Code" context="#stay" char="&quot;" char1="&quot;" />
>+            <RegExpr attribute="Escape Code" context="#stay" String="\\[0-7]{1,3}" />
>+            <RegExpr attribute="Escape Code" context="#stay" String="\\x[0-9A-Fa-f]{1,2}" />
>+            <DetectChar attribute="String" context="#pop" char="&quot;" />
>+            
>+            <RegExpr attribute="Variable" context="#stay" String="&var1;" />
>+            <RegExpr attribute="Variable" context="#stay" String="&varwithbraces;" />
>+        </context>
>+        <context name="singlequotestring" attribute="String" lineEndContext="#stay">
>+            <Detect2Chars attribute="Escape Code" context="#stay" char="'" char1="'"/>
>+            <DetectChar attribute="String" context="#pop" char="'" />
>+        </context>
>+        <context name="htmltag" attribute="Identifier" lineEndContext="#stay">
>+            <Detect2Chars attribute="HTML Tag" context="#pop" char="/" char1="&gt;" />
>+            <DetectChar attribute="HTML Tag" context="#pop" char="&gt;"/>
>+            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
>+            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
>+            <RegExpr attribute="Identifier" context="identifiers" String="\s*=\s*"/>
>+
>+        </context>
>+        <context name="htmlcomment" attribute="HTML Comment" lineEndContext="#stay">
>+            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
>+            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
>+            <StringDetect attribute="HTML Comment" context="#pop" String="--&gt;" />
>+            <RegExpr attribute="Normal Text" context="identifiers" String="\s*=\s*"/>
>+        </context>
>+        <context name="identifiers" attribute="Identifier" lineEndContext="#stay">
>+            <RegExpr attribute="String" context="#pop" String="\s*#?[a-zA-Z0-9]*" />
>+            <DetectChar attribute="Types" context="types1" char="'" />
>+            <DetectChar attribute="Types" context="types2" char="&quot;" />
>+        </context>
>+        
>+        <context name="types1" attribute="Types" lineEndContext="#stay">
>+            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
>+            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
>+            <DetectChar attribute="Types" context="#pop#pop" char="'" />
>+        </context>
>+        
>+        <context name="types2" attribute="Types" lineEndContext="#stay">
>+            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
>+            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
>+            <DetectChar attribute="Types" context="#pop#pop" char="&quot;" />
>+        </context>
>+        
>+        <context name="scripts" attribute="Normal Text" lineEndContext="#stay">
>+            <Detect2Chars attribute="Comment" context="scripts_onelinecomment" char="/" char1="/" />
>+            <Detect2Chars attribute="Comment" context="twolinecomment" char="/" char1="*" />
>+            <keyword attribute="Control Structures" context="#stay" String="control structures" />
>+            <keyword attribute="Keyword" context="#stay" String="keywords" />
>+            <keyword attribute="Function" context="#stay" String="functions" />
>+            <StringDetect attribute="Keyword" context="tt2source" String="[%"/>
>+            <RegExpr attribute="HTML Tag" context="#pop" String="&lt;\s*\/\s*script\s*&gt;" insensitive="TRUE" />
>+            
>+            <DetectChar attribute="String" context="doublequotestring" char="&quot;" />
>+            <DetectChar attribute="String" context="singlequotestring" char="&#39;" />
>+            <HlCOct attribute="Octal" context="#stay" />
>+            <HlCHex attribute="Hex" context="#stay" />
>+            <Float attribute="Float" context="#stay" />
>+            <Int attribute="Decimal" context="#stay" />
>+            <DetectChar attribute="Normal Text" context="#stay" char="{" beginRegion="Brace1" />
>+            <DetectChar attribute="Normal Text" context="#stay" char="}" endRegion="Brace1" />
>+            <AnyChar attribute="Other" context="#stay" String=";()}{:,[]" />
>+            <keyword attribute="Other" context="#stay" String="Others" />
>+        </context>
>+        <context name="scripts_onelinecomment" attribute="Comment" lineEndContext="#pop">
>+            <RegExpr attribute="HTML Tag" context="#pop#pop" String="&lt;\s*\/\s*script\s*&gt;" insensitive="TRUE" />
>+        </context>
>+        <context name="twolinecomment" attribute="Comment" lineEndContext="#stay">
>+            <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment" />
>+        </context>
>+        
>+    </contexts>
>+            
>+    <itemDatas>
>+        <itemData name="Normal Text" defStyleNum="dsNormal" />
>+        <itemData name="TT2 Text" defStyleNum="dsNormal" />
>+        <itemData name="Keyword" defStyleNum="dsKeyword" />
>+        <itemData name="Function" defStyleNum="dsKeyword" color="#0000FF" selColor="#00ffff" bold="0" italic="0"/>
>+        <itemData name="Decimal" defStyleNum="dsDecVal" />
>+        <itemData name="Octal" defStyleNum="dsBaseN" />
>+        <itemData name="Hex" defStyleNum="dsBaseN" />
>+        <itemData name="Float" defStyleNum="dsFloat" />
>+        <itemData name="String" defStyleNum="dsString" color="#FF6C6C" selColor="#FF6C6C" bold="0" italic="0" />
>+        <itemData name="Comment" defStyleNum="dsComment" />
>+        <itemData name="Variable" defStyleNum="dsKeyword" color="#5555FF" selColor="#ffffff" bold="1" italic="0" />
>+        <itemData name="Control Structures" defStyleNum="dsKeyword" color="#0000dd" selColor="#ffffff" bold="1" italic="0" />
>+        <itemData name="Backslash Code" defStyleNum="dsKeyword" color="#0F0F8F" selColor="#ffffff" bold="1" italic="0" />
>+        <itemData name="Other" defStyleNum="dsOthers" />
>+        <itemData name="Operator" defStyleNum="dsKeyword" color="#008000"/>
>+      <itemData name="HTML Tag" defStyleNum="dsKeyword" color="#0F0000" selColor="#ffffff" bold="1" italic="0" />
>+        <itemData name="HTML Comment" defStyleNum="dsComment" />
>+        <itemData name="Identifier" defStyleNum="dsOthers" />
>+        <itemData name="Types" defStyleNum="dsDataType" />
>+    </itemDatas>
>+</highlighting>
>+<general>
>+    <comments>
>+        <comment name="multiLine" start="&lt;!--" end="--&gt;" />
>+        <comment name="singleLine" start="#" />
>+        <comment name="multiLine" start="[%#" end="%]"/>
>+    </comments>
>+    <keywords casesensitive="1" />
>+  </general>
>+</language>
>diff -urN tdelibs/kate/data/texinfo.xml tdelibs.new/kate/data/texinfo.xml
>--- tdelibs/kate/data/texinfo.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/texinfo.xml	2013-12-26 13:26:40.668328645 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Texinfo" extensions="*.texi" section="Markup" mimetype="application/x-texinfo" author="Daniel Franke (franke.daniel@gmail.com)" license="LGPL" version="0.2" kateversion="2.3">
>+<language name="Texinfo" extensions="*.texi" section="Markup" mimetype="application/x-texinfo" author="Daniel Franke (franke.daniel@gmail.com)" license="LGPL" version="0.2" kateversion="2.5">
> 
>   <highlighting>
>     
>+
>+<!DOCTYPE language SYSTEM "language.dtd"
>+            [           
>+            <!ENTITY strongregex "(\s|^)\*[^*]\w.*\w[^*]\*(\s|\.|,|;|:|\-|\?|$)">
>+            <!ENTITY strikeoutregex "(\s|^)-[^-]\w.*\w[^-]-(\s|\.|,|;|:|\-|\?|$)">
>+            <!ENTITY blockattrsregex "($\w+(#\w+)?$)?">
>+            <!ENTITY formatregex "(&gt;|&lt;|=|&lt;&gt;)?">
>+            <!ENTITY name "(?![0-9])[\w_:][\w.:_-]*">
>+]>
>+            
>+<language section="Markup" name="Textile" 
>+        version="1.1" kateversion="2.5" 
>+        extensions="*.textile" priority="15"
>+        author="Alexander Kabakov (kabakov.as@gmail.com)"
>+        license="LGPL" >
>+    <highlighting>
>+        <contexts>
>+            <context attribute="Normal Text" lineEndContext="#stay" name="Normal Text" >
>+                <StringDetect attribute="comment" context="comment" String="&lt;!--" beginRegion="comment" />
>+                <RegExpr attribute="macro" String="\{\{&name;\}\}" />
>+                
>+                <RegExpr context="sectiontitle_block" String="^h1" />
>+                <RegExpr context="sectionheader_block" String="^h2" />                
>+                <RegExpr context="sectionheader_block" String="^h3" />
>+                <RegExpr context="sectionheader_block" String="^h4" />
>+                <RegExpr context="sectionheader_block" String="^h5" />
>+                
>+                <RegExpr attribute="textblock" String="^p&blockattrsregex;&formatregex;\." />
>+                <RegExpr attribute="textblock" String="^pre&blockattrsregex;&formatregex;\." />
>+                <RegExpr attribute="textblock" String="^bq&blockattrsregex;&formatregex;\." />
>+                <RegExpr attribute="textblock" String="^bc&blockattrsregex;&formatregex;\." />
>+                <RegExpr context="image" String="!"/>
>+                
>+                <IncludeRules context="inc" />
>+
>+                <RegExpr attribute="itemlist" String="^[\*\#]+\s" />
>+                <RegExpr attribute="htmllink" String='".*":http(s)?:[\w_/\\\d\.%\?&amp;=-]*' />
>+            </context>
>+            
>+            <context name="image" lineEndContext="#pop" attribute="image">
>+                <RegExpr String="&blockattrsregex;" attribute="blockattrs" />
>+                <RegExpr String="\w+\.(png|jpg|jpeg|gif|bmp)" attribute="imagefilename" />
>+                <DetectChar char="!" context="#pop" attribute="image"/>
>+            </context>
>+            
>+            <context name="sectiontitle_block" lineEndContext="#pop" attribute="sectiontitle">
>+                <RegExpr String="&blockattrsregex;" attribute="sectionblockattrs" />
>+            </context>
>+            
>+            <context name="sectionheader_block" lineEndContext="#pop" attribute="sectionheader">
>+                <RegExpr String="&blockattrsregex;" attribute="sectionblockattrs" />
>+            </context>
>+            
>+            <context name="comment" attribute="comment" lineEndContext="#stay">
>+                <DetectSpaces/>
>+                <DetectIdentifier/>
>+                <StringDetect attribute="comment" context="#pop" String="--&gt;" endRegion="comment" />
>+            </context>
>+            
>+            <context attribute="common" name="inc" lineEndContext="#stay" >
>+                <RegExpr attribute="strong" String="&strongregex;" />
>+                <RegExpr attribute="strikeout" minimal="true" String="&strikeoutregex;"/>
>+            </context>
>+        </contexts>
>+
>+        <itemDatas>
>+            <itemData name="Normal Text" defStyleNum="dsNormal" />
>+            
>+            <itemData name="sectiontitle" defStyleNum="dsKeyword" bold="true" />
>+            <itemData name="sectionheader" defStyleNum="dsFunction" bold="true" />
>+            <itemData name="sectionblockattrs" defStyleNum="dsComment" bold="true"/>
>+            <itemData name="blockattrs" defStyleNum="dsComment" />
>+            <itemData name="textblock"  defStyleNum="dsComment" />
>+            
>+            <itemData name="strong" defStyleNum="dsNormal" bold="true" />
>+            <itemData name="strikeout" defStyleNum="dsNormal" strikeOut="true" />
>+            
>+            <itemData name="itemlist" defStyleNum="dsDataType" />
>+            
>+            <itemData name="macro"  defStyleNum="dsComment" bold="true"/>
>+            <itemData name="comment"  defStyleNum="dsComment" />
>+            
>+            <itemData name="image"  defStyleNum="dsFloat" />
>+            <itemData name="imagefilename"  defStyleNum="dsKeyword" />
>+            <itemData name="htmllink" defStyleNum="dsDataType" />
>+        </itemDatas>
>+
>+    </highlighting>
>+
>+    <general>
>+        <comments>
>+            <comment name="multiLine" start="&lt;!--" end="--&gt;" />
>+        </comments>
>+    </general>
>+
>+</language>
>\ No newline at end of file
>diff -urN tdelibs/kate/data/tibasic.xml tdelibs.new/kate/data/tibasic.xml
>--- tdelibs/kate/data/tibasic.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/tibasic.xml	2013-12-26 13:26:41.649324459 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="TI Basic" version="1.01" kateversion="2.3" section="Scientific" extensions="">
>+<language name="TI Basic" version="1.01" kateversion="2.5" section="Scientific" extensions="">
>   <highlighting>
>     <list name="keywords">
>       <item>If </item>
>diff -urN tdelibs/kate/data/txt2tags.xml tdelibs.new/kate/data/txt2tags.xml
>--- tdelibs/kate/data/txt2tags.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/txt2tags.xml	2013-12-26 13:26:40.522329268 -0600
>@@ -3,7 +3,7 @@
> 
> 
> 
>-<language name="txt2tags" extensions="*.t2t" section="Markup" mimetype="text/txt2tags" version="1.20" kateversion="2.4" casesensitive="1">
>+<language name="txt2tags" extensions="*.t2t" section="Markup" mimetype="text/txt2tags" version="1.20" kateversion="2.5" casesensitive="1">
> <highlighting>
> 
> <contexts>
>diff -urN tdelibs/kate/data/uscript.xml tdelibs.new/kate/data/uscript.xml
>--- tdelibs/kate/data/uscript.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/uscript.xml	2013-12-26 13:26:40.848327878 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="UnrealScript" version="0.92" kateversion="2.3" section="Scripts" extensions="*.uc" mimetype="text/x-uscript">
>+<language name="UnrealScript" version="0.92" kateversion="2.5" section="Scripts" extensions="*.uc" mimetype="text/x-uscript">
> 	<highlighting>
> 		<list name="keywords">
> 			<item> break </item>
>diff -urN tdelibs/kate/data/valgrind-suppression.xml tdelibs.new/kate/data/valgrind-suppression.xml
>--- tdelibs/kate/data/valgrind-suppression.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/valgrind-suppression.xml	2013-12-26 13:26:40.548329157 -0600
>@@ -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.0" author="Milian Wolff (mail@milianw.de)" license="LGPL">
>+<language name="Valgrind Suppression" section="Other" extensions="*.supp;" mimetype="" version="1.0" kateversion="2.5" author="Milian Wolff (mail@milianw.de)" license="LGPL">
> <highlighting>
> <contexts>
>   <context name="File" attribute="Normal Text" lineEndContext="#stay">
>diff -urN tdelibs/kate/data/varnish.xml tdelibs.new/kate/data/varnish.xml
>--- tdelibs/kate/data/varnish.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/varnish.xml	2013-12-26 13:26:42.054322730 -0600
>@@ -0,0 +1,349 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd">
>+<language name="Varnish Configuration Language" version="0.3" kateversion="2.5" section="Configuration" extensions="*.vcl;" mimetype="" author="Xavier Guerrin (xavier@tuxfamily.org)" license="WTFPL">
>+  <highlighting>
>+    <list name="vclStandardSubs">
>+      <item>vcl_recv</item>
>+      <item>vcl_pipe</item>
>+      <item>vcl_pass</item>
>+      <item>vcl_hash</item>
>+      <item>vcl_hit</item>
>+      <item>vcl_miss</item>
>+      <item>vcl_fetch</item>
>+      <item>vcl_deliver</item>
>+      <item>vcl_init</item>
>+      <item>vcl_fini</item>
>+      <item>vcl_error</item>
>+    </list>
>+    <list name="vclConditionalKeywords">
>+      <item> if </item>
>+      <item> else </item>
>+      <item> elsif </item>
>+      <item> elseif </item>
>+    </list>
>+    <list name="vclKeywords">
>+      <item> set </item>
>+      <item> call </item>
>+      <item> error </item>
>+      <item> esi </item>
>+      <item> include </item>
>+      <item> remove </item>
>+      <item> unset </item>
>+      <item> panic </item>
>+      <item> rollback </item>
>+      <item> purge </item>
>+      <item> synthetic </item>
>+    </list>
>+    <list name="vclStandardFunctions">
>+      <item> hash_data </item>
>+      <item> regsub </item>
>+      <item> regsuball </item>
>+      <item> ban </item>
>+      <item> ban_url </item>
>+    </list>
>+    <list name="vclModes">
>+      <item>deliver</item>
>+      <item>error</item>
>+      <item>fetch</item>
>+      <item>hash</item>
>+      <item>hit_for_pass</item>
>+      <item>lookup</item>
>+      <item>ok</item>
>+      <item>pass</item>
>+      <item>pipe</item>
>+      <item>restart</item>
>+    </list>
>+    <list name="vclDirectorTypes">
>+      <item>random</item>
>+      <item>client</item>
>+      <item>hash</item>
>+      <item>round-robin</item>
>+      <item>dns</item>
>+      <item>fallback</item>
>+    </list>
>+    
>+    <list name="knownVMods">
>+      <item>std</item>
>+      <item>example</item>
>+      <item>abtest</item>
>+      <item>threescale</item>
>+      <item>authentication</item>
>+      <item>boltsort</item>
>+      <item>crashhandler</item>
>+      <item>curl</item>
>+      <item>digest</item>
>+      <item>dns</item>
>+      <item>header</item>
>+      <item>memcached</item>
>+      <item>null</item>
>+      <item>querystring</item>
>+      <item>shield</item>
>+      <item>softpurge</item>
>+      <item>statsd</item>
>+      <item>throttle</item>
>+      <item>timeutils</item>
>+      <item>urlcode</item>
>+      <item>var</item>
>+      <item>timers</item>
>+    </list>
>+    <contexts>
>+      <context name="normal_text" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="comments" />
>+        <RegExpr attribute="Keyword" context="sub_declaration"      String="^\s*sub\s+" />
>+        <RegExpr attribute="Keyword" context="probe_declaration"    String="^\s*probe\s+" />
>+        <RegExpr attribute="Keyword" context="backend_declaration"  String="^\s*backend\s+" />
>+        <RegExpr attribute="Keyword" context="director_declaration" String="^\s*director\s+" />
>+        <RegExpr attribute="Keyword" context="acl_declaration"      String="^\s*acl\s+" />
>+        <RegExpr attribute="Keyword" context="import_declaration"   String="^\s*import\s+" />
>+        <RegExpr attribute="Keyword" context="include_declaration"  String="^\s*include\s+" />
>+        <IncludeRules context="embedded-c" />
>+      </context>
>+      <context name="embedded-c" attribute="Normal Text" lineEndContext="#stay">
>+        <Detect2Chars char="C" char1="{" context="embedded-c_enclosure" attribute="Region Marker" beginRegion="embedded_c_block" />
>+      </context>
>+      <context name="embedded-c_enclosure" attribute="Normal Text" lineEndContext="#stay">
>+        <Detect2Chars char="}" char1="C" context="#pop" attribute="Region Marker" endRegion="embedded_c_block" />
>+        <IncludeRules context="##C" />
>+      </context>
>+      <context name="shell-like-comment" attribute="Comment" lineEndContext="#pop">
>+      </context>
>+      <context name="c-like-comment" attribute="Comment" lineEndContext="#stay">
>+        <Detect2Chars char="*" char1="/" context="#pop" attribute="Comment" />
>+      </context>
>+      <context name="cplusplus-like-comment" attribute="Comment" lineEndContext="#pop">
>+      </context>
>+      <context name="comments" attribute="Comment" lineEndContext="#pop">
>+        <DetectChar   char="#"           context="shell-like-comment"       attribute="Comment" />
>+        <Detect2Chars char="/" char1="*" context="c-like-comment"           attribute="Comment" />
>+        <Detect2Chars char="/" char1="/" context="cplusplus-like-comment"   attribute="Comment" />
>+      </context>
>+      <context name="vcl_variables" attribute="Normal Text" lineEndContext="#stay">
>+        <RegExpr attribute="Variable"       context="#stay" String="now" />
>+        <RegExpr attribute="Storage"        context="#stay" String="storage\.[a-zA-Z0-9]+(?:\.(?:free_space|used_space|happy))?" />
>+        <RegExpr attribute="TCP Property"   context="#stay" String="client\.(ip|identity)" />
>+        <RegExpr attribute="TCP Property"   context="#stay" String="server\.(ip|hostname|identity|port)" />
>+        <RegExpr attribute="HTTP Property"  context="#stay" String="req\.(request|url|proto|backend|restarts|esi_level|ttl|grace|keep|xid|esi|can_gzip|backend\.healthy|hash_ignore_busy|hash_always_miss)" />
>+        <RegExpr attribute="HTTP Property"  context="#stay" String="bereq\.(request|url|proto|connect_timeout|first_byte_timeout|between_bytes_timeout)" />
>+        <RegExpr attribute="HTTP Property"  context="#stay" String="obj\.(proto|status|response|hits|ttl|grace|keep|lastuse)" />
>+        <RegExpr attribute="HTTP Property"  context="#stay" String="beresp\.(proto|saintmode|status|response|do_esi|do_stream|do_gzip|do_gunzip|ttl|grace|keep|backend\.(name|ip|port)|storage|cacheable)" />
>+        <RegExpr attribute="HTTP Property"  context="#stay" String="resp\.(proto|status|response)" />
>+        <RegExpr attribute="HTTP X- Header" context="#stay" String="(req|bereq|resp|beresp|obj)\.http\.X-[-_A-Za-z0-9]*" />
>+        <RegExpr attribute="HTTP Header"    context="#stay" String="(req|bereq|resp|beresp|obj)\.http\.[A-Za-z][-_A-Za-z0-9]*" />
>+      </context>
>+      <context name="vcl_operators" attribute="Operator" lineEndContext="#stay">
>+        <DetectChar   attribute="Logical Operator" context="#stay" char="!" />
>+        <Detect2Chars attribute="Logical Operator" context="#stay" char="&amp;" char1="&amp;" />
>+        <Detect2Chars attribute="Logical Operator" context="#stay" char="|" char1="|" />
>+
>+        <Detect2Chars attribute="Comparison Operator" context="#stay" char="=" char1="=" />
>+        <Detect2Chars attribute="Comparison Operator" context="#stay" char="!" char1="=" />
>+        <Detect2Chars attribute="Comparison Operator" context="#stay" char="&lt;" char1="=" />
>+        <Detect2Chars attribute="Comparison Operator" context="#stay" char="&gt;" char1="=" />
>+        <DetectChar   attribute="Comparison Operator" context="#stay" char="&lt;" />
>+        <DetectChar   attribute="Comparison Operator" context="#stay" char="&gt;" />
>+        <DetectChar   attribute="Comparison Operator" context="#stay" char="~" />
>+        <Detect2Chars attribute="Comparison Operator" context="#stay" char="!" char1="~" />
>+
>+        <DetectChar   attribute="Arithmetic Operator" context="#stay" char="+" />
>+        <DetectChar   attribute="Arithmetic Operator" context="#stay" char="-" />
>+        <DetectChar   attribute="Arithmetic Operator" context="#stay" char="*" />
>+        <DetectChar   attribute="Arithmetic Operator" context="#stay" char="/" />
>+
>+        <Detect2Chars attribute="Arithmetic Operator" context="#stay" char="+" char1="=" />
>+        <Detect2Chars attribute="Arithmetic Operator" context="#stay" char="-" char1="=" />
>+        <Detect2Chars attribute="Arithmetic Operator" context="#stay" char="*" char1="=" />
>+        <Detect2Chars attribute="Arithmetic Operator" context="#stay" char="/" char1="=" />
>+
>+        <Detect2Chars attribute="Arithmetic Operator" context="#stay" char="+" char1="+" />
>+        <Detect2Chars attribute="Arithmetic Operator" context="#stay" char="-" char1="-" />
>+
>+        <Detect2Chars attribute="Arithmetic Operator" context="#stay" char="&gt;" char1="&gt;" />
>+        <Detect2Chars attribute="Arithmetic Operator" context="#stay" char="&lt;" char1="&lt;" />
>+
>+        <DetectChar   attribute="Operator" context="#stay" char="=" />
>+      </context>
>+      <context name="minimal_code" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="comments" />
>+        <RegExpr attribute="Duration" context="#stay" String="([0-9]+|[0-9]+\.[0-9]+|[0-9]+\.|\.[0-9]+)\s*(w|d|h|m|s|ms)" />
>+        <RegExpr attribute="Data Size" context="#stay" String="([0-9]+|[0-9]+\.[0-9]+|[0-9]+\.|\.[0-9]+)\s*[KMGT]?B" />
>+        <Float attribute="Float" context="#stay" />
>+        <Int attribute="Decimal" context="#stay" />
>+        <StringDetect attribute="Keyword" context="#stay" String="true" />
>+        <StringDetect attribute="Keyword" context="#stay" String="false" />
>+        <DetectChar char="&quot;" context="string" attribute="String" />
>+        <Detect2Chars attribute="String" char="{" char1="&quot;" context="string_enclosure" beginRegion="string_enclosure_block" />
>+      </context>
>+      <context name="definition_code" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="minimal_code" />
>+        <DetectChar attribute="Operator" context="#stay" char="=" />
>+      </context>
>+      <context name="basic_code" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="minimal_code" />
>+        <IncludeRules context="vcl_variables" />
>+        <IncludeRules context="vcl_operators" />
>+      </context>
>+      <context name="regular_code" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="basic_code" />
>+        <keyword attribute="Keyword" context="#stay" String="vclKeywords" />
>+        <keyword attribute="Standard VCL Sub" context="#stay" String="vclStandardSubs" />
>+        <keyword attribute="Standard VCL Function" context="#stay" String="vclStandardFunctions" />
>+        <keyword attribute="Condition Keyword" context="condition_part" String="vclConditionalKeywords" />
>+        <StringDetect attribute="Keyword" context="return_statement" String="return" />
>+        <IncludeRules context="embedded-c" />
>+      </context>
>+      <context name="return_statement" attribute="Normal Text" lineEndContext="#stay">
>+        <keyword attribute="Action Keyword" context="#stay" String="vclModes" />
>+        <DetectChar attribute="Normal Text" char=";" context="#pop" />
>+      </context>
>+      <context name="string_enclosure" attribute="String" lineEndContext="#stay">
>+        <Detect2Chars attribute="String" char="&quot;" char1="}" context="#pop" endRegion="string_enclosure_block" />
>+      </context>
>+      <context name="sub_declaration" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectSpaces />
>+        <keyword attribute="Standard VCL Sub" context="#stay" String="vclStandardSubs" />
>+        <DetectChar attribute="Region Marker" context="sub_definition" char="{" beginRegion="sub_block" />
>+      </context>
>+      <context name="sub_definition" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="regular_code" />
>+        <DetectChar attribute="Region Marker" context="#pop#pop" char="}" endRegion="sub_block" />
>+      </context>
>+      <context name="condition_part" attribute="Normal Text" lineEndContext="#stay">
>+        <keyword attribute="Condition Keyword" context="#stay" String="vclConditionalKeywords" />
>+        <DetectChar attribute="Region Marker" context="conditional_expression" char="(" beginRegion="conditional_expression_block" />
>+        <DetectChar attribute="Region Marker" context="conditional_block" char="{" beginRegion="conditional_blockregion" />
>+      </context>
>+      <context name="conditional_expression" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="basic_code" />
>+        <DetectChar attribute="Region Marker" context="conditional_expression" char="(" beginRegion="conditional_expression_block" />
>+        <DetectChar attribute="Region Marker" context="#pop" char=")" endRegion="conditional_expression_block" />
>+      </context>
>+      <context name="conditional_block" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="regular_code" />
>+        <DetectChar attribute="Region Marker" context="#pop#pop" char="}" endRegion="conditional_blockregion" />
>+      </context>
>+      <context name="string" attribute="String" lineEndContext="#pop">
>+        <DetectChar attribute="String" context="#pop" char="&quot;" />
>+      </context>
>+      <context name="probe_declaration" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectSpaces />
>+        <DetectChar   attribute="Operator" context="#stay" char="=" />
>+        <DetectChar attribute="Region Marker" context="probe_definition" char="{" beginRegion="probe_block" />
>+        <DetectChar attribute="Normal Text" context="#pop" char=";" />
>+      </context>
>+      <context name="probe_definition" attribute="Normal Text" lineEndContext="#stay">
>+        <RegExpr attribute="Probe Property" context="#stay" String="\.(url|request|window|threshold|initial|expected_response|interval|timeout)" />
>+        <IncludeRules context="definition_code" />
>+        <DetectChar attribute="Region Marker" context="#pop#pop" char="}" endRegion="probe_block" />
>+      </context>
>+      <context name="backend_declaration" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectSpaces />
>+        <DetectChar attribute="Operator" context="#stay" char="=" />
>+        <DetectChar attribute="Region Marker" context="backend_definition" char="{" beginRegion="backend_block" />
>+        <DetectChar attribute="Normal Text" context="#pop" char=";" />
>+      </context>
>+      <context name="backend_definition" attribute="Normal Text" lineEndContext="#stay">
>+        <RegExpr attribute="Backend Property" context="#stay" String="\.(host|port|host_header|connect_timeout|first_byte_timeout|between_bytes_timeout|max_connections|saintmode_threshold)" />
>+        <IncludeRules context="definition_code" />
>+        <StringDetect attribute="Backend Property" context="probe_declaration" String=".probe" />
>+        <DetectChar attribute="Region Marker" context="#pop#pop" char="}" endRegion="backend_block" />
>+      </context>
>+      <context name="director_declaration" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectSpaces />
>+        <keyword      attribute="Director Type" String="vclDirectorTypes" />
>+        <StringDetect attribute="Director Type" String="round-robin" />
>+        <DetectChar attribute="Region Marker" context="director_definition" char="{" beginRegion="director_block" />
>+      </context>
>+      <context name="director_definition" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="definition_code" />
>+        <RegExpr attribute="Director Property" context="#stay" String="\.(retries|ttl|suffix)" />
>+        <StringDetect attribute="Director Property" context="backend_declaration" String=".list" />
>+        <DetectChar attribute="Region Marker" context="director_backend" char="{" beginRegion="director_backend_block" />
>+        <DetectChar attribute="Region Marker" context="#pop#pop" char="}" endRegion="backend_block" />
>+      </context>
>+      <context name="director_backend" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="definition_code" />
>+        <RegExpr attribute="Director Property" context="#stay" String="\.(weight|suffix)" />
>+        <StringDetect attribute="Director Property" context="backend_declaration" String=".backend" />
>+        <DetectChar attribute="Region Marker" context="#pop" char="}" endRegion="director_backend_block" />
>+      </context>
>+      <context name="acl_declaration" attribute="Normal Text" lineEndContext="#stay"> 
>+        <DetectChar attribute="Region Marker" context="acl_definition" char="{" beginRegion="acl_block" />
>+      </context>
>+      <context name="acl_definition" attribute="Normal Text" lineEndContext="#stay"> 
>+        <IncludeRules context="minimal_code" />
>+        <DetectChar attribute="Logical Operator" context="#stay" char="!" />
>+        <DetectChar attribute="Logical Operator" context="#stay" char="/" />
>+        <DetectChar attribute="Region Marker" context="#pop#pop" char="}" endRegion="acl_block" />
>+      </context>
>+      <context name="import_declaration" attribute="Normal Text" lineEndContext="#stay">
>+        <keyword attribute="Well-known VMod" context="import_identified" String="knownVMods" />
>+        <DetectIdentifier attribute="VMod Identifier" context="import_identified" />
>+      </context>
>+      <context name="import_identified" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectChar attribute="Normal Text" context="#pop#pop" char=";" />
>+        <StringDetect attribute="Keyword" context="import_from" String="from" />
>+      </context>
>+      <context name="import_from" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectChar char="&quot;" context="import_from_path" attribute="String" />
>+      </context>
>+      <context name="import_from_path" attribute="String" lineEndContext="#stay">
>+        <DetectChar char="&quot;" context="import_from_path_complete" attribute="String" />
>+      </context>
>+      <context name="import_from_path_complete" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectChar attribute="Normal Text" context="#pop#pop#pop#pop#pop" char=";" />
>+      </context>
>+      <context name="include_declaration" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectChar char="&quot;" context="include_path" attribute="String" />
>+      </context>
>+      <context name="include_path" attribute="String" lineEndContext="#stay">
>+        <DetectChar char="&quot;" context="include_path_complete" attribute="String" />
>+      </context>
>+      <context name="include_path_complete" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectChar attribute="Normal Text" context="#pop#pop#pop" char=";" />
>+      </context>
>+    </contexts>
>+    <itemDatas>
>+      <itemData name="Normal Text"               defStyleNum="dsNormal" />
>+      <itemData name="Comment"                   defStyleNum="dsComment" />
>+      <itemData name="Keyword"                   defStyleNum="dsKeyword" />
>+      <itemData name="Condition Keyword"         defStyleNum="dsKeyword" />
>+      <itemData name="Action Keyword"            defStyleNum="dsKeyword" />
>+      <itemData name="Director Type"             defStyleNum="dsDataType" />
>+      <itemData name="Standard VCL Function"     defStyleNum="dsFunction" />
>+      <itemData name="Standard VCL Sub"          defStyleNum="dsFunction" bold="1" />
>+      <itemData name="Operator"                  defStyleNum="dsKeyword" color="#008000" bold="0" />
>+      <itemData name="Comparison Operator"       defStyleNum="dsKeyword" color="#008000" bold="0" />
>+      <itemData name="Arithmetic Operator"       defStyleNum="dsKeyword" color="#008000" bold="0" />
>+      <itemData name="Logical Operator"          defStyleNum="dsKeyword" color="#008000" bold="0" />
>+      <itemData name="String"                    defStyleNum="dsString" bold="0" italic="0" />
>+      <itemData name="Data Type"                 defStyleNum="dsDataType" />
>+      <itemData name="Region Marker"             defStyleNum="dsNormal" />
>+      <itemData name="Probe Property"            defStyleNum="dsDataType" color="#0000FF" selColor="#0000FF" bold="1" italic="0" />
>+      <itemData name="Backend Property"          defStyleNum="dsDataType" color="#0000FF" selColor="#0000FF" bold="1" italic="0" />
>+      <itemData name="Director Property"         defStyleNum="dsDataType" color="#0000FF" selColor="#0000FF" bold="1" italic="0" />
>+      <itemData name="Storage"                   defStyleNum="dsDataType" color="#0000FF" selColor="#0000FF" bold="0" italic="0" />
>+      <itemData name="TCP Property"              defStyleNum="dsDataType" color="#0000FF" selColor="#0000FF" bold="0" italic="1" />
>+      <itemData name="HTTP Property"             defStyleNum="dsDataType" color="#0000FF" selColor="#0000FF" bold="0" italic="0" />
>+      <itemData name="HTTP Header"               defStyleNum="dsDataType" color="#0D62FF" selColor="#0D62FF" bold="0" italic="0" />
>+      <itemData name="HTTP X- Header"            defStyleNum="dsDataType" color="#0D62FF" selColor="#0D62FF" bold="0" italic="1" />
>+      <itemData name="Decimal"                   defStyleNum="dsDecVal" />
>+      <itemData name="Duration"                  defStyleNum="dsDecVal" />
>+      <itemData name="Data Size"                 defStyleNum="dsDecVal" />
>+      <itemData name="Float"                     defStyleNum="dsFloat" spellChecking="false"/>
>+      <itemData name="VMod Identifier"           defStyleNum="dsDataType" color="#0000FF" selColor="#0000FF" />
>+      <itemData name="Well-known VMod"           defStyleNum="dsDataType" color="#0000FF" selColor="#0000FF" bold="1" />
>+    </itemDatas>
>+  </highlighting>
>+  <general>
>+    <comments>
>+      <comment name="singleLine" start="#" />
>+    </comments>
>+    <keywords casesensitive="1" />
>+  </general>
>+</language>
>+
>diff -urN tdelibs/kate/data/varnishtest.xml tdelibs.new/kate/data/varnishtest.xml
>--- tdelibs/kate/data/varnishtest.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/varnishtest.xml	2013-12-26 13:26:41.971323084 -0600
>@@ -0,0 +1,482 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE language SYSTEM "language.dtd">
>+<language name="Varnish Test Case language" version="0.1" kateversion="2.5" section="Configuration" extensions="*.vtc;" mimetype="" author="Xavier Guerrin (xavier@tuxfamily.org)" license="WTFPL">
>+  <highlighting>
>+    <list name="vtcClientKeywords">
>+      <item>fatal</item>
>+      <item>gunzip</item>
>+      <item>rxchunk</item>
>+    </list>
>+    <list name="vtcServerKeywords">
>+      <item>accept</item>
>+      <item>close</item>
>+      <item>expect_close</item>
>+      <item>fatal</item>
>+      <item>rxbody</item>
>+      <item>rxhdrs</item>
>+      <item>rxreq</item>
>+    </list>
>+    <contexts>
>+      
>+      <context name="vtcnormal_text" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="global_directives_restricted" />
>+        <IncludeRules context="global_directives" />
>+      </context>
>+
>+      
>+      <context name="global_directives_restricted" attribute="Normal Text" lineEndContext="#stay">
>+        <StringDetect firstNonSpace="true" attribute="Keyword" context="varnishtest_declaration" String="varnishtest" />
>+        <StringDetect firstNonSpace="true" attribute="Keyword" context="feature_instruction"     String="feature" />
>+        <RegExpr attribute="Keyword" context="#stay"     String="^\s*random\s*$" />
>+      </context>
>+
>+      
>+      <context name="global_directives" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="comments" />
>+        <StringDetect firstNonSpace="true" attribute="Keyword" context="client_declaration"      String="client" />
>+        <StringDetect firstNonSpace="true" attribute="Keyword" context="server_declaration"      String="server" />
>+        <StringDetect firstNonSpace="true" attribute="Keyword" context="varnish_declaration"     String="varnish" />
>+        <StringDetect firstNonSpace="true" attribute="Keyword" context="sema_instruction"        String="sema" />
>+        <StringDetect firstNonSpace="true" attribute="Keyword" context="shell_instruction"       String="shell" />
>+        <StringDetect firstNonSpace="true" attribute="Keyword" context="delay_instruction"       String="delay" />
>+        <StringDetect firstNonSpace="true" attribute="Keyword" context="global_loop_instruction" String="loop" />
>+      </context>
>+
>+      
>+      <context name="strings" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectChar char="&quot;" context="string" attribute="String" />
>+      </context>
>+      <context name="string" attribute="String" lineEndContext="#pop">
>+        <Detect2Chars attribute="String" context="#stay" char="\" char1="&quot;" />
>+        <DetectChar attribute="String" context="#pop" char="&quot;" />
>+      </context>
>+
>+      
>+      <context name="quoted-strings" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectChar char="&quot;" context="quoted-string" attribute="String" />
>+      </context>
>+      <context name="quoted-string" attribute="String" lineEndContext="#pop#pop">
>+        <Detect2Chars attribute="String" context="#stay" char="\" char1="&quot;" />
>+        <DetectChar attribute="String" context="#pop#pop" char="&quot;" />
>+      </context>
>+
>+      <context name="brace-strings" attribute="Normal Text" lineEndContext="#pop">
>+        <DetectChar attribute="String" context="brace-string" char="{" beginRegion="string_block" />
>+      </context>
>+      <context name="brace-string" attribute="String" lineEndContext="#stay">
>+        
>+        <DetectChar attribute="String" context="brace-string-internal" char="{" />
>+        <DetectChar attribute="String" context="#pop#pop" char="}" endRegion="string_block" />
>+      </context>
>+      <context name="brace-string-internal" attribute="String" lineEndContext="#stay">
>+        <DetectChar attribute="String" context="#pop" char="}" />
>+      </context>
>+
>+      <context name="unquoted-strings" attribute="String" lineEndContext="#pop">
>+        <RegExpr attribute="String" context="unquoted-string" String="[^ ]" />
>+      </context>
>+      <context name="unquoted-string" attribute="String" lineEndContext="#pop#pop">
>+        <RegExpr attribute="Normal Text" context="#pop#pop" String="\s" />
>+      </context>
>+
>+      
>+      <context name="string-arg" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="brace-strings" />
>+        <IncludeRules context="quoted-strings" />
>+        <IncludeRules context="unquoted-strings" />
>+      </context>
>+
>+      
>+      <context name="int-arg" attribute="Int" lineEndContext="#pop">
>+        <Int attribute="Decimal" context="#pop" />
>+      </context>
>+
>+      
>+      <context name="shell-like-comment" attribute="Comment" lineEndContext="#pop">
>+        <IncludeRules context="##Alerts" />
>+        <IncludeRules context="##Modelines" />
>+      </context>
>+      <context name="comments" attribute="Comment" lineEndContext="#pop">
>+        <DetectChar   char="#" context="shell-like-comment" attribute="Comment" />
>+      </context>
>+
>+      
>+      <context name="base_elements" attribute="Normal Text" lineEndContext="#stay">
>+        <RegExpr attribute="HTTP announce"        context="#stay" String="HTTP/[0-9.]+" />
>+        <RegExpr attribute="HTTP method"          context="#stay" String="\s+(GET|HEAD|POST|PUT|DELETE|TRACE|OPTIONS|CONNECT|PATCH)" />
>+        <RegExpr attribute="HTTP WebDAV method"   context="#stay" String="\s+(PROPFIND|PROPPATCH|MKCOL|COPY|MOVE|LOCK|UNLOCK|CONNECT|PATCH)" />
>+        <RegExpr attribute="HTTP custom method"   context="#stay" String="\s+(PURGE|PURGESTR)" />
>+        <Float attribute="Float" context="#stay" />
>+        <Int attribute="Decimal" context="#stay" />
>+        <IncludeRules context="strings" />
>+        <IncludeRules context="comments" />
>+      </context>
>+
>+      
>+      <context name="expectation_common" attribute="Normal Text" lineEndContext="#stay">
>+        <RegExpr attribute="Keyword" context="#stay" String="&lt;undef>" />
>+        <IncludeRules context="base_elements" />
>+        <IncludeRules context="vcl_operators" />
>+      </context>
>+
>+      <context name="expectation" attribute="String" lineEndContext="#pop">
>+        <IncludeRules context="expectation_common" />
>+        <IncludeRules context="vcl_variables" />
>+      </context>
>+
>+      <context name="varnish_expectation" attribute="Normal Text" lineEndContext="#pop">
>+        <IncludeRules context="expectation_common" />
>+        <IncludeRules context="varnishstat_variables" />
>+      </context>
>+
>+      
>+      <context name="macro_accepted" attribute="String" lineEndContext="#pop">
>+        <Detect2Chars char="$" char1="{" attribute="String" context="macro_identifier" />
>+      </context>
>+      <context name="macro_identifier" attribute="String" lineEndContext="#pop#pop">
>+        <DetectChar char="}" attribute="String" context="#pop" />
>+      </context>
>+
>+      
>+      <context name="common_options" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="macro_accepted" />
>+        <IncludeRules context="base_elements" />
>+      </context>
>+
>+      <context name="client_options" attribute="Normal Text" lineEndContext="#stay">
>+        <RegExpr attribute="Keyword" context="#stay" String="\-(?:run|wait|start|connect)" />
>+        <RegExpr attribute="Keyword" context="expectation" String="-expect" />
>+        <IncludeRules context="common_options" />
>+      </context>
>+
>+      <context name="server_options" attribute="Normal Text" lineEndContext="#stay" >
>+        <RegExpr attribute="Keyword" context="#stay" String="\-(?:start|wait|stop|repeat)" />
>+        <RegExpr attribute="Keyword" context="expectation" String="-expect" />
>+        <IncludeRules context="common_options" />
>+      </context>
>+
>+      <context name="varnish_options" attribute="Normal Text" lineEndContext="#stay" >
>+        <RegExpr attribute="Keyword" context="#stay" String="\-(?:start|stop|wait|wait-running|wait-stopped)" />
>+        <RegExpr attribute="Keyword" context="string-arg" String="\-(?:arg|cli|cliok|storage) " />
>+        <RegExpr attribute="Keyword" context="clierr_options" String="\-clierr " />
>+        <RegExpr attribute="Keyword" context="varnish_expectation" String="-expect" />
>+        <IncludeRules context="common_options" />
>+      </context>
>+
>+      <context name="clierr_options" attribute="Normal Text" lineEndContext="#pop">
>+        
>+        <Int attribute="Decimal" context="clierr_command" />
>+        <IncludeRules context="comments" />
>+      </context>
>+      <context name="clierr_command" attribute="String" lineEndContext="#pop">
>+        <IncludeRules context="comments" />
>+      </context>
>+
>+      
>+      <context name="txreq_options" attribute="String" lineEndContext="#pop">
>+        <IncludeRules context="comments" />
>+        <RegExpr attribute="TxReq Keyword" context="string-arg" String="\-(?:body|hdr|proto|req|url)" />
>+        <LineContinue attribute="Normal Text" context="#stay" />
>+      </context>
>+
>+      
>+      <context name="rxresp_options" attribute="Normal Text" lineEndContext="#pop">
>+        <StringDetect attribute="RxResp Keyword" String="-no_obj" />
>+        <LineContinue attribute="Normal Text" context="#stay" />
>+      </context>
>+
>+      
>+      <context name="txresp_options" attribute="Normal Text" lineEndContext="#pop">
>+        <IncludeRules context="comments" />
>+        <RegExpr attribute="TxResp Keyword" String="-nolen" />
>+        <RegExpr attribute="TxResp Keyword" context="string-arg" String="\-(?:body|gzipbody|hdr|proto|msg) " />
>+        <RegExpr attribute="TxResp Keyword" context="int-arg" String="\-(?:bodylen|gzip(?:len|residual|level)|status)" />
>+        <LineContinue attribute="Normal Text" context="#stay" />
>+      </context>
>+
>+      
>+      <context name="varnishtest_declaration" attribute="Normal Text" lineEndContext="#pop">
>+        <IncludeRules context="strings" />
>+        <IncludeRules context="comments" />
>+      </context>
>+
>+      
>+      <context name="client_declaration" attribute="Normal Text" lineEndContext="#pop">
>+        <DetectIdentifier attribute="Client Identifier" context="client_identified" />
>+      </context>
>+      <context name="client_identified" attribute="String" lineEndContext="#pop">
>+        <IncludeRules context="client_options" />
>+        <DetectChar attribute="Region Marker" context="client_definition" char="{" beginRegion="client_block" />
>+        <LineContinue attribute="Normal Text" context="#stay" />
>+      </context>
>+      <context name="client_definition" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="comments" />
>+        
>+        <keyword attribute="Action Keyword" context="#stay" String="vtcClientKeywords" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="#stay"                   String="non-fatal" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="expectation"             String="expect" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="txreq_options"           String="txreq" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="rxresp_options"          String="rxresp" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="sema_instruction"        String="sema" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="delay_instruction"       String="delay" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="send_instruction"        String="sendhex" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="send_instruction"        String="send" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="timeout_instruction"     String="timeout" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="client_loop_instruction" String="loop" />
>+        <DetectChar attribute="Region Marker" context="client_postdefinition" char="}" endRegion="client_block" />
>+      </context>
>+      <context name="client_postdefinition" attribute="Normal Text" lineEndContext="#pop#pop#pop#pop">
>+        <IncludeRules context="client_options" />
>+      </context>
>+
>+      
>+      <context name="server_declaration" attribute="Normal Text" lineEndContext="#pop">
>+        <DetectIdentifier attribute="Server Identifier" context="server_identified" />
>+      </context>
>+      <context name="server_identified" attribute="String" lineEndContext="#pop">
>+        <IncludeRules context="server_options" />
>+        <DetectChar attribute="Region Marker" context="server_definition" char="{" beginRegion="server_block" />
>+        <LineContinue attribute="Normal Text" context="#stay" />
>+      </context>
>+      <context name="server_definition" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="comments" />
>+        
>+        <keyword attribute="Action Keyword" context="#stay" String="vtcServerKeywords" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="#stay"                   String="non-fatal" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="expectation"             String="expect" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="txresp_options"          String="txresp" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="sema_instruction"        String="sema" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="delay_instruction"       String="delay" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="chunkedlen_instruction"  String="chunkedlen" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="send_instruction"        String="sendhex" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="send_instruction"        String="send" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="send_instruction"        String="chunked" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="timeout_instruction"     String="timeout" />
>+        <StringDetect firstNonSpace="true" attribute="Action Keyword" context="server_loop_instruction" String="loop" />
>+        <DetectChar attribute="Region Marker" context="server_postdefinition" char="}" endRegion="server_block" />
>+      </context>
>+      <context name="server_postdefinition" attribute="Normal Text" lineEndContext="#pop#pop#pop#pop">
>+        <IncludeRules context="server_options" />
>+      </context>
>+
>+      
>+      <context name="varnish_declaration" attribute="Normal Text" lineEndContext="#pop">
>+        <DetectIdentifier attribute="Varnish Identifier" context="varnish_identified" />
>+      </context>
>+      <context name="varnish_identified" attribute="Normal Text" lineEndContext="#pop">
>+        <IncludeRules context="varnish_options" />
>+        <RegExpr attribute="Keyword" context="varnish_vclannounced" String="\s*\-(?:bad)?vcl(?:\+backend)?" />
>+        <LineContinue attribute="Normal Text" context="#stay" />
>+      </context>
>+      <context name="varnish_vclannounced" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectChar attribute="Region Marker" context="varnish_vcldefinition" char="{" beginRegion="varnish_block" />
>+      </context>
>+      <context name="varnish_vcldefinition" attribute="Normal Text" lineEndContext="#stay">
>+        <IncludeRules context="##Varnish Configuration Language" />
>+        
>+        
>+        
>+        <DetectChar attribute="Region Marker" context="varnish_postvcldefinition" char="}" endRegion="varnish_block" />
>+      </context>
>+      <context name="varnish_postvcldefinition" attribute="Normal Text" lineEndContext="#pop#pop#pop#pop#pop">
>+        <IncludeRules context="varnish_options" />
>+      </context>
>+
>+      
>+      <context name="sema_instruction" attribute="Normal Text" lineEndContext="#pop">
>+        <DetectIdentifier attribute="Sema Identifier" context="sema_identified" />
>+      </context>
>+      <context name="sema_identified" attribute="Normal Text" lineEndContext="#pop#pop">
>+        <RegExpr attribute="Keyword" String="sync" />
>+        <Int attribute="Decimal" context="#stay" />
>+        <IncludeRules context="comments" />
>+      </context>
>+
>+      
>+      <context name="delay_instruction" attribute="Normal Text" lineEndContext="#pop">
>+        <Int attribute="Decimal" context="#stay" />
>+        <Float attribute="Float" context="#stay" />
>+        <IncludeRules context="comments" />
>+      </context>
>+
>+      
>+      <context name="feature_instruction" attribute="String" lineEndContext="#pop">
>+        <IncludeRules context="strings" />
>+        <IncludeRules context="comments" />
>+      </context>
>+
>+      
>+      <context name="chunkedlen_instruction" attribute="Normal Text" lineEndContext="#pop">
>+        <Int attribute="Decimal" context="#stay" />
>+        <IncludeRules context="comments" />
>+      </context>
>+
>+      
>+      <context name="send_instruction" attribute="Normal Text" lineEndContext="#pop">
>+        <IncludeRules context="string-arg" />
>+        <IncludeRules context="comments" />
>+      </context>
>+
>+      
>+      <context name="timeout_instruction" attribute="Normal Text" lineEndContext="#pop">
>+        <IncludeRules context="int-arg" />
>+        <IncludeRules context="comments" />
>+      </context>
>+
>+      
>+      <context name="global_loop_instruction" attribute="Normal Text" lineEndContext="#stay">
>+        <Int attribute="Decimal" context="global_loop_defined" />
>+      </context>
>+      <context name="global_loop_defined" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectChar attribute="Region Marker" context="global_loop_code" char="{" beginRegion="loop_block" />
>+      </context>
>+      <context name="global_loop_code" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectChar attribute="Region Marker" context="#pop#pop#pop" char="}" endRegion="loop_block" />
>+        <IncludeRules context="global_directives" />
>+      </context>
>+
>+      
>+      <context name="client_loop_instruction" attribute="Normal Text" lineEndContext="#stay">
>+        <Int attribute="Decimal" context="client_loop_defined" />
>+      </context>
>+      <context name="client_loop_defined" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectChar attribute="Region Marker" context="client_loop_code" char="{" beginRegion="loop_block" />
>+      </context>
>+      <context name="client_loop_code" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectChar attribute="Region Marker" context="#pop#pop#pop" char="}" endRegion="loop_block" />
>+        <IncludeRules context="client_definition" />
>+      </context>
>+
>+      
>+      <context name="server_loop_instruction" attribute="Normal Text" lineEndContext="#stay">
>+        <Int attribute="Decimal" context="server_loop_defined" />
>+      </context>
>+      <context name="server_loop_defined" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectChar attribute="Region Marker" context="server_loop_code" char="{" beginRegion="loop_block" />
>+      </context>
>+      <context name="server_loop_code" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectChar attribute="Region Marker" context="#pop#pop#pop" char="}" endRegion="loop_block" />
>+        <IncludeRules context="server_definition" />
>+      </context>
>+
>+      
>+      <context name="shell_instruction" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectChar attribute="Region Marker" context="shell_code" char="{" beginRegion="shell_block" />
>+        <IncludeRules context="quoted-strings" />
>+        <IncludeRules context="comments" />
>+      </context>
>+      <context name="shell_code" attribute="Normal Text" lineEndContext="#stay">
>+        <DetectChar attribute="Region Marker" context="#pop#pop" char="}" endRegion="shell_block" />
>+        
>+        <IncludeRules context="##Bash" />
>+      </context>
>+
>+      
>+      <context name="vcl_variables" attribute="Normal Text" lineEndContext="#stay">
>+        <RegExpr attribute="Variable"       context="#stay" String="now" />
>+        <RegExpr attribute="Storage"        context="#stay" String="storage\.[a-zA-Z0-9]+(?:\.(?:free_space|used_space|happy))?" />
>+        <RegExpr attribute="TCP Property"   context="#stay" String="client\.(ip|identity)" />
>+        <RegExpr attribute="TCP Property"   context="#stay" String="server\.(ip|hostname|identity|port)" />
>+        <RegExpr attribute="HTTP Property"  context="#stay" String="req\.(request|url|proto|backend|restarts|esi_level|ttl|grace|keep|xid|esi|can_gzip|backend\.healthy|hash_ignore_busy|hash_always_miss)" />
>+        <RegExpr attribute="HTTP Property"  context="#stay" String="bereq\.(request|url|proto|connect_timeout|first_byte_timeout|between_bytes_timeout)" />
>+        <RegExpr attribute="HTTP Property"  context="#stay" String="obj\.(proto|status|response|hits|ttl|grace|keep|lastuse)" />
>+        <RegExpr attribute="HTTP Property"  context="#stay" String="beresp\.(proto|saintmode|status|response|do_esi|do_stream|do_gzip|do_gunzip|ttl|grace|keep|backend\.(name|ip|port)|storage|cacheable)" />
>+        <RegExpr attribute="HTTP Property"  context="#stay" String="resp\.(proto|status|response)" />
>+        <RegExpr attribute="HTTP X- Header" context="#stay" String="(req|bereq|resp|beresp|obj)\.http\.X-[-_A-Za-z0-9]*" />
>+        <RegExpr attribute="HTTP Header"    context="#stay" String="(req|bereq|resp|beresp|obj)\.http\.[A-Za-z][-_A-Za-z0-9]*" />
>+      </context>
>+      <context name="vcl_operators" attribute="Operator" lineEndContext="#stay">
>+        <DetectChar   attribute="Logical Operator" context="#stay" char="!" />
>+        <Detect2Chars attribute="Logical Operator" context="#stay" char="&amp;" char1="&amp;" />
>+        <Detect2Chars attribute="Logical Operator" context="#stay" char="|" char1="|" />
>+
>+        <Detect2Chars attribute="Comparison Operator" context="#stay" char="=" char1="=" />
>+        <Detect2Chars attribute="Comparison Operator" context="#stay" char="!" char1="=" />
>+        <Detect2Chars attribute="Comparison Operator" context="#stay" char="&lt;" char1="=" />
>+        <Detect2Chars attribute="Comparison Operator" context="#stay" char="&gt;" char1="=" />
>+        <DetectChar   attribute="Comparison Operator" context="#stay" char="&lt;" />
>+        <DetectChar   attribute="Comparison Operator" context="#stay" char="&gt;" />
>+        <DetectChar   attribute="Comparison Operator" context="#stay" char="~" />
>+        <Detect2Chars attribute="Comparison Operator" context="#stay" char="!" char1="~" />
>+
>+        <DetectChar   attribute="Arithmetic Operator" context="#stay" char="+" />
>+        <DetectChar   attribute="Arithmetic Operator" context="#stay" char="-" />
>+        <DetectChar   attribute="Arithmetic Operator" context="#stay" char="*" />
>+        <DetectChar   attribute="Arithmetic Operator" context="#stay" char="/" />
>+
>+        <Detect2Chars attribute="Arithmetic Operator" context="#stay" char="+" char1="=" />
>+        <Detect2Chars attribute="Arithmetic Operator" context="#stay" char="-" char1="=" />
>+        <Detect2Chars attribute="Arithmetic Operator" context="#stay" char="*" char1="=" />
>+        <Detect2Chars attribute="Arithmetic Operator" context="#stay" char="/" char1="=" />
>+
>+        <Detect2Chars attribute="Arithmetic Operator" context="#stay" char="+" char1="+" />
>+        <Detect2Chars attribute="Arithmetic Operator" context="#stay" char="-" char1="-" />
>+
>+        <Detect2Chars attribute="Arithmetic Operator" context="#stay" char="&gt;" char1="&gt;" />
>+        <Detect2Chars attribute="Arithmetic Operator" context="#stay" char="&lt;" char1="&lt;" />
>+
>+        <DetectChar   attribute="Operator" context="#stay" char="=" />
>+      </context>
>+      <context name="varnishstat_variables" attribute="Normal Text" lineEndContext="#stay">
>+        <RegExpr attribute="VarnishStat metric"    context="#stay" String="client_(?:conn|drop|req|drop_late)" />
>+        <RegExpr attribute="VarnishStat metric"    context="#stay" String="cache_(?:hit(pass)?|miss)" />
>+        <RegExpr attribute="VarnishStat metric"    context="#stay" String="backend_(?:conn|unhealthy|busy|fail|reuse|toolate|recycle|retry|req)" />
>+        <RegExpr attribute="VarnishStat metric"    context="#stay" String="fetch_(?:head|length|chunked|eof|bad|close|oldhttp|zero|failed|1xx|204|304)" />
>+        <RegExpr attribute="VarnishStat metric"    context="#stay" String="n_(?:sess_mem|sess|object|vampireobject|objectcore|objecthead|waitinglist|vbc|wrk|wrk_(?:create|failed|max|lqueue|queueddrop)|backend|expired|lru_nuked|lru_moved|obj(?:sendfile|write|overflow)|vcl|vcl_avail|vcl_discard|ban|ban_(?:gone|add|retire|obj_test|re_test|dups)|gzip|gunzip)" />
>+        <RegExpr attribute="VarnishStat metric"    context="#stay" String="(?:losthdr|backend_req|accept_fail|uptime|vmods)" />
>+        <RegExpr attribute="VarnishStat metric"    context="#stay" String="s_(?:sess|req|pipe|pass|fetch|hdrbytes|bodybytes)" />
>+        <RegExpr attribute="VarnishStat metric"    context="#stay" String="sess_(?:closed|pipeline|readahead|linger|herd)" />
>+        <RegExpr attribute="VarnishStat metric"    context="#stay" String="shm_(?:records|writes|flushes|cont|cycles)" />
>+        <RegExpr attribute="VarnishStat metric"    context="#stay" String="sms_(?:nreq|nobj|nbytes|balloc|bfree)" />
>+        <RegExpr attribute="VarnishStat metric"    context="#stay" String="hcb_(?:nolock|lock|insert)" />
>+        <RegExpr attribute="VarnishStat metric"    context="#stay" String="esi_(?:errors|warnings)" />
>+        <RegExpr attribute="VarnishStat metric"    context="#stay" String="dir_dns_(?:lookups|failed|hit|cache_full)" />
>+        <RegExpr attribute="VarnishStat metric"    context="#stay" String="LCK\.(?:sm[spaf]|hsl|hcb|hcl|vcl|stat|sessmem|wstat|herder|wq|objhdr|exp|lru|cli|ban|vbp|vbe|backend)\.(?:creat|destroy|locks|colls)" />
>+        <RegExpr attribute="VarnishStat metric"    context="#stay" String="SMA\.[a-zA-Z0-9_-]+\.(?:c_(?:req|fail|bytes|freed)|g_(?:alloc|bytes|space))" />
>+        <RegExpr attribute="VarnishStat metric"    context="#stay" String="VBE\..+\.(?:happy|vcls)" />
>+      </context>
>+    </contexts>
>+    <itemDatas>
>+      <itemData name="Normal Text"               defStyleNum="dsNormal" />
>+      <itemData name="Comment"                   defStyleNum="dsComment" />
>+      <itemData name="Keyword"                   defStyleNum="dsKeyword" />
>+      <itemData name="TxReq Keyword"             defStyleNum="dsKeyword" color="#008000" bold="0" />
>+      <itemData name="TxResp Keyword"            defStyleNum="dsKeyword" color="#008000" bold="0" />
>+      <itemData name="RxResp Keyword"            defStyleNum="dsKeyword" color="#008000" bold="0" />
>+      <itemData name="Action Keyword"            defStyleNum="dsKeyword" />
>+      <itemData name="Operator"                  defStyleNum="dsKeyword" color="#008000" bold="0" />
>+      <itemData name="Comparison Operator"       defStyleNum="dsKeyword" color="#008000" bold="0" />
>+      <itemData name="Arithmetic Operator"       defStyleNum="dsKeyword" color="#008000" bold="0" />
>+      <itemData name="Logical Operator"          defStyleNum="dsKeyword" color="#008000" bold="0" />
>+      <itemData name="String"                    defStyleNum="dsString" bold="0" italic="0" />
>+      <itemData name="Region Marker"             defStyleNum="dsNormal" />
>+      <itemData name="Storage"                   defStyleNum="dsDataType" color="#0000FF" selColor="#0000FF" bold="0" italic="0" />
>+      <itemData name="TCP Property"              defStyleNum="dsDataType" color="#0000FF" selColor="#0000FF" bold="0" italic="1" />
>+      <itemData name="HTTP Property"             defStyleNum="dsDataType" color="#0000FF" selColor="#0000FF" bold="0" italic="0" />
>+      <itemData name="HTTP Header"               defStyleNum="dsDataType" color="#0D62FF" selColor="#0D62FF" bold="0" italic="0" />
>+      <itemData name="HTTP X- Header"            defStyleNum="dsDataType" color="#0D62FF" selColor="#0D62FF" bold="0" italic="1" />
>+      <itemData name="HTTP announce"             defStyleNum="dsDataType" color="#562579" selColor="#562579" bold="1" />
>+      <itemData name="HTTP method"               defStyleNum="dsDataType" color="#562579" selColor="#562579" bold="1" />
>+      <itemData name="HTTP WebDAV method"        defStyleNum="dsDataType" color="#562579" selColor="#562579" bold="1" />
>+      <itemData name="HTTP custom method"        defStyleNum="dsDataType" color="#562579" selColor="#562579" bold="1" />
>+      <itemData name="VarnishStat metric"        defStyleNum="dsDataType" color="#0000FF" selColor="#0000FF" bold="0" italic="0" />
>+      <itemData name="Decimal"                   defStyleNum="dsDecVal" />
>+      <itemData name="Float"                     defStyleNum="dsFloat" spellChecking="false"/>
>+      <itemData name="Client Identifier"         defStyleNum="dsDataType" color="#0D62FF" selColor="#0D62FF" bold="0" underline="1" />
>+      <itemData name="Server Identifier"         defStyleNum="dsDataType" color="#0D62FF" selColor="#0D62FF" bold="0" underline="1" />
>+      <itemData name="Varnish Identifier"        defStyleNum="dsDataType" color="#0D62FF" selColor="#0D62FF" bold="0" underline="1" />
>+      <itemData name="Sema Identifier"           defStyleNum="dsDataType" color="#0D62FF" selColor="#0D62FF" bold="0" underline="1" />
>+    </itemDatas>
>+  </highlighting>
>+  <general>
>+    <comments>
>+      <comment name="singleLine" start="#" />
>+    </comments>
>+    <keywords casesensitive="1" />
>+  </general>
>+</language>
>+
>diff -urN tdelibs/kate/data/vcard.xml tdelibs.new/kate/data/vcard.xml
>--- tdelibs/kate/data/vcard.xml	1969-12-31 19:00:00.000000000 -0500
>+++ tdelibs.new/kate/data/vcard.xml	2013-12-26 13:26:41.250326162 -0600
>@@ -0,0 +1,45 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+
>+<!DOCTYPE language SYSTEM "language.dtd" []>
>+
>+<language name="vCard, vCalendar, iCalendar" version="0.1" kateversion="2.5" section="Markup" extensions="*.iCal;*.iCalendar;.ics;*.ifb;*.iFBf;*.vcal;*.vcalendar;*.vcard;*.vcf;" author="Lukas Sommer" mimetype="text/calendar;text/vcard" license="public domain">
>+
>+    <highlighting>
>+
>+        <contexts>
>+            <context attribute="Property" lineEndContext="#stay" name="contextProperty">
>+                <StringDetect attribute="vCard" String="BEGIN:" beginRegion="region" context="contextAttribute" column="0"/>
>+                <StringDetect attribute="vCard" String="END:" endRegion="region" context="contextAttribute" column="0"/>
>+                <DetectChar char=" " context="contextAttribute" column="0"/>
>+                <DetectChar attribute="Delimiter" context="contextAttribute" char=":" />
>+                <DetectChar attribute="Delimiter" context="contextParameterKey" char=";" />
>+            </context>
>+            <context attribute="Parameter key" lineEndContext="#pop" name="contextParameterKey">
>+                <DetectChar attribute="Assignment" context="contextParameterValue" char="=" />
>+                <DetectChar attribute="Delimiter" context="contextAttribute" char=":" />
>+            </context>
>+            <context attribute="Parameter value" lineEndContext="#pop" name="contextParameterValue">
>+                <DetectChar attribute="Delimiter" context="contextParameterKey" char=";" />
>+                <DetectChar attribute="Delimiter" context="contextAttribute" char=":" />
>+            </context>
>+            <context attribute="Attribute" lineEndContext="#pop" name="contextAttribute">
>+                <DetectChar attribute="Delimiter" char=";" />
>+            </context>
>+        </contexts>
>+
>+        <itemDatas>
>+          <itemData name="Assignment" defStyleNum="dsKeyword"/>
>+          <itemData name="Attribute" defStyleNum="dsString"/>
>+          <itemData name="Delimiter" defStyleNum="dsKeyword"/>
>+          <itemData name="Parameter key" defStyleNum="dsFunction"/>
>+          <itemData name="Parameter value" defStyleNum="dsOthers"/>
>+	  <itemData name="Property" defStyleNum="dsKeyword"/> 
>+          <itemData name="vCard" defStyleNum="dsRegionMarker"/>
>+        </itemDatas>
>+
>+    </highlighting>
>+
>+    <general>
>+    </general>
>+
>+</language>
>diff -urN tdelibs/kate/data/velocity.xml tdelibs.new/kate/data/velocity.xml
>--- tdelibs/kate/data/velocity.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/velocity.xml	2013-12-26 13:26:41.337325791 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Velocity" version="1.04" kateversion="2.1" section="Scripts" extensions="*.vm;" mimetype="text/x-velocity-src;text/x-vm-src" author="John Christopher (John@animalsinneed.net)" license="">
>+<language name="Velocity" version="1.04" kateversion="2.5" section="Scripts" extensions="*.vm;" mimetype="text/x-velocity-src;text/x-vm-src" author="John Christopher (John@animalsinneed.net)" license="">
> 	<highlighting>
> 		<list name="keywords">
> 			<item> #set </item>
>diff -urN tdelibs/kate/data/verilog.xml tdelibs.new/kate/data/verilog.xml
>--- tdelibs/kate/data/verilog.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/verilog.xml	2013-12-26 13:26:41.226326265 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Verilog" version="1.09" kateversion="2.4" section="Hardware" extensions="*.v;*.V;*.vl" mimetype="text/x-verilog-src" author="Yevgen Voronenko (ysv22@drexel.edu), Ryan Dalzell (ryan@tullyroan.com)" license="">
>+<language name="Verilog" version="1.09" kateversion="2.5" section="Hardware" extensions="*.v;*.V;*.vl" mimetype="text/x-verilog-src" author="Yevgen Voronenko (ysv22@drexel.edu), Ryan Dalzell (ryan@tullyroan.com)" license="">
>   <highlighting>
>     <list name="keywords">
>       <item> macromodule </item>
>diff -urN tdelibs/kate/data/vhdl.xml tdelibs.new/kate/data/vhdl.xml
>--- tdelibs/kate/data/vhdl.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/vhdl.xml	2013-12-26 13:26:40.536329208 -0600
>@@ -11,7 +11,7 @@
> 
> ]>
> 
>-<language name="VHDL" version="1.10" kateversion="2.3" section="Hardware" extensions="*.vhdl;*.vhd" mimetype="text/x-vhdl" author="Rocky Scaletta (rocky@purdue.edu), Stefan Endrullis (stefan@endrullis.de), Florent Ouchet (outchy@users.sourceforge.net), Chris Higgs (chiggs.99@gmail.com), Jan Michel (jan@mueschelsoft.de)">
>+<language name="VHDL" version="1.10" kateversion="2.5" section="Hardware" extensions="*.vhdl;*.vhd" mimetype="text/x-vhdl" author="Rocky Scaletta (rocky@purdue.edu), Stefan Endrullis (stefan@endrullis.de), Florent Ouchet (outchy@users.sourceforge.net), Chris Higgs (chiggs.99@gmail.com), Jan Michel (jan@mueschelsoft.de)">
>   <highlighting>
>     <list name="keywordsToplevel">
>       <item> file </item>
>diff -urN tdelibs/kate/data/winehq.xml tdelibs.new/kate/data/winehq.xml
>--- tdelibs/kate/data/winehq.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/winehq.xml	2013-12-26 13:26:40.881327738 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="WINE Config" version="1.03" kateversion="2.4" section="Configuration" extensions="*.reg" mimetype="">
>+<language name="WINE Config" version="1.03" kateversion="2.5" section="Configuration" extensions="*.reg" mimetype="">
>   <highlighting>
>     <contexts>
>       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
>diff -urN tdelibs/kate/data/wml.xml tdelibs.new/kate/data/wml.xml
>--- tdelibs/kate/data/wml.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/wml.xml	2013-12-26 13:26:41.080326886 -0600
>@@ -5,6 +5,10 @@
>   Alternatively try the "normal" way: #kate@freenode, kwrite-devel@kde.org
>   Changelog (0.35 and later):
>   ***************************
>+* 0.42
>+  - 2011-11-15 <shadowm2006@gmail.com>:
>+    * Added preprocessor directives: #error, #warning
>+    * Added highlighting for the wmlxgettext annotation metadirective (po:)
> * 0.41
>   - 2011-04-15 <shadowm2006@gmail.com>:
>     * Added preprocessor directives: #if(n)have, #if(n)ver
>@@ -50,18 +54,21 @@
>     * Made the new #ifndef directive be recognized (implemented on Wesnoth 1.3.11 and later)
> -->
> 
>-<language name="Wesnoth Markup Language" section="Markup" extensions="*.cfg;*.pbl;*.CFG;*.PBL" version="0.41"
>+<language name="Wesnoth Markup Language" section="Markup" extensions="*.cfg;*.pbl;*.CFG;*.PBL" version="0.42"
>           kateversion="2.5" casesensitive="true" author="Zachary Palmer (zep01@bahj.com), modif. by Ignacio Riquelme Morelle (shadowm2006@gmail.com) and Jonathan Schmidt-DominÃ© (devel@the-user.org)" license="GPL">
>     <highlighting>
>         <list name="alerts_wml_utils">
>             <item> wmllint</item>
>             <item> wmlindent</item>
>             <item> wmlscope</item>
>+            <item> po</item>
>         </list>
>         <list name="preprocessor_directive_statements">
>                 <item>#textdomain</item>
>                 <item>#else</item>
>                 <item>#undef</item>
>+                <item>#error</item>
>+                <item>#warning</item>
>         </list>
>         <list name="preprocessor_block_begin_statements">
>                 <item>#define</item>
>diff -urN tdelibs/kate/data/xharbour.xml tdelibs.new/kate/data/xharbour.xml
>--- tdelibs/kate/data/xharbour.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/xharbour.xml	2013-12-26 13:26:40.519329280 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="xHarbour" version="1.04" kateversion="2.4" section="Sources" extensions="*.prg;*.PRG;*.ch" mimetype="text/x-xharbour-src" priority="5" author="Giancarlo Niccolai (giancarlo@niccolai.ws)" license="GPL">
>+<language name="xHarbour" version="1.04" kateversion="2.5" section="Sources" extensions="*.prg;*.PRG;*.ch" mimetype="text/x-xharbour-src" priority="5" author="Giancarlo Niccolai (giancarlo@niccolai.ws)" license="GPL">
> <highlighting>
> 
>    <list name="keywords">
>diff -urN tdelibs/kate/data/xml.xml tdelibs.new/kate/data/xml.xml
>--- tdelibs/kate/data/xml.xml	2012-10-19 20:54:27.000000000 -0500
>+++ tdelibs.new/kate/data/xml.xml	2013-12-26 13:26:41.059326977 -0600
>@@ -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="2.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="2.03" kateversion="2.5" 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>
>diff -urN tdelibs/kate/data/xmldebug.xml tdelibs.new/kate/data/xmldebug.xml
>--- tdelibs/kate/data/xmldebug.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/xmldebug.xml	2013-12-26 13:26:41.054326999 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language version="1.02" kateversion="2.3" name="XML (Debug)" section="Markup" extensions="" mimetype="">
>+<language version="1.03" kateversion="2.5" name="XML (Debug)" section="Markup" extensions="" mimetype="">
>   <highlighting>
>     <list name="AttType">
>         <item>CDATA</item>
>@@ -589,5 +589,6 @@
>       <comment name="multiLine" start="&lt;!--" end="--&gt;"/>
>     </comments>
>     <keywords casesensitive="1"/>
>+    <indentation mode="xml" />
>   </general>
> </language>
>diff -urN tdelibs/kate/data/xslt.xml tdelibs.new/kate/data/xslt.xml
>--- tdelibs/kate/data/xslt.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/xslt.xml	2013-12-26 13:26:40.488329413 -0600
>@@ -50,7 +50,7 @@
> 
> -->
> 
>-<language version="1.03" kateversion="2.1" name="xslt" section="Markup" extensions="*.xsl;*.xslt" license="LGPL" author="Peter Lammich (views@gmx.de)">
>+<language version="1.03" kateversion="2.5" name="xslt" section="Markup" extensions="*.xsl;*.xslt" license="LGPL" author="Peter Lammich (views@gmx.de)">
>   <highlighting>
>     <list name="keytags">
>       <item> xsl:value-of </item>
>diff -urN tdelibs/kate/data/yacas.xml tdelibs.new/kate/data/yacas.xml
>--- tdelibs/kate/data/yacas.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/yacas.xml	2013-12-26 13:26:40.919327574 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="yacas" version="1.02" kateversion="2.3" section="Sources" extensions="*.ys" mimetype="text/x-yacassrc">
>+<language name="yacas" version="1.02" kateversion="2.5" section="Sources" extensions="*.ys" mimetype="text/x-yacassrc">
>   <highlighting>
>     <list name="keywords">
>       <item> And </item>
>diff -urN tdelibs/kate/data/yacc.xml tdelibs.new/kate/data/yacc.xml
>--- tdelibs/kate/data/yacc.xml	2012-09-14 18:00:10.000000000 -0500
>+++ tdelibs.new/kate/data/yacc.xml	2013-12-26 13:26:40.408329756 -0600
>@@ -20,7 +20,7 @@
> 
>   ========================================================================
> -->
>-<language name="Yacc/Bison" version="1.03" kateversion="2.4" section="Sources" extensions="*.y" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
>+<language name="Yacc/Bison" version="1.03" kateversion="2.5" section="Sources" extensions="*.y" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
> 
> <highlighting>
> <contexts>
>diff -urN tdelibs/kate/data/yaml.xml tdelibs.new/kate/data/yaml.xml
>--- tdelibs/kate/data/yaml.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/yaml.xml	2013-12-26 13:26:40.505329340 -0600
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
> 
>-<language name="YAML" version="1.1" kateversion="2.3" section="Markup"
>+<language name="YAML" version="1.2" kateversion="2.5" section="Markup"
>           extensions="*.yaml;*.yml" mimetype="text/yaml"
>           author="Dr Orlovsky MA (dr.orlovsky@gmail.com)" license="LGPL">
>   <highlighting>
>@@ -140,13 +140,12 @@
>           <DetectIdentifier />
>           <DetectChar attribute="String" context="attribute-end-inline" char="'" endRegion="String" />
>       </context>
>-      
>+
>       <context attribute="String" lineEndContext="#stay" name="attribute-stringx-inline">
>           <DetectIdentifier />
>           <DetectChar attribute="String" context="attribute-end-inline" char="&quot;" endRegion="String" />
>       </context>
> 
>-      
>       <context attribute="Error" lineEndContext="#pop#pop#pop" name="attribute-end">
>       </context>
> 
>@@ -156,8 +155,6 @@
>           <RegExpr attribute="Operator" context="#pop#pop#pop"  String=",\s"/>
>       </context>
> 
>-      
>-      
>       <context attribute="String" lineEndContext="#stay" name="string">
>         <DetectIdentifier />
>         <DetectChar attribute="String" context="#pop" char="'" endRegion="String" />
>@@ -169,9 +166,12 @@
>       </context>
> 
>       <context attribute="Comment" lineEndContext="#pop" name="comment">
>+        <IncludeRules context="##Alerts" />
>+        <IncludeRules context="##Modelines" />
>       </context>
>     </contexts>
>-     <itemDatas>
>+
>+    <itemDatas>
>       <itemData name="Normal Text" defStyleNum="dsNormal" />
>       <itemData name="List" defStyleNum="dsNormal" />
>       <itemData name="Hash" defStyleNum="dsNormal" />
>@@ -184,13 +184,14 @@
>       <itemData name="Key" defStyleNum="dsFunction" />
>       <itemData name="Directive" defStyleNum="dsOthers" />
>       <itemData name="Operator" defStyleNum="dsKeyword" />
>-      <itemData name="String" defStyleNum="dsNormal" />
>+      <itemData name="String" defStyleNum="dsString" />
>       <itemData name="Error" defStyleNum="dsError" />
>     </itemDatas>
>   </highlighting>
>+
>   <general>
>     <comments>
>-      <comment name="singleLine" start="#"/>
>+      <comment name="singleLine" start="#" position="afterwhitespace" />
>     </comments>
>     <keywords casesensitive="1"/>
>   </general>
>diff -urN tdelibs/kate/data/zonnon.xml tdelibs.new/kate/data/zonnon.xml
>--- tdelibs/kate/data/zonnon.xml	2012-10-19 20:54:28.000000000 -0500
>+++ tdelibs.new/kate/data/zonnon.xml	2013-12-26 13:26:41.102326795 -0600
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE language SYSTEM "language.dtd">
>-<language name="Zonnon" version="1.0" kateversion="2.1" section="Sources" extensions="*.znn" mimetype="text/x-zonnon">
>+<language name="Zonnon" version="1.0" kateversion="2.5" section="Sources" extensions="*.znn" mimetype="text/x-zonnon">
>   <highlighting>
>     <list name="keywords">
>       <item> accept </item>
>diff -urN tdelibs/kate/data/zsh.xml tdelibs.new/kate/data/zsh.xml
>--- tdelibs/kate/data/zsh.xml	2013-03-02 15:57:35.000000000 -0600
>+++ tdelibs.new/kate/data/zsh.xml	2013-12-26 13:26:41.644324481 -0600
>@@ -8,7 +8,7 @@
>         <!ENTITY noword   "(?![\w$+-])">                
>         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     
> ]>
>-<language name="Zsh" version="0.1" kateversion="2.4" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Kolberg (bulldog98@kubuntu-de.org)" license="LGPL">
>+<language name="Zsh" version="0.1" kateversion="2.5" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Kolberg (bulldog98@kubuntu-de.org)" license="LGPL">
> 
> 
>@@ -393,7 +393,7 @@
>       <item> lex </item>
>       <item> ln </item>
>       <item> locate </item>
>-      <item> lockfile </item>
>+      <item> loctdefile </item>
>       <item> logname </item>
>       <item> lp </item>
>       <item> lpr </item>

Actions: View | Diff

Attachments on bug 1779: 1747 | 1750 | 1768 | 1784 | 1785 | 1786 | 1822 | 1825 | 1826 | 1836 | 1837 | 1842