Commits May 2009

commits@lists.geany.org

3 participants
72 discussions

SF.net SVN: geany:[3777] trunk
by eht16＠users.sourceforge.net 10 May '09

10 May '09

Revision: 3777 http://geany.svn.sourceforge.net/geany/?rev=3777&view=rev Author: eht16 Date: 2009-05-10 17:44:43 +0000 (Sun, 10 May 2009) Log Message: ----------- Create parent directories if necessary when checking for the configuration directory on startup (closes #2784577). Modified Paths: -------------- trunk/ChangeLog trunk/src/main.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-10 17:44:28 UTC (rev 3776) +++ trunk/ChangeLog 2009-05-10 17:44:43 UTC (rev 3777) @@ -5,6 +5,9 @@ on the press event like for other buttons. * src/editor.c: Refactor some multiple used code into get_multiline_comment_style(). + * src/main.c: + Create parent directories if necessary when checking for the + configuration directory on startup (closes #2784577). 2009-05-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2009-05-10 17:44:28 UTC (rev 3776) +++ trunk/src/main.c 2009-05-10 17:44:43 UTC (rev 3777) @@ -634,6 +634,9 @@ _("Geany needs to move your old configuration directory before starting."))) exit(0); + if (! g_file_test(app->configdir, G_FILE_TEST_IS_DIR)) + utils_mkdir(app->configdir, TRUE); + if (g_rename(old_dir, app->configdir) == 0) { dialogs_show_msgbox(GTK_MESSAGE_INFO, @@ -656,7 +659,7 @@ } #endif geany_debug("creating config directory %s", app->configdir); - saved_errno = utils_mkdir(app->configdir, FALSE); + saved_errno = utils_mkdir(app->configdir, TRUE); } if (saved_errno == 0 && ! g_file_test(conf_file, G_FILE_TEST_EXISTS)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3776] trunk
by eht16＠users.sourceforge.net 10 May '09

10 May '09

Revision: 3776 http://geany.svn.sourceforge.net/geany/?rev=3776&view=rev Author: eht16 Date: 2009-05-10 17:44:28 +0000 (Sun, 10 May 2009) Log Message: ----------- Refactor some multiple used code into get_multiline_comment_style(). Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-10 17:44:14 UTC (rev 3775) +++ trunk/ChangeLog 2009-05-10 17:44:28 UTC (rev 3776) @@ -3,6 +3,8 @@ * src/ui_utils.c: Make the clear icon of entry fields act on the release event, not on the press event like for other buttons. + * src/editor.c: + Refactor some multiple used code into get_multiline_comment_style(). 2009-05-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-05-10 17:44:14 UTC (rev 3775) +++ trunk/src/editor.c 2009-05-10 17:44:28 UTC (rev 3776) @@ -2371,6 +2371,37 @@ } +static gint get_multiline_comment_style(GeanyEditor *editor, gint line_start) +{ + gint lexer = SSM(editor->sci, SCI_GETLEXER, 0, 0); + gint style_comment; + + /* List only those lexers which support multi line comments */ + switch (lexer) + { + case SCLEX_XML: + case SCLEX_HTML: + { + if (is_style_php(sci_get_style_at(editor->sci, line_start))) + style_comment = SCE_HPHP_COMMENT; + else + style_comment = SCE_H_COMMENT; + break; + } + case SCLEX_HASKELL: style_comment = SCE_HA_COMMENTBLOCK; break; + case SCLEX_LUA: style_comment = SCE_LUA_COMMENT; break; + case SCLEX_CSS: style_comment = SCE_CSS_COMMENT; break; + case SCLEX_SQL: style_comment = SCE_SQL_COMMENT; break; + case SCLEX_CAML: style_comment = SCE_CAML_COMMENT; break; + case SCLEX_D: style_comment = SCE_D_COMMENT; break; + case SCLEX_PASCAL: style_comment = SCE_PAS_COMMENT; break; + default: style_comment = SCE_C_COMMENT; + } + + return style_comment; +} + + /* set toggle to TRUE if the caller is the toggle function, FALSE otherwise * returns the amount of uncommented single comment lines, in case of multi line uncomment * it returns just 1 */ @@ -2472,26 +2503,9 @@ else { gint style_comment; - gint lexer = SSM(editor->sci, SCI_GETLEXER, 0, 0); - /* process only lines which are already comments */ - switch (lexer) - { /* I will list only those lexers which support multi line comments */ - case SCLEX_XML: - case SCLEX_HTML: - { - if (is_style_php(sci_get_style_at(editor->sci, line_start))) - style_comment = SCE_HPHP_COMMENT; - else style_comment = SCE_H_COMMENT; - break; - } - case SCLEX_CSS: style_comment = SCE_CSS_COMMENT; break; - case SCLEX_SQL: style_comment = SCE_SQL_COMMENT; break; - case SCLEX_CAML: style_comment = SCE_CAML_COMMENT; break; - case SCLEX_D: style_comment = SCE_D_COMMENT; break; - case SCLEX_PASCAL: style_comment = SCE_PAS_COMMENT; break; - default: style_comment = SCE_C_COMMENT; - } + /* skip lines which are already comments */ + style_comment = get_multiline_comment_style(editor, line_start); if (sci_get_style_at(editor->sci, line_start + x) == style_comment) { real_uncomment_multiline(editor); @@ -2618,28 +2632,9 @@ else { gint style_comment; - gint lexer = SSM(editor->sci, SCI_GETLEXER, 0, 0); /* skip lines which are already comments */ - switch (lexer) - { /* I will list only those lexers which support multi line comments */ - case SCLEX_XML: - case SCLEX_HTML: - { - if (is_style_php(sci_get_style_at(editor->sci, line_start))) - style_comment = SCE_HPHP_COMMENT; - else style_comment = SCE_H_COMMENT; - break; - } - case SCLEX_CSS: style_comment = SCE_CSS_COMMENT; break; - case SCLEX_SQL: style_comment = SCE_SQL_COMMENT; break; - case SCLEX_CAML: style_comment = SCE_CAML_COMMENT; break; - case SCLEX_D: style_comment = SCE_D_COMMENT; break; - case SCLEX_RUBY: style_comment = SCE_RB_POD; break; - case SCLEX_PERL: style_comment = SCE_PL_POD; break; - case SCLEX_PASCAL: style_comment = SCE_PAS_COMMENT; break; - default: style_comment = SCE_C_COMMENT; - } + style_comment = get_multiline_comment_style(editor, line_start); if (sci_get_style_at(editor->sci, line_start + x) == style_comment) { real_uncomment_multiline(editor); @@ -2790,29 +2785,11 @@ else { gint style_comment; - gint lexer = SSM(editor->sci, SCI_GETLEXER, 0, 0); /* skip lines which are already comments */ - switch (lexer) - { /* I will list only those lexers which support multi line comments */ - /* FIXME Update the list of filetypes and move this switch into a separate - * function to avoid duplicate code. */ - case SCLEX_XML: - case SCLEX_HTML: - { - if (is_style_php(sci_get_style_at(editor->sci, line_start))) - style_comment = SCE_HPHP_COMMENT; - else style_comment = SCE_H_COMMENT; - break; - } - case SCLEX_CSS: style_comment = SCE_CSS_COMMENT; break; - case SCLEX_SQL: style_comment = SCE_SQL_COMMENT; break; - case SCLEX_CAML: style_comment = SCE_CAML_COMMENT; break; - case SCLEX_D: style_comment = SCE_D_COMMENT; break; - case SCLEX_PASCAL: style_comment = SCE_PAS_COMMENT; break; - default: style_comment = SCE_C_COMMENT; - } - if (sci_get_style_at(editor->sci, line_start + x) == style_comment) continue; + style_comment = get_multiline_comment_style(editor, line_start); + if (sci_get_style_at(editor->sci, line_start + x) == style_comment) + continue; real_comment_multiline(editor, line_start, last_line); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3775] trunk
by eht16＠users.sourceforge.net 10 May '09

10 May '09

Revision: 3775 http://geany.svn.sourceforge.net/geany/?rev=3775&view=rev Author: eht16 Date: 2009-05-10 17:44:14 +0000 (Sun, 10 May 2009) Log Message: ----------- Make the clear icon of entry fields act on the release event, not on the press event like for other buttons. Modified Paths: -------------- trunk/ChangeLog trunk/src/ui_utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-08 17:04:40 UTC (rev 3774) +++ trunk/ChangeLog 2009-05-10 17:44:14 UTC (rev 3775) @@ -1,3 +1,10 @@ +2009-05-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/ui_utils.c: + Make the clear icon of entry fields act on the release event, not + on the press event like for other buttons. + + 2009-05-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * plugins/filebrowser.c: Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2009-05-08 17:04:40 UTC (rev 3774) +++ trunk/src/ui_utils.c 2009-05-10 17:44:14 UTC (rev 3775) @@ -1293,7 +1293,8 @@ } -static void entry_clear_icon_press_cb(GtkEntry *entry, gint icon_pos, GdkEvent *event, gpointer data) +static void entry_clear_icon_release_cb(GtkEntry *entry, gint icon_pos, + GdkEvent *event, gpointer data) { if (event->button.button == 1 && icon_pos == 1) { @@ -1318,7 +1319,7 @@ if (gtk_check_version(2, 15, 2) == NULL) { g_object_set(entry, "secondary-icon-stock", "gtk-clear", NULL); - g_signal_connect(entry, "icon-press", G_CALLBACK(entry_clear_icon_press_cb), NULL); + g_signal_connect(entry, "icon-release", G_CALLBACK(entry_clear_icon_release_cb), NULL); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3774] trunk
by eht16＠users.sourceforge.net 08 May '09

08 May '09

Revision: 3774 http://geany.svn.sourceforge.net/geany/?rev=3774&view=rev Author: eht16 Date: 2009-05-08 17:04:40 +0000 (Fri, 08 May 2009) Log Message: ----------- Backport change from Scintilla CVS: Change capitalisation of header file to suit cross-compilation on Unix for Windows. Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/include/Scintilla.h trunk/scintilla/scintilla_changes.patch Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-08 17:00:28 UTC (rev 3773) +++ trunk/ChangeLog 2009-05-08 17:04:40 UTC (rev 3774) @@ -6,6 +6,10 @@ itself is also UTF-8. * src/utils.c, src/utils.h, src/highlighting.c, src/printing.c: Add utils_color_invert() and use it in highlighting.c and printing.c. + * scintilla/include/Scintilla.h, scintilla/scintilla_changes.patch: + Backport change from Scintilla CVS: + Change capitalisation of header file to suit cross-compilation on + Unix for Windows. 2009-05-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/scintilla/include/Scintilla.h =================================================================== --- trunk/scintilla/include/Scintilla.h 2009-05-08 17:00:28 UTC (rev 3773) +++ trunk/scintilla/include/Scintilla.h 2009-05-08 17:04:40 UTC (rev 3774) @@ -26,7 +26,7 @@ * hold a pointer and sptr_t, a signed integer large enough to hold a pointer. * May need to be changed for 64 bit platforms. */ #if defined(_WIN32) -#include <BaseTsd.h> +#include <basetsd.h> #endif #ifdef MAXULONG_PTR typedef ULONG_PTR uptr_t; Modified: trunk/scintilla/scintilla_changes.patch =================================================================== --- trunk/scintilla/scintilla_changes.patch 2009-05-08 17:00:28 UTC (rev 3773) +++ trunk/scintilla/scintilla_changes.patch 2009-05-08 17:04:40 UTC (rev 3774) @@ -151,6 +151,15 @@ diff -Naurp /tmp/scintilla/include/Scintilla.h scintilla/include/Scintilla.h --- /tmp/scintilla/include/Scintilla.h 2009-04-25 02:06:02.000000000 +0200 +++ scintilla/include/Scintilla.h 2009-05-01 11:51:07.000000000 +0200 +@@ -26,7 +26,7 @@ int Scintilla_LinkLexers(); + * hold a pointer and sptr_t, a signed integer large enough to hold a pointer. + * May need to be changed for 64 bit platforms. */ + #if defined(_WIN32) +-#include <BaseTsd.h> ++#include <basetsd.h> + #endif + #ifdef MAXULONG_PTR + typedef ULONG_PTR uptr_t; @@ -845,7 +845,7 @@ struct SCNotification { int ch; /* SCN_CHARADDED, SCN_KEY */ int modifiers; /* SCN_KEY */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3773] trunk
by eht16＠users.sourceforge.net 08 May '09

08 May '09

Revision: 3773 http://geany.svn.sourceforge.net/geany/?rev=3773&view=rev Author: eht16 Date: 2009-05-08 17:00:28 +0000 (Fri, 08 May 2009) Log Message: ----------- Add utils_color_invert() and use it in highlighting.c and printing.c. Modified Paths: -------------- trunk/ChangeLog trunk/src/highlighting.c trunk/src/printing.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-08 16:13:29 UTC (rev 3772) +++ trunk/ChangeLog 2009-05-08 17:00:28 UTC (rev 3773) @@ -4,6 +4,8 @@ When a filter is set, apply it only to files, not directories and apply the filter to the UTF-8 name of the file as the filter string itself is also UTF-8. + * src/utils.c, src/utils.h, src/highlighting.c, src/printing.c: + Add utils_color_invert() and use it in highlighting.c and printing.c. 2009-05-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2009-05-08 16:13:29 UTC (rev 3772) +++ trunk/src/highlighting.c 2009-05-08 17:00:28 UTC (rev 3773) @@ -291,14 +291,8 @@ static guint invert(guint icolour) { if (common_style_set.invert_all) - { - guint r, g, b; + return utils_invert_color(icolour); - r = 0xffffff - icolour; - g = 0xffffff - (icolour >> 8); - b = 0xffffff - (icolour >> 16); - return (r | (g << 8) | (b << 16)); - } return icolour; } Modified: trunk/src/printing.c =================================================================== --- trunk/src/printing.c 2009-05-08 16:13:29 UTC (rev 3772) +++ trunk/src/printing.c 2009-05-08 17:00:28 UTC (rev 3773) @@ -117,26 +117,13 @@ } -/* FIXME use the invert function in highlighting.c */ -static guint invert(guint icolour) -{ - if (interface_prefs.highlighting_invert_all) - { - guint r, g, b; - - r = 0xffffff - icolour; - g = 0xffffff - (icolour >> 8); - b = 0xffffff - (icolour >> 16); - return (r | (g << 8) | (b << 16)); - } - return icolour; -} - - /* split a RGB colour into the three colour components */ static void get_rgb_values(gint c, gint *r, gint *g, gint *b) { - c = invert(ROTATE_RGB(c)); + c = ROTATE_RGB(c); + if (interface_prefs.highlighting_invert_all) + c = utils_invert_color(c); + *r = c % 256; *g = (c & - 16711936) / 256; *b = (c & 0xff0000) / 65536; Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2009-05-08 16:13:29 UTC (rev 3772) +++ trunk/src/utils.c 2009-05-08 17:00:28 UTC (rev 3773) @@ -807,6 +807,18 @@ } +guint utils_invert_color(guint color) +{ + guint r, g, b; + + r = 0xffffff - color; + g = 0xffffff - (color >> 8); + b = 0xffffff - (color >> 16); + + return (r | (g << 8) | (b << 16)); +} + + /* Get directory from current file in the notebook. * Returns dir string that should be freed or NULL, depending on whether current file is valid. * Returned string is in UTF-8 encoding */ Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2009-05-08 16:13:29 UTC (rev 3772) +++ trunk/src/utils.h 2009-05-08 17:00:28 UTC (rev 3773) @@ -118,6 +118,8 @@ gchar *utils_get_hex_from_color(GdkColor *color); +guint utils_invert_color(guint color); + const gchar *utils_get_default_dir_utf8(void); gchar *utils_get_current_file_dir_utf8(void); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3772] trunk
by eht16＠users.sourceforge.net 08 May '09

08 May '09

Revision: 3772 http://geany.svn.sourceforge.net/geany/?rev=3772&view=rev Author: eht16 Date: 2009-05-08 16:13:29 +0000 (Fri, 08 May 2009) Log Message: ----------- When a filter is set, apply it only to files, not directories and apply the filter to the UTF-8 name of the file as the filter string itself is also UTF-8. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/filebrowser.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-04 20:40:11 UTC (rev 3771) +++ trunk/ChangeLog 2009-05-08 16:13:29 UTC (rev 3772) @@ -1,3 +1,11 @@ +2009-05-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * plugins/filebrowser.c: + When a filter is set, apply it only to files, not directories and + apply the filter to the UTF-8 name of the file as the filter string + itself is also UTF-8. + + 2009-05-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * wscript, scintilla/*, scintilla/include/*, src/plugindata.h: Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2009-05-04 20:40:11 UTC (rev 3771) +++ trunk/plugins/filebrowser.c 2009-05-08 16:13:29 UTC (rev 3772) @@ -168,13 +168,11 @@ if (! show_hidden_files && check_hidden(name)) return; - if (check_filtered(name)) - return; - sep = (utils_str_equal(current_dir, "/")) ? "" : G_DIR_SEPARATOR_S; fname = g_strconcat(current_dir, sep, name, NULL); dir = g_file_test(fname, G_FILE_TEST_IS_DIR); utf8_fullname = utils_get_locale_from_utf8(fname); + utf8_name = utils_get_utf8_from_locale(name); g_free(fname); if (dir) @@ -189,9 +187,16 @@ last_dir_iter = gtk_tree_iter_copy(&iter); } else + { + if (check_filtered(utf8_name)) + { + g_free(utf8_name); + g_free(utf8_fullname); + return; + } gtk_list_store_append(file_store, &iter); + } - utf8_name = utils_get_utf8_from_locale(name); gtk_list_store_set(file_store, &iter, FILEVIEW_COLUMN_ICON, (dir) ? GTK_STOCK_DIRECTORY : GTK_STOCK_FILE, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3771] trunk/po
by frlan＠users.sourceforge.net 04 May '09

04 May '09

