Merge branch 'master' into gtkbuilder

data/colorschemes/alt.conf

@@ -1,24 +1,96 @@
 [theme_info]
 name=Alternate
 description=Alternate Geany color scheme with styles like the Geany <= 0.19 Python/script defaults with gray comments.
+version=0.01
+author=
+url=
 
 [named_styles]
-# see filetypes.common for details
 
-default=0x000000;0xffffff
+default=0x000000;0xffffff;false;false
+error=0xffffff;0xff0000
+
+# Editor styles
+#-------------------------------------------------------------------------------
+
+selection=0x000000;0xc0c0c0;false;false
+current_line=0x000000;0xf0f0f0;true
+brace_good=0x0000ff;0xFFFFFF;true;false
+brace_bad=0xff0000;0xFFFFFF;true;false
+margin_line_number=0x000000;0xd0d0d0
+margin_folding=0x000000;0xdfdfdf
+fold_symbol_highlight=0xffffff
+indent_guide=0xc0c0c0
+caret=0x000000;0x000000;false
+marker_line=0x000000;0xffff00
+marker_search=0x000000;0x0000f0
+marker_mark=0x000000;0xb8f4b8
+call_tips=0xc0c0c0;0xffffff;false;false
+white_space=0xc0c0c0;0xffffff;true;false
+
+# Programming languages
+#-------------------------------------------------------------------------------
+
 comment=0x808080
-commentdoc=0x404000
+comment_doc=0x404000
+comment_line=comment
+comment_line_doc=comment_doc
+comment_doc_keyword=comment_doc,bold
+comment_doc_keyword_error=comment_doc,italic
+
 number=0x400080
-keyword=0x600080;;true
+number_1=number
-keyword2=0x9f0200;;true
+number_2=number_1
-string=0x008000
+
-preprocessor=0x808000
+type=0x2E8B57;;true
-operator=0x300080
+class=type
-stringeol=0x000000;0xe0c0e0
-# this is a bit dim, may want to change
-type=0x003030;;true
 function=0x000080
-extra=0x404080
+parameter=function
 
+keyword=0x003030;;true
+keyword_1=keyword
+keyword_2=0x9f0200;;true
+keyword_3=keyword_1
+keyword_4=keyword_1
 
+identifier=default
+identifier_1=identifier
+identifier_2=identifier_1
+identifier_3=identifier_1
+identifier_4=identifier_1
 
+string=0x008000
+string_1=string
+string_2=string_1
+string_3=default
+string_4=default
+string_eol=0x000000;0xe0c0e0
+character=string_1
+backtick=string_2
+here_doc=string_2
+
+scalar=string_2
+label=default,bold
+preprocessor=0x808000
+regex=number_1
+operator=0x300080
+decorator=string_1,bold
+other=0x404080
+
+# Markup-type languages
+#-------------------------------------------------------------------------------
+
+tag=type
+tag_unknown=tag,bold
+tag_end=tag,bold
+attribute=keyword_1
+attribute_unknown=attribute,bold
+value=string_1
+entity=default
+
+# Diff
+#-------------------------------------------------------------------------------
+
+line_added=0x008B8B
+line_removed=0x6A5ACD
+line_changed=preprocessor

data/filetypes.actionscript

@@ -1,28 +1,5 @@
 # For complete documentation of this file, please see Geany's main documentation
-[styling]
+[styling=C]
-# foreground;background;bold;italic
-default=default
-comment=comment
-commentline=comment
-commentdoc=commentdoc
-number=number
-word=keyword
-word2=keyword2
-string=string
-character=string
-uuid=extra
-preprocessor=preprocessor
-operator=operator
-identifier=default
-stringeol=stringeol
-# @"verbatim"
-verbatim=extra
-# (/regex/)
-regex=extra
-commentlinedoc=commentdoc,bold
-commentdockeyword=commentdoc,bold,italic
-commentdockeyworderror=commentdoc
-globalclass=type
 
 [keywords]
 # all items must be in one line

data/filetypes.ada

@@ -1,18 +1,18 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-word=0x00007f;0xffffff;true;false
+word=keyword_1
-identifier=0x000000;0xffffff;false;false
+identifier=identifier_1
-number=0x007f00;0xffffff;false;false
+number=number
-delimiter=0x301010;0xffffff;false;false
+delimiter=operator
-character=0xff901e;0xffffff;false;false
+character=string_1
-charactereol=0x000000;0xe0c0e0;false;false
+charactereol=string_eol
-string=0xff901e;0xffffff;false;false
+string=string_1
-stringeol=0x000000;0xe0c0e0;false;false
+stringeol=string_eol
-label=0xaaaaaa;0xffffff;false;true
+label=preprocessor
-commentline=0xd00000;0xffffff;false;false
+commentline=comment
-illegal=0xff0000;0xffffff;false;true
+illegal=error
 
 [keywords]
 # all items must be in one line

data/filetypes.asm

@@ -1,21 +1,21 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-comment=0x808080;0xffffff;false;false
+comment=comment
-number=0x007f00;0xffffff;false;false
+number=number_1
-string=0xff901e;0xffffff;false;false
+string=string_1
-operator=0x000000;0xffffff;false;false
+operator=operator
-identifier=0x880000;0xffffff;false;false
+identifier=identifier_1
-cpuinstruction=0x111199;0xffffff;true;false
+cpuinstruction=keyword_1
-mathinstruction=0x7f0000;0xffffff;true;false
+mathinstruction=keyword_2
-register=0x000000;0xffffff;true;false
+register=type
-directive=0x3d670f;0xffffff;true;false
+directive=preprocessor
-directiveoperand=0xff901e;0xffffff;false;false
+directiveoperand=keyword_3
-commentblock=0x808080;0xffffff;false;false
+commentblock=comment
-character=0xff901e;0xffffff;false;false
+character=string_1
-stringeol=0x000000;0xe0c0e0;false;false
+stringeol=string_eol
-extinstruction=0x007f7f;0xffffff;false;false
+extinstruction=keyword_4
 
 [keywords]
 # all items must be in one line

data/filetypes.c

@@ -1,28 +1,28 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
 default=default
 comment=comment
 commentline=comment
-commentdoc=commentdoc
+commentdoc=comment_doc
-number=number
+number=number_1
-word=keyword
+word=keyword_1
-word2=keyword2
+word2=keyword_2
-string=string
+string=string_1
-character=string
+character=string_1
-uuid=extra
+uuid=other
 preprocessor=preprocessor
 operator=operator
-identifier=default
+identifier=identifier_1
-stringeol=stringeol
+stringeol=string_eol
-# @"verbatim" and """multi-line verbatim"""
+verbatim=string_2
-verbatim=extra
+regex=regex
-# (/regex/)
+commentlinedoc=comment_doc
-regex=extra
+commentdockeyword=comment_doc_keyword
-commentlinedoc=commentdoc,bold
+commentdockeyworderror=comment_doc_keyword_error
-commentdockeyword=commentdoc,bold,italic
+globalclass=class
-commentdockeyworderror=commentdoc
+# """verbatim"""
-globalclass=type
+tripleverbatim=string_2
 
 [keywords]
 # all items must be in one line

data/filetypes.caml

@@ -1,20 +1,20 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-comment=0x808080;0xffffff;false;false
+comment=comment
-comment1=0x808080;0xffffff;false;false
+comment1=comment
-comment2=0x808080;0xffffff;false;false
+comment2=comment
-comment3=0x808080;0xffffff;false;false
+comment3=comment
-number=0x7f7f00;0xffffff;false;false
+number=number_1
-keyword=0x001a7f;0xffffff;true;false
+keyword=keyword_1
-keyword2=0x7f0000;0xffffff;true;false
+keyword2=keyword_2
-string=0x7f007f;0xffffff;false;false
+string=string_1
-char=0x7f007f;0xffffff;false;false
+char=string_1
-operator=0x000000;0xffffff;false;false
+operator=operator
-identifier=0x111199;0xffffff;false;false
+identifier=identifier_1
-tagname=0x000000;0xffe0ff;true;false
+tagname=preprocessor
-linenum=0x000000;0xc0c0c0;false;false
+linenum=number_2
 
 [keywords]
 # all items must be in one line

data/filetypes.cmake

@@ -1,21 +1,21 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
 # foreground;background;bold;italic
-default=0x000000;0xffffff;false;false;
+default=default
-comment=0x808080;0xffffff;false;false;
+comment=comment
-stringdq=0xff901e;0xffffff;false;false;
+stringdq=string_1
-stringlq=0x008000;0xffffff;false;false;
+stringlq=string_1
-stringrq=0x008000;0xffffff;false;false;
+stringrq=string_1
-command=0x00007f;0xffffff;false;false;
+command=function
-parameters=0x991111;0xffffff;false;false;
+parameters=parameter
-variable=0x007f7f;0xffffff;false;false;
+variable=identifier_1
-userdefined=0x0000d0;0xffffff;true;false;
+userdefined=type
-whiledef=0x00007f;0xffffff;true;false;
+whiledef=keyword_1
-foreachdef=0x00007f;0xffffff;true;false;
+foreachdef=keyword_1
-ifdefinedef=0x00007f;0xffffff;true;false;
+ifdefinedef=keyword_1
-macrodef=0x00007f;0xffffff;true;false;
+macrodef=preprocessor
-stringvar=0x007f7f;0xffffff;false;false;
+stringvar=string_2
-number=0x007f00;0xffffff;false;false;
+number=number_1
 
 [keywords]
 # all items must be in one line

