#include "frontends/Application.h"
#include "support/ConsoleApplication.h"
+#include "support/convert.h"
#include "support/lassert.h"
#include "support/debug.h"
#include "support/environment.h"
#include <string>
#include <vector>
+#include <qglobal.h> // For QT_VERSION
+
using namespace std;
using namespace lyx::support;
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.
OverwriteFiles force_overwrite = UNSPECIFIED;
+// Scale the GUI by this factor. This works whether we have a HiDpi screen
+// or not and scales everything, also fonts. Can only be changed by setting
+// the QT_SCALE_FACTOR environment variable before launching LyX and only
+// works properly with Qt 5.6 or higher.
+
+double qt_scale_factor = 1.0;
+
+
namespace {
// Filled with the command line arguments "foo" of "-sysdir foo" or
"Please check your installation."), from_utf8(error)));
}
-} // namespace anon
+} // namespace
/// The main application class private implementation.
struct LyX::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_;
///
// we need to parse for "-dbg" and "-help"
easyParse(argc, argv);
+#if QT_VERSION >= 0x050600
+ // Check whether Qt will scale all GUI elements and accordingly
+ // set the scale factor so that to avoid blurred images and text
+ char const * const scale_factor = getenv("QT_SCALE_FACTOR");
+ if (scale_factor) {
+ qt_scale_factor = convert<double>(scale_factor);
+ if (qt_scale_factor < 1.0)
+ qt_scale_factor = 1.0;
+ }
+#endif
+
try {
init_package(os::utf8_argv(0), cl_system_support, cl_user_support);
} catch (ExceptionMessage const & message) {
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();
// 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) {
}
// 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;
return std::string(line, nameLen);
}
}
-}
+} // namespace
void cleanDuplicateEnvVars()
{
#endif
lyxrc.tempdir_path = package().temp_dir().absFileName();
- lyxrc.document_path = ".";
+ lyxrc.document_path = package().document_dir().absFileName();
if (lyxrc.example_path.empty()) {
lyxrc.example_path = addPath(package().system_support().absFileName(),
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;
|| configFileNeedsUpdate("lyxmodules.lst")
|| configFileNeedsUpdate("textclass.lst")
|| configFileNeedsUpdate("packages.lst")
- || configFileNeedsUpdate("lyxciteengines.lst");
+ || configFileNeedsUpdate("lyxciteengines.lst")
+ || configFileNeedsUpdate("xtemplates.lst");
}
first_start = !explicit_userdir;
" 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"
}
+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["--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_;
}
projects / lyx.git / blobdiff