SF.net SVN: geany: [880] trunk
eht16 at users.sourceforge.net
eht16 at xxxxx
Tue Oct 10 17:28:22 UTC 2006
Revision: 880
http://svn.sourceforge.net/geany/?rev=880&view=rev
Author: eht16
Date: 2006-10-10 10:28:12 -0700 (Tue, 10 Oct 2006)
Log Message:
-----------
Fixed several highlighting errors, added new styles: identifier2, important and id.
Modified Paths:
--------------
trunk/ChangeLog
trunk/data/filetypes.css
trunk/src/highlighting.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-10-10 16:27:31 UTC (rev 879)
+++ trunk/ChangeLog 2006-10-10 17:28:12 UTC (rev 880)
@@ -10,6 +10,9 @@
also redone.
* src/sci_cb.c: Got rid of goto usage and added auto completion for
monitor construct for filetype Ferite.
+ * src/highlighting.c, data/filetypes.css:
+ Fixed several highlighting errors, added new styles: identifier2,
+ important and id.
2006-10-09 Nick Treleaven <nick.treleaven at btinternet.com>
Modified: trunk/data/filetypes.css
===================================================================
--- trunk/data/filetypes.css 2006-10-10 16:27:31 UTC (rev 879)
+++ trunk/data/filetypes.css 2006-10-10 17:28:12 UTC (rev 880)
@@ -6,14 +6,17 @@
tag=0x2166a4;0xffffff;true;false
class=0x007f00;0xffffff;true;false
pseudoclass=0x660010;0xffffff;true;true
-unknown_pseudoclass=0x000099;0xffffff;false;false
-unknown_identifier=0x000099;0xffffff;false;false
+unknown_pseudoclass=0xff0099;0xffffff;false;false
+unknown_identifier=0xff0099;0xffffff;false;false
operator=0x301010;0xffffff;false;false
identifier=0x000099;0xffffff;true;false
doublestring=0x330066;0xffffff;false;false
singlestring=0x330066;0xffffff;false;false
attribute=0x007f00;0xffffff;false;false
value=0x303030;0xffffff;false;false
+id=0x7f0000;0xffffff;false;false
+identifier2=0x6b6bff;0xffffff;false;false
+important=0xff0000;0xffffff;false;false
[keywords]
primary=color background-color background-image background-repeat background-attachment background-position background font-family font-style font-variant font-weight font-size font word-spacing letter-spacing text-decoration vertical-align text-transform text-align text-indent line-height margin-top margin-right margin-bottom margin-left margin padding-top padding-right padding-bottom padding-left padding border-top-width border-right-width border-bottom-width border-left-width border-width border-top border-right border-bottom border-left border border-color border-style width height float clear display white-space list-style-type list-style-image list-style-position list-style
Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c 2006-10-10 16:27:31 UTC (rev 879)
+++ trunk/src/highlighting.c 2006-10-10 17:28:12 UTC (rev 880)
@@ -1868,20 +1868,23 @@
load_keyfiles(config, config_home, "filetypes.css");
- new_style_array(GEANY_FILETYPES_CSS, 13);
+ new_style_array(GEANY_FILETYPES_CSS, 16);
get_keyfile_hex(config, config_home, "styling", "default", "0x003399", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[0]);
get_keyfile_hex(config, config_home, "styling", "comment", "0x808080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[1]);
get_keyfile_hex(config, config_home, "styling", "tag", "0x2166a4", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[2]);
get_keyfile_hex(config, config_home, "styling", "class", "0x007f00", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[3]);
get_keyfile_hex(config, config_home, "styling", "pseudoclass", "0x660010", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[4]);
- get_keyfile_hex(config, config_home, "styling", "unknown_pseudoclass", "0x000099", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[5]);
- get_keyfile_hex(config, config_home, "styling", "unknown_identifier", "0x000099", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[6]);
+ get_keyfile_hex(config, config_home, "styling", "unknown_pseudoclass", "0xff0099", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[5]);
+ get_keyfile_hex(config, config_home, "styling", "unknown_identifier", "0xff0099", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[6]);
get_keyfile_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[7]);
get_keyfile_hex(config, config_home, "styling", "identifier", "0x000099", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[8]);
get_keyfile_hex(config, config_home, "styling", "doublestring", "0x330066", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[9]);
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", "identifier2", "0x6b6bff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[14]);
+ get_keyfile_hex(config, config_home, "styling", "important", "0xff0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[15]);
style_sets[GEANY_FILETYPES_CSS].keywords = g_new(gchar*, 4);
get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_CSS, 0,
@@ -1894,7 +1897,8 @@
border-top border-right border-bottom border-left border \
border-color border-style width height float clear \
display white-space list-style-type list-style-image list-style-position list-style");
- get_keyfile_keywords(config, config_home, "keywords", "secondary", GEANY_FILETYPES_CSS, 1,
+ get_keyfile_keywords(config, config_home, "keywords", "pseudoclasses", GEANY_FILETYPES_CSS, 1, "first-letter first-line link active visited lang first-child focus hover before after left right first");
+ get_keyfile_keywords(config, config_home, "keywords", "secondary", GEANY_FILETYPES_CSS, 2,
"border-top-color border-right-color border-bottom-color border-left-color border-color \
border-top-style border-right-style border-bottom-style border-left-style border-style \
top right bottom left position z-index direction unicode-bidi \
@@ -1909,7 +1913,6 @@
volume speak pause-before pause-after pause cue-before cue-after cue \
play-during azimuth elevation speech-rate voice-family pitch pitch-range stress richness \
speak-punctuation speak-numeral");
- get_keyfile_keywords(config, config_home, "keywords", "pseudoclasses", GEANY_FILETYPES_CSS, 2, "first-letter first-line link active visited lang first-child focus hover before after left right first");
style_sets[GEANY_FILETYPES_CSS].keywords[3] = NULL;
get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
@@ -1929,6 +1932,10 @@
SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) style_sets[GEANY_FILETYPES_CSS].wordchars);
SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0);
+ SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_CSS].keywords[0]);
+ SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_CSS].keywords[1]);
+ SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_CSS].keywords[2]);
+
SSM(sci, SCI_SETLEXER, SCLEX_CSS, 0);
set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_CSS, 0);
@@ -1945,6 +1952,9 @@
set_sci_style(sci, SCE_CSS_SINGLESTRING, GEANY_FILETYPES_CSS, 10);
set_sci_style(sci, SCE_CSS_ATTRIBUTE, GEANY_FILETYPES_CSS, 11);
set_sci_style(sci, SCE_CSS_VALUE, GEANY_FILETYPES_CSS, 12);
+ set_sci_style(sci, SCE_CSS_ID, GEANY_FILETYPES_CSS, 13);
+ set_sci_style(sci, SCE_CSS_IDENTIFIER2, GEANY_FILETYPES_CSS, 14);
+ set_sci_style(sci, SCE_CSS_IMPORTANT, GEANY_FILETYPES_CSS, 15);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list