diff options
33 files changed, 196 insertions, 131 deletions
diff --git a/Master/bin/i386-linux/asy b/Master/bin/i386-linux/asy Binary files differindex e59d92af953..c104a867351 100755 --- a/Master/bin/i386-linux/asy +++ b/Master/bin/i386-linux/asy diff --git a/Master/bin/x86_64-linux/asy b/Master/bin/x86_64-linux/asy Binary files differindex 179f3901a4c..b704001f3ee 100755 --- a/Master/bin/x86_64-linux/asy +++ b/Master/bin/x86_64-linux/asy diff --git a/Master/texmf-dist/asymptote/GUI/xasyVersion.py b/Master/texmf-dist/asymptote/GUI/xasyVersion.py index 1ef1c03069e..cab68ccad10 100755 --- a/Master/texmf-dist/asymptote/GUI/xasyVersion.py +++ b/Master/texmf-dist/asymptote/GUI/xasyVersion.py @@ -1,2 +1,2 @@ #!/usr/bin/env python -xasyVersion = "2.38" +xasyVersion = "2.41" diff --git a/Master/texmf-dist/asymptote/asy-keywords.el b/Master/texmf-dist/asymptote/asy-keywords.el index 4d166f4cab8..56394f9ec67 100644 --- a/Master/texmf-dist/asymptote/asy-keywords.el +++ b/Master/texmf-dist/asymptote/asy-keywords.el @@ -2,7 +2,7 @@ ;; This file is automatically generated by asy-list.pl. ;; Changes will be overwritten. ;; -(defvar asy-keywords-version "2.38") +(defvar asy-keywords-version "2.41") (defvar asy-keyword-name '( and controls tension atleast curl if else while for do return break continue struct typedef new access import unravel from include quote static public private restricted this explicit true false null cycle newframe operator )) @@ -11,7 +11,7 @@ and controls tension atleast curl if else while for do return break continue str Braid FitResult Label Legend Solution TreeNode abscissa arc arrowhead binarytree binarytreeNode block bool bool3 bounds bqe circle conic coord coordsys cputime ellipse evaluatedpoint file filltype frame grid3 guide horner hsv hyperbola indexedTransform int inversion key light line linefit marginT marker mass object pair parabola patch path path3 pen picture point position positionedvector projection real revolution scaleT scientific segment side slice solution splitface string surface tensionSpecifier ticklocate ticksgridT tickvalues transform transformation tree triangle trilinear triple vector vertex void )) (defvar asy-function-name '( -AND Arc ArcArrow ArcArrows Arrow Arrows AtA Automatic AvantGarde B03 B13 B23 B33 BBox BWRainbow BWRainbow2 Bar Bars BeginArcArrow BeginArrow BeginBar BeginDotMargin BeginMargin BeginPenMargin Blank Bookman Bottom BottomTop Bounds Break Broken BrokenLog CLZ CTZ Ceil Circle CircleBarIntervalMarker Cos Courier CrossIntervalMarker DOSendl DOSnewl DefaultFormat DefaultLogFormat Degrees Dir DotMargin DotMargins Dotted Draw Drawline Embed EndArcArrow EndArrow EndBar EndDotMargin EndMargin EndPenMargin Fill FillDraw Floor Format Full Gaussian Gaussrand Gaussrandpair Gradient Grayscale Helvetica Hermite HookHead InOutTicks InTicks Jn Label Landscape Left LeftRight LeftTicks Legend Linear Log LogFormat Margin Margins Mark MidArcArrow MidArrow NOT NewCenturySchoolBook NoBox NoMargin NoModifier NoTicks NoTicks3 NoZero NoZeroFormat None OR OmitFormat OmitTick OmitTickInterval OmitTickIntervals OutTicks Ox Oy Palatino PaletteTicks Pen PenMargin PenMargins Pentype Portrait RadialShade RadialShadeDraw Rainbow Range Relative Right RightTicks Rotate Round SQR Scale ScaleX ScaleY ScaleZ Seascape Shift Sin Slant Spline StickIntervalMarker Straight Symbol Tan TeXify Ticks Ticks3 TildeIntervalMarker TimesRoman Top TrueMargin UnFill UpsideDown Wheel X XEquals XOR XY XYEquals XYZero XYgrid XZEquals XZZero XZero XZgrid Y YEquals YXgrid YZ YZEquals YZZero YZero YZgrid Yn Z ZX ZXgrid ZYgrid ZapfChancery ZapfDingbats _begingroup3 _cputime _draw _eval _findroot _image _labelpath _projection _strokepath _texpath aCos aSin aTan abort abs accel acos acosh acot acsc activatequote add addArrow addMargins addSaveFunction addpenarc addpenline addseg adjust alias align all altitude angabscissa angle angledegrees angpoint animate annotate anticomplementary antipedal apply approximate arc arcarrowsize arccircle arcdir arcfromcenter arcfromfocus arclength arcnodesnumber arcpoint arcsubtended arcsubtendedcenter arctime arctopath array arrow arrow2 arrowbase arrowbasepoints arrowsize ascii asec asin asinh ask assert asy asycode asydir asyfigure asyfilecode asyinclude asywrite atan atan2 atanh atbreakpoint atexit attach attract atupdate autoformat autoscale autoscale3 axes axes3 axialshade axis axiscoverage azimuth babel background bangles bar barmarksize barsize basealign baseline bbox beep begin beginclip begingroup beginpoint between bevel bezier bezierP bezierPP bezierPPP bezulate bibliography bibliographystyle binarytree binarytreeNode binomial bins bisector bisectorpoint bispline blend blockconnector box bqe brace breakpoint breakpoints brick buildRestoreDefaults buildRestoreThunk buildcycle bulletcolor byte calculateScaling canonical canonicalcartesiansystem cartesiansystem case1 case2 case3 cbrt cd ceil center centerToFocus centroid cevian change2 changecoordsys checkSegment check_fpt_zero checkconditionlength checker checkincreasing checklengths checkposition checkpt checkptincube checktriangle choose circle circlebarframe circlemarkradius circlenodesnumber circumcenter circumcircle clamped clear clip clipdraw close cmyk code colatitude collect collinear color colorless colors colorspace comma compassmark complement complementary concat concurrent cone conic conicnodesnumber conictype conj connect containmentTree contains contour contour3 controlSpecifier convert coordinates coordsys copy copyPairOrTriple cos cosh cot countIntersections cputime crop cropcode cross crossframe crosshatch crossmarksize csc cubicroots curabscissa curlSpecifier curpoint currentarrow currentexitfunction currentmomarrow currentpolarconicroutine curve cut cutafter cutbefore cyclic cylinder deactivatequote debugger deconstruct defaultdir defaultformat defaultpen defined degenerate degrees delete deletepreamble determinant diagonal diamond diffdiv dir dirSpecifier dirtime display distance divisors do_overpaint dot dotframe dotsize downcase draw drawAll drawDoubleLine drawFermion drawGhost drawGluon drawMomArrow drawPRCcylinder drawPRCdisk drawPRCsphere drawPRCtube drawPhoton drawScalar drawVertex drawVertexBox drawVertexBoxO drawVertexBoxX drawVertexO drawVertexOX drawVertexTriangle drawVertexTriangleO drawVertexX drawarrow drawarrow2 drawbeziertriangle drawline drawpixel drawtick duplicate elle ellipse ellipsenodesnumber embed embed3 embedplayer empty enclose end endScript endclip endgroup endgroup3 endl endpoint endpoints eof eol equation equations erase erasestep erf erfc error errorbar errorbars eval excenter excircle exit exitXasyMode exitfunction exp expfactors expi expm1 exradius extend extension extouch fabs factorial fermat fft fhorner figure file filecode fill filldraw filloutside fillrule filltype find findroot finite finiteDifferenceJacobian firstcut firstframe fit fit2 fixedscaling floor flush fmdefaults fmod focusToCenter font fontcommand fontsize foot format frac frequency fromCenter fromFocus fspline functionshade gamma generate_random_backtrace generateticks gergonne getc getint getpair getreal getstring gettriple gluon gouraudshade graph graphic graphicscale gray grestore grid grid3 gsave halfbox hatch hdiffdiv hermite hex histogram history hline hprojection hsv hyperbola hyperbolanodesnumber hyperlink hypot identity image implicitsurface incenter incentral incircle increasing incrementposition indexedTransform indexedfigure initXasyMode initdefaults input inradius insert inside insphere integrate interactive interior interp interpolate intersect intersection intersectionpoint intersectionpoints intersections intouch inverse inversion invisible is3D isDuplicate isnan isogonal isogonalconjugate isotomic isotomicconjugate isparabola italic item jobname key kurtosis kurtosisexcess label labelaxis labelmargin labelpath labels labeltick labelx labelx3 labely labely3 labelz labelz3 lastcut latex latitude latticeshade layer layout ldexp leastsquares legend legenditem length lexorder lift light limits line linear linecap lineinversion linejoin linemargin lineskip linetype linewidth link list lm_enorm lm_evaluate_default lm_lmdif lm_lmpar lm_minimize lm_print_default lm_print_quiet lm_qrfac lm_qrsolv locale locate locatefile location log log10 log1p logaxiscoverage longitude lookup make3dgrid makeNode makecircle makedraw makepen maketriangle map margin markangle markangleradius markanglespace markarc marker markinterval marknodes markrightangle markthin markuniform mass masscenter massformat math max max3 maxAfterTransform maxbezier maxbound maxcoords maxlength maxratio maxtimes mean medial median midpoint min min3 minAfterTransform minbezier minbound minipage minratio mintimes miterlimit mktemp momArrowPath momarrowsize monotonic multifigure nGrad nativeformat natural needshipout newl newpage newslide newton newtree nextframe nextnormal nextpage nib nodabscissa none norm normalout normalvideo notaknot nowarn numberpage nurb object offset onpath opacity opposite orient orientation origin orthic orthocentercenter outformat outline outname outprefix output overloadedMessage overwrite pack pad pairs palette parabola parabolanodesnumber parallel parallelogram partialsum patchwithnormals path path3 pathbetween pathinface pattern pause pdf pedal periodic perp perpendicular perpendicularmark phantom phi1 phi2 phi3 photon piecewisestraight point polar polarconicroutine polargraph polygon postcontrol postscript pow10 ppoint prc prc0 prconly precision precontrol prepend printBytecode print_random_addresses progress project projection projecttospan projecttospan_findcoeffs purge pwhermite quadpatches quadrant quadraticroots quantize quarticroots quotient radialshade radians radicalcenter radicalline radius rand randompath rd readline realmult realquarticroots rectangle rectangular rectify reflect relabscissa relative relativedistance reldir relpoint reltime remainder remark removeDuplicates rename replace report resetdefaultpen restore restoredefaults reverse reversevideo rf rfind rgb rgba rgbint rms rotate rotateO rotation round roundbox roundedpath roundrectangle samecoordsys sameside sample save savedefaults saveline scale scale3 scaleO scaleT scaleless scientific search searchtree sec secondaryX secondaryY seconds section sector seek seekeof segment segmentlimits sequence setpens sgn sgnd sharpangle sharpdegrees shift shiftless shipout shipout3 show simeq simpson sin sinh size size3 skewness skip slant sleep slice slope slopefield solve solveBVP sort sourceline sphere split sqrt square srand standardizecoordsys startScript stdev step stickframe stickmarksize stickmarkspace stop straight straightness string stripdirectory stripextension stripfile stripsuffix strokepath subdivide subitem subpath substr sum surface symmedial symmedian system tab tableau tan tangent tangential tangents tanh tell tensionSpecifier tensorshade tex texcolor texify texpath texpreamble texreset texshipout texsize textpath thick thin tick tickMax tickMax3 tickMin tickMin3 ticklabelshift ticklocate tildeframe tildemarksize tile tiling time times title titlepage topbox transform transformation transpose trembleFuzz triangle triangleAbc triangleabc triangletoquads trianglewithnormals triangulate tricoef tridiagonal trilinear trim truepoint tube uncycle unfill uniform unique unit unitrand unitsize unityroot unstraighten upcase updatefunction uperiodic upscale uptodate usepackage usersetting usetypescript usleep value variance variancebiased vbox vector vectorfield verbatim view vline vperiodic vprojection warn warning windingnumber write xaxis xaxis3 xaxis3At xaxisAt xequals xlimits xpart xscale xscaleO xtick xtick3 xtrans yaxis yaxis3 yaxis3At yaxisAt yequals ylimits ypart yscale yscaleO ytick ytick3 ytrans zaxis3 zaxis3At zero zero3 zlimits zpart ztick ztick3 ztrans )) +AND Arc ArcArrow ArcArrows Arrow Arrows AtA Automatic AvantGarde B03 B13 B23 B33 BBox BWRainbow BWRainbow2 Bar Bars BeginArcArrow BeginArrow BeginBar BeginDotMargin BeginMargin BeginPenMargin Blank Bookman Bottom BottomTop Bounds Break Broken BrokenLog CLZ CTZ Ceil Circle CircleBarIntervalMarker Cos Courier CrossIntervalMarker DOSendl DOSnewl DefaultFormat DefaultLogFormat Degrees Dir DotMargin DotMargins Dotted Draw Drawline Embed EndArcArrow EndArrow EndBar EndDotMargin EndMargin EndPenMargin Fill FillDraw Floor Format Full Gaussian Gaussrand Gaussrandpair Gradient Grayscale Helvetica Hermite HookHead InOutTicks InTicks Jn Label Landscape Left LeftRight LeftTicks Legend Linear Log LogFormat Margin Margins Mark MidArcArrow MidArrow NOT NewCenturySchoolBook NoBox NoMargin NoModifier NoTicks NoTicks3 NoZero NoZeroFormat None OR OmitFormat OmitTick OmitTickInterval OmitTickIntervals OutTicks Ox Oy Palatino PaletteTicks Pen PenMargin PenMargins Pentype Portrait RadialShade RadialShadeDraw Rainbow Range Relative Right RightTicks Rotate Round SQR Scale ScaleX ScaleY ScaleZ Seascape Shift Sin Slant Spline StickIntervalMarker Straight Symbol Tan TeXify Ticks Ticks3 TildeIntervalMarker TimesRoman Top TrueMargin UnFill UpsideDown Wheel X XEquals XOR XY XYEquals XYZero XYgrid XZEquals XZZero XZero XZgrid Y YEquals YXgrid YZ YZEquals YZZero YZero YZgrid Yn Z ZX ZXgrid ZYgrid ZapfChancery ZapfDingbats _begingroup3 _cputime _draw _eval _findroot _image _labelpath _projection _strokepath _texpath aCos aSin aTan abort abs accel acos acosh acot acsc activatequote add addArrow addMargins addSaveFunction addpenarc addpenline addseg adjust alias align all altitude angabscissa angle angledegrees angpoint animate annotate anticomplementary antipedal apply approximate arc arcarrowsize arccircle arcdir arcfromcenter arcfromfocus arclength arcnodesnumber arcpoint arcsubtended arcsubtendedcenter arctime arctopath array arrow arrow2 arrowbase arrowbasepoints arrowsize ascii asec asin asinh ask assert asy asycode asydir asyfigure asyfilecode asyinclude asywrite atan atan2 atanh atbreakpoint atexit attach attract atupdate autoformat autoscale autoscale3 axes axes3 axialshade axis axiscoverage azimuth babel background bangles bar barmarksize barsize basealign baseline bbox beep begin beginclip begingroup beginpoint between bevel bezier bezierP bezierPP bezierPPP bezulate bibliography bibliographystyle binarytree binarytreeNode binomial bins bisector bisectorpoint bispline blend blockconnector box bqe brace breakpoint breakpoints brick buildRestoreDefaults buildRestoreThunk buildcycle bulletcolor byte calculateScaling canonical canonicalcartesiansystem cartesiansystem case1 case2 case3 cbrt cd ceil center centerToFocus centroid cevian change2 changecoordsys checkSegment check_fpt_zero checkconditionlength checker checkincreasing checklengths checkposition checkpt checkptincube checktriangle choose circle circlebarframe circlemarkradius circlenodesnumber circumcenter circumcircle clamped clear clip clipdraw close cmyk code colatitude collect collinear color colorless colors colorspace comma compassmark complement complementary concat concurrent cone conic conicnodesnumber conictype conj connect containmentTree contains contour contour3 controlSpecifier convert coordinates coordsys copy copyPairOrTriple cos cosh cot countIntersections cputime crop cropcode cross crossframe crosshatch crossmarksize csc cubicroots curabscissa curlSpecifier curpoint currentarrow currentexitfunction currentmomarrow currentpolarconicroutine curve cut cutafter cutbefore cyclic cylinder deactivatequote debugger deconstruct defaultdir defaultformat defaultpen defined degenerate degrees delete deletepreamble determinant diagonal diamond diffdiv dir dirSpecifier dirtime display distance divisors do_overpaint dot dotframe dotsize downcase draw drawAll drawDoubleLine drawFermion drawGhost drawGluon drawMomArrow drawPRCcylinder drawPRCdisk drawPRCsphere drawPRCtube drawPhoton drawScalar drawVertex drawVertexBox drawVertexBoxO drawVertexBoxX drawVertexO drawVertexOX drawVertexTriangle drawVertexTriangleO drawVertexX drawarrow drawarrow2 drawbeziertriangle drawline drawpixel drawstrokepath drawtick duplicate elle ellipse ellipsenodesnumber embed embed3 embedplayer empty enclose end endScript endclip endgroup endgroup3 endl endpoint endpoints eof eol equation equations erase erasestep erf erfc error errorbar errorbars eval excenter excircle exit exitXasyMode exitfunction exp expfactors expi expm1 exradius extend extension extouch fabs factorial fermat fft fhorner figure file filecode fill filldraw filloutside fillrule filltype find findroot finite finiteDifferenceJacobian firstcut firstframe fit fit2 fixedscaling floor flush fmdefaults fmod focusToCenter font fontcommand fontsize foot format frac frequency fromCenter fromFocus fspline functionshade gamma generate_random_backtrace generateticks gergonne getc getint getpair getreal getstring gettriple gluon gouraudshade graph graphic graphicscale gray grestore grid grid3 gsave halfbox hatch hdiffdiv hermite hex histogram history hline hprojection hsv hyperbola hyperbolanodesnumber hyperlink hypot identity image implicitsurface incenter incentral incircle increasing incrementposition indexedTransform indexedfigure initXasyMode initdefaults initialized input inradius insert inside insphere integrate interactive interior interp interpolate intersect intersection intersectionpoint intersectionpoints intersections intouch inverse inversion invisible is3D isDuplicate isnan isogonal isogonalconjugate isotomic isotomicconjugate isparabola italic item jobname key kurtosis kurtosisexcess label labelaxis labelmargin labelpath labels labeltick labelx labelx3 labely labely3 labelz labelz3 lastcut latex latitude latticeshade layer layout ldexp leastsquares legend legenditem length lexorder lift light limits line linear linecap lineinversion linejoin linemargin lineskip linetype linewidth link list lm_enorm lm_evaluate_default lm_lmdif lm_lmpar lm_minimize lm_print_default lm_print_quiet lm_qrfac lm_qrsolv locale locate locatefile location log log10 log1p logaxiscoverage longitude lookup make3dgrid makeNode makecircle makedraw makepen maketriangle map margin markangle markangleradius markanglespace markarc marker markinterval marknodes markrightangle markthin markuniform mass masscenter massformat math max max3 maxAfterTransform maxbezier maxbound maxcoords maxlength maxratio maxtimes mean medial median midpoint min min3 minAfterTransform minbezier minbound minipage minratio mintimes miterlimit mktemp momArrowPath momarrowsize monotonic multifigure nGrad nativeformat natural needshipout newl newpage newslide newton newtree nextframe nextnormal nextpage nib nodabscissa none norm normalout normalvideo nosetpagesize notaknot nowarn numberpage nurb object offset onpath opacity opposite orient orientation origin orthic orthocentercenter outformat outline outname outprefix output overloadedMessage overwrite pack pad pairs palette parabola parabolanodesnumber parallel parallelogram partialsum patchwithnormals path path3 pathbetween pathinface pattern pause pdf pedal periodic perp perpendicular perpendicularmark phantom phi1 phi2 phi3 photon piecewisestraight point polar polarconicroutine polargraph polygon postcontrol postscript pow10 ppoint prc prc0 prconly precision precontrol prepend printBytecode print_random_addresses progress project projection projecttospan projecttospan_findcoeffs purge pwhermite quadpatches quadrant quadraticroots quantize quarticroots quotient radialshade radians radicalcenter radicalline radius rand randompath rd readline realmult realquarticroots rectangle rectangular rectify reflect relabscissa relative relativedistance reldir relpoint reltime remainder remark removeDuplicates rename replace report resetdefaultpen restore restoredefaults reverse reversevideo rf rfind rgb rgba rgbint rms rotate rotateO rotation round roundbox roundedpath roundrectangle samecoordsys sameside sample save savedefaults saveline scale scale3 scaleO scaleT scaleless scientific search searchtree sec secondaryX secondaryY seconds section sector seek seekeof segment segmentlimits sequence setpens sgn sgnd sharpangle sharpdegrees shift shiftless shipout shipout3 show simeq simpson sin sinh size size3 skewness skip slant sleep slice slope slopefield solve solveBVP sort sourceline sphere split sqrt square srand standardizecoordsys startScript stdev step stickframe stickmarksize stickmarkspace stop straight straightness string stripdirectory stripextension stripfile stripsuffix strokepath subdivide subitem subpath substr sum surface symmedial symmedian system tab tableau tan tangent tangential tangents tanh tell tensionSpecifier tensorshade tex texcolor texify texpath texpreamble texreset texshipout texsize textpath thick thin tick tickMax tickMax3 tickMin tickMin3 ticklabelshift ticklocate tildeframe tildemarksize tile tiling time times title titlepage topbox transform transformation transpose trembleFuzz triangle triangleAbc triangleabc triangletoquads trianglewithnormals triangulate tricoef tridiagonal trilinear trim truepoint tube uncycle unfill uniform unique unit unitrand unitsize unityroot unstraighten upcase updatefunction uperiodic upscale uptodate usepackage usersetting usetypescript usleep value variance variancebiased vbox vector vectorfield verbatim view vline vperiodic vprojection warn warning windingnumber write xaxis xaxis3 xaxis3At xaxisAt xequals xlimits xpart xscale xscaleO xtick xtick3 xtrans yaxis yaxis3 yaxis3At yaxisAt yequals ylimits ypart yscale yscaleO ytick ytick3 ytrans zaxis3 zaxis3At zero zlimits zpart ztick ztick3 ztrans )) (defvar asy-variable-name '( -AliceBlue Align Allow AntiqueWhite Apricot Aqua Aquamarine Aspect Azure BeginPoint Beige Bisque Bittersweet Black BlanchedAlmond Blue BlueGreen BlueViolet Both Break BrickRed Brown BurlyWood BurntOrange CCW CW CadetBlue CarnationPink Center Centered Cerulean Chartreuse Chocolate Coeff Coral CornflowerBlue Cornsilk Crimson Crop Cyan Dandelion DarkBlue DarkCyan DarkGoldenrod DarkGray DarkGreen DarkKhaki DarkMagenta DarkOliveGreen DarkOrange DarkOrchid DarkRed DarkSalmon DarkSeaGreen DarkSlateBlue DarkSlateGray DarkTurquoise DarkViolet DeepPink DeepSkyBlue DefaultHead DimGray DodgerBlue Dotted Down Draw E ENE EPS ESE E_Euler E_PC E_RK2 E_RK3BS Emerald EndPoint Euler Fill FillDraw FireBrick FloralWhite ForestGreen Fuchsia Gainsboro GhostWhite Gold Goldenrod Gray Green GreenYellow Honeydew HookHead Horizontal HotPink I IgnoreAspect IndianRed Indigo Ivory JOIN_IN JOIN_OUT JungleGreen Khaki LM_DWARF LM_MACHEP LM_SQRT_DWARF LM_SQRT_GIANT LM_USERTOL Label Lavender LavenderBlush LawnGreen Left LeftJustified LeftSide LemonChiffon LightBlue LightCoral LightCyan LightGoldenrodYellow LightGreen LightGrey LightPink LightSalmon LightSeaGreen LightSkyBlue LightSlateGray LightSteelBlue LightYellow Lime LimeGreen Linear Linen Log Logarithmic Magenta Mahogany Mark MarkFill MarkPath Maroon Max MediumAquamarine MediumBlue MediumOrchid MediumPurple MediumSeaGreen MediumSlateBlue MediumSpringGreen MediumTurquoise MediumVioletRed Melon MidPoint MidnightBlue Min MintCream MistyRose Moccasin Move MoveQuiet Mulberry N NE NNE NNW NULL_VERTEX NW NavajoWhite Navy NavyBlue NoAlign NoCrop NoFill NoSide OldLace Olive OliveDrab OliveGreen Orange OrangeRed Orchid Ox Oy PC PaleGoldenrod PaleGreen PaleTurquoise PaleVioletRed PapayaWhip Peach PeachPuff Periwinkle Peru PineGreen Pink Plum PowderBlue ProcessBlue Purple RK2 RK3 RK3BS RK4 RK5 RK5DP RK5F RawSienna Red RedOrange RedViolet Rhodamine Right RightJustified RightSide RosyBrown RoyalBlue RoyalPurple RubineRed S SE SSE SSW SW SaddleBrown Salmon SandyBrown SeaGreen Seashell Sepia Sienna Silver SimpleHead SkyBlue SlateBlue SlateGray Snow SpringGreen SteelBlue Suppress SuppressQuiet Tan TeXHead Teal TealBlue Thistle Ticksize Tomato Turquoise UnFill Up VERSION Value Vertical Violet VioletRed W WNW WSW Wheat White WhiteSmoke WildStrawberry XHIGH XLOW XYAlign YAlign YHIGH YLOW Yellow YellowGreen YellowOrange ZHIGH ZLOW addpenarc addpenline align allowstepping angularsystem animationdelay appendsuffix arcarrowangle arcarrowfactor arrow2sizelimit arrowangle arrowbarb arrowdir arrowfactor arrowhookfactor arrowlength arrowsizelimit arrowtexfactor authorpen axis axiscoverage axislabelfactor background backgroundcolor backgroundpen barfactor barmarksizefactor basealign baselinetemplate bernstein beveljoin bigvertexpen bigvertexsize black blue bm bottom bp bracedefaultratio braceinnerangle bracemidangle braceouterangle brown bullet byfoci byvertices camerafactor chartreuse circlemarkradiusfactor circlenodesnumberfactor circleprecision circlescale cm codefile codepen codeskip colorPen coloredNodes coloredSegments conditionlength conicnodesfactor count cputimeformat crossmarksizefactor currentcoordsys currentlight currentpatterns currentpen currentpicture currentposition currentprojection curvilinearsystem cuttings cyan darkblue darkbrown darkcyan darkgray darkgreen darkgrey darkmagenta darkolive darkred dashdotted dashed datepen dateskip debuggerlines debugging deepblue deepcyan deepgray deepgreen deepgrey deepmagenta deepred default defaultControl defaultS defaultbackpen defaultcoordsys defaultexcursion defaultfilename defaultformat defaultmassformat defaultpen defaultseparator diagnostics differentlengths dot dotfactor dotframe dotted doublelinepen doublelinespacing down duplicateFuzz ellipsenodesnumberfactor eps epsgeo epsilon evenodd expansionfactor extendcap fermionpen figureborder figuremattpen file3 firstnode firststep foregroundcolor fuchsia fuzz gapfactor ghostpen gluonamplitude gluonpen gluonratio gray green grey hatchepsilon havepagenumber heavyblue heavycyan heavygray heavygreen heavygrey heavymagenta heavyred hline hwratio hyperbolanodesnumberfactor identity4 ignore inXasyMode inch inches includegraphicscommand inf infinity institutionpen intMax intMin invert invisible itempen itemskip itemstep labelmargin landscape lastnode left legendhskip legendlinelength legendmargin legendmarkersize legendmaxrelativewidth legendvskip lightblue lightcyan lightgray lightgreen lightgrey lightmagenta lightolive lightred lightyellow linemargin lm_infmsg lm_shortmsg longdashdotted longdashed magenta magneticRadius mantissaBits markangleradius markangleradiusfactor markanglespace markanglespacefactor maxrefinements mediumblue mediumcyan mediumgray mediumgreen mediumgrey mediummagenta mediumred mediumyellow middle minDistDefault minblockheight minblockwidth mincirclediameter minipagemargin minipagewidth minvertexangle miterjoin mm momarrowfactor momarrowlength momarrowmargin momarrowoffset momarrowpen monoPen morepoints nCircle nan newbulletcolor ngraph nil nmesh nobasealign nodeMarginDefault nodesystem nomarker nopoint noprimary nullpath nullpen numarray ocgindex oldbulletcolor olive orange origin overpaint page pageheight pagemargin pagenumberalign pagenumberpen pagenumberposition pagewidth paleblue palecyan palegray palegreen palegrey palemagenta palered paleyellow parabolanodesnumberfactor perpfactor phi photonamplitude photonpen photonratio pi pink plain plain_bounds plain_scaling plus preamblenodes pt purple r3 r4a r4b randMax realDigits realEpsilon realMax realMin red relativesystem reverse right roundcap roundjoin royalblue salmon saveFunctions scalarpen sequencereal settings shipped signedtrailingzero solid spinner springgreen sqrtEpsilon squarecap squarepen startposition stdin stdout stepfactor stepfraction steppagenumberpen stepping stickframe stickmarksizefactor stickmarkspacefactor swap textpen ticksize tildeframe tildemarksizefactor tinv titlealign titlepagepen titlepageposition titlepen titleskip top trailingzero treeLevelStep treeMinNodeWidth treeNodeStep trembleAngle trembleFrequency trembleRandom undefined unitcircle unitsquare up urlpen urlskip version vertexpen vertexsize viewportmargin viewportsize vline white wye xformStack yellow ylabelwidth zerotickfuzz zerowinding )) +AliceBlue Align Allow AntiqueWhite Apricot Aqua Aquamarine Aspect Azure BeginPoint Beige Bisque Bittersweet Black BlanchedAlmond Blue BlueGreen BlueViolet Both Break BrickRed Brown BurlyWood BurntOrange CCW CW CadetBlue CarnationPink Center Centered Cerulean Chartreuse Chocolate Coeff Coral CornflowerBlue Cornsilk Crimson Crop Cyan Dandelion DarkBlue DarkCyan DarkGoldenrod DarkGray DarkGreen DarkKhaki DarkMagenta DarkOliveGreen DarkOrange DarkOrchid DarkRed DarkSalmon DarkSeaGreen DarkSlateBlue DarkSlateGray DarkTurquoise DarkViolet DeepPink DeepSkyBlue DefaultHead DimGray DodgerBlue Dotted Down Draw E ENE EPS ESE E_Euler E_PC E_RK2 E_RK3BS Emerald EndPoint Euler Fill FillDraw FireBrick FloralWhite ForestGreen Fuchsia Gainsboro GhostWhite Gold Goldenrod Gray Green GreenYellow Honeydew HookHead Horizontal HotPink I IgnoreAspect IndianRed Indigo Ivory JOIN_IN JOIN_OUT JungleGreen Khaki LM_DWARF LM_MACHEP LM_SQRT_DWARF LM_SQRT_GIANT LM_USERTOL Label Lavender LavenderBlush LawnGreen Left LeftJustified LeftSide LemonChiffon LightBlue LightCoral LightCyan LightGoldenrodYellow LightGreen LightGrey LightPink LightSalmon LightSeaGreen LightSkyBlue LightSlateGray LightSteelBlue LightYellow Lime LimeGreen Linear Linen Log Logarithmic Magenta Mahogany Mark MarkFill MarkPath Maroon Max MediumAquamarine MediumBlue MediumOrchid MediumPurple MediumSeaGreen MediumSlateBlue MediumSpringGreen MediumTurquoise MediumVioletRed Melon MidPoint MidnightBlue Min MintCream MistyRose Moccasin Move MoveQuiet Mulberry N NE NNE NNW NULL_VERTEX NW NavajoWhite Navy NavyBlue NoAlign NoCrop NoFill NoSide OldLace Olive OliveDrab OliveGreen Orange OrangeRed Orchid Ox Oy PC PaleGoldenrod PaleGreen PaleTurquoise PaleVioletRed PapayaWhip Peach PeachPuff Periwinkle Peru PineGreen Pink Plum PowderBlue ProcessBlue Purple RK2 RK3 RK3BS RK4 RK5 RK5DP RK5F RawSienna Red RedOrange RedViolet Rhodamine Right RightJustified RightSide RosyBrown RoyalBlue RoyalPurple RubineRed S SE SSE SSW SW SaddleBrown Salmon SandyBrown SeaGreen Seashell Sepia Sienna Silver SimpleHead SkyBlue SlateBlue SlateGray Snow SpringGreen SteelBlue Suppress SuppressQuiet Tan TeXHead Teal TealBlue Thistle Ticksize Tomato Turquoise UnFill Up VERSION Value Vertical Violet VioletRed W WNW WSW Wheat White WhiteSmoke WildStrawberry XHIGH XLOW XYAlign YAlign YHIGH YLOW Yellow YellowGreen YellowOrange ZHIGH ZLOW addpenarc addpenline align allowstepping angularsystem animationdelay appendsuffix arcarrowangle arcarrowfactor arrow2sizelimit arrowangle arrowbarb arrowdir arrowfactor arrowhookfactor arrowlength arrowsizelimit arrowtexfactor authorpen axis axiscoverage axislabelfactor background backgroundcolor backgroundpen barfactor barmarksizefactor basealign baselinetemplate bernstein beveljoin bigvertexpen bigvertexsize black blue bm bottom bp bracedefaultratio braceinnerangle bracemidangle braceouterangle brown bullet byfoci byvertices camerafactor chartreuse circlemarkradiusfactor circlenodesnumberfactor circleprecision circlescale cm codefile codepen codeskip colorPen coloredNodes coloredSegments conditionlength conicnodesfactor count cputimeformat crossmarksizefactor currentcoordsys currentlight currentpatterns currentpen currentpicture currentposition currentprojection curvilinearsystem cuttings cyan darkblue darkbrown darkcyan darkgray darkgreen darkgrey darkmagenta darkolive darkred dashdotted dashed datepen dateskip debuggerlines debugging deepblue deepcyan deepgray deepgreen deepgrey deepmagenta deepred deepyellow default defaultControl defaultS defaultbackpen defaultcoordsys defaultexcursion defaultfilename defaultformat defaultmassformat defaultpen defaultseparator diagnostics differentlengths dot dotfactor dotframe dotted doublelinepen doublelinespacing down duplicateFuzz ellipsenodesnumberfactor eps epsgeo epsilon evenodd expansionfactor extendcap fermionpen figureborder figuremattpen file3 firstnode firststep foregroundcolor fuchsia fuzz gapfactor ghostpen gluonamplitude gluonpen gluonratio gray green grey hatchepsilon havepagenumber heavyblue heavycyan heavygray heavygreen heavygrey heavymagenta heavyred hline hwratio hyperbolanodesnumberfactor identity4 ignore inXasyMode inch inches includegraphicscommand inf infinity institutionpen intMax intMin invert invisible itempen itemskip itemstep labelmargin landscape lastnode left legendhskip legendlinelength legendmargin legendmarkersize legendmaxrelativewidth legendvskip lightblue lightcyan lightgray lightgreen lightgrey lightmagenta lightolive lightred lightyellow linemargin lm_infmsg lm_shortmsg longdashdotted longdashed magenta magneticRadius mantissaBits markangleradius markangleradiusfactor markanglespace markanglespacefactor maxrefinements mediumblue mediumcyan mediumgray mediumgreen mediumgrey mediummagenta mediumred mediumyellow middle minDistDefault minblockheight minblockwidth mincirclediameter minipagemargin minipagewidth minvertexangle miterjoin mm momarrowfactor momarrowlength momarrowmargin momarrowoffset momarrowpen monoPen morepoints nCircle nan newbulletcolor ngraph nil nmesh nobasealign nodeMarginDefault nodesystem nomarker nopoint noprimary nullpath nullpen numarray ocgindex oldbulletcolor olive orange origin overpaint page pageheight pagemargin pagenumberalign pagenumberpen pagenumberposition pagewidth paleblue palecyan palegray palegreen palegrey palemagenta palered paleyellow parabolanodesnumberfactor perpfactor phi photonamplitude photonpen photonratio pi pink plain plain_bounds plain_scaling plus preamblenodes pt purple r3 r4a r4b randMax realDigits realEpsilon realMax realMin red relativesystem reverse right roundcap roundjoin royalblue salmon saveFunctions scalarpen sequencereal settings shipped signedtrailingzero solid spinner springgreen sqrtEpsilon squarecap squarepen startposition stdin stdout stepfactor stepfraction steppagenumberpen stepping stickframe stickmarksizefactor stickmarkspacefactor swap textpen ticksize tildeframe tildemarksizefactor tinv titlealign titlepagepen titlepageposition titlepen titleskip top trailingzero treeLevelStep treeMinNodeWidth treeNodeStep trembleAngle trembleFrequency trembleRandom undefined unitcircle unitsquare up urlpen urlskip version vertexpen vertexsize viewportmargin viewportsize vline white wye xformStack yellow ylabelwidth zerotickfuzz zerowinding )) diff --git a/Master/texmf-dist/asymptote/asymptote.py b/Master/texmf-dist/asymptote/asymptote.py index 721c464d36b..71e7b9beed6 100644 --- a/Master/texmf-dist/asymptote/asymptote.py +++ b/Master/texmf-dist/asymptote/asymptote.py @@ -3,7 +3,7 @@ from subprocess import * class asy: def __init__(self): - self.session = Popen(['asy','-quiet','-interactive'],stdin=PIPE) + self.session = Popen(['asy','-quiet','-inpipe=0','-outpipe=2'],stdin=PIPE) self.help() def send(self, cmd): self.session.stdin.write(cmd+'\n') diff --git a/Master/texmf-dist/asymptote/geometry.asy b/Master/texmf-dist/asymptote/geometry.asy index 580c49e2e69..2bc062f3560 100644 --- a/Master/texmf-dist/asymptote/geometry.asy +++ b/Master/texmf-dist/asymptote/geometry.asy @@ -1295,7 +1295,7 @@ void perpendicularmark(picture pic = currentpicture, point z, {/*<asyxml></code><documentation>Draw a perpendicular symbol at z aligned in the direction align relative to the path z--z + dir. dir(45 + n * 90), where n in N*, are common values for 'align'.</documentation></function></asyxml>*/ - p = squarecap + p; + p = squarecap + miterjoin + p; if(size == 0) size = perpfactor * 3mm + sqrt(1 + linewidth(p)) - 1; frame apic; pair d1 = size * align * unit(dir) * dir(-45); @@ -1354,8 +1354,6 @@ void markrightangle(picture pic = currentpicture, point A, point O, pair dir = Ap - Op; real a1 = degrees(dir); pair align = rotate(-a1) * unit(dir(Op--Ap, Op--Bp)); - if (margin == NoMargin) - margin = TrueMargin(linewidth(currentpen)/2, linewidth(currentpen)/2); perpendicularmark(pic = pic, z = O, align = align, dir = dir, size = size, p = p, margin = margin, filltype = filltype); diff --git a/Master/texmf-dist/asymptote/graph.asy b/Master/texmf-dist/asymptote/graph.asy index c50a7a67b2c..7498ce8bfdd 100644 --- a/Master/texmf-dist/asymptote/graph.asy +++ b/Master/texmf-dist/asymptote/graph.asy @@ -657,6 +657,7 @@ tickvalues generateticks(int sign, Label F="", ticklabel ticklabel=null, } if(calcStep) { + if(N == 1) N=2; if(N == 0) N=(int) (len/Step); else Step=len/N; } diff --git a/Master/texmf-dist/asymptote/graph3.asy b/Master/texmf-dist/asymptote/graph3.asy index fd7871e1547..ed098309740 100644 --- a/Master/texmf-dist/asymptote/graph3.asy +++ b/Master/texmf-dist/asymptote/graph3.asy @@ -4,8 +4,6 @@ private import math; import graph; import three; -triple zero3(real) {return O;} - typedef triple direction3(real); direction3 Dir(triple dir) {return new triple(real) {return dir;};} diff --git a/Master/texmf-dist/asymptote/ode.asy b/Master/texmf-dist/asymptote/ode.asy index 712196a3018..51941844fc4 100644 --- a/Master/texmf-dist/asymptote/ode.asy +++ b/Master/texmf-dist/asymptote/ode.asy @@ -98,8 +98,7 @@ void expfactors(real x, coefficients a) } // First-Order Euler -RKTableau Euler=RKTableau(1,new real[][], - new real[] {1}); +RKTableau Euler=RKTableau(1,new real[][], new real[] {1}); // First-Order Exponential Euler RKTableau E_Euler=RKTableau(1,new real[][], new real[] {1}, diff --git a/Master/texmf-dist/asymptote/palette.asy b/Master/texmf-dist/asymptote/palette.asy index 96bbf1550ec..2cb6e7c5475 100644 --- a/Master/texmf-dist/asymptote/palette.asy +++ b/Master/texmf-dist/asymptote/palette.asy @@ -245,12 +245,12 @@ pen[][] palette(real[][] f, pen[] palette) real Min=min(f); real Max=max(f); int n=f.length; - int m=n > 0 ? f[0].length : 0; - pen[][] p=new pen[n][m]; + pen[][] p=new pen[n][]; real step=(Max == Min) ? 0.0 : (palette.length-1)/(Max-Min); for(int i=0; i < n; ++i) { real[] fi=f[i]; - p[i]=sequence(new pen(int j) {return palette[round((fi[j]-Min)*step)];},m); + p[i]=sequence(new pen(int j) {return palette[round((fi[j]-Min)*step)];}, + f[i].length); } return p; } @@ -270,6 +270,7 @@ paletteticks PaletteTicks(Label format="", ticklabel ticklabel=null, } paletteticks PaletteTicks=PaletteTicks(); +paletteticks NoTicks=new ticks(int sign=-1) {return NoTicks;}; void palette(picture pic=currentpicture, Label L="", bounds bounds, pair initial, pair final, axis axis=Right, pen[] palette, diff --git a/Master/texmf-dist/asymptote/plain.asy b/Master/texmf-dist/asymptote/plain.asy index ac7106e6668..3bb8cf7ce93 100644 --- a/Master/texmf-dist/asymptote/plain.asy +++ b/Master/texmf-dist/asymptote/plain.asy @@ -281,14 +281,18 @@ if(settings.autoimport != "") { cputime(); -void nosetpagesize() { - if(latex()) { +void nosetpagesize() +{ + static bool initialized=false; + if(!initialized && latex()) { // Portably pass nosetpagesize option to graphicx package. - if(settings.tex == "lualatex") { - texpreamble("\ifx\pdfpagewidth\undefined\let\pdfpagewidth\paperwidth\fi"); - texpreamble("\ifx\pdfpageheight\undefined\let\pdfpageheight\paperheight\fi"); - } else - texpreamble("\let\paperwidthsave\paperwidth\let\paperwidth\undefined\usepackage{graphicx}\let\paperwidth\paperwidthsave"); + texpreamble("\usepackage{ifluatex}\ifluatex +\ifx\pdfpagewidth\undefined\let\pdfpagewidth\paperwidth\fi +\ifx\pdfpageheight\undefined\let\pdfpageheight\paperheight\fi\else +\let\paperwidthsave\paperwidth\let\paperwidth\undefined +\usepackage{graphicx} +\let\paperwidth\paperwidthsave\fi"); + initialized=true; } } diff --git a/Master/texmf-dist/asymptote/plain_pens.asy b/Master/texmf-dist/asymptote/plain_pens.asy index fcf9d31e638..627ce2e8c84 100644 --- a/Master/texmf-dist/asymptote/plain_pens.asy +++ b/Master/texmf-dist/asymptote/plain_pens.asy @@ -99,7 +99,7 @@ pen deepgreen=rgb(0,0.5,0); pen deepblue=rgb(0,0,0.5); pen deepcyan=rgb(0,0.5,0.5); pen deepmagenta=rgb(0.5,0,0.5); -pen olive=rgb(0.5,0.5,0); +pen deepyellow=rgb(0.5,0.5,0); pen deepgray=gray(0.1); pen darkred=rgb(0.25,0,0); @@ -123,6 +123,7 @@ pen royalblue=rgb(0,0.5,1); pen salmon=lightred; pen brown=deepred; +pen olive=deepyellow; pen darkbrown=darkred; pen pink=palemagenta; pen palegrey=palegray; diff --git a/Master/texmf-dist/asymptote/plain_picture.asy b/Master/texmf-dist/asymptote/plain_picture.asy index 5f4d759663a..f1dccbb8bea 100644 --- a/Master/texmf-dist/asymptote/plain_picture.asy +++ b/Master/texmf-dist/asymptote/plain_picture.asy @@ -1236,6 +1236,15 @@ void fill(picture pic=currentpicture, path[] g, pen p=currentpen, pic.addPath(g); } +void drawstrokepath(picture pic=currentpicture, path g, pen strokepen, + pen p=currentpen) +{ + pic.add(new void(frame f, transform t) { + draw(f,strokepath(t*g,strokepen),p); + },true); + pic.addPath(g,p); +} + void latticeshade(picture pic=currentpicture, path[] g, bool stroke=false, pen fillrule=currentpen, pen[][] p, bool copy=true) { diff --git a/Master/texmf-dist/asymptote/smoothcontour3.asy b/Master/texmf-dist/asymptote/smoothcontour3.asy index 4fe26654283..be6f900a4d1 100644 --- a/Master/texmf-dist/asymptote/smoothcontour3.asy +++ b/Master/texmf-dist/asymptote/smoothcontour3.asy @@ -1574,7 +1574,8 @@ surface implicitsurface(real f(triple) = null, real ff(real,real,real) = null, for (int i = 0; i < patches.length; ++i) { triple center = (patches[i].triangular ? patches[i].point(1/3, 1/3) : patches[i].point(1/2,1/2)); - patches[i] = shift(center) * scale3(1.01) * shift(-center) * patches[i]; + transform3 T=shift(center) * scale3(1.03) * shift(-center); + patches[i] = T * patches[i]; } } return surface(...patches); diff --git a/Master/texmf-dist/asymptote/solids.asy b/Master/texmf-dist/asymptote/solids.asy index 90f01dc935f..a52e9bd5079 100644 --- a/Master/texmf-dist/asymptote/solids.asy +++ b/Master/texmf-dist/asymptote/solids.asy @@ -408,5 +408,5 @@ revolution cone(triple c=O, real r, real h, triple axis=Z, int n=nslice) // Note: unitsphere provides a smoother and more efficient surface. revolution sphere(triple c=O, real r, int n=nslice) { - return revolution(c,Arc(c,r,180,0,0,0,Y,n),Z); + return revolution(c,Arc(c,r,180-sqrtEpsilon,0,sqrtEpsilon,0,Y,n),Z); } diff --git a/Master/texmf-dist/asymptote/three.asy b/Master/texmf-dist/asymptote/three.asy index 210ed55ddfe..01eec97976f 100644 --- a/Master/texmf-dist/asymptote/three.asy +++ b/Master/texmf-dist/asymptote/three.asy @@ -79,7 +79,7 @@ defaultrender.closed=false; defaultrender.tessellate=false; defaultrender.merge=false; defaultrender.margin=0.02; -defaultrender.tubegranularity=0.005; +defaultrender.tubegranularity=0.001; defaultrender.sphere=NURBSsphere; defaultrender.labelfill=true; defaultrender.partnames=false; @@ -218,7 +218,7 @@ triple perp(triple v) } // Return the transformation corresponding to moving the camera from the target -// (looking in the negative z direction) to the point 'eye' (looking at target), +// (looking in the negative z direction) to the point 'eye' (looking at target, // orienting the camera so that direction 'up' points upwards. // Since, in actuality, we are transforming the points instead of the camera, // we calculate the inverse matrix. diff --git a/Master/texmf-dist/asymptote/three_surface.asy b/Master/texmf-dist/asymptote/three_surface.asy index c6d439e9fb0..6e10246c774 100644 --- a/Master/texmf-dist/asymptote/three_surface.asy +++ b/Master/texmf-dist/asymptote/three_surface.asy @@ -1273,13 +1273,15 @@ patch subpatch(patch s, pair a, pair b) return patch(subpatch(s.P,a,b),s.straight,s.planar); } -// return an array containing an intersection times of path p and surface s. +// return an array containing the times for one intersection of path p and +// patch s. real[] intersect(path3 p, patch s, real fuzz=-1) { return intersect(p,s.P,fuzz); } -// return an array containing an intersection times of path p and surface s. +// return an array containing the times for one intersection of path p and +// surface s. real[] intersect(path3 p, surface s, real fuzz=-1) { for(int i=0; i < s.s.length; ++i) { @@ -1402,14 +1404,9 @@ void draw3D(frame f, int type=0, patch s, triple center=O, material m, if(prc()) PRCshininess=PRCshininess(m.shininess); - if(s.triangular) - drawbeziertriangle(f,s.P,center,s.straight && s.planar,m.p, - m.opacity,m.shininess,PRCshininess,s.colors, - interaction.type); - else - draw(f,s.P,center,s.straight && s.planar,m.p,m.opacity,m.shininess, - PRCshininess,s.planar ? s.normal(0.5,0.5) : O,s.colors, - interaction.type,prc); + (s.triangular ? drawbeziertriangle : draw) + (f,s.P,center,s.straight && s.planar,m.p,m.opacity,m.shininess, + PRCshininess,s.colors,interaction.type,prc); } // Draw triangles on a frame. diff --git a/Master/texmf-dist/asymptote/version.asy b/Master/texmf-dist/asymptote/version.asy index 971aacd2582..f94fcd38099 100644 --- a/Master/texmf-dist/asymptote/version.asy +++ b/Master/texmf-dist/asymptote/version.asy @@ -1 +1 @@ -string VERSION="2.38"; +string VERSION="2.41"; diff --git a/Master/texmf-dist/doc/asymptote/CAD.pdf b/Master/texmf-dist/doc/asymptote/CAD.pdf Binary files differindex a7b2400fd9b..30932b86142 100644 --- a/Master/texmf-dist/doc/asymptote/CAD.pdf +++ b/Master/texmf-dist/doc/asymptote/CAD.pdf diff --git a/Master/texmf-dist/doc/asymptote/TeXShopAndAsymptote.pdf b/Master/texmf-dist/doc/asymptote/TeXShopAndAsymptote.pdf Binary files differindex e6c32ee7055..1f5a1b68f65 100644 --- a/Master/texmf-dist/doc/asymptote/TeXShopAndAsymptote.pdf +++ b/Master/texmf-dist/doc/asymptote/TeXShopAndAsymptote.pdf diff --git a/Master/texmf-dist/doc/asymptote/asy-latex.pdf b/Master/texmf-dist/doc/asymptote/asy-latex.pdf Binary files differindex 7e15edf6287..a4175f6eefb 100644 --- a/Master/texmf-dist/doc/asymptote/asy-latex.pdf +++ b/Master/texmf-dist/doc/asymptote/asy-latex.pdf diff --git a/Master/texmf-dist/doc/asymptote/asyRefCard.pdf b/Master/texmf-dist/doc/asymptote/asyRefCard.pdf Binary files differindex b64189979a5..208c4eedc18 100644 --- a/Master/texmf-dist/doc/asymptote/asyRefCard.pdf +++ b/Master/texmf-dist/doc/asymptote/asyRefCard.pdf diff --git a/Master/texmf-dist/doc/asymptote/asymptote.pdf b/Master/texmf-dist/doc/asymptote/asymptote.pdf Binary files differindex 1b43272e3d9..49d678f6514 100644 --- a/Master/texmf-dist/doc/asymptote/asymptote.pdf +++ b/Master/texmf-dist/doc/asymptote/asymptote.pdf diff --git a/Master/texmf-dist/doc/asymptote/examples/BezierSaddle.asy b/Master/texmf-dist/doc/asymptote/examples/BezierSaddle.asy new file mode 100644 index 00000000000..f6c1d1895fc --- /dev/null +++ b/Master/texmf-dist/doc/asymptote/examples/BezierSaddle.asy @@ -0,0 +1,29 @@ +import three; + +size(300); + +patch p=patch(unstraighten(unitplane.s[0].external())); + +p.P[3][0]+=(0,0,1); + +p.P[1][0]+=(0,0,1/3); +p.P[2][0]+=(0,0,2/3); +p.P[3][1]+=(0,0,2/3); +p.P[3][2]+=(0,0,1/3); + +p.P[2][1]=interp(p.P[2][0],p.P[2][3],1/3); +p.P[2][2]=interp(p.P[2][0],p.P[2][3],2/3); + +p.P[1][1]=interp(p.P[1][0],p.P[1][3],1/3); +p.P[1][2]=interp(p.P[1][0],p.P[1][3],2/3); + +draw(surface(p),red+opacity(0.75)); + +void dot(triple[][] P) { + for(int i=0; i < 4; ++i) + for(int j=0; j < 4; ++j) { + draw(string(i)+","+string(j),P[i][j],linewidth(1mm)); + } +} + +dot(surface(p).s[0].P); diff --git a/Master/texmf-dist/doc/asymptote/examples/colorpatch.asy b/Master/texmf-dist/doc/asymptote/examples/colorpatch.asy new file mode 100644 index 00000000000..e0f6b5b4272 --- /dev/null +++ b/Master/texmf-dist/doc/asymptote/examples/colorpatch.asy @@ -0,0 +1,18 @@ +import three; +currentlight=Viewport; + +size(10cm); + +surface s=surface(patch(new triple[][] { + {(0,0,0),(1,0,0),(1,0,0),(2,0,0)}, + {(0,1,0),(1,0,1),(1,0,1),(2,1,0)}, + {(0,1,0),(1,0,-1),(1,0,-1),(2,1,0)}, + {(0,2,0),(1,2,0),(1,2,0),(2,2,0)}})); + +s.s[0].colors=new pen[] {red,green,blue,black}; +draw(s,nolight); + +surface t=shift(Z)*unitplane; +t.s[0].colors=new pen[] {red,green,blue,black}; + +draw(t,nolight); diff --git a/Master/texmf-dist/doc/asymptote/examples/washermethod.asy b/Master/texmf-dist/doc/asymptote/examples/washermethod.asy index d86bf8cd4df..c3177aa111e 100644 --- a/Master/texmf-dist/doc/asymptote/examples/washermethod.asy +++ b/Master/texmf-dist/doc/asymptote/examples/washermethod.asy @@ -5,7 +5,7 @@ currentprojection=perspective(0,0,11,up=Y); pen color1=green+opacity(0.25); pen color2=red; -real alpha=250; +real alpha=240; real f(real x) {return 2x^2-x^3;} pair F(real x) {return (x,f(x));} diff --git a/Master/texmf-dist/doc/info/asy-faq.info b/Master/texmf-dist/doc/info/asy-faq.info index b213a530b1e..67729d0b5f3 100644 --- a/Master/texmf-dist/doc/info/asy-faq.info +++ b/Master/texmf-dist/doc/info/asy-faq.info @@ -10,7 +10,7 @@ END-INFO-DIR-ENTRY File: asy-faq.info, Node: Top, Next: Question 1.1, Up: (dir) ASYMPTOTE FREQUENTLY ASKED QUESTIONS - 12 May 2016 + 22 Mar 2017 This is the list of Frequently Asked Questions about Asymptote (asy). diff --git a/Master/texmf-dist/doc/info/asymptote.info b/Master/texmf-dist/doc/info/asymptote.info index 68ca0b2a442..186c4c7f000 100644 --- a/Master/texmf-dist/doc/info/asymptote.info +++ b/Master/texmf-dist/doc/info/asymptote.info @@ -1,7 +1,7 @@ This is asymptote.info, produced by makeinfo version 6.0 from asymptote.texi. -This file documents 'Asymptote', version 2.38. +This file documents 'Asymptote', version 2.41. <http://asymptote.sourceforge.net> @@ -22,7 +22,7 @@ File: asymptote.info, Node: Top, Next: Description, Prev: (dir), Up: (dir) Asymptote ********* -This file documents 'Asymptote', version 2.38. +This file documents 'Asymptote', version 2.41. <http://asymptote.sourceforge.net> @@ -4454,6 +4454,14 @@ string s=(string) 2.5; real[] a={2.5,-3.5}; int[] b=(int []) a; write(stdout,b); // Outputs 2,-3 + In situations where casting from a string to a type 'T' fails, an +uninitialized variable is returned; this condition can be detected with +the function 'bool initialized(T);' +int i=(int) "2.5"; +assert(initialized(i),"Invalid cast."); + +real x=(real) "2.5a"; +assert(initialized(x),"Invalid cast."); Casting to user-defined types is also possible using 'operator cast': struct rpair { @@ -4476,9 +4484,9 @@ some code one wants all integers to represent multiples of 100. To convert them to reals, one would first want to multiply them by 100. However, the straightforward implementation real operator cast(int x) {return x*100;} - is equivalent to an infinite recursion, since the result 'x*100' -needs itself to be cast from an integer to a real. Instead, we want to -use the standard conversion of int to real: +is equivalent to an infinite recursion, since the result 'x*100' needs +itself to be cast from an integer to a real. Instead, we want to use +the standard conversion of int to real: real convert(int x) {return x*100;} real operator cast(int x)=convert; @@ -4741,7 +4749,7 @@ File: asymptote.info, Node: LaTeX usage, Next: Base modules, Prev: Programmin *************** 'Asymptote' comes with a convenient 'LaTeX' style file 'asymptote.sty' -(v1.30 or later required) that makes 'LaTeX' 'Asymptote'-aware. +(v1.33 or later required) that makes 'LaTeX' 'Asymptote'-aware. Entering 'Asymptote' code directly into the 'LaTeX' source file, at the point where it is needed, keeps figures organized and avoids the need to invent new file names for each figure. Simply add the line @@ -9523,8 +9531,8 @@ Index * 'operator --': graph. (line 30) * 'operator ..': graph. (line 33) * 'operator answer': Interactive mode. (line 35) -* 'operator cast': Casts. (line 30) -* 'operator ecast': Casts. (line 57) +* 'operator cast': Casts. (line 38) +* 'operator ecast': Casts. (line 65) * 'operator init': Variable initializers. (line 6) * 'operator init' <1>: Structures. (line 134) @@ -10159,78 +10167,78 @@ Ref: tridiagonal173531 Ref: solve174762 Node: Slices178901 Node: Casts182809 -Node: Import184780 -Node: Static190027 -Node: LaTeX usage192920 -Node: Base modules199425 -Node: plain201982 -Node: simplex202656 -Node: math202930 -Node: interpolate205639 -Node: geometry205918 -Node: trembling206512 -Node: stats206781 -Node: patterns207041 -Node: markers207277 -Node: tree209137 -Node: binarytree209322 -Node: drawtree209988 -Node: syzygy210189 -Node: feynman210463 -Node: roundedpath210738 -Node: animation211021 -Ref: animate211442 -Node: embed212559 -Node: slide213514 -Node: MetaPost213855 -Node: unicode214574 -Node: latin1215448 -Node: babel215817 -Node: labelpath216047 -Node: labelpath3216868 -Node: annotate217179 -Node: CAD217649 -Node: graph217960 -Ref: ticks225110 -Ref: pathmarkers238742 -Ref: marker239212 -Ref: markuniform239566 -Ref: errorbars241364 -Ref: automatic scaling245648 -Node: palette256924 -Ref: images257042 -Ref: image261216 -Ref: logimage261736 -Ref: penimage262841 -Ref: penfunctionimage263103 -Node: three263874 -Ref: PostScript3D290883 -Node: obj292622 -Node: graph3292871 -Ref: GaussianSurface298150 -Node: grid3299299 -Node: solids300083 -Node: tube301075 -Node: flowchart303309 -Node: contour307917 -Node: contour3313228 -Node: smoothcontour3313541 -Node: slopefield315260 -Node: ode316748 -Node: Options317005 -Ref: configuration file323168 -Ref: settings323168 -Ref: texengines324411 -Ref: convert324411 -Node: Interactive mode327734 -Ref: history329883 -Node: GUI331187 -Node: GUI installation331738 -Node: GUI usage332649 -Node: PostScript to Asymptote333557 -Node: Help334315 -Node: Debugger335969 -Node: Credits337725 -Node: Index338707 +Node: Import185076 +Node: Static190323 +Node: LaTeX usage193216 +Node: Base modules199721 +Node: plain202278 +Node: simplex202952 +Node: math203226 +Node: interpolate205935 +Node: geometry206214 +Node: trembling206808 +Node: stats207077 +Node: patterns207337 +Node: markers207573 +Node: tree209433 +Node: binarytree209618 +Node: drawtree210284 +Node: syzygy210485 +Node: feynman210759 +Node: roundedpath211034 +Node: animation211317 +Ref: animate211738 +Node: embed212855 +Node: slide213810 +Node: MetaPost214151 +Node: unicode214870 +Node: latin1215744 +Node: babel216113 +Node: labelpath216343 +Node: labelpath3217164 +Node: annotate217475 +Node: CAD217945 +Node: graph218256 +Ref: ticks225406 +Ref: pathmarkers239038 +Ref: marker239508 +Ref: markuniform239862 +Ref: errorbars241660 +Ref: automatic scaling245944 +Node: palette257220 +Ref: images257338 +Ref: image261512 +Ref: logimage262032 +Ref: penimage263137 +Ref: penfunctionimage263399 +Node: three264170 +Ref: PostScript3D291179 +Node: obj292918 +Node: graph3293167 +Ref: GaussianSurface298446 +Node: grid3299595 +Node: solids300379 +Node: tube301371 +Node: flowchart303605 +Node: contour308213 +Node: contour3313524 +Node: smoothcontour3313837 +Node: slopefield315556 +Node: ode317044 +Node: Options317301 +Ref: configuration file323464 +Ref: settings323464 +Ref: texengines324707 +Ref: convert324707 +Node: Interactive mode328030 +Ref: history330179 +Node: GUI331483 +Node: GUI installation332034 +Node: GUI usage332945 +Node: PostScript to Asymptote333853 +Node: Help334611 +Node: Debugger336265 +Node: Credits338021 +Node: Index339003 End Tag Table diff --git a/Master/texmf-dist/doc/man/man1/asy.man1.pdf b/Master/texmf-dist/doc/man/man1/asy.man1.pdf Binary files differindex 888bf33d69e..0cccc39029f 100644 --- a/Master/texmf-dist/doc/man/man1/asy.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/asy.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/xasy.man1.pdf b/Master/texmf-dist/doc/man/man1/xasy.man1.pdf Binary files differindex 1b11bac62b1..1e7bf0ace3a 100644 --- a/Master/texmf-dist/doc/man/man1/xasy.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/xasy.man1.pdf diff --git a/Master/texmf-dist/tex/latex/asymptote/asymptote.sty b/Master/texmf-dist/tex/latex/asymptote/asymptote.sty index 39a781598bc..715a291e8ac 100644 --- a/Master/texmf-dist/tex/latex/asymptote/asymptote.sty +++ b/Master/texmf-dist/tex/latex/asymptote/asymptote.sty @@ -17,7 +17,7 @@ %% Licence: GPL2+ %% \ProvidesPackage{asymptote} - [2016/11/14 v1.32 Asymptote style file for LaTeX] + [2016/11/26 v1.33 Asymptote style file for LaTeX] \def\Asymptote{{\tt Asymptote}} \InputIfFileExists{\jobname.pre}{}{} \newbox\ASYbox @@ -222,10 +222,8 @@ if(!settings.multipleView) settings.batchView=false;^^J% \ifxetex settings.tex="xelatex";^^J% - nosetpagesize();^^J% \else\ifASYPDF settings.tex="pdflatex";^^J% - nosetpagesize();^^J% \fi\fi \ifASYinline settings.inlinetex=true;^^J% diff --git a/Master/tlpkg/asymptote/asy.exe b/Master/tlpkg/asymptote/asy.exe Binary files differindex a99e5a4714e..bfd26f3f847 100755 --- a/Master/tlpkg/asymptote/asy.exe +++ b/Master/tlpkg/asymptote/asy.exe diff --git a/Master/tlpkg/bin/tl-update-asy b/Master/tlpkg/bin/tl-update-asy index f4321e32207..ba03b39bf10 100755 --- a/Master/tlpkg/bin/tl-update-asy +++ b/Master/tlpkg/bin/tl-update-asy @@ -15,6 +15,7 @@ ver=... # the newly-released version, from revision.cc test "x$1" = x--build || exit 1 +renice +19 -p $$ >/dev/null 2>&1 # if false && $update_sources_from_ctan; then @@ -61,17 +62,17 @@ elif test "x$1" = x--build; then $svn revert doc/asy-latex.pdf rm -f Makefile fi - rm -rf config.h config.log config.status errors.temp autom4te.cache - rm -rf /tmp/ainst + rm -rf config.cache config.h config.log config.status errors.temp + rm -rf /tmp/ainst autom4te.cache # these configure options represent what is intended to be supported - # in the i386-linux build. + # in the x86_64-linux build. ASYMPTOTE_EPSDRIVER=epswrite; export ASYMPTOTE_EPSDRIVER - ./configure --prefix=/tmp/ainst \ + ./configure -C --prefix=/tmp/ainst \ --with-latex=/tmp/ainst/latex --with-context=/tmp/ainst/context \ --enable-fftw --enable-gl --enable-gsl \ --enable-texlive-build CFLAGS=-g CXXFLAGS=-ansi - nice make - nice make check + make + make check make install-prebuilt test ! -r .git || mv dot.git .git exit 0 @@ -99,6 +100,8 @@ elif false && $update_runtime_from_ainst; then $cp latex/asymptote/* $xist/tex/latex/asymptote/ $cp context*/asymptote/* $xist/tex/context/third/asymptote/ # + # also copy in i386-linux binaryfrom build machine. + lb=$xb/x86_64-linux $cp bin/asy $lb/ strip $lb/asy @@ -107,7 +110,7 @@ elif false && $update_runtime_from_ainst; then ci="$xu/README \ $xy \ - $lb/asy $pg/asymptote/ \ + $xb/i386-linux $lb $pg/asymptote/ \ $xist/doc/info/ $xist/doc/man $xist/doc/asymptote \ $xist/asymptote/ $xist/tex/*/asymptote" |