X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=a6f8f60d18a07e90f0d132621b2723a24f6540e2;hb=a69e7a45780e94f4330a91facfe35126c678e34e;hp=8715b6dfd63026b612b73d3d05aac813f6e05738;hpb=884a2d31f172e56572d284fcc595034a46a34e52;p=lyx.git

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 8715b6dfd6..a6f8f60d18 100644
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -19,7 +19,6 @@
 #include "lyx.h"
 #include "layout_forms.h"
 #include "bullet_forms.h"
-#include "print_form.h"
 #include "form1.h"
 #include "lyx_main.h"
 #include "lyx_cb.h"
@@ -41,11 +40,9 @@
 #include "support/filetools.h"
 #include "support/path.h"
 #include "lyxserver.h"
-#include "FontLoader.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
 #include "CutAndPaste.h"
-#include "TextCache.h"
 
 using std::ifstream;
 using std::copy;
@@ -70,16 +67,9 @@ extern FD_form_document * fd_form_document;
 extern FD_form_quotes * fd_form_quotes;
 extern FD_form_preamble * fd_form_preamble;
 extern FD_form_table * fd_form_table;
-extern FD_form_print * fd_form_print;
 extern FD_form_figure * fd_form_figure;
-extern FD_form_screen * fd_form_screen;
-extern FD_form_toc * fd_form_toc;
-extern FD_form_ref * fd_form_ref;
-extern FD_LaTeXOptions * fd_latex_options;
 extern FD_form_bullet * fd_form_bullet;
 
-#define XFORMS_CLIPBOARD 1
-
 extern BufferView * current_view; // called too many times in this file...
 
 extern void DeleteSimpleCutBuffer(); /* for the cleanup when exiting */
@@ -164,8 +154,8 @@ void ToggleLockedInsetCursor(long x, long y, int asc, int desc);
 
 int RunLinuxDoc(BufferView *, int, string const &);
 int RunDocBook(int, string const &);
-void MenuWrite(Buffer * buf);
-void MenuWriteAs(Buffer * buffer);
+bool MenuWrite(Buffer * buf);
+bool MenuWriteAs(Buffer * buffer);
 void MenuReload(Buffer * buf);
 void MenuLayoutSave();
 
@@ -185,27 +175,6 @@ void ShowMessage(Buffer * buf,
 }
 
 
-// only called from this file, LyXView and LyXFunc
-char updatetimer = 0;
-
-
-// only called from BufferView_pimpl and LyXFunc
-void FreeUpdateTimer()
-{
-	/* a real free timer would be better but I don't know 
-	 * how to do this with xforms */
-	updatetimer = 0;
-}
-
-
-// Only called from LyXFunc
-void SetUpdateTimer(float time)
-{
-	fl_set_timer(current_view->owner()->getMainForm()->timer_update, time);
-	updatetimer = 1;
-}
-
-
 //
 // Menu callbacks
 //
@@ -215,7 +184,7 @@ void SetUpdateTimer(float time)
 //
 
 // should be moved to lyxfunc.C
-void MenuWrite(Buffer * buffer)
+bool MenuWrite(Buffer * buffer)
 {
 	XFlush(fl_display);
 	if (!buffer->save()) {
@@ -224,17 +193,19 @@ void MenuWrite(Buffer * buffer)
 		if (AskQuestion(_("Save failed. Rename and try again?"),
 				MakeDisplayPath(s, 50),
 				_("(If not, document is not saved.)"))) {
-			MenuWriteAs(buffer);
+			return MenuWriteAs(buffer);
 		}
+		return false;
 	} else {
 		lastfiles->newFile(buffer->fileName());
 	}
+	return true;
 }
 
 
 // should be moved to BufferView.C
 // Half of this func should be in LyXView, the rest in BufferView.
-void MenuWriteAs(Buffer * buffer)
+bool MenuWriteAs(Buffer * buffer)
 {
 	// Why do we require BufferView::text to be able to write a
 	// document? I see no point in that. (Lgb)
@@ -251,14 +222,21 @@ void MenuWriteAs(Buffer * buffer)
 	if (!IsLyXFilename(fname))
 		fname += ".lyx";
 
-	fname = fileDlg.Select(_("Enter Filename to Save Document as"), 
-			       OnlyPath(fname),
-			       "*.lyx", 
-			       OnlyFilename(fname));
+	if (buffer->isUnnamed()) {
+		fname = fileDlg.Select(_("Enter Filename to Save Document as"), 
+				       "",
+				       "*.lyx", 
+				       "");
+	} else {
+		fname = fileDlg.Select(_("Enter Filename to Save Document as"), 
+				       OnlyPath(fname),
+				       "*.lyx", 
+				       OnlyFilename(fname));
+	}
 	AllowInput(current_view);
 
 	if (fname.empty()) {
-		return;
+		return false;
 	}
 	// Make sure the absolute filename ends with appropriate suffix
 	string s = MakeAbsPath(fname);
@@ -270,7 +248,7 @@ void MenuWriteAs(Buffer * buffer)
 		if (!AskQuestion(_("Same name as document already has:"),
 				 MakeDisplayPath(s, 50),
 				 _("Save anyway?")))
-			return;
+			return false;
 		// Falls through to name change and save
 	} 
 	// No, but do we have another file with this name open?
@@ -288,24 +266,36 @@ void MenuWriteAs(Buffer * buffer)
 				ShowMessage(buffer, _("Document renamed to '"),
 						MakeDisplayPath(s), _("', but not saved..."));
 			}
-		return;
+		return false;
 	} // Check whether the file exists
 	else {
 		FileInfo myfile(s);
 		if (myfile.isOK() && !AskQuestion(_("Document already exists:"), 
 						  MakeDisplayPath(s, 50),
 						  _("Replace file?")))
-			return;
+			return false;
 	}
 
 	// Ok, change the name of the buffer
 	buffer->fileName(s);
 	buffer->markDirty();
+	bool unnamed = buffer->isUnnamed();
+	buffer->setUnnamed(false);
 	// And save
 	// Small bug: If the save fails, we have irreversible changed the name
 	// of the document.
-	MenuWrite(buffer);
-}    
+	// Hope this is fixed this way! (Jug)
+	if (!MenuWrite(buffer)) {
+	    buffer->fileName(oldname);
+	    buffer->setUnnamed(unnamed);
+	    ShowMessage(buffer, _("Document could not be saved!"),
+			_("Holding the old name."), MakeDisplayPath(oldname));
+	    return false;
+	}
+	// now remove the oldname autosave file if existant!
+	removeAutosaveFile(oldname);
+	return true;
+}
 
 
 int MenuRunLaTeX(Buffer * buffer)
