summaryrefslogtreecommitdiffstats
path: root/kate
diff options
context:
space:
mode:
Diffstat (limited to 'kate')
-rw-r--r--kate/data/cmake.xml13
-rw-r--r--kate/data/isocpp.xml (renamed from kate/data/cpp.xml)10
-rw-r--r--kate/data/qt4.xml38
-rw-r--r--kate/data/update-files.xml6
4 files changed, 40 insertions, 27 deletions
diff --git a/kate/data/cmake.xml b/kate/data/cmake.xml
index b20c1dcaa..692451395 100644
--- a/kate/data/cmake.xml
+++ b/kate/data/cmake.xml
@@ -26,7 +26,17 @@
**********************************************************************
-->
<!-- generated for "cmake version 2.8.12.1" -->
-<language name="CMake" version="1.26-1" kateversion="2.4" section="Other" extensions="CMakeLists.txt;*.cmake;" mimetype="" author="Alexander Neundorf (neundorf@kde.org)" license="LGPL">
+<language
+ name="CMake"
+ version="1.29-1"
+ kateversion="2.4"
+ section="Other"
+ extensions="CMakeLists.txt;*.cmake;*.cmake.in"
+ style="CMake"
+ mimetype=""
+ author="Alexander Neundorf (neundorf@kde.org)"
+ license="LGPL"
+ >
<highlighting>
<!-- ATTENTION Do not change the list name! Or change a generation script accordingly -->
@@ -975,7 +985,6 @@
</context>
<context attribute="Comment" lineEndContext="#stay" name="RST Documentation" dynamic="true">
<RegExpr attribute="Region Marker" context="#pop" String="^#?\]%1\]" dynamic="true" column="0" />
- <IncludeRules context="##reStructuredText" />
</context>
<context attribute="Comment" lineEndContext="#stay" name="Bracketed Comment" dynamic="true">
<RegExpr attribute="Comment" context="#pop" String="^#?\]%1\]" dynamic="true" column="0" />
diff --git a/kate/data/cpp.xml b/kate/data/isocpp.xml
index 48aed711c..c817dc485 100644
--- a/kate/data/cpp.xml
+++ b/kate/data/isocpp.xml
@@ -9,16 +9,16 @@
<!ENTITY convspec "diouxXeEfFgGaAcsP&#37;">
]>
<language
- name="C++"
+ name="ISO C++"
section="Sources"
- version="2.0-1"
+ version="2.1-1"
kateversion="2.4"
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"
author="Alex Turbov (i.zaufi@gmail.com)"
license="LGPL"
- priority="9"
+ priority="6"
>
<!--
Complete list of changes by Alex Turbov (I.zaufi@gmail.com)
@@ -397,7 +397,7 @@
<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;]" />
+ <RegExpr attribute="String Char" context="#stay" String="%[^&quot;&convspec;\s]*[&convspec;]" />
<DetectChar attribute="String" context="UDLStringSuffix" char="&quot;" />
</context>
@@ -417,7 +417,7 @@
<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 Char" context="#stay" String="%[^&quot;&convspec;\s]*[&convspec;]" />
<RegExpr attribute="String" context="#pop" String="\)%2&quot;" dynamic="true"/>
</context>
diff --git a/kate/data/qt4.xml b/kate/data/qt4.xml
index 2c1d1e099..ba9481154 100644
--- a/kate/data/qt4.xml
+++ b/kate/data/qt4.xml
@@ -11,32 +11,26 @@
<language
name="C++/Qt4"
section="Sources"
- version="1.2"
+ version="1.5-1"
kateversion="2.4"
indenter="cstyle"
- extensions="*.moc"
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="6"
+ priority="9"
>
<!--
The main purpose of this file is to hold Qt extensions syntax in a single place,
so later it can be included (using IncludeRules) to other (C++ based) syntaxes.
- NOTE Default colors are set to 'Normal Text', so if u don't want to highlight Qt stuff,
- just leave colors as is...
-
Based on Qt 4.8 documentation (http://qt-project.org/doc/qt-4.8/)
-->
<highlighting>
- <list name="Qt4Extensions">
+ <list name="Qt4Macros">
<item> emit </item>
<item> signals </item>
<item> slots </item>
- </list>
-
- <list name="Qt4Macros">
<item> foreach </item>
<item> forever </item>
<item> SIGNAL </item>
@@ -404,6 +398,11 @@
<item> QT_WA </item>
<item> QT_WA_INLINE </item>
<item> QT_WIN_CALLBACK </item>
+ <item> QT_USE_NAMESPACE </item>
+ <item> QT_BEGIN_NAMESPACE </item>
+ <item> QT_END_NAMESPACE </item>
+ <item> QT_BEGIN_HEADER </item>
+ <item> QT_END_HEADER </item>
<item> Q_ALIGNOF </item>
<item> Q_ASSERT </item>
<item> Q_ASSERT_X </item>
@@ -576,6 +575,12 @@
<item> Q_WS_WINCE </item>
<item> Q_WS_WINCE_WM </item>
<item> Q_WS_X11 </item>
+ <!-- arguments for Q_DECLARE_TYPEINFO, not really macros but good if highlighted like that -->
+ <item> Q_COMPLEX_TYPE </item>
+ <item> Q_PRIMITIVE_TYPE </item>
+ <item> Q_STATIC_TYPE </item>
+ <item> Q_MOVABLE_TYPE </item>
+ <item> Q_DUMMY_TYPE </item>
</list>
<list name="Qt4Classes">
@@ -647,6 +652,7 @@
<item> QBitArray </item>
<item> QBitmap </item>
<item> QBoxLayout </item>
+ <item> QBool </item>
<item> QBrush </item>
<item> QBuffer </item>
<item> QButtonGroup </item>
@@ -1554,14 +1560,13 @@
<!-- Base context for C++ and Qt highlighting to be used as standalone syntax -->
<context attribute="Normal Text" lineEndContext="#stay" name="Normal">
<IncludeRules context="DetectQt4Extensions" />
- <IncludeRules context="##C++" />
+ <IncludeRules context="##ISO C++" />
</context>
<!-- This context can be used from other (alternative) C++ syntax files
To use it just <IncludeRules context="DetectQt4Extensions##Qt4/C++" />
-->
<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" />
@@ -1582,11 +1587,10 @@
<itemDatas>
<itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false" />
- <itemData name="Qt4 Extensions" defStyleNum="dsOthers" spellChecking="false" />
- <itemData name="Qt4 Types" defStyleNum="dsOthers" spellChecking="false" />
- <itemData name="Qt4 Classes" defStyleNum="dsOthers" spellChecking="false" />
- <itemData name="Qt4 Functions" defStyleNum="dsOthers" spellChecking="false" />
- <itemData name="Qt4 Macros" defStyleNum="dsOthers" spellChecking="false" />
+ <itemData name="Qt4 Macros" defStyleNum="dsKeyword" color="#0095ff" selColor="#ffffff" bold="1" italic="0" spellChecking="false" />
+ <itemData name="Qt4 Types" defStyleNum="dsDataType" spellChecking="false" />
+ <itemData name="Qt4 Classes" defStyleNum="dsOthers" spellChecking="false" />
+ <itemData name="Qt4 Functions" defStyleNum="dsFunction" spellChecking="false" />
</itemDatas>
</highlighting>
diff --git a/kate/data/update-files.xml b/kate/data/update-files.xml
index dde5c9847..466811438 100644
--- a/kate/data/update-files.xml
+++ b/kate/data/update-files.xml
@@ -31,13 +31,12 @@
<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.26-1"/>
+<Definition name="CMake" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cmake.xml" version="1.29-1"/>
<Definition name="CoffeeScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/coffee.xml" version="1.4"/>
<Definition name="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="C++" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cpp.xml" version="2.0-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"/>
@@ -90,6 +89,7 @@
<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="Jam" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/jam.xml" version="0.3"/>
<Definition name="Javadoc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javadoc.xml" version="1.04"/>
<Definition name="JavaScript/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javascript-php.xml" version="1.22"/>
@@ -157,7 +157,7 @@
<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++11/Qt4" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/qt4.xml" version="1.2"/>
+<Definition name="C++/Qt4" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/qt4.xml" version="1.5-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"/>
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 07:38:30 +0000