tex2lyx/TODO.txt: add a feature that is not yet supported

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 0d4d2053eb8d42e25ae16b6558ae56dc5123f669..b57245bb1e1fc2226964082db05838a89fa630fe 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -4,10 +4,10 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alfredo Braunstein
  * 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 Jean-Marc Lasgouttes
  * \author John Levon

- * \author André Pönitz
+ * \author André Pönitz

  *
  * Full author contact details are available in file CREDITS.
  */
  *
  * Full author contact details are available in file CREDITS.
  */


@@ -17,33 +17,40 @@
 
 #include "LyX.h"
 
 
 #include "LyX.h"
 

-#include "LayoutFile.h"
+#include "AppleSpellChecker.h"
+#include "AspellChecker.h"

 #include "Buffer.h"
 #include "BufferList.h"
 #include "CmdDef.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 "ConverterCache.h"
 #include "Converter.h"
 #include "CutAndPaste.h"

+#include "EnchantChecker.h"

 #include "Encoding.h"
 #include "ErrorList.h"
 #include "Format.h"
 #include "FuncStatus.h"
 #include "Encoding.h"
 #include "ErrorList.h"
 #include "Format.h"
 #include "FuncStatus.h"

+#include "HunspellChecker.h"

 #include "KeyMap.h"
 #include "Language.h"
 #include "KeyMap.h"
 #include "Language.h"

+#include "LaTeXFonts.h"
+#include "LayoutFile.h"

 #include "Lexer.h"
 #include "Lexer.h"

+#include "LyX.h"

 #include "LyXAction.h"
 #include "LyXAction.h"

-#include "LyXFunc.h"

 #include "LyXRC.h"
 #include "ModuleList.h"
 #include "Mover.h"
 #include "Server.h"
 #include "ServerSocket.h"
 #include "Session.h"
 #include "LyXRC.h"
 #include "ModuleList.h"
 #include "Mover.h"
 #include "Server.h"
 #include "ServerSocket.h"
 #include "Session.h"

+#include "WordList.h"

 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
 
 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
 

+#include "support/ConsoleApplication.h"

 #include "support/lassert.h"
 #include "support/debug.h"
 #include "support/environment.h"
 #include "support/lassert.h"
 #include "support/debug.h"
 #include "support/environment.h"


@@ -54,10 +61,8 @@
 #include "support/Messages.h"
 #include "support/os.h"
 #include "support/Package.h"
 #include "support/Messages.h"
 #include "support/os.h"
 #include "support/Package.h"

-#include "support/Path.h"
-#include "support/Systemcall.h"

 
 

-#include <boost/bind.hpp>
+#include "support/bind.h"

 #include <boost/scoped_ptr.hpp>
 
 #include <algorithm>
 #include <boost/scoped_ptr.hpp>
 
 #include <algorithm>


@@ -71,6 +76,10 @@
 using namespace std;
 using namespace lyx::support;
 
 using namespace std;
 using namespace lyx::support;
 

+#if defined (USE_MACOSX_PACKAGING)
+#include <crt_externs.h>
+#endif
+

 namespace lyx {
 
 namespace Alert = frontend::Alert;
 namespace lyx {
 
 namespace Alert = frontend::Alert;


@@ -83,6 +92,22 @@ namespace os = support::os;
 
 bool use_gui = true;
 
 
 bool use_gui = true;
 

+
+// We default to open documents in an already running instance, provided that
+// the lyxpipe has been setup. This can be overridden either on the command
+// line or through preference settings.
+
+RunMode run_mode = PREFERRED;
+
+
+// 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
 namespace {
 
 // Filled with the command line arguments "foo" of "-sysdir foo" or


@@ -101,33 +126,23 @@ void showFileError(string const & error)
                           "Please check your installation."), from_utf8(error)));
 }
 
                           "Please check your installation."), from_utf8(error)));
 }
 

-
-void reconfigureUserLyXDir()
-{
-       string const configure_command = package().configure_command();
-
-       lyxerr << to_utf8(_("LyX: reconfiguring user directory")) << endl;
-       PathChanger p(package().user_support());
-       Systemcall one;
-       one.startscript(Systemcall::Wait, configure_command);
-       lyxerr << "LyX: " << to_utf8(_("Done!")) << endl;
-}
-

 } // namespace anon
 
 } // namespace anon
 

-

 /// The main application class private implementation.
 /// The main application class private implementation.

-struct LyX::Impl
-{
+struct LyX::Impl {

        Impl()
        Impl()

+               : latexfonts_(0), spell_checker_(0), apple_spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0)
+       {}
+
+       ~Impl()

        {
        {

-               // Set the default User Interface language as soon as possible.
-               // The language used will be derived from the environment
-               // variables.
-               messages_["GUI"] = Messages();
+               delete latexfonts_;
+               delete apple_spell_checker_;
+               delete aspell_checker_;
+               delete enchant_checker_;
+               delete hunspell_checker_;

        }
        }

-       /// our function handler
-       LyXFunc lyxfunc_;
+

        ///
        BufferList buffer_list_;
        ///
        ///
        BufferList buffer_list_;
        ///


@@ -160,12 +175,46 @@ struct LyX::Impl
        ///
        Movers system_movers_;
 
        ///
        Movers system_movers_;
 

-       /// has this user started lyx for the first time?
-       bool first_start;

        /// the parsed command line batch command if any
        /// the parsed command line batch command if any

-       string batch_command;
+       vector<string> batch_commands;
+
+       ///
+       LaTeXFonts * latexfonts_;
+
+       ///
+       SpellChecker * spell_checker_;
+       ///
+       SpellChecker * apple_spell_checker_;
+       ///
+       SpellChecker * aspell_checker_;
+       ///
+       SpellChecker * enchant_checker_;
+       ///
+       SpellChecker * hunspell_checker_;
+};
+
+
+/// The main application class for console mode
+class LyXConsoleApp : public ConsoleApplication
+{
+public:
+       LyXConsoleApp(LyX * lyx, int & argc, char * argv[])
+               : ConsoleApplication(lyx_package, argc, argv), lyx_(lyx),
+                 argc_(argc), argv_(argv)
+       {
+       }
+       void doExec()
+       {
+               int const exit_status = lyx_->execWithoutGui(argc_, argv_);
+               exit(exit_status);
+       }
+private:
+       LyX * lyx_;
+       int & argc_;
+       char ** argv_;

 };
 
 };
 

