diff options
Diffstat (limited to 'kate/data/isocpp.xml')
| -rw-r--r-- | kate/data/isocpp.xml | 45 |
1 files changed, 13 insertions, 32 deletions
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 ([email protected])" @@ -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> |