From b1fbce7d59b535b10e960183cb27077e8dd42746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Wed, 17 Jul 2002 17:26:35 +0000 Subject: [PATCH] revert $$s change git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4692 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/converter.C | 10 ++++------ src/graphics/GraphicsConverter.C | 5 +---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/converter.C b/src/converter.C index 0e72ca8958..7b86dd6786 100644 --- a/src/converter.C +++ b/src/converter.C @@ -46,14 +46,11 @@ using std::find_if; using std::reverse; using std::sort; -extern string system_lyxdir; - namespace { string const token_from("$$i"); string const token_base("$$b"); string const token_to("$$o"); -string const token_lib("$$s"); ////////////////////////////////////////////////////////////////////////////// @@ -627,15 +624,16 @@ bool Converters::convert(Buffer const * buffer, runLaTeX(buffer, latex_command_); } - string const infile2 = (conv.original_dir) + string infile2 = (conv.original_dir) ? infile : MakeRelPath(infile, path); - string const outfile2 = (conv.original_dir) + string outfile2 = (conv.original_dir) ? outfile : MakeRelPath(outfile, path); + string command = conv.command; command = subst(command, token_from, QuoteName(infile2)); command = subst(command, token_base, QuoteName(from_base)); command = subst(command, token_to, QuoteName(outfile2)); - command = subst(command, token_lib, system_lyxdir + "scripts"); + command = LibScriptSearch(command); if (!conv.parselog.empty()) command += " 2> " + QuoteName(infile2 + ".out"); diff --git a/src/graphics/GraphicsConverter.C b/src/graphics/GraphicsConverter.C index 5d08e460d5..149b94d3ca 100644 --- a/src/graphics/GraphicsConverter.C +++ b/src/graphics/GraphicsConverter.C @@ -28,8 +28,6 @@ #include #include // needed for pid_t -extern string system_lyxdir; - using std::endl; namespace grfx { @@ -282,7 +280,6 @@ bool build_script(string const & from_file, string const token_from("$$i"); string const token_base("$$b"); string const token_to("$$o"); - string const token_lib("$$s"); EdgePath::const_iterator it = edgepath.begin(); 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_base, "${infile_base}"); command = subst(command, token_to, "${outfile}"); - command = subst(command, token_lib, system_lyxdir + "scripts"); + command = LibScriptSearch(command); // Store in the shell script script << "\n" << command << "\n\n";