@@ -409,11 +399,11 @@ int MakeLaTeXOutput(Buffer * buffer)
 	if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) {
 		path = buffer->tmppath;
 	}
-	if (!buffer->isDviClean()) {
-		Path p(path);
-		ret = MenuRunLaTeX(buffer);
-	}
-	return ret;
+		
+    Path p(path);
+	ret = MenuRunLaTeX(buffer);
+	
+    return ret;
 }
 
 
@@ -745,7 +735,6 @@ void MenuMakeLaTeX(Buffer * buffer)
 			buffer->makeLaTeXFile(s, string(), true);
 		ShowMessage(buffer, _("Nice LaTeX file saved as"), 
 			    MakeDisplayPath(s));
-		buffer->markDviDirty();
 	}
 }
 
@@ -769,7 +758,7 @@ void MenuMakeLinuxDoc(Buffer * buffer)
 	ShowMessage(buffer, _("Building LinuxDoc SGML file `"),
 					  MakeDisplayPath(s),"'...");
 	
-	buffer->makeLinuxDocFile(s, 65);
+	buffer->makeLinuxDocFile(s, true);
 	buffer->redraw();
 	ShowMessage(buffer, _("LinuxDoc SGML file save as"),
 					  MakeDisplayPath(s)); 
@@ -796,7 +785,7 @@ void MenuMakeDocBook(Buffer * buffer)
 	ShowMessage(buffer, _("Building DocBook SGML file `"),
 					  MakeDisplayPath(s), "'..."); 
 	
-	buffer->makeDocBookFile(s, 65);
+	buffer->makeDocBookFile(s, true);
 	buffer->redraw();
 	ShowMessage(buffer, _("DocBook SGML file save as"),
 					  MakeDisplayPath(s)); 
@@ -821,27 +810,6 @@ void MenuMakeAscii(Buffer * buffer)
 }
 
 
-void MenuPrint(Buffer * buffer)
-{
-	// Who cares?
-	//if (!bv->text)
-	//	return;
-
-	string input_file = OnlyFilename(ChangeExtension(buffer->fileName(),
-					    lyxrc.print_file_extension));
-	fl_set_input(fd_form_print->input_file, input_file.c_str());
-	
-	if (fd_form_print->form_print->visible) {
-		fl_raise_form(fd_form_print->form_print);
-	} 
-	else {
-		fl_show_form(fd_form_print->form_print,
-			     FL_PLACE_MOUSE, FL_FULLBORDER,
-			     _("Print"));
-	}
-}
-
-
 void MenuMakeHTML(Buffer * buffer)
 {
 	// First, create LaTeX file
@@ -956,7 +924,9 @@ void MenuExport(Buffer * buffer, string const & extyp)
 	// postscript
 	else if (extyp == "postscript") {
 		// Start Print-dialog. Not as good as dvi... Bernhard.
-		MenuPrint(buffer);
+	//should start lyxview->getDialogs()->showPrint();
+	// to get same as before
+	//		MenuPrint(buffer);
 		// Since the MenuPrint is a pop-up, we can't use
 		// the same trick as above. (Asger)
 		// MISSING: Move of ps-file :-(
@@ -971,15 +941,12 @@ void MenuExport(Buffer * buffer, string const & extyp)
 	}
 	// HTML
 	else if (extyp == "html") {
-		MenuMakeHTML(buffer);
-	}
-	// HTML from linuxdoc
-	else if (extyp == "html-linuxdoc") {
-		MenuMakeHTML_LinuxDoc(buffer);
-	}
-	// HTML from docbook
-	else if (extyp == "html-docbook") {
-		MenuMakeHTML_DocBook(buffer);
+		if (buffer->isLinuxDoc())
+			MenuMakeHTML_LinuxDoc(buffer);
+		else if (buffer->isDocBook())
+			MenuMakeHTML_DocBook(buffer);
+		else
+			MenuMakeHTML(buffer);
 	}
 	else {
 		ShowMessage(buffer, _("Unknown export type: ") + extyp);
@@ -1020,8 +987,7 @@ void AutoSave(BufferView * bv)
 	if (!bv->available())
 		return;
 
-	if (bv->buffer()->isBakClean()
-	    || bv->buffer()->isReadonly()) {
+	if (bv->buffer()->isBakClean() || bv->buffer()->isReadonly()) {
 		// We don't save now, but we'll try again later
 		bv->owner()->resetAutosaveTimer();
 		return;
@@ -1148,40 +1114,29 @@ void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
 	ifs.unsetf(ios::skipws);
 	istream_iterator<char> ii(ifs);
 	istream_iterator<char> end;
+#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
+	// We use this until the compilers get better...
+	vector<char> tmp;
+	copy(ii, end, back_inserter(tmp));
+	string tmpstr(tmp.begin(), tmp.end());
+#else
+	// This is what we want to use and what we will use once the
+	// compilers get good enough. 
 	//string tmpstr(ii, end); // yet a reason for using std::string
 	// alternate approach to get the file into a string:
 	string tmpstr;
 	copy(ii, end, back_inserter(tmpstr));
+#endif
 	// insert the string
 	current_view->hideCursor();
 	
 	// clear the selection
 	bv->beforeChange();
 	if (!asParagraph)
-		bv->text->InsertStringA(tmpstr);
+		bv->text->InsertStringA(bv, tmpstr);
 	else
-		bv->text->InsertStringB(tmpstr);
-	bv->update(1);
-}
-
-
-void MenuShowTableOfContents()
-{
-	static int ow = -1, oh;
-
-	TocUpdateCB(0, 0);
-	if (fd_form_toc->form_toc->visible) {
-		fl_raise_form(fd_form_toc->form_toc);
-	} else {
-		fl_show_form(fd_form_toc->form_toc,
-			     FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER,
-			     _("Table Of Contents"));
-		if (ow < 0) {
-			ow = fd_form_toc->form_toc->w;
-			oh = fd_form_toc->form_toc->h;
-		}
-		fl_set_form_minsize(fd_form_toc->form_toc, ow, oh);
-	}
+		bv->text->InsertStringB(bv, tmpstr);
+	bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 }
 
 
@@ -1197,56 +1152,14 @@ void MenuInsertLabel(char const * arg)
 		}
 	}
 	if (!label.empty()) {
-		InsetLabel * new_inset = new InsetLabel;
-		new_inset->setContents(label);
-		current_view->insertInset(new_inset);
+		InsetCommandParams p( "label", label );
+		InsetLabel * inset = new InsetLabel( p );
+		current_view->insertInset( inset );
 	}
 	AllowInput(current_view);
 }
 
 
