[LyX/2.3.x] Fix issues with tilde in inputpath

Juergen Spitzmueller spitz at lyx.org
Mon Jan 27 07:14:32 UTC 2020


commit 2deabd0fbdb45affd3e145ad30cbf33e6a947dc7
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Wed Nov 20 11:57:32 2019 +0100

    Fix issues with tilde in inputpath
    
    Fixes #11699
    
    (cherry picked from commit a426b33067ae4e9d5452f13284f3e223d87ac45d)
---
 src/Buffer.cpp |    5 +++--
 status.23x     |    3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 912baec..92c3d5d 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1911,11 +1911,12 @@ void Buffer::writeLaTeXSource(otexstream & os,
 					os << "\\catcode`\\%=11"
 					      "\\def\\%{%}\\catcode`\\%=14\n";
 				}
+				if (contains(docdir, '~'))
+					docdir = subst(docdir, "~", "\\string~");
 				bool const nonascii = !isAscii(from_utf8(docdir));
 				// LaTeX 2019/10/01 handles non-ascii path without detokenize
 				bool const utfpathlatex = features.isAvailable("LaTeX-2019/10/01");
-				bool const detokenize = !utfpathlatex
-						&& (nonascii || contains(docdir, '~'));
+				bool const detokenize = !utfpathlatex && nonascii;
 				bool const quote = contains(docdir, ' ');
 				if (utfpathlatex && nonascii)
 					os << "\\UseRawInputEncoding\n";
diff --git a/status.23x b/status.23x
index 5cb8a2b..6780f03 100644
--- a/status.23x
+++ b/status.23x
@@ -44,6 +44,9 @@ What's new
 - Fix problems with non-ASCII characters in file path with recent LaTeX
   (bug 11146).
 
+- Fix problems with recent LaTeX when \input at path contains tilde and space
+  (bug 11699).
+
 
 * USER INTERFACE
 


More information about the lyx-cvs mailing list