From 735707cc5e014724ec187ac1d92bdb55e5ea242c Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Tue, 25 Apr 2006 10:12:08 +0000 Subject: [PATCH] * src/LaTeX.C (LaTeX::scanLogFile): remove \0 characters inserted by MikTeX before further processing (LaTeX::deplog): likewise git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@13738 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/LaTeX.C | 14 +++++++++++++- status.14x | 2 ++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/LaTeX.C b/src/LaTeX.C index e748be39c8..1d7f6f921a 100644 --- a/src/LaTeX.C +++ b/src/LaTeX.C @@ -540,6 +540,13 @@ int LaTeX::scanLogFile(TeXErrors & terr) string token; while (getline(ifs, token)) { + // MikTeX sometimes inserts \0 in the log file. They can't be + // removed directly with the existing string utility + // functions, so convert them first to \r, and remove all + // \r's afterwards, since we need to remove them anyway. + token = subst(token, '\0', '\r'); + token = subst(token, "\r", ""); + lyxerr[Debug::LATEX] << "Log line: " << token << endl; if (token.empty()) @@ -760,7 +767,12 @@ void LaTeX::deplog(DepTable & head) string token; getline(ifs, token); - token = rtrim(token, "\r"); + // MikTeX sometimes inserts \0 in the log file. They can't be + // removed directly with the existing string utility + // functions, so convert them first to \r, and remove all + // \r's afterwards, since we need to remove them anyway. + token = subst(token, '\0', '\r'); + token = subst(token, "\r", ""); if (token.empty()) continue; diff --git a/status.14x b/status.14x index eb0f99926c..2220f187eb 100644 --- a/status.14x +++ b/status.14x @@ -37,6 +37,8 @@ What's new using the AMS-specific commands \xleftarrow, \xrightarrow or array constructs split, gathered, aligned and alignedat (bug 2149). +- Don't get confused by 0-Characters in MikTeX logfiles anymore + * Math editor: - Fix metrics of AMS array environments like bmatrix, vmatrix etc. (bug 2036)