Track change of label name

[lyx.git] / src / LaTeX.cpp

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index 4096ca9f63600ea7b5c568aa963d3a4ad63bf38a..9e08ffec47420acdd75d448eba6bfcf3d6106095 100644 (file)
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -20,6 +20,7 @@
 #include "LyXRC.h"
 #include "LyX.h"
 #include "DepTable.h"
+#include "Encoding.h"
 
 #include "support/debug.h"
 #include "support/convert.h"
@@ -105,7 +106,7 @@ LaTeX::LaTeX(string const & latex, OutputParams const & rp,
             FileName const & f, string const & p, string const & lp, 
             bool allow_cancellation, bool const clean_start)
        : cmd(latex), file(f), path(p), lpath(lp), runparams(rp), biber(false),
-       allow_cancel(allow_cancellation)
+         allow_cancel(allow_cancellation)
 {
        num_errors = 0;
        // lualatex can still produce a DVI with --output-format=dvi. However,
@@ -187,6 +188,7 @@ int LaTeX::run(TeXErrors & terr)
 {
        int scanres = NO_ERRORS;
        int bscanres = NO_ERRORS;
+       int iscanres = NO_ERRORS;
        unsigned int count = 0; // number of times run
        num_errors = 0; // just to make sure.
        unsigned int const MAX_RUN = 6;
@@ -301,6 +303,9 @@ int LaTeX::run(TeXErrors & terr)
                                runMakeIndex(onlyFileName(idxfile.absFileName()), runparams);
                if (ret == Systemcall::KILLED)
                        return Systemcall::KILLED;
+               FileName const ilgfile(changeExtension(file.absFileName(), ".ilg"));
+               if (ilgfile.exists())
+                       iscanres = scanIlgFile(terr);
                rerun = true;
        }
 
@@ -425,7 +430,10 @@ int LaTeX::run(TeXErrors & terr)
                                file.absFileName(), ".idx")), runparams);
                if (ret == Systemcall::KILLED)
                        return Systemcall::KILLED;
-               rerun = true;
+               FileName const ilgfile(changeExtension(file.absFileName(), ".ilg"));
+               if (ilgfile.exists())
+                       iscanres = scanIlgFile(terr);
+               rerun = true;
        }
 
        // MSVC complains that bool |= int is unsafe. Not sure why.
@@ -474,6 +482,9 @@ int LaTeX::run(TeXErrors & terr)
        if (bscanres & ERRORS)
                return bscanres; // return on error
 
+       if (iscanres & ERRORS)
+               return iscanres; // return on error
+
        return scanres;
 }
 
@@ -499,6 +510,40 @@ int LaTeX::runMakeIndex(string const & f, OutputParams const & rp,
 
        if (!rp.index_command.empty())
                tmp = rp.index_command;
+       
+       if (contains(tmp, "$$x")) {
+               // This adds appropriate [te]xindy options
+               // such as language and codepage (for the
+               // main document language/encoding) as well
+               // as input markup (latex or xelatex)
+               string xdyopts = rp.xindy_language;
+               if (!xdyopts.empty())
+                       xdyopts = "-L " + xdyopts;
+               if (rp.isFullUnicode() && rp.encoding->package() == Encoding::none) {
+                       if (!xdyopts.empty())
+                               xdyopts += " ";
+                       // xelatex includes lualatex
+                       xdyopts += "-I xelatex";
+               }
+               else if (rp.encoding->iconvName() == "UTF-8") {
+                       if (!xdyopts.empty())
+                               xdyopts += " ";
+                       // -I not really needed for texindy, but for xindy
+                       xdyopts += "-C utf8 -I latex";
+               }
+               else {
+                       if (!xdyopts.empty())
+                               xdyopts += " ";
+                       // not really needed for texindy, but for xindy
+                       xdyopts += "-I latex";
+               }
+               tmp = subst(tmp, "$$x", xdyopts);
+       }
+
+       if (contains(tmp, "$$b")) {
+               // advise xindy to write a log file
+               tmp = subst(tmp, "$$b", removeExtension(f));
+       }
 
        LYXERR(Debug::LATEX,
                "idx file has been made, running index processor ("
@@ -781,7 +826,8 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                //TODO: TL 2020 engines will contain new commandline switch --cnf-line which we  
                //can use to set max_print_line variable for appropriate length and detect all
                //errors correctly.
-               if (contains(token, "There were undefined citations."))
+               if (contains(token, "There were undefined citations.") ||
+                   prefixIs(token, "Package biblatex Warning: The following entry could not be found"))
                        retval |= UNDEF_CIT;
 
                if (prefixIs(token, "LaTeX Warning:") ||
@@ -1493,4 +1539,42 @@ int LaTeX::scanBlgFile(DepTable & dep, TeXErrors & terr)
 }
 
 
+int LaTeX::scanIlgFile(TeXErrors & terr)
+{
+       FileName const ilg_file(changeExtension(file.absFileName(), "ilg"));
+       LYXERR(Debug::LATEX, "Scanning ilg file: " << ilg_file);
+
+       ifstream ifs(ilg_file.toFilesystemEncoding().c_str());
+       string token;
+       int retval = NO_ERRORS;
+
+       string prevtoken;
+       while (getline(ifs, token)) {
+               token = rtrim(token, "\r");
+               smatch sub;
+               if (prefixIs(token, "!! "))
+                       prevtoken = token;
+               else if (!prevtoken.empty()) {
+                       retval |= INDEX_ERROR;
+                       string errstr = N_("Makeindex error: ") + prevtoken;
+                       string msg = prevtoken + '\n';
+                       msg += token;
+                       terr.insertError(0,
+                                        from_local8bit(errstr),
+                                        from_local8bit(msg));
+                       prevtoken.clear();
+               } else if (prefixIs(token, "ERROR: ")) {
+                       retval |= BIBTEX_ERROR;
+                       string errstr = N_("Xindy error: ") + token.substr(6);
+                       string msg = token;
+                       terr.insertError(0,
+                                        from_local8bit(errstr),
+                                        from_local8bit(msg));
+               }
+       }
+       return retval;
+}
+
+
+
 } // namespace lyx