remove noload/don't typeset

[lyx.git] / src / LaTeX.C

diff --git a/src/LaTeX.C b/src/LaTeX.C
index 830834ebd697f46891f0d36d9bbe144febcb6abb..046f3f114856cb3ee2a1e217a997c0bc461b3185 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -22,6 +22,7 @@
 #include "gettext.h"
 #include "lyxfunc.h"
 #include "debug.h"
+#include "funcrequest.h"
 #include "support/filetools.h"
 #include "support/FileInfo.h"
 #include "support/lstrings.h"
@@ -197,7 +198,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
        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()();
@@ -233,7 +234,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                // 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")));
@@ -248,7 +249,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                // 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);
@@ -282,7 +283,8 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                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()();
@@ -312,7 +314,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                // 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")));
@@ -338,7 +340,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                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()();
@@ -429,7 +431,7 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
        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];
@@ -678,7 +680,7 @@ void LaTeX::deplog(DepTable & head)
                string foundfile;
                string token;
                getline(ifs, token);
-               token = strip(token, '\r');
+               token = rtrim(token, "\r");
                if (token.empty()) continue;
 
                smatch sub;