anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename LATEX debug level to OUTFILE and use it for DocBook, HTML, and XML messages.

Browse Source
This commit is contained in:
Thibaut Cuvelier 2022-02-27 20:35:58 +01:00
parent 1220f399a7
commit 997f0621c5
20 changed files with 93 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Buffer.cpp
View File

@ -1739,7 +1739,7 @@ Buffer::ExportStatus Buffer::makeLaTeXFile(FileName const & fname,
OutputParams runparams = runparams_in; OutputParams runparams = runparams_in;
string const encoding = runparams.encoding->iconvName(); string const encoding = runparams.encoding->iconvName();
LYXERR(Debug::LATEX, "makeLaTeXFile encoding: " << encoding << ", fname=" << fname.realPath()); LYXERR(Debug::OUTFILE, "makeLaTeXFile encoding: " << encoding << ", fname=" << fname.realPath());
ofdocstream ofs; ofdocstream ofs;
try { ofs.reset(encoding); } try { ofs.reset(encoding); }
@ -1851,7 +1851,7 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os,
BufferEncodings::initUnicodeMath(*this); BufferEncodings::initUnicodeMath(*this);
// validate the buffer. // validate the buffer.
LYXERR(Debug::LATEX, " Validating buffer..."); LYXERR(Debug::OUTFILE, " Validating buffer...");
LaTeXFeatures features(*this, params(), runparams); LaTeXFeatures features(*this, params(), runparams);
validate(features); validate(features);
// This is only set once per document (in master) // This is only set once per document (in master)
@ -1860,7 +1860,7 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os,
runparams.use_hyperref = features.isRequired("hyperref"); runparams.use_hyperref = features.isRequired("hyperref");
runparams.use_CJK = features.mustProvide("CJK"); runparams.use_CJK = features.mustProvide("CJK");
} }
LYXERR(Debug::LATEX, " Buffer validation done."); LYXERR(Debug::OUTFILE, " Buffer validation done.");
bool const output_preamble = bool const output_preamble =
output == FullSource || output == OnlyPreamble; output == FullSource || output == OnlyPreamble;
@ -2079,9 +2079,9 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os,
if (output_preamble) { if (output_preamble) {
os << "\\end{document}\n"; os << "\\end{document}\n";
LYXERR(Debug::LATEX, "makeLaTeXFile...done"); LYXERR(Debug::OUTFILE, "makeLaTeXFile...done");
} else { } else {
LYXERR(Debug::LATEX, "LaTeXFile for inclusion made."); LYXERR(Debug::OUTFILE, "LaTeXFile for inclusion made.");
} }
runparams_in.encoding = runparams.encoding; runparams_in.encoding = runparams.encoding;
@ -2095,7 +2095,7 @@ Buffer::ExportStatus Buffer::makeDocBookFile(FileName const & fname,
OutputParams const & runparams, OutputParams const & runparams,
OutputWhat output) const OutputWhat output) const
{ {
LYXERR(Debug::LATEX, "makeDocBookFile..."); LYXERR(Debug::OUTFILE, "makeDocBookFile...");
ofdocstream ofs; ofdocstream ofs;
if (!openFileWrite(ofs, fname)) if (!openFileWrite(ofs, fname))
@ -2185,7 +2185,7 @@ Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os,
Buffer::ExportStatus Buffer::makeLyXHTMLFile(FileName const & fname, Buffer::ExportStatus Buffer::makeLyXHTMLFile(FileName const & fname,
OutputParams const & runparams) const OutputParams const & runparams) const
{ {
LYXERR(Debug::LATEX, "makeLyXHTMLFile..."); LYXERR(Debug::OUTFILE, "makeLyXHTMLFile...");
ofdocstream ofs; ofdocstream ofs;
if (!openFileWrite(ofs, fname)) if (!openFileWrite(ofs, fname))
@ -2383,7 +2383,7 @@ void Buffer::validate(LaTeXFeatures & features) const
for (Paragraph const & p : paragraphs()) for (Paragraph const & p : paragraphs())
p.validate(features); p.validate(features);
if (lyxerr.debugging(Debug::LATEX)) { if (lyxerr.debugging(Debug::OUTFILE)) {
features.showStruct(); features.showStruct();
} }
} }

2
src/BufferView.cpp
View File

@ -2621,7 +2621,7 @@ bool BufferView::setCursorFromRow(int row)
{ {
TexRow::TextEntry start, end; TexRow::TextEntry start, end;
tie(start,end) = buffer_.texrow().getEntriesFromRow(row); tie(start,end) = buffer_.texrow().getEntriesFromRow(row);
LYXERR(Debug::LATEX, LYXERR(Debug::OUTFILE,
"setCursorFromRow: for row " << row << ", TexRow has found " "setCursorFromRow: for row " << row << ", TexRow has found "
"start (id=" << start.id << ",pos=" << start.pos << "), " "start (id=" << start.id << ",pos=" << start.pos << "), "
"end (id=" << end.id << ",pos=" << end.pos << ")"); "end (id=" << end.id << ",pos=" << end.pos << ")");

4
src/Floating.cpp
View File

@ -69,7 +69,7 @@ Floating::Floating(string const & type, string const & placement,
docbook_float_type_ = "video"; docbook_float_type_ = "video";
} else { } else {
// If nothing matches, return something that will not be valid. // If nothing matches, return something that will not be valid.
LYXERR0("Float type '" + floattype_ + "' unknown to DocBook!"); LYXERR(Debug::OUTFILE, "Float type '" + floattype_ + "' unknown to DocBook!");
docbook_float_type_ = "unknown"; docbook_float_type_ = "unknown";
} }
} }
@ -159,7 +159,7 @@ string Floating::docbookTag(bool hasTitle) const
return hasTitle ? "table" : "informaltable"; return hasTitle ? "table" : "informaltable";
} else { } else {
// If nothing matches, return something that will not be valid. // If nothing matches, return something that will not be valid.
LYXERR0("Float type '" + floattype() + "' unknown to DocBook!"); LYXERR(Debug::OUTFILE, "Float type '" + floattype() + "' unknown to DocBook!");
return "float"; return "float";
} }
} }

