Workaround for #6865: smarter FontList::setMisspelled implementation

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index e1bb5a92f7b58043dd9ca61bf19ce0184a88f0c4..42f79297cc0c8cf64da29457574de830baae1f4d 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -17,6 +17,7 @@
 
 #include "LyX.h"
 
+#include "AppleSpellChecker.h"
 #include "AspellChecker.h"
 #include "Buffer.h"
 #include "BufferList.h"
@@ -90,9 +91,11 @@ bool use_gui = true;
 
 
 // Tell what files can be silently overwritten during batch export.
-// Possible values are: NO_FILES, MAIN_FILE, ALL_FILES.
+// 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 = NO_FILES;
+OverwriteFiles force_overwrite = UNSPECIFIED;
 
 
 namespace {
@@ -130,7 +133,7 @@ void reconfigureUserLyXDir()
 /// The main application class private implementation.
 struct LyX::Impl
 {
-       Impl() : spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0)
+       Impl() : spell_checker_(0), apple_spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0)
        {
                // Set the default User Interface language as soon as possible.
                // The language used will be derived from the environment
@@ -140,6 +143,7 @@ struct LyX::Impl
 
        ~Impl()
        {
+               delete apple_spell_checker_;
                delete aspell_checker_;
                delete enchant_checker_;
                delete hunspell_checker_;
@@ -187,6 +191,8 @@ struct LyX::Impl
        ///
        SpellChecker * spell_checker_;
        ///
+       SpellChecker * apple_spell_checker_;
+       ///
        SpellChecker * aspell_checker_;
        ///
        SpellChecker * enchant_checker_;
@@ -275,6 +281,13 @@ void setRcGuiLanguage()
 
 int LyX::exec(int & argc, char * argv[])
 {
+       // Minimal setting of locale before parsing command line
+       try {
+               init_package(os::utf8_argv(0), string(), string(),
+                             top_build_dir_is_one_level_up);
+       } catch (ExceptionMessage const & message) {}
+       locale_init();
+
        // Here we need to parse the command line. At least
        // we need to parse for "-dbg" and "-help"
        easyParse(argc, argv);
@@ -451,7 +464,7 @@ int LyX::init(int & argc, char * argv[])
                return EXIT_FAILURE;
 
        // Remaining arguments are assumed to be files to load.
-       for (int argi = argc - 1; argi >= 1; --argi)
+       for (int argi = 1; argi < argc; ++argi)
                pimpl_->files_to_load_.push_back(os::utf8_argv(argi));
 
        if (first_start) {
@@ -512,7 +525,7 @@ void LyX::execCommands()
        if (LayoutFileList::get().empty()) {
                switch (Alert::prompt(
                        _("No textclass is found"),
-                       _("LyX will have minimal functionality because no textclasses "
+                       _("LyX will only have minimal functionality because no textclasses "
                                "have been found. You can either try to reconfigure LyX normally, "
                                "try to reconfigure using only the defaults, or continue."),
                        0, 2,
@@ -732,9 +745,20 @@ bool LyX::init()
        if (queryUserLyXDir(package().explicit_user_support()))
                reconfigureUserLyXDir();
 
-       // no need for a splash when there is no GUI
        if (!use_gui) {
+               // No need for a splash when there is no GUI
                first_start = false;
+               // Default is to overwrite the main file during export, unless
+               // the -f switch was specified or LYX_FORCE_OVERWRITE was set
+               if (force_overwrite == UNSPECIFIED) {
+                       string const what = getEnv("LYX_FORCE_OVERWRITE");
+                       if (what == "all")
+                               force_overwrite = ALL_FILES;
+                       else if (what == "none")
+                               force_overwrite = NO_FILES;
+                       else
+                               force_overwrite = MAIN_FILE;
+               }
        }
 
        // This one is generated in user_support directory by lib/configure.py.
@@ -1008,9 +1032,9 @@ int parse_help(string const &, string const &, string &)
                  "                  where fmt is the import format of choice\n"
                  "                  and file.xxx is the file to be imported.\n"
                  "\t-f [--force-overwrite] what\n"
-                 "                  where what is either `all' or `main'.\n"
-                 "                  Using `all', all files are overwritten during\n"
-                 "                  a batch export, otherwise only the main file will be.\n"
+                 "                  where what is either `all', `main' or `none',\n"
+                 "                  specifying whether all files, main file only, or no files,\n"
+                 "                  respectively, are to be overwritten during a batch export.\n"
                  "                  Anything else is equivalent to `all', but is not consumed.\n"
                  "\t-batch          execute commands without launching GUI and exit.\n"
                  "\t-version        summarize version and build info\n"
@@ -1122,6 +1146,9 @@ int parse_force(string const & arg, string const &, string &)
        } 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;
@@ -1324,6 +1351,14 @@ SpellChecker * theSpellChecker()
 
 void setSpellChecker()
 {
+#if defined(USE_MACOSX_PACKAGING)
+       if (lyxrc.spellchecker == "native") {
+               if (!singleton_->pimpl_->apple_spell_checker_)
+                       singleton_->pimpl_->apple_spell_checker_ = new AppleSpellChecker();
+               singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->apple_spell_checker_;
+               return;
+       }
+#endif
 #if defined(USE_ASPELL)
        if (lyxrc.spellchecker == "aspell") {
                if (!singleton_->pimpl_->aspell_checker_)