X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.C;h=b8caf83b607aa2bf65056589af6a3ad41688edc2;hb=c68f3da771a54ef78bd309b8f1a81c374d2fea4c;hp=c6734bb2bdf3e831d7af68da70c1f5f3606dd6e8;hpb=1f3a70835df303b2c0ca822840982845cb940145;p=lyx.git

diff --git a/src/LaTeX.C b/src/LaTeX.C
index c6734bb2bd..b8caf83b60 100644
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -481,6 +481,9 @@ void LaTeX::scanAuxFile(FileName const & file, Aux_Info & aux_info)
 	while (getline(ifs, token)) {
 		token = rtrim(token, "\r");
 		smatch sub;
+		// FIXME UNICODE: We assume that citation keys and filenames
+		// in the aux file are in the file system encoding.
+		token = to_utf8(from_filesystem8bit(token));
 		if (regex_match(token, sub, reg1)) {
 			string data = sub.str(1);
 			while (!data.empty()) {
@@ -836,6 +839,10 @@ void LaTeX::deplog(DepTable & head)
 
 		smatch sub;
 
+		// FIXME UNICODE: We assume that the file names in the log
+		// file are in the file system encoding.
+		token = to_utf8(from_filesystem8bit(token));
+
 		if (regex_match(token, sub, reg1)) {
 			static regex reg1_1("\\(([^()]+)");
 			smatch what;