X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfunc.C;h=abda8b84dd46b20279170baecd893418c1716679;hb=4148a9244547e7184c1dcc8234e9e62d3143a42c;hp=0e6564e9a379de10683be993ebb2a18affb16395;hpb=4b2a999762c83627476428e595d3c1e3704a3da0;p=lyx.git

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 0e6564e9a3..abda8b84dd 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -10,12 +10,7 @@
 
 #include <config.h>
 
-#ifdef HAVE_SSTREAM
-#include <sstream>
-using std::istringstream;
-#else
-#include <strstream>
-#endif
+#include "Lsstream.h"
 
 #include <time.h>
 #include <locale.h>
@@ -43,9 +38,6 @@ using std::istringstream;
 #include "insets/inseturl.h"
 #include "insets/insetlatexaccent.h"
 #include "insets/insettoc.h"
-#include "insets/insetlof.h"
-#include "insets/insetloa.h"
-#include "insets/insetlot.h"
 #include "insets/insetref.h"
 #include "insets/insetparent.h"
 #include "insets/insetindex.h"
@@ -89,12 +81,11 @@ using std::istringstream;
 #include "bufferview_funcs.h"
 #include "frontends/Dialogs.h"
 #include "frontends/Toolbar.h"
-#ifdef NEW_MENUBAR
 #include "frontends/Menubar.h"
-#else
-#include "menus.h"
-#endif
 #include "FloatList.h"
+#include "exporter.h"
+#include "FontLoader.h"
+#include "TextCache.h"
 
 using std::pair;
 using std::endl;
@@ -102,46 +93,36 @@ using std::endl;
 extern bool cursor_follows_scrollbar;
 
 extern void InsertAsciiFile(BufferView *, string const &, bool);
-extern void math_insert_symbol(char const *);
+extern void math_insert_symbol(string const &);
 extern bool math_insert_greek(char);
 extern BufferList bufferlist;
 extern LyXServer * lyxserver;
 extern int greek_kb_flag;
-extern FD_form_toc * fd_form_toc;
 extern bool selection_possible;
 
 extern kb_keymap * toplevel_keymap;
 
-extern void MenuWrite(Buffer *);
-extern void MenuWriteAs(Buffer *);
+extern bool MenuWrite(Buffer *);
+extern bool MenuWriteAs(Buffer *);
 extern int  MenuRunLaTeX(Buffer *);
 extern int  MenuBuildProg(Buffer *);
 extern int  MenuRunChktex(Buffer *);
-extern bool CreatePostscript(Buffer *, bool);
 extern void MenuPrint(Buffer *);
 extern void MenuSendto();
 extern void QuitLyX();
 extern void MenuFax(Buffer *);
-extern void MenuExport(Buffer *, string const &);
+extern void show_symbols_form(LyXFunc *);
 
 extern LyXAction lyxaction;
 // (alkis)
 extern tex_accent_struct get_accent(kb_action action);
 
 extern void AutoSave(BufferView *);
-extern bool PreviewDVI(Buffer *);
-extern bool PreviewPostscript(Buffer *);
-extern void MenuInsertLabel(char const *);
-extern void MenuInsertRef();
+extern void MenuInsertLabel(string const &);
 extern void MenuLayoutCharacter();
 extern void MenuLayoutParagraph();
-extern void MenuLayoutDocument();
-extern void MenuLayoutPaper();
-extern void MenuLayoutTable(int flag);
-extern void MenuLayoutQuotes();
 extern void MenuLayoutPreamble();
 extern void MenuLayoutSave();
-extern void bulletForm();
 
 extern Buffer * NewLyxFile(string const &);
 extern void LoadLyXFile(string const &);
@@ -189,13 +170,133 @@ void LyXFunc::moveCursorUpdate(bool selecting)
 }
 
 
