Plugins-Commits February 2009

plugins-commits@lists.geany.org

5 participants
103 discussions

SF.net SVN: geany-plugins:[489] trunk/geanylatex
by frlan＠users.sourceforge.net 18 Feb '09

18 Feb '09

Revision: 489 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=489&view=rev Author: frlan Date: 2009-02-18 00:21:13 +0000 (Wed, 18 Feb 2009) Log Message: ----------- GeanyLaTeX: Format selected text if any Modified Paths: -------------- trunk/geanylatex/ChangeLog trunk/geanylatex/src/formatutils.c Modified: trunk/geanylatex/ChangeLog =================================================================== --- trunk/geanylatex/ChangeLog 2009-02-18 00:20:44 UTC (rev 488) +++ trunk/geanylatex/ChangeLog 2009-02-18 00:21:13 UTC (rev 489) @@ -1,3 +1,8 @@ +2009-02-18 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * Formating of selected text + + 2009-02-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * Added a menu entry for easy formating of text Modified: trunk/geanylatex/src/formatutils.c =================================================================== --- trunk/geanylatex/src/formatutils.c 2009-02-18 00:20:44 UTC (rev 488) +++ trunk/geanylatex/src/formatutils.c 2009-02-18 00:21:13 UTC (rev 489) @@ -25,8 +25,32 @@ G_GNUC_UNUSED gpointer gdata) { gint format = GPOINTER_TO_INT(gdata); + GeanyDocument *doc = NULL; + doc = document_get_current(); - glatex_insert_string(glatex_format_pattern[format], TRUE); - glatex_insert_string("{", TRUE); - glatex_insert_string("}", FALSE); + if (doc != NULL) + { + if (sci_has_selection(doc->editor->sci)) + { + gint selection_len = sci_get_selected_text_length(doc->editor->sci); + gchar *selection = g_malloc(selection_len + 1); + const gchar *replacement = NULL; + + sci_get_selected_text(doc->editor->sci, selection); + + replacement = g_strconcat(glatex_format_pattern[format],"{", + selection, "}", NULL); + + sci_replace_sel(doc->editor->sci, replacement); + g_free(selection); + } + else + { + glatex_insert_string(glatex_format_pattern[format], TRUE); + glatex_insert_string("{", TRUE); + glatex_insert_string("}", FALSE); + } + } } + + 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:[488] trunk/geanylatex/src
by frlan＠users.sourceforge.net 18 Feb '09

18 Feb '09

Revision: 488 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=488&view=rev Author: frlan Date: 2009-02-18 00:20:44 +0000 (Wed, 18 Feb 2009) Log Message: ----------- GeanyLaTeX: Prefix a bunch of functions Modified Paths: -------------- trunk/geanylatex/src/bibtex.c trunk/geanylatex/src/bibtex.h trunk/geanylatex/src/bibtexlabels.c trunk/geanylatex/src/formatpatterns.c trunk/geanylatex/src/formatutils.c trunk/geanylatex/src/formatutils.h trunk/geanylatex/src/geanylatex.c trunk/geanylatex/src/geanylatex.h trunk/geanylatex/src/latexencodings.c trunk/geanylatex/src/latexencodings.h trunk/geanylatex/src/latexutils.c trunk/geanylatex/src/latexutils.h trunk/geanylatex/src/letters.c trunk/geanylatex/src/letters.h trunk/geanylatex/src/reftex.c trunk/geanylatex/src/reftex.h Modified: trunk/geanylatex/src/bibtex.c =================================================================== --- trunk/geanylatex/src/bibtex.c 2009-02-18 00:19:52 UTC (rev 487) +++ trunk/geanylatex/src/bibtex.c 2009-02-18 00:20:44 UTC (rev 488) @@ -22,7 +22,7 @@ #include "bibtex.h" #include "reftex.h" -#define set_status(entry_number, flag) \ +#define glatex_set_status(entry_number, flag) \ fields[entry_number] = flag; @@ -41,7 +41,7 @@ } #endif -void insert_bibtex_entry(G_GNUC_UNUSED GtkMenuItem * menuitem, +void glatex_insert_bibtex_entry(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) { int doctype = GPOINTER_TO_INT(gdata); @@ -51,91 +51,91 @@ for (i = 0; i < N_ENTRIES; i++) { - set_status(i, FALSE); + glatex_set_status(i, FALSE); } switch(doctype) { case ARTICLE: - set_status(AUTHOR, TRUE); - set_status(TITLE, TRUE); - set_status(JOURNAL, TRUE); - set_status(YEAR, TRUE); + glatex_set_status(AUTHOR, TRUE); + glatex_set_status(TITLE, TRUE); + glatex_set_status(JOURNAL, TRUE); + glatex_set_status(YEAR, TRUE); break; case BOOK: - set_status(AUTHOR, TRUE); - set_status(EDITOR, TRUE); - set_status(TITLE, TRUE); - set_status(PUBLISHER, TRUE); - set_status(YEAR, TRUE); + glatex_set_status(AUTHOR, TRUE); + glatex_set_status(EDITOR, TRUE); + glatex_set_status(TITLE, TRUE); + glatex_set_status(PUBLISHER, TRUE); + glatex_set_status(YEAR, TRUE); break; case BOOKLET: - set_status(TITLE, TRUE); + glatex_set_status(TITLE, TRUE); break; case CONFERENCE: case INCOLLECTION: case INPROCEEDINGS: - set_status(AUTHOR, TRUE); - set_status(TITLE, TRUE); - set_status(BOOKTITLE, TRUE); - set_status(YEAR, TRUE); + glatex_set_status(AUTHOR, TRUE); + glatex_set_status(TITLE, TRUE); + glatex_set_status(BOOKTITLE, TRUE); + glatex_set_status(YEAR, TRUE); break; case INBOOK: - set_status(AUTHOR, TRUE); - set_status(EDITOR, TRUE); - set_status(TITLE, TRUE); - set_status(CHAPTER, TRUE); - set_status(PAGES, TRUE); - set_status(PUBLISHER, TRUE); - set_status(YEAR, TRUE); + glatex_set_status(AUTHOR, TRUE); + glatex_set_status(EDITOR, TRUE); + glatex_set_status(TITLE, TRUE); + glatex_set_status(CHAPTER, TRUE); + glatex_set_status(PAGES, TRUE); + glatex_set_status(PUBLISHER, TRUE); + glatex_set_status(YEAR, TRUE); break; case MANUAL: - set_status(TITLE, TRUE); + glatex_set_status(TITLE, TRUE); break; case MASTERSTHESIS: case PHDTHESIS: - set_status(AUTHOR, TRUE); - set_status(TITLE, TRUE); - set_status(SCHOOL, TRUE); - set_status(YEAR, TRUE); + glatex_set_status(AUTHOR, TRUE); + glatex_set_status(TITLE, TRUE); + glatex_set_status(SCHOOL, TRUE); + glatex_set_status(YEAR, TRUE); break; case MISC: for (i = 0; i < N_ENTRIES; i++) { - set_status(i, TRUE); + glatex_set_status(i, TRUE); } case TECHREPORT: - set_status(AUTHOR, TRUE); - set_status(TITLE, TRUE); - set_status(INSTITUTION, TRUE); - set_status(YEAR, TRUE); + glatex_set_status(AUTHOR, TRUE); + glatex_set_status(TITLE, TRUE); + glatex_set_status(INSTITUTION, TRUE); + glatex_set_status(YEAR, TRUE); break; case UNPUBLISHED: - set_status(AUTHOR, TRUE); - set_status(TITLE, TRUE); - set_status(NOTE, TRUE); + glatex_set_status(AUTHOR, TRUE); + glatex_set_status(TITLE, TRUE); + glatex_set_status(NOTE, TRUE); break; case PROCEEDINGS: - set_status(TITLE, TRUE); - set_status(YEAR, TRUE); + glatex_set_status(TITLE, TRUE); + glatex_set_status(YEAR, TRUE); break; default: for (i = 0; i < N_ENTRIES; i++) { - set_status(i, TRUE); + glatex_set_status(i, TRUE); } } - output = g_strconcat(output, label_types[doctype], "{ \n",NULL); + output = g_strconcat(output, glatex_label_types[doctype], "{ \n",NULL); for (i = 0; i < N_ENTRIES; i++) { if (fields[i] == TRUE) { - output = g_strconcat(output, label_entry_keywords[i], "= {},\n", NULL); + output = g_strconcat(output, glatex_label_entry_keywords[i], "= {},\n", NULL); } } output = g_strconcat(output, "}\n", NULL); - insert_string(output, FALSE); + glatex_insert_string(output, FALSE); g_free(output); } Modified: trunk/geanylatex/src/bibtex.h =================================================================== --- trunk/geanylatex/src/bibtex.h 2009-02-18 00:19:52 UTC (rev 487) +++ trunk/geanylatex/src/bibtex.h 2009-02-18 00:20:44 UTC (rev 488) @@ -75,16 +75,17 @@ N_ENTRIES }; -extern gchar *label_types[]; +extern gchar *glatex_label_types[]; -extern const gchar *label_tooltips[]; +extern const gchar *glatex_label_tooltips[]; -extern const gchar *label_entry_keywords[]; +extern const gchar *glatex_label_entry_keywords[]; -extern const gchar *label_entry[]; +extern const gchar *glatex_label_entry[]; -int push_bibtex_entry(int style, GeanyDocument *doc); +int glatex_push_bibtex_entry(int style, GeanyDocument *doc); -void insert_bibtex_entry(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata); +void glatex_insert_bibtex_entry(G_GNUC_UNUSED GtkMenuItem * menuitem, + G_GNUC_UNUSED gpointer gdata); #endif Modified: trunk/geanylatex/src/bibtexlabels.c =================================================================== --- trunk/geanylatex/src/bibtexlabels.c 2009-02-18 00:19:52 UTC (rev 487) +++ trunk/geanylatex/src/bibtexlabels.c 2009-02-18 00:20:44 UTC (rev 488) @@ -22,7 +22,7 @@ #include "geanylatex.h" #include "bibtex.h" -gchar *label_types[] = { +gchar *glatex_label_types[] = { N_("Article"), N_("Book"), N_("Booklet"), @@ -39,7 +39,7 @@ N_("Unpublished")}; -const gchar *label_entry[] = { +const gchar *glatex_label_entry[] = { N_("Address"), N_("Annote"), N_("Author"), @@ -67,7 +67,7 @@ N_("Volume"), N_("Year")}; -const gchar *label_entry_keywords[] = { +const gchar *glatex_label_entry_keywords[] = { ("Address"), ("Annote"), ("Author"), @@ -95,7 +95,7 @@ ("Volume"), ("Year")}; -const gchar *label_tooltips[] = { +const gchar *glatex_label_tooltips[] = { N_("Address of publisher"), N_("Annotation for annotated bibliography styles"), N_("Name(s) of the author(s), separated by 'and' if more than one"), Modified: trunk/geanylatex/src/formatpatterns.c =================================================================== --- trunk/geanylatex/src/formatpatterns.c 2009-02-18 00:19:52 UTC (rev 487) +++ trunk/geanylatex/src/formatpatterns.c 2009-02-18 00:20:44 UTC (rev 488) @@ -21,7 +21,7 @@ #include "geanylatex.h" -gchar* format_pattern[] = { +gchar* glatex_format_pattern[] = { "\\textit", "\\textbf", "\\underline", @@ -31,7 +31,7 @@ "\\emph" }; -const gchar *format_labels[] = { +const gchar *glatex_format_labels[] = { N_("Italic"), N_("Boldfont"), N_("Underline"), Modified: trunk/geanylatex/src/formatutils.c =================================================================== --- trunk/geanylatex/src/formatutils.c 2009-02-18 00:19:52 UTC (rev 487) +++ trunk/geanylatex/src/formatutils.c 2009-02-18 00:20:44 UTC (rev 488) @@ -21,12 +21,12 @@ #include "formatutils.h" -void insert_latex_format(G_GNUC_UNUSED GtkMenuItem * menuitem, +void glatex_insert_latex_format(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) { gint format = GPOINTER_TO_INT(gdata); - insert_string(format_pattern[format], TRUE); - insert_string("{", TRUE); - insert_string("}", FALSE); + glatex_insert_string(glatex_format_pattern[format], TRUE); + glatex_insert_string("{", TRUE); + glatex_insert_string("}", FALSE); } Modified: trunk/geanylatex/src/formatutils.h =================================================================== --- trunk/geanylatex/src/formatutils.h 2009-02-18 00:19:52 UTC (rev 487) +++ trunk/geanylatex/src/formatutils.h 2009-02-18 00:20:44 UTC (rev 488) @@ -35,8 +35,8 @@ LATEX_STYLES_END }; -extern gchar* format_pattern[]; -extern const gchar *format_labels[]; -void insert_latex_format(GtkMenuItem * menuitem, gpointer gdata); +extern gchar* glatex_format_pattern[]; +extern const gchar *glatex_format_labels[]; +void glatex_insert_latex_format(GtkMenuItem * menuitem, gpointer gdata); #endif Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2009-02-18 00:19:52 UTC (rev 487) +++ trunk/geanylatex/src/geanylatex.c 2009-02-18 00:20:44 UTC (rev 488) @@ -61,7 +61,7 @@ PLUGIN_KEY_GROUP(geanylatex, COUNT_KB) void -insert_string(gchar *string, gboolean reset_position) +glatex_insert_string(gchar *string, gboolean reset_position) { GeanyDocument *doc = NULL; @@ -84,7 +84,7 @@ inline gchar* get_latex_command(gint tab_index) { - return char_array[tab_index].latex; + return glatex_char_array[tab_index].latex; } @@ -92,7 +92,7 @@ char_insert_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) { - insert_string(get_latex_command(GPOINTER_TO_INT(gdata)), TRUE); + glatex_insert_string(get_latex_command(GPOINTER_TO_INT(gdata)), TRUE); } @@ -135,7 +135,7 @@ gchar *label_str = NULL; label_str = g_strconcat("\\label{",g_strdup(gtk_entry_get_text( GTK_ENTRY(textbox_label))), "}", NULL); - insert_string(label_str, TRUE); + glatex_insert_string(label_str, TRUE); } gtk_widget_destroy(dialog); @@ -170,7 +170,7 @@ label_ref = gtk_label_new(_("Ref name:")); textbox_ref = gtk_combo_box_entry_new_text(); - add_Labels(textbox_ref, get_aux_file()); + glatex_add_Labels(textbox_ref, glatex_get_aux_file()); gtk_misc_set_alignment(GTK_MISC(label_ref), 0, 0.5); @@ -210,7 +210,7 @@ if (ref_string != NULL) { - insert_string(ref_string, TRUE); + glatex_insert_string(ref_string, TRUE); g_free(ref_string); } } @@ -236,7 +236,7 @@ * returns 0, if categorie is empty * if gint categorie is -1, function will count every element. * Useful, if there is no need for a categorie check.*/ -gint +static gint count_menu_entries(SubMenuTemplate *tmp, gint categorie) { /* TODO: Reset max value to stop before it's too late */ @@ -268,7 +268,7 @@ return count; } -gint +static gint count_menu_cat_entries(CategoryName *tmp) { gint i; @@ -278,7 +278,7 @@ } -void sub_menu_init(GtkWidget *base_menu, SubMenuTemplate *menu_template, +static void sub_menu_init(GtkWidget *base_menu, SubMenuTemplate *menu_template, CategoryName *category_name, SubMenuCallback callback_function) { @@ -844,7 +844,7 @@ static void kb_insert_newline(G_GNUC_UNUSED guint key_id) { - insert_string("\\\\\n", TRUE); + glatex_insert_string("\\\\\n", TRUE); } /*static void kb_bibtex_entry_insert(G_GNUC_UNUSED guint key_id) @@ -883,7 +883,7 @@ main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); - init_encodings_latex(); + glatex_init_encodings_latex(); tooltips = gtk_tooltips_new(); @@ -911,7 +911,7 @@ menu_latex_menu_special_char_submenu = gtk_menu_new(); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_latex_menu_special_char), menu_latex_menu_special_char_submenu); - sub_menu_init(menu_latex_menu_special_char_submenu, char_array, cat_names, + sub_menu_init(menu_latex_menu_special_char_submenu, glatex_char_array, glatex_cat_names, char_insert_activated); menu_latex_ref = gtk_menu_item_new_with_mnemonic(_("Insert _Reference")); @@ -938,10 +938,10 @@ for (i = 0; i < N_TYPES; i++) { tmp = NULL; - tmp = gtk_menu_item_new_with_mnemonic(_(label_types[i])); + tmp = gtk_menu_item_new_with_mnemonic(_(glatex_label_types[i])); gtk_container_add(GTK_CONTAINER(menu_latex_bibtex_submenu), tmp); g_signal_connect((gpointer) tmp, "activate", - G_CALLBACK(insert_bibtex_entry), GINT_TO_POINTER(i)); + G_CALLBACK(glatex_insert_bibtex_entry), GINT_TO_POINTER(i)); } menu_latex_format_insert = gtk_menu_item_new_with_mnemonic(_("Format")); @@ -954,10 +954,10 @@ for (i = 0; i < LATEX_STYLES_END; i++) { tmp = NULL; - tmp = gtk_menu_item_new_with_mnemonic(_(format_labels[i])); + tmp = gtk_menu_item_new_with_mnemonic(_(glatex_format_labels[i])); gtk_container_add(GTK_CONTAINER(menu_latex_format_insert_submenu), tmp); g_signal_connect((gpointer) tmp, "activate", - G_CALLBACK(insert_latex_format), GINT_TO_POINTER(i)); + G_CALLBACK(glatex_insert_latex_format), GINT_TO_POINTER(i)); } init_keybindings(); Modified: trunk/geanylatex/src/geanylatex.h =================================================================== --- trunk/geanylatex/src/geanylatex.h 2009-02-18 00:19:52 UTC (rev 487) +++ trunk/geanylatex/src/geanylatex.h 2009-02-18 00:20:44 UTC (rev 488) @@ -108,6 +108,6 @@ #define MAX_MENU_ENTRIES 20 -extern void insert_string(gchar *string, gboolean reset_position); +extern void glatex_insert_string(gchar *string, gboolean reset_position); #endif Modified: trunk/geanylatex/src/latexencodings.c =================================================================== --- trunk/geanylatex/src/latexencodings.c 2009-02-18 00:19:52 UTC (rev 487) +++ trunk/geanylatex/src/latexencodings.c 2009-02-18 00:20:44 UTC (rev 488) @@ -32,7 +32,7 @@ latex_encodings[Charset].latex = LaTeX; \ latex_encodings[Charset].geany_enc = GeanyEnc; -void init_encodings_latex(void) +void glatex_init_encodings_latex(void) { fill(LATEX_ENCODING_UTF_8, _("UTF-8"), "utf8", GEANY_ENCODING_UTF_8); fill(LATEX_ENCODING_ASCII, _("US-ASCII"), "ascii", GEANY_ENCODING_ISO_8859_1); Modified: trunk/geanylatex/src/latexencodings.h =================================================================== --- trunk/geanylatex/src/latexencodings.h 2009-02-18 00:19:52 UTC (rev 487) +++ trunk/geanylatex/src/latexencodings.h 2009-02-18 00:20:44 UTC (rev 488) @@ -51,6 +51,6 @@ extern LaTeXEncodings latex_encodings[LATEX_ENCODINGS_MAX]; -void init_encodings_latex(void); +void glatex_init_encodings_latex(void); #endif Modified: trunk/geanylatex/src/latexutils.c =================================================================== --- trunk/geanylatex/src/latexutils.c 2009-02-18 00:19:52 UTC (rev 487) +++ trunk/geanylatex/src/latexutils.c 2009-02-18 00:20:44 UTC (rev 488) @@ -41,7 +41,7 @@ return result; } -const gchar *get_aux_file() +const gchar *glatex_get_aux_file() { GeanyDocument *doc = NULL; gchar *locale_filename = NULL; Modified: trunk/geanylatex/src/latexutils.h =================================================================== --- trunk/geanylatex/src/latexutils.h 2009-02-18 00:19:52 UTC (rev 487) +++ trunk/geanylatex/src/latexutils.h 2009-02-18 00:20:44 UTC (rev 488) @@ -25,6 +25,6 @@ gchar **geanylatex_read_file_in_array(const gchar *filename); -const gchar *get_aux_file(); +const gchar *glatex_get_aux_file(); #endif Modified: trunk/geanylatex/src/letters.c =================================================================== --- trunk/geanylatex/src/letters.c 2009-02-18 00:19:52 UTC (rev 487) +++ trunk/geanylatex/src/letters.c 2009-02-18 00:20:44 UTC (rev 488) @@ -35,7 +35,7 @@ LETTERS_END }; -CategoryName cat_names[] = { +CategoryName glatex_cat_names[] = { { GREEK_LETTERS, N_("Greek letters"), TRUE}, { GERMAN_LETTERS, N_("German umlauts"), TRUE}, { MISC_LETTERS, N_("Misc"), FALSE}, @@ -50,7 +50,7 @@ * AAABBBCCC is valid * AAACCCBBB is valid * ACABCBACB is _not_ valid and will course trouble */ -SubMenuTemplate char_array[] = { +SubMenuTemplate glatex_char_array[] = { /* Greek characters */ {GREEK_LETTERS, "Α", "\\Alpha" }, {GREEK_LETTERS, "α", "\\alpha" }, Modified: trunk/geanylatex/src/letters.h =================================================================== --- trunk/geanylatex/src/letters.h 2009-02-18 00:19:52 UTC (rev 487) +++ trunk/geanylatex/src/letters.h 2009-02-18 00:20:44 UTC (rev 488) @@ -25,8 +25,8 @@ #include "datatypes.h" -extern SubMenuTemplate char_array[]; +extern SubMenuTemplate glatex_char_array[]; -extern CategoryName cat_names[]; +extern CategoryName glatex_cat_names[]; #endif Modified: trunk/geanylatex/src/reftex.c =================================================================== --- trunk/geanylatex/src/reftex.c 2009-02-18 00:19:52 UTC (rev 487) +++ trunk/geanylatex/src/reftex.c 2009-02-18 00:20:44 UTC (rev 488) @@ -23,7 +23,7 @@ #include "reftex.h" #include "latexutils.h" -void add_Labels(GtkWidget *combobox, const gchar *file) +void glatex_add_Labels(GtkWidget *combobox, const gchar *file) { gchar **aux_entries = NULL; int i = 0; @@ -37,7 +37,7 @@ { if (g_str_has_prefix(aux_entries[i], "\\newlabel")) { - tmp = parseLine(aux_entries[i]); + tmp = glatex_parseLine(aux_entries[i]); gtk_combo_box_append_text(GTK_COMBO_BOX(combobox), tmp.label_name); } } @@ -45,7 +45,7 @@ } } -LaTeXLabel parseLine(const gchar *line) +LaTeXLabel glatex_parseLine(const gchar *line) { LaTeXLabel label; Modified: trunk/geanylatex/src/reftex.h =================================================================== --- trunk/geanylatex/src/reftex.h 2009-02-18 00:19:52 UTC (rev 487) +++ trunk/geanylatex/src/reftex.h 2009-02-18 00:20:44 UTC (rev 488) @@ -31,8 +31,8 @@ gchar *chapter; } LaTeXLabel; -void add_Labels(GtkWidget *combobox, const gchar *file); +void glatex_add_Labels(GtkWidget *combobox, const gchar *file); -LaTeXLabel parseLine(const gchar *line); +LaTeXLabel glatex_parseLine(const gchar *line); #endif 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:[487] trunk/geanylipsum
by frlan＠users.sourceforge.net 18 Feb '09

