X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.C;h=ecb5e296634089d5907f8b0e8e22e7bd8b6a2acf;hb=98c966c64594611e469313314abd1e59524adb4a;hp=0eabab20218b243e591ad2b49dea4a3e255fc7f2;hpb=d6665cba427b04ae37f42c846398cad518d2be0f;p=lyx.git diff --git a/src/lyx_main.C b/src/lyx_main.C index 0eabab2021..ecb5e29663 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -1,46 +1,59 @@ /* This file is part of - * ====================================================== - * + * ====================================================== + * * LyX, The Document Processor - * + * * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. + * Copyright 1995-2001 The LyX Team. * * ====================================================== */ #include - -#include -#include +#include #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/FileInfo.h" #include "lastfiles.h" #include "intl.h" #include "lyxserver.h" -#include "layout.h" +//#include "layout.h" +#include "lyxtextclasslist.h" #include "gettext.h" #include "kbmap.h" #include "MenuBackend.h" #include "ToolbarDefaults.h" #include "lyxlex.h" +#include "encoding.h" +#include "converter.h" +#include "language.h" + +#include "frontends/Alert.h" +#include "frontends/GUIRunTime.h" + +#include "support/path.h" +#include "support/filetools.h" +#include "support/FileInfo.h" +#include "support/os.h" + +#include +#include using std::endl; +#ifndef CXX_GLOBAL_CSTD +using std::signal; +#endif + extern void LoadLyXFile(string const &); extern void QuitLyX(); @@ -52,7 +65,7 @@ string user_lyxdir; // Default $HOME/.lyx // Should this be kept global? Asger says Yes. DebugStream lyxerr; -LastFiles * lastfiles; +boost::scoped_ptr lastfiles; // This is the global bufferlist object BufferList bufferlist; @@ -62,27 +75,23 @@ LyXServer * lyxserver = 0; bool finished = false; // flag, that we are quitting the program // convenient to have it here. -kb_keymap * toplevel_keymap; +boost::scoped_ptr toplevel_keymap; 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); // Global bindings (this must be done as early as possible.) (Lgb) - toplevel_keymap = new kb_keymap; - defaultKeyBindings(toplevel_keymap); - + 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); + lyxGUI.reset(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 @@ -96,16 +105,16 @@ LyX::LyX(int * argc, char * argv[]) exit(0); } } - + // Initialization of LyX (reads lyxrc and more) lyxerr[Debug::INIT] << "Initializing LyX::init..." << endl; - init(argc, argv, gui); + init(gui); lyxerr[Debug::INIT] << "Initializing LyX::init...done" << endl; lyxGUI->init(); // Load the files specified in the command line. - if ((*argc) == 2) + if ((*argc) == 2) lyxerr[Debug::INFO] << "Opening document..." << endl; else if ((*argc) > 2) lyxerr[Debug::INFO] << "Opening documents..." << endl; @@ -120,7 +129,8 @@ LyX::LyX(int * argc, char * argv[]) } if (first_start) { - string splash = i18nLibFileSearch("examples", "splash.lyx"); + string const splash = + i18nLibFileSearch("examples", "splash.lyx"); lyxerr[Debug::INIT] << "Opening splash document " << splash << "..." << endl; Buffer * loadb = bufferlist.loadLyXFile(splash); @@ -145,9 +155,9 @@ LyX::LyX(int * argc, char * argv[]) last_loaded = bufferlist.newFile("tmpfile", string()); // try to dispatch to last loaded buffer first - bool dispatched = last_loaded->Dispatch(batch_command); + bool dispatched = last_loaded->dispatch(batch_command); - // if this was successful, return. + // if this was successful, return. // Maybe we could do something more clever than aborting... if (dispatched) { lyxerr << "We are done!" << endl; @@ -157,11 +167,11 @@ LyX::LyX(int * argc, char * argv[]) // otherwise, let the GUI handle the batch command lyxGUI->regBuf(last_loaded); - lyxGUI->getLyXView()->getLyXFunc()->Dispatch(batch_command); + lyxGUI->getLyXView()->getLyXFunc()->verboseDispatch(batch_command, false); // fall through... } - + // Let the ball begin... lyxGUI->runTime(); } @@ -170,14 +180,57 @@ LyX::LyX(int * argc, char * argv[]) // A destructor is always necessary (asierra-970604) LyX::~LyX() { - delete lastfiles; - delete lyxGUI; } -extern "C" void error_handler(int err_sig); +extern "C" { + +static +void error_handler(int err_sig) +{ + switch (err_sig) { + case SIGHUP: + lyxerr << "\nlyx: SIGHUP signal caught" << endl; + break; + case SIGINT: + // no comments + break; + case SIGFPE: + lyxerr << "\nlyx: SIGFPE signal caught" << endl; + break; + case SIGSEGV: + lyxerr << "\nlyx: SIGSEGV signal caught" << endl; + lyxerr << + "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(SIGFPE, SIG_DFL); + signal(SIGSEGV, SIG_DFL); + signal(SIGTERM, SIG_DFL); + + LyX::emergencyCleanup(); + + lyxerr << "Bye." << endl; + if (err_sig!= SIGHUP && + (!GetEnv("LYXDEBUG").empty() || err_sig == SIGSEGV)) + lyx::abort(); + exit(0); +} + +} + -void LyX::init(int */*argc*/, char **argv, bool gui) +void LyX::init(bool gui) { // Install the signal handlers signal(SIGHUP, error_handler); @@ -190,28 +243,9 @@ void LyX::init(int */*argc*/, char **argv, bool gui) // Determine path of binary // - string fullbinpath; - string binpath = subst(argv[0], '\\', '/'); - string binname = OnlyFilename(argv[0]); - // Sorry for system specific code. (SMiyata) - if (suffixIs(binname, ".exe")) - binname.erase(binname.length()-4, string::npos); - - binpath = ExpandPath(binpath); // This expands ./ and ~/ - - if (!AbsolutePath(binpath)) { - string binsearchpath = GetEnvPath("PATH"); - // This will make "src/lyx" work always :-) - binsearchpath += ";."; - binpath = FileOpenSearch(binsearchpath, argv[0]); - } - - fullbinpath = binpath; - binpath = MakeAbsPath(OnlyPath(binpath)); - - // In case we are running in place and compiled with shared libraries - if (suffixIs(binpath, "/.libs/")) - binpath.erase(binpath.length()-6, string::npos); + string binpath = os::binpath(); + string binname = os::binname(); + string fullbinname = MakeAbsPath(binname, binpath); if (binpath.empty()) { lyxerr << _("Warning: could not determine path of binary.") @@ -219,6 +253,7 @@ void LyX::init(int */*argc*/, char **argv, bool gui) << _("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; // @@ -245,13 +280,52 @@ void LyX::init(int */*argc*/, char **argv, bool gui) searchpath= MakeAbsPath(system_lyxdir) + ';'; // LYX_DIR_11x environment variable - string lyxdir = GetEnvPath("LYX_DIR_11x"); - + string const lyxdir = GetEnvPath("LYX_DIR_11x"); + if (!lyxdir.empty()) { lyxerr[Debug::INIT] << "LYX_DIR_11x: " << 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)) { + // 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)) { + fullbinpath = link; + binpath = MakeAbsPath(OnlyPath(fullbinpath)); + } + else { + followlink = false; + } + } + } while (followlink); + // /TOP_SRCDIR/lib build_lyxdir = MakeAbsPath("../lib", binpath); if (!FileSearch(build_lyxdir, "lyxrc.defaults").empty()) { @@ -266,27 +340,6 @@ void LyX::init(int */*argc*/, char **argv, bool gui) build_lyxdir.erase(); } - 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) { - string Link; - if (LyXReadLink(fullbinpath, Link)) { - fullbinpath = Link; - binpath = MakeAbsPath(OnlyPath(fullbinpath)); - } - else { - FollowLink = false; - } - } - } while (FollowLink); - // Hardcoded dir searchpath += LYX_DIR; @@ -295,7 +348,7 @@ void LyX::init(int */*argc*/, char **argv, bool gui) << searchpath << endl; string const filename = "chkconfig.ltx"; - string temp = FileOpenSearch(searchpath, filename, string()); + string const temp = FileOpenSearch(searchpath, filename, string()); system_lyxdir = OnlyPath(temp); // Reduce "path/../path" stuff out of system directory @@ -308,7 +361,7 @@ void LyX::init(int */*argc*/, char **argv, bool gui) if (system_lyxdir != NormalizePath(lyxdir)) { lyxerr <<_("LYX_DIR_11x environment variable no good.") << '\n' - << _("System directory set to: ") + << _("System directory set to: ") << system_lyxdir << endl; path_shown = true; } @@ -316,30 +369,36 @@ void LyX::init(int */*argc*/, char **argv, bool gui) // 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") + lyxerr <<_("LyX Warning! Couldn't determine system directory. ") + <<_("Try the '-sysdir' command line parameter or ") <<_("set the environment variable LYX_DIR_11x to the " - "LyX system directory") + "LyX system directory ") << _("containing the file `chkconfig.ltx'.") << endl; - if (!path_shown) - lyxerr << _("Using built-in default ") + 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 + } 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; + << system_lyxdir << '\'' << endl; // // Determine user lyx-dir // - + // Directories are searched in this order: // 1) -userdir command line parameter // 2) LYX_USERDIR_11x environment variable @@ -349,52 +408,50 @@ void LyX::init(int */*argc*/, char **argv, bool gui) bool explicit_userdir = true; if (user_lyxdir.empty()) { - // LYX_USERDIR_11x environment variable + // LYX_USERDIR_11x environment variable user_lyxdir = GetEnvPath("LYX_USERDIR_11x"); - // default behaviour + // default behaviour if (user_lyxdir.empty()) user_lyxdir = AddPath(GetEnvPath("HOME"), string(".") + PACKAGE); 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. - queryUserLyXDir(explicit_userdir); - - // - // Load the layouts first - // - - lyxerr[Debug::INIT] << "Reading layouts..." << endl; - LyXSetStyle(); + // Check that user LyX directory is ok. We don't do that if + // running in batch mode. + if (gui) { + queryUserLyXDir(explicit_userdir); + } 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: + + // Calculate screen dpi as average of x-DPI and y-DPI: if (lyxrc.use_gui) { - lyxrc.dpi = getScreenDPI(); + lyxrc.dpi = GUIRunTime::getScreenDPI(); lyxerr[Debug::INIT] << "DPI setting detected to be " - << lyxrc.dpi + 0.5 << endl; + << lyxrc.dpi + 0.5 << endl; } else { lyxrc.dpi = 1; // I hope this is safe } @@ -403,42 +460,55 @@ void LyX::init(int */*argc*/, char **argv, bool gui) // Read configuration files // - ReadRcFile("lyxrc.defaults"); -// system_lyxrc = lyxrc; + readRcFile("lyxrc.defaults"); + system_lyxrc = lyxrc; + system_formats = formats; + 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"); + if (!readRcFile("preferences")) + readRcFile("lyxrc"); + + // 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. - if (!lyxrc.hasBindFile) - lyxrc.ReadBindFile(); + lyxrc.readBindFileIfNeeded(); // Read menus - ReadUIFile(lyxrc.ui_file); + 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); + deadKeyBindings(toplevel_keymap.get()); if (lyxerr.debugging(Debug::LYXRC)) { lyxrc.print(); } - // Create temp directory - system_tempdir = CreateLyXTmpDir(lyxrc.tempdir_path); + // 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; } // load the lastfiles mini-database lyxerr[Debug::INIT] << "Reading lastfiles `" - << lyxrc.lastfiles << "'..." << endl; - lastfiles = new LastFiles(lyxrc.lastfiles, - lyxrc.check_lastfiles, - lyxrc.num_lastfiles); + << lyxrc.lastfiles << "'..." << endl; + lastfiles.reset(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 @@ -446,6 +516,7 @@ void LyX::init(int */*argc*/, char **argv, bool gui) // lyxserver = new LyXServer; } + // These are the default bindings known to LyX void LyX::defaultKeyBindings(kb_keymap * kbmap) { @@ -453,48 +524,71 @@ void LyX::defaultKeyBindings(kb_keymap * kbmap) 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("~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_Decimal", LFUN_SELFINSERT); - kbmap->bind("KP_Enter", LFUN_SELFINSERT); - kbmap->bind("KP_1", LFUN_SELFINSERT); - kbmap->bind("KP_2", LFUN_SELFINSERT); - kbmap->bind("KP_3", LFUN_SELFINSERT); - kbmap->bind("KP_4", LFUN_SELFINSERT); - kbmap->bind("KP_5", LFUN_SELFINSERT); - kbmap->bind("KP_6", LFUN_SELFINSERT); - kbmap->bind("KP_Add", LFUN_SELFINSERT); - kbmap->bind("KP_7", LFUN_SELFINSERT); - kbmap->bind("KP_8", LFUN_SELFINSERT); - kbmap->bind("KP_9", LFUN_SELFINSERT); - kbmap->bind("KP_Divide", LFUN_SELFINSERT); - kbmap->bind("KP_Multiply", LFUN_SELFINSERT); - kbmap->bind("KP_Subtract", LFUN_SELFINSERT); - - /* Most self-insert keys are handled in the 'default:' section of - * WorkAreaKeyPress - so we don't have to define them all. - * However keys explicit decleared as self-insert are - * handled seperatly (LFUN_SELFINSERT.) Lgb. */ - - kbmap->bind("C-Tab", LFUN_TABINSERT); // ale970515 + //kbmap->bind("KP_0", LFUN_SELFINSERT); + //kbmap->bind("KP_Decimal", LFUN_SELFINSERT); + kbmap->bind("KP_Enter", LFUN_BREAKPARAGRAPH); + //kbmap->bind("KP_1", LFUN_SELFINSERT); + //kbmap->bind("KP_2", LFUN_SELFINSERT); + //kbmap->bind("KP_3", LFUN_SELFINSERT); + //kbmap->bind("KP_4", LFUN_SELFINSERT); + //kbmap->bind("KP_5", LFUN_SELFINSERT); + //kbmap->bind("KP_6", LFUN_SELFINSERT); + //kbmap->bind("KP_Add", LFUN_SELFINSERT); + //kbmap->bind("KP_7", LFUN_SELFINSERT); + //kbmap->bind("KP_8", LFUN_SELFINSERT); + //kbmap->bind("KP_9", LFUN_SELFINSERT); + //kbmap->bind("KP_Divide", LFUN_SELFINSERT); + //kbmap->bind("KP_Multiply", LFUN_SELFINSERT); + //kbmap->bind("KP_Subtract", LFUN_SELFINSERT); + kbmap->bind("KP_Right", LFUN_RIGHT); + kbmap->bind("KP_Left", LFUN_LEFT); + kbmap->bind("KP_Up", LFUN_UP); + kbmap->bind("KP_Down", LFUN_DOWN); + kbmap->bind("KP_Home", LFUN_HOME); + 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("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) { @@ -522,7 +616,6 @@ void LyX::deadKeyBindings(kb_keymap * kbmap) } - // 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) @@ -533,15 +626,13 @@ void LyX::queryUserLyXDir(bool explicit_userdir) first_start = false; return; } else { - first_start = true; + first_start = !explicit_userdir; } - - // Nope - // Different wording if the user specifically requested a directory - if (!AskQuestion( explicit_userdir - ? _("You have specified an invalid LyX directory.") - : _("You don't have a personal LyX directory.") , + // 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; @@ -571,29 +662,31 @@ void LyX::queryUserLyXDir(bool explicit_userdir) // Read the rc file `name' -bool LyX::ReadRcFile(string const & name) +bool LyX::readRcFile(string const & name) { lyxerr[Debug::INIT] << "About to read " << name << "..." << endl; - - string lyxrc_path = LibFileSearch(string(), name); - if (!lyxrc_path.empty()){ - lyxerr[Debug::INIT] << "Found " << name + + 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) { - WriteAlert(_("LyX Warning!"), - _("Error while reading ")+lyxrc_path+".", + 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; + } else { + lyxerr[Debug::INIT] << "Could not find " << name << endl; + } + return false; } // Read the ui file `name' -void LyX::ReadUIFile(string const & name) +void LyX::readUIFile(string const & name) { enum Uitags { ui_menuset = 1, @@ -607,29 +700,30 @@ void LyX::ReadUIFile(string const & name) }; lyxerr[Debug::INIT] << "About to read " << name << "..." << endl; - - string ui_path = LibFileSearch("ui", name, "ui"); + + 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); lex.setFile(ui_path); - if (!lex.IsOK()) { + if (!lex.isOK()) { 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: + while (lex.isOK()) { + switch (lex.lex()) { + case ui_menuset: menubackend.read(lex); break; @@ -638,14 +732,46 @@ void LyX::ReadUIFile(string const & name) break; default: - lex.printError("LyX::ReadUFile: " - "Unknown menu tag: `$$Token'"); + if (!strip(lex.getString()).empty()) + lex.printError("LyX::ReadUIFile: " + "Unknown menu tag: `$$Token'"); break; } } } +// Read the languages file `name' +void LyX::readLanguagesFile(string const & name) +{ + lyxerr[Debug::INIT] << "About to read " << name << "..." << endl; + + string const lang_path = LibFileSearch(string(), name); + if (lang_path.empty()) { + lyxerr[Debug::INIT] << "Could not find " << name << endl; + languages.setDefaults(); + return; + } + languages.read(lang_path); +} + + +// Read the encodings file `name' +void LyX::readEncodingsFile(string const & name) +{ + lyxerr[Debug::INIT] << "About to read " << name << "..." << endl; + + string const enc_path = LibFileSearch(string(), name); + if (enc_path.empty()) { + lyxerr[Debug::INIT] << "Could not find " << name << endl; + return; + } + encodings.read(enc_path); +} + + +namespace { + // Set debugging level and report result to user void setDebuggingLevel(string const & dbgLevel) { @@ -658,7 +784,6 @@ void setDebuggingLevel(string const & dbgLevel) // Give command line help void commandLineHelp() { - lyxerr << "LyX " LYX_VERSION << " of " LYX_RELEASE << endl; lyxerr << _("Usage: lyx [ command line switches ] [ name.lyx ... ]\n" "Command line switches (case sensitive):\n" @@ -666,17 +791,39 @@ void commandLineHelp() "\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" - "Check the LyX man page for more options.") << endl; + "\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" + " where fmt is the export format of choice.\n" + "\t-i [--import] fmt file.xxx\n" + " where fmt is the import format of choice\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; } +// Give command line version information +void commandLineVersionInfo() +{ + lyxerr << "LyX " << lyx_version + << " of " << lyx_release_date << endl; + lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl; + + lyxerr << lyx_version_info << endl; +} + + +} // namespace anon + + 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 @@ -690,14 +837,14 @@ bool LyX::easyParse(int * argc, char * argv[]) Debug::showTags(lyxerr); exit(0); } - } + } // 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!") + lyxerr << _("Missing directory for -sysdir switch!") << endl; exit(0); } @@ -717,7 +864,12 @@ bool LyX::easyParse(int * argc, char * argv[]) else if (arg == "--help" || arg == "-help") { commandLineHelp(); exit(0); - } + } + // Check for --version or -version + else if (arg == "--version" || arg == "-version") { + commandLineVersionInfo(); + exit(0); + } // 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") { @@ -742,17 +894,18 @@ bool LyX::easyParse(int * argc, char * argv[]) 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; } - else if (arg == "--import") { + else if (arg == "-i" || arg == "--import") { if (i + 1 < *argc) { - string type(argv[i+1]); - string file(argv[i+2]); + string const type(argv[i+1]); + string const file(argv[i+2]); removeargs = 3; - + batch_command = "buffer-import " + type + " " + file; lyxerr << "batch_command: " << batch_command << endl; @@ -777,46 +930,3 @@ bool LyX::easyParse(int * argc, char * argv[]) return gui; } - - -extern "C" -void error_handler(int err_sig) -{ - switch (err_sig) { - case SIGHUP: - lyxerr << "\nlyx: SIGHUP signal caught" << endl; - break; - case SIGINT: - // no comments - break; - case SIGFPE: - lyxerr << "\nlyx: SIGFPE signal caught" << endl; - break; - 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; - break; - case SIGTERM: - // no comments - break; - } - - // Deinstall the signal handlers - signal(SIGHUP, SIG_DFL); - signal(SIGINT, SIG_DFL); - signal(SIGFPE, SIG_DFL); - signal(SIGSEGV, SIG_DFL); - signal(SIGTERM, SIG_DFL); - - bufferlist.emergencyWriteAll(); - - lyxerr << "Bye." << endl; - if(err_sig!= SIGHUP && - (!GetEnv("LYXDEBUG").empty() || err_sig == SIGSEGV)) - lyx::abort(); - exit(0); -}