Skip to content

Commit

Permalink
asymptote 2.88
Browse files Browse the repository at this point in the history
  • Loading branch information
edocevoli committed Mar 9, 2024
1 parent ab991cd commit baca386
Show file tree
Hide file tree
Showing 19 changed files with 28 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Admin/TPM/windows-x64/miktex-asymptote-bin-x64.tpm.in
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

### Upgraded programs

* asymptote 2.87
* asymptote 2.88
* dvipdfmx 20240305
* dvisvgm 3.2.2
* luatex 1.18.0
Expand Down
4 changes: 2 additions & 2 deletions Programs/GraphicsUtilities/asymptote/source/fileio.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#include "common.h"

#ifdef HAVE_RPC_RPC_H
#ifdef HAVE_LIBTIRPC
#include "xstream.h"
#endif

Expand Down Expand Up @@ -649,7 +649,7 @@ class obfile : public ofile {
void writeline() {}
};

#ifdef HAVE_RPC_RPC_H
#ifdef HAVE_LIBTIRPC

class ixfile : public file {
protected:
Expand Down
4 changes: 2 additions & 2 deletions Programs/GraphicsUtilities/asymptote/source/pair.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "common.h"
#include "angle.h"

#ifdef HAVE_RPC_RPC_H
#ifdef HAVE_LIBTIRPC
#include "xstream.h"
#endif

Expand Down Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions Programs/GraphicsUtilities/asymptote/source/picture.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions Programs/GraphicsUtilities/asymptote/source/prc/oPRCFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "writePRC.h"


#ifdef HAVE_RPC_RPC_H
#ifdef HAVE_LIBTIRPC
#include "xstream.h"
#endif

Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Programs/GraphicsUtilities/asymptote/source/process.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "transform.h"
#include "parser.h"

#ifdef HAVE_RPC_RPC_H
#ifdef HAVE_LIBTIRPC
#include "xstream.h"
#endif

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Programs/GraphicsUtilities/asymptote/source/revision.cc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
const char *REVISION="2.87";
const char *REVISION="2.88";
const char *AsyGLVersion="1.02";
4 changes: 2 additions & 2 deletions Programs/GraphicsUtilities/asymptote/source/runfile.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Programs/GraphicsUtilities/asymptote/source/runpicture.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Programs/GraphicsUtilities/asymptote/source/settings.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,7 @@ struct versionOption : public option {
eigen=true;
#endif

#ifdef HAVE_RPC_RPC_H
#ifdef HAVE_LIBTIRPC
xdr=true;
#endif

Expand Down Expand Up @@ -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", ""));
Expand Down
2 changes: 1 addition & 1 deletion Programs/GraphicsUtilities/asymptote/source/statistics.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
5 changes: 2 additions & 3 deletions Programs/GraphicsUtilities/asymptote/source/symbolmaps.h
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
6 changes: 3 additions & 3 deletions Programs/GraphicsUtilities/asymptote/source/triple.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Programs/GraphicsUtilities/asymptote/source/v3dfile.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "v3dfile.h"

#ifdef HAVE_RPC_RPC_H
#ifdef HAVE_LIBTIRPC

#ifdef HAVE_LIBGLM

Expand Down
2 changes: 1 addition & 1 deletion Programs/GraphicsUtilities/asymptote/source/v3dfile.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include "common.h"

#ifdef HAVE_RPC_RPC_H
#ifdef HAVE_LIBTIRPC

#include "abs3doutfile.h"
#include "xstream.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion Programs/GraphicsUtilities/asymptote/source/v3dtypes.h
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion Programs/GraphicsUtilities/asymptote/version.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")

0 comments on commit baca386

Please sign in to comment.