18 Feb '09

Revision: 487 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=487&view=rev Author: frlan Date: 2009-02-18 00:19:52 +0000 (Wed, 18 Feb 2009) Log Message: ----------- GeanyLipsum: Fix make dist call. Thanks to Enrico for missing input Added Paths: ----------- trunk/geanylipsum/makefile.win32 trunk/geanylipsum/po/ChangeLog Added: trunk/geanylipsum/makefile.win32 =================================================================== --- trunk/geanylipsum/makefile.win32 (rev 0) +++ trunk/geanylipsum/makefile.win32 2009-02-18 00:19:52 UTC (rev 487) @@ -0,0 +1,60 @@ +# +# localwin32.mk is an optional file to override make variables. +# Use localwin32.mk instead of editing variables as it is included in sub +# makefiles. +# localwin32.mk to set PREFIX instead of the default C:\libs +# For MSYS use localwin32.mk to set CP and RM. +# By default this will work in a Windows command prompt. + +CC = gcc +CP = copy +RM = del +PREFIX = C:\libs + +GEANY_SRC = c:\geany +TARGET = geanylipsum.dll +.SUFFIXES: .c .o +-include localwin32.mk + + +OBJS = geanylipsum.o +INCLUDEDIRS= -I. \ + -I$(GEANY_SRC) \ + -I$(GEANY_SRC)\src \ + -I$(GEANY_SRC)\plugins \ + -I$(GEANY_SRC)\tagmanager\include \ + -I$(GEANY_SRC)\scintilla\include \ + -I$(PREFIX)/include/gtk-2.0 \ + -I$(PREFIX)/lib/gtk-2.0/include \ + -I$(PREFIX)/include/atk-1.0 \ + -I$(PREFIX)/include/pango-1.0 \ + -I$(PREFIX)/include/cairo \ + -I$(PREFIX)/include/glib-2.0 \ + -I$(PREFIX)/lib/glib-2.0/include \ + -I$(PREFIX)/include/gettext \ + -I$(PREFIX)/include \ + -I$(ASPELL_PREFIX)/interfaces/cc + +ALL_GTK_LIBS= \ + -L"$(PREFIX)/lib" \ + -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 \ + -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl -liconv +CCFLAGS=-Wall -O2 -mms-bitfields -DHAVE_CONFIG_H + + +all: $(TARGET) + +deps.mak: + $(CC) -MM $(CCFLAGS) $(INCLUDEDIRS) src/*.c >deps.mak + +spellcheck.o: + $(CC) $(CCFLAGS) $(INCLUDEDIRS) -c $< + +$(TARGET): deps.mak $(OBJS) + $(CC) -shared $(OBJS) $(ALL_GTK_LIBS) -o $(TARGET) + +clean: + -$(RM) deps.mak *.o *.dll + +# Generate header dependencies with "make deps.mak" +include deps.mak 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:[486] trunk/spellcheck
by eht16＠users.sourceforge.net 17 Feb '09

17 Feb '09