+

 ///
 frontend::Application * theApp()
 {
 ///
 frontend::Application * theApp()
 {


@@ -179,10 +228,12 @@ frontend::Application * theApp()
 LyX::~LyX()
 {
        delete pimpl_;
 LyX::~LyX()
 {
        delete pimpl_;

+       singleton_ = 0;
+       WordList::cleanupWordLists();

 }
 
 
 }
 
 

-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
 {
        if (exit_code)
                // Something wrong happened so better save everything, just in


@@ -202,20 +253,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)
 {
 LyX::LyX()
        : first_start(false)
 {


@@ -224,105 +261,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<string, Messages>::iterator it = pimpl_->messages_.find(language);
 
 {
        map<string, Messages>::iterator it = pimpl_->messages_.find(language);
 


@@ -332,37 +271,32 @@ Messages & LyX::getMessages(string const & language)
        pair<map<string, Messages>::iterator, bool> result =
                        pimpl_->messages_.insert(make_pair(language, Messages(language)));
 
        pair<map<string, Messages>::iterator, bool> result =
                        pimpl_->messages_.insert(make_pair(language, Messages(language)));
 

-       LASSERT(result.second, /**/);
+       LATTEST(result.second);

        return result.first->second;
 }
 
 
        return result.first->second;
 }
 
 

-Messages & LyX::getGuiMessages()
-{
-       return pimpl_->messages_["GUI"];
-}
-
-
-void LyX::setGuiLanguage(string const & language)
-{
-       pimpl_->messages_["GUI"] = Messages(language);
-}
-
-

 int LyX::exec(int & argc, char * argv[])
 {
 int LyX::exec(int & argc, char * argv[])
 {

+       // Minimal setting of locale before parsing command line
+       try {
+               init_package(os::utf8_argv(0), string(), string());
+               // we do not get to this point when init_package throws an exception
+               setLocale();
+       } catch (ExceptionMessage const & message) {
+               LYXERR(Debug::LOCALE, message.title_ + ", " + message.details_);
+       }
+

        // Here we need to parse the command line. At least
        // we need to parse for "-dbg" and "-help"
        easyParse(argc, argv);
 
        try {
        // 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);

        } catch (ExceptionMessage const & message) {
                if (message.type_ == ErrorException) {
                        Alert::error(message.title_, message.details_);
        } 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_);
                }
                } else if (message.type_ == WarningException) {
                        Alert::warning(message.title_, message.details_);
                }


@@ -370,42 +304,25 @@ int LyX::exec(int & argc, char * argv[])
 
        // Reinit the messages machinery in case package() knows
        // something interesting about the locale directory.
 
        // Reinit the messages machinery in case package() knows
        // something interesting about the locale directory.

-       Messages::init();
+       setLocale();

 
        if (!use_gui) {
 
        if (!use_gui) {

-               // FIXME: create a ConsoleApplication
-               int exit_status = init(argc, argv);
-               if (exit_status) {
-                       prepareExit();
-                       return exit_status;
-               }
+               LyXConsoleApp app(this, argc, argv);

 
 

-               // this is correct, since return values are inverted.
-               exit_status = !loadFiles();
+               // Reestablish our defaults, as Qt overwrites them
+               // after creating app
+               setLocale();//???

 
 

-               if (pimpl_->batch_command.empty() || pimpl_->buffer_list_.empty()) {
-                       prepareExit();
-                       return exit_status;
-               }
-
-               BufferList::iterator begin = pimpl_->buffer_list_.begin();
-
-               bool final_success = false;
-               for (BufferList::iterator I = begin; I != pimpl_->buffer_list_.end(); ++I) {
-                       Buffer * buf = *I;
-                       if (buf != buf->masterBuffer())
-                               continue;
-                       bool success = false;
-                       buf->dispatch(pimpl_->batch_command, &success);
-                       final_success |= success;
-               }
-               prepareExit();
-               return !final_success;
+               return app.exec();

        }
 
        // Let the frontend parse and remove all arguments that it knows
        pimpl_->application_.reset(createApplication(argc, 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()
+       setLocale();//???
+

        // Parse and remove all known arguments in the LyX singleton
        // Give an error for all remaining ones.
        int exit_status = init(argc, argv);
        // Parse and remove all known arguments in the LyX singleton
        // Give an error for all remaining ones.
        int exit_status = init(argc, argv);


@@ -417,21 +334,36 @@ int LyX::exec(int & argc, char * argv[])
                return exit_status;
        }
 
                return exit_status;
        }
 

+       // If not otherwise specified by a command line option or
+       // by preferences, we default to reuse a running instance.
+       if (run_mode == PREFERRED)
+               run_mode = USE_REMOTE;
+

        // FIXME
        /* Create a CoreApplication class that will provide the main event loop
        // FIXME
        /* Create a CoreApplication class that will provide the main event loop

-       * and the socket callback registering. With Qt4, only QtCore
+       * and the socket callback registering. With Qt, 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.
        * 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.

+       * However, note that the first of the two lines below triggers the
+       * "single instance" behavior, which should occur right at this point.

        */
        // Note: socket callback must be registered after init(argc, argv)
        // such that package().temp_dir() is properly initialized.
        */
        // 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.
 
        // Start the real execution loop.

-       exit_status = pimpl_->application_->exec();
+       if (!theServer().deferredLoadingToOtherInstance())
+               exit_status = pimpl_->application_->exec();
+       else if (!pimpl_->files_to_load_.empty()) {
+               vector<string>::const_iterator it = pimpl_->files_to_load_.begin();
+               vector<string>::const_iterator end = pimpl_->files_to_load_.end();
+               lyxerr << _("The following files could not be loaded:") << endl;
+               for (; it != end; ++it)
+                       lyxerr << *it << endl;
+       }

 
        prepareExit();
 
 
        prepareExit();
 


@@ -445,6 +377,9 @@ void LyX::prepareExit()
        cap::clearCutStack();
        cap::clearSelection();
 
        cap::clearCutStack();
        cap::clearSelection();
 

+       // Write the index file of the converter cache
+       ConverterCache::get().writeIndex();
+

        // close buffers first
        pimpl_->buffer_list_.closeAll();
 
        // close buffers first
        pimpl_->buffer_list_.closeAll();
 


@@ -459,27 +394,33 @@ void LyX::prepareExit()
 
        // do any other cleanup procedures now
        if (package().temp_dir() != package().system_temp_dir()) {
 
        // 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 =
                        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);
+                       }

                }
        }
 
        // Kill the application object before exiting. This avoids crashes
        // when exiting on Linux.
                }
        }
 
        // Kill the application object before exiting. This avoids crashes
        // when exiting on Linux.