-void MenuInsertRef()
-{
-	static int ow = -1, oh;
-
-	RefUpdateCB(0, 0);
-	if (fd_form_ref->form_ref->visible) {
-		fl_raise_form(fd_form_ref->form_ref);
-	} else {
-		fl_show_form(fd_form_ref->form_ref,
-			     FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER,
-			     _("Insert Reference"));
-		if (ow < 0) {
-			ow = fd_form_ref->form_ref->w;
-			oh = fd_form_ref->form_ref->h;
-		}
-		fl_set_form_minsize(fd_form_ref->form_ref, ow, oh);
-	}
-}
-
-
-#ifndef XFORMS_CLIPBOARD
-void MenuPasteSelection(char at)
-{
-	if (!current_view->available())
-		return;
-	ascii_type = at;
-  
-	Atom data_prop = XInternAtom(fl_display, 
-				     "LyX_Primary",
-				     false);
-	if (data_prop == None) 
-		return;
-	XConvertSelection(fl_display,
-			  XA_PRIMARY, XA_STRING, data_prop, 
-			  current_view->owner()->getForm()->window, 0);
-	XFlush(fl_display);
-
-}
-#endif
-
-
-
 // candidate for move to LyXView
 // This is only used in toolbar.C
 void LayoutsCB(int sel, void *)
@@ -1279,7 +1192,7 @@ int RunLinuxDoc(BufferView * bv, int flag, string const & filename)
 	
 	if (!bv->available())
 		return 0;
-	bv->buffer()->makeLinuxDocFile(name, 0);
+	bv->buffer()->makeLinuxDocFile(name, false);
 
 	// CHECK remove this once we have a proper geometry class
 
@@ -1310,8 +1223,7 @@ int RunLinuxDoc(BufferView * bv, int flag, string const & filename)
 		s2 = lyxrc.linuxdoc_to_latex_command + ' ' + add_flags + " -o dvi " + ' ' + name;
 		if (one.startscript(Systemcalls::System, s2)) {
 			errorcode = 1;
-		} else
-			bv->buffer()->markDviClean();
+		} 
 		break;
 	default: /* unknown output */
 		break;
@@ -1341,7 +1253,7 @@ int RunDocBook(int flag, string const & filename)
 	if (!current_view->available())
 		return 0;
 	
-	current_view->buffer()->makeDocBookFile(name, 0);
+	current_view->buffer()->makeDocBookFile(name, false);
 
 	// Shall this code go or should it stay? (Lgb)
 	// This code is a placeholder for future implementation. (Jose')
@@ -1363,8 +1275,7 @@ int RunDocBook(int flag, string const & filename)
 		string s2 = lyxrc.docbook_to_dvi_command + ' ' + name;
 		if (one.startscript(Systemcalls::System, s2)) {
 			errorcode = 1;
-		} else
-			current_view->buffer()->markDviClean();
+		}
 	}
 	break;
 	default: /* unknown output */
@@ -1474,18 +1385,23 @@ bool UpdateLayoutParagraph()
 	}
 
 	Buffer * buf = current_view->buffer();
+	LyXText * text = 0;
+	if (current_view->the_locking_inset)
+	    text = current_view->the_locking_inset->getLyXText(current_view);
+	if (!text)
+	    text = current_view->text;
 
 	fl_set_input(fd_form_paragraph->input_labelwidth,
-		     current_view->text->cursor.par->GetLabelWidthString().c_str());
+		     text->cursor.par()->GetLabelWidthString().c_str());
 	fl_set_button(fd_form_paragraph->radio_align_right, 0);
 	fl_set_button(fd_form_paragraph->radio_align_left, 0);
 	fl_set_button(fd_form_paragraph->radio_align_center, 0);
 	fl_set_button(fd_form_paragraph->radio_align_block, 0);
 
-	int align = current_view->text->cursor.par->GetAlign();
+	int align = text->cursor.par()->GetAlign();
 	if (align == LYX_ALIGN_LAYOUT)
 		align = textclasslist.Style(buf->params.textclass,
-					    current_view->text->cursor.par->GetLayout()).align;
+					    text->cursor.par()->GetLayout()).align;
 	 
 	switch (align) {
 	case LYX_ALIGN_RIGHT:
@@ -1501,20 +1417,41 @@ bool UpdateLayoutParagraph()
 		fl_set_button(fd_form_paragraph->radio_align_block, 1);
 		break;
 	}
-	 
+
+#ifndef NEW_INSETS
 	fl_set_button(fd_form_paragraph->check_lines_top,
-		      current_view->text->cursor.par->FirstPhysicalPar()->line_top);
+		      text->cursor.par()->FirstPhysicalPar()->line_top);
+
 	fl_set_button(fd_form_paragraph->check_lines_bottom,
-		      current_view->text->cursor.par->FirstPhysicalPar()->line_bottom);
+		      text->cursor.par()->FirstPhysicalPar()->line_bottom);
+
 	fl_set_button(fd_form_paragraph->check_pagebreaks_top,
-		      current_view->text->cursor.par->FirstPhysicalPar()->pagebreak_top);
+		      text->cursor.par()->FirstPhysicalPar()->pagebreak_top);
+
 	fl_set_button(fd_form_paragraph->check_pagebreaks_bottom,
-		      current_view->text->cursor.par->FirstPhysicalPar()->pagebreak_bottom);
+		      text->cursor.par()->FirstPhysicalPar()->pagebreak_bottom);
 	fl_set_button(fd_form_paragraph->check_noindent,
-		      current_view->text->cursor.par->FirstPhysicalPar()->noindent);
+		      text->cursor.par()->FirstPhysicalPar()->noindent);
+#else
+	fl_set_button(fd_form_paragraph->check_lines_top,
+		      text->cursor.par()->line_top);
+	fl_set_button(fd_form_paragraph->check_lines_bottom,
+		      text->cursor.par()->line_bottom);
+	fl_set_button(fd_form_paragraph->check_pagebreaks_top,
+		      text->cursor.par()->pagebreak_top);
+	fl_set_button(fd_form_paragraph->check_pagebreaks_bottom,
+		      text->cursor.par()->pagebreak_bottom);
+	fl_set_button(fd_form_paragraph->check_noindent,
+		      text->cursor.par()->noindent);
+#endif
 	fl_set_input (fd_form_paragraph->input_space_above, "");
