#ifdef __GNUG__
#pragma implementation
#endif
-#include <fstream>
#include "LaTeX.h"
#include "bufferlist.h"
#include "gettext.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/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;
+using boost::smatch;
// TODO: in no particular order
// - get rid of the extern BufferList and the call to
if (lfun) {
ostringstream str;
str << _("LaTeX run number") << ' ' << count;
- lfun->dispatch(LFUN_MESSAGE, str.str().c_str());
+ lfun->dispatch(FuncRequest(LFUN_MESSAGE, str.str().c_str()));
}
this->operator()();
// 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);
if (lfun) {
ostringstream str;
str << _("LaTeX run number") << ' ' << count;
- lfun->dispatch(LFUN_MESSAGE, str.str().c_str());
+ // check lyxstring string stream and gcc 3.1 before fixing
+ lfun->dispatch(FuncRequest(LFUN_MESSAGE, str.str().c_str()));
}
this->operator()();
// 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")));
if (lfun) {
ostringstream str;
str << _("LaTeX run number") << ' ' << count;
- lfun->dispatch(LFUN_MESSAGE, str.str().c_str());
+ lfun->dispatch(FuncRequest(LFUN_MESSAGE, str.str().c_str()));
}
this->operator()();
// 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;
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");
+ smatch sub;
+ if (regex_match(token, sub, reg1)) {
+ string data = sub[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(token, sub, reg2)) {
+ string data = sub[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 (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(token, sub, reg3)) {
+ string style = sub[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 (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(token, sub, reg4)) {
+ string file2 = sub[1];
scanAuxFile(file2, aux_info);
}
}
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) {
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);
+ smatch sub;
+ if (regex_match(token, sub, reg1)) {
+ foundfile = sub[1];
+ } else if (regex_match(token, sub, reg2)) {
+ foundfile = sub[1];
+ } else if (regex_match(token, sub, reg3)) {
+ foundfile = sub[1];
+ } else if (regex_match(token, sub, reg4)) {
+ foundfile = sub[1];
+ } else if (regex_match(token, sub, reg5)) {
+ foundfile = sub[1];
} else {
continue;
}
// (2) foundfile is in the tmpdir
// insert it into head
else if (FileInfo(OnlyFilename(foundfile)).exist()) {
- if (unwanted.exact_match(foundfile)) {
+ if (regex_match(foundfile, unwanted)) {
lyxerr[Debug::DEPEND]
<< "We don't want "
<< OnlyFilename(foundfile)
projects / lyx.git / blobdiff