Plugins-Commits November 2008

plugins-commits@lists.geany.org

2 participants
45 discussions

SF.net SVN: geany-plugins:[299] trunk/spellcheck
by eht16＠users.sourceforge.net 15 Nov '08

15 Nov '08

Revision: 299 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=299&view=rev Author: eht16 Date: 2008-11-15 17:59:17 +0000 (Sat, 15 Nov 2008) Log Message: ----------- Move SpellClickInfo struct into gui.c. Modified Paths: -------------- trunk/spellcheck/ChangeLog trunk/spellcheck/src/gui.c trunk/spellcheck/src/gui.h trunk/spellcheck/src/scplugin.c trunk/spellcheck/src/scplugin.h trunk/spellcheck/src/speller.c Modified: trunk/spellcheck/ChangeLog =================================================================== --- trunk/spellcheck/ChangeLog 2008-11-15 17:17:33 UTC (rev 298) +++ trunk/spellcheck/ChangeLog 2008-11-15 17:59:17 UTC (rev 299) @@ -1,3 +1,12 @@ +2008-11-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/speller.c, src/speller.h, src/gui.c: + When replacing a misspelled word with a suggestion, add this + replacement to the spell checker to remember it in further checks. + * src/gui.c, src/scplugin.c, src/speller.c, src/gui.h, src/scplugin.h: + Move SpellClickInfo struct into gui.c. + + 2008-11-12 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/speller.c, src/speller.h, src/gui.c: Modified: trunk/spellcheck/src/gui.c =================================================================== --- trunk/spellcheck/src/gui.c 2008-11-15 17:17:33 UTC (rev 298) +++ trunk/spellcheck/src/gui.c 2008-11-15 17:59:17 UTC (rev 299) @@ -45,6 +45,19 @@ +#define MAX_MENU_SUGGESTIONS 10 + +typedef struct +{ + gint pos; + GeanyDocument *doc; + /* static array to keep suggestions for use as callback user data for the editing menu items */ + gchar *suggs[MAX_MENU_SUGGESTIONS]; + /* static storage for the misspelled word under the cursor when using the editing menu */ + gchar *word; +} SpellClickInfo; +static SpellClickInfo clickinfo; + /* Flag to indicate that a callback function will be triggered by generating the appropriate event * but the callback should be ignored. */ static gboolean ignore_sc_callback = FALSE; @@ -153,14 +166,14 @@ if (startword != endword) { gchar *word; - + p_sci->set_selection_start(sci, startword); p_sci->set_selection_end(sci, endword); - + /* retrieve the old text */ word = g_malloc(p_sci->get_selected_text_length(sci) + 1); p_sci->get_selected_text(sci, word); - + /* replace the misspelled word with the chosen suggestion */ p_sci->replace_sel(sci, sugg); @@ -169,7 +182,7 @@ /* remove indicator */ p_sci->indicator_clear(sci, startword, endword - startword); - + g_free(word); } } @@ -439,3 +452,25 @@ } +void gui_init(void) +{ + guint i; + + for (i = 0; i < MAX_MENU_SUGGESTIONS; i++) + { + clickinfo.suggs[i] = NULL; + } + clickinfo.word = NULL; +} + + +void gui_free(void) +{ + guint i; + + for (i = 0; i < MAX_MENU_SUGGESTIONS; i++) + { + g_free(clickinfo.suggs[i]); + } + g_free(clickinfo.word); +} Modified: trunk/spellcheck/src/gui.h =================================================================== --- trunk/spellcheck/src/gui.h 2008-11-15 17:17:33 UTC (rev 298) +++ trunk/spellcheck/src/gui.h 2008-11-15 17:59:17 UTC (rev 299) @@ -46,4 +46,8 @@ void gui_toolbar_update(void); +void gui_init(void); + +void gui_free(void); + #endif Modified: trunk/spellcheck/src/scplugin.c =================================================================== --- trunk/spellcheck/src/scplugin.c 2008-11-15 17:17:33 UTC (rev 298) +++ trunk/spellcheck/src/scplugin.c 2008-11-15 17:59:17 UTC (rev 299) @@ -60,7 +60,6 @@ SpellCheck *sc = NULL; -SpellClickInfo clickinfo; @@ -183,7 +182,6 @@ { GtkWidget *sp_item; GKeyFile *config = g_key_file_new(); - guint i; gchar *default_lang; default_lang = speller_get_default_lang(); @@ -210,14 +208,9 @@ gui_toolbar_update(); + gui_init(); speller_init(); - for (i = 0; i < MAX_MENU_SUGGESTIONS; i++) - { - clickinfo.suggs[i] = NULL; - } - clickinfo.word = NULL; - gui_create_edit_menu(); sp_item = gui_create_menu(sc->menu_item); gtk_widget_show_all(sp_item); @@ -292,11 +285,7 @@ void plugin_cleanup(void) { guint i; - for (i = 0; i < MAX_MENU_SUGGESTIONS; i++) - { - clickinfo.suggs[i] = NULL; - } - g_free(clickinfo.word); + for (i = 0; i < sc->dicts->len; i++) { g_free(g_ptr_array_index(sc->dicts, i)); @@ -310,6 +299,7 @@ if (sc->toolbar_button != NULL) gtk_widget_destroy(GTK_WIDGET(sc->toolbar_button)); + gui_free(); speller_free(); g_free(sc->default_language); Modified: trunk/spellcheck/src/scplugin.h =================================================================== --- trunk/spellcheck/src/scplugin.h 2008-11-15 17:17:33 UTC (rev 298) +++ trunk/spellcheck/src/scplugin.h 2008-11-15 17:59:17 UTC (rev 299) @@ -45,21 +45,7 @@ } SpellCheck; -#define MAX_MENU_SUGGESTIONS 10 - -typedef struct -{ - gint pos; - GeanyDocument *doc; - /* static array to keep suggestions for use as callback user data for the editing menu items */ - gchar *suggs[MAX_MENU_SUGGESTIONS]; - /* static storage for the misspelled word under the cursor when using the editing menu */ - gchar *word; -} SpellClickInfo; - - extern SpellCheck *sc; -extern SpellClickInfo clickinfo; extern GeanyPlugin *geany_plugin; extern GeanyData *geany_data; extern GeanyFunctions *geany_functions; Modified: trunk/spellcheck/src/speller.c =================================================================== --- trunk/spellcheck/src/speller.c 2008-11-15 17:17:33 UTC (rev 298) +++ trunk/spellcheck/src/speller.c 2008-11-15 17:59:17 UTC (rev 299) @@ -359,7 +359,7 @@ g_return_if_fail(speller_dict != NULL); g_return_if_fail(word != NULL); - enchant_dict_add_to_pwl(speller_dict, clickinfo.word, -1); + enchant_dict_add_to_pwl(speller_dict, word, -1); } gboolean speller_dict_check(const gchar *word) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[298] trunk/spellcheck/src
by eht16＠users.sourceforge.net 15 Nov '08

