Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LaTeX: Switch handling of insert (list) environments over to snippets workflow #1330

Merged
merged 2 commits into from
Apr 28, 2024
Merged

LaTeX: Switch handling of insert (list) environments over to snippets workflow #1330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddb0c93
LaTeX: Switch handling of insert (list) environments over to snippets…
frlan Apr 14, 2024
4ca8faa
Propper NULL-terminate strings and fix an trailing space inside a tem…
frlan Apr 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 34 additions & 42 deletions latex/src/latexenvironments.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* latexenvironments.c
*
* Copyright 2009-2012 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* Copyright 2009-2024 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
Expand Down Expand Up @@ -69,6 +69,7 @@ void glatex_insert_environment(const gchar *environment, gint type)
/* Only do anything if it is realy needed to */
if (doc != NULL && environment != NULL)
{
/* Checking whether we do have a selection */
if (sci_has_selection(doc->editor->sci))
{
gchar *selection = NULL;
Expand All @@ -92,12 +93,9 @@ void glatex_insert_environment(const gchar *environment, gint type)
g_free(replacement);

}
else
else /* No selection found*/
{
gint indent, pos;
GString *tmpstring = NULL;
gchar *tmp = NULL;
static const GeanyIndentPrefs *indention_prefs = NULL;
gchar *tmpstring = NULL;

if (type == -1)
{
Expand All @@ -114,49 +112,43 @@ void glatex_insert_environment(const gchar *environment, gint type)
}
}
}
pos = sci_get_current_position(doc->editor->sci);

sci_start_undo_action(doc->editor->sci);

tmpstring = g_string_new("\\begin{");
g_string_append(tmpstring, environment);

if (utils_str_equal(environment, "block") == TRUE)
{
g_string_append(tmpstring, "}{}");
tmpstring = g_strconcat(
"\\begin{",
environment,
"}{}\n%cursor%\n\\end{",
environment,
"}",
NULL);
}
else
else /* We don't have a block-like environment */
{
g_string_append(tmpstring, "}");
}
g_string_append(tmpstring, "\n");


if (type == GLATEX_ENVIRONMENT_TYPE_LIST)
{
g_string_append(tmpstring, "\t\\item ");
}

tmp = g_string_free(tmpstring, FALSE);
glatex_insert_string(tmp, TRUE);
g_free(tmp);

indent = sci_get_line_indentation(doc->editor->sci,
sci_get_line_from_position(doc->editor->sci, pos));

tmp = g_strdup_printf("\n\\end{%s}", environment);
glatex_insert_string(tmp, FALSE);
g_free(tmp);

indention_prefs = editor_get_indent_prefs(doc->editor);
if (type == GLATEX_ENVIRONMENT_TYPE_LIST)
{
sci_set_line_indentation(doc->editor->sci,
sci_get_current_line(doc->editor->sci),
indent + indention_prefs->width);
if (type == GLATEX_ENVIRONMENT_TYPE_LIST)
{
tmpstring = g_strconcat(
"\\begin{",
environment,
"}\n\t\\item %cursor%\n\\end{",
environment,
"}",
NULL);
}
else
{
tmpstring = g_strconcat(
"\\begin{",
environment,
"}\n%cursor%\n\\end{",
environment,
"}",
NULL);
}
}
sci_set_line_indentation(doc->editor->sci,
sci_get_current_line(doc->editor->sci) + 1, indent);
glatex_insert_snippet(tmpstring);
g_free(tmpstring);
sci_end_undo_action(doc->editor->sci);
}
}
Expand Down
13 changes: 11 additions & 2 deletions latex/src/latexutils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,22 @@ void glatex_usepackage(const gchar *pkg, const gchar *options)
ui_set_statusbar(TRUE, _("Could not determine where to insert package: %s"), pkg );
}


void glatex_enter_key_pressed_in_entry(G_GNUC_UNUSED GtkWidget *widget, gpointer dialog)
{
gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
}

void glatex_insert_snippet(const gchar *string)
{
GeanyDocument *doc = NULL;

doc = document_get_current();
if (doc != NULL && string != NULL)
{
gint pos = sci_get_current_position(doc->editor->sci);
editor_insert_snippet(doc->editor, pos, string);
}
}

void
glatex_insert_string(const gchar *string, gboolean reset_position)
Expand All @@ -117,7 +127,6 @@ glatex_insert_string(const gchar *string, gboolean reset_position)
}
}


void glatex_replace_special_character(void)
{
GeanyDocument *doc = NULL;
Expand Down
1 change: 1 addition & 0 deletions latex/src/latexutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
gchar **glatex_read_file_in_array(const gchar *filename);
void glatex_usepackage(const gchar *pkg, const gchar *options);
void glatex_enter_key_pressed_in_entry(G_GNUC_UNUSED GtkWidget *widget, gpointer dialog);
void glatex_insert_snippet(const gchar *string);
void glatex_insert_string(const gchar *string, gboolean reset_position);
void glatex_replace_special_character(void);

Expand Down