Updated README and about, plus changed mathtex installation.

xournalpp · Oct 10, 2013 · 42ede1c · 42ede1c
1 parent d37be77
commit 42ede1c
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Xournalpp is a modified and extended Xournal. New features include:
 * support for image insertion
 * a better eraser
 * reduced memory usage
-* LaTex support (required Mathtex)
+* LaTeX support (requires a working LaTeX install and ```--enable-mathtex``` flag)
 * advanced page sorting
 
 Hopefully you enjoy it! Just build with
@@ -25,7 +25,8 @@ The binary will be in the src/ subdirectory.
 make install
 ```
 
-should also work.
+will then install it in your system path.
+For more details on installation, visit the wiki at <a href="http://github.com/xournalpp/xournalpp/wiki">Xournalpp Wiki</a>.
 
 
 Development
@@ -37,3 +38,4 @@ updated accordingly.
 I could not get the php buildsystem to work so the instructions above were what
 worked for me.
 
+See <a href="http://github.com/xournalpp/xournalpp">Github:xournalpp</a> for current development.
diff --git a/src/gui/dialog/AboutDialog.cpp b/src/gui/dialog/AboutDialog.cpp
@@ -13,7 +13,7 @@ AboutDialog::AboutDialog(GladeSearchpath * gladeSearchPath) :
 			"Build: " __DATE__);
 
 	GtkWidget * w = get("vbox1");
-	GtkWidget * linkButton = gtk_link_button_new("http://xournal.sourceforge.net/");
+	GtkWidget * linkButton = gtk_link_button_new("http://github.com/xournalpp/xournalpp");
 	gtk_widget_show(linkButton);
 	gtk_box_pack_start_defaults(GTK_BOX(w), linkButton);
 
@@ -22,6 +22,7 @@ AboutDialog::AboutDialog(GladeSearchpath * gladeSearchPath) :
 	// Authors of the application
 	AUTOHOR("Denis Auroux, 2006 - 2010");
 	AUTOHOR("Andreas Butti, 2010 - 2012");
+	AUTOHOR("Wilson Brenna (tex support), 2012 - 2013");
 
 	w = get("lbAuthors");
 	gtk_label_set_text(GTK_LABEL(w), authors.c_str());

diff --git a/src/mathtex/Makefile.am b/src/mathtex/Makefile.am
@@ -1,2 +1,2 @@
-bin_PROGRAMS = mathtex.cgi
-mathtex_cgi_SOURCES = mathtex.c
+bin_PROGRAMS = mathtex-xournalpp.cgi
+mathtex_xournalpp_cgi_SOURCES = mathtex.c
diff --git a/src/mathtex/Makefile.in b/src/mathtex/Makefile.in
@@ -32,7 +32,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-bin_PROGRAMS = mathtex.cgi$(EXEEXT)
+bin_PROGRAMS = mathtex-xournalpp.cgi$(EXEEXT)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/../../depcomp \
 	$(srcdir)/../../install-sh $(srcdir)/../../missing \
@@ -51,9 +51,9 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
-am_mathtex_cgi_OBJECTS = mathtex.$(OBJEXT)
-mathtex_cgi_OBJECTS = $(am_mathtex_cgi_OBJECTS)
-mathtex_cgi_LDADD = $(LDADD)
+am_mathtex_xournalpp_cgi_OBJECTS = mathtex.$(OBJEXT)
+mathtex_xournalpp_cgi_OBJECTS = $(am_mathtex_xournalpp_cgi_OBJECTS)
+mathtex_xournalpp_cgi_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/../../depcomp
 am__depfiles_maybe = depfiles
@@ -62,8 +62,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(mathtex_cgi_SOURCES)
-DIST_SOURCES = $(mathtex_cgi_SOURCES)
+SOURCES = $(mathtex_xournalpp_cgi_SOURCES)
+DIST_SOURCES = $(mathtex_xournalpp_cgi_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -166,7 +166,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-mathtex_cgi_SOURCES = mathtex.c
+mathtex_xournalpp_cgi_SOURCES = mathtex.c
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -260,9 +260,9 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-mathtex.cgi$(EXEEXT): $(mathtex_cgi_OBJECTS) $(mathtex_cgi_DEPENDENCIES) 
-	@rm -f mathtex.cgi$(EXEEXT)
-	$(LINK) $(mathtex_cgi_OBJECTS) $(mathtex_cgi_LDADD) $(LIBS)
+mathtex-xournalpp.cgi$(EXEEXT): $(mathtex_xournalpp_cgi_OBJECTS) $(mathtex_xournalpp_cgi_DEPENDENCIES) 
+	@rm -f mathtex-xournalpp.cgi$(EXEEXT)
+	$(LINK) $(mathtex_xournalpp_cgi_OBJECTS) $(mathtex_xournalpp_cgi_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)

diff --git a/src/mathtex/autom4te.cache/requests b/src/mathtex/autom4te.cache/requests
@@ -64,8 +64,8 @@
                         'AM_SET_LEADING_DOT' => 1,
                         'AM_SET_DEPDIR' => 1,
                         '_AM_DEPENDENCIES' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
                         'm4_include' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
                         '_AC_AM_CONFIG_HEADER_HOOK' => 1,
                         'AU_DEFUN' => 1,
                         'AM_MAKE_INCLUDE' => 1
@@ -83,25 +83,25 @@
                         'configure.in'
                       ],
                       {
-                        '_LT_AC_TAGCONFIG' => 1,
                         'AM_PROG_F77_C_O' => 1,
-                        'm4_pattern_forbid' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
                         'AC_INIT' => 1,
-                        '_AM_COND_IF' => 1,
+                        'm4_pattern_forbid' => 1,
                         'AC_CANONICAL_TARGET' => 1,
-                        'AC_SUBST' => 1,
+                        '_AM_COND_IF' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AC_FC_SRCEXT' => 1,
+                        'AC_SUBST' => 1,
                         'AC_CANONICAL_HOST' => 1,
+                        'AC_FC_SRCEXT' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
                         'AC_CONFIG_SUBDIRS' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
                         'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
                         'AC_CONFIG_LINKS' => 1,
-                        'm4_sinclude' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
                         'LT_SUPPORTED_TAG' => 1,
+                        'm4_sinclude' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
                         '_m4_warn' => 1,
@@ -114,17 +114,17 @@
                         'include' => 1,
                         'AM_GNU_GETTEXT' => 1,
                         'AC_LIBSOURCE' => 1,
-                        'AM_PROG_FC_C_O' => 1,
                         'AC_CANONICAL_BUILD' => 1,
+                        'AM_PROG_FC_C_O' => 1,
                         'AC_FC_FREEFORM' => 1,
                         'AH_OUTPUT' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
                         'AC_CONFIG_AUX_DIR' => 1,
-                        'sinclude' => 1,
-                        'm4_pattern_allow' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
                         'AM_PROG_CC_C_O' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
+                        'm4_pattern_allow' => 1,
+                        'sinclude' => 1,
                         'AM_CONDITIONAL' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
                         'm4_include' => 1,

diff --git a/src/util/LatexAction.cpp b/src/util/LatexAction.cpp
@@ -41,7 +41,7 @@ void LatexAction::runCommand(){
 	 * at some point, I may need to sanitize theLatex
 	 */
 	printf("Command is being run.\n");
-	const gchar* mtex = "mathtex";
+	const gchar* mtex = "mathtex-xournalpp.cgi";
 	gchar* mathtex = g_find_program_in_path(mtex);
 	if (!mathtex)
 	{
@@ -73,25 +73,6 @@ void LatexAction::runCommand(){
 
 }
 
-void LatexAction::mathtexAddImage(Control * control, double x, double y) {
-	printf("Adding element\n");
-}
-
-void LatexAction::mathtexModImage(TexImage * img, Layer * layer)
-{
-	//get the image we're looking at and take care of all that
-
-	//get theLatex and query for modifications
-	//this->texlen = img->getText(this->theLatex);
-
-	this->myx = img->getX();
-	this->myy = img->getY();
-
-	//remove image
-	//
-	layer->removeElement(img,false);
-
-}
 
 gchar * LatexAction::getFileName()
 {

diff --git a/src/util/LatexAction.h b/src/util/LatexAction.h
@@ -26,8 +26,6 @@ class LatexAction {
 	virtual ~LatexAction();
 
 public:
-	void mathtexModImage(TexImage * img, Layer * layer);
-	void mathtexAddImage(Control * control, double x, double y);
 	void runCommand();
 	gchar * getFileName();