Revision: 3771 http://geany.svn.sourceforge.net/geany/?rev=3771&view=rev Author: frlan Date: 2009-05-04 20:40:11 +0000 (Mon, 04 May 2009) Log Message: ----------- Update of Italian translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/it.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2009-05-03 18:13:34 UTC (rev 3770) +++ trunk/po/ChangeLog 2009-05-04 20:40:11 UTC (rev 3771) @@ -1,3 +1,8 @@ +2009-05-04 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * it.po: Update of Italian translation (Thanks M. Baldinelli). + + 2009-05-02 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * New release: Geany 0.17 "Wessex". Modified: trunk/po/it.po =================================================================== --- trunk/po/it.po 2009-05-03 18:13:34 UTC (rev 3770) +++ trunk/po/it.po 2009-05-04 20:40:11 UTC (rev 3771) @@ -1,17 +1,17 @@ # Italian translations for geany package # Traduzioni italiane per il pacchetto geany.. -# Copyright (C) 2006 THE geany'S COPYRIGHT HOLDER +# Copyright (C) 2006-2009 THE geany'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany package. # <dario.santomarco(a)gmail.com>, 2006. -# <M.Baldinelli(a)agora.it>, 2006, 2007, 2008 +# <M.Baldinelli(a)agora.it>, 2006 - 2009 # msgid "" msgstr "" -"Project-Id-Version: Geany 0.16\n" +"Project-Id-Version: Geany 0.17\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" -"PO-Revision-Date: 2008-10-19 22:13+0100\n" -"Last-Translator: Max Baldinelli <M.Baldinelli(a)agora.it>\n" +"POT-Creation-Date: 2009-05-04 22:38+0200\n" +"PO-Revision-Date: 2009-05-04 21:37+0100\n" +"Last-Translator: Max <firebeam(a)usenet.eu.org>\n" "Language-Team: <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -274,7 +274,6 @@ msgstr "Esecuzione:" #: ../src/build.c:1901 ../src/toolbar.c:194 -#, fuzzy msgid "Build the current file" msgstr "Compila il file corrente" @@ -290,19 +289,16 @@ "comando «make»." #: ../src/build.c:1976 -#, fuzzy msgid "Build the current file with Make and the default target" -msgstr "Compila il file corrente tramite make verso destinazione predefinita" +msgstr "Compila il file corrente con Make verso destinazione predefinita" #: ../src/build.c:1979 -#, fuzzy msgid "Build the current file with Make and the specified target" -msgstr "Compila il file corrente tramite make la destinazione specificata" +msgstr "Compila il file corrente con Make la destinazione specificata" #: ../src/build.c:1982 -#, fuzzy msgid "Compile the current file with Make" -msgstr "Compila il file corrente" +msgstr "Compila il file corrente con Make" #: ../src/build.c:2044 msgid "Failed to execute the view program" @@ -321,8 +317,8 @@ msgid "Do you really want to quit?" msgstr "Si vuole veramente uscire?" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2902 ../src/interface.c:340 +#: ../src/treeviews.c:554 msgid "_Reload" msgstr "_Ripristina" @@ -335,54 +331,54 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Si è sicuri di voler ripristinare '%s'?" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:367 msgid "Go to Line" msgstr "Vai alla riga" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Inserire la riga a cui si vuole andare:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Impostare il tipo di file per il file corrente prima di usare questa " "funzione." -#: ../src/callbacks.c:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "gg.mm.aaaa" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "mm.gg.aaaa" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "aaaa/mm/gg" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "gg.mm.aaaa hh:mm:ss" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.gg.aaaa hh:mm:ss" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "aaaa/mm/gg hh:mm:ss" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "_Usa il formato di data personalizzato" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Formato di data personalizzato" -#: ../src/callbacks.c:1495 +#: ../src/callbacks.c:1498 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -391,7 +387,7 @@ "gli specificatori di conversione che è possibile usare nella funzione ANSI C " "strftime." -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 msgid "Date format string could not be converted (possibly too long)." msgstr "" "Impossibile convertire la stringa di formato della data (forse è troppo " @@ -427,9 +423,8 @@ msgstr "Individua dal file" #: ../src/dialogs.c:259 -#, fuzzy msgid "_More Options" -msgstr "Opzioni" +msgstr "_Altre opzioni" #. line 1 with checkbox and encoding combo #: ../src/dialogs.c:266 @@ -480,7 +475,6 @@ msgstr "_Rinomina" #: ../src/dialogs.c:421 -#, fuzzy msgid "Save the file and rename it" msgstr "Salva il file e lo rinomina." @@ -489,7 +483,6 @@ msgstr "_Apre il file in una nuova scheda" #: ../src/dialogs.c:431 -#, fuzzy msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -524,7 +517,7 @@ #: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 #: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 +#: ../src/symbols.c:1668 ../src/symbols.c:1689 ../src/symbols.c:1741 #: ../src/ui_utils.c:222 msgid "unknown" msgstr "sconosciuto" @@ -622,22 +615,22 @@ msgid "Other:" msgstr "Altri:" -#: ../src/document.c:674 +#: ../src/document.c:678 #, c-format msgid "File %s closed." msgstr "File %s chiuso." -#: ../src/document.c:791 +#: ../src/document.c:795 #, c-format msgid "New file \"%s\" opened." msgstr "Nuovo file \"%s\" aperto." -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:968 ../src/document.c:1474 #, c-format msgid "Could not open file %s (%s)" msgstr "Impossibile aprire il file %s (%s)" -#: ../src/document.c:994 +#: ../src/document.c:998 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -652,12 +645,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:1024 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Il file \"%s\" non è %s valido." -#: ../src/document.c:1030 +#: ../src/document.c:1034 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -668,49 +661,48 @@ # NdMax: # "Spazio dei nomi" che contiene classi e funzioni, per esempio System.IO oppure System.Windows.Forms del C#. Si puo' lasciare com'e' levando il plurale dato che in italiano le parole straniere diventano invarianti. -#: ../src/document.c:1168 +#: ../src/document.c:1172 msgid "Spaces" msgstr "Spazi" -#: ../src/document.c:1171 +#: ../src/document.c:1175 msgid "Tabs" msgstr "Tabulazioni" -#: ../src/document.c:1174 +#: ../src/document.c:1178 msgid "Tabs and Spaces" msgstr "Tabulazioni e spazi" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1179 +#: ../src/document.c:1183 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Impostati %s come modalità rientro automatico per %s." -#: ../src/document.c:1232 +#: ../src/document.c:1236 msgid "Invalid filename" msgstr "Nome del file non valido" -#: ../src/document.c:1352 +#: ../src/document.c:1356 #, c-format msgid "File %s reloaded." msgstr "File %s ricaricato." -#: ../src/document.c:1354 +#: ../src/document.c:1358 #, c-format msgid "File %s opened(%d%s)." msgstr "File %s aperto(%d%s)." -#: ../src/document.c:1356 +#: ../src/document.c:1360 msgid ", read-only" msgstr ", sola lettura" -#: ../src/document.c:1561 -#, fuzzy +#: ../src/document.c:1565 msgid "Error renaming file." msgstr "Errore nel salvataggio del file." -#: ../src/document.c:1636 +#: ../src/document.c:1640 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -719,7 +711,7 @@ "Si è verificato un errore nella conversione del file da UTF-8 a \"%s\". Il " "file resta non salvato." -#: ../src/document.c:1658 +#: ../src/document.c:1662 #, c-format msgid "" "Error message: %s\n" @@ -728,52 +720,52 @@ "Messaggio di errore: %s\n" "Errore verificatosi in corrispondenza di: \"%s\" (linea: %d, colonna: %d)." -#: ../src/document.c:1663 +#: ../src/document.c:1667 #, c-format msgid "Error message: %s." msgstr "Messaggio di errore: %s." -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1767 ../src/document.c:1827 msgid "Error saving file." msgstr "Errore nel salvataggio del file." -#: ../src/document.c:1822 +#: ../src/document.c:1826 #, c-format msgid "Error saving file (%s)." msgstr "Errore nel salvataggio del file (%s)." -#: ../src/document.c:1847 +#: ../src/document.c:1851 #, c-format msgid "File %s saved." msgstr "File %s salvato." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1917 ../src/document.c:1974 ../src/document.c:1982 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" non trovato." -#: ../src/document.c:1978 +#: ../src/document.c:1982 msgid "Wrap search and find again?" msgstr "Ricominciare la ricerca dall'inizio?" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 +#: ../src/document.c:2061 ../src/search.c:1065 ../src/search.c:1669 #: ../src/search.c:1670 #, c-format msgid "No matches found for \"%s\"." msgstr "Nessuna corrispondenza trovata per \"%s\"." -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../src/document.c:2072 ../src/document.c:2081 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: sostituita %d occorrenza di \"%s\" con \"%s\"." msgstr[1] "%s: sostituite %d occorrenze di \"%s\" con \"%s\"." -#: ../src/document.c:2899 +#: ../src/document.c:2903 msgid "Do you want to reload it?" msgstr "Ricaricare il file?" -#: ../src/document.c:2900 +#: ../src/document.c:2904 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -782,32 +774,32 @@ "Il file '%s' presente sul disco è più recente della\n" "copia che si sta editando." -#: ../src/document.c:2921 +#: ../src/document.c:2925 msgid "Try to resave the file?" msgstr "Provare di nuovo a salvare il file?" -#: ../src/document.c:2922 +#: ../src/document.c:2926 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "File \"%s\" non trovato." -#: ../src/editor.c:3852 ../src/utils.c:295 +#: ../src/editor.c:3875 ../src/utils.c:295 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/editor.c:3853 ../src/utils.c:296 +#: ../src/editor.c:3876 ../src/utils.c:296 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/editor.c:3854 ../src/utils.c:297 +#: ../src/editor.c:3877 ../src/utils.c:297 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/editor.c:3978 +#: ../src/editor.c:4001 msgid "Enter Tab Width" msgstr "Ampiezza delle tabulazioni:" -#: ../src/editor.c:3979 +#: ../src/editor.c:4002 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" "Indicare il numero di spazi da sostituire con un carattere di tabulazione." @@ -1029,7 +1021,7 @@ msgid "All Source" msgstr "Tutti i file sorgente" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1309 ../src/project.c:292 msgid "All files" msgstr "Tutti i file" @@ -1132,9 +1124,8 @@ msgstr "_Diminuisci Rientro" #: ../src/interface.c:526 ../src/interface.c:1995 -#, fuzzy msgid "_Send Selection to Terminal" -msgstr "_Invia selezione a" +msgstr "_Invia la selezione al terminale." #: ../src/interface.c:530 ../src/interface.c:1999 msgid "_Send Selection to" @@ -1177,9 +1168,8 @@ msgstr "I_nserisci \"include <...>\"" #: ../src/interface.c:613 -#, fuzzy msgid "Preference_s" -msgstr "Preferenze" +msgstr "Preferen_ze" #: ../src/interface.c:621 msgid "_Search" @@ -1258,19 +1248,16 @@ msgstr "Mostra i numeri di _riga" #: ../src/interface.c:751 -#, fuzzy msgid "Show _White Space" -msgstr "Mostra gli spazi bianchi" +msgstr "Mostra gli spazi _bianchi" #: ../src/interface.c:755 -#, fuzzy msgid "Show Line _Endings" -msgstr "Mostra i fine riga" +msgstr "Mostra i _fine riga" #: ../src/interface.c:759 -#, fuzzy msgid "Show _Indentation Guides" -msgstr "Mostra guide di rientro" +msgstr "Mostra guide di _rientro" #: ../src/interface.c:780 msgid "_Document" @@ -1380,9 +1367,8 @@ msgstr "_Apri" #: ../src/interface.c:955 -#, fuzzy msgid "_Recent Projects" -msgstr "Apri progetto" +msgstr "Progetti _recenti" #: ../src/interface.c:959 msgid "_Close" @@ -1474,9 +1460,8 @@ msgstr "Icone _piccole" #: ../src/interface.c:1760 ../src/interface.c:3306 -#, fuzzy msgid "_Very Small Icons" -msgstr "Icone _piccole" +msgstr "Icone _molto piccole" #: ../src/interface.c:1770 msgid "_Hide toolbar" @@ -1519,7 +1504,6 @@ msgstr "Carica l'emulatore del terminale virtuale" #: ../src/interface.c:2690 -#, fuzzy msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1549,7 +1533,6 @@ msgstr "Conferma l'uscita" #: ../src/interface.c:2723 -#, fuzzy msgid "Shows a confirmation dialog on exit" msgstr "Mostra un dialogo di conferma all'uscita." @@ -1578,9 +1561,8 @@ msgstr "Percorso iniziale all'apertura dei file di progetto" #: ../src/interface.c:2796 -#, fuzzy msgid "Extra plugin path:" -msgstr "Abilita il supporto dei plugin" +msgstr "Percorso aggiuntivo dei plugin:" #: ../src/interface.c:2808 msgid "" @@ -1588,22 +1570,24 @@ "configuration directory. The path entered here will be searched additionally " "for plugins. Leave blank to disable." msgstr "" +"Come impostazione predefinita Geany cerca nel percorso globale " +"dell'installazione e nella directory della configurazione. In aggiunta, nel " +"percorso inserito qui si cercheranno i plugin. Per disabilitare, lasciare " +"vuoto." #: ../src/interface.c:2821 msgid "Paths" msgstr "Percorsi dei programmi" #: ../src/interface.c:2826 -#, fuzzy msgid "Startup" -msgstr "Stato" +msgstr "Avvio" #: ../src/interface.c:2848 msgid "Beep on errors or when compilation has finished" msgstr "Emette un suono in caso di errori o al termine della compilazione" #: ../src/interface.c:2851 -#, fuzzy msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1616,13 +1600,12 @@ msgstr "Passa alla lista dei messaggi di stato in caso di nuovo messaggio" #: ../src/interface.c:2856 -#, fuzzy msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" msgstr "" "Passa alla scheda dei messaggi di stato (nella finestra del blocco note in " -"basso) se un nuovo messaggio di stato arriva." +"basso) in caso di arrivo di un nuovo messaggio di stato." #: ../src/interface.c:2858 msgid "Suppress status messages in the status bar" @@ -1660,7 +1643,6 @@ msgstr "Ricomincia sempre la ricerca dall'inizio e nascondi la finestra Trova" #: ../src/interface.c:2891 -#, fuzzy msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1673,7 +1655,6 @@ msgstr "Usa la parola in corrispondenza del cursore per il dialogo Trova" #: ../src/interface.c:2896 -#, fuzzy msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1694,20 +1675,18 @@ msgstr "Usa file di sessione per progetto" #: ../src/interface.c:2924 -#, fuzzy msgid "" "Whether to store a project's session files and open them when re-opening the " "project" msgstr "" -"Per salvare i file della sessione del progetto ed aprirli alla riapertura " -"del progetto." +"Per salvare i file della sessione del progetto e aprirli alla riapertura del " +"progetto." #: ../src/interface.c:2926 msgid "Store project file inside the project base directory" msgstr "Salvare il file di progetto nel percorso base del progetto" #: ../src/interface.c:2929 -#, fuzzy msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1724,9 +1703,8 @@ msgstr "Progetti" #: ../src/interface.c:2936 -#, fuzzy msgid "Miscellaneous" -msgstr "Varie" +msgstr "Varie" #: ../src/interface.c:2940 msgid "General" @@ -1789,7 +1767,6 @@ msgstr "Mostra il pulsante Chiudi" #: ../src/interface.c:3064 -#, fuzzy msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1823,12 +1800,10 @@ "Le nuove linguette file saranno posizionate alla destra della lista schede" #: ../src/interface.c:3090 -#, fuzzy msgid "Double-clicking hides all additional widgets" -msgstr "Mostra/nascondi tutti i controlli aggiuntivi" +msgstr "Doppio click per nascondere tutti i controlli aggiuntivi" #: ../src/interface.c:3093 -#, fuzzy msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Mostra/nascondi tutti i controlli aggiuntivi" @@ -1857,26 +1832,26 @@ msgstr "Mostra barra di stato" #: ../src/interface.c:3192 -#, fuzzy msgid "Whether to show the status bar at the bottom of the main window" -msgstr "Mostrare la barra di stato nella finestra principale in basso." +msgstr "Mostra/Nasconde la barra di stato nella finestra principale in basso." #: ../src/interface.c:3199 msgid "Interface" msgstr "Interfaccia" #: ../src/interface.c:3222 -#, fuzzy msgid "Show T_oolbar" -msgstr "Mostra barra degli strumenti" +msgstr "Mostra barra degli _strumenti" #: ../src/interface.c:3226 msgid "_Append Toolbar to the Menu" -msgstr "" +msgstr "_Appendi al Menù la barra degli strumenti" #: ../src/interface.c:3229 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" +"Include la barra degli strumenti nel menù principale per risparmiare spazio " +"in senso verticale." #: ../src/interface.c:3231 msgid "Toolbar" @@ -1936,7 +1911,6 @@ msgstr "Disabilita il drag and drop" #: ../src/interface.c:3359 -#, fuzzy msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" @@ -1958,7 +1932,6 @@ msgstr "Comprimi/Espandi tutti i figli di un punto di contrazione" #: ../src/interface.c:3369 -#, fuzzy msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -1972,7 +1945,6 @@ msgstr "Usa indicatori per evidenziare errori di compilazione" #: ../src/interface.c:3374 -#, fuzzy msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -1985,7 +1957,6 @@ msgstr "L'andata a capo elimina gli spazi in coda" #: ../src/interface.c:3379 -#, fuzzy msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Abilita l'eliminazione degli spazi in coda alla riga precedente." @@ -1998,7 +1969,6 @@ msgstr "Marcatore di selezione del commento:" #: ../src/interface.c:3406 -#, fuzzy msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -2068,7 +2038,6 @@ "documento" #: ../src/interface.c:3543 ../src/interface.c:5091 -#, fuzzy msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -2081,7 +2050,6 @@ msgstr "Indentazione di riga intelligente" #: ../src/interface.c:3548 -#, fuzzy msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" @@ -2093,16 +2061,14 @@ msgstr "Indentazione" #: ../src/interface.c:3555 ../src/interface.c:5093 -#, fuzzy msgid "Indentation" -msgstr "Indentazione" +msgstr "Indentazione" #: ../src/interface.c:3578 msgid "Snippet completion" msgstr "Completamento del costrutto" #: ../src/interface.c:3581 -#, fuzzy msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2124,7 +2090,6 @@ msgstr "Continuazione automatica di commenti multiriga" #: ../src/interface.c:3591 -#, fuzzy msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2157,7 +2122,6 @@ msgstr "Caratteri da digitare per il completamento:" #: ../src/interface.c:3631 -#, fuzzy msgid "" "The amount of characters which are necessary to show the symbol auto " "completion list" @@ -2166,12 +2130,10 @@ "completamento automatico." #: ../src/interface.c:3640 -#, fuzzy msgid "Display height in rows for the auto completion list" msgstr "Numero di righe da mostrare nella lista di completamento automatico." #: ../src/interface.c:3649 -#, fuzzy msgid "Maximum number of entries to display in the auto completion list" msgstr "" "Massimo numero di righe da mostrare nella lista di completamento automatico." @@ -2182,47 +2144,56 @@ #: ../src/interface.c:3672 msgid "Parenthesis ( )" -msgstr "" +msgstr "Parentesi tonde ( )" #: ../src/interface.c:3677 msgid "Auto-close parenthesis when typing an opening one" msgstr "" +"Chiude automaticamente la parentesi tonda quando si digita quella di " +"apertura." #: ../src/interface.c:3679 msgid "Single quotes ' '" -msgstr "" +msgstr "Apici singoli ' '" #: ../src/interface.c:3684 msgid "Auto-close simple quote when typing an opening one" msgstr "" +"Chiude automaticamente l'apice singolo quando si digita quello di apertura." #: ../src/interface.c:3686 msgid "Curly brackets { }" -msgstr "" +msgstr "Parentesi graffe { }" #: ../src/interface.c:3691 msgid "Auto-close curly bracket when typing an opening one" msgstr "" +"Chiude automaticamente la parentesi graffa quando si digita quella di " +"apertura." #: ../src/interface.c:3693 msgid "Square brackets [ ]" -msgstr "" +msgstr "Parentesi quadre [ ]" #: ../src/interface.c:3698 msgid "Auto-close square-bracket when typing an opening one" msgstr "" +"Chiude automaticamente la parentesi quadra quando si digita quella di " +"apertura." #: ../src/interface.c:3700 msgid "Double quotes \" \"" -msgstr "" +msgstr "Virgolette doppie \" \"" #: ../src/interface.c:3705 msgid "Auto-close double quote when typing an opening one" msgstr "" +"Chiude automaticamente le virgolette doppie quando si digitano quelle di " +"apertura." #: ../src/interface.c:3707 msgid "Auto-close quotes and brackets" -msgstr "" +msgstr "Chiusura automatica di virgolette e parentesi" #: ../src/interface.c:3712 msgid "Completions" @@ -2237,13 +2208,14 @@ "Use white text on a black background and invert all colors, this option " "requires a restart of Geany" msgstr "" +"Mostra testo bianco su sfondo nero e inverte tutti i colori, questa opzione " +"richiede il riavvio di Geany." #: ../src/interface.c:3740 msgid "Show indentation guides" msgstr "Mostra guide di rientro" #: ../src/interface.c:3743 -#, fuzzy msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Mostra sottili linee punteggiate per aiutare ad usare i rientri corretti." @@ -2253,7 +2225,6 @@ msgstr "Mostra gli spazi bianchi" #: ../src/interface.c:3748 -#, fuzzy msgid "Marks spaces with dots and tabs with arrows" msgstr "Marca gli spazi con punti e le tabulazioni con frecce." @@ -2262,27 +2233,22 @@ msgstr "Mostra i fine riga" #: ../src/interface.c:3753 -#, fuzzy msgid "Shows the line ending character" msgstr "Mostra il carattere di fine riga" #: ../src/interface.c:3755 -#, fuzzy msgid "Show line numbers" -msgstr "Mostra i numeri di _riga" +msgstr "Mostra i numeri di riga" #: ../src/interface.c:3758 -#, fuzzy msgid "Shows or hides the Line Number margin" msgstr "Mostra/nasconde il margine dei numeri di riga." #: ../src/interface.c:3760 -#, fuzzy msgid "Show markers margin" -msgstr "Mostra il margine per i _marcatori" +msgstr "Mostra il margine per i marcatori" #: ../src/interface.c:3763 -#, fuzzy msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2295,7 +2261,6 @@ msgstr "Ferma lo scorrimento all'ultima riga" #: ../src/interface.c:3768 -#, fuzzy msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" "Indica se fermare lo scorrimento una pagina dopo l'ultima riga di un " @@ -2323,7 +2288,6 @@ msgstr "Scelta colori" #: ../src/interface.c:3826 -#, fuzzy msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2339,7 +2303,6 @@ msgstr "Linea" #: ../src/interface.c:3839 -#, fuzzy msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2352,7 +2315,6 @@ msgstr "Sfondo" #: ../src/interface.c:3846 -#, fuzzy msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " @@ -2379,7 +2341,6 @@ msgstr "Apre nuovi documenti dalla linea di comando" #: ../src/interface.c:3895 -#, fuzzy msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" "Crea un nuovo file per ogni nome file da riga di comando che non esiste." @@ -2393,7 +2354,6 @@ msgstr "File nuovi" #: ../src/interface.c:3942 -#, fuzzy msgid "Sets the default encoding for newly created files" msgstr "Imposta la codifica predefinita per i file appena creati." @@ -2406,7 +2366,6 @@ msgstr "Codifica predefinita (file esistenti):" #: ../src/interface.c:3967 -#, fuzzy msgid "Sets the default encoding for opening existing files" msgstr "Imposta la codifica predefinita per l'apertura di file esistenti." @@ -2415,7 +2374,6 @@ msgstr "Usa codifica prefissata per aprire i file" #: ../src/interface.c:3978 -#, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " "opening files and opens the file with the specified encoding (usually not " @@ -2450,7 +2408,6 @@ msgstr "Sostituisce le tabulazioni con gli spazi" #: ../src/interface.c:4012 -#, fuzzy msgid "Replaces all tabs in document by spaces" msgstr "Sostituisce tutte le tabulazioni del documento con spazi." @@ -2463,7 +2420,6 @@ msgstr "Lunghezza della lista file recenti:" #: ../src/interface.c:4053 -#, fuzzy msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Specifica il numero di file memorizzati nella lista File recenti." @@ -2479,7 +2435,7 @@ "Frequenza di controllo per i cambiamenti a documenti su disco. Il valore " "zero disabilita il controllo." -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1019 msgid "Files" msgstr "File" @@ -2647,7 +2603,7 @@ msgstr "Comando:" #: ../src/interface.c:4480 -#, fuzzy, c-format +#, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "Percorso del comando di stampa file (usare %f per il nome del file)." @@ -2655,55 +2611,51 @@ msgid "Use an external command for printing" msgstr "Usa un comando esterno per stampare" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4510 ../src/printing.c:361 msgid "Print line numbers" msgstr "Stampa i numeri di riga" -#: ../src/interface.c:4513 ../src/printing.c:347 -#, fuzzy +#: ../src/interface.c:4513 ../src/printing.c:363 msgid "Add line numbers to the printed page" msgstr "Aggiunge i numeri di riga alla pagina stampata." -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4515 ../src/printing.c:366 msgid "Print page numbers" msgstr "Stampa i numeri di pagina" -#: ../src/interface.c:4518 ../src/printing.c:352 -#, fuzzy +#: ../src/interface.c:4518 ../src/printing.c:368 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" "Aggiungi i numeri di pagina al piede di ogni pagina. Occupa 2 righe della " "pagina." -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4520 ../src/printing.c:371 msgid "Print page header" msgstr "Stampa l'intestazione della pagina" -#: ../src/interface.c:4523 ../src/printing.c:357 -#, fuzzy +#: ../src/interface.c:4523 ../src/printing.c:373 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." msgstr "" "Aggiunge una piccola intestazione a ogni pagina contenente il numero della " -"pagina, il nome del file e la data corrente (vedere sotto. Occupa 3 righe " +"pagina, il nome del file e la data corrente (vedere sotto). Occupa 3 righe " "della pagina." -#: ../src/interface.c:4540 ../src/printing.c:373 +#: ../src/interface.c:4540 ../src/printing.c:389 msgid "Use the basename of the printed file" msgstr "Usa il nome base del file stampato" #: ../src/interface.c:4543 -#, fuzzy msgid "Print only the basename (without the path) of the printed file" msgstr "Stampa solo il nome base (senza il percorso) del file stampato." -#: ../src/interface.c:4549 ../src/printing.c:381 +#: ../src/interface.c:4549 ../src/printing.c:397 msgid "Date format:" msgstr "Formato di data:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../src/interface.c:4556 ../src/printing.c:403 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2725,7 +2677,7 @@ msgid "Project Properties" msgstr "Proprietà del progetto" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:196 ../src/plugins.c:1106 msgid "File" msgstr "File" @@ -2769,7 +2721,7 @@ msgid "Reload file" msgstr "Ricarica file" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:222 ../src/project.c:495 msgid "Project" msgstr "Progetto" @@ -2815,7 +2767,7 @@ #: ../src/keybindings.c:250 msgid "Move cursor in snippet" -msgstr "" +msgstr "Sposta il cursore nel frammento." #: ../src/keybindings.c:252 msgid "Suppress snippet completion" @@ -2934,9 +2886,8 @@ msgstr "Invia al comando personalizzato n. 3" #: ../src/keybindings.c:317 -#, fuzzy msgid "Send Selection to Terminal" -msgstr "_Invia selezione a" +msgstr "Invia la selezione al terminale." #: ../src/keybindings.c:319 msgid "Insert" @@ -3230,18 +3181,17 @@ msgid "The following keyboard shortcuts are configurable:" msgstr "Sono definite le seguenti scorciatoie da tastiera:" -#: ../src/keybindings.c:1530 -#, fuzzy +#: ../src/keybindings.c:1531 msgid "Switch to Document" -msgstr "Passa al documento di sinistra" +msgstr "Passa al documento" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:809 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "E' possibile scrivere qualunque cosa, questa è una bacheca per bozze e " "appunti" -#: ../src/keyfile.c:1001 +#: ../src/keyfile.c:1009 msgid "Failed to load one or more session files." msgstr "Caricamento di uno o più file della sessione non riuscito." @@ -3263,7 +3213,7 @@ #: ../src/main.c:126 ../src/main.c:146 msgid "Be verbose" -msgstr "" +msgstr "Messaggi verbosi" #: ../src/main.c:127 msgid "Print internal filetype names" @@ -3275,7 +3225,7 @@ #: ../src/main.c:129 msgid "Don't preprocess C/C++ files when generating tags" -msgstr "" +msgstr "Non preprocessare i file C/C++ quando si generano i tag." #: ../src/main.c:132 msgid "Don't open files in a running instance, force opening a new instance" @@ -3321,40 +3271,45 @@ msgid "Show version and exit" msgstr "Mostra le informazioni sulla versione ed esce" -#: ../src/main.c:509 +#: ../src/main.c:510 msgid "[FILES...]" msgstr "[FILE...]" -#: ../src/main.c:526 +#: ../src/main.c:527 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(compilato il %s con GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:631 +#: ../src/main.c:632 msgid "Move it now?" -msgstr "" +msgstr "Spostare ora?" -#: ../src/main.c:633 +#: ../src/main.c:634 msgid "Geany needs to move your old configuration directory before starting." msgstr "" +"Geany deve spostare la vecchia directory di configurazione prima dell'avvio." -#: ../src/main.c:639 +#: ../src/main.c:640 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" "\"." msgstr "" +"La directory di configurazione è stata spostata correttamente da \"%s\" a \"%" +"s\"." #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../src/main.c:650 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " "Please move manually the directory to the new location." msgstr "" +"Impossibile spostare la vecchia directory di configurazione \"%s\" in \"%s" +"\" (%s). Spostare manualmente la directory nella nuova posizione." -#: ../src/main.c:730 +#: ../src/main.c:731 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3366,22 +3321,22 @@ "configurazione.\n" "Avviare ugualmente Geany?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../src/main.c:817 ../src/socket.c:164 #, c-format msgid "Could not find file '%s'." msgstr "Impossibile trovare il file '%s'." -#: ../src/main.c:1037 +#: ../src/main.c:1039 #, c-format msgid "This is Geany %s." msgstr "Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:1041 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Impossibile creare la cartella di configurazione (%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1280 msgid "Configuration files reloaded." msgstr "File di configurazione ricaricato." @@ -3397,7 +3352,7 @@ msgid "_Hide Message Window" msgstr "_Nascondi la finestra dei messaggi" -#: ../src/plugins.c:442 +#: ../src/plugins.c:436 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3406,11 +3361,11 @@ "Il plugin \"%s\" non è compatibile con questa versione di Geany e dev'essere " "ricompilato." -#: ../src/plugins.c:882 +#: ../src/plugins.c:876 msgid "_Plugin Manager" msgstr "Gestione _Plugin" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1024 #, c-format msgid "" "Plugin: %s %s\n" @@ -3421,23 +3376,23 @@ "Descrizione: %s\n" "Autore(i): %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1094 msgid "Active" msgstr "Attivo" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1100 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1124 msgid "No plugins available." msgstr "Nessun plugin disponibile." -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1237 msgid "Plugins" msgstr "Plugin" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1257 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3445,7 +3400,7 @@ "Qui sotto è presente una lista di plugin disponibili. Selezionare i plugin " "da caricare all'avvio di Geany." -#: ../src/plugins.c:1276 +#: ../src/plugins.c:1270 msgid "Plugin details:" msgstr "Dettagli del plugin" @@ -3534,6 +3489,9 @@ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." "xml'. Please see the documentation for details." msgstr "" +"Avvertenza: per personalizzare gli elementi della barra degli strumenti, " +"modificare il file 'ui_toolbar.xml'. Vedere la documentazione per i dettagli." +"" #. page Editor->Indentation #: ../src/prefs.c:1481 @@ -3541,23 +3499,24 @@ "Warning: these settings are overridden by the current project. See " "Project->Properties." msgstr "" +"Attenzione: queste impostazioni sono ridefinite dal progetto corrente. " +"Vedere Progetto->Proprietà." # I file hanno tre date: # ultimo accesso = ultima volta che si è letto/scritto i dati contenuti nel file # ultimo editing = l'ultima volta che sono stati cambiati i dati nel file # ultima modifica = l'ultima volta che si è cambiato l'inode del file (rinomina, etc) # Mi è sembrato più corretto rinominarli in questo modo. -#: ../src/printing.c:270 +#: ../src/printing.c:286 #, c-format msgid "Page %d of %d" msgstr "Pagina %d di %d" -#: ../src/printing.c:340 +#: ../src/printing.c:356 msgid "Document Setup" msgstr "Impostazione del documento" -#: ../src/printing.c:375 -#, fuzzy +#: ../src/printing.c:391 msgid "Print only the basename(without the path) of the printed file" msgstr "Stampa solo il nome base (senza il percorso) del file stampato." @@ -3566,32 +3525,31 @@ # ultimo editing = l'ultima volta che sono stati cambiati i dati nel file # ultima modifica = l'ultima volta che si è cambiato l'inode del file (rinomina, etc) # Mi è sembrato più corretto rinominarli in questo modo. -#: ../src/printing.c:491 -#, fuzzy, c-format +#: ../src/printing.c:507 +#, c-format msgid "Page %d of %d" -msgstr "Pagina %d di %d" +msgstr "Pagina %d di %d" -#: ../src/printing.c:741 +#: ../src/printing.c:757 #, c-format msgid "Printing of file %s was cancelled." msgstr "Stampa del file \"%s\" cancellata." -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:759 ../src/printing.c:878 #, c-format msgid "File %s printed." msgstr "File %s stampato." -#: ../src/printing.c:792 +#: ../src/printing.c:808 #, c-format msgid "Printing of %s failed (%s)." msgstr "Stampa del file \"%s\" fallita (%s)." -#: ../src/printing.c:832 -#, fuzzy +#: ../src/printing.c:848 msgid "Please set a print command in the preferences dialog first." -msgstr "Definire prima un comando di stampa nella finestra delle preferenze" +msgstr "Definire prima un comando di stampa nella finestra delle preferenze." -#: ../src/printing.c:840 +#: ../src/printing.c:856 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3602,7 +3560,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:872 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Stampa del file \"%s\" fallita (codice errore: %s)" @@ -3621,19 +3579,19 @@ msgid "C_reate" msgstr "C_rea" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Nome:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Nome del file:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Percorso base:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../src/project.c:171 ../src/project.c:438 msgid "" "Base directory of all files that make up the project. This can be a new " "path, or an existing directory tree. You can use paths relative to the " @@ -3643,41 +3601,41 @@ "nuovo percorso, o una cartella esistente. Si possono usare percorsi relativi " "al nome file del progetto." -#: ../src/project.c:174 ../src/project.c:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Scegliere il percorso base del progetto" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Impossibile caricare il file del progetto \"%s\"." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Apri progetto" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "File di progetto" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "Progetto \"%s\" chiuso." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Descrizione:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "Compila nel percorso base" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Esegui comando:" -#: ../src/project.c:457 +#: ../src/project.c:461 msgid "" "Command-line to run in the project base directory. Options can be appended " "to the command. Leave blank to use the default run command." @@ -3685,72 +3643,72 @@ "Comando da eseguire nella directory base del progetto. È possibile passare " "delle opzioni al comando. Lasciare vuoto per usare il comando predefinito." -#: ../src/project.c:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Modelli dei nomi di file:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "Si desidera chiudere prima di continuare?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "Il progetto '%s' è già aperto." -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "Il nome di progetto specificato è troppo corto." -#: ../src/project.c:625 +#: ../src/project.c:629 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Il nome di progetto specificato è troppo lungo (max. %d caratteri)." -#: ../src/project.c:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "È stato specificato un nome di progetto non valido." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Creare il percorso base del progetto?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "Il percorso \"%s\" non esiste." -#: ../src/project.c:666 +#: ../src/project.c:670 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Impossibile creare il percorso base del progetto (%s)." -#: ../src/project.c:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "Impossibile salvare il file del progetto (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "Progetto \"%s\" creato." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "Progetto \"%s\" salvato." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Scegliere il nome del file di progetto" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "Scegliere il comando di esecuzione del progetto" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "Progetto \"%s\" aperto." @@ -3777,7 +3735,6 @@ msgstr "Usa sequenze di _escape" #: ../src/search.c:231 -#, fuzzy msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3819,7 +3776,6 @@ msgstr "_Marca" #: ../src/search.c:418 -#, fuzzy msgid "Mark all matches in the current document" msgstr "Marca tutte le corrispondenze nel documento corrente." @@ -3837,7 +3793,6 @@ msgstr "Chiudi _dialogo" #: ../src/search.c:439 ../src/search.c:603 -#, fuzzy msgid "Disable this option to keep the dialog open" msgstr "Disabilita questa opzione per mantenere aperta la finestra." @@ -3867,7 +3822,6 @@ msgstr "_Cartella:" #: ../src/search.c:712 -#, fuzzy msgid "E_ncoding:" msgstr "Imposta _codifica:" @@ -3881,7 +3835,6 @@ msgstr "Espressioni regolari di _grep" #: ../src/search.c:749 ../src/search.c:757 -#, fuzzy msgid "See grep's manual page for more information" msgstr "Per maggiori informazioni consultare la pagina di manuale di grep." @@ -3899,7 +3852,6 @@ msgstr "_Inverti il senso di ricerca" #: ../src/search.c:782 -#, fuzzy msgid "Invert the sense of matching, to select non-matching lines" msgstr "Inverte il senso della ricerca e mostra le righe senza occorrenze." @@ -3941,9 +3893,8 @@ "Preferenze." #: ../src/search.c:1400 -#, fuzzy msgid "Searching..." -msgstr "Cerca" +msgstr "Ricerca in corso..." #: ../src/search.c:1412 #, c-format @@ -3957,7 +3908,7 @@ #: ../src/search.c:1546 msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" +msgstr "Ricerca fallita (vedere Help->Messaggi di debug per i dettagli)." #: ../src/search.c:1567 #, c-format @@ -4064,9 +4015,8 @@ msgstr "Etichetta" #: ../src/symbols.c:630 -#, fuzzy msgid "Structures" -msgstr "Stato" +msgstr "Strutture" #: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 msgid "Package" @@ -4105,34 +4055,28 @@ msgstr "Costanti" #: ../src/symbols.c:666 -#, fuzzy msgid "Anchors" -msgstr "Ancora" +msgstr "Ancore" #: ../src/symbols.c:667 -#, fuzzy msgid "H1 Headings" msgstr "Intestazione (H1)" #: ../src/symbols.c:668 -#, fuzzy msgid "H2 Headings" -msgstr "Intestazione (H1)" +msgstr "Intestazione (H2)" #: ../src/symbols.c:669 -#, fuzzy msgid "H3 Headings" -msgstr "Intestazione (H1)" +msgstr "Intestazione (H3)" #: ../src/symbols.c:677 -#, fuzzy msgid "ID Selectors" -msgstr "Nel testo se_lezionato" +msgstr "Selettori di ID" #: ../src/symbols.c:678 -#, fuzzy msgid "Type Selectors" -msgstr "Costruttori di tipo" +msgstr "Selettori di tipo" #: ../src/symbols.c:694 msgid "Modules" @@ -4184,33 +4128,32 @@ msgstr "Namespace" #: ../src/symbols.c:830 -#, fuzzy msgid "Structs" -msgstr "Stato" +msgstr "Strutture" #: ../src/symbols.c:831 msgid "Typedefs / Enums" -msgstr "" +msgstr "Typedef / Enum" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1311 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Estensione sconosciuta per \"%s\".\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1332 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" "Creazione file dei tag fallita, probabilmente non sono stati trovati tag.\n" -#: ../src/symbols.c:1335 +#: ../src/symbols.c:1339 #, c-format msgid "" "Usage: %s -g <Tag File> <File list>\n" "\n" msgstr "Uso: %s -g <File dei tag> <Lista di file>\n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1340 #, c-format msgid "" "Example:\n" @@ -4221,50 +4164,48 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1350 +#: ../src/symbols.c:1354 msgid "Load Tags" msgstr "Carica tag" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1361 msgid "Geany tag files (*.tags)" msgstr "File dei tag di Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1377 +#: ../src/symbols.c:1381 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Caricati %s file dei tag '%s'." -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1383 #, c-format msgid "Could not load tags file '%s'." msgstr "Impossibile caricare il file dei tag '%s'." -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1517 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Dichiarazione di \"%s\" non trovata." -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1519 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definizione di \"%s\" non trovata." -#: ../src/symbols.c:1806 -#, fuzzy +#: ../src/symbols.c:1810 msgid "_Expand All" -msgstr "_Trova tutti" +msgstr "_Espandi tutto" -#: ../src/symbols.c:1811 -#, fuzzy +#: ../src/symbols.c:1815 msgid "_Collapse All" msgstr "C_hiudi tutto" -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1825 msgid "Sort by _Name" msgstr "Ordina per _nome" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1832 msgid "Sort by _Appearance" msgstr "Ordina per _aspetto" @@ -4273,7 +4214,6 @@ msgstr "Salva il file corrente" #: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -#, fuzzy msgid "Save All" msgstr "Salva _tutti" @@ -4290,28 +4230,24 @@ msgstr "Chiude il file corrente" #: ../src/toolbar.c:55 -#, fuzzy msgid "Close all open files" msgstr "Chiude tutti i file aperti" #: ../src/toolbar.c:56 -#, fuzzy msgid "Cut the current selection" -msgstr "Converte lo stato MAIUSCOLO/minuscolo della selezione corrente" +msgstr "Taglia la selezione corrente" #: ../src/toolbar.c:57 -#, fuzzy msgid "Copy the current selection" -msgstr "Compila il file corrente" +msgstr "Copia la selezione corrente" #: ../src/toolbar.c:58 msgid "Paste the contents of the clipboard" -msgstr "" +msgstr "Incolla il contenuto della clipboard" #: ../src/toolbar.c:59 -#, fuzzy msgid "Delete the current selection" -msgstr "Converte lo stato MAIUSCOLO/minuscolo della selezione corrente" +msgstr "Cancella la selezione corrente" #: ../src/toolbar.c:60 msgid "Undo the last modification" @@ -4330,7 +4266,6 @@ msgstr "Esegue o visualizza il file corrente" #: ../src/toolbar.c:66 -#, fuzzy msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "" @@ -4358,28 +4293,28 @@ msgstr "Trova il testo inserito nel file corrente" #: ../src/toolbar.c:72 ../src/toolbar.c:208 -#, fuzzy msgid "Jump to the entered line number" msgstr "Vai al numero di riga inserito." #: ../src/toolbar.c:73 msgid "Show the preferences dialog" -msgstr "" +msgstr "Mostra il dialogo delle preferenze" #: ../src/toolbar.c:74 msgid "Quit Geany" msgstr "Chiude Geany" #: ../src/toolbar.c:75 -#, fuzzy msgid "Print document" -msgstr "Documento XML" +msgstr "Stampa il documento." #: ../src/toolbar.c:153 msgid "" "For all changes you make in this file to take effect, you need to restart " "Geany." msgstr "" +"Perche le modifiche effettuate in questo file abbiano effetto, è necessario " +"riavviare Geany." #. Create our custom actions #: ../src/toolbar.c:184 @@ -4391,7 +4326,6 @@ msgstr "Apre un file esistente" #: ../src/toolbar.c:208 -#, fuzzy msgid "Goto" msgstr "Vai alla riga" @@ -4472,15 +4406,15 @@ msgid "No tags found" msgstr "Nessun riferimento" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:491 msgid "Show S_ymbol List" msgstr "Mostra la lista dei _simboli" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:499 msgid "Show _Document List" msgstr "Mostra la lista dei _documenti" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:507 ../plugins/filebrowser.c:586 msgid "H_ide Sidebar" msgstr "_Nascondi barra laterale" @@ -4579,12 +4513,10 @@ msgstr "Seleziona file" #: ../src/ui_utils.c:1737 -#, fuzzy msgid "C_onfiguration Files" -msgstr "File di configurazione ricaricato." +msgstr "File di c_onfigurazione" #: ../src/ui_utils.c:1756 -#, fuzzy msgid "Close All" msgstr "C_hiudi tutto" @@ -4629,7 +4561,6 @@ msgstr "Carattere del terminale:" #: ../src/vte.c:750 -#, fuzzy msgid "Sets the font for the terminal widget" msgstr "Imposta il carattere per il terminale." @@ -4642,12 +4573,10 @@ msgstr "Colore dello sfondo:" #: ../src/vte.c:768 -#, fuzzy msgid "Sets the foreground color of the text in the terminal widget" msgstr "Imposta il colore del testo nel terminale." #: ../src/vte.c:775 -#, fuzzy msgid "Sets the background color of the text in the terminal widget" msgstr "Imposta il colore dello sfondo nel terminale." @@ -4658,7 +4587,6 @@ msgstr "Righe di scorrimento all'indietro:" #: ../src/vte.c:790 -#, fuzzy msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" @@ -4671,7 +4599,6 @@ msgstr "Shell:" #: ../src/vte.c:802 -#, fuzzy msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" @@ -4682,34 +4609,30 @@ msgstr "Scorrere alla pressione dei tasti" #: ../src/vte.c:820 -#, fuzzy msgid "Whether to scroll to the bottom if a key was pressed" -msgstr "Fa scorrere il testo alla pressione di un tasto." +msgstr "Fa scorrere verso il fondo alla pressione di un tasto." #: ../src/vte.c:823 msgid "Scroll on output" msgstr "Scorrere in presenza di output" #: ../src/vte.c:824 -#, fuzzy msgid "Whether to scroll to the bottom when output is generated" -msgstr "Fa scorrere il testo in presenza di output." +msgstr "Fa scorrere verso il fondo quando viene generato dell'output." #: ../src/vte.c:827 msgid "Cursor blinks" -msgstr "" +msgstr "Cursore lampeggiante" #: ../src/vte.c:828 -#, fuzzy msgid "Whether to blink the cursor" -msgstr "Abilita o meno la contrazione/espansione del codice" +msgstr "Abilita/Disabilita il lampeggio del cursore." #: ../src/vte.c:831 msgid "Override Geany keybindings" msgstr "Ridefinisce le scorciatoie da tastiera di Geany" #: ../src/vte.c:833 -#, fuzzy msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "" @@ -4730,12 +4653,11 @@ "essere utile se si usa, per esempio, Midnight Commander all'interno " "dell'emulatore di terminale virtuale." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:840 ../plugins/filebrowser.c:1125 msgid "Follow the path of the current file" msgstr "Segui il percorso del file corrente" #: ../src/vte.c:841 -#, fuzzy msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "Esegue \"cd $path\" quando si passa da un file aperto all'altro." @@ -4746,7 +4668,6 @@ msgstr "Non usare script per l'esecuzione" #: ../src/vte.c:847 -#, fuzzy msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" @@ -4759,7 +4680,6 @@ msgstr "Esegui i programmi nel terminale virtuale." #: ../src/vte.c:851 -#, fuzzy msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" @@ -4946,32 +4866,28 @@ #. Add menuitem for html replacement functions #: ../plugins/htmlchars.c:699 -#, fuzzy msgid "HTML Replacement" -msgstr "Sostituisci" +msgstr "Sostituzione HTML" #: ../plugins/htmlchars.c:706 msgid "_HTMLToggle" -msgstr "" +msgstr "Abilita _HTML" #: ../plugins/htmlchars.c:715 -#, fuzzy msgid "Bulk replacement of special chars" -msgstr "Posizione delle nuove linguette file:" +msgstr "Sostituzione di massa dei caratteri speciali" #: ../plugins/htmlchars.c:730 msgid "Insert Special HTML Characters" msgstr "Inserisce caratteri HTML speciali" #: ../plugins/htmlchars.c:733 -#, fuzzy msgid "Replace special characters" -msgstr "Caratteri speciali" +msgstr "Sostituisce i caratteri speciali." #: ../plugins/htmlchars.c:736 -#, fuzzy msgid "Toggle plugin status" -msgstr "Commenta/Decommenta riga" +msgstr "Abilita/Disabilita lo stato dei plugin." #: ../plugins/export.c:45 msgid "Export" @@ -4990,11 +4906,10 @@ msgstr "_Usa livello di ingrandimento corrente" #: ../plugins/export.c:193 -#, fuzzy msgid "" "Renders the font size of the document together with the current zoom level" msgstr "" -"Visualizza la dimensione dei caratteri del documento secondo il livello di " +"Visualizza la dimensione dei caratteri del documento insieme al livello di " "ingrandimento corrente." #: ../plugins/export.c:275 @@ -5034,68 +4949,68 @@ msgid "Adds a file browser tab to the sidebar." msgstr "Aggiunge una scheda per l'esplorazione dei file alla barra laterale." -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:329 msgid "Too many items selected!" msgstr "Selezionati troppi elementi!" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:405 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Impossibile eseguire il comando esterno configurato '%s' (%s)." -#: ../plugins/filebrowser.c:558 +#: ../plugins/filebrowser.c:561 msgid "Open _externally" msgstr "Aprire _esternamente" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:567 msgid "_Find in Files" msgstr "_Trova in file" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:577 msgid "Show _Hidden Files" msgstr "Mostra file _nascosti" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:769 msgid "Up" msgstr "Su" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:774 msgid "Refresh" msgstr "Aggiorna" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:779 msgid "Home" msgstr "Home" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:784 msgid "Set path from document" msgstr "Imposta il percorso dal documento" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:792 msgid "Clear the filter" msgstr "Elimina il filtro" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:806 msgid "Filter:" msgstr "Filtro:" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1025 msgid "Focus File List" msgstr "Passa alla lista dei file" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1027 msgid "Focus Path Entry" msgstr "Passa al percorso" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../plugins/filebrowser.c:1070 ../plugins/saveactions.c:478 msgid "Plugin configuration directory could not be created." msgstr "Impossibile creare la cartella di configurazione dei plugin." -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1095 msgid "External open command:" msgstr "Comando esterno di apertura:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1104 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5109,15 +5024,15 @@ "%f sarà sostituita dal nome file con il percorso completo\n" "%d sarà sostituita dal percorso del file selezionato senza il nome del file" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1110 msgid "Show hidden files" msgstr "Mostra file nascosti" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1116 msgid "Hide object files" msgstr "Nascondi file oggetto" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1120 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -5125,16 +5040,14 @@ "Non mostrare nell'esplorazione dei file i file oggetto generati, che " "comprendono *.o, *.obj, *.so, *.dll, *.a, *.lib" -#: ../plugins/filebrowser.c:1128 -#, fuzzy +#: ../plugins/filebrowser.c:1131 msgid "Set the project's base directory" -msgstr "Creare il percorso base del progetto?" +msgstr "Crea il percorso base del progetto." -#: ../plugins/filebrowser.c:1132 -#, fuzzy +#: ../plugins/filebrowser.c:1135 msgid "" "Change the directory to the base directory of the currently opened project" -msgstr "Crea un diff dal percorso del file attivo corrente" +msgstr "Cambia la directory al percorso base del progetto corrente." #: ../plugins/saveactions.c:47 msgid "Save Actions" @@ -5254,21 +5167,19 @@ #: ../plugins/splitwindow.c:407 msgid "_Vertically" -msgstr "" +msgstr "_Verticalmente" #: ../plugins/splitwindow.c:422 -#, fuzzy msgid "Split Horizontally" -msgstr "_Orizzontalmente" +msgstr "Dividi orizzontalmente" #: ../plugins/splitwindow.c:424 msgid "Split Vertically" -msgstr "" +msgstr "Dividi verticalmente" #: ../plugins/splitwindow.c:426 -#, fuzzy msgid "Unsplit" -msgstr "_Unisci" +msgstr "Unisci" #~ msgid "Failed to view %s (make sure it is already compiled)" #~ msgstr "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3770] trunk
by eht16＠users.sourceforge.net 03 May '09

