anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 00:20:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert $$s change

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4692 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2002-07-17 17:26:35 +00:00
parent c69579b679
commit b1fbce7d59
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/converter.C
View File

@ -46,14 +46,11 @@ using std::find_if;
using std::reverse; using std::reverse;
using std::sort; using std::sort;
extern string system_lyxdir;
namespace { namespace {
string const token_from("$$i"); string const token_from("$$i");
string const token_base("$$b"); string const token_base("$$b");
string const token_to("$$o"); string const token_to("$$o");
string const token_lib("$$s");
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
@ -627,15 +624,16 @@ bool Converters::convert(Buffer const * buffer,
runLaTeX(buffer, latex_command_); runLaTeX(buffer, latex_command_);
} }
string const infile2 = (conv.original_dir) string infile2 = (conv.original_dir)
? infile : MakeRelPath(infile, path); ? infile : MakeRelPath(infile, path);
string const outfile2 = (conv.original_dir) string outfile2 = (conv.original_dir)
? outfile : MakeRelPath(outfile, path); ? outfile : MakeRelPath(outfile, path);
string command = conv.command; string command = conv.command;
command = subst(command, token_from, QuoteName(infile2)); command = subst(command, token_from, QuoteName(infile2));
command = subst(command, token_base, QuoteName(from_base)); command = subst(command, token_base, QuoteName(from_base));
command = subst(command, token_to, QuoteName(outfile2)); command = subst(command, token_to, QuoteName(outfile2));
command = subst(command, token_lib, system_lyxdir + "scripts"); command = LibScriptSearch(command);
if (!conv.parselog.empty()) if (!conv.parselog.empty())
command += " 2> " + QuoteName(infile2 + ".out"); command += " 2> " + QuoteName(infile2 + ".out");

5
src/graphics/GraphicsConverter.C
View File

@ -28,8 +28,6 @@
#include <fstream> #include <fstream>
#include <sys/types.h> // needed for pid_t #include <sys/types.h> // needed for pid_t
extern string system_lyxdir;
using std::endl; using std::endl;
namespace grfx { namespace grfx {
@ -282,7 +280,6 @@ bool build_script(string const & from_file,
string const token_from("$$i"); string const token_from("$$i");
string const token_base("$$b"); string const token_base("$$b");
string const token_to("$$o"); string const token_to("$$o");
string const token_lib("$$s");
EdgePath::const_iterator it = edgepath.begin(); EdgePath::const_iterator it = edgepath.begin();
EdgePath::const_iterator end = edgepath.end(); EdgePath::const_iterator end = edgepath.end();
@ -304,7 +301,7 @@ bool build_script(string const & from_file,
command = subst(command, token_from, "${infile}"); command = subst(command, token_from, "${infile}");
command = subst(command, token_base, "${infile_base}"); command = subst(command, token_base, "${infile_base}");
command = subst(command, token_to, "${outfile}"); command = subst(command, token_to, "${outfile}");
command = subst(command, token_lib, system_lyxdir + "scripts"); command = LibScriptSearch(command);
// Store in the shell script // Store in the shell script
script << "\n" << command << "\n\n"; script << "\n" << command << "\n\n";