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
This commit is contained in:
Richard Heck 2011-09-05 19:29:49 +00:00
parent 08f6667a60
commit 7fe931ea93
2 changed files with 7 additions and 4 deletions

View File

@ -1046,6 +1046,10 @@ void LaTeX::deplog(DepTable & head)
continue; 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. // Sometimes, filenames are broken across lines.
// We care for that and save suspicious lines. // We care for that and save suspicious lines.
// Here we exclude some cases where we are sure // Here we exclude some cases where we are sure
@ -1075,10 +1079,6 @@ void LaTeX::deplog(DepTable & head)
smatch sub; 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" // (1) "File: file.ext"
if (regex_match(token, sub, reg1)) { if (regex_match(token, sub, reg1)) {
// check for dot // check for dot

View File

@ -47,6 +47,9 @@ What's new
- Fix regression where parent macros were not displayed in a viewed child - Fix regression where parent macros were not displayed in a viewed child
(bug 7593). (bug 7593).
- Fix problem where updates to children were not seen on output of master
(bug 7360).
* USER INTERFACE * USER INTERFACE