-	
-	switch (current_view->text->cursor.par->FirstPhysicalPar()->added_space_top.kind()) {
+
+#ifndef NEW_INSETS
+	switch (text->cursor.par()->FirstPhysicalPar()->added_space_top.kind()) {
+#else
+	switch (text->cursor.par()->added_space_top.kind()) {
+#endif
+
 	case VSpace::NONE:
 		fl_set_choice (fd_form_paragraph->choice_space_above, 1);
 		break;
@@ -1534,15 +1471,27 @@ bool UpdateLayoutParagraph()
 		fl_set_choice (fd_form_paragraph->choice_space_above, 6);
 		break;
 	case VSpace::LENGTH:
-		fl_set_choice (fd_form_paragraph->choice_space_above, 7); 
+		fl_set_choice (fd_form_paragraph->choice_space_above, 7);
+#ifndef NEW_INSETS
 		fl_set_input  (fd_form_paragraph->input_space_above, 
-			       current_view->text->cursor.par->FirstPhysicalPar()->added_space_top.length().asString().c_str());
+			       text->cursor.par()->FirstPhysicalPar()->added_space_top.length().asString().c_str());
+#else
+		fl_set_input  (fd_form_paragraph->input_space_above, 
+			       text->cursor.par()->added_space_top.length().asString().c_str());
+#endif
 		break;
 	}
+#ifndef NEW_INSETS
 	fl_set_button (fd_form_paragraph->check_space_above,
-		       current_view->text->cursor.par->FirstPhysicalPar()->added_space_top.keep());
+		       text->cursor.par()->FirstPhysicalPar()->added_space_top.keep());
 	fl_set_input (fd_form_paragraph->input_space_below, "");
-	switch (current_view->text->cursor.par->FirstPhysicalPar()->added_space_bottom.kind()) {
+	switch (text->cursor.par()->FirstPhysicalPar()->added_space_bottom.kind()) {
+#else
+	fl_set_button (fd_form_paragraph->check_space_above,
+		       text->cursor.par()->added_space_top.keep());
+	fl_set_input (fd_form_paragraph->input_space_below, "");
+	switch (text->cursor.par()->added_space_bottom.kind()) {
+#endif
 	case VSpace::NONE:
 		fl_set_choice (fd_form_paragraph->choice_space_below,
 			       1);
@@ -1569,17 +1518,28 @@ bool UpdateLayoutParagraph()
 		break;
 	case VSpace::LENGTH:
 		fl_set_choice (fd_form_paragraph->choice_space_below,
-			       7); 
+			       7);
+#ifndef NEW_INSETS
 		fl_set_input  (fd_form_paragraph->input_space_below, 
-			       current_view->text->cursor.par->FirstPhysicalPar()->added_space_bottom.length().asString().c_str());
+			       text->cursor.par()->FirstPhysicalPar()->added_space_bottom.length().asString().c_str());
 		break;
 	}
 	fl_set_button (fd_form_paragraph->check_space_below,
-		       current_view->text->cursor.par->FirstPhysicalPar()->added_space_bottom.keep());
+		       text->cursor.par()->FirstPhysicalPar()->added_space_bottom.keep());
 
 	fl_set_button(fd_form_paragraph->check_noindent,
-		      current_view->text->cursor.par->FirstPhysicalPar()->noindent);
+		      text->cursor.par()->FirstPhysicalPar()->noindent);
+#else
+		fl_set_input  (fd_form_paragraph->input_space_below, 
+			       text->cursor.par()->added_space_bottom.length().asString().c_str());
+		break;
+	}
+	fl_set_button (fd_form_paragraph->check_space_below,
+		       text->cursor.par()->added_space_bottom.keep());
 
+	fl_set_button(fd_form_paragraph->check_noindent,
+		      text->cursor.par()->noindent);
+#endif
 	if (current_view->buffer()->isReadonly()) {
 		DisableParagraphLayout();
 	} else {
@@ -1979,7 +1939,7 @@ void MenuLayoutSave()
 
 // This is both GUI and LyXFont dependent. Don't know where to put it. (Asger)
 // Well, it's mostly GUI dependent, so I guess it will stay here. (Asger)
-LyXFont UserFreeFont()
+LyXFont UserFreeFont(BufferParams const & params)
 {
 	LyXFont font(LyXFont::ALL_IGNORE);
 
@@ -2061,20 +2021,18 @@ LyXFont UserFreeFont()
 	case 11: font.setColor(LColor::inherit); break;
 	}
 
- 	string language = combo_language2->getline();
- 	Languages::iterator lit = languages.find(language);
- 	if (lit != languages.end()) 
- 		font.setLanguage(&(*lit).second);
- 	else
- 		font.setLanguage(ignore_language);
-
+	int choice = combo_language2->get();
+	if (choice == 1)
+		font.setLanguage(ignore_language);
+	else if (choice == 2)
+		font.setLanguage(params.language_info);
+	else
+		font.setLanguage(&languages[combo_language2->getline()]);
 
 	return font; 
 }
 
 
-
-
 /* callbacks for form form_title */
 extern "C" void TimerCB(FL_OBJECT *, long)
 {
@@ -2202,16 +2160,22 @@ extern "C" void ParagraphApplyCB(FL_OBJECT *, long)
 	labelwidthstring = fl_get_input(fd_form_paragraph->input_labelwidth);
 	noindent = fl_get_button(fd_form_paragraph->check_noindent);
 
-	current_view->text->SetParagraph(line_top,
-					 line_bottom,
-					 pagebreak_top,
-					 pagebreak_bottom,
-					 space_top,
-					 space_bottom,
-					 align, 
-					 labelwidthstring,
-					 noindent);
-	current_view->update(1);
+	LyXText * text = 0;
+	if (current_view->the_locking_inset)
+	    text = current_view->the_locking_inset->getLyXText(current_view);
+	if (!text)
+	    text = current_view->text;
+	text->SetParagraph(current_view,
+			   line_top,
+			   line_bottom,
+			   pagebreak_top,
+			   pagebreak_bottom,
+			   space_top,
+			   space_bottom,
+			   align, 
+			   labelwidthstring,
+			   noindent);
+	current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 	current_view->owner()->getMiniBuffer()->Set(_("Paragraph layout set"));
 }
 
@@ -2236,7 +2200,7 @@ extern "C" void CharacterApplyCB(FL_OBJECT *, long)
 	// we set toggleall locally here, since it should be true for
 	// all other uses of ToggleAndShow() (JMarc)
 	toggleall = fl_get_button(fd_form_character->check_toggle_all);
-	ToggleAndShow(current_view, UserFreeFont());
+	ToggleAndShow(current_view, UserFreeFont(current_view->buffer()->params));
 	current_view->setState();
 	toggleall = true;
 }
