save preamble in defaults.lyx template; tweak hollywood.layout; tentative fix to lyxserver (please test!)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4257 a592a061-630c-0410-9148-cb99ea01b6c8

lib/ChangeLog

@@ -1,3 +1,7 @@
+2002-05-28  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* layouts/hollywood.layout: fix style "FADE_OUT:"
+
 2002-05-28  John Levon  <moz@compsoc.man.ac.uk>
 
 	* images/buffer-new.xpm: icon from Vitaly Lipatov

lib/layouts/hollywood.layout

@@ -351,7 +351,7 @@ Style Standard
 ObsoletedBy General
 End
 Style FADE_OUT:
-ObsoletedBy FADE_OUT
+ObsoletedBy "FADE OUT"
 End
 
 # For shooting scripts only, puts CONTINUED in rfoot, CONTINUED: in

src/ChangeLog

@@ -1,3 +1,8 @@
+2002-05-29  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* lyxserver.C (callback): tentative fix of lyxserver. Does not use
+	lyxaction directly now.
+
 2002-05-27  John Levon  <moz@compsoc.man.ac.uk>
 
 	* trans.C:

src/frontends/xforms/ChangeLog

@@ -1,3 +1,8 @@
+2002-05-28  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* FormDocument.C (input): set preamble too when saving default
+	template. 
+
 2002-05-26  John Levon  <moz@compsoc.man.ac.uk>
 
 	* Makefile.am:

src/frontends/xforms/FormDocument.C

@@ -497,6 +497,7 @@ bool FormDocument::input(FL_OBJECT * ob, long data)
 		language_apply(params);
 		options_apply(params);
 		bullets_apply(params);
+		params.preamble = lv_->buffer()->params.preamble;
 		saveParamsAsDefault(params);
 	}
 

src/lyxserver.C

@@ -50,7 +50,6 @@
 #include "lyxserver.h"
 #include "lyx_main.h"
 #include "debug.h"
-#include "LyXAction.h"
 #include "lyxfunc.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
@@ -78,9 +77,6 @@ int mkfifo(char const * __path, mode_t __mode) {
 
 /* === variables ========================================================= */
 
-extern LyXAction lyxaction;
-
-
 extern "C" {
 
 	// C wrapper
@@ -501,25 +497,20 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
 			// connect to the lyxfunc in the single LyXView we
 			// support currently. (Lgb)
 
-			kb_action action = static_cast<kb_action>(lyxaction.LookupFunc(cmd));
-			//int action = -1;
-			string rval, buf;
 
-			if (action>= 0) {
+			serv->func->verboseDispatch(cmd + ' ' + arg, false);
-				rval = serv->func->dispatch(action, arg);
+			string const rval = serv->func->getMessage();
-			} else {
-				rval = "Unknown command";
-			}
 			
 			//modified june 1999 stefano@zool.su.se:
 			//all commands produce an INFO or ERROR message
 			//in the output pipe, even if they do not return
 			//anything. See chapter 4 of Customization doc.
-			if (action<0 || serv->func->errorStat())
+			string buf;
+			if (serv->func->errorStat())
 				buf = "ERROR:";
 			else
 				buf = "INFO:";
-			buf += string(client) + ":" + cmd	+ ":" + rval + "\n";
+			buf += client + ":" + cmd + ":" +  rval + "\n";
 			serv->pipes.send(buf);
 
 			// !!! we don't do any error checking -