SF.net SVN: geany:[3140] trunk

[eht16 at users.sourceforge.net]

Revision: 3140
          http://geany.svn.sourceforge.net/geany/?rev=3140&view=rev
Author:   eht16
Date:     2008-10-20 18:18:28 +0000 (Mon, 20 Oct 2008)

Log Message:
-----------
Change colours and bold flag for the extended_* and id styles (thanks to Jason Oster for his suggestions).
Use CSS-specific symbol type names.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/data/filetypes.css
    trunk/src/highlighting.c
    trunk/src/symbols.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-10-20 18:18:02 UTC (rev 3139)
+++ trunk/ChangeLog	2008-10-20 18:18:28 UTC (rev 3140)
@@ -13,9 +13,13 @@
  * src/highlighting.c, data/filetypes.css:
    Fix typo in 'pseudo_elements' keyword type name.
    Change style for pseudo elements to bold and italic.
+   Change colours and bold flag for the extended_* and id styles
+   (thanks to Jason Oster for his suggestions).
  * src/about.c:
    Use a GeanyWrapLabel for the label holding the "Some contributors"
    text to fix dialog oversize problems with some localisations.
+ * src/symbols.c:
+   Use CSS-specific symbol type names.
 
 
 2008-10-20  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/data/filetypes.css
===================================================================
--- trunk/data/filetypes.css	2008-10-20 18:18:02 UTC (rev 3139)
+++ trunk/data/filetypes.css	2008-10-20 18:18:28 UTC (rev 3140)
@@ -14,15 +14,15 @@
 singlestring=0x330066;0xffffff;false;false
 attribute=0x007f00;0xffffff;false;false
 value=0x303030;0xffffff;false;false
-id=0x7f0000;0xffffff;false;false
+id=0xff9000;0xffffff;true;false
 identifier2=0x6b6bff;0xffffff;true;false
 important=0x990000;0xffffff;true;false
 directive=0x006bff;0xffffff;false;true
 identifier3=0x00c8ff;0xffffff;false;false
 pseudoelement=0x666610;0xffffff;true;true
-extended_identifier=0x666610;0xffffff;false;false
-extended_pseudoclass=0x660010;0xffffff;true;false
-extended_pseudoelement=0x660010;0xffffff;true;true
+extended_identifier=0x9090a0;0xffffff;true;false
+extended_pseudoclass=0x907080;0xffffff;true;true
+extended_pseudoelement=0x909080;0xffffff;true;true
 
 [keywords]
 # CSS 1 properties
@@ -42,7 +42,7 @@
 #extension=css
 
 # the following characters are these which a "word" can contains, see documentation
-#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 
 # if only single comment char is supported like # in this file, leave comment_close blank
 comment_open=/*

Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c	2008-10-20 18:18:02 UTC (rev 3139)
+++ trunk/src/highlighting.c	2008-10-20 18:18:28 UTC (rev 3140)
@@ -1938,15 +1938,15 @@
 	get_keyfile_hex(config, config_home, "styling", "singlestring", "0x330066", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[10]);
 	get_keyfile_hex(config, config_home, "styling", "attribute", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[11]);
 	get_keyfile_hex(config, config_home, "styling", "value", "0x303030", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[12]);
-	get_keyfile_hex(config, config_home, "styling", "id", "0x7f0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[13]);
+	get_keyfile_hex(config, config_home, "styling", "id", "0xff9000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[13]);
 	get_keyfile_hex(config, config_home, "styling", "identifier2", "0x6b6bff", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[14]);
 	get_keyfile_hex(config, config_home, "styling", "important", "0x990000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[15]);
 	get_keyfile_hex(config, config_home, "styling", "directive", "0x006bff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[16]);
 	get_keyfile_hex(config, config_home, "styling", "identifier3", "0x00c8ff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[17]);
 	get_keyfile_hex(config, config_home, "styling", "pseudoelement", "0x666610", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[18]);
-	get_keyfile_hex(config, config_home, "styling", "extended_identifier", "0x666610", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[19]);
-	get_keyfile_hex(config, config_home, "styling", "extended_pseudoclass", "0x660010", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[20]);
-	get_keyfile_hex(config, config_home, "styling", "extended_pseudoelement", "0x660010", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[21]);
+	get_keyfile_hex(config, config_home, "styling", "extended_identifier", "0x9090a0", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[19]);
+	get_keyfile_hex(config, config_home, "styling", "extended_pseudoclass", "0x907080", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[20]);
+	get_keyfile_hex(config, config_home, "styling", "extended_pseudoelement", "0x909080", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[21]);
 
 	style_sets[GEANY_FILETYPES_CSS].keywords = g_new(gchar*, 9);
 	get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_CSS, 0, "");

Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c	2008-10-20 18:18:02 UTC (rev 3139)
+++ trunk/src/symbols.c	2008-10-20 18:18:28 UTC (rev 3140)
@@ -662,7 +662,6 @@
 				NULL);
 			break;
 		}
-/*
 		case GEANY_FILETYPES_CSS:
 		{
 			tag_list_add_groups(tag_store,
@@ -671,7 +670,6 @@
 				&(tv_iters.tag_struct), _("Type Selectors"), "classviewer-struct", NULL);
 			break;
 		}
-*/
 		case GEANY_FILETYPES_REST:
 		{
 			tag_list_add_groups(tag_store,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.