From baca386ec3a21d3d3b224b16075080092b7ece8e Mon Sep 17 00:00:00 2001
From: Christian Schenk <cs@miktex.org>
Date: Sat, 9 Mar 2024 11:33:17 +0100
Subject: [PATCH] asymptote 2.88

---
 Admin/TPM/windows-x64/miktex-asymptote-bin-x64.tpm.in       | 2 +-
 CHANGELOG.md                                                | 2 +-
 Programs/GraphicsUtilities/asymptote/source/fileio.h        | 4 ++--
 Programs/GraphicsUtilities/asymptote/source/pair.h          | 4 ++--
 Programs/GraphicsUtilities/asymptote/source/picture.cc      | 3 +--
 Programs/GraphicsUtilities/asymptote/source/prc/oPRCFile.h  | 4 ++--
 Programs/GraphicsUtilities/asymptote/source/process.h       | 4 ++--
 Programs/GraphicsUtilities/asymptote/source/revision.cc     | 2 +-
 Programs/GraphicsUtilities/asymptote/source/runfile.cc      | 4 ++--
 Programs/GraphicsUtilities/asymptote/source/runpicture.cc   | 2 +-
 Programs/GraphicsUtilities/asymptote/source/settings.cc     | 4 ++--
 Programs/GraphicsUtilities/asymptote/source/statistics.h    | 2 +-
 Programs/GraphicsUtilities/asymptote/source/symbolmaps.h    | 5 ++---
 Programs/GraphicsUtilities/asymptote/source/triple.h        | 6 +++---
 Programs/GraphicsUtilities/asymptote/source/v3dfile.cc      | 2 +-
 Programs/GraphicsUtilities/asymptote/source/v3dfile.h       | 2 +-
 .../GraphicsUtilities/asymptote/source/v3dheadertypes.h     | 2 +-
 Programs/GraphicsUtilities/asymptote/source/v3dtypes.h      | 2 +-
 Programs/GraphicsUtilities/asymptote/version.cmake          | 2 +-
 19 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/Admin/TPM/windows-x64/miktex-asymptote-bin-x64.tpm.in b/Admin/TPM/windows-x64/miktex-asymptote-bin-x64.tpm.in
index 6786d1793..9e19ac0c8 100644
--- a/Admin/TPM/windows-x64/miktex-asymptote-bin-x64.tpm.in
+++ b/Admin/TPM/windows-x64/miktex-asymptote-bin-x64.tpm.in
@@ -6,7 +6,7 @@
     <TPM:Title>asymptote, Windows x64</TPM:Title>
     <TPM:Copyright owner="Andy Hammerlindl, John C. Bowman and Tom Prince" year="2004-2022"/>
     <TPM:License type="gpl3"/>
-    <TPM:Version>2.87</TPM:Version>
+    <TPM:Version>2.88</TPM:Version>
     <TPM:TargetSystem minVersion="@MIKTEX_MIN_TARGET_SYSTEM_VERSION@">windows-x64</TPM:TargetSystem>
     <TPM:Date>@MIKTEX_DATETIME_STR@</TPM:Date>
     <TPM:Description>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1230e8f18..adb4cda07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
 
 ### Upgraded programs
 
-* asymptote 2.87
+* asymptote 2.88
 * dvipdfmx 20240305
 * dvisvgm 3.2.2
 * luatex 1.18.0
diff --git a/Programs/GraphicsUtilities/asymptote/source/fileio.h b/Programs/GraphicsUtilities/asymptote/source/fileio.h
index 96e5ae2e1..00ed9cfc9 100644
--- a/Programs/GraphicsUtilities/asymptote/source/fileio.h
+++ b/Programs/GraphicsUtilities/asymptote/source/fileio.h
@@ -15,7 +15,7 @@
 
 #include "common.h"
 
-#ifdef HAVE_RPC_RPC_H
+#ifdef HAVE_LIBTIRPC
 #include "xstream.h"
 #endif
 
@@ -649,7 +649,7 @@ class obfile : public ofile {
   void writeline() {}
 };
 