data/filetypes.cobol

@@ -1,18 +1,18 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
 default=default
 comment=comment
 commentline=comment
-commentdoc=commentdoc
+commentdoc=comment_doc
-number=number
+number=number_1
-word=keyword
+word=keyword_1
-word2=keyword2
+word2=keyword_2
-string=string
+string=string_1
-character=string
+character=character
 operator=operator
-identifier=default
+identifier=identifier_1
-quotedidentifier=default
+quotedidentifier=identifier_2
 
 [keywords]
 # all items must be in one line

data/filetypes.common

@@ -7,21 +7,21 @@ default=default
 
 # 3rd selection argument is true to override default foreground
 # 4th selection argument is true to override default background
-selection=0x000000;0xc0c0c0;false;false
+selection=selection
 
 # style for a matching brace
-brace_good=0x0000ff;0xFFFFFF;true;false
+brace_good=brace_good
 # style for a non-matching brace (a brace without a counterpart)
-brace_bad=0xff0000;0xFFFFFF;true;false
+brace_bad=brace_bad
 
 # the following settings define the colours of the margins on the left side
-margin_linenumber=0x000000;0xd0d0d0;
+margin_linenumber=margin_line_number
-margin_folding=0x000000;0xdfdfdf;
+margin_folding=margin_folding
-fold_symbol_highlight=0xffffff
+fold_symbol_highlight=fold_symbol_highlight
 
 # 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=0x000000;0xf0f0f0;true;
+current_line=current_line
 
 # translucency for the current line(first argument) and the selection (second argument)
 # values between 0 and 256 are accepted. Note for Windows 95, 98 and ME users:
@@ -29,33 +29,33 @@ current_line=0x000000;0xf0f0f0;true;
 translucency=256;256
 
 # style for a highlighted line (e.g when using Goto line or goto tag)
-marker_line=0x000000;0xffff00;
+marker_line=marker_line
 
 # style for a marked search results (when using "Mark" in Search dialogs)
 # the second argument sets the background colour for the drawn rectangle
 # only the second argument is interpreted
-marker_search=0x000000;0x0000f0;
+marker_search=marker_search
 
 # style for a marked line (e.g when using the "Toggle Marker" keybinding (Ctrl-M))
-marker_mark=0x000000;0xb8f4b8;
+marker_mark=marker_mark
 
 # translucency for the line marker(first argument) and the search marker (second argument)
 marker_translucency=256;256
 
 # colour of the caret(the blinking cursor), only first and third argument is interpreted
 # set the third argument to true to change the caret into a block caret
-caret=0x000000;0x000000;false;
+caret=caret
 
 # width of the caret(the blinking cursor)
 # width in pixels, use 0 to make it invisible, maximum width is 3
 caret_width=1
 
 # set foreground and background colour of indentation guides
-indent_guide=0xc0c0c0;;
+indent_guide=indent_guide
 
 # third argument: if true, use this foreground color. If false, use the default value defined by the filetypes.
 # fourth argument: if true, use this background color. If false, use the default value defined by the filetypes.
-white_space=0xc0c0c0;0xffffff;true;false
+white_space=white_space
 
 # style of folding icons, valid values are:
 # first argument:  1 for boxes, 2 for circles, 3 for arrows, 4 for +/-
@@ -91,7 +91,7 @@ line_height=0;0;
 
 # 3rd argument is true to override default foreground of calltips
 # 4th argument is true to override default background of calltips
-calltips=0xc0c0c0;0xffffff;false;false
+calltips=call_tips
 
 [settings]
 # which characters should be skipped when moving (or included when deleting) to word boundaries
@@ -99,26 +99,77 @@ calltips=0xc0c0c0;0xffffff;false;false
 whitespace_chars=\s\t!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~
 
 [named_styles]
-# style names to use in filetypes.* [styling] sections
+# This is the Default "built-in" color scheme
-# use foreground;background;bold;italic
-# normally background should be left blank to use the "default" style
-
 default=0x000000;0xffffff;false;false
-comment=0xd00000
+error=0xff0000;0xBFBFBF;false;italic
-commentdoc=0x3f5fbf
-number=0x007f00
-# keyword
-keyword=0x00007f;;true;false
-# usually type keywords and library type names
-keyword2=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
-extra=0x404080
 
+selection=0x000000;0xc0c0c0;false;false
+current_line=0x000000;0xf0f0f0;true;
+brace_good=0x0000ff;0xFFFFFF;true;false
+brace_bad=0xff0000;0xFFFFFF;true;false
+margin_line_number=0x000000;0xd0d0d0;
+margin_folding=0x000000;0xdfdfdf;
+fold_symbol_highlight=0xffffff
+indent_guide=0xc0c0c0;;
+caret=0x000000;0x000000;false;
+marker_line=0x000000;0xffff00;
+marker_search=0x000000;0x0000f0;
+marker_mark=0x000000;0xb8f4b8;
+call_tips=0xc0c0c0;0xffffff;false;false
+white_space=0xc0c0c0;0xffffff;true;false
+
+comment=0xd00000
+comment_doc=0x3f5fbf
+comment_line=comment
+comment_line_doc=comment_doc
+comment_doc_keyword=comment_doc,bold
+comment_doc_keyword_error=comment_doc,italic
+
+number=0x007f00
+number_1=number
+number_2=number_1
+
+type=0x0000d0;;true;false
+class=type
+function=0x000080
+parameter=function
+
+keyword=0x00007f;;true;false
+keyword_1=keyword
+keyword_2=0x991111;;true;false
+keyword_3=keyword_1
+keyword_4=keyword_1
+
+identifier=default
+identifier_1=identifier
+identifier_2=identifier_1
+identifier_3=identifier_1
+identifier_4=identifier_1
+
+string=0xff901e
+string_1=string
+string_2=string_1
+string_eol=0x000000;0xe0c0e0;false;false
+character=string_1
+backtick=string_2
+here_doc=string_2
+
+scalar=string_2
+label=default,bold
+preprocessor=0x007f7f
+regex=number_1
+operator=0x301010
+decorator=string_1,bold
+other=0x404080
+
+tag=type
+tag_unknown=tag,bold
+tag_end=tag,bold
+attribute=keyword_1
+attribute_unknown=attribute,bold
+value=string_1
+entity=default
+
+line_added=0x34b034;0xffffff;false;false
+line_removed=0xff2727;0xffffff;false;false
+line_changed=0x7f007f;0xffffff;false;false

data/filetypes.conf

@@ -1,12 +1,12 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x7f0000;0xffffff;false;false
+default=value
-comment=0x808080;0xffffff;false;false
+comment=comment
-section=0x000090;0xffffff;true;false
+section=tag
-key=0x00007f;0xffffff;false;false
+key=attribute
-assignment=0x000000;0xffffff;false;false
+assignment=operator
-defval=0x00007f;0xffffff;false;false
+defval=value
 
 # the lexer doesn't support keywords
 

data/filetypes.cpp

@@ -1,28 +1,5 @@
 # For complete documentation of this file, please see Geany's main documentation
-[styling]
+[styling=C]
-# foreground;background;bold;italic
-default=default
-comment=comment
-commentline=comment
-commentdoc=commentdoc
-number=number
-word=keyword
-word2=keyword2
-string=string
-character=string
-uuid=extra
-preprocessor=preprocessor
-operator=operator
-identifier=default
-stringeol=stringeol
-# @"verbatim"
-verbatim=extra
-# (/regex/)
-regex=extra
-commentlinedoc=commentdoc,bold
-commentdockeyword=commentdoc,bold,italic
-commentdockeyworderror=commentdoc
-globalclass=type
 
 [keywords]
 # all items must be in one line

data/filetypes.cs

@@ -1,28 +1,5 @@
 # For complete documentation of this file, please see Geany's main documentation
-[styling]
+[styling=C]
-# foreground;background;bold;italic
-default=default
-comment=comment
-commentline=comment
-commentdoc=commentdoc
-number=number
-word=keyword
-word2=keyword2
-string=string
-character=string
-uuid=extra
-preprocessor=preprocessor
-operator=operator
-identifier=default
-stringeol=stringeol
-# @"verbatim"
-verbatim=extra
-# (/regex/)
-regex=extra
-commentlinedoc=commentdoc,bold
-commentdockeyword=commentdoc,bold,italic
-commentdockeyworderror=commentdoc
-globalclass=type
 
 [keywords]
 # all items must be in one line

data/filetypes.css

