rendered paste bodyIndex: gtksourceview/language-specs/c.lang
===================================================================
--- gtksourceview/language-specs/c.lang (revision 1518)
+++ gtksourceview/language-specs/c.lang (working copy)
@@ -34,19 +34,26 @@
<style id="comment" _name="Comment" map-to="def:comment"/>
<style id="error" _name="Error" map-to="def:error"/>
<style id="string" _name="String" map-to="def:string"/>
- <style id="escape" _name="Escape" map-to="def:escape"/>
+ <style id="escape" _name="Escape" map-to="def:preprocessor"/>
<style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
- <style id="common-defines" _name="Common Defines" map-to="def:special-value"/>
- <style id="included-file" _name="Included File" map-to="c:preprocessor"/>
+ <style id="common-defines" _name="Common Defines" map-to="def:constant"/>
+ <style id="included-file" _name="Included File" map-to="def:string"/>
<style id="char" _name="Character" map-to="def:character"/>
+ <style id="conditional" _name="Conditional" map-to="def:conditional"/>
+ <style id="repeat" _name="Repeat" map-to="def:repeat"/>
+ <style id="label" _name="Label" map-to="def:label"/>
+ <style id="operator" _name="Operator" map-to="def:operator"/>
<style id="keyword" _name="Keyword" map-to="def:keyword"/>
- <style id="data-type" _name="Data Type" map-to="def:data-type"/>
- <style id="printf" _name="printf Conversion" map-to="def:character"/>
- <style id="escaped-character" _name="Escaped Character" map-to="def:escape"/>
- <style id="floating-point" _name="Float" map-to="def:floating-point"/>
- <style id="decimal" _name="Decimal" map-to="def:decimal"/>
- <style id="octal" _name="Octal" map-to="def:base-n-integer"/>
- <style id="hexadecimal" _name="Hex" map-to="def:base-n-integer"/>
+ <style id="type" _name="Type" map-to="def:type"/>
+ <style id="storage-class" _name="Storage Class" map-to="def:storage-class"/>
+ <style id="structure" _name="Structure" map-to="def:structure"/>
+ <style id="typedef" _name="Typedef" map-to="def:typedef"/>
+ <style id="printf" _name="printf Conversion" map-to="def:special-char"/>
+ <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
+ <style id="floating-point" _name="Float" map-to="def:number"/>
+ <style id="decimal" _name="Decimal" map-to="def:number"/>
+ <style id="octal" _name="Octal" map-to="def:number"/>
+ <style id="hexadecimal" _name="Hex" map-to="def:number"/>
</styles>
<definitions>
@@ -125,7 +132,7 @@
(".*?"|<.*>)
</match>
<include>
- <context id="included-file" sub-pattern="1" style-ref="included-file"/>
+ <context id="included-file" sub-pattern="2" style-ref="included-file"/>
</include>
</context>
@@ -194,53 +201,74 @@
</match>
</context>
- <!-- Keywords -->
- <context id="keywords" style-ref="keyword">
+ <!-- Statements -->
+ <context id="conditional" style-ref="conditional">
+ <keyword>else</keyword>
+ <keyword>if</keyword>
+ <keyword>switch</keyword>
+ </context>
+
+ <context id="repeat" style-ref="repeat">
+ <keyword>do</keyword>
+ <keyword>for</keyword>
+ <keyword>while</keyword>
+ </context>
+
+ <context id="label" style-ref="label">
+ <keyword>case</keyword>
+ <keyword>default</keyword>
+ </context>
+
+ <context id="keyword" style-ref="keyword">
<keyword>asm</keyword>
<keyword>break</keyword>
- <keyword>case</keyword>
<keyword>continue</keyword>
- <keyword>default</keyword>
- <keyword>do</keyword>
- <keyword>else</keyword>
- <keyword>enum</keyword>
- <keyword>for</keyword>
<keyword>fortran</keyword>
<keyword>goto</keyword>
- <keyword>if</keyword>
<keyword>return</keyword>
+ </context>
+
+ <context id="operator" style-ref="operator">
<keyword>sizeof</keyword>
- <keyword>struct</keyword>
- <keyword>switch</keyword>
- <keyword>typedef</keyword>
- <keyword>union</keyword>
- <keyword>while</keyword>
</context>
- <context id="types" style-ref="data-type">
+ <context id="type" style-ref="type">
<keyword>_Bool</keyword>
<keyword>_Complex</keyword>
<keyword>_Imaginary</keyword>
- <keyword>auto</keyword>
<keyword>char</keyword>
- <keyword>const</keyword>
<keyword>double</keyword>
- <keyword>extern</keyword>
<keyword>float</keyword>
<keyword>int</keyword>
- <keyword>inline</keyword>
<keyword>long</keyword>
- <keyword>register</keyword>
- <keyword>restrict</keyword>
<keyword>short</keyword>
<keyword>signed</keyword>
<keyword>size_t</keyword>
- <keyword>static</keyword>
<keyword>unsigned</keyword>
<keyword>void</keyword>
+ </context>
+
+ <context id="storage-class" style-ref="storage-class">
+ <keyword>auto</keyword>
+ <keyword>const</keyword>
+ <keyword>extern</keyword>
+ <keyword>inline</keyword>
+ <keyword>register</keyword>
+ <keyword>restrict</keyword>
+ <keyword>static</keyword>
<keyword>volatile</keyword>
</context>
+ <context id="structure" style-ref="structure">
+ <keyword>enum</keyword>
+ <keyword>struct</keyword>
+ <keyword>union</keyword>
+ </context>
+
+ <context id="typedef" style-ref="typedef">
+ <keyword>typedef</keyword>
+ </context>
+
<context id="common-defines" style-ref="common-defines">
<keyword>NULL</keyword>
<keyword>TRUE</keyword>
Index: gtksourceview/language-specs/desktop.lang
===================================================================
--- gtksourceview/language-specs/desktop.lang (revision 1518)
+++ gtksourceview/language-specs/desktop.lang (working copy)
@@ -31,12 +31,11 @@
<styles>
<style id="group" _name="Group" map-to="def:keyword"/>
<style id="key" _name="Key" map-to="def:data-type"/>
- <style id="language" _name="Translation" map-to="def:decimal"/>
- <style id="number" _name="Number" map-to="def:floating-point"/>
- <style id="boolean" _name="Boolean" map-to="def:floating-point"/>
- <style id="exec-parameter" _name="Exec parameter" map-to="def:floating-point"/>
- <style id="encoding" _name="Encoding" map-to="def:floating-point"/>
- <style id="category" _name="Category" map-to="def:floating-point"/>
+ <style id="language" _name="Translation" map-to="def:function"/>
+ <style id="boolean" _name="Boolean" map-to="def:base-n-integer"/>
+ <style id="exec-parameter" _name="Exec parameter" map-to="def:base-n-integer"/>
+ <style id="encoding" _name="Encoding" map-to="def:special-value"/>
+ <style id="category" _name="Category" map-to="def:special-value"/>
</styles>
<definitions>
@@ -61,9 +60,6 @@
<keyword>UTF\-8</keyword>
<keyword>Legacy\-Mixed</keyword>
</context>
- <context id="number" style-ref="number">
- <match>(.\b[0-9]+([Ll]?|[Ff]?)\b)|(b[0-9]*\.\W)</match>
- </context>
<context id="standard-key" style-ref="key">
<prefix>^_?</prefix>
@@ -142,7 +138,6 @@
<context ref="boolean"/>
<context ref="exec-parameter"/>
<context ref="encoding"/>
- <context ref="number"/>
</include>
</context>
</include>
Index: gtksourceview/language-specs/cpp.lang
===================================================================
--- gtksourceview/language-specs/cpp.lang (revision 1518)
+++ gtksourceview/language-specs/cpp.lang (working copy)
@@ -32,7 +32,7 @@
<styles>
<style id="keyword" _name="Keyword" map-to="c:keyword"/>
- <style id="data-type" _name="Data Type" map-to="c:data-type"/>
+ <style id="data-type" _name="Data Type" map-to="c:type"/>
<style id="common-defines" _name="Common Defines" map-to="c:common-defines"/>
</styles>
Index: gtksourceview/language-specs/changelog.lang
===================================================================
--- gtksourceview/language-specs/changelog.lang (revision 1518)
+++ gtksourceview/language-specs/changelog.lang (working copy)
@@ -29,12 +29,14 @@
</metadata>
<styles>
- <style id="date" name="Date" map-to="def:data-type"/>
+ <style id="date" name="Date" map-to="def:decimal"/>
<style id="name" name="Name" map-to="def:keyword"/>
<style id="email" name="Email"/>
- <style id="file" name="File" map-to="def:function"/>
+ <style id="file" name="File" map-to="def:comment"/>
<style id="function" name="Function" map-to="def:function"/>
- <style id="release" name="Release" map-to="def:function"/>
+ <style id="release" name="Release" map-to="def:keyword"/>
+ <style id="bullet" name="Bullet" map-to="def:type"/>
+ <style id="colon" name="Colon" map-to="def:type"/>
</styles>
<definitions>
@@ -68,9 +70,13 @@
<match>^\s*\=.*\=\s*$</match>
</context>
<context id="file" style-ref="file">
- <start>^\s+\*</start>
+ <start>^\s+(\*)</start>
<!-- end at blank lines if there's no colon -->
- <end>\:|^(?!\S)</end>
+ <end>(\:)|^(?!\S)</end>
+ <include>
+ <context sub-pattern="1" where="start" style-ref="bullet"/>
+ <context sub-pattern="1" where="end" style-ref="colon"/>
+ </include>
</context>
<context id="function" style-ref="function">
<match>\(\s*\%{identifier}\s*\)</match>
Index: gtksourceview/language-specs/tango.xml
===================================================================
--- gtksourceview/language-specs/tango.xml (revision 1518)
+++ gtksourceview/language-specs/tango.xml (working copy)
@@ -62,37 +62,28 @@
<style name="bracket-match" foreground="aluminium1" background="aluminium3" bold="true"/>
<style name="bracket-mismatch" foreground="aluminium1" background="scarletred3" bold="true"/>
- <style name="def:base-n-integer" foreground="plum1"/>
- <style name="def:decimal" foreground="plum1"/>
- <style name="def:character" foreground="plum1"/>
- <style name="def:floating-point" foreground="plum1"/>
- <style name="def:string" foreground="plum1"/>
-
- <style name="def:data-type" foreground="chameleon3" bold="true"/>
- <style name="def:function" foreground="chameleon3"/>
- <style name="def:keyword" foreground="scarletred3" bold="true"/>
-
<style name="def:comment" foreground="skyblue2"/>
- <style name="def:net-address-in-comment" foreground="skyblue2" italic="true" underline="true"/>
+ <style name="def:constant" foreground="plum1"/>
+ <style name="def:identifier" foreground="chameleon3"/>
+ <style name="def:statement" foreground="scarletred3" bold="true"/>
+ <style name="def:type" foreground="chameleon3" bold="true"/>
+ <style name="def:underlined" italic="true" underline="true"/>
<style name="def:note" foreground="skyblue2" background="butter1" bold="true"/>
- <style name="def:shebang" foreground="skyblue2" bold="true"/>
- <style name="def:doc-comment-element" italic="true"/>
-
<style name="def:error" background="scarletred1" bold="true"/>
- <style name="def:escape" foreground="orange2"/>
-
<style name="def:preprocessor" foreground="chocolate2"/>
+ <style name="def:special" use-style="def:constant"/>
+ <style name="def:special-comment" italic="true"/>
<!-- Language specific -->
- <style name="changelog:email" use-style="def:net-address-in-comment"/>
+ <style name="changelog:email" use-style="def:underlined"/>
<style name="diff:added-line" foreground="chameleon3"/>
<style name="diff:removed-line" foreground="plum3"/>
<style name="diff:changed-line" use-style="def:preprocessor"/>
- <style name="diff:diff-file" use-style="def:data-type"/>
- <style name="diff:location" use-style="def:keyword"/>
+ <style name="diff:diff-file" use-style="def:type"/>
+ <style name="diff:location" use-style="def:statement"/>
- <style name="diff:special-case" use-style="def:string"/>
+ <style name="diff:special-case" use-style="def:constant"/>
<style name="js:object" foreground="chameleon3" bold="true"/>
<style name="js:constructors" foreground="chameleon3"/>
Index: gtksourceview/language-specs/gvim.xml
===================================================================
--- gtksourceview/language-specs/gvim.xml (revision 1518)
+++ gtksourceview/language-specs/gvim.xml (working copy)
@@ -32,30 +32,28 @@
<style name="Others 2" foreground="#008B8B"/>
<style name="Others 3" foreground="#6A5ACD"/>
- <style name="def:base-n-integer" foreground="#FF00FF"/>
- <style name="def:character" foreground="#FF00FF"/>
<style name="def:comment" foreground="#0000FF"/>
- <style name="def:data-type" foreground="#2E8B57" bold="true"/>
- <style name="def:function" foreground="#008A8C"/>
- <style name="def:decimal" foreground="#FF00FF"/>
- <style name="def:floating-point" foreground="#FF00FF"/>
- <style name="def:keyword" foreground="#A52A2A" bold="true"/>
- <style name="def:string" foreground="#FF00FF"/>
- <style name="def:net-address-in-comment" foreground="#0000FF" italic="true" underline="true"/>
- <style name="def:note" foreground="#0000FF" background="#FFFF00" bold="true"/>
+ <style name="def:constant" foreground="#FF00FF"/>
+ <style name="def:identifier" foreground="#008A8C"/>
+ <style name="def:statement" foreground="#A52A2A" bold="true"/>
+ <style name="def:type" foreground="#2E8B57" bold="true"/>
+ <style name="def:underlined" italic="true" underline="true"/>
+ <style name="def:note" foreground="#0000FF" background="#FFFF00"/>
<style name="def:error" background="#FF0000" bold="true"/>
- <style name="def:escape" foreground="#9010D0"/>
- <style name="def:shebang" foreground="#0000FF" bold="true"/>
- <style name="def:doc-comment-element" italic="true"/>
-
<style name="def:preprocessor" foreground="#A020F0"/>
+ <style name="def:special" use-style="def:constant"/>
+ <style name="def:special-comment" italic="true"/>
+
+ <style name="c:printf" foreground="#A020F0"/>
+
+ <style name="desktop:exec-parameter" use-style="c:printf"/>
<style name="diff:added-line" use-style="Others 2"/>
<style name="diff:removed-line" use-style="Others 3"/>
<style name="diff:changed-line" use-style="def:preprocessor"/>
- <style name="diff:special-case" use-style="def:string"/>
- <style name="diff:location" use-style="def:keyword"/>
- <style name="diff:diff-file" use-style="def:data-type"/>
+ <style name="diff:special-case" use-style="def:constant"/>
+ <style name="diff:location" use-style="def:statement"/>
+ <style name="diff:diff-file" use-style="def:type"/>
<style name="xml:attribute-name" foreground="#6A5ACD"/>
<style name="xml:tags" foreground="#008B8B"/>
@@ -75,5 +73,5 @@
<style name="sh:variable2" use-style="Others 2"/>
<style name="python:builtins" use-style="Others"/>
- <style name="changelog:email" use-style="def:comment"/>
+ <style name="changelog:email" foreground="#6A5ACD"/>
</style-scheme>
Index: gtksourceview/language-specs/tangodark.xml
===================================================================
--- gtksourceview/language-specs/tangodark.xml (revision 0)
+++ gtksourceview/language-specs/tangodark.xml (revision 0)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (C) 2007 GtkSourceView team
+ Author: Paolo Maggi <paolo@gnome.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+
+-->
+
+<style-scheme id="tangodark" _name="Tango Dark" version="1.0">
+
+ <author>Paolo Maggi</author>
+ <_description>Dark color scheme using Tango color palette</_description>
+
+ <!-- Tango colors -->
+ <color name="butter1" value="#fce94f"/>
+ <color name="butter2" value="#edd400"/>
+ <color name="butter3" value="#c4a000"/>
+ <color name="chameleon1" value="#8ae234"/>
+ <color name="chameleon2" value="#73d216"/>
+ <color name="chameleon3" value="#4e9a06"/>
+ <color name="orange1" value="#fcaf3e"/>
+ <color name="orange2" value="#f57900"/>
+ <color name="orange3" value="#ce5c00"/>
+ <color name="skyblue1" value="#729fcf"/>
+ <color name="skyblue2" value="#3465a4"/>
+ <color name="skyblue3" value="#204a87"/>
+ <color name="plum1" value="#ad7fa8"/>
+ <color name="plum2" value="#75507b"/>
+ <color name="plum3" value="#5c3566"/>
+ <color name="chocolate1" value="#e9b96e"/>
+ <color name="chocolate2" value="#c17d11"/>
+ <color name="chocolate3" value="#8f5902"/>
+ <color name="scarletred1" value="#ef2929"/>
+ <color name="scarletred2" value="#cc0000"/>
+ <color name="scarletred3" value="#a40000"/>
+ <color name="aluminium1" value="#eeeeec"/>
+ <color name="aluminium2" value="#d3d7cf"/>
+ <color name="aluminium3" value="#babdb6"/>
+ <color name="aluminium4" value="#888a85"/>
+ <color name="aluminium5" value="#555753"/>
+ <color name="aluminium6" value="#2e3436"/>
+
+ <style name="text" foreground="aluminium1" background="aluminium6"/>
+ <style name="selection" foreground="aluminium1" background="aluminium4"/>
+ <style name="cursor" foreground="aluminium2"/>
+ <style name="current-line" background="aluminium5"/> <!-- FIXME -->
+ <style name="line-numbers" foreground="aluminium2" background="aluminium5"/>
+
+ <style name="bracket-match" foreground="aluminium6" background="aluminium2" bold="true"/>
+
+ <style name="def:comment" foreground="aluminium3"/>
+
+ <style name="def:note" background="butter2" foreground="aluminium6" bold="true"/>
+
+ <style name="def:constant" foreground="orange2" bold="true"/>
+ <style name="def:character" foreground="chameleon1" italic="true"/>
+ <style name="def:string" use-style="def:character"/>
+
+ <style name="def:identifier" foreground="plum1"/>
+
+ <style name="def:type" foreground="chameleon1" bold="true"/>
+
+ <style name="def:statement" foreground="chocolate1" bold="true"/>
+
+ <style name="def:preprocessor" foreground="chocolate1"/>
+
+ <style name="def:special" foreground="chameleon2"/>
+
+ <style name="def:underlined" italic="true" underline="true"/>
+ <style name="def:special-comment" italic="true"/>
+
+ <style name="def:error" foreground="aluminium1" background="scarletred1" bold="true"/>
+</style-scheme>
Index: gtksourceview/language-specs/softdark.xml
===================================================================
--- gtksourceview/language-specs/softdark.xml (revision 0)
+++ gtksourceview/language-specs/softdark.xml (revision 0)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (C) 2007 GtkSourceView team
+ Author: Paolo Maggi <paolo@gnome.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+
+-->
+
+<!--
+This style scheme is based on the Wombat theme for VIM by Lars H. Nielsen <dengmao@gmail.com>.
+See http://dengmao.wordpress.com/2007/01/22/vim-color-scheme-wombat/
+-->
+<style-scheme id="softdark" _name="Soft Dark" version="1.0">
+
+ <author>Paolo Maggi</author>
+ <_description>Dark color scheme with soft colors</_description>
+
+ <style name="text" foreground="#f6f3e8" background="#242424"/>
+ <style name="selection" foreground="#f6f3e8" background="#444444"/>
+ <style name="cursor" foreground="#656565"/>
+ <style name="current-line" background="#2d2d2d"/>
+ <style name="line-numbers" foreground="#857b6f" background="#000000"/>
+
+ <style name="bracket-match" foreground="#f6f3e8" background="#857b6f" bold="true"/>
+
+ <style name="def:comment" foreground="#99968b"/>
+
+ <style name="def:note" background="#95e454" foreground="#242424" bold="true" italic="true"/>
+
+ <style name="def:constant" foreground="#e5786d"/>
+ <style name="def:character" foreground="#95e454" italic="true"/>
+ <style name="def:string" use-style="def:character"/>
+
+ <style name="def:identifier" foreground="#cae682"/>
+
+ <style name="def:type" foreground="#cae682"/>
+
+ <style name="def:statement" foreground="#8ac6f2"/>
+
+ <style name="def:preprocessor" foreground="#e5786d"/>
+
+ <style name="def:special" foreground="#e7f6da" italic="false"/>
+
+ <style name="def:underlined" italic="true" underline="true"/>
+ <style name="def:special-comment" italic="true"/>
+
+</style-scheme>
Index: gtksourceview/language-specs/testdark.xml
===================================================================
--- gtksourceview/language-specs/testdark.xml (revision 1518)
+++ gtksourceview/language-specs/testdark.xml (working copy)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<style-scheme id="dark" _name="dark" parent-scheme="gvim" version="1.0">
+<style-scheme id="testdark" _name="Test Dark" parent-scheme="gvim" version="1.0">
<style name="text" foreground="#white" background="#black"/>
<style name="selection" foreground="#magenta" background="#grey"/>
<style name="selection-unfocused" foreground="#magenta" background="#grey"/>
Index: gtksourceview/language-specs/kate.xml
===================================================================
--- gtksourceview/language-specs/kate.xml (revision 1518)
+++ gtksourceview/language-specs/kate.xml (working copy)
@@ -40,37 +40,48 @@
<style name="Others 2" bold="true"/>
<style name="Others 3" foreground="dark-green"/>
- <style name="def:string" foreground="#DD0000"/>
<style name="def:comment" foreground="grey" italic="true" bold="false"/>
- <style name="def:base-n-integer" foreground="#008080"/>
- <style name="def:complex" use-style="def:base-n-integer"/>
- <style name="def:keyword" bold="true"/>
- <style name="def:data-type" foreground="dark-red"/>
- <style name="def:decimal" foreground="blue"/>
- <style name="def:floating-point" foreground="#800080"/>
- <style name="def:character" foreground="#FF00FF"/>
+
+ <style name="def:constant" foreground="#008080"/>
+ <style name="def:number" foreground="#008080"/>
+ <style name="def:float" foreground="#800080"/>
+
+ <style name="def:identifier" foreground="#000080"/>
+
+ <style name="def:statement" bold="true"/>
+
+ <style name="def:type" foreground="dark-red"/>
+
+ <style name="def:underlined" underline="true"/>
<style name="def:note" foreground="white" background="#FFCCCC" bold="true" italic="false"/>
- <style name="def:function" foreground="#000080"/>
+
<style name="def:error" foreground="red" underline="true"/>
+
+ <style name="def:preprocessor" bold="true"/>
+
+ <style name="def:special-comment" bold="true"/>
+
+ <style name="def:character" foreground="#FF00FF"/>
+ <style name="def:string" foreground="#DD0000"/>
+
+
+ <!-- FIXME: Adapt to the new way to write style schemes -->
<style name="def:shebang" foreground="grey" bold="true"/>
<style name="def:doc-comment" foreground="blue"/>
- <style name="def:doc-comment-element" bold="true"/>
- <style name="def:net-address-in-comment" underline="true"/>
<style name="def:escape" foreground="#FF00FF"/>
-
<style name="def:special-value" bold="true"/>
- <style name="def:preprocessor" bold="true"/>
+
<style name="c:preprocessor" foreground="dark-green"/>
<style name="c:common-defines" foreground="#0095FF" bold="true"/>
- <style name="diff:diff-file" use-style="def:keyword"/>
- <style name="diff:added-line" use-style="def:decimal"/>
+ <style name="diff:diff-file" use-style="def:statement"/>
+ <style name="diff:added-line" foreground="blue"/>
<style name="diff:removed-line" use-style="def:string"/>
<style name="diff:changed-line" use-style="c:preprocessor"/>
<style name="diff:special-case"/>
- <style name="diff:location" use-style="def:data-type"/>
+ <style name="diff:location" use-style="def:type"/>
<style name="xml:attribute-name" foreground="dark-green"/>
<style name="xml:tags" bold="true"/>
@@ -100,8 +111,8 @@
<style name="changelog:email" use-style="c:preprocessor"/>
- <style name="scheme:parens" use-style="def:keyword"/>
- <style name="scheme:any-function" use-style="def:keyword"/>
+ <style name="scheme:parens" use-style="def:statement"/>
+ <style name="scheme:any-function" use-style="def:statement"/>
<style name="sh:dollar" foreground="dark-green" bold="true"/>
Index: gtksourceview/language-specs/Makefile.am
===================================================================
--- gtksourceview/language-specs/Makefile.am (revision 1518)
+++ gtksourceview/language-specs/Makefile.am (working copy)
@@ -64,7 +64,9 @@ LANGUAGES = \
STYLES = \
gvim.xml \
kate.xml \
- tango.xml
+ tango.xml \
+ softdark.xml \
+ tangodark.xml
languagesdir = $(datadir)/gtksourceview-2.0/language-specs
languages_DATA = $(LANGUAGES) language.rng language2.rng language.dtd \
Index: gtksourceview/language-specs/def.lang
===================================================================
--- gtksourceview/language-specs/def.lang (revision 1518)
+++ gtksourceview/language-specs/def.lang (working copy)
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Authors: Marco Barisione, Emanuele Aina
+ Authors: Marco Barisione, Emanuele Aina, Paolo Maggi
+
Copyright (C) 2005-2007 Marco Barisione <barisione@gmail.com>
Copyright (C) 2005-2007 Emanuele Aina
+ Copyright (C) 2007 Paolo Maggi
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -23,27 +25,146 @@
-->
<language id="def" _name="Defaults" hidden="true" version="2.0">
<styles>
- <style id="decimal" _name="Decimal"/>
- <style id="base-n-integer" _name="Base-N Integer"/>
- <style id="complex" _name="Complex number"/>
- <style id="floating-point" _name="Floating Point"/>
- <style id="net-address-in-comment" _name="Net Address"/>
- <style id="note" _name="Note"/>
- <style id="escape" _name="Escape"/>
+
+ <!-- Comment group -->
+
+ <!-- Any comment -->
<style id="comment" _name="Comment"/>
+
+ <!-- A shebang: #!/bin/sh -->
+ <style id="shebang" _name="Shebang" map-to="def:comment"/>
+
+ <!-- A special comment containing documentation like in javadoc or
+ gtk-doc -->
+ <style id="doc-comment" _name="Documentation comment" map-to="def:comment"/>
+
+
+ <!-- Constant group -->
+
+ <!-- Any constant -->
+ <style id="constant" _name="Constant"/>
+
+ <!-- A string string constant: "this is a string" -->
+ <style id="string" _name="String" map-to="def:constant"/>
+
+ <!-- A character constant: 'c', '\n' -->
+ <style id="character" _name="Character" map-to="def:constant"/>
+
+ <!-- A generic number constant -->
+ <style id="number" _name="Number" map-to="def:constant"/>
+
+ <!-- A boolean constant: TRUE, false -->
+ <style id="boolean" _name="Boolean" map-to="def:constant"/>
+
+ <!-- A floating point constant: 2.3e10 -->
+ <style id="float" _name="Float" map-to="def:number"/>
+
+ <!-- A decimal number: 1234 -->
+ <style id="decimal" _name="Decimal" map-to="def:number"/>
+
+ <!-- A base-N number: 0xFFFF -->
+ <style id="base-n-integer" _name="Base-N integer" map-to="def:number"/>
+
+ <!-- A complex number -->
+ <style id="complex" _name="Complex" map-to="def:number"/>
+
+ <!-- For things like NULL in C. -->
+ <style id="special-value" _name="Special value" map-to="def:constant"/>
+
+
+ <!-- Identifier group -->
+
+ <!-- Any variable name -->
+ <style id="identifier" _name="Identifier" />
+
+ <!-- A function name (also: methods for classes) -->
+ <style id="function" _name="Function" map-to="def:identifier"/>
+
+
+ <!-- Statement group -->
+
+ <!-- Any statement -->
+ <style id="statement" _name="Statement"/>
+
+ <!-- if, then, else, endif, switch, etc. -->
+ <style id="conditional" _name="Conditional" map-to="def:statement"/>
+
+ <!-- for, do, while, etc. -->
+ <style id="repeat" _name="Repeat" map-to="def:statement" />
+
+ <!-- case, default, etc. -->
+ <style id="label" _name="Label" map-to="def:statement" />
+
+ <!-- "sizeof", "+", "*", etc. -->
+ <style id="operator" _name="Operator" map-to="def:statement" />
+
+ <!-- Any other keyword -->
+ <style id="keyword" _name="Keyword" map-to="def:statement" />
+
+ <!--try, catch, throw, etc. -->
+ <style id="exception" _name="Exception" map-to="def:statement" />
+
+
+ <!-- Type group -->
+
+ <!--int, long, char, etc. -->
+ <style id="type" _name="Type"/>
+
+ <!-- static, register, volatile, etc. -->
+ <style id="storage-class" _name="Storage class" map-to="def:type" />
+
+ <!-- struct, union, enum, etc. -->
+ <style id="structure" _name="Structure" map-to="def:type" />
+
+ <!-- A typedef -->
+ <style id="typedef" _name="Typedef" map-to="def:type" />
+
+
+ <!-- Special group -->
+
+ <!-- Any special symbol -->
+ <style id="special" _name="Special"/>
+
+ <!-- Special character in a constant: "%s", "\t" -->
+ <style id="special-char" _name="Special char" map-to="def:special" />
+
+ <!-- A character that needs attention -->
+ <style id="delimiter" _name="Delimiter" map-to="def:special" />
+
+ <!-- Special things inside a comment -->
+ <style id="special-comment" _name="Special comment" map-to="def:comment" />
+
+ <!-- A element inside a documentation comment: @author -->
+ <style id="doc-comment-element" _name="Documentation comment element" map-to="def:special-comment"/>
+
+ <!-- Debuggin statements -->
+ <style id="debug" _name="Debug" map-to="def:special" />
+
+ <!-- Text that stands out, HTML links, e-mail addresses. etc. -->
+ <style id="underlined" _name="Underlined" map-to="def:special" />
+
+
+ <!-- Others -->
+
+ <!-- Any erroneous construct -->
<style id="error" _name="Error"/>
- <style id="string" _name="String"/>
- <style id="keyword" _name="Keyword"/>
- <style id="data-type" _name="Data Type"/>
- <style id="character" _name="Character"/>
- <style id="function" _name="Function"/>
- <style id="shebang" _name="Shebang"/>
- <style id="doc-comment" _name="Documentation Comment" map-to="def:comment"/>
- <style id="doc-comment-element" _name="Documentation Comment Element"/>
+
+ <!-- anything that needs extra attention; mostly the keywords TODO FIXME and XXX -->
+ <style id="note" _name="Note"/>
+
<!-- This one is for '#include <foo.h>' and "#pragma blah", or 'use foobar', etc.. -->
<style id="preprocessor" _name="Preprocessor directive"/>
- <!-- For things like TRUE and NULL in C. -->
- <style id="special-value" _name="Special value" map-to="def:preprocessor"/>
+
+
+ <!-- DEPRECATED -->
+ <!-- Next styles are deprecated and must not be used in new .lang files
+ and style schemes -->
+
+ <style id="data-type" name="" map-to="def:type"/>
+ <style id="floating-point" name="" map-to="def:float"/>
+ <style id="net-address-in-comment" name="" map-to="def:underlined"/>
+ <style id="escape" name="" map-to="def:special-char"/>
+
</styles>
<definitions>
@@ -80,7 +201,7 @@
<context id="hexadecimal" style-ref="base-n-integer">
<match>\%{hexadecimal}</match>
</context>
- <context id="float" style-ref="floating-point">
+ <context id="float" style-ref="float">
<match>\%{float}</match>
</context>
@@ -103,10 +224,10 @@
<context id="in-comment">
<include>
- <context id="net-address" extend-parent="false" style-ref="net-address-in-comment">
+ <context id="net-address" extend-parent="false" style-ref="underlined">
<match>\%{net-address}</match>
</context>
- <context id="email-address" extend-parent="false" style-ref="net-address-in-comment">
+ <context id="email-address" extend-parent="false" style-ref="underlined">
<match>\%{email-address}</match>
</context>
<context id="comment-note" extend-parent="false" style-ref="note">
@@ -123,7 +244,7 @@
</include>
</context>
- <context id="line-continue" style-ref="escape">
+ <context id="line-continue" style-ref="special-char">
<start>\\$</start>
<end>^</end>
</context>
@@ -142,7 +263,7 @@
<end>$</end>
</context>
- <context id="escape" style-ref="escape">
+ <context id="escape" style-ref="special-char">
<match>\\.</match>
</context>