278 Commits

Author SHA1 Message Date
Nick Treleaven
e47f7ef1e1 Fix lexer settings for custom filetypes.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4447 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-11-24 16:47:35 +00:00
Nick Treleaven
0ae71f0ac5 Fix setting filetype properties when both the system and the user file
have properties set.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4445 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-11-24 16:22:14 +00:00
Nick Treleaven
9fdfc59a42 Make stylesets take a ft_id argument so they can be reused fully with
custom filetypes, so custom styles and keywords can be set.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4444 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-11-24 15:47:44 +00:00
Nick Treleaven
f92a31b59c Replace filetypes.xml html_asp_default_language key with
filetypes.html asp.default.language property in [lexer_properties]
group.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4433 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-11-18 17:07:12 +00:00
Nick Treleaven
c877db21df Use filetypes.foo [lexer_properties] group instead of hardcoding
lexer properties (more flexible e.g. for custom filetypes).



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4432 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-11-18 16:48:17 +00:00
Nick Treleaven
67d868be14 Use default color scheme if pref color scheme file doesn't exist.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4403 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-11-05 18:03:34 +00:00
Nick Treleaven
9a649260c5 Only reload filetype files when changing color scheme, not all
configuration files.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4398 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-11-04 15:06:56 +00:00
Nick Treleaven
1748976317 Fix issue with default color not being reset if overridden with a
system default color.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4397 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-11-04 14:59:16 +00:00
Nick Treleaven
dfd1ea1782 Add utils_get_config_files().
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4396 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-11-04 14:47:07 +00:00
Nick Treleaven
01b408c09b Add 'View->Editor->Color Schemes' menu, for now only shown if color
scheme files exist in a colorschemes config directory. Color scheme
files must end in ".conf" and currently only the [named_styles]
section is read.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4395 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-11-04 12:36:56 +00:00
Nick Treleaven
d17141ca9a Support loading global tags files for custom filetypes.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4343 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-10-20 12:07:12 +00:00
Nick Treleaven
7c450e2939 Add filetype "lexer_filetype" key so custom filetypes can use an
existing lexer.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4340 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-10-19 14:58:51 +00:00
Nick Treleaven
0b8c46a8a8 Add highlighting_set_styles() to API, use for Split Window plugin so
filetypes.common settings get set too.
Make highlighting_set_styles() take GeanyFiletype pointer instead of
filetype id.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4322 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-10-15 16:54:15 +00:00
Nick Treleaven
46ef07f0ab Change many SSM() macros to use sciwrappers.h instead.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4319 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-10-14 16:00:40 +00:00
Nick Treleaven
f47acb132c Call apply_filetype_properties() from styleset_c_like().
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4291 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-10-04 12:15:29 +00:00
Nick Treleaven
90bdc7e35a Move new_styleset() and preprocessor setup code into styleset_c_like[_init]().
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4290 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-10-04 11:55:50 +00:00
Nick Treleaven
1c29d0906d Fix 2 wrong uses of SSM() macro.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4289 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-10-04 11:19:46 +00:00
Nick Treleaven
3afd76aae1 Use sci_set_property() wrapper.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4288 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-10-04 11:15:26 +00:00
Enrico Tröger
62c474ffad Map global types (read from tags files) to keyword style for filetype Java.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4287 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-10-03 16:35:34 +00:00
Nick Treleaven
48c3918e13 Use jscript_keyword for SCE_HB[A]_WORD markup styles.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4276 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-10-01 11:16:12 +00:00
Nick Treleaven
d83caa6481 Add Vala keywords to conf file.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4270 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-09-30 12:10:24 +00:00
Nick Treleaven
783204f6ff Add sci_set_keywords() wrapper.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4260 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-09-28 16:27:14 +00:00
Nick Treleaven
b897991cad Remove filetype keyword defaults from the code - just read them from
configuration files.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4258 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-09-28 16:14:24 +00:00
Nick Treleaven
2f3a5ac325 Add apply_style_entries() to simplify implementing styleset_foo().
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4257 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-09-28 15:55:49 +00:00
Nick Treleaven
deeef8d1d1 Remove style defaults from the code - just read them from
configuration files.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4256 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-09-28 15:33:05 +00:00
Nick Treleaven
e0bf328c15 Fix possible segfault in get_keyfile_int() if key value is malformed.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4247 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-09-27 16:38:37 +00:00
Nick Treleaven
c0dcc7002b Change new html_asp_default_language markup pref to use integer,
not hex in config file.
Fix minor issue with changing pref back to 0.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4246 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-09-27 16:16:18 +00:00
Nick Treleaven
4e386fcc2b Add get_keyfile_ints() instead of using tmp_style hack.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4245 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-09-27 15:59:58 +00:00
Enrico Tröger
edd50b5f6c Add "html_asp_default_language" pseudo style to filetypes.xml to allow setting the used language in embedded ASP code (patch by Ross McKay, thanks).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4235 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-09-24 17:12:36 +00:00
Nick Treleaven
1986d915cc Run ./scripts/fix-alignment.pl -w src/*.[hc] plugins/*.[hc] (skipping generated files).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4199 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-09-16 14:13:38 +00:00
Nick Treleaven
683e09aae5 Update syntax highlighting after changing the 'Invert syntax
highlighting colors' pref, instead of requiring a restart.
Remove filetypes.common invert_all option - use 'Invert syntax
highlighting colors' pref instead (closes #2854525).



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4184 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-09-14 11:53:08 +00:00
Nick Treleaven
4c55a5506b Rename new_style_array -> new_styleset.
Rename styleset_free -> free_styleset.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/custom-filetypes@4081 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-08-14 11:13:22 +00:00
Nick Treleaven
352254b0ba Fix setting wordchars for custom filetypes.
Use style_sets array for custom filetypes too.
Replace styleset_none() with styleset_default().



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/custom-filetypes@4080 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-08-14 11:05:47 +00:00
Nick Treleaven
2bb49a38c8 Support adding custom filetype files e.g. filetype.Foo.conf. (Only
tested with empty file so far).
Allow GeanyFiletype::extension to be NULL.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/custom-filetypes@4070 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-08-12 11:19:54 +00:00
Nick Treleaven
9c0ced05d2 Call get_keyfile_wordchars() in highlighting_init_styles().
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4067 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-08-11 14:18:44 +00:00
Nick Treleaven
5e55af41fc Add Markdown filetype (patch by Jon Strait, thanks).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4046 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-07-30 11:29:53 +00:00
Nick Treleaven
88ae507faf Use full styleset_foo[_init] function name as argument to
init_styleset_case() and styleset_case() macros so it's easier to
understand the code.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4024 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-07-24 14:31:43 +00:00
Nick Treleaven
d2433058ef Fix building on GTK 2.8 (patch by Eugene Arshinov, thanks).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3971 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-07-15 14:23:02 +00:00
Nick Treleaven
b051d01215 Apply patch from Eugene Arshinov to reload color schemes via menu
(thanks).



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3955 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-07-13 11:58:21 +00:00
Enrico Tröger
2eed73e620 Fix setting keyword list 'classes' for Haxe (pointed out by Andreas Mokros, thanks).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3946 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-07-09 15:25:26 +00:00
Enrico Tröger
cb8cc25610 Add style 'marker_mark' and change style 'marker_search' to define the style used for marked search results.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3936 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-07-08 22:22:28 +00:00
Enrico Tröger
443ee99e7e Add style 'line_height' to increase the line height.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3935 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-07-08 22:21:45 +00:00
Nick Treleaven
1063c6ebdf Highlight D WYSIWYG backtick strings and r"strings" (closes
#1895745).



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3931 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-07-08 15:39:07 +00:00
Nick Treleaven
9d8863f79e Fix removing underscores in translated string using no_underscore()
macro.
Set a tooltip for the Split Window plugin's Show Current tool button.
Add utils_strdupa() macro.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3922 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-07-07 11:57:50 +00:00
Enrico Tröger
6334ebbd0c Add second argument to the 'line_wrap_indent' styling setting to control the new Scintilla indentation mode for wrapped lines.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3913 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-07-04 09:21:44 +00:00
Nick Treleaven
0a65df77d1 Make filetypes.common named styles use the "default" named style for
all missing style fields.
Set named styles to usually leave the background style empty. This
currently allows C-like filetypes to have a common default
background color.
Allow hard-coded colors to use -1 for the default color.
Add some highlighting style examples to the manual.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3890 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-06-22 15:26:44 +00:00
Nick Treleaven
385ce9f9a9 Remove gsd_* default styles, use named styles instead.
Note: this relies on filetypes.common being installed.
Add load_style_entries(), which makes style initialization
simpler, used in styleset_c_like_init().



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3873 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-06-18 14:20:07 +00:00
Enrico Tröger
0c97d49ed2 Add style 'jscript_regex' for filetype HTML (patch by Chris Macksey, thanks).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3872 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-06-17 19:04:17 +00:00
Nick Treleaven
60c7d9e5cf Fix segfault on parsing a filetypes.* style definition that has < 4
fields.
Allow style definitions to have missing fields to use the default
style fields.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3843 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-06-05 15:59:58 +00:00
Nick Treleaven
e01537fe3e Support toggling bold/italic when using a named style, e.g.:
commentdockeyword=commentdoc,bold,italic
Improve named style docs.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3836 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-06-03 15:42:01 +00:00