+int LyXFunc::processKeySym(KeySym keysym, unsigned int state) 
+{
+	string argument;
+	
+	if (lyxerr.debugging(Debug::KEY)) {
+		char * tmp = XKeysymToString(keysym);
+		string stm = (tmp ? tmp : "");
+		lyxerr << "KeySym is "
+		       << stm
+		       << "["
+		       << keysym << "]"
+		       << endl;
+	}
+	// Do nothing if we have nothing (JMarc)
+	if (keysym == NoSymbol) {
+		lyxerr[Debug::KEY] << "Empty kbd action (probably composing)"
+				   << endl;
+		//return 0;
+		return FL_PREEMPT;
+	}
+	
+	// this function should be used always [asierra060396]
+	UpdatableInset * tli = owner->view()->the_locking_inset;
+	if (owner->view()->available() && tli && (keysym == XK_Escape)) {
+		if (tli == tli->GetLockingInset()) {
+			owner->view()->unlockInset(tli);
+			owner->view()->text->CursorRight(owner->view());
+			moveCursorUpdate(false);
+			owner->showState();
+		} else {
+			tli->UnlockInsetInInset(owner->view(),
+						tli->GetLockingInset(),true);
+		}
+		//return 0;
+		return FL_PREEMPT;
+	}
+
+	// Can we be sure that this will work for all X-Windows
+	// implementations? (Lgb)
+	// This code snippet makes lyx ignore some keys. Perhaps
+	// all of them should be explictly mentioned?
+	if((keysym >= XK_Shift_L && keysym <= XK_Hyper_R)
+	   || keysym == XK_Mode_switch || keysym == 0x0)
+		return 0;
+
+	// Do a one-deep top-level lookup for
+	// cancel and meta-fake keys. RVDK_PATCH_5
+	cancel_meta_seq.reset();
+
+	int action = cancel_meta_seq.addkey(keysym, state
+					    &(ShiftMask|ControlMask
+					      |Mod1Mask)); 
+
+	// When not cancel or meta-fake, do the normal lookup. 
+	// Note how the meta_fake Mod1 bit is OR-ed in and reset afterwards.
+	// Mostly, meta_fake_bit = 0. RVDK_PATCH_5.
+	if ( (action != LFUN_CANCEL) && (action != LFUN_META_FAKE) ) {
+
+		// remove Caps Lock and Mod2 as a modifiers
+		action = keyseq.addkey(keysym,
+				       (state | meta_fake_bit)
+				       &(ShiftMask|ControlMask
+					 |Mod1Mask));      
+	}
+	// Dont remove this unless you know what you are doing.
+	meta_fake_bit = 0;
+		
+	if (action == 0) action = LFUN_PREFIX;
+
+	if (lyxerr.debugging(Debug::KEY)) {
+		string buf;
+		keyseq.print(buf);
+		lyxerr << "Key ["
+		       << action << "]["
+		       << buf << "]"
+		       << endl;
+	}
+
+	// already here we know if it any point in going further
+	// why not return already here if action == -1 and
+	// num_bytes == 0? (Lgb)
+
+	if(keyseq.length > 1 || keyseq.length < -1) {
+		string buf;
+		keyseq.print(buf);
+		owner->getMiniBuffer()->Set(buf);
+	}
+
+	if (action == -1) {
+		if (keyseq.length < -1) { // unknown key sequence...
+			string buf;
+			LyXBell();
+			keyseq.print(buf);
+			owner->getMiniBuffer()->Set(_("Unknown sequence:"), buf);
+			return 0;
+		}
+	
+		char isochar = keyseq.getiso();
+		if (!(state & ControlMask) &&
+		    !(state & Mod1Mask) &&
+		    (isochar && keysym < 0xF000)) {
+			argument += isochar;
+		}
+		if (argument.empty()) {
+			lyxerr.debug() << "Empty argument!" << endl;
+			// This can`t possibly be of any use
+			// so we`ll skip the dispatch.
+			return 0;
+		}
+	}
+
+        bool tmp_sc = show_sc;
+	show_sc = false;
+	Dispatch(action, argument);
+	show_sc = tmp_sc;
+	
+	return 0;
+} 
+
+
+#if 0
 int LyXFunc::processKeyEvent(XEvent * ev)
 {
 	char s_r[10];
+	KeySym keysym_return = 0;
 	string argument;
 	XKeyEvent * keyevent = &ev->xkey;
-	KeySym keysym_return = 0;
-
 	int num_bytes = LyXLookupString(ev, s_r, 10, &keysym_return);
 	s_r[num_bytes] = '\0';
 
@@ -209,7 +310,8 @@ int LyXFunc::processKeyEvent(XEvent * ev)
 		       << " and num_bytes is "
 		       << num_bytes
 		       << " the string returned is \""
-		       << s_r << '\"' << endl;
+		       << s_r << '\"'
+		       << endl;
 	}
 	// Do nothing if we have nothing (JMarc)
 	if (num_bytes == 0 && keysym_return == NoSymbol) {
@@ -270,8 +372,10 @@ int LyXFunc::processKeyEvent(XEvent * ev)
 		keyseq.print(buf);
 		lyxerr << "Key ["
 		       << action << "]["
-		       << buf << "]["
-		       << num_bytes << "]" << endl;
+		       << buf << "]"
+		       << "["
+		       << num_bytes << "]"
+		       << endl;
 	}
 
 	// already here we know if it any point in going further
@@ -305,18 +409,20 @@ int LyXFunc::processKeyEvent(XEvent * ev)
 			// so we`ll skip the dispatch.
 			return 0;
 		}
-	} else
+	}
+	else
 		if (action == LFUN_SELFINSERT) {
 			argument = s_r[0];
 		}
-    
+
         bool tmp_sc = show_sc;
 	show_sc = false;
-	Dispatch(action, argument.c_str());
+	Dispatch(action, argument);
 	show_sc = tmp_sc;
 	
 	return 0;
 } 
+#endif
 
 
 LyXFunc::func_status LyXFunc::getStatus(int ac) const
@@ -348,13 +454,13 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
 				// no
 				setErrorMessage(N_("Document is read-only"));
 				flag |= LyXFunc::Disabled;
-				return flag;
 			}
 		} else {
 			// no
 			setErrorMessage(N_("Command not allowed with"
 					   "out any document open"));
 			flag |= LyXFunc::Disabled;
+			return flag;
 		}
 	}
 
