#include "layout.h"
#include "gettext.h"
#include "kbmap.h"
-#ifdef NEW_MENUBAR
-# include "MenuBackend.h"
-#endif
+#include "MenuBackend.h"
#include "ToolbarDefaults.h"
#include "lyxlex.h"
using std::endl;
extern void LoadLyXFile(string const &);
+extern void QuitLyX();
string system_lyxdir;
string build_lyxdir;
// Execute batch commands if available
if (!batch_command.empty()) {
- lyxerr << "About to handle -x '" << batch_command << "'" << endl;
+ lyxerr << "About to handle -x '"
+ << batch_command << "'" << endl;
// no buffer loaded, create one
if (!last_loaded)
// Maybe we could do something more clever than aborting...
if (dispatched) {
lyxerr << "We are done!" << endl;
+ QuitLyX();
return;
}
//
ReadRcFile("lyxrc.defaults");
+// system_lyxrc = lyxrc;
// If there is a preferences file we read that instead
// of the old lyxrc file.
if (!ReadRcFile("preferences"))
// Run configure in user lyx directory
Path p(user_lyxdir);
- system(AddName(system_lyxdir, "configure").c_str());
+ ::system(AddName(system_lyxdir, "configure").c_str());
lyxerr << "LyX: " << _("Done!") << endl;
}
while (lex.IsOK()) {
switch(lex.lex()) {
case ui_menuset:
-#ifdef NEW_MENUBAR
menubackend.read(lex);
break;
-#else
- // Skip any menu definition and fall over to toolbar.
- // This is a hack, but it is supposed to go away...
- do {
- lex.next();
- if (!lex.IsOK()) return;
- }
- while (lex.lex() != ui_toolbar);
-#endif
case ui_toolbar:
toolbardefaults.read(lex);
if (i + 1 < *argc) {
string type(argv[i+1]);
removeargs = 2;
-
- if (type == "tex")
- type = "latex";
- else if (type == "ps")
- type = "postscript";
- else if (type == "text" || type == "txt")
- type = "ascii";
-
- if (type == "latex" || type == "postscript"
- || type == "linuxdoc" || type == "docbook"
- || type == "ascii" || type == "html")
- batch_command = "buffer-export " + type;
- else
- lyxerr << _("Unknown file type '")
- << type << _("' after ")
- << arg << _(" switch!") << endl;
+ batch_command = "buffer-export " + type;
+ gui = false;
} else
lyxerr << _("Missing file type [eg latex, "
"ps...] after ")