@@ -2375,12 +2339,14 @@ extern "C" void DocumentApplyCB(FL_OBJECT *, long)
 		new_language = default_language;
 
 	if (current_view->available()) {
-		if (old_language != new_language &&
-		    old_language->RightToLeft == new_language->RightToLeft && 
-		    ! current_view->buffer()->isMultiLingual() ) {
+		if (old_language != new_language
+		    && old_language->RightToLeft() == new_language->RightToLeft()
+		    && !current_view->buffer()->isMultiLingual())
 			current_view->buffer()->ChangeLanguage(old_language,
 							       new_language);
-			current_view->buffer()->redraw();
+		if (old_language != new_language) {
+				//current_view->buffer()->redraw();
+			redo = true;
 		}
 	}
 	params->language_info = new_language;
@@ -2413,8 +2379,9 @@ extern "C" void DocumentApplyCB(FL_OBJECT *, long)
 	if (!current_view->available())
 		return;
 
-        current_view->text->SetCursor(current_view->text->cursor.par,
-                                      current_view->text->cursor.pos);
+        current_view->text->SetCursor(current_view,
+				      current_view->text->cursor.par(),
+                                      current_view->text->cursor.pos());
         current_view->setState();
 
 	LyXTextClassList::ClassList::size_type new_class =
@@ -2530,10 +2497,9 @@ extern "C" void DocumentApplyCB(FL_OBJECT *, long)
    
 	current_view->owner()->getMiniBuffer()->Set(_("Document layout set"));
 	current_view->buffer()->markDirty();
-
+	
         params->options = 
 		fl_get_input(fd_form_document->input_extra);
-   
 }
 
 
@@ -2639,19 +2605,21 @@ extern "C" void PreambleOKCB(FL_OBJECT * ob, long data)
 
 /* callbacks for form form_table */
 
