Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 8b8ca03e authored by Anders Lund's avatar Anders Lund

Using the new function default style. I really hope it works out resonably

well :-)

svn path=/trunk/kdelibs/kate/; revision=294847
parent 276e5749
......@@ -91,7 +91,7 @@
<itemData name="Normal" defStyleNum="dsNormal"/>
<itemData name="Keyword" defStyleNum="dsKeyword"/>
<itemData name="Builtin" defStyleNum="dsDataType"/>
<itemData name="Function" defStyleNum="dsKeyword"/>
<itemData name="Function" defStyleNum="dsFunction"/>
<itemData name="Decimal" defStyleNum="dsDecVal"/>
<itemData name="Float" defStyleNum="dsFloat"/>
<itemData name="String" defStyleNum="dsString"/>
......
......@@ -130,7 +130,7 @@
<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="Function" defStyleNum="dsFunction" bold="0"/>
<itemData name="Data Type" defStyleNum="dsDataType"/>
<itemData name="Decimal" defStyleNum="dsDecVal"/>
<itemData name="Octal" defStyleNum="dsBaseN"/>
......
......@@ -708,7 +708,7 @@
<itemData name="Script Strings" defStyleNum="dsNormal" color="#008080" selColor="#ffffff" bold="0" italic="0" />
<itemData name="Script Operators" defStyleNum="dsNormal" color="#0000ff" selColor="#ffffff" bold="0" italic="0" />
<itemData name="Script Keywords" defStyleNum="dsNormal" color="#0000cc" selColor="#ffffff" bold="1" italic="0" />
<itemData name="Script Functions" defStyleNum="dsNormal" color="#000080" selColor="#ffffff" bold="1" italic="0" />
<itemData name="Script Functions" defStyleNum="dsFunciton" bold="1" />
<itemData name="Script Objects" defStyleNum="dsNormal" color="#0000cc" selColor="#ffffff" bold="1" italic="0" />
</itemDatas>
......
......@@ -208,7 +208,7 @@
<itemData name="Normal Text" defStyleNum="dsNormal"/>
<itemData name="Keyword" defStyleNum="dsKeyword"/>
<itemData name="Extensions" defStyleNum="dsKeyword" color="#0095ff" selColor="#ffffff" bold="1" italic="0"/>
<itemData name="Function" defStyleNum="dsKeyword" color="#000080" selColor="#ffffff" bold="0" italic="0"/>
<itemData name="Function" defStyleNum="dsFunction" />
<itemData name="Data Type" defStyleNum="dsDataType"/>
<itemData name="Decimal" defStyleNum="dsDecVal"/>
<itemData name="Octal" defStyleNum="dsBaseN"/>
......
......@@ -138,7 +138,7 @@
<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="Function" defStyleNum="dsFunction"/>
<itemData name="Data Type" defStyleNum="dsDataType"/>
<itemData name="Decimal" defStyleNum="dsDecVal"/>
<itemData name="Octal" defStyleNum="dsBaseN"/>
......
......@@ -207,12 +207,12 @@
<context name="normal" attribute="Normal Text" lineEndContext="#stay">
<DetectChar attribute="Operators" context="#stay" char="{" beginRegion="Region1"/>
<DetectChar attribute="Operators" context="#stay" char="}" endRegion="Region1"/>
<HlCHex attribute="Integer" context="#stay" />
<HlCOct attribute="Integer" context="#stay" />
<Int attribute="Integer" context="#stay" />
<HlCHex attribute="Integer" context="#stay" />
<HlCOct attribute="Integer" context="#stay" />
<Int attribute="Integer" context="#stay" />
<Detect2Chars attribute="code_end" context="out_comment" char="'" char1="&gt;" />
<Detect2Chars attribute="Comment" context="comment" char="-" char1="-" />
<Detect2Chars attribute="Comment" context="comment" char="/" char1="/" />
<Detect2Chars attribute="Comment" context="comment" char="-" char1="-" />
<Detect2Chars attribute="Comment" context="comment" char="/" char1="/" />
<DetectChar attribute="Vector" context="string" char="&quot;" />
<AnyChar attribute="Operators" context="#stay" String="'[&amp;&gt;&lt;=:+\-*\|].,;" />
<keyword attribute="Data Type" context="#stay" String="Type"/>
......@@ -230,7 +230,7 @@
<context name="string" attribute="Vector" lineEndContext="#stay" >
<DetectChar attribute="Vector" context="#pop" char="&quot;" />
</context>
</context>
</contexts>
......@@ -238,15 +238,15 @@
<itemData name="OutSide E code" defStyleNum="dsComment"/>
<itemData name="Normal Text" defStyleNum="dsNormal" />
<itemData name="Keyword" defStyleNum="dsKeyword" />
<itemData name="Function" defStyleNum="dsNormal" color="#0000FF" selColor="#00ff00" bold="1" italic="0" />
<itemData name="Statement" defStyleNum="dsNormal" color="#8080FF" selColor="#00ff00" bold="1" italic="0" />
<itemData name="Action" defStyleNum="dsNormal" color="#FF8080" selColor="#00ff00" bold="1" italic="0" />
<itemData name="Function" defStyleNum="dsFunction" bold="1"/>
<itemData name="Statement" defStyleNum="dsNormal" color="#8080FF" selColor="#00ff00" bold="1" italic="0" />
<itemData name="Action" defStyleNum="dsNormal" color="#FF8080" selColor="#00ff00" bold="1" italic="0" />
<itemData name="Data Type" defStyleNum="dsDataType" />
<itemData name="Comment" defStyleNum="dsComment" />
<itemData name="Integer" defStyleNum="dsDecVal" />
<itemData name="Bit" defStyleNum="dsDecVal" />
<itemData name="Vector" defStyleNum="dsString" />
<itemData name="Operators" defStyleNum="dsNormal" color="#404000" selColor="#00ff00" bold="0" italic="0" />
<itemData name="Integer" defStyleNum="dsDecVal" />
<itemData name="Bit" defStyleNum="dsDecVal" />
<itemData name="Vector" defStyleNum="dsString" />
<itemData name="Operators" defStyleNum="dsNormal" color="#404000" selColor="#00ff00" bold="0" italic="0" />
</itemDatas>
</highlighting>
......
......@@ -192,7 +192,7 @@
<itemData name="Symbol" defStyleNum="dsNormal"/>
<itemData name="Preprocessor" defStyleNum="dsOthers"/>
<itemData name="Conditional" defStyleNum="dsOthers" color="#008000" selColor="#ffa0a0" bold="1" italic="0"/>
<itemData name="IO Function" defStyleNum="dsKeyword" color="#006060" selColor="#ffffff" bold="0" italic="0"/>
<itemData name="IO Function" defStyleNum="dsFunction" color="#006060" selColor="#ffffff" bold="0" italic="0"/>
<itemData name="Math Intrinsic" defStyleNum="dsKeyword" color="#600060" selColor="#ffa0ff" bold="1" italic="0"/>
</itemDatas>
</highlighting>
......
......@@ -365,8 +365,8 @@
<itemDatas>
<itemData name="Normal Text" defStyleNum="dsNormal"/>
<itemData name="Keyword" defStyleNum="dsKeyword"/>
<itemData name="Function" defStyleNum="dsOthers"/>
<itemData name="Function Definition" defStyleNum="dsOthers"/>
<itemData name="Function" defStyleNum="dsFunction"/>
<itemData name="Function Definition" defStyleNum="dsFunction"/>
<itemData name="Class" defStyleNum="dsKeyword"/>
<itemData name="Decimal" defStyleNum="dsDecVal"/>
<itemData name="Float" defStyleNum="dsFloat"/>
......
......@@ -271,7 +271,7 @@
<item> ofclass </item>
<item> or </item>
</list>
<list name="ClassDeclOps">
<item> with </item>
<item> private </item>
......@@ -282,20 +282,20 @@
<context attribute="Normal Text" lineEndContext="#stay" name="TopLevel">
<DetectChar attribute="Comment" context="comment" char="!" />
<DetectChar attribute="String" context="string" char="&quot;" />
<RegExpr attribute="Function" context="funcdef" beginRegion="reg_function"
<RegExpr attribute="Function" context="funcdef" beginRegion="reg_function"
String="[[]\s*[a-zA-Z_]+[a-zA-Z_0-9]*" />
<RegExpr String="^ *object |^ *class " attribute="Pragma"
<RegExpr String="^ *object |^ *class " attribute="Pragma"
context="ClassDecl"
insensitive="TRUE" beginRegion="reg_class" />
<keyword attribute="Pragma" context="#stay" String="pragmas" />
<keyword attribute="Pragma" context="#stay" String="inline_pragmas" />
<RegExpr attribute="Operator" context="#stay" String="--?>" />
<RegExpr attribute="Normal Text" context="#stay" String="[a-zA-Z_]+[0-9]*" />
<RegExpr attribute="Number" context="#stay" String="\$[0-9a-fA-F]{1,4}" />
<RegExpr attribute="Number" context="#stay" String="[0-9]+" />
<RegExpr attribute="Number" context="#stay" String="[0-9]+" />
</context>
<context name="Normal" attribute="Normal Text" lineEndContext="#stay">
......@@ -314,9 +314,9 @@
<RegExpr attribute="Number" context="#stay" String="\$[0-9a-fA-F]{1,4}" />
<RegExpr String="[a-zA-Z_]+[a-zA-Z_0-9]*" attribute="Normal Text" context="#stay" />
<RegExpr attribute="Number" context="#stay" String="[0-9]+" />
<DetectChar char="{" attribute="Keyword" context="#stay"
<DetectChar char="{" attribute="Keyword" context="#stay"
beginRegion="reg_compound" />
<DetectChar char="}" attribute="Keyword" context="#stay"
<DetectChar char="}" attribute="Keyword" context="#stay"
endRegion="reg_compound" />
<RegExpr attribute="Operator" context="#stay" String="[%&amp;()+-&lt;=&gt;{|}~]"/>
</context>
......@@ -331,7 +331,7 @@
<RegExpr attribute="Number" context="#stay" String="[0-9]+" />
</context>
<context name="funcdef" attribute="Normal Text" lineEndContext="#stay" >
<IncludeRules context="Normal" />
<Detect2Chars attribute="Function" context="#pop" char="]" char1=";"
......@@ -341,11 +341,11 @@
<context name="ClassDecl" attribute="Normal Text" lineEndContext="ClassDecl_1">
<IncludeRules context="PropDefVal rules" />
</context>
<context name="ClassDecl_1" attribute="Normal Text" lineEndContext="#stay">
<RegExpr String="^[\t ]*has " attribute="Keyword" context="has_decl" insensitive="TRUE"/>
<keyword String="ClassDeclOps" attribute="Keyword" context="#stay" />
<RegExpr String="[a-zA-Z_]+[a-zA-Z_0-9]*" context = "prop_def"
<RegExpr String="[a-zA-Z_]+[a-zA-Z_0-9]*" context = "prop_def"
attribute="Function"/>
<DetectChar char=";" context="#pop" attribute="Pragma" endRegion="reg_class"/>
</context>
......@@ -358,9 +358,9 @@
<context attribute="String" lineEndContext="#stay" name="string">
<DetectChar attribute="String" context="#pop" char="&quot;" />
</context>
<context name="prop_func_def" attribute="Normal Text" lineEndContext="#stay">
<DetectChar context="#pop" char="]" attribute="Function"
<DetectChar context="#pop" char="]" attribute="Function"
endRegion="reg_prop_func"/>
<IncludeRules context="Normal" />
</context>
......@@ -392,8 +392,8 @@
<itemData name="OpCode" defStyleNum="dsDecVal" color="#3015F0" selColor="#000000" bold="1" italic="0"/>
<itemData name="Values" defStyleNum="dsBaseN" color="#7020F0" selColor="#400000" bold="1" italic="0" />
<itemData name="Pragma" defStyleNum="dsOthers" color="#109010" selColor="#400000" bold="1" italic="0" />
<itemData name="PredefFunction" defStyleNum="dsNormal" color="#000090" selColor="#ffffff" bold="1" italic="0"/>
<itemData name="Function" defStyleNum="dsNormal" color="#000090" selColor="#ffffff" bold="0" italic="0"/>
<itemData name="PredefFunction" defStyleNum="dsFunction" />
<itemData name="Function" defStyleNum="dsFunction" />
<itemData name="Comment" defStyleNum="dsComment" color="#707070" selColor="#ffffff" bold="0" italic="1"/>
<itemData name="String" defStyleNum="dsString" color="#007000" selColor="#007000" bold="0" italic="0"/>
<itemData name="Word" defStyleNum="dsString" color="#007000" selColor="#007000" bold="0" italic="1"/>
......
......@@ -2833,7 +2833,7 @@
<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="Function" defStyleNum="dsFunction" />
<itemData name="Imports" defStyleNum="dsKeyword" color="#808000" selColor="#ffffff" bold="0" italic="0"/>
<itemData name="Data Type" defStyleNum="dsDataType"/>
<itemData name="Decimal" defStyleNum="dsDecVal"/>
......
......@@ -465,7 +465,7 @@
<itemDatas>
<itemData name="Normal Text" defStyleNum="dsNormal"/>
<itemData name="Keyword" defStyleNum="dsKeyword"/>
<itemData name="Function" defStyleNum="dsKeyword" color="#0000FF" selColor="#00ffff" bold="0" italic="0"/>
<itemData name="Function" defStyleNum="dsFunction"/>
<itemData name="Objects" defStyleNum="dsKeyword" color="#008000" selColor="#00ffff" bold="0" italic="0"/>
<itemData name="Math" defStyleNum="dsKeyword" color="#DBA716" selColor="#00ffff" bold="0" italic="0"/>
<itemData name="Events" defStyleNum="dsKeyword" color="#F766D5" selColor="#00ffff" bold="0" italic="0"/>
......
......@@ -367,8 +367,8 @@
<itemDatas>
<itemData name="Normal Text" defStyleNum="dsNormal"/>
<itemData name="Keyword" defStyleNum="dsKeyword"/>
<itemData name="Function" defStyleNum="dsOthers"/>
<itemData name="Function Definition" defStyleNum="dsOthers"/>
<itemData name="Function" defStyleNum="dsFunction"/>
<itemData name="Function Definition" defStyleNum="dsFunction"/>
<itemData name="Class" defStyleNum="dsKeyword"/>
<itemData name="Decimal" defStyleNum="dsDecVal"/>
<itemData name="Float" defStyleNum="dsFloat"/>
......
......@@ -669,7 +669,7 @@
<itemData name="Normal Text" defStyleNum="dsNormal" />
<itemData name="Keyword" defStyleNum="dsKeyword" />
<itemData name="Pragma" defStyleNum="dsKeyword" />
<itemData name="Function" defStyleNum="dsNormal" color="#000080" selColor="#ffffff" bold="0" italic="0"/>
<itemData name="Function" defStyleNum="dsFunction" />
<itemData name="Operator" defStyleNum="dsKeyword" />
<itemData name="Data Type" defStyleNum="dsDataType" />
<itemData name="Special Variable" defStyleNum="dsDataType" color="#C00000" selColor="#C00000" bold="0" italic="0" />
......
......@@ -2755,7 +2755,7 @@
<itemData name="Normal Text" defStyleNum="dsNormal" />
<itemData name="PHP Text" defStyleNum="dsNormal" />
<itemData name="Keyword" defStyleNum="dsKeyword" />
<itemData name="Function" defStyleNum="dsKeyword" color="#0000FF" selColor="#00ffff" bold="0" italic="0"/>
<itemData name="Function" defStyleNum="dsFunction" />
<itemData name="Decimal" defStyleNum="dsDecVal" />
<itemData name="Octal" defStyleNum="dsBaseN" />
<itemData name="Hex" defStyleNum="dsBaseN" />
......
......@@ -94,7 +94,7 @@
<itemDatas>
<itemData name="Normal Text" defStyleNum="dsNormal"/>
<itemData name="Keyword" defStyleNum="dsKeyword"/>
<itemData name="Builtin Function" defStyleNum="dsKeyword"/>
<itemData name="Builtin Function" defStyleNum="dsFunction"/>
<itemData name="Data Type" defStyleNum="dsDataType"/>
<itemData name="Decimal" defStyleNum="dsDecVal"/>
<itemData name="Hex" defStyleNum="dsBaseN"/>
......
......@@ -1404,7 +1404,7 @@
<itemData name="Properties" defStyleNum="dsOthers"/>
<itemData name="Attributes" defStyleNum="dsDataType"/>
<itemData name="Methods" defStyleNum="dsOthers"/>
<itemData name="Functions" defStyleNum="dsKeyword"/>
<itemData name="Functions" defStyleNum="dsFunction"/>
<itemData name="Normal Text" defStyleNum="dsNormal"/>
<itemData name="Decimal" defStyleNum="dsDecVal"/>
......
......@@ -118,7 +118,7 @@
<itemData name="Normal Text" defStyleNum="dsNormal"/>
<itemData name="Instructions" defStyleNum="dsKeyword"/>
<itemData name="Built In" defStyleNum="dsNormal" color="#000090"/>
<itemData name="Function" defStyleNum="dsNormal" color="#26537B"/>
<itemData name="Function" defStyleNum="dsFunction" />
<itemData name="String" defStyleNum="dsString"/>
<itemData name="Comment" defStyleNum="dsComment"/>
<itemData name="Symbol" defStyleNum="dsNormal"/>
......
......@@ -1172,10 +1172,10 @@
<itemData name="Normal Text" defStyleNum="dsNormal"/>
<itemData name="Structure-keywords" defStyleNum="dsNormal" color="#000080" selColor="#ffff00" bold="1" italic="0"/>
<itemData name="Control-keywords" defStyleNum="dsNormal" color="#800000" selColor="#ff0000" bold="1" italic="0"/>
<itemData name="Function-keywords" defStyleNum="dsNormal" color="#008000" selColor="#ffff00" bold="1" italic="0"/>
<itemData name="Function-keywords" defStyleNum="dsFunction" color="#008000" selColor="#ffff00" bold="1" italic="0"/>
<itemData name="Warning-keywords" defStyleNum="dsNormal" color="#ff0000" selColor="#ff0000" bold="1" italic="0"/>
<itemData name="Constants-keyword" defStyleNum="dsNormal" color="#008080" selColor="#00ffff" bold="1" italic="0"/>
<itemData name="functions" defStyleNum="dsNormal" color="#0000ff" selColor="#00ff00" bold="1" italic="1"/>
<itemData name="functions" defStyleNum="dsFunction" color="#0000ff" selColor="#00ff00" bold="1" italic="1"/>
<itemData name="Decimal" defStyleNum = "dsDecVal"/>
<itemData name="Float" defStyleNum = "dsFloat"/>
<itemData name="Comment" defStyleNum = "dsComment"/>
......
......@@ -56,6 +56,7 @@
<itemData name="Comment" defStyleNum="dsComment"/>
<itemData name="Symbol" defStyleNum="dsNormal"/>
<itemData name="Tagged Argument" defStyleNum="dsOthers"/>
<itemData name="Function" defStyleNum="dsFunction" />
</itemDatas>
</highlighting>
<general>
......
......@@ -103,7 +103,7 @@
<item> PRIMARY </item>
<item> PRIVILEGES </item>
<item> PROCEDURE </item>
<item> PURGE </item>
<item> PURGE </item>
<item> READ </item>
<item> REFERENCES </item>
<item> REGEXP </item>
......@@ -133,7 +133,7 @@
<item> TO </item>
<item> TRAILING </item>
<item> UNION </item>
<item> UNIQUE </item>
<item> UNIQUE </item>
<item> UNLOCK </item>
<item> UNSIGNED </item>
<item> UPDATE </item>
......@@ -334,7 +334,7 @@
<item> CHAR </item>
<item> CHARACTER </item>
<item> DECIMAL </item>
<item> DOUBLE </item>
<item> DOUBLE </item>
<item> FLOAT </item>
<item> INT </item>
<item> INTEGER </item>
......@@ -403,7 +403,7 @@
<itemData name="Normal Text" defStyleNum="dsNormal"/>
<itemData name="Keyword" defStyleNum="dsKeyword"/>
<itemData name="Operator" defStyleNum="dsNormal"/>
<itemData name="Function" defStyleNum="dsKeyword"/>
<itemData name="Function" defStyleNum="dsFunction"/>
<itemData name="Data Type" defStyleNum="dsDataType"/>
<itemData name="Decimal" defStyleNum="dsDecVal"/>
<itemData name="Float" defStyleNum="dsFloat"/>
......
......@@ -773,7 +773,7 @@
<itemData name="Normal Text" defStyleNum="dsNormal"/>
<itemData name="Keyword" defStyleNum="dsKeyword"/>
<itemData name="Operator" defStyleNum="dsNormal"/>
<itemData name="Function" defStyleNum="dsKeyword"/>
<itemData name="Function" defStyleNum="dsFunction"/>
<itemData name="Data Type" defStyleNum="dsDataType"/>
<itemData name="Decimal" defStyleNum="dsDecVal"/>
<itemData name="Float" defStyleNum="dsFloat"/>
......
......@@ -869,7 +869,7 @@
<itemData name="Normal Text" defStyleNum="dsNormal"/>
<itemData name="Keyword" defStyleNum="dsKeyword"/>
<itemData name="Operator" defStyleNum="dsNormal"/>
<itemData name="Function" defStyleNum="dsKeyword"/>
<itemData name="Function" defStyleNum="dsFunction"/>
<itemData name="Data Type" defStyleNum="dsDataType"/>
<itemData name="Decimal" defStyleNum="dsDecVal"/>
<itemData name="Float" defStyleNum="dsFloat"/>
......
......@@ -539,7 +539,7 @@
<itemData name="Comment" defStyleNum="dsComment"/>
<itemData name="Operator" defStyleNum="dsBaseN" color="#A01060" selColor="#400040" bold="0" italic="0"/>
<itemData name="Number" defStyleNum="dsDecVal" color="#5050C0" selColor="#000000" bold="0" italic="0"/>
<itemData name="Function" defStyleNum="dsNormal" color="#000090" selColor="#ffffff" bold="0" italic="0"/>
<itemData name="Function" defStyleNum="dsFunction" />
<itemData name="String" defStyleNum="dsString"/>
<itemData name="Preprocessor" defStyleNum="dsOthers"/>
</itemDatas>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment