* Copyright 1995-2002 the LyX Team
* Read the file COPYING
*
- * \author unknown
+ * \author Lars Gullik Bjønnes
*/
#include <config.h>
#include <version.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "lyx_main.h"
#include "support/filetools.h"
#include "support/lyxlib.h"
-#include "support/os.h"
#include "support/FileInfo.h"
#include "support/path.h"
+#include "support/path_defines.h"
#include "debug.h"
#include "gettext.h"
#include "lyxlex.h"
+#include "graphics/GraphicsTypes.h"
+
#include "bufferlist.h"
#include "buffer.h"
+#include "buffer_funcs.h"
#include "lyxserver.h"
#include "kbmap.h"
#include "lyxfunc.h"
-#include "ToolbarDefaults.h"
+#include "ToolbarBackend.h"
#include "MenuBackend.h"
#include "language.h"
#include "lastfiles.h"
#include "encoding.h"
#include "converter.h"
+#include "format.h"
#include "lyxtextclasslist.h"
#include "frontends/Alert.h"
#include "frontends/lyx_gui.h"
+#include <boost/function.hpp>
+#include <boost/bind.hpp>
+#include <boost/signals/signal1.hpp>
+
#include <cstdlib>
#include <csignal>
+#include <iostream>
+
+using namespace lyx::support;
using std::vector;
using std::endl;
extern LyXServer * lyxserver;
-string system_lyxdir;
-string build_lyxdir;
-string system_tempdir;
-string user_lyxdir;
-
DebugStream lyxerr;
boost::scoped_ptr<LastFiles> lastfiles;
// convenient to have it here.
boost::scoped_ptr<kb_keymap> toplevel_keymap;
+namespace {
+
+void showFileError(string const & error)
+{
+ Alert::warning(_("Could not read configuration file"),
+ bformat(_("Error while reading the configuration file\n%1$s.\n"
+ "Please check your installation."), error));
+ exit(EXIT_FAILURE);
+}
+
+}
LyX::LyX(int & argc, char * argv[])
{
// we need to parse for "-dbg" and "-help"
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());
+ // set the DisplayTranslator only once; should that be done here??
+ // if this should not be in this file, please also remove
+ // #include "graphics/GraphicsTypes.h" at the top -- Rob Lahaye.
+ lyx::graphics::setDisplayTranslator();
if (want_gui) {
lyx_gui::parse_init(argc, argv);
// other than documents
for (int argi = 1; argi < argc ; ++argi) {
if (argv[argi][0] == '-') {
- lyxerr << _("Wrong command line option `")
- << argv[argi]
- << _("'. Exiting.") << endl;
+ lyxerr << bformat(_("Wrong command line option `%1$s'. Exiting."),
+ argv[argi]) << endl;
exit(1);
}
}
files.push_back(argv[argi]);
}
- if (first_start) {
+ if (first_start)
files.push_back(i18nLibFileSearch("examples", "splash.lyx"));
- }
// Execute batch commands if available
if (!batch_command.empty()) {
+
lyxerr[Debug::INIT] << "About to handle -x '"
- << batch_command << "'" << endl;
+ << batch_command << '\'' << endl;
Buffer * last_loaded = 0;
-
- vector<string>::iterator it = files.begin();
- vector<string>::iterator end = files.end();
- for (; it != end; ++it) {
- last_loaded = bufferlist.loadLyXFile(*it);
- }
-
- files.clear();
- // no buffer loaded, create one
- if (!last_loaded)
- last_loaded = bufferlist.newFile("tmpfile", string());
+ vector<string>::const_iterator it = files.begin();
+ vector<string>::const_iterator end = files.end();
- bool success = false;
+ for (; it != end; ++it) {
+ // get absolute path of file and add ".lyx" to
+ // the filename if necessary
+ string s = FileSearch(string(), *it, "lyx");
+ if (s.empty()) {
+ last_loaded = newFile(*it, "");
+ } else {
+ last_loaded = bufferlist.newBuffer(s, false);
+ last_loaded->error.connect(boost::bind(&LyX::printError, this, _1));
+ if (!loadLyXFile(last_loaded, s)) {
+ bufferlist.release(last_loaded);
+ last_loaded = newFile(*it, string());
+ }
+ }
+ }
// try to dispatch to last loaded buffer first
- bool const dispatched = last_loaded->dispatch(batch_command, &success);
-
- if (dispatched) {
- QuitLyX();
- exit(!success);
- }
+ if (last_loaded) {
+ bool success = false;
+ if (last_loaded->dispatch(batch_command, &success)) {
+ QuitLyX();
+ exit(!success);
+ }
+ }
+ files.clear(); // the files are already loaded
}
lyx_gui::start(batch_command, files);
extern "C" {
-static
-void error_handler(int err_sig)
+static void error_handler(int err_sig)
{
switch (err_sig) {
case SIGHUP:
lyxerr << "Bye." << endl;
if (err_sig!= SIGHUP &&
(!GetEnv("LYXDEBUG").empty() || err_sig == SIGSEGV))
- lyx::abort();
+ lyx::support::abort();
exit(0);
}
}
+void LyX::printError(ErrorItem const & ei)
+{
+ std::cerr << _("LyX: ") << ei.error
+ << ':' << ei.description << std::endl;
+
+}
+
+
void LyX::init(bool gui)
{
- // Install the signal handlers
signal(SIGHUP, error_handler);
signal(SIGFPE, error_handler);
signal(SIGSEGV, error_handler);
signal(SIGINT, error_handler);
signal(SIGTERM, error_handler);
- //
- // Determine path of binary
- //
-
- string binpath = os::binpath();
- string binname = os::binname();
- string fullbinname = MakeAbsPath(binname, binpath);
-
- if (binpath.empty()) {
- lyxerr << _("Warning: could not determine path of binary.")
- << "\n"
- << _("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;
-
- //
- // Determine system directory.
- //
-
- // Directories are searched in this order:
- // 1) -sysdir command line parameter
- // 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
- // binary> is a symbolic link.
- // 5) hardcoded lyx_dir
- // The directory is checked for the presence of the file
- // "chkconfig.ltx", and if that is present, the directory
- // is accepted as the system directory.
- // If no chkconfig.ltx file is found, a warning is given,
- // and the hardcoded lyx_dir is used.
-
- // If we had a command line switch, system_lyxdir is already set
- string searchpath;
- if (!system_lyxdir.empty())
- searchpath = MakeAbsPath(system_lyxdir) + ';';
-
- // LYX_DIR_13x environment variable
- string const lyxdir = GetEnvPath("LYX_DIR_13x");
-
- if (!lyxdir.empty()) {
- lyxerr[Debug::INIT] << "LYX_DIR_13x: " << lyxdir << endl;
- searchpath += lyxdir + ';';
- }
-
- string fullbinpath = binpath;
- FileInfo file(fullbinname, true);
- if (file.isLink()) {
- lyxerr[Debug::INIT] << "binary is a link" << endl;
- string link;
- if (LyXReadLink(fullbinname, link, true)) {
- // Path of binary/../share/name of binary/
- searchpath += NormalizePath(AddPath(binpath,
- "../share/")
- + OnlyFilename(binname));
- searchpath += ';';
- fullbinpath = link;
- binpath = MakeAbsPath(OnlyPath(fullbinpath));
- }
- }
-
- bool followlink;
- do {
- // Path of binary/../share/name of binary/
- searchpath += NormalizePath(AddPath(binpath, "../share/") +
- OnlyFilename(binname)) + ';';
-
- // Follow Symlinks
- FileInfo file(fullbinpath, true);
- followlink = file.isLink();
- if (followlink) {
- lyxerr << " directory " << fullbinpath
- << " is a link" << endl;
- string link;
- if (LyXReadLink(fullbinpath, link, true)) {
- fullbinpath = link;
- binpath = MakeAbsPath(OnlyPath(fullbinpath));
- }
- else {
- followlink = false;
- }
- }
- } 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;
-
- // If debugging, show complete search path
- lyxerr[Debug::INIT] << "System directory search path: "
- << searchpath << endl;
-
- string const filename = "chkconfig.ltx";
- string const temp = FileOpenSearch(searchpath, filename, string());
- system_lyxdir = OnlyPath(temp);
-
- // Reduce "path/../path" stuff out of system directory
- system_lyxdir = NormalizePath(system_lyxdir);
-
- bool path_shown = false;
-
- // Warn if environment variable is set, but unusable
- if (!lyxdir.empty()) {
- if (system_lyxdir != NormalizePath(lyxdir)) {
- lyxerr <<_("LYX_DIR_13x environment variable no good.")
- << '\n'
- << _("System directory set to: ")
- << system_lyxdir << endl;
- path_shown = true;
- }
- }
-
- // Warn the user if we couldn't find "chkconfig.ltx"
- if (system_lyxdir == "./") {
- lyxerr <<_("LyX Warning! Couldn't determine system directory. ")
- <<_("Try the '-sysdir' command line parameter or ")
- <<_("set the environment variable LYX_DIR_13x to the "
- "LyX system directory ")
- << _("containing the file `chkconfig.ltx'.") << endl;
- if (!path_shown) {
- FileInfo fi(LYX_DIR);
- if (!fi.exist()) {
- lyxerr << "Couldn't even find the default LYX_DIR." << endl
- << "Giving up." << endl;
- exit(1);
- }
- lyxerr << _("Using built-in default ")
- << LYX_DIR << _(" but expect problems.")
- << endl;
- } else {
- lyxerr << _("Expect problems.") << endl;
- }
- system_lyxdir = LYX_DIR;
- path_shown = true;
- }
- // Report the system directory if debugging is on
- if (!path_shown)
- lyxerr[Debug::INIT] << "System directory: '"
- << system_lyxdir << '\'' << endl;
-
- //
- // Determine user lyx-dir
- //
-
- // Directories are searched in this order:
- // 1) -userdir command line parameter
- // 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_13x environment variable
- user_lyxdir = GetEnvPath("LYX_USERDIR_13x");
-
- // default behaviour
- if (user_lyxdir.empty())
- user_lyxdir = AddPath(GetEnvPath("HOME"),
- string(".") + PACKAGE);
- explicit_userdir = false;
- }
-
- lyxerr[Debug::INIT] << "User LyX directory: '"
- << user_lyxdir << '\'' << endl;
+ bool const explicit_userdir = setLyxPaths();
// Check that user LyX directory is ok. We don't do that if
// running in batch mode.
first_start = false;
}
- //
- // Shine up lyxrc defaults
- //
+ // Disable gui when easyparse says so
+ lyx_gui::use_gui = gui;
- // Default template path: system_dir/templates
if (lyxrc.template_path.empty()) {
- lyxrc.template_path = AddPath(system_lyxdir, "templates");
+ lyxrc.template_path = AddPath(system_lyxdir(), "templates");
}
- // Default lastfiles file: $HOME/.lyx/lastfiles
if (lyxrc.lastfiles.empty()) {
- lyxrc.lastfiles = AddName(user_lyxdir, "lastfiles");
+ lyxrc.lastfiles = AddName(user_lyxdir(), "lastfiles");
}
- // Disable gui when either lyxrc or easyparse says so
- if (!gui)
- lyxrc.use_gui = false;
+ if (lyxrc.roman_font_name.empty())
+ lyxrc.roman_font_name = lyx_gui::roman_font_name();
+ if (lyxrc.sans_font_name.empty())
+ lyxrc.sans_font_name = lyx_gui::sans_font_name();
+ if (lyxrc.typewriter_font_name.empty())
+ lyxrc.typewriter_font_name = lyx_gui::typewriter_font_name();
//
// Read configuration files
system_converters = converters;
system_lcolor = lcolor;
- // If there is a preferences file we read that instead
- // of the old lyxrc file.
- if (!readRcFile("preferences"))
- readRcFile("lyxrc");
+ string prefsfile = "preferences";
+ // back compatibility to lyxs < 1.1.6
+ if (LibFileSearch(string(), prefsfile).empty())
+ prefsfile = "lyxrc";
+ if (!LibFileSearch(string(), prefsfile).empty())
+ readRcFile(prefsfile);
- // Read encodings
readEncodingsFile("encodings");
- // Read languages
readLanguagesFile("languages");
// Load the layouts
lyxerr[Debug::INIT] << "Reading layouts..." << endl;
LyXSetStyle();
- // Ensure that we have really read a bind file, so that LyX is
- // usable.
- lyxrc.readBindFileIfNeeded();
-
- // Read menus
- readUIFile(lyxrc.ui_file);
+ if (gui) {
+ // Set up bindings
+ toplevel_keymap.reset(new kb_keymap);
+ defaultKeyBindings(toplevel_keymap.get());
+ toplevel_keymap->read(lyxrc.bind_file);
- // Bind the X dead keys to the corresponding LyX functions if
- // necessary.
- if (lyxrc.override_x_deadkeys)
- deadKeyBindings(toplevel_keymap.get());
+ // Read menus
+ readUIFile(lyxrc.ui_file);
+ }
- if (lyxerr.debugging(Debug::LYXRC)) {
+ if (lyxerr.debugging(Debug::LYXRC))
lyxrc.print();
- }
- // Create temp directory
os::setTmpDir(CreateLyXTmpDir(lyxrc.tempdir_path));
- system_tempdir = os::getTmpDir();
if (lyxerr.debugging(Debug::INIT)) {
- lyxerr << "LyX tmp dir: `" << system_tempdir << '\'' << endl;
+ lyxerr << "LyX tmp dir: `" << os::getTmpDir() << '\'' << endl;
}
- // load the lastfiles mini-database
lyxerr[Debug::INIT] << "Reading lastfiles `"
<< lyxrc.lastfiles << "'..." << endl;
lastfiles.reset(new LastFiles(lyxrc.lastfiles,
}
-// These are the default bindings known to LyX
void LyX::defaultKeyBindings(kb_keymap * kbmap)
{
kbmap->bind("Right", LFUN_RIGHT);
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("Tab", LFUN_CELL_FORWARD);
+ kbmap->bind("ISO_Left_Tab", LFUN_CELL_FORWARD); // jbl 2001-23-02
kbmap->bind("Home", LFUN_HOME);
kbmap->bind("End", LFUN_END);
kbmap->bind("KP_Prior", LFUN_PRIOR);
kbmap->bind("KP_Next", LFUN_NEXT);
- 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
+ kbmap->bind("C-Tab", LFUN_CELL_SPLIT); // ale970515
+ kbmap->bind("S-Tab", LFUN_CELL_BACKWARD); // jug20000522
+ kbmap->bind("S-ISO_Left_Tab", LFUN_CELL_BACKWARD); // jbl 2001-23-02
}
}
-// LyX can optionally take over the handling of deadkeys
void LyX::deadKeyBindings(kb_keymap * kbmap)
{
// bindKeyings for transparent handling of deadkeys
}
-// This one is not allowed to use anything on the main form, since that
-// one does not exist yet. (Asger)
void LyX::queryUserLyXDir(bool explicit_userdir)
{
+ string const configure_script = AddName(system_lyxdir(), "configure");
+
// Does user directory exist?
- FileInfo fileInfo(user_lyxdir);
+ FileInfo fileInfo(user_lyxdir());
if (fileInfo.isOK() && fileInfo.isDir()) {
first_start = false;
+ FileInfo script(configure_script);
+ FileInfo defaults(AddName(user_lyxdir(), "lyxrc.defaults"));
+ if (defaults.isOK() && script.isOK()
+ && defaults.getModificationTime() < script.getModificationTime()) {
+ lyxerr << _("LyX: reconfiguring user directory")
+ << endl;
+ Path p(user_lyxdir());
+ ::system(configure_script.c_str());
+ lyxerr << "LyX: " << _("Done!") << endl;
+ }
return;
- } else {
- first_start = !explicit_userdir;
}
- // If the user specified explicitely a directory, ask whether
- // to create it (otherwise, always create it)
- if (explicit_userdir &&
- !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;
- // No, let's use $HOME instead.
- user_lyxdir = GetEnvPath("HOME");
- return;
- }
+ first_start = !explicit_userdir;
- // Tell the user what is going on
- lyxerr << _("LyX: Creating directory ") << user_lyxdir
- << _(" and running configure...") << endl;
+ lyxerr << bformat(_("LyX: Creating directory %1$s"
+ " and running configure..."), user_lyxdir()) << endl;
- // Create directory structure
- if (!createDirectory(user_lyxdir, 0755)) {
+ if (!createDirectory(user_lyxdir(), 0755)) {
// Failed, let's use $HOME instead.
- user_lyxdir = GetEnvPath("HOME");
- lyxerr << _("Failed. Will use ") << user_lyxdir
- << _(" instead.") << endl;
+ user_lyxdir(GetEnvPath("HOME"));
+ lyxerr << bformat(_("Failed. Will use %1$s instead."),
+ user_lyxdir()) << endl;
return;
}
// Run configure in user lyx directory
- Path p(user_lyxdir);
- ::system(AddName(system_lyxdir, "configure").c_str());
+ Path p(user_lyxdir());
+ ::system(configure_script.c_str());
lyxerr << "LyX: " << _("Done!") << endl;
}
-// Read the rc file `name'
-bool LyX::readRcFile(string const & name)
+void 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
<< " in " << lyxrc_path << endl;
- 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;
+
+ if (lyxrc.read(lyxrc_path) >= 0)
+ return;
}
- return false;
+ showFileError(name);
}
enum Uitags {
ui_menuset = 1,
ui_toolbar,
+ ui_toolbars,
+ ui_include,
ui_last
};
- struct keyword_item uitags[ui_last-1] = {
+ struct keyword_item uitags[ui_last - 1] = {
+ { "include", ui_include },
{ "menuset", ui_menuset },
- { "toolbar", ui_toolbar }
+ { "toolbar", ui_toolbar },
+ { "toolbars", ui_toolbars }
};
+ // Ensure that a file is read only once (prevents include loops)
+ static std::list<string> uifiles;
+ std::list<string>::const_iterator it = uifiles.begin();
+ std::list<string>::const_iterator end = uifiles.end();
+ it = std::find(it, end, name);
+ if (it != end) {
+ lyxerr[Debug::INIT] << "UI file '" << name
+ << "' has been read already. "
+ << "Is this an include loop?"
+ << endl;
+ return;
+ }
+
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;
- menubackend.defaults();
+ showFileError(name);
return;
}
+ uifiles.push_back(name);
lyxerr[Debug::INIT] << "Found " << name
<< " in " << ui_path << endl;
while (lex.isOK()) {
switch (lex.lex()) {
+ case ui_include: {
+ lex.next(true);
+ string const file = lex.getString();
+ readUIFile(file);
+ break;
+ }
case ui_menuset:
menubackend.read(lex);
break;
case ui_toolbar:
- toolbardefaults.read(lex);
+ toolbarbackend.read(lex);
+ break;
+
+ case ui_toolbars:
+ toolbarbackend.readToolbars(lex);
break;
default:
string const lang_path = LibFileSearch(string(), name);
if (lang_path.empty()) {
- lyxerr[Debug::INIT] << "Could not find " << name << endl;
- languages.setDefaults();
+ showFileError(name);
return;
}
languages.read(lang_path);
string const enc_path = LibFileSearch(string(), name);
if (enc_path.empty()) {
- lyxerr[Debug::INIT] << "Could not find " << name << endl;
+ showFileError(name);
return;
}
encodings.read(enc_path);
namespace {
-// Set debugging level and report result to user
-void setDebuggingLevel(string const & dbgLevel)
+bool is_gui = true;
+string batch;
+
+/// return the the number of arguments consumed
+typedef boost::function<int(string const &, string const &)> cmd_helper;
+
+int parse_dbg(string const & arg, string const &)
{
- lyxerr << _("Setting debug level to ") << dbgLevel << endl;
- lyxerr.level(Debug::value(dbgLevel));
+ if (arg.empty()) {
+ lyxerr << _("List of supported debug flags:") << endl;
+ Debug::showTags(lyxerr);
+ exit(0);
+ }
+ lyxerr << bformat(_("Setting debug level to %1$s"), arg) << endl;
+
+ lyxerr.level(Debug::value(arg));
Debug::showLevel(lyxerr, lyxerr.level());
+ return 1;
}
-// Give command line help
-void commandLineHelp()
+int parse_help(string const &, string const &)
{
lyxerr <<
_("Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
" and file.xxx is the file to be imported.\n"
"\t-version summarize version and build info\n"
"Check the LyX man page for more details.") << endl;
+ exit(0);
+ return 0;
}
-// Give command line version information
-void commandLineVersionInfo()
+int parse_version(string const &, string const &)
{
lyxerr << "LyX " << lyx_version
<< " of " << lyx_release_date << endl;
lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl;
lyxerr << lyx_version_info << endl;
+ exit(0);
+ return 0;
}
+int parse_sysdir(string const & arg, string const &)
+{
+ if (arg.empty()) {
+ lyxerr << _("Missing directory for -sysdir switch") << endl;
+ exit(1);
+ }
+ system_lyxdir(arg);
+ return 1;
+}
-} // namespace anon
+int parse_userdir(string const & arg, string const &)
+{
+ if (arg.empty()) {
+ lyxerr << _("Missing directory for -userdir switch") << endl;
+ exit(1);
+ }
+ user_lyxdir(arg);
+ return 1;
+}
+int parse_execute(string const & arg, string const &)
+{
+ if (arg.empty()) {
+ lyxerr << _("Missing command string after --execute switch") << endl;
+ exit(1);
+ }
+ batch = arg;
+ // Argh. Setting gui to false segfaults..
+ // FIXME: when ? how ?
+ // is_gui = false;
+ return 1;
+}
-bool LyX::easyParse(int & argc, char * argv[])
+int parse_export(string const & type, string const &)
{
- bool gui = true;
- int removeargs = 0; // used when options are read
- for (int i = 1; i < argc; ++i) {
- string arg = argv[i];
+ if (type.empty()) {
+ lyxerr << _("Missing file type [eg latex, ps...] after "
+ "--export switch") << endl;
+ exit(1);
+ }
+ batch = "buffer-export " + type;
+ is_gui = false;
+ return 1;
+}
- // Check for -dbg int
- if (arg == "-dbg") {
- if (i + 1 < argc) {
- setDebuggingLevel(argv[i + 1]);
- removeargs = 2;
- } else {
- lyxerr << _("List of supported debug flags:")
- << endl;
- Debug::showTags(lyxerr);
- exit(1);
- }
- }
- // Check for "-sysdir"
- else if (arg == "-sysdir") {
- if (i + 1 < argc) {
- system_lyxdir = argv[i + 1];
- removeargs = 2;
- } else {
- lyxerr << _("Missing directory for -sysdir switch!")
- << endl;
- exit(1);
- }
- }
- // Check for "-userdir"
- else if (arg == "-userdir") {
- if (i + 1 < argc) {
- user_lyxdir = argv[i + 1];
- removeargs = 2;
- } else {
- lyxerr << _("Missing directory for -userdir switch!")
- << endl;
- 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") {
- // gui = false;
- //}
-
- // Check for "-x": Execute commands
- else if (arg == "-x" || arg == "--execute") {
- if (i + 1 < argc) {
- batch_command = string(argv[i + 1]);
- removeargs = 2;
- }
- else
- lyxerr << _("Missing command string after -x switch!") << endl;
+int parse_import(string const & type, string const & file)
+{
+ if (type.empty()) {
+ lyxerr << _("Missing file type [eg latex, ps...] after "
+ "--import switch") << endl;
+ exit(1);
+ }
+ if (file.empty()) {
+ lyxerr << _("Missing filename for --import") << endl;
+ exit(1);
+ }
- // Argh. Setting gui to false segfaults..
- // FIXME: when ? how ?
- // gui = false;
- }
+ batch = "buffer-import " + type + ' ' + file;
+ return 2;
+}
+
+} // namespace anon
- else if (arg == "-e" || arg == "--export") {
- if (i + 1 < argc) {
- string type(argv[i+1]);
- removeargs = 2;
- batch_command = "buffer-export " + type;
- gui = false;
- } else {
- lyxerr << _("Missing file type [eg latex, "
- "ps...] after ")
- << arg << _(" switch!") << endl;
- exit(1);
- }
- }
- else if (arg == "-i" || arg == "--import") {
- 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;
+bool LyX::easyParse(int & argc, char * argv[])
+{
+ std::map<string, cmd_helper> cmdmap;
+
+ cmdmap["-dbg"] = parse_dbg;
+ cmdmap["-help"] = parse_help;
+ cmdmap["--help"] = parse_help;
+ cmdmap["-version"] = parse_version;
+ cmdmap["--version"] = parse_version;
+ cmdmap["-sysdir"] = parse_sysdir;
+ cmdmap["-userdir"] = parse_userdir;
+ cmdmap["-x"] = parse_execute;
+ cmdmap["--execute"] = parse_execute;
+ cmdmap["-e"] = parse_export;
+ cmdmap["--export"] = parse_export;
+ cmdmap["-i"] = parse_import;
+ cmdmap["--import"] = parse_import;
- batch_command = "buffer-import " + type + " " + file;
- lyxerr << "batch_command: "
- << batch_command << endl;
+ for (int i = 1; i < argc; ++i) {
+ std::map<string, cmd_helper>::const_iterator it
+ = cmdmap.find(argv[i]);
- } else {
- lyxerr << _("Missing type [eg latex, "
- "ps...] after ")
- << arg << _(" switch!") << endl;
- exit(1);
- }
- }
+ // don't complain if not found - may be parsed later
+ if (it == cmdmap.end())
+ continue;
- if (removeargs > 0) {
- // Now, remove used arguments by shifting
- // the following ones removeargs places down.
- argc -= removeargs;
- for (int j = i; j < argc; ++j)
- argv[j] = argv[j + removeargs];
- --i; // After shift, check this number again.
- removeargs = 0;
- }
+ string arg((i + 1 < argc) ? argv[i + 1] : "");
+ string arg2((i + 2 < argc) ? argv[i + 2] : "");
+ int const remove = 1 + it->second(arg, arg2);
+
+ // Now, remove used arguments by shifting
+ // the following ones remove places down.
+ argc -= remove;
+ for (int j = i; j < argc; ++j)
+ argv[j] = argv[j + remove];
+ --i;
}
- return gui;
+ batch_command = batch;
+
+ return is_gui;
}