diff options
author | Norbert Preining <norbert@preining.info> | 2024-02-28 03:01:23 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2024-02-28 03:01:23 +0000 |
commit | 0afdc3e8c2d8e96d0cd0a5f05f1481a4eecc51d2 (patch) | |
tree | 805f2acf8e0115574bc5781d1dfb87fbe2e63ba8 /graphics/asymptote/picture.cc | |
parent | a64a01e8eaa2c096e7879421f075ebfa2a8bb7f0 (diff) |
CTAN sync 202402280301
Diffstat (limited to 'graphics/asymptote/picture.cc')
-rw-r--r-- | graphics/asymptote/picture.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/graphics/asymptote/picture.cc b/graphics/asymptote/picture.cc index dea28b541b..65c72cbca1 100644 --- a/graphics/asymptote/picture.cc +++ b/graphics/asymptote/picture.cc @@ -462,7 +462,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"); + cmd.push_back("--optimize=collapse-groups,group-attributes,remove-clippaths,simplify-text,simplify-transform"); push_split(cmd,getSetting<string>("dvisvgmOptions")); string outfile=stripDir(outname); if(!outfile.empty()) @@ -976,10 +976,8 @@ bool picture::shipout(picture *preamble, const string& Prefix, else htmlformat=false; } -#ifndef HAVE_LIBGLM if(outputformat == "v3d") - camp::reportError("to support V3D rendering, please install glm header files, then ./configure; make"); -#endif + camp::reportError("v3d format only supports 3D files"); bool svgformat=outputformat == "svg"; bool png=outputformat == "png"; @@ -999,7 +997,7 @@ bool picture::shipout(picture *preamble, const string& Prefix, bool pdf=settings::pdf(texengine); bool standardout=Prefix == "-"; - string prefix=standardout ? standardprefix : stripExt(Prefix); + string prefix=standardout ? standardprefix : Prefix; string preformat=nativeformat(); bool epsformat=outputformat == "eps"; @@ -1362,10 +1360,14 @@ bool picture::shipout3(const string& prefix, const string& format, if(width <= 0 || height <= 0) return false; bool webgl=format == "html"; + bool v3d=format == "v3d"; #ifndef HAVE_LIBGLM if(webgl) camp::reportError("to support WebGL rendering, please install glm header files, then ./configure; make"); + + if(v3d) + camp::reportError("to support V3D rendering, please install glm header files, then ./configure; make"); #endif #ifndef HAVE_LIBOSMESA @@ -1420,7 +1422,6 @@ bool picture::shipout3(const string& prefix, const string& format, #endif #endif - bool v3d=format == "v3d"; bool format3d=webgl || v3d; if(!format3d) { @@ -1516,7 +1517,7 @@ bool picture::shipout3(const string& prefix, const string& format, #ifdef HAVE_GL if(format3dWait) { - gl::format3dWait=false; + format3dWait=false; #ifdef HAVE_PTHREAD endwait(initSignal,initLock); #endif |