Skip to content

Commit

Permalink
geanylatex: adjusted files content to new plugin name
Browse files Browse the repository at this point in the history
  • Loading branch information
lpaulsen93 committed Oct 16, 2017
1 parent 234bf40 commit 299176d
Show file tree
Hide file tree
Showing 33 changed files with 157 additions and 156 deletions.
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ M:
W: http://plugins.geany.org/geanyinsertnum.html
S: Orphaned

geanylatex
latex
P: Frank Lanitz <frank@frank.uvena.de>
M: Frank Lanitz <frank@frank.uvena.de>
W: http://frank.uvena.de/en/Geany/geanylatex/
Expand Down
4 changes: 2 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ if ENABLE_GEANYINSERTNUM
SUBDIRS += geanyinsertnum
endif

if ENABLE_GEANYLATEX
SUBDIRS += geanylatex
if ENABLE_LATEX
SUBDIRS += latex
endif

if ENABLE_GEANYLUA
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Available plugins are:
* ``geanyextrasel`` -- the GeanyExtraSel plugin
* ``geanygendoc`` -- the GeanyGenDoc plugin
* ``geanyinsertnum`` -- the GeanyInsertNum plugin
* ``geanylatex`` -- the GeanyLaTeX plugin
* ``latex`` -- the LaTeX plugin
* ``geanylua`` -- the GeanyLua plugin
* ``geanymacro`` -- the GeanyMacro plugin
* ``geanyminiscript`` -- the GeanyMiniScript plugin
Expand Down
1 change: 1 addition & 0 deletions build/geany-plugins.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ Section Uninstall
Delete "$INSTDIR\lib\geany\geanygendoc.dll"
Delete "$INSTDIR\lib\geany\geanyinsertnum.dll"
Delete "$INSTDIR\lib\geany\geanylatex.dll"
Delete "$INSTDIR\lib\geany\latex.dll"
; Keep for geanylipsum propper deleting old dll some time
Delete "$INSTDIR\lib\geany\geanylipsum.dll"
Delete "$INSTDIR\lib\geany\geanylua.dll"
Expand Down
12 changes: 6 additions & 6 deletions build/latex.m4
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
AC_DEFUN([GP_CHECK_GEANYLATEX],
AC_DEFUN([GP_CHECK_LATEX],
[
GP_ARG_DISABLE([GeanyLaTeX], [auto])
GP_COMMIT_PLUGIN_STATUS([GeanyLaTeX])
GP_ARG_DISABLE([LaTeX], [auto])
GP_COMMIT_PLUGIN_STATUS([LaTeX])
AC_CONFIG_FILES([
geanylatex/Makefile
geanylatex/doc/Makefile
geanylatex/src/Makefile
latex/Makefile
latex/doc/Makefile
latex/src/Makefile
])
])
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ GP_CHECK_GEANYDOC
GP_CHECK_GEANYEXTRASEL
GP_CHECK_GEANYGENDOC
GP_CHECK_GEANYINSERTNUM
GP_CHECK_GEANYLATEX
GP_CHECK_LATEX
GP_CHECK_GEANYLUA
GP_CHECK_GEANYMACRO
GP_CHECK_GEANYMINISCRIPT
Expand Down
2 changes: 1 addition & 1 deletion latex/ABOUT
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GeanyLaTeX is a little plugin to improve support of LaTeX on Geany.
LaTeX is a little plugin to improve support of LaTeX on Geany.
It implements a couple of maybe useful functions:

* Wizard to create new LaTeX documents in a fast and easy way
Expand Down
2 changes: 1 addition & 1 deletion latex/INSTALL
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
GeanyLaTeX as distributed within the geany-plugins package doesn't
LaTeX as distributed within the geany-plugins package doesn't
have a own build system. Please check documentation of geany-plugins
release instead.
2 changes: 1 addition & 1 deletion latex/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include $(top_srcdir)/build/vars.auxfiles.mk

SUBDIRS = src doc
plugin = geanylatex
plugin = latex
16 changes: 8 additions & 8 deletions latex/doc/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
include $(top_srcdir)/build/vars.docs.mk

plugin = geanylatex
plugin = latex
dist_plugindoc_DATA = \
geanylatex2.html \
geanylatex3.html \
geanylatex4.html \
geanylatex.css \
geanylatex.html \
geanylatex.pdf \
geanylatex.tex \
latex2.html \
latex3.html \
latex4.html \
latex.css \
latex.html \
latex.pdf \
latex.tex \
img/bibtex_reference.png \
img/insert_environment.png \
img/insert_label.png \
Expand Down
146 changes: 73 additions & 73 deletions latex/doc/latex.html

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions latex/doc/latex.tex
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

\dedication{\normalsize \textbf{Note:} Please note that this document has been created on
\today. If you are using a devel version from GIT, please compile and check
\texttt{doc/geanylatex.tex} from sources. Please check Page \pageref
\texttt{doc/latex.tex} from sources. Please check Page \pageref
{sec:compiling_of_documentation}, Section \ref{sec:compiling_of_documentation} on how to do this. }


Expand Down Expand Up @@ -186,14 +186,14 @@ \subsection{Compiling the plugin}
\subsection{Compiling the documentation}
\label{sec:compiling_of_documentation}
Sources of this documentation are available throught
\texttt{doc/geanylatex.tex} inside source tree. To compile the sources,
\texttt{doc/latex.tex} inside source tree. To compile the sources,
usage of \texttt{pdflatex} (should be delivered with your favorite
\LaTeX{} distribution) is recommended. For compiling into HTML format you
might like to use \texttt{htlatex}. The HTML version of this documentation
shipped with source tarball has been compiled with:

\begin{lstlisting}[caption={Compiling of documentation}]
htlatex geanylatex.tex xhtml -cvalidate -interaction=batchmode
htlatex latex.tex xhtml -cvalidate -interaction=batchmode
\end{lstlisting}

\texttt{htlatex} most likely can be found in a package called \texttt{tex4ht}
Expand Down Expand Up @@ -282,7 +282,7 @@ \subsubsection{Extending by own templates}
configuration dir with file extension glt. For creating a
customized template you will need to create a normal *.tex file and
store it inside the directory. On most Linux systems this should be
\texttt{\textasciitilde/.config/geany/geanyLaTeX/}.
\texttt{\textasciitilde/.config/geany/LaTeX/}.

Inside your template you can refer to wizard's field by using some
special strings which are:
Expand Down Expand Up @@ -502,7 +502,7 @@ \subsection{Format}
\subsection{Autocompletion of \textbackslash{}begin and
\textbackslash{}begingroup}

Since version 0.5 GeanyLaTeX{} is supporting autocompletion for
Since version 0.5 LaTeX{} is supporting autocompletion for
closing \textbackslash{}end and \textbackslash{}endgroup for begin
commands. Before Geany 0.19 this has been part of the Geany core
but has been moved out as it is something \LaTeX{} specific.
Expand Down Expand Up @@ -555,9 +555,9 @@ \subsection{Lower selection before inserting \textbackslash{}textsc\{\}}

\section{Configuration}

GeanyLaTeX{} can be configured in three major ways:
LaTeX{} can be configured in three major ways:
\begin{enumerate}
\item GeanyLaTeX{}'s configuration dialog (see chapter \ref{sec:configuration_dialog},
\item LaTeX{}'s configuration dialog (see chapter \ref{sec:configuration_dialog},
page \pageref{sec:configuration_dialog})
\item Geany's keybindings interface (see chapter \ref{sec:key_bindings},
page \pageref{sec:key_bindings})
Expand All @@ -566,7 +566,7 @@ \section{Configuration}
page \pageref{sec:hidden_preferences})
\end{enumerate}