@@ -363,16 +469,6 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
         static bool noLaTeX = lyxrc.latex_command == "none";
         bool disable = false;
         switch (action) {
-	case LFUN_PREVIEW:
-		disable = noLaTeX || lyxrc.view_dvi_command == "none";
-		break;
-	case LFUN_PREVIEWPS:
-		disable = noLaTeX || lyxrc.view_ps_command == "none";
-		break;
-	case LFUN_RUNLATEX:
-	case LFUN_RUNDVIPS:
-		disable = noLaTeX;
-		break;
 	case LFUN_MENUPRINT:
 		disable = noLaTeX || lyxrc.print_command == "none";
 		break;
@@ -380,21 +476,11 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
 		disable = noLaTeX || lyxrc.fax_command == "none";
 		break;
 	case LFUN_IMPORT:
-		if (argument == "latex")
+		if (argument == "latex" || argument == "noweb")
 			disable = lyxrc.relyx_command == "none";
-		if (argument == "linuxdoc")
+		else if (argument == "linuxdoc")
 			disable = lyxrc.linuxdoc_to_lyx_command == "none";
 		break;
-	case LFUN_EXPORT:
-		if (argument == "dvi" || argument == "postscript")
-			disable = noLaTeX;
-		if (argument == "html")
-			disable = lyxrc.html_command == "none";
-		if (argument == "html-linuxdoc")
-			disable = lyxrc.linuxdoc_to_html_command == "none";
-		if (argument == "html-docbook")
-			disable = lyxrc.docbook_to_html_command == "none";
-		break;
 	case LFUN_UNDO:
 		disable = buf->undostack.empty();
 		break;
@@ -407,11 +493,47 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
 	case LFUN_RUNCHKTEX:
 		disable = lyxrc.chktex_command == "none";
 		break;
-#ifndef NEW_TABULAR
-	case LFUN_LAYOUT_TABLE:
-		disable = ! owner->view()->text->cursor.par()->table;
+	case LFUN_BUILDPROG:
+		disable = (lyxrc.literate_command == "none" 
+			   || ! buf->isLiterate());
 		break;
-#endif
+
+	case LFUN_LAYOUT_TABULAR:
+		disable = true;
+		if (owner->view()->the_locking_inset) {
+			disable = (owner->view()->the_locking_inset->LyxCode() != Inset::TABULAR_CODE) &&
+				!owner->view()->the_locking_inset->GetFirstLockingInsetOfType(Inset::TABULAR_CODE);
+		}
+		break;
+
+	case LFUN_TABULAR_FEATURE:
+		disable = true;
+		if (owner->view()->the_locking_inset) {
+			func_status ret = LyXFunc::Disabled;
+			if (owner->view()->the_locking_inset->LyxCode() == Inset::TABULAR_CODE) {
+				ret = static_cast<InsetTabular *>
+					(owner->view()->the_locking_inset)->
+					getStatus(argument);
+			} else if (owner->view()->the_locking_inset->GetFirstLockingInsetOfType(Inset::TABULAR_CODE)) {
+				ret = static_cast<InsetTabular *>
+					(owner->view()->the_locking_inset->
+					GetFirstLockingInsetOfType(Inset::TABULAR_CODE))->
+					getStatus(argument);
+			}
+			flag |= ret;
+			disable = false;
+		} else {
+		    static InsetTabular inset(owner->buffer(), 1, 1);
+		    func_status ret;
+
+		    disable = true;
+		    ret = inset.getStatus(argument);
+		    if ((ret & LyXFunc::ToggleOn) ||
+			(ret & LyXFunc::ToggleOff))
+			flag |= LyXFunc::ToggleOff;
+		}
+		break;
+
 	case LFUN_VC_REGISTER:
 		disable = buf->lyxvc.inUse();
 		break;
@@ -426,6 +548,9 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
 	case LFUN_VC_HISTORY:
 		disable = !buf->lyxvc.inUse();
 		break;
+	case LFUN_REF_BACK:
+		disable = owner->view()->NoSavedPositions();
+		break;
 	default:
 		break;
         }
