From 7fe931ea938518c00bbcf90a3967aa4345238bf2 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Mon, 5 Sep 2011 19:29:49 +0000 Subject: [PATCH] Backport fix for bug #7360. Patch from Nemah, posted to bug report. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39601 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/LaTeX.cpp | 8 ++++---- status.20x | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp index f1d7b1a779..04a86f795a 100644 --- a/src/LaTeX.cpp +++ b/src/LaTeX.cpp @@ -1046,6 +1046,10 @@ void LaTeX::deplog(DepTable & head) continue; } + // FIXME UNICODE: We assume that the file names in the log + // file are in the file system encoding. + token = to_utf8(from_filesystem8bit(token)); + // Sometimes, filenames are broken across lines. // We care for that and save suspicious lines. // Here we exclude some cases where we are sure @@ -1075,10 +1079,6 @@ 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)); - // (1) "File: file.ext" if (regex_match(token, sub, reg1)) { // check for dot diff --git a/status.20x b/status.20x index 222fb0e86a..d06d28f2df 100644 --- a/status.20x +++ b/status.20x @@ -47,6 +47,9 @@ What's new - Fix regression where parent macros were not displayed in a viewed child (bug 7593). +- Fix problem where updates to children were not seen on output of master + (bug 7360). + * USER INTERFACE -- 2.39.5