-       if (pimpl_->application_)
-               pimpl_->application_.reset();
+       pimpl_->application_.reset();

 }
 
 
 void LyX::earlyExit(int status)
 {
 }
 
 
 void LyX::earlyExit(int status)
 {

-       LASSERT(pimpl_->application_.get(), /**/);
+       LATTEST(pimpl_->application_.get());

        // LyX::pimpl_::application_ is not initialised at this
        // point so it's safe to just exit after some cleanup.
        prepareExit();
        // LyX::pimpl_::application_ is not initialised at this
        // point so it's safe to just exit after some cleanup.
        prepareExit();


@@ -495,7 +436,7 @@ int LyX::init(int & argc, char * argv[])
                if (argv[argi][0] == '-') {
                        lyxerr << to_utf8(
                                bformat(_("Wrong command line option `%1$s'. Exiting."),
                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;
                }
        }
                        return EXIT_FAILURE;
                }
        }


@@ -508,32 +449,63 @@ int LyX::init(int & argc, char * argv[])
                return EXIT_FAILURE;
 
        // Remaining arguments are assumed to be files to load.
                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 (!use_gui && pimpl_->files_to_load_.empty()) {
+               lyxerr << to_utf8(_("Missing filename for this operation.")) << endl;
+               return EXIT_FAILURE;
+       }

 
        if (first_start) {
                pimpl_->files_to_load_.push_back(
 
        if (first_start) {
                pimpl_->files_to_load_.push_back(

-                       i18nLibFileSearch("examples", "splash.lyx").absFilename());
+                       i18nLibFileSearch("examples", "splash.lyx").absFileName());

        }
 
        return EXIT_SUCCESS;
 }
 
 
        }
 
        return EXIT_SUCCESS;
 }
 
 

-void LyX::addFileToLoad(string const & fname)
+int LyX::execWithoutGui(int & argc, char * argv[])

 {
 {

-       vector<string>::const_iterator cit = find(
-               pimpl_->files_to_load_.begin(), pimpl_->files_to_load_.end(),
-               fname);
+       int exit_status = init(argc, argv);
+       if (exit_status) {
+               prepareExit();
+               return exit_status;
+       }
+
+       // this is correct, since return values are inverted.
+       exit_status = !loadFiles();

 
 

-       if (cit == pimpl_->files_to_load_.end())
-               pimpl_->files_to_load_.push_back(fname);
+       if (pimpl_->batch_commands.empty() || pimpl_->buffer_list_.empty()) {
+               prepareExit();
+               return exit_status;
+       }
+
+       BufferList::iterator begin = pimpl_->buffer_list_.begin();
+
+       bool final_success = false;
+       for (BufferList::iterator I = begin; I != pimpl_->buffer_list_.end(); ++I) {
+               Buffer * buf = *I;
+               if (buf != buf->masterBuffer())
+                       continue;
+               vector<string>::const_iterator bcit  = pimpl_->batch_commands.begin();
+               vector<string>::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;

 }
 
 
 bool LyX::loadFiles()
 {
 }
 
 
 bool LyX::loadFiles()
 {

-       LASSERT(!use_gui, /**/);
+       LATTEST(!use_gui);

        bool success = true;
        vector<string>::const_iterator it = pimpl_->files_to_load_.begin();
        vector<string>::const_iterator end = pimpl_->files_to_load_.end();
        bool success = true;
        vector<string>::const_iterator it = pimpl_->files_to_load_.begin();
        vector<string>::const_iterator end = pimpl_->files_to_load_.end();


@@ -547,15 +519,19 @@ bool LyX::loadFiles()
                if (fname.empty())
                        continue;
 
                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());
+               if (buf->loadLyXFile() == Buffer::ReadSuccess) {

                        ErrorList const & el = buf->errorList("Parse");
                        if (!el.empty())
                                for_each(el.begin(), el.end(),
                        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 {
                        pimpl_->buffer_list_.release(buf);
                }
                else {
                        pimpl_->buffer_list_.release(buf);

+                       docstring const error_message =
+                               bformat(_("LyX failed to load the following file: %1$s"),
+                               from_utf8(fname.absFileName()));
+                       lyxerr << to_utf8(error_message) << endl;

                        success = false;
                }
        }
                        success = false;
                }
        }


@@ -563,62 +539,70 @@ bool LyX::loadFiles()
 }
 
 
 }
 
 