@@ -434,7 +559,13 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
 
 	if (buf) {
 		func_status box = LyXFunc::ToggleOff;
-		LyXFont font = owner->view()->text->real_current_font;
+		LyXFont font;
+		if (owner->view()->the_locking_inset &&
+		    owner->view()->the_locking_inset->getLyXText(owner->view()))
+		    font = owner->view()->the_locking_inset->
+			getLyXText(owner->view())->real_current_font;
+		else
+		    font = owner->view()->text->real_current_font;
 		switch (action) {
 		case LFUN_EMPH:
 			if (font.emph() == LyXFont::ON)
@@ -463,18 +594,19 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
 }
 
 
-string LyXFunc::Dispatch(string const & s) 
+string const LyXFunc::Dispatch(string const & s) 
 {
 	// Split command string into command and argument
-	string cmd, line = frontStrip(s);
+	string cmd;
+	string line = frontStrip(s);
 	string arg = strip(frontStrip(split(line, cmd, ' ')));
 
-	return Dispatch(lyxaction.LookupFunc(cmd.c_str()), arg.c_str());
+	return Dispatch(lyxaction.LookupFunc(cmd), arg);
 }
 
 
-string LyXFunc::Dispatch(int ac,
-			 char const * do_not_use_this_arg)
+string const LyXFunc::Dispatch(int ac,
+			 string const & do_not_use_this_arg)
 {
 	string argument;
 	kb_action action;
@@ -492,7 +624,7 @@ string LyXFunc::Dispatch(int ac,
 			argument = tmparg;
 	} else {
 		action = static_cast<kb_action>(ac);
-		if (do_not_use_this_arg)
+		if (!do_not_use_this_arg.empty())
 			argument = do_not_use_this_arg; // except here
 	}
     
@@ -502,7 +634,7 @@ string LyXFunc::Dispatch(int ac,
 		owner->view()->hideCursor();
 
 	// We cannot use this function here
-	if (getStatus(action) & Disabled)
+	if (getStatus(ac) & Disabled)
 		goto exit_with_message;
 
 	commandshortcut.erase();
@@ -521,7 +653,7 @@ string LyXFunc::Dispatch(int ac,
 				// this is better
 				pseudoaction = 
 					lyxaction.searchActionArg(action,
-							  	  argument.c_str());
+							  	  argument);
 
 				if (pseudoaction == -1) {
 					pseudoaction = action;
@@ -658,8 +790,8 @@ string LyXFunc::Dispatch(int ac,
 
 		if (!searched_string.empty() &&
 		    ((action == LFUN_WORDFINDBACKWARD) ? 
-		     ltCur->SearchBackward(owner->view(), searched_string.c_str()) :
-		     ltCur->SearchForward(owner->view(), searched_string.c_str()))) {
+		     ltCur->SearchBackward(owner->view(), searched_string) :
+		     ltCur->SearchForward(owner->view(), searched_string))) {
 
 			// ??? What is that ???
 			owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
@@ -708,7 +840,7 @@ string LyXFunc::Dispatch(int ac,
 		meta_fake_bit = 0;
 		if(owner->view()->available())
 			// cancel any selection
-			Dispatch(LFUN_MARK_OFF, 0);
+			Dispatch(LFUN_MARK_OFF);
 		setMessage(N_("Cancel"));
 		break;
 
@@ -760,16 +892,20 @@ string LyXFunc::Dispatch(int ac,
 		break;
 		
 	case LFUN_MENUWRITE:
-		owner->getMiniBuffer()->Set(_("Saving document"),
-					    MakeDisplayPath(owner->buffer()->fileName()),
-					    "...");
-		MenuWrite(owner->buffer());
-		//owner->getMiniBuffer()-> {
-		//	Set(_("Document saved as"),
-		//	    MakeDisplayPath(owner->buffer()->fileName()));
-		//} else {
-		//owner->getMiniBuffer()->Set(_("Save failed!"));
-		//}
+		if (!owner->buffer()->isUnnamed()) {
+			owner->getMiniBuffer()->Set(_("Saving document"),
+						    MakeDisplayPath(owner->buffer()->fileName()),
+						    "...");
+			MenuWrite(owner->buffer());
+			//owner->getMiniBuffer()-> {
+			//	Set(_("Document saved as"),
+			//	    MakeDisplayPath(owner->buffer()->fileName()));
+			//} else {
+			//owner->getMiniBuffer()->Set(_("Save failed!"));
+			//}
+		} else {
+			MenuWriteAs(owner->buffer());
+		}
 		break;
 		
 	case LFUN_MENUWRITEAS:
@@ -780,16 +916,12 @@ string LyXFunc::Dispatch(int ac,
 		reloadBuffer();
 		break;
 		
-	case LFUN_PREVIEW:
-		PreviewDVI(owner->buffer());
+	case LFUN_UPDATE:
+		Exporter::Export(owner->buffer(), argument, true);
 		break;
-			
-	case LFUN_PREVIEWPS:
-		PreviewPostscript(owner->buffer());
-		break;
-		
-	case LFUN_RUNLATEX:
-		MenuRunLaTeX(owner->buffer());
+
+	case LFUN_PREVIEW:
+		Exporter::Preview(owner->buffer(), argument);
 		break;
 		
         case LFUN_BUILDPROG:
@@ -799,11 +931,7 @@ string LyXFunc::Dispatch(int ac,
  	case LFUN_RUNCHKTEX:
 		MenuRunChktex(owner->buffer());
 		break;
-		
-	case LFUN_RUNDVIPS:
-		CreatePostscript(owner->buffer(), false);
-		break;
-		
+				
 	case LFUN_MENUPRINT:
 		owner->getDialogs()->showPrint();
 		break;
@@ -813,7 +941,7 @@ string LyXFunc::Dispatch(int ac,
 		break;
 			
 	case LFUN_EXPORT:
-		MenuExport(owner->buffer(), argument);
+		Exporter::Export(owner->buffer(), argument, false);
 		break;
 
 	case LFUN_IMPORT:
@@ -829,80 +957,68 @@ string LyXFunc::Dispatch(int ac,
 	case LFUN_LOTVIEW:
 	case LFUN_LOAVIEW:
 	{
-		Buffer::TocType type = Buffer::TOC_TOC;
-		if (action == LFUN_LOFVIEW)
-			type = Buffer::TOC_LOF;
-		else if (action == LFUN_LOTVIEW)
-			type = Buffer::TOC_LOT;
-		else if (action == LFUN_LOAVIEW)
-			type = Buffer::TOC_LOA;
-		fl_set_choice(fd_form_toc->toctype,type + 1);
-		TocUpdateCB(0, 0);
-		if (fd_form_toc->form_toc->visible) {
-			fl_raise_form(fd_form_toc->form_toc);
-		} else {
-			static int ow = -1, oh;
-			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);
-		}
+		InsetCommandParams p;
+		
+		if( action == LFUN_TOCVIEW )
+			p.setCmdName( "tableofcontents" );
+		else if( action == LFUN_LOAVIEW )
+			p.setCmdName( "listofalgorithms" );
+		else if( action == LFUN_LOFVIEW )
+			p.setCmdName( "listoffigures" );
+		else
+			p.setCmdName( "listoftables" );
+
+		owner->getDialogs()->createTOC( p.getAsString() );
 		break;
 	}	
+
 	case LFUN_TOC_INSERT:
-	{
-		Inset * new_inset = new InsetTOC(owner->buffer());
-		if (!owner->view()->insertInset(new_inset, "Standard", true))
-			delete new_inset;
-		break;
-	}
-	
-	case LFUN_LOF_INSERT:
-	{
-		Inset * new_inset = new InsetLOF(owner->buffer());
-		if (!owner->view()->insertInset(new_inset, "Standard", true))
-			delete new_inset;
-		break;
-	}
-	
 	case LFUN_LOA_INSERT:
-	{
-		Inset * new_inset = new InsetLOA(owner->buffer());
-		if (!owner->view()->insertInset(new_inset, "Standard", true))
-			delete new_inset;
-		break;
-	}
-
+	case LFUN_LOF_INSERT:
 	case LFUN_LOT_INSERT:
 	{
-		Inset * new_inset = new InsetLOT(owner->buffer());
-		if (!owner->view()->insertInset(new_inset, "Standard", true))
-			delete new_inset;
+		InsetCommandParams p;
+		
+		if( action == LFUN_TOC_INSERT )
+			p.setCmdName( "tableofcontents" );
+		else if( action == LFUN_LOA_INSERT )
+			p.setCmdName( "listofalgorithms" );
+		else if( action == LFUN_LOF_INSERT )
+			p.setCmdName( "listoffigures" );
+		else
+			p.setCmdName( "listoftables" );
+
+		Inset * inset = new InsetTOC( p );
+		if( !owner->view()->insertInset( inset, "Standard", true ) )
+			delete inset;
 		break;
 	}
 		
-	case LFUN_TABLE:
-#ifndef NEW_TABULAR
-		Table();
-#else
+	case LFUN_DIALOG_TABULAR_INSERT:
 		owner->getDialogs()->showTabularCreate();
-#endif
 		break;
 		
+	case LFUN_TABULAR_FEATURE:
+	case LFUN_SCROLL_INSET:
+		// this is not handled here as this funktion is only aktive
+		// if we have a locking_inset and that one is (or contains)
+		// a tabular-inset
+		break;
+
 	case LFUN_FIGURE:
 		Figure();
 		break;
 
-	case LFUN_INSERT_GRAPHICS:
+	case LFUN_INSET_GRAPHICS:
 	{
 		Inset * new_inset = new InsetGraphics;
-		if (!owner->view()->insertInset(new_inset))
+		if (!owner->view()->insertInset(new_inset)) {
 			delete new_inset;
+		} else {
+			// this is need because you don't use a inset->Edit()
+			owner->view()->updateInset(new_inset, true);
+			new_inset->Edit(owner->view(), 0, 0, 0);
+		}
 		break;
 	}
 	
@@ -1194,7 +1310,7 @@ string LyXFunc::Dispatch(int ac,
 		Dispatch(int(LFUN_LAYOUT), 
 			 textclasslist.NameOfLayout(owner->view()
 						    ->buffer()->params.textclass,
-						    sel).c_str());
+						    sel));
 		return string();
 	}
 		
@@ -1240,33 +1356,36 @@ string LyXFunc::Dispatch(int ac,
 	break;
 
 	case LFUN_LAYOUT_DOCUMENT:
-		MenuLayoutDocument();
+		owner->getDialogs()->showLayoutDocument();
 		break;
 		
 	case LFUN_LAYOUT_PARAGRAPH:
+#ifdef USE_OLD_PARAGRAPH_LAYOUT
 		MenuLayoutParagraph();
+#else
+		owner->getDialogs()->showLayoutParagraph();
+#endif
 		break;
 		
 	case LFUN_LAYOUT_CHARACTER:
 		MenuLayoutCharacter();
 		break;
-		
-	case LFUN_LAYOUT_TABLE:
-	{
-	        int flag = 0;
-	        if (argument == "true") flag = 1;
-		MenuLayoutTable(flag);
-	}
-	break;
-		
-	case LFUN_LAYOUT_PAPER:
-		MenuLayoutPaper();
-		break;
-		
-	case LFUN_LAYOUT_QUOTES:
-		MenuLayoutQuotes();
-		break;
-		
+
+	case LFUN_LAYOUT_TABULAR:
+	    if (owner->view()->the_locking_inset) {
+		if (owner->view()->the_locking_inset->LyxCode()==Inset::TABULAR_CODE) {
+		    InsetTabular * inset = static_cast<InsetTabular *>
+			(owner->view()->the_locking_inset);
+		    inset->OpenLayoutDialog(owner->view());
+		} else if (owner->view()->the_locking_inset->
+			   GetFirstLockingInsetOfType(Inset::TABULAR_CODE)!=0) {
+		    InsetTabular * inset = static_cast<InsetTabular *>(
+			owner->view()->the_locking_inset->GetFirstLockingInsetOfType(Inset::TABULAR_CODE));
+		    inset->OpenLayoutDialog(owner->view());
+		}
+	    }
+	    break;
+
 	case LFUN_LAYOUT_PREAMBLE:
 		MenuLayoutPreamble();
 		break;
@@ -1356,33 +1475,32 @@ string LyXFunc::Dispatch(int ac,
 		break;
 		
 	case LFUN_INSERT_LABEL:
-		MenuInsertLabel(argument.c_str());
+		MenuInsertLabel(argument);
 		break;
 		
-	case LFUN_INSERT_REF:
-		MenuInsertRef();
-		break;
-		
-	case LFUN_REFTOGGLE:
-	{
-		InsetRef * inset = 
-			static_cast<InsetRef*>(getInsetByCode(Inset::REF_CODE));
-		if (inset) {
-			inset->Toggle();
-			owner->view()->updateInset(inset, true);
+	case LFUN_REF_INSERT:
+		if (argument.empty()) {
+			InsetCommandParams p("ref");
+		owner->getDialogs()->createRef(p.getAsString());
 		} else {
-			setErrorMessage(N_("No cross-reference to toggle"));
+			InsetCommandParams p;
+			p.setFromString(argument);
+
+			InsetRef * inset = new InsetRef(p);
+			if (!owner->view()->insertInset(inset))
+				delete inset;
+			else
+				owner->view()->updateInset(inset, true);
 		}
-	}
-	break;
-	
-	case LFUN_REFBACK:
+		break;
+
+	case LFUN_REF_BACK:
 	{
 		owner->view()->restorePosition();
 	}
 	break;
 
-	case LFUN_REFGOTO:
+	case LFUN_REF_GOTO:
 	{
 		string label(argument);
 		if (label.empty()) {
@@ -1403,11 +1521,7 @@ string LyXFunc::Dispatch(int ac,
 	break;
 		
 	case LFUN_MENU_OPEN_BY_NAME:
-#ifdef NEW_MENUBAR
 		owner->getMenubar()->openByName(argument);
-#else
-		owner->getMenus()->openByName(argument);
-#endif
 		break; // RVDK_PATCH_5
 		
 	case LFUN_SPELLCHECK:
@@ -2005,11 +2119,8 @@ string LyXFunc::Dispatch(int ac,
 			cur_value = par->spacing.getValue();
 		}
 		
-#ifdef HAVE_SSTREAM
 		istringstream istr(argument);
-#else
-		istrstream istr(argument.c_str());
-#endif
+
 		string tmp;
 		istr >> tmp;
 		Spacing::Space new_spacing = cur_spacing;
@@ -2054,18 +2165,28 @@ string LyXFunc::Dispatch(int ac,
 	case LFUN_HTMLURL:
 	case LFUN_URL:
 	{
-		InsetCommand * new_inset;
+		InsetCommandParams p;
 		if (action == LFUN_HTMLURL)
-			new_inset = new InsetUrl("htmlurl", "", "");
+			p.setCmdName("htmlurl");
 		else
-			new_inset = new InsetUrl("url", "", "");
-		if (owner->view()->insertInset(new_inset))
-			new_inset->Edit(owner->view(), 0, 0, 0);
+			p.setCmdName("url");
+		owner->getDialogs()->createUrl( p.getAsString() );
+	}
+	break;
+		    
+	case LFUN_INSERT_URL:
+	{
+		InsetCommandParams p;
+		p.setFromString( argument );
+
+		InsetUrl * inset = new InsetUrl( p );
+		if (!owner->view()->insertInset(inset))
+			delete inset;
 		else
-			delete new_inset;
+			owner->view()->updateInset( inset, true );
 	}
 	break;
-	
+		    
 	case LFUN_INSET_TEXT:
 	{
 		InsetText * new_inset = new InsetText;
@@ -2168,7 +2289,7 @@ string LyXFunc::Dispatch(int ac,
 		// Do we have a locking inset...
 		if (owner->view()->the_locking_inset) {
 			lyxerr << "Locking inset code: "
-			       << owner->view()->the_locking_inset->LyxCode();
+			       << static_cast<int>(owner->view()->the_locking_inset->LyxCode());
 			InsetCaption * new_inset = new InsetCaption;
 			new_inset->setOwner(owner->view()->the_locking_inset);
 			new_inset->SetAutoBreakRows(true);
@@ -2186,7 +2307,7 @@ string LyXFunc::Dispatch(int ac,
 	{
 		int r = 2, c = 2;
 		if (!argument.empty())
-			sscanf(argument.c_str(),"%d%d", &r, &c);
+			::sscanf(argument.c_str(),"%d%d", &r, &c);
 		InsetTabular * new_inset =
 			new InsetTabular(owner->buffer(), r, c);
 		if (owner->view()->insertInset(new_inset))
@@ -2223,7 +2344,7 @@ string LyXFunc::Dispatch(int ac,
 	{
 		int  x;
 		long y;
-		sscanf(argument.c_str(), " %d %ld", &x, &y);
+		::sscanf(argument.c_str(), " %d %ld", &x, &y);
 		owner->view()->text->SetCursorFromCoordinates(owner->view(), x, y);
 	}
 	break;
@@ -2276,7 +2397,7 @@ string LyXFunc::Dispatch(int ac,
 	{
 	        char file_name[100];
 		int  row;
-		sscanf(argument.c_str(), " %s %d", file_name, &row);
+		::sscanf(argument.c_str(), " %s %d", file_name, &row);
 
 		// Must replace extension of the file to be .lyx and get full path
 		string s = ChangeExtension(string(file_name), ".lyx");
@@ -2295,10 +2416,28 @@ string LyXFunc::Dispatch(int ac,
 	}
 	break;
 
+	case LFUN_GOTO_PARAGRAPH:
+	{
+                istringstream istr(argument);
+
+		int id;
+		istr >> id;
+		LyXParagraph * par = owner->view()->text->GetParFromID(id);
+
+		// Set the cursor
+		owner->view()->text->SetCursor(owner->view(), par, 0);
+		owner->view()->setState();
+		owner->showState();
+
+		// Recenter screen
+		owner->view()->center();
+	}
+	break;
+
 	case LFUN_APROPOS:
 	case LFUN_GETTIP:
 	{
-		int qa = lyxaction.LookupFunc(argument.c_str());
+		int const qa = lyxaction.LookupFunc(argument);
 		setMessage(lyxaction.helpText(static_cast<kb_action>(qa)));
 	}
 	break;
@@ -2419,7 +2558,7 @@ string LyXFunc::Dispatch(int ac,
 	       
 	case LFUN_INSERT_MATH:
 	{
-		math_insert_symbol(argument.c_str());
+		math_insert_symbol(argument);
 	}
 	break;
 	
@@ -2438,7 +2577,7 @@ string LyXFunc::Dispatch(int ac,
 				setErrorMessage(N_("Missing argument"));
 		        else {
 				string s1 = token(s, ' ', 1);
-				int na = s1.empty() ? 0: atoi(s1.c_str());
+				int na = s1.empty() ? 0 : lyx::atoi(s1);
 				owner->view()->
 					open_new_inset(new InsetFormulaMacro(token(s, ' ', 0), na));
 			}
@@ -2447,8 +2586,7 @@ string LyXFunc::Dispatch(int ac,
 	break;
 
 	case LFUN_MATH_MODE:   // Open or create a math inset
-	{
-		
+	{		
 		if (owner->view()->available())
 			owner->view()->open_new_inset(new InsetFormula);
 		setMessage(N_("Math editor mode"));
@@ -2459,21 +2597,38 @@ string LyXFunc::Dispatch(int ac,
 	case LFUN_MATH_LIMITS:
 	{
 		setErrorMessage(N_("This is only allowed in math mode!"));
+	
+	}
+	break;
+
+	case LFUN_MATH_PANEL:
+	{
+		show_symbols_form(this);
 	}
 	break;
 	
-	case LFUN_CREATE_CITATION:
+	case LFUN_CITATION_CREATE:
 	{
-		owner->getDialogs()->createCitation( argument );
+		// Should do this "at source"
+		InsetCommandParams p( "cite" );
+		
+		if (contains(argument, "|")) {
+			p.setContents( token(argument, '|', 0) );
+			p.setOptions(  token(argument, '|', 1) );
+		} else {
+			p.setContents( argument );
+		}
+
+		owner->getDialogs()->createCitation( p.getAsString() );
 	}
 	break;
 		    
-	case LFUN_INSERT_CITATION:
+	case LFUN_CITATION_INSERT:
 	{
-		string keys = token(argument, '|', 0);
-		string text = token(argument, '|', 1);
+		InsetCommandParams p;
+		p.setFromString( argument );
 
-		InsetCitation * inset = new InsetCitation( keys, text );
+		InsetCitation * inset = new InsetCitation( p );
 		if (!owner->view()->insertInset(inset))
 			delete inset;
 		else
@@ -2486,20 +2641,19 @@ string LyXFunc::Dispatch(int ac,
 		// ale970405+lasgoutt970425
 		// The argument can be up to two tokens separated 
 		// by a space. The first one is the bibstyle.
-		string lsarg(argument);
-		string bibstyle = token(lsarg, ' ', 1);
+		string db       = token(argument, ' ', 0);
+		string bibstyle = token(argument, ' ', 1);
 		if (bibstyle.empty())
 			bibstyle = "plain";
-		InsetBibtex * new_inset 
-			= new InsetBibtex(token(lsarg, ' ', 0),
-					  bibstyle,
-					  owner->buffer());
+
+		InsetCommandParams p( "BibTeX", db, bibstyle );
+		InsetBibtex * inset = new InsetBibtex(p, owner->buffer());
 		
-		if (owner->view()->insertInset(new_inset)) {
-			if (lsarg.empty())
-				new_inset->Edit(owner->view(), 0, 0, 0);
+		if (owner->view()->insertInset(inset)) {
+			if (argument.empty())
+				inset->Edit(owner->view(), 0, 0, 0);
 		} else
-			delete new_inset;
+			delete inset;
 	}
 	break;
 		
@@ -2534,81 +2688,90 @@ string LyXFunc::Dispatch(int ac,
 	}
 	break;
 		
-	case LFUN_INDEX_INSERT:
-	case LFUN_INDEX_INSERT_LAST:
+	case LFUN_INDEX_CREATE:
 	{
-	  	// Can't do that at the beginning of a paragraph.
-	  	if (owner->view()->text->cursor.pos() - 1 < 0)
-			break;
+		InsetCommandParams p( "index" );
+		
+		if( argument.empty() ) {
+			// Get the word immediately preceding the cursor
+			LyXParagraph::size_type curpos = 
+				owner->view()->text->cursor.pos() - 1;
 
-		InsetIndex * new_inset = new InsetIndex();
-		if (!argument.empty()) {
-  			string lsarg(argument);
-			new_inset->setContents(lsarg);
-			if (!owner->view()->insertInset(new_inset))
-				delete new_inset;
+			string curstring;
+			if( curpos >= 0 )
+				curstring = owner->view()->text
+					    ->cursor.par()->GetWord(curpos);
+
+			p.setContents( curstring );
 		} else {
-			//reh 98/09/21
-			//get the current word for an argument
-			LyXParagraph::size_type lastpos = 
-				owner->view()->text->cursor.pos() - 1;
-			// Get the current word. note that this must be done
-			// before inserting the inset, or the inset will
-			// break the word
-			string curstring(owner->view()
-					 ->text->cursor.par()->GetWord(lastpos));
+			p.setContents( argument );
+		}
 
-			//make the new inset and write the current word into it
-			InsetIndex * new_inset = new InsetIndex();
+		owner->getDialogs()->createIndex( p.getAsString() );
+	}
+	break;
+		    
+	case LFUN_INDEX_INSERT:
+	{
+		InsetCommandParams p;
+		p.setFromString( argument );
+		InsetIndex * inset = new InsetIndex( p );
 
-			new_inset->setContents(curstring);
+		if (!owner->view()->insertInset(inset))
+			delete inset;
+		else
+			owner->view()->updateInset( inset, true );
+	}
+	break;
+		    
+	case LFUN_INDEX_INSERT_LAST:
+	{
+		// Get word immediately preceding the cursor
+		LyXParagraph::size_type curpos = 
+			owner->view()->text->cursor.pos() - 1;
+	  	// Can't do that at the beginning of a paragraph
+	  	if( curpos < 0 ) break;
 
-			//don't edit it if the call was to INSERT_LAST
-			if(action != LFUN_INDEX_INSERT_LAST) {
-				new_inset->Edit(owner->view(), 0, 0, 0);
-			} else {
-				//it looks blank on the screen unless
-				//we do  something.  put it here.
+		string curstring( owner->view()->text
+				  ->cursor.par()->GetWord(curpos) );
 
-				// move the cursor to the returned value of lastpos
-				// but only for the auto-insert
-				owner->view()->text->cursor.pos(lastpos);
-			}
+		InsetCommandParams p( "index", curstring );
+		InsetIndex * inset = new InsetIndex( p );
 
-			//put the new inset into the buffer.
-			// there should be some way of knowing the user
-			//cancelled & avoiding this, but i don't know how
-			if (!owner->view()->insertInset(new_inset))
-				delete new_inset;
-		}
+		if (!owner->view()->insertInset(inset))
+			delete inset;
+		else
+			owner->view()->updateInset( inset, true );
 	}
 	break;
-
+		    
 	case LFUN_INDEX_PRINT:
 	{
-		Inset * new_inset = new InsetPrintIndex(owner->buffer());
-		if (!owner->view()->insertInset(new_inset, "Standard", true))
-			delete new_inset;
+		InsetCommandParams p( "printindex" );
+		Inset * inset = new InsetPrintIndex(p);
+		if (!owner->view()->insertInset(inset, "Standard", true))
+			delete inset;
 	}
 	break;
 
 	case LFUN_PARENTINSERT:
 	{
 		lyxerr << "arg " << argument << endl;
-		Inset * new_inset = new InsetParent(argument, owner->buffer());
-		if (!owner->view()->insertInset(new_inset, "Standard", true))
-			delete new_inset;
+		InsetCommandParams p( "lyxparent", argument );
+		Inset * inset = new InsetParent(p, owner->buffer());
+		if (!owner->view()->insertInset(inset, "Standard", true))
+			delete inset;
 	}
 	break;
 
 	case LFUN_CHILDINSERT:
 	{
-		Inset * new_inset = new InsetInclude(argument,
-						     owner->buffer());
-		if (owner->view()->insertInset(new_inset, "Standard", true))
-			new_inset->Edit(owner->view(), 0, 0, 0);
+		InsetCommandParams p( "Include", argument );
+		Inset * inset = new InsetInclude(p, owner->buffer());
+		if (owner->view()->insertInset(inset, "Standard", true))
+			inset->Edit(owner->view(), 0, 0, 0);
 		else
-			delete new_inset;
+			delete inset;
 	}
 	break;
 
@@ -2657,11 +2820,7 @@ string LyXFunc::Dispatch(int ac,
 		owner->view()->setState();
 	}
 	break;
-#endif	
-	case LFUN_BUFFERBULLETSSELECT:
-		bulletForm();
-		break;
-		
+#endif
 	case LFUN_TOGGLECURSORFOLLOW:
 		cursor_follows_scrollbar = !cursor_follows_scrollbar;
 		break;
@@ -2720,7 +2879,7 @@ string LyXFunc::Dispatch(int ac,
 		else 
 			arg = lyxrc.date_insert_format;
 		char datetmp[32];
-		int datetmp_len = strftime(datetmp, 32, arg.c_str(), now_tm);
+		int datetmp_len = ::strftime(datetmp, 32, arg.c_str(), now_tm);
 		for (int i = 0; i < datetmp_len; i++) {
 			owner->view()->text->InsertChar(owner->view(), datetmp[i]);
 			owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
@@ -2731,6 +2890,10 @@ string LyXFunc::Dispatch(int ac,
 	}
 	break;
 
+	case LFUN_DIALOG_PREFERENCES:
+		owner->getDialogs()->showPreferences();
+		break;
+		
 	case LFUN_SAVEPREFERENCES:
 	{
 		Path p(user_lyxdir);
@@ -2738,6 +2901,22 @@ string LyXFunc::Dispatch(int ac,
 	}
 	break;
 
+	case LFUN_SCREEN_FONT_UPDATE:
+	{
+		// handle the screen font changes.
+		// 
+		lyxrc.set_font_norm_type();
+		fontloader.update();
+		// Of course we should only do the resize and the textcache.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();
+	}
+
 	case LFUN_SET_COLOR:
 	{
 		string lyx_name, x11_name;
@@ -2862,31 +3041,35 @@ void LyXFunc::MenuNew(bool fromTemplate)
 			initpath = trypath;
 	}
 
-	ProhibitInput(owner->view());
-	fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
-	fileDlg.SetButton(1, _("Templates"), lyxrc.template_path);
-	fname = fileDlg.Select(_("Enter Filename for new document"), 
-			       initpath, "*.lyx", _("newfile"));
- 	AllowInput(owner->view());
-	
-	if (fname.empty()) {
-		owner->getMiniBuffer()->Set(_("Canceled."));
-		lyxerr.debug() << "New Document Cancelled." << endl;
-		return;
-	}
-        
-	// get absolute path of file and make sure the filename ends
-	// with .lyx
-	string s = MakeAbsPath(fname);
-	if (!IsLyXFilename(s))
-		s += ".lyx";
+	static int newfile_number = 0;
+	string s;
 
-	// Check if the document already is open
-	if (bufferlist.exists(s)){
-		switch(AskConfirmation(_("Document is already open:"), 
-				       MakeDisplayPath(s, 50),
-				       _("Do you want to close that document now?\n"
-					 "('No' will just switch to the open version)")))
+	if (lyxrc.new_ask_filename) {
+		ProhibitInput(owner->view());
+		fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
+		fileDlg.SetButton(1, _("Templates"), lyxrc.template_path);
+		fname = fileDlg.Select(_("Enter Filename for new document"), 
+				       initpath, "*.lyx", _("newfile"));
+		AllowInput(owner->view());
+	
+		if (fname.empty()) {
+			owner->getMiniBuffer()->Set(_("Canceled."));
+			lyxerr.debug() << "New Document Cancelled." << endl;
+			return;
+		}
+	
+		// get absolute path of file and make sure the filename ends
+		// with .lyx
+		s = MakeAbsPath(fname);
+		if (!IsLyXFilename(s))
+			s += ".lyx";
+
+		// Check if the document already is open
+		if (bufferlist.exists(s)) {
+			switch(AskConfirmation(_("Document is already open:"), 
+					       MakeDisplayPath(s, 50),
+					       _("Do you want to close that document now?\n"
+						 "('No' will just switch to the open version)")))
 			{
 			case 1: // Yes: close the document
 				if (!bufferlist.close(bufferlist.getBuffer(s)))
@@ -2900,25 +3083,36 @@ void LyXFunc::MenuNew(bool fromTemplate)
 				owner->getMiniBuffer()->Set(_("Canceled."));
 				return;
 			}
-	}
-        
-	// Check whether the file already exists
-	if (IsLyXFilename(s)) {
+		}
+		// Check whether the file already exists
+		if (IsLyXFilename(s)) {
+			FileInfo fi(s);
+			if (fi.readable() &&
+			    AskQuestion(_("File already exists:"), 
+					MakeDisplayPath(s, 50),
+					_("Do you want to open the document?"))) {
+				// loads document
+				owner->getMiniBuffer()->Set(_("Opening document"), 
+							    MakeDisplayPath(s), "...");
+				XFlush(fl_display);
+				owner->view()->buffer(
+					bufferlist.loadLyXFile(s));
+				owner->getMiniBuffer()->Set(_("Document"),
+							    MakeDisplayPath(s),
+							    _("opened."));
+				return;
+			}
+		}
+	} else {
+		s = lyxrc.document_path +
+		    "newfile" + tostr(++newfile_number) + ".lyx";
 		FileInfo fi(s);
-		if (fi.readable() &&
-		    AskQuestion(_("File already exists:"), 
-				MakeDisplayPath(s, 50),
-				_("Do you want to open the document?"))) {
-			// loads document
-			owner->getMiniBuffer()->Set(_("Opening document"), 
-						    MakeDisplayPath(s), "...");
-			XFlush(fl_display);
-			owner->view()->buffer(
-				bufferlist.loadLyXFile(s));
-			owner->getMiniBuffer()->Set(_("Document"),
-						    MakeDisplayPath(s),
-						    _("opened."));
-			return;
+		while (bufferlist.exists(s) || fi.readable()) {
+			++newfile_number;
+			s = lyxrc.document_path +
+			    "newfile" +	tostr(newfile_number) +
+			    ".lyx";
+			fi.newFile(s);
 		}
 	}