03 May '09

Revision: 3770 http://geany.svn.sourceforge.net/geany/?rev=3770&view=rev Author: eht16 Date: 2009-05-03 18:13:34 +0000 (Sun, 03 May 2009) Log Message: ----------- Update Pascal styles as they changed in Scintilla. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.pascal trunk/src/editor.c trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-03 17:49:33 UTC (rev 3769) +++ trunk/ChangeLog 2009-05-03 18:13:34 UTC (rev 3770) @@ -2,6 +2,8 @@ * wscript, scintilla/*, scintilla/include/*, src/plugindata.h: Update Scintilla to version 1.78. + * src/editor.c, src/highlighting.c: + Update Pascal styles as they changed in Scintilla. 2009-05-02 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/data/filetypes.pascal =================================================================== --- trunk/data/filetypes.pascal 2009-05-03 17:49:33 UTC (rev 3769) +++ trunk/data/filetypes.pascal 2009-05-03 18:13:34 UTC (rev 3770) @@ -1,21 +1,26 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x0000ff;0xffffff;false;false +default=0x000000;0xffffff;false;false +identifier=0x000000;0xffffff;false;false comment=0xd00000;0xffffff;false;false -number=0x007f00;0xffffff;false;false +comment2=0x3f5fbf;0xffffff;false;false +commentline=0xd00000;0xffffff;false;false +preprocessor=0x007f7f;0xffffff;false;false +preprocessor2=0x007f7f;0xffffff;false;false +number=0x007F00;0xffffff;false;false +hexnumber=0x007F00;0xffffff;false;false word=0x111199;0xffffff;true;false string=0xff901e;0xffffff;false;false +stringeol=0x000000;0xe0c0e0;false;false character=0x404000;0xffffff;false;false -preprocessor=0x007f7f;0xffffff;false;false operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -regex=0x1b6313;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false +asm=0x804080;0xffffff;false;false + [keywords] -primary=absolute and array asm begin break case const constructor continue destructor div do downto dynamic else end end. file for function goto if implementation in inherited inline interface label message mod nil not object of on operator or overload outpacked procedure program record reintroduce repeat self set shl shr string then to type unit until uses var while with xor as class except exports finalization finally initialization is library on property raise threadvar try dispose exit false new true absolute abstract alias assembler cdecl cppdecl default export external far far16 forward index name near oldfpccall override pascal private protected public published read register safecall softfloat stdcall virtual write +# all items must be in one line +primary=absolute abstract add and array as asm assembler automated begin byte case cdecl char class const constructor contains default deprecated destructor dispid dispinterface div do downto dynamic else end except export exports external far file final finalization finally for forward function goto if implementation implements in index inherited initialization inline integer interface is label library message mod name near nil nodefault not object of on or out overload override package packed pascal platform private procedure program property protected public published raise read readonly real record register reintroduce remove repeat requires resourcestring safecall sealed set shl shr static stdcall stored strict string then threadvar to try type unit unsafe until uses var varargs virtual while with word write writeonly xor [settings] Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-05-03 17:49:33 UTC (rev 3769) +++ trunk/src/editor.c 2009-05-03 18:13:34 UTC (rev 3770) @@ -2489,6 +2489,7 @@ case SCLEX_SQL: style_comment = SCE_SQL_COMMENT; break; case SCLEX_CAML: style_comment = SCE_CAML_COMMENT; break; case SCLEX_D: style_comment = SCE_D_COMMENT; break; + case SCLEX_PASCAL: style_comment = SCE_PAS_COMMENT; break; default: style_comment = SCE_C_COMMENT; } if (sci_get_style_at(editor->sci, line_start + x) == style_comment) @@ -2636,6 +2637,7 @@ case SCLEX_D: style_comment = SCE_D_COMMENT; break; case SCLEX_RUBY: style_comment = SCE_RB_POD; break; case SCLEX_PERL: style_comment = SCE_PL_POD; break; + case SCLEX_PASCAL: style_comment = SCE_PAS_COMMENT; break; default: style_comment = SCE_C_COMMENT; } if (sci_get_style_at(editor->sci, line_start + x) == style_comment) @@ -2793,6 +2795,8 @@ /* skip lines which are already comments */ switch (lexer) { /* I will list only those lexers which support multi line comments */ + /* FIXME Update the list of filetypes and move this switch into a separate + * function to avoid duplicate code. */ case SCLEX_XML: case SCLEX_HTML: { @@ -2805,6 +2809,7 @@ case SCLEX_SQL: style_comment = SCE_SQL_COMMENT; break; case SCLEX_CAML: style_comment = SCE_CAML_COMMENT; break; case SCLEX_D: style_comment = SCE_D_COMMENT; break; + case SCLEX_PASCAL: style_comment = SCE_PAS_COMMENT; break; default: style_comment = SCE_C_COMMENT; } if (sci_get_style_at(editor->sci, line_start + x) == style_comment) continue; @@ -2878,6 +2883,10 @@ return (style == SCE_C_COMMENT || style == SCE_C_COMMENTDOC); + case SCLEX_PASCAL: + return (style == SCE_PAS_COMMENT || + style == SCE_PAS_COMMENT2); + case SCLEX_D: return (style == SCE_D_COMMENT || style == SCE_D_COMMENTDOC || @@ -2976,10 +2985,13 @@ switch (lexer) { case SCLEX_CPP: - case SCLEX_PASCAL: return (style == SCE_C_CHARACTER || style == SCE_C_STRING); + case SCLEX_PASCAL: + return (style == SCE_PAS_CHARACTER || + style == SCE_PAS_STRING); + case SCLEX_D: return (style == SCE_D_CHARACTER || style == SCE_D_STRING); @@ -3097,7 +3109,6 @@ switch (lexer) { case SCLEX_CPP: - case SCLEX_PASCAL: return (style == SCE_C_COMMENT || style == SCE_C_COMMENTLINE || style == SCE_C_COMMENTDOC || @@ -3105,6 +3116,11 @@ style == SCE_C_COMMENTDOCKEYWORD || style == SCE_C_COMMENTDOCKEYWORDERROR); + case SCLEX_PASCAL: + return (style == SCE_PAS_COMMENT || + style == SCE_PAS_COMMENT2 || + style == SCE_PAS_COMMENTLINE); + case SCLEX_D: return (style == SCE_D_COMMENT || style == SCE_D_COMMENTLINE || Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2009-05-03 17:49:33 UTC (rev 3769) +++ trunk/src/highlighting.c 2009-05-03 18:13:34 UTC (rev 3770) @@ -988,24 +988,27 @@ static void styleset_pascal_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_PASCAL, 12); - get_keyfile_hex(config, config_home, "styling", "default", "0x0000ff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[0]); - get_keyfile_style(config, config_home, "comment", &gsd_comment, &style_sets[GEANY_FILETYPES_PASCAL].styling[1]); - get_keyfile_hex(config, config_home, "styling", "number", "0x007F00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[2]); - get_keyfile_hex(config, config_home, "styling", "word", "0x111199", "0xffffff", "true", &style_sets[GEANY_FILETYPES_PASCAL].styling[3]); - get_keyfile_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[4]); - get_keyfile_hex(config, config_home, "styling", "character", "0x404000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[5]); - get_keyfile_hex(config, config_home, "styling", "preprocessor", "0x007f7f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[6]); - get_keyfile_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[7]); - get_keyfile_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[8]); - get_keyfile_hex(config, config_home, "styling", "regex", "0x1b6313", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[9]); - get_keyfile_style(config, config_home, "commentline", &gsd_comment, &style_sets[GEANY_FILETYPES_PASCAL].styling[10]); - get_keyfile_style(config, config_home, "commentdoc", &gsd_comment_doc, &style_sets[GEANY_FILETYPES_PASCAL].styling[11]); + new_style_array(GEANY_FILETYPES_PASCAL, 15); + get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[0]); + get_keyfile_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[1]); + get_keyfile_hex(config, config_home, "styling", "comment", "0xd00000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[2]); + get_keyfile_hex(config, config_home, "styling", "comment2", "0x3f5fbf", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[3]); + get_keyfile_hex(config, config_home, "styling", "commentline", "0xd00000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[4]); + get_keyfile_hex(config, config_home, "styling", "preprocessor", "0x007f7f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[5]); + get_keyfile_hex(config, config_home, "styling", "preprocessor2", "0x007f7f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[6]); + get_keyfile_hex(config, config_home, "styling", "number", "0x007F00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[7]); + get_keyfile_hex(config, config_home, "styling", "hexnumber", "0x007F00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[8]); + get_keyfile_hex(config, config_home, "styling", "word", "0x111199", "0xffffff", "true", &style_sets[GEANY_FILETYPES_PASCAL].styling[9]); + get_keyfile_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[10]); + get_keyfile_hex(config, config_home, "styling", "stringeol", "0x000000", "0xe0c0e0", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[11]); + get_keyfile_hex(config, config_home, "styling", "character", "0x404000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[12]); + get_keyfile_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[13]); + get_keyfile_hex(config, config_home, "styling", "asm", "0x804080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[14]); style_sets[GEANY_FILETYPES_PASCAL].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_PASCAL, 0, "word integer char string byte real \ - for to do until repeat program if uses then else case var begin end \ - asm unit interface implementation procedure function object try class"); + get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_PASCAL, 0, + "asm begin byte case char class do else end for function if implementation integer \ + interface object procedure program real repeat string then to try unit until uses var word"); style_sets[GEANY_FILETYPES_PASCAL].keywords[1] = NULL; get_keyfile_wordchars(config, config_home, @@ -1022,18 +1025,23 @@ SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_PASCAL].keywords[0]); set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_PASCAL, 0); - set_sci_style(sci, SCE_C_DEFAULT, GEANY_FILETYPES_PASCAL, 0); - set_sci_style(sci, SCE_C_COMMENT, GEANY_FILETYPES_PASCAL, 1); - set_sci_style(sci, SCE_C_NUMBER, GEANY_FILETYPES_PASCAL, 2); - set_sci_style(sci, SCE_C_WORD, GEANY_FILETYPES_PASCAL, 3); - set_sci_style(sci, SCE_C_STRING, GEANY_FILETYPES_PASCAL, 4); - set_sci_style(sci, SCE_C_CHARACTER, GEANY_FILETYPES_PASCAL, 5); - set_sci_style(sci, SCE_C_PREPROCESSOR, GEANY_FILETYPES_PASCAL, 6); - set_sci_style(sci, SCE_C_OPERATOR, GEANY_FILETYPES_PASCAL, 7); - set_sci_style(sci, SCE_C_IDENTIFIER, GEANY_FILETYPES_PASCAL, 8); - set_sci_style(sci, SCE_C_REGEX, GEANY_FILETYPES_PASCAL, 9); - set_sci_style(sci, SCE_C_COMMENTLINE, GEANY_FILETYPES_PASCAL, 10); - set_sci_style(sci, SCE_C_COMMENTDOC, GEANY_FILETYPES_PASCAL, 11); + set_sci_style(sci, SCE_PAS_DEFAULT, GEANY_FILETYPES_PASCAL, 0); + set_sci_style(sci, SCE_PAS_IDENTIFIER, GEANY_FILETYPES_PASCAL, 1); + set_sci_style(sci, SCE_PAS_COMMENT, GEANY_FILETYPES_PASCAL, 2); + set_sci_style(sci, SCE_PAS_COMMENT2, GEANY_FILETYPES_PASCAL, 3); + set_sci_style(sci, SCE_PAS_COMMENTLINE, GEANY_FILETYPES_PASCAL, 4); + set_sci_style(sci, SCE_PAS_PREPROCESSOR, GEANY_FILETYPES_PASCAL, 5); + set_sci_style(sci, SCE_PAS_PREPROCESSOR2, GEANY_FILETYPES_PASCAL, 6); + set_sci_style(sci, SCE_PAS_NUMBER, GEANY_FILETYPES_PASCAL, 7); + set_sci_style(sci, SCE_PAS_HEXNUMBER, GEANY_FILETYPES_PASCAL, 8); + set_sci_style(sci, SCE_PAS_WORD, GEANY_FILETYPES_PASCAL, 9); + set_sci_style(sci, SCE_PAS_STRING, GEANY_FILETYPES_PASCAL, 10); + set_sci_style(sci, SCE_PAS_STRINGEOL, GEANY_FILETYPES_PASCAL, 11); + set_sci_style(sci, SCE_PAS_CHARACTER, GEANY_FILETYPES_PASCAL, 12); + set_sci_style(sci, SCE_PAS_OPERATOR, GEANY_FILETYPES_PASCAL, 13); + set_sci_style(sci, SCE_PAS_ASM, GEANY_FILETYPES_PASCAL, 14); + + SSM(sci, SCI_SETPROPERTY, (uptr_t) "lexer.pascal.smart.highlighting", (sptr_t) "1"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3769] trunk
by eht16＠users.sourceforge.net 03 May '09