-void LyX::execBatchCommands()
+void execBatchCommands()
+{
+       LAPPERR(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.
 {
        // 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()) {
+       if (LayoutFileList::get().empty()) {

                switch (Alert::prompt(
                        _("No textclass is found"),
                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."),
+                       _("LyX will only have minimal functionality because no textclasses "
+                               "have been found. You can either try to reconfigure LyX normally, "
+                               "try to reconfigure without checking your LaTeX installation, or continue."),

                        0, 2,
                        _("&Reconfigure"),
                        0, 2,
                        _("&Reconfigure"),

-                       _("&Use Default"),
-                       _("&Exit LyX")))
+                       _("&Without LaTeX"),
+                       _("&Continue")))

                {
                case 0:
                        // regular reconfigure
                {
                case 0:
                        // regular reconfigure

-                       pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_RECONFIGURE, ""));
+                       lyx::dispatch(FuncRequest(LFUN_RECONFIGURE, ""));

                        break;
                case 1:
                        // reconfigure --without-latex-config
                        break;
                case 1:
                        // reconfigure --without-latex-config

-                       pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_RECONFIGURE,
+                       lyx::dispatch(FuncRequest(LFUN_RECONFIGURE,

                                " --without-latex-config"));
                        break;
                default:
                                " --without-latex-config"));
                        break;
                default:

-                       pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_LYX_QUIT));
-                       return;
+                       break;

                }
        }
                }
        }

-       
+

        // create the first main window
        // 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) {
 
        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();
                                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
                pimpl_->application_->restoreGuiSession();
 
        // Execute batch commands if available

-       if (pimpl_->batch_command.empty())
+       if (pimpl_->batch_commands.empty())

                return;
 
                return;
 

-       LYXERR(Debug::INIT, "About to handle -x '" << pimpl_->batch_command << '\'');
-
-       pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(pimpl_->batch_command));
+       vector<string>::const_iterator bcit  = pimpl_->batch_commands.begin();
+       vector<string>::const_iterator bcend = pimpl_->batch_commands.end();
+       for (; bcit != bcend; ++bcit) {
+               LYXERR(Debug::INIT, "About to handle -x '" << *bcit << '\'');
+               lyx::dispatch(lyxaction.lookupFunc(*bcit));
+       }

 }
 
 
 }
 
 


@@ -629,7 +613,7 @@ The SIGHUP signal does not exist on Windows and does not need to be handled.
 
 Windows handles SIGFPE and SIGSEGV signals as expected.
 
 
 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.
 
 cause a new thread to be spawned. This may well result in unexpected
 behaviour by the single-threaded LyX.
 


@@ -664,7 +648,7 @@ static void error_handler(int err_sig)
 
        // We have received a signal indicating a fatal error, so
        // try and save the data ASAP.
 
        // 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:
 
 
        // These lyxerr calls may or may not work:
 


@@ -677,21 +661,23 @@ static void error_handler(int err_sig)
 
        // This shouldn't matter here, however, as we've already invoked
        // emergencyCleanup.
 
        // This shouldn't matter here, however, as we've already invoked
        // emergencyCleanup.

+       docstring msg;

        switch (err_sig) {
 #ifdef SIGHUP
        case SIGHUP:
        switch (err_sig) {
 #ifdef SIGHUP
        case SIGHUP:

-               lyxerr << "\nlyx: SIGHUP signal caught\nBye." << endl;
+               msg = _("SIGHUP signal caught!\nBye.");

                break;
 #endif
        case SIGFPE:
                break;
 #endif
        case SIGFPE:

-               lyxerr << "\nlyx: SIGFPE signal caught\nBye." << endl;
+               msg = _("SIGFPE signal caught!\nBye.");

                break;
        case SIGSEGV:
                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 "
                          "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:
                break;
        case SIGINT:
        case SIGTERM:


@@ -699,6 +685,12 @@ static void error_handler(int err_sig)
                break;
        }
 
                break;
        }
 

+       if (!msg.empty()) {
+               lyxerr << "\nlyx: " << msg << endl;
+               // try to make a GUI message
+               Alert::error(_("LyX crashed!"), msg, true);
+       }
+

        // Deinstall the signal handlers
 #ifdef SIGHUP
        signal(SIGHUP, SIG_DFL);
        // Deinstall the signal handlers
 #ifdef SIGHUP
        signal(SIGHUP, SIG_DFL);


@@ -710,11 +702,18 @@ static void error_handler(int err_sig)
 
 #ifdef SIGHUP
        if (err_sig == SIGSEGV ||
 
 #ifdef SIGHUP
        if (err_sig == SIGSEGV ||

-           (err_sig != SIGHUP && !getEnv("LYXDEBUG").empty()))
+               (err_sig != SIGHUP && !getEnv("LYXDEBUG").empty())) {

 #else
 #else

-       if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty())
+       if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty()) {

 #endif
 #endif

+#ifdef _MSC_VER
+               // with abort() it crashes again.
+               exit(err_sig);
+#else

                abort();
                abort();

+#endif
+       }
+

        exit(0);
 }
 
        exit(0);
 }
 


@@ -728,6 +727,57 @@ void LyX::printError(ErrorItem const & ei)
        cerr << to_utf8(tmp) << endl;
 }
 
        cerr << to_utf8(tmp) << endl;
 }
 

