X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.C;h=a8106ccf2fd5f4ff3f811f22d8e967b8834441c5;hb=15a0218c0fbd310587456f1342f051a663a69d64;hp=c40f17173f2e3fd4e5bed8b15197efef5a91393d;hpb=64f1e20c746a6478dc41b47112a96f37ef89f48f;p=lyx.git

diff --git a/src/LaTeX.C b/src/LaTeX.C
index c40f17173f..a8106ccf2f 100644
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -3,9 +3,9 @@
  * 
  *           LyX, The Document Processor 	 
  *	     Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
- *           This file is Copyright 1996-2000
+ *           This file is Copyright 1996-2001
  *           Lars Gullik Bjønnes
  *
  * ====================================================== 
@@ -174,7 +174,12 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
 
 	++count;
 	lyxerr[Debug::LATEX] << "Run #" << count << endl;
-	lfun->Dispatch(LFUN_MESSAGE, _("LaTeX run number") + ' ' + tostr(count));
+	if (lfun) {
+		ostringstream str;
+		str << _("LaTeX run number") << ' ' << count;
+		lfun->Dispatch(LFUN_MESSAGE, str.str().c_str());
+	}
+	
 	
 	//WriteStatus(lfun, string(_("LaTeX run number ")) + tostr(count));
 	this->operator()();
@@ -209,7 +214,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
 	if (head.haschanged(OnlyFilename(ChangeExtension(file, ".idx")))) {
 		// no checks for now
 		lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
-		lfun->Dispatch(LFUN_MESSAGE, _("Running MakeIndex."));
+		if (lfun) lfun->Dispatch(LFUN_MESSAGE, _("Running MakeIndex."));
 //		WriteStatus(minib, _("Running MakeIndex."));
 		rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
 	}
@@ -222,7 +227,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
 		// tags is found -> run bibtex and set rerun = true;
 		// no checks for now
 		lyxerr[Debug::LATEX] << "Running BibTeX." << endl;
-		lfun->Dispatch(LFUN_MESSAGE, _("Running BibTeX."));
+		if (lfun) lfun->Dispatch(LFUN_MESSAGE, _("Running BibTeX."));
 		//WriteStatus(minib, _("Running BibTeX."));
 		updateBibtexDependencies(head, bibtex_info);
 		rerun |= runBibTeX(bibtex_info);
@@ -251,7 +256,12 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
 			<< "Dep. file has changed or rerun requested" << endl;
 		lyxerr[Debug::LATEX]
 			<< "Run #" << count << endl;
-		lfun->Dispatch(LFUN_MESSAGE, _("LaTeX run number") + ' ' + tostr(count));
+		if (lfun) {
+			ostringstream str;
+			str << _("LaTeX run number") << ' ' << count;
+			lfun->Dispatch(LFUN_MESSAGE, str.str().c_str());
+		}
+		
 //		WriteStatus(minib,
 //			    string(_("LaTeX run number ")) + tostr(count));
 		this->operator()();
@@ -280,7 +290,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
 	if (head.haschanged(OnlyFilename(ChangeExtension(file, ".idx")))) {
 		// no checks for now
 		lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
-		lfun->Dispatch(LFUN_MESSAGE, _("Running MakeIndex."));
+		if (lfun) lfun->Dispatch(LFUN_MESSAGE, _("Running MakeIndex."));
 		//WriteStatus(minib, _("Running MakeIndex."));
 		rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
 	}
@@ -302,7 +312,12 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
 		rerun = false;
 		++count;
 		lyxerr[Debug::LATEX] << "Run #" << count << endl;
-		lfun->Dispatch(LFUN_MESSAGE, _("LaTeX run numger") + ' ' + tostr(count));
+		if (lfun) {
+			ostringstream str;
+			str << _("LaTeX run number") << ' ' << count;
+			lfun->Dispatch(LFUN_MESSAGE, str.str().c_str());
+		}
+		
 //		WriteStatus(minib, string(_("LaTeX run number ")) + tostr(count));
 		this->operator()();
 		scanres = scanLogFile(terr);
@@ -704,4 +719,7 @@ void LaTeX::deplog(DepTable & head)
 				<< "Not a file or we are unable to find it."
 				<< endl;
 	}
+
+	// Make sure that the main .tex file is in the dependancy file.
+	head.insert(OnlyFilename(file), true);
 }