hopefully fix tex2lyx linking.

[lyx.git] / src / LaTeX.C

diff --git a/src/LaTeX.C b/src/LaTeX.C
index 8cbb27f2fee7a88607af3c539bf742aa4043338f..8c8091fe4fc13e68c3f258821e07f82d49cc5472 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -95,8 +95,8 @@ docstring runMessage(unsigned int count)
  * CLASS TEXERRORS
  */
 
-void TeXErrors::insertError(int line, string const & error_desc,
-                           string const & error_text)
+void TeXErrors::insertError(int line, docstring const & error_desc,
+                           docstring const & error_text)
 {
        Error newerr(line, error_desc, error_text);
        errors.push_back(newerr);
@@ -289,7 +289,7 @@ int LaTeX::run(TeXErrors & terr)
        }
        if (head.haschanged(onlyFilename(changeExtension(file, ".nlo")))) {
                lyxerr[Debug::LATEX] << "Running MakeIndex for nomencl." << endl;
-               message(_("Running Makeindex for nomencl."));
+               message(_("Running MakeIndex for nomencl."));
                string const nomenclstr = " -s nomencl.ist -o " + changeExtension(file, ".nls");
                rerun |= runMakeIndex(onlyFilename(changeExtension(file, ".nlo")), runparams, nomenclstr);
        }
@@ -365,7 +365,7 @@ int LaTeX::run(TeXErrors & terr)
        // I am not pretty sure if need this twice. 
        if (head.haschanged(onlyFilename(changeExtension(file, ".nlo")))) {
                lyxerr[Debug::LATEX] << "Running MakeIndex for nomencl." << endl;
-               message(_("Running Makeindex for nomencl. "));
+               message(_("Running MakeIndex for nomencl."));
                string nomenclstr = " -s nomencl.ist -o " + changeExtension(file, ".nls");
                rerun |= runMakeIndex(onlyFilename(changeExtension(file, ".nlo")), runparams, nomenclstr);
        }
@@ -671,7 +671,11 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                                        last_line = line;
                                }
                                if (line_count <= 5) {
-                                       terr.insertError(line, desc, errstr);
+                                       // FIXME UNICODE
+                                       // We have no idea what the encoding of the log file is
+                                       // (probably pure ascii, but maybe some localized
+                                       // latex compilers or packages exist)
+                                       terr.insertError(line, from_utf8(desc), from_utf8(errstr));
                                        ++num_errors;
                                }
                        }