28
src/Font.cpp
View File

@ -758,34 +758,34 @@ void Font::validate(LaTeXFeatures & features) const
Language const * doc_language = bparams.language; Language const * doc_language = bparams.language;
if (bits_.noun() == FONT_ON) { if (bits_.noun() == FONT_ON) {
LYXERR(Debug::LATEX, "font.noun: " << bits_.noun()); LYXERR(Debug::OUTFILE, "font.noun: " << bits_.noun());
features.require("noun"); features.require("noun");
LYXERR(Debug::LATEX, "Noun enabled. Font: " << to_utf8(stateText())); LYXERR(Debug::OUTFILE, "Noun enabled. Font: " << to_utf8(stateText()));
} }
if (bits_.underbar() == FONT_ON) { if (bits_.underbar() == FONT_ON) {
LYXERR(Debug::LATEX, "font.underline: " << bits_.underbar()); LYXERR(Debug::OUTFILE, "font.underline: " << bits_.underbar());
features.require("ulem"); features.require("ulem");
LYXERR(Debug::LATEX, "Underline enabled. Font: " << to_utf8(stateText())); LYXERR(Debug::OUTFILE, "Underline enabled. Font: " << to_utf8(stateText()));
} }
if (bits_.strikeout() == FONT_ON) { if (bits_.strikeout() == FONT_ON) {
LYXERR(Debug::LATEX, "font.strikeout: " << bits_.strikeout()); LYXERR(Debug::OUTFILE, "font.strikeout: " << bits_.strikeout());
features.require("ulem"); features.require("ulem");
LYXERR(Debug::LATEX, "Strike out enabled. Font: " << to_utf8(stateText())); LYXERR(Debug::OUTFILE, "Strike out enabled. Font: " << to_utf8(stateText()));
} }
if (bits_.xout() == FONT_ON) { if (bits_.xout() == FONT_ON) {
LYXERR(Debug::LATEX, "font.xout: " << bits_.xout()); LYXERR(Debug::OUTFILE, "font.xout: " << bits_.xout());
features.require("ulem"); features.require("ulem");
LYXERR(Debug::LATEX, "Cross out enabled. Font: " << to_utf8(stateText())); LYXERR(Debug::OUTFILE, "Cross out enabled. Font: " << to_utf8(stateText()));
} }
if (bits_.uuline() == FONT_ON) { if (bits_.uuline() == FONT_ON) {
LYXERR(Debug::LATEX, "font.uuline: " << bits_.uuline()); LYXERR(Debug::OUTFILE, "font.uuline: " << bits_.uuline());
features.require("ulem"); features.require("ulem");
LYXERR(Debug::LATEX, "Double underline enabled. Font: " << to_utf8(stateText())); LYXERR(Debug::OUTFILE, "Double underline enabled. Font: " << to_utf8(stateText()));
} }
if (bits_.uwave() == FONT_ON) { if (bits_.uwave() == FONT_ON) {
LYXERR(Debug::LATEX, "font.uwave: " << bits_.uwave()); LYXERR(Debug::OUTFILE, "font.uwave: " << bits_.uwave());
features.require("ulem"); features.require("ulem");
LYXERR(Debug::LATEX, "Wavy underline enabled. Font: " << to_utf8(stateText())); LYXERR(Debug::OUTFILE, "Wavy underline enabled. Font: " << to_utf8(stateText()));
} }
switch (bits_.color()) { switch (bits_.color()) {
case Color_none: case Color_none:
@ -811,7 +811,7 @@ void Font::validate(LaTeXFeatures & features) const
break; break;
default: default:
features.require("color"); features.require("color");
LYXERR(Debug::LATEX, "Color enabled. Font: " << to_utf8(stateText())); LYXERR(Debug::OUTFILE, "Color enabled. Font: " << to_utf8(stateText()));
} }
// FIXME: Do something for background and soul package? // FIXME: Do something for background and soul package?
@ -823,7 +823,7 @@ void Font::validate(LaTeXFeatures & features) const
&& lang_ != latex_language) && lang_ != latex_language)
{ {
features.useLanguage(lang_); features.useLanguage(lang_);
LYXERR(Debug::LATEX, "Found language " << lang_->lang()); LYXERR(Debug::OUTFILE, "Found language " << lang_->lang());
} }
} }

68
src/LaTeX.cpp
View File

