HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace filetypes.xml html_asp_default_language key with

Browse Source 
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
This commit is contained in:
Nick Treleaven 2009-11-18 17:07:12 +00:00
parent c877db21df
commit f92a31b59c
4 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -6,6 +6,10 @@
data/filetypes.python, data/filetypes.conf:
Use filetypes.foo [lexer_properties] group instead of hardcoding
lexer properties (more flexible e.g. for custom filetypes).
* src/highlighting.c, data/filetypes.xml, data/filetypes.html:
Replace filetypes.xml html_asp_default_language key with
filetypes.html asp.default.language property in [lexer_properties]
group.
2009-11-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

6
data/filetypes.html
View File

@ -2,6 +2,12 @@
[styling]
# styling for PHP/HTML is done in filetypes.xml
[lexer_properties]
# default scripting language for ASP
# 1 = JavaScript (or leave blank for default)
# 2 = VBScript
# 3 = Python
# asp.default.language=2
[settings]
# default extension used when saving files

6
data/filetypes.xml
View File

@ -71,12 +71,6 @@ jscript_regex=0x105090;0xffffff;false;false
# for embedded Python script (<script language="python">...</script>), Python styles from
# filetypes.python are used
# default scripting language for ASP
# 1 = JavaScript (or leave blank for default)
# 2 = VBScript
# 3 = Python
#html_asp_default_language=2
[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

15
src/highlighting.c
View File

@ -1258,7 +1258,7 @@ static void styleset_html(ScintillaObject *sci)
static void styleset_markup_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
{
new_styleset(GEANY_FILETYPES_XML, 57);
new_styleset(GEANY_FILETYPES_XML, 56);
get_keyfile_style(config, config_home, "html_default", &style_sets[GEANY_FILETYPES_XML].styling[0]);
get_keyfile_style(config, config_home, "html_tag", &style_sets[GEANY_FILETYPES_XML].styling[1]);
get_keyfile_style(config, config_home, "html_tagunknown", &style_sets[GEANY_FILETYPES_XML].styling[2]);
@ -1319,8 +1319,6 @@ static void styleset_markup_init(gint ft_id, GKeyFile *config, GKeyFile *config_
get_keyfile_style(config, config_home, "jscript_stringeol", &style_sets[GEANY_FILETYPES_XML].styling[54]);
get_keyfile_style(config, config_home, "jscript_regex", &style_sets[GEANY_FILETYPES_XML].styling[55]);
get_keyfile_int(config, config_home, "styling", "html_asp_default_language", 1, 0, &style_sets[GEANY_FILETYPES_XML].styling[56]);
style_sets[GEANY_FILETYPES_XML].keywords = g_new(gchar*, 7);
get_keyfile_keywords(config, config_home, "html", GEANY_FILETYPES_XML, 0);
get_keyfile_keywords(config, config_home, "javascript", GEANY_FILETYPES_XML, 1);
@ -1484,18 +1482,9 @@ static void styleset_markup(ScintillaObject *sci, gboolean set_keywords)
set_sci_style(sci, SCE_HPHP_HSTRING_VARIABLE, GEANY_FILETYPES_XML, 41);
set_sci_style(sci, SCE_HPHP_COMPLEX_VARIABLE, GEANY_FILETYPES_XML, 42);
/* note: normally this would be in the filetype file instead */
sci_set_property(sci, "fold.html", "1");
sci_set_property(sci, "fold.html.preprocessor", "0");
{
gint asp_default_language;
gchar *str;
asp_default_language = style_sets[GEANY_FILETYPES_XML].styling[56].foreground;
str = g_strdup_printf("%d", asp_default_language);
sci_set_property(sci, "asp.default.language", &str[0]);
g_free(str);
}
}