03 May '09

Revision: 3769 http://geany.svn.sourceforge.net/geany/?rev=3769&view=rev Author: eht16 Date: 2009-05-03 17:49:33 +0000 (Sun, 03 May 2009) Log Message: ----------- Update Scintilla to version 1.78. Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/CellBuffer.cxx trunk/scintilla/CellBuffer.h trunk/scintilla/Document.cxx trunk/scintilla/Document.h trunk/scintilla/Editor.cxx trunk/scintilla/Editor.h trunk/scintilla/Indicator.cxx trunk/scintilla/Indicator.h trunk/scintilla/KeyWords.cxx trunk/scintilla/LexBash.cxx trunk/scintilla/LexCPP.cxx trunk/scintilla/LexD.cxx trunk/scintilla/LexFortran.cxx trunk/scintilla/LexHTML.cxx trunk/scintilla/LexOthers.cxx trunk/scintilla/LexPascal.cxx trunk/scintilla/LexPerl.cxx trunk/scintilla/LexPython.cxx trunk/scintilla/LexRuby.cxx trunk/scintilla/LexSQL.cxx trunk/scintilla/LexYAML.cxx trunk/scintilla/Makefile.am trunk/scintilla/PlatGTK.cxx trunk/scintilla/PositionCache.cxx trunk/scintilla/RESearch.cxx trunk/scintilla/ScintillaBase.cxx trunk/scintilla/ScintillaGTK.cxx trunk/scintilla/SplitVector.h trunk/scintilla/UniConversion.cxx trunk/scintilla/ViewStyle.cxx trunk/scintilla/ViewStyle.h trunk/scintilla/include/Accessor.h trunk/scintilla/include/KeyWords.h trunk/scintilla/include/Platform.h trunk/scintilla/include/PropSet.h trunk/scintilla/include/SString.h trunk/scintilla/include/SciLexer.h trunk/scintilla/include/Scintilla.h trunk/scintilla/include/Scintilla.iface trunk/scintilla/include/WindowAccessor.h trunk/scintilla/makefile.win32 trunk/scintilla/scintilla_changes.patch trunk/src/plugindata.h trunk/wscript Added Paths: ----------- trunk/scintilla/PerLine.cxx trunk/scintilla/PerLine.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/ChangeLog 2009-05-03 17:49:33 UTC (rev 3769) @@ -1,3 +1,9 @@ +2009-05-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * wscript, scintilla/*, scintilla/include/*, src/plugindata.h: + Update Scintilla to version 1.78. + + 2009-05-02 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/printing.c: Modified: trunk/scintilla/CellBuffer.cxx =================================================================== --- trunk/scintilla/CellBuffer.cxx 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/CellBuffer.cxx 2009-05-03 17:49:33 UTC (rev 3769) @@ -21,183 +21,31 @@ using namespace Scintilla; #endif -MarkerHandleSet::MarkerHandleSet() { - root = 0; -} - -MarkerHandleSet::~MarkerHandleSet() { - MarkerHandleNumber *mhn = root; - while (mhn) { - MarkerHandleNumber *mhnToFree = mhn; - mhn = mhn->next; - delete mhnToFree; - } - root = 0; -} - -int MarkerHandleSet::Length() const { - int c = 0; - MarkerHandleNumber *mhn = root; - while (mhn) { - c++; - mhn = mhn->next; - } - return c; -} - -int MarkerHandleSet::NumberFromHandle(int handle) const { - MarkerHandleNumber *mhn = root; - while (mhn) { - if (mhn->handle == handle) { - return mhn->number; - } - mhn = mhn->next; - } - return - 1; -} - -int MarkerHandleSet::MarkValue() const { - unsigned int m = 0; - MarkerHandleNumber *mhn = root; - while (mhn) { - m |= (1 << mhn->number); - mhn = mhn->next; - } - return m; -} - -bool MarkerHandleSet::Contains(int handle) const { - MarkerHandleNumber *mhn = root; - while (mhn) { - if (mhn->handle == handle) { - return true; - } - mhn = mhn->next; - } - return false; -} - -bool MarkerHandleSet::InsertHandle(int handle, int markerNum) { - MarkerHandleNumber *mhn = new MarkerHandleNumber; - if (!mhn) - return false; - mhn->handle = handle; - mhn->number = markerNum; - mhn->next = root; - root = mhn; - return true; -} - -void MarkerHandleSet::RemoveHandle(int handle) { - MarkerHandleNumber **pmhn = &root; - while (*pmhn) { - MarkerHandleNumber *mhn = *pmhn; - if (mhn->handle == handle) { - *pmhn = mhn->next; - delete mhn; - return; - } - pmhn = &((*pmhn)->next); - } -} - -bool MarkerHandleSet::RemoveNumber(int markerNum) { - bool performedDeletion = false; - MarkerHandleNumber **pmhn = &root; - while (*pmhn) { - MarkerHandleNumber *mhn = *pmhn; - if (mhn->number == markerNum) { - *pmhn = mhn->next; - delete mhn; - performedDeletion = true; - } else { - pmhn = &((*pmhn)->next); - } - } - return performedDeletion; -} - -void MarkerHandleSet::CombineWith(MarkerHandleSet *other) { - MarkerHandleNumber **pmhn = &root; - while (*pmhn) { - pmhn = &((*pmhn)->next); - } - *pmhn = other->root; - other->root = 0; -} - LineVector::LineVector() : starts(256) { - handleCurrent = 1; - Init(); } LineVector::~LineVector() { starts.DeleteAll(); - for (int line = 0; line < markers.Length(); line++) { - delete markers[line]; - markers[line] = 0; - } - markers.DeleteAll(); - levels.DeleteAll(); } void LineVector::Init() { starts.DeleteAll(); - for (int line = 0; line < markers.Length(); line++) { - delete markers[line]; - markers[line] = 0; - } - markers.DeleteAll(); - levels.DeleteAll(); } -void LineVector::ExpandLevels(int sizeNew) { - levels.InsertValue(levels.Length(), sizeNew - levels.Length(), SC_FOLDLEVELBASE); +void LineVector::SetPerLine(PerLine *pl) { + perLine = pl; } -void LineVector::ClearLevels() { - levels.DeleteAll(); -} - -int LineVector::SetLevel(int line, int level) { - int prev = 0; - if ((line >= 0) && (line < Lines())) { - if (!levels.Length()) { - ExpandLevels(Lines() + 1); - } - prev = levels[line]; - if (prev != level) { - levels[line] = level; - } - } - return prev; -} - -int LineVector::GetLevel(int line) { - if (levels.Length() && (line >= 0) && (line < Lines())) { - return levels[line]; - } else { - return SC_FOLDLEVELBASE; - } -} - void LineVector::InsertText(int line, int delta) { starts.InsertText(line, delta); } void LineVector::InsertLine(int line, int position) { starts.InsertPartition(line, position); - if (markers.Length()) { - markers.Insert(line, 0); + if (perLine) { + perLine->InsertLine(line); } - if (levels.Length()) { - int level = SC_FOLDLEVELBASE; - if ((line > 0) && (line < Lines())) { - level = levels[line-1] & ~SC_FOLDLEVELWHITEFLAG; - } - levels.InsertValue(line, 1, level); - } } void LineVector::SetLineStart(int line, int position) { @@ -206,103 +54,15 @@ void LineVector::RemoveLine(int line) { starts.RemovePartition(line); - // Retain the markers from the deleted line by oring them into the previous line - if (markers.Length()) { - if (line > 0) { - MergeMarkers(line - 1); - } - markers.Delete(line); + if (perLine) { + perLine->RemoveLine(line); } - if (levels.Length()) { - // Move up following lines but merge header flag from this line - // to line before to avoid a temporary disappearence causing expansion. - int firstHeader = levels[line] & SC_FOLDLEVELHEADERFLAG; - levels.Delete(line); - if (line > 0) - levels[line-1] |= firstHeader; - } } int LineVector::LineFromPosition(int pos) { return starts.PartitionFromPosition(pos); } -int LineVector::MarkValue(int line) { - if (markers.Length() && markers[line]) - return markers[line]->MarkValue(); - else - return 0; -} - -int LineVector::AddMark(int line, int markerNum) { - handleCurrent++; - if (!markers.Length()) { - // No existing markers so allocate one element per line - markers.InsertValue(0, Lines(), 0); - } - if (!markers[line]) { - // Need new structure to hold marker handle - markers[line] = new MarkerHandleSet(); - if (!markers[line]) - return - 1; - } - markers[line]->InsertHandle(handleCurrent, markerNum); - - return handleCurrent; -} - -void LineVector::MergeMarkers(int pos) { - if (markers[pos + 1] != NULL) { - if (markers[pos] == NULL) - markers[pos] = new MarkerHandleSet; - markers[pos]->CombineWith(markers[pos + 1]); - delete markers[pos + 1]; - markers[pos + 1] = NULL; - } -} - -void LineVector::DeleteMark(int line, int markerNum, bool all) { - if (markers.Length() && markers[line]) { - if (markerNum == -1) { - delete markers[line]; - markers[line] = NULL; - } else { - bool performedDeletion = markers[line]->RemoveNumber(markerNum); - while (all && performedDeletion) { - performedDeletion = markers[line]->RemoveNumber(markerNum); - } - if (markers[line]->Length() == 0) { - delete markers[line]; - markers[line] = NULL; - } - } - } -} - -void LineVector::DeleteMarkFromHandle(int markerHandle) { - int line = LineFromHandle(markerHandle); - if (line >= 0) { - markers[line]->RemoveHandle(markerHandle); - if (markers[line]->Length() == 0) { - delete markers[line]; - markers[line] = NULL; - } - } -} - -int LineVector::LineFromHandle(int markerHandle) { - if (markers.Length()) { - for (int line = 0; line < Lines(); line++) { - if (markers[line]) { - if (markers[line]->Contains(markerHandle)) { - return line; - } - } - } - } - return -1; -} - Action::Action() { at = startAction; position = 0; @@ -398,7 +158,7 @@ } void UndoHistory::AppendAction(actionType at, int position, char *data, int lengthData, - bool &startSequence) { + bool &startSequence, bool mayCoalesce) { EnsureUndoRoom(); //Platform::DebugPrintf("%% %d action %d %d %d\n", at, position, lengthData, currentAction); //Platform::DebugPrintf("^ %d action %d %d\n", actions[currentAction - 1].at, @@ -410,25 +170,35 @@ if (currentAction >= 1) { if (0 == undoSequenceDepth) { // Top level actions may not always be coalesced - Action &actPrevious = actions[currentAction - 1]; + int targetAct = -1; + const Action *actPrevious = &(actions[currentAction + targetAct]); + // Container actions may forward the coalesce state of Scintilla Actions. + while ((actPrevious->at == containerAction) && actPrevious->mayCoalesce) { + targetAct--; + actPrevious = &(actions[currentAction + targetAct]); + } // See if current action can be coalesced into previous action // Will work if both are inserts or deletes and position is same - if (at != actPrevious.at) { + if (currentAction == savePoint) { currentAction++; - } else if (currentAction == savePoint) { + } else if (!actions[currentAction].mayCoalesce) { + // Not allowed to coalesce if this set currentAction++; + } else if (!mayCoalesce || !actPrevious->mayCoalesce) { + currentAction++; + } else if (at == containerAction || actions[currentAction].at == containerAction) { + ; // A coalescible containerAction + } else if ((at != actPrevious->at) && (actPrevious->at != startAction)) { + currentAction++; } else if ((at == insertAction) && - (position != (actPrevious.position + actPrevious.lenData))) { + (position != (actPrevious->position + actPrevious->lenData))) { // Insertions must be immediately after to coalesce currentAction++; - } else if (!actions[currentAction].mayCoalesce) { - // Not allowed to coalesce if this set - currentAction++; } else if (at == removeAction) { if ((lengthData == 1) || (lengthData == 2)){ - if ((position + lengthData) == actPrevious.position) { + if ((position + lengthData) == actPrevious->position) { ; // Backspace -> OK - } else if (position == actPrevious.position) { + } else if (position == actPrevious->position) { ; // Delete -> OK } else { // Removals must be at same position to coalesce @@ -451,7 +221,7 @@ currentAction++; } startSequence = oldCurrentAction != currentAction; - actions[currentAction].Create(at, position, data, lengthData); + actions[currentAction].Create(at, position, data, lengthData, mayCoalesce); currentAction++; actions[currentAction].Create(startAction); maxAction = currentAction; @@ -666,6 +436,10 @@ style.ReAllocate(newSize); } +void CellBuffer::SetPerLine(PerLine *pl) { + lv.SetPerLine(pl); +} + int CellBuffer::Lines() const { return lv.Lines(); } @@ -695,54 +469,14 @@ return uh.IsSavePoint(); } -int CellBuffer::AddMark(int line, int markerNum) { - if ((line >= 0) && (line < Lines())) { - return lv.AddMark(line, markerNum); - } - return - 1; -} - -void CellBuffer::DeleteMark(int line, int markerNum) { - if ((line >= 0) && (line < Lines())) { - lv.DeleteMark(line, markerNum, false); - } -} - -void CellBuffer::DeleteMarkFromHandle(int markerHandle) { - lv.DeleteMarkFromHandle(markerHandle); -} - -int CellBuffer::GetMark(int line) { - if ((line >= 0) && (line < Lines())) - return lv.MarkValue(line); - return 0; -} - -void CellBuffer::DeleteAllMarks(int markerNum) { - for (int line = 0; line < Lines(); line++) { - lv.DeleteMark(line, markerNum, true); - } -} - -int CellBuffer::LineFromHandle(int markerHandle) { - return lv.LineFromHandle(markerHandle); -} - // Without undo void CellBuffer::InsertLine(int line, int position) { lv.InsertLine(line, position); - if (lineStates.Length()) { - lineStates.EnsureLength(line); - lineStates.Insert(line, 0); - } } void CellBuffer::RemoveLine(int line) { lv.RemoveLine(line); - if (lineStates.Length() > line) { - lineStates.Delete(line); - } } void CellBuffer::BasicInsertString(int position, const char *s, int insertLength) { @@ -862,6 +596,11 @@ uh.EndUndoAction(); } +void CellBuffer::AddUndoAction(int token, bool mayCoalesce) { + bool startSequence; + uh.AppendAction(containerAction, token, 0, 0, startSequence, mayCoalesce); +} + void CellBuffer::DeleteUndoHistory() { uh.DeleteUndoHistory(); } @@ -910,30 +649,3 @@ uh.CompletedRedoStep(); } -int CellBuffer::SetLineState(int line, int state) { - lineStates.EnsureLength(line + 1); - int stateOld = lineStates[line]; - lineStates[line] = state; - return stateOld; -} - -int CellBuffer::GetLineState(int line) { - lineStates.EnsureLength(line + 1); - return lineStates[line]; -} - -int CellBuffer::GetMaxLineState() { - return lineStates.Length(); -} - -int CellBuffer::SetLevel(int line, int level) { - return lv.SetLevel(line, level); -} - -int CellBuffer::GetLevel(int line) { - return lv.GetLevel(line); -} - -void CellBuffer::ClearLevels() { - lv.ClearLevels(); -} Modified: trunk/scintilla/CellBuffer.h =================================================================== --- trunk/scintilla/CellBuffer.h 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/CellBuffer.h 2009-05-03 17:49:33 UTC (rev 3769) @@ -12,33 +12,12 @@ namespace Scintilla { #endif -/** - * This holds the marker identifier and the marker type to display. - * MarkerHandleNumbers are members of lists. - */ -struct MarkerHandleNumber { - int handle; - int number; - MarkerHandleNumber *next; -}; - -/** - * A marker handle set contains any number of MarkerHandleNumbers. - */ -class MarkerHandleSet { - MarkerHandleNumber *root; - +// Interface to per-line data that wants to see each line insertion and deletion +class PerLine { public: - MarkerHandleSet(); - ~MarkerHandleSet(); - int Length() const; - int NumberFromHandle(int handle) const; - int MarkValue() const; ///< Bit set of marker numbers. - bool Contains(int handle) const; - bool InsertHandle(int handle, int markerNum); - void RemoveHandle(int handle); - bool RemoveNumber(int markerNum); - void CombineWith(MarkerHandleSet *other); + virtual ~PerLine() {} + virtual void InsertLine(int)=0; + virtual void RemoveLine(int)=0; }; /** @@ -47,22 +26,15 @@ class LineVector { Partitioning starts; - SplitVector<MarkerHandleSet *> markers; - SplitVector<int> levels; - /// Handles are allocated sequentially and should never have to be reused as 32 bit ints are very big. - int handleCurrent; + PerLine *perLine; public: LineVector(); ~LineVector(); void Init(); + void SetPerLine(PerLine *pl); - void ExpandLevels(int sizeNew=-1); - void ClearLevels(); - int SetLevel(int line, int level); - int GetLevel(int line); - void InsertText(int line, int delta); void InsertLine(int line, int position); void SetLineStart(int line, int position); @@ -81,9 +53,18 @@ void DeleteMark(int line, int markerNum, bool all); void DeleteMarkFromHandle(int markerHandle); int LineFromHandle(int markerHandle); + + void ClearLevels(); + int SetLevel(int line, int level); + int GetLevel(int line); + + int SetLineState(int line, int state); + int GetLineState(int line); + int GetMaxLineState(); + }; -enum actionType { insertAction, removeAction, startAction }; +enum actionType { insertAction, removeAction, startAction, containerAction }; /** * Actions are used to store all the information required to perform one undo/redo step. @@ -120,7 +101,7 @@ UndoHistory(); ~UndoHistory(); - void AppendAction(actionType at, int position, char *data, int length, bool &startSequence); + void AppendAction(actionType at, int position, char *data, int length, bool &startSequence, bool mayCoalesce=true); void BeginUndoAction(); void EndUndoAction(); @@ -160,8 +141,6 @@ LineVector lv; - SplitVector<int> lineStates; - public: CellBuffer(); @@ -175,6 +154,7 @@ int Length() const; void Allocate(int newSize); + void SetPerLine(PerLine *pl); int Lines() const; int LineStart(int line) const; int LineFromPosition(int pos) { return lv.LineFromPosition(pos); } @@ -197,14 +177,6 @@ void SetSavePoint(); bool IsSavePoint(); - /// Line marker functions - int AddMark(int line, int markerNum); - void DeleteMark(int line, int markerNum); - void DeleteMarkFromHandle(int markerHandle); - int GetMark(int line); - void DeleteAllMarks(int markerNum); - int LineFromHandle(int markerHandle); - /// Actions without undo void BasicInsertString(int position, const char *s, int insertLength); void BasicDeleteChars(int position, int deleteLength); @@ -213,6 +185,7 @@ bool IsCollectingUndo(); void BeginUndoAction(); void EndUndoAction(); + void AddUndoAction(int token, bool mayCoalesce); void DeleteUndoHistory(); /// To perform an undo, StartUndo is called to retrieve the number of steps, then UndoStep is @@ -225,14 +198,6 @@ int StartRedo(); const Action &GetRedoStep() const; void PerformRedoStep(); - - int SetLineState(int line, int state); - int GetLineState(int line); - int GetMaxLineState(); - - int SetLevel(int line, int level); - int GetLevel(int line); - void ClearLevels(); }; #ifdef SCI_NAMESPACE Modified: trunk/scintilla/Document.cxx =================================================================== --- trunk/scintilla/Document.cxx 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/Document.cxx 2009-05-03 17:49:33 UTC (rev 3769) @@ -17,6 +17,7 @@ #include "Partitioning.h" #include "RunStyles.h" #include "CellBuffer.h" +#include "PerLine.h" #include "CharClassify.h" #include "Decoration.h" #include "Document.h" @@ -74,6 +75,14 @@ matchesValid = false; regex = 0; + + perLineData[ldMarkers] = new LineMarkers(); + perLineData[ldLevels] = new LineLevels(); + perLineData[ldState] = new LineState(); + perLineData[ldMargin] = new LineAnnotation(); + perLineData[ldAnnotation] = new LineAnnotation(); + + cb.SetPerLine(this); } Document::~Document() { @@ -81,12 +90,30 @@ watchers[i].watcher->NotifyDeleted(this, watchers[i].userData); } delete []watchers; + for (int j=0; j<ldSize; j++) { + delete perLineData[j]; + perLineData[j] = 0; + } watchers = 0; lenWatchers = 0; delete regex; regex = 0; } +void Document::InsertLine(int line) { + for (int j=0; j<ldSize; j++) { + if (perLineData[j]) + perLineData[j]->InsertLine(line); + } +} + +void Document::RemoveLine(int line) { + for (int j=0; j<ldSize; j++) { + if (perLineData[j]) + perLineData[j]->RemoveLine(line); + } +} + // Increase reference count and return its previous value. int Document::AddRef() { return refCount++; @@ -106,42 +133,58 @@ NotifySavePoint(true); } +int Document::GetMark(int line) { + return static_cast<LineMarkers*>(perLineData[ldMarkers])->MarkValue(line); +} + int Document::AddMark(int line, int markerNum) { - int prev = cb.AddMark(line, markerNum); - DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0, line); - NotifyModified(mh); - return prev; + if (line <= LinesTotal()) { + int prev = static_cast<LineMarkers*>(perLineData[ldMarkers])-> + AddMark(line, markerNum, LinesTotal()); + DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0, line); + NotifyModified(mh); + return prev; + } else { + return 0; + } } void Document::AddMarkSet(int line, int valueSet) { unsigned int m = valueSet; for (int i = 0; m; i++, m >>= 1) if (m & 1) - cb.AddMark(line, i); + static_cast<LineMarkers*>(perLineData[ldMarkers])-> + AddMark(line, i, LinesTotal()); DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0, line); NotifyModified(mh); } void Document::DeleteMark(int line, int markerNum) { - cb.DeleteMark(line, markerNum); + static_cast<LineMarkers*>(perLineData[ldMarkers])->DeleteMark(line, markerNum, false); DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0, line); NotifyModified(mh); } void Document::DeleteMarkFromHandle(int markerHandle) { - cb.DeleteMarkFromHandle(markerHandle); + static_cast<LineMarkers*>(perLineData[ldMarkers])->DeleteMarkFromHandle(markerHandle); DocModification mh(SC_MOD_CHANGEMARKER, 0, 0, 0, 0); mh.line = -1; NotifyModified(mh); } void Document::DeleteAllMarks(int markerNum) { - cb.DeleteAllMarks(markerNum); + for (int line = 0; line < LinesTotal(); line++) { + static_cast<LineMarkers*>(perLineData[ldMarkers])->DeleteMark(line, markerNum, true); + } DocModification mh(SC_MOD_CHANGEMARKER, 0, 0, 0, 0); mh.line = -1; NotifyModified(mh); } +int Document::LineFromHandle(int markerHandle) { + return static_cast<LineMarkers*>(perLineData[ldMarkers])->LineFromHandle(markerHandle); +} + int Document::LineStart(int line) const { return cb.LineStart(line); } @@ -181,7 +224,7 @@ } int Document::SetLevel(int line, int level) { - int prev = cb.SetLevel(line, level); + int prev = static_cast<LineLevels*>(perLineData[ldLevels])->SetLevel(line, level, LinesTotal()); if (prev != level) { DocModification mh(SC_MOD_CHANGEFOLD | SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0, line); @@ -192,6 +235,14 @@ return prev; } +int Document::GetLevel(int line) { + return static_cast<LineLevels*>(perLineData[ldLevels])->GetLevel(line); +} + +void Document::ClearLevels() { + static_cast<LineLevels*>(perLineData[ldLevels])->ClearLevels(); +} + static bool IsSubordinate(int levelStart, int levelTry) { if (levelTry & SC_FOLDLEVELWHITEFLAG) return true; @@ -503,21 +554,27 @@ if (action.at == removeAction) { NotifyModified(DocModification( SC_MOD_BEFOREINSERT | SC_PERFORMED_UNDO, action)); + } else if (action.at == containerAction) { + DocModification dm(SC_MOD_CONTAINER | SC_PERFORMED_UNDO); + dm.token = action.position; + NotifyModified(dm); } else { NotifyModified(DocModification( SC_MOD_BEFOREDELETE | SC_PERFORMED_UNDO, action)); } cb.PerformUndoStep(); int cellPosition = action.position; - ModifiedAt(cellPosition); - newPos = cellPosition; + if (action.at != containerAction) { + ModifiedAt(cellPosition); + newPos = cellPosition; + } int modFlags = SC_PERFORMED_UNDO; // With undo, an insertion action becomes a deletion notification if (action.at == removeAction) { newPos += action.lenData; modFlags |= SC_MOD_INSERTTEXT; - } else { + } else if (action.at == insertAction) { modFlags |= SC_MOD_DELETETEXT; } if (steps > 1) @@ -558,19 +615,25 @@ if (action.at == insertAction) { NotifyModified(DocModification( SC_MOD_BEFOREINSERT | SC_PERFORMED_REDO, action)); + } else if (action.at == containerAction) { + DocModification dm(SC_MOD_CONTAINER | SC_PERFORMED_REDO); + dm.token = action.position; + NotifyModified(dm); } else { NotifyModified(DocModification( SC_MOD_BEFOREDELETE | SC_PERFORMED_REDO, action)); } cb.PerformRedoStep(); - ModifiedAt(action.position); - newPos = action.position; + if (action.at != containerAction) { + ModifiedAt(action.position); + newPos = action.position; + } int modFlags = SC_PERFORMED_REDO; if (action.at == insertAction) { newPos += action.lenData; modFlags |= SC_MOD_INSERTTEXT; - } else { + } else if (action.at == removeAction) { modFlags |= SC_MOD_DELETETEXT; } if (steps > 1) @@ -1059,8 +1122,8 @@ } if (found) { if ((!word && !wordStart) || - word && IsWordAt(pos, pos + lengthFind) || - wordStart && IsWordStartAt(pos)) + (word && IsWordAt(pos, pos + lengthFind)) || + (wordStart && IsWordStartAt(pos))) return pos; } } @@ -1075,8 +1138,8 @@ } if (found) { if ((!word && !wordStart) || - word && IsWordAt(pos, pos + lengthFind) || - wordStart && IsWordStartAt(pos)) + (word && IsWordAt(pos, pos + lengthFind)) || + (wordStart && IsWordStartAt(pos))) return pos; } } @@ -1155,7 +1218,7 @@ } } -bool Document::SetStyles(int length, char *styles) { +bool Document::SetStyles(int length, const char *styles) { if (enteredStyling != 0) { return false; } else { @@ -1194,7 +1257,7 @@ } int Document::SetLineState(int line, int state) { - int statePrevious = cb.SetLineState(line, state); + int statePrevious = static_cast<LineState*>(perLineData[ldState])->SetLineState(line, state); if (state != statePrevious) { DocModification mh(SC_MOD_CHANGELINESTATE, 0, 0, 0, 0, line); NotifyModified(mh); @@ -1202,6 +1265,89 @@ return statePrevious; } +int Document::GetLineState(int line) { + return static_cast<LineState*>(perLineData[ldState])->GetLineState(line); +} + +int Document::GetMaxLineState() { + return static_cast<LineState*>(perLineData[ldState])->GetMaxLineState(); +} + +StyledText Document::MarginStyledText(int line) { + LineAnnotation *pla = static_cast<LineAnnotation*>(perLineData[ldMargin]); + return StyledText(pla->Length(line), pla->Text(line), + pla->MultipleStyles(line), pla->Style(line), pla->Styles(line)); +} + +void Document::MarginSetText(int line, const char *text) { + static_cast<LineAnnotation*>(perLineData[ldMargin])->SetText(line, text); + DocModification mh(SC_MOD_CHANGEMARGIN, LineStart(line), 0, 0, 0, line); + NotifyModified(mh); +} + +void Document::MarginSetStyle(int line, int style) { + static_cast<LineAnnotation*>(perLineData[ldMargin])->SetStyle(line, style); +} + +void Document::MarginSetStyles(int line, const unsigned char *styles) { + static_cast<LineAnnotation*>(perLineData[ldMargin])->SetStyles(line, styles); +} + +int Document::MarginLength(int line) const { + return static_cast<LineAnnotation*>(perLineData[ldMargin])->Length(line); +} + +void Document::MarginClearAll() { + int maxEditorLine = LinesTotal(); + for (int l=0;l<maxEditorLine;l++) + MarginSetText(l, 0); + // Free remaining data + static_cast<LineAnnotation*>(perLineData[ldMargin])->ClearAll(); +} + +bool Document::AnnotationAny() const { + return static_cast<LineAnnotation*>(perLineData[ldAnnotation])->AnySet(); +} + +StyledText Document::AnnotationStyledText(int line) { + LineAnnotation *pla = static_cast<LineAnnotation*>(perLineData[ldAnnotation]); + return StyledText(pla->Length(line), pla->Text(line), + pla->MultipleStyles(line), pla->Style(line), pla->Styles(line)); +} + +void Document::AnnotationSetText(int line, const char *text) { + const int linesBefore = AnnotationLines(line); + static_cast<LineAnnotation*>(perLineData[ldAnnotation])->SetText(line, text); + const int linesAfter = AnnotationLines(line); + DocModification mh(SC_MOD_CHANGEANNOTATION, LineStart(line), 0, 0, 0, line); + mh.annotationLinesAdded = linesAfter - linesBefore; + NotifyModified(mh); +} + +void Document::AnnotationSetStyle(int line, int style) { + static_cast<LineAnnotation*>(perLineData[ldAnnotation])->SetStyle(line, style); +} + +void Document::AnnotationSetStyles(int line, const unsigned char *styles) { + static_cast<LineAnnotation*>(perLineData[ldAnnotation])->SetStyles(line, styles); +} + +int Document::AnnotationLength(int line) const { + return static_cast<LineAnnotation*>(perLineData[ldAnnotation])->Length(line); +} + +int Document::AnnotationLines(int line) const { + return static_cast<LineAnnotation*>(perLineData[ldAnnotation])->Lines(line); +} + +void Document::AnnotationClearAll() { + int maxEditorLine = LinesTotal(); + for (int l=0;l<maxEditorLine;l++) + AnnotationSetText(l, 0); + // Free remaining data + static_cast<LineAnnotation*>(perLineData[ldAnnotation])->ClearAll(); +} + void Document::IncrementStyleClock() { styleClock = (styleClock + 1) % 0x100000; } @@ -1657,8 +1803,18 @@ #ifndef SCI_OWNREGEX +#ifdef SCI_NAMESPACE + +RegexSearchBase *Scintilla::CreateRegexSearch(CharClassify *charClassTable) { + return new BuiltinRegex(charClassTable); +} + +#else + RegexSearchBase *CreateRegexSearch(CharClassify *charClassTable) { return new BuiltinRegex(charClassTable); } #endif + +#endif Modified: trunk/scintilla/Document.h =================================================================== --- trunk/scintilla/Document.h 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/Document.h 2009-05-03 17:49:33 UTC (rev 3769) @@ -93,9 +93,31 @@ /// Factory function for RegexSearchBase extern RegexSearchBase* CreateRegexSearch(CharClassify *charClassTable); +struct StyledText { + size_t length; + const char *text; + bool multipleStyles; + size_t style; + const unsigned char *styles; + StyledText( size_t length_, const char *text_, bool multipleStyles_, int style_, const unsigned char *styles_) : + length(length_), text(text_), multipleStyles(multipleStyles_), style(style_), styles(styles_) { + } + // Return number of bytes from start to before '\n' or end of text. + // Return 1 when start is outside text + size_t LineLength(size_t start) const { + size_t cur = start; + while ((cur < length) && (text[cur] != '\n')) + cur++; + return cur-start; + } + size_t StyleAt(size_t i) const { + return multipleStyles ? styles[i] : style; + } +}; + /** */ -class Document { +class Document : PerLine { public: /** Used to pair watcher pointer with user data. */ @@ -110,7 +132,6 @@ }; enum charClassification { ccSpace, ccNewLine, ccWord, ccPunctuation }; - private: int refCount; CellBuffer cb; @@ -125,6 +146,10 @@ WatcherWithUserData *watchers; int lenWatchers; + // ldSize is not real data - it is for dimensions and loops + enum lineData { ldMarkers, ldLevels, ldState, ldMargin, ldAnnotation, ldSize }; + PerLine *perLineData[ldSize]; + bool matchesValid; RegexSearchBase* regex; @@ -150,6 +175,9 @@ int AddRef(); int Release(); + virtual void InsertLine(int line); + virtual void RemoveLine(int line); + int LineFromPosition(int pos); int ClampPositionIntoDocument(int pos); bool IsCrLf(int pos); @@ -173,6 +201,7 @@ bool IsCollectingUndo() { return cb.IsCollectingUndo(); } void BeginUndoAction() { cb.BeginUndoAction(); } void EndUndoAction() { cb.EndUndoAction(); } + void AddUndoAction(int token, bool mayCoalesce) { cb.AddUndoAction(token, mayCoalesce); } void SetSavePoint(); bool IsSavePoint() { return cb.IsSavePoint(); } const char *BufferPointer() { return cb.BufferPointer(); } @@ -199,21 +228,21 @@ cb.GetCharRange(buffer, position, lengthRetrieve); } char StyleAt(int position) { return cb.StyleAt(position); } - int GetMark(int line) { return cb.GetMark(line); } + int GetMark(int line); int AddMark(int line, int markerNum); void AddMarkSet(int line, int valueSet); void DeleteMark(int line, int markerNum); void DeleteMarkFromHandle(int markerHandle); void DeleteAllMarks(int markerNum); - int LineFromHandle(int markerHandle) { return cb.LineFromHandle(markerHandle); } + int LineFromHandle(int markerHandle); int LineStart(int line) const; int LineEnd(int line) const; int LineEndPosition(int position); int VCHomePosition(int position); int SetLevel(int line, int level); - int GetLevel(int line) { return cb.GetLevel(line); } - void ClearLevels() { cb.ClearLevels(); } + int GetLevel(int line); + void ClearLevels(); int GetLastChild(int lineParent, int level=-1); int GetFoldParent(int line); @@ -236,7 +265,7 @@ void SetStylingBits(int bits); void StartStyling(int position, char mask); bool SetStyleFor(int length, char style); - bool SetStyles(int length, char *styles); + bool SetStyles(int length, const char *styles); int GetEndStyled() { return endStyled; } void EnsureStyledTo(int pos); int GetStyleClock() { return styleClock; } @@ -244,9 +273,25 @@ void DecorationFillRange(int position, int value, int fillLength); int SetLineState(int line, int state); - int GetLineState(int line) { return cb.GetLineState(line); } - int GetMaxLineState() { return cb.GetMaxLineState(); } + int GetLineState(int line); + int GetMaxLineState(); + StyledText MarginStyledText(int line); + void MarginSetStyle(int line, int style); + void MarginSetStyles(int line, const unsigned char *styles); + void MarginSetText(int line, const char *text); + int MarginLength(int line) const; + void MarginClearAll(); + + bool AnnotationAny() const; + StyledText AnnotationStyledText(int line); + void AnnotationSetText(int line, const char *text); + void AnnotationSetStyle(int line, int style); + void AnnotationSetStyles(int line, const unsigned char *styles); + int AnnotationLength(int line) const; + int AnnotationLines(int line) const; + void AnnotationClearAll(); + bool AddWatcher(DocWatcher *watcher, void *userData); bool RemoveWatcher(DocWatcher *watcher, void *userData); const WatcherWithUserData *GetWatchers() const { return watchers; } @@ -288,6 +333,8 @@ int line; int foldLevelNow; int foldLevelPrev; + int annotationLinesAdded; + int token; DocModification(int modificationType_, int position_=0, int length_=0, int linesAdded_=0, const char *text_=0, int line_=0) : @@ -298,7 +345,9 @@ text(text_), line(line_), foldLevelNow(0), - foldLevelPrev(0) {} + foldLevelPrev(0), + annotationLinesAdded(0), + token(0) {} DocModification(int modificationType_, const Action &act, int linesAdded_=0) : modificationType(modificationType_), @@ -308,7 +357,9 @@ text(act.data), line(0), foldLevelNow(0), - foldLevelPrev(0) {} + foldLevelPrev(0), + annotationLinesAdded(0), + token(0) {} }; /** Modified: trunk/scintilla/Editor.cxx =================================================================== --- trunk/scintilla/Editor.cxx 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/Editor.cxx 2009-05-03 17:49:33 UTC (rev 3769) @@ -1277,7 +1277,8 @@ LayoutLine(lineToWrap, surface, vs, ll, wrapWidth); linesWrapped = ll->lines; } - return cs.SetHeight(lineToWrap, linesWrapped); + return cs.SetHeight(lineToWrap, linesWrapped + + (vs.annotationVisible ? pdoc->AnnotationLines(lineToWrap) : 0)); } // Check if wrapping needed and perform any needed wrapping. @@ -1315,7 +1316,8 @@ if (wrapWidth != LineLayout::wrapWidthInfinite) { wrapWidth = LineLayout::wrapWidthInfinite; for (int lineDoc = 0; lineDoc < pdoc->LinesTotal(); lineDoc++) { - cs.SetHeight(lineDoc, 1); + cs.SetHeight(lineDoc, 1 + + (vs.annotationVisible ? pdoc->AnnotationLines(lineDoc) : 0)); } wrapOccurred = true; } @@ -1457,6 +1459,84 @@ return static_cast<int>(strlen(s)); } +bool ValidStyledText(ViewStyle &vs, size_t styleOffset, const StyledText &st) { + if (st.multipleStyles) { + for (size_t iStyle=0;iStyle<st.length; iStyle++) { + if (!vs.ValidStyle(styleOffset + st.styles[iStyle])) + return false; + } + } else { + if (!vs.ValidStyle(styleOffset + st.style)) + return false; + } + return true; +} + +static int WidthStyledText(Surface *surface, ViewStyle &vs, int styleOffset, + const char *text, const unsigned char *styles, size_t len) { + int width = 0; + size_t start = 0; + while (start < len) { + size_t style = styles[start]; + size_t endSegment = start; + while ((endSegment+1 < len) && (static_cast<size_t>(styles[endSegment+1]) == style)) + endSegment++; + width += surface->WidthText(vs.styles[style+styleOffset].font, text + start, endSegment - start + 1); + start = endSegment + 1; + } + return width; +} + +static int WidestLineWidth(Surface *surface, ViewStyle &vs, int styleOffset, const StyledText &st) { + int widthMax = 0; + size_t start = 0; + while (start < st.length) { + size_t lenLine = st.LineLength(start); + int widthSubLine; + if (st.multipleStyles) { + widthSubLine = WidthStyledText(surface, vs, styleOffset, st.text + start, st.styles + start, lenLine); + } else { + widthSubLine = surface->WidthText(vs.styles[styleOffset + st.style].font, st.text + start, lenLine); + } + if (widthSubLine > widthMax) + widthMax = widthSubLine; + start += lenLine + 1; + } + return widthMax; +} + +void DrawStyledText(Surface *surface, ViewStyle &vs, int styleOffset, PRectangle rcText, int ascent, + const StyledText &st, size_t start, size_t length) { + + if (st.multipleStyles) { + int x = rcText.left; + size_t i = 0; + while (i < length) { + size_t end = i; + int style = st.styles[i + start]; + while (end < length-1 && st.styles[start+end+1] == style) + end++; + style += styleOffset; + int width = surface->WidthText(vs.styles[style].font, st.text + start + i, end - i + 1); + PRectangle rcSegment = rcText; + rcSegment.left = x; + rcSegment.right = x + width + 1; + surface->DrawTextNoClip(rcSegment, vs.styles[style].font, + ascent, st.text + start + i, end - i + 1, + vs.styles[style].fore.allocated, + vs.styles[style].back.allocated); + x += width; + i = end + 1; + } + } else { + int style = st.style + styleOffset; + surface->DrawTextNoClip(rcText, vs.styles[style].font, + rcText.top + vs.maxAscent, st.text, st.length, + vs.styles[style].fore.allocated, + vs.styles[style].back.allocated); + } +} + void Editor::PaintSelMargin(Surface *surfWindow, PRectangle &rc) { if (vs.fixedColumnWidth == 0) return; @@ -1638,6 +1718,20 @@ rcNumber.top + vs.maxAscent, number, istrlen(number), vs.styles[STYLE_LINENUMBER].fore.allocated, vs.styles[STYLE_LINENUMBER].back.allocated); + } else if (vs.ms[margin].style == SC_MARGIN_TEXT || vs.ms[margin].style == SC_MARGIN_RTEXT) { + if (firstSubLine) { + const StyledText stMargin = pdoc->MarginStyledText(lineDoc); + if (stMargin.text && ValidStyledText(vs, vs.marginStyleOffset, stMargin)) { + surface->FillRectangle(rcMarker, + vs.styles[stMargin.StyleAt(0)+vs.marginStyleOffset].back.allocated); + if (vs.ms[margin].style == SC_MARGIN_RTEXT) { + int width = WidestLineWidth(surface, vs, vs.marginStyleOffset, stMargin); + rcMarker.left = rcMarker.right - width - 3; + } + DrawStyledText(surface, vs, vs.marginStyleOffset, rcMarker, rcMarker.top + vs.maxAscent, + stMargin, 0, stMargin.length); + } + } } if (marks) { @@ -2221,6 +2315,58 @@ textBack, textFore); } +void Editor::DrawAnnotation(Surface *surface, ViewStyle &vsDraw, int line, int xStart, + PRectangle rcLine, LineLayout *ll, int subLine) { + int indent = pdoc->GetLineIndentation(line) * vsDraw.spaceWidth; + PRectangle rcSegment = rcLine; + int annotationLine = subLine - ll->lines; + const StyledText stAnnotation = pdoc->AnnotationStyledText(line); + if (stAnnotation.text && ValidStyledText(vsDraw, vsDraw.annotationStyleOffset, stAnnotation)) { + surface->FillRectangle(rcSegment, vsDraw.styles[0].back.allocated); + if (vs.annotationVisible == ANNOTATION_BOXED) { + // Only care about calculating width if need to draw box + int widthAnnotation = WidestLineWidth(surface, vsDraw, vsDraw.annotationStyleOffset, stAnnotation); + widthAnnotation += vsDraw.spaceWidth * 2; // Margins + rcSegment.left = xStart + indent; + rcSegment.right = rcSegment.left + widthAnnotation; + surface->PenColour(vsDraw.styles[vsDraw.annotationStyleOffset].fore.allocated); + } else { + rcSegment.left = xStart; + } + const int annotationLines = pdoc->AnnotationLines(line); + size_t start = 0; + size_t lengthAnnotation = stAnnotation.LineLength(start); + int lineInAnnotation = 0; + while ((lineInAnnotation < annotationLine) && (start < stAnnotation.length)) { + start += lengthAnnotation + 1; + lengthAnnotation = stAnnotation.LineLength(start); + lineInAnnotation++; + } + PRectangle rcText = rcSegment; + if (vs.annotationVisible == ANNOTATION_BOXED) { + surface->FillRectangle(rcText, + vsDraw.styles[stAnnotation.StyleAt(start) + vsDraw.annotationStyleOffset].back.allocated); + rcText.left += vsDraw.spaceWidth; + } + DrawStyledText(surface, vsDraw, vsDraw.annotationStyleOffset, rcText, rcText.top + vsDraw.maxAscent, + stAnnotation, start, lengthAnnotation); + if (vs.annotationVisible == ANNOTATION_BOXED) { + surface->MoveTo(rcSegment.left, rcSegment.top); + surface->LineTo(rcSegment.left, rcSegment.bottom); + surface->MoveTo(rcSegment.right, rcSegment.top); + surface->LineTo(rcSegment.right, rcSegment.bottom); + if (subLine == ll->lines){ + surface->MoveTo(rcSegment.left, rcSegment.top); + surface->LineTo(rcSegment.right, rcSegment.top); + } + if (subLine == ll->lines+annotationLines-1) { + surface->MoveTo(rcSegment.left, rcSegment.bottom - 1); + surface->LineTo(rcSegment.right, rcSegment.bottom - 1); + } + } + } +} + void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVisible, int xStart, PRectangle rcLine, LineLayout *ll, int subLine) { @@ -2280,6 +2426,10 @@ int startseg = ll->LineStart(subLine); int subLineStart = ll->positions[startseg]; + if (subLine >= ll->lines) { + DrawAnnotation(surface, vsDraw, line, xStart, rcLine, ll, subLine); + return; // No further drawing + } int lineStart = 0; int lineEnd = 0; if (subLine < ll->lines) { @@ -2693,9 +2843,16 @@ } // We now know what to draw, update the caret drawing rectangle - rcCaret.left = ll->positions[offsetFirstChar] - ll->positions[ll->LineStart(subLine)] + xStart; - rcCaret.right = ll->positions[offsetFirstChar+numCharsToDraw] - ll->positions[ll->LineStart(subLine)] + xStart; + rcCaret.left = ll->positions[offsetFirstChar] - ll->positions[lineStart] + xStart; + rcCaret.right = ll->positions[offsetFirstChar+numCharsToDraw] - ll->positions[lineStart] + xStart; + // Adjust caret position to take into account any word wrapping symbols. + if ((actualWrapVisualStartIndent != 0) && (lineStart != 0)) { + int wordWrapCharWidth = actualWrapVisualStartIndent * vs.aveCharWidth; + rcCaret.left += wordWrapCharWidth; + rcCaret.right += wordWrapCharWidth; + } + // This character is where the caret block is, we override the colours // (inversed) for drawing the caret here. int styleMain = ll->styles[offsetFirstChar]; @@ -2793,7 +2950,7 @@ //Platform::DebugPrintf("Paint lines = %d .. %d\n", topLine + screenLinePaintFirst, lineStyleLast); int endPosPaint = pdoc->Length(); if (lineStyleLast < cs.LinesDisplayed()) - endPosPaint = pdoc->LineStart(cs.DocFromDisplay(lineStyleLast + 1)); + endPosPaint = pdoc->LineStart(cs.DocFromDisplay(lineStyleLast) + 1); int xStart = vs.fixedColumnWidth - xOffset; int ypos = 0; @@ -2945,7 +3102,9 @@ ll->RestoreBracesHighlight(rangeLine, braces); bool expanded = cs.GetExpanded(lineDoc); +#ifdef INCLUDE_DEPRECATED_FEATURES if ((foldFlags & SC_FOLDFLAG_BOX) == 0) { +#endif // Paint the line above the fold if ((expanded && (foldFlags & SC_FOLDFLAG_LINEBEFORE_EXPANDED)) || @@ -2966,6 +3125,7 @@ surface->FillRectangle(rcFoldLine, vs.styles[STYLE_DEFAULT].fore.allocated); } } +#ifdef INCLUDE_DEPRECATED_FEATURES } else { int FoldLevelCurr = (pdoc->GetLevel(lineDoc) & SC_FOLDLEVELNUMBERMASK) - SC_FOLDLEVELBASE; int FoldLevelPrev = (pdoc->GetLevel(lineDoc - 1) & SC_FOLDLEVELNUMBERMASK) - SC_FOLDLEVELBASE; @@ -3001,6 +3161,7 @@ surface->FillRectangle(rcBoxLine, vs.styles[STYLE_DEFAULT].fore.allocated); } } +#endif // Draw the Caret if (lineDoc == lineCaret) { @@ -3512,6 +3673,8 @@ } if (!pdoc->IsReadOnly()) { cs.Clear(); + pdoc->AnnotationClearAll(); + pdoc->MarginClearAll(); } pdoc->EndUndoAction(); anchor = 0; @@ -3885,6 +4048,10 @@ int lines = Platform::Maximum(0, mh.linesAdded); NeedWrapping(lineDoc, lineDoc + lines + 1); } + // Fix up annotation heights + int lineDoc = pdoc->LineFromPosition(mh.position); + int lines = Platform::Maximum(0, mh.linesAdded); + SetAnnotationHeights(lineDoc, lineDoc + lines + 2); } } @@ -3972,6 +4139,12 @@ cs.DeleteLines(lineOfPos, -mh.linesAdded); } } + if (mh.modificationType & SC_MOD_CHANGEANNOTATION) { + int lineDoc = pdoc->LineFromPosition(mh.position); + if (vs.annotationVisible) { + cs.SetHeight(lineDoc, cs.GetHeight(lineDoc) + mh.annotationLinesAdded); + } + } CheckModificationForWrap(mh); if (mh.linesAdded != 0) { // Avoid scrolling of display if change before current display @@ -4002,7 +4175,7 @@ SetScrollBars(); } - if (mh.modificationType & SC_MOD_CHANGEMARKER) { + if ((mh.modificationType & SC_MOD_CHANGEMARKER) || (mh.modificationType & SC_MOD_CHANGEMARGIN)) { if ((paintState == notPainting) || !PaintContainsMargin()) { if (mh.modificationType & SC_MOD_CHANGEFOLD) { // Fold changes can affect the drawing of following lines so redraw whole margin @@ -4036,6 +4209,8 @@ scn.line = mh.line; scn.foldLevelNow = mh.foldLevelNow; scn.foldLevelPrev = mh.foldLevelPrev; + scn.token = mh.token; + scn.annotationLinesAdded = mh.annotationLinesAdded; NotifyParent(scn); } } @@ -4305,8 +4480,16 @@ void Editor::CursorUpOrDown(int direction, selTypes sel) { Point pt = LocationFromPosition(currentPos); + int lineDoc = pdoc->LineFromPosition(currentPos); + Point ptStartLine = LocationFromPosition(pdoc->LineStart(lineDoc)); + int subLine = (pt.y - ptStartLine.y) / vs.lineHeight; + int commentLines = vs.annotationVisible ? pdoc->AnnotationLines(lineDoc) : 0; int posNew = PositionFromLocation( Point(lastXChosen, pt.y + direction * vs.lineHeight)); + if ((direction > 0) && (subLine >= (cs.GetHeight(lineDoc) - 1 - commentLines))) { + posNew = PositionFromLocation( + Point(lastXChosen, pt.y + (commentLines + 1) * vs.lineHeight)); + } if (direction < 0) { // Line wrapping may lead to a location on the same line, so // seek back if that is the case. @@ -4611,6 +4794,7 @@ SetLastXChosen(); } EnsureCaretVisible(); + ShowCaretAtCurrentPosition(); // Avoid blinking break; case SCI_BACKTAB: Indent(false); @@ -4618,6 +4802,7 @@ SetLastXChosen(); } EnsureCaretVisible(); + ShowCaretAtCurrentPosition(); // Avoid blinking break; case SCI_NEWLINE: NewLine(); @@ -5740,6 +5925,14 @@ } } +void Editor::SetAnnotationHeights(int start, int end) { + if (vs.annotationVisible) { + for (int line=start; line<end; line++) { + cs.SetHeight(line, pdoc->AnnotationLines(line) + 1); + } + } +} + void Editor::SetDocPointer(Document *document) { //Platform::DebugPrintf("** %x setdoc to %x\n", pdoc, document); pdoc->RemoveWatcher(this, 0); @@ -5764,6 +5957,7 @@ // Reset the contraction state to fully shown. cs.Clear(); cs.InsertLines(0, pdoc->LinesTotal() - 1); + SetAnnotationHeights(0, pdoc->LinesTotal()); llc.Deallocate(); NeedWrapping(); @@ -5772,6 +5966,22 @@ Redraw(); } +void Editor::SetAnnotationVisible(int visible) { + if (vs.annotationVisible != visible) { + bool changedFromOrToHidden = ((vs.annotationVisible != 0) != (visible != 0)); + vs.annotationVisible = visible; + if (changedFromOrToHidden) { + int dir = vs.annotationVisible ? 1 : -1; + for (int line=0; line<pdoc->LinesTotal(); line++) { + int annotationLines = pdoc->AnnotationLines(line); + if (annotationLines > 0) { + cs.SetHeight(line, cs.GetHeight(line) + annotationLines * dir); + } + } + } + } +} + /** * Recursively expand a fold, making lines visible except where they have an unexpanded parent. */ @@ -6892,6 +7102,13 @@ InvalidateStyleData(); RedrawSelMargin(); break; + + case SCI_MARKERSYMBOLDEFINED: + if (wParam <= MARKER_MAX) + return vs.markers[wParam].markType; + else + return 0; + case SCI_MARKERSETFORE: if (wParam <= MARKER_MAX) vs.markers[wParam].fore.desired = ColourDesired(lParam); @@ -7304,6 +7521,16 @@ case SCI_INDICGETUNDER: return (wParam <= INDIC_MAX) ? vs.indicators[wParam].under : 0; + case SCI_INDICSETALPHA: + if (wParam <= INDIC_MAX && lParam >=0 && lParam <= 100) { + vs.indicators[wParam].fillAlpha = lParam; + InvalidateStyleRedraw(); + } + break; + + case SCI_INDICGETALPHA: + return (wParam <= INDIC_MAX) ? vs.indicators[wParam].fillAlpha : 0; + case SCI_SETINDICATORCURRENT: pdoc->decorations.SetCurrentIndicator(wParam); break; @@ -7675,6 +7902,138 @@ case SCI_GETCHARACTERPOINTER: return reinterpret_cast<sptr_t>(pdoc->BufferPointer()); + case SCI_SETEXTRAASCENT: + vs.extraAscent = wParam; + InvalidateStyleRedraw(); + break; + + case SCI_GETEXTRAASCENT: + return vs.extraAscent; + + case SCI_SETEXTRADESCENT: + vs.extraDescent = wParam; + InvalidateStyleRedraw(); + break; + + case SCI_GETEXTRADESCENT: + return vs.extraDescent; + + case SCI_MARGINSETSTYLEOFFSET: + vs.marginStyleOffset = wParam; + InvalidateStyleRedraw(); + break; + + case SCI_MARGINGETSTYLEOFFSET: + return vs.marginStyleOffset; + + case SCI_MARGINSETTEXT: + pdoc->MarginSetText(wParam, CharPtrFromSPtr(lParam)); + break; + + case SCI_MARGINGETTEXT: { + const StyledText st = pdoc->MarginStyledText(wParam); + if (lParam) { + if (st.text) + memcpy(CharPtrFromSPtr(lParam), st.text, st.length); + else + strcpy(CharPtrFromSPtr(lParam), ""); + } + return st.length; + } + + case SCI_MARGINSETSTYLE: + pdoc->MarginSetStyle(wParam, lParam); + break; + + case SCI_MARGINGETSTYLE: { + const StyledText st = pdoc->MarginStyledText(wParam); + return st.style; + } + + case SCI_MARGINSETSTYLES: + pdoc->MarginSetStyles(wParam, reinterpret_cast<const unsigned char *>(lParam)); + break; + + case SCI_MARGINGETSTYLES: { + const StyledText st = pdoc->MarginStyledText(wParam); + if (lParam) { + if (st.styles) + memcpy(CharPtrFromSPtr(lParam), st.styles, st.length); + else + strcpy(CharPtrFromSPtr(lParam), ""); + } + return st.styles ? st.length : 0; + } + + case SCI_MARGINTEXTCLEARALL: + pdoc->MarginClearAll(); + break; + + case SCI_ANNOTATIONSETTEXT: + pdoc->AnnotationSetText(wParam, CharPtrFromSPtr(lParam)); + break; + + case SCI_ANNOTATIONGETTEXT: { + const StyledText st = pdoc->AnnotationStyledText(wParam); + if (lParam) { + if (st.text) + memcpy(CharPtrFromSPtr(lParam), st.text, st.length); + else + strcpy(CharPtrFromSPtr(lParam), ""); + } + return st.length; + } + + case SCI_ANNOTATIONGETSTYLE: { + const StyledText st = pdoc->AnnotationStyledText(wParam); + return st.style; + } + + case SCI_ANNOTATIONSETSTYLE: + pdoc->AnnotationSetStyle(wParam, lParam); + break; + + case SCI_ANNOTATIONSETSTYLES: + pdoc->AnnotationSetStyles(wParam, reinterpret_cast<const unsigned char *>(lParam)); + break; + + case SCI_ANNOTATIONGETSTYLES: { + const StyledText st = pdoc->AnnotationStyledText(wParam); + if (lParam) { + if (st.styles) + memcpy(CharPtrFromSPtr(lParam), st.styles, st.length); + else + strcpy(CharPtrFromSPtr(lParam), ""); + } + return st.styles ? st.length : 0; + } + + case SCI_ANNOTATIONGETLINES: + return pdoc->AnnotationLines(wParam); + + case SCI_ANNOTATIONCLEARALL: + pdoc->AnnotationClearAll(); + break; + + case SCI_ANNOTATIONSETVISIBLE: + SetAnnotationVisible(wParam); + break; + + case SCI_ANNOTATIONGETVISIBLE: + return vs.annotationVisible; + + case SCI_ANNOTATIONSETSTYLEOFFSET: + vs.annotationStyleOffset = wParam; + InvalidateStyleRedraw(); + break; + + case SCI_ANNOTATIONGETSTYLEOFFSET: + return vs.annotationStyleOffset; + + case SCI_ADDUNDOACTION: + pdoc->AddUndoAction(wParam, lParam & UNDO_MAY_COALESCE); + break; + default: return DefWndProc(iMessage, wParam, lParam); } Modified: trunk/scintilla/Editor.h =================================================================== --- trunk/scintilla/Editor.h 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/Editor.h 2009-05-03 17:49:33 UTC (rev 3769) @@ -322,6 +322,8 @@ bool drawWrapMark, ColourAllocated wrapColour); void DrawIndicators(Surface *surface, ViewStyle &vsDraw, int line, int xStart, PRectangle rcLine, LineLayout *ll, int subLine, int lineEnd, bool under); + void DrawAnnotation(Surface *surface, ViewStyle &vsDraw, int line, int xStart, + PRectangle rcLine, LineLayout *ll, int subLine); void DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVisible, int xStart, PRectangle rcLine, LineLayout *ll, int subLine=0); void DrawBlockCaret(Surface *surface, ViewStyle &vsDraw, LineLayout *ll, int subLine, int xStart, int offset, int posCaret, PRectangle rcCaret); @@ -443,7 +445,10 @@ void CheckForChangeOutsidePaint(Range r); void SetBraceHighlight(Position pos0, Position pos1, int matchStyle); + void SetAnnotationHeights(int start, int end); void SetDocPointer(Document *document); + + void SetAnnotationVisible(int visible); void Expand(int &line, bool doExpand); void ToggleContraction(int line); Modified: trunk/scintilla/Indicator.cxx =================================================================== --- trunk/scintilla/Indicator.cxx 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/Indicator.cxx 2009-05-03 17:49:33 UTC (rev 3769) @@ -72,7 +72,7 @@ rcBox.top = rcLine.top + 1; rcBox.left = rc.left; rcBox.right = rc.right; - surface->AlphaRectangle(rcBox, 1, fore.allocated, 30, fore.allocated, 50, 0); + surface->AlphaRectangle(rcBox, 1, fore.allocated, fillAlpha, fore.allocated, 50, 0); } else { // Either INDIC_PLAIN or unknown surface->MoveTo(rc.left, ymid); surface->LineTo(rc.right, ymid); Modified: trunk/scintilla/Indicator.h =================================================================== --- trunk/scintilla/Indicator.h 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/Indicator.h 2009-05-03 17:49:33 UTC (rev 3769) @@ -19,7 +19,8 @@ int style; bool under; ColourPair fore; - Indicator() : style(INDIC_PLAIN), under(false), fore(ColourDesired(0,0,0)) { + int fillAlpha; + Indicator() : style(INDIC_PLAIN), under(false), fore(ColourDesired(0,0,0)), fillAlpha(30) { } void Draw(Surface *surface, const PRectangle &rc, const PRectangle &rcLine); }; Modified: trunk/scintilla/KeyWords.cxx =================================================================== --- trunk/scintilla/KeyWords.cxx 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/KeyWords.cxx 2009-05-03 17:49:33 UTC (rev 3769) @@ -144,7 +144,6 @@ LINK_LEXER(lmAda); LINK_LEXER(lmAsm); LINK_LEXER(lmBash); - LINK_LEXER(lmFreeBasic); LINK_LEXER(lmCaml); LINK_LEXER(lmCmake); LINK_LEXER(lmCPP); @@ -153,6 +152,7 @@ LINK_LEXER(lmDiff); LINK_LEXER(lmF77); LINK_LEXER(lmFortran); + LINK_LEXER(lmFreeBasic); LINK_LEXER(lmHaskell); LINK_LEXER(lmHTML); LINK_LEXER(lmLatex); Modified: trunk/scintilla/LexBash.cxx =================================================================== --- trunk/scintilla/LexBash.cxx 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/LexBash.cxx 2009-05-03 17:49:33 UTC (rev 3769) @@ -334,6 +334,10 @@ } char s[HERE_DELIM_MAX]; sc.GetCurrent(s, sizeof(s)); + if (sc.LengthCurrent() == 0) + break; + if (s[strlen(s) - 1] == '\r') + s[strlen(s) - 1] = '\0'; if (strcmp(HereDoc.Delimiter, s) == 0) { if ((prefixws > 0 && HereDoc.Indent) || // indentation rule (prefixws == 0 && !HereDoc.Indent)) { Modified: trunk/scintilla/LexCPP.cxx =================================================================== --- trunk/scintilla/LexCPP.cxx 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/LexCPP.cxx 2009-05-03 17:49:33 UTC (rev 3769) @@ -58,6 +58,9 @@ WordList &keywords3 = *keywordlists[2]; WordList &keywords4 = *keywordlists[3]; + // property styling.within.preprocessor + // For C++ code, determines whether all preprocessor code is styled in the preprocessor style (0, the default) + // or only from the initial # to the end of the command word(1). bool stylingWithinPreprocessor = styler.GetPropertyInt("styling.within.preprocessor") != 0; CharacterSet setOKBeforeRE(CharacterSet::setNone, "([{=,:;!%^&*|?~+-"); @@ -67,6 +70,9 @@ CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true); CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true); + + // property lexer.cpp.allow.dollars + // Set to 0 to disallow the '$' character in identifiers with the cpp lexer. if (styler.GetPropertyInt("lexer.cpp.allow.dollars", 1) != 0) { setWordStart.Add('$'); setWord.Add('$'); @@ -77,6 +83,7 @@ bool lastWordWasUUID = false; int styleBeforeDCKeyword = SCE_C_DEFAULT; bool continuationLine = false; + bool isIncludePreprocessor = false; if (initStyle == SCE_C_PREPROCESSOR) { // Set continuationLine if last character of previous line is '\' @@ -118,6 +125,7 @@ // if different sets of lines lexed. visibleChars = 0; lastWordWasUUID = false; + isIncludePreprocessor = false; } // Handle line continuation generically. @@ -230,6 +238,11 @@ case SCE_C_STRING: if (sc.atLineEnd) { sc.ChangeState(SCE_C_STRINGEOL); + } else if (isIncludePreprocessor) { + if (sc.ch == '>') { + sc.ForwardSetState(SCE_C_DEFAULT); + isIncludePreprocessor = false; + } } else if (sc.ch == '\\') { if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { sc.Forward(); @@ -321,6 +334,9 @@ sc.SetState(SCE_C_REGEX); // JavaScript's RegEx } else if (sc.ch == '\"') { sc.SetState(SCE_C_STRING); + isIncludePreprocessor = false; // ensure that '>' won't end the string + } else if (isIncludePreprocessor && sc.ch == '<') { + sc.SetState(SCE_C_STRING); } else if (sc.ch == '\'') { sc.SetState(SCE_C_CHARACTER); } else if (sc.ch == '#' && visibleChars == 0) { @@ -332,6 +348,8 @@ } while ((sc.ch == ' ' || sc.ch == '\t') && sc.More()); if (sc.atLineEnd) { sc.SetState(SCE_C_DEFAULT); + } else if (sc.Match("include")) { + isIncludePreprocessor = true; } } else if (isoperator(static_cast<char>(sc.ch))) { sc.SetState(SCE_C_OPERATOR); @@ -359,10 +377,24 @@ // and to make it possible to fiddle the current level for "} else {". static void FoldCppDoc(unsigned int startPos, int length, int initStyle, WordList *[], Accessor &styler) { + + // property fold.comment + // This option enables folding multi-line comments and explicit fold points when using the C++ lexer. + // Explicit fold points allows adding extra folding by placing a //{ comment at the start and a //} + // at the end of a section that should fold. bool foldComment = styler.GetPropertyInt("fold.comment") != 0; + + // property fold.preprocessor + // This option enables folding preprocessor directives when using the C++ lexer. + // Includes C#'s explicit #region and #endregion folding directives. bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0; + bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; + + // property fold.at.else + // This option enables C++ folding on a "} else {" line of an if statement. bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0; + unsigned int endPos = startPos + length; int visibleChars = 0; int lineCurrent = styler.GetLine(startPos); Modified: trunk/scintilla/LexD.cxx =================================================================== --- trunk/scintilla/LexD.cxx 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/LexD.cxx 2009-05-03 17:49:33 UTC (rev 3769) @@ -268,6 +268,9 @@ static void FoldDoc(unsigned int startPos, int length, int initStyle, Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; + + // property lexer.d.fold.at.else + // This option enables D folding on a "} else {" line of an if statement. bool foldAtElse = styler.GetPropertyInt("lexer.d.fold.at.else", styler.GetPropertyInt("fold.at.else", 0)) != 0; unsigned int endPos = startPos + length; Modified: trunk/scintilla/LexFortran.cxx =================================================================== --- trunk/scintilla/LexFortran.cxx 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/LexFortran.cxx 2009-05-03 17:49:33 UTC (rev 3769) @@ -83,7 +83,7 @@ // Handle the fix format generically int toLineStart = sc.currentPos - posLineStart; if (isFixFormat && (toLineStart < 6 || toLineStart > 72)) { - if (toLineStart == 0 && (tolower(sc.ch) == 'c' || sc.ch == '*') || sc.ch == '!') { + if ((toLineStart == 0 && (tolower(sc.ch) == 'c' || sc.ch == '*')) || sc.ch == '!') { if (sc.MatchIgnoreCase("cdec$") || sc.MatchIgnoreCase("*dec$") || sc.MatchIgnoreCase("!dec$") || sc.MatchIgnoreCase("cdir$") || sc.MatchIgnoreCase("*dir$") || sc.MatchIgnoreCase("!dir$") || sc.MatchIgnoreCase("cms$") || sc.MatchIgnoreCase("*ms$") || sc.MatchIgnoreCase("!ms$") || @@ -252,7 +252,7 @@ lev = 0; else lev = 1; - } else if (strcmp(s, "end") == 0 && chNextNonBlank != '=' + } else if ((strcmp(s, "end") == 0 && chNextNonBlank != '=') || strcmp(s, "endassociate") == 0 || strcmp(s, "endblock") == 0 || strcmp(s, "endblockdata") == 0 || strcmp(s, "endselect") == 0 || strcmp(s, "enddo") == 0 || strcmp(s, "endenum") ==0 Modified: trunk/scintilla/LexHTML.cxx =================================================================== --- trunk/scintilla/LexHTML.cxx 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/LexHTML.cxx 2009-05-03 17:49:33 UTC (rev 3769) @@ -274,17 +274,30 @@ s[i] = '\0'; // No keywords -> all are known - // Name of a closing tag starts at s + 1 char chAttr = SCE_H_TAGUNKNOWN; if (s[0] == '!') { chAttr = SCE_H_SGML_DEFAULT; - } else if (!keywords || keywords.InList(s[0] == '/' ? s + 1 : s)) { + } else if (!keywords || keywords.InList(s)) { chAttr = SCE_H_TAG; } styler.ColourTo(end, chAttr); if (chAttr == SCE_H_TAG) { if (allowScripts && 0 == strcmp(s, "script")) { - chAttr = SCE_H_SCRIPT; + // check to see if this is a self-closing tag by sniffing ahead + bool isSelfClose = false; + for (unsigned int cPos = end; cPos <= end + 100; cPos++) { + char ch = styler.SafeGetCharAt(cPos, '\0'); + if (ch == '\0' || ch == '>') + break; + else if (ch == '/' && styler.SafeGetCharAt(cPos + 1, '\0') == '>') { + isSelfClose = true; + break; + } + } + + // do not enter a script state if the tag self-closed + if (!isSelfClose) + chAttr = SCE_H_SCRIPT; } else if (!isXml && 0 == strcmp(s, "comment")) { chAttr = SCE_H_COMMENT; } @@ -561,6 +574,10 @@ } else { // Default client and ASP scripting language is JavaScript lineState = eScriptJS << 8; + + // property asp.default.language + // Script in ASP code is initially assumed to be in JavaScript. + // To change this to VBScript set asp.default.language to 2. Python is 3. lineState |= styler.GetPropertyInt("asp.default.language", eScriptJS) << 4; } script_mode inScriptType = script_mode((lineState >> 0) & 0x03); // 2 bits of scripting mode @@ -577,13 +594,37 @@ scriptLanguage = eScriptComment; } + // property fold.html + // Folding is turned on or off for HTML and XML files with this option. + // The fold option must also be on for folding to occur. const bool foldHTML = styler.GetPropertyInt("fold.html", 0) != 0; + const bool fold = foldHTML && styler.GetPropertyInt("fold", 0); + + // property fold.html.preprocessor + // Folding is turned on or off for scripts embedded in HTML files with this option. + // The default is on. const bool foldHTMLPreprocessor = foldHTML && styler.GetPropertyInt("fold.html.preprocessor", 1); + const bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; + + // property fold.hypertext.comment + // Allow folding for comments in scripts embedded in HTML. + // The default is off. const bool foldComment = fold && styler.GetPropertyInt("fold.hypertext.comment", 0) != 0; + + // property fold.hypertext.heredoc + // Allow folding for heredocs in scripts embedded in HTML. + // The default is off. const bool foldHeredoc = fold && styler.GetPropertyInt("fold.hypertext.heredoc", 0) != 0; + + // property html.tags.case.sensitive + // For XML and HTML, setting this property to 1 will make tags match in a case + // sensitive way which is the expected behaviour for XML and XHTML. const bool caseSensitive = styler.GetPropertyInt("html.tags.case.sensitive", 0) != 0; + + // property lexer.xml.allow.scripts + // Set to 0 to disable scripts in XML. const bool allowScripts = styler.GetPropertyInt("lexer.xml.allow.scripts", 1) != 0; const CharacterSet setHTMLWord(CharacterSet::setAlphaNum, ".-_:!#", 0x80, true); Modified: trunk/scintilla/LexOthers.cxx =================================================================== --- trunk/scintilla/LexOthers.cxx 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/LexOthers.cxx 2009-05-03 17:49:33 UTC (rev 3769) @@ -694,6 +694,11 @@ styler.StartSegment(startPos); unsigned int linePos = 0; unsigned int startLine = startPos; + + // property lexer.props.allow.initial.spaces + // For properties files, set to 0 to style all lines that start with whitespace in the default style. + // This is not suitable for SciTE .properties files which use indentation for flow control but + // can be used for RFC2822 text where indentation is used for continuation lines. bool allowInitialSpaces = styler.GetPropertyInt("lexer.props.allow.initial.spaces", 1) != 0; for (unsigned int i = startPos; i < startPos + length; i++) { @@ -782,7 +787,7 @@ lev = SC_FOLDLEVELBASE; } int flagsNext = styler.LevelAt(lineCurrent); - styler.SetLevel(lineCurrent, lev | flagsNext & ~SC_FOLDLEVELNUMBERMASK); + styler.SetLevel(lineCurrent, lev | (flagsNext & ~SC_FOLDLEVELNUMBERMASK)); } static void ColouriseMakeLine( @@ -1097,6 +1102,12 @@ styler.StartAt(startPos); styler.StartSegment(startPos); unsigned int linePos = 0; + + // property lexer.errorlist.value.separate + // For lines in the output pane that are matches from Find in Files or GCC-style + // diagnostics, style the path and line number separately from the rest of the + // line with style 21 used for the rest of the line. + // This allows matched text to be more easily distinguished from its location. bool valueSeparate = styler.GetPropertyInt("lexer.errorlist.value.separate", 0) != 0; for (unsigned int i = startPos; i < startPos + length; i++) { lineBuffer[linePos++] = styler[i]; Modified: trunk/scintilla/LexPascal.cxx =================================================================== --- trunk/scintilla/LexPascal.cxx 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/LexPascal.cxx 2009-05-03 17:49:33 UTC (rev 3769) @@ -4,8 +4,109 @@ ** Written by Laurent le Tynevez ** Updated by Simon Steele <s.steele(a)pnotepad.org> September 2002 ** Updated by Mathias Rauen <scite(a)madshi.net> May 2003 (Delphi adjustments) + ** Completely rewritten by Marko Njezic <sf(a)maxempire.com> October 2008 **/ +/* + +A few words about features of the new completely rewritten LexPascal... + +Generally speaking LexPascal tries to support all available Delphi features (up +to Delphi 2009 at this time), including .NET specific features. + +~ HIGHLIGHTING: + +If you enable "lexer.pascal.smart.highlighting" property, some keywords will +only be highlighted in appropriate context. As implemented those are keywords +related to property and DLL exports declarations (similar to how Delphi IDE +works). + +For example, keywords "read" and "write" will only be highlighted if they are in +property declaration: + +property MyProperty: boolean read FMyProperty write FMyProperty; + +~ FOLDING: + +Folding is supported in the following cases: + +- Folding of stream-like comments +- Folding of groups of consecutive line comments +- Folding of preprocessor blocks (the following preprocessor blocks are +supported: IF / IFEND; IFDEF, IFNDEF, IFOPT / ENDIF and REGION / ENDREGION +blocks), including nesting of preprocessor blocks up to 255 levels +- Folding of code blocks on appropriate keywords (the following code blocks are +supported: "begin, asm, record, try, case / end" blocks, class & object +declarations and interface declarations) + +Remarks: + +- Folding of code blocks tries to handle all special cases in which folding +should not occur. As implemented those are: + +1. Structure "record case / end" (there's only one "end" statement and "case" is +ignored as fold point) +2. Forward class declarations ("type TMyClass = class;") and object method +declarations ("TNotifyEvent = procedure(Sender: TObject) of object;") are +ignored as fold points +3. Simplified complete class declarations ("type TMyClass = class(TObject);") +are ignored as fold points +4. Every other situation when class keyword doesn't actually start class +declaration ("class procedure", "class function", "class of", "class var", +"class property" and "class operator") + +- Folding of code blocks inside preprocessor blocks is disabled (any comments +inside them will be folded fine) because there is no guarantee that complete +code block will be contained inside folded preprocessor block in which case +folded code block could end prematurely at the end of preprocessor block if +there is no closing statement inside. This was done in order to properly process +document that may contain something like this: + +type +{$IFDEF UNICODE} + TMyClass = class(UnicodeAncestor) +{$ELSE} + TMyClass = class(AnsiAncestor) +{$ENDIF} + private + ... + public + ... + published + ... +end; + +If class declarations were folded, then the second class declaration would end +at "$ENDIF" statement, first class statement would end at "end;" statement and +preprocessor "$IFDEF" block would go all the way to the end of document. +However, having in mind all this, if you want to enable folding of code blocks +inside preprocessor blocks, you can disable folding of preprocessor blocks by +changing "fold.preprocessor" property, in which case everything inside them +would be folded. + +~ KEYWORDS: + +The list of keywords that can be used in pascal.properties file (up to Delphi +2009): + +- Keywords: absolute abstract and array as asm assembler automated begin case +cdecl class const constructor deprecated destructor dispid dispinterface div do +downto dynamic else end except export exports external far file final +finalization finally for forward function goto if implementation in inherited +initialization inline interface is label library message mod near nil not object +of on or out overload override packed pascal platform private procedure program +property protected public published raise record register reintroduce repeat +resourcestring safecall sealed set shl shr static stdcall strict string then +threadvar to try type unit unsafe until uses var varargs virtual while with xor + +- Keywords related to the "smart highlithing" feature: add default implements +index name nodefault read readonly remove stored write writeonly + +- Keywords related to Delphi packages (in addition to all above): package +contains requires + +*/ + #include <stdlib.h> #include <string.h> #include <ctype.h> @@ -20,12 +121,13 @@ #include "Scintilla.h" #include "SciLexer.h" #include "StyleContext.h" +#include "CharacterSet.h" #ifdef SCI_NAMESPACE using namespace Scintilla; #endif -static void getRange(unsigned int start, +static void GetRangeLowered(unsigned int start, unsigned int end, Accessor &styler, char *s, @@ -38,241 +140,361 @@ s[i] = '\0'; } -static bool IsStreamCommentStyle(int style) { - return style == SCE_C_COMMENT || - style == SCE_C_COMMENTDOC || - style == SCE_C_COMMENTDOCKEYWORD || - style == SCE_C_COMMENTDOCKEYWORDERROR; -} +static void GetForwardRangeLowered(unsigned int start, + CharacterSet &charSet, + Accessor &styler, + char *s, + unsigned int len) { + unsigned int i = 0; + while ((i < len-1) && charSet.Contains(styler.SafeGetCharAt(start + i))) { + s[i] = static_cast<char>(tolower(styler.SafeGetCharAt(start + i))); + i++; + } + s[i] = '\0'; -static void ColourTo(Accessor &styler, unsigned int end, unsigned int attr, bool bInAsm) { - if ((bInAsm) && (attr == SCE_C_OPERATOR || attr == SCE_C_NUMBER || attr == SCE_C_DEFAULT || attr == SCE_C_WORD || attr == SCE_C_IDENTIFIER)) { - styler.ColourTo(end, SCE_C_REGEX); - } else - styler.ColourTo(end, attr); } -// returns 1 if the item starts a class definition, and -1 if the word is "end", and 2 if the word is "asm" -static int classifyWordPascal(unsigned int start, unsigned int end, /*WordList &keywords*/WordList *keywordlists[], Accessor &styler, bool bInClass, bool bInAsm) { - int ret = 0; +enum { + stateInAsm = 0x1000, + stateInProperty = 0x2000, + stateInExport = 0x4000, + stateFoldInPreprocessor = 0x0100, + stateFoldInRecord = 0x0200, + stateFoldInPreprocessorLevelMask = 0x00FF, + stateFoldMaskAll = 0x0FFF +}; +static void ClassifyPascalWord(WordList *keywordlists[], StyleContext &sc, int &curLineState, bool bSmartHighlighting) { WordList& keywords = *keywordlists[0]; - WordList& classwords = *keywordlists[1]; char s[100]; - getRange(start, end, styler, s, sizeof(s)); + sc.GetCurrentLowered(s, sizeof(s)); + if (keywords.InList(s)) { + if (curLineState & stateInAsm) { + if (strcmp(s, "end") == 0 && sc.GetRelative(-4) != '@') { + curLineState &= ~stateInAsm; + sc.ChangeState(SCE_PAS_WORD); + } else { + sc.ChangeState(SCE_PAS_ASM); + } + } else { + bool ignoreKeyword = false; + if (strcmp(s, "asm") == 0) { + curLineState |= stateInAsm; + } else if (bSmartHighlighting) { + if (strcmp(s, "property") == 0) { + curLineState |= stateInProperty; + } else if (strcmp(s, "exports") == 0) { + curLineState |= stateInExport; + } else if (!(curLineState & (stateInProperty | stateInExport)) && strcmp(s, "index") == 0) { + ignoreKeyword = true; + } else if (!(curLineState & stateInExport) && strcmp(s, "name") == 0) { + ignoreKeyword = true; + } else if (!(curLineState & stateInProperty) && + (strcmp(s, "read") == 0 || strcmp(s, "write") == 0 || + strcmp(s, "default") == 0 || strcmp(s, "nodefault") == 0 || + strcmp(s, "stored") == 0 || strcmp(s, "implements") == 0 || + strcmp(s, "readonly") == 0 || strcmp(s, "writeonly") == 0 || + strcmp(s, "add") == 0 || strcmp(s, "remove") == 0)) { + ignoreKeyword = true; + } + } + if (!ignoreKeyword) { + sc.ChangeState(SCE_PAS_WORD); + } + } + } else if (curLineState & stateInAsm) { + sc.ChangeState(SCE_PAS_ASM); + } + sc.SetState(SCE_PAS_DEFAULT); +} - char chAttr = SCE_C_IDENTIFIER; - if (isdigit(s[0]) || (s[0] == '.') ||(s[0] == '$')) { - chAttr = SCE_C_NUMBER; - } - else { - if (s[0] == '#') { - chAttr = SCE_C_CHARACTER; +static void ColourisePascalDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], + Accessor &styler) { + bool bSmartHighlighting = styler.GetPropertyInt("lexer.pascal.smart.highlighting", 1) != 0; + + CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true); + CharacterSet setWord(CharacterSet::setAlphaNum, "_", 0x80, true); + CharacterSet setNumber(CharacterSet::setDigits, ".-+eE"); + CharacterSet setHexNumber(CharacterSet::setDigits, "abcdefABCDEF"); + CharacterSet setOperator(CharacterSet::setNone, "#$&'()*+,-./:;<=>@[]^{}"); + + int curLine = styler.GetLine(startPos); + int curLineState = curLine > 0 ? styler.GetLineState(curLine - 1) : 0; + + StyleContext sc(startPos, length, initStyle, styler); + + for (; sc.More(); sc.Forward()) { + if (sc.atLineEnd) { + // Update the line state, so it can be seen by next line + curLine = styler.GetLine(sc.currentPos); + styler.SetLineState(curLine, curLineState); } - else { - if (keywords.InList(s)) { - chAttr = SCE_C_WORD; - if(strcmp(s, "class") == 0) { - ret = 1; + // Determine if the current state should terminate. + switch (sc.state) { + case SCE_PAS_NUMBER: + if (!setNumber.Contains(sc.ch) || (sc.ch == '.' && sc.chNext == '.')) { + sc.SetState(SCE_PAS_DEFAULT); + } else if (sc.ch == '-' || sc.ch == '+') { + if (sc.chPrev != 'E' && sc.chPrev != 'e') { + sc.SetState(SCE_PAS_DEFAULT); + } } - else if (strcmp(s, "asm") == 0) { - ret = 2; + break; + case SCE_PAS_IDENTIFIER: + if (!setWord.Contains(sc.ch)) { + ClassifyPascalWord(keywordlists, sc, curLineState, bSmartHighlighting); } - else if (strcmp(s, "end") == 0) { - ret = -1; + break; + case SCE_PAS_HEXNUMBER: + if (!setHexNumber.Contains(sc.ch)) { + sc.SetState(SCE_PAS_DEFAULT); } - } else if (bInClass) { - if (classwords.InList(s)) { - chAttr = SCE_C_WORD; + break; + case SCE_PAS_COMMENT: + case SCE_PAS_PREPROCESSOR: + if (sc.ch == '}') { + sc.ForwardSetState(SCE_PAS_DEFAULT); } + break; + case SCE_PAS_COMMENT2: + case SCE_PAS_PREPROCESSOR2: + if (sc.Match('*', ')')) { + sc.Forward(); + sc.ForwardSetState(SCE_PAS_DEFAULT); + } + break; + case SCE_PAS_COMMENTLINE: + if (sc.atLineStart) { + sc.SetState(SCE_PAS_DEFAULT); + } + break; + case SCE_PAS_STRING: + if (sc.atLineEnd) { + sc.ChangeState(SCE_PAS_STRINGEOL); + } else if (sc.ch == '\'' && sc.chNext == '\'') { + sc.Forward(); + } else if (sc.ch == '\'') { + sc.ForwardSetState(SCE_PAS_DEFAULT); + } + break; + case SCE_PAS_STRINGEOL: + if (sc.atLineStart) { + sc.SetState(SCE_PAS_DEFAULT); + } + break; + case SCE_PAS_CHARACTER: + if (!setHexNumber.Contains(sc.ch) && sc.ch != '$') { + sc.SetState(SCE_PAS_DEFAULT); + } + break; + case SCE_PAS_OPERATOR: + if (bSmartHighlighting && sc.chPrev == ';') { + curLineState &= ~(stateInProperty | stateInExport); + } + sc.SetState(SCE_PAS_DEFAULT); + break; + case SCE_PAS_ASM: + sc.SetState(SCE_PAS_DEFAULT); + break; + } + + // Determine if a new state should be entered. + if (sc.state == SCE_PAS_DEFAULT) { + if (IsADigit(sc.ch) && !(curLineState & stateInAsm)) { + sc.SetState(SCE_PAS_NUMBER); + } else if (setWordStart.Contains(sc.ch)) { + sc.SetState(SCE_PAS_IDENTIFIER); + } else if (sc.ch == '$' && !(curLineState & stateInAsm)) { + sc.SetState(SCE_PAS_HEXNUMBER); + } else if (sc.Match('{', '$')) { + sc.SetState(SCE_PAS_PREPROCESSOR); + } else if (sc.ch == '{') { + sc.SetState(SCE_PAS_COMMENT); + } else if (sc.Match("(*$")) { + sc.SetState(SCE_PAS_PREPROCESSOR2); + } else if (sc.Match('(', '*')) { + sc.SetState(SCE_PAS_COMMENT2); + sc.Forward(); // Eat the * so it isn't used for the end of the comment + } else if (sc.Match('/', '/')) { + sc.SetState(SCE_PAS_COMMENTLINE); + } else if (sc.ch == '\'') { + sc.SetState(SCE_PAS_STRING); + } else if (sc.ch == '#') { + sc.SetState(SCE_PAS_CHARACTER); + } else if (setOperator.Contains(sc.ch) && !(curLineState & stateInAsm)) { + sc.SetState(SCE_PAS_OPERATOR); + } else if (curLineState & stateInAsm) { + sc.SetState(SCE_PAS_ASM); } } } - ColourTo(styler, end, chAttr, (bInAsm && ret != -1)); - return ret; + + if (sc.state == SCE_PAS_IDENTIFIER && setWord.Contains(sc.chPrev)) { + ClassifyPascalWord(keywordlists, sc, curLineState, bSmartHighlighting); + } + + sc.Complete(); } -static int classifyFoldPointPascal(const char* s) { - int lev = 0; - if (!(isdigit(s[0]) || (s[0] == '.'))) { - if (strcmp(s, "begin") == 0 || - strcmp(s, "object") == 0 || - strcmp(s, "case") == 0 || - strcmp(s, "class") == 0 || - strcmp(s, "record") == 0 || - strcmp(s, "try") == 0) { - lev=1; - } else if (strcmp(s, "end") == 0) { - lev=-1; +static bool IsStreamCommentStyle(int style) { + return style == SCE_PAS_COMMENT || style == SCE_PAS_COMMENT2; +} + +static bool IsCommentLine(int line, Accessor &styler) { + int pos = styler.LineStart(line); + int eolPos = styler.LineStart(line + 1) - 1; + for (int i = pos; i < eolPos; i++) { + char ch = styler[i]; + char chNext = styler.SafeGetCharAt(i + 1); + int style = styler.StyleAt(i); + if (ch == '/' && chNext == '/' && style == SCE_PAS_COMMENTLINE) { + return true; + } else if (!IsASpaceOrTab(ch)) { + return false; } } - return lev; + return false; } -static void ColourisePascalDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], - Accessor &styler) { +static unsigned int GetFoldInPreprocessorLevelFlag(int lineFoldStateCurrent) { + return lineFoldStateCurrent & stateFoldInPreprocessorLevelMask; +} - styler.StartAt(startPos); +static void SetFoldInPreprocessorLevelFlag(int &lineFoldStateCurrent, unsigned int nestLevel) { + lineFoldStateCurrent &= ~stateFoldInPreprocessorLevelMask; + lineFoldStateCurrent |= nestLevel & stateFoldInPreprocessorLevelMask; +} - int state = initStyle; - if (state == SCE_C_CHARACTER) // Does not leak onto next line - state = SCE_C_DEFAULT; - char chPrev = ' '; - char chNext = styler[startPos]; - unsigned int lengthDoc = startPos + length; +static void ClassifyPascalPreprocessorFoldPoint(int &levelCurrent, int &lineFoldStateCurrent, + unsigned int startPos, Accessor &styler) { + CharacterSet setWord(CharacterSet::setAlpha); - bool bInClassDefinition; + char s[11]; // Size of the longest possible keyword + one additional character + null + GetForwardRangeLowered(startPos, setWord, styler, s, sizeof(s)); - int currentLine = styler.GetLine(startPos); - if (currentLine > 0) { - styler.SetLineState(currentLine, styler.GetLineState(currentLine-1)); - bInClassDefinition = (styler.GetLineState(currentLine) == 1); - } else { - styler.SetLineState(currentLine, 0); - bInClassDefinition = false; - } + unsigned int nestLevel = GetFoldInPreprocessorLevelFlag(lineFoldStateCurrent); - bool bInAsm = (state == SCE_C_REGEX); - if (bInAsm) - state = SCE_C_DEFAULT; - - styler.StartSegment(startPos); - for (unsigned int i = startPos; i < lengthDoc; i++) { - char ch = chNext; - - chNext = styler.SafeGetCharAt(i + 1); - - if ((ch == '\r' && chNext != '\n') || (ch == '\n')) { - // Trigger on CR only (Mac style) or either on LF from CR+LF (Dos/Win) or on LF alone (Unix) - // Avoid triggering two times on Dos/Win - // End of line - if (state == SCE_C_CHARACTER) { - ColourTo(styler, i, state, bInAsm); - state = SCE_C_DEFAULT; - } - currentLine++; - styler.SetLineState(currentLine, (bInClassDefinition ? 1 : 0)); + if (strcmp(s, "if") == 0 || + strcmp(s, "ifdef") == 0 || + strcmp(s, "ifndef") == 0 || + strcmp(s, "ifopt") == 0 || + strcmp(s, "region") == 0) { + nestLevel++; + SetFoldInPreprocessorLevelFlag(lineFoldStateCurrent, nestLevel); + lineFoldStateCurrent |= stateFoldInPreprocessor; + levelCurrent++; + } else if (strcmp(s, "endif") == 0 || + strcmp(s, "ifend") == 0 || + strcmp(s, "endregion") == 0) { + nestLevel--; + SetFoldInPreprocessorLevelFlag(lineFoldStateCurrent, nestLevel); + if (nestLevel == 0) { + lineFoldStateCurrent &= ~stateFoldInPreprocessor; } - - if (styler.IsLeadByte(ch)) { - chNext = styler.SafeGetCharAt(i + 2); - chPrev = ' '; - i += 1; - continue; + levelCurrent--; + if (levelCurrent < SC_FOLDLEVELBASE) { + levelCurrent = SC_FOLDLEVELBASE; } + } +} - if (state == SCE_C_DEFAULT) { - if (iswordstart(ch) || ch == '#' || ch == '$' || (ch == '@' && bInAsm)) { - ColourTo(styler, i-1, state, bInAsm); - state = SCE_C_IDENTIFIER; - } else if (ch == '{' && chNext != '$' && chNext != '&') { - ColourTo(styler, i-1, state, bInAsm); - state = SCE_C_COMMENT; - } else if (ch == '(' && chNext == '*' - && styler.SafeGetCharAt(i + 2) != '$' - && styler.SafeGetCharAt(i + 2) != '&') { - ColourTo(styler, i-1, state, bInAsm); - state = SCE_C_COMMENTDOC; - } else if (ch == '/' && chNext == '/') { - ColourTo(styler, i-1, state, bInAsm); - state = SCE_C_COMMENTLINE; - } else if (ch == '\'') { - ColourTo(styler, i-1, state, bInAsm); - state = SCE_C_CHARACTER; - } else if (ch == '{' && (chNext == '$' || chNext=='&')) { - ColourTo(styler, i-1, state, bInAsm); - state = SCE_C_PREPROCESSOR; - } else if (isoperator(ch)) { - ColourTo(styler, i-1, state, bInAsm); - ColourTo(styler, i, SCE_C_OPERATOR, bInAsm); +static unsigned int SkipWhiteSpace(unsigned int currentPos, unsigned int endPos, + Accessor &styler, bool includeChars = false) { + CharacterSet setWord(CharacterSet::setAlphaNum, "_"); + unsigned int j = currentPos + 1; + char ch = styler.SafeGetCharAt(j); + while ((j < endPos) && (IsASpaceOrTab(ch) || ch == '\r' || ch == '\n' || + IsStreamCommentStyle(styler.StyleAt(j)) || (includeChars && setWord.Contains(ch)))) { + j++; + ch = styler.SafeGetCharAt(j); + } + return j; +} - } - } else if (state == SCE_C_IDENTIFIER) { - bool bDoublePoint = ((ch == '.') && (chPrev == '.')); - bool bSinglePoint = (ch == '.'); +static void ClassifyPascalWordFoldPoint(int &levelCurrent, int &lineFoldStateCurrent, + unsigned int startPos, unsigned int endPos, + unsigned int lastStart, unsigned int currentPos, Accessor &styler) { + char s[100]; + GetRangeLowered(lastStart, currentPos, styler, s, sizeof(s)); - if ((!iswordchar(ch) && ch != '$' && ch != '#' && (ch != '@' || !bInAsm)) || bDoublePoint || bSinglePoint) { - if (bDoublePoint) i--; - int lStateChange = classifyWordPascal(styler.GetStartSegment(), i - 1, keywordlists, styler, bInClassDefinition, bInAsm); + if (strcmp(s, "record") == 0) { + lineFoldStateCurrent |= stateFoldInRecord; + levelCurrent++; + } else if (strcmp(s, "begin") == 0 || + strcmp(s, "asm") == 0 || + strcmp(s, "try") == 0 || + (strcmp(s, "case") == 0 && !(lineFoldStateCurrent & stateFoldInRecord))) { + levelCurrent++; + } else if (strcmp(s, "class") == 0 || strcmp(s, "object") == 0) { + // "class" & "object" keywords require special handling... + bool ignoreKeyword = false; + unsigned int j = SkipWhiteSpace(currentPos, endPos, styler); + if (j < endPos) { + CharacterSet setWordStart(CharacterSet::setAlpha, "_"); + CharacterSet setWord(CharacterSet::setAlphaNum, "_"); - if(lStateChange == 1) { - styler.SetLineState(currentLine, 1); - bInClassDefinition = true; - } else if(lStateChange == 2) { - bInAsm = true; - } else if(lStateChange == -1) { - styler.SetLineState(currentLine, 0); - bInClassDefinition = false; - bInAsm = false; - } - if (bDoublePoint) { - i++; - ColourTo(styler, i-1, SCE_C_DEFAULT, bInAsm); - } + if (styler.SafeGetCharAt(j) == ';') { + // Handle forward class declarations ("type TMyClass = class;") + // and object method declarations ("TNotifyEvent = procedure(Sender: TObject) of object;") + ignoreKeyword = true; + } else if (strcmp(s, "class") == 0) { + // "class" keyword has a few more special cases... + if (styler.SafeGetCharAt(j) == '(') { + // Handle simplified complete class declarations ("type TMyClass = class(TObject);") + j = SkipWhiteSpace(j, endPos, styler, true); + if (j < endPos && styler.SafeGetCharAt(j) == ')') { + j = SkipWhiteSpace(j, endPos, styler); + if (j < endPos && styler.SafeGetCharAt(j) == ';') { + ignoreKeyword = true; + } + } + } else if (setWordStart.Contains(styler.SafeGetCharAt(j))) { + char s2[11]; // Size of the longest possible keyword + one additional character + null + GetForwardRangeLowered(j, setWord, styler, s2, sizeof(s2)); - state = SCE_C_DEFAULT; - chNext = styler.SafeGetCharAt(i + 1); - if (ch == '{' && chNext != '$' && chNext != '&') { - state = SCE_C_COMMENT; - } else if (ch == '(' && chNext == '*' - && styler.SafeGetCharAt(i + 2) != '$' - && styler.SafeGetCharAt(i + 2) != '&') { - ColourTo(styler, i-1, state, bInAsm); - state = SCE_C_COMMENTDOC; - } else if (ch == '/' && chNext == '/') { - state = SCE_C_COMMENTLINE; - } else if (ch == '\'') { - state = SCE_C_CHARACTER; - } else if (isoperator(ch)) { - ColourTo(styler, i, SCE_C_OPERATOR, bInAsm); - } - } - } else { - if (state == SCE_C_PREPROCESSOR) { - if (ch=='}'){ - ColourTo(styler, i, state, bInAsm); - state = SCE_C_DEFAULT; - } else { - if ((ch == '\r' || ch == '\n') && !(chPrev == '\\' || chPrev == '\r')) { - ColourTo(styler, i-1, state, bInAsm); - state = SCE_C_DEFAULT; + if (strcmp(s2, "procedure") == 0 || + strcmp(s2, "function") == 0 || + strcmp(s2, "of") == 0 || + strcmp(s2, "var") == 0 || + strcmp(s2, "property") == 0 || + strcmp(s2, "operator") == 0) { + ignoreKeyword = true; } } - } else if (state == SCE_C_COMMENT) { - if (ch == '}' ) { - ColourTo(styler, i, state, bInAsm); - state = SCE_C_DEFAULT; - } - } else if (state == SCE_C_COMMENTDOC) { - if (ch == ')' && chPrev == '*') { - if (((i > styler.GetStartSegment() + 2) || ( - (initStyle == SCE_C_COMMENTDOC) && - (styler.GetStartSegment() == static_cast<unsigned int>(startPos))))) { - ColourTo(styler, i, state, bInAsm); - state = SCE_C_DEFAULT; - } - } - } else if (state == SCE_C_COMMENTLINE) { - if (ch == '\r' || ch == '\n') { - ColourTo(styler, i-1, state, bInAsm); - state = SCE_C_DEFAULT; - } - } else if (state == SCE_C_CHARACTER) { - if (ch == '\'') { - ColourTo(styler, i, state, bInAsm); - state = SCE_C_DEFAULT; - } } } - chPrev = ch; + if (!ignoreKeyword) { + levelCurrent++; + } + } else if (strcmp(s, "interface") == 0) { + // "interface" keyword requires special handling... + bool ignoreKeyword = true; + unsigned int j = lastStart - 1; + char ch = styler.SafeGetCharAt(j); + while ((j >= startPos) && (IsASpaceOrTab(ch) || ch == '\r' || ch == '\n' || + IsStreamCommentStyle(styler.StyleAt(j)))) { + j--; + ch = styler.SafeGetCharAt(j); + } + if (j >= startPos && styler.SafeGetCharAt(j) == '=') { + ignoreKeyword = false; + } + if (!ignoreKeyword) { + levelCurrent++; + } + } else if (strcmp(s, "end") == 0) { + lineFoldStateCurrent &= ~stateFoldInRecord; + levelCurrent--; + if (levelCurrent < SC_FOLDLEVELBASE) { + levelCurrent = SC_FOLDLEVELBASE; + } } - ColourTo(styler, lengthDoc - 1, state, bInAsm); } static void FoldPascalDoc(unsigned int startPos, int length, int initStyle, WordList *[], - Accessor &styler) { + Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; @@ -281,11 +503,13 @@ int lineCurrent = styler.GetLine(startPos); int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK; int levelCurrent = levelPrev; + int lineFoldStateCurrent = lineCurrent > 0 ? styler.GetLineState(lineCurrent - 1) & stateFoldMaskAll : 0; char chNext = styler[startPos]; int styleNext = styler.StyleAt(startPos); int style = initStyle; int lastStart = 0; + CharacterSet setWord(CharacterSet::setAlphaNum, "_", 0x80, true); for (unsigned int i = startPos; i < endPos; i++) { char ch = chNext; @@ -295,53 +519,45 @@ styleNext = styler.StyleAt(i + 1); bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); - if (stylePrev != SCE_C_WORD && style == SCE_C_WORD) + if (foldComment && IsStreamCommentStyle(style)) { + if (!IsStreamCommentStyle(stylePrev)) { + levelCurrent++; + } else if (!IsStreamCommentStyle(styleNext) && !atEOL) { + // Comments don't end at end of line and the next character may be unstyled. + levelCurrent--; + } + } + if (foldComment && atEOL && IsCommentLine(lineCurrent, styler)) { - // Store last word start point. - lastStart = i; + if (!IsCommentLine(lineCurrent - 1, styler) + && IsCommentLine(lineCurrent + 1, styler)) + levelCurrent++; + else if (IsCommentLine(lineCurrent - 1, styler) + && !IsCommentLine(lineCurrent+1, styler)) + levelCurrent--; } - - if (stylePrev == SCE_C_WORD) { - if(iswordchar(ch) && !iswordchar(chNext)) { - char s[100]; - getRange(lastStart, i, styler, s, sizeof(s)); - levelCurrent += classifyFoldPointPascal(s); + if (foldPreprocessor) { + if (style == SCE_PAS_PREPROCESSOR && ch == '{' && chNext == '$') { + ClassifyPascalPreprocessorFoldPoint(levelCurrent, lineFoldStateCurrent, i + 2, styler); + } else if (style == SCE_PAS_PREPROCESSOR2 && ch == '(' && chNext == '*' + && styler.SafeGetCharAt(i + 2) == '$') { + ClassifyPascalPreprocessorFoldPoint(levelCurrent, lineFoldStateCurrent, i + 3, styler); } } - if (foldComment && (style == SCE_C_COMMENTLINE)) { - if ((ch == '/') && (chNext == '/')) { - char chNext2 = styler.SafeGetCharAt(i + 2); - if (chNext2 == '{') { - levelCurrent++; - } else if (chNext2 == '}') { - levelCurrent--; - } - } + if (stylePrev != SCE_PAS_WORD && style == SCE_PAS_WORD) + { + // Store last word start point. + lastStart = i; } - - if (foldPreprocessor && (style == SCE_C_PREPROCESSOR)) { - if (ch == '{' && chNext == '$') { - unsigned int j=i+2; // skip {$ - while ((j<endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) { - j++; - } - if (styler.Match(j, "region") || styler.Match(j, "if")) { - levelCurrent++; - } else if (styler.Match(j, "end")) { - levelCurrent--; - } + if (stylePrev == SCE_PAS_WORD && !(lineFoldStateCurrent & stateFoldInPreprocessor)) { + if(setWord.Contains(ch) && !setWord.Contains(chNext)) { + ClassifyPascalWordFoldPoint(levelCurrent, lineFoldStateCurrent, startPos, endPos, lastStart, i, styler); } } - if (foldComment && IsStreamCommentStyle(style)) { - if (!IsStreamCommentStyle(stylePrev)) { - levelCurrent++; - } else if (!IsStreamCommentStyle(styleNext) && !atEOL) { - // Comments don't end at end of line and the next character may be unstyled. - levelCurrent--; - } - } + if (!IsASpace(ch)) + visibleChars++; if (atEOL) { int lev = levelPrev; @@ -352,23 +568,24 @@ if (lev != styler.LevelAt(lineCurrent)) { styler.SetLevel(lineCurrent, lev); } + int newLineState = (styler.GetLineState(lineCurrent) & ~stateFoldMaskAll) | lineFoldStateCurrent; + styler.SetLineState(lineCurrent, newLineState); lineCurrent++; levelPrev = levelCurrent; visibleChars = 0; } - - if (!isspacechar(ch)) - visibleChars++; } - // Fill in the real level of the next line, keeping the current flags as they will be filled in later - int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK; - styler.SetLevel(lineCurrent, levelPrev | flagsNext); + // If we didn't reach the EOL in previous loop, store line level and whitespace information. + // The rest will be filled in later... + int lev = levelPrev; + if (visibleChars == 0 && foldCompact) + lev |= SC_FOLDLEVELWHITEFLAG; + styler.SetLevel(lineCurrent, lev); } static const char * const pascalWordListDesc[] = { "Keywords", - "Classwords", 0 }; Modified: trunk/scintilla/LexPerl.cxx =================================================================== --- trunk/scintilla/LexPerl.cxx 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/LexPerl.cxx 2009-05-03 17:49:33 UTC (rev 3769) @@ -247,8 +247,9 @@ static bool isMatch(const char *sref, char *s) { // match per-line delimiter - must kill trailing CR if CRLF - if (s[strlen(s) - 1] == '\r') - s[strlen(s) - 1] = '\0'; + int i = strlen(s); + if (i != 0 && s[i - 1] == '\r') + s[i - 1] = '\0'; return (strcmp(sref, s) == 0); } @@ -569,7 +570,7 @@ sc.Forward(ws_skip + 1); HereDoc.Quote = delim_ch; HereDoc.Quoted = true; - } else if (ws_skip == 0 && setNonHereDoc.Contains(sc.chNext) + } else if ((ws_skip == 0 && setNonHereDoc.Contains(sc.chNext)) || ws_skip > 0) { // left shift << or <<= operator cases // restore position if operator @@ -1183,8 +1184,15 @@ bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; // Custom folding of POD and packages + + // property fold.perl.pod + // Enable folding Pod blocks when using the Perl lexer. bool foldPOD = styler.GetPropertyInt("fold.perl.pod", 1) != 0; + + // property fold.perl.package + // Enable folding packages when using the Perl lexer. bool foldPackage = styler.GetPropertyInt("fold.perl.package", 1) != 0; + unsigned int endPos = startPos + length; int visibleChars = 0; int lineCurrent = styler.GetLine(startPos); Modified: trunk/scintilla/LexPython.cxx =================================================================== --- trunk/scintilla/LexPython.cxx 2009-05-02 19:12:15 UTC (rev 3768) +++ trunk/scintilla/LexPython.cxx 2009-05-03 17:49:33 UTC (rev 3769) @@ -24,17 +24,27 @@ using namespace Scintilla; #endif -enum kwType { kwOther, kwClass, kwDef, kwImport }; +/* kwCDef, kwCTypeName only used for Cython */ +enum kwType { kwOther, kwClass, kwDef, kwImport, kwCDef, kwCTypeName }; + static const int indicatorWhitespace = 1; static bool IsPyComment(Accessor &styler, int pos, int len) { return len > 0 && styler[pos] == '#'; } -static bool IsPyStringStart(int ch, int chNext, int chNext2) { +enum literalsAllowed { litNone=0, litU=1, litB=2}; + +static bool IsPyStringTypeChar(int ch, literalsAllowed allowed) { + return + ((allowed & litB) && (ch == 'b' || ch == 'B')) || + ((allowed & litU) && (ch == 'u' || ch == 'U')); +} + +static bool IsPyStringStart(int ch, int chNext, int chNext2, literalsAllowed allowed) { if (ch == '\'' || ch == '"') return true; - if (ch == 'u' || ch == 'U') { + if (IsPyStringTypeChar(ch, allowed)) { if (chNext == '"' || chNext == '\'') return true; if ((chNext == 'r' || chNext == 'R') && (chNext2 == '"' || chNext2 == '\'')) @@ -47,16 +57,16 @@ } /* Return the state to use for the string starting at i; *nextIndex will be set to the first index following the quote(s) */ -static int GetPyStringState(Accessor &styler, int i, unsigned int *nextIndex) { +static int GetPyStringState(Accessor &styler, int i, unsigned int *nextIndex, literalsAllowed allowed) { char ch = styler.SafeGetCharAt(i); char chNext = styler.SafeGetCharAt(i + 1); - // Advance beyond r, u, or ur prefix, but bail if there are any unexpected chars + // Advance beyond r, u, or ur prefix (or r, b, or br in Python 3.0), but bail if there are any unexpected chars if (ch == 'r' || ch == 'R') { i++; ch = styler.SafeGetCharAt(i); chNext = styler.SafeGetCharAt(i + 1); - } else if (ch == 'u' || ch == 'U') { + } else if (IsPyStringTypeChar(ch, allowed)) { if (chNext == 'r' || chNext == 'R') i += 2; else @@ -96,7 +106,7 @@ } static void ColourisePyDoc(unsigned int startPos, int length, int initStyle, - WordList *keywordlists[], Accessor &styler) { + WordList *keywordlists[], Accessor &styler) { int endPos = startPos + length; @@ -105,19 +115,49 @@ if (startPos > 0) { if (lineCurrent > 0) { lineCurrent--; + // Look for backslash-continued lines + while (lineCurrent > 0) { + int eolPos = styler.LineStart(lineCurrent) - 1; + int eolStyle = styler.StyleAt(eolPos); + if (eolStyle == SCE_P_STRING + || eolStyle == SCE_P_CHARACTER + || eolStyle == SCE_P_STRINGEOL) { + lineCurrent -= 1; + } else { + break; + } + } startPos = styler.LineStart(lineCurrent); - if (startPos == 0) - initStyle = SCE_P_DEFAULT; - else - initStyle = styler.StyleAt(startPos - 1); } + initStyle = startPos == 0 ? SCE_P_DEFAULT : styler.StyleAt(startPos - 1); } WordList &keywords = *keywordlists[0]; WordList &keywords2 = *keywordlists[1]; + // property tab.timmy.whinge.level + // For Python code, checks whether indenting is consistent. + // The default, 0 turns off indentation checking, + // 1 checks whether each line is potentially inconsistent with the previous line, + // 2 checks whether any space characters occur before a tab character in the indentation, + // 3 checks whether any spaces are in the indentation, and + // 4 checks for any tab characters in the indentation. + // 1 is a good level to use. const int whingeLevel = styler.GetPropertyInt("tab.timmy.whinge.level"); + // property lexer.python.literals.binary + // Set to 0 to not recognise Python 3 binary and octal literals: 0b1011 0o712. + bool base2or8Literals = styler.GetPropertyInt("lexer.python.literals.binary", 1) != 0; + + // property lexer.python.strings.u + // Set to 0 to not recognise Python Unicode literals u"x" as used before Python 3. + literalsAllowed allowedLiterals = (styler.GetPropertyInt("lexer.python.strings.u", 1)) ? litU : litNone; + + // property lexer.python.strings.b + // Set to 0 to not recognise Python 3 bytes literals b"x". + if (styler.GetPropertyInt("lexer.python.strings.b", 1)) + allowedLiterals = static_cast<literalsAllowed>(allowedLiterals | litB); + initStyle = initStyle & 31; if (initStyle == SCE_P_STRINGEOL) { initStyle = SCE_P_DEFAULT; @@ -126,12 +166,13 @@ kwType kwLast = kwOther; int spaceFlags = 0; styler.IndentAmount(lineCurrent, &spaceFlags, IsPyComment); - bool hexadecimal = false; + bool base_n_number = false; StyleContext sc(startPos, endPos - startPos, initStyle, styler); bool indentGood = true; int startIndicator = sc.currentPos; + bool inContinuedString = false; for (; sc.More(); sc.Forward()) { @@ -163,8 +204,12 @@ } lineCurrent++; if ((sc.state == SCE_P_STRING) || (sc.state == SCE_P_CHARACTER)) { - sc.ChangeState(SCE_P_STRINGEOL); - sc.ForwardSetState(SCE_P_DEFAULT); + if (inContinuedString) { + inContinuedString = false; + } else { + sc.ChangeState(SCE_P_STRINGEOL); + sc.ForwardSetState(SCE_P_DEFAULT); + } } if (!sc.More()) break; @@ -178,7 +223,7 @@ sc.SetState(SCE_P_DEFAULT); } else if (sc.state == SCE_P_NUMBER) { if (!IsAWordChar(sc.ch) && - !(!hexadecimal && ((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E')))) { + !(!base_n_number && ((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E')))) { sc.SetState(SCE_P_DEFAULT); } } else if (sc.state == SCE_P_IDENTIFIER) { @@ -194,6 +239,23 @@ style = SCE_P_CLASSNAME; } else if (kwLast == kwDef) { style = SCE_P_DEFNAME; + } else if (kwLast == kwCDef) { + int pos = sc.currentPos; + unsigned char ch = styler.SafeGetCharAt(pos, '\0'); + while (ch != '\0') { + if (ch == '(') { + style = SCE_P_DEFNAME; + break; + } else if (ch == ':') { + style = SCE_P_CLASSNAME; + break; + } else if (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r') { + pos++; + ch = styler.SafeGetCharAt(pos, '\0'); + } else { + break; + } + } } else if (keywords2.InList(s)) { style = SCE_P_WORD2; } @@ -206,9 +268,13 @@ kwLast = kwDef; else if (0 == strcmp(s, "import")) kwLast = kwImport; - else + else if (0 == strcmp(s, "cdef")) + kwLast = kwCDef; + else if (0 == strcmp(s, "cimport")) + kwLast = kwImport; + else if (kwLast != kwCDef) kwLast = kwOther; - } else { + } else if (kwLast != kwCDef) { kwLast = kwOther; } } @@ -225,7 +291,12 @@ if ((sc.chNext == '\r') && (sc.GetRelative(2) == '\n')) { sc.Forward(); } - sc.Forward(); + if (sc.chNext == '\n' || sc.chNext == '\r') { @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3768] trunk
by eht16＠users.sourceforge.net 02 May '09

