anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4257 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-05-28 23:04:57 +00:00
parent 99732e7e2c
commit b74d4e8b93
6 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ChangeLog
View File

@ -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> 2002-05-28 John Levon <moz@compsoc.man.ac.uk>
* images/buffer-new.xpm: icon from Vitaly Lipatov * images/buffer-new.xpm: icon from Vitaly Lipatov

2
lib/layouts/hollywood.layout
View File

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

5
src/ChangeLog
View File

@ -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> 2002-05-27 John Levon <moz@compsoc.man.ac.uk>
* trans.C: * trans.C:

5
src/frontends/xforms/ChangeLog
View File

@ -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> 2002-05-26 John Levon <moz@compsoc.man.ac.uk>
* Makefile.am: * Makefile.am:

1
src/frontends/xforms/FormDocument.C
View File

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

23
src/lyxserver.C
View File

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