@@ -1,29 +1,29 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x003399;0xffffff;false;false
+default=default
-comment=0x808080;0xffffff;false;false
+comment=comment
-tag=0x2166a4;0xffffff;true;false
+tag=tag
-class=0x007f00;0xffffff;true;false
+class=class
-pseudoclass=0x660010;0xffffff;true;true
+pseudoclass=class
-unknown_pseudoclass=0xff0099;0xffffff;false;false
+unknown_pseudoclass=class
-unknown_identifier=0xff0099;0xffffff;false;false
+unknown_identifier=class
-operator=0x301010;0xffffff;false;false
+operator=operator
-identifier=0x000099;0xffffff;true;false
+identifier=keyword_1
-doublestring=0x330066;0xffffff;false;false
+doublestring=string_1
-singlestring=0x330066;0xffffff;false;false
+singlestring=string_1
-attribute=0x007f00;0xffffff;false;false
+attribute=attribute
-value=0x303030;0xffffff;false;false
+value=value
-id=0xff9000;0xffffff;true;false
+id=number
-identifier2=0x6b6bff;0xffffff;true;false
+identifier2=keyword_2
-important=0x990000;0xffffff;true;false
+important=extra
-directive=0x006bff;0xffffff;false;true
+directive=preprocessor
-identifier3=0x00c8ff;0xffffff;true;false
+identifier3=keyword_3
-pseudoelement=0x666610;0xffffff;true;true
+pseudoelement=element
-extended_identifier=0x9090a0;0xffffff;true;false
+extended_identifier=keyword_4
-extended_pseudoclass=0x907080;0xffffff;true;true
+extended_pseudoclass=class
-extended_pseudoelement=0x909080;0xffffff;true;true
+extended_pseudoelement=element
-media=0x006bff;0xffffff;false;true
+media=string_2
 
 [keywords]
 # CSS 1 properties

data/filetypes.d

@@ -1,24 +1,24 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
 default=default
 comment=comment
 commentline=comment
-commentdoc=commentdoc
+commentdoc=comment_doc
-commentdocnested=commentdoc
+commentdocnested=comment_doc
-number=number
+number=number_1
-word=keyword
+word=keyword_1
-word2=keyword2
+word2=keyword_2
-word3=keyword2
+word3=keyword_3
 typedef=type
-string=string
+string=string_1
-stringeol=stringeol
+stringeol=string_eol
-character=string
+character=string_1
 operator=operator
-identifier=default
+identifier=identifier_1
-commentlinedoc=commentdoc,bold
+commentlinedoc=comment_doc
-commentdockeyword=commentdoc,bold,italic
+commentdockeyword=comment_doc_keyword
-commentdockeyworderror=commentdoc
+commentdockeyworderror=comment_doc_keyword_error
 
 [keywords]
 # all items must be in one line

data/filetypes.diff

@@ -1,14 +1,14 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-comment=0x808080;0xffffff;false;false
+comment=comment
-command=0x7f7f00;0xffffff;false;false
+command=function
-header=0x7f0000;0xffffff;false;false
+header=preprocessor
-position=0x00007f;0xffffff;false;false
+position=number
-deleted=0xff2727;0xffffff;false;false
+deleted=line_removed
-added=0x34b034;0xffffff;false;false
+added=line_added
-changed=0x7f007f;0xffffff;false;false
+changed=line_changed
 
 
 [settings]
@@ -30,4 +30,3 @@ context_action_cmd=
 #width=4
 # 0 is spaces, 1 is tabs, 2 is tab & spaces
 #type=1
-

data/filetypes.docbook

@@ -1,35 +1,5 @@
 # For complete documentation of this file, please see Geany's main documentation
-[styling]
+[styling=XML]
-# foreground;background;bold;italic
-default=0x000000;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=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=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=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

data/filetypes.erlang

@@ -1,28 +1,28 @@
 [styling]
-# Each of these (...) refers to the lexer state SCE_ERLANG_(...)
+# Edit these in the colorscheme .conf file instead
 default=default
 comment=comment
 variable=default
-number=number
+number=number_1
-keyword=keyword
+keyword=keyword_1
-string=string
+string=string_1
 operator=operator
 atom=default
-function_name=default,bold
+function_name=function
-character=default
+character=character
 macro=preprocessor
 record=type
 preproc=preprocessor
 node_name=default
 comment_function=comment
 comment_module=comment
-comment_doc=comment
+comment_doc=comment_doc
-comment_doc_macro=comment
+comment_doc_macro=comment_doc
 atom_quoted=default
 macro_quoted=default
 record_quoted=default
 node_name_quoted=default
-bifs=keyword2
+bifs=keyword_2
 modules=default
 modules_att=preprocessor
 unknown=default

data/filetypes.f77

@@ -1,23 +1,21 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-comment=0x808080;0xffffff;false;false
+comment=comment
-number=0x007f00;0xffffff;false;false
+number=number_1
-string=0xff901e;0xffffff;false;false
+string=string_1
-operator=0x301010;0xffffff;false;false
+operator=operator
-identifier=0x000000;0xffffff;false;false
+identifier=identifier_1
-string2=0x111199;0xffffff;true;false
+string2=string_2
-word=0x7f0000;0xffffff;true;false
+word=keyword_1
-word2=0x000099;0xffffff;true;false
+word2=keyword_2
-word3=0x3d670f;0xffffff;true;false
+word3=keyword_3
-preprocessor=0x007f7f;0xffffff;false;false
+preprocessor=preprocessor
-operator2=0x301010;0xffffff;true;false
+operator2=operator
-continuation=0x000000;0xffffff;false;false
+continuation=default
-#continuation=0xff901e;0xf0e080;false;false
+stringeol=string_eol
-stringeol=0x000000;0xe0c0e0;false;false
+label=type
-label=0xa861a8;0xffffff;true;false
-
 
 [keywords]
 # all items must be in one line

data/filetypes.ferite

@@ -1,28 +1,5 @@
 # For complete documentation of this file, please see Geany's main documentation
-[styling]
+[styling=C]
-# foreground;background;bold;italic
-default=default
-comment=comment
-commentline=comment
-commentdoc=commentdoc
-number=number
-word=keyword
-word2=keyword2
-string=string
-character=string
-uuid=extra
-preprocessor=preprocessor
-operator=operator
-identifier=default
-stringeol=stringeol
-# @"verbatim"
-verbatim=extra
-# (/regex/)
-regex=extra
-commentlinedoc=commentdoc,bold
-commentdockeyword=commentdoc,bold,italic
-commentdockeyworderror=commentdoc
-globalclass=type
 
 [keywords]
 # all items must be in one line

data/filetypes.forth

@@ -1,18 +1,18 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
 default=default
-comment=commentdoc
+comment=comment
-commentml=comment
+commentml=comment_doc
-identifier=default
+identifier=identifier_1
-control=0x301010;0xffffff;true;false
+control=keyword_1
-keyword=0x301060;0xffffff;true;false
+keyword=keyword_1
-defword=0x000080;;false;true
+defword=keyword_2
-preword1=0x000000;0xe0c0e0;false;false
+preword1=keyword_3
-preword2=0xaaaaaa;0xffffff;false;true
+preword2=keyword_4
-number=0x007f00;0xffffff;false;false
+number=number_1
-string=string
+string=string_1
-locale=0xff0000;0xffffff;false;true
+locale=other
 
 [keywords]
 # all items must be in one line

data/filetypes.fortran

@@ -1,23 +1,5 @@
 # For complete documentation of this file, please see Geany's main documentation
-[styling]
+[styling=F77]
-# foreground;background;bold;italic
-default=0x000000;0xffffff;false;false
-comment=0x808080;0xffffff;false;false
-number=0x007f00;0xffffff;false;false
-string=0xff901e;0xffffff;false;false
-operator=0x301010;0xffffff;false;false
-identifier=0x000000;0xffffff;false;false
-string2=0x111199;0xffffff;true;false
-word=0x7f0000;0xffffff;true;false
-word2=0x000099;0xffffff;true;false
-word3=0x3d670f;0xffffff;true;false
-preprocessor=0x007f7f;0xffffff;false;false
-operator2=0x301010;0xffffff;true;false
-continuation=0x000000;0xffffff;false;false
-#continuation=0xff901e;0xf0e080;false;false
-stringeol=0x000000;0xe0c0e0;false;false
-label=0xa861a8;0xffffff;true;false
-
 
 [keywords]
 # all items must be in one line
@@ -55,7 +37,6 @@ context_action_cmd=
 # 0 is spaces, 1 is tabs, 2 is tab & spaces
 #type=1
 
-
 [build_settings]
 # %f will be replaced by the complete filename
 # %e will be replaced by the filename without extension

data/filetypes.freebasic

@@ -1,26 +1,25 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false;
+default=default
-comment=0x808080;0xffffff;false;false;
+comment=comment
-number=0x007f00;0xffffff;false;false;
+number=number_1
-word=0x00007f;0xffffff;true;false;
+word=keyword_1
-string=0xff901e;0xffffff;false;false;
+string=string_1
-preprocessor=0x007f7f;0xffffff;false;false;
+preprocessor=preprocessor
-operator=0x301010;0xffffff;false;false;
+operator=operator
-identifier=0x000000;0xffffff;false;false;
+identifier=identifier_1
-date=0x1a6500;0xffffff;false;false;
+date=number_2
-stringeol=0x000000;0xe0c0e0;false;false;
+stringeol=string_eol
-word2=0x007f7f;0xffffff;true;false;
+word2=keyword_2
-word3=0x991111;0xffffff;false;false;
+word3=keyword_3
-word4=0x0000d0;0xffffff;false;false;
+word4=keyword_4
-constant=0x007f7f;0xffffff;false;false;
+constant=identifier_2
-# asm is still unused
+asm=type
-asm=0x105090;0xffffff;false;false;
+label=identifier_3
-label=0x007f7f;0xffffff;false;false;
+error=error
-error=0xd00000;0xffffff;false;false;
+hexnumber=number_1
-hexnumber=0x007f00;0xffffff;false;false;
+binnumber=number_1
-binnumber=0x007f00;0xffffff;false;false;
 
 [keywords]
 # all items must be in one line

