diff options
| -rw-r--r-- | kate/data/ccss.xml | 11 | ||||
| -rw-r--r-- | kate/data/cmake.xml | 5 | ||||
| -rw-r--r-- | kate/data/coffee.xml | 2 | ||||
| -rw-r--r-- | kate/data/css-php.xml | 12 | ||||
| -rw-r--r-- | kate/data/css.xml | 12 | ||||
| -rw-r--r-- | kate/data/debianchangelog.xml | 12 | ||||
| -rw-r--r-- | kate/data/djangotemplate.xml | 2 | ||||
| -rw-r--r-- | kate/data/doxygen.xml | 27 | ||||
| -rw-r--r-- | kate/data/gcc.xml | 10 | ||||
| -rw-r--r-- | kate/data/go.xml | 35 | ||||
| -rw-r--r-- | kate/data/html-php.xml | 2 | ||||
| -rw-r--r-- | kate/data/html.xml | 2 | ||||
| -rw-r--r-- | kate/data/isocpp.xml | 45 | ||||
| -rw-r--r-- | kate/data/javascript-php.xml | 2 | ||||
| -rw-r--r-- | kate/data/javascript.xml | 2 | ||||
| -rw-r--r-- | kate/data/makefile.xml | 18 | ||||
| -rw-r--r-- | kate/data/mako.xml | 2 | ||||
| -rw-r--r-- | kate/data/modelines.xml | 29 | ||||
| -rw-r--r-- | kate/data/perl.xml | 4 | ||||
| -rw-r--r-- | kate/data/php.xml | 2 | ||||
| -rw-r--r-- | kate/data/prolog.xml | 5 | ||||
| -rw-r--r-- | kate/data/qt4.xml | 8 | ||||
| -rw-r--r-- | kate/data/rest.xml | 177 | ||||
| -rw-r--r-- | kate/data/rhtml.xml | 2 | ||||
| -rw-r--r-- | kate/data/scss.xml | 11 | ||||
| -rw-r--r-- | kate/data/update-files.xml | 44 |
26 files changed, 275 insertions, 208 deletions
diff --git a/kate/data/ccss.xml b/kate/data/ccss.xml index cbee0f41e..acb1054f5 100644 --- a/kate/data/ccss.xml +++ b/kate/data/ccss.xml @@ -1,7 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE language SYSTEM "language.dtd"> +<!DOCTYPE language SYSTEM "language.dtd" +[ + <!-- http://www.w3.org/TR/CSS21/syndata.html#tokenization --> + <!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="CleanCSS" version="1.0" kateversion="2.4" section="Markup" extensions="*.ccss" author="Massimiliano Torromeo" license="BSD"> +<language name="CleanCSS" version="1.1" kateversion="2.4" section="Markup" extensions="*.ccss" author="Massimiliano Torromeo" license="BSD"> <highlighting> <list name="properties"> @@ -547,7 +552,7 @@ <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 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})*" /> <DetectChar attribute="Selector Pseudo" context="SelPseudo" char=":" /> <keyword attribute="Media" context="#stay" String="mediatypes" /> diff --git a/kate/data/cmake.xml b/kate/data/cmake.xml index 692451395..fa499c3dd 100644 --- a/kate/data/cmake.xml +++ b/kate/data/cmake.xml @@ -28,12 +28,12 @@ <!-- generated for "cmake version 2.8.12.1" --> <language name="CMake" - version="1.29-1" + version="1.30-1" kateversion="2.4" section="Other" extensions="CMakeLists.txt;*.cmake;*.cmake.in" style="CMake" - mimetype="" + mimetype="text/x-cmake" author="Alexander Neundorf (neundorf@kde.org)" license="LGPL" > @@ -980,6 +980,7 @@ <IncludeRules context="Detect Generator Expressions"/> </context> <context attribute="Comment" lineEndContext="#pop" name="Comment"> + <LineContinue attribute="Comment" context="#pop" /> <IncludeRules context="##Alerts" /> <IncludeRules context="##Modelines" /> </context> diff --git a/kate/data/coffee.xml b/kate/data/coffee.xml index dc0f1c541..1e0c49af8 100644 --- a/kate/data/coffee.xml +++ b/kate/data/coffee.xml @@ -2,7 +2,7 @@ <!DOCTYPE language SYSTEM "language.dtd"> <language name="CoffeeScript" - version="1.5" + version="1.4" kateversion="2.4" section="Scripts" extensions="Cakefile;*.coffee;*.coco" diff --git a/kate/data/css-php.xml b/kate/data/css-php.xml index 8fd82afc0..6a8bf4d73 100644 --- a/kate/data/css-php.xml +++ b/kate/data/css-php.xml @@ -1,5 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE language SYSTEM "language.dtd"> +<!DOCTYPE language SYSTEM "language.dtd" +[ + <!-- http://www.w3.org/TR/CSS21/syndata.html#tokenization --> + <!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])"> +]> <!-- @@ -24,7 +29,7 @@ Changelog: -<language name="CSS/PHP" hidden="true" version="2.08" kateversion="2.4" section="Other" extensions="" indenter="cstyle" mimetype="" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> +<language name="CSS/PHP" hidden="true" version="2.09" kateversion="2.4" section="Other" extensions="" indenter="cstyle" mimetype="" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> <highlighting> <list name="properties"> @@ -726,7 +731,7 @@ Changelog: <DetectChar attribute="Property" context="RuleSet" char="{" beginRegion="ruleset" /> <!--parse selectors--> <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=":" /> @@ -809,6 +814,7 @@ Changelog: <context attribute="Media" lineEndContext="#stay" name="MQEV"> <IncludeRules context="FindPHP" /> <!-- this should be seperate for different features, for now it is all the same --> + <DetectSpaces/> <RegExpr attribute="Value" context="#pop" String="[1-9][0-9.]*\s*/\s*[1-9][0-9.]*" /> <RegExpr attribute="Value" context="#pop" String="[0-9.]+(em|ex|ch|rem|vw|vh|vm|px|in|cm|mm|pt|pc|deg|rad|grad|turn|ms|s|Hz|kHz|dpi|dpcm)\b" /> <RegExpr attribute="Value" context="#pop" String="[0-9.]+[%]?" /> diff --git a/kate/data/css.xml b/kate/data/css.xml index 6f274bb50..a8502e6b7 100644 --- a/kate/data/css.xml +++ b/kate/data/css.xml @@ -1,5 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE language SYSTEM "language.dtd"> +<!DOCTYPE language SYSTEM "language.dtd" +[ + <!-- http://www.w3.org/TR/CSS21/syndata.html#tokenization --> + <!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])"> +]> <!-- @@ -18,7 +23,7 @@ Changelog: --> -<language name="CSS" version="2.08" kateversion="2.4" section="Markup" extensions="*.css" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> +<language name="CSS" version="2.09" kateversion="2.4" section="Markup" extensions="*.css" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> <highlighting> <list name="properties"> @@ -718,7 +723,7 @@ Changelog: <DetectChar attribute="Property" context="RuleSet" char="{" beginRegion="ruleset" /> <!--parse selectors--> <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=":" /> @@ -792,6 +797,7 @@ Changelog: <context attribute="Media" lineEndContext="#stay" name="MQEV"> <!-- this should be seperate for different features, for now it is all the same --> + <DetectSpaces/> <RegExpr attribute="Value" context="#pop" String="[1-9][0-9.]*\s*/\s*[1-9][0-9.]*" /> <RegExpr attribute="Value" context="#pop" String="[0-9.]+(em|ex|ch|rem|vw|vh|vm|px|in|cm|mm|pt|pc|deg|rad|grad|turn|ms|s|Hz|kHz|dpi|dpcm)\b" /> <RegExpr attribute="Value" context="#pop" String="[0-9.]+[%]?" /> diff --git a/kate/data/debianchangelog.xml b/kate/data/debianchangelog.xml index b629b1f77..05a0db8ab 100644 --- a/kate/data/debianchangelog.xml +++ b/kate/data/debianchangelog.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE language SYSTEM "language.dtd"> -<language name="Debian Changelog" version="0.68" kateversion="2.4" section="Other" extensions="" mimetype=""> +<language name="Debian Changelog" version="0.69" kateversion="2.4" section="Other" extensions="" mimetype=""> <highlighting> <list name="keywords"> <item>urgency</item> @@ -130,6 +130,16 @@ <item>saucy-proposed</item> <item>saucy-updates</item> <item>saucy-backports</item> + <item>trusty</item> + <item>trusty-security</item> + <item>trusty-proposed</item> + <item>trusty-updates</item> + <item>trusty-backports</item> + <item>utopic</item> + <item>utopic-security</item> + <item>utopic-proposed</item> + <item>utopic-updates</item> + <item>utopic-backports</item> </list> <list name="urgencies"> diff --git a/kate/data/djangotemplate.xml b/kate/data/djangotemplate.xml index 5189f86ea..47ad9cd09 100644 --- a/kate/data/djangotemplate.xml +++ b/kate/data/djangotemplate.xml @@ -265,7 +265,7 @@ <RegExpr attribute="Element" context="El Close 2" String="</script\b" insensitive="TRUE" endRegion="script" /> <RegExpr attribute="Comment" context="JS comment close" String="//(?=.*</script\b)" insensitive="TRUE" /> <IncludeRules context="FindTemplate" /> - <IncludeRules context="##JavaScript" includeAttrib="true"/> + <IncludeRules context="Normal##JavaScript" includeAttrib="true"/> </context> <context name="JS comment close" attribute="Comment" lineEndContext="#pop"> diff --git a/kate/data/doxygen.xml b/kate/data/doxygen.xml index 2bc15ce06..8854ecbc4 100644 --- a/kate/data/doxygen.xml +++ b/kate/data/doxygen.xml @@ -29,8 +29,8 @@ --> <language name="Doxygen" - version="1.35-1" - kateversion="2.4" + version="1.36-1" + kateversion="2.5" section="Markup" extensions="*.dox;*.doxygen" mimetype="text/x-doxygen" @@ -53,15 +53,19 @@ <item> \date </item> <item> @date </item> <item> \deprecated </item> <item> @deprecated </item> <item> \details </item> <item> @details </item> + <item> \docbookonly </item> <item> @docbookonly </item> <item> \else </item> <item> @else </item> <item> \endcond </item> <item> @endcond </item> + <item> \enddocbookonly </item> <item> @enddocbookonly </item> <item> \endhtmlonly </item> <item> @endhtmlonly </item> <item> \endif </item> <item> @endif </item> - <item> \enditernal </item> <item> @enditernal </item> + <item> \endinternal </item> <item> @endinternal </item> <item> \endlatexonly </item> <item> @endlatexonly </item> <item> \endlink </item> <item> @endlink </item> <item> \endmanonly </item> <item> @endmanonly </item> + <item> \endparblock </item> <item> @endparblock </item> <item> \endrtfonly </item> <item> @endrtfonly </item> + <item> \endsecreflist </item> <item> @endsecreflist </item> <item> \endxmlonly </item> <item> @endxmlonly </item> <item> \f[ </item> <item> @f[ </item> <item> \f] </item> <item> @f] </item> @@ -78,6 +82,7 @@ <item> \n </item> <item> @n </item> <item> \nosubgrouping </item> <item> @nosubgrouping </item> <item> \only </item> <item> @only </item> + <item> \parblock </item> <item> @parblock </item> <item> \post </item> <item> @post </item> <item> \pre </item> <item> @pre </item> <item> \private </item> <item> @pivate </item> @@ -86,16 +91,20 @@ <item> \protectedsection </item> <item> @protectedsection </item> <item> \public </item> <item> @public </item> <item> \publicsection </item> <item> @publicsection </item> + <item> \pure </item> <item> @pure </item> + <item> \remark </item> <item> @remark </item> <item> \remarks </item> <item> @remarks </item> <item> \return </item> <item> @return </item> <item> \returns </item> <item> @returns </item> <item> \result </item> <item> @result </item> <item> \rtfonly </item> <item> @rtfonly </item> <item> \sa </item> <item> @sa </item> + <item> \secreflist </item> <item> @secreflist </item> <item> \see </item> <item> @see </item> <item> \short </item> <item> @short </item> <item> \showinitializer </item> <item> @showinitializer </item> <item> \since </item> <item> @since </item> + <item> \static </item> <item> @static </item> <item> \tableofcontents </item> <item> @tableofcontents </item> <item> \test </item> <item> @test </item> <item> \version </item> <item> @version </item> @@ -112,6 +121,9 @@ <item> \@ </item> <item> @@ </item> <item> \\ </item> <item> @\ </item> <item> \~ </item> <item> @~ </item> + <item> \. </item> <item> @. </item> + <item> \-- </item> <item> @-- </item> + <item> \--- </item> <item> @--- </item> </list> <list name="TagWord"> @@ -119,6 +131,7 @@ <item> \anchor </item> <item> @anchor </item> <item> \b </item> <item> @b </item> <item> \c </item> <item> @c </item> + <item> \cite </item> <item> @cite </item> <item> \cond </item> <item> @cond </item> <item> \copybrief </item> <item> @copybrief </item> <item> \copydetails </item> <item> @copydetails </item> @@ -136,11 +149,13 @@ <item> \extends </item> <item> @extends </item> <item> \file </item> <item> @file </item> <item> \htmlinclude </item> <item> @htmlinclude </item> + <item> \idlexcept </item>m> <item> @idlexcept </item> <item> \if </item> <item> @if </item> <item> \ifnot </item> <item> @ifnot </item> <item> \implements </item> <item> @implements </item> <item> \include </item> <item> @include </item> <item> \includelineno </item> <item> @includelineno </item> + <item> \latexinclude </item> <item> @latexinclude </item> <item> \link </item> <item> @link </item> <item> \memberof </item> <item> @memberof </item> <item> \namespace </item> <item> @namespace </item> @@ -176,6 +191,7 @@ <item> \addtogroup </item> <item> @addtogroup </item> <item> \category </item> <item> @category </item> <item> \class </item> <item> @class </item> + <item> \diafile </item> <item> @diafile </item> <item> \dotfile </item> <item> @dotfile </item> <item> \defgroup </item> <item> @defgroup </item> <item> \interface </item> <item> @interface </item> @@ -209,6 +225,7 @@ <item> \typedef </item> <item> @typedef </item> <item> \until </item> <item> @until </item> <item> \var </item> <item> @var </item> + <item> \vhdlflow </item> <item> @vhdlflow </item> </list> <list name="Note"> <item> \note </item> <item> @note </item> @@ -469,7 +486,7 @@ <itemDatas> <itemData name="Normal Text" defStyleNum="dsNormal" /> <itemData name="Tags" defStyleNum="dsKeyword" color="#ca60ca" bold="1" italic="0" /> - <itemData name="Custom Tags" defStyleNum="dsNormal" color="#458C61" bold="1" italic="0" /> + <itemData name="Custom Tags" defStyleNum="dsNormal" color="#458C61" bold="1" italic="0" /> <itemData name="Word" defStyleNum="dsKeyword" color="#0095ff" bold="1" italic="0" /> <itemData name="HTML Tag" defStyleNum="dsKeyword" color="#000000" bold="1" italic="0" /> <itemData name="Entities" defStyleNum="dsOthers" color="#4086C0" bold="1" italic="1" /> @@ -491,7 +508,7 @@ </itemDatas> </highlighting> <general> - <keywords casesensitive="0" weakDeliminator="\$~" /> + <keywords casesensitive="1" weakDeliminator="\$~" /> </general> </language> <!-- kate: indent-width 2; --> diff --git a/kate/data/gcc.xml b/kate/data/gcc.xml index 57b4f9f5b..0f78b3361 100644 --- a/kate/data/gcc.xml +++ b/kate/data/gcc.xml @@ -7,13 +7,13 @@ <!ENTITY punctuators ":&ns_punctuators;"> ]> <!-- - Copyright (c) 2012 by Alex Turbov (i.zaufi@gmail.com) + Copyright (c) 2012-2014 by Alex Turbov (i.zaufi@gmail.com) Homepage: http://kde-files.org/content/show.php?content=90660 --> <language name="GCCExtensions" - version="0.3" + version="0.4" kateversion="2.4" section="Sources" extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.h++;*.hxx;*.hpp;*.hcc;" @@ -552,6 +552,11 @@ <context name="Close" attribute="GNU Extensions" lineEndContext="#stay"> <DetectChar attribute="GNU Extensions" context="#pop" char=")" /> + <DetectChar attribute="String" context="AttrStringArg" char=""" /> + </context> + + <context name="AttrStringArg" attribute="String" lineEndContext="#stay"> + <DetectChar attribute="String" context="#pop" char=""" /> </context> </contexts> @@ -562,6 +567,7 @@ <itemData name="GNU Functions" defStyleNum="dsOthers" spellChecking="false" /> <itemData name="GNU Macros" defStyleNum="dsOthers" spellChecking="false" /> <itemData name="GNU Types" defStyleNum="dsOthers" spellChecking="false" /> + <itemData name="String" defStyleNum="dsString" spellChecking="false" /> </itemDatas> </highlighting> diff --git a/kate/data/go.xml b/kate/data/go.xml index c864b92e3..d657d2a41 100644 --- a/kate/data/go.xml +++ b/kate/data/go.xml @@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., --> -<language name="Go" version="1.04-1" kateversion="2.4" section="Sources" indenter="cstyle" extensions="*.go" author="Miquel Sabaté (mikisabate@gmail.com)" license="GPL"> +<language name="Go" version="1.05-1" kateversion="2.4" section="Sources" indenter="cstyle" extensions="*.go" author="Miquel Sabaté (mikisabate@gmail.com)" license="GPL"> <highlighting> <list name="keywords"> <!-- Keywords have been taken from The Go Programming Language Specification -> Keywords section --> @@ -103,20 +103,23 @@ with this program; if not, write to the Free Software Foundation, Inc., </list> <contexts> <context name="normal" attribute="Normal Text" lineEndContext="#stay"> - <keyword attribute="Keyword" context="#stay" String="keywords" /> - <keyword attribute="Predeclared Identifier" context="#stay" String="predeclared" /> - <keyword attribute="Data Type" context="#stay" String="types" /> - <keyword attribute="Builtin Function" context="#stay" String="builtin" /> - <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" /> - <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" /> - <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/" /> - <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" /> - <HlCOct attribute="Octal" context="#stay"/> - <HlCHex attribute="Hex" context="#stay"/> - <HlCChar attribute="Char" context="#stay" /> - <DetectChar attribute="String" context="String" char=""" /> - <DetectChar attribute="String" context="Multiline String" char="`"/> - <AnyChar attribute="Symbol" context="#stay" String=":!%&()+,-/.*<=>?[]|~^;"/> + <keyword attribute="Keyword" context="#stay" String="keywords" /> + <keyword attribute="Predeclared Identifier" context="#stay" String="predeclared" /> + <keyword attribute="Data Type" context="#stay" String="types" /> + <keyword attribute="Builtin Function" context="#stay" String="builtin" /> + <DetectIdentifier /> + <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" /> + <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" /> + <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/" /> + <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" /> + <Int attribute="Decimal" context="#stay" /> + <Float attribute="Float" context="#stay" /> + <HlCOct attribute="Octal" context="#stay"/> + <HlCHex attribute="Hex" context="#stay"/> + <HlCChar attribute="Char" context="#stay" /> + <DetectChar attribute="String" context="String" char=""" /> + <DetectChar attribute="String" context="Multiline String" char="`"/> + <AnyChar attribute="Symbol" context="#stay" String=":!%&()+,-/.*<=>?[]|~^;"/> </context> <context attribute="Comment" lineEndContext="#pop" name="Commentar 1"> @@ -154,8 +157,10 @@ with this program; if not, write to the Free Software Foundation, Inc., <itemData name="String Char" defStyleNum="dsChar" /> <itemData name="String" defStyleNum="dsString" /> <itemData name="Comment" defStyleNum="dsComment" /> + <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="Symbol" defStyleNum="dsNormal" spellChecking="false"/> <itemData name="Error" defStyleNum="dsError" spellChecking="false"/> diff --git a/kate/data/html-php.xml b/kate/data/html-php.xml index 4b18b99fd..010297417 100644 --- a/kate/data/html-php.xml +++ b/kate/data/html-php.xml @@ -25,7 +25,7 @@ <DetectIdentifier/> <StringDetect attribute="Comment" context="Comment" String="<!--" beginRegion="comment" /> <StringDetect attribute="CDATA" context="CDATA" String="<![CDATA[" beginRegion="cdata" /> - <RegExpr attribute="Doctype" context="Doctype" String="<!DOCTYPE\s+" beginRegion="doctype" /> + <RegExpr attribute="Doctype" context="Doctype" String="<!DOCTYPE\s+" insensitive="TRUE" beginRegion="doctype" /> <RegExpr attribute="Processing Instruction" context="PI" String="<\?[\w:-]*" beginRegion="pi" /> <RegExpr attribute="Element" context="CSS" String="<style\b" insensitive="TRUE" beginRegion="style" /> <RegExpr attribute="Element" context="JS" String="<script\b" insensitive="TRUE" beginRegion="script" /> diff --git a/kate/data/html.xml b/kate/data/html.xml index 653fdb2b0..9bdd4b77d 100644 --- a/kate/data/html.xml +++ b/kate/data/html.xml @@ -17,7 +17,7 @@ <DetectIdentifier/> <StringDetect attribute="Comment" context="Comment" String="<!--" beginRegion="comment" /> <StringDetect attribute="CDATA" context="CDATA" String="<![CDATA[" beginRegion="cdata" /> - <RegExpr attribute="Doctype" context="Doctype" String="<!DOCTYPE\s+" beginRegion="doctype" /> + <RegExpr attribute="Doctype" context="Doctype" String="<!DOCTYPE\s+" insensitive="TRUE" beginRegion="doctype" /> <RegExpr attribute="Processing Instruction" context="PI" String="<\?[\w:-]*" beginRegion="pi" /> <RegExpr attribute="Element" context="CSS" String="<style\b" insensitive="TRUE" beginRegion="style" /> <RegExpr attribute="Element" context="JS" String="<script\b" insensitive="TRUE" beginRegion="script" /> diff --git a/kate/data/isocpp.xml b/kate/data/isocpp.xml index c817dc485..8f1e12e5f 100644 --- a/kate/data/isocpp.xml +++ b/kate/data/isocpp.xml @@ -11,9 +11,10 @@ <language name="ISO C++" section="Sources" - version="2.1-1" + version="2.4-1" kateversion="2.4" indenter="cstyle" + style="C++" 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)" @@ -344,8 +345,8 @@ <DetectIdentifier /> <!-- Match comments --> <IncludeRules context="##Doxygen" /> - <IncludeRules context="AlignedComments" /> - <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment" /> + <Detect2Chars attribute="Comment" context="Comment 1" char="/" char1="/" /> + <Detect2Chars attribute="Comment" context="Comment 2" char="/" char1="*" beginRegion="Comment" /> <!-- Match scope regions --> <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" /> <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" /> @@ -447,7 +448,7 @@ <IncludeRules context="DetectNSEnd" /> </context> - <context name="Commentar 1" attribute="Comment" lineEndContext="#pop"> + <context name="Comment 1" attribute="Comment" lineEndContext="#pop"> <LineContinue attribute="Comment" context="#stay" /> <DetectSpaces /> <IncludeRules context="##Alerts" /> @@ -455,7 +456,7 @@ <DetectIdentifier /> </context> - <context name="Commentar 2" attribute="Comment" lineEndContext="#stay"> + <context name="Comment 2" attribute="Comment" lineEndContext="#stay"> <DetectSpaces /> <LineContinue attribute="Comment" context="#stay" /> <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment" /> @@ -481,8 +482,8 @@ <RangeDetect attribute="Prep. Lib" context="#stay" char=""" char1=""" /> <RangeDetect attribute="Prep. Lib" context="#stay" char="<" char1=">" /> <IncludeRules context="##Doxygen" /> - <Detect2Chars attribute="Comment" context="Commentar/Preprocessor" char="/" char1="*" beginRegion="Comment2" /> - <IncludeRules context="AlignedComments" /> + <Detect2Chars attribute="Comment" context="Comment/Preprocessor" char="/" char1="*" beginRegion="Comment2" /> + <Detect2Chars attribute="Comment" context="Comment 1" char="/" char1="/" /> </context> <context name="Define" attribute="Preprocessor" lineEndContext="#pop"> @@ -492,7 +493,7 @@ <IncludeRules context="GNUMacros##GCCExtensions" /> </context> - <context name="Commentar/Preprocessor" attribute="Comment" lineEndContext="#stay"> + <context name="Comment/Preprocessor" attribute="Comment" lineEndContext="#stay"> <DetectSpaces /> <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment2" /> <DetectIdentifier /> @@ -504,12 +505,12 @@ <IncludeRules context="##Modelines" /> <DetectIdentifier /> <IncludeRules context="##Doxygen" /> - <IncludeRules context="AlignedComments" /> + <Detect2Chars attribute="Comment" context="Comment 1" char="/" char1="/" /> <!-- Do not try to detect "C" style comments inside outscoped text to prevent incorrect highlighting in case of overlapped (or not closed properly) comment block... - <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment" /> + <Detect2Chars attribute="Comment" context="Comment 2" char="/" char1="*" beginRegion="Comment" /> --> <RegExpr attribute="Comment" context="Outscoped intern" String="(#|%\:|\?\?=)\s*if" beginRegion="PP" firstNonSpace="true" insensitive="false" /> <LineContinue context="#stay" /> @@ -539,31 +540,11 @@ <IncludeRules context="##Modelines" /> <DetectIdentifier /> <IncludeRules context="##Doxygen" /> - <IncludeRules context="AlignedComments" /> - <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment" /> + <Detect2Chars attribute="Comment" context="Comment 1" char="/" char1="/" /> + <Detect2Chars attribute="Comment" context="Comment 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> diff --git a/kate/data/javascript-php.xml b/kate/data/javascript-php.xml index a4ff01233..cd20480e1 100644 --- a/kate/data/javascript-php.xml +++ b/kate/data/javascript-php.xml @@ -9,7 +9,7 @@ -<language name="JavaScript/PHP" hidden="true" version="1.23" kateversion="2.4" section="Other" extensions="" +<language name="JavaScript/PHP" hidden="true" version="1.22" kateversion="2.4" section="Other" extensions="" mimetype="" indenter="cstyle" author="Anders Lund (anders@alweb.dk), Joseph Wenninger (jowenn@kde.org), Whitehawk Stormchaser (zerokode@gmx.net)" license=""> <highlighting> diff --git a/kate/data/javascript.xml b/kate/data/javascript.xml index dc124041e..c9b5f4bcc 100644 --- a/kate/data/javascript.xml +++ b/kate/data/javascript.xml @@ -3,7 +3,7 @@ <!-- Author: Anders Lund <anders@alweb.dk> //--> <!-- Minor changes: Joseph Wenninger <jowenn@kde.org> //--> <!-- Full JavaScript 1.0 support by Whitehawk Stormchaser //--> -<language name="JavaScript" version="1.23" kateversion="2.4" section="Scripts" extensions="*.js;*.kwinscript" +<language name="JavaScript" version="1.22" kateversion="2.4" section="Scripts" extensions="*.js;*.kwinscript" mimetype="text/x-javascript;application/x-javascript" indenter="cstyle" author="Anders Lund (anders@alweb.dk), Joseph Wenninger (jowenn@kde.org), Whitehawk Stormchaser (zerokode@gmx.net)" license=""> <highlighting> diff --git a/kate/data/makefile.xml b/kate/data/makefile.xml index 573359208..e25376dd9 100644 --- a/kate/data/makefile.xml +++ b/kate/data/makefile.xml @@ -5,8 +5,10 @@ <!-- Modified by Rui Santana <santana.rui@gmail.com> --> <!-- v2.0 by Andreas Nordal <andreas.nordal@gmail.com> --> <!-- small priority to allow for example Makefile.cpp to be detected as cpp file --> +<!-- v2.1 by Alex Turbov <i.zaufi@gmail.com> + improve comments handling --> <language name="Makefile" section="Other" - version="2.0" kateversion="2.4" + version="2.1" kateversion="2.4" extensions="GNUmakefile;Makefile;makefile;GNUmakefile.*;Makefile.*;makefile.*;*.mk" mimetype="text/x-makefile" author="Per Wigren (wigren@home.se)" license=""> @@ -64,7 +66,7 @@ <contexts> <context name="normal" attribute="Normal" lineEndContext="#stay"> <DetectSpaces/> - <RegExpr attribute="Comment" context="#stay" String="#.*$"/> + <DetectChar attribute="Comment" context="Comment" char="#"/> <keyword attribute="Keyword" context="#stay" String="keywords"/> <RegExpr attribute="Variable" context="assign" String="[^\s:+?]*\s*(?=:=|=|\+=|\?=)"/> <RegExpr attribute="Section" context="prereq" String="^\.[^.][^:]*:"/> @@ -85,7 +87,7 @@ <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="#.*$"/> + <DetectChar attribute="Comment" context="Comment" char="#"/> </context> <context name="rule" attribute="Normal" lineEndContext="#stay"> @@ -102,7 +104,7 @@ <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="#.*$"/> + <DetectChar attribute="Comment" context="Comment" char="#"/> </context> <context name="silent" attribute="Silent" lineEndContext="#pop"> @@ -114,7 +116,7 @@ <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="#.*$"/> + <DetectChar attribute="Comment" context="Comment" char="#"/> </context> <context name="string"" attribute="String" lineEndContext="#pop"> @@ -182,6 +184,12 @@ <DetectChar attribute="String" context="string'" char="'"/> </context> + <context attribute="Comment" lineEndContext="#pop" name="Comment"> + <LineContinue attribute="Comment" context="#stay" /> + <IncludeRules context="##Alerts" /> + <IncludeRules context="##Modelines" /> + </context> + </contexts> <itemDatas> <itemData name="Normal" defStyleNum="dsNormal" spellChecking="0"/> diff --git a/kate/data/mako.xml b/kate/data/mako.xml index 86acdf95c..09bba3c93 100644 --- a/kate/data/mako.xml +++ b/kate/data/mako.xml @@ -4,7 +4,7 @@ <!ENTITY name "[A-Za-z_:][\w.:_-]*"> <!ENTITY entref "&(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);"> ]> -<language name="Mako" version="1.1" kateversion="2.4" section="Markup" extensions="*.mako;*.mak" author="Massimiliano Torromeo (massimiliano.torromeo@gmail.com)" license="LGPL"> +<language name="Mako" version="1.0" kateversion="2.4" section="Markup" extensions="*.mako;*.mak" author="Massimiliano Torromeo (massimiliano.torromeo@gmail.com)" license="LGPL"> <highlighting> <list name="flow"> diff --git a/kate/data/modelines.xml b/kate/data/modelines.xml index 14533425a..a7566f330 100644 --- a/kate/data/modelines.xml +++ b/kate/data/modelines.xml @@ -5,12 +5,10 @@ <!ENTITY end ";"> ]> <!-- - Copyright (c) 2012 by Alex Turbov (i.zaufi@gmail.com) - - Homepage: http://kde-files.org/content/show.php?content=90660 + Copyright (c) 2012-2014 by Alex Turbov (i.zaufi@gmail.com) --> <language name="Modelines" - version="1.0-1" + version="1.2-1" kateversion="2.4" section="Other" extensions="" @@ -36,18 +34,19 @@ <!-- NOTE Deprecated --> <!-- <item> auto-brackets </item> --> <item> auto-insert-doxygen </item> + <item> automatic-spell-checking </item> <!-- NOTE Since KDE 4.?? --> <item> backspace-indents </item> <item> block-selection </item> + <item> bookmark-sorting </item> <item> bom </item> <item> byte-order-marker </item> + <item> dynamic-word-wrap </item> <item> folding-markers </item> <item> icon-border </item> - <!-- Since TDE 14 --> - <item> indent-pasted-text </item> + <item> indent-pasted-text </item> <!-- Since KDE 4.11 --> <item> keep-extra-spaces </item> <item> line-numbers </item> - <!-- Since TDE 14 --> - <item> newline-at-eof </item> + <item> newline-at-eof </item> <!-- Since KDE 4.9 --> <item> overwrite-mode </item> <item> persistent-selection </item> <!-- NOTE Deprecated --> @@ -55,8 +54,10 @@ <item> replace-tabs-save </item> <item> replace-tabs </item> <item> replace-trailing-space-save </item> + <item> smart-home </item> <item> space-indent </item> <item> show-tabs </item> + <item> show-trailing-spaces </item> <!-- NOTE Since KDE 4.?? --> <item> tab-indents </item> <item> word-wrap </item> <item> wrap-cursor </item> @@ -77,8 +78,8 @@ <list name="Integrals"> <item> auto-center-lines </item> <item> font-size </item> + <item> indent-mode </item> <item> indent-width </item> - <item> smart-home </item> <item> tab-width </item> <item> undo-steps </item> <item> word-wrap-column </item> @@ -89,15 +90,16 @@ <item> bracket-highlight-color </item> <item> current-line-color </item> <item> default-dictionary </item> - <item> dynamic-word-wrap </item> - <item> eol </item> - <item> end-of-line </item> <!-- Valid settings are unix, mac and dos --> + <item> encoding </item> <!-- NOTE Since KDE 4.?? --> + <item> eol </item> <!-- Valid settings are unix, mac and dos --> + <item> end-of-line </item> <!-- Valid settings are unix, mac and dos --> <item> font </item> <item> hl </item> <item> icon-bar-color </item> - <item> indent-mode </item> + <item> mode </item> <!-- NOTE Since KDE 4.?? --> <item> scheme </item> <item> selection-color </item> + <item> syntax </item> <item> word-wrap-marker-color </item> </list> @@ -124,6 +126,7 @@ <context name="Normal" attribute="Comment" lineEndContext="#pop"> <DetectSpaces /> <keyword String="ModelineStartKeyword" context="Modeline" attribute="Keyword" /> + <RegExpr String="kate-(mimetype|wildcard)\(.*\):" context="Modeline" attribute="Keyword" /> <LineContinue context="#pop" /> </context> diff --git a/kate/data/perl.xml b/kate/data/perl.xml index 33bef8337..ebc78987b 100644 --- a/kate/data/perl.xml +++ b/kate/data/perl.xml @@ -39,7 +39,7 @@ Enhance tr/// and y/// support. --> -<language name="Perl" version="1.29-1" kateversion="2.4" section="Scripts" extensions="*.pl;*.PL;*.pm" mimetype="application/x-perl;text/x-perl" priority="5" author="Anders Lund (anders@alweb.dk)" license="LGPL"> +<language name="Perl" version="1.29-2" kateversion="2.4" section="Scripts" extensions="*.pl;*.PL;*.pm" mimetype="application/x-perl;text/x-perl" priority="5" author="Anders Lund (anders@alweb.dk)" license="LGPL"> <highlighting> <list name="keywords"> <item> if </item> @@ -745,7 +745,7 @@ </context> <context name="here_document" attribute="String (interpolated)" lineEndContext="#stay" dynamic="true"> <DetectSpaces /> - <RegExpr attribute="Keyword" context="#pop#pop" String="%1" column="0" dynamic="true" endRegion="HereDocument"/> + <RegExpr attribute="Keyword" context="#pop#pop" String="^%1\b" column="0" dynamic="true" endRegion="HereDocument"/> <RegExpr attribute="Keyword" context="here_document" String="\=\s*<<\s*["']?([A-Z0-9_\-]+)["']?" beginRegion="HEREDoc" /> <IncludeRules context="ipstring_internal" /> </context> diff --git a/kate/data/php.xml b/kate/data/php.xml index f195b956e..3abd5e26d 100644 --- a/kate/data/php.xml +++ b/kate/data/php.xml @@ -64,7 +64,7 @@ Changes: <!ENTITY types "int|integer|bool|boolean|float|double|real|string|array|object"> ]> -<language name="PHP/PHP" indenter="cstyle" version="1.45" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true"> +<language name="PHP/PHP" indenter="cstyle" version="1.44" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true"> <highlighting> <list name="control structures"> <item>as</item> diff --git a/kate/data/prolog.xml b/kate/data/prolog.xml index 269c30776..905b59493 100644 --- a/kate/data/prolog.xml +++ b/kate/data/prolog.xml @@ -105,7 +105,7 @@ to make the rules more expressive. --> <!ENTITY bs "\"> ]> <language name="Prolog" section="Sources" - version="1.1-2" kateversion="2.3" + version="1.2-1" kateversion="2.3" mimetype="text/x-prolog" extensions="*.prolog;*.dcg;*.pro" author="Torsten Eichstädt (torsten.eichstaedt@web.de)" @@ -656,7 +656,6 @@ TODO sorted by priority <DetectChar char="&cut;" context="#stay" attribute="Normal Text" /> <DetectChar char="&bar;" context="#stay" attribute="other built-in operator" /> <Detect2Chars lookAhead="true" char="˙" 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" > @@ -669,7 +668,6 @@ TODO sorted by priority <DetectChar char="&cut;" context="#stay" attribute="Logic & Control" /> <DetectChar char="&bar;" context="#stay" attribute="Normal Text" /> <Detect2Chars lookAhead="true" char="˙" char1="(" context="list_functor" attribute="Normal Text" /> - <RegExpr String="&fullstop_iso;" context="#stay" attribute="Warning (!use background)" /> <IncludeRules context="atomic" /> </context> @@ -702,7 +700,6 @@ TODO sorted by priority <DetectChar char="," context="#stay" attribute="Syntax Error" /> <!-- bar & dot could be a user-def'd op, pre-def'd ops could be redef'd; else these were errors --> <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> diff --git a/kate/data/qt4.xml b/kate/data/qt4.xml index ba9481154..6ce265e35 100644 --- a/kate/data/qt4.xml +++ b/kate/data/qt4.xml @@ -11,9 +11,10 @@ <language name="C++/Qt4" section="Sources" - version="1.5-1" + version="1.9-1" kateversion="2.4" indenter="cstyle" + style="C++" 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)" @@ -472,8 +473,13 @@ <item> Q_DECL_CONSTEXPR </item> <item> Q_DECL_CONSTRUCTOR_DEPRECATED </item> <item> Q_DECL_DEPRECATED </item> + <item> Q_DECL_FINAL </item> <item> Q_DECL_HIDDEN </item> <item> Q_DECL_IMPORT </item> + <item> Q_DECL_OVERRIDE </item> + <item> Q_DECL_NOEXCEPT </item> + <item> Q_DECL_NOTHROW </item> + <item> Q_NULLPTR </item> <item> Q_DECL_VARIABLE_DEPRECATED </item> <item> Q_DESTRUCTOR_FUNCTION </item> <item> Q_DESTRUCTOR_FUNCTION0 </item> diff --git a/kate/data/rest.xml b/kate/data/rest.xml index 76c476a7a..1c86f0084 100644 --- a/kate/data/rest.xml +++ b/kate/data/rest.xml @@ -1,98 +1,109 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE language SYSTEM "language.dtd" [ - <!ENTITY inlinestart "(^|[\s'"\(\[-{</:‘“’«¡¿‐‑‒–— ])"> - <!ENTITY inlineend "([\s’”»‐‑‒–— '"\)\]}>-/:\.,;!\?\\]|$)"> - <!ENTITY SimpleReferenceNameChars "\w-_\.:\+"> + <!ENTITY inlinestart "(^|[-\s'"\(\[{</:‘“’«¡¿‐‑‒–— ])"> + <!ENTITY inlineend "(?=[-\s’”»‐‑‒–— '"\)\]}>/:\.,;!\?\\]|$)"> + <!ENTITY SimpleReferenceNameChars "\w_\.:\+-"> ]> -<!-- Copyright Matt Williams <matt@milliams.com> June 2010 --> -<language name="reStructuredText" extensions="*.rst" section="Markup" mimetype="text/x-rst" version="1.02" kateversion="2.4" casesensitive="1"> - - <highlighting> - - <contexts> - <context name="Normal" attribute="Normal" lineEndContext="#stay"> - <RegExpr attribute="Bold" context="#stay" String="&inlinestart;\*\*[^\s].*\*\*&inlineend;" minimal="true"/> - <RegExpr attribute="Italic" context="#stay" String="&inlinestart;\*[^\s].*\*&inlineend;" minimal="true"/> - <RegExpr attribute="InlineLiteral" context="#stay" String="&inlinestart;``[^\s].*``&inlineend;" minimal="true"/> - <RegExpr attribute="SubstitutionReference" context="#stay" String="&inlinestart;\|[^\s].*\|&inlineend;" minimal="true"/> - <RegExpr attribute="InlineInternalTarget" context="#stay" String="&inlinestart;_`[^\s].*`&inlineend;" minimal="true"/> - <RegExpr attribute="Normal" context="#stay" String="&inlinestart;\[[^\s].*\]&inlineend;" minimal="true"/> <!--This is to stop greedy matching of [foo]--> - <RegExpr attribute="FootnoteReference" context="#stay" String="&inlinestart;\[[^\s].*\]_&inlineend;" minimal="true"/> - <RegExpr attribute="HyperlinkRefOrInterpretedText" context="#stay" String="&inlinestart;`[^\s].*(`|`_)&inlineend;" minimal="true"/> - <RegExpr attribute="HyperlinkReference" context="#stay" String="\w+_(\s|$)" minimal="true"/> - <RegExpr attribute="Role" String=":[^:]+:" context="Role" /> - <DetectChar attribute="Field" context="Field" firstNonSpace="true" char=":"/> - <RegExpr attribute="Footnote" context="#stay" String="^\s*\.\. \[(\d+|#|\*|#[&SimpleReferenceNameChars;]+)\]\s" minimal="true" firstNonSpace="true"/> - <RegExpr attribute="Citation" context="#stay" String="^\s*\.\. \[[&SimpleReferenceNameChars;]+\]\s" minimal="true" firstNonSpace="true"/> - <RegExpr attribute="HyperlinkTarget" context="#stay" String="^\s*(\.\. (__:|_[&SimpleReferenceNameChars; ]+:(\s|$))|__ )" minimal="true" firstNonSpace="true"/> - <RegExpr attribute="CMakeCode" String="\s*\.\. code-block::\s*cmake$" context="CMakeCodeBlock" /> - <RegExpr attribute="CppCode" String="\s*\.\. code-block::\s*c\+\+" context="CppCodeBlock" /> - <RegExpr attribute="Directive" context="#stay" String="^\s*\.\. [\w-_\.]+::(\s|$)" minimal="true" firstNonSpace="true"/> - <RegExpr attribute="Code" String="::$" context="CodeBlock" /> - <RegExpr attribute="SubstitutionDefinition" context="#stay" String="^\s*\.\. \|[&SimpleReferenceNameChars; ]+\|\s+[&SimpleReferenceNameChars;]+::\s" minimal="true" firstNonSpace="true"/> - </context> - <context name="Field" attribute="Field" lineEndContext="#stay"> - <DetectChar attribute="Field" context="#pop" char=":"/> - <Detect2Chars attribute="Field" context="#stay" char="\" char1=":"/> - </context> - <context name="HyperlinkRefOrInterpretedText" attribute="HyperlinkRefOrInterpretedText" lineEndContext="#pop"> - <DetectChar attribute="HyperlinkRefOrInterpretedText" char="`" context="#pop" /> +<!-- + This file is part of KDE's kate project. + + Copyright 2010 Matt Williams (matt@milliams.com) + Copyright 2014 Matthew Woehlke (mw_triad@users.sourceforge.net) + --> +<language name="reStructuredText" extensions="*.rst" section="Markup" mimetype="text/x-rst" version="1.4" kateversion="2.4" casesensitive="1"> + + <highlighting> + + <contexts> + <context name="Normal" attribute="Normal" lineEndContext="#stay"> + <RegExpr attribute="Bold" context="#stay" String="&inlinestart;\*\*[^\s].*\*\*&inlineend;" minimal="true"/> + <RegExpr attribute="Italic" context="#stay" String="&inlinestart;\*[^\s].*\*&inlineend;" minimal="true"/> + <IncludeRules context="InlineMarkup"/> + <RegExpr attribute="Footnote" context="#stay" String="^\s*\.\. \[(\d+|#|\*|#[&SimpleReferenceNameChars;]+)\]\s" minimal="true" column="0"/> + <RegExpr attribute="Citation" context="#stay" String="^\s*\.\. \[[&SimpleReferenceNameChars;]+\]\s" minimal="true" column="0"/> + <RegExpr attribute="HyperlinkTarget" context="#stay" String="^\s*(\.\. (__:|_[&SimpleReferenceNameChars; ]+:(\s|$))|__ )" minimal="true" column="0"/> + <RegExpr attribute="Code" String="^\s*\.\. code-block::" context="CodeBlock" column="0"/> + <RegExpr attribute="Directive" context="#stay" String="^\s*\.\. [\w-_\.]+::(\s|$)" minimal="true" column="0"/> + <RegExpr attribute="Code" String="::$" context="CodeBlock" /> + <RegExpr attribute="SubstitutionDefinition" context="#stay" String="^\s*\.\. \|[&SimpleReferenceNameChars; ]+\|\s+[&SimpleReferenceNameChars;]+::\s" minimal="true" column="0"/> + <RegExpr attribute="Field" String=":(?=([^:]*\\:)*[^:]*:(\s|$))" context="Field" firstNonSpace="true"/> + <RegExpr attribute="Comment" context="Comment" String="^(\s*)\.\.\s(?![\w-_\.]+::(\s|$))" column="0"/> + </context> + + <context name="InlineMarkup" attribute="Normal" lineEndContext="#stay"> + <RegExpr attribute="InlineLiteral" context="#stay" String="&inlinestart;``[^\s].*``&inlineend;" minimal="true"/> + <RegExpr attribute="SubstitutionReference" context="#stay" String="&inlinestart;\|[^\s].*\|&inlineend;" minimal="true"/> + <RegExpr attribute="InlineInternalTarget" context="#stay" String="&inlinestart;_`[^\s].*`&inlineend;" minimal="true"/> + <RegExpr attribute="FootnoteReference" context="#stay" String="&inlinestart;\[[&SimpleReferenceNameChars;]+\]_&inlineend;" minimal="true"/> + <RegExpr attribute="HyperlinkReference" context="#stay" String="&inlinestart;`[^\s].*`_&inlineend;" minimal="true"/> + <RegExpr attribute="HyperlinkReference" context="#stay" String="&inlinestart;\w+_&inlineend;" minimal="true"/> + <RegExpr attribute="InterpretedText" context="TrailingRole" String="&inlinestart;`[^\s].*`(?=:[\w-_\.\+]+:)" minimal="true"/> + <RegExpr attribute="Role" String=":[\w-_\.\+]+:(?=`)" context="Role"/> + </context> + + <context name="Field" attribute="Field" lineEndContext="#stay"> + <DetectChar attribute="Field" context="#pop" char=":"/> + <Detect2Chars attribute="Field" context="#stay" char="\" char1=":"/> + <RegExpr attribute="FieldBold" context="#stay" String="&inlinestart;\*\*[^\s].*\*\*&inlineend;" minimal="true"/> + <RegExpr attribute="FieldItalic" context="#stay" String="&inlinestart;\*[^\s].*\*&inlineend;" minimal="true"/> + <IncludeRules context="InlineMarkup"/> + </context> + <context name="InterpretedText" attribute="InterpretedText" lineEndContext="#pop"> + <DetectChar attribute="InterpretedText" char="`" context="#pop" /> </context> <context name="Role" attribute="Role" lineEndContext="#pop"> - <RegExpr attribute="Keyword" String="\w+" context="#stay" /> - <DetectChar attribute="HyperlinkRefOrInterpretedText" char="`" context="#pop!HyperlinkRefOrInterpretedText" /> + <DetectChar attribute="InterpretedText" char="`" context="#pop!InterpretedText" /> </context> - <context name="CMakeCodeBlock" attribute="CMakeCode" lineEndContext="#stay"> - <RegExpr attribute="CMakeCode" String="^\s" context="CMakeCode" /> + <context name="TrailingRole" attribute="Role" lineEndContext="#pop"> + <RegExpr attribute="Role" String=":[\w-_\.\+]+:" context="#pop"/> </context> - <context name="CppCodeBlock" attribute="CppCode" lineEndContext="#stay"> - <RegExpr attribute="CppCode" String="^\s" context="CppCode" /> + <context name="Comment" attribute="Comment" lineEndContext="#stay" dynamic="true"> + <RegExpr attribute="Code" String="^%1 " context="#stay" column="0" dynamic="true"/> + <RegExpr attribute="Normal" String="^(.|$)" lookAhead="true" column="0" context="#pop"/> + <IncludeRules context="##Alerts"/> </context> + <context name="CodeBlock" attribute="Code" lineEndContext="#stay"> - <RegExpr attribute="Code" String="^\s" context="Code" /> + <RegExpr attribute="Code" String="^(\s+)(?=\S)" context="Code" column="0"/> </context> - <context name="CMakeCode" attribute="CMakeCode" lineEndContext="#stay"> - <RegExpr attribute="Normal" String="^\S" lookAhead="true" context="#pop#pop" /> - <IncludeRules context="##CMake" includeAttrib="true"/> - </context> - <context name="CppCode" attribute="CppCode" lineEndContext="#stay"> - <RegExpr attribute="Normal" String="^\S" lookAhead="true" context="#pop#pop" /> - <IncludeRules context="##C++" includeAttrib="true"/> + <context name="Code" attribute="Code" lineEndContext="#stay" dynamic="true"> + <RegExpr attribute="Code" String="^%1" context="#stay" column="0" dynamic="true"/> + <RegExpr attribute="Normal" String="^(.|$)" lookAhead="true" context="#pop#pop" column="0"/> </context> - <context name="Code" attribute="Code" lineEndContext="#stay"> - <RegExpr attribute="Normal" String="^\S" lookAhead="true" context="#pop#pop" /> - </context> - </contexts> - - <itemDatas> - <itemData name="Normal" defStyleNum="dsNormal" /> - <itemData name="Bold" defStyleNum="dsNormal" bold="1" /> - <itemData name="Italic" defStyleNum="dsNormal" italic="1" /> - <itemData name="InlineLiteral" defStyleNum="dsDataType" /> - <itemData name="SubstitutionReference" defStyleNum="dsFunction" /> - <itemData name="InlineInternalTarget" defStyleNum="dsFunction" /> - <itemData name="FootnoteReference" defStyleNum="dsOthers" /> - <itemData name="HyperlinkRefOrInterpretedText" defStyleNum="dsOthers" /> - <itemData name="HyperlinkReference" defStyleNum="dsOthers" /> - <itemData name="Monospaced" defStyleNum="dsNormal" color="#006600" /> - <itemData name="Field" defStyleNum="dsFunction" /> - <itemData name="Footnote" defStyleNum="dsDataType" /> - <itemData name="Citation" defStyleNum="dsDataType" /> - <itemData name="HyperlinkTarget" defStyleNum="dsDataType" /> - <itemData name="Directive" defStyleNum="dsDataType" /> - <itemData name="SubstitutionDefinition" defStyleNum="dsDataType" /> - <itemData name="Role" defStyleNum="dsNormal" bold="1" /> - <itemData name="CMakeCode" defStyleNum="dsDataType" /> - <itemData name="CppCode" defStyleNum="dsDataType" /> + </contexts> + + <itemDatas> + <itemData name="Normal" defStyleNum="dsNormal" /> + <itemData name="Bold" defStyleNum="dsNormal" bold="1" /> + <itemData name="Italic" defStyleNum="dsNormal" italic="1" /> + <itemData name="InlineLiteral" defStyleNum="dsDataType" /> + <itemData name="SubstitutionReference" defStyleNum="dsFunction" /> + <itemData name="InlineInternalTarget" defStyleNum="dsFunction" /> + <itemData name="FootnoteReference" defStyleNum="dsOthers" /> + <itemData name="InterpretedText" defStyleNum="dsDecVal" /> + <itemData name="HyperlinkReference" defStyleNum="dsOthers" /> + <itemData name="Field" defStyleNum="dsFunction" /> + <itemData name="FieldBold" defStyleNum="dsFunction" bold="1" /> + <itemData name="FieldItalic" defStyleNum="dsFunction" italic="1" /> + <itemData name="Footnote" defStyleNum="dsDataType" /> + <itemData name="Citation" defStyleNum="dsDataType" /> + <itemData name="HyperlinkTarget" defStyleNum="dsDataType" /> + <itemData name="Directive" defStyleNum="dsDataType" /> + <itemData name="SubstitutionDefinition" defStyleNum="dsDataType" /> + <itemData name="Role" defStyleNum="dsKeyword" /> <itemData name="Code" defStyleNum="dsDataType" /> - </itemDatas> - - </highlighting> - - <general> - <folding indentationsensitive="true" /> - </general> - + <itemData name="Comment" defStyleNum="dsComment" /> + </itemDatas> + + </highlighting> + + <general> + <folding indentationsensitive="true" /> + <comments> + <comment name="singleLine" start=".."/> + </comments> + </general> + </language> diff --git a/kate/data/rhtml.xml b/kate/data/rhtml.xml index 19fa0ace8..560fb6d77 100644 --- a/kate/data/rhtml.xml +++ b/kate/data/rhtml.xml @@ -44,7 +44,7 @@ --> <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". --> -<language name="Ruby/Rails/RHTML" version="1.02" 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.4" section="Markup" extensions="*.rhtml;*.html.erb" mimetype="" author="Richard Dale rdale@foton.es" license="LGPL"> <highlighting> diff --git a/kate/data/scss.xml b/kate/data/scss.xml index 69a5826a6..9aa1ad80c 100644 --- a/kate/data/scss.xml +++ b/kate/data/scss.xml @@ -1,5 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE language SYSTEM "language.dtd"> +<!DOCTYPE language SYSTEM "language.dtd" +[ + <!-- http://www.w3.org/TR/CSS21/syndata.html#tokenization --> + <!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])"> +]> <!-- @@ -20,7 +25,7 @@ Changelog: --> -<language name="SCSS" version="2.04" kateversion="2.4" section="Markup" extensions="*.scss" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> +<language name="SCSS" version="2.05" kateversion="2.4" section="Markup" extensions="*.scss" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> <highlighting> <list name="properties"> @@ -680,7 +685,7 @@ Changelog: <DetectChar attribute="Property" context="RuleSet" char="{" beginRegion="ruleset" /> <!--parse selectors--> <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 --git a/kate/data/update-files.xml b/kate/data/update-files.xml index b8336b001..db29db381 100644 --- a/kate/data/update-files.xml +++ b/kate/data/update-files.xml @@ -23,7 +23,7 @@ <Definition name="Bash" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/bash.xml" version="2.17-1"/> <Definition name="BibTeX" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/bibtex.xml" version="1.17"/> <Definition name="B-Method" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/bmethod.xml" version="0.2"/> -<Definition name="CleanCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ccss.xml" version="1.0"/> +<Definition name="CleanCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ccss.xml" version="1.1"/> <Definition name="CGiS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cgis.xml" version="1.02"/> <Definition name="Cg" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cg.xml" version="1.11"/> <Definition name="ChangeLog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/changelog.xml" version="1.04"/> @@ -31,21 +31,21 @@ <Definition name="Cisco" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cisco.xml" version="1.10"/> <Definition name="Clipper" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/clipper.xml" version="1.05"/> <Definition name="Clojure" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/clojure.xml" version="2-1"/> -<Definition name="CMake" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cmake.xml" version="1.29-1"/> -<Definition name="CoffeeScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/coffee.xml" version="1.5"/> +<Definition name="CMake" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cmake.xml" version="1.30-1"/> +<Definition name="CoffeeScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/coffee.xml" version="1.4"/> <Definition name="ColdFusion" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/coldfusion.xml" version="1.04"/> <Definition name="Common Lisp" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/commonlisp.xml" version="1.05-1"/> <Definition name="Component-Pascal" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/component-pascal.xml" version="1.05"/> <Definition name="ConTeXt" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/context.xml" version="1.1"/> <Definition name="Crack" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/crk.xml" version="1.1"/> -<Definition name="CSS/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css-php.xml" version="2.08"/> -<Definition name="CSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css.xml" version="2.08"/> +<Definition name="CSS/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css-php.xml" version="2.09"/> +<Definition name="CSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css.xml" version="2.09"/> <Definition name="C#" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cs.xml" version="1.15"/> <Definition name="CUE Sheet" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cue.xml" version="0.91"/> <Definition name="Curry" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/curry.xml" version="0.3"/> <Definition name="C" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/c.xml" version="1.45"/> <Definition name="Ddoc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ddoc.xml" version="1.15"/> -<Definition name="Debian Changelog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/debianchangelog.xml" version="0.68"/> +<Definition name="Debian Changelog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/debianchangelog.xml" version="0.69"/> <Definition name="Debian Control" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/debiancontrol.xml" version="0.84"/> <Definition name=".desktop" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/desktop.xml" version="1.05-1"/> <Definition name="Diff" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/diff.xml" version="1.11"/> @@ -53,7 +53,7 @@ <Definition name="MS-DOS Batch" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/dosbat.xml" version="0.30"/> <Definition name="dot" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/dot.xml" version="1.1"/> <Definition name="DoxygenLua" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/doxygenlua.xml" version="1.01"/> -<Definition name="Doxygen" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/doxygen.xml" version="1.35-1"/> +<Definition name="Doxygen" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/doxygen.xml" version="1.36-1"/> <Definition name="DTD" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/dtd.xml" version="1.02"/> <Definition name="D" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/d.xml" version="1.62-1"/> <Definition name="Eiffel" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/eiffel.xml" version="1.02"/> @@ -69,7 +69,7 @@ <Definition name="FSharp" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/fsharp.xml" version="0.0.1"/> <Definition name="fstab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/fstab.xml" version="1.00"/> <Definition name="GAP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gap.xml" version="0.2-1"/> -<Definition name="GCCExtensions" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gcc.xml" version="0.3"/> +<Definition name="GCCExtensions" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gcc.xml" version="0.4"/> <Definition name="GDB Backtrace" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gdb.xml" version="1.0-1"/> <Definition name="GDL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gdl.xml" version="1.01"/> <Definition name="GNU Gettext" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gettext.xml" version="2.00-1"/> @@ -78,7 +78,7 @@ <Definition name="GLSL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/glsl.xml" version="1.03"/> <Definition name="GNU Assembler" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gnuassembler.xml" version="1.10-1"/> <Definition name="Gnuplot" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gnuplot.xml" version="0.1"/> -<Definition name="Go" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/go.xml" version="1.04-1"/> +<Definition name="Go" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/go.xml" version="1.05-1"/> <Definition name="KDev-PG[-Qt] Grammar" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/grammar.xml" version="0.24-1"/> <Definition name="Haml" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/haml.xml" version="1.1"/> <Definition name="Haskell" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/haskell.xml" version="2.2"/> @@ -89,11 +89,11 @@ <Definition name="ILERPG" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ilerpg.xml" version="1.05-1"/> <Definition name="Inform" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/inform.xml" version="1.23-1"/> <Definition name="INI Files" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ini.xml" version="1.1"/> -<Definition name="ISO C++" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/isocpp.xml" version="2.1-1"/> +<Definition name="ISO C++" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/isocpp.xml" version="2.4-1"/> <Definition name="Jam" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/jam.xml" version="0.3"/> <Definition name="Javadoc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javadoc.xml" version="1.04"/> -<Definition name="JavaScript/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javascript-php.xml" version="1.23"/> -<Definition name="JavaScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javascript.xml" version="1.23"/> +<Definition name="JavaScript/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javascript-php.xml" version="1.22"/> +<Definition name="JavaScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javascript.xml" version="1.22"/> <Definition name="Java" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/java.xml" version="1.21"/> <Definition name="JSON" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/json.xml" version="1.3"/> <Definition name="JSP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/jsp.xml" version="1.02"/> @@ -112,8 +112,8 @@ <Definition name="M3U" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/m3u.xml" version="1.10-1"/> <Definition name="GNU M4" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/m4.xml" version="1.1-1"/> <Definition name="MAB-DB" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mab.xml" version="1.03"/> -<Definition name="Makefile" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/makefile.xml" version="2.0"/> -<Definition name="Mako" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mako.xml" version="1.1"/> +<Definition name="Makefile" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/makefile.xml" version="2.1"/> +<Definition name="Mako" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mako.xml" version="1.0"/> <Definition name="Mason" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mason.xml" version="1.06"/> <Definition name="Mathematica" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mathematica.xml" version="8.0.4"/> <Definition name="Matlab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/matlab.xml" version="1.31-1"/> @@ -123,7 +123,7 @@ <Definition name="mergetag text" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mergetagtext.xml" version="0.1"/> <Definition name="MIPS Assembler" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mips.xml" version="1.03"/> <Definition name="Modelica" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/modelica.xml" version="3.2-1"/> -<Definition name="Modelines" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/modelines.xml" version="1.0-1"/> +<Definition name="Modelines" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/modelines.xml" version="1.2-1"/> <Definition name="Modula-2" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/modula-2.xml" version="1.03"/> <Definition name="MonoBasic" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/monobasic.xml" version="1.01"/> <Definition name="Music Publisher" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mup.xml" version="1.06"/> @@ -140,9 +140,9 @@ <Definition name="OpenCL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/opencl.xml" version="1.44"/> <Definition name="Pango" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pango.xml" version="0.1"/> <Definition name="Pascal" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pascal.xml" version="1.23"/> -<Definition name="Perl" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/perl.xml" version="1.29-1"/> +<Definition name="Perl" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/perl.xml" version="1.29-2"/> <Definition name="PGN" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pgn.xml" version="2.01-1"/> -<Definition name="PHP/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/php.xml" version="1.45"/> +<Definition name="PHP/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/php.xml" version="1.44"/> <Definition name="PicAsm" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/picsrc.xml" version="1.07"/> <Definition name="Pig" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pig.xml" version="3.0"/> <Definition name="Pike" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pike.xml" version="1.07"/> @@ -150,21 +150,21 @@ <Definition name="POV-Ray" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/povray.xml" version="1.2.1"/> <Definition name="PostScript Printer Description" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ppd.xml" version="0.1"/> <Definition name="progress" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/progress.xml" version="1.10"/> -<Definition name="Prolog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/prolog.xml" version="1.1-2"/> +<Definition name="Prolog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/prolog.xml" version="1.2-1"/> <Definition name="Protobuf" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/protobuf.xml" version="2.40"/> <Definition name="Puppet" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/puppet.xml" version="1.18"/> <Definition name="PureBasic" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/purebasic.xml" version="3.91"/> <Definition name="Python" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/python.xml" version="2.22"/> <Definition name="QMake" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/qmake.xml" version="1.2"/> <Definition name="QML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/qml.xml" version="1.4"/> -<Definition name="C++/Qt4" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/qt4.xml" version="1.5-1"/> +<Definition name="C++/Qt4" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/qt4.xml" version="1.9-1"/> <Definition name="RapidQ" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rapidq.xml" version="1.01"/> <Definition name="RelaxNG-Compact" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/relaxngcompact.xml" version="0.2"/> <Definition name="RELAX NG" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/relaxng.xml" version="0.8"/> <Definition name="Restructured Text" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/restructuredtext.xml" version="1.0"/> -<Definition name="reStructuredText" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rest.xml" version="1.02"/> +<Definition name="reStructuredText" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rest.xml" version="1.4"/> <Definition name="REXX" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rexx.xml" version="1.01"/> -<Definition name="Ruby/Rails/RHTML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rhtml.xml" version="1.02"/> +<Definition name="Ruby/Rails/RHTML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rhtml.xml" version="1.01"/> <Definition name="RenderMan RIB" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rib.xml" version="1.00"/> <Definition name="RPM Spec" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rpmspec.xml" version="2.03"/> <Definition name="RSI IDL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rsiidl.xml" version="1.04"/> @@ -174,7 +174,7 @@ <Definition name="Scala" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scala.xml" version="1.0"/> <Definition name="Scheme" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scheme.xml" version="1.13-1"/> <Definition name="scilab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sci.xml" version="1.03"/> -<Definition name="SCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scss.xml" version="2.04"/> +<Definition name="SCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scss.xml" version="2.05"/> <Definition name="sed" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sed.xml" version="1.0"/> <Definition name="SGML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sgml.xml" version="1.02"/> <Definition name="Sieve" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sieve.xml" version="1.05"/> |