Move #includes out of header files.

[lyx.git] / src / LaTeX.C

diff --git a/src/LaTeX.C b/src/LaTeX.C
index d069babb2a40409882f8c8a7f3dc4aa890643a00..3f6b97d11905ef0016f95c8b8121cc1d849aeca8 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -1,14 +1,15 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file LaTeX.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
- *          Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+ * \author Alfredo Braunstein
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author Dekel Tsur
  *
- *           This file is Copyright 1996-2001
- *           Lars Gullik Bjønnes
- *
- * ======================================================
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -16,9 +17,8 @@
 #include "LaTeX.h"
 #include "bufferlist.h"
 #include "gettext.h"
-#include "lyxfunc.h"
 #include "debug.h"
-#include "funcrequest.h"
+#include "DepTable.h"
 #include "support/filetools.h"
 #include "support/FileInfo.h"
 #include "support/tostr.h"
@@ -70,14 +70,13 @@ extern BufferList bufferlist;
 
 namespace {
 
-void showRunMessage(LyXFunc * lf, unsigned int count)
+string runMessage(unsigned int count)
 {
-       string str = bformat(_("Waiting for LaTeX run number %1$s"), tostr(count));
-       lf->dispatch(FuncRequest(LFUN_MESSAGE, str));
+       return bformat(_("Waiting for LaTeX run number %1$s"), tostr(count));
 }
 
-
 };
+
 /*
  * CLASS TEXERRORS
  */
@@ -151,7 +150,7 @@ void LaTeX::deleteFilesOnError() const
 }
 
 
-int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
+int LaTeX::run(TeXErrors & terr)
        // We know that this function will only be run if the lyx buffer
        // has been changed. We also know that a newly written .tex file
        // is always different from the previous one because of the date
@@ -229,10 +228,8 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
 
        ++count;
        lyxerr[Debug::LATEX] << "Run #" << count << endl;
-       if (lfun) {
-               showRunMessage(lfun, count);
-       }
-
+       message(runMessage(count));
+       
        startscript();
        scanres = scanLogFile(terr);
        if (scanres & ERROR_RERUN) {
@@ -265,10 +262,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;
-               if (lfun) {
-                       lfun->dispatch(FuncRequest(LFUN_MESSAGE, _("Running MakeIndex.")));
-               }
-
+               message(_("Running MakeIndex."));
                rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
        }
 
@@ -280,10 +274,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;
-               if (lfun) {
-                       lfun->dispatch(FuncRequest(LFUN_MESSAGE, _("Running BibTeX.")));
-               }
-
+               message(_("Running BibTeX."));
                updateBibtexDependencies(head, bibtex_info);
                rerun |= runBibTeX(bibtex_info);
        } else if (!had_depfile) {
@@ -312,10 +303,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                        << "Dep. file has changed or rerun requested" << endl;
                lyxerr[Debug::LATEX]
                        << "Run #" << count << endl;
-               if (lfun) {
-                       showRunMessage(lfun, count);
-               }
-
+               message(runMessage(count));
                startscript();
                scanres = scanLogFile(terr);
                if (scanres & ERRORS) {
@@ -342,10 +330,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;
-               if (lfun) {
-                       lfun->dispatch(FuncRequest(LFUN_MESSAGE, _("Running MakeIndex.")));
-               }
-
+               message(_("Running MakeIndex."));
                rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
        }
 
@@ -366,10 +351,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                rerun = false;
                ++count;
                lyxerr[Debug::LATEX] << "Run #" << count << endl;
-               if (lfun) {
-                       showRunMessage(lfun, count);
-               }
-
+               message(runMessage(count));
                startscript();
                scanres = scanLogFile(terr);
                if (scanres & ERRORS) {