+#if defined (USE_MACOSX_PACKAGING)
+namespace {
+       // Unexposed--extract an environment variable name from its NAME=VALUE
+       // representation
+       std::string varname(const char* line)
+       {
+               size_t nameLen = strcspn(line, "=");
+               if (nameLen == strlen(line)) {
+                       return std::string();
+               } else {
+                       return std::string(line, nameLen);
+               }
+       }
+}
+
+void cleanDuplicateEnvVars()
+{
+       std::set<std::string> seen;
+       std::set<std::string> dupes;
+
+       // Create a list of the environment variables that appear more than once
+       for (char **read = *_NSGetEnviron(); *read; read++) {
+               std::string name = varname(*read);
+               if (name.size() == 0) {
+                       continue;
+               }
+               if (seen.find(name) != seen.end()) {
+                       dupes.insert(name);
+               } else {
+                       seen.insert(name);
+               }
+       }
+
+       // Loop over the list of duplicated variables
+       std::set<std::string>::iterator dupe = dupes.begin();
+       std::set<std::string>::iterator const dend = dupes.end();
+       for (; dupe != dend; ++dupe) {
+               const char *name = (*dupe).c_str();
+               char *val = getenv(name);
+               if (val != NULL) {
+                       LYXERR(Debug::INIT, "Duplicate environment variable: " << name);
+                       // unsetenv removes *all* instances of the variable from the environment
+                       unsetenv(name);
+
+                       // replace with the value from getenv (in practice appears to be the
+                       // first value in the list)
+                       setenv(name, val, 0);
+               }
+       }
+}
+#endif

 
 bool LyX::init()
 {
 
 bool LyX::init()
 {


@@ -740,18 +790,40 @@ bool LyX::init()
        signal(SIGTERM, error_handler);
        // SIGPIPE can be safely ignored.
 
        signal(SIGTERM, error_handler);
        // SIGPIPE can be safely ignored.
 

-       lyxrc.tempdir_path = package().temp_dir().absFilename();
-       lyxrc.document_path = package().document_dir().absFilename();
+#if defined (USE_MACOSX_PACKAGING)
+       cleanDuplicateEnvVars();
+#endif
+
+       lyxrc.tempdir_path = package().temp_dir().absFileName();
+       lyxrc.document_path = package().document_dir().absFileName();

 
        if (lyxrc.example_path.empty()) {
 
        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()) {
                                              "examples");
        }
        if (lyxrc.template_path.empty()) {

-               lyxrc.template_path = addPath(package().system_support().absFilename(),
+               lyxrc.template_path = addPath(package().system_support().absFileName(),

                                              "templates");
        }
 
                                              "templates");
        }
 

+       // init LyXDir environment variable
+       string const lyx_dir = package().lyx_dir().absFileName();
+       LYXERR(Debug::INIT, "Setting LyXDir... to \"" << lyx_dir << "\"");
+       if (!setEnv("LyXDir", lyx_dir))
+               LYXERR(Debug::INIT, "\t... failed!");
+
+       if (package().explicit_user_support() && getEnv(LYX_USERDIR_VER).empty()) {
+               // -userdir was given on the command line.
+               // Make it available to child processes, otherwise tex2lyx
+               // would not find all layout files, and other converters might
+               // use it as well.
+               string const user_dir = package().user_support().absFileName();
+               LYXERR(Debug::INIT, "Setting " LYX_USERDIR_VER "... to \""
+                                   << user_dir << '"');
+               if (!setEnv(LYX_USERDIR_VER, user_dir))
+                       LYXERR(Debug::INIT, "\t... failed!");
+       }
+

        //
        // Read configuration files
        //
        //
        // Read configuration files
        //


@@ -760,26 +832,41 @@ bool LyX::init()
        if (!readRcFile("lyxrc.dist"))
                return false;
 
        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
        // so that LyX can find things like tex2lyx.
        if (package().build_support().empty())
        // 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())
 #endif
        if (!lyxrc.path_prefix.empty())

-               prependEnvPath("PATH", lyxrc.path_prefix);
+               prependEnvPath("PATH", replaceEnvironmentPath(lyxrc.path_prefix));

 
        // Check that user LyX directory is ok.
 
        // Check that user LyX directory is ok.

-       if (queryUserLyXDir(package().explicit_user_support()))
-               reconfigureUserLyXDir();
+       {
+               string const lock_file = package().getConfigureLockName();
+               int fd = fileLock(lock_file.c_str());
+
+               if (queryUserLyXDir(package().explicit_user_support())) {
+                       package().reconfigureUserLyXDir("");
+               }
+               fileUnlock(fd, lock_file.c_str());
+       }

 
 

-       // no need for a splash when there is no GUI

        if (!use_gui) {
        if (!use_gui) {

+               // No need for a splash when there is no GUI

                first_start = false;
                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.
        }
 
        // This one is generated in user_support directory by lib/configure.py.


@@ -799,56 +886,55 @@ bool LyX::init()
        system_lcolor = lcolor;
 
        // This one is edited through the preferences dialog.
        system_lcolor = lcolor;
 
        // This one is edited through the preferences dialog.

-       if (!readRcFile("preferences"))
+       if (!readRcFile("preferences", true))

                return false;
 
                return false;
 

+       // The language may have been set to someting useful through prefs
+       setLocale();
+

        if (!readEncodingsFile("encodings", "unicodesymbols"))
                return false;
        if (!readLanguagesFile("languages"))
                return false;
 
        if (!readEncodingsFile("encodings", "unicodesymbols"))
                return false;
        if (!readLanguagesFile("languages"))
                return false;
 

-       // Load the layouts

        LYXERR(Debug::INIT, "Reading layouts...");
        LYXERR(Debug::INIT, "Reading layouts...");

-       if (!LyXSetStyle())
-               return false;
+       // Load the layouts
+       LayoutFileList::get().read();

        //...and the modules
        //...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
 
 
        // 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);
 
        // 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
        // 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();
 
        os::windows_style_tex_paths(lyxrc.windows_style_tex_paths);
 
        if (lyxerr.debugging(Debug::LYXRC))
                lyxrc.print();
 
        os::windows_style_tex_paths(lyxrc.windows_style_tex_paths);

+       // Prepend path prefix a second time to take the user preferences into a account

        if (!lyxrc.path_prefix.empty())
        if (!lyxrc.path_prefix.empty())

-               prependEnvPath("PATH", lyxrc.path_prefix);
+               prependEnvPath("PATH", replaceEnvironmentPath(lyxrc.path_prefix));

 
        FileName const document_path(lyxrc.document_path);
        if (document_path.exists() && document_path.isDirectory())
                package().document_dir() = document_path;
 
 
        FileName const document_path(lyxrc.document_path);
        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"
        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
                                     from_utf8(lyxrc.tempdir_path)));
                // createLyXTmpDir() tries sufficiently hard to create a
                // usable temp dir, so the probability to come here is