-extern "C" void TableApplyCB(FL_OBJECT *, long)
+extern "C"
+void TableApplyCB(FL_OBJECT *, long)
 {
 	if (!current_view->available())
 		return;
-   
+
+#ifndef NEW_TABULAR
 	// check for tables in tables
-	if (current_view->text->cursor.par->table){
+	if (current_view->text->cursor.par()->table){
 		WriteAlert(_("Impossible Operation!"),
 			   _("Cannot insert table in table."),
 			   _("Sorry."));
 		return;
 	}
- 
+#endif
 	current_view->owner()->getMiniBuffer()->Set(_("Inserting table..."));
 
 	int ysize = int(fl_get_slider_value(fd_form_table->slider_columns) + 0.5);
@@ -2660,29 +2628,31 @@ extern "C" void TableApplyCB(FL_OBJECT *, long)
    
 	current_view->hideCursor();
 	current_view->beforeChange();
-	current_view->update(-2);
+	current_view->update(BufferView::SELECT|BufferView::FITCUR);
    
-	current_view->text->SetCursorParUndo(); 
+	current_view->text->SetCursorParUndo(current_view->buffer()); 
 	current_view->text->FreezeUndo();
 
-	current_view->text->BreakParagraph();
-	current_view->update(-1);
+	current_view->text->BreakParagraph(current_view);
+	current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
    
-	if (current_view->text->cursor.par->Last()) {
-		current_view->text->CursorLeft();
+	if (current_view->text->cursor.par()->Last()) {
+		current_view->text->CursorLeft(current_view);
       
-		current_view->text->BreakParagraph();
-		current_view->update(-1);
+		current_view->text->BreakParagraph(current_view);
+		current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 	}
 
 	current_view->text->current_font.setLatex(LyXFont::OFF);
 	//if (!fl_get_button(fd_form_table->check_latex)){
 	// insert the new wysiwy table
-	current_view->text->SetLayout(0); // standard layout
-	if (current_view->text->cursor.par->footnoteflag == 
+	current_view->text->SetLayout(current_view, 0); // standard layout
+#ifndef NEW_INSETS
+	if (current_view->text->cursor.par()->footnoteflag == 
 	    LyXParagraph::NO_FOOTNOTE) {
+#endif
 		current_view->text
-			->SetParagraph(0, 0,
+			->SetParagraph(current_view, 0, 0,
 				       0, 0,
 				       VSpace (0.3 * current_view->buffer()->
 					       params.spacing.getValue(),
@@ -2693,9 +2663,10 @@ extern "C" void TableApplyCB(FL_OBJECT *, long)
 				       LYX_ALIGN_CENTER,
 				       string(),
 				       0);
+#ifndef NEW_INSETS
 	} else {
 		current_view->text
-			->SetParagraph(0, 0,
+			->SetParagraph(current_view, 0, 0,
 				       0, 0,
 				       VSpace(VSpace::NONE),
 				       VSpace(VSpace::NONE),
@@ -2703,221 +2674,43 @@ extern "C" void TableApplyCB(FL_OBJECT *, long)
 				       string(),
 				       0);
 	}
-	
-	current_view->text->cursor.par->table =
+#endif
+#ifndef NEW_TABULAR
+	current_view->text->cursor.par()->table =
 		new LyXTable(xsize, ysize);
-
+#endif
 	Language const * lang = 
-		current_view->text->cursor.par->getParLanguage();
+		current_view->text->cursor.par()->getParLanguage(current_view->buffer()->params);
 	LyXFont font(LyXFont::ALL_INHERIT, lang);
 	for (int i = 0; i < xsize * ysize - 1; ++i) {
-		current_view->text->cursor.par->InsertChar(0, LyXParagraph::META_NEWLINE);
-		current_view->text->cursor.par->SetFont(0, font);
+		current_view->text->cursor.par()
+			->InsertChar(0, LyXParagraph::META_NEWLINE, font);
 	}
-	current_view->text->RedoParagraph();
+	current_view->text->RedoParagraph(current_view);
    
 	current_view->text->UnFreezeUndo();
      
-	current_view->update(1);
+	current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 	current_view->owner()->getMiniBuffer()->Set(_("Table inserted"));
 	current_view->setState();
 }
 
 
-extern "C" void TableCancelCB(FL_OBJECT *, long)
+extern "C"
+void TableCancelCB(FL_OBJECT *, long)
 {
 	fl_hide_form(fd_form_table->form_table);
 }
 
 
-extern "C" void TableOKCB(FL_OBJECT * ob, long data)
+extern "C"
+void TableOKCB(FL_OBJECT * ob, long data)
 {
 	TableApplyCB(ob, data);
 	TableCancelCB(ob, data);
 }
 
 
-/* callbacks for form form_print */
-
-extern "C" void PrintCancelCB(FL_OBJECT *, long)
-{
-	fl_hide_form(fd_form_print->form_print);
-}
-
-
-static
-bool stringOnlyContains (string const & LStr, char const * cset)
-{
-	return LStr.find_first_not_of(cset) == string::npos;
-}
-
-
-extern "C" void PrintApplyCB(FL_OBJECT *, long)
-{
-	if (!current_view->available())
-		return;
-        Buffer * buffer = current_view->buffer();
-        string path = OnlyPath(buffer->fileName());
-
-	string pageflag;
-	if (fl_get_button(fd_form_print->radio_even_pages))
-		pageflag = lyxrc.print_evenpage_flag + ' ';
-	else if (fl_get_button(fd_form_print->radio_odd_pages))
-		pageflag = lyxrc.print_oddpage_flag + ' ';
-
-// Changes by Stephan Witt (stephan.witt@beusen.de), 19-Jan-99
-// User may give a page (range) list
-// User may print multiple (unsorted) copies
-	string pages = subst(fl_get_input(fd_form_print->input_pages), ';',',');
-	pages = subst(pages, '+',',');
-	pages = frontStrip(strip(pages)) ;
-	while (!pages.empty()) { // a page range was given
-		string piece ;
-		pages = split (pages, piece, ',') ;
-		piece = strip(piece) ;
-		piece = frontStrip(piece) ;
-		if ( !stringOnlyContains (piece, "0123456789-") ) {
-			WriteAlert(_("ERROR!  Unable to print!"),
-				   _("Check 'range of pages'!"));
-			return;
-		}
-		if (piece.find('-') == string::npos) { // not found
-			pageflag += lyxrc.print_pagerange_flag + piece + '-' + piece + ' ' ;
-		} else if (suffixIs(piece, "-") ) { // missing last page
-			pageflag += lyxrc.print_pagerange_flag + piece + "1000 ";
-		} else if (prefixIs(piece, "-") ) { // missing first page
-			pageflag += lyxrc.print_pagerange_flag + '1' + piece + ' ' ;
-		} else {
-			pageflag += lyxrc.print_pagerange_flag + piece + ' ' ;
-		}
-	}
-   
-	string copies = frontStrip(strip(fl_get_input(fd_form_print->input_copies)));
-	if (!copies.empty()) { // a number of copies was given
-		if ( !stringOnlyContains (copies, "0123456789") ) {
-			WriteAlert(_("ERROR!  Unable to print!"),
-				   _("Check 'number of copies'!"));
-			return;
-		}
-		if (fl_get_button(fd_form_print->do_unsorted))
-			pageflag += lyxrc.print_copies_flag;
-		else
-			pageflag += lyxrc.print_collcopies_flag;
-		pageflag += " " + copies + ' ' ;
-	}
-
-	string reverseflag;
-	if (fl_get_button(fd_form_print->radio_order_reverse))
-		reverseflag = lyxrc.print_reverse_flag + ' ';
-   
-	string orientationflag;
-	if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE)
-		orientationflag = lyxrc.print_landscape_flag + ' ';
-   
-	string ps_file = fl_get_input(fd_form_print->input_file);
-	string printer = strip(fl_get_input(fd_form_print->input_printer));
-
-	string printerflag;
-	if (lyxrc.print_adapt_output // printer name should be passed to dvips
-	    && ! printer.empty()) // a printer name has been given
-		printerflag = lyxrc.print_to_printer + printer + ' ';
-     
-	string extraflags;
-	if (!lyxrc.print_extra_options.empty())
-		extraflags = lyxrc.print_extra_options + ' ';
-
-	string command = lyxrc.print_command + ' ' 
-		+ printerflag + pageflag + reverseflag 
-		+ orientationflag + extraflags;
- 
-	char real_papersize = buffer->params.papersize;
-	if (real_papersize == BufferParams::PAPER_DEFAULT)
-		real_papersize = lyxrc.default_papersize;
-	
-        string paper;
-	switch (real_papersize) {
-	case BufferParams::PAPER_USLETTER:
-		paper = "letter";
-		break;
-	case BufferParams::PAPER_A3PAPER:
-		paper = "a3";
-		break;
-	case BufferParams::PAPER_A4PAPER:
-		paper = "a4";
-		break;
-	case BufferParams::PAPER_A5PAPER:
-		paper = "a5";
-		break;
-	case BufferParams::PAPER_B5PAPER:
-		paper = "b5";
-		break;
-	case BufferParams::PAPER_EXECUTIVEPAPER:
-		paper = "foolscap";
-		break;
-	case BufferParams::PAPER_LEGALPAPER:
-		paper = "legal";
-		break;
-	default: /* If nothing else fits, keep an empty value... */
-		break;
-	}
-
-	if (buffer->params.use_geometry
-	    && buffer->params.papersize2 == BufferParams::VM_PAPER_CUSTOM
-	    && !lyxrc.print_paper_dimension_flag.empty()
-	    && !buffer->params.paperwidth.empty()
-	    && !buffer->params.paperheight.empty()) {
-		// using a custom papersize
-		command += ' ';
-		command += lyxrc.print_paper_dimension_flag + ' ';
-		command += buffer->params.paperwidth + ',';
-		command += buffer->params.paperheight + ' ';
-	} else if (!lyxrc.print_paper_flag.empty()
-		   && !paper.empty()
-		   && (real_papersize != BufferParams::PAPER_USLETTER ||
-		       buffer->params.orientation == BufferParams::ORIENTATION_PORTRAIT)) {
-		command += " " + lyxrc.print_paper_flag + " " + paper + " ";
-	}
-	if (fl_get_button(fd_form_print->radio_file))
-		command += lyxrc.print_to_file 
-			+ QuoteName(MakeAbsPath(ps_file, path));
-	else if (!lyxrc.print_spool_command.empty())
-		command += lyxrc.print_to_file 
-			+ QuoteName(ps_file);
-	
-	// push directorypath, if necessary 
-        if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)){
-		path = buffer->tmppath;
-        }
-        Path p(path);
-
-	bool result;
-	if (!lyxrc.print_spool_command.empty() && 
-	    !fl_get_button(fd_form_print->radio_file)) {
-	    	string command2 = lyxrc.print_spool_command + ' ';
-		if (!printer.empty())
-			command2 += lyxrc.print_spool_printerprefix 
-				+ printer;
-		// First run dvips and, if succesful, then spool command
-		if ((result = RunScript(buffer, true, command))) {
-			result = RunScript(buffer, false, command2, ps_file);
-		}
-        } else
-		result = RunScript(buffer, false, command);
-
-	if (!result)
-		WriteAlert(_("Error:"),
-			   _("Unable to print"),
-			   _("Check that your parameters are correct"));
-}
-
-
-extern "C" void PrintOKCB(FL_OBJECT * ob, long data)
-{
-	PrintCancelCB(ob, data);  
-	PrintApplyCB(ob, data);
-}
-
-
 void Figure()
 {
 	if (fd_form_figure->form_figure->visible) {
@@ -2943,7 +2736,8 @@ void Table()
 
 
 /* callbacks for form form_figure */
-extern "C" void FigureApplyCB(FL_OBJECT *, long)
+extern "C"
+void FigureApplyCB(FL_OBJECT *, long)
 {
 	if (!current_view->available())
 		return;
@@ -2954,7 +2748,10 @@ extern "C" void FigureApplyCB(FL_OBJECT *, long)
 	
 	current_view->owner()->getMiniBuffer()->Set(_("Inserting figure..."));
 	if (fl_get_button(fd_form_figure->radio_inline)
-	    || current_view->text->cursor.par->table) {
+#ifndef NEW_TABULAR
+	    || current_view->text->cursor.par()->table
+#endif
+		) {
 		InsetFig * new_inset = new InsetFig(100, 20, buffer);
 		current_view->insertInset(new_inset);
 		current_view->owner()->getMiniBuffer()->Set(_("Figure inserted"));
@@ -2963,29 +2760,31 @@ extern "C" void FigureApplyCB(FL_OBJECT *, long)
 	}
 	
 	current_view->hideCursor();
-	current_view->update(-2);
+	current_view->update(BufferView::SELECT|BufferView::FITCUR);
 	current_view->beforeChange();
       
-	current_view->text->SetCursorParUndo(); 
+	current_view->text->SetCursorParUndo(current_view->buffer()); 
 	current_view->text->FreezeUndo();
 
-	current_view->text->BreakParagraph();
-	current_view->update(-1);
+	current_view->text->BreakParagraph(current_view);
+	current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
       
-	if (current_view->text->cursor.par->Last()) {
-		current_view->text->CursorLeft();
+	if (current_view->text->cursor.par()->Last()) {
+		current_view->text->CursorLeft(current_view);
 	 
-		current_view->text->BreakParagraph();
-		current_view->update(-1);
+		current_view->text->BreakParagraph(current_view);
+		current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 	}
 
 	// The standard layout should always be numer 0;
-	current_view->text->SetLayout(0);
-	
-	if (current_view->text->cursor.par->footnoteflag == 
+	current_view->text->SetLayout(current_view, 0);
+
+#ifndef NEW_INSETS
+	if (current_view->text->cursor.par()->footnoteflag == 
 	    LyXParagraph::NO_FOOTNOTE) {
+#endif
 		current_view->text->
-			SetParagraph(0, 0,
+			SetParagraph(current_view, 0, 0,
 				     0, 0,
 				     VSpace (0.3 * buffer->params.spacing.getValue(),
 					     LyXLength::CM),
@@ -2993,8 +2792,9 @@ extern "C" void FigureApplyCB(FL_OBJECT *, long)
 					     buffer->params.spacing.getValue(),
 					     LyXLength::CM),
 				     LYX_ALIGN_CENTER, string(), 0);
+#ifndef NEW_INSETS
 	} else {
-		current_view->text->SetParagraph(0, 0,
+		current_view->text->SetParagraph(current_view, 0, 0,
 						 0, 0,
 						 VSpace(VSpace::NONE),
 						 VSpace(VSpace::NONE),
@@ -3002,13 +2802,14 @@ extern "C" void FigureApplyCB(FL_OBJECT *, long)
 						 string(),
 						 0);
 	}
+#endif
 	
-	current_view->update(-1);
+	current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
       
 	Inset * new_inset = new InsetFig(100, 100, buffer);
 	current_view->insertInset(new_inset);
 	new_inset->Edit(current_view, 0, 0, 0);
-	current_view->update(0);
+	current_view->update(BufferView::SELECT|BufferView::FITCUR);
 	current_view->owner()->getMiniBuffer()->Set(_("Figure inserted"));
 	current_view->text->UnFreezeUndo();
 	current_view->setState();
@@ -3028,60 +2829,6 @@ extern "C" void FigureOKCB(FL_OBJECT * ob, long data)
 }
 
 
-extern "C" void ScreenApplyCB(FL_OBJECT *, long)
-{
-	lyxrc.roman_font_name = fl_get_input(fd_form_screen->input_roman);
-	lyxrc.sans_font_name = fl_get_input(fd_form_screen->input_sans);
-	lyxrc.typewriter_font_name = fl_get_input(fd_form_screen->input_typewriter);
-	lyxrc.font_norm = fl_get_input(fd_form_screen->input_font_norm);
-	lyxrc.zoom = atoi(fl_get_input(fd_form_screen->intinput_size));
-	fontloader.update();
-
-	// Of course we should only to the resize and the textcahce.clear
-	// if values really changed...but not very important right now. (Lgb)
-	
-	// All buffers will need resize
-	bufferlist.resize();
-	// We also need to empty the textcache so that
-	// the buffer will be formatted correctly after
-	// a zoom change.
-	textcache.clear();
-	
-	current_view->owner()->getMiniBuffer()->Set(_("Screen options set"));
-}
-
-
-extern "C" void ScreenCancelCB(FL_OBJECT *, long)
-{
-	fl_hide_form(fd_form_screen->form_screen);
-}
-
-
-extern "C" void ScreenOKCB(FL_OBJECT * ob, long data)
-{
-	ScreenCancelCB(ob, data);
-	ScreenApplyCB(ob, data);
-}
-
-
-void LaTeXOptions(BufferView * bv)
-{
-	if (!bv->available())
-		return;
-
-	fl_set_button(fd_latex_options->accents,
-		      int(bv->buffer()->params.allowAccents));
-	
-	if (fd_latex_options->LaTeXOptions->visible) {
-		fl_raise_form(fd_latex_options->LaTeXOptions);
-	} else {
-		fl_show_form(fd_latex_options->LaTeXOptions,
-			     FL_PLACE_MOUSE, FL_FULLBORDER,
-			     _("LaTeX Options"));
-	}
-}
-
-
 // This function runs "configure" and then rereads lyx.defaults to
 // reconfigure the automatic settings.
 void Reconfigure(BufferView * bv)
@@ -3099,202 +2846,3 @@ void Reconfigure(BufferView * bv)
 		   _("You need to restart LyX to make use of any"),
 		   _("updated document class specifications."));
 }
-
-
-//
-// Table of Contents
-//
-
-static vector<Buffer::TocItem> toclist;
-
-
-extern "C" void TocSelectCB(FL_OBJECT * ob, long)
-{
-	if (!current_view->available())
-		return;
-   
-	TocUpdateCB(0, 0);
-	unsigned int choice = fl_get_browser(ob);
-	if (0 < choice && choice - 1 < toclist.size()) {
- 		current_view->beforeChange();
-		current_view->text->SetCursor(toclist[choice-1].par, 0);
-		current_view->text->sel_cursor = 
-			current_view->text->cursor;
-		current_view->update(0);
-	} else {
-		WriteAlert(_("Error"), 
-			   _("Couldn't find this label"), 
-			   _("in current document."));
-	}
-}
-
-
-extern "C" void TocCancelCB(FL_OBJECT *, long)
-{
-	fl_hide_form(fd_form_toc->form_toc);
-}
-
-
-extern "C"
-void TocUpdateCB(FL_OBJECT *, long)
-{
-	if (!current_view->available()) {
-		toclist.clear();
-		fl_clear_browser(fd_form_toc->browser_toc);
-		fl_add_browser_line(fd_form_toc->browser_toc,
-				    _("*** No Document ***"));
-		return;
-	}
-
-	vector<vector<Buffer::TocItem> > tmp =
-		current_view->buffer()->getTocList();
-	int type = fl_get_choice(fd_form_toc->toctype)-1;
-	//if (toclist == tmp[type])
-	//	return;
-	if (toclist.size() == tmp[type].size()) {
-		// Check if all elements are the same.
-		int i = 0;
-		for (; i < toclist.size(); ++i) {
-			if (toclist[i] !=  tmp[type][i])
-				break;
-		}
-		if (i >= toclist.size()) return;
-	}
-
-	toclist = tmp[type];
-
-	static Buffer * buffer = 0;
-	int topline = 0;
-	int line = 0;
-	if (buffer == current_view->buffer()) {
-		topline = fl_get_browser_topline(fd_form_toc->browser_toc);
-		line = fl_get_browser(fd_form_toc->browser_toc);
-	} else
-		buffer = current_view->buffer();
-
-	fl_clear_browser(fd_form_toc->browser_toc);
-	fl_hide_object(fd_form_toc->browser_toc);
-
-	for (vector<Buffer::TocItem>::const_iterator it = toclist.begin();
-	     it != toclist.end(); ++it)
-		fl_add_browser_line(fd_form_toc->browser_toc,
-				    (string(4*(*it).depth,' ')+
-				     (*it).str).c_str());
-
-	fl_set_browser_topline(fd_form_toc->browser_toc, topline);
-	fl_select_browser_line(fd_form_toc->browser_toc, line);
-	fl_show_object(fd_form_toc->browser_toc);
-}
-
-
-/* callbacks for form form_ref */
-extern "C" void RefSelectCB(FL_OBJECT *, long data)
-{
-	if (!current_view->available())
-		return;
-
-	string s = 
-		fl_get_browser_line(fd_form_ref->browser_ref,
-				    fl_get_browser(fd_form_ref->browser_ref));
-	string u = frontStrip(strip(fl_get_input(fd_form_ref->ref_name)));
-
-	if (s.empty())
-		return;
-
-        if (data >= 5) {
-                current_view->owner()->getLyXFunc()->Dispatch(LFUN_REFGOTO, s.c_str());
-	        return;
-	}
-
-	static string const commands[5]
-		= { "\\ref", "\\pageref", "\\vref", "\\vpageref",
-		    "\\prettyref"};
-	string t = commands[data];
-
-	if (current_view->buffer()->isSGML())
-		t += "[" + u + "]" + "{" + s + "}";
-	else
-		t += "{" + s + "}";
-
-	Inset * new_inset = 
-		new InsetRef(t, current_view->buffer());
-	current_view->insertInset(new_inset);
-}
-
-
-extern "C" void RefUpdateCB(FL_OBJECT *, long)
-{
-	if (!current_view->available()) {
-		fl_clear_browser(fd_form_ref->browser_ref);
-		return;
-	}
-
-	FL_OBJECT * brow = fd_form_ref->browser_ref;
-
-	// Get the current line, in order to restore it later
-	char const * const btmp = fl_get_browser_line(brow,
-						      fl_get_browser(brow));
-	string currentstr = btmp ? btmp : "";
-
-	fl_clear_browser(brow);
-	fl_hide_object(brow);
-
-	vector<string> refs = current_view->buffer()->getLabelList();
-	if (fl_get_button(fd_form_ref->sort))
-		sort(refs.begin(),refs.end());
-	for (vector<string>::const_iterator it = refs.begin();
-	     it != refs.end(); ++it)
-		fl_add_browser_line(brow, (*it).c_str());
-
-	int topline = 1;
-	int total_lines = fl_get_browser_maxline(brow);
-	for (int i = 1; i <= total_lines ; ++i) {
-		if (fl_get_browser_line(brow, i) == currentstr) {
-			topline = i;
-			break;
-		}
-	}
-	fl_set_browser_topline(brow, topline);
-
-	if (!fl_get_browser_maxline(brow)) {
-		fl_add_browser_line(brow, 
-				    _("*** No labels found in document ***"));
-		fl_deactivate_object(brow);
-	} else {
-		fl_select_browser_line(brow, topline);
-		fl_activate_object(brow);
-	}
-	if (current_view->buffer()->isReadonly()) {
-		// would be better to de/activate insert buttons
-		// but that's more work... besides this works. ARRae
-		fl_hide_form(fd_form_ref->form_ref);
-	}
-	if (!current_view->buffer()->isSGML()) {
-		fl_deactivate_object(fd_form_ref->ref_name);
-		fl_set_object_lcol(fd_form_ref->ref_name, FL_INACTIVE);
-
-		fl_activate_object(fd_form_ref->vref);
-		fl_set_object_lcol(fd_form_ref->vref, FL_BLACK);
-		fl_activate_object(fd_form_ref->vpageref);
-		fl_set_object_lcol(fd_form_ref->vpageref, FL_BLACK);
-		fl_activate_object(fd_form_ref->prettyref);
-		fl_set_object_lcol(fd_form_ref->prettyref, FL_BLACK);
-	} else {
-		fl_activate_object(fd_form_ref->ref_name);
-		fl_set_object_lcol(fd_form_ref->ref_name, FL_BLACK);
-
-		fl_deactivate_object(fd_form_ref->vref);
-		fl_set_object_lcol(fd_form_ref->vref, FL_INACTIVE);
-		fl_deactivate_object(fd_form_ref->vpageref);
-		fl_set_object_lcol(fd_form_ref->vpageref, FL_INACTIVE);
-		fl_deactivate_object(fd_form_ref->prettyref);
-		fl_set_object_lcol(fd_form_ref->prettyref, FL_INACTIVE);
-	}
-	fl_show_object(brow);
-}
-
-
-extern "C" void RefHideCB(FL_OBJECT *, long)
-{
-	fl_hide_form(fd_form_ref->form_ref);
-}