\subsection{GeanyLaTeX{}'s configuration dialog}
\subsection{LaTeX{}'s configuration dialog}
\label{sec:configuration_dialog}
With version 0.4 the configuration dialog is offering two options which
can be changed:
Expand Down
4 changes: 2 additions & 2 deletions latex/doc/latex2.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<meta name="generator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" />
<meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" />
<!-- xhtml,html -->
<meta name="src" content="geanylatex.tex" />
<meta name="src" content="latex.tex" />
<meta name="date" content="2012-07-08 10:09:00" />
<link rel="stylesheet" type="text/css" href="geanylatex.css" />
<link rel="stylesheet" type="text/css" href="latex.css" />
</head><body
>
<div class="footnote-text">
Expand Down
4 changes: 2 additions & 2 deletions latex/doc/latex3.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<meta name="generator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" />
<meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" />
<!-- xhtml,html -->
<meta name="src" content="geanylatex.tex" />
<meta name="src" content="latex.tex" />
<meta name="date" content="2012-07-08 10:09:00" />
<link rel="stylesheet" type="text/css" href="geanylatex.css" />
<link rel="stylesheet" type="text/css" href="latex.css" />
</head><body
>
<div class="footnote-text">
Expand Down
4 changes: 2 additions & 2 deletions latex/doc/latex4.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<meta name="generator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" />
<meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" />
<!-- xhtml,html -->
<meta name="src" content="geanylatex.tex" />
<meta name="src" content="latex.tex" />
<meta name="date" content="2011-01-08 21:12:00" />
<link rel="stylesheet" type="text/css" href="geanylatex.css" />
<link rel="stylesheet" type="text/css" href="latex.css" />
</head><body
>
<div class="footnote-text">
Expand Down
14 changes: 7 additions & 7 deletions latex/src/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
include $(top_srcdir)/build/vars.build.mk
plugin = geanylatex
plugin = latex

geanyplugins_LTLIBRARIES = geanylatex.la
geanyplugins_LTLIBRARIES = latex.la

geanylatex_la_SOURCES = \
latex_la_SOURCES = \
bibtex.c \
geanylatex.c \
latex.c \
latexkeybindings.h \
reftex.c \
bibtex.h \
geanylatex.h \
latex.h \
latexstructure.c \
reftex.h \
bibtexlabels.c \
Expand All @@ -30,7 +30,7 @@ geanylatex_la_SOURCES = \
latexkeybindings.c \
letters.h

geanylatex_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GeanyLaTeX\"
geanylatex_la_LIBADD = $(COMMONLIBS)
latex_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"LaTeX\"
latex_la_LIBADD = $(COMMONLIBS)

include $(top_srcdir)/build/cppcheck.mk
2 changes: 1 addition & 1 deletion latex/src/bibtex.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#ifndef LATEXBIBTEX_H
#define LATEXBIBTEX_H

#include "geanylatex.h"
#include "latex.h"


/* Define generic stuff */
Expand Down
2 changes: 1 addition & 1 deletion latex/src/bibtexlabels.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* MA 02110-1301, USA.
*/

#include "geanylatex.h"
#include "latex.h"
#include "bibtex.h"
#include "datatypes.h"

Expand Down
2 changes: 1 addition & 1 deletion latex/src/formatpatterns.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* MA 02110-1301, USA.
*/

#include "geanylatex.h"
#include "latex.h"

const gchar* glatex_format_pattern[] = {
"\\textit",
Expand Down
2 changes: 1 addition & 1 deletion latex/src/formatutils.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#ifndef LATEXFORMATUTILS_H
#define LATEXFORMATUTILS_H

#include "geanylatex.h"
#include "latex.h"

enum {
LATEX_ITALIC = 0,
Expand Down
18 changes: 9 additions & 9 deletions latex/src/latex.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* geanylatex.c - Plugin to let Geany better work together with LaTeX
* latex.c - Plugin to let Geany better work together with LaTeX
*
* Copyright 2007-2015 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* Copyright 2005-2009 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Expand Down Expand Up @@ -30,15 +30,15 @@
#include "config.h" /* for the gettext domain */
#endif

#include "geanylatex.h"
#include "latex.h"
#include "ctype.h"

PLUGIN_VERSION_CHECK(224)

PLUGIN_SET_TRANSLATABLE_INFO(
LOCALEDIR,
GETTEXT_PACKAGE,
_("GeanyLaTeX"),
_("LaTeX"),
_("Extends LaTeX support"),
"0.7",
"Frank Lanitz <frank@frank.uvena.de>")
Expand Down Expand Up @@ -194,7 +194,7 @@ on_configure_response(G_GNUC_UNUSED GtkDialog *dialog, gint response,

config_file = g_strconcat(geany->app->configdir,
G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S,
"geanyLaTeX", G_DIR_SEPARATOR_S, "general.conf", NULL);
"LaTeX", G_DIR_SEPARATOR_S, "general.conf", NULL);
glatex_set_koma_active =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(config_widgets.koma_active));
glatex_set_toolbar_active =
Expand All @@ -206,7 +206,7 @@ on_configure_response(G_GNUC_UNUSED GtkDialog *dialog, gint response,
glatex_lowercase_on_smallcaps =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(config_widgets.lower_selection_on_smallcaps));

/* Check the response code for geanyLaTeX's autocompletion functions.
/* Check the response code for LaTeX's autocompletion functions.
* Due compatibility with oder Geany versions cass 0 will be treated
* as FALSE, which means autocompletion is deactivated. */
glatex_autocompletion_active_response = gtk_combo_box_get_active(
Expand Down Expand Up @@ -525,7 +525,7 @@ static gboolean on_editor_notify(G_GNUC_UNUSED GObject *object, GeanyEditor *edi
* Function is based on function which was inside
* Geany's core under terms of GPLv2+
* EXtended for GeanyLaTeX with some more autocompletion features
* EXtended for LaTeX with some more autocompletion features
* for e.g. _{} and ^{}.*/

if (glatex_autocompletion_active == TRUE &&
Expand Down Expand Up @@ -1946,7 +1946,7 @@ static void init_keybindings(void)
GeanyKeyGroup *key_group;

/* init keybindings */
key_group = plugin_set_key_group(geany_plugin, "geanylatex", COUNT_KB, NULL);
key_group = plugin_set_key_group(geany_plugin, "latex", COUNT_KB, NULL);
keybindings_set_item(key_group, KB_LATEX_WIZARD, glatex_kbwizard,
0, 0, "run_latex_wizard", _("Run LaTeX-Wizard"), menu_latex_wizard);
keybindings_set_item(key_group, KB_LATEX_INSERT_LABEL, glatex_kblabel_insert,
Expand Down Expand Up @@ -2008,7 +2008,7 @@ static void init_keybindings(void)
void plugin_help(void)
{
dialogs_show_msgbox(GTK_MESSAGE_INFO,
_("GeanyLaTeX is a plugin to improve support for LaTeX in Geany."
_("LaTeX is a plugin to improve support for LaTeX in Geany."
"\n\nPlease report all bugs or feature requests to one of the "
"authors."));
}
Expand All @@ -2021,7 +2021,7 @@ static void glatex_init_configuration(void)
/* loading configurations from file ...*/
config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S,
"plugins", G_DIR_SEPARATOR_S,
"geanyLaTeX", G_DIR_SEPARATOR_S, "general.conf", NULL);
"LaTeX", G_DIR_SEPARATOR_S, "general.conf", NULL);

/* ... and Initialising options from config file */
g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL);
Expand Down
6 changes: 3 additions & 3 deletions latex/src/latex.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* geanylatex.h
* latex.h
*
* Copyright 2008-2012 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
*
Expand All @@ -22,8 +22,8 @@
/* LaTeX plugin */
/* This plugin improves the work with LaTeX and Geany.*/

#ifndef GEANYLATEX_H
#define GEANYLATEX_H
#ifndef LATEX_H
#define LATEX_H

#include <geanyplugin.h>
#include <gtk/gtk.h>
Expand Down
2 changes: 1 addition & 1 deletion latex/src/latexencodings.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/

#include <gtk/gtk.h>
#include "geanylatex.h"
#include "latex.h"
#include "encodings.h"
#include "latexencodings.h"

Expand Down
2 changes: 1 addition & 1 deletion latex/src/latexenvironments.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#ifndef LATEXENVIRONMENTS_H
#define LATEXENVIRONMENTS_H

#include "geanylatex.h"
#include "latex.h"
#include <string.h>

enum {
Expand Down
2 changes: 1 addition & 1 deletion latex/src/latexkeybindings.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#ifndef LATEXKEYBINDINGS_H
#define LATEXKEYBINDINGS_H

#include "geanylatex.h"
#include "latex.h"

/* Enum for available keybindings */
enum
Expand Down
Loading

0 comments on commit 299176d

Please sign in to comment.