@@ -859,7 +945,7 @@ bool LyX::init()
        }
 
        LYXERR(Debug::INIT, "LyX tmp dir: `"
        }
 
        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));
 
        LYXERR(Debug::INIT, "Reading session information '.lyx/session'...");
        pimpl_->session_.reset(new Session(lyxrc.num_lastfiles));


@@ -867,49 +953,28 @@ 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();
        // 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;
 }
 
 
        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
 
 {
        // 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 (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();

        }
 }
 
 
        }
 }
 
 

-// return true if file does not exist or is older than configure.py.
-static bool needsUpdate(string const & file)
-{
-       // We cannot initialize configure_script directly because the package
-       // is not initialized yet when  static objects are constructed.
-       static FileName configure_script;
-       static bool firstrun = true;
-       if (firstrun) {
-               configure_script =
-                       FileName(addName(package().system_support().absFilename(),
-                               "configure.py"));
-               firstrun = false;
-       }
-
-       FileName absfile = 
-               FileName(addName(package().user_support().absFilename(), file));
-       return !absfile.exists()
-               || configure_script.lastModified() > absfile.lastModified();
-}
-
-

 bool LyX::queryUserLyXDir(bool explicit_userdir)
 {
        // Does user directory exist?
 bool LyX::queryUserLyXDir(bool explicit_userdir)
 {
        // Does user directory exist?


@@ -917,10 +982,10 @@ bool LyX::queryUserLyXDir(bool explicit_userdir)
        if (sup.exists() && sup.isDirectory()) {
                first_start = false;
 
        if (sup.exists() && sup.isDirectory()) {
                first_start = false;
 

-               return needsUpdate("lyxrc.defaults")
-                       || needsUpdate("lyxmodules.lst")
-                       || needsUpdate("textclass.lst")
-                       || needsUpdate("packages.lst");
+               return configFileNeedsUpdate("lyxrc.defaults")
+                       || configFileNeedsUpdate("lyxmodules.lst")
+                       || configFileNeedsUpdate("textclass.lst")
+                       || configFileNeedsUpdate("packages.lst");

        }
 
        first_start = !explicit_userdir;
        }
 
        first_start = !explicit_userdir;


@@ -933,7 +998,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."),
                    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"))) {
                    1, 0,
                    _("&Create directory"),
                    _("&Exit LyX"))) {


@@ -942,7 +1007,7 @@ bool LyX::queryUserLyXDir(bool explicit_userdir)
        }
 
        lyxerr << to_utf8(bformat(_("LyX: Creating directory %1$s"),
        }
 
        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.
 
        if (!sup.createDirectory(0755)) {
                // Failed, so let's exit.


@@ -955,21 +1020,22 @@ bool LyX::queryUserLyXDir(bool explicit_userdir)
 }
 
 
 }
 
 

-bool LyX::readRcFile(string const & name)
+bool LyX::readRcFile(string const & name, bool check_format)

 {
        LYXERR(Debug::INIT, "About to read " << name << "... ");
 
        FileName const lyxrc_path = libFileSearch(string(), name);
 {
        LYXERR(Debug::INIT, "About to read " << name << "... ");
 
        FileName const lyxrc_path = libFileSearch(string(), name);

-       if (!lyxrc_path.empty()) {
-               LYXERR(Debug::INIT, "Found in " << lyxrc_path);
-               if (lyxrc.read(lyxrc_path) < 0) {
-                       showFileError(name);
-                       return false;
-               }
-       } else {
+       if (lyxrc_path.empty()) {

                LYXERR(Debug::INIT, "Not found." << lyxrc_path);
                LYXERR(Debug::INIT, "Not found." << lyxrc_path);

+               // FIXME
+               // This was the previous logic, but can it be right??
+               return true;

        }
        }

-       return true;
+       LYXERR(Debug::INIT, "Found in " << lyxrc_path);
+       bool const success = lyxrc.read(lyxrc_path, check_format);
+       if (!success)
+               showFileError(name);
+       return success;

 }
 
 // Read the languages file `name'
 }
 
 // Read the languages file `name'


