Revision: 641 Author: eht16 Date: 2006-07-27 13:57:13 -0700 (Thu, 27 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=641&view=rev
Log Message: ----------- Removed unused colour parsing functions. Let the colour chooser pick the colour under the cursor. Fixed bug in parsing strings containing hex values, modified the styles to keep the syntax highlighting consistent. Removed startup warning.
Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.asm trunk/data/filetypes.c trunk/data/filetypes.caml trunk/data/filetypes.common trunk/data/filetypes.conf trunk/data/filetypes.cpp trunk/data/filetypes.css trunk/data/filetypes.d trunk/data/filetypes.docbook trunk/data/filetypes.java trunk/data/filetypes.latex trunk/data/filetypes.makefile trunk/data/filetypes.oms trunk/data/filetypes.pascal trunk/data/filetypes.perl trunk/data/filetypes.php trunk/data/filetypes.python trunk/data/filetypes.ruby trunk/data/filetypes.sh trunk/data/filetypes.sql trunk/data/filetypes.tcl trunk/data/filetypes.xml trunk/src/callbacks.c trunk/src/dialogs.c trunk/src/dialogs.h trunk/src/highlighting.c trunk/src/keybindings.c trunk/src/main.c trunk/src/sciwrappers.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/ChangeLog 2006-07-27 20:57:13 UTC (rev 641) @@ -1,3 +1,15 @@ +2006-07-27 Enrico Tröger enrico.troeger@uvena.de + + * src/sciwrappers.c, src/callbacks.c, src/utils.c, src/dialogs.c, + src/keybindings.c: + Removed unused colour parsing functions. + Let the colour chooser pick the colour under the cursor. + * data/filetypes.*, src/highlighting.c, src/utils.c: + Fixed bug in parsing strings containing hex values, modified the + styles to keep the syntax highlighting consistent. + * src/main.c: Removed startup warning. + + 2006-07-26 Enrico Tröger enrico.troeger@uvena.de
* src/Makefile.am: Added target to remove geany_res.res when cleaning.
Modified: trunk/data/filetypes.asm =================================================================== --- trunk/data/filetypes.asm 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.asm 2006-07-27 20:57:13 UTC (rev 641) @@ -4,18 +4,18 @@ default=0x000000;0xffffff;false;false comment=0x808080;0xffffff;false;false number=0x007f00;0xffffff;false;false -string=0x1e90ff;0xffffff;false;false +string=0xff901e;0xffffff;false;false operator=0x000000;0xffffff;false;false -identifier=0x000088;0xffffff;false;false -cpuinstruction=0x991111;0xffffff;true;false -mathinstruction=0x00007f;0xffffff;true;false +identifier=0x880000;0xffffff;false;false +cpuinstruction=0x111199;0xffffff;true;false +mathinstruction=0x7f0000;0xffffff;true;false register=0x000000;0xffffff;true;false -directive=0x0F673D;0xffffff;true;false -directiveoperand=0x1e90ff;0xffffff;false;false +directive=0x3d670f;0xffffff;true;false +directiveoperand=0xff901e;0xffffff;false;false commentblock=0x808080;0xffffff;false;false -character=0x1e90ff;0xffffff;false;false +character=0xff901e;0xffffff;false;false stringeol=0x000000;0xe0c0e0;false;false -extinstruction=0x7f7f00;0xffffff;false;false +extinstruction=0x007f7f;0xffffff;false;false
[keywords] # all items must be in one line @@ -33,7 +33,7 @@ comment_open=; comment_close=
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.c =================================================================== --- trunk/data/filetypes.c 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.c 2006-07-27 20:57:13 UTC (rev 641) @@ -2,24 +2,24 @@ [styling] # foreground;background;bold;italic default=0x000000;0xffffff;false;false -comment=0x0000ff;0xffffff;false;false -commentline=0x0000ff;0xffffff;false;false -commentdoc=0x0000ff;0xffffff;false;false +comment=0xff0000;0xffffff;false;false +commentline=0xff0000;0xffffff;false;false +commentdoc=0xff0000;0xffffff;false;false number=0x007f00;0xffffff;false;false -word=0x991111;0xffffff;true;false -word2=0x00007F;0xffffff;true;false -string=0x1E90FF;0xffffff;false;false -character=0x1E90FF;0xffffff;false;false -uuid=0x804040;0xffffff;false;false -preprocessor=0x7F7F00;0xffffff;false;false -operator=0x101030;0xffffff;false;false -identifier=0x100000;0xffffff;false;false +word=0x00007f;0xffffff;true;false +word2=0x991111;0xffffff;true;false +string=0xff901e;0xffffff;false;false +character=0xff901e;0xffffff;false;false +uuid=0x404080;0xffffff;false;false +preprocessor=0x007F7F;0xffffff;false;false +operator=0x301010;0xffffff;false;false +identifier=0x000000;0xffffff;false;false stringeol=0x000000;0xe0c0e0;false;false verbatim=0x101030;0xffffff;false;false -regex=0x905010;0xffffff;false;false -commentlinedoc=0x0000ff;0xffffff;true;false -commentdockeyword=0x0000ff;0xffffff;true;true -globalclass=0xbb1111;0xffffff;true;false +regex=0x105090;0xffffff;false;false +commentlinedoc=0xff0000;0xffffff;true;false +commentdockeyword=0xff0000;0xffffff;true;true +globalclass=0x1111bb;0xffffff;true;false # whether arguments of preprocessor commands should be styled (only first argument is used) # 1 to enable, 0 to disable styling_within_preprocessor=1;0;false;false
Modified: trunk/data/filetypes.caml =================================================================== --- trunk/data/filetypes.caml 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.caml 2006-07-27 20:57:13 UTC (rev 641) @@ -6,15 +6,15 @@ comment1=0x808080;0xffffff;false;false comment2=0x808080;0xffffff;false;false comment3=0x808080;0xffffff;false;false -number=0x007f7f;0xffffff;false;false -keyword=0x7f1a00;0xffffff;true;false -keyword2=0x00007f;0xffffff;true;false +number=0x7f7f00;0xffffff;false;false +keyword=0x001a7f;0xffffff;true;false +keyword2=0x7f0000;0xffffff;true;false string=0x7f007f;0xffffff;false;false char=0x7f007f;0xffffff;false;false operator=0x000000;0xffffff;false;false -identifier=0x991111;0xffffff;false;false +identifier=0x111199;0xffffff;false;false tagname=0x000000;0xffe0ff;true;false -linenum=0x000000;0xC0C0C0;false;false +linenum=0x000000;0xc0c0c0;false;false
[keywords] # all items must be in one line @@ -30,7 +30,7 @@ comment_open=(* comment_close=*)
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.common =================================================================== --- trunk/data/filetypes.common 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.common 2006-07-27 20:57:13 UTC (rev 641) @@ -3,15 +3,15 @@ # foreground;background;bold;italic default=0x000000;0xffffff;false;false # bold for selection is useless, so say false -selection=0xc0c0c0;0x00007F;false;false -brace_good=0xff0000;0xFFFFFF;true;false -brace_bad=0x0000ff;0xFFFFFF;true;false +selection=0xc0c0c0;0x7f0000;false;false +brace_good=0x0000ff;0xFFFFFF;true;false +brace_bad=0xff0000;0xFFFFFF;true;false # the following settings define the colours of the margins on the left side margin_linenumber=0x000000;0xd0d0d0;false;false margin_folding=0x000000;0xdfdfdf;false;false # background colour of the current line, only the second and third argument is interpreted # use the third argument to enable or disable the highlighting of the current line (has to be true/false) -current_line=0x0;0xe5e5e5;true;false +current_line=0;0xe5e5e5;true;false # style of folding icons, only first and second arguments are used, valid values are: # first argument: 1 for boxes, 2 for circles # second argument: 1 for straight lines, 2 for curved lines
Modified: trunk/data/filetypes.conf =================================================================== --- trunk/data/filetypes.conf 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.conf 2006-07-27 20:57:13 UTC (rev 641) @@ -1,12 +1,12 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x00007f;0xffffff;false;false +default=0x7f0000;0xffffff;false;false comment=0x808080;0xffffff;false;false -section=0x900000;0xffffff;true;false -key=0x7f0000;0xffffff;false;false +section=0x000090;0xffffff;true;false +key=0x00007f;0xffffff;false;false assignment=0x000000;0xffffff;false;false -defval=0x7f0000;0xffffff;false;false +defval=0x00007f;0xffffff;false;false
# the lexer don't support keywords
@@ -19,7 +19,7 @@ comment_open=# comment_close=
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.cpp =================================================================== --- trunk/data/filetypes.cpp 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.cpp 2006-07-27 20:57:13 UTC (rev 641) @@ -2,24 +2,24 @@ [styling] # foreground;background;bold;italic default=0x000000;0xffffff;false;false -comment=0x0000ff;0xffffff;false;false -commentline=0x0000ff;0xffffff;false;false -commentdoc=0x0000ff;0xffffff;false;false +comment=0xff0000;0xffffff;false;false +commentline=0xff0000;0xffffff;false;false +commentdoc=0xff0000;0xffffff;false;false number=0x007f00;0xffffff;false;false -word=0x991111;0xffffff;true;false -word2=0x00007F;0xffffff;true;false -string=0x1E90FF;0xffffff;false;false -character=0x1E90FF;0xffffff;false;false -uuid=0x804040;0xffffff;false;false -preprocessor=0x7F7F00;0xffffff;false;false -operator=0x101030;0xffffff;false;false -identifier=0x100000;0xffffff;false;false +word=0x00007f;0xffffff;true;false +word2=0x991111;0xffffff;true;false +string=0xff901e;0xffffff;false;false +character=0xff901e;0xffffff;false;false +uuid=0x404080;0xffffff;false;false +preprocessor=0x007F7F;0xffffff;false;false +operator=0x301010;0xffffff;false;false +identifier=0x000000;0xffffff;false;false stringeol=0x000000;0xe0c0e0;false;false verbatim=0x101030;0xffffff;false;false -regex=0x905010;0xffffff;false;false -commentlinedoc=0x0000ff;0xffffff;true;false -commentdockeyword=0x0000ff;0xffffff;true;true -globalclass=0xbb1111;0xffffff;true;false +regex=0x105090;0xffffff;false;false +commentlinedoc=0xff0000;0xffffff;true;false +commentdockeyword=0xff0000;0xffffff;true;true +globalclass=0x1111bb;0xffffff;true;false # whether arguments of preprocessor commands should be styled (only first argument is used) # 1 to enable, 0 to disable styling_within_preprocessor=1;0;false;false @@ -40,7 +40,7 @@ #comment_open=/* #comment_close=*/
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.css =================================================================== --- trunk/data/filetypes.css 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.css 2006-07-27 20:57:13 UTC (rev 641) @@ -1,18 +1,18 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x993300;0xffffff;false;false +default=0x003399;0xffffff;false;false comment=0x808080;0xffffff;false;false -tag=0xa46621;0xffffff;true;false +tag=0x2166a4;0xffffff;true;false class=0x007f00;0xffffff;true;false -pseudoclass=0x100066;0xffffff;true;true -unknown_pseudoclass=0x990000;0xffffff;false;false -unknown_identifier=0x990000;0xffffff;false;false -operator=0x101030;0xffffff;false;false -identifier=0x990000;0xffffff;true;false -doublestring=0x660033;0xffffff;false;false -singlestring=0x660033;0xffffff;false;false -attribute=0x007F00;0xffffff;false;false +pseudoclass=0x660010;0xffffff;true;true +unknown_pseudoclass=0x000099;0xffffff;false;false +unknown_identifier=0x000099;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
[keywords] @@ -29,7 +29,7 @@ comment_open=/* comment_close=*/
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.d =================================================================== --- trunk/data/filetypes.d 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.d 2006-07-27 20:57:13 UTC (rev 641) @@ -2,24 +2,24 @@ [styling] # foreground;background;bold;italic default=0x000000;0xffffff;false;false -comment=0x0000ff;0xffffff;false;false -commentline=0x0000ff;0xffffff;false;false -commentdoc=0x0000ff;0xffffff;false;false +comment=0xff0000;0xffffff;false;false +commentline=0xff0000;0xffffff;false;false +commentdoc=0xff0000;0xffffff;false;false number=0x007f00;0xffffff;false;false -word=0x991111;0xffffff;true;false -word2=0x00007F;0xffffff;true;false -string=0x1E90FF;0xffffff;false;false -character=0x1E90FF;0xffffff;false;false -uuid=0x804040;0xffffff;false;false +word=0x111199;0xffffff;true;false +word2=0x7f0000;0xffffff;true;false +string=0xff901e;0xffffff;false;false +character=0xff901e;0xffffff;false;false +uuid=0x404080;0xffffff;false;false preprocessor=0x7F7F00;0xffffff;false;false -operator=0x101030;0xffffff;false;false -identifier=0x100000;0xffffff;false;false +operator=0x301010;0xffffff;false;false +identifier=0x000000;0xffffff;false;false stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x905010;0xffffff;false;false -commentlinedoc=0x0000ff;0xffffff;true;false -commentdockeyword=0x0000ff;0xffffff;true;true -globalclass=0xbb1111;0xffffff;true;false +verbatim=0x301010;0xffffff;false;false +regex=0x105090;0xffffff;false;false +commentlinedoc=0xff0000;0xffffff;true;false +commentdockeyword=0xff0000;0xffffff;true;true +globalclass=0x1111bb;0xffffff;true;false # whether arguments of preprocessor commands should be styled (only first argument is used) # 1 to enable, 0 to disable styling_within_preprocessor=1;0;false;false @@ -43,7 +43,7 @@ #comment_open=/+ #comment_close=+/
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.docbook =================================================================== --- trunk/data/filetypes.docbook 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.docbook 2006-07-27 20:57:13 UTC (rev 641) @@ -2,34 +2,34 @@ [styling] # foreground;background;bold;italic default=0x000000;0xffffff;false;false -tag=0x990000;0xffffff;false;false -tagunknown=0x0000ff;0xffffff;false;false -attribute=0x007F00;0xffffff;false;false -attributeunknown=0x0000ff;0xffffff;false;false +tag=0x000099;0xffffff;false;false +tagunknown=0xff0000;0xffffff;false;false +attribute=0x007f00;0xffffff;false;false +attributeunknown=0xff0000;0xffffff;false;false number=0x800080;0xffffff;false;false -doublestring=0x1E90FF;0xffffff;false;false -singlestring=0x1E90FF;0xffffff;false;false +doublestring=0xff901e;0xffffff;false;false +singlestring=0xff901e;0xffffff;false;false other=0x800080;0xffffff;false;false comment=0x808080;0xffffff;false;false entity=0x800080;0xffffff;false;false -tagend=0x990000;0xffffff;false;false -xmlstart=0x990000;0xffffff;false;false -xmlend=0x990000;0xf0f0f0;false;false -cdata=0x990066;0xffffff;false;false -question=0xff0000;0xffffff;false;false -value=0x990066;0xffffff;false;false -xccomment=0x990066;0xffffff;false;false +tagend=0x000099;0xffffff;false;false +xmlstart=0x000099;0xffffff;false;false +xmlend=0x000099;0xffffff;false;false +cdata=0x660099;0xffffff;false;false +question=0x0000ff;0xffffff;false;false +value=0x660099;0xffffff;false;false +xccomment=0x660099;0xffffff;false;false sgml_default=0x000000;0xffffff;false;false -sgml_comment=0x808080;0xffffff;false;false -sgml_special=0x007F00;0xffffff;false;false -sgml_command=0x991111;0xffffff;true;false -sgml_doublestring=0x1E90FF;0xffffff;false;false -sgml_simplestring=0x004040;0xffffff;false;false -sgml_1st_param=0x804040;0xffffff;false;false -sgml_entity=0x101030;0xffffff;false;false -sgml_block_default=0x100000;0xffffff;false;false -sgml_1st_param_comment=0x906040;0xffffff;false;false -sgml_error=0x0000ff;0xffffff;false;false +sgml_comment=0x303030;0xffffff;false;false +sgml_special=0x007f00;0xffffff;false;false +sgml_command=0x111199;0xffffff;true;false +sgml_doublestring=0xff901e;0xffffff;false;false +sgml_simplestring=0x202020;0xffffff;false;false +sgml_1st_param=0x404080;0xffffff;false;false +sgml_entity=0x301010;0xffffff;false;false +sgml_block_default=0x000000;0xffffff;false;false +sgml_1st_param_comment=0x406090;0xffffff;false;false +sgml_error=0xff0000;0xffffff;false;false
[keywords] # all items must be in one line @@ -45,7 +45,7 @@ comment_open=<!-- comment_close=-->
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.java =================================================================== --- trunk/data/filetypes.java 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.java 2006-07-27 20:57:13 UTC (rev 641) @@ -2,24 +2,24 @@ [styling] # foreground;background;bold;italic default=0x000000;0xffffff;false;false -comment=0x0000ff;0xffffff;false;false -commentline=0x0000ff;0xffffff;false;false -commentdoc=0x0000ff;0xffffff;false;false +comment=0xff0000;0xffffff;false;false +commentline=0xff0000;0xffffff;false;false +commentdoc=0xff0000;0xffffff;false;false number=0x007f00;0xffffff;false;false -word=0x991111;0xffffff;true;false -word2=0x00007F;0xffffff;true;false -string=0x1E90FF;0xffffff;false;false -character=0x1E90FF;0xffffff;false;false -uuid=0x804040;0xffffff;false;false -preprocessor=0x7F7F00;0xffffff;false;false -operator=0x101030;0xffffff;false;false -identifier=0x004040;0xffffff;false;false +word=0x111199;0xffffff;true;false +word2=0x7f0000;0xffffff;true;false +string=0xff901e;0xffffff;false;false +character=0xff901e;0xffffff;false;false +uuid=0x404080;0xffffff;false;false +preprocessor=0x007f7f;0xffffff;false;false +operator=0x301010;0xffffff;false;false +identifier=0x404000;0xffffff;false;false stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x906040;0x0000ff;false;false +verbatim=0x406090;0x0000ff;false;false regex=0x905010;0xffffff;false;false -commentlinedoc=0x0000ff;0xffffff;true;true -commentdockeyword=0x0000ff;0xffffff;true;true -globalclass=0x109040;0xffffff;true;false +commentlinedoc=0xff0000;0xffffff;true;true +commentdockeyword=0xff0000;0xffffff;true;true +globalclass=0x409010;0xffffff;true;false
[keywords] primary=abstract assert break case catch class const continue default do else extends final finally for future generic goto if implements import inner instanceof interface native new outer package private protected public rest return static super switch synchronized this throw throws transient try var volatile while @@ -36,7 +36,7 @@ comment_open=/* comment_close=*/
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.latex =================================================================== --- trunk/data/filetypes.latex 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.latex 2006-07-27 20:57:13 UTC (rev 641) @@ -1,11 +1,11 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0xFF0000;0xffffff;false;false -command=0x0000ff;0xffffff;true;false -tag=0x7F7F00;0xffffff;true;false -math=0x007F00;0xffffff;false;false -comment=0x007F00;0xffffff;false;true +default=0x00002f;0xffffff;false;false +command=0xff0000;0xffffff;true;false +tag=0x007f7f;0xffffff;true;false +math=0x007f00;0xffffff;false;false +comment=0x007f00;0xffffff;false;true
[keywords] # all items must be in one line @@ -20,7 +20,7 @@ comment_open=% comment_close=
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.makefile =================================================================== --- trunk/data/filetypes.makefile 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.makefile 2006-07-27 20:57:13 UTC (rev 641) @@ -1,12 +1,12 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0xFF0000;0xffffff;false;false -comment=0x0000ff;0xffffff;false;false -preprocessor=0x7F7F00;0xffffff;false;false -identifier=0x007F00;0xffffff;false;false -operator=0x101030;0xffffff;false;false -target=0xff0000;0xffffff;false;false +default=0x00002f;0xffffff;false;false +comment=0xff0000;0xffffff;false;false +preprocessor=0x007f7f;0xffffff;false;false +identifier=0x007f00;0xffffff;false;false +operator=0x301010;0xffffff;false;false +target=0x0000ff;0xffffff;false;false ideol=0x008000;0xffffff;false;false
# there are no keywords available otherwise mail me @@ -20,7 +20,7 @@ comment_open=# comment_close=
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.oms =================================================================== --- trunk/data/filetypes.oms 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.oms 2006-07-27 20:57:13 UTC (rev 641) @@ -4,14 +4,14 @@ default=0x000000;0xffffff;false;false commentline=0x909090;0xffffff;false;false number=0x007f00;0xffffff;false;false -word=0x111199;0xffffff;false;false -string=0x1e90ff;0xffffff;false;false -character=0x004040;0xffffff;false;false +word=0x991111;0xffffff;false;false +string=0xff901e;0xffffff;false;false +character=0x404000;0xffffff;false;false operator=0x000000;0xffffff;false;false identifier=0x000000;0xffffff;false;false backticks=0x000000;0xe0c0e0;false;false -param=0x111199;0x0000ff;false;false -scalar=0xff0000;0xffffff;false;false +param=0x991111;0x0000ff;false;false +scalar=0x0000ff;0xffffff;false;false
[keywords] # all items must be in one line @@ -26,7 +26,7 @@ comment_open=# comment_close=
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.pascal =================================================================== --- trunk/data/filetypes.pascal 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.pascal 2006-07-27 20:57:13 UTC (rev 641) @@ -2,17 +2,17 @@ [styling] # foreground;background;bold;italic default=0x0000ff;0xffffff;false;false -comment=0x0000ff;0xffffff;false;false -number=0x007F00;0xffffff;false;false -word=0x991111;0xffffff;true;false -string=0x1E90FF;0xffffff;false;false -character=0x004040;0xffffff;false;false -preprocessor=0x7F7F00;0xffffff;false;false -operator=0x101030;0xffffff;false;false -identifier=0x100000;0xffffff;false;false -regex=0x13631B;0xffffff;false;false -commentline=0x0000ff;0xffffff;false;false -commentdoc=0x0000ff;0xffffff;false;false +comment=0xff0000;0xffffff;false;false +number=0x007f00;0xffffff;false;false +word=0x111199;0xffffff;true;false +string=0xff901e;0xffffff;false;false +character=0x404000;0xffffff;false;false +preprocessor=0x007f7f;0xffffff;false;false +operator=0x301010;0xffffff;false;false +identifier=0x000000;0xffffff;false;false +regex=0x1b6313;0xffffff;false;false +commentline=0xff0000;0xffffff;false;false +commentdoc=0xff0000;0xffffff;false;false
[keywords] primary=absolute and array asm begin break case const constructor continue destructor div do downto dynamic else end end. file for function goto if implementation in inherited inline interface label message mod nil not object of on operator or overload outpacked procedure program record reintroduce repeat self set shl shr string then to type unit until uses var while with xor as class except exports finalization finally initialization is library on property raise threadvar try dispose exit false new true absolute abstract alias assembler cdecl cppdecl default export external far far16 forward index name near oldfpccall override pascal private protected public published read register safecall softfloat stdcall virtual write @@ -26,7 +26,7 @@ comment_open={ comment_close=}
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.perl =================================================================== --- trunk/data/filetypes.perl 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.perl 2006-07-27 20:57:13 UTC (rev 641) @@ -2,21 +2,21 @@ [styling] # foreground;background;bold;italic default=0x000000;0xffffff;false;false -error=0x0000ff;0xffffff;false;false -commentline=0x0000ff;0xffffff;false;false -number=0x007F00;0xffffff;false;false -word=0x991111;0xffffff;true;false -string=0x1E90FF;0xffffff;false;false -character=0x1E90FF;0xffffff;false;false -preprocessor=0x7F7F00;0xffffff;false;false -operator=0x101030;0xffffff;false;false -identifier=0x110000;0xffffff;false;false -scalar=0x00007F;0xffffff;true;false -pod=0x0356500;0xffffff;false;true -regex=0x905010;0xffffff;false;false -array=0x905010;0xffffff;false;false -hash=0x905010;0xffffff;false;false -symboltable=0x905010;0xffffff;false;false +error=0xff0000;0xffffff;false;false +commentline=0xff0000;0xffffff;false;false +number=0x007f00;0xffffff;false;false +word=0x111199;0xffffff;true;false +string=0xff901e;0xffffff;false;false +character=0xff901e;0xffffff;false;false +preprocessor=0x007f7f;0xffffff;false;false +operator=0x301010;0xffffff;false;false +identifier=0x000000;0xffffff;false;false +scalar=0x7f0000;0xffffff;true;false +pod=0x035650;0xffffff;false;true +regex=0x105090;0xffffff;false;false +array=0x105090;0xffffff;false;false +hash=0x105090;0xffffff;false;false +symboltable=0x105090;0xffffff;false;false backticks=0x000000;0xe0c0e0;false;false
[keywords] @@ -31,7 +31,7 @@ comment_open=# comment_close=
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.php =================================================================== --- trunk/data/filetypes.php 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.php 2006-07-27 20:57:13 UTC (rev 641) @@ -12,7 +12,7 @@ comment_open=/* comment_close=*/
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.python =================================================================== --- trunk/data/filetypes.python 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.python 2006-07-27 20:57:13 UTC (rev 641) @@ -2,18 +2,18 @@ [styling] # foreground;background;bold;italic default=0x000000;0xffffff;false;false -commentline=0xFF0000;0xffffff;false;false -number=0x800040;0xffffff;false;false +commentline=0x808080;0xffffff;false;false +number=0x400080;0xffffff;false;false string=0x008000;0xffffff;false;false character=0x008000;0xffffff;false;false -word=0x800060;0xffffff;true;false -triple=0x208000;0xffffff;false;false -tripledouble=0x004040;0xffffff;false;false -classname=0x303000;0xffffff;false;false -defname=0x800000;0xffffff;false;false -operator=0x800030;0xffffff;false;false +word=0x600080;0xffffff;true;false +triple=0x008020;0xffffff;false;false +tripledouble=0x404000;0xffffff;false;false +classname=0x003030;0xffffff;false;false +defname=0x000080;0xffffff;false;false +operator=0x300080;0xffffff;false;false identifier=0x000000;0xffffff;false;false -commentblock=0xff00ff;0xffffff;false;false +commentblock=0x808080;0xffffff;false;false stringeol=0x000000;0xe0c0e0;false;false
[keywords] @@ -29,7 +29,7 @@ comment_open=# comment_close=
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.ruby =================================================================== --- trunk/data/filetypes.ruby 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.ruby 2006-07-27 20:57:13 UTC (rev 641) @@ -2,24 +2,24 @@ [styling] # foreground;background;bold;italic default=0x000000;0xffffff;false -commentline=0x0000ff;0xffffff;false;false -number=0x800040;0xffffff;false;false +commentline=0xff0000;0xffffff;false;false +number=0x400080;0xffffff;false;false string=0x008000;0xffffff;false;false character=0x008000;0xffffff;false;false -word=0x991111;0xffffff;true;false -global=0x991111;0xffffff;false;false -symbol=0x208000;0xffffff;false;false -classname=0x00007f;0xffffff;true;false -defname=0x00007f;0xffffff;false;false +word=0x111199;0xffffff;true;false +global=0x111199;0xffffff;false;false +symbol=0x008020;0xffffff;false;false +classname=0x7f0000;0xffffff;true;false +defname=0x7f0000;0xffffff;false;false operator=0x000000;0xffffff;false;false identifier=0x000000;0xffffff;false;false -modulename=0x991111;0xffffff;true;false +modulename=0x111199;0xffffff;true;false backticks=0x000000;0xe0c0e0;false;false instancevar=0x000000;0xffffff;false;true classvar=0x000000;0xffffff;true;true datasection=0x000000;0xffffff;false;false heredelim=0x000000;0xffffff;false;false -worddemoted=0x991111;0xffffff;false;false +worddemoted=0x111199;0xffffff;false;false
[keywords] # all items must be in one line @@ -34,7 +34,7 @@ comment_open=# comment_close=
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.sh =================================================================== --- trunk/data/filetypes.sh 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.sh 2006-07-27 20:57:13 UTC (rev 641) @@ -2,19 +2,19 @@ [styling] # foreground;background;bold;italic default=0x000000;0xffffff;false;false -commentline=0x0000ff;0xffffff;false;false -number=0x007F00;0xffffff;false;false -word=0x991111;0xffffff;true;false -string=0x1E90FF;0xffffff;false;false -character=0x004040;0xffffff;false;false -operator=0x101030;0xffffff;false;false +commentline=0xff0000;0xffffff;false;false +number=0x007f00;0xffffff;false;false +word=0x111199;0xffffff;true;false +string=0xff901e;0xffffff;false;false +character=0x404000;0xffffff;false;false +operator=0x301010;0xffffff;false;false identifier=0x000000;0xffffff;false;false backticks=0x000000;0xd0d0d0;false;false -param=0x00009f;0xffffff;false;false -scalar=0x905010;0xffffff;false;false +param=0x009f00;0xffffff;false;false +scalar=0x105090;0xffffff;false;false
[keywords] -primary=break case continue do done elif else esac eval exit export fi for goto if in integer return set shift then while +primary=break case continue do done elif else esac eval exit export fi for function goto if in integer return set shift then while
[settings]
Modified: trunk/data/filetypes.sql =================================================================== --- trunk/data/filetypes.sql 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.sql 2006-07-27 20:57:13 UTC (rev 641) @@ -5,17 +5,17 @@ comment=0x808080;0xffffff;false;false commentline=0x808080;0xffffff;false;false commentdoc=0x808080;0xffffff;false;false -number=0x007F7F;0xffffff;false;false -word=0x7F1A00;0xffffff;true;false -word2=0x00007F;0xffffff;true;false -string=0x7F007F;0xffffff;false;false +number=0x7f7f00;0xffffff;false;false +word=0x001a7f;0xffffff;true;false +word2=0x7f0000;0xffffff;true;false +string=0x7f007f;0xffffff;false;false character=0x000000;0xffffff;false;false operator=0x000000;0xffffff;true;false -identifier=0x991111;0xffffff;false;false +identifier=0x111199;0xffffff;false;false sqlplus=0x000000;0xffffff;false;false sqlplus_prompt=0x000000;0xffffff;false;false sqlplus_comment=0x000000;0xffffff;false;false -quotedidentifier=0x991111;0xffffff;false;false +quotedidentifier=0x111199;0xffffff;false;false
[keywords] # all items must be in one line @@ -30,7 +30,7 @@ comment_open=/* comment_close=*/
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.tcl =================================================================== --- trunk/data/filetypes.tcl 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.tcl 2006-07-27 20:57:13 UTC (rev 641) @@ -2,21 +2,21 @@ [styling] # foreground;background;bold;italic default=0x000000;0xffffff;false;false -comment=0x0000ff;0xffffff;false;false -commentline=0x0000ff;0xffffff;false;false +comment=0xff0000;0xffffff;false;false +commentline=0xff0000;0xffffff;false;false number=0x007f00;0xffffff;false;false -operator=0x101030;0xffffff;false;false -identifier=0x0000a2;0xffffff;false;false +operator=0x301010;0xffffff;false;false +identifier=0xa20000;0xffffff;false;false wordinquote=0x7f007f;0xffffff;false;false inquote=0x7f007f;0xffffff;false;false -substitution=0x991111;0xffffff;false;false +substitution=0x111199;0xffffff;false;false modifier=0x7f007f;0xffffff;false;false -expand=0x100000;0xffffff;false;false -wordtcl=0x991111;0xffffff;true;false -wordtk=0x00007f;0xffffff;true;false -worditcl=0x991111;0xffffff;true;false -wordtkcmds=0x00007f;0xffffff;true;false -wordexpand=0x00007f;0xffffff;true;false +expand=0x000000;0xffffff;false;false +wordtcl=0x111199;0xffffff;true;false +wordtk=0x7f0000;0xffffff;true;false +worditcl=0x111199;0xffffff;true;false +wordtkcmds=0x7f0000;0xffffff;true;false +wordexpand=0x7f0000;0xffffff;true;false
[keywords] @@ -36,7 +36,7 @@ comment_open=# comment_close=
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/data/filetypes.xml =================================================================== --- trunk/data/filetypes.xml 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/data/filetypes.xml 2006-07-27 20:57:13 UTC (rev 641) @@ -2,67 +2,67 @@ [styling] # foreground;background;bold;italic html_default=0x000000;0xffffff;false;false -html_tag=0x990000;0xffffff;false;false -html_tagunknown=0x0000ff;0xffffff;false;false -html_attribute=0x007F00;0xffffff;false;false -html_attributeunknown=0x0000ff;0xffffff;false;false +html_tag=0x000099;0xffffff;false;false +html_tagunknown=0xff0000;0xffffff;false;false +html_attribute=0x007f00;0xffffff;false;false +html_attributeunknown=0xff0000;0xffffff;false;false html_number=0x800080;0xffffff;false;false -html_doublestring=0x1E90FF;0xffffff;false;false -html_singlestring=0x1E90FF;0xffffff;false;false +html_doublestring=0xff901e;0xffffff;false;false +html_singlestring=0xff901e;0xffffff;false;false html_other=0x800080;0xffffff;false;false html_comment=0x808080;0xffffff;false;false html_entity=0x800080;0xffffff;false;false -html_tagend=0x800000;0xffffff;false;false +html_tagend=0x000080;0xffffff;false;false # <? -html_xmlstart=0x990000;0xf0f0f0;false;false +html_xmlstart=0x000099;0xf0f0f0;false;false # ?> -html_xmlend=0x990000;0xf0f0f0;false;false +html_xmlend=0x000099;0xf0f0f0;false;false # <script -html_script=0x800000;0xf0f0f0;false;false +html_script=0x000080;0xf0f0f0;false;false # <% ... %> -html_asp=0x4f4f00;0xf0f0f0;false;false +html_asp=0x004f4f;0xf0f0f0;false;false # <%@ ... %> -html_aspat=0x4f4f00;0xf0f0f0;false;false -html_cdata=0x990066;0xffffff;false;false -html_question=0xff0000;0xffffff;false;false -html_value=0x990066;0xffffff;false;false -html_xccomment=0x990066;0xffffff;false;false +html_aspat=0x004f4f;0xf0f0f0;false;false +html_cdata=0x660099;0xffffff;false;false +html_question=0x0000ff;0xffffff;false;false +html_value=0x660099;0xffffff;false;false +html_xccomment=0x660099;0xffffff;false;false
sgml_default=0x000000;0xffffff;false;false sgml_comment=0x808080;0xffffff;false;false -sgml_special=0x007F00;0xffffff;false;false -sgml_command=0x991111;0xffffff;true;false -sgml_doublestring=0x1E90FF;0xffffff;false;false -sgml_simplestring=0x004040;0xffffff;false;false -sgml_1st_param=0x804040;0xffffff;false;false -sgml_entity=0x101030;0xffffff;false;false -sgml_block_default=0x100000;0xffffff;false;false -sgml_1st_param_comment=0x906040;0xffffff;false;false -sgml_error=0x0000ff;0xffffff;false;false +sgml_special=0x007f00;0xffffff;false;false +sgml_command=0x111199;0xffffff;true;false +sgml_doublestring=0xff901e;0xffffff;false;false +sgml_simplestring=0xff901e;0xffffff;false;false +sgml_1st_param=0x404080;0xffffff;false;false +sgml_entity=0x301010;0xffffff;false;false +sgml_block_default=0x000000;0xffffff;false;false +sgml_1st_param_comment=0x406090;0xffffff;false;false +sgml_error=0xff0000;0xffffff;false;false
php_default=0x000000;0xffffff;false;false -php_simplestring=0x008000;0xffffff;false;false +php_simplestring=0xff901e;0xffffff;false;false php_hstring=0x008000;0xffffff;false;false -php_number=0x006060;0xffffff;false;false -php_word=0x990000;0xffffff;false;false -php_variable=0x00007F;0xffffff;false;false +php_number=0x606000;0xffffff;false;false +php_word=0x000099;0xffffff;false;false +php_variable=0x7f0000;0xffffff;false;false php_comment=0x808080;0xffffff;false;false php_commentline=0x808080;0xffffff;false;false -php_operator=0x602010;0xffffff;false;false -php_hstring_variable=0x601010;0xffffff;false;false +php_operator=0x102060;0xffffff;false;false +php_hstring_variable=0x101060;0xffffff;false;false php_complex_variable=0x105010;0xffffff;false;false
-jscript_start=0x808000;0xffffff;false;false +jscript_start=0x008080;0xffffff;false;false jscript_default=0x000000;0xffffff;false;false jscript_comment=0x222222;0xffffff;false;false jscript_commentline=0x808080;0xffffff;false;false jscript_commentdoc=0x808080;0xffffff;false;false -jscript_number=0x606000;0xffffff;false;false -jscript_word=0xff0000;0xffffff;false;false -jscript_keyword=0x001050;0xffffff;false;false -jscript_doublestring=0x080080;0xffffff;false;false -jscript_singlestring=0x080080;0xffffff;false;false -jscript_symbols=0x501000;0xffffff;false;false +jscript_number=0x006060;0xffffff;false;false +jscript_word=0x0000ff;0xffffff;false;false +jscript_keyword=0x501000;0xffffff;false;false +jscript_doublestring=0xff901e;0xffffff;false;false +jscript_singlestring=0xff901e;0xffffff;false;false +jscript_symbols=0x001050;0xffffff;false;false jscript_stringeol=0x000000;0xe0c0e0;false;false
[keywords] @@ -82,7 +82,7 @@ comment_open=<!-- comment_close=-->
-# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indention of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this
Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/src/callbacks.c 2006-07-27 20:57:13 UTC (rev 641) @@ -1450,7 +1450,12 @@ on_show_color_chooser1_activate (GtkMenuItem *menuitem, gpointer user_data) { - dialogs_show_color(); + static gchar colour[9]; + gint idx = document_get_cur_idx(); + gint pos = sci_get_current_position(doc_list[idx].sci); + + utils_find_current_word(doc_list[idx].sci, pos, colour, sizeof colour); + dialogs_show_color(colour); }
Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/src/dialogs.c 2006-07-27 20:57:13 UTC (rev 641) @@ -417,9 +417,10 @@
/* This shows the color selection dialog to choose a color. */ -void dialogs_show_color(void) +void dialogs_show_color(gchar *colour) { #ifdef G_OS_WIN32 + /// TODO pass colour to the windows dialog win32_show_color_dialog(); #else
@@ -435,6 +436,21 @@ g_signal_connect(app->open_colorsel, "delete_event", G_CALLBACK(gtk_widget_hide), NULL); } + // if colour is non-NULL set it in the dialog as preselected colour + if (colour != NULL && (colour[0] == '0' || colour[0] == '#')) + { + GdkColor gc; + + if (colour[0] == '0' && colour[1] == 'x') + { // we have a string of the format "0x00ff00" and we need it to "#00ff00" + colour[1] = '#'; + colour++; + } + gdk_color_parse(colour, &gc); + gtk_color_selection_set_current_color(GTK_COLOR_SELECTION( + GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->colorsel), &gc); + } + // We make sure the dialog is visible. gtk_window_present(GTK_WINDOW(app->open_colorsel)); #endif
Modified: trunk/src/dialogs.h =================================================================== --- trunk/src/dialogs.h 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/src/dialogs.h 2006-07-27 20:57:13 UTC (rev 641) @@ -41,7 +41,7 @@
void dialogs_show_word_count(void);
-void dialogs_show_color(void); +void dialogs_show_color(gchar *colour);
GtkWidget *dialogs_create_build_menu_gen(gint idx);
Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-07-26 17:10:35 UTC (rev 640) +++ trunk/src/highlighting.c 2006-07-27 20:57:13 UTC (rev 641) @@ -108,10 +108,10 @@
list = g_key_file_get_string_list(configh, section, key, &len, NULL); if (list == NULL) list = g_key_file_get_string_list(config, section, key, &len, NULL); - if (list != NULL && list[0] != NULL) array[0] = (gint) utils_strtod(list[0], NULL); - else if (foreground) array[0] = (gint) utils_strtod(foreground, NULL); - if (list && list != NULL && list[1] != NULL) array[1] = (gint) utils_strtod(list[1], NULL); - else if (background) array[1] = (gint) utils_strtod(background, NULL); + if (list != NULL && list[0] != NULL) array[0] = (gint) utils_strtod(list[0], NULL, FALSE); + else if (foreground) array[0] = (gint) utils_strtod(foreground, NULL, FALSE); + if (list && list != NULL && list[1] != NULL) array[1] = (gint) utils_strtod(list[1], NULL, FALSE); + else if (background) array[1] = (gint) utils_strtod(background, NULL, FALSE); if (list != NULL && list[2] != NULL) array[2] = utils_atob(list[2]); else array[2] = utils_atob(bold); if (list != NULL && list[3] != NULL) array[3] = utils_atob(list[3]); @@ -197,9 +197,9 @@
types[GEANY_FILETYPES_ALL] = g_new(style_set, 1); styleset_get_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_ALL]->styling[0]); - styleset_get_hex(config, config_home, "styling", "selection", "0xc0c0c0", "0x00007f", "false", types[GEANY_FILETYPES_ALL]->styling[1]); - styleset_get_hex(config, config_home, "styling", "brace_good", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_ALL]->styling[2]); - styleset_get_hex(config, config_home, "styling", "brace_bad", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_ALL]->styling[3]); + styleset_get_hex(config, config_home, "styling", "selection", "0xc0c0c0", "0x7f0000", "false", types[GEANY_FILETYPES_ALL]->styling[1]); + styleset_get_hex(config, config_home, "styling", "brace_good", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_ALL]->styling[2]); + styleset_get_hex(config, config_home, "styling", "brace_bad", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_ALL]->styling[3]); styleset_get_hex(config, config_home, "styling", "margin_linenumber", "0x000000", "0xd0d0d0", "false", types[GEANY_FILETYPES_ALL]->styling[4]); styleset_get_hex(config, config_home, "styling", "margin_folding", "0x000000", "0xdfdfdf", "false", types[GEANY_FILETYPES_ALL]->styling[5]); styleset_get_hex(config, config_home, "styling", "current_line", "0x000000", "0xe5e5e5", "true", types[GEANY_FILETYPES_ALL]->styling[6]); @@ -344,24 +344,24 @@
types[GEANY_FILETYPES_C] = g_new(style_set, 1); styleset_get_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[0]); - styleset_get_hex(config, config_home, "styling", "comment", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[1]); - styleset_get_hex(config, config_home, "styling", "commentline", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[2]); - styleset_get_hex(config, config_home, "styling", "commentdoc", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[3]); + styleset_get_hex(config, config_home, "styling", "comment", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[1]); + styleset_get_hex(config, config_home, "styling", "commentline", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[2]); + styleset_get_hex(config, config_home, "styling", "commentdoc", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[3]); styleset_get_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[4]); - styleset_get_hex(config, config_home, "styling", "word", "0x991111", "0xffffff", "true", types[GEANY_FILETYPES_C]->styling[5]); - styleset_get_hex(config, config_home, "styling", "word2", "0x00007F", "0xffffff", "true", types[GEANY_FILETYPES_C]->styling[6]); - styleset_get_hex(config, config_home, "styling", "string", "0x1E90FF", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[7]); - styleset_get_hex(config, config_home, "styling", "character", "0x1E90FF", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[8]); - styleset_get_hex(config, config_home, "styling", "uuid", "0x804040", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[9]); - styleset_get_hex(config, config_home, "styling", "preprocessor", "0x7F7F00", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[10]); - styleset_get_hex(config, config_home, "styling", "operator", "0x101030", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[11]); - styleset_get_hex(config, config_home, "styling", "identifier", "0x100000", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[12]); + styleset_get_hex(config, config_home, "styling", "word", "0x111199", "0xffffff", "true", types[GEANY_FILETYPES_C]->styling[5]); + styleset_get_hex(config, config_home, "styling", "word2", "0x7f0000", "0xffffff", "true", types[GEANY_FILETYPES_C]->styling[6]); + styleset_get_hex(config, config_home, "styling", "string", "0x90ff1e", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[7]); + styleset_get_hex(config, config_home, "styling", "character", "0x90ff1e", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[8]); + styleset_get_hex(config, config_home, "styling", "uuid", "0x404080", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[9]); + styleset_get_hex(config, config_home, "styling", "preprocessor", "0x007f7f", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[10]); + styleset_get_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[11]); + styleset_get_hex(config, config_home, "styling", "identifier", "0x,00000", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[12]); styleset_get_hex(config, config_home, "styling", "stringeol", "0x000000", "0xe0c0e0", "false", types[GEANY_FILETYPES_C]->styling[13]); - styleset_get_hex(config, config_home, "styling", "verbatim", "0x101030", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[14]); - styleset_get_hex(config, config_home, "styling", "regex", "0x101030", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[15]); - styleset_get_hex(config, config_home, "styling", "commentlinedoc", "0x0000ff", "0xffffff", "true", types[GEANY_FILETYPES_C]->styling[16]); - styleset_get_hex(config, config_home, "styling", "commentdockeyword", "0x0000ff", "0xffffff", "true", types[GEANY_FILETYPES_C]->styling[17]); - styleset_get_hex(config, config_home, "styling", "globalclass", "0xbb1111", "0xffffff", "true", types[GEANY_FILETYPES_C]->styling[18]); + styleset_get_hex(config, config_home, "styling", "verbatim", "0x301010", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[14]); + styleset_get_hex(config, config_home, "styling", "regex", "0x105090", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[15]); + styleset_get_hex(config, config_home, "styling", "commentlinedoc", "0xff0000", "0xffffff", "true", types[GEANY_FILETYPES_C]->styling[16]); + styleset_get_hex(config, config_home, "styling", "commentdockeyword", "0xff0000", "0xffffff", "true", types[GEANY_FILETYPES_C]->styling[17]); + styleset_get_hex(config, config_home, "styling", "globalclass", "0x1111bb", "0xffffff", "true", types[GEANY_FILETYPES_C]->styling[18]); styleset_get_int(config, config_home, "styling", "styling_within_preprocessor", 1, 0, types[GEANY_FILETYPES_C]->styling[19]);
types[GEANY_FILETYPES_C]->keywords = g_new(gchar*, 3); @@ -479,24 +479,24 @@
types[GEANY_FILETYPES_CPP] = g_new(style_set, 1); styleset_get_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[0]); - styleset_get_hex(config, config_home, "styling", "comment", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[1]); - styleset_get_hex(config, config_home, "styling", "commentline", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[2]); - styleset_get_hex(config, config_home, "styling", "commentdoc", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[3]); + styleset_get_hex(config, config_home, "styling", "comment", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[1]); + styleset_get_hex(config, config_home, "styling", "commentline", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[2]); + styleset_get_hex(config, config_home, "styling", "commentdoc", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[3]); styleset_get_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[4]); - styleset_get_hex(config, config_home, "styling", "word", "0x991111", "0xffffff", "true", types[GEANY_FILETYPES_CPP]->styling[5]); - styleset_get_hex(config, config_home, "styling", "word2", "0x00007F", "0xffffff", "true", types[GEANY_FILETYPES_CPP]->styling[6]); - styleset_get_hex(config, config_home, "styling", "string", "0x1E90FF", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[7]); - styleset_get_hex(config, config_home, "styling", "character", "0x1E90FF", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[8]); - styleset_get_hex(config, config_home, "styling", "uuid", "0x804040", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[9]); - styleset_get_hex(config, config_home, "styling", "preprocessor", "0x7F7F00", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[10]); - styleset_get_hex(config, config_home, "styling", "operator", "0x101030", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[11]); - styleset_get_hex(config, config_home, "styling", "identifier", "0x100000", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[12]); + styleset_get_hex(config, config_home, "styling", "word", "0x00007f", "0xffffff", "true", types[GEANY_FILETYPES_CPP]->styling[5]); + styleset_get_hex(config, config_home, "styling", "word2", "0x991111", "0xffffff", "true", types[GEANY_FILETYPES_CPP]->styling[6]); + styleset_get_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[7]); + styleset_get_hex(config, config_home, "styling", "character", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[8]); + styleset_get_hex(config, config_home, "styling", "uuid", "0x404080", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[9]); + styleset_get_hex(config, config_home, "styling", "preprocessor", "0x007f7f", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[10]); + styleset_get_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[11]); + styleset_get_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[12]); styleset_get_hex(config, config_home, "styling", "stringeol", "0x000000", "0xe0c0e0", "false", types[GEANY_FILETYPES_CPP]->styling[13]); styleset_get_hex(config, config_home, "styling", "verbatim", "0x101030", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[14]); - styleset_get_hex(config, config_home, "styling", "regex", "0x101030", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[15]); - styleset_get_hex(config, config_home, "styling", "commentlinedoc", "0x0000ff", "0xffffff", "true", types[GEANY_FILETYPES_CPP]->styling[16]); - styleset_get_hex(config, config_home, "styling", "commentdockeyword", "0x0000ff", "0xffffff", "true", types[GEANY_FILETYPES_CPP]->styling[17]); - styleset_get_hex(config, config_home, "styling", "globalclass", "0xbb1111", "0xffffff", "true", types[GEANY_FILETYPES_CPP]->styling[18]); + styleset_get_hex(config, config_home, "styling", "regex", "0x105090", "0xffffff", "false", types[GEANY_FILETYPES_CPP]->styling[15]); + styleset_get_hex(config, config_home, "styling", "commentlinedoc", "0xff0000", "0xffffff", "true", types[GEANY_FILETYPES_CPP]->styling[16]); + styleset_get_hex(config, config_home, "styling", "commentdockeyword", "0xff0000", "0xffffff", "true", types[GEANY_FILETYPES_CPP]->styling[17]); + styleset_get_hex(config, config_home, "styling", "globalclass", "0x1111bb", "0xffffff", "true", types[GEANY_FILETYPES_CPP]->styling[18]); styleset_get_int(config, config_home, "styling", "styling_within_preprocessor", 1, 0, types[GEANY_FILETYPES_CPP]->styling[19]);
types[GEANY_FILETYPES_CPP]->keywords = g_new(gchar*, 3); @@ -612,17 +612,17 @@
types[GEANY_FILETYPES_PASCAL] = g_new(style_set, 1); styleset_get_hex(config, config_home, "styling", "default", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[0]); - styleset_get_hex(config, config_home, "styling", "comment", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[1]); + styleset_get_hex(config, config_home, "styling", "comment", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[1]); styleset_get_hex(config, config_home, "styling", "number", "0x007F00", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[2]); - styleset_get_hex(config, config_home, "styling", "word", "0x991111", "0xffffff", "true", types[GEANY_FILETYPES_PASCAL]->styling[3]); - styleset_get_hex(config, config_home, "styling", "string", "0x1E90FF", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[4]); - styleset_get_hex(config, config_home, "styling", "character", "0x004040", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[5]); - styleset_get_hex(config, config_home, "styling", "preprocessor", "0x7F7F00", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[6]); - styleset_get_hex(config, config_home, "styling", "operator", "0x101030", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[7]); - styleset_get_hex(config, config_home, "styling", "identifier", "0x100000", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[8]); - styleset_get_hex(config, config_home, "styling", "regex", "0x13631B", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[9]); - styleset_get_hex(config, config_home, "styling", "commentline", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[10]); - styleset_get_hex(config, config_home, "styling", "commentdoc", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[11]); + styleset_get_hex(config, config_home, "styling", "word", "0x111199", "0xffffff", "true", types[GEANY_FILETYPES_PASCAL]->styling[3]); + styleset_get_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[4]); + styleset_get_hex(config, config_home, "styling", "character", "0x404000", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[5]); + styleset_get_hex(config, config_home, "styling", "preprocessor", "0x007f7f", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[6]); + styleset_get_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[7]); + styleset_get_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[8]); + styleset_get_hex(config, config_home, "styling", "regex", "0x1b6313", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[9]); + styleset_get_hex(config, config_home, "styling", "commentline", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[10]); + styleset_get_hex(config, config_home, "styling", "commentdoc", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_PASCAL]->styling[11]);
types[GEANY_FILETYPES_PASCAL]->keywords = g_new(gchar*, 2); styleset_get_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_PASCAL, 0, "word integer char string byte real \ @@ -684,12 +684,12 @@ g_key_file_load_from_file(config_home, f, G_KEY_FILE_KEEP_COMMENTS, NULL);
types[GEANY_FILETYPES_MAKE] = g_new(style_set, 1); - styleset_get_hex(config, config_home, "styling", "default", "0xFF0000", "0xffffff", "false", types[GEANY_FILETYPES_MAKE]->styling[0]); - styleset_get_hex(config, config_home, "styling", "comment", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_MAKE]->styling[1]); - styleset_get_hex(config, config_home, "styling", "preprocessor", "0x7F7F00", "0xffffff", "false", types[GEANY_FILETYPES_MAKE]->styling[2]); - styleset_get_hex(config, config_home, "styling", "identifier", "0x007F00", "0xffffff", "false", types[GEANY_FILETYPES_MAKE]->styling[3]); - styleset_get_hex(config, config_home, "styling", "operator", "0x101030", "0xffffff", "false", types[GEANY_FILETYPES_MAKE]->styling[4]); - styleset_get_hex(config, config_home, "styling", "target", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_MAKE]->styling[5]); + styleset_get_hex(config, config_home, "styling", "default", "0x00002f", "0xffffff", "false", types[GEANY_FILETYPES_MAKE]->styling[0]); + styleset_get_hex(config, config_home, "styling", "comment", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_MAKE]->styling[1]); + styleset_get_hex(config, config_home, "styling", "preprocessor", "0x007f7f", "0xffffff", "false", types[GEANY_FILETYPES_MAKE]->styling[2]); + styleset_get_hex(config, config_home, "styling", "identifier", "0x007f00", "0xffffff", "false", types[GEANY_FILETYPES_MAKE]->styling[3]); + styleset_get_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", types[GEANY_FILETYPES_MAKE]->styling[4]); + styleset_get_hex(config, config_home, "styling", "target", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_MAKE]->styling[5]); styleset_get_hex(config, config_home, "styling", "ideol", "0x008000", "0xffffff", "false", types[GEANY_FILETYPES_MAKE]->styling[6]);
types[GEANY_FILETYPES_MAKE]->keywords = NULL; @@ -734,11 +734,11 @@ g_key_file_load_from_file(config_home, f, G_KEY_FILE_KEEP_COMMENTS, NULL);
types[GEANY_FILETYPES_LATEX] = g_new(style_set, 1); - styleset_get_hex(config, config_home, "styling", "default", "0xFF0000", "0xffffff", "false", types[GEANY_FILETYPES_LATEX]->styling[0]); - styleset_get_hex(config, config_home, "styling", "command", "0x0000ff", "0xffffff", "true", types[GEANY_FILETYPES_LATEX]->styling[1]); - styleset_get_hex(config, config_home, "styling", "tag", "0x7F7F00", "0xffffff", "true", types[GEANY_FILETYPES_LATEX]->styling[2]); - styleset_get_hex(config, config_home, "styling", "math", "0x007F00", "0xffffff", "false", types[GEANY_FILETYPES_LATEX]->styling[3]); - styleset_get_hex(config, config_home, "styling", "comment", "0x007F00", "0xffffff", "false", types[GEANY_FILETYPES_LATEX]->styling[4]); + styleset_get_hex(config, config_home, "styling", "default", "0x00002f", "0xffffff", "false", types[GEANY_FILETYPES_LATEX]->styling[0]); + styleset_get_hex(config, config_home, "styling", "command", "0xff0000", "0xffffff", "true", types[GEANY_FILETYPES_LATEX]->styling[1]); + styleset_get_hex(config, config_home, "styling", "tag", "0x007f7f", "0xffffff", "true", types[GEANY_FILETYPES_LATEX]->styling[2]); + styleset_get_hex(config, config_home, "styling", "math", "0x007f00", "0xffffff", "false", types[GEANY_FILETYPES_LATEX]->styling[3]); + styleset_get_hex(config, config_home, "styling", "comment", "0x007f00", "0xffffff", "false", types[GEANY_FILETYPES_LATEX]->styling[4]);
types[GEANY_FILETYPES_LATEX]->keywords = g_new(gchar*, 2); styleset_get_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_LATEX, 0, "section subsection begin item"); @@ -852,62 +852,62 @@
types[GEANY_FILETYPES_XML] = g_new(style_set, 1); styleset_get_hex(config, config_home, "styling", "html_default", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[0]); - styleset_get_hex(config, config_home, "styling", "html_tag", "0x990000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[1]); - styleset_get_hex(config, config_home, "styling", "html_tagunknown", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[2]); - styleset_get_hex(config, config_home, "styling", "html_attribute", "0x007F00", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[3]); - styleset_get_hex(config, config_home, "styling", "html_attributeunknown", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[4]); + styleset_get_hex(config, config_home, "styling", "html_tag", "0x000099", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[1]); + styleset_get_hex(config, config_home, "styling", "html_tagunknown", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[2]); + styleset_get_hex(config, config_home, "styling", "html_attribute", "0x007f00", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[3]); + styleset_get_hex(config, config_home, "styling", "html_attributeunknown", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[4]); styleset_get_hex(config, config_home, "styling", "html_number", "0x800080", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[5]); - styleset_get_hex(config, config_home, "styling", "html_doublestring", "0x1E90FF", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[6]); - styleset_get_hex(config, config_home, "styling", "html_singlestring", "0x1E90FF", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[7]); + styleset_get_hex(config, config_home, "styling", "html_doublestring", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[6]); + styleset_get_hex(config, config_home, "styling", "html_singlestring", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[7]); styleset_get_hex(config, config_home, "styling", "html_other", "0x800080", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[8]); styleset_get_hex(config, config_home, "styling", "html_comment", "0x808080", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[9]); styleset_get_hex(config, config_home, "styling", "html_entity", "0x800080", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[10]); - styleset_get_hex(config, config_home, "styling", "html_tagend", "0x800000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[11]); - styleset_get_hex(config, config_home, "styling", "html_xmlstart", "0x990000", "0xf0f0f0", "false", types[GEANY_FILETYPES_XML]->styling[12]); - styleset_get_hex(config, config_home, "styling", "html_xmlend", "0x990000", "0xf0f0f0", "false", types[GEANY_FILETYPES_XML]->styling[13]); - styleset_get_hex(config, config_home, "styling", "html_script", "0x800000", "0xf0f0f0", "false", types[GEANY_FILETYPES_XML]->styling[14]); - styleset_get_hex(config, config_home, "styling", "html_asp", "0x4f4f00", "0xf0f0f0", "false", types[GEANY_FILETYPES_XML]->styling[15]); - styleset_get_hex(config, config_home, "styling", "html_aspat", "0x4f4f00", "0xf0f0f0", "false", types[GEANY_FILETYPES_XML]->styling[16]); - styleset_get_hex(config, config_home, "styling", "html_cdata", "0x990066", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[17]); - styleset_get_hex(config, config_home, "styling", "html_question", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[18]); - styleset_get_hex(config, config_home, "styling", "html_value", "0x990066", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[19]); - styleset_get_hex(config, config_home, "styling", "html_xccomment", "0x990066", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[20]); + styleset_get_hex(config, config_home, "styling", "html_tagend", "0x000080", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[11]); + styleset_get_hex(config, config_home, "styling", "html_xmlstart", "0x000099", "0xf0f0f0", "false", types[GEANY_FILETYPES_XML]->styling[12]); + styleset_get_hex(config, config_home, "styling", "html_xmlend", "0x000099", "0xf0f0f0", "false", types[GEANY_FILETYPES_XML]->styling[13]); + styleset_get_hex(config, config_home, "styling", "html_script", "0x000080", "0xf0f0f0", "false", types[GEANY_FILETYPES_XML]->styling[14]); + styleset_get_hex(config, config_home, "styling", "html_asp", "0x004f4f", "0xf0f0f0", "false", types[GEANY_FILETYPES_XML]->styling[15]); + styleset_get_hex(config, config_home, "styling", "html_aspat", "0x004f4f", "0xf0f0f0", "false", types[GEANY_FILETYPES_XML]->styling[16]); + styleset_get_hex(config, config_home, "styling", "html_cdata", "0x660099", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[17]); + styleset_get_hex(config, config_home, "styling", "html_question", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[18]); + styleset_get_hex(config, config_home, "styling", "html_value", "0x660099", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[19]); + styleset_get_hex(config, config_home, "styling", "html_xccomment", "0x660099", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[20]);
styleset_get_hex(config, config_home, "styling", "sgml_default", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[21]); styleset_get_hex(config, config_home, "styling", "sgml_comment", "0x808080", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[22]); - styleset_get_hex(config, config_home, "styling", "sgml_special", "0x007F00", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[23]); - styleset_get_hex(config, config_home, "styling", "sgml_command", "0x991111", "0xffffff", "true", types[GEANY_FILETYPES_XML]->styling[24]); - styleset_get_hex(config, config_home, "styling", "sgml_doublestring", "0x1E90FF", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[25]); - styleset_get_hex(config, config_home, "styling", "sgml_simplestring", "0x004040", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[26]); - styleset_get_hex(config, config_home, "styling", "sgml_1st_param", "0x804040", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[27]); - styleset_get_hex(config, config_home, "styling", "sgml_entity", "0x101030", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[28]); - styleset_get_hex(config, config_home, "styling", "sgml_block_default", "0x100000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[29]); - styleset_get_hex(config, config_home, "styling", "sgml_1st_param_comment", "0x906040", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[30]); - styleset_get_hex(config, config_home, "styling", "sgml_error", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[31]); + styleset_get_hex(config, config_home, "styling", "sgml_special", "0x007f00", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[23]); + styleset_get_hex(config, config_home, "styling", "sgml_command", "0x111199", "0xffffff", "true", types[GEANY_FILETYPES_XML]->styling[24]); + styleset_get_hex(config, config_home, "styling", "sgml_doublestring", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[25]); + styleset_get_hex(config, config_home, "styling", "sgml_simplestring", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[26]); + styleset_get_hex(config, config_home, "styling", "sgml_1st_param", "0x404080", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[27]); + styleset_get_hex(config, config_home, "styling", "sgml_entity", "0x301010", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[28]); + styleset_get_hex(config, config_home, "styling", "sgml_block_default", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[29]); + styleset_get_hex(config, config_home, "styling", "sgml_1st_param_comment", "0x406090", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[30]); + styleset_get_hex(config, config_home, "styling", "sgml_error", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[31]);
styleset_get_hex(config, config_home, "styling", "php_default", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[32]); styleset_get_hex(config, config_home, "styling", "php_simplestring", "0x008000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[33]); styleset_get_hex(config, config_home, "styling", "php_hstring", "0x008000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[34]); - styleset_get_hex(config, config_home, "styling", "php_number", "0x006060", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[35]); - styleset_get_hex(config, config_home, "styling", "php_word", "0x990000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[36]); - styleset_get_hex(config, config_home, "styling", "php_variable", "0x00007F", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[37]); + styleset_get_hex(config, config_home, "styling", "php_number", "0x606000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[35]); + styleset_get_hex(config, config_home, "styling", "php_word", "0x000099", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[36]); + styleset_get_hex(config, config_home, "styling", "php_variable", "0x7f0000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[37]); styleset_get_hex(config, config_home, "styling", "php_comment", "0x808080", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[38]); styleset_get_hex(config, config_home, "styling", "php_commentline", "0x808080", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[39]); - styleset_get_hex(config, config_home, "styling", "php_operator", "0x602010", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[40]); - styleset_get_hex(config, config_home, "styling", "php_hstring_variable", "0x601010", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[41]); + styleset_get_hex(config, config_home, "styling", "php_operator", "0x102060", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[40]); + styleset_get_hex(config, config_home, "styling", "php_hstring_variable", "0x101060", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[41]); styleset_get_hex(config, config_home, "styling", "php_complex_variable", "0x105010", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[42]);
- styleset_get_hex(config, config_home, "styling", "jscript_start", "0x808000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[43]); + styleset_get_hex(config, config_home, "styling", "jscript_start", "0x008080", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[43]); styleset_get_hex(config, config_home, "styling", "jscript_default", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[44]); styleset_get_hex(config, config_home, "styling", "jscript_comment", "0x222222", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[45]); styleset_get_hex(config, config_home, "styling", "jscript_commentline", "0x808080", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[46]); styleset_get_hex(config, config_home, "styling", "jscript_commentdoc", "0x808080", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[47]); - styleset_get_hex(config, config_home, "styling", "jscript_number", "0x606000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[48]); - styleset_get_hex(config, config_home, "styling", "jscript_word", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[49]); - styleset_get_hex(config, config_home, "styling", "jscript_keyword", "0x001050", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[50]); - styleset_get_hex(config, config_home, "styling", "jscript_doublestring", "0x080080", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[51]); - styleset_get_hex(config, config_home, "styling", "jscript_singlestring", "0x080080", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[52]); - styleset_get_hex(config, config_home, "styling", "jscript_symbols", "0x501000", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[53]); + styleset_get_hex(config, config_home, "styling", "jscript_number", "0x006060", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[48]); + styleset_get_hex(config, config_home, "styling", "jscript_word", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[49]); + styleset_get_hex(config, config_home, "styling", "jscript_keyword", "0x501010", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[50]); + styleset_get_hex(config, config_home, "styling", "jscript_doublestring", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[51]); + styleset_get_hex(config, config_home, "styling", "jscript_singlestring", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[52]); + styleset_get_hex(config, config_home, "styling", "jscript_symbols", "0x001050", "0xffffff", "false", types[GEANY_FILETYPES_XML]->styling[53]); styleset_get_hex(config, config_home, "styling", "jscript_stringeol", "0x000000", "0xe0c0e0", "false", types[GEANY_FILETYPES_XML]->styling[54]);
types[GEANY_FILETYPES_XML]->keywords = g_new(gchar*, 7); @@ -1162,24 +1162,24 @@
types[GEANY_FILETYPES_JAVA] = g_new(style_set, 1); styleset_get_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[0]); - styleset_get_hex(config, config_home, "styling", "comment", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[1]); - styleset_get_hex(config, config_home, "styling", "commentline", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[2]); - styleset_get_hex(config, config_home, "styling", "commentdoc", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[3]); + styleset_get_hex(config, config_home, "styling", "comment", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[1]); + styleset_get_hex(config, config_home, "styling", "commentline", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[2]); + styleset_get_hex(config, config_home, "styling", "commentdoc", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[3]); styleset_get_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[4]); - styleset_get_hex(config, config_home, "styling", "word", "0x991111", "0xffffff", "true", types[GEANY_FILETYPES_JAVA]->styling[5]); - styleset_get_hex(config, config_home, "styling", "word2", "0x00007F", "0xffffff", "true", types[GEANY_FILETYPES_JAVA]->styling[6]); - styleset_get_hex(config, config_home, "styling", "string", "0x1E90FF", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[7]); - styleset_get_hex(config, config_home, "styling", "character", "0x004040", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[8]); - styleset_get_hex(config, config_home, "styling", "uuid", "0x804040", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[9]); - styleset_get_hex(config, config_home, "styling", "preprocessor", "0x7F7F00", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[10]); - styleset_get_hex(config, config_home, "styling", "operator", "0x101030", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[11]); - styleset_get_hex(config, config_home, "styling", "identifier", "0x100000", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[12]); + styleset_get_hex(config, config_home, "styling", "word", "0x111199", "0xffffff", "true", types[GEANY_FILETYPES_JAVA]->styling[5]); + styleset_get_hex(config, config_home, "styling", "word2", "0x7f0000", "0xffffff", "true", types[GEANY_FILETYPES_JAVA]->styling[6]); + styleset_get_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[7]); + styleset_get_hex(config, config_home, "styling", "character", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[8]); + styleset_get_hex(config, config_home, "styling", "uuid", "0x404080", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[9]); + styleset_get_hex(config, config_home, "styling", "preprocessor", "0x007f7f", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[10]); + styleset_get_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[11]); + styleset_get_hex(config, config_home, "styling", "identifier", "0x404000", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[12]); styleset_get_hex(config, config_home, "styling", "stringeol", "0x000000", "0xe0c0e0", "false", types[GEANY_FILETYPES_JAVA]->styling[13]); - styleset_get_hex(config, config_home, "styling", "verbatim", "0x906040", "0x0000ff", "false", types[GEANY_FILETYPES_JAVA]->styling[14]); + styleset_get_hex(config, config_home, "styling", "verbatim", "0x406090", "0x0000ff", "false", types[GEANY_FILETYPES_JAVA]->styling[14]); styleset_get_hex(config, config_home, "styling", "regex", "0x905010", "0xffffff", "false", types[GEANY_FILETYPES_JAVA]->styling[15]); - styleset_get_hex(config, config_home, "styling", "commentlinedoc", "0x0000ff", "0xffffff", "true", types[GEANY_FILETYPES_JAVA]->styling[16]); - styleset_get_hex(config, config_home, "styling", "commentdockeyword", "0x0000ff", "0xffffff", "true", types[GEANY_FILETYPES_JAVA]->styling[17]); - styleset_get_hex(config, config_home, "styling", "globalclass", "0x109040", "0xffffff", "true", types[GEANY_FILETYPES_JAVA]->styling[18]); + styleset_get_hex(config, config_home, "styling", "commentlinedoc", "0xff0000", "0xffffff", "true", types[GEANY_FILETYPES_JAVA]->styling[16]); + styleset_get_hex(config, config_home, "styling", "commentdockeyword", "0xff0000", "0xffffff", "true", types[GEANY_FILETYPES_JAVA]->styling[17]); + styleset_get_hex(config, config_home, "styling", "globalclass", "0x409010", "0xffffff", "true", types[GEANY_FILETYPES_JAVA]->styling[18]);
types[GEANY_FILETYPES_JAVA]->keywords = g_new(gchar*, 5); styleset_get_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_JAVA, 0, "\ @@ -1262,21 +1262,21 @@
types[GEANY_FILETYPES_PERL] = g_new(style_set, 1); styleset_get_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[0]); - styleset_get_hex(config, config_home, "styling", "error", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[1]); - styleset_get_hex(config, config_home, "styling", "commentline", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[2]); - styleset_get_hex(config, config_home, "styling", "number", "0x007F00", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[3]); - styleset_get_hex(config, config_home, "styling", "word", "0x991111", "0xffffff", "true", types[GEANY_FILETYPES_PERL]->styling[4]); - styleset_get_hex(config, config_home, "styling", "string", "0x1E90FF", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[5]); - styleset_get_hex(config, config_home, "styling", "character", "0x1E90FF", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[6]); - styleset_get_hex(config, config_home, "styling", "preprocessor", "0x7F7F00", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[7]); - styleset_get_hex(config, config_home, "styling", "operator", "0x101030", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[8]); - styleset_get_hex(config, config_home, "styling", "identifier", "0x100000", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[9]); - styleset_get_hex(config, config_home, "styling", "scalar", "0x00007F", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[10]); - styleset_get_hex(config, config_home, "styling", "pod", "0x0356500", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[11]); - styleset_get_hex(config, config_home, "styling", "regex", "0x905010", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[12]); - styleset_get_hex(config, config_home, "styling", "array", "0x905010", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[13]); - styleset_get_hex(config, config_home, "styling", "hash", "0x905010", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[14]); - styleset_get_hex(config, config_home, "styling", "symboltable", "0x905010", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[15]); + styleset_get_hex(config, config_home, "styling", "error", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[1]); + styleset_get_hex(config, config_home, "styling", "commentline", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[2]); + styleset_get_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[3]); + styleset_get_hex(config, config_home, "styling", "word", "0x111199", "0xffffff", "true", types[GEANY_FILETYPES_PERL]->styling[4]); + styleset_get_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[5]); + styleset_get_hex(config, config_home, "styling", "character", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[6]); + styleset_get_hex(config, config_home, "styling", "preprocessor", "0x007f7f", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[7]); + styleset_get_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[8]); + styleset_get_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[9]); + styleset_get_hex(config, config_home, "styling", "scalar", "0x7f0000", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[10]); + styleset_get_hex(config, config_home, "styling", "pod", "0x035650", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[11]); + styleset_get_hex(config, config_home, "styling", "regex", "0x105090", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[12]); + styleset_get_hex(config, config_home, "styling", "array", "0x105090", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[13]); + styleset_get_hex(config, config_home, "styling", "hash", "0x105090", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[14]); + styleset_get_hex(config, config_home, "styling", "symboltable", "0x105090", "0xffffff", "false", types[GEANY_FILETYPES_PERL]->styling[15]); styleset_get_hex(config, config_home, "styling", "backticks", "0x000000", "0xe0c0e0", "false", types[GEANY_FILETYPES_PERL]->styling[16]);
types[GEANY_FILETYPES_PERL]->keywords = g_new(gchar*, 2); @@ -1368,16 +1368,16 @@
types[GEANY_FILETYPES_PYTHON] = g_new(style_set, 1); styleset_get_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[0]); - styleset_get_hex(config, config_home, "styling", "commentline", "0xFF0000", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[1]); - styleset_get_hex(config, config_home, "styling", "number", "0x800040", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[2]); + styleset_get_hex(config, config_home, "styling", "commentline", "0x808080", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[1]); + styleset_get_hex(config, config_home, "styling", "number", "0x400080", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[2]); styleset_get_hex(config, config_home, "styling", "string", "0x008000", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[3]); styleset_get_hex(config, config_home, "styling", "character", "0x008000", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[4]); - styleset_get_hex(config, config_home, "styling", "word", "0x800060", "0xffffff", "true", types[GEANY_FILETYPES_PYTHON]->styling[5]); - styleset_get_hex(config, config_home, "styling", "triple", "0x208000", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[6]); - styleset_get_hex(config, config_home, "styling", "tripledouble", "0x004040", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[7]); - styleset_get_hex(config, config_home, "styling", "classname", "0x303000", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[8]); - styleset_get_hex(config, config_home, "styling", "defname", "0x800000", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[9]); - styleset_get_hex(config, config_home, "styling", "operator", "0x800030", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[10]); + styleset_get_hex(config, config_home, "styling", "word", "0x600080", "0xffffff", "true", types[GEANY_FILETYPES_PYTHON]->styling[5]); + styleset_get_hex(config, config_home, "styling", "triple", "0x008020", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[6]); + styleset_get_hex(config, config_home, "styling", "tripledouble", "0x404000", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[7]); + styleset_get_hex(config, config_home, "styling", "classname", "0x003030", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[8]); + styleset_get_hex(config, config_home, "styling", "defname", "0x000080", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[9]); + styleset_get_hex(config, config_home, "styling", "operator", "0x300080", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[10]); styleset_get_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[11]); styleset_get_hex(config, config_home, "styling", "commentblock", "0x808080", "0xffffff", "false", types[GEANY_FILETYPES_PYTHON]->styling[12]); styleset_get_hex(config, config_home, "styling", "stringeol", "0x000000", "0xe0c0e0", "false", types[GEANY_FILETYPES_PYTHON]->styling[13]); @@ -1437,24 +1437,24 @@
types[GEANY_FILETYPES_RUBY] = g_new(style_set, 1); styleset_get_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[0]); - styleset_get_hex(config, config_home, "styling", "commentline", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[1]); - styleset_get_hex(config, config_home, "styling", "number", "0x800040", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[2]); + styleset_get_hex(config, config_home, "styling", "commentline", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[1]); + styleset_get_hex(config, config_home, "styling", "number", "0x400080", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[2]); styleset_get_hex(config, config_home, "styling", "string", "0x008000", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[3]); styleset_get_hex(config, config_home, "styling", "character", "0x008000", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[4]); - styleset_get_hex(config, config_home, "styling", "word", "0x991111", "0xffffff", "true", types[GEANY_FILETYPES_RUBY]->styling[5]); - styleset_get_hex(config, config_home, "styling", "global", "0x991111", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[6]); - styleset_get_hex(config, config_home, "styling", "symbol", "0x208000", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[7]); - styleset_get_hex(config, config_home, "styling", "classname", "0x00007f", "0xffffff", "true", types[GEANY_FILETYPES_RUBY]->styling[8]); - styleset_get_hex(config, config_home, "styling", "defname", "0x00007f", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[9]); + styleset_get_hex(config, config_home, "styling", "word", "0x111199", "0xffffff", "true", types[GEANY_FILETYPES_RUBY]->styling[5]); + styleset_get_hex(config, config_home, "styling", "global", "0x111199", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[6]); + styleset_get_hex(config, config_home, "styling", "symbol", "0x008020", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[7]); + styleset_get_hex(config, config_home, "styling", "classname", "0x7f0000", "0xffffff", "true", types[GEANY_FILETYPES_RUBY]->styling[8]); + styleset_get_hex(config, config_home, "styling", "defname", "0x7f0000", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[9]); styleset_get_hex(config, config_home, "styling", "operator", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[10]); styleset_get_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[11]); - styleset_get_hex(config, config_home, "styling", "modulename", "0x991111", "0xffffff", "true", types[GEANY_FILETYPES_RUBY]->styling[12]); + styleset_get_hex(config, config_home, "styling", "modulename", "0x111199", "0xffffff", "true", types[GEANY_FILETYPES_RUBY]->styling[12]); styleset_get_hex(config, config_home, "styling", "backticks", "0x000000", "0xe0c0e0", "false", types[GEANY_FILETYPES_RUBY]->styling[13]); styleset_get_hex(config, config_home, "styling", "instancevar", "0x000000", "0xffffff", "true", types[GEANY_FILETYPES_RUBY]->styling[14]); styleset_get_hex(config, config_home, "styling", "classvar", "0x000000", "0xffffff", "true", types[GEANY_FILETYPES_RUBY]->styling[15]); styleset_get_hex(config, config_home, "styling", "datasection", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[16]); styleset_get_hex(config, config_home, "styling", "heredelim", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[17]); - styleset_get_hex(config, config_home, "styling", "worddemoted", "0x991111", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[18]); + styleset_get_hex(config, config_home, "styling", "worddemoted", "0x111199", "0xffffff", "false", types[GEANY_FILETYPES_RUBY]->styling[18]);
types[GEANY_FILETYPES_RUBY]->keywords = g_new(gchar*, 2); styleset_get_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_RUBY, 0, "load define_method attr_accessor attr_writer attr_reader include __FILE__ and def end in or self unless __LINE__ begin defined? ensure module redo super until BEGIN break do false next rescue then when END case else for nil require retry true while alias class elsif if not return undef yield"); @@ -1513,16 +1513,16 @@
types[GEANY_FILETYPES_SH] = g_new(style_set, 1); styleset_get_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_SH]->styling[0]); - styleset_get_hex(config, config_home, "styling", "commentline", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_SH]->styling[1]); + styleset_get_hex(config, config_home, "styling", "commentline", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_SH]->styling[1]); styleset_get_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", types[GEANY_FILETYPES_SH]->styling[2]); - styleset_get_hex(config, config_home, "styling", "word", "0x991111", "0xffffff", "true", types[GEANY_FILETYPES_SH]->styling[3]); - styleset_get_hex(config, config_home, "styling", "string", "0x1e90ff", "0xffffff", "false", types[GEANY_FILETYPES_SH]->styling[4]); - styleset_get_hex(config, config_home, "styling", "character", "0x004040", "0xffffff", "false", types[GEANY_FILETYPES_SH]->styling[5]); - styleset_get_hex(config, config_home, "styling", "operator", "0x101030", "0xffffff", "false", types[GEANY_FILETYPES_SH]->styling[6]); + styleset_get_hex(config, config_home, "styling", "word", "0x119911", "0xffffff", "true", types[GEANY_FILETYPES_SH]->styling[3]); + styleset_get_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_SH]->styling[4]); + styleset_get_hex(config, config_home, "styling", "character", "0x404000", "0xffffff", "false", types[GEANY_FILETYPES_SH]->styling[5]); + styleset_get_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", types[GEANY_FILETYPES_SH]->styling[6]); styleset_get_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_SH]->styling[7]); styleset_get_hex(config, config_home, "styling", "backticks", "0x000000", "0xe0c0e0", "false", types[GEANY_FILETYPES_SH]->styling[8]); - styleset_get_hex(config, config_home, "styling", "param", "0x00009f", "0xffffff", "false", types[GEANY_FILETYPES_SH]->styling[9]); - styleset_get_hex(config, config_home, "styling", "scalar", "0x905010", "0xffffff", "false", types[GEANY_FILETYPES_SH]->styling[10]); + styleset_get_hex(config, config_home, "styling", "param", "0x9f0000", "0xffffff", "false", types[GEANY_FILETYPES_SH]->styling[9]); + styleset_get_hex(config, config_home, "styling", "scalar", "0x105090", "0xffffff", "false", types[GEANY_FILETYPES_SH]->styling[10]);
types[GEANY_FILETYPES_SH]->keywords = g_new(gchar*, 2); styleset_get_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_SH, 0, "break case continue do done elif else esac eval exit export fi for goto if in integer return set shift then while"); @@ -1593,34 +1593,34 @@
types[GEANY_FILETYPES_DOCBOOK] = g_new(style_set, 1); styleset_get_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[0]); - styleset_get_hex(config, config_home, "styling", "tag", "0x990000", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[1]); - styleset_get_hex(config, config_home, "styling", "tagunknown", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[2]); - styleset_get_hex(config, config_home, "styling", "attribute", "0x007F00", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[3]); - styleset_get_hex(config, config_home, "styling", "attributeunknown", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[4]); + styleset_get_hex(config, config_home, "styling", "tag", "0x000099", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[1]); + styleset_get_hex(config, config_home, "styling", "tagunknown", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[2]); + styleset_get_hex(config, config_home, "styling", "attribute", "0x007f00", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[3]); + styleset_get_hex(config, config_home, "styling", "attributeunknown", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[4]); styleset_get_hex(config, config_home, "styling", "number", "0x800080", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[5]); - styleset_get_hex(config, config_home, "styling", "doublestring", "0x1E90FF", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[6]); - styleset_get_hex(config, config_home, "styling", "singlestring", "0x1E90FF", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[7]); + styleset_get_hex(config, config_home, "styling", "doublestring", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[6]); + styleset_get_hex(config, config_home, "styling", "singlestring", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[7]); styleset_get_hex(config, config_home, "styling", "other", "0x800080", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[8]); styleset_get_hex(config, config_home, "styling", "comment", "0x808080", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[9]); styleset_get_hex(config, config_home, "styling", "entity", "0x800080", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[10]); - styleset_get_hex(config, config_home, "styling", "tagend", "0x990000", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[11]); - styleset_get_hex(config, config_home, "styling", "xmlstart", "0x990000", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[12]); - styleset_get_hex(config, config_home, "styling", "xmlend", "0x990000", "0xf0f0f0", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[13]); - styleset_get_hex(config, config_home, "styling", "cdata", "0x990066", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[14]); - styleset_get_hex(config, config_home, "styling", "question", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[15]); - styleset_get_hex(config, config_home, "styling", "value", "0x990066", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[16]); - styleset_get_hex(config, config_home, "styling", "xccomment", "0x990066", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[17]); + styleset_get_hex(config, config_home, "styling", "tagend", "0x000099", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[11]); + styleset_get_hex(config, config_home, "styling", "xmlstart", "0x000099", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[12]); + styleset_get_hex(config, config_home, "styling", "xmlend", "0x000099", "0xf0f0f0", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[13]); + styleset_get_hex(config, config_home, "styling", "cdata", "0x660099", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[14]); + styleset_get_hex(config, config_home, "styling", "question", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[15]); + styleset_get_hex(config, config_home, "styling", "value", "0x660099", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[16]); + styleset_get_hex(config, config_home, "styling", "xccomment", "0x660099", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[17]); styleset_get_hex(config, config_home, "styling", "sgml_default", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_DOCBOOK]->styling[18]);
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.