#include "LaTeX.h"
#include "bufferlist.h"
#include "gettext.h"
+#include "lyxrc.h"
#include "debug.h"
#include "DepTable.h"
#include "support/filetools.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
-using namespace lyx::support;
+using lyx::support::AbsolutePath;
+using lyx::support::bformat;
+using lyx::support::ChangeExtension;
+using lyx::support::contains;
+using lyx::support::FileInfo;
+using lyx::support::findtexfile;
+using lyx::support::getcwd;
+using lyx::support::OnlyFilename;
+using lyx::support::prefixIs;
+using lyx::support::QuoteName;
+using lyx::support::rtrim;
+using lyx::support::split;
+using lyx::support::suffixIs;
+using lyx::support::Systemcall;
+using lyx::support::unlink;
+using lyx::support::trim;
+
+namespace os = lyx::support::os;
+
+using boost::regex;
+using boost::smatch;
+
#ifndef CXX_GLOBAL_CSTD
using std::sscanf;
#endif
-using std::ifstream;
-using std::getline;
using std::endl;
-using std::vector;
+using std::getline;
+using std::string;
+using std::ifstream;
using std::set;
-using boost::regex;
-using boost::regex_match;
-
-#ifndef USE_INCLUDED_STRING
-using boost::smatch;
-#else
-using boost::cmatch;
-#endif
+using std::vector;
// TODO: in no particular order
// - get rid of the extern BufferList and the call to
// BufferList::updateIncludedTeXfiles, this should either
// be done before calling LaTeX::funcs or in a completely
// different way.
-// - the bibtex command options should be supported.
// - the makeindex style files should be taken care of with
// the dependency mechanism.
// - makeindex commandline options should be supported
// - somewhere support viewing of bibtex and makeindex log files.
// - we should perhaps also scan the bibtex log file
-// - we should perhaps also scan the bibtex log file
extern BufferList bufferlist;
return bformat(_("Waiting for LaTeX run number %1$s"), tostr(count));
}
-};
+} // anon namespace
/*
* CLASS TEXERRORS
* CLASS LaTeX
*/
-LaTeX::LaTeX(string const & latex, LatexRunParams const & rp,
+LaTeX::LaTeX(string const & latex, OutputParams const & rp,
string const & f, string const & p)
: cmd(latex), file(f), path(p), runparams(rp)
{
++count;
lyxerr[Debug::LATEX] << "Run #" << count << endl;
message(runMessage(count));
-
+
startscript();
scanres = scanLogFile(terr);
if (scanres & ERROR_RERUN) {
// to be able to make style files from within LyX. This has
// to come for a later time.
string tmp = "makeindex -c -q ";
- tmp += f;
+ tmp += QuoteName(f);
Systemcall one;
one.startscript(Systemcall::Wait, tmp);
return true;
ifstream ifs(file.c_str());
string token;
- regex reg1("\\\\citation\\{([^}]+)\\}");
- regex reg2("\\\\bibdata\\{([^}]+)\\}");
- regex reg3("\\\\bibstyle\\{([^}]+)\\}");
- regex reg4("\\\\@input\\{([^}]+)\\}");
+ static regex const reg1("\\\\citation\\{([^}]+)\\}");
+ static regex const reg2("\\\\bibdata\\{([^}]+)\\}");
+ static regex const reg3("\\\\bibstyle\\{([^}]+)\\}");
+ static regex const reg4("\\\\@input\\{([^}]+)\\}");
while (getline(ifs, token)) {
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));
+ if (regex_match(token, sub, reg1)) {
+ string data = sub.str(1);
while (!data.empty()) {
string citation;
data = split(data, citation, ',');
<< citation << endl;
aux_info.citations.insert(citation);
}
- } else if (regex_match(STRCONV(token), sub, reg2)) {
- string data = sub.STRCONV(str(1));
+ } else if (regex_match(token, sub, reg2)) {
+ string data = sub.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()) {
<< database << '\'' << endl;
aux_info.databases.insert(database);
}
- } else if (regex_match(STRCONV(token), sub, reg3)) {
- string style = STRCONV(sub.str(1));
+ } else if (regex_match(token, sub, reg3)) {
+ string style = 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;
aux_info.styles.insert(style);
- } else if (regex_match(STRCONV(token), sub, reg4)) {
- string const file2 = STRCONV(sub.str(1));
+ } else if (regex_match(token, sub, reg4)) {
+ string const file2 = sub.str(1);
scanAuxFile(file2, aux_info);
}
}
continue;
result = true;
- string tmp = "bibtex ";
- tmp += OnlyFilename(ChangeExtension(it->aux_file, string()));
+ string tmp = lyxrc.bibtex_command + " ";
+ tmp += QuoteName(OnlyFilename(ChangeExtension(it->aux_file, string())));
Systemcall one;
one.startscript(Systemcall::Wait, tmp);
}
}
+namespace {
+
+void handleFoundFile(string const & ff, DepTable & head)
+{
+ // convert from native os path to unix path
+ string const foundfile = os::internal_path(trim(ff));
+
+ 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: "
+ << foundfile << endl;
+ // On initial insert we want to do the update at once
+ // since this file can not be a file generated by
+ // the latex run.
+ if (FileInfo(foundfile).exist())
+ head.insert(foundfile, true);
+
+ return;
+ }
+
+ string const onlyfile = OnlyFilename(foundfile);
+
+ // (2) foundfile is in the tmpdir
+ // insert it into head
+ if (FileInfo(onlyfile).exist()) {
+ static regex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$");
+ if (regex_match(onlyfile, unwanted)) {
+ lyxerr[Debug::DEPEND]
+ << "We don't want "
+ << onlyfile
+ << " in the dep file"
+ << endl;
+ } else if (suffixIs(onlyfile, ".tex")) {
+ // This is a tex file generated by LyX
+ // and latex is not likely to change this
+ // during its runs.
+ lyxerr[Debug::DEPEND]
+ << "Tmpdir TeX file: "
+ << onlyfile
+ << endl;
+ head.insert(onlyfile, true);
+ } else {
+ lyxerr[Debug::DEPEND]
+ << "In tmpdir file:"
+ << onlyfile
+ << endl;
+ head.insert(onlyfile);
+ }
+ } else
+ lyxerr[Debug::DEPEND]
+ << "Not a file or we are unable to find it."
+ << endl;
+}
+
+} // anon namespace
+
+
void LaTeX::deplog(DepTable & head)
{
// This function reads the LaTeX log file end extracts all the external
string const logfile = OnlyFilename(ChangeExtension(file, ".log"));
- regex reg1("\\)* *\\(([^ )]+).*");
- regex reg2("File: ([^ ]+).*");
- regex reg3("No file ([^ ]+)\\..*");
- regex reg4("\\\\openout[0-9]+.*=.*`([^ ]+)'\\..*");
+ static regex reg1(".*\\([^)]+.*");
+ static regex reg2("File: ([^ ]+).*");
+ static regex reg3("No file ([^ ]+)\\..*");
+ static 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
- regex reg5("Writing index file ([^ ]+).*");
- regex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$");
+ static regex reg5("Writing index file ([^ ]+).*");
ifstream ifs(logfile.c_str());
while (ifs) {
// Ok, the scanning of files here is not sufficient.
// Sometimes files are named by "File: xxx" only
// So I think we should use some regexps to find files instead.
- // "(\([^ ]+\)" should match the "(file " variant
+ // "(\([^ ]+\)" should match the "(file " variant, note
+ // that we can have several of these on one line.
// "File: \([^ ]+\)" should match the "File: file" variant
- string foundfile;
+
string token;
getline(ifs, token);
token = rtrim(token, "\r");
- if (token.empty()) continue;
-
-#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 {
+ if (token.empty())
continue;
- }
-
- // convert from native os path to unix path
- foundfile = os::internal_path(foundfile);
- lyxerr[Debug::DEPEND] << "Found file: "
- << foundfile << endl;
+ smatch sub;
- // 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: "
- << foundfile << endl;
- // On initial insert we want to do the update at once
- // since this file can not be a file generated by
- // the latex run.
- if (FileInfo(foundfile).exist())
- head.insert(foundfile, true);
- }
+ if (regex_match(token, sub, reg1)) {
+ static regex reg1_1("\\(([^()]+)");
+ smatch what;
+ string::const_iterator first = token.begin();
+ string::const_iterator end = token.end();
- // (2) foundfile is in the tmpdir
- // insert it into head
- else if (FileInfo(OnlyFilename(foundfile)).exist()) {
- if (regex_match(STRCONV(foundfile), unwanted)) {
- lyxerr[Debug::DEPEND]
- << "We don't want "
- << OnlyFilename(foundfile)
- << " in the dep file"
- << endl;
- } else if (suffixIs(foundfile, ".tex")) {
- // This is a tex file generated by LyX
- // and latex is not likely to change this
- // during its runs.
- lyxerr[Debug::DEPEND]
- << "Tmpdir TeX file: "
- << OnlyFilename(foundfile)
- << endl;
- head.insert(foundfile, true);
- } else {
- lyxerr[Debug::DEPEND]
- << "In tmpdir file:"
- << OnlyFilename(foundfile)
- << endl;
- head.insert(OnlyFilename(foundfile));
+ while (regex_search(first, end, what, reg1_1)) {
+ first = what[0].second;
+ handleFoundFile(what.str(1), head);
}
- } else
- lyxerr[Debug::DEPEND]
- << "Not a file or we are unable to find it."
- << endl;
+ } else if (regex_match(token, sub, reg2)) {
+ handleFoundFile(sub.str(1), head);
+ } else if (regex_match(token, sub, reg3)) {
+ handleFoundFile(sub.str(1), head);
+ } else if (regex_match(token, sub, reg4)) {
+ handleFoundFile(sub.str(1), head);
+ } else if (regex_match(token, sub, reg5)) {
+ handleFoundFile(sub.str(1), head);
+ }
}
// Make sure that the main .tex file is in the dependancy file.
projects / lyx.git / blobdiff