-#ifdef HAVE_RPC_RPC_H
+#ifdef HAVE_LIBTIRPC
 
 class ixfile : public file {
 protected:
diff --git a/Programs/GraphicsUtilities/asymptote/source/pair.h b/Programs/GraphicsUtilities/asymptote/source/pair.h
index bc72f3b03..d3b9803cf 100644
--- a/Programs/GraphicsUtilities/asymptote/source/pair.h
+++ b/Programs/GraphicsUtilities/asymptote/source/pair.h
@@ -25,7 +25,7 @@
 #include "common.h"
 #include "angle.h"
 
-#ifdef HAVE_RPC_RPC_H
+#ifdef HAVE_LIBTIRPC
 #include "xstream.h"
 #endif
 
@@ -243,7 +243,7 @@ class pair : public gc {
     return out;
   }
 
-#ifdef HAVE_RPC_RPC_H
+#ifdef HAVE_LIBTIRPC
   friend xdr::oxstream& operator << (xdr::oxstream& out, pair const& v)
   {
       out << v.x << v.y;
diff --git a/Programs/GraphicsUtilities/asymptote/source/picture.cc b/Programs/GraphicsUtilities/asymptote/source/picture.cc
index 351bb7e41..82d2e4d39 100644
--- a/Programs/GraphicsUtilities/asymptote/source/picture.cc
+++ b/Programs/GraphicsUtilities/asymptote/source/picture.cc
@@ -480,7 +480,6 @@ 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=collapse-groups,group-attributes,remove-clippaths,simplify-text,simplify-transform");
   push_split(cmd,getSetting<string>("dvisvgmOptions"));
   string outfile=stripDir(outname);
   if(!outfile.empty())
@@ -684,7 +683,7 @@ int picture::epstopdf(const string& epsname, const string& pdfname)
   cmd.push_back("-dMaxSubsetPct=100");
   cmd.push_back("-dEncodeColorImages="+compress);
   cmd.push_back("-dEncodeGrayImages="+compress);
-  cmd.push_back("-dCompatibilityLevel=1.4");
+  cmd.push_back("-dCompatibilityLevel=1.5");
   cmd.push_back("-dTransferFunctionInfo=/Apply");
   if(!getSetting<bool>("autorotate"))
     cmd.push_back("-dAutoRotatePages=/None");
diff --git a/Programs/GraphicsUtilities/asymptote/source/prc/oPRCFile.h b/Programs/GraphicsUtilities/asymptote/source/prc/oPRCFile.h
index 00ebf7a05..6f1c1984c 100644
--- a/Programs/GraphicsUtilities/asymptote/source/prc/oPRCFile.h
+++ b/Programs/GraphicsUtilities/asymptote/source/prc/oPRCFile.h
@@ -44,7 +44,7 @@
 #include "writePRC.h"
 
 
-#ifdef HAVE_RPC_RPC_H
+#ifdef HAVE_LIBTIRPC
 #include "xstream.h"
 #endif
 
@@ -97,7 +97,7 @@ struct RGBAColour
   friend RGBAColour operator * (const double d, const RGBAColour& a)
   { return RGBAColour(a.R*d,a.G*d,a.B*d,a.A*d); }
 
-#ifdef HAVE_RPC_RPC_H
+#ifdef HAVE_LIBTIRPC
   friend xdr::oxstream& operator<<(xdr::oxstream& out, RGBAColour const& col)
   {
     out << (float) col.R << (float) col.G << (float) col.B << (float) col.A;
diff --git a/Programs/GraphicsUtilities/asymptote/source/process.h b/Programs/GraphicsUtilities/asymptote/source/process.h
index 913af4a7d..031111bd9 100644
--- a/Programs/GraphicsUtilities/asymptote/source/process.h
+++ b/Programs/GraphicsUtilities/asymptote/source/process.h
@@ -21,7 +21,7 @@
 #include "transform.h"
 #include "parser.h"
 
-#ifdef HAVE_RPC_RPC_H
+#ifdef HAVE_LIBTIRPC
 #include "xstream.h"
 #endif
 
@@ -116,7 +116,7 @@ struct processDataStruct {
 
   terminator<std::ofstream> ofile;
   terminator<std::fstream> ifile;
-#ifdef HAVE_RPC_RPC_H
+#ifdef HAVE_LIBTIRPC
   terminator<xdr::ixstream> ixfile;
   terminator<xdr::oxstream> oxfile;
 #endif
diff --git a/Programs/GraphicsUtilities/asymptote/source/revision.cc b/Programs/GraphicsUtilities/asymptote/source/revision.cc
index 1aa18b936..9ff8e10b8 100644
--- a/Programs/GraphicsUtilities/asymptote/source/revision.cc
+++ b/Programs/GraphicsUtilities/asymptote/source/revision.cc
@@ -1,2 +1,2 @@
-const char *REVISION="2.87";
+const char *REVISION="2.88";
 const char *AsyGLVersion="1.02";
diff --git a/Programs/GraphicsUtilities/asymptote/source/runfile.cc b/Programs/GraphicsUtilities/asymptote/source/runfile.cc
index 4bafe1be6..dc4ab1693 100644
--- a/Programs/GraphicsUtilities/asymptote/source/runfile.cc
+++ b/Programs/GraphicsUtilities/asymptote/source/runfile.cc
@@ -130,7 +130,7 @@ void gen_runfile3(stack *Stack)
   if(mode == "binary")
     f=new ibfile(name,check);
   else if(mode == "xdr" || mode == "xdrgz") {
-#ifdef HAVE_RPC_RPC_H
+#ifdef HAVE_LIBTIRPC
     if(mode == "xdr")
       f=new ixfile(name,check);
     else if(mode == "xdrgz")
@@ -170,7 +170,7 @@ void gen_runfile4(stack *Stack)
     if(update) f=new iobfile(name);
     else f=new obfile(name);
   } else if(mode == "xdr") {
-#ifdef HAVE_RPC_RPC_H
+#ifdef HAVE_LIBTIRPC
     if(update)
       f=new ioxfile(name);
     else f=new oxfile(name);
diff --git a/Programs/GraphicsUtilities/asymptote/source/runpicture.cc b/Programs/GraphicsUtilities/asymptote/source/runpicture.cc
index 56602cba0..03c971883 100644
--- a/Programs/GraphicsUtilities/asymptote/source/runpicture.cc
+++ b/Programs/GraphicsUtilities/asymptote/source/runpicture.cc
@@ -953,7 +953,7 @@ void gen_runpicture46(stack *Stack)
   }
 
   string outname=buildname(prefix,xformat);
-  F->shipout(preamble,outname,xformat,false,false);
+  F->shipout(preamble,stripExt(outname),xformat,false,false);
   fprintf(pipeout,"%s\n",Done.c_str());
   fflush(pipeout);
   delete F;
diff --git a/Programs/GraphicsUtilities/asymptote/source/settings.cc b/Programs/GraphicsUtilities/asymptote/source/settings.cc
index 5f08b0dca..3f462c9c2 100644
--- a/Programs/GraphicsUtilities/asymptote/source/settings.cc
+++ b/Programs/GraphicsUtilities/asymptote/source/settings.cc
@@ -1045,7 +1045,7 @@ struct versionOption : public option {
     eigen=true;
 #endif
 
-#ifdef HAVE_RPC_RPC_H
+#ifdef HAVE_LIBTIRPC
     xdr=true;
 #endif
 
@@ -1530,7 +1530,7 @@ void initSettings() {
   addOption(new realSetting("paperheight", 0, "bp", "Default page height"));
 
   addOption(new stringSetting("dvipsOptions", 0, "str", ""));
-  addOption(new stringSetting("dvisvgmOptions", 0, "str", ""));
+  addOption(new stringSetting("dvisvgmOptions", 0, "str", "", "--optimize"));
   addOption(new boolSetting("dvisvgmMultipleFiles", 0,
                             "dvisvgm supports multiple files", true));
   addOption(new stringSetting("convertOptions", 0, "str", ""));
diff --git a/Programs/GraphicsUtilities/asymptote/source/statistics.h b/Programs/GraphicsUtilities/asymptote/source/statistics.h
index 5588f7a99..7d609b505 100644
--- a/Programs/GraphicsUtilities/asymptote/source/statistics.h
+++ b/Programs/GraphicsUtilities/asymptote/source/statistics.h
@@ -108,7 +108,7 @@ class statistics {
     return stdev(varH,2.0);
   }
   double stderror() {
-    return stdev()/sqrt(N);
+    return stdev()/sqrt((double) N);
   }
   double median() {
     if(!computeMedian) {
diff --git a/Programs/GraphicsUtilities/asymptote/source/symbolmaps.h b/Programs/GraphicsUtilities/asymptote/source/symbolmaps.h
index c2388e125..19e2f3b64 100644
--- a/Programs/GraphicsUtilities/asymptote/source/symbolmaps.h
+++ b/Programs/GraphicsUtilities/asymptote/source/symbolmaps.h
@@ -450,9 +450,8 @@ namespace AsymptoteLsp
     ExternalRefs(ExternalRefs const& exRef) = default;
     ExternalRefs& operator=(ExternalRefs const& exRef) = default;
 
-    ExternalRefs(ExternalRefs&& exRef) noexcept = default;
-    ExternalRefs& operator=(ExternalRefs&& exRef) noexcept = default;
-
+//  ExternalRefs(ExternalRefs&& exRef) noexcept = default;
+//  ExternalRefs& operator=(ExternalRefs&& exRef) noexcept = default;
 
     void clear()
     {
diff --git a/Programs/GraphicsUtilities/asymptote/source/triple.h b/Programs/GraphicsUtilities/asymptote/source/triple.h
index 34013f644..cb6397c87 100644
--- a/Programs/GraphicsUtilities/asymptote/source/triple.h
+++ b/Programs/GraphicsUtilities/asymptote/source/triple.h
@@ -19,11 +19,11 @@
 #include "angle.h"
 #include "pair.h"
 
-#ifdef HAVE_RPC_RPC_H
+#ifdef HAVE_LIBTIRPC
 #include "xstream.h"
 #endif
 #if defined(MIKTEX)
-#  include <algorithm>
+#include <algorithm>
 #endif
 
 namespace camp {
@@ -335,7 +335,7 @@ class triple : virtual public gc {
   }
 
 
-#ifdef HAVE_RPC_RPC_H
+#ifdef HAVE_LIBTIRPC
   friend xdr::oxstream& operator << (xdr::oxstream& out, triple const& v)
   {
     out << v.x << v.y << v.z;
diff --git a/Programs/GraphicsUtilities/asymptote/source/v3dfile.cc b/Programs/GraphicsUtilities/asymptote/source/v3dfile.cc
index e800b445d..f9a66e84e 100644
--- a/Programs/GraphicsUtilities/asymptote/source/v3dfile.cc
+++ b/Programs/GraphicsUtilities/asymptote/source/v3dfile.cc
@@ -8,7 +8,7 @@
 
 #include "v3dfile.h"
 
-#ifdef HAVE_RPC_RPC_H
+#ifdef HAVE_LIBTIRPC
 
 #ifdef HAVE_LIBGLM
 
diff --git a/Programs/GraphicsUtilities/asymptote/source/v3dfile.h b/Programs/GraphicsUtilities/asymptote/source/v3dfile.h
index 78fb807b8..cc838eef8 100644
--- a/Programs/GraphicsUtilities/asymptote/source/v3dfile.h
+++ b/Programs/GraphicsUtilities/asymptote/source/v3dfile.h
@@ -18,7 +18,7 @@
 
 #include "common.h"
 
-#ifdef HAVE_RPC_RPC_H
+#ifdef HAVE_LIBTIRPC
 
 #include "abs3doutfile.h"
 #include "xstream.h"
diff --git a/Programs/GraphicsUtilities/asymptote/source/v3dheadertypes.h b/Programs/GraphicsUtilities/asymptote/source/v3dheadertypes.h
index 562a7c260..6039c4ad7 100644
--- a/Programs/GraphicsUtilities/asymptote/source/v3dheadertypes.h
+++ b/Programs/GraphicsUtilities/asymptote/source/v3dheadertypes.h
@@ -1,6 +1,6 @@
 // Enum class for v3dheadertypes
 // AUTO-GENERATED from v3dheadertypes.csv
-// Generated at 2024-02-27 00:37:58
+// Generated at 2024-03-08 08:14:33
 
 namespace camp
 {
diff --git a/Programs/GraphicsUtilities/asymptote/source/v3dtypes.h b/Programs/GraphicsUtilities/asymptote/source/v3dtypes.h
index 29caad1df..9c88bb21f 100644
--- a/Programs/GraphicsUtilities/asymptote/source/v3dtypes.h
+++ b/Programs/GraphicsUtilities/asymptote/source/v3dtypes.h
@@ -1,6 +1,6 @@
 // Enum class for v3dtypes
 // AUTO-GENERATED from v3dtypes.csv
-// Generated at 2024-02-27 00:37:58
+// Generated at 2024-03-08 08:14:33
 
 namespace camp
 {
diff --git a/Programs/GraphicsUtilities/asymptote/version.cmake b/Programs/GraphicsUtilities/asymptote/version.cmake
index ca9477f84..38d3441b9 100644
--- a/Programs/GraphicsUtilities/asymptote/version.cmake
+++ b/Programs/GraphicsUtilities/asymptote/version.cmake
@@ -10,7 +10,7 @@ set(MIKTEX_COMP_MAJOR_VERSION 4)
 set(MIKTEX_COMP_MINOR_VERSION 6)
 set(MIKTEX_COMP_PATCH_VERSION 0)
 
-set(MIKTEX_COMP_ORIG_VERSION_STR "2.87")
+set(MIKTEX_COMP_ORIG_VERSION_STR "2.88")
 
 set(MIKTEX_COMP_COMPANY_STR "")
 set(MIKTEX_COMP_COPYRIGHT_STR "© 2004 Andy Hammerlindl, John C. Bowman, Tom Prince")