anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 21:40:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

introduce new converter variable $$d to pass output directory pathname to converter programs

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27554 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stephan Witt 2008-11-16 15:07:51 +00:00
parent ae7a262a78
commit bb54a2be93
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/graphics/GraphicsConverter.cpp
View File

@ -345,10 +345,11 @@ static void build_script(FileName const & from_file,
}
// The conversion commands may contain these tokens that need to be
// changed to infile, infile_base, outfile respectively.
string const token_from = "$$i";
string const token_base = "$$b";
string const token_to = "$$o";
// changed to infile, infile_base, outfile and output directory respectively.
string const token_from = "$$i";
string const token_base = "$$b";
string const token_to = "$$o";
string const token_todir = "$$d";
EdgePath::const_iterator it = edgepath.begin();
EdgePath::const_iterator end = edgepath.end();
@ -367,14 +368,16 @@ static void build_script(FileName const & from_file,
"infile_base = utf8ToDefaultEncoding("
<< quoteName(infile_base, quote_python) << ")\n"
"outfile = utf8ToDefaultEncoding("
<< quoteName(outfile, quote_python) << ")\n";
<< quoteName(outfile, quote_python) << ")\n"
"outdir = os.path.dirname(outfile)\n" ;
// See comment about extra " quotes above (although that
// applies only for the first loop run here).
string command = conv.command;
command = subst(command, token_from, "' + '\"' + infile + '\"' + '");
command = subst(command, token_base, "' + '\"' + infile_base + '\"' + '");
command = subst(command, token_to, "' + '\"' + outfile + '\"' + '");
command = subst(command, token_from, "' + '\"' + infile + '\"' + '");
command = subst(command, token_base, "' + '\"' + infile_base + '\"' + '");
command = subst(command, token_to, "' + '\"' + outfile + '\"' + '");
command = subst(command, token_todir, "' + '\"' + outdir + '\"' + '");
command = libScriptSearch(command, quote_python);
build_conversion_command(command, script);