save preamble in defaults.lyx template; tweak hollywood.layout; tentative fix to...

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 8c211e35a61a5c63b1661a2c39480fac6dfec4f8..e812ffb51f90e6ceb001468480026b18f6899aa0 100644 (file)
--- a/lib/ChangeLog
+++ b/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

diff --git a/lib/layouts/hollywood.layout b/lib/layouts/hollywood.layout
index 10a76d072e6615e8a59799a792837b6b7a2fa411..b3a7854b06c8f46b27939062b6721f9fa0eda46a 100644 (file)
--- a/lib/layouts/hollywood.layout
+++ b/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

diff --git a/src/ChangeLog b/src/ChangeLog
index 50291ac037cd795bfea4715b56d172e382f723b1..d63d06df2b137a074c3a8a811d5afab577532e37 100644 (file)
--- a/src/ChangeLog
+++ b/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:

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 7b434627d45123bc472edfd09ab14a11affa07c5..876387cd475a1106908b2dbccbb4880d994b33ff 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/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:

diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index 40e553cc31ab9426169710a657e351d22c48c40b..caa1d0162d29e217cfecba6a23bd3d413a7b2034 100644 (file)
--- a/src/frontends/xforms/FormDocument.C
+++ b/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);
        }
 

diff --git a/src/lyxserver.C b/src/lyxserver.C
index a3d781edadf3555f0ab80803d6a2a789531bbe65..11f3d47aea8df785f1e216be66aa56d4a121d48f 100644 (file)
--- a/src/lyxserver.C
+++ b/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) {
-                               rval = serv->func->dispatch(action, arg);
-                       } else {
-                               rval = "Unknown command";
-                       }
 
-      //modified june 1999 stefano@zool.su.se:
+                       serv->func->verboseDispatch(cmd + ' ' + arg, false);
+                       string const rval = serv->func->getMessage();
+                       
+                       //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 -