#include "support/regex.h"
#include <fstream>
+#include <stack>
using namespace std;
*/
void TeXErrors::insertError(int line, docstring const & error_desc,
- docstring const & error_text)
+ docstring const & error_text,
+ string const & child_name)
{
- Error newerr(line, error_desc, error_text);
+ Error newerr(line, error_desc, error_text, child_name);
errors.push_back(newerr);
}
ifstream ifs(fn.toFilesystemEncoding().c_str());
bool fle_style = false;
static regex file_line_error(".+\\.\\D+:[0-9]+: (.+)");
+ static regex child_file(".*([0-9]+[A-Za-z]*_.+\\.tex).*");
// Flag for 'File ended while scanning' message.
// We need to wait for subsequent processing.
string wait_for_error;
+ string child_name;
+ int pnest = 0;
+ stack <pair<string, int> > child;
string token;
while (getline(ifs, token)) {
if (token.empty())
continue;
+ // Track child documents
+ for (size_t i = 0; i < token.length(); ++i) {
+ if (token[i] == '(') {
+ ++pnest;
+ size_t j = token.find('(', i + 1);
+ size_t len = j == string::npos
+ ? token.substr(i + 1).length()
+ : j - i - 1;
+ if (regex_match(token.substr(i + 1, len),
+ sub, child_file)) {
+ string const name = sub.str(1);
+ child.push(make_pair(name, pnest));
+ i += len;
+ }
+ } else if (token[i] == ')') {
+ if (!child.empty()
+ && child.top().second == pnest)
+ child.pop();
+ --pnest;
+ }
+ }
+ child_name = child.empty() ? empty_string() : child.top().first;
+
if (contains(token, "file:line:error style messages enabled"))
fle_style = true;
if (contains(token, "LaTeX Error:"))
retval |= LATEX_ERROR;
- // bug 6445. At this point its not clear we finish with error.
if (prefixIs(token, "! File ended while scanning")){
- wait_for_error = desc;
- continue;
+ if (prefixIs(token, "! File ended while scanning use of \\Hy@setref@link.")){
+ // bug 7344. We must rerun LaTeX if hyperref has been toggled.
+ retval |= ERROR_RERUN;
+ LYXERR(Debug::LATEX, "Force rerun.");
+ } else {
+ // bug 6445. At this point its not clear we finish with error.
+ wait_for_error = desc;
+ continue;
+ }
}
+
+ if (prefixIs(token, "! Paragraph ended before \\Hy@setref@link was complete.")){
+ // bug 7344. We must rerun LaTeX if hyperref has been toggled.
+ retval |= ERROR_RERUN;
+ LYXERR(Debug::LATEX, "Force rerun.");
+ }
+
if (!wait_for_error.empty() && prefixIs(token, "! Emergency stop.")){
retval |= LATEX_ERROR;
string errstr;
do {
if (!getline(ifs, tmp))
break;
+ tmp = rtrim(tmp, "\r");
errstr += "\n" + tmp;
if (++count > 5)
break;
terr.insertError(0,
from_local8bit("Emergency stop"),
- from_local8bit(errstr));
+ from_local8bit(errstr),
+ child_name);
}
// get the next line
do {
if (!getline(ifs, tmp))
break;
+ tmp = rtrim(tmp, "\r");
if (++count > 10)
break;
} while (!prefixIs(tmp, "l."));
string errstr(tmp, tmp.find(' '));
errstr += '\n';
getline(ifs, tmp);
+ tmp = rtrim(tmp, "\r");
while (!contains(errstr, "l.")
&& !tmp.empty()
&& !prefixIs(tmp, "! ")
errstr += tmp;
errstr += "\n";
getline(ifs, tmp);
+ tmp = rtrim(tmp, "\r");
}
LYXERR(Debug::LATEX, "line: " << line << '\n'
<< "Desc: " << desc << '\n' << "Text: " << errstr);
// assume here it can be wrong.
terr.insertError(line,
from_local8bit(desc),
- from_local8bit(errstr));
+ from_local8bit(errstr),
+ child_name);
++num_errors;
}
}
retval |= ERRORS;
terr.insertError(0,
from_local8bit("pdfTeX Error"),
- from_local8bit(token));
+ from_local8bit(token),
+ child_name);
}
}
}