data/filetypes.glsl

@@ -1,31 +1,5 @@
 # For complete documentation of this file, please see Geany's main documentation
-[styling]
+[styling=C]
-# foreground;background;bold;italic
-default=default
-comment=comment
-commentline=comment
-commentdoc=commentdoc
-number=number
-word=keyword
-word2=keyword2
-string=string
-character=string
-uuid=extra
-preprocessor=preprocessor
-operator=operator
-identifier=default
-stringeol=stringeol
-# @"verbatim"
-verbatim=extra
-# (/regex/)
-regex=extra
-commentlinedoc=commentdoc,bold
-commentdockeyword=commentdoc,bold,italic
-commentdockeyworderror=commentdoc
-globalclass=type
-# 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
 
 [keywords]
 # all items must be in one line

data/filetypes.haskell

@@ -1,23 +1,23 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-commentline=0x808080;0xffffff;false;false
+commentline=comment
-commentblock=0x808080;0xffffff;false;false
+commentblock=comment
-commentblock2=0x808080;0xffffff;false;false
+commentblock2=comment
-commentblock3=0x808080;0xffffff;false;false
+commentblock3=comment
-number=0x007f00;0xffffff;false;false
+number=number_1
-keyword=0x00007f;0xffffff;true;false
+keyword=keyword_1
-import=0x991111;0xffffff;false;false
+import=preprocessor
-string=0xff901e;0xffffff;false;false
+string=string_1
-character=0x7f007f;0xffffff;false;false
+character=string_2
-class=0x0000d0;0xffffff;false;false
+class=class
-operator=0x301010;0xffffff;false;false
+operator=operator
-identifier=0x000000;0xffffff;false;false
+identifier=identifier_1
-instance=0x000000;0xffffff;false;false
+instance=type
-capital=0x635b00;0xffffff;false;false
+capital=string_2
-module=0x007f7f;0xffffff;false;false
+module=function
-data=0x000000;0xffffff;false;false
+data=number_2
 
 [keywords]
 # all items must be in one line

data/filetypes.haxe

@@ -1,28 +1,5 @@
 # For complete documentation of this file, please see Geany's main documentation
-[styling]
+[styling=C]
-# foreground;background;bold;italic
-default=default
-comment=comment
-commentline=comment
-commentdoc=commentdoc
-number=number
-word=keyword
-word2=keyword2
-string=string
-character=string
-uuid=extra
-preprocessor=preprocessor
-operator=operator
-identifier=default
-stringeol=stringeol
-# @"verbatim"
-verbatim=extra
-# (/regex/)
-regex=extra
-commentlinedoc=commentdoc,bold
-commentdockeyword=commentdoc,bold,italic
-commentdockeyworderror=commentdoc
-globalclass=type
 
 [keywords]
 # all items must be in one line

data/filetypes.java

@@ -1,28 +1,5 @@
 # For complete documentation of this file, please see Geany's main documentation
-[styling]
+[styling=C]
-# foreground;background;bold;italic
-default=default
-comment=comment
-commentline=comment
-commentdoc=commentdoc
-number=number
-word=keyword
-word2=keyword2
-string=string
-character=string
-uuid=extra
-preprocessor=preprocessor
-operator=operator
-identifier=default
-stringeol=stringeol
-# @"verbatim"
-verbatim=extra
-# (/regex/)
-regex=extra
-commentlinedoc=commentdoc,bold
-commentdockeyword=commentdoc,bold,italic
-commentdockeyworderror=commentdoc
-globalclass=type
 
 [keywords]
 primary=abstract assert break case catch class const continue default do else enum 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 true false null
@@ -61,7 +38,6 @@ context_action_cmd=
 # 0 is spaces, 1 is tabs, 2 is tab & spaces
 #type=1
 
-
 [build_settings]
 # %f will be replaced by the complete filename
 # %e will be replaced by the filename without extension

data/filetypes.javascript

@@ -1,28 +1,5 @@
 # For complete documentation of this file, please see Geany's main documentation
-[styling]
+[styling=C]
-# foreground;background;bold;italic
-default=default
-comment=comment
-commentline=comment
-commentdoc=commentdoc
-number=number
-word=keyword
-word2=keyword2
-string=string
-character=string
-uuid=extra
-preprocessor=preprocessor
-operator=operator
-identifier=default
-stringeol=stringeol
-# @"verbatim"
-verbatim=extra
-# (/regex/)
-regex=extra
-commentlinedoc=commentdoc,bold
-commentdockeyword=commentdoc,bold,italic
-commentdockeyworderror=commentdoc
-globalclass=type
 
 [keywords]
 # all items must be in one line

data/filetypes.latex

@@ -1,11 +1,11 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x00002f;0xffffff;false;false
+default=default
-command=0xff0000;0xffffff;true;false
+command=keyword_1
-tag=0x007f7f;0xffffff;true;false
+tag=tag
-math=0x00007f;0xffffff;false;false
+math=number_1
-comment=0x007f00;0xffffff;false;true
+comment=comment
 
 [keywords]
 # all items must be in one line

data/filetypes.lisp

@@ -1,21 +1,21 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
 default=default
 comment=comment
 multicomment=comment
-number=number
+number=number_1
-keyword=0x0071FD;;true;false
+keyword=keyword_1
-special_keyword=0x0071FD;;true;false
+special_keyword=type
-symbol=keyword2
+symbol=keyword_2
-string=string
+string=string_1
-stringeol=stringeol
+stringeol=string_eol
-identifier=default
+identifier=identifier_1
-operator=default
+operator=operator
-special=keyword
+special=function
-character=default
+character=character
-macro=keyword2
+macro=preprocessor
-macrodispatch=keyword2
+macrodispatch=number_2
 
 [keywords]
 # all items must be in one line

data/filetypes.lua

@@ -1,26 +1,26 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-comment=0xd00000;0xffffff;false;false
+comment=comment
-commentline=0xd00000;0xffffff;false;false
+commentline=comment_line
-commentdoc=0x3f5fbf;0xffffff;true;false
+commentdoc=comment_line_doc
-number=0x007f00;0xffffff;false;false
+number=number_1
-word=0x00007f;0xffffff;true;false
+word=keyword_1
-string=0xff901e;0xffffff;false;false
+string=string_1
-character=0x008000;0xffffff;false;false
+character=character
-literalstring=0x008020;0xffffff;false;false
+literalstring=string_2
-preprocessor=0x007f7f;0xffffff;false;false
+preprocessor=preprocess
-operator=0x301010;0xffffff;false;false
+operator=operator
-identifier=0x000000;0xffffff;false;false
+identifier=identifier_1
-stringeol=0x000000;0xe0c0e0;false;false
+stringeol=string_eol
-function_basic=0x991111;0xffffff;false;false
+function_basic=function
-function_other=0x690000;0xffffff;false;false
+function_other=type
-coroutines=0x66005c;0xffffff;false;false
+coroutines=class
-word5=0x7979ff;0xffffff;false;false
+word5=keyword_1
-word6=0xad00ff;0xffffff;false;false
+word6=keyword_2
-word7=0x03D000;0xffffff;false;false
+word7=keyword_3
-word8=0xff7600;0xffffff;false;false
+word8=keyword_4
 
 [keywords]
 # all items must be in one line

data/filetypes.makefile

@@ -1,16 +1,13 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x00002f;0xffffff;false;false
+default=default
-comment=0xd00000;0xffffff;false;false
+comment=comment
-preprocessor=0x007f7f;0xffffff;false;false
+preprocessor=preprocessor
-identifier=0x007f00;0xffffff;false;false
+identifier=identifier_4
-operator=0x301010;0xffffff;false;false
+operator=operator
-target=0x0000ff;0xffffff;false;false
+target=label
-ideol=0x008000;0xffffff;false;false
+ideol=type
-
-# there are no keywords available otherwise mail me
-
 
 [settings]
 # default extension used when saving files

data/filetypes.markdown

