anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #9622

Browse Source 
The backslash is the escape character used in our parser. Hence,
when used as a path separator on Windows, it has to be itself
escaped or the path enclosed in either double or single quotes.
Windows users are maybe trained to quote paths containing spaces
but not paths with backslashes. So, we automatically escape the
backslashes when they are not already enclosed in quotes.
This commit is contained in:
Enrico Forestieri 2018-12-14 11:41:16 +01:00
parent 95bc273a59
commit 4c9df62c6c
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Format.cpp
View File

@ -682,6 +682,28 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
string command = format->viewer();
// Escape backslashes if not already in double or single quotes.
// We cannot simply quote the whole command as there may be arguments.
if (contains(command, '\\')) {
bool inquote1 = false;
bool inquote2 = false;
string::iterator cit = command.begin();
for (; cit != command.end(); ++cit) {
switch (*cit) {
case '"':
inquote1 = !inquote1;
break;
case '\'':
inquote2 = !inquote2;
break;
case '\\':
if (!inquote1 && !inquote2)
cit = ++command.insert(cit, '\\');
break;
}
}
}
if (format_name == "dvi" &&
!lyxrc.view_dvi_paper_option.empty()) {
string paper_size = buffer.params().paperSizeName(BufferParams::XDVI);