diff options
Diffstat (limited to 'Build/source/utils/asymptote/picture.cc')
-rw-r--r-- | Build/source/utils/asymptote/picture.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/utils/asymptote/picture.cc b/Build/source/utils/asymptote/picture.cc index 6dacbec2b45..2412863f606 100644 --- a/Build/source/utils/asymptote/picture.cc +++ b/Build/source/utils/asymptote/picture.cc @@ -359,7 +359,6 @@ void texinit() bool context=settings::context(getSetting<string>("tex")); string dir=stripFile(outname()); - dir=dir.substr(0,dir.length()-1); string logname; if(!context) logname=dir; logname += "texput.log"; @@ -371,6 +370,7 @@ void texinit() writeable.close(); unlink(cname); + dir=dir.substr(0,dir.length()-1); mem::vector<string> cmd; cmd.push_back(texprogram()); string oldPath; @@ -464,7 +464,7 @@ string dvisvgmCommand(mem::vector<string>& cmd, const string& outname) string libgs=getSetting<string>("libgs"); if(!libgs.empty()) cmd.push_back("--libgs="+libgs); -// cmd.push_back("--optimize"); // Requires dvisvgm > 2.9.1 + cmd.push_back("--optimize"); push_split(cmd,getSetting<string>("dvisvgmOptions")); string outfile=stripDir(outname); if(!outfile.empty()) @@ -635,7 +635,11 @@ bool picture::texprocess(const string& texname, const string& outname, int picture::epstopdf(const string& epsname, const string& pdfname) { - string compress=getSetting<bool>("compress") ? "true" : "false"; + string outputformat=getSetting<string>("outformat"); + bool pdf=settings::pdf(getSetting<string>("tex")); + bool pdfformat=(pdf && outputformat == "") || outputformat == "pdf"; + string compress=getSetting<bool>("compress") && pdfformat ? + "true" : "false"; mem::vector<string> cmd; cmd.push_back(getSetting<string>("gs")); cmd.push_back("-q"); @@ -685,7 +689,7 @@ int picture::pdftoeps(const string& pdfname, const string& epsname, bool eps) mem::vector<string> cmd; cmd.push_back(getSetting<string>("gs")); cmd.push_back("-q"); - cmd.push_back("-dNOCACHE"); + cmd.push_back("-dNoOutputFonts"); cmd.push_back("-dNOPAUSE"); cmd.push_back("-dBATCH"); cmd.push_back("-P"); |