@@ -1012,29 +1078,27 @@ bool LyX::readEncodingsFile(string const & enc_name,
 
 namespace {
 
 
 namespace {
 

-string batch;
-

 /// return the the number of arguments consumed
 /// return the the number of arguments consumed

-typedef boost::function<int(string const &, string const &)> cmd_helper;
+typedef boost::function<int(string const &, string const &, string &)> cmd_helper;

 
 

-int parse_dbg(string const & arg, string const &)
+int parse_dbg(string const & arg, string const &, string &)

 {
        if (arg.empty()) {
 {
        if (arg.empty()) {

-               lyxerr << to_utf8(_("List of supported debug flags:")) << endl;
-               Debug::showTags(lyxerr);
+               cout << to_utf8(_("List of supported debug flags:")) << endl;
+               Debug::showTags(cout);

                exit(0);
        }
        lyxerr << to_utf8(bformat(_("Setting debug level to %1$s"), from_utf8(arg))) << endl;
 
                exit(0);
        }
        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;
 }
 
 
        Debug::showLevel(lyxerr, lyxerr.level());
        return 1;
 }
 
 

-int parse_help(string const &, string const &)
+int parse_help(string const &, string const &, string &)

 {
 {

-       lyxerr <<
+       cout <<

                to_utf8(_("Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
                  "Command line switches (case sensitive):\n"
                  "\t-help              summarize LyX usage\n"
                to_utf8(_("Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
                  "Command line switches (case sensitive):\n"
                  "\t-help              summarize LyX usage\n"


@@ -1047,32 +1111,49 @@ int parse_help(string const &, string const &)
                  "\t-x [--execute] command\n"
                  "                  where command is a lyx command.\n"
                  "\t-e [--export] fmt\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"
-                 "                  Look on Tools->Preferences->File formats->Format\n"
-                 "                  to get an idea which parameters should be passed.\n"
+                 "                  where fmt is the export format of choice. Look in\n"
+                 "                  Tools->Preferences->File Handling->File Formats->Short Name\n"
+                 "                  to see which parameter (which differs from the format name\n"
+                 "                  in the File->Export menu) should be passed.\n"
+                 "                  Note that the order of -e and -x switches matters.\n"
+                 "\t-E [--export-to] fmt filename\n"
+                 "                  where fmt is the export format of choice (see --export),\n"
+                 "                  and filename is the destination filename.\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-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"
+                 "\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-n [--no-remote]\n"
+                 "                  open documents in a new instance\n"
+                 "\t-r [--remote]\n"
+                 "                  open documents in an already running instance\n"
+                 "                  (a working lyxpipe is needed)\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);
        return 0;
 }
 
 
                               "Check the LyX man page for more details.")) << endl;
        exit(0);
        return 0;
 }
 
 

-int parse_version(string const &, string const &)
+int parse_version(string const &, string const &, string &)

 {
 {

-       lyxerr << "LyX " << lyx_version
+       cout << "LyX " << lyx_version

               << " (" << lyx_release_date << ")" << endl;
               << " (" << lyx_release_date << ")" << endl;

-       lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl;
-
-       lyxerr << lyx_version_info << endl;
+       if (string(lyx_git_commit_hash) != "none")
+               cout << to_utf8(_("  Git commit hash "))
+                    << string(lyx_git_commit_hash).substr(0,8) << endl;
+       cout << lyx_version_info << endl;

        exit(0);
        return 0;
 }
 
 
        exit(0);
        return 0;
 }
 
 

-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"),
 {
        if (arg.empty()) {
                Alert::error(_("No system directory"),


@@ -1084,7 +1165,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"),
 {
        if (arg.empty()) {
                Alert::error(_("No user directory"),


@@ -1096,7 +1177,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"),
 {
        if (arg.empty()) {
                Alert::error(_("Incomplete command"),


@@ -1108,7 +1189,25 @@ int parse_execute(string const & arg, string const &)
 }
 
 
 }
 
 

-int parse_export(string const & type, string const &)
+int parse_export_to(string const & type, string const & output_file, string & batch)
+{
+       if (type.empty()) {
+               lyxerr << to_utf8(_("Missing file type [eg latex, ps...] after "
+                                        "--export-to switch")) << endl;
+               exit(1);
+       }
+       if (output_file.empty()) {
+               lyxerr << to_utf8(_("Missing destination filename after "
+                                        "--export-to switch")) << endl;
+               exit(1);
+       }
+       batch = "buffer-export " + type + " " + output_file;
+       use_gui = false;
+       return 2;
+}
+
+
+int parse_export(string const & type, string const &, string & batch)

 {
        if (type.empty()) {
                lyxerr << to_utf8(_("Missing file type [eg latex, ps...] after "
 {
        if (type.empty()) {
                lyxerr << to_utf8(_("Missing file type [eg latex, ps...] after "


@@ -1121,7 +1220,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 "
 {
        if (type.empty()) {
                lyxerr << to_utf8(_("Missing file type [eg latex, ps...] after "


@@ -1132,22 +1231,55 @@ int parse_import(string const & type, string const & file)
                lyxerr << to_utf8(_("Missing filename for --import")) << endl;
                exit(1);
        }
                lyxerr << to_utf8(_("Missing filename for --import")) << endl;
                exit(1);
        }

-

        batch = "buffer-import " + type + ' ' + file;
        return 2;
 }
 
 
        batch = "buffer-import " + type + ' ' + file;
        return 2;
 }
 
 

-int parse_geometry(string const & arg1, string const &)
+int parse_geometry(string const & arg1, string const &, string &)

 {
        geometryArg = arg1;
 {
        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;
        return -1;

-#endif
+}
+
+
+int parse_batch(string const &, string const &, string &)
+{
+       use_gui = false;
+       return 0;
+}
+
+
+int parse_noremote(string const &, string const &, string &)
+{
+       run_mode = NEW_INSTANCE;
+       return 0;
+}
+
+
+int parse_remote(string const &, string const &, string &)
+{
+       run_mode = USE_REMOTE;
+       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;

 }
 
 
 }
 
 


@@ -1169,9 +1301,18 @@ void LyX::easyParse(int & argc, char * argv[])
        cmdmap["--execute"] = parse_execute;
        cmdmap["-e"] = parse_export;
        cmdmap["--export"] = parse_export;
        cmdmap["--execute"] = parse_execute;
        cmdmap["-e"] = parse_export;
        cmdmap["--export"] = parse_export;

+       cmdmap["-E"] = parse_export_to;
+       cmdmap["--export-to"] = parse_export_to;

        cmdmap["-i"] = parse_import;
        cmdmap["--import"] = parse_import;
        cmdmap["-geometry"] = parse_geometry;
        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;
+       cmdmap["-n"] = parse_noremote;
+       cmdmap["--no-remote"] = parse_noremote;
+       cmdmap["-r"] = parse_remote;
+       cmdmap["--remote"] = parse_remote;

 
        for (int i = 1; i < argc; ++i) {
                map<string, cmd_helper>::const_iterator it
 
        for (int i = 1; i < argc; ++i) {
                map<string, cmd_helper>::const_iterator it


@@ -1182,117 +1323,219 @@ void LyX::easyParse(int & argc, char * argv[])
                        continue;
 
                string const arg =
                        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 =
                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) {
 
                // 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;
                }
        }
                        argc -= remove;
                        for (int j = i; j < argc; ++j)
                                argv[j] = argv[j + remove];
                        --i;
                }
        }

-
-       pimpl_->batch_command = batch;

 }
 
 
 FuncStatus getStatus(FuncRequest const & action)
 {
 }
 
 
 FuncStatus getStatus(FuncRequest const & action)
 {

-       return LyX::ref().lyxFunc().getStatus(action);
+       LAPPERR(theApp());
+       return theApp()->getStatus(action);

 }
 
 
 void dispatch(FuncRequest const & action)
 {
 }
 
 
 void dispatch(FuncRequest const & action)
 {

-       LyX::ref().lyxFunc().dispatch(action);
+       LAPPERR(theApp());
+       return theApp()->dispatch(action);

 }
 
 
 }
 
 

-BufferList & theBufferList()
+void dispatch(FuncRequest const & action, DispatchResult & dr)

 {
 {

-       return LyX::ref().bufferList();
+       LAPPERR(theApp());
+       return theApp()->dispatch(action, dr);

 }
 
 
 }
 
 

-LyXFunc & theLyXFunc()
+vector<string> & theFilesToLoad()

 {
 {

-       return LyX::ref().lyxFunc();
+       LAPPERR(singleton_);
+       return singleton_->pimpl_->files_to_load_;
+}
+
+
+BufferList & theBufferList()
+{
+       LAPPERR(singleton_);
+       return singleton_->pimpl_->buffer_list_;

 }
 
 
 Server & theServer()
 {
        // FIXME: this should not be use_gui dependent
 }
 
 
 Server & theServer()
 {
        // FIXME: this should not be use_gui dependent

-       LASSERT(use_gui, /**/);
-       return LyX::ref().server();
+       LWARNIF(use_gui);
+       LAPPERR(singleton_);
+       return *singleton_->pimpl_->lyx_server_.get();

 }
 
 
 ServerSocket & theServerSocket()
 {
        // FIXME: this should not be use_gui dependent
 }
 
 
 ServerSocket & theServerSocket()
 {
        // FIXME: this should not be use_gui dependent

-       LASSERT(use_gui, /**/);
-       return LyX::ref().socket();
+       LWARNIF(use_gui);
+       LAPPERR(singleton_);
+       return *singleton_->pimpl_->lyx_socket_.get();

 }
 
 
 KeyMap & theTopLevelKeymap()
 {
 }
 
 
 KeyMap & theTopLevelKeymap()
 {

-       return LyX::ref().pimpl_->toplevel_keymap_;
+       LAPPERR(singleton_);
+       return singleton_->pimpl_->toplevel_keymap_;

 }
 
 
 Converters & theConverters()
 {
 }
 
 
 Converters & theConverters()
 {

-       return  LyX::ref().converters();
+       LAPPERR(singleton_);
+       return  singleton_->pimpl_->converters_;

 }
 
 
 Converters & theSystemConverters()
 {
 }
 
 
 Converters & theSystemConverters()
 {

-       return  LyX::ref().systemConverters();
+       LAPPERR(singleton_);
+       return  singleton_->pimpl_->system_converters_;

 }
 
 
 Movers & theMovers()
 {
 }
 
 
 Movers & theMovers()
 {

-       return  LyX::ref().pimpl_->movers_;
+       LAPPERR(singleton_);
+       return singleton_->pimpl_->movers_;

 }
 
 
 Mover const & getMover(string  const & fmt)
 {
 }
 
 
 Mover const & getMover(string  const & fmt)
 {

-       return  LyX::ref().pimpl_->movers_(fmt);
+       LAPPERR(singleton_);
+       return singleton_->pimpl_->movers_(fmt);

 }
 
 
 void setMover(string const & fmt, string const & command)
 {
 }
 
 
 void setMover(string const & fmt, string const & command)
 {

-       LyX::ref().pimpl_->movers_.set(fmt, command);
+       LAPPERR(singleton_);
+       singleton_->pimpl_->movers_.set(fmt, command);

 }
 
 
 Movers & theSystemMovers()
 {
 }
 
 
 Movers & theSystemMovers()
 {

-       return  LyX::ref().pimpl_->system_movers_;
+       LAPPERR(singleton_);
+       return singleton_->pimpl_->system_movers_;
+}
+
+
+Messages const & getMessages(string const & language)
+{
+       LAPPERR(singleton_);
+       return singleton_->messages(language);
+}
+
+
+Messages const & getGuiMessages()
+{
+       LAPPERR(singleton_);
+       return singleton_->messages(Messages::guiLanguage());
+}
+
+
+Session & theSession()
+{
+       LAPPERR(singleton_);
+       return *singleton_->pimpl_->session_.get();
+}
+
+
+LaTeXFonts & theLaTeXFonts()
+{
+       LAPPERR(singleton_);
+       if (!singleton_->pimpl_->latexfonts_)
+               singleton_->pimpl_->latexfonts_ = new LaTeXFonts;
+       return *singleton_->pimpl_->latexfonts_;

 }
 
 
 }
 
 

-Messages & getMessages(string const & language)
+CmdDef & theTopLevelCmdDef()

 {
 {

-       return LyX::ref().getMessages(language);
+       LAPPERR(singleton_);
+       return singleton_->pimpl_->toplevel_cmddef_;

 }
 
 
 }
 
 

-Messages & getGuiMessages()
+SpellChecker * theSpellChecker()

 {
 {

-       return LyX::ref().getGuiMessages();
+       if (!singleton_->pimpl_->spell_checker_)
+               setSpellChecker();
+       return singleton_->pimpl_->spell_checker_;
+}
+
+
+void setSpellChecker()
+{
+       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
 }
 
 } // namespace lyx