@@ -1,23 +1,23 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-strong=0xff0000;0xffffff;false;false
+strong=string_3
-emphasis=0xff0000;0xffffff;false;false
+emphasis=string_4
-header1=0x0000bb;0xffffff;false;false
+header1=keyword_1
-header2=0x0000bb;0xffffff;false;false
+header2=keyword_1
-header3=0x0000bb;0xffffff;false;false
+header3=keyword_1
-header4=0x0000bb;0xffffff;false;false
+header4=keyword_1
-header5=0x0000bb;0xffffff;false;false
+header5=keyword_1
-header6=0x0000bb;0xffffff;false;false
+header6=keyword_1
-ulist_item=0x007f00;0xffffff;false;false
+ulist_item=tag_unknown
-olist_item=0x007f00;0xffffff;false;false
+olist_item=tag_unknown
-blockquote=0xff0000;0xffffff;false;false
+blockquote=tag_unknown
-strikeout=0xaa00ff;0xffffff;false;false
+strikeout=tag_unknown
-hrule=0xff901e;0xffffff;false;false
+hrule=tag_unknown
-link=0x0000ff;0xffffff;false;false
+link=keyword_1
-code=0x009f00;0xffffff;false;false
+code=attribute_unknown
-codebk=0x005f00;0xffffff;false;false
+codebk=attribute_unknown
 
 [settings]
 # default extension used when saving files

data/filetypes.matlab

@@ -1,15 +1,15 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-comment=0x808080;0xffffff;false;false
+comment=comment
-command=0x111199;0xffffff;true;false
+command=function
-number=0x007f00;0xffffff;false;false
+number=number_1
-keyword=0x001a7f;0xffffff;true;false
+keyword=keyword_1
-string=0xff901e;0xffffff;false;false
+string=string_1
-operator=0x301010;0xffffff;false;false
+operator=operator
-identifier=0x000000;0xffffff;false;false
+identifier=identifier_1
-doublequotedstring=0xff901e;0xffffff;false;false
+doublequotedstring=string_2
 
 [keywords]
 # all items must be in one line

data/filetypes.nsis

@@ -1,26 +1,25 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false;
+default=default
-comment=0x808080;0xffffff;false;false;
+comment=comment
-stringdq=0xff901e;0xffffff;false;false;
+stringdq=string_1
-stringlq=0x008000;0xffffff;false;false;
+stringlq=string_2
-stringrq=0x008000;0xffffff;false;false;
+stringrq=string_2
-function=0x00007f;0xffffff;false;false;
+function=keyword_1
-variable=0x991111;0xffffff;false;false;
+variable=type
-label=0x007f7f;0xffffff;false;false;
+label=label
-userdefined=0x0000d0;0xffffff;true;false;
+userdefined=keyword_2
-sectiondef=0x00007f;0xffffff;true;false;
+sectiondef=keyword_1
-subsectiondef=0x00007f;0xffffff;true;false;
+subsectiondef=keyword_1
-ifdefinedef=0x00007f;0xffffff;true;false;
+ifdefinedef=keyword_1
-macrodef=0x00007f;0xffffff;true;false;
+macrodef=keyword_1
-stringvar=0x991111;0xffffff;false;false;
+stringvar=string_1
-number=0x007f00;0xffffff;false;false;
+number=number_1
-sectiongroup=0x00007f;0xffffff;true;false;
+sectiongroup=keyword_1
-pageex=0x00007f;0xffffff;true;false;
+pageex=keyword_1
-functiondef=0x00007f;0xffffff;true;false;
+functiondef=keyword_1
-commentbox=0x808080;0xffffff;false;false;
+commentbox=comment
-
 
 [keywords]
 # all items must be in one line and in lowercase

data/filetypes.pascal

@@ -1,21 +1,21 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-identifier=0x000000;0xffffff;false;false
+identifier=identifier_1
-comment=0xd00000;0xffffff;false;false
+comment=comment
-comment2=0x3f5fbf;0xffffff;false;false
+comment2=comment
-commentline=0xd00000;0xffffff;false;false
+commentline=comment
-preprocessor=0x007f7f;0xffffff;false;false
+preprocessor=preprocessor
-preprocessor2=0x007f7f;0xffffff;false;false
+preprocessor2=preprocessor
-number=0x007F00;0xffffff;false;false
+number=number_1
-hexnumber=0x007F00;0xffffff;false;false
+hexnumber=number_1
-word=0x111199;0xffffff;true;false
+word=keyword_1
-string=0xff901e;0xffffff;false;false
+string=string
-stringeol=0x000000;0xe0c0e0;false;false
+stringeol=string_eol
-character=0x404000;0xffffff;false;false
+character=character
-operator=0x301010;0xffffff;false;false
+operator=operator
-asm=0x804080;0xffffff;false;false
+asm=number_2
 
 
 [keywords]

data/filetypes.perl

@@ -1,43 +1,43 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-error=0xff0000;0xffffff;false;false
+error=error
-commentline=0xd00000;0xffffff;false;false
+commentline=comment
-number=0x007f00;0xffffff;false;false
+number=number_1
-word=0x111199;0xffffff;true;false
+word=keyword_1
-string=0xff901e;0xffffff;false;false
+string=string_1
-character=0xff901e;0xffffff;false;false
+character=character
-preprocessor=0x007f7f;0xffffff;false;false
+preprocessor=preprocessor
-operator=0x301010;0xffffff;false;false
+operator=operator
-identifier=0x000000;0xffffff;false;false
+identifier=identifier_1
-scalar=0x7f0000;0xffffff;true;false
+scalar=scalar
-pod=0x035650;0xffffff;false;true
+pod=comment_doc
-regex=0x105090;0xffffff;false;false
+regex=regex
-array=0x105090;0xffffff;false;false
+array=regex
-hash=0x105090;0xffffff;false;false
+hash=regex
-symboltable=0x105090;0xffffff;false;false
+symboltable=number_2
-backticks=0x000000;0xe0c0e0;false;false
+backticks=backticks
-pod_verbatim=0x004000;0xc0ffc0;false;false
+pod_verbatim=comment_doc_keyword
-reg_subst=0x000000;0xf0e080;false;false
+reg_subst=regex
-datasection=0x600000;0xfff0d8;false;false
+datasection=value
-here_delim=0x000000;0xddd0dd;false;false
+here_delim=here_doc
-here_q=0x7f007f;0xddd0dd;false;false
+here_q=here_doc
-here_qq=0x7f007f;0xddd0dd;true;false
+here_qq=here_doc
-here_qx=0x7f007f;0xddd0dd;false;true
+here_qx=here_doc
-string_q=0x7f007f;0xffffff;false;false
+string_q=string_2
-string_qq=0xff901e;0xffffff;false;false
+string_qq=string_2
-string_qx=0x000000;0xe0c0e0;false;false
+string_qx=string_2
-string_qr=0x105090;0xffffff;false;false
+string_qr=string_2
-string_qw=0x105090;0xffffff;false;false
+string_qw=string_2
-variable_indexer=0x000000;0xffffff;false;false
+variable_indexer=default
 # not used
-punctuation=0x000000;0xffffff;false;false
+punctuation=default
 # obsolete: replaced by qq, qx, qr, qw
-longquote=0x000000;0xffffff;false;false
+longquote=perl_here_qq
-sub_prototype=0x301010;0xffffff;false;true
+sub_prototype=perl_here_qx
-format_ident=0xc000c0;0xffffff;true;false
+format_ident=perl_string_qr
-format=0xc000c0;0xffffff;false;false
+format=perl_string_qw
 
 [keywords]
 primary=NULL __FILE__ __LINE__ __PACKAGE__ __DATA__ __END__ AUTOLOAD BEGIN CORE DESTROY END EQ GE GT INIT LE LT NE CHECK abs accept alarm and atan2 bind binmode bless caller chdir chmod chomp chop chown chr chroot close closedir cmp connect continue cos crypt dbmclose dbmopen defined delete die do dump each else elsif endgrent endhostent endnetent endprotoent endpwent endservent eof eq eval exec exists exit exp fcntl fileno flock for foreach fork format formline ge getc getgrent getgrgid getgrnam gethostbyaddr gethostbyname gethostent getlogin getnetbyaddr getnetbyname getnetent getpeername getpgrp getppid getpriority getprotobyname getprotobynumber getprotoent getpwent getpwnam getpwuid getservbyname getservbyport getservent getsockname getsockopt glob gmtime goto grep gt hex if index int ioctl join keys kill last lc lcfirst le length link listen local localtime lock log lstat lt m map mkdir msgctl msgget msgrcv msgsnd my ne next no not oct open opendir or ord our pack package pipe pop pos print printf prototype push q qq qr quotemeta qu qw qx rand read readdir readline readlink readpipe recv redo ref rename require reset return reverse rewinddir rindex rmdir s scalar seek seekdir select semctl semget semop send setgrent sethostent setnetent setpgrp setpriority setprotoent setpwent setservent setsockopt shift shmctl shmget shmread shmwrite shutdown sin sleep socket socketpair sort splice split sprintf sqrt srand stat study sub substr symlink syscall sysopen sysread sysseek system syswrite tell telldir tie tied time times tr truncate uc ucfirst umask undef unless unlink unpack unshift untie until use utime values vec wait waitpid wantarray warn while write x xor y

data/filetypes.po