02 May '09

Revision: 3768 http://geany.svn.sourceforge.net/geany/?rev=3768&view=rev Author: eht16 Date: 2009-05-02 19:12:15 +0000 (Sat, 02 May 2009) Log Message: ----------- Post-release version bump. Modified Paths: -------------- trunk/ChangeLog trunk/configure.in trunk/doc/geany.html trunk/doc/geany.txt trunk/geany.nsi trunk/geany_private.rc trunk/src/geany.h trunk/win32-config.h trunk/wscript Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-02 18:16:50 UTC (rev 3767) +++ trunk/ChangeLog 2009-05-02 19:12:15 UTC (rev 3768) @@ -4,6 +4,9 @@ Ignore the invert syntax highlighting colours setting when printing to not print characters on a dark background (closes #2785244). * New release: Geany 0.17 "Wessex". + * configure.in, geany.nsi, geany_private.rc, win32-config.h, wscript, + src/geany.h, doc/geany.html, doc/geany.txt: + Post-release version bump. 2009-04-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2009-05-02 18:16:50 UTC (rev 3767) +++ trunk/configure.in 2009-05-02 19:12:15 UTC (rev 3768) @@ -2,7 +2,7 @@ dnl $Id$ AC_INIT(configure.in) -AM_INIT_AUTOMAKE(geany, 0.17) +AM_INIT_AUTOMAKE(geany, 0.18) AM_CONFIG_HEADER(config.h) Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2009-05-02 18:16:50 UTC (rev 3767) +++ trunk/doc/geany.html 2009-05-02 19:12:15 UTC (rev 3768) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2009-05-02" /> +<meta name="date" content="2009-04-24" /> <style type="text/css"> /* @@ -139,9 +139,9 @@ Nick Treleaven Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2009-05-02</td></tr> +<td>2009-04-24</td></tr> <tr><th class="docinfo-name">Version:</th> -<td>0.17</td></tr> +<td>0.18</td></tr> </tbody> </table> Copyright © 2005-2009 @@ -3768,7 +3768,7 @@ </tr> <tr><td>geanyversion</td> <td>The actual Geany version, e.g. -"Geany 0.17".</td> +"Geany 0.18".</td> <td>filetype templates, file header, function description, ChangeLog entry, bsd, gpl, snippets</td> @@ -3989,7 +3989,7 @@ look, run "<tt class="docutils literal">make doc</tt>" in the subdirectory <tt class="docutils literal">doc</tt> of Geany's source directory. This regenerates the <tt class="docutils literal">geany.html</tt> file. To generate a PDF file, use the command "<tt class="docutils literal">make pdf</tt>" which should generate a file called -geany-0.17.pdf. +geany-0.18.pdf. After you are happy with your changes, create a patch: <pre class="literal-block"> % svn diff geany.txt > foo.patch @@ -4847,7 +4847,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2009-05-02 17:29 UTC. +Generated on: 2009-05-02 19:09 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2009-05-02 18:16:50 UTC (rev 3767) +++ trunk/doc/geany.txt 2009-05-02 19:12:15 UTC (rev 3768) @@ -1,4 +1,4 @@ -.. |(version)| replace:: 0.17 +.. |(version)| replace:: 0.18 ======= Geany Modified: trunk/geany.nsi =================================================================== --- trunk/geany.nsi 2009-05-02 18:16:50 UTC (rev 3767) +++ trunk/geany.nsi 2009-05-02 19:12:15 UTC (rev 3768) @@ -33,8 +33,8 @@ ; helper defines ; ;;;;;;;;;;;;;;;;;;; !define PRODUCT_NAME "Geany" -!define PRODUCT_VERSION "0.17" -!define PRODUCT_VERSION_ID "0.17.0.0" +!define PRODUCT_VERSION "0.18" +!define PRODUCT_VERSION_ID "0.18.0.0" !define PRODUCT_PUBLISHER "The Geany developer team" !define PRODUCT_WEB_SITE "http://www.geany.org/" !define PRODUCT_DIR_REGKEY "Software\Geany" Modified: trunk/geany_private.rc =================================================================== --- trunk/geany_private.rc 2009-05-02 18:16:50 UTC (rev 3767) +++ trunk/geany_private.rc 2009-05-02 19:12:15 UTC (rev 3768) @@ -5,8 +5,8 @@ A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../pixmaps/geany.ico" 1 VERSIONINFO -FILEVERSION 0,17,0,0 -PRODUCTVERSION 0,17,0,0 +FILEVERSION 0,18,0,0 +PRODUCTVERSION 0,18,0,0 FILETYPE VFT_APP { BLOCK "StringFileInfo" @@ -14,14 +14,14 @@ BLOCK "040704E4" { VALUE "CompanyName", "" - VALUE "FileVersion", "0.17" + VALUE "FileVersion", "0.18" VALUE "FileDescription", "Geany" VALUE "InternalName", "geany" VALUE "LegalCopyright", "Copyright 2005-2009 by the Geany developers" VALUE "LegalTrademarks", "" VALUE "OriginalFilename", "geany" VALUE "ProductName", "geany" - VALUE "ProductVersion", "0.17" + VALUE "ProductVersion", "0.18" } } } Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2009-05-02 18:16:50 UTC (rev 3767) +++ trunk/src/geany.h 2009-05-02 19:12:15 UTC (rev 3768) @@ -44,7 +44,7 @@ * listed in the documentation should not be changed */ #define GEANY_FILEDEFS_SUBDIR "filedefs" #define GEANY_TEMPLATES_SUBDIR "templates" -#define GEANY_CODENAME "Wessex" +#define GEANY_CODENAME "Kaine" #define GEANY_HOMEPAGE "http://www.geany.org/" #define GEANY_USE_WIN32_DIALOG 0 #define GEANY_STRING_UNTITLED _("untitled") Modified: trunk/win32-config.h =================================================================== --- trunk/win32-config.h 2009-05-02 18:16:50 UTC (rev 3767) +++ trunk/win32-config.h 2009-05-02 19:12:15 UTC (rev 3768) @@ -282,9 +282,6 @@ /* Define to 1 if your <sys/time.h> declares `struct tm'. */ /* #undef TM_IN_SYS_TIME */ -/* Version number of package */ -#define VERSION "0.17" - /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ @@ -316,6 +313,9 @@ code using `volatile' can become incorrect without. Disable with care. */ /* #undef volatile */ +/* Version number of package */ +#define VERSION "0.18" + #define REVISION "-1" /* Define if you want to detect a running instance */ Modified: trunk/wscript =================================================================== --- trunk/wscript 2009-05-02 18:16:50 UTC (rev 3767) +++ trunk/wscript 2009-05-02 19:12:15 UTC (rev 3768) @@ -45,7 +45,7 @@ APPNAME = 'geany' -VERSION = '0.17' +VERSION = '0.18' srcdir = '.' blddir = '_build_' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2009