209 Commits

Author SHA1 Message Date
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
Nick Treleaven
f678ee105a Support named styles also for filetypes.common [styling] entries.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3828 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-06-01 13:46:21 +00:00
Nick Treleaven
9d0abef4ee Implement named styles support for filetypes.* using a
filetypes.common [named_styles] section e.g.:
foo=0xc00000;0xffffff;false;true
bar=foo
These can be used in e.g. filetypes.c as:
comment=foo



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3825 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-05-30 11:57:56 +00:00
Nick Treleaven
8906b19bac Make get_keyfile_hex() call get_keyfile_style() to share code for future improvements. Adjust arguments to avoid parsing strings.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3824 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-05-29 13:35:55 +00:00
Nick Treleaven
76ef2baa9d Remove get_keyfile_keywords() constant argument, rename index argument.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3823 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-05-29 12:54:56 +00:00
Enrico Tröger
ecfbe40cdc Unset maybe previously keywords when setting up Scintilla for XML files. This fixed wrong highlighting after switching back to filetype XML from another one.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3780 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-05-11 15:56:08 +00:00
Enrico Tröger
5c91e8aefd Add utils_color_invert() and use it in highlighting.c and printing.c.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3773 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-05-08 17:00:28 +00:00
Enrico Tröger
a6fe1f46f0 Update Pascal styles as they changed in Scintilla.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3770 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-05-03 18:13:34 +00:00
Enrico Tröger
a95a59a42f Remove all G_LIKELY macros inside g_return_if_fail() statements as this is redundant.
Remove many other G_LIKELY/G_UNLIKELY macros which doesn't make much sense to keep the code more readable.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3708 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-04-15 22:47:33 +00:00
Nick Treleaven
bfe7da53bd Fix 2 old uses of filetype IDs.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3694 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-04-07 15:42:24 +00:00
Enrico Tröger
1f7def7b71 Fix typo in the G_LIKELY checks, introduced in last commit.
Fix the size of the styles array.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3688 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-04-05 21:22:49 +00:00
Enrico Tröger
a9dc990049 Start using G_LIKELY/G_UNLIKELY macros to gain a little more performance when building the code with gcc.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3687 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-04-05 21:07:40 +00:00
Nick Treleaven
8bf28b76fb Merge trunk changes.
Add string.h include for htmlchars.c.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/reorder-filetypes@3679 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-04-03 13:45:47 +00:00
Enrico Tröger
00bc23cec4 Backport recent changes from Scintilla CVS to add partial support for RFC2822 styled text using the Properties lexer.
Ignore leading whitespace for config files and RFC2822 text.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3669 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-03-30 17:49:40 +00:00
Nick Treleaven
5ddc129829 Make GEANY_FILETYPES_NONE = 0; other things are now broken, e.g.
setting Open dialog filetypes.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/reorder-filetypes@3640 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-03-20 16:18:32 +00:00
Enrico Tröger
4122c1b138 Add filetype ActionScript (patch by Chris Macksey, thanks).
Update type keywords only for real C-like languages.
Fix wrong sorting of Assembler and Ada filetypes.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3624 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-03-13 09:58:27 +00:00
Enrico Tröger
60e751eaf2 Remove filetype O-Matrix (probably unused for years).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3482 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-01-18 18:18:38 +00:00
Enrico Tröger
9d627214f1 Add GUI pref to invert all colours for syntax highlighting.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3468 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-01-14 19:19:08 +00:00
Enrico Tröger
71f1dac2db Don't fold toplevel PHP script tags (part of #2003912).
Replace remaining occurences of sptr_t by uptr_t in the third argument of SSM() calls.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3462 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-01-11 21:24:09 +00:00
Enrico Tröger
c636728975 Fix several compiler warnings and build errors (patch by Daniel Richard G., thanks).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3460 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-01-11 18:29:39 +00:00