@@ -1,18 +1,15 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x7f0000;0xffffff;false;false
+default=default
-comment=0x808080;0xffffff;false;false
+comment=comment
-msgid=0x00007f;0xffffff;true;false
+msgid=keyword_1
-msgid_text=0x00007f;0xffffff;false;false
+msgid_text=string_1
-msgstr=0x7f0000;0xffffff;true;false
+msgstr=keyword_2
-msgstr_text=0x7f0000;0xffffff;false;false
+msgstr_text=string_1
-msgctxt=0x007f00;0xffffff;true;false
+msgctxt=keyword_3
-msgctxt_text=0x007f00;0xffffff;false;false
+msgctxt_text=string_1
-fuzzy=0xffa500;0xffffff;true;false
+fuzzy=comment_doc_keyword
-
-# the lexer don't support keywords
-
 
 [settings]
 # default extension used when saving files
@@ -43,7 +40,6 @@ context_action_cmd=
 # 0 is spaces, 1 is tabs, 2 is tab & spaces
 #type=1
 
-
 [build_settings]
 # %f will be replaced by the complete filename
 # %e will be replaced by the filename without extension

data/filetypes.python

@@ -1,23 +1,22 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
 default=default
 commentline=comment
-number=number
+number=number_1
-string=string
+string=string_1
-character=string
+character=character
-word=keyword
+word=keyword_1
-triple=string
+triple=string_2
-tripledouble=commentdoc
+tripledouble=string_2
-classname=type,bold
+classname=type
 defname=function
 operator=operator
-identifier=default
+identifier=identifier_1
 commentblock=comment
-stringeol=stringeol
+stringeol=string_eol
-# flip bold for identifiers
+word2=keyword_2
-word2=keyword2,bold
+decorator=decorator
-decorator=preprocessor
 
 [keywords]
 # all items must be in one line

data/filetypes.r

@@ -1,23 +1,18 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-comment=0x808080;0xffffff;false;false
+comment=comment
-# primary keyword
+kword=keyword_1
-kword=0x00007f;0xffffff;false;false
+operator=operator
-operator=0x301010;0xffffff;false;false
+basekword=keyword_2
-# package keyword
+otherkword=keyword_3
-basekword=0x991111;0xffffff;false;false
+number=number_1
-# package_other keyword
+string=string_1
-otherkword=0x991111;0xffffff;false;false
+string2=string_2
-number=0x007f00;0xffffff;false;false
+identifier=identifier
-# "blah" string
+infix=function
-string=0xff901e;0xffffff;false;false
+infixeol=function
-# 'blah' string
-string2=0xff901e;0xffffff;false;false
-identifier=0x000000;0xffffff;false;false
-infix=0x008000;0xffffff;false;false
-infixeol=0x000000;0xe0c0e0;false;false
 
 [keywords]
 # all items must be in one line

data/filetypes.ruby

@@ -1,41 +1,40 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false
+default=default
-commentline=0xd00000;0xffffff;false;false
+commentline=comment
-number=0x400080;0xffffff;false;false
+number=number_1
-string=0x008000;0xffffff;false;false
+string=string_1
-character=0x008000;0xffffff;false;false
+character=character
-word=0x111199;0xffffff;true;false
+word=keyword_1
-global=0x111199;0xffffff;false;false
+global=type
-symbol=0x008020;0xffffff;false;false
+symbol=preprocessor
-classname=0x7f0000;0xffffff;true;false
+classname=class
-defname=0x7f0000;0xffffff;false;false
+defname=function
-operator=0x000000;0xffffff;false;false
+operator=operator
-identifier=0x000000;0xffffff;false;false
+identifier=identifier_1
-modulename=0x111199;0xffffff;true;false
+modulename=type
-backticks=0x000000;0xe0c0e0;false;false
+backticks=backticks
-instancevar=0x000000;0xffffff;false;true
+instancevar=default
-classvar=0x000000;0xffffff;true;true
+classvar=default
-datasection=0x000000;0xffffff;false;false
+datasection=default
-heredelim=0x000000;0xffffff;false;false
+heredelim=operator
-worddemoted=0x111199;0xffffff;false;false
+worddemoted=keyword_1
-stdin=0x000000;0xffffff;false;false
+stdin=default
-stdout=0x000000;0xffffff;false;false
+stdout=default
-stderr=0x000000;0xffffff;false;false
+stderr=default
-datasection=0x600000;0xfff0d8;false;false
+regex=regex
-regex=0x105090;0xffffff;false;false
+here_q=here_doc
-here_q=0x7f007f;0xddd0dd;false;false
+here_qq=here_doc
-here_qq=0x7f007f;0xddd0dd;true;false
+here_qx=here_doc
-here_qx=0x7f007f;0xddd0dd;false;true
+string_q=string_2
-string_q=0x7f007f;0xffffff;false;false
+string_qq=string_2
-string_qq=0xff901e;0xffffff;false;false
+string_qx=string_2
-string_qx=0x000000;0xe0c0e0;false;false
+string_qr=string_2
-string_qr=0x105090;0xffffff;false;false
+string_qw=string_2
-string_qw=0x105090;0xffffff;false;false
+upper_bound=default
-upper_bound=0x000000;0xffffff;false;false
+error=error
-error=0xe500cc;0xffffff;false;false
+pod=comment_doc
-pod=0x035650;0xffffff;false;false
 
 [keywords]
 # all items must be in one line

data/filetypes.sh

@@ -1,20 +1,20 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-commentline=0xd00000;0xffffff;false;false
+commentline=comment
-number=0x007f00;0xffffff;false;false
+number=number_1
-word=0x111199;0xffffff;true;false
+word=keyword_1
-string=0xff901e;0xffffff;false;false
+string=string_1
-character=0x404000;0xffffff;false;false
+character=string_1
-operator=0x301010;0xffffff;false;false
+operator=operator
-identifier=0x000000;0xffffff;false;false
+identifier=identifier_1
-backticks=0x000000;0xd0d0d0;false;false
+backticks=backtick
-param=0x009f00;0xffffff;false;false
+param=parameter
-scalar=0x105090;0xffffff;false;false
+scalar=scalar
-error=0xff0000;0xffffff;false;false
+error=error
-here_delim=0x000000;0xddd0dd;false;false
+here_delim=here_doc
-here_q=0x7f007f;0xddd0dd;false;false
+here_q=here_doc
 
 [keywords]
 primary=break case continue do done elif else esac eval exit export fi for function goto if in integer return set shift then until while

data/filetypes.sql

@@ -1,21 +1,21 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-comment=0x808080;0xffffff;false;false
+comment=comment
-commentline=0x808080;0xffffff;false;false
+commentline=comment_line
-commentdoc=0x3f5fbf;0xffffff;false;false
+commentdoc=comment_doc
-number=0x7f7f00;0xffffff;false;false
+number=number_1
-word=0x001a7f;0xffffff;true;false
+word=keyword_1
-word2=0x7f0000;0xffffff;true;false
+word2=keyword_2
-string=0x7f007f;0xffffff;false;false
+string=string_1
-character=0x000000;0xffffff;false;false
+character=character
-operator=0x000000;0xffffff;true;false
+operator=operator
-identifier=0x111199;0xffffff;false;false
+identifier=identifier_1
-sqlplus=0x000000;0xffffff;false;false
+sqlplus=default
-sqlplus_prompt=0x000000;0xffffff;false;false
+sqlplus_prompt=default
-sqlplus_comment=0x000000;0xffffff;false;false
+sqlplus_comment=default
-quotedidentifier=0x111199;0xffffff;false;false
+quotedidentifier=identifier_2
 
 [keywords]
 # all items must be in one line

data/filetypes.tcl

@@ -1,23 +1,22 @@
 # For complete documentation of this file; please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-comment=0xd00000;0xffffff;false;false
+comment=comment
-commentline=0xd00000;0xffffff;false;false
+commentline=comment_line
-number=0x007f00;0xffffff;false;false
+number=number_1
-operator=0x301010;0xffffff;false;false
+operator=operator
-identifier=0xa20000;0xffffff;false;false
+identifier=identifier_1
-wordinquote=0x7f007f;0xffffff;false;false
+wordinquote=string_1
-inquote=0x7f007f;0xffffff;false;false
+inquote=string_1
-substitution=0x111199;0xffffff;false;false
+substitution=function
-modifier=0x7f007f;0xffffff;false;false
+modifier=operator
-expand=0x000000;0xffffff;false;false
+expand=default
-wordtcl=0x111199;0xffffff;true;false
+wordtcl=keyword_1
-wordtk=0x7f0000;0xffffff;true;false
+wordtk=keyword_2
-worditcl=0x111199;0xffffff;true;false
+worditcl=keyword_3
-wordtkcmds=0x7f0000;0xffffff;true;false
+wordtkcmds=keyword_4
-wordexpand=0x7f0000;0xffffff;true;false
+wordexpand=keyword_4
-
 
 [keywords]
 # all items must be in one line
@@ -56,7 +55,6 @@ context_action_cmd=
 # 0 is spaces, 1 is tabs, 2 is tab & spaces
 #type=1
 
-
 [build_settings]
 # %f will be replaced by the complete filename
 # %e will be replaced by the filename without extension

data/filetypes.txt2tags

