/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#endif
#include "Liason.h"
+#include "lyxrc.h"
+#include "PrinterParams.h"
+
#include "LyXView.h"
#include "BufferView.h"
#include "buffer.h"
-#include "lyxrc.h"
-#include "PrinterParams.h"
-#include "lyx_gui_misc.h"
+#include "exporter.h"
+#include "converter.h"
+
+#include "support/LAssert.h"
#include "support/lstrings.h"
#include "support/filetools.h"
#include "support/path.h"
-#include "exporter.h"
-#include "converter.h"
-#include "support/syscall.h"
+#include "support/systemcall.h"
using std::endl;
}
-bool printBuffer(Buffer * buffer, PrinterParams const & pp)
+bool printBuffer(Buffer * buffer, PrinterParams const & pp)
{
string command(lyxrc.print_command + ' ');
-
+
if (pp.target == PrinterParams::PRINTER
&& lyxrc.print_adapt_output // dvips wants a printer name
&& !pp.printer_name.empty()) {// printer name given
case PrinterParams::ODD:
command += lyxrc.print_oddpage_flag + ' ';
break;
-
+
default:
// only option left is print all of them
break;
return false;
// Push directory path.
- string path = OnlyPath(buffer->fileName());
- if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) {
+ string path = buffer->filePath();
+ if (lyxrc.use_tempdir || !IsDirWriteable(path)) {
path = buffer->tmppath;
}
Path p(path);
// 1. we print to a file
// 2. we print direct to a printer
// 3. we print using a spool command (print to file first)
- Systemcalls one;
+ Systemcall one;
int res = 0;
string dviname = ChangeExtension(buffer->getLatexName(true), "dvi");
switch (pp.target) {
command2 += QuoteName(psname);
// First run dvips.
// If successful, then spool command
- res = one.startscript(Systemcalls::System, command);
+ res = one.startscript(Systemcall::Wait, command);
if (res == 0)
- res = one.startscript(Systemcalls::SystemDontWait,
+ res = one.startscript(Systemcall::DontWait,
command2);
} else
// case 2
- res = one.startscript(Systemcalls::SystemDontWait,
+ res = one.startscript(Systemcall::DontWait,
command + QuoteName(dviname));
break;
command += lyxrc.print_to_file
+ QuoteName(MakeAbsPath(pp.file_name, path));
command += ' ' + QuoteName(dviname);
- res = one.startscript(Systemcalls::SystemDontWait, command);
+ res = one.startscript(Systemcall::DontWait, command);
break;
}
return res == 0;