mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-21 23:09:40 +00:00
cmake: fix merge build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33645 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
2d67296c59
commit
870e4549f9
@ -1308,7 +1308,7 @@ void Buffer::writeLaTeXSource(odocstream & os,
|
||||
if (!original_path.empty()) {
|
||||
// FIXME UNICODE
|
||||
// We don't know the encoding of inputpath
|
||||
docstring const inputpath = from_utf8(latex_path(original_path));
|
||||
docstring const inputpath = from_utf8(support::latex_path(original_path));
|
||||
docstring uncodable_glyphs;
|
||||
Encoding const * const enc = runparams.encoding;
|
||||
if (enc) {
|
||||
|
@ -1280,7 +1280,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
|
||||
incfile = mangled;
|
||||
// \includeonly doesn't want an extension
|
||||
incfile = changeExtension(incfile, string());
|
||||
incfile = latex_path(incfile);
|
||||
incfile = support::latex_path(incfile);
|
||||
if (!incfile.empty()) {
|
||||
if (!first)
|
||||
os << ",";
|
||||
|
Loading…
x
Reference in New Issue
Block a user