@@ -1,28 +1,28 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-strong=0x445675;0xffffff;true;false
+strong=tag
-emphasis=0x653A39;0xffffff;false;true
+emphasis=tag
-underlined=0x386742;0xffffff;false;false
+underlined=tag
-header1=0xE20700;0xffffff;true;false
+header1=tag
-header2=0xE20700;0xffffff;true;false
+header2=tag
-header3=0xA81D05;0xffffff;true;false
+header3=tag
-header4=0x871704;0xffffff;true;false
+header4=tag
-header5=0x871704;0xffffff;true;false
+header5=tag
-header6=0x871704;0xffffff;true;false
+header6=tag
-ulist_item=0xE300EE;0xffffff;false;false
+ulist_item=tag
-olist_item=0xE300EE;0xffffff;false;false
+olist_item=tag
-blockquote=0x015F52;0xffffff;false;false
+blockquote=tag
-strikeout=0x644A9B;0xffffff;false;false
+strikeout=tag
-hrule=0xff901e;0xffffff;false;false
+hrule=tag
-link=0x0930DE;0xffffff;false;true
+link=function
-code=0x009f00;0xffffff;false;false
+code=identifier_1
-codebk=0x005f00;0xffffff;false;false
+codebk=identifier_2
-comment=0x777777;0xffffff;false;false
+comment=comment
-option=0xC0036E;0xffffff;false;true
+option=operator
-preproc=0x848B00;0xffffff;false;true
+preproc=preprocessor
-postproc=0xC05600;0xffffff;false;true
+postproc=preprocessor
 
 [settings]
 # default extension used when saving files

data/filetypes.vala

@@ -1,28 +1,5 @@
 # For complete documentation of this file, please see Geany's main documentation
-[styling]
+[styling=C]
-# foreground;background;bold;italic
-default=default
-comment=comment
-commentline=comment
-commentdoc=commentdoc
-number=number
-word=keyword
-word2=keyword2
-string=string
-character=string
-uuid=extra
-preprocessor=preprocessor
-operator=operator
-identifier=default
-stringeol=stringeol
-# @"verbatim"
-verbatim=extra
-# (/regex/)
-regex=extra
-commentlinedoc=commentdoc,bold
-commentdockeyword=commentdoc,bold,italic
-commentdockeyworderror=commentdoc
-globalclass=type
 
 [keywords]
 # all items must be in one line

data/filetypes.verilog

@@ -1,19 +1,19 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
 default=default
 comment=comment
-comment_line=comment
+comment_line=comment_line
-comment_line_bang=comment
+comment_line_bang=comment_line
-number=number
+number=number_1
-word=keyword
+word=keyword_1
-word2=keyword2
+word2=keyword_2
-word3=0x5ea01f;;true
+word3=keyword_3
-string=string
+string=string_1
 preprocessor=preprocessor
 operator=operator
-identifier=default
+identifier=identifier_1
-stringeol=stringeol
+stringeol=string_eol
 userword=type
 
 [keywords]
@@ -50,5 +50,3 @@ context_action_cmd=
 #width=4
 # 0 is spaces, 1 is tabs, 2 is tab & spaces
 #type=1
-
-

data/filetypes.vhdl

@@ -1,21 +1,21 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-comment=0xd00000;0xffffff;false;false
+comment=comment
-comment_line_bang=0x3f5fbf;0xffffff;false;false;
+comment_line_bang=comment_line
-number=0x007f00;0xffffff;false;false
+number=number_1
-string=0xff901e;0xffffff;false;false
+string=string_1
-operator=0x301010;0xffffff;false;false
+operator=operator
-identifier=0x000000;0xffffff;false;false
+identifier=identifier_1
-stringeol=0x000000;0xe0c0e0;false;false
+stringeol=string_eol
-keyword=0x001a7f;0xffffff;true;false
+keyword=keyword_1
-stdoperator=0x007f7f;0xffffff;false;false
+stdoperator=operator
-attribute=0x804020;0xffffff;false;false
+attribute=attribute
-stdfunction=0x808020;0xffffff;true;false
+stdfunction=function
-stdpackage=0x208020;0xffffff;false;false
+stdpackage=preprocessor
-stdtype=0x208080;0xffffff;false;false
+stdtype=type
-userword=0x804020;0xffffff;true;false
+userword=keyword_2
 
 [keywords]
 # all items must be in one line
@@ -55,5 +55,3 @@ context_action_cmd=
 #width=4
 # 0 is spaces, 1 is tabs, 2 is tab & spaces
 #type=1
-
-

data/filetypes.xml

@@ -1,76 +1,66 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-html_default=0x000000;0xffffff;false;false
+html_default=default
-html_tag=0x000099;0xffffff;false;false
+html_tag=tag
-html_tagunknown=0xff0000;0xffffff;false;false
+html_tagunknown=tag_unknown
-html_attribute=0x007f00;0xffffff;false;false
+html_attribute=attribute
-html_attributeunknown=0xff0000;0xffffff;false;false
+html_attributeunknown=attribute_unknown
-html_number=0x800080;0xffffff;false;false
+html_number=number_1
-html_doublestring=0xff901e;0xffffff;false;false
+html_doublestring=string_1
-html_singlestring=0xff901e;0xffffff;false;false
+html_singlestring=string_1
-html_other=0x800080;0xffffff;false;false
+html_other=other
-html_comment=0x808080;0xffffff;false;false
+html_comment=comment
-html_entity=0x800080;0xffffff;false;false
+html_entity=entity
-html_tagend=0x000080;0xffffff;false;false
+html_tagend=tag_end
-# <?
+html_xmlstart=tag
-html_xmlstart=0x000099;0xf0f0f0;false;false
+html_xmlend=tag_end
-# ?>
+html_script=tag
-html_xmlend=0x000099;0xf0f0f0;false;false
+html_asp=tag
-# <script
+html_aspat=tag
-html_script=0x000080;0xf0f0f0;false;false
+html_cdata=string_2
-# <% ... %>
+html_question=number_2
-html_asp=0x004f4f;0xf0f0f0;false;false
+html_value=value
-# <%@ ... %>
+html_xccomment=comment
-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_default=default
-sgml_comment=0x808080;0xffffff;false;false
+sgml_comment=comment
-sgml_special=0x007f00;0xffffff;false;false
+sgml_special=number_1
-sgml_command=0x111199;0xffffff;true;false
+sgml_command=number_2
-sgml_doublestring=0xff901e;0xffffff;false;false
+sgml_doublestring=string_1
-sgml_simplestring=0xff901e;0xffffff;false;false
+sgml_simplestring=string_1
-sgml_1st_param=0x404080;0xffffff;false;false
+sgml_1st_param=attribute
-sgml_entity=0x301010;0xffffff;false;false
+sgml_entity=entity
-sgml_block_default=0x000000;0xffffff;false;false
+sgml_block_default=default
-sgml_1st_param_comment=0x406090;0xffffff;false;false
+sgml_1st_param_comment=comment
-sgml_error=0xff0000;0xffffff;false;false
+sgml_error=error
 
-php_default=0x000000;0xffffff;false;false
+php_default=default
-php_simplestring=0xff901e;0xffffff;false;false
+php_simplestring=string_1
-php_hstring=0x008000;0xffffff;false;false
+php_hstring=string_1
-php_number=0x606000;0xffffff;false;false
+php_number=number_1
-php_word=0x000099;0xffffff;false;false
+php_word=number_2
-php_variable=0x7f0000;0xffffff;false;false
+php_variable=identifier_4
-php_comment=0x808080;0xffffff;false;false
+php_comment=comment
-php_commentline=0x808080;0xffffff;false;false
+php_commentline=comment
-php_operator=0x102060;0xffffff;false;false
+php_operator=operator
-php_hstring_variable=0x101060;0xffffff;false;false
+php_hstring_variable=string_2
-php_complex_variable=0x105010;0xffffff;false;false
+php_complex_variable=identifier_2
 
-# used for JavaScript, ASP Javascript, VBScript
+jscript_start=tag
-jscript_start=0x008080;0xffffff;false;false
+jscript_default=default
-jscript_default=0x000000;0xffffff;false;false
+jscript_comment=comment
-jscript_comment=0xd00000;0xffffff;false;false
+jscript_commentline=comment
-jscript_commentline=0xd00000;0xffffff;false;false
+jscript_commentdoc=comment_doc
-jscript_commentdoc=0x3f5fbf;0xffffff;true;false
+jscript_number=number_1
-jscript_number=0x007f00;0xffffff;false;false
+jscript_word=number_2
-jscript_word=0x000000;0xffffff;false;false
+jscript_keyword=keyword_1
-jscript_keyword=0x00007f;0xffffff;true;false
+jscript_doublestring=string_1
-jscript_doublestring=0xff901e;0xffffff;false;false
+jscript_singlestring=string_1
-jscript_singlestring=0xff901e;0xffffff;false;false
-# same as operators
-jscript_symbols=0x301010;0xffffff;false;false
-jscript_stringeol=0x000000;0xe0c0e0;false;false
-jscript_regex=0x105090;0xffffff;false;false
-
-# for embedded Python script (<script language="python">...</script>), Python styles from
-# filetypes.python are used
 
