#include "gettext.h"
#include "lyxfunc.h"
#include "debug.h"
+#include "funcrequest.h"
#include "support/filetools.h"
#include "support/FileInfo.h"
#include "support/lstrings.h"
#include <fstream>
#include <cstdio> // sscanf
+#ifndef CXX_GLOBAL_CSTD
+using std::sscanf;
+#endif
+
using std::ifstream;
using std::getline;
using std::endl;
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;
regex reg4("\\\\@input\\{([^}]+)\\}");
while (getline(ifs, token)) {
- token = strip(token, '\r');
+ token = rtrim(token, "\r");
smatch sub;
if (regex_match(token, sub, reg1)) {
string data = sub[1];
string foundfile;
string token;
getline(ifs, token);
- token = strip(token, '\r');
+ token = rtrim(token, "\r");
if (token.empty()) continue;
smatch sub;