X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.C;h=97f71100ff10ece894cf3e99837d70daf1cdbd23;hb=27a777ccc624b19c5d1961a6279c0db97594c0fb;hp=66daee095abff5b2be83941b006f7836e0b0c475;hpb=3e40bf3dbf2f926717177103e101cc8090e69994;p=lyx.git diff --git a/src/lyx_main.C b/src/lyx_main.C index 66daee095a..97f71100ff 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -40,6 +40,7 @@ #include "lyxsocket.h" #include "lyxtextclasslist.h" #include "MenuBackend.h" +#include "messages.h" #include "mover.h" #include "ToolbarBackend.h" @@ -50,9 +51,9 @@ #include "support/environment.h" #include "support/filetools.h" -#include "support/fontutils.h" #include "support/lyxlib.h" #include "support/convert.h" +#include "support/ExceptionMessage.h" #include "support/os.h" #include "support/package.h" #include "support/path.h" @@ -64,6 +65,9 @@ #include #include +#include +#include +#include namespace lyx { @@ -71,9 +75,11 @@ namespace lyx { using support::addName; using support::addPath; using support::bformat; +using support::changeExtension; using support::createDirectory; using support::createLyXTmpDir; using support::destroyDir; +using support::FileName; using support::fileSearch; using support::getEnv; using support::i18nLibFileSearch; @@ -88,9 +94,11 @@ namespace os = support::os; namespace fs = boost::filesystem; using std::endl; +using std::for_each; +using std::map; +using std::make_pair; using std::string; using std::vector; -using std::for_each; #ifndef CXX_GLOBAL_CSTD using std::exit; @@ -98,8 +106,6 @@ using std::signal; using std::system; #endif -/// -frontend::Application * theApp = 0; /// are we using the GUI at all? /** @@ -115,6 +121,8 @@ namespace { string cl_system_support; string cl_user_support; +std::string geometryArg; + LyX * singleton_ = 0; void showFileError(string const & error) @@ -144,6 +152,10 @@ struct LyX::Singletons { Singletons(): iconv(ucs4_codeset, "UTF-8") { + // 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_; @@ -162,18 +174,38 @@ struct LyX::Singletons /// IconvProcessor iconv; + + /// Files to load at start. + vector files_to_load_; + + /// The messages translators. + map messages_; + + /// The file converters. + Converters converters_; + + // The system converters copy after reading lyxrc.defaults. + Converters system_converters_; + + /// + Movers movers_; + + /// + Movers system_movers_; }; +/// +frontend::Application * theApp() +{ + if (singleton_) + return singleton_->pimpl_->application_.get(); + else + return 0; +} + LyX::~LyX() { - // Static data are not treated in the same way at all on the Mac (and - // the LyX singleton has static methods). This is the reason why the - // exit command on the Mac bypasses our dispatch machinery altogether. - // On Linux and Windows we won't pass a second time through quit() - // because quitting will already be set to true. - if (!quitting) - quit(); } @@ -192,10 +224,11 @@ LyX const & LyX::cref() LyX::LyX() - : first_start(false), geometryOption_(false) + : first_start(false) { singleton_ = this; pimpl_.reset(new Singletons); + geometryArg.clear(); } @@ -286,6 +319,18 @@ kb_keymap & LyX::topLevelKeymap() } +Converters & LyX::converters() +{ + return pimpl_->converters_; +} + + +Converters & LyX::systemConverters() +{ + return pimpl_->system_converters_; +} + + IconvProcessor & LyX::iconvProcessor() { return pimpl_->iconv; @@ -299,6 +344,33 @@ kb_keymap const & LyX::topLevelKeymap() const } +Messages & LyX::getMessages(std::string const & language) +{ + map::iterator it = pimpl_->messages_.find(language); + + if (it != pimpl_->messages_.end()) + return it->second; + + std::pair::iterator, bool> result = + pimpl_->messages_.insert(std::make_pair(language, Messages(language))); + + BOOST_ASSERT(result.second); + return result.first->second; +} + + +Messages & LyX::getGuiMessages() +{ + return pimpl_->messages_["GUI"]; +} + + +void LyX::setGuiLanguage(std::string const & language) +{ + pimpl_->messages_["GUI"] = Messages(language); +} + + Buffer const * const LyX::updateInset(InsetBase const * inset) const { if (!inset) @@ -324,53 +396,87 @@ int LyX::exec(int & argc, char * argv[]) // we need to parse for "-dbg" and "-help" easyParse(argc, argv); - support::init_package(argv[0], cl_system_support, cl_user_support, - support::top_build_dir_is_one_level_up); + try { support::init_package(to_utf8(from_local8bit(argv[0])), + cl_system_support, cl_user_support, + support::top_build_dir_is_one_level_up); + } catch (support::ExceptionMessage const & message) { + if (message.type_ == support::ErrorException) { + Alert::error(message.title_, message.details_); + exit(1); + } else if (message.type_ == support::WarningException) { + Alert::warning(message.title_, message.details_); + } + } + + if (!use_gui) { + // FIXME: create a ConsoleApplication + int exit_status = init(argc, argv); + if (exit_status) { + prepareExit(); + return exit_status; + } - vector files; - int exit_status = execBatchCommands(argc, argv, files); + loadFiles(); - if (exit_status) - return exit_status; - - if (use_gui) { - // Force adding of font path _before_ Application is initialized - support::addFontResources(); - pimpl_->application_.reset(createApplication(argc, argv)); - initGuiFont(); - // FIXME: this global pointer should probably go. - theApp = pimpl_->application_.get(); - restoreGuiSession(files); - // Start the real execution loop. - - // FIXME - /* Create a CoreApplication class that will provide the main event loop - * and the socket callback registering. With Qt4, only QtCore - * library would be needed. - * When this is done, a server_mode could be created and the following two - * line would be moved out from here. - */ - pimpl_->lyx_server_.reset(new LyXServer(&pimpl_->lyxfunc_, lyxrc.lyxpipes)); - pimpl_->lyx_socket_.reset(new LyXServerSocket(&pimpl_->lyxfunc_, - support::os::internal_path(package().temp_dir() + "/lyxsocket"))); - - // handle the batch commands the user asked for - if (!batch_command.empty()) { - pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(batch_command)); + if (batch_command.empty() || pimpl_->buffer_list_.empty()) { + prepareExit(); + return EXIT_SUCCESS; } - exit_status = pimpl_->application_->start(batch_command); - // Kill the application object before exiting. This avoid crash - // on exit on Linux. - pimpl_->application_.reset(); - // Restore original font resources after Application is destroyed. - support::restoreFontResources(); + BufferList::iterator begin = pimpl_->buffer_list_.begin(); + BufferList::iterator end = pimpl_->buffer_list_.end(); + + bool final_success = false; + for (BufferList::iterator I = begin; I != end; ++I) { + Buffer * buf = *I; + bool success = false; + buf->dispatch(batch_command, &success); + final_success |= success; + } + prepareExit(); + return !final_success; } - else { - // FIXME: create a ConsoleApplication - theApp = 0; + + // Force adding of font path _before_ Application is initialized + support::os::addFontResources(); + + // Let the frontend parse and remove all arguments that it knows + pimpl_->application_.reset(createApplication(argc, argv)); + + initGuiFont(); + + // Parse and remove all known arguments in the LyX singleton + // Give an error for all remaining ones. + int exit_status = init(argc, argv); + if (exit_status) { + // Kill the application object before exiting. + pimpl_->application_.reset(); + use_gui = false; + prepareExit(); + return exit_status; } + // FIXME + /* Create a CoreApplication class that will provide the main event loop + * and the socket callback registering. With Qt4, only QtCore + * library would be needed. + * When this is done, a server_mode could be created and the following two + * line would be moved out from here. + */ + // Note: socket callback must be registered after init(argc, argv) + // such that package().temp_dir() is properly initialized. + pimpl_->lyx_server_.reset(new LyXServer(&pimpl_->lyxfunc_, lyxrc.lyxpipes)); + pimpl_->lyx_socket_.reset(new LyXServerSocket(&pimpl_->lyxfunc_, + os::internal_path(package().temp_dir() + "/lyxsocket"))); + + // Start the real execution loop. + exit_status = pimpl_->application_->exec(); + + prepareExit(); + + // Restore original font resources after Application is destroyed. + support::os::restoreFontResources(); + return exit_status; } @@ -385,14 +491,30 @@ void LyX::prepareExit() pimpl_->buffer_list_.closeAll(); // do any other cleanup procedures now - lyxerr[Debug::INFO] << "Deleting tmp dir " << package().temp_dir() << endl; + if (package().temp_dir() != package().system_temp_dir()) { + lyxerr[Debug::INFO] << "Deleting tmp dir " + << package().temp_dir() << endl; + + if (!destroyDir(FileName(package().temp_dir()))) { + docstring const msg = + bformat(_("Unable to remove the temporary directory %1$s"), + from_utf8(package().temp_dir())); + Alert::warning(_("Unable to remove temporary directory"), msg); + } + } - if (!destroyDir(package().temp_dir())) { - docstring const msg = - bformat(_("Unable to remove the temporary directory %1$s"), - from_utf8(package().temp_dir())); - Alert::warning(_("Unable to remove temporary directory"), msg); + if (use_gui) { + if (pimpl_->session_) + pimpl_->session_->writeFile(); + pimpl_->session_.reset(); + pimpl_->lyx_server_.reset(); + pimpl_->lyx_socket_.reset(); } + + // Kill the application object before exiting. This avoids crashes + // when exiting on Linux. + if (pimpl_->application_) + pimpl_->application_.reset(); } @@ -406,25 +528,19 @@ void LyX::earlyExit(int status) } -void LyX::quit() +int LyX::init(int & argc, char * argv[]) { - lyxerr[Debug::INFO] << "Running QuitLyX." << endl; - - prepareExit(); - - if (use_gui) { - pimpl_->session_->writeFile(); - pimpl_->lyx_server_.reset(); - pimpl_->lyx_socket_.reset(); - pimpl_->application_->exit(0); - theApp = 0; + // check for any spurious extra arguments + // other than documents + for (int argi = 1; argi < argc ; ++argi) { + if (argv[argi][0] == '-') { + lyxerr << to_utf8( + bformat(_("Wrong command line option `%1$s'. Exiting."), + from_utf8(argv[argi]))) << endl; + return EXIT_FAILURE; + } } -} - -int LyX::execBatchCommands(int & argc, char * argv[], - vector & files) -{ // Initialization of LyX (reads lyxrc and more) lyxerr[Debug::INIT] << "Initializing LyX::init..." << endl; bool success = init(); @@ -433,82 +549,86 @@ int LyX::execBatchCommands(int & argc, char * argv[], return EXIT_FAILURE; for (int argi = argc - 1; argi >= 1; --argi) { - // check for any remaining extra arguments other than - // document file names. These will be passed out to the - // frontend. - if (argv[argi][0] == '-') - continue; - files.push_back(os::internal_path(argv[argi])); + // get absolute path of file and add ".lyx" to + // the filename if necessary + pimpl_->files_to_load_.push_back(fileSearch(string(), + os::internal_path(to_utf8(from_local8bit(argv[argi]))), + "lyx", support::allow_unreadable)); } if (first_start) - files.push_back(i18nLibFileSearch("examples", "splash.lyx")); + pimpl_->files_to_load_.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; - - Buffer * last_loaded = 0; - - vector::const_iterator it = files.begin(); - vector::const_iterator end = files.end(); - - 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()) { - Buffer * const b = newFile(*it, string(), true); - if (b) - last_loaded = b; - } else { - Buffer * buf = pimpl_->buffer_list_.newBuffer(s, false); - if (loadLyXFile(buf, s)) { - last_loaded = buf; - ErrorList const & el = buf->errorList("Parse"); - if (!el.empty()) - for_each(el.begin(), el.end(), - boost::bind(&LyX::printError, this, _1)); - } - else - pimpl_->buffer_list_.release(buf); - } - } + return EXIT_SUCCESS; +} + + +void LyX::loadFiles() +{ + vector::const_iterator it = pimpl_->files_to_load_.begin(); + vector::const_iterator end = pimpl_->files_to_load_.end(); - // try to dispatch to last loaded buffer first - if (last_loaded) { - success = false; - if (last_loaded->dispatch(batch_command, &success)) { - prepareExit(); - return !success; - } + for (; it != end; ++it) { + if (it->empty()) + continue; + + Buffer * buf = pimpl_->buffer_list_.newBuffer(it->absFilename(), false); + if (loadLyXFile(buf, *it)) { + ErrorList const & el = buf->errorList("Parse"); + if (!el.empty()) + for_each(el.begin(), el.end(), + boost::bind(&LyX::printError, this, _1)); } - files.clear(); // the files are already loaded + else + pimpl_->buffer_list_.release(buf); } +} - return EXIT_SUCCESS; + +void LyX::execBatchCommands() +{ + // The advantage of doing this here is that the event loop + // is already started. So any need for interaction will be + // aknowledged. + restoreGuiSession(); + + // Execute batch commands if available + if (batch_command.empty()) + return; + + lyxerr[Debug::INIT] << "About to handle -x '" + << batch_command << '\'' << endl; + + pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(batch_command)); } -void LyX::restoreGuiSession(vector const & files) +void LyX::restoreGuiSession() { LyXView * view = newLyXView(); - // load files - for_each(files.begin(), files.end(), - bind(&LyXView::loadLyXFile, view, _1, true)); - - // if a file is specified, I assume that user wants to edit *that* file - if (files.empty() && lyxrc.load_session) { - vector const & lastopened = pimpl_->session_->lastOpened().getfiles(); - // do not add to the lastfile list since these files are restored from - // last seesion, and should be already there (regular files), or should - // not be added at all (help files). - for_each(lastopened.begin(), lastopened.end(), - bind(&LyXView::loadLyXFile, view, _1, false)); + // if some files were specified at command-line we assume that the + // user wants to edit *these* files and not to restore the session. + if (!pimpl_->files_to_load_.empty()) { + for_each(pimpl_->files_to_load_.begin(), + pimpl_->files_to_load_.end(), + bind(&LyXView::loadLyXFile, view, _1, true)); + // clear this list to save a few bytes of RAM + pimpl_->files_to_load_.clear(); + pimpl_->session_->lastOpened().clear(); + return; } + + if (!lyxrc.load_session) + return; + + vector const & lastopened = pimpl_->session_->lastOpened().getfiles(); + // do not add to the lastfile list since these files are restored from + // last session, and should be already there (regular files), or should + // not be added at all (help files). + for_each(lastopened.begin(), lastopened.end(), + bind(&LyXView::loadLyXFile, view, _1, false)); + // clear this list to save a few bytes of RAM pimpl_->session_->lastOpened().clear(); } @@ -523,6 +643,8 @@ LyXView * LyX::newLyXView() // initial geometry unsigned int width = 690; unsigned int height = 510; + // default icon size, will be overwritten by stored session value + unsigned int iconSizeXY = 0; bool maximize = false; // first try lyxrc if (lyxrc.geometry_width != 0 && lyxrc.geometry_height != 0 ) { @@ -539,6 +661,9 @@ LyXView * LyX::newLyXView() height = convert(val); if (session().sessionInfo().load("WindowIsMaximized") == "yes") maximize = true; + val = session().sessionInfo().load("IconSizeXY"); + if (!val.empty()) + iconSizeXY = convert(val); } // if user wants to restore window position @@ -553,12 +678,14 @@ LyXView * LyX::newLyXView() posy = convert(val); } - if (geometryOption_) { + if (!geometryArg.empty()) + { width = 0; height = 0; } + // create the main window - LyXView * view = &pimpl_->application_->createView(width, height, posx, posy, maximize); + LyXView * view = &pimpl_->application_->createView(width, height, posx, posy, maximize, iconSizeXY, geometryArg); return view; } @@ -711,6 +838,9 @@ bool LyX::init() if (!readRcFile("lyxrc.dist")) return false; + // Set the language defined by the distributor. + //setGuiLanguage(lyxrc.gui_language); + // Set the PATH correctly. #if !defined (USE_POSIX_PACKAGING) // Add the directory containing the LyX executable to the path @@ -742,8 +872,8 @@ bool LyX::init() system_lyxrc = lyxrc; system_formats = formats; - system_converters = converters; - system_movers = movers; + pimpl_->system_converters_ = pimpl_->converters_; + pimpl_->system_movers_ = pimpl_->movers_; system_lcolor = lcolor; // This one is edited through the preferences dialog. @@ -761,6 +891,9 @@ bool LyX::init() return false; if (use_gui) { + // Set the language defined by the user. + //setGuiLanguage(lyxrc.gui_language); + // Set up bindings pimpl_->toplevel_keymap_.reset(new kb_keymap); defaultKeyBindings(pimpl_->toplevel_keymap_.get()); @@ -780,11 +913,12 @@ bool LyX::init() if (!lyxrc.path_prefix.empty()) prependEnvPath("PATH", lyxrc.path_prefix); - if (fs::exists(lyxrc.document_path) && - fs::is_directory(lyxrc.document_path)) + FileName const document_path(lyxrc.document_path); + if (fs::exists(document_path.toFilesystemEncoding()) && + fs::is_directory(document_path.toFilesystemEncoding())) package().document_dir() = lyxrc.document_path; - package().temp_dir() = createLyXTmpDir(lyxrc.tempdir_path); + package().temp_dir() = createLyXTmpDir(FileName(lyxrc.tempdir_path)).absFilename(); if (package().temp_dir().empty()) { Alert::error(_("Could not create temporary directory"), bformat(_("Could not create a temporary directory in\n" @@ -875,7 +1009,8 @@ void LyX::emergencyCleanup() const pimpl_->buffer_list_.emergencyWriteAll(); if (use_gui) { - pimpl_->lyx_server_->emergencyCleanup(); + if (pimpl_->lyx_server_) + pimpl_->lyx_server_->emergencyCleanup(); pimpl_->lyx_server_.reset(); pimpl_->lyx_socket_.reset(); } @@ -913,11 +1048,19 @@ namespace { // return true if file does not exist or is older than configure.py. bool needsUpdate(string const & file) { - static string const configure_script = - addName(package().system_support(), "configure.py"); - string const absfile = - addName(package().user_support(), file); + // We cannot initialize configure_script directly because the package + // is not initialized yet when static objects are constructed. + static string configure_script; + static bool firstrun = true; + if (firstrun) { + configure_script = FileName(addName( + package().system_support(), + "configure.py")).toFilesystemEncoding(); + firstrun = false; + } + string const absfile = FileName(addName( + package().user_support(), file)).toFilesystemEncoding(); return (! fs::exists(absfile)) || (fs::last_write_time(configure_script) > fs::last_write_time(absfile)); @@ -929,8 +1072,9 @@ bool needsUpdate(string const & file) bool LyX::queryUserLyXDir(bool explicit_userdir) { // Does user directory exist? - if (fs::exists(package().user_support()) && - fs::is_directory(package().user_support())) { + string const user_support = + FileName(package().user_support()).toFilesystemEncoding(); + if (fs::exists(user_support) && fs::is_directory(user_support)) { first_start = false; return needsUpdate("lyxrc.defaults") @@ -975,7 +1119,7 @@ bool LyX::readRcFile(string const & name) { lyxerr[Debug::INIT] << "About to read " << name << "... "; - string const lyxrc_path = libFileSearch(string(), name); + FileName const lyxrc_path = libFileSearch(string(), name); if (!lyxrc_path.empty()) { lyxerr[Debug::INIT] << "Found in " << lyxrc_path << endl; @@ -992,7 +1136,7 @@ bool LyX::readRcFile(string const & name) // Read the ui file `name' -bool LyX::readUIFile(string const & name) +bool LyX::readUIFile(string const & name, bool include) { enum Uitags { ui_menuset = 1, @@ -1024,13 +1168,23 @@ bool LyX::readUIFile(string const & name) lyxerr[Debug::INIT] << "About to read " << name << "..." << endl; - string const ui_path = libFileSearch("ui", name, "ui"); - + + FileName ui_path; + if (include) { + ui_path = libFileSearch("ui", name, "inc"); + if (ui_path.empty()) + ui_path = libFileSearch("ui", + changeExtension(name, "inc")); + } + else + ui_path = libFileSearch("ui", name, "ui"); + if (ui_path.empty()) { lyxerr[Debug::INIT] << "Could not find " << name << endl; showFileError(name); return false; } + uifiles.push_back(name); lyxerr[Debug::INIT] << "Found " << name @@ -1050,7 +1204,7 @@ bool LyX::readUIFile(string const & name) case ui_include: { lex.next(true); string const file = lex.getString(); - if (!readUIFile(file)) + if (!readUIFile(file, true)) return false; break; } @@ -1082,7 +1236,7 @@ bool LyX::readLanguagesFile(string const & name) { lyxerr[Debug::INIT] << "About to read " << name << "..." << endl; - string const lang_path = libFileSearch(string(), name); + FileName const lang_path = libFileSearch(string(), name); if (lang_path.empty()) { showFileError(name); return false; @@ -1097,7 +1251,7 @@ bool LyX::readEncodingsFile(string const & name) { lyxerr[Debug::INIT] << "About to read " << name << "..." << endl; - string const enc_path = libFileSearch(string(), name); + FileName const enc_path = libFileSearch(string(), name); if (enc_path.empty()) { showFileError(name); return false; @@ -1168,7 +1322,8 @@ int parse_version(string const &, string const &) int parse_sysdir(string const & arg, string const &) { if (arg.empty()) { - lyxerr << to_utf8(_("Missing directory for -sysdir switch")) << endl; + Alert::error(_("No system directory"), + _("Missing directory for -sysdir switch")); exit(1); } cl_system_support = arg; @@ -1178,7 +1333,8 @@ int parse_sysdir(string const & arg, string const &) int parse_userdir(string const & arg, string const &) { if (arg.empty()) { - lyxerr << to_utf8(_("Missing directory for -userdir switch")) << endl; + Alert::error(_("No user directory"), + _("Missing directory for -userdir switch")); exit(1); } cl_user_support = arg; @@ -1188,7 +1344,8 @@ int parse_userdir(string const & arg, string const &) int parse_execute(string const & arg, string const &) { if (arg.empty()) { - lyxerr << to_utf8(_("Missing command string after --execute switch")) << endl; + Alert::error(_("Incomplete command"), + _("Missing command string after --execute switch")); exit(1); } batch = arg; @@ -1223,6 +1380,19 @@ int parse_import(string const & type, string const & file) return 2; } +int parse_geometry(string const & arg1, string const &) +{ + geometryArg = arg1; +#if defined(_WIN32) || (defined(__CYGWIN__) && defined(X_DISPLAY_MISSING)) + // remove also the arg + return 1; +#else + // don't remove "-geometry" + return -1; +#endif +} + + } // namespace anon @@ -1243,30 +1413,29 @@ void LyX::easyParse(int & argc, char * argv[]) cmdmap["--export"] = parse_export; cmdmap["-i"] = parse_import; cmdmap["--import"] = parse_import; + cmdmap["-geometry"] = parse_geometry; for (int i = 1; i < argc; ++i) { std::map::const_iterator it = cmdmap.find(argv[i]); - // check for X11 -geometry option - if (support::compare(argv[i], "-geometry") == 0) - geometryOption_ = true; - // don't complain if not found - may be parsed later if (it == cmdmap.end()) continue; - string arg((i + 1 < argc) ? argv[i + 1] : ""); - string arg2((i + 2 < argc) ? argv[i + 2] : ""); + string const arg((i + 1 < argc) ? to_utf8(from_local8bit(argv[i + 1])) : string()); + string const arg2((i + 2 < argc) ? to_utf8(from_local8bit(argv[i + 2])) : string()); 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; + if (remove > 0) { + argc -= remove; + for (int j = i; j < argc; ++j) + argv[j] = argv[j + remove]; + --i; + } } batch_command = batch; @@ -1320,9 +1489,57 @@ kb_keymap & theTopLevelKeymap() } +Converters & theConverters() +{ + return LyX::ref().converters(); +} + + +Converters & theSystemConverters() +{ + return LyX::ref().systemConverters(); +} + + +Movers & theMovers() +{ + return LyX::ref().pimpl_->movers_; +} + + +Mover const & getMover(std::string const & fmt) +{ + return LyX::ref().pimpl_->movers_(fmt); +} + + +void setMover(std::string const & fmt, std::string const & command) +{ + LyX::ref().pimpl_->movers_.set(fmt, command); +} + + +Movers & theSystemMovers() +{ + return LyX::ref().pimpl_->system_movers_; +} + + IconvProcessor & utf8ToUcs4() { return LyX::ref().iconvProcessor(); } + +Messages & getMessages(std::string const & language) +{ + return LyX::ref().getMessages(language); +} + + +Messages & getGuiMessages() +{ + return LyX::ref().getGuiMessages(); +} + } // namespace lyx