X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmover.C;h=a74ae0795f45f27258c7669d71e75225a0ab0788;hb=2486c96b8d9086471299bf207b85b1ce848246aa;hp=a646f49478ce8d28923a131fceec26d398d4fcb9;hpb=e5706b107da902bc6a28cba0de3ccd6f75d9fee7;p=lyx.git diff --git a/src/mover.C b/src/mover.C index a646f49478..a74ae0795f 100644 --- a/src/mover.C +++ b/src/mover.C @@ -8,6 +8,8 @@ * Full author contact details are available in file CREDITS. */ +#include + #include "mover.h" #include "support/filetools.h" @@ -26,38 +28,43 @@ Movers movers; Movers system_movers; -bool Mover::do_copy(string const & from, string const & to) const +bool Mover::do_copy(string const & from, string const & to, + string const &) const { return support::copy(from, to); } -bool Mover::do_rename(string const & from, string const & to) const +bool Mover::do_rename(string const & from, string const & to, + string const &) const { return support::rename(from, to); } -bool SpecialisedMover::do_copy(string const & from, string const & to) const +bool SpecialisedMover::do_copy(string const & from, string const & to, + string const & latex) const { if (command_.empty()) - return Mover::do_copy(from, to); + return Mover::do_copy(from, to, latex); string command = support::LibScriptSearch(command_); command = support::subst(command, "$$i", from); command = support::subst(command, "$$o", to); + command = support::subst(command, "$$l", latex); support::Systemcall one; return one.startscript(support::Systemcall::Wait, command) == 0; } -bool SpecialisedMover::do_rename(string const & from, string const & to) const +bool SpecialisedMover::do_rename(string const & from, string const & to, + string const & latex) const { if (command_.empty()) - return Mover::do_rename(from, to); + return Mover::do_rename(from, to, latex); - if (!do_copy(from, to)) + if (!do_copy(from, to, latex)) return false; return support::unlink(from) == 0; }