Revision: 486 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=486&view=rev Author: eht16 Date: 2009-02-17 14:52:25 +0000 (Tue, 17 Feb 2009) Log Message: ----------- Synchronise lexer checks with Geany's new filetypes. Modified Paths: -------------- trunk/spellcheck/ChangeLog trunk/spellcheck/src/speller.c Modified: trunk/spellcheck/ChangeLog =================================================================== --- trunk/spellcheck/ChangeLog 2009-02-17 14:32:18 UTC (rev 485) +++ trunk/spellcheck/ChangeLog 2009-02-17 14:52:25 UTC (rev 486) @@ -14,6 +14,8 @@ * src/gui.c, src/gui.h, src/scplugin.c, src/scplugin.h, src/speller.c, src/speller.h: Prefix all non-static functions which sc_ to avoid symbol clashes. + * src/speller.c: + Synchronise lexer checks with Geany's new filetypes. 2009-02-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/spellcheck/src/speller.c =================================================================== --- trunk/spellcheck/src/speller.c 2009-02-17 14:32:18 UTC (rev 485) +++ trunk/spellcheck/src/speller.c 2009-02-17 14:52:25 UTC (rev 486) @@ -431,15 +431,30 @@ g_return_val_if_fail(doc != NULL, FALSE); g_return_val_if_fail(pos >= 0, FALSE); - lexer = scintilla_send_message(doc->editor->sci, SCI_GETLEXER, 0, 0); style = sci_get_style_at(doc->editor->sci, pos); + /* early out for the default style */ + if (style == STYLE_DEFAULT) + return TRUE; + lexer = scintilla_send_message(doc->editor->sci, SCI_GETLEXER, 0, 0); switch (lexer) { - /* early out for the default style */ - if (style == STYLE_DEFAULT) - return TRUE; - + case SCLEX_ADA: + { + switch (style) + { + case SCE_ADA_DEFAULT: + case SCE_ADA_COMMENTLINE: + case SCE_ADA_STRING: + case SCE_ADA_STRINGEOL: + case SCE_ADA_CHARACTER: + case SCE_ADA_CHARACTEREOL: + return TRUE; + default: + return FALSE; + } + break; + } case SCLEX_ASM: { switch (style) @@ -506,6 +521,22 @@ } break; } + case SCLEX_CMAKE: + { + switch (style) + { + case SCE_CMAKE_DEFAULT: + case SCE_CMAKE_COMMENT: + case SCE_CMAKE_STRINGDQ: + case SCE_CMAKE_STRINGLQ: + case SCE_CMAKE_STRINGRQ: + case SCE_CMAKE_STRINGVAR: + return TRUE; + default: + return FALSE; + } + break; + } case SCLEX_CSS: { switch (style) @@ -718,6 +749,23 @@ } break; } + case SCLEX_NSIS: + { + switch (style) + { + case SCE_NSIS_DEFAULT: + case SCE_NSIS_COMMENT: + case SCE_NSIS_STRINGDQ: + case SCE_NSIS_STRINGLQ: + case SCE_NSIS_STRINGRQ: + case SCE_NSIS_STRINGVAR: + case SCE_NSIS_COMMENTBOX: + return TRUE; + default: + return FALSE; + } + break; + } case SCLEX_PERL: { switch (style) @@ -856,6 +904,19 @@ } break; } + case SCLEX_YAML: + { + switch (style) + { + case SCE_YAML_DEFAULT: + case SCE_YAML_COMMENT: + case SCE_YAML_TEXT: + 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 */ 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:[485] trunk/spellcheck
by eht16＠users.sourceforge.net 17 Feb '09

17 Feb '09

Revision: 485 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=485&view=rev Author: eht16 Date: 2009-02-17 14:32:18 +0000 (Tue, 17 Feb 2009) Log Message: ----------- Prefix all non-static functions which sc_ to avoid symbol clashes. 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 trunk/spellcheck/src/speller.h Modified: trunk/spellcheck/ChangeLog =================================================================== --- trunk/spellcheck/ChangeLog 2009-02-17 14:10:47 UTC (rev 484) +++ trunk/spellcheck/ChangeLog 2009-02-17 14:32:18 UTC (rev 485) @@ -11,6 +11,9 @@ 'check while typing' feature while not being much slower (if ever). * src/gui.c, src/scplugin.c, src/scplugin.h: Display accelerator on the 'Default' menu item. + * src/gui.c, src/gui.h, src/scplugin.c, src/scplugin.h, src/speller.c, + src/speller.h: + Prefix all non-static functions which sc_ to avoid symbol clashes. 2009-02-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/spellcheck/src/gui.c =================================================================== --- trunk/spellcheck/src/gui.c 2009-02-17 14:10:47 UTC (rev 484) +++ trunk/spellcheck/src/gui.c 2009-02-17 14:32:18 UTC (rev 485) @@ -60,22 +60,9 @@ -void gui_perform_check(GeanyDocument *doc) -{ - editor_indicator_clear(doc->editor, GEANY_INDICATOR_ERROR); - if (sc->use_msgwin) - { - msgwin_clear_tab(MSG_MESSAGE); - msgwin_switch_tab(MSG_MESSAGE, FALSE); - } - - speller_check_document(doc); -} - - static void print_typing_changed_message(void) { - if (sc->check_while_typing) + if (sc_info->check_while_typing) ui_set_statusbar(FALSE, _("Spell checking while typing is now enabled")); else ui_set_statusbar(FALSE, _("Spell checking while typing is now disabled")); @@ -87,43 +74,43 @@ if (ignore_sc_callback) return; - sc->check_while_typing = gtk_toggle_tool_button_get_active(button); + sc_info->check_while_typing = gtk_toggle_tool_button_get_active(button); print_typing_changed_message(); } -void gui_toolbar_update(void) +void sc_gui_toolbar_update(void) { /* toolbar item is not requested, so remove the item if it exists */ - if (! sc->show_toolbar_item) + if (! sc_info->show_toolbar_item) { - if (sc->toolbar_button != NULL) + if (sc_info->toolbar_button != NULL) { - gtk_widget_hide(GTK_WIDGET(sc->toolbar_button)); + gtk_widget_hide(GTK_WIDGET(sc_info->toolbar_button)); } } else { - if (sc->toolbar_button == NULL) + if (sc_info->toolbar_button == NULL) { - sc->toolbar_button = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_SPELL_CHECK); + sc_info->toolbar_button = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_SPELL_CHECK); #if GTK_CHECK_VERSION(2, 12, 0) - gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(sc->toolbar_button), + gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(sc_info->toolbar_button), _("Toggle spell check while typing")); #endif - plugin_add_toolbar_item(geany_plugin, sc->toolbar_button); - ui_add_document_sensitive(GTK_WIDGET(sc->toolbar_button)); + plugin_add_toolbar_item(geany_plugin, sc_info->toolbar_button); + ui_add_document_sensitive(GTK_WIDGET(sc_info->toolbar_button)); - g_signal_connect(sc->toolbar_button, "toggled", + g_signal_connect(sc_info->toolbar_button, "toggled", G_CALLBACK(toolbar_item_toggled_cb), NULL); } - gtk_widget_show(GTK_WIDGET(sc->toolbar_button)); + gtk_widget_show(GTK_WIDGET(sc_info->toolbar_button)); ignore_sc_callback = TRUE; gtk_toggle_tool_button_set_active( - GTK_TOGGLE_TOOL_BUTTON(sc->toolbar_button), sc->check_while_typing); + GTK_TOGGLE_TOOL_BUTTON(sc_info->toolbar_button), sc_info->check_while_typing); ignore_sc_callback = FALSE; } } @@ -158,7 +145,7 @@ sci_replace_sel(sci, sugg); /* store the replacement for future checks */ - speller_store_replacement(word, sugg); + sc_speller_store_replacement(word, sugg); /* remove indicator */ sci_indicator_clear(sci, startword, endword - startword); @@ -168,7 +155,7 @@ } -static void on_menu_addword_item_activate(GtkMenuItem *menuitem, gpointer gdata) +static void menu_addword_item_activate_cd(GtkMenuItem *menuitem, gpointer gdata) { gint startword, endword, i, doc_len; ScintillaObject *sci; @@ -181,10 +168,10 @@ /* 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); + sc_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); + sc_speller_add_word(clickinfo.word); /* Remove all indicators on the added/ignored word */ sci = clickinfo.doc->editor->sci; @@ -228,16 +215,16 @@ } -void gui_update_editor_menu_cb(GObject *obj, const gchar *word, gint pos, - GeanyDocument *doc, gpointer user_data) +void sc_gui_update_editor_menu_cb(GObject *obj, const gchar *word, gint pos, + GeanyDocument *doc, gpointer user_data) { gchar *search_word; g_return_if_fail(doc != NULL && doc->is_valid); /* hide the submenu in any case, we will reshow it again if we actually found something */ - gtk_widget_hide(sc->edit_menu); - gtk_widget_hide(sc->edit_menu_sep); + gtk_widget_hide(sc_info->edit_menu); + gtk_widget_hide(sc_info->edit_menu_sep); /* if we have a selection, prefer it over the current word */ if (sci_has_selection(doc->editor->sci)) @@ -250,30 +237,30 @@ search_word = g_strdup(word); /* ignore numbers or words starting with digits and non-text */ - if (! NZV(search_word) || isdigit(*search_word) || ! speller_is_text(doc, pos)) + if (! NZV(search_word) || isdigit(*search_word) || ! sc_speller_is_text(doc, pos)) { g_free(search_word); return; } - if (speller_dict_check(search_word) != 0) + if (sc_speller_dict_check(search_word) != 0) { GtkWidget *menu_item, *menu; gchar *label; gsize n_suggs, i; gchar **suggs; - suggs = speller_dict_suggest(search_word, &n_suggs); + suggs = sc_speller_dict_suggest(search_word, &n_suggs); clickinfo.pos = pos; clickinfo.doc = doc; setptr(clickinfo.word, search_word); - if (sc->edit_menu_sub != NULL && GTK_IS_WIDGET(sc->edit_menu_sub)) - gtk_widget_destroy(sc->edit_menu_sub); + if (sc_info->edit_menu_sub != NULL && GTK_IS_WIDGET(sc_info->edit_menu_sub)) + gtk_widget_destroy(sc_info->edit_menu_sub); - sc->edit_menu_sub = menu = gtk_menu_new(); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(sc->edit_menu), sc->edit_menu_sub); + sc_info->edit_menu_sub = menu = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(sc_info->edit_menu), sc_info->edit_menu_sub); for (i = 0; i < n_suggs; i++) { @@ -299,28 +286,28 @@ { menu_item = gtk_menu_item_new_with_label(_("(No Suggestions)")); gtk_widget_set_sensitive(menu_item, FALSE); - gtk_container_add(GTK_CONTAINER(sc->edit_menu_sub), menu_item); + gtk_container_add(GTK_CONTAINER(sc_info->edit_menu_sub), menu_item); } menu_item = gtk_separator_menu_item_new(); - gtk_container_add(GTK_CONTAINER(sc->edit_menu_sub), menu_item); + gtk_container_add(GTK_CONTAINER(sc_info->edit_menu_sub), menu_item); label = g_strdup_printf(_("Add \"%s\" to Dictionary"), search_word); menu_item = image_menu_item_new(GTK_STOCK_ADD, label); - gtk_container_add(GTK_CONTAINER(sc->edit_menu_sub), menu_item); + gtk_container_add(GTK_CONTAINER(sc_info->edit_menu_sub), menu_item); g_signal_connect(menu_item, "activate", - G_CALLBACK(on_menu_addword_item_activate), GINT_TO_POINTER(0)); + G_CALLBACK(menu_addword_item_activate_cd), GINT_TO_POINTER(0)); menu_item = image_menu_item_new(GTK_STOCK_REMOVE, _("Ignore All")); - gtk_container_add(GTK_CONTAINER(sc->edit_menu_sub), menu_item); + gtk_container_add(GTK_CONTAINER(sc_info->edit_menu_sub), menu_item); g_signal_connect(menu_item, "activate", - G_CALLBACK(on_menu_addword_item_activate), GINT_TO_POINTER(1)); + G_CALLBACK(menu_addword_item_activate_cd), GINT_TO_POINTER(1)); - gtk_widget_show(sc->edit_menu); - gtk_widget_show(sc->edit_menu_sep); - gtk_widget_show_all(sc->edit_menu_sub); + gtk_widget_show(sc_info->edit_menu); + gtk_widget_show(sc_info->edit_menu_sep); + gtk_widget_show_all(sc_info->edit_menu_sub); if (suggs != NULL) - speller_dict_free_string_list(suggs); + sc_speller_dict_free_string_list(suggs); g_free(label); } @@ -338,12 +325,12 @@ } -gboolean gui_editor_notify_cb(GObject *obj, GeanyEditor *editor, SCNotification *nt, gpointer data) +gboolean sc_gui_editor_notify_cb(GObject *obj, GeanyEditor *editor, SCNotification *nt, gpointer data) { gint start_pos, end_pos, pos; gchar *word; - if (! sc->check_while_typing || nt->nmhdr.code != SCN_MODIFIED || + if (! sc_info->check_while_typing || nt->nmhdr.code != SCN_MODIFIED || ! (nt->modificationType & (SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT))) { return FALSE; @@ -360,9 +347,9 @@ end_pos = start_pos + strlen(word); indicator_clear_on_range(editor, start_pos, end_pos - start_pos); - if (speller_check_word(editor->document, -1, word, start_pos, end_pos) != 0) + if (sc_speller_check_word(editor->document, -1, word, start_pos, end_pos) != 0) { - if (sc->use_msgwin) + if (sc_info->use_msgwin) msgwin_switch_tab(MSG_MESSAGE, FALSE); } @@ -380,52 +367,52 @@ /* Another language was chosen from the menu item, so make it default for this session. */ if (gdata != NULL) - setptr(sc->default_language, g_strdup(gdata)); + setptr(sc_info->default_language, g_strdup(gdata)); - speller_reinit_enchant_dict(); + sc_speller_reinit_enchant_dict(); editor_indicator_clear(doc->editor, GEANY_INDICATOR_ERROR); - if (sc->use_msgwin) + if (sc_info->use_msgwin) { msgwin_clear_tab(MSG_MESSAGE); msgwin_switch_tab(MSG_MESSAGE, FALSE); } - speller_check_document(doc); + sc_speller_check_document(doc); } -void gui_kb_run_activate_cb(guint key_id) +void sc_gui_kb_run_activate_cb(guint key_id) { menu_item_activate_cb(NULL, NULL); } -void gui_kb_toggle_typing_activate_cb(guint key_id) +void sc_gui_kb_toggle_typing_activate_cb(guint key_id) { - sc->check_while_typing = ! sc->check_while_typing; + sc_info->check_while_typing = ! sc_info->check_while_typing; print_typing_changed_message(); - gui_toolbar_update(); + sc_gui_toolbar_update(); } -void gui_create_edit_menu(void) +void sc_gui_create_edit_menu(void) { - sc->edit_menu = ui_image_menu_item_new(GTK_STOCK_SPELL_CHECK, _("Spelling Suggestions")); - gtk_container_add(GTK_CONTAINER(geany->main_widgets->editor_menu), sc->edit_menu); - gtk_menu_reorder_child(GTK_MENU(geany->main_widgets->editor_menu), sc->edit_menu, 0); + sc_info->edit_menu = ui_image_menu_item_new(GTK_STOCK_SPELL_CHECK, _("Spelling Suggestions")); + gtk_container_add(GTK_CONTAINER(geany->main_widgets->editor_menu), sc_info->edit_menu); + gtk_menu_reorder_child(GTK_MENU(geany->main_widgets->editor_menu), sc_info->edit_menu, 0); - sc->edit_menu_sep = gtk_separator_menu_item_new(); - gtk_container_add(GTK_CONTAINER(geany->main_widgets->editor_menu), sc->edit_menu_sep); - gtk_menu_reorder_child(GTK_MENU(geany->main_widgets->editor_menu), sc->edit_menu_sep, 1); + sc_info->edit_menu_sep = gtk_separator_menu_item_new(); + gtk_container_add(GTK_CONTAINER(geany->main_widgets->editor_menu), sc_info->edit_menu_sep); + gtk_menu_reorder_child(GTK_MENU(geany->main_widgets->editor_menu), sc_info->edit_menu_sep, 1); - gtk_widget_show_all(sc->edit_menu); + gtk_widget_show_all(sc_info->edit_menu); } -GtkWidget *gui_create_menu(GtkWidget *sp_item) +GtkWidget *sc_gui_create_menu(GtkWidget *sp_item) { GtkWidget *menu, *menu_item; guint i; @@ -435,32 +422,32 @@ menu = gtk_menu_new(); gtk_menu_item_set_submenu(GTK_MENU_ITEM(sp_item), menu); - sc->submenu_item_default = gtk_menu_item_new_with_mnemonic(_("Default")); - gtk_container_add(GTK_CONTAINER(menu), sc->submenu_item_default); - g_signal_connect(sc->submenu_item_default, "activate", G_CALLBACK(menu_item_activate_cb), NULL); + sc_info->submenu_item_default = gtk_menu_item_new_with_mnemonic(_("Default")); + gtk_container_add(GTK_CONTAINER(menu), sc_info->submenu_item_default); + g_signal_connect(sc_info->submenu_item_default, "activate", G_CALLBACK(menu_item_activate_cb), NULL); menu_item = gtk_separator_menu_item_new(); gtk_container_add(GTK_CONTAINER(menu), menu_item); - for (i = 0; i < sc->dicts->len; i++) + for (i = 0; i < sc_info->dicts->len; i++) { - menu_item = gtk_menu_item_new_with_label(g_ptr_array_index(sc->dicts, i)); + menu_item = gtk_menu_item_new_with_label(g_ptr_array_index(sc_info->dicts, i)); gtk_container_add(GTK_CONTAINER(menu), menu_item); g_signal_connect(menu_item, "activate", - G_CALLBACK(menu_item_activate_cb), g_ptr_array_index(sc->dicts, i)); + G_CALLBACK(menu_item_activate_cb), g_ptr_array_index(sc_info->dicts, i)); } return sp_item; } -void gui_init(void) +void sc_gui_init(void) { clickinfo.word = NULL; } -void gui_free(void) +void sc_gui_free(void) { g_free(clickinfo.word); } Modified: trunk/spellcheck/src/gui.h =================================================================== --- trunk/spellcheck/src/gui.h 2009-02-17 14:10:47 UTC (rev 484) +++ trunk/spellcheck/src/gui.h 2009-02-17 14:32:18 UTC (rev 485) @@ -28,28 +28,29 @@ -void gui_update_editor_menu_cb(GObject *obj, const gchar *word, gint pos, +void sc_gui_update_editor_menu_cb(GObject *obj, const gchar *word, gint pos, GeanyDocument *doc, gpointer user_data); -gboolean gui_key_release_cb(GtkWidget *widget, GdkEventKey *ev, gpointer user_data); +gboolean sc_gui_key_release_cb(GtkWidget *widget, GdkEventKey *ev, gpointer user_data); -gboolean gui_editor_notify_cb(GObject *obj, GeanyEditor *editor, SCNotification *nt, gpointer data); +gboolean sc_gui_editor_notify_cb(GObject *obj, GeanyEditor *editor, + SCNotification *nt, gpointer data); -void gui_kb_run_activate_cb(guint key_id); +void sc_gui_kb_run_activate_cb(guint key_id); -void gui_kb_toggle_typing_activate_cb(guint key_id); +void sc_gui_kb_toggle_typing_activate_cb(guint key_id); -void gui_create_edit_menu(void); +void sc_gui_create_edit_menu(void); -GtkWidget *gui_create_menu(GtkWidget *sp_item); +GtkWidget *sc_gui_create_menu(GtkWidget *sp_item); -void gui_update_editor_menu_cb(GObject *obj, const gchar *word, gint pos, +void sc_gui_update_editor_menu_cb(GObject *obj, const gchar *word, gint pos, GeanyDocument *doc, gpointer user_data); -void gui_toolbar_update(void); +void sc_gui_toolbar_update(void); -void gui_init(void); +void sc_gui_init(void); -void gui_free(void); +void sc_gui_free(void); #endif Modified: trunk/spellcheck/src/scplugin.c =================================================================== --- trunk/spellcheck/src/scplugin.c 2009-02-17 14:10:47 UTC (rev 484) +++ trunk/spellcheck/src/scplugin.c 2009-02-17 14:32:18 UTC (rev 485) @@ -60,7 +60,7 @@ _("The Geany developer team")) -SpellCheck *sc = NULL; +SpellCheck *sc_info = NULL; @@ -78,8 +78,8 @@ PluginCallback plugin_callbacks[] = { - { "update-editor-menu", (GCallback) &gui_update_editor_menu_cb, FALSE, NULL }, - { "editor-notify", (GCallback) &gui_editor_notify_cb, TRUE, NULL }, + { "update-editor-menu", (GCallback) &sc_gui_update_editor_menu_cb, FALSE, NULL }, + { "editor-notify", (GCallback) &sc_gui_editor_notify_cb, TRUE, NULL }, { NULL, NULL, FALSE, NULL } }; @@ -113,29 +113,29 @@ { GKeyFile *config = g_key_file_new(); gchar *data; - gchar *config_dir = g_path_get_dirname(sc->config_file); + gchar *config_dir = g_path_get_dirname(sc_info->config_file); - setptr(sc->default_language, gtk_combo_box_get_active_text(GTK_COMBO_BOX( + setptr(sc_info->default_language, gtk_combo_box_get_active_text(GTK_COMBO_BOX( g_object_get_data(G_OBJECT(dialog), "combo")))); - speller_reinit_enchant_dict(); + sc_speller_reinit_enchant_dict(); - sc->check_while_typing = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + sc_info->check_while_typing = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( g_object_get_data(G_OBJECT(dialog), "check_type")))); - sc->use_msgwin = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + sc_info->use_msgwin = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( g_object_get_data(G_OBJECT(dialog), "check_msgwin")))); - sc->show_toolbar_item = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + sc_info->show_toolbar_item = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( g_object_get_data(G_OBJECT(dialog), "check_toolbar")))); - g_key_file_load_from_file(config, sc->config_file, G_KEY_FILE_NONE, NULL); - if (sc->default_language != NULL) /* lang may be NULL */ - g_key_file_set_string(config, "spellcheck", "language", sc->default_language); - g_key_file_set_boolean(config, "spellcheck", "check_while_typing", sc->check_while_typing); - g_key_file_set_boolean(config, "spellcheck", "use_msgwin", sc->use_msgwin); - g_key_file_set_boolean(config, "spellcheck", "show_toolbar_item", sc->show_toolbar_item); + g_key_file_load_from_file(config, sc_info->config_file, G_KEY_FILE_NONE, NULL); + if (sc_info->default_language != NULL) /* lang may be NULL */ + g_key_file_set_string(config, "spellcheck", "language", sc_info->default_language); + g_key_file_set_boolean(config, "spellcheck", "check_while_typing", sc_info->check_while_typing); + g_key_file_set_boolean(config, "spellcheck", "use_msgwin", sc_info->use_msgwin); + g_key_file_set_boolean(config, "spellcheck", "show_toolbar_item", sc_info->show_toolbar_item); - gui_toolbar_update(); + sc_gui_toolbar_update(); if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) { @@ -146,7 +146,7 @@ { /* write config to file */ data = g_key_file_to_data(config, NULL, NULL); - utils_write_file(sc->config_file, data); + utils_write_file(sc_info->config_file, data); g_free(data); } g_free(config_dir); @@ -161,42 +161,42 @@ GKeyFile *config = g_key_file_new(); gchar *default_lang; - default_lang = speller_get_default_lang(); - sc = g_new0(SpellCheck, 1); + default_lang = sc_speller_get_default_lang(); + sc_info = g_new0(SpellCheck, 1); - sc->config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, + sc_info->config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, "spellcheck", G_DIR_SEPARATOR_S, "spellcheck.conf", NULL); - g_key_file_load_from_file(config, sc->config_file, G_KEY_FILE_NONE, NULL); - sc->default_language = utils_get_setting_string(config, + g_key_file_load_from_file(config, sc_info->config_file, G_KEY_FILE_NONE, NULL); + sc_info->default_language = utils_get_setting_string(config, "spellcheck", "language", default_lang); - sc->check_while_typing = utils_get_setting_boolean(config, + sc_info->check_while_typing = utils_get_setting_boolean(config, "spellcheck", "check_while_typing", FALSE); - sc->show_toolbar_item = utils_get_setting_boolean(config, + sc_info->show_toolbar_item = utils_get_setting_boolean(config, "spellcheck", "show_toolbar_item", TRUE); - sc->use_msgwin = utils_get_setting_boolean(config, "spellcheck", "use_msgwin", FALSE); + sc_info->use_msgwin = utils_get_setting_boolean(config, "spellcheck", "use_msgwin", FALSE); g_key_file_free(config); g_free(default_lang); main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); - sc->menu_item = gtk_image_menu_item_new_from_stock(GTK_STOCK_SPELL_CHECK, NULL); - ui_add_document_sensitive(sc->menu_item); + sc_info->menu_item = gtk_image_menu_item_new_from_stock(GTK_STOCK_SPELL_CHECK, NULL); + ui_add_document_sensitive(sc_info->menu_item); - gui_toolbar_update(); + sc_gui_toolbar_update(); - gui_init(); - speller_init(); + sc_gui_init(); + sc_speller_init(); - gui_create_edit_menu(); - sp_item = gui_create_menu(sc->menu_item); + sc_gui_create_edit_menu(); + sp_item = sc_gui_create_menu(sc_info->menu_item); gtk_widget_show_all(sp_item); /* setup keybindings */ - keybindings_set_item(plugin_key_group, KB_SPELL_CHECK, gui_kb_run_activate_cb, - 0, 0, "spell_check", _("Run Spell Check"), sc->submenu_item_default); + keybindings_set_item(plugin_key_group, KB_SPELL_CHECK, sc_gui_kb_run_activate_cb, + 0, 0, "spell_check", _("Run Spell Check"), sc_info->submenu_item_default); keybindings_set_item(plugin_key_group, KB_SPELL_TOOGLE_TYPING, - gui_kb_toggle_typing_activate_cb, 0, 0, "spell_toggle_typing", + sc_gui_kb_toggle_typing_activate_cb, 0, 0, "spell_toggle_typing", _("Toggle Check While Typing"), NULL); } @@ -209,16 +209,16 @@ vbox = gtk_vbox_new(FALSE, 6); check_type = gtk_check_button_new_with_label(_("Check spelling while typing")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_type), sc->check_while_typing); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_type), sc_info->check_while_typing); gtk_box_pack_start(GTK_BOX(vbox), check_type, FALSE, FALSE, 6); check_toolbar = gtk_check_button_new_with_label(_("Show toolbar item to toggle spell checking")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_toolbar), sc->show_toolbar_item); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_toolbar), sc_info->show_toolbar_item); gtk_box_pack_start(GTK_BOX(vbox), check_toolbar, FALSE, FALSE, 3); check_msgwin = gtk_check_button_new_with_label( _("Print misspelled words and suggestions in the messages window")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_msgwin), sc->use_msgwin); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_msgwin), sc_info->use_msgwin); gtk_box_pack_start(GTK_BOX(vbox), check_msgwin, FALSE, FALSE, 3); label = gtk_label_new(_("Language to use for the spell check:")); @@ -227,20 +227,20 @@ combo = gtk_combo_box_new_text(); - for (i = 0; i < sc->dicts->len; i++) + for (i = 0; i < sc_info->dicts->len; i++) { - gtk_combo_box_append_text(GTK_COMBO_BOX(combo), g_ptr_array_index(sc->dicts, i)); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), g_ptr_array_index(sc_info->dicts, i)); - if (utils_str_equal(g_ptr_array_index(sc->dicts, i), sc->default_language)) + if (utils_str_equal(g_ptr_array_index(sc_info->dicts, i), sc_info->default_language)) gtk_combo_box_set_active(GTK_COMBO_BOX(combo), i); } /* if the default language couldn't be selected, select the first available language */ if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == -1) gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0); - if (sc->dicts->len > 20) + if (sc_info->dicts->len > 20) gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(combo), 3); - else if (sc->dicts->len > 10) + else if (sc_info->dicts->len > 10) gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(combo), 2); gtk_box_pack_start(GTK_BOX(vbox), combo, FALSE, FALSE, 6); @@ -276,22 +276,22 @@ { guint i; - for (i = 0; i < sc->dicts->len; i++) + for (i = 0; i < sc_info->dicts->len; i++) { - g_free(g_ptr_array_index(sc->dicts, i)); + g_free(g_ptr_array_index(sc_info->dicts, i)); } - g_ptr_array_free(sc->dicts, TRUE); + g_ptr_array_free(sc_info->dicts, TRUE); - gtk_widget_destroy(sc->edit_menu); - gtk_widget_destroy(sc->edit_menu_sep); - if (sc->toolbar_button != NULL) - gtk_widget_destroy(GTK_WIDGET(sc->toolbar_button)); + gtk_widget_destroy(sc_info->edit_menu); + gtk_widget_destroy(sc_info->edit_menu_sep); + if (sc_info->toolbar_button != NULL) + gtk_widget_destroy(GTK_WIDGET(sc_info->toolbar_button)); - gui_free(); - speller_free(); + sc_gui_free(); + sc_speller_free(); - g_free(sc->default_language); - g_free(sc->config_file); - gtk_widget_destroy(sc->menu_item); - g_free(sc); + g_free(sc_info->default_language); + g_free(sc_info->config_file); + gtk_widget_destroy(sc_info->menu_item); + g_free(sc_info); } Modified: trunk/spellcheck/src/scplugin.h =================================================================== --- trunk/spellcheck/src/scplugin.h 2009-02-17 14:10:47 UTC (rev 484) +++ trunk/spellcheck/src/scplugin.h 2009-02-17 14:32:18 UTC (rev 485) @@ -45,7 +45,7 @@ } SpellCheck; -extern SpellCheck *sc; +extern SpellCheck *sc_info; extern GeanyPlugin *geany_plugin; extern GeanyData *geany_data; extern GeanyFunctions *geany_functions; Modified: trunk/spellcheck/src/speller.c =================================================================== --- trunk/spellcheck/src/speller.c 2009-02-17 14:10:47 UTC (rev 484) +++ trunk/spellcheck/src/speller.c 2009-02-17 14:32:18 UTC (rev 485) @@ -46,8 +46,8 @@ -static EnchantBroker *speller_broker = NULL; -static EnchantDict *speller_dict = NULL; +static EnchantBroker *sc_speller_broker = NULL; +static EnchantDict *sc_speller_dict = NULL; @@ -59,12 +59,12 @@ } -gint speller_check_word(GeanyDocument *doc, gint line_number, const gchar *word, - gint start_pos, gint end_pos) +gint sc_speller_check_word(GeanyDocument *doc, gint line_number, const gchar *word, + gint start_pos, gint end_pos) { gsize n_suggs = 0; - g_return_val_if_fail(speller_dict != NULL, 0); + g_return_val_if_fail(sc_speller_dict != NULL, 0); g_return_val_if_fail(doc != NULL, 0); g_return_val_if_fail(word != NULL, 0); g_return_val_if_fail(start_pos >= 0 && end_pos >= 0, 0); @@ -77,23 +77,23 @@ return 0; /* ignore non-text */ - if (! speller_is_text(doc, start_pos)) + if (! sc_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) + if (enchant_dict_check(sc_speller_dict, word, -1) == 0) return 0; editor_indicator_set_on_range(doc->editor, GEANY_INDICATOR_ERROR, start_pos, end_pos); - if (sc->use_msgwin && line_number != -1) + if (sc_info->use_msgwin && line_number != -1) { gsize j; gchar **suggs; GString *str; str = g_string_sized_new(256); - suggs = enchant_dict_suggest(speller_dict, word, -1, &n_suggs); + suggs = enchant_dict_suggest(sc_speller_dict, word, -1, &n_suggs); if (suggs != NULL) { g_string_append_printf(str, "line %d: %s | ", line_number + 1, word); @@ -110,7 +110,7 @@ msgwin_msg_add(COLOR_RED, line_number + 1, doc, "%s", str->str); if (suggs != NULL && n_suggs > 0) - enchant_dict_free_string_list(speller_dict, suggs); + enchant_dict_free_string_list(sc_speller_dict, suggs); } g_string_free(str, TRUE); } @@ -127,7 +127,7 @@ gint suggestions_found = 0; gchar c; - g_return_val_if_fail(speller_dict != NULL, 0); + g_return_val_if_fail(sc_speller_dict != NULL, 0); g_return_val_if_fail(doc != NULL, 0); g_return_val_if_fail(line != NULL, 0); @@ -156,7 +156,7 @@ sci_get_text_range(doc->editor->sci, wstart, wend, str->str); - suggestions_found += speller_check_word(doc, line_number, str->str, wstart, wend); + suggestions_found += sc_speller_check_word(doc, line_number, str->str, wstart, wend); pos_start = wend + 1; } @@ -166,7 +166,7 @@ } -void speller_check_document(GeanyDocument *doc) +void sc_speller_check_document(GeanyDocument *doc) { gchar *line; gint i; @@ -174,12 +174,12 @@ gchar *dict_string = NULL; gint suggestions_found = 0; - g_return_if_fail(speller_dict != NULL); + g_return_if_fail(sc_speller_dict != NULL); g_return_if_fail(doc != NULL); ui_progress_bar_start(_("Checking")); - enchant_dict_describe(speller_dict, dict_describe, &dict_string); + enchant_dict_describe(sc_speller_dict, dict_describe, &dict_string); if (sci_has_selection(doc->editor->sci)) { @@ -188,7 +188,7 @@ last_line = sci_get_line_from_position( doc->editor->sci, sci_get_selection_end(doc->editor->sci)); - if (sc->use_msgwin) + if (sc_info->use_msgwin) msgwin_msg_add(COLOR_BLUE, -1, NULL, _("Checking file \"%s\" (lines %d to %d using %s):"), DOC_FILENAME(doc), first_line + 1, last_line + 1, dict_string); @@ -199,7 +199,7 @@ { first_line = 0; last_line = sci_get_line_count(doc->editor->sci); - if (sc->use_msgwin) + if (sc_info->use_msgwin) msgwin_msg_add(COLOR_BLUE, -1, NULL, _("Checking file \"%s\" (using %s):"), DOC_FILENAME(doc), dict_string); g_message("Checking file \"%s\" (using %s):", DOC_FILENAME(doc), dict_string); @@ -217,7 +217,7 @@ g_free(line); } - if (suggestions_found == 0 && sc->use_msgwin) + if (suggestions_found == 0 && sc_info->use_msgwin) msgwin_msg_add(COLOR_BLUE, -1, NULL, _("The checked text is spelled correctly.")); ui_progress_bar_stop(); @@ -226,7 +226,7 @@ static void broker_init_failed(void) { - const gchar *err = enchant_broker_get_error(speller_broker); + const gchar *err = enchant_broker_get_error(sc_speller_broker); dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("The Enchant library couldn't be initialized (%s)."), (err != NULL) ? err : _("unknown error (maybe the chosen language is not available)")); @@ -237,7 +237,7 @@ { gboolean *supported = user_data; - if (utils_str_equal(sc->default_language, data)) + if (utils_str_equal(sc_info->default_language, data)) *supported = TRUE; } @@ -246,49 +246,49 @@ { gboolean supported = FALSE; - g_ptr_array_foreach(sc->dicts, dict_compare, &supported); + g_ptr_array_foreach(sc_info->dicts, dict_compare, &supported); return supported; } -void speller_reinit_enchant_dict(void) +void sc_speller_reinit_enchant_dict(void) { - gchar *lang = sc->default_language; + gchar *lang = sc_info->default_language; /* Release a previous dict object */ - if (speller_dict != NULL) - enchant_broker_free_dict(speller_broker, speller_dict); + if (sc_speller_dict != NULL) + enchant_broker_free_dict(sc_speller_broker, sc_speller_dict); /* Check if the stored default dictionary is (still) avaiable, fall back to the first * one in the list if not */ if (! check_default_lang()) { - if (sc->dicts->len > 0) + if (sc_info->dicts->len > 0) { - lang = g_ptr_array_index(sc->dicts, 0); + lang = g_ptr_array_index(sc_info->dicts, 0); g_warning("Stored language ('%s') could not be loaded. Falling back to '%s'", - sc->default_language, lang); + sc_info->default_language, lang); } else - g_warning("Stored language ('%s') could not be loaded.", sc->default_language); + g_warning("Stored language ('%s') could not be loaded.", sc_info->default_language); } /* Request new dict object */ - speller_dict = enchant_broker_request_dict(speller_broker, lang); - if (speller_dict == NULL) + sc_speller_dict = enchant_broker_request_dict(sc_speller_broker, lang); + if (sc_speller_dict == NULL) { broker_init_failed(); - gtk_widget_set_sensitive(sc->menu_item, FALSE); + gtk_widget_set_sensitive(sc_info->menu_item, FALSE); } else { - gtk_widget_set_sensitive(sc->menu_item, TRUE); + gtk_widget_set_sensitive(sc_info->menu_item, TRUE); } } -gchar *speller_get_default_lang(void) +gchar *sc_speller_get_default_lang(void) { const gchar *lang = g_getenv("LANG"); gchar *result = NULL; @@ -327,13 +327,13 @@ } /* find duplicates and skip them */ - for (i = 0; i < sc->dicts->len; i++) + for (i = 0; i < sc_info->dicts->len; i++) { - if (utils_str_equal(g_ptr_array_index(sc->dicts, i), result)) + if (utils_str_equal(g_ptr_array_index(sc_info->dicts, i), result)) return; } - g_ptr_array_add(sc->dicts, result); + g_ptr_array_add(sc_info->dicts, result); } @@ -345,86 +345,86 @@ static void create_dicts_array(void) { - sc->dicts = g_ptr_array_new(); + sc_info->dicts = g_ptr_array_new(); - enchant_broker_list_dicts(speller_broker, add_dict_array, sc->dicts); + enchant_broker_list_dicts(sc_speller_broker, add_dict_array, sc_info->dicts); - g_ptr_array_sort(sc->dicts, sort_dicts); + g_ptr_array_sort(sc_info->dicts, sort_dicts); } -void speller_dict_free_string_list(gchar **tmp_suggs) +void sc_speller_dict_free_string_list(gchar **tmp_suggs) { - g_return_if_fail(speller_dict != NULL); + g_return_if_fail(sc_speller_dict != NULL); - enchant_dict_free_string_list(speller_dict, tmp_suggs); + enchant_dict_free_string_list(sc_speller_dict, tmp_suggs); } -void speller_add_word(const gchar *word) +void sc_speller_add_word(const gchar *word) { - g_return_if_fail(speller_dict != NULL); + g_return_if_fail(sc_speller_dict != NULL); g_return_if_fail(word != NULL); - enchant_dict_add_to_pwl(speller_dict, word, -1); + enchant_dict_add_to_pwl(sc_speller_dict, word, -1); } -gboolean speller_dict_check(const gchar *word) +gboolean sc_speller_dict_check(const gchar *word) { - g_return_val_if_fail(speller_dict != NULL, FALSE); + g_return_val_if_fail(sc_speller_dict != NULL, FALSE); g_return_val_if_fail(word != NULL, FALSE); - return enchant_dict_check(speller_dict, word, -1); + return enchant_dict_check(sc_speller_dict, word, -1); } -gchar **speller_dict_suggest(const gchar *word, gsize *n_suggs) +gchar **sc_speller_dict_suggest(const gchar *word, gsize *n_suggs) { - g_return_val_if_fail(speller_dict != NULL, NULL); + g_return_val_if_fail(sc_speller_dict != NULL, NULL); g_return_val_if_fail(word != NULL, NULL); - return enchant_dict_suggest(speller_dict, word, -1, n_suggs); + return enchant_dict_suggest(sc_speller_dict, word, -1, n_suggs); } -void speller_add_word_to_session(const gchar *word) +void sc_speller_add_word_to_session(const gchar *word) { - g_return_if_fail(speller_dict != NULL); + g_return_if_fail(sc_speller_dict != NULL); g_return_if_fail(word != NULL); - enchant_dict_add_to_session(speller_dict, word, -1); + enchant_dict_add_to_session(sc_speller_dict, word, -1); } -void speller_store_replacement(const gchar *old_word, const gchar *new_word) +void sc_speller_store_replacement(const gchar *old_word, const gchar *new_word) { - g_return_if_fail(speller_dict != NULL); + g_return_if_fail(sc_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); + enchant_dict_store_replacement(sc_speller_dict, old_word, -1, new_word, -1); } -void speller_init(void) +void sc_speller_init(void) { - speller_broker = enchant_broker_init(); + sc_speller_broker = enchant_broker_init(); create_dicts_array(); - speller_reinit_enchant_dict(); + sc_speller_reinit_enchant_dict(); } -void speller_free(void) +void sc_speller_free(void) { - if (speller_dict != NULL) - enchant_broker_free_dict(speller_broker, speller_dict); - enchant_broker_free(speller_broker); + if (sc_speller_dict != NULL) + enchant_broker_free_dict(sc_speller_broker, sc_speller_dict); + enchant_broker_free(sc_speller_broker); } -gboolean speller_is_text(GeanyDocument *doc, gint pos) +gboolean sc_speller_is_text(GeanyDocument *doc, gint pos) { gint lexer, style; Modified: trunk/spellcheck/src/speller.h =================================================================== --- trunk/spellcheck/src/speller.h 2009-02-17 14:10:47 UTC (rev 484) +++ trunk/spellcheck/src/speller.h 2009-02-17 14:32:18 UTC (rev 485) @@ -27,31 +27,31 @@ #define SC_SPELLER_H 1 -gint speller_check_word(GeanyDocument *doc, gint line_number, const gchar *word, - gint start_pos, gint end_pos); +gint sc_speller_check_word(GeanyDocument *doc, gint line_number, const gchar *word, + gint start_pos, gint end_pos); -void speller_check_document(GeanyDocument *doc); +void sc_speller_check_document(GeanyDocument *doc); -void speller_reinit_enchant_dict(void); +void sc_speller_reinit_enchant_dict(void); -gchar *speller_get_default_lang(void); +gchar *sc_speller_get_default_lang(void); -void speller_dict_free_string_list(gchar **tmp_suggs); +void sc_speller_dict_free_string_list(gchar **tmp_suggs); -void speller_add_word(const gchar *word); +void sc_speller_add_word(const gchar *word); -gboolean speller_dict_check(const gchar *word); +gboolean sc_speller_dict_check(const gchar *word); -gchar **speller_dict_suggest(const gchar *word, gsize *n_suggs); +gchar **sc_speller_dict_suggest(const gchar *word, gsize *n_suggs); -gboolean speller_is_text(GeanyDocument *doc, gint pos); +gboolean sc_speller_is_text(GeanyDocument *doc, gint pos); -void speller_add_word_to_session(const gchar *word); +void sc_speller_add_word_to_session(const gchar *word); -void speller_store_replacement(const gchar *old_word, const gchar *new_word); +void sc_speller_store_replacement(const gchar *old_word, const gchar *new_word); -void speller_init(void); +void sc_speller_init(void); -void speller_free(void); +void sc_speller_free(void); #endif 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:[484] trunk/spellcheck
by eht16＠users.sourceforge.net 17 Feb '09

17 Feb '09

Revision: 484 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=484&view=rev Author: eht16 Date: 2009-02-17 14:10:47 +0000 (Tue, 17 Feb 2009) Log Message: ----------- Display accelerator on the 'Default' menu item. Modified Paths: -------------- trunk/spellcheck/ChangeLog trunk/spellcheck/src/gui.c trunk/spellcheck/src/scplugin.c trunk/spellcheck/src/scplugin.h Modified: trunk/spellcheck/ChangeLog =================================================================== --- trunk/spellcheck/ChangeLog 2009-02-17 13:58:58 UTC (rev 483) +++ trunk/spellcheck/ChangeLog 2009-02-17 14:10:47 UTC (rev 484) @@ -9,6 +9,8 @@ typing. These changes should increase the usability and accuracy of the 'check while typing' feature while not being much slower (if ever). + * src/gui.c, src/scplugin.c, src/scplugin.h: + Display accelerator on the 'Default' menu item. 2009-02-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/spellcheck/src/gui.c =================================================================== --- trunk/spellcheck/src/gui.c 2009-02-17 13:58:58 UTC (rev 483) +++ trunk/spellcheck/src/gui.c 2009-02-17 14:10:47 UTC (rev 484) @@ -427,7 +427,7 @@ GtkWidget *gui_create_menu(GtkWidget *sp_item) { - GtkWidget *menu, *subitem; + GtkWidget *menu, *menu_item; guint i; gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), sp_item); @@ -435,17 +435,15 @@ menu = gtk_menu_new(); gtk_menu_item_set_submenu(GTK_MENU_ITEM(sp_item), menu); - subitem = gtk_menu_item_new_with_mnemonic(_("Default")); - gtk_container_add(GTK_CONTAINER(menu), subitem); - g_signal_connect(subitem, "activate", G_CALLBACK(menu_item_activate_cb), NULL); + sc->submenu_item_default = gtk_menu_item_new_with_mnemonic(_("Default")); + gtk_container_add(GTK_CONTAINER(menu), sc->submenu_item_default); + g_signal_connect(sc->submenu_item_default, "activate", G_CALLBACK(menu_item_activate_cb), NULL); - subitem = gtk_separator_menu_item_new(); - gtk_container_add(GTK_CONTAINER(menu), subitem); + menu_item = gtk_separator_menu_item_new(); + gtk_container_add(GTK_CONTAINER(menu), menu_item); for (i = 0; i < sc->dicts->len; i++) { - GtkWidget *menu_item; - menu_item = gtk_menu_item_new_with_label(g_ptr_array_index(sc->dicts, i)); gtk_container_add(GTK_CONTAINER(menu), menu_item); g_signal_connect(menu_item, "activate", Modified: trunk/spellcheck/src/scplugin.c =================================================================== --- trunk/spellcheck/src/scplugin.c 2009-02-17 13:58:58 UTC (rev 483) +++ trunk/spellcheck/src/scplugin.c 2009-02-17 14:10:47 UTC (rev 484) @@ -194,7 +194,7 @@ /* setup keybindings */ keybindings_set_item(plugin_key_group, KB_SPELL_CHECK, gui_kb_run_activate_cb, - 0, 0, "spell_check", _("Run Spell Check"), NULL); + 0, 0, "spell_check", _("Run Spell Check"), sc->submenu_item_default); keybindings_set_item(plugin_key_group, KB_SPELL_TOOGLE_TYPING, gui_kb_toggle_typing_activate_cb, 0, 0, "spell_toggle_typing", _("Toggle Check While Typing"), NULL); Modified: trunk/spellcheck/src/scplugin.h =================================================================== --- trunk/spellcheck/src/scplugin.h 2009-02-17 13:58:58 UTC (rev 483) +++ trunk/spellcheck/src/scplugin.h 2009-02-17 14:10:47 UTC (rev 484) @@ -37,6 +37,7 @@ gboolean show_toolbar_item; GPtrArray *dicts; GtkWidget *menu_item; + GtkWidget *submenu_item_default; GtkWidget *edit_menu; GtkWidget *edit_menu_sep; GtkWidget *edit_menu_sub; 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:[483] trunk/spellcheck
by eht16＠users.sourceforge.net 17 Feb '09

17 Feb '09

Revision: 483 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=483&view=rev Author: eht16 Date: 2009-02-17 13:58:58 +0000 (Tue, 17 Feb 2009) Log Message: ----------- Use the "editor-notify" signal to catch text modifications for checking while typing. Also remove the timeout which never worked as intended. Don't add suggestions to the messages window when checking while typing. These changes should increase the usability and accuracy of the 'check while typing' feature while not being much slower (if ever). 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 trunk/spellcheck/src/speller.h Modified: trunk/spellcheck/ChangeLog =================================================================== --- trunk/spellcheck/ChangeLog 2009-02-15 22:55:55 UTC (rev 482) +++ trunk/spellcheck/ChangeLog 2009-02-17 13:58:58 UTC (rev 483) @@ -1,3 +1,16 @@ +2009-02-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/gui.c, src/gui.h, src/scplugin.c, src/scplugin.h, src/speller.c, + src/speller.h: + Use the "editor-notify" signal to catch text modifications for + checking while typing. Also remove the timeout which never worked + as intended. + Don't add suggestions to the messages window when checking while + typing. + These changes should increase the usability and accuracy of the + 'check while typing' feature while not being much slower (if ever). + + 2009-02-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/sc_plugin.c: Modified: trunk/spellcheck/src/gui.c =================================================================== --- trunk/spellcheck/src/gui.c 2009-02-15 22:55:55 UTC (rev 482) +++ trunk/spellcheck/src/gui.c 2009-02-17 13:58:58 UTC (rev 483) @@ -129,20 +129,6 @@ } -static void clear_indicators_on_line(GeanyDocument *doc, gint line_number) -{ - gint start_pos, length; - - g_return_if_fail(doc != NULL); - - start_pos = sci_get_position_from_line(doc->editor->sci, line_number); - length = sci_get_line_length(doc->editor->sci, line_number); - - sci_indicator_clear(doc->editor->sci, start_pos, length); -} - - - static void menu_suggestion_item_activate_cb(GtkMenuItem *menuitem, gpointer gdata) { const gchar *sugg; @@ -345,51 +331,42 @@ } -/* Checks only the last word before the current cursor position -> check as you type. */ -gboolean gui_key_release_cb(GtkWidget *widget, GdkEventKey *ev, gpointer user_data) +static void indicator_clear_on_range(GeanyEditor *editor, gint start, gint len) { - gint line_number; - GString *str = g_string_sized_new(256); - gchar *line; - GeanyDocument *doc; - static time_t time_prev = 0; - time_t time_now = time(NULL); - GtkWidget *focusw; + sci_indicator_set(editor->sci, GEANY_INDICATOR_ERROR); + sci_indicator_clear(editor->sci, start, len); +} - if (! sc->check_while_typing) - return FALSE; - /* check only once a second */ - if (time_now == time_prev) - return FALSE; - /* set current time for the next key press */ - time_prev = time_now; - doc = document_get_current(); - /* bail out if we don't have a document or if we are not in the editor widget */ - focusw = gtk_window_get_focus(GTK_WINDOW(geany->main_widgets->window)); - if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) - return FALSE; +gboolean gui_editor_notify_cb(GObject *obj, GeanyEditor *editor, SCNotification *nt, gpointer data) +{ + gint start_pos, end_pos, pos; + gchar *word; - if (ev->keyval == '\r' && - scintilla_send_message(doc->editor->sci, SCI_GETEOLMODE, 0, 0) == SC_EOL_CRLF) - { /* prevent double line checking */ + if (! sc->check_while_typing || nt->nmhdr.code != SCN_MODIFIED || + ! (nt->modificationType & (SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT))) + { return FALSE; } - line_number = sci_get_current_line(doc->editor->sci); - if (ev->keyval == '\n' || ev->keyval == '\r') - line_number--; /* check previous line if we start a new one */ - line = sci_get_line(doc->editor->sci, line_number); + pos = nt->position; - clear_indicators_on_line(doc, line_number); - if (speller_process_line(doc, line_number, line) != 0) + /* retrieve the word at the position */ + word = editor_get_word_at_pos(editor, pos, GEANY_WORDCHARS); + if (word == NULL) + return FALSE; + + start_pos = scintilla_send_message(editor->sci, SCI_WORDSTARTPOSITION, pos, 0); + end_pos = start_pos + strlen(word); + + indicator_clear_on_range(editor, start_pos, end_pos - start_pos); + if (speller_check_word(editor->document, -1, word, start_pos, end_pos) != 0) { if (sc->use_msgwin) msgwin_switch_tab(MSG_MESSAGE, FALSE); } - g_string_free(str, TRUE); - g_free(line); + g_free(word); return FALSE; } Modified: trunk/spellcheck/src/gui.h =================================================================== --- trunk/spellcheck/src/gui.h 2009-02-15 22:55:55 UTC (rev 482) +++ trunk/spellcheck/src/gui.h 2009-02-17 13:58:58 UTC (rev 483) @@ -33,6 +33,8 @@ gboolean gui_key_release_cb(GtkWidget *widget, GdkEventKey *ev, gpointer user_data); +gboolean gui_editor_notify_cb(GObject *obj, GeanyEditor *editor, SCNotification *nt, gpointer data); + void gui_kb_run_activate_cb(guint key_id); void gui_kb_toggle_typing_activate_cb(guint key_id); Modified: trunk/spellcheck/src/scplugin.c =================================================================== --- trunk/spellcheck/src/scplugin.c 2009-02-15 22:55:55 UTC (rev 482) +++ trunk/spellcheck/src/scplugin.c 2009-02-17 13:58:58 UTC (rev 483) @@ -75,10 +75,12 @@ + PluginCallback plugin_callbacks[] = { - { "update-editor-menu", (GCallback) &gui_update_editor_menu_cb, FALSE, NULL }, - { NULL, NULL, FALSE, NULL } + { "update-editor-menu", (GCallback) &gui_update_editor_menu_cb, FALSE, NULL }, + { "editor-notify", (GCallback) &gui_editor_notify_cb, TRUE, NULL }, + { NULL, NULL, FALSE, NULL } }; @@ -190,9 +192,6 @@ sp_item = gui_create_menu(sc->menu_item); gtk_widget_show_all(sp_item); - sc->signal_id = g_signal_connect(geany->main_widgets->window, - "key-release-event", G_CALLBACK(gui_key_release_cb), NULL); - /* setup keybindings */ keybindings_set_item(plugin_key_group, KB_SPELL_CHECK, gui_kb_run_activate_cb, 0, 0, "spell_check", _("Run Spell Check"), NULL); @@ -283,8 +282,6 @@ } g_ptr_array_free(sc->dicts, TRUE); - g_signal_handler_disconnect(geany->main_widgets->window, sc->signal_id); - gtk_widget_destroy(sc->edit_menu); gtk_widget_destroy(sc->edit_menu_sep); if (sc->toolbar_button != NULL) Modified: trunk/spellcheck/src/scplugin.h =================================================================== --- trunk/spellcheck/src/scplugin.h 2009-02-15 22:55:55 UTC (rev 482) +++ trunk/spellcheck/src/scplugin.h 2009-02-17 13:58:58 UTC (rev 483) @@ -35,7 +35,6 @@ gboolean use_msgwin; gboolean check_while_typing; gboolean show_toolbar_item; - gulong signal_id; GPtrArray *dicts; GtkWidget *menu_item; GtkWidget *edit_menu; Modified: trunk/spellcheck/src/speller.c =================================================================== --- trunk/spellcheck/src/speller.c 2009-02-15 22:55:55 UTC (rev 482) +++ trunk/spellcheck/src/speller.c 2009-02-17 13:58:58 UTC (rev 483) @@ -59,12 +59,15 @@ } -static gint speller_check_word(GeanyDocument *doc, gint line_number, const gchar *word, +gint speller_check_word(GeanyDocument *doc, gint line_number, const gchar *word, gint start_pos, gint end_pos) { gsize n_suggs = 0; g_return_val_if_fail(speller_dict != NULL, 0); + g_return_val_if_fail(doc != NULL, 0); + g_return_val_if_fail(word != NULL, 0); + g_return_val_if_fail(start_pos >= 0 && end_pos >= 0, 0); if (! NZV(word)) return 0; @@ -81,12 +84,9 @@ if (enchant_dict_check(speller_dict, word, -1) == 0) return 0; - if (start_pos == -1) - start_pos = end_pos - strlen(word); - editor_indicator_set_on_range(doc->editor, GEANY_INDICATOR_ERROR, start_pos, end_pos); - if (sc->use_msgwin) + if (sc->use_msgwin && line_number != -1) { gsize j; gchar **suggs; @@ -119,7 +119,7 @@ } -gint speller_process_line(GeanyDocument *doc, gint line_number, const gchar *line) +static gint speller_process_line(GeanyDocument *doc, gint line_number, const gchar *line) { gint pos_start, pos_end; gint wstart, wend; @@ -134,7 +134,6 @@ str = g_string_sized_new(256); pos_start = sci_get_position_from_line(doc->editor->sci, line_number); - /* TODO use SCI_GETLINEENDPOSITION */ pos_end = sci_get_position_from_line(doc->editor->sci, line_number + 1); while (pos_start < pos_end) Modified: trunk/spellcheck/src/speller.h =================================================================== --- trunk/spellcheck/src/speller.h 2009-02-15 22:55:55 UTC (rev 482) +++ trunk/spellcheck/src/speller.h 2009-02-17 13:58:58 UTC (rev 483) @@ -27,7 +27,8 @@ #define SC_SPELLER_H 1 -gint speller_process_line(GeanyDocument *doc, gint line_number, const gchar *line); +gint speller_check_word(GeanyDocument *doc, gint line_number, const gchar *word, + gint start_pos, gint end_pos); void speller_check_document(GeanyDocument *doc); 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:[482] trunk/geanylatex/src/geanylatex.c
by frlan＠users.sourceforge.net 15 Feb '09

15 Feb '09

Revision: 482 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=482&view=rev Author: frlan Date: 2009-02-15 22:55:55 +0000 (Sun, 15 Feb 2009) Log Message: ----------- GeanyLaTeX: Moved initialization of keybdindings to separate function Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2009-02-15 22:55:16 UTC (rev 481) +++ trunk/geanylatex/src/geanylatex.c 2009-02-15 22:55:55 UTC (rev 482) @@ -852,6 +852,18 @@ insert_bibtex_entry(NULL, NULL); }*/ +void init_keybindings() +{ + /* init keybindins */ + keybindings_set_item(plugin_key_group, LATEX_WIZZARD_KB, kbwizard, + 0, 0, "run_latex_wizard", _("Run LaTeX-Wizard"), menu_latex_wizzard); + keybindings_set_item(plugin_key_group, LATEX_INSERT_LABEL_KB, kblabel_insert, + 0, 0, "insert_latex_label", _("Insert \\label"), menu_latex_label); + keybindings_set_item(plugin_key_group, LATEX_INSERT_REF_KB, kbref_insert, + 0, 0, "insert_latex_ref", _("Insert \\ref"), menu_latex_ref); + keybindings_set_item(plugin_key_group, LATEX_INSERT_NEWLINE, kb_insert_newline, + 0, 0, "insert_new_line", _("Insert linebreak \\\\ "), NULL); +} void plugin_help() { @@ -948,18 +960,7 @@ G_CALLBACK(insert_latex_format), GINT_TO_POINTER(i)); } - /* init keybindins */ - keybindings_set_item(plugin_key_group, LATEX_WIZZARD_KB, kbwizard, - 0, 0, "run_latex_wizard", _("Run LaTeX-Wizard"), menu_latex_wizzard); - keybindings_set_item(plugin_key_group, LATEX_INSERT_LABEL_KB, kblabel_insert, - 0, 0, "insert_latex_label", _("Insert \\label"), menu_latex_label); - keybindings_set_item(plugin_key_group, LATEX_INSERT_REF_KB, kbref_insert, - 0, 0, "insert_latex_ref", _("Insert \\ref"), menu_latex_ref); - keybindings_set_item(plugin_key_group, LATEX_INSERT_NEWLINE, kb_insert_newline, - 0, 0, "insert_new_line", _("Insert linebreak \\\\ "), NULL); -/* keybindings_set_item(plugin_key_group, LATEX_INSERT_BIBTEX_ENTRY_KB, - kb_bibtex_entry_insert, 0, 0, "insert_latex_bibtex_entry", _("Add BiBTeX entry"), - menu_latex_bibtex); */ + init_keybindings(); ui_add_document_sensitive(menu_latex_menu_special_char); ui_add_document_sensitive(menu_latex_ref); 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:[481] trunk
by frlan＠users.sourceforge.net 15 Feb '09

15 Feb '09

Revision: 481 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=481&view=rev Author: frlan Date: 2009-02-15 22:55:16 +0000 (Sun, 15 Feb 2009) Log Message: ----------- GeanyLaTeX: Added a menu entry for easy formating of text Modified Paths: -------------- trunk/geanylatex/ChangeLog trunk/geanylatex/po/POTFILES.in trunk/geanylatex/po/de.po trunk/geanylatex/po/geanylatex.pot trunk/geanylatex/src/Makefile.am trunk/geanylatex/src/geanylatex.c trunk/geanylatex/src/geanylatex.h trunk/wscript Added Paths: ----------- trunk/geanylatex/src/formatpatterns.c trunk/geanylatex/src/formatutils.c trunk/geanylatex/src/formatutils.h Modified: trunk/geanylatex/ChangeLog =================================================================== --- trunk/geanylatex/ChangeLog 2009-02-15 22:54:13 UTC (rev 480) +++ trunk/geanylatex/ChangeLog 2009-02-15 22:55:16 UTC (rev 481) @@ -1,7 +1,12 @@ +2009-02-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * Added a menu entry for easy formating of text + + 2009-02-14 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * Added a keyboard shortcut for inserting a new line ( \\ ). - * Make cursor placed behind inserted text for most cases. + * Make cursor placed behind inserted text for most cases. (Inserting BibTeX entries will not reset the cursor) Modified: trunk/geanylatex/po/POTFILES.in =================================================================== --- trunk/geanylatex/po/POTFILES.in 2009-02-15 22:54:13 UTC (rev 480) +++ trunk/geanylatex/po/POTFILES.in 2009-02-15 22:55:16 UTC (rev 481) @@ -3,3 +3,5 @@ src/letters.c src/bibtex.c src/bibtexlabels.c +src/formatutils.c +src/formatpatterns.c Modified: trunk/geanylatex/po/de.po =================================================================== --- trunk/geanylatex/po/de.po 2009-02-15 22:54:13 UTC (rev 480) +++ trunk/geanylatex/po/de.po 2009-02-15 22:55:16 UTC (rev 481) @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: GeanyLaTeX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-28 22:23+0100\n" +"POT-Creation-Date: 2009-02-15 23:43+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" @@ -21,87 +21,87 @@ msgid "Plugin to provide better LaTeX support" msgstr "Plugin zum Verbessern des LaTeX-Support für Geany" -#: src/geanylatex.c:101 +#: src/geanylatex.c:109 msgid "Insert label" msgstr "Lesezeichen einfügen" -#: src/geanylatex.c:114 +#: src/geanylatex.c:122 msgid "Label name:" msgstr "Lesezeichenname:" -#: src/geanylatex.c:149 +#: src/geanylatex.c:158 msgid "Insert reference" msgstr "Verweis einfügen" -#: src/geanylatex.c:162 +#: src/geanylatex.c:171 msgid "Ref name:" msgstr "Lesezeichenname:" -#: src/geanylatex.c:173 +#: src/geanylatex.c:182 msgid "Standard Reference" msgstr "Normaler Verweis" -#: src/geanylatex.c:178 +#: src/geanylatex.c:187 msgid "Page Reference" msgstr "Verweis auf Seite" -#: src/geanylatex.c:351 +#: src/geanylatex.c:363 msgid "More" msgstr "Weitere" #. Documentclass -#: src/geanylatex.c:446 +#: src/geanylatex.c:458 msgid "Documentclass:" msgstr "Dokumentenklasse:" -#: src/geanylatex.c:449 +#: src/geanylatex.c:461 msgid "Choose the kind of document you want to write" msgstr "Art des Dokumentes" -#: src/geanylatex.c:451 src/bibtexlabels.c:27 +#: src/geanylatex.c:463 src/bibtexlabels.c:27 msgid "Book" msgstr "Buch" -#: src/geanylatex.c:453 src/bibtexlabels.c:26 +#: src/geanylatex.c:465 src/bibtexlabels.c:26 msgid "Article" msgstr "Artikel" -#: src/geanylatex.c:455 +#: src/geanylatex.c:467 msgid "Report" msgstr "Bericht" -#: src/geanylatex.c:457 +#: src/geanylatex.c:469 msgid "Letter" msgstr "Brief" -#: src/geanylatex.c:459 +#: src/geanylatex.c:471 msgid "Presentation" msgstr "Präsentation" #. Encoding -#: src/geanylatex.c:469 +#: src/geanylatex.c:481 msgid "Encoding:" msgstr "Zeichensatz:" -#: src/geanylatex.c:473 +#: src/geanylatex.c:485 msgid "Set the encoding for your new document" msgstr "Zeichensatz für das neue Dokument" #. fontsize -#: src/geanylatex.c:488 +#: src/geanylatex.c:500 msgid "Fontsize:" msgstr "Schriftgröße:" -#: src/geanylatex.c:491 +#: src/geanylatex.c:503 msgid "Set the default fontsize of your new document" msgstr "Setzt die Standardschriftgröße für das neue Dokument" #. Author -#: src/geanylatex.c:504 +#: src/geanylatex.c:516 msgid "Author:" msgstr "Autor:" -#: src/geanylatex.c:507 +#: src/geanylatex.c:519 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" @@ -109,11 +109,11 @@ "Setzt den Eintrag für den \\author Befehl. Meist sollte hier Ihr Name stehen." #. Date -#: src/geanylatex.c:518 +#: src/geanylatex.c:530 msgid "Date:" msgstr "Datum:" -#: src/geanylatex.c:521 +#: src/geanylatex.c:533 msgid "" "Sets the value of the \\date command inside header of your\t\t newly created " "LaTeX-document. Keeping it at \\today is a good \t\t decision if you don't " @@ -123,35 +123,35 @@ "meisten Fällen sollte \\today eine gute Wahl sein." #. Title of the new document -#: src/geanylatex.c:530 +#: src/geanylatex.c:542 msgid "Title:" msgstr "Titel:" -#: src/geanylatex.c:533 +#: src/geanylatex.c:545 msgid "Sets the title of your new document." msgstr "Setzt den Titel für das neue Dokument." #. Papersize -#: src/geanylatex.c:539 +#: src/geanylatex.c:551 msgid "Paper size:" msgstr "Papiergröße:" -#: src/geanylatex.c:542 +#: src/geanylatex.c:554 msgid "Choose the paper format for the newly created document" msgstr "" "Setzt das Papierformat als Argument der Dokumentenklasse für das neue " "Dokument" #. Building the wizard-dialog and showing it -#: src/geanylatex.c:557 +#: src/geanylatex.c:569 msgid "LaTeX-Wizard" msgstr "LaTeX-Assistent" -#: src/geanylatex.c:568 +#: src/geanylatex.c:580 msgid "Use KOMA-script classes if possible" msgstr "Benutze KOMA-Skript wenn möglich" -#: src/geanylatex.c:570 +#: src/geanylatex.c:582 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" "Keep in mind: To compile your document these classeshave to be installed " @@ -160,11 +160,11 @@ "Wenn diese Option aktiviert ist, werden die KOMA-Skript-Klassen von Markus " "Kohm genutzt. Sie müssen natürlich dafür installiert sein." -#: src/geanylatex.c:577 +#: src/geanylatex.c:589 msgid "Use draft mode" msgstr "Entwurfsmodus benutzen" -#: src/geanylatex.c:579 +#: src/geanylatex.c:591 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" @@ -172,66 +172,81 @@ "Setzt die Option draft für die Dokumentenklasse um das neue Dokument mit " "einer Nummer von kleinen Korrekturhinweisen zu versehen." -#: src/geanylatex.c:807 +#: src/geanylatex.c:819 msgid "Dear Sir or Madame" msgstr "Sehr geehrte Damen und Herren" -#: src/geanylatex.c:808 +#: src/geanylatex.c:820 msgid "With kind regards" msgstr "Mit freundlichen Grüßen" -#: src/geanylatex.c:850 +#: src/geanylatex.c:859 +msgid "" +"GeanyLaTeX is a plugin to improve support for LaTeX in Geany.\n" +"\n" +"Please report all bugs or feature requests to one of the authors." +msgstr "" + +#: src/geanylatex.c:878 msgid "_LaTeX" msgstr "_LaTeX" -#: src/geanylatex.c:857 +#: src/geanylatex.c:885 msgid "LaTeX-_Wizard" msgstr "LaTeX-_Assistent" -#: src/geanylatex.c:860 +#: src/geanylatex.c:888 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "Öffnet einen Assistenten, um einfache LaTeX-Dokumente zu erstellen." -#: src/geanylatex.c:865 +#: src/geanylatex.c:893 msgid "Insert _Special Character" msgstr "_Sonderzeichen einfügen" -#: src/geanylatex.c:867 +#: src/geanylatex.c:895 msgid "Helps to use some not very common letters and signs" msgstr "Unterstützt bei der Verwendung von seltenen Sonderzeichen" -#: src/geanylatex.c:877 +#: src/geanylatex.c:905 msgid "Insert _Reference" msgstr "_Verweis einfügen" -#: src/geanylatex.c:879 +#: src/geanylatex.c:907 msgid "Inserting references to the document" msgstr "Eine Referenz in das Dokument einfügen" -#: src/geanylatex.c:884 +#: src/geanylatex.c:912 msgid "Insert _Label" msgstr "_Lesezeichen einfügen" -#: src/geanylatex.c:886 +#: src/geanylatex.c:914 msgid "Helps at inserting labels to a document" msgstr "Untersützt bei dem Einfügen von Lesezeichen in ein Dokument" -#: src/geanylatex.c:891 +#: src/geanylatex.c:919 msgid "BibTeX" msgstr "BibTeX" -#: src/geanylatex.c:910 +#: src/geanylatex.c:935 +msgid "Format" +msgstr "Format" + +#: src/geanylatex.c:953 msgid "Run LaTeX-Wizard" msgstr "LaTeX-Assistent starten" -#: src/geanylatex.c:912 +#: src/geanylatex.c:955 msgid "Insert \\label" msgstr "\\label einfügen" -#: src/geanylatex.c:914 +#: src/geanylatex.c:957 msgid "Insert \\ref" msgstr "\\ref einfügen" +#: src/geanylatex.c:959 +msgid "Insert linebreak \\\\ " +msgstr "Zeilenumbruch einfügen (\\\\)" + #: src/latexencodings.c:37 msgid "UTF-8" msgstr "UTF-8" @@ -556,3 +571,31 @@ msgstr "" "Jahr der Publikation oder der Erstellung, wenn das Werk noch nicht " "veröffentlicht ist." + +#: src/formatpatterns.c:35 +msgid "Italic" +msgstr "Kursiv" + +#: src/formatpatterns.c:36 +msgid "Boldfont" +msgstr "Fettdruck" + +#: src/formatpatterns.c:37 +msgid "Underline" +msgstr "Unterstrichen" + +#: src/formatpatterns.c:38 +msgid "Slanted" +msgstr "" + +#: src/formatpatterns.c:39 +msgid "Typewriter" +msgstr "Schreibmaschine" + +#: src/formatpatterns.c:40 +msgid "Small Caps" +msgstr "Kapitälchen" + +#: src/formatpatterns.c:41 +msgid "Emphasis" +msgstr "" Modified: trunk/geanylatex/po/geanylatex.pot =================================================================== --- trunk/geanylatex/po/geanylatex.pot 2009-02-15 22:54:13 UTC (rev 480) +++ trunk/geanylatex/po/geanylatex.pot 2009-02-15 22:55:16 UTC (rev 481) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-28 22:23+0100\n" +"POT-Creation-Date: 2009-02-15 23:43+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" @@ -24,98 +24,98 @@ msgid "Plugin to provide better LaTeX support" msgstr "" -#: src/geanylatex.c:101 +#: src/geanylatex.c:109 msgid "Insert label" msgstr "" -#: src/geanylatex.c:114 +#: src/geanylatex.c:122 msgid "Label name:" msgstr "" -#: src/geanylatex.c:149 +#: src/geanylatex.c:158 msgid "Insert reference" msgstr "" -#: src/geanylatex.c:162 +#: src/geanylatex.c:171 msgid "Ref name:" msgstr "" -#: src/geanylatex.c:173 +#: src/geanylatex.c:182 msgid "Standard Reference" msgstr "" -#: src/geanylatex.c:178 +#: src/geanylatex.c:187 msgid "Page Reference" msgstr "" -#: src/geanylatex.c:351 +#: src/geanylatex.c:363 msgid "More" msgstr "" #. Documentclass -#: src/geanylatex.c:446 +#: src/geanylatex.c:458 msgid "Documentclass:" msgstr "" -#: src/geanylatex.c:449 +#: src/geanylatex.c:461 msgid "Choose the kind of document you want to write" msgstr "" -#: src/geanylatex.c:451 src/bibtexlabels.c:27 +#: src/geanylatex.c:463 src/bibtexlabels.c:27 msgid "Book" msgstr "" -#: src/geanylatex.c:453 src/bibtexlabels.c:26 +#: src/geanylatex.c:465 src/bibtexlabels.c:26 msgid "Article" msgstr "" -#: src/geanylatex.c:455 +#: src/geanylatex.c:467 msgid "Report" msgstr "" -#: src/geanylatex.c:457 +#: src/geanylatex.c:469 msgid "Letter" msgstr "" -#: src/geanylatex.c:459 +#: src/geanylatex.c:471 msgid "Presentation" msgstr "" #. Encoding -#: src/geanylatex.c:469 +#: src/geanylatex.c:481 msgid "Encoding:" msgstr "" -#: src/geanylatex.c:473 +#: src/geanylatex.c:485 msgid "Set the encoding for your new document" msgstr "" #. fontsize -#: src/geanylatex.c:488 +#: src/geanylatex.c:500 msgid "Fontsize:" msgstr "" -#: src/geanylatex.c:491 +#: src/geanylatex.c:503 msgid "Set the default fontsize of your new document" msgstr "" #. Author -#: src/geanylatex.c:504 +#: src/geanylatex.c:516 msgid "Author:" msgstr "" -#: src/geanylatex.c:507 +#: src/geanylatex.c:519 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" msgstr "" #. Date -#: src/geanylatex.c:518 +#: src/geanylatex.c:530 msgid "Date:" msgstr "" -#: src/geanylatex.c:521 +#: src/geanylatex.c:533 msgid "" "Sets the value of the \\date command inside header of your\t\t newly created " "LaTeX-document. Keeping it at \\today is a good \t\t decision if you don't " @@ -123,109 +123,124 @@ msgstr "" #. Title of the new document -#: src/geanylatex.c:530 +#: src/geanylatex.c:542 msgid "Title:" msgstr "" -#: src/geanylatex.c:533 +#: src/geanylatex.c:545 msgid "Sets the title of your new document." msgstr "" #. Papersize -#: src/geanylatex.c:539 +#: src/geanylatex.c:551 msgid "Paper size:" msgstr "" -#: src/geanylatex.c:542 +#: src/geanylatex.c:554 msgid "Choose the paper format for the newly created document" msgstr "" #. Building the wizard-dialog and showing it -#: src/geanylatex.c:557 +#: src/geanylatex.c:569 msgid "LaTeX-Wizard" msgstr "" -#: src/geanylatex.c:568 +#: src/geanylatex.c:580 msgid "Use KOMA-script classes if possible" msgstr "" -#: src/geanylatex.c:570 +#: src/geanylatex.c:582 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" "Keep in mind: To compile your document these classeshave to be installed " "before." msgstr "" -#: src/geanylatex.c:577 +#: src/geanylatex.c:589 msgid "Use draft mode" msgstr "" -#: src/geanylatex.c:579 +#: src/geanylatex.c:591 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" msgstr "" -#: src/geanylatex.c:807 +#: src/geanylatex.c:819 msgid "Dear Sir or Madame" msgstr "" -#: src/geanylatex.c:808 +#: src/geanylatex.c:820 msgid "With kind regards" msgstr "" -#: src/geanylatex.c:850 +#: src/geanylatex.c:859 +msgid "" +"GeanyLaTeX is a plugin to improve support for LaTeX in Geany.\n" +"\n" +"Please report all bugs or feature requests to one of the authors." +msgstr "" + +#: src/geanylatex.c:878 msgid "_LaTeX" msgstr "" -#: src/geanylatex.c:857 +#: src/geanylatex.c:885 msgid "LaTeX-_Wizard" msgstr "" -#: src/geanylatex.c:860 +#: src/geanylatex.c:888 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "" -#: src/geanylatex.c:865 +#: src/geanylatex.c:893 msgid "Insert _Special Character" msgstr "" -#: src/geanylatex.c:867 +#: src/geanylatex.c:895 msgid "Helps to use some not very common letters and signs" msgstr "" -#: src/geanylatex.c:877 +#: src/geanylatex.c:905 msgid "Insert _Reference" msgstr "" -#: src/geanylatex.c:879 +#: src/geanylatex.c:907 msgid "Inserting references to the document" msgstr "" -#: src/geanylatex.c:884 +#: src/geanylatex.c:912 msgid "Insert _Label" msgstr "" -#: src/geanylatex.c:886 +#: src/geanylatex.c:914 msgid "Helps at inserting labels to a document" msgstr "" -#: src/geanylatex.c:891 +#: src/geanylatex.c:919 msgid "BibTeX" msgstr "" -#: src/geanylatex.c:910 +#: src/geanylatex.c:935 +msgid "Format" +msgstr "" + +#: src/geanylatex.c:953 msgid "Run LaTeX-Wizard" msgstr "" -#: src/geanylatex.c:912 +#: src/geanylatex.c:955 msgid "Insert \\label" msgstr "" -#: src/geanylatex.c:914 +#: src/geanylatex.c:957 msgid "Insert \\ref" msgstr "" +#: src/geanylatex.c:959 +msgid "Insert linebreak \\\\ " +msgstr "" + #: src/latexencodings.c:37 msgid "UTF-8" msgstr "" @@ -547,3 +562,31 @@ #: src/bibtexlabels.c:124 msgid "Year of publication or creation if unpublished" msgstr "" + +#: src/formatpatterns.c:35 +msgid "Italic" +msgstr "" + +#: src/formatpatterns.c:36 +msgid "Boldfont" +msgstr "" + +#: src/formatpatterns.c:37 +msgid "Underline" +msgstr "" + +#: src/formatpatterns.c:38 +msgid "Slanted" +msgstr "" + +#: src/formatpatterns.c:39 +msgid "Typewriter" +msgstr "" + +#: src/formatpatterns.c:40 +msgid "Small Caps" +msgstr "" + +#: src/formatpatterns.c:41 +msgid "Emphasis" +msgstr "" Modified: trunk/geanylatex/src/Makefile.am =================================================================== --- trunk/geanylatex/src/Makefile.am 2009-02-15 22:54:13 UTC (rev 480) +++ trunk/geanylatex/src/Makefile.am 2009-02-15 22:55:16 UTC (rev 481) @@ -1,5 +1,5 @@ lib_LTLIBRARIES = geanylatex.la -geanylatex_la_SOURCES = geanylatex.c geanylatex.h datatypes.h latexencodings.c latexencodings.h letters.c letters.h bibtex.h bibtex.c bibtexlabels.c reftex.c reftex.h latexutils.c latexutils.h +geanylatex_la_SOURCES = geanylatex.c geanylatex.h datatypes.h latexencodings.c latexencodings.h letters.c letters.h bibtex.h bibtex.c bibtexlabels.c reftex.c reftex.h latexutils.c latexutils.h formatutils.c formatutils.h formatpatterns.c geanylatex_la_LDFLAGS = -module -avoid-version geanylatex_la_LIBADD = @GEANY_LIBS@ $(INTLLIBS) Added: trunk/geanylatex/src/formatpatterns.c =================================================================== --- trunk/geanylatex/src/formatpatterns.c (rev 0) +++ trunk/geanylatex/src/formatpatterns.c 2009-02-15 22:55:16 UTC (rev 481) @@ -0,0 +1,42 @@ +/* + * formatpatterns.c + * + * Copyright 2009 Frank Lanitz <frank@Jupiter> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +#include "geanylatex.h" + +gchar* format_pattern[] = { + "\\textit", + "\\textbf", + "\\underline", + "\\textsl", + "\\texttt", + "\\textsc", + "\\emph" +}; + +const gchar *format_labels[] = { + N_("Italic"), + N_("Boldfont"), + N_("Underline"), + N_("Slanted"), + N_("Typewriter"), + N_("Small Caps"), + N_("Emphasis"), +}; Added: trunk/geanylatex/src/formatutils.c =================================================================== --- trunk/geanylatex/src/formatutils.c (rev 0) +++ trunk/geanylatex/src/formatutils.c 2009-02-15 22:55:16 UTC (rev 481) @@ -0,0 +1,32 @@ +/* + * formatutils.c + * + * Copyright 2009 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +#include "formatutils.h" + +void insert_latex_format(G_GNUC_UNUSED GtkMenuItem * menuitem, + G_GNUC_UNUSED gpointer gdata) +{ + gint format = GPOINTER_TO_INT(gdata); + + insert_string(format_pattern[format], TRUE); + insert_string("{", TRUE); + insert_string("}", FALSE); +} Added: trunk/geanylatex/src/formatutils.h =================================================================== --- trunk/geanylatex/src/formatutils.h (rev 0) +++ trunk/geanylatex/src/formatutils.h 2009-02-15 22:55:16 UTC (rev 481) @@ -0,0 +1,42 @@ +/* + * formatutils.h + * + * Copyright 2009 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +#ifndef LATEXFORMATUTILS_H +#define LATEXFORMATUTILS_H + +#include "geanylatex.h" + +enum { + LATEX_ITALIC = 0, + LATEX_BOLD, + LATEX_UNDERLINE, + LATEX_SLANTED, + LATEX_TYPEWRITER, + LATEX_SMALLCAPS, + LATEX_EMPHASIS, + LATEX_STYLES_END +}; + +extern gchar* format_pattern[]; +extern const gchar *format_labels[]; +void insert_latex_format(GtkMenuItem * menuitem, gpointer gdata); + +#endif Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2009-02-15 22:54:13 UTC (rev 480) +++ trunk/geanylatex/src/geanylatex.c 2009-02-15 22:55:16 UTC (rev 481) @@ -43,6 +43,8 @@ GtkWidget *menu_latex_label = NULL; GtkWidget *menu_latex_bibtex = NULL; GtkWidget *menu_latex_bibtex_submenu = NULL; +GtkWidget *menu_latex_format_insert = NULL; +GtkWidget *menu_latex_format_insert_submenu = NULL; static GtkWidget *main_menu_item = NULL; @@ -930,15 +932,30 @@ G_CALLBACK(insert_bibtex_entry), GINT_TO_POINTER(i)); } + menu_latex_format_insert = gtk_menu_item_new_with_mnemonic(_("Format")); + gtk_container_add(GTK_CONTAINER(menu_latex_menu), menu_latex_format_insert); + + menu_latex_format_insert_submenu = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_latex_format_insert), + menu_latex_format_insert_submenu); + + for (i = 0; i < LATEX_STYLES_END; i++) + { + tmp = NULL; + tmp = gtk_menu_item_new_with_mnemonic(_(format_labels[i])); + gtk_container_add(GTK_CONTAINER(menu_latex_format_insert_submenu), tmp); + g_signal_connect((gpointer) tmp, "activate", + G_CALLBACK(insert_latex_format), GINT_TO_POINTER(i)); + } + /* init keybindins */ - keybindings_set_item(plugin_key_group, LATEX_WIZZARD_KB, kbwizard, 0, 0, "run_latex_wizard", _("Run LaTeX-Wizard"), menu_latex_wizzard); keybindings_set_item(plugin_key_group, LATEX_INSERT_LABEL_KB, kblabel_insert, 0, 0, "insert_latex_label", _("Insert \\label"), menu_latex_label); keybindings_set_item(plugin_key_group, LATEX_INSERT_REF_KB, kbref_insert, 0, 0, "insert_latex_ref", _("Insert \\ref"), menu_latex_ref); - keybindings_set_item(plugin_key_group, LATEX_INSERT_NEWLINE, kb_insert_newline, + keybindings_set_item(plugin_key_group, LATEX_INSERT_NEWLINE, kb_insert_newline, 0, 0, "insert_new_line", _("Insert linebreak \\\\ "), NULL); /* keybindings_set_item(plugin_key_group, LATEX_INSERT_BIBTEX_ENTRY_KB, kb_bibtex_entry_insert, 0, 0, "insert_latex_bibtex_entry", _("Add BiBTeX entry"), Modified: trunk/geanylatex/src/geanylatex.h =================================================================== --- trunk/geanylatex/src/geanylatex.h 2009-02-15 22:54:13 UTC (rev 480) +++ trunk/geanylatex/src/geanylatex.h 2009-02-15 22:55:16 UTC (rev 481) @@ -28,7 +28,7 @@ #include "geany.h" #include "support.h" -#include "plugindata.h" + #include "document.h" #include "editor.h" #include "filetypes.h" @@ -38,13 +38,15 @@ #include "ui_utils.h" #include "keybindings.h" #include "prefs.h" -#include "geanyfunctions.h" #include "datatypes.h" #include "letters.h" #include "latexencodings.h" #include "bibtex.h" #include "latexutils.h" #include "reftex.h" +#include "formatutils.h" +#include "plugindata.h" +#include "geanyfunctions.h" #include <gtk/gtk.h> Modified: trunk/wscript =================================================================== --- trunk/wscript 2009-02-15 22:54:13 UTC (rev 480) +++ trunk/wscript 2009-02-15 22:55:16 UTC (rev 481) @@ -84,7 +84,8 @@ [ 'geanylatex/src/latexencodings.c', 'geanylatex/src/geanylatex.c', 'geanylatex/src/letters.c', 'geanylatex/src/bibtex.c', 'geanylatex/src/bibtexlabels.c', 'geanylatex/src/reftex.c', - 'geanylatex/src/latexutils.c'], + 'geanylatex/src/latexutils.c', 'geanylatex/src/formatutils.c', + 'geanylatex/src/formatpatterns.c'], [ 'geanylatex' ], # include dirs '0.3'), Plugin('geanylua', 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:[480] trunk/geanylatex
by frlan＠users.sourceforge.net 15 Feb '09

15 Feb '09

Revision: 480 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=480&view=rev Author: frlan Date: 2009-02-15 22:54:13 +0000 (Sun, 15 Feb 2009) Log Message: ----------- GeanyLaTeX: Added a keybinding for newline \\ and extend insert_string() to also support reseting cursor after inserting text if needed Modified Paths: -------------- trunk/geanylatex/ChangeLog trunk/geanylatex/src/bibtex.c trunk/geanylatex/src/geanylatex.c trunk/geanylatex/src/geanylatex.h Modified: trunk/geanylatex/ChangeLog =================================================================== --- trunk/geanylatex/ChangeLog 2009-02-15 22:09:33 UTC (rev 479) +++ trunk/geanylatex/ChangeLog 2009-02-15 22:54:13 UTC (rev 480) @@ -1,3 +1,10 @@ +2009-02-14 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * Added a keyboard shortcut for inserting a new line ( \\ ). + * Make cursor placed behind inserted text for most cases. + (Inserting BibTeX entries will not reset the cursor) + + 2009-01-19 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * Improved reference dialog to offer labels based on aux file Modified: trunk/geanylatex/src/bibtex.c =================================================================== --- trunk/geanylatex/src/bibtex.c 2009-02-15 22:09:33 UTC (rev 479) +++ trunk/geanylatex/src/bibtex.c 2009-02-15 22:54:13 UTC (rev 480) @@ -135,7 +135,7 @@ } output = g_strconcat(output, "}\n", NULL); - insert_string(output); + insert_string(output, FALSE); g_free(output); } Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2009-02-15 22:09:33 UTC (rev 479) +++ trunk/geanylatex/src/geanylatex.c 2009-02-15 22:54:13 UTC (rev 480) @@ -52,23 +52,29 @@ LATEX_WIZZARD_KB, LATEX_INSERT_LABEL_KB, LATEX_INSERT_REF_KB, -/* LATEX_INSERT_BIBTEX_ENTRY_KB,*/ + LATEX_INSERT_NEWLINE, COUNT_KB }; PLUGIN_KEY_GROUP(geanylatex, COUNT_KB) void -insert_string(gchar *string) +insert_string(gchar *string, gboolean reset_position) { GeanyDocument *doc = NULL; + doc = document_get_current(); - if (doc != NULL) + if (doc != NULL && string != NULL) { gint pos = sci_get_current_position(doc->editor->sci); sci_insert_text(doc->editor->sci, pos, string); + if (reset_position == TRUE) + { + gint len = strlen(string); + sci_set_current_position(doc->editor->sci, pos + len, TRUE); + } } } @@ -84,7 +90,7 @@ char_insert_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) { - insert_string(get_latex_command(GPOINTER_TO_INT(gdata))); + insert_string(get_latex_command(GPOINTER_TO_INT(gdata)), TRUE); } @@ -127,7 +133,7 @@ gchar *label_str = NULL; label_str = g_strconcat("\\label{",g_strdup(gtk_entry_get_text( GTK_ENTRY(textbox_label))), "}", NULL); - insert_string(label_str); + insert_string(label_str, TRUE); } gtk_widget_destroy(dialog); @@ -202,7 +208,7 @@ if (ref_string != NULL) { - insert_string(ref_string); + insert_string(ref_string, TRUE); g_free(ref_string); } } @@ -223,6 +229,7 @@ G_CALLBACK(callback), GINT_TO_POINTER(letter)); } + /* returns -1, if there are more than gint can work with or any other error * returns 0, if categorie is empty * if gint categorie is -1, function will count every element. @@ -268,6 +275,7 @@ return i; } + void sub_menu_init(GtkWidget *base_menu, SubMenuTemplate *menu_template, CategoryName *category_name, SubMenuCallback callback_function) @@ -832,6 +840,11 @@ wizard_activated(NULL, NULL); } +static void kb_insert_newline(G_GNUC_UNUSED guint key_id) +{ + insert_string("\\\\\n", TRUE); +} + /*static void kb_bibtex_entry_insert(G_GNUC_UNUSED guint key_id) { insert_bibtex_entry(NULL, NULL); @@ -925,6 +938,8 @@ 0, 0, "insert_latex_label", _("Insert \\label"), menu_latex_label); keybindings_set_item(plugin_key_group, LATEX_INSERT_REF_KB, kbref_insert, 0, 0, "insert_latex_ref", _("Insert \\ref"), menu_latex_ref); + keybindings_set_item(plugin_key_group, LATEX_INSERT_NEWLINE, kb_insert_newline, + 0, 0, "insert_new_line", _("Insert linebreak \\\\ "), NULL); /* keybindings_set_item(plugin_key_group, LATEX_INSERT_BIBTEX_ENTRY_KB, kb_bibtex_entry_insert, 0, 0, "insert_latex_bibtex_entry", _("Add BiBTeX entry"), menu_latex_bibtex); */ Modified: trunk/geanylatex/src/geanylatex.h =================================================================== --- trunk/geanylatex/src/geanylatex.h 2009-02-15 22:09:33 UTC (rev 479) +++ trunk/geanylatex/src/geanylatex.h 2009-02-15 22:54:13 UTC (rev 480) @@ -106,6 +106,6 @@ #define MAX_MENU_ENTRIES 20 -extern void insert_string(gchar *string); +extern void insert_string(gchar *string, gboolean reset_position); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits February 2009