/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
+ * ======================================================
+ *
+ * LyX, The Document Processor
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team.
*
* This file is Copyright 1996-2001
* Lars Gullik Bjønnes
*
- * ======================================================
+ * ======================================================
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-#include <fstream>
-
#include "LaTeX.h"
#include "bufferlist.h"
#include "gettext.h"
-#include "lyx_gui_misc.h"
#include "lyxfunc.h"
#include "debug.h"
+#include "funcrequest.h"
#include "support/filetools.h"
#include "support/FileInfo.h"
-#include "support/LRegex.h"
-#include "support/LSubstring.h"
+#include "support/tostr.h"
#include "support/lstrings.h"
#include "support/lyxlib.h"
#include "support/systemcall.h"
#include "support/os.h"
#include "support/path.h"
+#include <boost/regex.hpp>
+
+#include <fstream>
+#include <cstdio> // sscanf
+
+#ifndef CXX_GLOBAL_CSTD
+using std::sscanf;
+#endif
+
using std::ifstream;
using std::getline;
using std::endl;
using std::vector;
using std::set;
+using boost::regex;
+using boost::regex_match;
+
+#ifndef USE_INCLUDED_STRING
+using boost::smatch;
+#else
+using boost::cmatch;
+#endif
// TODO: in no particular order
// - get rid of the extern BufferList and the call to
extern BufferList bufferlist;
+namespace {
+
+void showRunMessage(LyXFunc * lf, unsigned int count)
+{
+ string str = bformat(_("Waiting for LaTeX run number %1$s"), tostr(count));
+ lf->dispatch(FuncRequest(LFUN_MESSAGE, str));
+}
+
+
+};
/*
* CLASS TEXERRORS
*/
void TeXErrors::insertError(int line, string const & error_desc,
string const & error_text)
{
- Error newerr(line, error_desc, error_text);
+ Error newerr(line, error_desc, error_text);
errors.push_back(newerr);
}
+
+bool operator==(Aux_Info const & a, Aux_Info const & o)
+{
+ return a.aux_file == o.aux_file &&
+ a.citations == o.citations &&
+ a.databases == o.databases &&
+ a.styles == o.styles;
+}
+
+
+bool operator!=(Aux_Info const & a, Aux_Info const & o)
+{
+ return !(a == o);
+}
+
+
/*
* CLASS LaTeX
*/
// but the reason for the error might be in a generated file...
- string ofname = OnlyFilename(file);
+ string const ofname = OnlyFilename(file);
// bibtex file
- string bbl = ChangeExtension(ofname, ".bbl");
+ string const bbl = ChangeExtension(ofname, ".bbl");
lyx::unlink(bbl);
// makeindex file
- string ind = ChangeExtension(ofname, ".ind");
+ string const ind = ChangeExtension(ofname, ".ind");
lyx::unlink(ind);
-
+
// Also remove the aux file
- string aux = ChangeExtension(ofname, ".aux");
+ string const aux = ChangeExtension(ofname, ".aux");
lyx::unlink(aux);
}
int scanres = NO_ERRORS;
unsigned int count = 0; // number of times run
num_errors = 0; // just to make sure.
- const unsigned int MAX_RUN = 6;
+ unsigned int const MAX_RUN = 6;
DepTable head; // empty head
bool rerun = false; // rerun requested
-
+
// The class LaTeX does not know the temp path.
- bufferlist.updateIncludedTeXfiles(lyx::getcwd()); //GetCWD());
-
+ bufferlist.updateIncludedTeXfiles(lyx::getcwd());
+
// Never write the depfile if an error was encountered.
-
+
// 0
// first check if the file dependencies exist:
// ->If it does exist
if (had_depfile) {
lyxerr[Debug::DEPEND] << "Dependency file exists" << endl;
// Read the dep file:
- head.read(depfile);
+ had_depfile = head.read(depfile);
+ }
+
+ if (had_depfile) {
// Update the checksums
head.update();
// Can't just check if anything has changed because it might have aborted
run_bibtex = true;
} else
lyxerr[Debug::DEPEND]
- << "Dependency file does not exist" << endl;
+ << "Dependency file does not exist, or has wrong format" << endl;
/// We scan the aux file even when had_depfile = false,
/// because we can run pdflatex on the file after running latex on it,
++count;
lyxerr[Debug::LATEX] << "Run #" << count << endl;
if (lfun) {
- ostringstream str;
- str << _("LaTeX run number") << ' ' << count;
- lfun->dispatch(LFUN_MESSAGE, str.str().c_str());
+ showRunMessage(lfun, count);
}
-
- this->operator()();
+
+ startscript();
scanres = scanLogFile(terr);
if (scanres & ERROR_RERUN) {
lyxerr[Debug::LATEX] << "Rerunning LaTeX" << endl;
- this->operator()();
+ startscript();
scanres = scanLogFile(terr);
}
// And if there were undefined citations or changes in references
// the .aux file is checked for signs of bibtex. Bibtex is then run
// if needed.
-
+
// run makeindex
if (head.haschanged(OnlyFilename(ChangeExtension(file, ".idx")))) {
// no checks for now
lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
if (lfun) {
- lfun->dispatch(LFUN_MESSAGE, _("Running MakeIndex."));
+ lfun->dispatch(FuncRequest(LFUN_MESSAGE, _("Running MakeIndex.")));
}
-
+
rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
}
// no checks for now
lyxerr[Debug::LATEX] << "Running BibTeX." << endl;
if (lfun) {
- lfun->dispatch(LFUN_MESSAGE, _("Running BibTeX."));
+ lfun->dispatch(FuncRequest(LFUN_MESSAGE, _("Running BibTeX.")));
}
-
+
updateBibtexDependencies(head, bibtex_info);
rerun |= runBibTeX(bibtex_info);
} else if (!had_depfile) {
/// insert the .bib and .bst files into the .dep-pdf file.
updateBibtexDependencies(head, bibtex_info);
}
-
+
// 1
// we know on this point that latex has been run once (or we just
// returned) and the question now is to decide if we need to run
lyxerr[Debug::LATEX]
<< "Run #" << count << endl;
if (lfun) {
- ostringstream str;
- str << _("LaTeX run number") << ' ' << count;
- lfun->dispatch(LFUN_MESSAGE, str.str().c_str());
+ showRunMessage(lfun, count);
}
-
- this->operator()();
+
+ startscript();
scanres = scanLogFile(terr);
if (scanres & ERRORS) {
deleteFilesOnError();
return scanres; // return on error
}
-
+
// update the depedencies
deplog(head); // reads the latex log
head.update();
// again to make sure everything is redone correctly.
// Also there should be no need to run the external programs any
// more after this.
-
+
// run makeindex if the <file>.idx has changed or was generated.
if (head.haschanged(OnlyFilename(ChangeExtension(file, ".idx")))) {
// no checks for now
lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
if (lfun) {
- lfun->dispatch(LFUN_MESSAGE, _("Running MakeIndex."));
+ lfun->dispatch(FuncRequest(LFUN_MESSAGE, _("Running MakeIndex.")));
}
-
+
rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
}
-
+
// 2
// we will only run latex more if the log file asks for it.
// or if the sumchange() is true.
// -> rerun not asked for:
// just return (fall out of bottom of func)
//
- while ((head.sumchange() || rerun || (scanres & RERUN))
+ while ((head.sumchange() || rerun || (scanres & RERUN))
&& count < MAX_RUN) {
// Yes rerun until message goes away, or until
// MAX_RUNS are reached.
++count;
lyxerr[Debug::LATEX] << "Run #" << count << endl;
if (lfun) {
- ostringstream str;
- str << _("LaTeX run number") << ' ' << count;
- lfun->dispatch(LFUN_MESSAGE, str.str().c_str());
+ showRunMessage(lfun, count);
}
-
- this->operator()();
+
+ startscript();
scanres = scanLogFile(terr);
if (scanres & ERRORS) {
deleteFilesOnError();
return scanres; // return on error
}
-
+
// keep this updated
head.update();
}
}
-int LaTeX::operator()()
+int LaTeX::startscript()
{
#ifndef __EMX__
string tmp = cmd + ' ' + QuoteName(file) + " > /dev/null";
#else // cmd.exe (OS/2) causes SYS0003 error at "/dev/null"
string tmp = cmd + ' ' + file + " > nul";
#endif
- Systemcall one;
+ Systemcall one;
return one.startscript(Systemcall::Wait, tmp);
}
// It should be possible to set the switches for makeindex
// sorting style and such. It would also be very convenient
// to be able to make style files from within LyX. This has
- // to come for a later time. (0.13 perhaps?)
+ // to come for a later time.
string tmp = "makeindex -c -q ";
tmp += f;
Systemcall one;
LaTeX::scanAuxFiles(string const & file)
{
vector<Aux_Info> result;
-
+
result.push_back(scanAuxFile(file));
for (int i = 1; i < 1000; ++i) {
- string file2 = ChangeExtension(file, "") + "." + tostr(i)
+ string file2 = ChangeExtension(file, "") + '.' + tostr(i)
+ ".aux";
FileInfo fi(file2);
if (!fi.exist())
ifstream ifs(file.c_str());
string token;
- LRegex reg1("\\\\citation\\{([^}]+)\\}");
- LRegex reg2("\\\\bibdata\\{([^}]+)\\}");
- LRegex reg3("\\\\bibstyle\\{([^}]+)\\}");
- LRegex reg4("\\\\@input\\{([^}]+)\\}");
+ regex reg1("\\\\citation\\{([^}]+)\\}");
+ regex reg2("\\\\bibdata\\{([^}]+)\\}");
+ regex reg3("\\\\bibstyle\\{([^}]+)\\}");
+ regex reg4("\\\\@input\\{([^}]+)\\}");
while (getline(ifs, token)) {
- token = strip(token, '\r');
- if (reg1.exact_match(token)) {
- LRegex::SubMatches const & sub = reg1.exec(token);
- string data = LSubstring(token, sub[1].first,
- sub[1].second);
+ token = rtrim(token, "\r");
+#ifndef USE_INCLUDED_STRING
+ smatch sub;
+#else
+ cmatch sub;
+#endif
+ if (regex_match(STRCONV(token), sub, reg1)) {
+ string data = STRCONV(sub.str(1));
while (!data.empty()) {
string citation;
data = split(data, citation, ',');
<< citation << endl;
aux_info.citations.insert(citation);
}
- } else if (reg2.exact_match(token)) {
- LRegex::SubMatches const & sub = reg2.exec(token);
- string data = LSubstring(token, sub[1].first,
- sub[1].second);
+ } else if (regex_match(STRCONV(token), sub, reg2)) {
+ string data = sub.STRCONV(str(1));
// data is now all the bib files separated by ','
// get them one by one and pass them to the helper
while (!data.empty()) {
string database;
data = split(data, database, ',');
database = ChangeExtension(database, "bib");
- lyxerr[Debug::LATEX] << "Bibtex database: `"
- << database << "'" << endl;
+ lyxerr[Debug::LATEX] << "BibTeX database: `"
+ << database << '\'' << endl;
aux_info.databases.insert(database);
}
- } else if (reg3.exact_match(token)) {
- LRegex::SubMatches const & sub = reg3.exec(token);
- string style = LSubstring(token, sub[1].first,
- sub[1].second);
+ } else if (regex_match(STRCONV(token), sub, reg3)) {
+ string style = STRCONV(sub.str(1));
// token is now the style file
// pass it to the helper
style = ChangeExtension(style, "bst");
- lyxerr[Debug::LATEX] << "Bibtex style: `"
- << style << "'" << endl;
+ lyxerr[Debug::LATEX] << "BibTeX style: `"
+ << style << '\'' << endl;
aux_info.styles.insert(style);
- } else if (reg4.exact_match(token)) {
- LRegex::SubMatches const & sub = reg4.exec(token);
- string file2 = LSubstring(token, sub[1].first,
- sub[1].second);
+ } else if (regex_match(STRCONV(token), sub, reg4)) {
+ string const file2 = STRCONV(sub.str(1));
scanAuxFile(file2, aux_info);
}
}
string file = findtexfile(*it2, "bst");
if (!file.empty())
dep.insert(file, true);
- }
+ }
}
}
string token;
while (getline(ifs, token)) {
lyxerr[Debug::LATEX] << "Log line: " << token << endl;
-
+
if (token.empty())
continue;
<< "We should rerun." << endl;
retval |= RERUN;
}
- } else if (prefixIs(token, "(")) {
+ } else if (token[0] == '(') {
if (contains(token, "Rerun LaTeX") ||
contains(token, "Rerun to get")) {
// Used by natbib
string const logfile = OnlyFilename(ChangeExtension(file, ".log"));
- LRegex reg1("\\)* *\\(([^ )]+).*");
- LRegex reg2("File: ([^ ]+).*");
- LRegex reg3("No file ([^ ]+)\\..*");
- LRegex reg4("\\\\openout[0-9]+.*=.*`([^ ]+)'\\..*");
+ regex reg1("\\)* *\\(([^ )]+).*");
+ regex reg2("File: ([^ ]+).*");
+ regex reg3("No file ([^ ]+)\\..*");
+ regex reg4("\\\\openout[0-9]+.*=.*`([^ ]+)'\\..*");
// If an index should be created, MikTex does not write a line like
// \openout# = 'sample,idx'.
// but intstead only a line like this into the log:
// Writing index file sample.idx
- LRegex reg5("Writing index file ([^ ]+).*");
- LRegex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$");
-
+ regex reg5("Writing index file ([^ ]+).*");
+ regex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$");
+
ifstream ifs(logfile.c_str());
while (ifs) {
// Ok, the scanning of files here is not sufficient.
string foundfile;
string token;
getline(ifs, token);
- token = strip(token, '\r');
+ token = rtrim(token, "\r");
if (token.empty()) continue;
-
- if (reg1.exact_match(token)) {
- LRegex::SubMatches const & sub = reg1.exec(token);
- foundfile = LSubstring(token, sub[1].first,
- sub[1].second);
- } else if (reg2.exact_match(token)) {
- LRegex::SubMatches const & sub = reg2.exec(token);
- foundfile = LSubstring(token, sub[1].first,
- sub[1].second);
- } else if (reg3.exact_match(token)) {
- LRegex::SubMatches const & sub = reg3.exec(token);
- foundfile = LSubstring(token, sub[1].first,
- sub[1].second);
- } else if (reg4.exact_match(token)) {
- LRegex::SubMatches const & sub = reg4.exec(token);
- foundfile = LSubstring(token, sub[1].first,
- sub[1].second);
- } else if (reg5.exact_match(token)) {
- LRegex::SubMatches const & sub = reg5.exec(token);
- foundfile = LSubstring(token, sub[1].first,
- sub[1].second);
+
+#ifndef USE_INCLUDED_STRING
+ smatch sub;
+#else
+ cmatch sub;
+#endif
+ if (regex_match(STRCONV(token), sub, reg1)) {
+ foundfile = STRCONV(sub.str(1));
+ } else if (regex_match(STRCONV(token), sub, reg2)) {
+ foundfile = STRCONV(sub.str(1));
+ } else if (regex_match(STRCONV(token), sub, reg3)) {
+ foundfile = STRCONV(sub.str(1));
+ } else if (regex_match(STRCONV(token), sub, reg4)) {
+ foundfile = STRCONV(sub.str(1));
+ } else if (regex_match(STRCONV(token), sub, reg5)) {
+ foundfile = STRCONV(sub.str(1));
} else {
continue;
}
// convert from native os path to unix path
foundfile = os::internal_path(foundfile);
-
- lyxerr[Debug::DEPEND] << "Found file: "
+
+ lyxerr[Debug::DEPEND] << "Found file: "
<< foundfile << endl;
-
+
// Ok now we found a file.
// Now we should make sure that this is a file that we can
// access through the normal paths.
// We will not try any fancy search methods to
// find the file.
-
+
// (1) foundfile is an
// absolute path and should
// be inserted.
if (AbsolutePath(foundfile)) {
- lyxerr[Debug::DEPEND] << "AbsolutePath file: "
+ lyxerr[Debug::DEPEND] << "AbsolutePath file: "
<< foundfile << endl;
// On initial insert we want to do the update at once
// since this file can not be a file generated by
// (2) foundfile is in the tmpdir
// insert it into head
else if (FileInfo(OnlyFilename(foundfile)).exist()) {
- if (unwanted.exact_match(foundfile)) {
+ if (regex_match(STRCONV(foundfile), unwanted)) {
lyxerr[Debug::DEPEND]
<< "We don't want "
<< OnlyFilename(foundfile)
projects / lyx.git / blobdiff