@ -135,7 +135,7 @@ LaTeX::LaTeX(string const & latex, OutputParams const & rp,
void LaTeX::removeAuxiliaryFiles() const void LaTeX::removeAuxiliaryFiles() const
{ {
LYXERR(Debug::LATEX, "Removing auxiliary files"); LYXERR(Debug::OUTFILE, "Removing auxiliary files");
// Note that we do not always call this function when there is an error. // Note that we do not always call this function when there is an error.
// For example, if there is an error but an output file is produced we // For example, if there is an error but an output file is produced we
// still would like to output (export/view) the file. // still would like to output (export/view) the file.
@ -280,7 +280,7 @@ int LaTeX::run(TeXErrors & terr)
bibtex_info_old = scanAuxFiles(aux_file, runparams.only_childbibs); bibtex_info_old = scanAuxFiles(aux_file, runparams.only_childbibs);
++count; ++count;
LYXERR(Debug::LATEX, "Run #" << count); LYXERR(Debug::OUTFILE, "Run #" << count);
message(runMessage(count)); message(runMessage(count));
int exit_code = startscript(); int exit_code = startscript();
@ -289,7 +289,7 @@ int LaTeX::run(TeXErrors & terr)
scanres = scanLogFile(terr); scanres = scanLogFile(terr);
if (scanres & ERROR_RERUN) { if (scanres & ERROR_RERUN) {
LYXERR(Debug::LATEX, "Rerunning LaTeX"); LYXERR(Debug::OUTFILE, "Rerunning LaTeX");
terr.clearErrors(); terr.clearErrors();
exit_code = startscript(); exit_code = startscript();
if (exit_code == Systemcall::KILLED || exit_code == Systemcall::TIMEOUT) if (exit_code == Systemcall::KILLED || exit_code == Systemcall::TIMEOUT)
@ -324,7 +324,7 @@ int LaTeX::run(TeXErrors & terr)
// "\bibdata" and/or "\bibstyle". If one of those // "\bibdata" and/or "\bibstyle". If one of those
// tags is found -> run bibtex and set rerun = true; // tags is found -> run bibtex and set rerun = true;
// no checks for now // no checks for now
LYXERR(Debug::LATEX, "Running Bibliography Processor."); LYXERR(Debug::OUTFILE, "Running Bibliography Processor.");
message(_("Running Bibliography Processor.")); message(_("Running Bibliography Processor."));
updateBibtexDependencies(head, bibtex_info); updateBibtexDependencies(head, bibtex_info);
int exit_code; int exit_code;
@ -357,7 +357,7 @@ int LaTeX::run(TeXErrors & terr)
rerun = false; rerun = false;
++count; ++count;
LYXERR(Debug::DEPEND, "Dep. file has changed or rerun requested"); LYXERR(Debug::DEPEND, "Dep. file has changed or rerun requested");
LYXERR(Debug::LATEX, "Run #" << count); LYXERR(Debug::OUTFILE, "Run #" << count);
message(runMessage(count)); message(runMessage(count));
int exit_code = startscript(); int exit_code = startscript();
if (exit_code == Systemcall::KILLED || exit_code == Systemcall::TIMEOUT) if (exit_code == Systemcall::KILLED || exit_code == Systemcall::TIMEOUT)
@ -385,7 +385,7 @@ int LaTeX::run(TeXErrors & terr)
// "\bibdata" and/or "\bibstyle". If one of those // "\bibdata" and/or "\bibstyle". If one of those
// tags is found -> run bibtex and set rerun = true; // tags is found -> run bibtex and set rerun = true;
// no checks for now // no checks for now
LYXERR(Debug::LATEX, "Re-Running Bibliography Processor."); LYXERR(Debug::OUTFILE, "Re-Running Bibliography Processor.");
message(_("Re-Running Bibliography Processor.")); message(_("Re-Running Bibliography Processor."));
updateBibtexDependencies(head, bibtex_info); updateBibtexDependencies(head, bibtex_info);
int exit_code; int exit_code;
@ -411,7 +411,7 @@ int LaTeX::run(TeXErrors & terr)
// MAX_RUNS are reached. // MAX_RUNS are reached.
rerun = false; rerun = false;
++count; ++count;
LYXERR(Debug::LATEX, "Run #" << count); LYXERR(Debug::OUTFILE, "Run #" << count);
message(runMessage(count)); message(runMessage(count));
startscript(); startscript();
scanres = scanLogFile(terr); scanres = scanLogFile(terr);
@ -425,7 +425,7 @@ int LaTeX::run(TeXErrors & terr)
// Now that we have final pagination, run the index and nomencl processors // Now that we have final pagination, run the index and nomencl processors
if (idxfile.exists()) { if (idxfile.exists()) {
// no checks for now // no checks for now
LYXERR(Debug::LATEX, "Running Index Processor."); LYXERR(Debug::OUTFILE, "Running Index Processor.");
message(_("Running Index Processor.")); message(_("Running Index Processor."));
// onlyFileName() is needed for cygwin // onlyFileName() is needed for cygwin
int const ret = int const ret =
@ -480,7 +480,7 @@ int LaTeX::run(TeXErrors & terr)
// MAX_RUNS are reached. // MAX_RUNS are reached.
rerun = false; rerun = false;
++count; ++count;
LYXERR(Debug::LATEX, "Run #" << count); LYXERR(Debug::OUTFILE, "Run #" << count);
message(runMessage(count)); message(runMessage(count));
startscript(); startscript();
scanres = scanLogFile(terr); scanres = scanLogFile(terr);
@ -499,7 +499,7 @@ int LaTeX::run(TeXErrors & terr)
scanres |= NONZERO_ERROR; scanres |= NONZERO_ERROR;
} }
LYXERR(Debug::LATEX, "Done."); LYXERR(Debug::OUTFILE, "Done.");
if (bscanres & ERRORS) if (bscanres & ERRORS)
return bscanres; // return on error return bscanres; // return on error
@ -569,7 +569,7 @@ int LaTeX::runMakeIndex(string const & f, OutputParams const & rp,
tmp = subst(tmp, "$$b", removeExtension(f)); tmp = subst(tmp, "$$b", removeExtension(f));
} }
LYXERR(Debug::LATEX, LYXERR(Debug::OUTFILE,
"idx file has been made, running index processor (" "idx file has been made, running index processor ("
<< tmp << ") on file " << f); << tmp << ") on file " << f);
@ -579,7 +579,7 @@ int LaTeX::runMakeIndex(string const & f, OutputParams const & rp,
} }
if (rp.use_indices) { if (rp.use_indices) {
tmp = lyxrc.splitindex_command + " -m " + quoteName(tmp); tmp = lyxrc.splitindex_command + " -m " + quoteName(tmp);
LYXERR(Debug::LATEX, LYXERR(Debug::OUTFILE,
"Multiple indices. Using splitindex command: " << tmp); "Multiple indices. Using splitindex command: " << tmp);
} }
tmp += ' '; tmp += ' ';
@ -595,7 +595,7 @@ int LaTeX::runMakeIndex(string const & f, OutputParams const & rp,
int LaTeX::runMakeIndexNomencl(FileName const & fname, int LaTeX::runMakeIndexNomencl(FileName const & fname,
string const & nlo, string const & nls) string const & nlo, string const & nls)
{ {
LYXERR(Debug::LATEX, "Running Nomenclature Processor."); LYXERR(Debug::OUTFILE, "Running Nomenclature Processor.");
message(_("Running Nomenclature Processor.")); message(_("Running Nomenclature Processor."));
string tmp = lyxrc.nomencl_command + ' '; string tmp = lyxrc.nomencl_command + ' ';
// onlyFileName() is needed for cygwin // onlyFileName() is needed for cygwin
@ -654,7 +654,7 @@ AuxInfo const LaTeX::scanAuxFile(FileName const & fname)
void LaTeX::scanAuxFile(FileName const & fname, AuxInfo & aux_info) void LaTeX::scanAuxFile(FileName const & fname, AuxInfo & aux_info)
{ {
LYXERR(Debug::LATEX, "Scanning aux file: " << fname); LYXERR(Debug::OUTFILE, "Scanning aux file: " << fname);
ifstream ifs(fname.toFilesystemEncoding().c_str()); ifstream ifs(fname.toFilesystemEncoding().c_str());
string token; string token;
@ -674,7 +674,7 @@ void LaTeX::scanAuxFile(FileName const & fname, AuxInfo & aux_info)
while (!data.empty()) { while (!data.empty()) {
string citation; string citation;
data = split(data, citation, ','); data = split(data, citation, ',');
LYXERR(Debug::LATEX, "Citation: " << citation); LYXERR(Debug::OUTFILE, "Citation: " << citation);
aux_info.citations.insert(citation); aux_info.citations.insert(citation);
} }
} else if (regex_match(token, sub, reg2)) { } else if (regex_match(token, sub, reg2)) {
@ -685,7 +685,7 @@ void LaTeX::scanAuxFile(FileName const & fname, AuxInfo & aux_info)
string database; string database;
data = split(data, database, ','); data = split(data, database, ',');
database = changeExtension(database, "bib"); database = changeExtension(database, "bib");
LYXERR(Debug::LATEX, "BibTeX database: `" << database << '\''); LYXERR(Debug::OUTFILE, "BibTeX database: `" << database << '\'');
aux_info.databases.insert(database); aux_info.databases.insert(database);
} }
} else if (regex_match(token, sub, reg3)) { } else if (regex_match(token, sub, reg3)) {
@ -693,7 +693,7 @@ void LaTeX::scanAuxFile(FileName const & fname, AuxInfo & aux_info)
// token is now the style file // token is now the style file
// pass it to the helper // pass it to the helper
style = changeExtension(style, "bst"); style = changeExtension(style, "bst");
LYXERR(Debug::LATEX, "BibTeX style: `" << style << '\''); LYXERR(Debug::OUTFILE, "BibTeX style: `" << style << '\'');
aux_info.styles.insert(style); aux_info.styles.insert(style);
} else if (regex_match(token, sub, reg4)) { } else if (regex_match(token, sub, reg4)) {
string const file2 = sub.str(1); string const file2 = sub.str(1);
@ -782,7 +782,7 @@ int LaTeX::scanLogFile(TeXErrors & terr)
int retval = NO_ERRORS; int retval = NO_ERRORS;
string tmp = string tmp =
onlyFileName(changeExtension(file.absFileName(), ".log")); onlyFileName(changeExtension(file.absFileName(), ".log"));
LYXERR(Debug::LATEX, "Log file: " << tmp); LYXERR(Debug::OUTFILE, "Log file: " << tmp);
FileName const fn = makeAbsPath(tmp); FileName const fn = makeAbsPath(tmp);
// FIXME we should use an ifdocstream here and a docstring for token // FIXME we should use an ifdocstream here and a docstring for token
// below. The encoding of the log file depends on the _output_ (font) // below. The encoding of the log file depends on the _output_ (font)
@ -813,7 +813,7 @@ int LaTeX::scanLogFile(TeXErrors & terr)
token = subst(token, "\r", ""); token = subst(token, "\r", "");
smatch sub; smatch sub;
LYXERR(Debug::LATEX, "Log line: " << token); LYXERR(Debug::OUTFILE, "Log line: " << token);
if (token.empty()) if (token.empty())
continue; continue;
@ -869,24 +869,24 @@ int LaTeX::scanLogFile(TeXErrors & terr)
// Here shall we handle different // Here shall we handle different
// types of warnings // types of warnings
retval |= LATEX_WARNING; retval |= LATEX_WARNING;
LYXERR(Debug::LATEX, "LaTeX Warning."); LYXERR(Debug::OUTFILE, "LaTeX Warning.");
if (contains(token, "Rerun to get cross-references")) { if (contains(token, "Rerun to get cross-references")) {
retval |= RERUN; retval |= RERUN;
LYXERR(Debug::LATEX, "We should rerun."); LYXERR(Debug::OUTFILE, "We should rerun.");
// package clefval needs 2 latex runs before bibtex // package clefval needs 2 latex runs before bibtex
} else if (contains(token, "Value of") } else if (contains(token, "Value of")
&& contains(token, "on page") && contains(token, "on page")
&& contains(token, "undefined")) { && contains(token, "undefined")) {
retval |= ERROR_RERUN; retval |= ERROR_RERUN;
LYXERR(Debug::LATEX, "Force rerun."); LYXERR(Debug::OUTFILE, "Force rerun.");
// package etaremune // package etaremune
} else if (contains(token, "Etaremune labels have changed")) { } else if (contains(token, "Etaremune labels have changed")) {
retval |= ERROR_RERUN; retval |= ERROR_RERUN;
LYXERR(Debug::LATEX, "Force rerun."); LYXERR(Debug::OUTFILE, "Force rerun.");
// package enotez // package enotez
} else if (contains(token, "Endnotes may have changed. Rerun")) { } else if (contains(token, "Endnotes may have changed. Rerun")) {
retval |= RERUN; retval |= RERUN;
LYXERR(Debug::LATEX, "We should rerun."); LYXERR(Debug::OUTFILE, "We should rerun.");
//"Citation `cit' on page X undefined on input line X." //"Citation `cit' on page X undefined on input line X."
} else if (!runparams.includeall && contains(token, "Citation") } else if (!runparams.includeall && contains(token, "Citation")
//&& contains(token, "on input line") //often split to newline //&& contains(token, "on input line") //often split to newline
@ -968,20 +968,20 @@ int LaTeX::scanLogFile(TeXErrors & terr)
contains(token, "Rerun to get")) { contains(token, "Rerun to get")) {
// at least longtable.sty and bibtopic.sty // at least longtable.sty and bibtopic.sty
// might use this. // might use this.
LYXERR(Debug::LATEX, "We should rerun."); LYXERR(Debug::OUTFILE, "We should rerun.");
retval |= RERUN; retval |= RERUN;
} }
} else if (prefixIs(token, "LETTRE WARNING:")) { } else if (prefixIs(token, "LETTRE WARNING:")) {
if (contains(token, "veuillez recompiler")) { if (contains(token, "veuillez recompiler")) {
// lettre.cls // lettre.cls
LYXERR(Debug::LATEX, "We should rerun."); LYXERR(Debug::OUTFILE, "We should rerun.");
retval |= RERUN; retval |= RERUN;
} }
} else if (token[0] == '(') { } else if (token[0] == '(') {
if (contains(token, "Rerun LaTeX") || if (contains(token, "Rerun LaTeX") ||
contains(token, "Rerun to get")) { contains(token, "Rerun to get")) {
// Used by natbib // Used by natbib
LYXERR(Debug::LATEX, "We should rerun."); LYXERR(Debug::OUTFILE, "We should rerun.");
retval |= RERUN; retval |= RERUN;
} }
} else if (prefixIs(token, "! ") } else if (prefixIs(token, "! ")
@ -1004,7 +1004,7 @@ int LaTeX::scanLogFile(TeXErrors & terr)
if (prefixIs(token, "! File ended while scanning use of \\Hy@setref@link.")){ if (prefixIs(token, "! File ended while scanning use of \\Hy@setref@link.")){
// bug 7344. We must rerun LaTeX if hyperref has been toggled. // bug 7344. We must rerun LaTeX if hyperref has been toggled.
retval |= ERROR_RERUN; retval |= ERROR_RERUN;
LYXERR(Debug::LATEX, "Force rerun."); LYXERR(Debug::OUTFILE, "Force rerun.");
} else { } else {
// bug 6445. At this point its not clear we finish with error. // bug 6445. At this point its not clear we finish with error.
wait_for_error = desc; wait_for_error = desc;
@ -1021,7 +1021,7 @@ int LaTeX::scanLogFile(TeXErrors & terr)
if (prefixIs(token, "! Paragraph ended before \\Hy@setref@link was complete.")){ if (prefixIs(token, "! Paragraph ended before \\Hy@setref@link was complete.")){
// bug 7344. We must rerun LaTeX if hyperref has been toggled. // bug 7344. We must rerun LaTeX if hyperref has been toggled.
retval |= ERROR_RERUN; retval |= ERROR_RERUN;
LYXERR(Debug::LATEX, "Force rerun."); LYXERR(Debug::OUTFILE, "Force rerun.");
} }
if (!wait_for_error.empty() && prefixIs(token, "! Emergency stop.")){ if (!wait_for_error.empty() && prefixIs(token, "! Emergency stop.")){
@ -1101,7 +1101,7 @@ int LaTeX::scanLogFile(TeXErrors & terr)
if (preamble_error) if (preamble_error)
// Add a note that the error is to be found in preamble // Add a note that the error is to be found in preamble
errstr += "\n" + to_utf8(_("(NOTE: The erroneous command is in the preamble)")); errstr += "\n" + to_utf8(_("(NOTE: The erroneous command is in the preamble)"));
LYXERR(Debug::LATEX, "line: " << line << '\n' LYXERR(Debug::OUTFILE, "line: " << line << '\n'
<< "Desc: " << desc << '\n' << "Text: " << errstr); << "Desc: " << desc << '\n' << "Text: " << errstr);
if (line == last_line) if (line == last_line)
++line_count; ++line_count;
@ -1182,7 +1182,7 @@ int LaTeX::scanLogFile(TeXErrors & terr)
} }
} }
} }
LYXERR(Debug::LATEX, "Log line: " << token); LYXERR(Debug::OUTFILE, "Log line: " << token);
return retval; return retval;
} }
@ -1560,7 +1560,7 @@ void LaTeX::deplog(DepTable & head)
int LaTeX::scanBlgFile(DepTable & dep, TeXErrors & terr) int LaTeX::scanBlgFile(DepTable & dep, TeXErrors & terr)
{ {
FileName const blg_file(changeExtension(file.absFileName(), "blg")); FileName const blg_file(changeExtension(file.absFileName(), "blg"));
LYXERR(Debug::LATEX, "Scanning blg file: " << blg_file); LYXERR(Debug::OUTFILE, "Scanning blg file: " << blg_file);
ifstream ifs(blg_file.toFilesystemEncoding().c_str()); ifstream ifs(blg_file.toFilesystemEncoding().c_str());
string token; string token;
@ -1583,7 +1583,7 @@ int LaTeX::scanBlgFile(DepTable & dep, TeXErrors & terr)
if (regex_match(token, sub, reg1)) { if (regex_match(token, sub, reg1)) {
string data = sub.str(3); string data = sub.str(3);
if (!data.empty()) { if (!data.empty()) {
LYXERR(Debug::LATEX, "Found bib file: " << data); LYXERR(Debug::OUTFILE, "Found bib file: " << data);
handleFoundFile(data, dep); handleFoundFile(data, dep);
} }
} }
@ -1628,7 +1628,7 @@ int LaTeX::scanBlgFile(DepTable & dep, TeXErrors & terr)
int LaTeX::scanIlgFile(TeXErrors & terr) int LaTeX::scanIlgFile(TeXErrors & terr)
{ {
FileName const ilg_file(changeExtension(file.absFileName(), "ilg")); FileName const ilg_file(changeExtension(file.absFileName(), "ilg"));
LYXERR(Debug::LATEX, "Scanning ilg file: " << ilg_file); LYXERR(Debug::OUTFILE, "Scanning ilg file: " << ilg_file);
ifstream ifs(ilg_file.toFilesystemEncoding().c_str()); ifstream ifs(ilg_file.toFilesystemEncoding().c_str());
string token; string token;

4
src/Paragraph.cpp
View File

@ -2510,7 +2510,7 @@ void Paragraph::latex(BufferParams const & bparams,
OutputParams const & runparams, OutputParams const & runparams,
int start_pos, int end_pos, bool force) const int start_pos, int end_pos, bool force) const
{ {
LYXERR(Debug::LATEX, "Paragraph::latex... " << this); LYXERR(Debug::OUTFILE, "Paragraph::latex... " << this);
// FIXME This check should not be needed. Perhaps issue an // FIXME This check should not be needed. Perhaps issue an
// error if it triggers. // error if it triggers.
@ -3127,7 +3127,7 @@ void Paragraph::latex(BufferParams const & bparams,
os << setEncoding(prev_encoding->iconvName()); os << setEncoding(prev_encoding->iconvName());
} }
LYXERR(Debug::LATEX, "Paragraph::latex... done " << this); LYXERR(Debug::OUTFILE, "Paragraph::latex... done " << this);
} }

2
src/Paragraph.h
View File

@ -194,7 +194,7 @@ public:
/// Can we drop the standard paragraph wrapper? /// Can we drop the standard paragraph wrapper?
bool emptyTag() const; bool emptyTag() const;
/// Get the id of the paragraph, usefull for docbook /// Get the id of the paragraph, useful for DocBook
std::string getID(Buffer const & buf, OutputParams const & runparams) const; std::string getID(Buffer const & buf, OutputParams const & runparams) const;
/// Output the first word of a paragraph, return the position where it left. /// Output the first word of a paragraph, return the position where it left.

4
src/TexRow.cpp
View File

@ -251,7 +251,7 @@ TexRow::getEntriesFromRow(int const row) const
// correspond to no output by delaying their addition, at the level // correspond to no output by delaying their addition, at the level
// of otexrowstream, until a character is actually output. // of otexrowstream, until a character is actually output.
// //
LYXERR(Debug::LATEX, "getEntriesFromRow: row " << row << " requested"); LYXERR(Debug::OUTFILE, "getEntriesFromRow: row " << row << " requested");
// check bounds for row - 1, our target index // check bounds for row - 1, our target index
if (row <= 0) if (row <= 0)
@ -360,7 +360,7 @@ FuncRequest TexRow::goToFuncFromRow(int const row) const
{ {
TextEntry start, end; TextEntry start, end;
tie(start,end) = getEntriesFromRow(row); tie(start,end) = getEntriesFromRow(row);
LYXERR(Debug::LATEX, LYXERR(Debug::OUTFILE,
"goToFuncFromRow: for row " << row << ", TexRow has found " "goToFuncFromRow: for row " << row << ", TexRow has found "
"start (id=" << start.id << ",pos=" << start.pos << "), " "start (id=" << start.id << ",pos=" << start.pos << "), "
"end (id=" << end.id << ",pos=" << end.pos << ")"); "end (id=" << end.id << ",pos=" << end.pos << ")");

2
src/frontends/qt/GuiView.cpp
View File

@ -3998,7 +3998,7 @@ bool GuiView::goToFileRow(string const & argument)
setBuffer(buf); setBuffer(buf);
bool success = documentBufferView()->setCursorFromRow(row); bool success = documentBufferView()->setCursorFromRow(row);
if (!success) { if (!success) {
LYXERR(Debug::LATEX, LYXERR(Debug::OUTFILE,
"setCursorFromRow: invalid position for row " << row); "setCursorFromRow: invalid position for row " << row);
frontend::Alert::error(_("Inverse Search Failed"), frontend::Alert::error(_("Inverse Search Failed"),
_("Invalid position requested by inverse search.\n" _("Invalid position requested by inverse search.\n"

2
src/frontends/qt/GuiViewSource.cpp
View File

@ -199,7 +199,7 @@ void ViewSourceWidget::updateView(BufferView const * bv)
if (guiApp->currentView()->develMode()) { if (guiApp->currentView()->develMode()) {
// output tex<->row correspondences in the source panel if the "-dbg latex" // output tex<->row correspondences in the source panel if the "-dbg latex"
// option is given. // option is given.
if (texrow_ && lyx::lyxerr.debugging(Debug::LATEX)) { if (texrow_ && lyx::lyxerr.debugging(Debug::OUTFILE)) {
QStringList list = qcontent.split(QChar('\n')); QStringList list = qcontent.split(QChar('\n'));
docstring_list dlist; docstring_list dlist;
for (QStringList::const_iterator it = list.begin(); it != list.end(); ++it) for (QStringList::const_iterator it = list.begin(); it != list.end(); ++it)

4
src/graphics/PreviewLoader.cpp
View File

@ -624,7 +624,7 @@ void PreviewLoader::Impl::startLoading(bool wait)
<< from_utf8(changeExtension(buffer_.latexName(), "")) << from_utf8(changeExtension(buffer_.latexName(), ""))
<< "}\n"; << "}\n";
LYXERR(Debug::LATEX, "Format = " << buffer_.params().getDefaultOutputFormat()); LYXERR(Debug::OUTFILE, "Format = " << buffer_.params().getDefaultOutputFormat());
string latexparam = ""; string latexparam = "";
bool docformat = !buffer_.params().default_output_format.empty() bool docformat = !buffer_.params().default_output_format.empty()
&& buffer_.params().default_output_format != "default"; && buffer_.params().default_output_format != "default";
@ -810,7 +810,7 @@ void PreviewLoader::Impl::finishedGenerating(pid_t pid, int retval)
void PreviewLoader::Impl::dumpPreamble(otexstream & os, Flavor flavor) const void PreviewLoader::Impl::dumpPreamble(otexstream & os, Flavor flavor) const
{ {
// Dump the preamble only. // Dump the preamble only.
LYXERR(Debug::LATEX, "dumpPreamble, flavor == " << static_cast<int>(flavor)); LYXERR(Debug::OUTFILE, "dumpPreamble, flavor == " << static_cast<int>(flavor));
OutputParams runparams(&buffer_.params().encoding()); OutputParams runparams(&buffer_.params().encoding());
runparams.flavor = flavor; runparams.flavor = flavor;
runparams.nice = true; runparams.nice = true;

2
src/insets/Inset.h
View File

@ -335,7 +335,7 @@ public:
/// output, add PLAINTEXT_NEWLINE to the number of chars in the last line /// output, add PLAINTEXT_NEWLINE to the number of chars in the last line
virtual int plaintext(odocstringstream &, OutputParams const &, virtual int plaintext(odocstringstream &, OutputParams const &,
size_t max_length = INT_MAX) const = 0; size_t max_length = INT_MAX) const = 0;
/// docbook output /// DocBook output
virtual void docbook(XMLStream &, OutputParams const &) const; virtual void docbook(XMLStream &, OutputParams const &) const;
/// XHTML output /// XHTML output
/// the inset is expected to write XHTML to the XMLStream /// the inset is expected to write XHTML to the XMLStream

8
src/insets/InsetInclude.cpp
View File

@ -618,9 +618,9 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
FileName const writefile(makeAbsPath(mangled, runparams.for_preview ? FileName const writefile(makeAbsPath(mangled, runparams.for_preview ?
buffer().temppath() : masterBuffer->temppath())); buffer().temppath() : masterBuffer->temppath()));
LYXERR(Debug::LATEX, "incfile:" << incfile); LYXERR(Debug::OUTFILE, "incfile:" << incfile);
LYXERR(Debug::LATEX, "exportfile:" << exportfile); LYXERR(Debug::OUTFILE, "exportfile:" << exportfile);
LYXERR(Debug::LATEX, "writefile:" << writefile); LYXERR(Debug::OUTFILE, "writefile:" << writefile);
string const tex_format = flavor2format(runparams.flavor); string const tex_format = flavor2format(runparams.flavor);
@ -783,7 +783,7 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
if (checksum_in != checksum_out) { if (checksum_in != checksum_out) {
if (!included_file.copyTo(writefile)) { if (!included_file.copyTo(writefile)) {
// FIXME UNICODE // FIXME UNICODE
LYXERR(Debug::LATEX, LYXERR(Debug::OUTFILE,
to_utf8(bformat(_("Could not copy the file\n%1$s\n" to_utf8(bformat(_("Could not copy the file\n%1$s\n"
"into the temporary directory."), "into the temporary directory."),
from_utf8(included_file.absFileName())))); from_utf8(included_file.absFileName()))));

2
src/output_docbook.cpp
View File

@ -826,7 +826,7 @@ DocBookInfoTag getParagraphsWithInfo(ParagraphList const &paragraphs,
// There should never be any section here, except for the first paragraph (a title can be part of <info>). // There should never be any section here, except for the first paragraph (a title can be part of <info>).
// (Just a sanity check: if this fails, this function could end up processing the whole document.) // (Just a sanity check: if this fails, this function could end up processing the whole document.)
if (cpit != bpit && isLayoutSectioningOrSimilar(par.layout())) { if (cpit != bpit && isLayoutSectioningOrSimilar(par.layout())) {
LYXERR0("Assertion failed: section found in potential <info> paragraphs."); LYXERR(Debug::OUTFILE, "Assertion failed: section found in potential <info> paragraphs.");
break; break;
} }

10
src/output_latex.cpp
View File

@ -409,7 +409,7 @@ void TeXEnvironment(Buffer const & buf, Text const & text,
{ {
ParagraphList const & paragraphs = text.paragraphs(); ParagraphList const & paragraphs = text.paragraphs();
ParagraphList::const_iterator ipar = paragraphs.iterator_at(pit); ParagraphList::const_iterator ipar = paragraphs.iterator_at(pit);
LYXERR(Debug::LATEX, "TeXEnvironment for paragraph " << pit); LYXERR(Debug::OUTFILE, "TeXEnvironment for paragraph " << pit);
Layout const & current_layout = ipar->layout(); Layout const & current_layout = ipar->layout();
depth_type const current_depth = ipar->params().depth(); depth_type const current_depth = ipar->params().depth();
@ -490,7 +490,7 @@ void TeXEnvironment(Buffer const & buf, Text const & text,
} }
if (pit != runparams.par_end) if (pit != runparams.par_end)
LYXERR(Debug::LATEX, "TeXEnvironment for paragraph " << par_begin << " done."); LYXERR(Debug::OUTFILE, "TeXEnvironment for paragraph " << par_begin << " done.");
} }
@ -800,7 +800,7 @@ void TeXOnePar(Buffer const & buf,
&& !par.empty() && par.isDeleted(0, par.size()) && !bparams.output_changes) && !par.empty() && par.isDeleted(0, par.size()) && !bparams.output_changes)
return; return;
LYXERR(Debug::LATEX, "TeXOnePar for paragraph " << pit << " ptr " << &par << " '" LYXERR(Debug::OUTFILE, "TeXOnePar for paragraph " << pit << " ptr " << &par << " '"
<< everypar << "'"); << everypar << "'");
OutputParams runparams = runparams_in; OutputParams runparams = runparams_in;
@ -1555,7 +1555,7 @@ void TeXOnePar(Buffer const & buf,
if (intitle_command) if (intitle_command)
state->nest_level_ -= 1; state->nest_level_ -= 1;
LYXERR(Debug::LATEX, "TeXOnePar for paragraph " << pit << " done; ptr " LYXERR(Debug::OUTFILE, "TeXOnePar for paragraph " << pit << " done; ptr "
<< &par << " next " << nextpar); << &par << " next " << nextpar);
return; return;
@ -1863,7 +1863,7 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
// but it is the best we can do. // but it is the best we can do.
// change encoding // change encoding
LYXERR(Debug::LATEX, "Changing LaTeX encoding from " LYXERR(Debug::OUTFILE, "Changing LaTeX encoding from "
<< oldEnc.name() << " to " << newEnc.name()); << oldEnc.name() << " to " << newEnc.name());
os << setEncoding(newEnc.iconvName()); os << setEncoding(newEnc.iconvName());
if (bparams.inputenc == "auto-legacy-plain") if (bparams.inputenc == "auto-legacy-plain")

3
src/support/debug.cpp
View File

@ -47,7 +47,8 @@ DebugErrorItem errorTags[] = {
{ Debug::PARSER, "parser", N_("Lyxlex grammar parser")}, { Debug::PARSER, "parser", N_("Lyxlex grammar parser")},
{ Debug::LYXRC, "lyxrc", N_("Configuration files reading")}, { Debug::LYXRC, "lyxrc", N_("Configuration files reading")},
{ Debug::KBMAP, "kbmap", N_("Custom keyboard definition")}, { Debug::KBMAP, "kbmap", N_("Custom keyboard definition")},
{ Debug::LATEX, "latex", N_("LaTeX generation/execution")}, { Debug::OUTFILE, "outfile", N_("Output source file generation/processing")},
{ Debug::OUTFILE, "latex", N_("Output source file generation/processing")},
{ Debug::MATHED, "mathed", N_("Math editor")}, { Debug::MATHED, "mathed", N_("Math editor")},
{ Debug::FONT, "font", N_("Font handling")}, { Debug::FONT, "font", N_("Font handling")},
{ Debug::TCLASS, "tclass", N_("Textclass files reading")}, { Debug::TCLASS, "tclass", N_("Textclass files reading")},

2
src/support/debug.h
View File

@ -55,7 +55,7 @@ namespace Debug {
/// ///
KBMAP = (1u << 6), // 64 KBMAP = (1u << 6), // 64
/// ///
LATEX = (1u << 7), // 128 OUTFILE = (1u << 7), // 128
/// ///
MATHED = (1u << 8), // 256 // Alejandro, please use this. MATHED = (1u << 8), // 256 // Alejandro, please use this.
/// ///

2
src/support/filetools.cpp
View File

@ -1207,7 +1207,7 @@ FileName const findtexfile(string const & fil, string const & /*format*/,
cmd_ret const c = runCommand(kpsecmd); cmd_ret const c = runCommand(kpsecmd);
LYXERR(Debug::LATEX, "kpse status = " << c.valid << '\n' LYXERR(Debug::OUTFILE, "kpse status = " << c.valid << '\n'
<< "kpse result = `" << rtrim(c.result, "\n\r") << '\''); << "kpse result = `" << rtrim(c.result, "\n\r") << '\'');
if (c.valid) if (c.valid)
return FileName(rtrim(to_utf8(from_filesystem8bit(c.result)), "\n\r")); return FileName(rtrim(to_utf8(from_filesystem8bit(c.result)), "\n\r"));

4
src/support/os_win32.cpp
View File

@ -325,7 +325,7 @@ string external_path(string const & p)
{ {
string const dos_path = subst(p, "/", "\\"); string const dos_path = subst(p, "/", "\\");
LYXERR(Debug::LATEX, "<Win32 path correction> [" LYXERR(Debug::OUTFILE, "<Win32 path correction> ["
<< p << "]->>[" << dos_path << ']'); << p << "]->>[" << dos_path << ']');
return dos_path; return dos_path;
} }
@ -410,7 +410,7 @@ string latex_path(string const & p)
string const drive = p.substr(0, 2); string const drive = p.substr(0, 2);
string const cygprefix = cygdrive + "/" + drive.substr(0, 1); string const cygprefix = cygdrive + "/" + drive.substr(0, 1);
string const cygpath = subst(subst(p, '\\', '/'), drive, cygprefix); string const cygpath = subst(subst(p, '\\', '/'), drive, cygprefix);
LYXERR(Debug::LATEX, "<Path correction for LaTeX> [" LYXERR(Debug::OUTFILE, "<Path correction for LaTeX> ["
<< p << "]->>[" << cygpath << ']'); << p << "]->>[" << cygpath << ']');
return cygpath; return cygpath;
} }

8
src/xml.cpp
View File

@ -166,7 +166,7 @@ bool FontTag::operator==(StartTag const & tag) const
void XMLStream::writeError(std::string const &s) void XMLStream::writeError(std::string const &s)
{ {
LYXERR0(s); LYXERR(Debug::OUTFILE, s);
*this << ESCAPE_NONE << from_utf8("<!-- Output Error: " + s + " -->"); *this << ESCAPE_NONE << from_utf8("<!-- Output Error: " + s + " -->");
*this << xml::CR(); *this << xml::CR();
} }
@ -174,7 +174,7 @@ void XMLStream::writeError(std::string const &s)
void XMLStream::writeError(docstring const &s) void XMLStream::writeError(docstring const &s)
{ {
LYXERR0(s); LYXERR(Debug::OUTFILE, s);
*this << ESCAPE_NONE << from_utf8("<!-- Output Error: "); *this << ESCAPE_NONE << from_utf8("<!-- Output Error: ");
*this << s; *this << s;
*this << ESCAPE_NONE << from_utf8(" -->"); *this << ESCAPE_NONE << from_utf8(" -->");
@ -686,9 +686,9 @@ void xml::openTag(odocstream & os, string const & name, string const & attribute
string param = subst(attribute, "<", "\""); string param = subst(attribute, "<", "\"");
param = subst(param, ">", "\""); param = subst(param, ">", "\"");
// Note: we ignore the name if it empty or if it is a comment "<!-- -->" or // Note: we ignore the name if it is empty or if it is a comment "<!-- -->" or
// if the name is *dummy*. // if the name is *dummy*.
// We ignore dummy because dummy is not a valid docbook element and it is // We ignore dummy because dummy is not a valid DocBook element and it is
// the internal name given to single paragraphs in the latex output. // the internal name given to single paragraphs in the latex output.
// This allow us to simplify the code a lot and is a reasonable compromise. // This allow us to simplify the code a lot and is a reasonable compromise.
if (!name.empty() && name != "!-- --" && name != "dummy") { if (!name.empty() && name != "!-- --" && name != "dummy") {