+jscript_symbols=operator
+jscript_stringeol=string_eol
+jscript_regex=regex
 
 [keywords]
 html=a abbr acronym address applet area b base basefont bdo big blockquote body br button caption center cite code col colgroup dd del dfn dir div dl dt em embed fieldset font form frame frameset h1 h2 h3 h4 h5 h6 head hr html i iframe img input ins isindex kbd label legend li link map menu meta noframes noscript object ol optgroup option p param pre q quality s samp script select small span strike strong style sub sup table tbody td textarea tfoot th thead title tr tt u ul var xmlns leftmargin topmargin abbr accept-charset accept accesskey action align alink alt archive axis background bgcolor border cellpadding cellspacing char charoff charset checked cite class classid clear codebase codetype color cols colspan compact content coords data datafld dataformatas datapagesize datasrc datetime declare defer dir disabled enctype face for frame frameborder selected headers height href hreflang hspace http-equiv id ismap label lang language link longdesc marginwidth marginheight maxlength media framespacing method multiple name nohref noresize noshade nowrap object onblur onchange onclick ondblclick onfocus onkeydown onkeypress onkeyup onload onmousedown onmousemove onmouseover onmouseout onmouseup onreset onselect onsubmit onunload profile prompt pluginspage readonly rel rev rows rowspan rules scheme scope scrolling shape size span src standby start style summary tabindex target text title type usemap valign value valuetype version vlink vspace width text password checkbox radio submit reset file hidden image public doctype xml xml:lang article aside audio canvas command details datalist figure figcaption footer header hgroup keygen mark meter nav output progress section time video wbr async autocomplete autofocus contenteditable contextmenu draggable formaction formenctype formnovalidate formtarget list manifest max min novalidate pattern ping placeholder required reversed role sandbox scoped seamless sizes spellcheck srcdoc step ^data- ^aria-

data/filetypes.yaml

@@ -1,17 +1,16 @@
 # For complete documentation of this file, please see Geany's main documentation
 [styling]
-# foreground;background;bold;italic
+# Edit these in the colorscheme .conf file instead
-default=0x000000;0xffffff;false;false
+default=default
-comment=0x808080;0xffffff;false;false
+comment=comment
-identifier=0x000088;0xffffff;true;false
+identifier=identifier
-keyword=0x991111;0xffffff;true;false
+keyword=keyword_1
-number=0x007f00;0xffffff;false;false
+number=number_1
-reference=0x008888;0xffffff;false;false
+reference=function
-document=0x000088;0xffffff;false;false
+document=preprocessor
-text=0x333366;0xffffff;false;false
+text=string_1
-error=0xff0000;0xffffff;true;true
+error=error
-operator=0x301010;0xffffff;false;false
+operator=operator
-
 
 [keywords]
 # all items must be in one line

src/about.c

@@ -277,18 +277,18 @@ static GtkWidget *create_dialog(void)
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 	row++;
 
-	g_snprintf(buffer, sizeof(buffer), "Nick Treleaven - %s", _("maintainer"));
+	g_snprintf(buffer, sizeof(buffer), "Colomban Wendling - %s", _("maintainer"));
 	ROW(buffer, row, 0, 0, 0, 1);
 	row++;
-	ROW("<nick.treleaven@btinternet.com>", row, 0, 0, 0, 1);
+	ROW("<lists.ban@herbesfolles.org>", row, 0, 0, 0, 1);
 	row++;
 	ROW("", row, 0, 0, 0, 0);
 	row++;
 
-	g_snprintf(buffer, sizeof(buffer), "Colomban Wendling - %s", _("developer"));
+	g_snprintf(buffer, sizeof(buffer), "Nick Treleaven - %s", _("developer"));
 	ROW(buffer, row, 0, 0, 0, 1);
 	row++;
-	ROW("<lists.ban@herbesfolles.org>", row, 0, 0, 0, 1);
+	ROW("<nick.treleaven@btinternet.com>", row, 0, 0, 0, 1);
 	row++;
 	ROW("", row, 0, 0, 0, 0);
 	row++;

src/dialogs.c

@@ -170,14 +170,13 @@ static void open_file_dialog_handle_response(GtkWidget *dialog, gint response)
 
 static void on_file_open_notify(GObject *filechooser, GParamSpec *pspec, gpointer data)
 {
-	GValue *value;
+	GValue value = { 0 };
 
-	value = g_new0(GValue, 1);
+	g_value_init(&value, pspec->value_type);
-	g_value_init(value, pspec->value_type);
+	g_object_get_property(filechooser, pspec->name, &value);
-	g_object_get_property(filechooser, pspec->name, value);
 
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
-		ui_lookup_widget(GTK_WIDGET(filechooser), "check_hidden")), g_value_get_boolean(value));
+		ui_lookup_widget(GTK_WIDGET(filechooser), "check_hidden")), g_value_get_boolean(&value));
 }
 
 
@@ -833,7 +832,7 @@ gboolean dialogs_show_unsaved_file(GeanyDocument *doc)
 {
 	gchar *msg, *short_fn = NULL;
 	const gchar *msg2;
-	gint ret;
+	gint response;
 	gboolean old_quitting_state = main_status.quitting;
 
 	/* display the file tab to remind the user of the document */
@@ -843,33 +842,32 @@ gboolean dialogs_show_unsaved_file(GeanyDocument *doc)
 
 	short_fn = document_get_basename_for_display(doc, -1);
 
-	msg = g_strdup_printf(_("The file '%s' is not saved."),
+	msg = g_strdup_printf(_("The file '%s' is not saved."), short_fn);
-		(short_fn != NULL) ? short_fn : GEANY_STRING_UNTITLED);
 	msg2 = _("Do you want to save it before closing?");
 	g_free(short_fn);
 
-	ret = run_unsaved_dialog(msg, msg2);
+	response = run_unsaved_dialog(msg, msg2);
 	g_free(msg);
 
-	switch (ret)
+	switch (response)
 	{
 		case GTK_RESPONSE_YES:
 		{
 			if (document_need_save_as(doc))
 			{
-				ret = dialogs_show_save_as();
+				return dialogs_show_save_as();
 			}
 			else
 				/* document_save_file() returns the status if the file could be saved */
-				ret = document_save_file(doc, FALSE);
+				return document_save_file(doc, FALSE);
-			break;
 		}
-		case GTK_RESPONSE_NO: ret = TRUE; break;
+		case GTK_RESPONSE_NO:
-		case GTK_RESPONSE_CANCEL: /* fall through to default and leave the function */
+			return TRUE;
-		default: ret = FALSE; break;
-	}
 		
-	return (gboolean) ret;
+		case GTK_RESPONSE_CANCEL: /* fall through to default and leave the function */
+		default:
+			return FALSE;
+	}
 }
 
 

src/document.c

@@ -278,6 +278,10 @@ void document_init_doclist()
 
 void document_finalize()
 {
+	guint i;
+
+	for (i = 0; i < documents_array->len; i++)
+		g_free(documents[i]);
 	g_ptr_array_free(documents_array, TRUE);
 }
 

src/geanymenubuttonaction.c

@@ -194,7 +194,12 @@ static void menu_items_changed_cb(GtkContainer *container, GtkWidget *widget, Ge
 
 	priv = GEANY_MENU_BUTTON_ACTION_GET_PRIVATE(action);
 	if (priv->menu != NULL)
-		enable = (g_list_length(gtk_container_get_children(GTK_CONTAINER(priv->menu))) > 0);
+	{
+		GList *children = gtk_container_get_children(GTK_CONTAINER(priv->menu));
+
+		enable = (g_list_length(children) > 0);
+		g_list_free(children);
+	}
 	else
 		enable = FALSE;
 

src/sidebar.c

@@ -540,12 +540,9 @@ void sidebar_remove_document(GeanyDocument *doc)
 
 	if (GTK_IS_WIDGET(doc->priv->tag_tree))
 	{
-		gtk_widget_destroy(doc->priv->tag_tree);
+		gtk_widget_destroy(doc->priv->tag_tree); /* make GTK release its references, if any */
-		if (GTK_IS_TREE_VIEW(doc->priv->tag_tree))
+		/* Because it was ref'd in sidebar_update_tag_list, it needs unref'ing */
-		{
+		g_object_unref(doc->priv->tag_tree);
-			/* Because it was ref'd in sidebar_update_tag_list, it needs unref'ing */
-			g_object_unref((gpointer)doc->priv->tag_tree);
-		}
 		doc->priv->tag_tree = NULL;
 	}
 }
@@ -1056,11 +1053,8 @@ void sidebar_finalize(void)
 {
 	if (WIDGET(tv.default_tag_tree))
 	{
-		g_object_unref(tv.default_tag_tree);
+		gtk_widget_destroy(tv.default_tag_tree); /* make GTK release its references, if any... */
-		/* This is not exactly clean, default_tag_tree's ref_count is 2 when it is shown,
+		g_object_unref(tv.default_tag_tree); /* ...and release our own */
-		 * 1 oherwise. We should probably handle the ref_count more accurate. */
-		if (WIDGET(tv.default_tag_tree))
-			gtk_widget_destroy(tv.default_tag_tree);
 	}
 	if (WIDGET(tv.popup_taglist))
 		gtk_widget_destroy(tv.popup_taglist);