#include "Buffer.h"
#include "BufferList.h"
#include "CmdDef.h"
+#include "CiteEnginesList.h"
#include "ColorSet.h"
#include "ConverterCache.h"
#include "Converter.h"
#include "CutAndPaste.h"
+#include "DispatchResult.h"
#include "EnchantChecker.h"
#include "Encoding.h"
#include "ErrorList.h"
#include "Language.h"
#include "LaTeXFonts.h"
#include "LayoutFile.h"
-#include "Lexer.h"
-#include "LyX.h"
#include "LyXAction.h"
#include "LyXRC.h"
#include "ModuleList.h"
#include "Server.h"
#include "ServerSocket.h"
#include "Session.h"
-#include "WordList.h"
#include "frontends/alert.h"
#include "frontends/Application.h"
-#include "support/bind.h"
#include "support/ConsoleApplication.h"
#include "support/lassert.h"
#include "support/debug.h"
#include "support/Package.h"
#include "support/unique_ptr.h"
-#include <algorithm>
-#include <iostream>
#include <csignal>
+#include <iostream>
+#include <functional>
#include <map>
#include <stdlib.h>
#include <string>
#include <vector>
+#include <qglobal.h> // For QT_VERSION
+
using namespace std;
using namespace lyx::support;
bool use_gui = true;
+// Report on the terminal about spawned commands. The default is false
+// and can be changed with the option -v (--verbose).
+
+bool verbose = false;
+
+
+// Do not treat the "missing glyphs" warning of fontspec as an error message.
+// The default is false and can be changed with the option
+// --ignore-error-message missing_glyphs
+// This is used in automated testing.
+bool ignore_missing_glyphs = false;
+
+
// 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.
string geometryArg;
-LyX * singleton_ = 0;
+LyX * singleton_ = nullptr;
void showFileError(string const & error)
{
"Please check your installation."), from_utf8(error)));
}
-} // namespace anon
+} // namespace
/// The main application class private implementation.
struct LyX::Impl {
Impl()
- : latexfonts_(0), spell_checker_(0), apple_spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0)
+ : latexfonts_(nullptr), spell_checker_(nullptr),
+ apple_spell_checker_(nullptr), aspell_checker_(nullptr),
+ enchant_checker_(nullptr), hunspell_checker_(nullptr)
{}
~Impl()
/// The file converters.
Converters converters_;
-
- // The system converters copy after reading lyxrc.defaults.
+ /// The system converters after reading lyxrc.defaults.
Converters system_converters_;
+ /// Global format information
+ Formats formats_;
+ /// The system formats after reading lyxrc.defaults.
+ Formats system_formats_;
+
+
///
Movers movers_;
///
argc_(argc), argv_(argv)
{
}
- void doExec()
+ void doExec() override
{
int const exit_status = lyx_->execWithoutGui(argc_, argv_);
exit(exit_status);
if (singleton_)
return singleton_->pimpl_->application_.get();
else
- return 0;
+ return nullptr;
}
LyX::~LyX()
{
delete pimpl_;
- singleton_ = 0;
- WordList::cleanupWordLists();
+ singleton_ = nullptr;
}
FileName(package().temp_dir().absFileName() + "/lyxsocket")));
// Start the real execution loop.
- if (!theServer().deferredLoadingToOtherInstance())
+ if (!pimpl_->lyx_server_->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;
+ for (auto const & f : pimpl_->files_to_load_)
+ lyxerr << f << endl;
}
prepareExit();
// Write the index file of the converter cache
ConverterCache::get().writeIndex();
- // close buffers first
- pimpl_->buffer_list_.closeAll();
+ // closing buffer may throw exceptions, but we ignore them since we
+ // are quitting.
+ try {
+ // close buffers first
+ pimpl_->buffer_list_.closeAll();
+ } catch (ExceptionMessage const &) {}
// register session changes and shutdown server and socket
if (use_gui) {
// do any other cleanup procedures now
if (package().temp_dir() != package().system_temp_dir()) {
string const abs_tmpdir = package().temp_dir().absFileName();
- if (!contains(package().temp_dir().absFileName(), "lyx_tmpdir")) {
+ if (!contains(abs_tmpdir, "lyx_tmpdir")) {
docstring const 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());
+ LYXERR(Debug::INFO, "Deleting tmp dir " << abs_tmpdir);
if (!package().temp_dir().destroyDirectory()) {
LYXERR0(bformat(_("Unable to remove the temporary directory %1$s"),
- from_utf8(package().temp_dir().absFileName())));
+ from_utf8(abs_tmpdir)));
}
}
}
if (first_start) {
pimpl_->files_to_load_.push_back(
- i18nLibFileSearch("examples", "splash.lyx").absFileName());
+ i18nLibFileSearch("examples", "Welcome.lyx").absFileName());
}
return EXIT_SUCCESS;
}
// Used to keep track of which buffers were explicitly loaded by user request.
- // This is necessary because master and child document buffers are loaded, even
+ // This is necessary because master and child document buffers are loaded, even
// if they were not named on the command line. We do not want to dispatch to
// those.
vector<Buffer *> command_line_buffers;
Buffer * buf = pimpl_->buffer_list_.newBuffer(fname.absFileName());
LYXERR(Debug::FILES, "Loading " << fname);
- if (buf->loadLyXFile() == Buffer::ReadSuccess) {
+ if (buf && buf->loadLyXFile() == Buffer::ReadSuccess) {
ErrorList const & el = buf->errorList("Parse");
- if (!el.empty())
- for_each(el.begin(), el.end(),
- bind(&LyX::printError, this, _1));
+ for(ErrorItem const & e : el)
+ printError(e);
command_line_buffers.push_back(buf);
} else {
- pimpl_->buffer_list_.release(buf);
+ if (buf)
+ pimpl_->buffer_list_.release(buf);
docstring const error_message =
bformat(_("LyX failed to load the following file: %1$s"),
from_utf8(fname.absFileName()));
{
// The advantage of doing this here is that the event loop
// is already started. So any need for interaction will be
- // aknowledged.
+ // acknowledged.
// if reconfiguration is needed.
- if (LayoutFileList::get().empty()) {
+ const bool noLayouts = LayoutFileList::get().empty();
+ if (noLayouts && os::hasPython()) {
switch (Alert::prompt(
_("No textclass is found"),
_("LyX will only have minimal functionality because no textclasses "
0, 2,
_("&Reconfigure"),
_("&Without LaTeX"),
- _("&Continue")))
+ _("&Continue"),
+ _("&Exit LyX")))
{
case 0:
// regular reconfigure
lyx::dispatch(FuncRequest(LFUN_RECONFIGURE,
" --without-latex-config"));
break;
+ case 3:
+ lyx::dispatch(FuncRequest(LFUN_LYX_QUIT, ""));
+ return;
+ default:
+ break;
+ }
+ } else if (noLayouts) {
+ switch (Alert::prompt(
+ _("No python is found"),
+ _("LyX will only have minimal functionality because no python interpreter "
+ "has been found. Consider installing python with your software manager "
+ "or from the python.org website."),
+ 0, 1,
+ _("&Continue"),
+ _("&Exit LyX")))
+ {
+ case 1:
+ lyx::dispatch(FuncRequest(LFUN_LYX_QUIT, ""));
+ return;
default:
break;
}
return std::string(line, nameLen);
}
}
-}
+} // namespace
void cleanDuplicateEnvVars()
{
if (package().build_support().empty())
prependEnvPath("PATH", package().binary_dir().absFileName());
#endif
+ {
+ // Add the directory containing the dt2dv and dv2dt executables to the path
+ FileName dtldir;
+ if (!package().build_support().empty()) {
+ // dtl executables should be in the same dir ar tex2lyx
+ dtldir = package().binary_dir();
+ }
+ else {
+ dtldir = FileName(addName(package().system_support().absFileName(), "extratools"));
+ }
+#if defined(_WIN32)
+ string dtlexe = "dt2dv.exe";
+#else
+ string dtlexe = "dt2dv";
+#endif
+ FileName const dt2dv = FileName(addName(dtldir.absFileName(), dtlexe));
+ if (dt2dv.exists())
+ prependEnvPath("PATH", dtldir.absFileName());
+ }
if (!lyxrc.path_prefix.empty())
prependEnvPath("PATH", replaceEnvironmentPath(lyxrc.path_prefix));
return false;
// Query the OS to know what formats are viewed natively
- formats.setAutoOpen();
+ theFormats().setAutoOpen();
// Read lyxrc.dist again to be able to override viewer auto-detection.
readRcFile("lyxrc.dist");
system_lyxrc = lyxrc;
- system_formats = formats;
+ theSystemFormats() = theFormats();
pimpl_->system_converters_ = pimpl_->converters_;
pimpl_->system_movers_ = pimpl_->movers_;
system_lcolor = lcolor;
// This one is edited through the preferences dialog.
if (!readRcFile("preferences", true))
return false;
+ pimpl_->application_->applyPrefs();
// The language may have been set to someting useful through prefs
setLocale();
LYXERR(Debug::INIT, "Reading layouts...");
// Load the layouts
LayoutFileList::get().read();
- //...and the modules
+ //... the modules
theModuleList.read();
+ //... and the cite engines
+ theCiteEnginesList.read();
// read keymap and ui files in batch mode as well
// because InsetInfo needs to know these to produce
pimpl_->toplevel_keymap_.read("site");
pimpl_->toplevel_keymap_.read(lyxrc.bind_file);
// load user bind file user.bind
- pimpl_->toplevel_keymap_.read("user", 0, KeyMap::MissingOK);
+ pimpl_->toplevel_keymap_.read("user", nullptr, KeyMap::MissingOK);
if (lyxerr.debugging(Debug::LYXRC))
lyxrc.print();
return configFileNeedsUpdate("lyxrc.defaults")
|| configFileNeedsUpdate("lyxmodules.lst")
|| configFileNeedsUpdate("textclass.lst")
- || configFileNeedsUpdate("packages.lst");
+ || configFileNeedsUpdate("packages.lst")
+ || configFileNeedsUpdate("lyxciteengines.lst")
+ || configFileNeedsUpdate("xtemplates.lst");
}
first_start = !explicit_userdir;
if (!sup.createDirectory(0755)) {
// Failed, so let's exit.
- lyxerr << to_utf8(_("Failed to create directory. Exiting."))
+ lyxerr << to_utf8(_("Failed to create directory. Perhaps wrong -userdir command-line option?\nExiting."))
<< endl;
earlyExit(EXIT_FAILURE);
}
namespace {
/// return the the number of arguments consumed
-typedef boost::function<int(string const &, string const &, string &)> cmd_helper;
+typedef function<int(string const &, string const &, string &)> cmd_helper;
int parse_dbg(string const & arg, string const &, string &)
{
Debug::showTags(cout);
exit(0);
}
- lyxerr << to_utf8(bformat(_("Setting debug level to %1$s"), from_utf8(arg))) << endl;
-
- lyxerr.setLevel(Debug::value(arg));
- Debug::showLevel(lyxerr, lyxerr.level());
+ string bad = Debug::badValue(arg);
+ if (bad.empty()) {
+ lyxerr.setLevel(Debug::value(arg));
+ Debug::showLevel(lyxerr, lyxerr.level());
+ } else {
+ cout << to_utf8(bformat(_("Bad debug value `%1$s'. Exiting."),
+ from_utf8(bad))) << endl;
+ exit(1);
+ }
return 1;
}
" 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"
+ " in the File->Export menu) should be passed. To export to\n"
+ " the document's default output format, use 'default'.\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"
" 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--ignore-error-message which\n"
+ " allows you to ignore specific LaTeX error messages.\n"
+ " Do not use for final documents! Currently supported values:\n"
+ " * missing_glyphs: Fontspec `missing glyphs' error.\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-v [--verbose]\n"
+ " report on terminal about spawned commands.\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;
int parse_geometry(string const & arg1, string const &, string &)
{
geometryArg = arg1;
+#if !defined(QPA_XCB)
// don't remove "-geometry", it will be pruned out later in the
// frontend if need be.
return -1;
+#else
+ // but that is only done if QPA_XCB is not defined.
+ return 1;
+#endif
}
}
+int parse_verbose(string const &, string const &, string &)
+{
+ verbose = true;
+ return 0;
+}
+
+
+int parse_ignore_error_message(string const & arg1, string const &, string &)
+{
+ if (arg1 == "missing_glyphs") {
+ ignore_missing_glyphs = true;
+ return 1;
+ }
+ return 0;
+}
+
+
int parse_force(string const & arg, string const &, string &)
{
if (arg == "all") {
}
-} // namespace anon
+} // namespace
void LyX::easyParse(int & argc, char * argv[])
cmdmap["--no-remote"] = parse_noremote;
cmdmap["-r"] = parse_remote;
cmdmap["--remote"] = parse_remote;
+ cmdmap["-v"] = parse_verbose;
+ cmdmap["--verbose"] = parse_verbose;
+ cmdmap["--ignore-error-message"] = parse_ignore_error_message;
for (int i = 1; i < argc; ++i) {
map<string, cmd_helper>::const_iterator it
}
+Formats & theFormats()
+{
+ LAPPERR(singleton_);
+ return singleton_->pimpl_->formats_;
+}
+
+
+Formats & theSystemFormats()
+{
+ LAPPERR(singleton_);
+ return singleton_->pimpl_->system_formats_;
+}
+
+
Converters & theConverters()
{
LAPPERR(singleton_);
- return singleton_->pimpl_->converters_;
+ return singleton_->pimpl_->converters_;
}
Converters & theSystemConverters()
{
LAPPERR(singleton_);
- return singleton_->pimpl_->system_converters_;
+ return singleton_->pimpl_->system_converters_;
}
singleton_->pimpl_->apple_spell_checker_ = new AppleSpellChecker;
singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->apple_spell_checker_;
#else
- singleton_->pimpl_->spell_checker_ = 0;
+ singleton_->pimpl_->spell_checker_ = nullptr;
#endif
} else if (lyxrc.spellchecker == "aspell") {
#if defined(USE_ASPELL)
singleton_->pimpl_->aspell_checker_ = new AspellChecker;
singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->aspell_checker_;
#else
- singleton_->pimpl_->spell_checker_ = 0;
+ singleton_->pimpl_->spell_checker_ = nullptr;
#endif
} else if (lyxrc.spellchecker == "enchant") {
#if defined(USE_ENCHANT)
singleton_->pimpl_->enchant_checker_ = new EnchantChecker;
singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->enchant_checker_;
#else
- singleton_->pimpl_->spell_checker_ = 0;
+ singleton_->pimpl_->spell_checker_ = nullptr;
#endif
} else if (lyxrc.spellchecker == "hunspell") {
#if defined(USE_HUNSPELL)
singleton_->pimpl_->hunspell_checker_ = new HunspellChecker;
singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->hunspell_checker_;
#else
- singleton_->pimpl_->spell_checker_ = 0;
+ singleton_->pimpl_->spell_checker_ = nullptr;
#endif
} else {
- singleton_->pimpl_->spell_checker_ = 0;
+ singleton_->pimpl_->spell_checker_ = nullptr;
}
if (singleton_->pimpl_->spell_checker_) {
singleton_->pimpl_->spell_checker_->changeNumber(speller_change_number);