From: John Darrington <john@darrington.wattle.id.au>
Date: Sun, 17 Oct 2010 19:04:28 +0000 (+0200)
Subject: Merge commit 'origin/master' into sso
X-Git-Tag: v0.7.9~159^2~1
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a258e53c63a08b0ec48aea8f03808eb651729424;hp=8a920632b433443aa37e16349589f0c7d7d3cdaf;p=pspp-builds.git

Merge commit 'origin/master' into sso

Conflicts:

	src/ui/gui/psppire-syntax-window.c
---

diff --git a/INSTALL b/INSTALL
index 6654e90b..23bbf8a4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -55,6 +55,10 @@ use the GUI, you must run `configure' with --without-gui.
 
     * GTK+ (http://www.gtk.org/), version 2.12.0 or later.
 
+    * GtkSourceView (http://projects.gnome.org/gtksourceview/) 
+      version 2.2 or later.
+
+
 To cross-compile PSPP, you will likely need to set the
 PKG_CONFIG_LIBDIR environment variable to point to an
 appropriate pkg-config for the cross-compilation environment.
diff --git a/configure.ac b/configure.ac
index b06392a5..abf7afad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,9 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then
   PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.16], [],
     [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.16 or later (or use --without-gui)])])
 
+  PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-2.0 >= 2.2], [],
+    [PSPP_REQUIRED_PREREQ([gtksourceview 2.0 version 2.2 or later (or use --without-gui)])])
+
   AC_ARG_VAR([GLIB_GENMARSHAL])
   AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
   if test "x$GLIB_GENMARSHAL" = x; then
diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 989677f8..fd78196d 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -42,7 +42,7 @@ EXTRA_DIST += \
 if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire 
 
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
 
 
 src_ui_gui_psppire_LDFLAGS = \
@@ -64,6 +64,7 @@ src_ui_gui_psppire_LDADD = \
 	src/libpspp.la \
 	src/libpspp-core.la \
 	$(GTK_LIBS) \
+	$(GTKSOURCEVIEW_LIBS) \
 	$(CAIRO_LIBS) \
 	$(LIBINTL)
 
@@ -74,6 +75,9 @@ themedir = $(DESTDIR)$(datadir)/icons/hicolor
 context = apps
 
 
+install-lang:
+	$(INSTALL) $(top_srcdir)/src/ui/gui/pspp.lang $(pkgdatadir)
+	
 install-icons:
 	for size in 16x16 ; do \
 	  $(MKDIR_P) $(themedir)/$$size/$(context) ; \
@@ -81,7 +85,7 @@ install-icons:
 	done 
 	gtk-update-icon-cache --ignore-theme-index $(themedir)
 
-INSTALL_DATA_HOOKS += install-icons
+INSTALL_DATA_HOOKS += install-icons install-lang
 
 uninstall-icons:
 	for size in 16x16 ; do \
@@ -93,6 +97,7 @@ UNINSTALL_DATA_HOOKS += uninstall-icons
 
 dist_src_ui_gui_psppire_DATA = \
 	$(UI_FILES) \
+	$(top_srcdir)/src/ui/gui/pspp.lang \
 	$(top_srcdir)/src/ui/gui/pspplogo.png \
 	$(top_srcdir)/src/ui/gui/icons/value-labels.png \
 	$(top_srcdir)/src/ui/gui/icons/goto-variable.png\
diff --git a/src/ui/gui/pspp.lang b/src/ui/gui/pspp.lang
new file mode 100644
index 00000000..199586eb
--- /dev/null
+++ b/src/ui/gui/pspp.lang
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   PSPP - a program for statistical analysis.
+   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+
+   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 3 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, see <http://www.gnu.org/licenses/>.
+-->
+
+
+<language id="pspp" _name="PSPP" version="2.0" _section="Sources">
+
+  <styles>
+    <style id="string" _name="String" map-to="def:string"/>
+    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
+    <style id="data-block" _name="Data Block" map-to="def:preprocessor"/>
+    <style id="included-file" _name="Included File" map-to="def:string"/>
+    <style id="char" _name="Character" map-to="def:character"/>
+    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
+    <style id="type" _name="Data Type" map-to="def:type"/>
+    <style id="comment" _name="Comment" map-to="def:comment"/>
+  </styles>
+
+  <default-regex-options case-sensitive="false" />
+
+  <definitions>
+
+    <context id="pspp">
+
+      <include>
+
+        <context id="comment-star" style-ref="comment">
+          <start>^[\t ]*\*</start>
+          <end>^[\t ]*$|^(?=[^\t ])</end>
+        </context>
+
+        <context id="comment-keyword" style-ref="comment">
+          <start>^[\t ]*COMMENT</start>
+          <end>\.[\t ]*$|^[\t ]*$|^(?=[^\t ])</end>
+        </context>
+
+        <context id="data-block" style-ref="data-block">
+          <start>(?&lt;=(^BEGIN DATA$))</start>
+          <end>(?=(^END DATA\.?))</end>
+	</context>
+
+        <context id="string-double" end-at-line-end="true"
+                 style-ref="string">
+          <start>"</start>
+          <end>"</end>
+        </context>
+
+        <context id="string-single" end-at-line-end="true"
+                 style-ref="string">
+          <start>'</start>
+          <end>'</end>
+        </context>
+
+	<context id="keywords" style-ref="keyword">
+          <keyword>ALL</keyword>
+          <keyword>AND</keyword>
+          <keyword>BY</keyword>
+          <keyword>EQ</keyword>
+          <keyword>GE</keyword>
+          <keyword>GT</keyword>
+          <keyword>LE</keyword>
+          <keyword>LT</keyword>
+          <keyword>NE</keyword>
+          <keyword>NOT</keyword>
+          <keyword>OR</keyword>
+          <keyword>TO</keyword>
+          <keyword>WITH</keyword>
+        </context>
+
+      </include>
+    </context>
+  </definitions>
+
+
+</language>
diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index 63ad9fe1..aace66fa 100644
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -465,7 +465,7 @@ open_window (PsppireWindow *de)
 	if (any_reader_may_open (sysname))
 	  psppire_window_load (de, name);
 	else
-	  open_syntax_window (name);
+	  open_new_syntax_window (name);
 
 	g_free (sysname);
 	g_free (name);
@@ -853,8 +853,6 @@ on_recent_files_select (GtkMenuShell *menushell,   gpointer user_data)
 {
   gchar *file;
 
-  GtkWidget *se ;
-
   gchar *uri =
     gtk_recent_chooser_get_current_uri (GTK_RECENT_CHOOSER (menushell));
 
@@ -862,17 +860,13 @@ on_recent_files_select (GtkMenuShell *menushell,   gpointer user_data)
 
   g_free (uri);
 
-  se = psppire_syntax_window_new ();
-
-  if ( psppire_window_load (PSPPIRE_WINDOW (se), file) ) 
-    gtk_widget_show (se);
-  else
-    gtk_widget_destroy (se);
+  open_new_syntax_window (file);
 
   g_free (file);
 }
 
 
+
 static void
 enable_delete_cases (GtkWidget *w, gint case_num, gpointer data)
 {
diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c
index ccf94e7b..c7251a1a 100644
--- a/src/ui/gui/psppire-syntax-window.c
+++ b/src/ui/gui/psppire-syntax-window.c
@@ -16,16 +16,22 @@
 
 #include <config.h>
 
+#include "relocatable.h"
+
 #include <gtk/gtksignal.h>
 #include <gtk/gtkbox.h>
 #include "executor.h"
 #include "helper.h"
 
+#include <gtksourceview/gtksourcebuffer.h>
+#include <gtksourceview/gtksourcelanguage.h>
+#include <gtksourceview/gtksourcelanguagemanager.h>
+#include <gtksourceview/gtksourceprintcompositor.h>
+
 #include <libpspp/message.h>
 #include <stdlib.h>
 
 #include "psppire.h"
-#include "psppire-syntax-window.h"
 
 #include "psppire-data-window.h"
 #include "psppire-window-register.h"
@@ -131,6 +137,28 @@ psppire_syntax_window_class_init (PsppireSyntaxWindowClass *class)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
 
+  GtkSourceLanguageManager *lm = gtk_source_language_manager_get_default ();
+
+  const gchar * const *existing_paths =  gtk_source_language_manager_get_search_path (lm);
+  gchar **new_paths = g_strdupv ((gchar **)existing_paths);
+  int n = g_strv_length ((gchar **) existing_paths);
+
+  new_paths = g_realloc (new_paths, (n + 2) * sizeof (*new_paths));
+  new_paths[n] = g_strdup (relocate (PKGDATADIR));
+  new_paths[n+1] = NULL;
+
+  lm = gtk_source_language_manager_new ();
+  gtk_source_language_manager_set_search_path (lm, new_paths);
+
+  class->lan = gtk_source_language_manager_get_language (lm, "pspp");
+
+  if (class->lan == NULL)
+    g_warning ("pspp.lang file not found.  Syntax highlighting will not be available.");
+
+  parent_class = g_type_class_peek_parent (class);
+
+  g_strfreev (new_paths);
+
   parent_class = g_type_class_peek_parent (class);
 
   gobject_class->dispose = psppire_syntax_window_dispose;
@@ -141,7 +169,6 @@ static void
 psppire_syntax_window_base_init (PsppireSyntaxWindowClass *class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (class);
-
   object_class->finalize = psppire_syntax_window_finalize;
 }
 
@@ -160,7 +187,7 @@ editor_execute_syntax (const PsppireSyntaxWindow *sw, GtkTextIter start,
 {
   PsppireWindow *win = PSPPIRE_WINDOW (sw);
   const gchar *name = psppire_window_get_filename (win);
-  execute_syntax (create_syntax_editor_source (sw->buffer, start, stop, name));
+  execute_syntax (create_syntax_editor_source (GTK_TEXT_BUFFER (sw->buffer), start, stop, name));
 }
 
 
@@ -171,14 +198,13 @@ static void
 on_edit_delete (PsppireSyntaxWindow *sw)
 {
   GtkTextIter begin, end;
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer);
   
-  if ( gtk_text_buffer_get_selection_bounds (sw->buffer, &begin, &end) )
-    gtk_text_buffer_delete (sw->buffer, &begin, &end);
+  if ( gtk_text_buffer_get_selection_bounds (buffer, &begin, &end) )
+    gtk_text_buffer_delete (buffer, &begin, &end);
 }
 
 
-
-
 /* The syntax editor's clipboard deals only with text */
 enum {
   SELECT_FMT_NULL,
@@ -189,7 +215,7 @@ enum {
 static void
 selection_changed (PsppireSyntaxWindow *sw)
 {
-  gboolean sel = gtk_text_buffer_get_has_selection (sw->buffer);
+  gboolean sel = gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (sw->buffer));
 
   gtk_action_set_sensitive (sw->edit_copy, sel);
   gtk_action_set_sensitive (sw->edit_cut, sel);
@@ -242,12 +268,13 @@ static gboolean
 set_clip (PsppireSyntaxWindow *sw, GtkTextIter *begin, GtkTextIter *end)
 {
   GtkClipboard *clipboard ;
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer);
 
-  if ( ! gtk_text_buffer_get_selection_bounds (sw->buffer, begin, end) )
+  if ( ! gtk_text_buffer_get_selection_bounds (buffer, begin, end) )
     return FALSE;
 
   g_free (sw->cliptext);
-  sw->cliptext = gtk_text_buffer_get_text  (sw->buffer, begin, end, FALSE);
+  sw->cliptext = gtk_text_buffer_get_text  (buffer, begin, end, FALSE);
 
   clipboard =
     gtk_widget_get_clipboard (GTK_WIDGET (sw), GDK_SELECTION_CLIPBOARD);
@@ -267,7 +294,7 @@ on_edit_cut (PsppireSyntaxWindow *sw)
   GtkTextIter begin, end;
   
   if ( set_clip (sw, &begin, &end))
-    gtk_text_buffer_delete (sw->buffer, &begin, &end);
+    gtk_text_buffer_delete (GTK_TEXT_BUFFER (sw->buffer), &begin, &end);
 }
 
 static void
@@ -296,7 +323,7 @@ contents_received_callback (GtkClipboard *clipboard,
 
   c = (gchar *) sd->data;
 
-  gtk_text_buffer_insert_at_cursor (syntax_window->buffer,
+  gtk_text_buffer_insert_at_cursor (GTK_TEXT_BUFFER (syntax_window->buffer),
 				    (gchar *) sd->data,
 				    sd->length);
 
@@ -349,8 +376,8 @@ on_run_all (GtkMenuItem *menuitem, gpointer user_data)
   GtkTextIter begin, end;
   PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
 
-  gtk_text_buffer_get_iter_at_offset (se->buffer, &begin, 0);
-  gtk_text_buffer_get_iter_at_offset (se->buffer, &end, -1);
+  gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (se->buffer), &begin, 0);
+  gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (se->buffer), &end, -1);
 
   editor_execute_syntax (se, begin, end);
 }
@@ -362,7 +389,7 @@ on_run_selection (GtkMenuItem *menuitem, gpointer user_data)
   GtkTextIter begin, end;
   PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
 
-  if ( gtk_text_buffer_get_selection_bounds (se->buffer, &begin, &end) )
+  if ( gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (se->buffer), &begin, &end) )
     editor_execute_syntax (se, begin, end);
 }
 
@@ -379,17 +406,17 @@ on_run_to_end (GtkMenuItem *menuitem, gpointer user_data)
   PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
 
   /* Get the current line */
-  gtk_text_buffer_get_iter_at_mark (se->buffer,
+  gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (se->buffer),
 				    &here,
-				    gtk_text_buffer_get_insert (se->buffer)
+				    gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (se->buffer))
 				    );
 
   line = gtk_text_iter_get_line (&here) ;
 
   /* Now set begin and end to the start of this line, and end of buffer
      respectively */
-  gtk_text_buffer_get_iter_at_line (se->buffer, &begin, line);
-  gtk_text_buffer_get_iter_at_line (se->buffer, &end, -1);
+  gtk_text_buffer_get_iter_at_line (GTK_TEXT_BUFFER (se->buffer), &begin, line);
+  gtk_text_buffer_get_iter_at_line (GTK_TEXT_BUFFER (se->buffer), &end, -1);
 
   editor_execute_syntax (se, begin, end);
 }
@@ -407,17 +434,17 @@ on_run_current_line (GtkMenuItem *menuitem, gpointer user_data)
   PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
 
   /* Get the current line */
-  gtk_text_buffer_get_iter_at_mark (se->buffer,
+  gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (se->buffer),
 				    &here,
-				    gtk_text_buffer_get_insert (se->buffer)
+				    gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (se->buffer))
 				    );
 
   line = gtk_text_iter_get_line (&here) ;
 
   /* Now set begin and end to the start of this line, and start of
      following line respectively */
-  gtk_text_buffer_get_iter_at_line (se->buffer, &begin, line);
-  gtk_text_buffer_get_iter_at_line (se->buffer, &end, line + 1);
+  gtk_text_buffer_get_iter_at_line (GTK_TEXT_BUFFER (se->buffer), &begin, line);
+  gtk_text_buffer_get_iter_at_line (GTK_TEXT_BUFFER (se->buffer), &end, line + 1);
 
   editor_execute_syntax (se, begin, end);
 }
@@ -449,7 +476,7 @@ save_editor_to_file (PsppireSyntaxWindow *se,
 		     const gchar *filename,
 		     GError **err)
 {
-  GtkTextBuffer *buffer = se->buffer;
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (se->buffer);
   gboolean result ;
   GtkTextIter start, stop;
   gchar *text;
@@ -562,6 +589,21 @@ on_quit (GtkMenuItem *menuitem, gpointer    user_data)
 }
 
 
+static void
+load_and_show_syntax_window (GtkWidget *se, const gchar *filename)
+{
+  gboolean ok;
+
+  gtk_source_buffer_begin_not_undoable_action (PSPPIRE_SYNTAX_WINDOW (se)->buffer);
+  ok = psppire_window_load (PSPPIRE_WINDOW (se), filename);
+  gtk_source_buffer_end_not_undoable_action (PSPPIRE_SYNTAX_WINDOW (se)->buffer);
+
+  if (ok )
+    gtk_widget_show (se);
+  else
+    gtk_widget_destroy (se);
+}
+
 void
 create_syntax_window (void)
 {
@@ -570,21 +612,17 @@ create_syntax_window (void)
 }
 
 void
-open_syntax_window (const char *file_name)
+open_new_syntax_window (const char *file_name)
 {
   GtkWidget *se = psppire_syntax_window_new ();
 
-  if ( psppire_window_load (PSPPIRE_WINDOW (se), file_name) )
-    gtk_widget_show (se);
-  else
-    gtk_widget_destroy (se);
+  if ( file_name)
+    load_and_show_syntax_window (se, file_name);
 }
 
-static void
-on_text_changed (GtkTextBuffer *buffer, PsppireSyntaxWindow *window)
-{
-  gtk_statusbar_pop (GTK_STATUSBAR (window->sb), window->text_context);
-}
+
+
+static void psppire_syntax_window_print (PsppireSyntaxWindow *window);
 
 static void
 on_modified_changed (GtkTextBuffer *buffer, PsppireWindow *window)
@@ -595,6 +633,17 @@ on_modified_changed (GtkTextBuffer *buffer, PsppireWindow *window)
 
 extern struct source_stream *the_source_stream ;
 
+static void undo_redo_update (PsppireSyntaxWindow *window);
+static void undo_last_edit (PsppireSyntaxWindow *window);
+static void redo_last_edit (PsppireSyntaxWindow *window);
+
+static void
+on_text_changed (GtkTextBuffer *buffer, PsppireSyntaxWindow *window)
+{
+  gtk_statusbar_pop (GTK_STATUSBAR (window->sb), window->text_context);
+  undo_redo_update (window);
+}
+
 static void
 psppire_syntax_window_init (PsppireSyntaxWindow *window)
 {
@@ -604,12 +653,38 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
   GtkWidget *menubar = get_widget_assert (xml, "menubar");
   GtkWidget *sw = get_widget_assert (xml, "scrolledwindow8");
 
-
   GtkWidget *text_view = get_widget_assert (xml, "syntax_text_view");
 
+  PsppireSyntaxWindowClass *class
+    = PSPPIRE_SYNTAX_WINDOW_CLASS (G_OBJECT_GET_CLASS (window));
+
   GtkClipboard *clip_selection = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD);
   GtkClipboard *clip_primary =   gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_PRIMARY);
 
+
+  window->print_settings = NULL;
+  window->undo_menuitem = get_action_assert (xml, "edit_undo");
+  window->redo_menuitem = get_action_assert (xml, "edit_redo");
+
+  if (class->lan)
+    window->buffer = gtk_source_buffer_new_with_language (class->lan);
+  else
+    window->buffer = gtk_source_buffer_new (NULL);
+
+  gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), GTK_TEXT_BUFFER (window->buffer));
+
+  g_object_set (window->buffer,
+		"highlight-matching-brackets", TRUE,
+		NULL);
+
+  g_object_set (text_view,
+		"show-line-numbers", TRUE,
+		"show-line-marks", TRUE,
+		"auto-indent", TRUE,
+		"indent-width", 4,
+		"highlight-current-line", TRUE,
+		NULL);
+
   window->cliptext = NULL;
   window->dispose_has_run = FALSE;
 
@@ -618,7 +693,6 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
   window->edit_cut = get_action_assert (xml, "edit_cut");
   window->edit_paste = get_action_assert (xml, "edit_paste");
 
-  window->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
   window->lexer = lex_create (the_source_stream);
 
   window->sb = get_widget_assert (xml, "statusbar2");
@@ -630,6 +704,22 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
   g_signal_connect (window->buffer, "modified-changed", 
 		    G_CALLBACK (on_modified_changed), window);
 
+  g_signal_connect_swapped (get_action_assert (xml, "file_print"), "activate",
+                            G_CALLBACK (psppire_syntax_window_print), window);
+
+
+  g_signal_connect_swapped (window->undo_menuitem,
+			    "activate",
+                            G_CALLBACK (undo_last_edit),
+			    window);
+
+  g_signal_connect_swapped (window->redo_menuitem,
+			    "activate",
+                            G_CALLBACK (redo_last_edit),
+			    window);
+
+  undo_redo_update (window);
+
   window->sel_handler = g_signal_connect_swapped (clip_primary, "owner-change", 
 						   G_CALLBACK (selection_changed), window);
 
@@ -721,6 +811,9 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
 		    G_CALLBACK (psppire_window_minimise_all), NULL);
 
 
+
+
+
   {
   GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER));
 
@@ -785,7 +878,7 @@ syntax_load (PsppireWindow *window, const gchar *filename)
   gsize len_utf8 = -1;
   GtkTextIter iter;
   PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (window);
-
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer);
   /* FIXME: What if it's a very big file ? */
   if ( ! g_file_get_contents (filename, &text_locale, &len_locale, &err) )
     {
@@ -805,11 +898,11 @@ syntax_load (PsppireWindow *window, const gchar *filename)
       return FALSE;
     }
 
-  gtk_text_buffer_get_iter_at_line (sw->buffer, &iter, 0);
+  gtk_text_buffer_get_iter_at_line (buffer, &iter, 0);
 
-  gtk_text_buffer_insert (sw->buffer, &iter, text_utf8, len_utf8);
+  gtk_text_buffer_insert (buffer, &iter, text_utf8, len_utf8);
 
-  gtk_text_buffer_set_modified (sw->buffer, FALSE);
+  gtk_text_buffer_set_modified (buffer, FALSE);
 
   free (text_utf8);
 
@@ -825,3 +918,113 @@ psppire_syntax_window_iface_init (PsppireWindowIface *iface)
   iface->load = syntax_load;
 }
 
+
+
+
+static void
+undo_redo_update (PsppireSyntaxWindow *window)
+{
+  gtk_action_set_sensitive (window->undo_menuitem,
+			    gtk_source_buffer_can_undo (window->buffer));
+
+  gtk_action_set_sensitive (window->redo_menuitem,
+			    gtk_source_buffer_can_redo (window->buffer));
+}
+
+static void
+undo_last_edit (PsppireSyntaxWindow *window)
+{
+  gtk_source_buffer_undo (window->buffer);
+  undo_redo_update (window);
+}
+
+static void
+redo_last_edit (PsppireSyntaxWindow *window)
+{
+  gtk_source_buffer_redo (window->buffer);
+  undo_redo_update (window);
+}
+
+
+
+/* Printing related stuff */
+
+
+static void
+begin_print (GtkPrintOperation *operation,
+          GtkPrintContext   *context,
+          PsppireSyntaxWindow *window)
+{
+  window->compositor =
+    gtk_source_print_compositor_new (window->buffer);
+}
+
+
+static void
+end_print (GtkPrintOperation *operation,
+          GtkPrintContext   *context,
+          PsppireSyntaxWindow *window)
+{
+  g_object_unref (window->compositor);
+  window->compositor = NULL;
+}
+
+
+
+static gboolean
+paginate (GtkPrintOperation *operation,
+          GtkPrintContext   *context,
+          PsppireSyntaxWindow *window)
+{
+  if (gtk_source_print_compositor_paginate (window->compositor, context))
+    {
+      gint n_pages = gtk_source_print_compositor_get_n_pages (window->compositor);
+      gtk_print_operation_set_n_pages (operation, n_pages);
+        
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+draw_page (GtkPrintOperation *operation,
+           GtkPrintContext   *context,
+           gint               page_nr,
+          PsppireSyntaxWindow *window)
+{
+  gtk_source_print_compositor_draw_page (window->compositor, 
+					 context,
+					 page_nr);
+}
+
+
+
+static void
+psppire_syntax_window_print (PsppireSyntaxWindow *window)
+{
+  GtkPrintOperationResult res;
+
+  GtkPrintOperation *print = gtk_print_operation_new ();
+
+  if (window->print_settings != NULL) 
+    gtk_print_operation_set_print_settings (print, window->print_settings);
+
+
+  g_signal_connect (print, "begin_print", G_CALLBACK (begin_print), window);
+  g_signal_connect (print, "end_print", G_CALLBACK (end_print),     window);
+  g_signal_connect (print, "draw_page", G_CALLBACK (draw_page),     window);
+  g_signal_connect (print, "paginate", G_CALLBACK (paginate),       window);
+
+  res = gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
+                                 GTK_WINDOW (window), NULL);
+
+  if (res == GTK_PRINT_OPERATION_RESULT_APPLY)
+    {
+      if (window->print_settings != NULL)
+        g_object_unref (window->print_settings);
+      window->print_settings = g_object_ref (gtk_print_operation_get_print_settings (print));
+    }
+
+  g_object_unref (print);
+}
diff --git a/src/ui/gui/psppire-syntax-window.h b/src/ui/gui/psppire-syntax-window.h
index 08f5a7c5..df16ed3b 100644
--- a/src/ui/gui/psppire-syntax-window.h
+++ b/src/ui/gui/psppire-syntax-window.h
@@ -25,12 +25,17 @@
 #include "psppire-window.h"
 #include <gtk/gtk.h>
 
+#include <gtksourceview/gtksourcelanguage.h>
+#include <gtksourceview/gtksourcelanguagemanager.h>
+#include <gtksourceview/gtksourcebuffer.h>
+#include <gtksourceview/gtksourceprintcompositor.h>
+
 G_BEGIN_DECLS
 
 #define PSPPIRE_SYNTAX_WINDOW_TYPE            (psppire_syntax_window_get_type ())
 #define PSPPIRE_SYNTAX_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_SYNTAX_WINDOW_TYPE, PsppireSyntaxWindow))
 #define PSPPIRE_SYNTAX_WINDOW_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class), \
-    PSPPIRE_SYNTAX_WINDOW_TYPE, PsppireSyntax_WindowClass))
+    PSPPIRE_SYNTAX_WINDOW_TYPE, PsppireSyntaxWindowClass))
 #define PSPPIRE_IS_SYNTAX_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
     PSPPIRE_SYNTAX_WINDOW_TYPE))
 #define PSPPIRE_IS_SYNTAX_WINDOW_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), \
@@ -47,11 +52,16 @@ struct _PsppireSyntaxWindow
 
   /* <private> */
 
-  GtkTextBuffer *buffer;  /* The buffer which contains the text */
+  GtkSourceBuffer *buffer;  /* The buffer which contains the text */
   struct lexer *lexer;    /* Lexer to parse syntax */
   GtkWidget *sb;
   guint text_context;
 
+  GtkPrintSettings *print_settings;
+  GtkSourcePrintCompositor *compositor;
+  GtkAction *undo_menuitem;
+  GtkAction *redo_menuitem;
+
   gchar *cliptext;
 
   GtkAction *edit_cut;
@@ -69,13 +79,16 @@ struct _PsppireSyntaxWindowClass
 {
   PsppireWindowClass parent_class;
 
+
+  GtkSourceLanguage *lan ;
 };
 
 GType      psppire_syntax_window_get_type        (void);
 GtkWidget* psppire_syntax_window_new             (void);
 
 void create_syntax_window (void);
-void open_syntax_window (const char *file_name);
+void open_new_syntax_window (const char *file_name);
+
 
 G_END_DECLS
 
diff --git a/src/ui/gui/syntax-editor.ui b/src/ui/gui/syntax-editor.ui
index c9436629..4f134c2e 100644
--- a/src/ui/gui/syntax-editor.ui
+++ b/src/ui/gui/syntax-editor.ui
@@ -58,6 +58,12 @@
             <property name="name">file_save_as</property>
           </object>
         </child>
+        <child>
+          <object class="GtkAction" id="file_print">
+            <property name="name">file_print</property>
+            <property name="stock-id">gtk-print</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="file_quit">
             <property name="stock-id">gtk-quit</property>
@@ -98,6 +104,18 @@
             <property name="sensitive">false</property>
           </object>
         </child>
+        <child>
+          <object class="GtkAction" id="edit_undo">
+            <property name="stock-id">gtk-undo</property>
+            <property name="name">edit_undo</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="edit_redo">
+            <property name="stock-id">gtk-redo</property>
+            <property name="name">edit_redo</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="run1">
             <property name="name">run1</property>
@@ -157,6 +175,8 @@
           <menuitem action="file_save"/>
           <menuitem action="file_save_as"/>
           <separator/>
+          <menuitem action="file_print"/>
+          <separator/>
           <menuitem action="file_quit"/>
         </menu>
         <menu action="menuitem7">
@@ -164,6 +184,9 @@
           <menuitem action="edit_copy"/>
           <menuitem action="edit_paste"/>
           <menuitem action="edit_delete"/>
+          <separator/>
+          <menuitem action="edit_undo"/>
+          <menuitem action="edit_redo"/>
         </menu>
         <menu action="run1">
           <menuitem action="run_all"/>
@@ -190,7 +213,7 @@
     <property name="shadow_type">GTK_SHADOW_IN</property>
     <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
     <child>
-      <object class="GtkTextView" id="syntax_text_view">
+      <object class="GtkSourceView" id="syntax_text_view">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="editable">True</property>