SF.net SVN: geany:[5339] trunk

[ntrel at users.sourceforge.net]

Revision: 5339
          http://geany.svn.sourceforge.net/geany/?rev=5339&view=rev
Author:   ntrel
Date:     2010-10-28 12:58:12 +0000 (Thu, 28 Oct 2010)

Log Message:
-----------
Make Python use named styles for color scheme support - use
alt.conf color scheme if you want the old colors.
Add named style 'function'.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/data/colorschemes/alt.conf
    trunk/data/filetypes.common
    trunk/data/filetypes.python

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-10-28 12:06:53 UTC (rev 5338)
+++ trunk/ChangeLog	2010-10-28 12:58:12 UTC (rev 5339)
@@ -2,6 +2,11 @@
 
  * data/filetypes.xml:
    Match data-* and aria-* as HTML attributes.
+ * data/colorschemes/alt.conf, data/filetypes.common,
+   data/filetypes.python:
+   Make Python use named styles for color scheme support - use
+   alt.conf color scheme if you want the old colors.
+   Add named style 'function'.
 
 
 2010-10-27  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/data/colorschemes/alt.conf
===================================================================
--- trunk/data/colorschemes/alt.conf	2010-10-28 12:06:53 UTC (rev 5338)
+++ trunk/data/colorschemes/alt.conf	2010-10-28 12:58:12 UTC (rev 5339)
@@ -1,24 +1,21 @@
 # Set of styles like the Geany <= 0.19 Python/script defaults with gray comments.
 
 [named_styles]
-# style names to use in filetypes.* [styling] sections
-# use foreground;background;bold;italic
-# normally background should be left blank to use the "default" style
+# see filetypes.common for details
 
 default=0x000000;0xffffff
 comment=0x808080
 commentdoc=0x404000
 number=0x400080
-# keyword
 word=0x600080;;true
-# e.g. global types from a *.c.tags file
 word2=0x9f0200;;true
 string=0x008000
-preprocessor=0x007f7f
+preprocessor=0x808000
 operator=0x300080
-# unterminated string
 stringeol=0x000000;0xe0c0e0
-type=0x0000d0;;true
+# this is a bit dim, may want to change
+type=0x003030;;true
+function=0x000080
 
 
 

Modified: trunk/data/filetypes.common
===================================================================
--- trunk/data/filetypes.common	2010-10-28 12:06:53 UTC (rev 5338)
+++ trunk/data/filetypes.common	2010-10-28 12:58:12 UTC (rev 5339)
@@ -109,11 +109,15 @@
 number=0x007f00
 # keyword
 word=0x00007f;;true;false
-# e.g. global types from a *.c.tags file
+# usually type keywords and library type names
 word2=0x991111;;true;false
 string=0xff901e
 preprocessor=0x007f7f
 operator=0x301010
 # unterminated string
 stringeol=0x000000;0xe0c0e0;false;false
+# user type names
 type=0x0000d0;;true;false
+# user function names
+function=0x000080
+

Modified: trunk/data/filetypes.python
===================================================================
--- trunk/data/filetypes.python	2010-10-28 12:06:53 UTC (rev 5338)
+++ trunk/data/filetypes.python	2010-10-28 12:58:12 UTC (rev 5339)
@@ -1,22 +1,23 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
 # foreground;background;bold;italic
-default=0x000000;0xffffff;false;false
-commentline=0x808080;0xffffff;false;false
-number=0x400080;0xffffff;false;false
-string=0x008000;0xffffff;false;false
-character=0x008000;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=0x808080;0xffffff;false;false
-stringeol=0x000000;0xe0c0e0;false;false
-word2=0x9f0200;0xffffff;false;false
-decorator=0x808000;0xffffff;false;false
+default=default
+commentline=comment
+number=number
+string=string
+character=string
+word=word
+triple=string
+tripledouble=commentdoc
+classname=type,bold
+defname=function
+operator=operator
+identifier=default
+commentblock=comment
+stringeol=stringeol
+# flip bold for identifiers
+word2=word2,bold
+decorator=preprocessor
 
 [keywords]
 # all items must be in one line


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