mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-26 11:16:55 +00:00
whitespace only
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29393 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes
parent
fcc4a0f794
commit
26b1c55e03
256
src/Buffer.cpp
256
src/Buffer.cpp
@ -1568,156 +1568,156 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
|
||||
bool dispatched = true;
|
||||
|
||||
switch (func.action) {
|
||||
case LFUN_BUFFER_EXPORT: {
|
||||
bool success = doExport(to_utf8(func.argument()), false);
|
||||
dr.setError(success);
|
||||
if (!success)
|
||||
dr.setMessage(bformat(_("Error exporting to format: %1$s."),
|
||||
func.argument()));
|
||||
case LFUN_BUFFER_EXPORT: {
|
||||
bool success = doExport(to_utf8(func.argument()), false);
|
||||
dr.setError(success);
|
||||
if (!success)
|
||||
dr.setMessage(bformat(_("Error exporting to format: %1$s."),
|
||||
func.argument()));
|
||||
break;
|
||||
}
|
||||
|
||||
case LFUN_BRANCH_ACTIVATE:
|
||||
case LFUN_BRANCH_DEACTIVATE: {
|
||||
BranchList & branchList = params().branchlist();
|
||||
docstring const branchName = func.argument();
|
||||
// the case without a branch name is handled elsewhere
|
||||
if (branchName.empty()) {
|
||||
dispatched = false;
|
||||
break;
|
||||
}
|
||||
Branch * branch = branchList.find(branchName);
|
||||
if (!branch) {
|
||||
LYXERR0("Branch " << branchName << " does not exist.");
|
||||
dr.setError(true);
|
||||
docstring const msg =
|
||||
bformat(_("Branch \"%1$s\" does not exist."), branchName);
|
||||
dr.setMessage(msg);
|
||||
} else {
|
||||
branch->setSelected(func.action == LFUN_BRANCH_ACTIVATE);
|
||||
dr.setError(false);
|
||||
dr.update(Update::Force);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case LFUN_BUFFER_PRINT: {
|
||||
// we'll assume there's a problem until we succeed
|
||||
dr.setError(true);
|
||||
string target = func.getArg(0);
|
||||
string target_name = func.getArg(1);
|
||||
string command = func.getArg(2);
|
||||
|
||||
if (target.empty()
|
||||
|| target_name.empty()
|
||||
|| command.empty()) {
|
||||
LYXERR0("Unable to parse " << func.argument());
|
||||
docstring const msg =
|
||||
bformat(_("Unable to parse \"%1$s\""), func.argument());
|
||||
dr.setMessage(msg);
|
||||
break;
|
||||
}
|
||||
if (target != "printer" && target != "file") {
|
||||
LYXERR0("Unrecognized target \"" << target << '"');
|
||||
docstring const msg =
|
||||
bformat(_("Unrecognized target \"%1$s\""), from_utf8(target));
|
||||
dr.setMessage(msg);
|
||||
break;
|
||||
}
|
||||
|
||||
case LFUN_BRANCH_ACTIVATE:
|
||||
case LFUN_BRANCH_DEACTIVATE: {
|
||||
BranchList & branchList = params().branchlist();
|
||||
docstring const branchName = func.argument();
|
||||
// the case without a branch name is handled elsewhere
|
||||
if (branchName.empty()) {
|
||||
dispatched = false;
|
||||
break;
|
||||
}
|
||||
Branch * branch = branchList.find(branchName);
|
||||
if (!branch) {
|
||||
LYXERR0("Branch " << branchName << " does not exist.");
|
||||
dr.setError(true);
|
||||
docstring const msg =
|
||||
bformat(_("Branch \"%1$s\" does not exist."), branchName);
|
||||
dr.setMessage(msg);
|
||||
} else {
|
||||
branch->setSelected(func.action == LFUN_BRANCH_ACTIVATE);
|
||||
dr.setError(false);
|
||||
dr.update(Update::Force);
|
||||
}
|
||||
if (!doExport("dvi", true)) {
|
||||
showPrintError(absFileName());
|
||||
dr.setMessage(_("Error exporting to DVI."));
|
||||
break;
|
||||
}
|
||||
|
||||
case LFUN_BUFFER_PRINT: {
|
||||
// we'll assume there's a problem until we succeed
|
||||
dr.setError(true);
|
||||
string target = func.getArg(0);
|
||||
string target_name = func.getArg(1);
|
||||
string command = func.getArg(2);
|
||||
// Push directory path.
|
||||
string const path = temppath();
|
||||
// Prevent the compiler from optimizing away p
|
||||
FileName pp(path);
|
||||
PathChanger p(pp);
|
||||
|
||||
if (target.empty()
|
||||
|| target_name.empty()
|
||||
|| command.empty()) {
|
||||
LYXERR0("Unable to parse " << func.argument());
|
||||
docstring const msg =
|
||||
bformat(_("Unable to parse \"%1$s\""), func.argument());
|
||||
dr.setMessage(msg);
|
||||
break;
|
||||
}
|
||||
if (target != "printer" && target != "file") {
|
||||
LYXERR0("Unrecognized target \"" << target << '"');
|
||||
docstring const msg =
|
||||
bformat(_("Unrecognized target \"%1$s\""), from_utf8(target));
|
||||
dr.setMessage(msg);
|
||||
break;
|
||||
}
|
||||
// there are three cases here:
|
||||
// 1. we print to a file
|
||||
// 2. we print directly to a printer
|
||||
// 3. we print using a spool command (print to file first)
|
||||
Systemcall one;
|
||||
int res = 0;
|
||||
string const dviname = changeExtension(latexName(true), "dvi");
|
||||
|
||||
if (!doExport("dvi", true)) {
|
||||
showPrintError(absFileName());
|
||||
dr.setMessage(_("Error exporting to DVI."));
|
||||
break;
|
||||
}
|
||||
if (target == "printer") {
|
||||
if (!lyxrc.print_spool_command.empty()) {
|
||||
// case 3: print using a spool
|
||||
string const psname = changeExtension(dviname,".ps");
|
||||
command += ' ' + lyxrc.print_to_file
|
||||
+ quoteName(psname)
|
||||
+ ' '
|
||||
+ quoteName(dviname);
|
||||
|
||||
// Push directory path.
|
||||
string const path = temppath();
|
||||
// Prevent the compiler from optimizing away p
|
||||
FileName pp(path);
|
||||
PathChanger p(pp);
|
||||
string command2 = lyxrc.print_spool_command + ' ';
|
||||
if (target_name != "default") {
|
||||
command2 += lyxrc.print_spool_printerprefix
|
||||
+ target_name
|
||||
+ ' ';
|
||||
}
|
||||
command2 += quoteName(psname);
|
||||
// First run dvips.
|
||||
// If successful, then spool command
|
||||
res = one.startscript(Systemcall::Wait, command);
|
||||
|
||||
// there are three cases here:
|
||||
// 1. we print to a file
|
||||
// 2. we print directly to a printer
|
||||
// 3. we print using a spool command (print to file first)
|
||||
Systemcall one;
|
||||
int res = 0;
|
||||
string const dviname = changeExtension(latexName(true), "dvi");
|
||||
|
||||
if (target == "printer") {
|
||||
if (!lyxrc.print_spool_command.empty()) {
|
||||
// case 3: print using a spool
|
||||
string const psname = changeExtension(dviname,".ps");
|
||||
command += ' ' + lyxrc.print_to_file
|
||||
+ quoteName(psname)
|
||||
+ ' '
|
||||
+ quoteName(dviname);
|
||||
|
||||
string command2 = lyxrc.print_spool_command + ' ';
|
||||
if (target_name != "default") {
|
||||
command2 += lyxrc.print_spool_printerprefix
|
||||
+ target_name
|
||||
+ ' ';
|
||||
}
|
||||
command2 += quoteName(psname);
|
||||
// First run dvips.
|
||||
// If successful, then spool command
|
||||
res = one.startscript(Systemcall::Wait, command);
|
||||
|
||||
if (res == 0) {
|
||||
// If there's no GUI, we have to wait on this command. Otherwise,
|
||||
// LyX deletes the temporary directory, and with it the spooled
|
||||
// file, before it can be printed!!
|
||||
Systemcall::Starttype stype = use_gui ?
|
||||
Systemcall::DontWait : Systemcall::Wait;
|
||||
res = one.startscript(stype, command2);
|
||||
}
|
||||
} else {
|
||||
// case 2: print directly to a printer
|
||||
if (target_name != "default")
|
||||
command += ' ' + lyxrc.print_to_printer + target_name + ' ';
|
||||
// as above....
|
||||
if (res == 0) {
|
||||
// If there's no GUI, we have to wait on this command. Otherwise,
|
||||
// LyX deletes the temporary directory, and with it the spooled
|
||||
// file, before it can be printed!!
|
||||
Systemcall::Starttype stype = use_gui ?
|
||||
Systemcall::DontWait : Systemcall::Wait;
|
||||
res = one.startscript(stype, command + quoteName(dviname));
|
||||
res = one.startscript(stype, command2);
|
||||
}
|
||||
|
||||
} else {
|
||||
// case 1: print to a file
|
||||
FileName const filename(makeAbsPath(target_name, filePath()));
|
||||
FileName const dvifile(makeAbsPath(dviname, path));
|
||||
if (filename.exists()) {
|
||||
docstring text = bformat(
|
||||
_("The file %1$s already exists.\n\n"
|
||||
"Do you want to overwrite that file?"),
|
||||
makeDisplayPath(filename.absFilename()));
|
||||
if (Alert::prompt(_("Overwrite file?"),
|
||||
text, 0, 1, _("&Overwrite"), _("&Cancel")) != 0)
|
||||
break;
|
||||
}
|
||||
command += ' ' + lyxrc.print_to_file
|
||||
+ quoteName(filename.toFilesystemEncoding())
|
||||
+ ' '
|
||||
+ quoteName(dvifile.toFilesystemEncoding());
|
||||
// case 2: print directly to a printer
|
||||
if (target_name != "default")
|
||||
command += ' ' + lyxrc.print_to_printer + target_name + ' ';
|
||||
// as above....
|
||||
Systemcall::Starttype stype = use_gui ?
|
||||
Systemcall::DontWait : Systemcall::Wait;
|
||||
res = one.startscript(stype, command);
|
||||
res = one.startscript(stype, command + quoteName(dviname));
|
||||
}
|
||||
|
||||
if (res == 0)
|
||||
dr.setError(false);
|
||||
else {
|
||||
dr.setMessage(_("Error running external commands."));
|
||||
showPrintError(absFileName());
|
||||
} else {
|
||||
// case 1: print to a file
|
||||
FileName const filename(makeAbsPath(target_name, filePath()));
|
||||
FileName const dvifile(makeAbsPath(dviname, path));
|
||||
if (filename.exists()) {
|
||||
docstring text = bformat(
|
||||
_("The file %1$s already exists.\n\n"
|
||||
"Do you want to overwrite that file?"),
|
||||
makeDisplayPath(filename.absFilename()));
|
||||
if (Alert::prompt(_("Overwrite file?"),
|
||||
text, 0, 1, _("&Overwrite"), _("&Cancel")) != 0)
|
||||
break;
|
||||
}
|
||||
break;
|
||||
command += ' ' + lyxrc.print_to_file
|
||||
+ quoteName(filename.toFilesystemEncoding())
|
||||
+ ' '
|
||||
+ quoteName(dvifile.toFilesystemEncoding());
|
||||
// as above....
|
||||
Systemcall::Starttype stype = use_gui ?
|
||||
Systemcall::DontWait : Systemcall::Wait;
|
||||
res = one.startscript(stype, command);
|
||||
}
|
||||
|
||||
default:
|
||||
dispatched = false;
|
||||
break;
|
||||
if (res == 0)
|
||||
dr.setError(false);
|
||||
else {
|
||||
dr.setMessage(_("Error running external commands."));
|
||||
showPrintError(absFileName());
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
dispatched = false;
|
||||
break;
|
||||
}
|
||||
dr.dispatched(dispatched);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user