From 55c6d66f61a96ba63cd8c141229843ad2ab42632 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 24 Nov 2020 03:01:06 +0000 Subject: CTAN sync 202011240301 --- graphics/asymptote/runlabel.in | 44 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 32 deletions(-) (limited to 'graphics/asymptote/runlabel.in') diff --git a/graphics/asymptote/runlabel.in b/graphics/asymptote/runlabel.in index 61f66bfcb2..632f68df55 100644 --- a/graphics/asymptote/runlabel.in +++ b/graphics/asymptote/runlabel.in @@ -87,7 +87,7 @@ void showpath(std::ostream& ps) fillpath(ps); } -array *readpath(const string& psname, bool keep, bool pdf=false, +array *readpath(const string& psname, bool keep, double hscale=1.0, double vsign=1.0) { double vscale=vsign*hscale; @@ -111,8 +111,8 @@ array *readpath(const string& psname, bool keep, bool pdf=false, #else const string null="/dev/null"; #endif - string epsdriver=getSetting("epsdriver"); - cmd.push_back("-sDEVICE="+epsdriver); + string psdriver=getSetting("psdriver"); + cmd.push_back("-sDEVICE="+psdriver); cmd.push_back("-sOutputFile="+null); cmd.push_back(stripDir(psname)); iopipestream gs(cmd,"gs","Ghostscript"); @@ -120,7 +120,7 @@ array *readpath(const string& psname, bool keep, bool pdf=false, stringstream buf; string s=gs.readline(); if(s.empty()) break; - if(!pdf) gs << newl; + gs << newl; // Workaround broken stringstream container in libc++. #ifdef _LIBCPP_VERSION @@ -288,13 +288,9 @@ patharray2 *_texpath(stringarray *s, penarray *p) string pdfname,pdfname2,psname2; bool keep=getSetting("keep"); - bool legacygs=false; if(!status) { if(xe) { -// Use legacy ghostscript driver for gs-9.13 and earlier. - string epsdriver=getSetting("epsdriver"); - legacygs=epsdriver == "epswrite"; - + string psdriver=getSetting("psdriver"); pdfname=auxname(prefix,"pdf"); pdfname2=auxname(prefix+"_","pdf"); psname2=auxname(prefix+"_","ps"); @@ -323,28 +319,13 @@ patharray2 *_texpath(stringarray *s, penarray *p) cmd.push_back("-dNOPAUSE"); cmd.push_back("-dBATCH"); if(safe) cmd.push_back("-dSAFER"); - cmd.push_back("-sDEVICE="+epsdriver); - // Work around eps2write bug that forces all postscript to first page. - cmd.push_back("-sOutputFile="+psname2+(legacygs ? "" : "%d")); + cmd.push_back("-sDEVICE="+psdriver); + cmd.push_back("-sOutputFile="+psname2); cmd.push_back(pdfname2); status=System(cmd,0,true,"gs"); - if(legacygs) { - std::ifstream in(psname2.c_str()); - ps << in.rdbuf(); - } else { - for(unsigned int i=1; i <= n ; ++i) { - ostringstream buf; - buf << psname2 << i; - const string& s=buf.str(); - const char *name=s.c_str(); - std::ifstream in(name,std::ios::binary); - ps << in.rdbuf(); - ps << "(>\n) print flush\n"; - in.close(); - if(!keep) unlink(name); - } - } + std::ifstream in(psname2.c_str()); + ps << in.rdbuf(); ps.close(); } } else { @@ -380,8 +361,7 @@ patharray2 *_texpath(stringarray *s, penarray *p) unlink(auxname(prefix,"tui").c_str()); } } - return xe ? readpath(psname,keep,!legacygs,0.1) : - readpath(psname,keep,false,0.12,-1.0); + return xe ? readpath(psname,keep,0.1) : readpath(psname,keep,0.12,-1.0); } patharray2 *textpath(stringarray *s, penarray *p) @@ -426,7 +406,7 @@ patharray2 *textpath(stringarray *s, penarray *p) cmd2.push_back("-dBATCH"); cmd2.push_back("-P"); if(safe) cmd2.push_back("-dSAFER"); - cmd2.push_back("-sDEVICE="+getSetting("epsdriver")); + cmd2.push_back("-sDEVICE="+getSetting("psdriver")); cmd2.push_back("-sOutputFile=-"); cmd2.push_back("-"); iopipestream gs(cmd2,"gs","Ghostscript"); @@ -455,7 +435,7 @@ patharray2 *textpath(stringarray *s, penarray *p) bool keep=getSetting("keep"); if(!keep) // Delete temporary files. unlink(textname.c_str()); - return readpath(psname,keep,false,0.1); + return readpath(psname,keep,0.1); } patharray *_strokepath(path g, pen p=CURRENTPEN) -- cgit v1.2.3