-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
+/**
+ * \file lyx_main.C
+ * Copyright 1995-2002 the LyX Team
+ * Read the file COPYING
*
- * ====================================================== */
+ * \author unknown
+ */
#include <config.h>
-
-#include <cstdlib>
-#include <csignal>
+#include <version.h>
#ifdef __GNUG__
#pragma implementation
#endif
-#include <version.h>
#include "lyx_main.h"
-#include "lyx_gui.h"
-#include "LyXView.h"
-#include "lyxfunc.h"
-#include "lyx_gui_misc.h"
-#include "lyxrc.h"
-#include "support/path.h"
+
#include "support/filetools.h"
-#include "buffer.h"
-#include "bufferlist.h"
-#include "debug.h"
+#include "support/lyxlib.h"
+#include "support/os.h"
#include "support/FileInfo.h"
-#include "lastfiles.h"
-#include "intl.h"
-#include "lyxserver.h"
-#include "layout.h"
+#include "support/path.h"
+#include "debug.h"
#include "gettext.h"
+#include "lyxlex.h"
+
+#include "bufferlist.h"
+#include "lyxtextclasslist.h"
+#include "lyxserver.h"
#include "kbmap.h"
-#include "MenuBackend.h"
+#include "lyxfunc.h"
#include "ToolbarDefaults.h"
-#include "lyxlex.h"
+#include "MenuBackend.h"
+#include "language.h"
+#include "lastfiles.h"
#include "encoding.h"
#include "converter.h"
-#include "language.h"
-#include "support/os.h"
+#include "frontends/Alert.h"
+#include "frontends/lyx_gui.h"
+
+#include <cstdlib>
+#include <csignal>
+
+using std::vector;
using std::endl;
#ifndef CXX_GLOBAL_CSTD
+using std::exit;
using std::signal;
+using std::system;
#endif
extern void LoadLyXFile(string const &);
extern void QuitLyX();
+extern LyXServer * lyxserver;
+
string system_lyxdir;
string build_lyxdir;
string system_tempdir;
-string user_lyxdir; // Default $HOME/.lyx
-string help_lyxdir; // Default system_lyxdir/help
+string user_lyxdir;
-// Should this be kept global? Asger says Yes.
DebugStream lyxerr;
-LastFiles * lastfiles;
+boost::scoped_ptr<LastFiles> lastfiles;
// This is the global bufferlist object
BufferList bufferlist;
-LyXServer * lyxserver = 0;
// this should be static, but I need it in buffer.C
bool finished = false; // flag, that we are quitting the program
boost::scoped_ptr<kb_keymap> toplevel_keymap;
-LyX::LyX(int * argc, char * argv[])
+LyX::LyX(int & argc, char * argv[])
{
- // Prevent crash with --help
- lyxGUI = 0;
- lastfiles = 0;
-
// Here we need to parse the command line. At least
// we need to parse for "-dbg" and "-help"
- bool gui = easyParse(argc, argv);
+ bool const want_gui = easyParse(argc, argv);
// Global bindings (this must be done as early as possible.) (Lgb)
toplevel_keymap.reset(new kb_keymap);
defaultKeyBindings(toplevel_keymap.get());
-
- // Make the GUI object, and let it take care of the
- // command line arguments that concerns it.
- lyxerr[Debug::INIT] << "Initializing LyXGUI..." << endl;
- lyxGUI = new LyXGUI(this, argc, argv, gui);
- lyxerr[Debug::INIT] << "Initializing LyXGUI...done" << endl;
-
- // Now the GUI and LyX have taken care of their arguments, so
- // the only thing left on the command line should be
- // filenames. Let's check anyway.
- for (int argi = 1; argi < *argc ; ++argi) {
+
+ if (want_gui) {
+ lyx_gui::parse_init(argc, argv);
+ }
+
+ // check for any spurious extra arguments
+ // other than documents
+ for (int argi = 1; argi < argc ; ++argi) {
if (argv[argi][0] == '-') {
lyxerr << _("Wrong command line option `")
<< argv[argi]
<< _("'. Exiting.") << endl;
- exit(0);
+ exit(1);
}
}
-
+
// Initialization of LyX (reads lyxrc and more)
lyxerr[Debug::INIT] << "Initializing LyX::init..." << endl;
- init(gui);
+ init(want_gui);
lyxerr[Debug::INIT] << "Initializing LyX::init...done" << endl;
- lyxGUI->init();
-
- // Load the files specified in the command line.
- if ((*argc) == 2)
- lyxerr[Debug::INFO] << "Opening document..." << endl;
- else if ((*argc) > 2)
- lyxerr[Debug::INFO] << "Opening documents..." << endl;
+ if (want_gui) {
+ lyx_gui::parse_lyxrc();
+ }
- Buffer * last_loaded = 0;
+ vector<string> files;
- for (int argi = (*argc) - 1; argi >= 1; --argi) {
- Buffer * loadb = bufferlist.loadLyXFile(argv[argi]);
- if (loadb != 0) {
- last_loaded = loadb;
- }
+ for (int argi = argc - 1; argi >= 1; --argi) {
+ files.push_back(argv[argi]);
}
if (first_start) {
- string const splash =
- i18nLibFileSearch("examples", "splash.lyx");
- lyxerr[Debug::INIT] << "Opening splash document "
- << splash << "..." << endl;
- Buffer * loadb = bufferlist.loadLyXFile(splash);
- if (loadb != 0) {
- last_loaded = loadb;
- }
- }
-
- if (last_loaded != 0) {
- lyxerr[Debug::INIT] << "Yes we loaded some files." << endl;
- if (lyxrc.use_gui)
- lyxGUI->regBuf(last_loaded);
+ files.push_back(i18nLibFileSearch("examples", "splash.lyx"));
}
-
+
+#if 0 // FIXME: GUII
// Execute batch commands if available
if (!batch_command.empty()) {
- lyxerr << "About to handle -x '"
+ lyxerr[Debug::INIT] << "About to handle -x '"
<< batch_command << "'" << endl;
// no buffer loaded, create one
if (!last_loaded)
last_loaded = bufferlist.newFile("tmpfile", string());
+ bool success = false;
+
// try to dispatch to last loaded buffer first
- bool dispatched = last_loaded->dispatch(batch_command);
+ bool const dispatched = last_loaded->dispatch(batch_command, &success);
- // if this was successful, return.
- // Maybe we could do something more clever than aborting...
+ // if this was successful, finish
if (dispatched) {
- lyxerr << "We are done!" << endl;
QuitLyX();
- return;
+ exit(!success);
}
-
- // otherwise, let the GUI handle the batch command
- lyxGUI->regBuf(last_loaded);
- lyxGUI->getLyXView()->getLyXFunc()->dispatch(batch_command);
-
- // fall through...
}
-
- // Let the ball begin...
- lyxGUI->runTime();
-}
-
+#endif
-// A destructor is always necessary (asierra-970604)
-LyX::~LyX()
-{
- delete lastfiles;
- delete lyxGUI;
+ lyx_gui::start(batch_command, files);
}
-
+
extern "C" {
-
+
static
void error_handler(int err_sig)
{
case SIGSEGV:
lyxerr << "\nlyx: SIGSEGV signal caught" << endl;
lyxerr <<
- "Sorry, you have found a bug in LyX."
- " If possible, please read 'Known bugs'\n"
- "under the Help menu and then send us "
- "a full bug report. Thanks!" << endl;
+ "Sorry, you have found a bug in LyX. "
+ "Please read the bug-reporting instructions "
+ "in Help->Introduction and send us a bug report, "
+ "if necessary. Thanks !" << endl;
break;
case SIGTERM:
// no comments
break;
}
-
+
// Deinstall the signal handlers
signal(SIGHUP, SIG_DFL);
signal(SIGINT, SIG_DFL);
signal(SIGSEGV, SIG_DFL);
signal(SIGTERM, SIG_DFL);
- bufferlist.emergencyWriteAll();
+ LyX::emergencyCleanup();
lyxerr << "Bye." << endl;
- if (err_sig!= SIGHUP &&
+ if (err_sig!= SIGHUP &&
(!GetEnv("LYXDEBUG").empty() || err_sig == SIGSEGV))
lyx::abort();
exit(0);
// Determine path of binary
//
- string fullbinpath;
string binpath = os::binpath();
string binname = os::binname();
- fullbinpath = binpath;
+ string fullbinname = MakeAbsPath(binname, binpath);
if (binpath.empty()) {
lyxerr << _("Warning: could not determine path of binary.")
<< _("If you have problems, try starting LyX with an absolute path.")
<< endl;
}
+ lyxerr[Debug::INIT] << "Name of binary: " << binname << endl;
lyxerr[Debug::INIT] << "Path of binary: " << binpath << endl;
//
// Directories are searched in this order:
// 1) -sysdir command line parameter
- // 2) LYX_DIR_11x environment variable
+ // 2) LYX_DIR_13x environment variable
// 3) Maybe <path of binary>/TOP_SRCDIR/lib
// 4) <path of binary>/../share/<name of binary>/
// 4a) repeat 4 after following the Symlink if <path of
if (!system_lyxdir.empty())
searchpath= MakeAbsPath(system_lyxdir) + ';';
- // LYX_DIR_11x environment variable
- string const lyxdir = GetEnvPath("LYX_DIR_11x");
-
+ // LYX_DIR_13x environment variable
+ string const lyxdir = GetEnvPath("LYX_DIR_13x");
+
if (!lyxdir.empty()) {
- lyxerr[Debug::INIT] << "LYX_DIR_11x: " << lyxdir << endl;
+ lyxerr[Debug::INIT] << "LYX_DIR_13x: " << lyxdir << endl;
searchpath += lyxdir + ';';
}
- // <path of binary>/TOP_SRCDIR/lib
- build_lyxdir = MakeAbsPath("../lib", binpath);
- if (!FileSearch(build_lyxdir, "lyxrc.defaults").empty()) {
- searchpath += MakeAbsPath(AddPath(TOP_SRCDIR, "lib"),
- binpath) + ';';
- lyxerr[Debug::INIT] << "Checking whether LyX is run in "
- "place... yes" << endl;
- } else {
- lyxerr[Debug::INIT]
- << "Checking whether LyX is run in place... no"
- << endl;
- build_lyxdir.erase();
+ string fullbinpath = binpath;
+ FileInfo file(fullbinname, true);
+ if (file.isLink()) {
+ lyxerr[Debug::INIT] << "binary is a link" << endl;
+ string link;
+ if (LyXReadLink(fullbinname, link)) {
+ // Path of binary/../share/name of binary/
+ searchpath += NormalizePath(AddPath(binpath,
+ "../share/")
+ + OnlyFilename(binname));
+ searchpath += ';';
+ fullbinpath = link;
+ binpath = MakeAbsPath(OnlyPath(fullbinpath));
+ }
}
- bool followlink;
+ bool followlink;
do {
- // Path of binary/../share/name of binary/
- searchpath += NormalizePath(AddPath(binpath, "../share/") +
+ // Path of binary/../share/name of binary/
+ searchpath += NormalizePath(AddPath(binpath, "../share/") +
OnlyFilename(binname)) + ';';
- // Follow Symlinks
+ // Follow Symlinks
FileInfo file(fullbinpath, true);
followlink = file.isLink();
if (followlink) {
+ lyxerr << " directory " << fullbinpath
+ << " is a link" << endl;
string link;
if (LyXReadLink(fullbinpath, link)) {
fullbinpath = link;
}
} while (followlink);
+ // <path of binary>/TOP_SRCDIR/lib
+ build_lyxdir = MakeAbsPath("../lib", binpath);
+ if (!FileSearch(build_lyxdir, "lyxrc.defaults").empty()) {
+ searchpath += MakeAbsPath(AddPath(TOP_SRCDIR, "lib"),
+ binpath) + ';';
+ lyxerr[Debug::INIT] << "Checking whether LyX is run in "
+ "place... yes" << endl;
+ } else {
+ lyxerr[Debug::INIT]
+ << "Checking whether LyX is run in place... no"
+ << endl;
+ build_lyxdir.erase();
+ }
+
// Hardcoded dir
searchpath += LYX_DIR;
// Warn if environment variable is set, but unusable
if (!lyxdir.empty()) {
if (system_lyxdir != NormalizePath(lyxdir)) {
- lyxerr <<_("LYX_DIR_11x environment variable no good.")
+ lyxerr <<_("LYX_DIR_13x environment variable no good.")
<< '\n'
- << _("System directory set to: ")
+ << _("System directory set to: ")
<< system_lyxdir << endl;
path_shown = true;
}
if (system_lyxdir == "./") {
lyxerr <<_("LyX Warning! Couldn't determine system directory. ")
<<_("Try the '-sysdir' command line parameter or ")
- <<_("set the environment variable LYX_DIR_11x to the "
+ <<_("set the environment variable LYX_DIR_13x to the "
"LyX system directory ")
<< _("containing the file `chkconfig.ltx'.") << endl;
if (!path_shown) {
<< "Giving up." << endl;
exit(1);
}
- lyxerr << _("Using built-in default ")
+ lyxerr << _("Using built-in default ")
<< LYX_DIR << _(" but expect problems.")
<< endl;
} else {
system_lyxdir = LYX_DIR;
path_shown = true;
}
- help_lyxdir = system_lyxdir+"help/";
// Report the system directory if debugging is on
if (!path_shown)
lyxerr[Debug::INIT] << "System directory: '"
- << system_lyxdir << '\'' << endl;
+ << system_lyxdir << '\'' << endl;
//
// Determine user lyx-dir
//
-
+
// Directories are searched in this order:
// 1) -userdir command line parameter
- // 2) LYX_USERDIR_11x environment variable
+ // 2) LYX_USERDIR_13x environment variable
// 3) $HOME/.<name of binary>
// If we had a command line switch, user_lyxdir is already set
bool explicit_userdir = true;
if (user_lyxdir.empty()) {
- // LYX_USERDIR_11x environment variable
- user_lyxdir = GetEnvPath("LYX_USERDIR_11x");
+ // LYX_USERDIR_13x environment variable
+ user_lyxdir = GetEnvPath("LYX_USERDIR_13x");
// default behaviour
if (user_lyxdir.empty())
explicit_userdir = false;
}
- lyxerr[Debug::INIT] << "User LyX directory: '"
+ lyxerr[Debug::INIT] << "User LyX directory: '"
<< user_lyxdir << '\'' << endl;
// Check that user LyX directory is ok. We don't do that if
} else {
first_start = false;
}
-
+
//
// Shine up lyxrc defaults
//
// Default template path: system_dir/templates
- if (lyxrc.template_path.empty()){
+ if (lyxrc.template_path.empty()) {
lyxrc.template_path = AddPath(system_lyxdir, "templates");
}
-
+
// Default lastfiles file: $HOME/.lyx/lastfiles
- if (lyxrc.lastfiles.empty()){
+ if (lyxrc.lastfiles.empty()) {
lyxrc.lastfiles = AddName(user_lyxdir, "lastfiles");
}
// Disable gui when either lyxrc or easyparse says so
if (!gui)
lyxrc.use_gui = false;
-
- // Calculate screen dpi as average of x-DPI and y-DPI:
- if (lyxrc.use_gui) {
- lyxrc.dpi = getScreenDPI();
- lyxerr[Debug::INIT] << "DPI setting detected to be "
- << lyxrc.dpi + 0.5 << endl;
- } else {
- lyxrc.dpi = 1; // I hope this is safe
- }
//
// Read configuration files
readUIFile(lyxrc.ui_file);
// Bind the X dead keys to the corresponding LyX functions if
- // necessary.
+ // necessary.
if (lyxrc.override_x_deadkeys)
deadKeyBindings(toplevel_keymap.get());
lyxrc.print();
}
- // Create temp directory
+ // Create temp directory
os::setTmpDir(CreateLyXTmpDir(lyxrc.tempdir_path));
system_tempdir = os::getTmpDir();
if (lyxerr.debugging(Debug::INIT)) {
// load the lastfiles mini-database
lyxerr[Debug::INIT] << "Reading lastfiles `"
- << lyxrc.lastfiles << "'..." << endl;
- lastfiles = new LastFiles(lyxrc.lastfiles,
- lyxrc.check_lastfiles,
- lyxrc.num_lastfiles);
-
- // start up the lyxserver. (is this a bit early?) (Lgb)
- // 0.12 this will be way to early, we need the GUI to be initialized
- // first, so move it for now.
- // lyxserver = new LyXServer;
+ << lyxrc.lastfiles << "'..." << endl;
+ lastfiles.reset(new LastFiles(lyxrc.lastfiles,
+ lyxrc.check_lastfiles,
+ lyxrc.num_lastfiles));
}
kbmap->bind("Left", LFUN_LEFT);
kbmap->bind("Up", LFUN_UP);
kbmap->bind("Down", LFUN_DOWN);
-
+
kbmap->bind("Tab", LFUN_TAB);
kbmap->bind("ISO_Left_Tab", LFUN_TAB); // jbl 2001-23-02
-
+
kbmap->bind("Home", LFUN_HOME);
kbmap->bind("End", LFUN_END);
kbmap->bind("Prior", LFUN_PRIOR);
kbmap->bind("Next", LFUN_NEXT);
-
+
kbmap->bind("Return", LFUN_BREAKPARAGRAPH);
//kbmap->bind("~C-~S-~M-nobreakspace", LFUN_PROTECTEDSPACE);
-
+
kbmap->bind("Delete", LFUN_DELETE);
kbmap->bind("BackSpace", LFUN_BACKSPACE);
-
+
+ // sub- and superscript -MV
+ kbmap->bind("~S-underscore", LFUN_SUBSCRIPT);
+ kbmap->bind("~S-asciicircum", LFUN_SUPERSCRIPT);
+
// kbmap->bindings to enable the use of the numeric keypad
// e.g. Num Lock set
//kbmap->bind("KP_0", LFUN_SELFINSERT);
kbmap->bind("KP_End", LFUN_END);
kbmap->bind("KP_Prior", LFUN_PRIOR);
kbmap->bind("KP_Next", LFUN_NEXT);
-
- kbmap->bind("C-Tab", LFUN_TABINSERT); // ale970515
+
+ kbmap->bind("C-Tab", LFUN_TABINSERT); // ale970515
kbmap->bind("S-Tab", LFUN_SHIFT_TAB); // jug20000522
kbmap->bind("S-ISO_Left_Tab", LFUN_SHIFT_TAB); // jbl 2001-23-02
}
+void LyX::emergencyCleanup()
+{
+ // what to do about tmpfiles is non-obvious. we would
+ // like to delete any we find, but our lyxdir might
+ // contain documents etc. which might be helpful on
+ // a crash
+
+ bufferlist.emergencyWriteAll();
+ if (lyxserver)
+ lyxserver->emergencyCleanup();
+}
+
+
// LyX can optionally take over the handling of deadkeys
void LyX::deadKeyBindings(kb_keymap * kbmap)
{
} else {
first_start = !explicit_userdir;
}
-
+
// If the user specified explicitely a directory, ask whether
// to create it (otherwise, always create it)
if (explicit_userdir &&
- !AskQuestion(_("You have specified an invalid LyX directory."),
+ !Alert::askQuestion(_("You have specified an invalid LyX directory."),
_("It is needed to keep your own configuration."),
_("Should I try to set it up for you (recommended)?"))) {
lyxerr << _("Running without personal LyX directory.") << endl;
bool LyX::readRcFile(string const & name)
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
-
+
string const lyxrc_path = LibFileSearch(string(), name);
- if (!lyxrc_path.empty()){
- lyxerr[Debug::INIT] << "Found " << name
+ if (!lyxrc_path.empty()) {
+ lyxerr[Debug::INIT] << "Found " << name
<< " in " << lyxrc_path << endl;
- if (lyxrc.read(lyxrc_path) < 0) {
- WriteAlert(_("LyX Warning!"),
+ if (lyxrc.read(lyxrc_path) < 0) {
+ Alert::alert(_("LyX Warning!"),
_("Error while reading ") + lyxrc_path + ".",
_("Using built-in defaults."));
return false;
}
return true;
} else {
- lyxerr[Debug::INIT] << "Could not find " << name << endl;
+ lyxerr[Debug::INIT] << "Could not find " << name << endl;
}
-
+
return false;
}
};
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
-
+
string const ui_path = LibFileSearch("ui", name, "ui");
if (ui_path.empty()) {
- lyxerr[Debug::INIT] << "Could not find " << name << endl;
+ lyxerr[Debug::INIT] << "Could not find " << name << endl;
menubackend.defaults();
return;
}
-
+
lyxerr[Debug::INIT] << "Found " << name
<< " in " << ui_path << endl;
LyXLex lex(uitags, ui_last - 1);
lyxerr << "Unable to set LyXLeX for ui file: " << ui_path
<< endl;
}
-
+
if (lyxerr.debugging(Debug::PARSER))
lex.printTable(lyxerr);
while (lex.isOK()) {
switch (lex.lex()) {
- case ui_menuset:
+ case ui_menuset:
menubackend.read(lex);
break;
break;
default:
- if(!strip(lex.getString()).empty())
+ if (!strip(lex.getString()).empty())
lex.printError("LyX::ReadUIFile: "
"Unknown menu tag: `$$Token'");
break;
"\t-userdir dir try to set user directory to dir\n"
"\t-sysdir dir try to set system directory to dir\n"
"\t-geometry WxH+X+Y set geometry of the main window\n"
- "\t-dbg feature[,feature]...\n"
- " select the features to debug.\n"
- " Type `lyx -dbg' to see the list of features\n"
+ "\t-dbg feature[,feature]...\n"
+ " select the features to debug.\n"
+ " Type `lyx -dbg' to see the list of features\n"
"\t-x [--execute] command\n"
" where command is a lyx command.\n"
"\t-e [--export] fmt\n"
} // namespace anon
-bool LyX::easyParse(int * argc, char * argv[])
+bool LyX::easyParse(int & argc, char * argv[])
{
bool gui = true;
int removeargs = 0; // used when options are read
- for (int i = 1; i < *argc; ++i) {
+ for (int i = 1; i < argc; ++i) {
string arg = argv[i];
// Check for -dbg int
if (arg == "-dbg") {
- if (i + 1 < *argc) {
+ if (i + 1 < argc) {
setDebuggingLevel(argv[i + 1]);
removeargs = 2;
} else {
lyxerr << _("List of supported debug flags:")
<< endl;
Debug::showTags(lyxerr);
- exit(0);
+ exit(1);
}
- }
+ }
// Check for "-sysdir"
else if (arg == "-sysdir") {
- if (i + 1 < *argc) {
+ if (i + 1 < argc) {
system_lyxdir = argv[i + 1];
removeargs = 2;
} else {
- lyxerr << _("Missing directory for -sysdir switch!")
+ lyxerr << _("Missing directory for -sysdir switch!")
<< endl;
- exit(0);
+ exit(1);
}
}
// Check for "-userdir"
else if (arg == "-userdir") {
- if (i + 1 < *argc) {
+ if (i + 1 < argc) {
user_lyxdir = argv[i + 1];
removeargs = 2;
} else {
lyxerr << _("Missing directory for -userdir switch!")
<< endl;
- exit(0);
+ exit(1);
}
}
// Check for --help or -help
else if (arg == "--help" || arg == "-help") {
commandLineHelp();
exit(0);
- }
+ }
// Check for --version or -version
else if (arg == "--version" || arg == "-version") {
commandLineVersionInfo();
exit(0);
}
+ // FIXME: why is this commented out ?
// Check for "-nw": No XWindows as for emacs this should
// give a LyX that could be used in a terminal window.
//else if (arg == "-nw") {
// Check for "-x": Execute commands
else if (arg == "-x" || arg == "--execute") {
- if (i + 1 < *argc) {
+ if (i + 1 < argc) {
batch_command = string(argv[i + 1]);
removeargs = 2;
}
lyxerr << _("Missing command string after -x switch!") << endl;
// Argh. Setting gui to false segfaults..
- //gui = false;
+ // FIXME: when ? how ?
+ // gui = false;
}
else if (arg == "-e" || arg == "--export") {
- if (i + 1 < *argc) {
+ if (i + 1 < argc) {
string type(argv[i+1]);
removeargs = 2;
batch_command = "buffer-export " + type;
gui = false;
- } else
+ } else {
lyxerr << _("Missing file type [eg latex, "
"ps...] after ")
<< arg << _(" switch!") << endl;
+ exit(1);
+ }
}
else if (arg == "-i" || arg == "--import") {
- if (i + 1 < *argc) {
- string type(argv[i+1]);
- string file(argv[i+2]);
+ if (i + 1 < argc) {
+ if (!argv[i+2]) {
+ lyxerr << _("Missing filename for --import") << endl;
+ exit(1);
+ }
+
+ string const file(argv[i+2]);
+ string const type(argv[i+1]);
removeargs = 3;
-
+
batch_command = "buffer-import " + type + " " + file;
lyxerr << "batch_command: "
<< batch_command << endl;
- } else
+ } else {
lyxerr << _("Missing type [eg latex, "
"ps...] after ")
<< arg << _(" switch!") << endl;
+ exit(1);
+ }
}
if (removeargs > 0) {
// Now, remove used arguments by shifting
// the following ones removeargs places down.
- (*argc) -= removeargs;
- for (int j = i; j < (*argc); ++j)
+ argc -= removeargs;
+ for (int j = i; j < argc; ++j)
argv[j] = argv[j + removeargs];
--i; // After shift, check this number again.
removeargs = 0;
return gui;
}
-
-