15 Nov '08

Revision: 298 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=298&view=rev Author: eht16 Date: 2008-11-15 17:17:33 +0000 (Sat, 15 Nov 2008) Log Message: ----------- When replacing a misspelled word with a suggestion, add this replacement to the spell checker to remember it in further checks. Modified Paths: -------------- trunk/spellcheck/src/gui.c trunk/spellcheck/src/speller.c trunk/spellcheck/src/speller.h Modified: trunk/spellcheck/src/gui.c =================================================================== --- trunk/spellcheck/src/gui.c 2008-11-14 01:37:06 UTC (rev 297) +++ trunk/spellcheck/src/gui.c 2008-11-15 17:17:33 UTC (rev 298) @@ -139,6 +139,7 @@ { gchar *sugg = gdata; gint startword, endword; + ScintillaObject *sci = clickinfo.doc->editor->sci; if (clickinfo.doc == NULL || clickinfo.pos == -1) { @@ -146,20 +147,30 @@ return; } - startword = p_sci->send_message( - clickinfo.doc->editor->sci, SCI_WORDSTARTPOSITION, clickinfo.pos, 0); - endword = p_sci->send_message( - clickinfo.doc->editor->sci, SCI_WORDENDPOSITION, clickinfo.pos, 0); + startword = p_sci->send_message(sci, SCI_WORDSTARTPOSITION, clickinfo.pos, 0); + endword = p_sci->send_message(sci, SCI_WORDENDPOSITION, clickinfo.pos, 0); if (startword != endword) { - p_sci->set_selection_start(clickinfo.doc->editor->sci, startword); - p_sci->set_selection_end(clickinfo.doc->editor->sci, endword); - p_sci->replace_sel(clickinfo.doc->editor->sci, sugg); + gchar *word; + + p_sci->set_selection_start(sci, startword); + p_sci->set_selection_end(sci, endword); + + /* retrieve the old text */ + word = g_malloc(p_sci->get_selected_text_length(sci) + 1); + p_sci->get_selected_text(sci, word); + + /* replace the misspelled word with the chosen suggestion */ + p_sci->replace_sel(sci, sugg); - /** TODO replace word */ + /* store the replacement for future checks */ + speller_store_replacement(word, sugg); - p_sci->indicator_clear(clickinfo.doc->editor->sci, startword, endword - startword); + /* remove indicator */ + p_sci->indicator_clear(sci, startword, endword - startword); + + g_free(word); } } Modified: trunk/spellcheck/src/speller.c =================================================================== --- trunk/spellcheck/src/speller.c 2008-11-14 01:37:06 UTC (rev 297) +++ trunk/spellcheck/src/speller.c 2008-11-15 17:17:33 UTC (rev 298) @@ -122,10 +122,16 @@ { gint pos_start, pos_end; gint wstart, wend; - GString *str = g_string_sized_new(256); + GString *str; gint suggestions_found = 0; gchar c; + g_return_val_if_fail(speller_dict != NULL, 0); + g_return_val_if_fail(doc != NULL, 0); + g_return_val_if_fail(line != NULL, 0); + + str = g_string_sized_new(256); + pos_start = p_sci->get_position_from_line(doc->editor->sci, line_number); /* TODO use SCI_GETLINEENDPOSITION */ pos_end = p_sci->get_position_from_line(doc->editor->sci, line_number + 1); @@ -169,6 +175,7 @@ gint suggestions_found = 0; g_return_if_fail(speller_dict != NULL); + g_return_if_fail(doc != NULL); enchant_dict_describe(speller_dict, dict_describe, &dict_string); @@ -349,12 +356,16 @@ void speller_add_word(const gchar *word) { + g_return_if_fail(speller_dict != NULL); + g_return_if_fail(word != NULL); + enchant_dict_add_to_pwl(speller_dict, clickinfo.word, -1); } gboolean speller_dict_check(const gchar *word) { g_return_val_if_fail(speller_dict != NULL, FALSE); + g_return_val_if_fail(word != NULL, FALSE); return enchant_dict_check(speller_dict, word, -1); } @@ -363,6 +374,7 @@ gchar **speller_dict_suggest(const gchar *word, gsize *n_suggs) { g_return_val_if_fail(speller_dict != NULL, NULL); + g_return_val_if_fail(word != NULL, NULL); return enchant_dict_suggest(speller_dict, word, -1, n_suggs); } @@ -371,11 +383,22 @@ void speller_add_word_to_session(const gchar *word) { g_return_if_fail(speller_dict != NULL); + g_return_if_fail(word != NULL); enchant_dict_add_to_session(speller_dict, word, -1); } +void speller_store_replacement(const gchar *old_word, const gchar *new_word) +{ + g_return_if_fail(speller_dict != NULL); + g_return_if_fail(old_word != NULL); + g_return_if_fail(new_word != NULL); + + enchant_dict_store_replacement(speller_dict, old_word, -1, new_word, -1); +} + + void speller_init(void) { speller_broker = enchant_broker_init(); Modified: trunk/spellcheck/src/speller.h =================================================================== --- trunk/spellcheck/src/speller.h 2008-11-14 01:37:06 UTC (rev 297) +++ trunk/spellcheck/src/speller.h 2008-11-15 17:17:33 UTC (rev 298) @@ -47,6 +47,8 @@ void speller_add_word_to_session(const gchar *word); +void speller_store_replacement(const gchar *old_word, const gchar *new_word); + void speller_init(void); void speller_free(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-plugins:[297] trunk/geanylatex/src/geanylatex.c
by frlan＠users.sourceforge.net 14 Nov '08

14 Nov '08

Revision: 297 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=297&view=rev Author: frlan Date: 2008-11-14 01:37:06 +0000 (Fri, 14 Nov 2008) Log Message: ----------- GeanyLaTeX: Fixes a little issue with keyboard shortcuts and visibility on menu Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2008-11-14 00:04:51 UTC (rev 296) +++ trunk/geanylatex/src/geanylatex.c 2008-11-14 01:37:06 UTC (rev 297) @@ -783,8 +783,6 @@ { GtkTooltips *tooltips = NULL; - gchar *kblabel_insert_label, *kblabel_insert_ref, *kblabel_wizard; - p_main->locale_init(LOCALEDIR, GETTEXT_PACKAGE); init_encodings_latex(); @@ -827,16 +825,15 @@ g_signal_connect((gpointer) menu_latex_label, "activate", G_CALLBACK(insert_label_activated), NULL); /* init keybindins */ - kblabel_insert_label = _("Insert \\label"); - kblabel_insert_ref = _("Insert \\ref"); - kblabel_wizard = _("Run LaTeX-Wizard"); + p_keybindings->set_item(plugin_key_group, LATEX_WIZZARD_KB, kbwizard, - 0, 0, "run_latex_wizard", kblabel_wizard, menu_latex_wizzard); + 0, 0, "run_latex_wizard", _("Run LaTeX-Wizard"), menu_latex_wizzard); p_keybindings->set_item(plugin_key_group, LATEX_INSERT_LABEL_KB, kblabel_insert, - 0, 0, "insert_latex_label", kblabel_insert_label, menu_latex_wizzard); + 0, 0, "insert_latex_label", _("Insert \\label"), menu_latex_label); p_keybindings->set_item(plugin_key_group, LATEX_INSERT_REF_KB, kbref_insert, - 0, 0, "insert_latex_ref", kblabel_insert_ref, menu_latex_wizzard); + 0, 0, "insert_latex_ref", _("Insert \\ref"), menu_latex_ref); + p_ui->add_document_sensitive(menu_latex_menu_special_char); p_ui->add_document_sensitive(menu_latex_ref); p_ui->add_document_sensitive(menu_latex_label); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[296] trunk/geanylatex
by frlan＠users.sourceforge.net 14 Nov '08

14 Nov '08

Revision: 296 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=296&view=rev Author: frlan Date: 2008-11-14 00:04:51 +0000 (Fri, 14 Nov 2008) Log Message: ----------- GeanyLaTeX: Applied a patch by Enrico which corrects some spelling mistakes and cleans up code a bit. Modified Paths: -------------- trunk/geanylatex/ChangeLog trunk/geanylatex/po/de.po trunk/geanylatex/po/geanylatex.pot trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/ChangeLog =================================================================== --- trunk/geanylatex/ChangeLog 2008-11-13 09:37:54 UTC (rev 295) +++ trunk/geanylatex/ChangeLog 2008-11-14 00:04:51 UTC (rev 296) @@ -1,3 +1,9 @@ +2008-11-14 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * Applied a patch by Enrico which corrects some spelling + mistakes and cleans up code a bit. + + 2008-11-02 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * Make usage of Geany API v104 by using of Geany's plugin init Modified: trunk/geanylatex/po/de.po =================================================================== --- trunk/geanylatex/po/de.po 2008-11-13 09:37:54 UTC (rev 295) +++ trunk/geanylatex/po/de.po 2008-11-14 00:04:51 UTC (rev 296) @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: GeanyLaTeX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-09 22:46+0100\n" +"POT-Creation-Date: 2008-11-14 01:00+0100\n" "PO-Revision-Date: \n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: geany-118n <geany-118n(a)uvena.de>\n" @@ -18,7 +18,7 @@ msgstr "LaTeX" #: src/geanylatex.c:54 -msgid "Plugin to make Geany better support LaTeX" +msgid "Plugin to provide better LaTeX support" msgstr "Plugin zum Verbessern des LaTeX-Support für Geany" #: src/geanylatex.c:135 @@ -83,7 +83,8 @@ #: src/geanylatex.c:517 msgid "" -"Sets the entry of \\author command. In most cases here should stay your name" +"Sets the value of the \\author command. In most cases this should be your " +"name" msgstr "" "Setzt den Eintrag für den \\author Befehl. Meist sollte hier Ihr Name stehen." @@ -94,7 +95,7 @@ #: src/geanylatex.c:531 msgid "" -"Sets the entry of the \\date command inside header of your newly created " +"Sets the value of the \\date command inside header of your newly created " "LaTeX-document. Keeping it at \\today is a good decision if you don't need " "any fixed date." msgstr "" @@ -107,7 +108,7 @@ msgstr "Titel:" #: src/geanylatex.c:540 -msgid "Sets the title of your newly document." +msgid "Sets the title of your new document." msgstr "Setzt den Titel für das neue Dokument." #. Papersize @@ -116,12 +117,12 @@ msgstr "Papiergröße:" #: src/geanylatex.c:550 -msgid "Chooce the paper format for the new created document" +msgid "Choose the paper format for the newly created document" msgstr "" "Setzt das Papierformat als Argument der Dokumentenklasse für das neue " "Dokument" -#. Buidling the wizard-dialog and showing it +#. Building the wizard-dialog and showing it #: src/geanylatex.c:565 msgid "LaTeX-Wizard" msgstr "LaTeX-Assistent" @@ -133,7 +134,7 @@ #: src/geanylatex.c:578 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" -"Keep in mind: To compile your document these classes have to been installed " +"Keep in mind: To compile your document these classes have to be installed " "before." msgstr "" "Wenn diese Option aktiviert ist, werden die KOMA-Skript-Klassen von Markus " @@ -151,54 +152,55 @@ "Setzt die Option draft für die Dokumentenklasse um das neue Dokument mit " "einer Nummer von kleinen Korrekturhinweisen zu versehen." -#: src/geanylatex.c:786 -msgid "Insert \\label" -msgstr "\\label einfügen" - -#: src/geanylatex.c:787 -msgid "Insert \\ref" -msgstr "\\ref einfügen" - -#: src/geanylatex.c:788 -msgid "Run LaTeX-Wizard" -msgstr "LaTeX-Assistent starten" - -#: src/geanylatex.c:796 +#: src/geanylatex.c:794 msgid "_LaTeX" msgstr "_LaTeX" -#: src/geanylatex.c:802 +#: src/geanylatex.c:800 msgid "LaTeX-_Wizard" msgstr "LaTeX-_Assistent" -#: src/geanylatex.c:805 -msgid "Starts a Wizard to create easily LaTeX-dokuments" -msgstr "Öffnen einen Assistenten, um einfach LaTeX-Dokumente zu erstellen." +#: src/geanylatex.c:803 +msgid "Starts a Wizard to easily create LaTeX-documents" +msgstr "Öffnet einen Assistenten, um einfache LaTeX-Dokumente zu erstellen." -#: src/geanylatex.c:810 +#: src/geanylatex.c:808 msgid "Insert _Special Character" msgstr "_Sonderzeichen einfügen" -#: src/geanylatex.c:812 +#: src/geanylatex.c:810 msgid "Helps to use some not very common letters and signs" msgstr "Unterstützt bei der Verwendung von seltenen Sonderzeichen" -#: src/geanylatex.c:819 +#: src/geanylatex.c:817 msgid "Insert _Reference" msgstr "_Verweis einfügen" -#: src/geanylatex.c:821 +#: src/geanylatex.c:819 msgid "Inserting references to the document" msgstr "Eine Referenz in das Dokument einfügen" -#: src/geanylatex.c:825 +#: src/geanylatex.c:823 msgid "Insert _Label" msgstr "_Lesezeichen einfügen" -#: src/geanylatex.c:827 -msgid "Helps at inserting labels to a docuemnt" +#: src/geanylatex.c:825 +msgid "Helps at inserting labels to a document" msgstr "Untersützt bei dem Einfügen von Lesezeichen in ein Dokument" +#. init keybindins +#: src/geanylatex.c:830 +msgid "Insert \\label" +msgstr "\\label einfügen" + +#: src/geanylatex.c:831 +msgid "Insert \\ref" +msgstr "\\ref einfügen" + +#: src/geanylatex.c:832 +msgid "Run LaTeX-Wizard" +msgstr "LaTeX-Assistent starten" + #: src/latexencodings.c:37 msgid "UTF-8" msgstr "UTF-8" Modified: trunk/geanylatex/po/geanylatex.pot =================================================================== --- trunk/geanylatex/po/geanylatex.pot 2008-11-13 09:37:54 UTC (rev 295) +++ trunk/geanylatex/po/geanylatex.pot 2008-11-14 00:04:51 UTC (rev 296) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-09 22:46+0100\n" +"POT-Creation-Date: 2008-11-14 01:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -21,7 +21,7 @@ msgstr "" #: src/geanylatex.c:54 -msgid "Plugin to make Geany better support LaTeX" +msgid "Plugin to provide better LaTeX support" msgstr "" #: src/geanylatex.c:135 @@ -86,7 +86,8 @@ #: src/geanylatex.c:517 msgid "" -"Sets the entry of \\author command. In most cases here should stay your name" +"Sets the value of the \\author command. In most cases this should be your " +"name" msgstr "" #. Date @@ -96,7 +97,7 @@ #: src/geanylatex.c:531 msgid "" -"Sets the entry of the \\date command inside header of your newly created " +"Sets the value of the \\date command inside header of your newly created " "LaTeX-document. Keeping it at \\today is a good decision if you don't need " "any fixed date." msgstr "" @@ -107,7 +108,7 @@ msgstr "" #: src/geanylatex.c:540 -msgid "Sets the title of your newly document." +msgid "Sets the title of your new document." msgstr "" #. Papersize @@ -116,10 +117,10 @@ msgstr "" #: src/geanylatex.c:550 -msgid "Chooce the paper format for the new created document" +msgid "Choose the paper format for the newly created document" msgstr "" -#. Buidling the wizard-dialog and showing it +#. Building the wizard-dialog and showing it #: src/geanylatex.c:565 msgid "LaTeX-Wizard" msgstr "" @@ -131,7 +132,7 @@ #: src/geanylatex.c:578 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" -"Keep in mind: To compile your document these classes have to been installed " +"Keep in mind: To compile your document these classes have to be installed " "before." msgstr "" @@ -145,54 +146,55 @@ "number of debugging helpers" msgstr "" -#: src/geanylatex.c:786 -msgid "Insert \\label" -msgstr "" - -#: src/geanylatex.c:787 -msgid "Insert \\ref" -msgstr "" - -#: src/geanylatex.c:788 -msgid "Run LaTeX-Wizard" -msgstr "" - -#: src/geanylatex.c:796 +#: src/geanylatex.c:794 msgid "_LaTeX" msgstr "" -#: src/geanylatex.c:802 +#: src/geanylatex.c:800 msgid "LaTeX-_Wizard" msgstr "" -#: src/geanylatex.c:805 -msgid "Starts a Wizard to create easily LaTeX-dokuments" +#: src/geanylatex.c:803 +msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "" -#: src/geanylatex.c:810 +#: src/geanylatex.c:808 msgid "Insert _Special Character" msgstr "" -#: src/geanylatex.c:812 +#: src/geanylatex.c:810 msgid "Helps to use some not very common letters and signs" msgstr "" -#: src/geanylatex.c:819 +#: src/geanylatex.c:817 msgid "Insert _Reference" msgstr "" -#: src/geanylatex.c:821 +#: src/geanylatex.c:819 msgid "Inserting references to the document" msgstr "" -#: src/geanylatex.c:825 +#: src/geanylatex.c:823 msgid "Insert _Label" msgstr "" -#: src/geanylatex.c:827 -msgid "Helps at inserting labels to a docuemnt" +#: src/geanylatex.c:825 +msgid "Helps at inserting labels to a document" msgstr "" +#. init keybindins +#: src/geanylatex.c:830 +msgid "Insert \\label" +msgstr "" + +#: src/geanylatex.c:831 +msgid "Insert \\ref" +msgstr "" + +#: src/geanylatex.c:832 +msgid "Run LaTeX-Wizard" +msgstr "" + #: src/latexencodings.c:37 msgid "UTF-8" msgstr "" Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2008-11-13 09:37:54 UTC (rev 295) +++ trunk/geanylatex/src/geanylatex.c 2008-11-14 00:04:51 UTC (rev 296) @@ -51,7 +51,7 @@ PLUGIN_VERSION_CHECK(104) -PLUGIN_SET_INFO(_("LaTeX"), _("Plugin to make Geany better support LaTeX"), "0.2", +PLUGIN_SET_INFO(_("LaTeX"), _("Plugin to provide better LaTeX support"), "0.2", "Frank Lanitz <frank(a)frank.uvena.de>") GtkWidget *menu_latex = NULL; @@ -254,7 +254,7 @@ gint count_menu_entries(SubMenuTemplate *tmp, gint categorie) { - // TODO: Reset max value for to stop before it's too late + // TODO: Reset max value to stop before it's too late gint i; gint count = 0; if (categorie == -1) @@ -330,10 +330,10 @@ split = TRUE; } - // Setting active sub menu to sub menu of catagorie + // Setting active sub menu to sub menu of category sub_menu = sub_menu_cat[i][0]; active_submenu = sub_menu; - // Finding entries for each categorie + // Finding entries for each category for (j = 0; menu_template[j].latex != NULL; j++) { @@ -454,7 +454,7 @@ GtkTooltips *tooltip = gtk_tooltips_new(); - // Creating and formating table + // Creating and formatting table table = gtk_table_new(2, 6, FALSE); gtk_table_set_col_spacings(GTK_TABLE(table), 6); gtk_table_set_row_spacings(GTK_TABLE(table), 6); @@ -514,7 +514,7 @@ label_author = gtk_label_new(_("Author:")); author_textbox = gtk_entry_new(); gtk_tooltips_set_tip(tooltip, author_textbox, - _("Sets the entry of \\author command. In most cases here should stay your name"), NULL); + _("Sets the value of the \\author command. In most cases this should be your name"), NULL); if (geany_data->template_prefs->developer != NULL) { author = geany_data->template_prefs->developer; @@ -528,7 +528,7 @@ label_date = gtk_label_new(_("Date:")); date_textbox = gtk_entry_new(); gtk_tooltips_set_tip(tooltip, date_textbox, - _("Sets the entry of the \\date command inside header of your newly created LaTeX-document. Keeping it at \\today is a good decision if you don't need any fixed date."), NULL); + _("Sets the value of the \\date command inside header of your newly created LaTeX-document. Keeping it at \\today is a good decision if you don't need any fixed date."), NULL); gtk_entry_set_text(GTK_ENTRY(date_textbox), "\\today"); gtk_misc_set_alignment(GTK_MISC(label_date), 0, 0.5); gtk_table_attach_defaults(GTK_TABLE(table), label_date, 0, 1, 4, 5); @@ -537,7 +537,7 @@ // Title of the new document label_title = gtk_label_new(_("Title:")); title_textbox = gtk_entry_new(); - gtk_tooltips_set_tip(tooltip, title_textbox, _("Sets the title of your newly document."), + gtk_tooltips_set_tip(tooltip, title_textbox, _("Sets the title of your new document."), NULL); gtk_misc_set_alignment(GTK_MISC(label_title), 0, 0.5); gtk_table_attach_defaults(GTK_TABLE(table), label_title, 0, 1, 5, 6); @@ -547,7 +547,7 @@ label_papersize = gtk_label_new(_("Paper size:")); papersize_combobox = gtk_combo_box_new_text(); gtk_tooltips_set_tip(tooltip, papersize_combobox, - _("Chooce the paper format for the new created document"), NULL); + _("Choose the paper format for the newly created document"), NULL); gtk_combo_box_insert_text(GTK_COMBO_BOX(papersize_combobox), 0, "A4"); gtk_combo_box_insert_text(GTK_COMBO_BOX(papersize_combobox), 1, "A5"); gtk_combo_box_insert_text(GTK_COMBO_BOX(papersize_combobox), 2, "A6"); @@ -561,7 +561,7 @@ gtk_widget_show_all(table); - // Buidling the wizard-dialog and showing it + // Building the wizard-dialog and showing it dialog = gtk_dialog_new_with_buttons(_("LaTeX-Wizard"), GTK_WINDOW(geany->main_widgets->window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, @@ -575,7 +575,7 @@ checkbox_KOMA = gtk_check_button_new_with_label(_("Use KOMA-script classes if possible")); gtk_tooltips_set_tip(tooltip, checkbox_KOMA, _ - ("Uses the KOMA-script classes by Markus Kohm.\nKeep in mind: To compile your document these classes have to been installed before."), + ("Uses the KOMA-script classes by Markus Kohm.\nKeep in mind: To compile your document these classes have to be installed before."), NULL); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox_KOMA), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox_KOMA), KOMA_active); @@ -783,9 +783,7 @@ { GtkTooltips *tooltips = NULL; - gchar *kblabel_insert_label = _("Insert \\label"); - gchar *kblabel_insert_ref = _("Insert \\ref"); - gchar *kblabel_wizard = _("Run LaTeX-Wizard"); + gchar *kblabel_insert_label, *kblabel_insert_ref, *kblabel_wizard; p_main->locale_init(LOCALEDIR, GETTEXT_PACKAGE); @@ -802,7 +800,7 @@ menu_latex_wizzard = gtk_menu_item_new_with_mnemonic(_("LaTeX-_Wizard")); gtk_container_add(GTK_CONTAINER(menu_latex_menu), menu_latex_wizzard); gtk_tooltips_set_tip(tooltips, menu_latex_wizzard, - _("Starts a Wizard to create easily LaTeX-dokuments"), NULL); + _("Starts a Wizard to easily create LaTeX-documents"), NULL); g_signal_connect((gpointer) menu_latex_wizzard, "activate", G_CALLBACK(wizard_activated), NULL); @@ -824,11 +822,14 @@ menu_latex_label = gtk_menu_item_new_with_mnemonic(_("Insert _Label")); gtk_tooltips_set_tip(tooltips, menu_latex_label, - _("Helps at inserting labels to a docuemnt"), NULL); + _("Helps at inserting labels to a document"), NULL); gtk_container_add(GTK_CONTAINER(menu_latex_menu), menu_latex_label); g_signal_connect((gpointer) menu_latex_label, "activate", G_CALLBACK(insert_label_activated), NULL); /* init keybindins */ + kblabel_insert_label = _("Insert \\label"); + kblabel_insert_ref = _("Insert \\ref"); + kblabel_wizard = _("Run LaTeX-Wizard"); p_keybindings->set_item(plugin_key_group, LATEX_WIZZARD_KB, kbwizard, 0, 0, "run_latex_wizard", kblabel_wizard, menu_latex_wizzard); p_keybindings->set_item(plugin_key_group, LATEX_INSERT_LABEL_KB, kblabel_insert, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[295] trunk/geanylatex/src/letters.c
by frlan＠users.sourceforge.net 13 Nov '08

13 Nov '08

Revision: 295 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=295&view=rev Author: frlan Date: 2008-11-13 09:37:54 +0000 (Thu, 13 Nov 2008) Log Message: ----------- GeanyLaTeX: Fix for the fix of a typo to prevent build issues. Ooops Modified Paths: -------------- trunk/geanylatex/src/letters.c Modified: trunk/geanylatex/src/letters.c =================================================================== --- trunk/geanylatex/src/letters.c 2008-11-12 23:48:17 UTC (rev 294) +++ trunk/geanylatex/src/letters.c 2008-11-13 09:37:54 UTC (rev 295) @@ -1,4 +1,4 @@ -v/* +/* * letters.c * * Copyright 2008 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[294] trunk/geanylatex/src/letters.c
by frlan＠users.sourceforge.net 13 Nov '08

13 Nov '08

Revision: 294 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=294&view=rev Author: frlan Date: 2008-11-12 23:48:17 +0000 (Wed, 12 Nov 2008) Log Message: ----------- GeanyLaTeX: Fixed a wrong file name in header Modified Paths: -------------- trunk/geanylatex/src/letters.c Modified: trunk/geanylatex/src/letters.c =================================================================== --- trunk/geanylatex/src/letters.c 2008-11-12 19:49:49 UTC (rev 293) +++ trunk/geanylatex/src/letters.c 2008-11-12 23:48:17 UTC (rev 294) @@ -1,5 +1,5 @@ -/* - * letters.h +v/* + * letters.c * * Copyright 2008 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[293] trunk/spellcheck
by eht16＠users.sourceforge.net 12 Nov '08

12 Nov '08

Revision: 293 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=293&view=rev Author: eht16 Date: 2008-11-12 19:49:49 +0000 (Wed, 12 Nov 2008) Log Message: ----------- When using 'Ignore All', add the word to ignore to the enchant session list to really ignore it for further checks, too. Modified Paths: -------------- trunk/spellcheck/ChangeLog trunk/spellcheck/src/gui.c trunk/spellcheck/src/speller.c trunk/spellcheck/src/speller.h Modified: trunk/spellcheck/ChangeLog =================================================================== --- trunk/spellcheck/ChangeLog 2008-11-11 21:13:35 UTC (rev 292) +++ trunk/spellcheck/ChangeLog 2008-11-12 19:49:49 UTC (rev 293) @@ -1,3 +1,10 @@ +2008-11-12 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/speller.c, src/speller.h, src/gui.c: + When using 'Ignore All', add the word to ignore to the enchant + session list to really ignore it for further checks, too. + + 2008-11-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/speller.c, src/speller.h, src/gui.c: Modified: trunk/spellcheck/src/gui.c =================================================================== --- trunk/spellcheck/src/gui.c 2008-11-11 21:13:35 UTC (rev 292) +++ trunk/spellcheck/src/gui.c 2008-11-12 19:49:49 UTC (rev 293) @@ -157,6 +157,8 @@ p_sci->set_selection_end(clickinfo.doc->editor->sci, endword); p_sci->replace_sel(clickinfo.doc->editor->sci, sugg); + /** TODO replace word */ + p_sci->indicator_clear(clickinfo.doc->editor->sci, startword, endword - startword); } } @@ -172,12 +174,15 @@ if (clickinfo.doc == NULL || clickinfo.word == NULL || clickinfo.pos == -1) return; - /* we either ignore the word, so we only remove all indicators or - * we add the word to the personal dictionary */ - if (! ignore) + /* if we ignore the word, we add it to the current session, to ignore it + * also for further checks*/ + if (ignore) + speller_add_word_to_session(clickinfo.word); + /* if we do not ignore the word, we add the word to the personal dictionary */ + else speller_add_word(clickinfo.word); - /* Remove all indicators on the added word */ + /* Remove all indicators on the added/ignored word */ sci = clickinfo.doc->editor->sci; str = g_string_sized_new(256); doc_len = p_sci->get_length(sci); Modified: trunk/spellcheck/src/speller.c =================================================================== --- trunk/spellcheck/src/speller.c 2008-11-11 21:13:35 UTC (rev 292) +++ trunk/spellcheck/src/speller.c 2008-11-12 19:49:49 UTC (rev 293) @@ -350,7 +350,6 @@ void speller_add_word(const gchar *word) { enchant_dict_add_to_pwl(speller_dict, clickinfo.word, -1); - } gboolean speller_dict_check(const gchar *word) @@ -369,6 +368,14 @@ } +void speller_add_word_to_session(const gchar *word) +{ + g_return_if_fail(speller_dict != NULL); + + enchant_dict_add_to_session(speller_dict, word, -1); +} + + void speller_init(void) { speller_broker = enchant_broker_init(); Modified: trunk/spellcheck/src/speller.h =================================================================== --- trunk/spellcheck/src/speller.h 2008-11-11 21:13:35 UTC (rev 292) +++ trunk/spellcheck/src/speller.h 2008-11-12 19:49:49 UTC (rev 293) @@ -45,6 +45,8 @@ gboolean speller_is_text(GeanyDocument *doc, gint pos); +void speller_add_word_to_session(const gchar *word); + void speller_init(void); void speller_free(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-plugins:[292] trunk/geanylatex/src/latexencodings.c
by frlan＠users.sourceforge.net 11 Nov '08

11 Nov '08

Revision: 292 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=292&view=rev Author: frlan Date: 2008-11-11 21:13:35 +0000 (Tue, 11 Nov 2008) Log Message: ----------- GeanyLaTeX: Use of utf8 insteed of utf8x for UTF-8 inputencoding Modified Paths: -------------- trunk/geanylatex/src/latexencodings.c Modified: trunk/geanylatex/src/latexencodings.c =================================================================== --- trunk/geanylatex/src/latexencodings.c 2008-11-11 17:03:20 UTC (rev 291) +++ trunk/geanylatex/src/latexencodings.c 2008-11-11 21:13:35 UTC (rev 292) @@ -34,7 +34,7 @@ void init_encodings_latex(void) { - fill(LATEX_ENCODING_UTF_8, _("UTF-8"), "utf8x", GEANY_ENCODING_UTF_8); + fill(LATEX_ENCODING_UTF_8, _("UTF-8"), "utf8", GEANY_ENCODING_UTF_8); fill(LATEX_ENCODING_ASCII, _("US-ASCII"), "ascii", GEANY_ENCODING_ISO_8859_1); fill(LATEX_ENCODING_ISO_8859_1, _("ISO-8859-1 (Latin-1)"), "latin1", GEANY_ENCODING_ISO_8859_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-plugins:[291] trunk
by eht16＠users.sourceforge.net 11 Nov '08

11 Nov '08

Revision: 291 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=291&view=rev Author: eht16 Date: 2008-11-11 17:03:20 +0000 (Tue, 11 Nov 2008) Log Message: ----------- Try to fix missing dependencies on globally installed Geany header files. Update Waf to 1.5 (final). Modified Paths: -------------- trunk/waf trunk/wscript Modified: trunk/waf =================================================================== --- trunk/waf 2008-11-10 19:58:18 UTC (rev 290) +++ trunk/waf 2008-11-11 17:03:20 UTC (rev 291) @@ -38,10 +38,10 @@ except:pass VERSION="1.5.0" -REVISION="a28f28ae2e5fe099ce722d07de417940" +REVISION="80c6ad48eea21944e014f0f0e609ef9c" INSTALL=sys.platform=='win32' and 'c:/temp' or '/usr/local' -C1='#)' -C2='#%' +C1='#(' +C2='#&' cwd = os.getcwd() join = os.path.join @@ -127,5 +127,5 @@ Scripting.prepare(t, cwd, VERSION, wafdir) #==> @@ 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-plugins:[290] trunk/spellcheck
by eht16＠users.sourceforge.net 10 Nov '08

10 Nov '08

Revision: 290 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=290&view=rev Author: eht16 Date: 2008-11-10 19:58:18 +0000 (Mon, 10 Nov 2008) Log Message: ----------- Check the Scintilla lexing style for the word to check and skip any further checks if the word is not a comment, string or has any other style which belongs to the filetype language of the current document. This makes the whole plugin much more useful, eliminates many false positives and increases speed a lot. Modified Paths: -------------- trunk/spellcheck/ChangeLog trunk/spellcheck/src/gui.c trunk/spellcheck/src/speller.c trunk/spellcheck/src/speller.h Modified: trunk/spellcheck/ChangeLog =================================================================== --- trunk/spellcheck/ChangeLog 2008-11-09 21:49:07 UTC (rev 289) +++ trunk/spellcheck/ChangeLog 2008-11-10 19:58:18 UTC (rev 290) @@ -1,3 +1,13 @@ +2008-11-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/speller.c, src/speller.h, src/gui.c: + Check the Scintilla lexing style for the word to check and + skip any further checks if the word is not a comment, string + or has any other style which belongs to the filetype language of + the current document. This makes the whole plugin much more useful, + eliminates many false positives and increases speed a lot. + + 2008-10-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/speller.c, src/speller.h, src/scplugin.c: Modified: trunk/spellcheck/src/gui.c =================================================================== --- trunk/spellcheck/src/gui.c 2008-11-09 21:49:07 UTC (rev 289) +++ trunk/spellcheck/src/gui.c 2008-11-10 19:58:18 UTC (rev 290) @@ -203,7 +203,7 @@ void gui_update_editor_menu_cb(GObject *obj, const gchar *word, gint pos, - GeanyDocument *doc, gpointer user_data) + GeanyDocument *doc, gpointer user_data) { gsize n_suggs, i; gchar **tmp_suggs; @@ -218,6 +218,10 @@ if (isdigit(*word)) return; + /* ignore non-text */ + if (! speller_is_text(doc, pos)) + return; + if (! NZV(word) || speller_dict_check(word) == 0) return; Modified: trunk/spellcheck/src/speller.c =================================================================== --- trunk/spellcheck/src/speller.c 2008-11-09 21:49:07 UTC (rev 289) +++ trunk/spellcheck/src/speller.c 2008-11-10 19:58:18 UTC (rev 290) @@ -36,6 +36,7 @@ #include "editor.h" #include "msgwindow.h" #include "utils.h" +#include "scintilla/SciLexer.h" #include "pluginmacros.h" @@ -71,6 +72,10 @@ if (isdigit(*word)) return 0; + /* ignore non-text */ + if (! speller_is_text(doc, start_pos)) + return 0; + /* early out if the word is spelled correctly */ if (enchant_dict_check(speller_dict, word, -1) == 0) return 0; @@ -380,3 +385,445 @@ enchant_broker_free_dict(speller_broker, speller_dict); enchant_broker_free(speller_broker); } + + +gboolean speller_is_text(GeanyDocument *doc, gint pos) +{ + gint lexer, style; + + g_return_val_if_fail(doc != NULL, FALSE); + g_return_val_if_fail(pos >= 0, FALSE); + + lexer = p_sci->send_message(doc->editor->sci, SCI_GETLEXER, 0, 0); + style = p_sci->get_style_at(doc->editor->sci, pos); + + switch (lexer) + { + /* early out for the default style */ + if (style == STYLE_DEFAULT) + return TRUE; + + case SCLEX_ASM: + { + switch (style) + { + case SCE_ASM_DEFAULT: + case SCE_ASM_COMMENT: + case SCE_ASM_COMMENTBLOCK: + case SCE_ASM_STRING: + case SCE_ASM_STRINGEOL: + case SCE_ASM_CHARACTER: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_BASH: + case SCLEX_OMS: + { + switch (style) + { + case SCE_SH_DEFAULT: + case SCE_SH_COMMENTLINE: + case SCE_SH_STRING: + case SCE_SH_CHARACTER: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_CAML: + { + switch (style) + { + case SCE_CAML_DEFAULT: + case SCE_CAML_COMMENT: + case SCE_CAML_COMMENT1: + case SCE_CAML_COMMENT2: + case SCE_CAML_COMMENT3: + case SCE_CAML_STRING: + case SCE_CAML_CHAR: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_CPP: + case SCLEX_PASCAL: + { + switch (style) + { + case SCE_C_DEFAULT: + case SCE_C_COMMENT: + case SCE_C_COMMENTLINE: + case SCE_C_COMMENTDOC: + case SCE_C_STRING: + case SCE_C_CHARACTER: + case SCE_C_STRINGEOL: + case SCE_C_COMMENTLINEDOC: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_CSS: + { + switch (style) + { + case SCE_CSS_DEFAULT: + case SCE_CSS_COMMENT: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_D: + { + switch (style) + { + case SCE_D_DEFAULT: + case SCE_D_COMMENT: + case SCE_D_COMMENTLINE: + case SCE_D_COMMENTDOC: + case SCE_D_COMMENTNESTED: + case SCE_D_STRING: + case SCE_D_STRINGEOL: + case SCE_D_CHARACTER: + case SCE_D_COMMENTLINEDOC: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_DIFF: + { + switch (style) + { + case SCE_DIFF_DEFAULT: + case SCE_DIFF_COMMENT: + case SCE_DIFF_HEADER: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_FORTRAN: + case SCLEX_F77: + { + switch (style) + { + case SCE_F_DEFAULT: + case SCE_F_COMMENT: + case SCE_F_STRING1: + case SCE_F_STRING2: + case SCE_F_STRINGEOL: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_FREEBASIC: + { + switch (style) + { + case SCE_B_DEFAULT: + case SCE_B_COMMENT: + case SCE_B_STRING: + case SCE_B_STRINGEOL: + case SCE_B_CONSTANT: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_HASKELL: + { + switch (style) + { + case SCE_HA_DEFAULT: + case SCE_HA_COMMENTLINE: + case SCE_HA_COMMENTBLOCK: + case SCE_HA_COMMENTBLOCK2: + case SCE_HA_COMMENTBLOCK3: + case SCE_HA_STRING: + case SCE_HA_CHARACTER: + case SCE_HA_DATA: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_HTML: + case SCLEX_XML: + { + switch (style) + { + case SCE_H_DEFAULT: + case SCE_H_TAGUNKNOWN: + case SCE_H_ATTRIBUTEUNKNOWN: + case SCE_H_DOUBLESTRING: + case SCE_H_SINGLESTRING: + case SCE_H_COMMENT: + case SCE_H_CDATA: + case SCE_H_VALUE: /* really? */ + case SCE_H_SGML_DEFAULT: + case SCE_H_SGML_COMMENT: + case SCE_H_SGML_DOUBLESTRING: + case SCE_H_SGML_SIMPLESTRING: + case SCE_H_SGML_1ST_PARAM_COMMENT: + case SCE_HJ_DEFAULT: + case SCE_HJ_COMMENT: + case SCE_HJ_COMMENTLINE: + case SCE_HJ_COMMENTDOC: + case SCE_HJ_DOUBLESTRING: + case SCE_HJ_SINGLESTRING: + case SCE_HJ_STRINGEOL: + case SCE_HB_DEFAULT: + case SCE_HB_COMMENTLINE: + case SCE_HB_STRING: + case SCE_HB_STRINGEOL: + case SCE_HBA_DEFAULT: + case SCE_HBA_COMMENTLINE: + case SCE_HBA_STRING: + case SCE_HBA_STRINGEOL: + case SCE_HJA_DEFAULT: + case SCE_HJA_COMMENT: + case SCE_HJA_COMMENTLINE: + case SCE_HJA_COMMENTDOC: + case SCE_HJA_DOUBLESTRING: + case SCE_HJA_SINGLESTRING: + case SCE_HJA_STRINGEOL: + case SCE_HP_DEFAULT: + case SCE_HP_COMMENTLINE: + case SCE_HP_STRING: + case SCE_HP_CHARACTER: + case SCE_HP_TRIPLE: + case SCE_HP_TRIPLEDOUBLE: + case SCE_HPA_DEFAULT: + case SCE_HPA_COMMENTLINE: + case SCE_HPA_STRING: + case SCE_HPA_CHARACTER: + case SCE_HPA_TRIPLE: + case SCE_HPA_TRIPLEDOUBLE: + case SCE_HPHP_DEFAULT: + case SCE_HPHP_SIMPLESTRING: + case SCE_HPHP_HSTRING: + case SCE_HPHP_COMMENT: + case SCE_HPHP_COMMENTLINE: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_LATEX: + { + switch (style) + { + case SCE_L_DEFAULT: + case SCE_L_COMMENT: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_LUA: + { + switch (style) + { + case SCE_LUA_DEFAULT: + case SCE_LUA_COMMENT: + case SCE_LUA_COMMENTLINE: + case SCE_LUA_COMMENTDOC: + case SCE_LUA_STRING: + case SCE_LUA_CHARACTER: + case SCE_LUA_LITERALSTRING: + case SCE_LUA_STRINGEOL: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_MAKEFILE: + { + switch (style) + { + case SCE_MAKE_DEFAULT: + case SCE_MAKE_COMMENT: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_MATLAB: + { + switch (style) + { + case SCE_MATLAB_DEFAULT: + case SCE_MATLAB_COMMENT: + case SCE_MATLAB_STRING: + case SCE_MATLAB_DOUBLEQUOTESTRING: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_PERL: + { + switch (style) + { + case SCE_PL_DEFAULT: + case SCE_PL_COMMENTLINE: + case SCE_PL_STRING: + case SCE_PL_CHARACTER: + case SCE_PL_POD: + case SCE_PL_POD_VERB: + case SCE_PL_LONGQUOTE: + /* do we want SCE_PL_STRING_* too? */ + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_PO: + { + switch (style) + { + case SCE_PO_DEFAULT: + case SCE_PO_COMMENT: + case SCE_PO_MSGID_TEXT: + case SCE_PO_MSGSTR_TEXT: + case SCE_PO_MSGCTXT_TEXT: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_PROPERTIES: + { + switch (style) + { + case SCE_PROPS_DEFAULT: + case SCE_PROPS_COMMENT: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_PYTHON: + { + switch (style) + { + case SCE_P_DEFAULT: + case SCE_P_COMMENTLINE: + case SCE_P_STRING: + case SCE_P_CHARACTER: + case SCE_P_TRIPLE: + case SCE_P_TRIPLEDOUBLE: + case SCE_P_COMMENTBLOCK: + case SCE_P_STRINGEOL: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_R: + { + switch (style) + { + case SCE_R_DEFAULT: + case SCE_R_COMMENT: + case SCE_R_STRING: + case SCE_R_STRING2: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_RUBY: + { + switch (style) + { + case SCE_RB_DEFAULT: + case SCE_RB_COMMENTLINE: + case SCE_RB_STRING: + case SCE_RB_CHARACTER: + case SCE_RB_POD: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_SQL: + { + switch (style) + { + case SCE_SQL_DEFAULT: + case SCE_SQL_COMMENT: + case SCE_SQL_COMMENTLINE: + case SCE_SQL_COMMENTDOC: + case SCE_SQL_STRING: + case SCE_SQL_CHARACTER: + case SCE_SQL_SQLPLUS_COMMENT: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_TCL: + { + switch (style) + { + case SCE_TCL_DEFAULT: + case SCE_TCL_COMMENT: + case SCE_TCL_COMMENTLINE: + case SCE_TCL_IN_QUOTE: + return TRUE; + default: + return FALSE; + } + break; + } + case SCLEX_VHDL: + { + switch (style) + { + case SCE_VHDL_DEFAULT: + case SCE_VHDL_COMMENT: + case SCE_VHDL_COMMENTLINEBANG: + case SCE_VHDL_STRING: + case SCE_VHDL_STRINGEOL: + return TRUE; + default: + return FALSE; + } + break; + } + } + /* if the current lexer was not handled, let's say the passed position contains + * valid text to not ignore more than we want */ + return TRUE; +} + + Modified: trunk/spellcheck/src/speller.h =================================================================== --- trunk/spellcheck/src/speller.h 2008-11-09 21:49:07 UTC (rev 289) +++ trunk/spellcheck/src/speller.h 2008-11-10 19:58:18 UTC (rev 290) @@ -43,6 +43,8 @@ gchar **speller_dict_suggest(const gchar *word, gsize *n_suggs); +gboolean speller_is_text(GeanyDocument *doc, gint pos); + void speller_init(void); void speller_free(void); 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

Plugins-Commits November 2008