X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.cpp;h=9cd448ea0b6cedd95860764ab874699f55e5af05;hb=c393abbe12c360eec07a3dcbb5929e6b7c0ad329;hp=0131eb95f9113981ce745fcc2ded20f0873bf34f;hpb=145585dc189203d37dd9eb78e071f8cc2959f82c;p=lyx.git diff --git a/src/LyX.cpp b/src/LyX.cpp index 0131eb95f9..9cd448ea0b 100644 --- a/src/LyX.cpp +++ b/src/LyX.cpp @@ -4,10 +4,10 @@ * Licence details can be found in the file COPYING. * * \author Alfredo Braunstein - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean-Marc Lasgouttes * \author John Levon - * \author André Pönitz + * \author André Pönitz * * Full author contact details are available in file CREDITS. */ @@ -17,23 +17,27 @@ #include "LyX.h" -#include "LayoutFile.h" +#include "AppleSpellChecker.h" +#include "AspellChecker.h" #include "Buffer.h" #include "BufferList.h" #include "CmdDef.h" -#include "Color.h" +#include "ColorSet.h" #include "ConverterCache.h" #include "Converter.h" #include "CutAndPaste.h" +#include "EnchantChecker.h" #include "Encoding.h" #include "ErrorList.h" #include "Format.h" #include "FuncStatus.h" +#include "HunspellChecker.h" #include "KeyMap.h" #include "Language.h" +#include "LayoutFile.h" #include "Lexer.h" +#include "LyX.h" #include "LyXAction.h" -#include "LyXFunc.h" #include "LyXRC.h" #include "ModuleList.h" #include "Mover.h" @@ -44,6 +48,8 @@ #include "frontends/alert.h" #include "frontends/Application.h" +#include "graphics/Previews.h" + #include "support/lassert.h" #include "support/debug.h" #include "support/environment.h" @@ -57,7 +63,7 @@ #include "support/Path.h" #include "support/Systemcall.h" -#include +#include "support/bind.h" #include #include @@ -83,6 +89,15 @@ namespace os = support::os; bool use_gui = true; + +// Tell what files can be silently overwritten during batch export. +// Possible values are: NO_FILES, MAIN_FILE, ALL_FILES, UNSPECIFIED. +// Unless specified on command line (through the -f switch) or through the +// environment variable LYX_FORCE_OVERWRITE, the default will be MAIN_FILE. + +OverwriteFiles force_overwrite = UNSPECIFIED; + + namespace { // Filled with the command line arguments "foo" of "-sysdir foo" or @@ -115,19 +130,25 @@ void reconfigureUserLyXDir() } // namespace anon - /// The main application class private implementation. struct LyX::Impl { - Impl() + Impl() : spell_checker_(0), apple_spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0) { // Set the default User Interface language as soon as possible. // The language used will be derived from the environment // variables. messages_["GUI"] = Messages(); } - /// our function handler - LyXFunc lyxfunc_; + + ~Impl() + { + delete apple_spell_checker_; + delete aspell_checker_; + delete enchant_checker_; + delete hunspell_checker_; + } + /// BufferList buffer_list_; /// @@ -163,7 +184,20 @@ struct LyX::Impl /// has this user started lyx for the first time? bool first_start; /// the parsed command line batch command if any - string batch_command; + vector batch_commands; + + /// + graphics::Previews preview_; + /// + SpellChecker * spell_checker_; + /// + SpellChecker * apple_spell_checker_; + /// + SpellChecker * aspell_checker_; + /// + SpellChecker * enchant_checker_; + /// + SpellChecker * hunspell_checker_; }; /// @@ -179,10 +213,11 @@ frontend::Application * theApp() LyX::~LyX() { delete pimpl_; + singleton_ = 0; } -void LyX::exit(int exit_code) const +void lyx_exit(int exit_code) { if (exit_code) // Something wrong happened so better save everything, just in @@ -202,20 +237,6 @@ void LyX::exit(int exit_code) const } -LyX & LyX::ref() -{ - LASSERT(singleton_, /**/); - return *singleton_; -} - - -LyX const & LyX::cref() -{ - LASSERT(singleton_, /**/); - return *singleton_; -} - - LyX::LyX() : first_start(false) { @@ -224,105 +245,7 @@ LyX::LyX() } -BufferList & LyX::bufferList() -{ - return pimpl_->buffer_list_; -} - - -BufferList const & LyX::bufferList() const -{ - return pimpl_->buffer_list_; -} - - -Session & LyX::session() -{ - LASSERT(pimpl_->session_.get(), /**/); - return *pimpl_->session_.get(); -} - - -Session const & LyX::session() const -{ - LASSERT(pimpl_->session_.get(), /**/); - return *pimpl_->session_.get(); -} - - -LyXFunc & LyX::lyxFunc() -{ - return pimpl_->lyxfunc_; -} - - -LyXFunc const & LyX::lyxFunc() const -{ - return pimpl_->lyxfunc_; -} - - -Server & LyX::server() -{ - LASSERT(pimpl_->lyx_server_.get(), /**/); - return *pimpl_->lyx_server_.get(); -} - - -Server const & LyX::server() const -{ - LASSERT(pimpl_->lyx_server_.get(), /**/); - return *pimpl_->lyx_server_.get(); -} - - -ServerSocket & LyX::socket() -{ - LASSERT(pimpl_->lyx_socket_.get(), /**/); - return *pimpl_->lyx_socket_.get(); -} - - -ServerSocket const & LyX::socket() const -{ - LASSERT(pimpl_->lyx_socket_.get(), /**/); - return *pimpl_->lyx_socket_.get(); -} - - -frontend::Application & LyX::application() -{ - LASSERT(pimpl_->application_.get(), /**/); - return *pimpl_->application_.get(); -} - - -frontend::Application const & LyX::application() const -{ - LASSERT(pimpl_->application_.get(), /**/); - return *pimpl_->application_.get(); -} - - -CmdDef & LyX::topLevelCmdDef() -{ - return pimpl_->toplevel_cmddef_; -} - - -Converters & LyX::converters() -{ - return pimpl_->converters_; -} - - -Converters & LyX::systemConverters() -{ - return pimpl_->system_converters_; -} - - -Messages & LyX::getMessages(string const & language) +Messages & LyX::messages(string const & language) { map::iterator it = pimpl_->messages_.find(language); @@ -337,32 +260,49 @@ Messages & LyX::getMessages(string const & language) } -Messages & LyX::getGuiMessages() -{ - return pimpl_->messages_["GUI"]; -} - - -void LyX::setGuiLanguage(string const & language) +void setRcGuiLanguage() { - pimpl_->messages_["GUI"] = Messages(language); + LASSERT(singleton_, /**/); + if (lyxrc.gui_language == "auto") + return; + Language const * language = languages.getLanguage(lyxrc.gui_language); + if (language) { + LYXERR(Debug::LOCALE, "Setting LANGUAGE to " << language->code()); + if (!setEnv("LANGUAGE", language->code())) + LYXERR(Debug::LOCALE, "\t... failed!"); + } + LYXERR(Debug::LOCALE, "Setting LC_ALL to en_US"); + if (!setEnv("LC_ALL", "en_US")) + LYXERR(Debug::LOCALE, "\t... failed!"); + Messages::init(); + singleton_->pimpl_->messages_["GUI"] = Messages(); } int LyX::exec(int & argc, char * argv[]) { + // Minimal setting of locale before parsing command line + try { + init_package(os::utf8_argv(0), string(), string(), + top_build_dir_is_one_level_up); + } catch (ExceptionMessage const & message) { + LYXERR(Debug::LOCALE, message.title_ + ", " + message.details_); + } + // FIXME: This breaks out of source build under Windows. + locale_init(); + // Here we need to parse the command line. At least // we need to parse for "-dbg" and "-help" easyParse(argc, argv); try { - init_package(to_utf8(from_local8bit(argv[0])), - cl_system_support, cl_user_support, - top_build_dir_is_one_level_up); + init_package(os::utf8_argv(0), + cl_system_support, cl_user_support, + top_build_dir_is_one_level_up); } catch (ExceptionMessage const & message) { if (message.type_ == ErrorException) { Alert::error(message.title_, message.details_); - exit(1); + lyx_exit(1); } else if (message.type_ == WarningException) { Alert::warning(message.title_, message.details_); } @@ -380,11 +320,12 @@ int LyX::exec(int & argc, char * argv[]) return exit_status; } - loadFiles(); + // this is correct, since return values are inverted. + exit_status = !loadFiles(); - if (pimpl_->batch_command.empty() || pimpl_->buffer_list_.empty()) { + if (pimpl_->batch_commands.empty() || pimpl_->buffer_list_.empty()) { prepareExit(); - return EXIT_SUCCESS; + return exit_status; } BufferList::iterator begin = pimpl_->buffer_list_.begin(); @@ -394,9 +335,14 @@ int LyX::exec(int & argc, char * argv[]) Buffer * buf = *I; if (buf != buf->masterBuffer()) continue; - bool success = false; - buf->dispatch(pimpl_->batch_command, &success); - final_success |= success; + vector::const_iterator bcit = pimpl_->batch_commands.begin(); + vector::const_iterator bcend = pimpl_->batch_commands.end(); + DispatchResult dr; + for (; bcit != bcend; bcit++) { + LYXERR(Debug::ACTION, "Buffer::dispatch: cmd: " << *bcit); + buf->dispatch(*bcit, dr); + final_success |= !dr.error(); + } } prepareExit(); return !final_success; @@ -405,6 +351,10 @@ int LyX::exec(int & argc, char * argv[]) // Let the frontend parse and remove all arguments that it knows pimpl_->application_.reset(createApplication(argc, argv)); + // Reestablish our defaults, as Qt overwrites them + // after createApplication() + locale_init(); + // Parse and remove all known arguments in the LyX singleton // Give an error for all remaining ones. int exit_status = init(argc, argv); @@ -425,9 +375,9 @@ int LyX::exec(int & argc, char * argv[]) */ // Note: socket callback must be registered after init(argc, argv) // such that package().temp_dir() is properly initialized. - pimpl_->lyx_server_.reset(new Server(&pimpl_->lyxfunc_, lyxrc.lyxpipes)); - pimpl_->lyx_socket_.reset(new ServerSocket(&pimpl_->lyxfunc_, - FileName(package().temp_dir().absFilename() + "/lyxsocket"))); + pimpl_->lyx_server_.reset(new Server(lyxrc.lyxpipes)); + pimpl_->lyx_socket_.reset(new ServerSocket( + FileName(package().temp_dir().absFileName() + "/lyxsocket"))); // Start the real execution loop. exit_status = pimpl_->application_->exec(); @@ -444,6 +394,9 @@ void LyX::prepareExit() cap::clearCutStack(); cap::clearSelection(); + // Write the index file of the converter cache + ConverterCache::get().writeIndex(); + // close buffers first pimpl_->buffer_list_.closeAll(); @@ -458,14 +411,21 @@ void LyX::prepareExit() // do any other cleanup procedures now if (package().temp_dir() != package().system_temp_dir()) { - LYXERR(Debug::INFO, "Deleting tmp dir " - << package().temp_dir().absFilename()); - - if (!package().temp_dir().destroyDirectory()) { + string const abs_tmpdir = package().temp_dir().absFileName(); + if (!contains(package().temp_dir().absFileName(), "lyx_tmpdir")) { docstring const msg = - bformat(_("Unable to remove the temporary directory %1$s"), - from_utf8(package().temp_dir().absFilename())); - Alert::warning(_("Unable to remove temporary directory"), msg); + bformat(_("%1$s does not appear like a LyX created temporary directory."), + from_utf8(abs_tmpdir)); + Alert::warning(_("Cannot remove temporary directory"), msg); + } else { + LYXERR(Debug::INFO, "Deleting tmp dir " + << package().temp_dir().absFileName()); + if (!package().temp_dir().destroyDirectory()) { + docstring const msg = + bformat(_("Unable to remove the temporary directory %1$s"), + from_utf8(package().temp_dir().absFileName())); + Alert::warning(_("Unable to remove temporary directory"), msg); + } } } @@ -494,7 +454,7 @@ int LyX::init(int & argc, char * argv[]) if (argv[argi][0] == '-') { lyxerr << to_utf8( bformat(_("Wrong command line option `%1$s'. Exiting."), - from_utf8(argv[argi]))) << endl; + from_utf8(os::utf8_argv(argi)))) << endl; return EXIT_FAILURE; } } @@ -507,31 +467,22 @@ int LyX::init(int & argc, char * argv[]) return EXIT_FAILURE; // Remaining arguments are assumed to be files to load. - for (int argi = argc - 1; argi >= 1; --argi) - pimpl_->files_to_load_.push_back(to_utf8(from_local8bit(argv[argi]))); + for (int argi = 1; argi < argc; ++argi) + pimpl_->files_to_load_.push_back(os::utf8_argv(argi)); if (first_start) { pimpl_->files_to_load_.push_back( - i18nLibFileSearch("examples", "splash.lyx").absFilename()); + i18nLibFileSearch("examples", "splash.lyx").absFileName()); } return EXIT_SUCCESS; } -void LyX::addFileToLoad(string const & fname) -{ - vector::const_iterator cit = find( - pimpl_->files_to_load_.begin(), pimpl_->files_to_load_.end(), - fname); - - if (cit == pimpl_->files_to_load_.end()) - pimpl_->files_to_load_.push_back(fname); -} - - -void LyX::loadFiles() +bool LyX::loadFiles() { + LASSERT(!use_gui, /**/); + bool success = true; vector::const_iterator it = pimpl_->files_to_load_.begin(); vector::const_iterator end = pimpl_->files_to_load_.end(); @@ -544,75 +495,86 @@ void LyX::loadFiles() if (fname.empty()) continue; - Buffer * buf = pimpl_->buffer_list_.newBuffer(fname.absFilename(), false); - if (buf->loadLyXFile(fname)) { + Buffer * buf = pimpl_->buffer_list_.newBuffer(fname.absFileName(), false); + if (buf->loadLyXFile(fname) == Buffer::ReadSuccess) { ErrorList const & el = buf->errorList("Parse"); if (!el.empty()) for_each(el.begin(), el.end(), - boost::bind(&LyX::printError, this, _1)); + bind(&LyX::printError, this, _1)); } - else + else { pimpl_->buffer_list_.release(buf); + success = false; + } } + return success; } -void LyX::execBatchCommands() +void execBatchCommands() +{ + LASSERT(singleton_, /**/); + singleton_->execCommands(); +} + + +void LyX::execCommands() { // The advantage of doing this here is that the event loop // is already started. So any need for interaction will be // aknowledged. // if reconfiguration is needed. - while (LayoutFileList::get().empty()) { - switch (Alert::prompt( - _("No textclass is found"), - _("LyX cannot continue because no textclass is found. " - "You can either reconfigure normally, or reconfigure using " - "default textclasses, or quit LyX."), - 0, 2, - _("&Reconfigure"), - _("&Use Default"), - _("&Exit LyX"))) + if (LayoutFileList::get().empty()) { + switch (Alert::prompt( + _("No textclass is found"), + _("LyX will only have minimal functionality because no textclasses " + "have been found. You can either try to reconfigure LyX normally, " + "try to reconfigure using only the defaults, or continue."), + 0, 2, + _("&Reconfigure"), + _("&Use Defaults"), + _("&Continue"))) { case 0: // regular reconfigure - pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_RECONFIGURE, "")); + lyx::dispatch(FuncRequest(LFUN_RECONFIGURE, "")); break; case 1: // reconfigure --without-latex-config - pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_RECONFIGURE, + lyx::dispatch(FuncRequest(LFUN_RECONFIGURE, " --without-latex-config")); break; default: - pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_LYX_QUIT)); - return; + break; } } - + // create the first main window - pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_WINDOW_NEW, geometryArg)); + lyx::dispatch(FuncRequest(LFUN_WINDOW_NEW, geometryArg)); if (!pimpl_->files_to_load_.empty()) { // if some files were specified at command-line we assume that the // user wants to edit *these* files and not to restore the session. for (size_t i = 0; i != pimpl_->files_to_load_.size(); ++i) { - pimpl_->lyxfunc_.dispatch( + lyx::dispatch( FuncRequest(LFUN_FILE_OPEN, pimpl_->files_to_load_[i])); } // clear this list to save a few bytes of RAM pimpl_->files_to_load_.clear(); - } - else + } else pimpl_->application_->restoreGuiSession(); // Execute batch commands if available - if (pimpl_->batch_command.empty()) + if (pimpl_->batch_commands.empty()) return; - LYXERR(Debug::INIT, "About to handle -x '" << pimpl_->batch_command << '\''); - - pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(pimpl_->batch_command)); + vector::const_iterator bcit = pimpl_->batch_commands.begin(); + vector::const_iterator bcend = pimpl_->batch_commands.end(); + for (; bcit != bcend; bcit++) { + LYXERR(Debug::INIT, "About to handle -x '" << *bcit << '\''); + lyx::dispatch(lyxaction.lookupFunc(*bcit)); + } } @@ -623,7 +585,7 @@ The SIGHUP signal does not exist on Windows and does not need to be handled. Windows handles SIGFPE and SIGSEGV signals as expected. -Cntl+C interrupts (mapped to SIGINT by Windows' POSIX compatability layer) +Ctrl+C interrupts (mapped to SIGINT by Windows' POSIX compatability layer) cause a new thread to be spawned. This may well result in unexpected behaviour by the single-threaded LyX. @@ -658,7 +620,7 @@ static void error_handler(int err_sig) // We have received a signal indicating a fatal error, so // try and save the data ASAP. - LyX::cref().emergencyCleanup(); + emergencyCleanup(); // These lyxerr calls may or may not work: @@ -671,21 +633,23 @@ static void error_handler(int err_sig) // This shouldn't matter here, however, as we've already invoked // emergencyCleanup. + docstring msg; switch (err_sig) { #ifdef SIGHUP case SIGHUP: - lyxerr << "\nlyx: SIGHUP signal caught\nBye." << endl; + msg = _("SIGHUP signal caught!\nBye."); break; #endif case SIGFPE: - lyxerr << "\nlyx: SIGFPE signal caught\nBye." << endl; + msg = _("SIGFPE signal caught!\nBye."); break; case SIGSEGV: - lyxerr << "\nlyx: SIGSEGV signal caught\n" - "Sorry, you have found a bug in LyX. " + msg = _("SIGSEGV signal caught!\n" + "Sorry, you have found a bug in LyX, " + "hope you have not lost any data.\n" "Please read the bug-reporting instructions " - "in Help->Introduction and send us a bug report, " - "if necessary. Thanks !\nBye." << endl; + "in 'Help->Introduction' and send us a bug report, " + "if necessary. Thanks !\nBye."); break; case SIGINT: case SIGTERM: @@ -693,6 +657,12 @@ static void error_handler(int err_sig) break; } + if (!msg.empty()) { + lyxerr << "\nlyx: " << msg << endl; + // try to make a GUI message + Alert::error(_("LyX crashed!"), msg); + } + // Deinstall the signal handlers #ifdef SIGHUP signal(SIGHUP, SIG_DFL); @@ -704,11 +674,18 @@ static void error_handler(int err_sig) #ifdef SIGHUP if (err_sig == SIGSEGV || - (err_sig != SIGHUP && !getEnv("LYXDEBUG").empty())) + (err_sig != SIGHUP && !getEnv("LYXDEBUG").empty())) { #else - if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty()) + if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty()) { #endif +#ifdef _MSC_VER + // with abort() it crashes again. + exit(err_sig); +#else abort(); +#endif + } + exit(0); } @@ -734,15 +711,15 @@ bool LyX::init() signal(SIGTERM, error_handler); // SIGPIPE can be safely ignored. - lyxrc.tempdir_path = package().temp_dir().absFilename(); - lyxrc.document_path = package().document_dir().absFilename(); + lyxrc.tempdir_path = package().temp_dir().absFileName(); + lyxrc.document_path = package().document_dir().absFileName(); if (lyxrc.example_path.empty()) { - lyxrc.example_path = addPath(package().system_support().absFilename(), + lyxrc.example_path = addPath(package().system_support().absFileName(), "examples"); } if (lyxrc.template_path.empty()) { - lyxrc.template_path = addPath(package().system_support().absFilename(), + lyxrc.template_path = addPath(package().system_support().absFileName(), "templates"); } @@ -755,14 +732,14 @@ bool LyX::init() return false; // Set the language defined by the distributor. - //setGuiLanguage(lyxrc.gui_language); + setRcGuiLanguage(); // Set the PATH correctly. #if !defined (USE_POSIX_PACKAGING) // Add the directory containing the LyX executable to the path // so that LyX can find things like tex2lyx. if (package().build_support().empty()) - prependEnvPath("PATH", package().binary_dir().absFilename()); + prependEnvPath("PATH", package().binary_dir().absFileName()); #endif if (!lyxrc.path_prefix.empty()) prependEnvPath("PATH", lyxrc.path_prefix); @@ -771,9 +748,20 @@ bool LyX::init() if (queryUserLyXDir(package().explicit_user_support())) reconfigureUserLyXDir(); - // no need for a splash when there is no GUI if (!use_gui) { + // No need for a splash when there is no GUI first_start = false; + // Default is to overwrite the main file during export, unless + // the -f switch was specified or LYX_FORCE_OVERWRITE was set + if (force_overwrite == UNSPECIFIED) { + string const what = getEnv("LYX_FORCE_OVERWRITE"); + if (what == "all") + force_overwrite = ALL_FILES; + else if (what == "none") + force_overwrite = NO_FILES; + else + force_overwrite = MAIN_FILE; + } } // This one is generated in user_support directory by lib/configure.py. @@ -786,6 +774,9 @@ bool LyX::init() // Read lyxrc.dist again to be able to override viewer auto-detection. readRcFile("lyxrc.dist"); + // Set again the language defined by the distributor. + setRcGuiLanguage(); + system_lyxrc = lyxrc; system_formats = formats; pimpl_->system_converters_ = pimpl_->converters_; @@ -801,30 +792,28 @@ bool LyX::init() if (!readLanguagesFile("languages")) return false; - // Load the layouts + // Set the language defined by the user. + setRcGuiLanguage(); + LYXERR(Debug::INIT, "Reading layouts..."); - if (!LyXSetStyle()) - return false; + // Load the layouts + LayoutFileList::get().read(); //...and the modules - moduleList.load(); + theModuleList.read(); // read keymap and ui files in batch mode as well // because InsetInfo needs to know these to produce // the correct output - // Set the language defined by the user. - //setGuiLanguage(lyxrc.gui_language); - // Set up command definitions pimpl_->toplevel_cmddef_.read(lyxrc.def_file); + // FIXME // Set up bindings pimpl_->toplevel_keymap_.read("site"); pimpl_->toplevel_keymap_.read(lyxrc.bind_file); // load user bind file user.bind - pimpl_->toplevel_keymap_.read("user"); - - pimpl_->lyxfunc_.initKeySequences(&pimpl_->toplevel_keymap_); + pimpl_->toplevel_keymap_.read("user", 0, KeyMap::MissingOK); if (lyxerr.debugging(Debug::LYXRC)) lyxrc.print(); @@ -837,12 +826,12 @@ bool LyX::init() if (document_path.exists() && document_path.isDirectory()) package().document_dir() = document_path; - package().temp_dir() = createLyXTmpDir(FileName(lyxrc.tempdir_path)); + package().set_temp_dir(createLyXTmpDir(FileName(lyxrc.tempdir_path))); if (package().temp_dir().empty()) { Alert::error(_("Could not create temporary directory"), bformat(_("Could not create a temporary directory in\n" - "%1$s. Make sure that this\n" - "path exists and is writable and try again."), + "\"%1$s\"\n" + "Make sure that this path exists and is writable and try again."), from_utf8(lyxrc.tempdir_path))); // createLyXTmpDir() tries sufficiently hard to create a // usable temp dir, so the probability to come here is @@ -853,7 +842,7 @@ bool LyX::init() } LYXERR(Debug::INIT, "LyX tmp dir: `" - << package().temp_dir().absFilename() << '\''); + << package().temp_dir().absFileName() << '\''); LYXERR(Debug::INIT, "Reading session information '.lyx/session'..."); pimpl_->session_.reset(new Session(lyxrc.num_lastfiles)); @@ -861,24 +850,24 @@ bool LyX::init() // This must happen after package initialization and after lyxrc is // read, therefore it can't be done by a static object. ConverterCache::init(); - + return true; } -void LyX::emergencyCleanup() const +void 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 - pimpl_->buffer_list_.emergencyWriteAll(); + singleton_->pimpl_->buffer_list_.emergencyWriteAll(); if (use_gui) { - if (pimpl_->lyx_server_) - pimpl_->lyx_server_->emergencyCleanup(); - pimpl_->lyx_server_.reset(); - pimpl_->lyx_socket_.reset(); + if (singleton_->pimpl_->lyx_server_) + singleton_->pimpl_->lyx_server_->emergencyCleanup(); + singleton_->pimpl_->lyx_server_.reset(); + singleton_->pimpl_->lyx_socket_.reset(); } } @@ -892,13 +881,13 @@ static bool needsUpdate(string const & file) static bool firstrun = true; if (firstrun) { configure_script = - FileName(addName(package().system_support().absFilename(), + FileName(addName(package().system_support().absFileName(), "configure.py")); firstrun = false; } - FileName absfile = - FileName(addName(package().user_support().absFilename(), file)); + FileName absfile = + FileName(addName(package().user_support().absFileName(), file)); return !absfile.exists() || configure_script.lastModified() > absfile.lastModified(); } @@ -927,7 +916,7 @@ bool LyX::queryUserLyXDir(bool explicit_userdir) bformat(_("You have specified a non-existent user " "LyX directory, %1$s.\n" "It is needed to keep your own configuration."), - from_utf8(package().user_support().absFilename())), + from_utf8(package().user_support().absFileName())), 1, 0, _("&Create directory"), _("&Exit LyX"))) { @@ -936,7 +925,7 @@ bool LyX::queryUserLyXDir(bool explicit_userdir) } lyxerr << to_utf8(bformat(_("LyX: Creating directory %1$s"), - from_utf8(sup.absFilename()))) << endl; + from_utf8(sup.absFileName()))) << endl; if (!sup.createDirectory(0755)) { // Failed, so let's exit. @@ -1006,12 +995,10 @@ bool LyX::readEncodingsFile(string const & enc_name, namespace { -string batch; - /// return the the number of arguments consumed -typedef boost::function cmd_helper; +typedef boost::function cmd_helper; -int parse_dbg(string const & arg, string const &) +int parse_dbg(string const & arg, string const &, string &) { if (arg.empty()) { lyxerr << to_utf8(_("List of supported debug flags:")) << endl; @@ -1020,13 +1007,13 @@ int parse_dbg(string const & arg, string const &) } lyxerr << to_utf8(bformat(_("Setting debug level to %1$s"), from_utf8(arg))) << endl; - lyxerr.level(Debug::value(arg)); + lyxerr.setLevel(Debug::value(arg)); Debug::showLevel(lyxerr, lyxerr.level()); return 1; } -int parse_help(string const &, string const &) +int parse_help(string const &, string const &, string &) { lyxerr << to_utf8(_("Usage: lyx [ command line switches ] [ name.lyx ... ]\n" @@ -1044,9 +1031,16 @@ int parse_help(string const &, string const &) " where fmt is the export format of choice.\n" " Look on Tools->Preferences->File formats->Format\n" " to get an idea which parameters should be passed.\n" + " Note that the order of -e and -x switches matters.\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-f [--force-overwrite] what\n" + " where what is either `all', `main' or `none',\n" + " specifying whether all files, main file only, or no files,\n" + " respectively, are to be overwritten during a batch export.\n" + " Anything else is equivalent to `all', but is not consumed.\n" + "\t-batch execute commands without launching GUI and exit.\n" "\t-version summarize version and build info\n" "Check the LyX man page for more details.")) << endl; exit(0); @@ -1054,7 +1048,7 @@ int parse_help(string const &, string const &) } -int parse_version(string const &, string const &) +int parse_version(string const &, string const &, string &) { lyxerr << "LyX " << lyx_version << " (" << lyx_release_date << ")" << endl; @@ -1066,7 +1060,7 @@ int parse_version(string const &, string const &) } -int parse_sysdir(string const & arg, string const &) +int parse_sysdir(string const & arg, string const &, string &) { if (arg.empty()) { Alert::error(_("No system directory"), @@ -1078,7 +1072,7 @@ int parse_sysdir(string const & arg, string const &) } -int parse_userdir(string const & arg, string const &) +int parse_userdir(string const & arg, string const &, string &) { if (arg.empty()) { Alert::error(_("No user directory"), @@ -1090,7 +1084,7 @@ int parse_userdir(string const & arg, string const &) } -int parse_execute(string const & arg, string const &) +int parse_execute(string const & arg, string const &, string & batch) { if (arg.empty()) { Alert::error(_("Incomplete command"), @@ -1102,7 +1096,7 @@ int parse_execute(string const & arg, string const &) } -int parse_export(string const & type, string const &) +int parse_export(string const & type, string const &, string & batch) { if (type.empty()) { lyxerr << to_utf8(_("Missing file type [eg latex, ps...] after " @@ -1115,7 +1109,7 @@ int parse_export(string const & type, string const &) } -int parse_import(string const & type, string const & file) +int parse_import(string const & type, string const & file, string & batch) { if (type.empty()) { lyxerr << to_utf8(_("Missing file type [eg latex, ps...] after " @@ -1132,16 +1126,36 @@ int parse_import(string const & type, string const & file) } -int parse_geometry(string const & arg1, string const &) +int parse_geometry(string const & arg1, string const &, string &) { geometryArg = arg1; -#if defined(_WIN32) || (defined(__CYGWIN__) && defined(X_DISPLAY_MISSING)) - // remove also the arg - return 1; -#else - // don't remove "-geometry" + // don't remove "-geometry", it will be pruned out later in the + // frontend if need be. return -1; -#endif +} + + +int parse_batch(string const &, string const &, string &) +{ + use_gui = false; + return 0; +} + + +int parse_force(string const & arg, string const &, string &) +{ + if (arg == "all") { + force_overwrite = ALL_FILES; + return 1; + } else if (arg == "main") { + force_overwrite = MAIN_FILE; + return 1; + } else if (arg == "none") { + force_overwrite = NO_FILES; + return 1; + } + force_overwrite = ALL_FILES; + return 0; } @@ -1166,6 +1180,9 @@ void LyX::easyParse(int & argc, char * argv[]) cmdmap["-i"] = parse_import; cmdmap["--import"] = parse_import; cmdmap["-geometry"] = parse_geometry; + cmdmap["-batch"] = parse_batch; + cmdmap["-f"] = parse_force; + cmdmap["--force-overwrite"] = parse_force; for (int i = 1; i < argc; ++i) { map::const_iterator it @@ -1176,47 +1193,53 @@ void LyX::easyParse(int & argc, char * argv[]) continue; string const arg = - (i + 1 < argc) ? to_utf8(from_local8bit(argv[i + 1])) : string(); + (i + 1 < argc) ? os::utf8_argv(i + 1) : string(); string const arg2 = - (i + 2 < argc) ? to_utf8(from_local8bit(argv[i + 2])) : string(); + (i + 2 < argc) ? os::utf8_argv(i + 2) : string(); - int const remove = 1 + it->second(arg, arg2); + string batch; + int const remove = 1 + it->second(arg, arg2, batch); + if (!batch.empty()) + pimpl_->batch_commands.push_back(batch); // Now, remove used arguments by shifting // the following ones remove places down. if (remove > 0) { + os::remove_internal_args(i, remove); argc -= remove; for (int j = i; j < argc; ++j) argv[j] = argv[j + remove]; --i; } } - - pimpl_->batch_command = batch; } FuncStatus getStatus(FuncRequest const & action) { - return LyX::ref().lyxFunc().getStatus(action); + LASSERT(theApp(), /**/); + return theApp()->getStatus(action); } void dispatch(FuncRequest const & action) { - LyX::ref().lyxFunc().dispatch(action); + LASSERT(theApp(), /**/); + return theApp()->dispatch(action); } -BufferList & theBufferList() +void dispatch(FuncRequest const & action, DispatchResult & dr) { - return LyX::ref().bufferList(); + LASSERT(theApp(), /**/); + return theApp()->dispatch(action, dr); } -LyXFunc & theLyXFunc() +BufferList & theBufferList() { - return LyX::ref().lyxFunc(); + LASSERT(singleton_, /**/); + return singleton_->pimpl_->buffer_list_; } @@ -1224,7 +1247,8 @@ Server & theServer() { // FIXME: this should not be use_gui dependent LASSERT(use_gui, /**/); - return LyX::ref().server(); + LASSERT(singleton_, /**/); + return *singleton_->pimpl_->lyx_server_.get(); } @@ -1232,61 +1256,147 @@ ServerSocket & theServerSocket() { // FIXME: this should not be use_gui dependent LASSERT(use_gui, /**/); - return LyX::ref().socket(); + LASSERT(singleton_, /**/); + return *singleton_->pimpl_->lyx_socket_.get(); } KeyMap & theTopLevelKeymap() { - return LyX::ref().pimpl_->toplevel_keymap_; + LASSERT(singleton_, /**/); + return singleton_->pimpl_->toplevel_keymap_; } Converters & theConverters() { - return LyX::ref().converters(); + LASSERT(singleton_, /**/); + return singleton_->pimpl_->converters_; } Converters & theSystemConverters() { - return LyX::ref().systemConverters(); + LASSERT(singleton_, /**/); + return singleton_->pimpl_->system_converters_; } Movers & theMovers() { - return LyX::ref().pimpl_->movers_; + LASSERT(singleton_, /**/); + return singleton_->pimpl_->movers_; } Mover const & getMover(string const & fmt) { - return LyX::ref().pimpl_->movers_(fmt); + LASSERT(singleton_, /**/); + return singleton_->pimpl_->movers_(fmt); } void setMover(string const & fmt, string const & command) { - LyX::ref().pimpl_->movers_.set(fmt, command); + LASSERT(singleton_, /**/); + singleton_->pimpl_->movers_.set(fmt, command); } Movers & theSystemMovers() { - return LyX::ref().pimpl_->system_movers_; + LASSERT(singleton_, /**/); + return singleton_->pimpl_->system_movers_; +} + + +Messages const & getMessages(string const & language) +{ + LASSERT(singleton_, /**/); + return singleton_->messages(language); +} + + +Messages const & getGuiMessages() +{ + LASSERT(singleton_, /**/); + return singleton_->pimpl_->messages_["GUI"]; +} + + +graphics::Previews & thePreviews() +{ + LASSERT(singleton_, /**/); + return singleton_->pimpl_->preview_; +} + + +Session & theSession() +{ + LASSERT(singleton_, /**/); + return *singleton_->pimpl_->session_.get(); +} + + +CmdDef & theTopLevelCmdDef() +{ + LASSERT(singleton_, /**/); + return singleton_->pimpl_->toplevel_cmddef_; } -Messages & getMessages(string const & language) +SpellChecker * theSpellChecker() { - return LyX::ref().getMessages(language); + if (!singleton_->pimpl_->spell_checker_) + setSpellChecker(); + return singleton_->pimpl_->spell_checker_; } -Messages & getGuiMessages() +void setSpellChecker() { - return LyX::ref().getGuiMessages(); + SpellChecker::ChangeNumber speller_change_number =singleton_->pimpl_->spell_checker_ ? + singleton_->pimpl_->spell_checker_->changeNumber() : 0; + + if (lyxrc.spellchecker == "native") { +#if defined(USE_MACOSX_PACKAGING) + if (!singleton_->pimpl_->apple_spell_checker_) + singleton_->pimpl_->apple_spell_checker_ = new AppleSpellChecker(); + singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->apple_spell_checker_; +#else + singleton_->pimpl_->spell_checker_ = 0; +#endif + } else if (lyxrc.spellchecker == "aspell") { +#if defined(USE_ASPELL) + if (!singleton_->pimpl_->aspell_checker_) + singleton_->pimpl_->aspell_checker_ = new AspellChecker(); + singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->aspell_checker_; +#else + singleton_->pimpl_->spell_checker_ = 0; +#endif + } else if (lyxrc.spellchecker == "enchant") { +#if defined(USE_ENCHANT) + if (!singleton_->pimpl_->enchant_checker_) + singleton_->pimpl_->enchant_checker_ = new EnchantChecker(); + singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->enchant_checker_; +#else + singleton_->pimpl_->spell_checker_ = 0; +#endif + } else if (lyxrc.spellchecker == "hunspell") { +#if defined(USE_HUNSPELL) + if (!singleton_->pimpl_->hunspell_checker_) + singleton_->pimpl_->hunspell_checker_ = new HunspellChecker(); + singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->hunspell_checker_; +#else + singleton_->pimpl_->spell_checker_ = 0; +#endif + } else { + singleton_->pimpl_->spell_checker_ = 0; + } + if (singleton_->pimpl_->spell_checker_) { + singleton_->pimpl_->spell_checker_->changeNumber(speller_change_number); + singleton_->pimpl_->spell_checker_->advanceChangeNumber(); + } } } // namespace lyx