diff options
Diffstat (limited to 'Master')
26 files changed, 372 insertions, 468 deletions
diff --git a/Master/bin/i386-cygwin/asy.exe b/Master/bin/i386-cygwin/asy.exe Binary files differindex 3daf4a36e76..01deb9e10d0 100755 --- a/Master/bin/i386-cygwin/asy.exe +++ b/Master/bin/i386-cygwin/asy.exe diff --git a/Master/texmf/asymptote/GUI/xasyVersion.py b/Master/texmf/asymptote/GUI/xasyVersion.py index 8183dae8688..105c268b68a 100755 --- a/Master/texmf/asymptote/GUI/xasyVersion.py +++ b/Master/texmf/asymptote/GUI/xasyVersion.py @@ -1,2 +1,2 @@ #!/usr/bin/env python -xasyVersion = "2.01" +xasyVersion = "2.02" diff --git a/Master/texmf/asymptote/asy-keywords.el b/Master/texmf/asymptote/asy-keywords.el index 1b4365b88f5..bce38beaa05 100644 --- a/Master/texmf/asymptote/asy-keywords.el +++ b/Master/texmf/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.01") +(defvar asy-keywords-version "2.02") (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 Segment Solution TreeNode abscissa arc arrowhead binarytree binarytreeNode block bool bool3 bounds bqe circle conic coord coordsys cputime ellipse file filltype frame grid3 guide horner hsv hyperbola indexedTransform int inversion key light line linefit marginT marker mass object pair parabola path path3 pen picture point position 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 Automatic AvantGarde 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 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 Link 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 Segment 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 _image _labelpath _projection _strokepath _texpath aCos aSin aTan abort abs accel acos acosh acot acsc activatequote add addArrow addMargins addSaveFunction addnode addnodes addpenarc addpenline adjust alias align all altitude angabscissa angle 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 asec asin asinh ask assert asy asycode asydir asyfigure asyfilecode asyinclude asywrite atan atan2 atanh atbreakpoint atexit atime 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 binput bins bisector bisectorpoint bispline blend blockconnector boutput box bqe breakpoint breakpoints brick buildRestoreDefaults buildRestoreThunk buildcycle bulletcolor byte canonical canonicalcartesiansystem cartesiansystem case1 case2 case3 case4 cbrt cd ceil center centerToFocus centroid cevian change2 changecoordsys checkSegment checkconditionlength checker checkincreasing checklengths checkposition 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 connected connectedindex containmentTree contains contour contour3 contouredges controlSpecifier convert coordinates coordsys copy 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 drawline drawtick duplicate elle ellipse ellipsenodesnumber embed embed3 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 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 gray grestore grid grid3 gsave halfbox hatch hdiffdiv hermite hex histogram history hline hprojection hsv hyperbola hyperbolanodesnumber hyperlink hypot identity image incenter incentral incircle increasing incrementposition indexedTransform indexedfigure initXasyMode initdefaults input inradius insert inside integrate interactive interior interp interpolate intersect intersection intersectionpoint intersectionpoints intersections intouch inverse inversion invisible is3D isCCW isDuplicate isogonal isogonalconjugate isotomic isotomicconjugate isparabola italic item 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 magnetize makeNode makedraw makepen map margin markangle markangleradius markanglespace markarc marker markinterval marknodes markrightangle markuniform mass masscenter massformat math max max3 maxbezier maxbound maxcoords maxlength maxratio maxtimes mean medial median midpoint min min3 minbezier minbound minipage minratio mintimes miterlimit momArrowPath momarrowsize monotonic multifigure nativeformat natural needshipout newl newpage newslide newton newtree nextframe nextnormal nextpage nib nodabscissa none norm normalvideo notaknot nowarn numberpage nurb object offset onpath opacity opposite orientation orig_circlenodesnumber orig_circlenodesnumber1 orig_draw orig_ellipsenodesnumber orig_ellipsenodesnumber1 orig_hyperbolanodesnumber orig_parabolanodesnumber origin orthic orthocentercenter outformat outline outname outprefix output overloadedMessage overwrite pack pad pairs palette parabola parabolanodesnumber parallel parallelogram partialsum path path3 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 precision precontrol prepend print_random_addresses project projection purge pwhermite 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 same samecoordsys sameside sample save savedefaults saveline scale scale3 scaleO scaleT scaleless scientific search searchindex searchtree sec secondaryX secondaryY seconds section sector seek seekeof segment sequence setcontour setpens sgn sgnd sharpangle sharpdegrees shift shiftless shipout shipout3 show side simeq simpson sin single sinh size size3 skewness skip slant sleep slope slopefield solve solveBVP sort sourceline sphere split sqrt square srand standardizecoordsys startScript startTrembling stdev step stickframe stickmarksize stickmarkspace stop straight straightness string stripdirectory stripextension stripfile 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 tremble trembleFuzz tremble_circlenodesnumber tremble_circlenodesnumber1 tremble_draw tremble_ellipsenodesnumber tremble_ellipsenodesnumber1 tremble_hyperbolanodesnumber tremble_marknodes tremble_markuniform tremble_parabolanodesnumber triangle triangleAbc triangleabc triangulate tricoef tridiagonal trilinear trim trueMagnetize 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 xinput xlimits xoutput 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 Automatic AvantGarde 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 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 Link 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 Segment 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 _image _labelpath _projection _strokepath _texpath aCos aSin aTan abort abs accel acos acosh acot acsc activatequote add addArrow addMargins addSaveFunction addnode addnodes addpenarc addpenline adjust alias align all altitude angabscissa angle 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 asec asin asinh ask assert asy asycode asydir asyfigure asyfilecode asyinclude asywrite atan atan2 atanh atbreakpoint atexit atime 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 binput bins bisector bisectorpoint bispline blend blockconnector boutput box bqe breakpoint breakpoints brick buildRestoreDefaults buildRestoreThunk buildcycle bulletcolor byte canonical canonicalcartesiansystem cartesiansystem case1 case2 case3 case4 cbrt cd ceil center centerToFocus centroid cevian change2 changecoordsys checkSegment checkconditionlength checker checkincreasing checklengths checkposition 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 connected connectedindex containmentTree contains contour contour3 contouredges controlSpecifier convert coordinates coordsys copy 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 drawline drawtick duplicate elle ellipse ellipsenodesnumber embed embed3 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 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 gray grestore grid grid3 gsave halfbox hatch hdiffdiv hermite hex histogram history hline hprojection hsv hyperbola hyperbolanodesnumber hyperlink hypot identity image incenter incentral incircle increasing incrementposition indexedTransform indexedfigure initXasyMode initdefaults input inradius insert inside integrate interactive interior interp interpolate intersect intersection intersectionpoint intersectionpoints intersections intouch inverse inversion invisible is3D isCCW isDuplicate isogonal isogonalconjugate isotomic isotomicconjugate isparabola italic item 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 magnetize makeNode makedraw makepen map margin markangle markangleradius markanglespace markarc marker markinterval marknodes markrightangle markuniform mass masscenter massformat math max max3 maxbezier maxbound maxcoords maxlength maxratio maxtimes mean medial median midpoint min min3 minbezier minbound minipage minratio mintimes miterlimit momArrowPath momarrowsize monotonic multifigure nativeformat natural needshipout newl newpage newslide newton newtree nextframe nextnormal nextpage nib nodabscissa none norm normalvideo notaknot nowarn numberpage nurb object offset onpath opacity opposite orientation orig_circlenodesnumber orig_circlenodesnumber1 orig_draw orig_ellipsenodesnumber orig_ellipsenodesnumber1 orig_hyperbolanodesnumber orig_parabolanodesnumber origin orthic orthocentercenter outformat outline outname outprefix output overloadedMessage overwrite pack pad pairs palette parabola parabolanodesnumber parallel parallelogram partialsum path path3 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 precision precontrol prepend print_random_addresses project projection purge pwhermite 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 same samecoordsys sameside sample save savedefaults saveline scale scale3 scaleO scaleT scaleless scientific search searchindex searchtree sec secondaryX secondaryY seconds section sector seek seekeof segment sequence setcontour setpens sgn sgnd sharpangle sharpdegrees shift shiftless shipout shipout3 show side simeq simpson sin single sinh size size3 skewness skip slant sleep slope slopefield solve solveBVP sort sourceline sphere split sqrt square srand standardizecoordsys startScript startTrembling 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 tremble trembleFuzz tremble_circlenodesnumber tremble_circlenodesnumber1 tremble_draw tremble_ellipsenodesnumber tremble_ellipsenodesnumber1 tremble_hyperbolanodesnumber tremble_marknodes tremble_markuniform tremble_parabolanodesnumber triangle triangleAbc triangleabc triangulate tricoef tridiagonal trilinear trim trueMagnetize 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 xinput xlimits xoutput 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 )) (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 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 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 XYAlign YAlign Yellow YellowGreen YellowOrange 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 beveljoin bigvertexpen bigvertexsize black blue bm bottom bp 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 diagnostics differentlengths dot dotfactor dotframe dotted doublelinepen doublelinespacing down duplicateFuzz edge ellipsenodesnumberfactor eps epsgeo epsilon evenodd extendcap exterior fermionpen figureborder figuremattpen firstnode firststep foregroundcolor fuchsia fuzz gapfactor ghostpen gluonamplitude gluonpen gluonratio gray green grey hatchepsilon havepagenumber heavyblue heavycyan heavygray heavygreen heavygrey heavymagenta heavyred hline hwratio hyperbola hyperbolanodesnumberfactor identity4 ignore inXasyMode inch inches includegraphicscommand inf infinity institutionpen intMax intMin interior invert invisible itempen itemskip itemstep labelmargin landscape lastnode left legendhskip legendlinelength legendmargin legendmarkersize legendmaxrelativewidth legendvskip lightblue lightcyan lightgray lightgreen lightgrey lightmagenta lightolive lightred lightyellow line linemargin lm_infmsg lm_shortmsg longdashdotted longdashed magenta magneticPoints magneticRadius mantissaBits markangleradius markangleradiusfactor markanglespace markanglespacefactor 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 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 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 springgreen sqrtEpsilon squarecap squarepen startposition stdin stdout stepfactor stepfraction steppagenumberpen stepping stickframe stickmarksizefactor stickmarkspacefactor textpen ticksize tildeframe tildemarksizefactor tinv titlealign titlepagepen titlepageposition titlepen titleskip top trailingzero treeLevelStep treeMinNodeWidth treeNodeStep trembleAngle trembleFrequency trembleRandom tremblingMode undefined unitcircle unitsquare up urlpen urlskip version vertexpen vertexsize viewportmargin viewportsize vline white wye xformStack yellow ylabelwidth zerotickfuzz zerowinding )) diff --git a/Master/texmf/asymptote/plain.asy b/Master/texmf/asymptote/plain.asy index 76f77aaf52c..e06bc66543c 100644 --- a/Master/texmf/asymptote/plain.asy +++ b/Master/texmf/asymptote/plain.asy @@ -187,22 +187,31 @@ void usersetting() eval(settings.user,true); } +string stripsuffix(string f, string suffix=".asy") +{ + int n=rfind(f,suffix); + if(n != -1) f=erase(f,n,-1); + return f; +} + // Conditionally process each file name in array s in a new environment. void asy(string format, bool overwrite=false ... string[] s) { for(string f : s) { - int n=rfind(f,".asy"); - if(n != -1) f=erase(f,n,-1); - if(overwrite || error(input(f+"."+format,check=false))) { + f=stripsuffix(f); + string suffix="."+format; + string fsuffix=f+suffix; + if(overwrite || error(input(fsuffix,check=false))) { string outformat=settings.outformat; bool interactiveView=settings.interactiveView; bool batchView=settings.batchView; settings.outformat=format; settings.interactiveView=false; settings.batchView=false; - delete(outname()+"_"+".aux"); - eval("defaultfilename=\""+f+"\"; import \""+f+ - "\" as dummy; exitfunction()"); + string outname=outname(); + delete(outname+"_"+".aux"); + eval("import \""+f+"\" as dummy"); + rename(stripsuffix(outname)+suffix,fsuffix); settings.outformat=outformat; settings.interactiveView=interactiveView; settings.batchView=batchView; @@ -210,7 +219,8 @@ void asy(string format, bool overwrite=false ... string[] s) } } -void beep() { +void beep() +{ write('\7',flush); } diff --git a/Master/texmf/asymptote/plain_Label.asy b/Master/texmf/asymptote/plain_Label.asy index 86d11f8acc0..623619f4a0c 100644 --- a/Master/texmf/asymptote/plain_Label.asy +++ b/Master/texmf/asymptote/plain_Label.asy @@ -625,6 +625,7 @@ path[] texpath(Label L, bool tex=settings.tex != "none", bool bbox=false) } path[] transform(path[] g, Label L) { + if(g.length == 0) return g; pair m=min(g); pair M=max(g); pair dir=rectify(inverse(L.T)*-L.align.dir); diff --git a/Master/texmf/asymptote/plain_picture.asy b/Master/texmf/asymptote/plain_picture.asy index 2ec467727d2..6764d885380 100644 --- a/Master/texmf/asymptote/plain_picture.asy +++ b/Master/texmf/asymptote/plain_picture.asy @@ -36,7 +36,6 @@ transform3 shiftless(transform3 t) // coordinates. struct coord { real user,truesize; - bool finite=true; // Build a coord. static coord build(real user, real truesize) { @@ -88,14 +87,13 @@ struct coords2 { void push(transform t, coords2 c1, coords2 c2) { for(int i=0; i < c1.x.length; ++i) { coord cx=c1.x[i], cy=c2.y[i]; - pair tinf=shiftless(t)*((finite(cx.user) ? 0 : 1), - (finite(cy.user) ? 0 : 1)); + pair tinf=shiftless(t)*(0,0); pair z=t*(cx.user,cy.user); pair w=(cx.truesize,cy.truesize); w=length(w)*unit(shiftless(t)*w); coord Cx,Cy; - Cx.user=(tinf.x == 0 ? z.x : infinity); - Cy.user=(tinf.y == 0 ? z.y : infinity); + Cx.user=z.x; + Cy.user=z.y; Cx.truesize=w.x; Cy.truesize=w.y; push(Cx,Cy); @@ -145,16 +143,14 @@ struct coords3 { void push(transform3 t, coords3 c1, coords3 c2, coords3 c3) { for(int i=0; i < c1.x.length; ++i) { coord cx=c1.x[i], cy=c2.y[i], cz=c3.z[i]; - triple tinf=shiftless(t)*((finite(cx.user) ? 0 : 1), - (finite(cy.user) ? 0 : 1), - (finite(cz.user) ? 0 : 1)); + triple tinf=shiftless(t)*(0,0,0); triple z=t*(cx.user,cy.user,cz.user); triple w=(cx.truesize,cy.truesize,cz.truesize); w=length(w)*unit(shiftless(t)*w); coord Cx,Cy,Cz; - Cx.user=(tinf.x == 0 ? z.x : infinity); - Cy.user=(tinf.y == 0 ? z.y : infinity); - Cz.user=(tinf.z == 0 ? z.z : infinity); + Cx.user=z.x; + Cy.user=z.y; + Cz.user=z.z; Cx.truesize=w.x; Cy.truesize=w.y; Cz.truesize=w.z; @@ -185,18 +181,13 @@ coord[] maxcoords(coord[] in, bool operator <= (coord,coord)) int n=in.length; - // Find the first finite restriction. - int first=0; - for(first=0; first < n; ++first) - if(finite(in[first].user)) break; - - if(first == n) + if(n == 0) return c; - else { - // Add the first coord without checking restrictions (as there are none). - best=in[first]; - c.push(best); - } + + int first=0; + // Add the first coord without checking restrictions (as there are none). + best=in[first]; + c.push(best); static int NONE=-1; @@ -234,7 +225,7 @@ coord[] maxcoords(coord[] in, bool operator <= (coord,coord)) void add(coord x) { - if(x <= best || !finite(x.user)) + if(x <= best) return; else { int i=dominator(x); @@ -957,7 +948,7 @@ struct picture { // Calculate the minimum point in scaling the coords. real min(real m, scaling s, coord[] c) { for(int i=0; i < c.length; ++i) - if(finite(c[i].user) && s.scale(c[i]) < m) + if(s.scale(c[i]) < m) m=s.scale(c[i]); return m; } @@ -965,7 +956,7 @@ struct picture { // Calculate the maximum point in scaling the coords. real max(real M, scaling s, coord[] c) { for(int i=0; i < c.length; ++i) - if(finite(c[i].user) && s.scale(c[i]) > M) + if(s.scale(c[i]) > M) M=s.scale(c[i]); return M; } @@ -1062,8 +1053,6 @@ struct picture { bool userzero=true; for(int i=0; i < coords.length; ++i) { if(coords[i].user != 0) userzero=false; - if(!finite(coords[i].user) || !finite(coords[i].truesize)) - abort("unbounded picture"); } if(userzero) return 1; warning("cannotfit","cannot fit picture to "+dir+"size "+(string) size diff --git a/Master/texmf/asymptote/version.asy b/Master/texmf/asymptote/version.asy index 46cd98e4887..4a0037a691b 100644 --- a/Master/texmf/asymptote/version.asy +++ b/Master/texmf/asymptote/version.asy @@ -1 +1 @@ -string VERSION="2.01"; +string VERSION="2.02"; diff --git a/Master/texmf/doc/asymptote/CAD.pdf b/Master/texmf/doc/asymptote/CAD.pdf Binary files differindex 327f2ff3b0b..59b899d3388 100644 --- a/Master/texmf/doc/asymptote/CAD.pdf +++ b/Master/texmf/doc/asymptote/CAD.pdf diff --git a/Master/texmf/doc/asymptote/asymptote.pdf b/Master/texmf/doc/asymptote/asymptote.pdf Binary files differindex d4a834d8dde..d480d1c6d84 100644 --- a/Master/texmf/doc/asymptote/asymptote.pdf +++ b/Master/texmf/doc/asymptote/asymptote.pdf diff --git a/Master/texmf/doc/asymptote/examples/animations/inlinemovie.tex b/Master/texmf/doc/asymptote/examples/animations/inlinemovie.tex index f3d9f5b0893..5f1eff9d4bb 100644 --- a/Master/texmf/doc/asymptote/examples/animations/inlinemovie.tex +++ b/Master/texmf/doc/asymptote/examples/animations/inlinemovie.tex @@ -7,9 +7,13 @@ Here is an inline PDF movie, generated with the commands \begin{verbatim} pdflatex inlinemovie -asy inlinemovie +asy inlinemovie-*.asy pdflatex inlinemovie \end{verbatim} +or equivalently, +\begin{verbatim} +latexmk -pdf inlinemovie +\end{verbatim} \begin{center} \begin{asy} diff --git a/Master/texmf/doc/asymptote/examples/animations/inlinemovie3.tex b/Master/texmf/doc/asymptote/examples/animations/inlinemovie3.tex index 46779e85b28..5131c652a11 100644 --- a/Master/texmf/doc/asymptote/examples/animations/inlinemovie3.tex +++ b/Master/texmf/doc/asymptote/examples/animations/inlinemovie3.tex @@ -7,9 +7,13 @@ Here is an inline 3D PDF movie, generated with the commands \begin{verbatim} pdflatex inlinemovie3 -asy inlinemovie3 +asy inlinemovie3-*.asy pdflatex inlinemovie3 \end{verbatim} +or equivalently, +\begin{verbatim} +latexmk -pdf inlinemovie3 +\end{verbatim} \begin{center} \begin{asy} diff --git a/Master/texmf/doc/asymptote/examples/cards.asy b/Master/texmf/doc/asymptote/examples/cards.asy new file mode 100644 index 00000000000..337a886ec86 --- /dev/null +++ b/Master/texmf/doc/asymptote/examples/cards.asy @@ -0,0 +1,26 @@ +picture rect; + +size(rect,0,2.5cm); + +real x=1; +real y=1.25; + +filldraw(rect,box((-x,-y)/2,(x,y)/2),lightolive); + +label(rect,"1",(-x,y)*0.45,SE); +label(rect,"2",(x,y)*0.45,SW); +label(rect,"3",(-x,-y)*0.45,NE); +label(rect,"4",(x,-y)*0.45,NW); + +frame rectf=rect.fit(); +frame toplef=rectf; +frame toprig=xscale(-1)*rectf; +frame botlef=yscale(-1)*rectf; +frame botrig=xscale(-1)*yscale(-1)*rectf; + +size(0,7.5cm); + +add(toplef,(-x,y)); +add(toprig,(x,y)); +add(botlef,(-x,-y)); +add(botrig,(x,-y)); diff --git a/Master/texmf/doc/asymptote/examples/externalprc.tex b/Master/texmf/doc/asymptote/examples/externalprc.tex index 96643d7cebf..e6d4ade1dcf 100644 --- a/Master/texmf/doc/asymptote/examples/externalprc.tex +++ b/Master/texmf/doc/asymptote/examples/externalprc.tex @@ -5,8 +5,8 @@ % asy -inlineimage teapot -render=4 -tex pdflatex % \documentclass[12pt]{article} -\input teapot_.pre +\input teapot.pre \RequirePackage{color,graphicx} \begin{document} -\input teapot_.tex +\input teapot.tex \end{document} diff --git a/Master/texmf/doc/asymptote/examples/intro.asy b/Master/texmf/doc/asymptote/examples/intro.asy index 20b03c578dc..5d7ce12b184 100644 --- a/Master/texmf/doc/asymptote/examples/intro.asy +++ b/Master/texmf/doc/asymptote/examples/intro.asy @@ -352,13 +352,9 @@ item("Having prescribed outgoing and incoming path directions $e^{i\theta}$ at node~$z_0$ and $e^{i\phi}$ at node $z_1$ relative to the vector $z_1-z_0$, the control points are determined as:"); -skip(-3); - equations("u&=&z_0+e^{i\theta}(z_1-z_0)f(\theta,-\phi),\nonumber\\ v&=&z_1-e^{i\phi}(z_1-z_0)f(-\phi,\theta),"); -skip(-3); - remark("where the relative distance function $f(\theta,\phi)$ is given by Hobby [1986]."); asyfigure("Hobbycontrol","height=9cm"); @@ -376,9 +372,13 @@ equation("\displaystyle x(t)=\sum_{k=0}^3 B_k(t) P_k, \qquad t\in [0,1]."); item("The resulting curve is also a B\'ezier curve:"); +skip(-2); + equations("x'_i(t)&=&\sum_{k=0}^3 B_k(t) A_{ij}(P_k)_j+C_i\nonumber\\ &=&\sum_{k=0}^3 B_k(t) P'_k,"); +skip(-2); + remark("where $P'_k$ is the transformed $k^{\rm th}$ control point, noting $\displaystyle\sum_{k=0}^3 B_k(t)=1.$"); } diff --git a/Master/texmf/doc/asymptote/examples/latexusage-1.asy b/Master/texmf/doc/asymptote/examples/latexusage-1.asy deleted file mode 100644 index 7f0d6a2b3aa..00000000000 --- a/Master/texmf/doc/asymptote/examples/latexusage-1.asy +++ /dev/null @@ -1,55 +0,0 @@ -if(!settings.multipleView) - settings.batchView=false; -defaultfilename="latexusage-1"; -if(settings.render < 0) settings.render=4; -settings.inlineimage=true; -settings.embed=true; -settings.outformat=""; -settings.toolbar=false; -viewportmargin=(2,2); - -// Global Asymptote definitions can be put here. -import three; -usepackage("bm"); -texpreamble("\def\V#1{\bm{#1}}"); -// One can globally override the default toolbar settings here: -// settings.toolbar=true; - -size(4cm,0); -pen colour1=red; -pen colour2=green; - -pair z0=(0,0); -pair z1=(-1,0); -pair z2=(1,0); -real r=1.5; -path c1=circle(z1,r); -path c2=circle(z2,r); -fill(c1,colour1); -fill(c2,colour2); - -picture intersection=new picture; -fill(intersection,c1,colour1+colour2); -clip(intersection,c2); - -add(intersection); - -draw(c1); -draw(c2); - -//draw("$\A$",box,z1); // Requires [inline] package option. -//draw(Label("$\B$","$B$"),box,z2); // Requires [inline] package option. -draw("$A$",box,z1); -draw("$\V{B}$",box,z2); - -pair z=(0,-2); -real m=3; -margin BigMargin=Margin(0,m*dot(unit(z1-z),unit(z0-z))); - -draw(Label("$A\cap B$",0),conj(z)--z0,Arrow,BigMargin); -draw(Label("$A\cup B$",0),z--z0,Arrow,BigMargin); -draw(z--z1,Arrow,Margin(0,m)); -draw(z--z2,Arrow,Margin(0,m)); - -shipout(bbox(0.25cm)); -viewportsize=(390.0pt,0); diff --git a/Master/texmf/doc/asymptote/examples/latexusage-2.asy b/Master/texmf/doc/asymptote/examples/latexusage-2.asy deleted file mode 100644 index b91be72419f..00000000000 --- a/Master/texmf/doc/asymptote/examples/latexusage-2.asy +++ /dev/null @@ -1,23 +0,0 @@ -if(!settings.multipleView) - settings.batchView=false; -defaultfilename="latexusage-2"; -if(settings.render < 0) settings.render=4; -settings.inlineimage=true; -settings.embed=true; -settings.outformat=""; -settings.toolbar=false; -viewportmargin=(2,2); - -// Global Asymptote definitions can be put here. -import three; -usepackage("bm"); -texpreamble("\def\V#1{\bm{#1}}"); -// One can globally override the default toolbar settings here: -// settings.toolbar=true; - - -currentprojection=orthographic(5,4,2); -draw(unitcube,blue); -label("$V-E+F=2$",(0,1,0.5),3Y,blue+fontsize(17pt)); -size(0,4cm); -viewportsize=(390.0pt,0); diff --git a/Master/texmf/doc/asymptote/examples/latexusage-3.asy b/Master/texmf/doc/asymptote/examples/latexusage-3.asy deleted file mode 100644 index d3990c9cbfb..00000000000 --- a/Master/texmf/doc/asymptote/examples/latexusage-3.asy +++ /dev/null @@ -1,38 +0,0 @@ -if(!settings.multipleView) - settings.batchView=false; -defaultfilename="latexusage-3"; -if(settings.render < 0) settings.render=4; -settings.inlineimage=true; -settings.embed=true; -settings.outformat=""; -settings.toolbar=false; -viewportmargin=(2,2); - -// Global Asymptote definitions can be put here. -import three; -usepackage("bm"); -texpreamble("\def\V#1{\bm{#1}}"); -// One can globally override the default toolbar settings here: -// settings.toolbar=true; - - -pair z0=(0,0); -pair z1=(2,0); -pair z2=(5,0); -pair zf=z1+0.75*(z2-z1); - -draw(z1--z2); -dot(z1,red+0.15cm); -dot(z2,darkgreen+0.3cm); -label("$m$",z1,1.2N,red); -label("$M$",z2,1.5N,darkgreen); -label("$\hat{\ }$",zf,0.2*S,fontsize(24pt)+blue); - -pair s=-0.2*I; -draw("$x$",z0+s--z1+s,N,red,Arrows,Bars,PenMargins); -s=-0.5*I; -draw("$\bar{x}$",z0+s--zf+s,blue,Arrows,Bars,PenMargins); -s=-0.95*I; -draw("$X$",z0+s--z2+s,darkgreen,Arrows,Bars,PenMargins); -size(390.0pt,0); -viewportsize=(390.0pt,0); diff --git a/Master/texmf/doc/asymptote/examples/latexusage.tex b/Master/texmf/doc/asymptote/examples/latexusage.tex index 6324238f1a2..ae555a476bd 100644 --- a/Master/texmf/doc/asymptote/examples/latexusage.tex +++ b/Master/texmf/doc/asymptote/examples/latexusage.tex @@ -3,13 +3,16 @@ % Use this form to include EPS (latex) or PDF (pdflatex) files: \usepackage{asymptote} -% Use this form with latex or pdflatex to include inline LaTeX code: +% Use this form with latex or pdflatex to include inline LaTeX code by default: %\usepackage[inline]{asymptote} +% Use this form with latex or pdflatex to create PDF attachments by default: +%\usepackage[attach]{asymptote} + % Enable this line to support PDF hyperlinks: -%\usepackage{hyperref}\hypersetup{setpagesize=false} +%\usepackage{hyperref}\hypersetup{setpagesize=false,unicode} -% Enable this line for PDF attachments with asy environment option attach=true: +% Enable this line to support the attach option: %\usepackage[dvips]{attachfile2} \begin{document} @@ -76,11 +79,12 @@ shipout(bbox(0.25cm)); Each graph is drawn in its own environment. One can specify the width and height to \LaTeX\ explicitly. This 3D example can be viewed interactively either with Adobe Reader or Asymptote's fast OpenGL-based -renderer. It is often desirable to embed such files as annotated attachments; -this requires the optional \verb+\usepackage{attachfile2}+ package and -the \verb+{attach=true}+ option: +renderer. To support {\tt latexmk}, 3D figures should specify +\verb+inline=true+. It is sometimes desirable to embed 3D files as annotated +attachments; this requires the optional \verb+\usepackage{attachfile2}+ +package and the \verb+attach=true+ option: \begin{center} -\begin{asy}[height=4cm,attach=false] +\begin{asy}[height=4cm,inline=true,attach=false] currentprojection=orthographic(5,4,2); draw(unitcube,blue); label("$V-E+F=2$",(0,1,0.5),3Y,blue+fontsize(17pt)); @@ -89,7 +93,7 @@ label("$V-E+F=2$",(0,1,0.5),3Y,blue+fontsize(17pt)); One can also scale the figure to the full line width: \begin{center} -\begin{asy}[width=\the\linewidth] +\begin{asy}[width=\the\linewidth,inline=true] pair z0=(0,0); pair z1=(2,0); pair z2=(5,0); diff --git a/Master/texmf/doc/asymptote/examples/slidemovies.asy b/Master/texmf/doc/asymptote/examples/slidemovies.asy deleted file mode 100644 index ec724cf3326..00000000000 --- a/Master/texmf/doc/asymptote/examples/slidemovies.asy +++ /dev/null @@ -1,46 +0,0 @@ -// Slide demo. -// Command-line options to enable stepping and/or reverse video: -// asy [-u stepping=true] [-u reverse=true] slidedemo - -orientation=Landscape; - -settings.tex="pdflatex"; - -import slide; - -// Optional movie modules: -import animate; // For portable embedded PDF movies -import external; // For portable external movies -import embed; // For non-portable embedded movies - -usersetting(); - -titlepage("Slides with {\tt Asymptote}: Animations","John C. Bowman", - "University of Alberta","\today","http://asymptote.sf.net"); - -title("Embedded PDF movies (portable)"); -animation a=animation("A"); -animation b=animation("B"); -int n=20; -for(int i=0; i < 2n; ++i) { - picture pic; - size(pic,100); - draw(pic,shift(0,sin(pi/n*i))*unitsquare); - a.add(pic); - if(i < 1.5n) b.add(rotate(45)*pic); -} -display(a.pdf("autoplay,loop,controls")); -display(b.pdf("controls")); - -title("External Movie (portable)"); -display(external.embed("animations/wheel.mpg", - "poster,text=wheel.mpg,label=wheel.mpg",20cm,5.6cm)); -display(external.link("animations/wheel.mpg","Play","play")); - -title("Embedded Movie (not portable)"); -// Generated needed files if they don't already exist. -asy("mpg","animations/wheel"); -display(embed.embed("animations/wheel.mpg", - "poster,text=wheel.mpg,label=wheel.mpg", - 20cm,5.6cm)); -display(embed.link("animations/wheel.mpg","Play","play")); diff --git a/Master/texmf/doc/asymptote/examples/washermethod.asy b/Master/texmf/doc/asymptote/examples/washermethod.asy index 9a18b871414..d86bf8cd4df 100644 --- a/Master/texmf/doc/asymptote/examples/washermethod.asy +++ b/Master/texmf/doc/asymptote/examples/washermethod.asy @@ -12,9 +12,14 @@ pair F(real x) {return (x,f(x));} triple F3(real x) {return (x,f(x),0);} ngraph=12; -path[] p={graph(F,0.7476,1.8043,Spline)--cycle, - graph(F,0.7,0.7476,Spline)--graph(F,1.7787,1.8043,Spline)--cycle, - graph(F,0,0.7,Spline)--graph(F,1.8043,2,Spline)--cycle}; + +real x1=0.7476; +real x2=1.7787; +real x3=1.8043; + +path[] p={graph(F,x1,x2,Spline), + graph(F,0.7,x1,Spline)--graph(F,x2,x3,Spline), + graph(F,0,0.7,Spline)--graph(F,x3,2,Spline)}; pen[] pn=new pen[] {color1,color2,color1}; @@ -24,7 +29,7 @@ for(int i=0; i < p.length; ++i) { revolution a=revolution(path3(p[i]),Y,0,alpha); draw(surface(a),pn[i],render); - surface s=surface(p[i]); + surface s=surface(p[i]--cycle); draw(s,pn[i],render); draw(rotate(alpha,Y)*s,pn[i],render); } diff --git a/Master/texmf/doc/info/asy-faq.info b/Master/texmf/doc/info/asy-faq.info index 64d6def87ce..059fa578d1a 100644 --- a/Master/texmf/doc/info/asy-faq.info +++ b/Master/texmf/doc/info/asy-faq.info @@ -9,7 +9,7 @@ END-INFO-DIR-ENTRY File: $prefix.info, Node: Top, Next: Question 1.1, Up: (dir) ASYMPTOTE FREQUENTLY ASKED QUESTIONS - 05 Jul 2010 + 11 Jul 2010 This is the list of Frequently Asked Questions about Asymptote (asy). diff --git a/Master/texmf/doc/info/asymptote.info b/Master/texmf/doc/info/asymptote.info index af0f271a9d2..e72ff70242c 100644 --- a/Master/texmf/doc/info/asymptote.info +++ b/Master/texmf/doc/info/asymptote.info @@ -1,11 +1,11 @@ This is asymptote.info, produced by makeinfo version 4.13 from ../asymptote.texi. -This file documents `Asymptote', version 2.01. +This file documents `Asymptote', version 2.02. `http://asymptote.sourceforge.net' - Copyright (C) 2004-9 Andy Hammerlindl, John Bowman, and Tom Prince. + Copyright (C) 2004-10 Andy Hammerlindl, John Bowman, and Tom Prince. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Lesser General Public License @@ -23,11 +23,11 @@ File: asymptote.info, Node: Top, Next: Description, Up: (dir) Asymptote ********* -This file documents `Asymptote', version 2.01. +This file documents `Asymptote', version 2.02. `http://asymptote.sourceforge.net' - Copyright (C) 2004-9 Andy Hammerlindl, John Bowman, and Tom Prince. + Copyright (C) 2004-10 Andy Hammerlindl, John Bowman, and Tom Prince. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Lesser General Public License @@ -499,7 +499,7 @@ used; if it is old we recommend first putting in the `Asymptote' source directory. If your graphics card supports multisampling, we recommend using version -`2.6.0-rc1' (or later) of `freeglut' to support antialiasing in +`2.6.0' (or later) of `freeglut' to support antialiasing in `Asymptote''s adaptive `OpenGL' 3D renderer (`MacOS X' users can skip this step since `Asymptote' is configured to use the native glut library on that platform). Download @@ -2325,7 +2325,7 @@ number, until it saturates with one or more color components equal to 1. at the beginning of the file (this requires the `type1cm' package available from - `http://www.ctan.org/tex-archive/help/Catalogue/entries/type1cm' + `http://www.ctan.org/tex-archive/macros/latex/contrib/type1cm/' and included in recent `LaTeX' distributions). The font size and line skip of a pen can be examined with the routines `real fontsize(pen p=currentpen)' and `real lineskip(pen p=currentpen)', @@ -4642,60 +4642,66 @@ File: asymptote.info, Node: LaTeX usage, Next: Base modules, Prev: Programmin *************** `Asymptote' comes with a convenient `LaTeX' style file `asymptote.sty' -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 `\usepackage{asymptote}' at the -beginning of your file and enclose your `Asymptote' code within a -`\begin{asy}...\end{asy}' environment. As with the `LaTeX' `comment' -environment, the `\end{asy}' command must appear on a line by itself, -with no leading spaces or trailing commands/comments. +(version 1.15 or later) 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 +`\usepackage{asymptote}' at the beginning of your file and enclose your +`Asymptote' code within a `\begin{asy}...\end{asy}' environment. As +with the `LaTeX' `comment' environment, the `\end{asy}' command must +appear on a line by itself, with no leading spaces or trailing +commands/comments. The sample `LaTeX' file below, named `latexusage.tex', can be run as follows: latex latexusage -asy latexusage +asy latexusage-*.asy latex latexusage or pdflatex latexusage -asy latexusage +asy latexusage-*.asy pdflatex latexusage + To switch between using `latex' and `pdflatex' you may first need to +remove the files `latexusage-*', `latexusage.pre', and `latexusage.aux'. - To switch between using `latex' and `pdflatex' you may first need to -remove the files `latexusage-*', `latexusage_.pre', and -`latexusage.aux'. Version 1.13 of `Asymptote.sty' supports processing -each figure separately: `asy latexusage' is equivalent to `asy -latexusage-*.asy'. For example, one may wish to reduce memory usage by -generating each figure in a separate `UNIX' process: -/bin/ls latexusage-*.asy | xargs --replace=% asy % + An even better method for processing a `LaTeX' file with embedded +`Asymptote' code is to use the `latexmk' utility from + + `http://www.ctan.org/tex-archive/support/latexmk/' + after putting the rules + +sub asy {return system("asy '$_[0]'");} +add_cus_dep("asy","eps",0,"asy"); +add_cus_dep("asy","pdf",0,"asy"); +add_cus_dep("asy","tex",0,"asy"); +in a file `latexmkrc' in the same directory. The command +latexmk -pdf latexusage + will then call `Asymptote' automatically, recompiling only the figures +that have changed. Since each figure is compiled in a separate system +process, this method also tends to use less memory. One can specify `width', `height', `viewportwidth', -`viewportheight', and `attach' `keyval'-style options to the `asy' -environment. The current version of `asymptote.sty' supports the -embedding of 3D PRC files, either inline or, using the `attach' option -with the `attachfile2' (or older `attachfile') `LaTeX' package, as -annotated (but printable) attachments. For many applications, the -annotated attachment method tends to be more convenient. The default -value of `viewportwidth' is `\the\linewidth' for inline 3D figures and -`0' for attachments. - - If the `inline' option is given to the `asymptote.sty' package, -inline `LaTeX' code is generated instead of EPS or PDF files. This -makes 2D LaTeX symbols visible to the `\begin{asy}...\end{asy}' -environment. In this mode, Asymptote correctly aligns 2D LaTeX symbols -defined outside of `\begin{asy}...\end{asy}', but treats their size as -zero; an optional second string can be given to `Label' to provide an -estimate of the unknown label size. - - Note that if `latex' is used with the `inline' option, the labels -might not show up in DVI viewers that cannot handle raw `PostScript' -code. One can use `dvips'/`dvipdf' to produce `PostScript'/PDF output -(we recommend using the modified version of `dvipdf' in the `Asymptote' -patches directory, which accepts the `dvips -z' hyperdvi option). - - An excellent tutorial by Dario Teixeira on integrating `Asymptote' -and `LaTeX' is available at `http://dario.dse.nl/projects/asylatex/'. +`viewportheight', `attach', and `inline'. `keyval'-style options to +the `asy' environment. Three-dimensional PRC files may either be +embedded within the page (the default) or attached as annotated (but +printable) attachments, using the `attach' option and the `attachfile2' +(or older `attachfile') `LaTeX' package. The default value of +`viewportwidth' is `\the\linewidth' for inline 3D figures and `0' for +attachments. The `inline' option generates inline `LaTeX' code instead +of EPS or PDF files. This makes 2D LaTeX symbols visible to the +`\begin{asy}...\end{asy}' environment. In this mode, Asymptote +correctly aligns 2D LaTeX symbols defined outside of +`\begin{asy}...\end{asy}', but treats their size as zero; an optional +second string can be given to `Label' to provide an estimate of the +unknown label size. + + Note that if the `latex' TeX engine is used with the `inline' +option, labels might not show up in DVI viewers that cannot handle raw +`PostScript' code. One can use `dvips'/`dvipdf' to produce +`PostScript'/PDF output (we recommend using the modified version of +`dvipdf' in the `Asymptote' patches directory, which accepts the `dvips +-z' hyperdvi option). Here now is `latexusage.tex': @@ -4704,13 +4710,16 @@ and `LaTeX' is available at `http://dario.dse.nl/projects/asylatex/'. % Use this form to include EPS (latex) or PDF (pdflatex) files: \usepackage{asymptote} -% Use this form with latex or pdflatex to include inline LaTeX code: +% Use this form with latex or pdflatex to include inline LaTeX code by default: %\usepackage[inline]{asymptote} +% Use this form with latex or pdflatex to create PDF attachments by default: +%\usepackage[attach]{asymptote} + % Enable this line to support PDF hyperlinks: -%\usepackage{hyperref}\hypersetup{setpagesize=false} +%\usepackage{hyperref}\hypersetup{setpagesize=false,unicode} -% Enable this line for PDF attachments with asy environment option attach=true: +% Enable this line to support the attach option: %\usepackage[dvips]{attachfile2} \begin{document} @@ -4777,11 +4786,12 @@ shipout(bbox(0.25cm)); Each graph is drawn in its own environment. One can specify the width and height to \LaTeX\ explicitly. This 3D example can be viewed interactively either with Adobe Reader or Asymptote's fast OpenGL-based -renderer. It is often desirable to embed such files as annotated attachments; -this requires the optional \verb+\usepackage{attachfile2}+ package and -the \verb+{attach=true}+ option: +renderer. To support {\tt latexmk}, 3D figures should specify +\verb+inline=true+. It is sometimes desirable to embed 3D files as annotated +attachments; this requires the optional \verb+\usepackage{attachfile2}+ +package and the \verb+attach=true+ option: \begin{center} -\begin{asy}[height=4cm,attach=false] +\begin{asy}[height=4cm,inline=true,attach=false] currentprojection=orthographic(5,4,2); draw(unitcube,blue); label("$V-E+F=2$",(0,1,0.5),3Y,blue+fontsize(17pt)); @@ -4790,7 +4800,7 @@ label("$V-E+F=2$",(0,1,0.5),3Y,blue+fontsize(17pt)); One can also scale the figure to the full line width: \begin{center} -\begin{asy}[width=\the\linewidth] +\begin{asy}[width=\the\linewidth,inline=true] pair z0=(0,0); pair z1=(2,0); pair z2=(5,0); @@ -5201,20 +5211,18 @@ directory the commands: tex ifdraft.dtx texhash + A more portable method for embedding movie files, which should work +on any platform and does not require the `movie15' or `ifdraft' +packages, is provided by using the `external' module instead of +`embed'. An example of these interfaces is provided in the file +`embeddedmovie.asy' and `externalmovie.asy' in the `animations' +subdirectory of the examples directory. For a higher quality movie +generated directly by `Asymptote', use the `animate' module along with +the `animate.sty' package to embed a portable PDF animation (*note +animate::). + An example of embedding `U3D' code is provided in the file -`embeddedu3d.asy'. As of version 7.0.8, `Adobe Reader' supports the -`U3D' format under Linux. - - Unfortunately, Adobe has not yet made available an embedded movie -plugin for the Linux version of `Adobe Reader'. A portable method for -embedding movie files, which should work on any platform and does not -require the `movie15' or `ifdraft' packages, is provided by using the -`external' module instead of `embed'. An example of these interfaces is -provided in the file `embeddedmovie.asy' and `externalmovie.asy' in the -`animations' subdirectory of the examples directory. For a higher -quality movie generated directly by `Asymptote', use the `animate' -module along with the `animate.sty' package to embed a portable PDF -animation (*note animate::). +`embeddedu3d.asy'. File: asymptote.info, Node: slide, Next: MetaPost, Prev: embed, Up: Base modules @@ -8528,7 +8536,7 @@ Index (line 6) * atleast: Bezier curves. (line 56) * attach <1>: graph. (line 415) -* attach: LaTeX usage. (line 35) +* attach: LaTeX usage. (line 46) * autoadjust: three. (line 354) * autoimport: Options. (line 110) * automatic scaling: graph. (line 682) @@ -8942,7 +8950,7 @@ Index * guide: Paths and guides. (line 300) * guide3: three. (line 6) * hatch: Pens. (line 267) -* height: LaTeX usage. (line 35) +* height: LaTeX usage. (line 46) * help <1>: Debugger. (line 30) * help <2>: Help. (line 6) * help: Interactive mode. (line 44) @@ -8992,6 +9000,7 @@ Index * initialized: Arrays. (line 39) * initializers: Variable initializers. (line 6) +* inline: LaTeX usage. (line 46) * InOutTicks: graph3. (line 34) * input <1>: Interactive mode. (line 48) * input: Files. (line 11) @@ -9054,6 +9063,7 @@ Index * latex: Options. (line 142) * LaTeX fonts: Pens. (line 192) * LaTeX usage: LaTeX usage. (line 6) +* latexmk: LaTeX usage. (line 30) * latin1: latin1. (line 6) * latitude: Data types. (line 134) * latticeshade: fill. (line 32) @@ -9572,6 +9582,7 @@ Index * type1cm: Pens. (line 178) * typedef <1>: Functions. (line 36) * typedef: Data types. (line 344) +* U3D: embed. (line 38) * undefined: Paths and guides. (line 268) * UnFill: Frames and pictures. (line 152) * unfill: fill. (line 106) @@ -9612,10 +9623,10 @@ Index * verbatim: Frames and pictures. (line 271) * vertex-dependent colors: three. (line 81) * Vertical: flowchart. (line 81) -* viewportheight: LaTeX usage. (line 35) +* viewportheight: LaTeX usage. (line 46) * viewportmargin: three. (line 262) * viewportsize: three. (line 262) -* viewportwidth: LaTeX usage. (line 35) +* viewportwidth: LaTeX usage. (line 46) * views: three. (line 231) * vim: Editing modes. (line 33) * virtual functions: Structures. (line 181) @@ -9626,7 +9637,7 @@ Index * wheel mouse: GUI. (line 6) * while: Programming. (line 29) * white-space string delimiter mode: Arrays. (line 359) -* width: LaTeX usage. (line 35) +* width: LaTeX usage. (line 46) * windingnumber: Paths and guides. (line 268) * word: Arrays. (line 359) * write <1>: Arrays. (line 399) @@ -9696,146 +9707,146 @@ Index Tag Table: -Node: Top574 -Node: Description6832 -Node: Installation10333 -Node: UNIX binary distributions11386 -Node: MacOS X binary distributions12492 -Node: Microsoft Windows13376 -Ref: psview14086 -Node: Configuring15007 -Node: Search paths19228 -Node: Compiling from UNIX source20025 -Ref: multisampling20614 -Node: Editing modes23024 -Node: Subversion25456 -Node: Uninstall25919 -Node: Tutorial26269 -Ref: unitcircle30495 -Node: Drawing commands32431 -Node: draw34142 -Ref: arrows35290 -Node: fill40533 -Ref: gradient shading41577 -Node: clip45805 -Node: label46397 -Ref: Label47096 -Node: Bezier curves52821 -Node: Programming56398 -Ref: array iteration57212 -Node: Data types58293 -Ref: format67301 -Node: Paths and guides70904 -Ref: circle71158 -Ref: arctime76646 -Ref: extension80501 -Node: Pens87184 -Ref: fillrule94550 -Ref: basealign95447 -Ref: transparency98274 -Ref: makepen101717 -Ref: overwrite102555 -Node: Transforms103765 -Node: Frames and pictures105556 -Ref: envelope106697 -Ref: size107780 -Ref: unitsize108767 -Ref: shipout109827 -Ref: filltype112160 -Ref: add115297 -Ref: add about116243 -Ref: tex119181 -Node: Files120055 -Ref: cd121020 -Ref: scroll125452 -Node: Variable initializers128525 -Node: Structures131250 -Node: Operators138694 -Node: Arithmetic & logical139008 -Node: Self & prefix operators140982 -Node: User-defined operators141770 -Node: Implicit scaling142681 -Node: Functions143244 -Ref: stack overflow145997 -Node: Default arguments146561 -Node: Named arguments147300 -Node: Rest arguments149462 -Node: Mathematical functions152272 -Node: Arrays156879 -Ref: sort163929 -Ref: tridiagonal166333 -Ref: solve167561 -Node: Slices171754 -Node: Casts175644 -Node: Import177609 -Node: Static182836 -Node: LaTeX usage185730 -Node: Base modules191468 -Node: plain193968 -Node: simplex194620 -Node: math194893 -Node: interpolate197598 -Node: geometry197877 -Node: trembling198471 -Node: stats198822 -Node: patterns199082 -Node: markers199318 -Node: tree201101 -Node: binarytree201289 -Node: drawtree201878 -Node: syzygy202082 -Node: feynman202356 -Node: roundedpath202631 -Node: animation202914 -Ref: animate203331 -Node: embed204470 -Node: slide206259 -Node: MetaPost206599 -Node: unicode207315 -Node: latin1208203 -Node: babel208571 -Node: labelpath208800 -Node: labelpath3209620 -Node: annotate209931 -Node: CAD210402 -Node: graph210712 -Ref: ticks217841 -Ref: pathmarkers231120 -Ref: marker231585 -Ref: markuniform231936 -Ref: errorbars233727 -Ref: automatic scaling237783 -Node: palette248429 -Ref: images248547 -Ref: image252718 -Ref: logimage253196 -Ref: penimage254002 -Node: three254446 -Ref: PostScript3D278988 -Node: obj280680 -Node: graph3280932 -Ref: GaussianSurface286057 -Node: grid3287161 -Node: solids287901 -Node: tube288849 -Node: flowchart291084 -Node: contour295653 -Node: contour3300778 -Node: slopefield301085 -Node: ode302522 -Node: Options302782 -Ref: configuration file308627 -Ref: settings308627 -Ref: convert309828 -Node: Interactive mode312795 -Ref: history314948 -Node: GUI316253 -Node: GUI installation316756 -Node: GUI usage317886 -Node: PostScript to Asymptote318789 -Node: Help319545 -Node: Debugger321281 -Node: Credits323066 -Node: Index323998 +Node: Top575 +Node: Description6834 +Node: Installation10335 +Node: UNIX binary distributions11388 +Node: MacOS X binary distributions12494 +Node: Microsoft Windows13378 +Ref: psview14088 +Node: Configuring15009 +Node: Search paths19230 +Node: Compiling from UNIX source20027 +Ref: multisampling20616 +Node: Editing modes23022 +Node: Subversion25454 +Node: Uninstall25917 +Node: Tutorial26267 +Ref: unitcircle30493 +Node: Drawing commands32429 +Node: draw34140 +Ref: arrows35288 +Node: fill40531 +Ref: gradient shading41575 +Node: clip45803 +Node: label46395 +Ref: Label47094 +Node: Bezier curves52819 +Node: Programming56396 +Ref: array iteration57210 +Node: Data types58291 +Ref: format67299 +Node: Paths and guides70902 +Ref: circle71156 +Ref: arctime76644 +Ref: extension80499 +Node: Pens87182 +Ref: fillrule94548 +Ref: basealign95445 +Ref: transparency98271 +Ref: makepen101714 +Ref: overwrite102552 +Node: Transforms103762 +Node: Frames and pictures105553 +Ref: envelope106694 +Ref: size107777 +Ref: unitsize108764 +Ref: shipout109824 +Ref: filltype112157 +Ref: add115294 +Ref: add about116240 +Ref: tex119178 +Node: Files120052 +Ref: cd121017 +Ref: scroll125449 +Node: Variable initializers128522 +Node: Structures131247 +Node: Operators138691 +Node: Arithmetic & logical139005 +Node: Self & prefix operators140979 +Node: User-defined operators141767 +Node: Implicit scaling142678 +Node: Functions143241 +Ref: stack overflow145994 +Node: Default arguments146558 +Node: Named arguments147297 +Node: Rest arguments149459 +Node: Mathematical functions152269 +Node: Arrays156876 +Ref: sort163926 +Ref: tridiagonal166330 +Ref: solve167558 +Node: Slices171751 +Node: Casts175641 +Node: Import177606 +Node: Static182833 +Node: LaTeX usage185727 +Node: Base modules191768 +Node: plain194268 +Node: simplex194920 +Node: math195193 +Node: interpolate197898 +Node: geometry198177 +Node: trembling198771 +Node: stats199122 +Node: patterns199382 +Node: markers199618 +Node: tree201401 +Node: binarytree201589 +Node: drawtree202178 +Node: syzygy202382 +Node: feynman202656 +Node: roundedpath202931 +Node: animation203214 +Ref: animate203631 +Node: embed204770 +Node: slide206373 +Node: MetaPost206713 +Node: unicode207429 +Node: latin1208317 +Node: babel208685 +Node: labelpath208914 +Node: labelpath3209734 +Node: annotate210045 +Node: CAD210516 +Node: graph210826 +Ref: ticks217955 +Ref: pathmarkers231234 +Ref: marker231699 +Ref: markuniform232050 +Ref: errorbars233841 +Ref: automatic scaling237897 +Node: palette248543 +Ref: images248661 +Ref: image252832 +Ref: logimage253310 +Ref: penimage254116 +Node: three254560 +Ref: PostScript3D279102 +Node: obj280794 +Node: graph3281046 +Ref: GaussianSurface286171 +Node: grid3287275 +Node: solids288015 +Node: tube288963 +Node: flowchart291198 +Node: contour295767 +Node: contour3300892 +Node: slopefield301199 +Node: ode302636 +Node: Options302896 +Ref: configuration file308741 +Ref: settings308741 +Ref: convert309942 +Node: Interactive mode312909 +Ref: history315062 +Node: GUI316367 +Node: GUI installation316870 +Node: GUI usage318000 +Node: PostScript to Asymptote318903 +Node: Help319659 +Node: Debugger321395 +Node: Credits323180 +Node: Index324112 End Tag Table diff --git a/Master/texmf/doc/man/man1/asy.man1.pdf b/Master/texmf/doc/man/man1/asy.man1.pdf Binary files differindex 964a9724a2a..b15add600aa 100644 --- a/Master/texmf/doc/man/man1/asy.man1.pdf +++ b/Master/texmf/doc/man/man1/asy.man1.pdf diff --git a/Master/texmf/tex/latex/asymptote/asymptote.sty b/Master/texmf/tex/latex/asymptote/asymptote.sty index 937af3ef6bc..4db253d4095 100644 --- a/Master/texmf/tex/latex/asymptote/asymptote.sty +++ b/Master/texmf/tex/latex/asymptote/asymptote.sty @@ -3,11 +3,13 @@ %%% Modified by John Bowman %%% Adapted from comment.sty (Under GPL v2+) -\ProvidesPackage{asymptote}[2010/07/06 v1.14 Asymptote style file for LaTeX] +\ProvidesPackage{asymptote}[2010/07/10 v1.15 Asymptote style file for LaTeX] \RequirePackage{keyval} \RequirePackage{ifthen} -\newif\ifASYinline -\DeclareOption{inline}{\ASYinlinetrue} +\newif\ifASYdefaultinline +\newif\ifASYdefaultattach +\DeclareOption{inline}{\ASYdefaultinlinetrue} +\DeclareOption{attach}{\ASYdefaultattachtrue} \ProcessOptions* \def\unquoteJobname#1"#2"#3\relax{\def\rawJobname{#1}% @@ -24,21 +26,23 @@ \def\makeinnocent#1{\catcode`#1=12 } \def\csarg#1#2{\expandafter#1\csname#2\endcsname} \newwrite\AsyStream -\newwrite\AsyAllStream +\newwrite\AsyPreStream \newread\AsyTestStream -\newread\AsyTestTeXStream -\openin\AsyTestStream=\jobname_.pre +\def\AsyInput#1{\openin\AsyTestStream=#1 \ifeof\AsyTestStream \else -\input \jobname_.pre + \input #1 \fi \closein\AsyTestStream% +} + +\AsyInput{\jobname.pre} -\immediate\openout\AsyAllStream=\jobname.asy +\immediate\openout\AsyPreStream=\jobname.pre +\newif\ifASYinline \newif\ifASYattach -\newif\ifASYtex \newif\ifASYPDF \ifx\pdfoutput\undefined @@ -107,14 +111,10 @@ \immediate\write\AsyStream{size(\ASYwidth,\ASYheight);}% \fi \fi - \ASYtexfalse% \ifASYattach \def\ASYdefaultviewportwidth{0}% \else \def\ASYdefaultviewportwidth{\the\linewidth}% - \ifASYinline - \ASYtextrue% - \fi \fi \ifx\ASYviewportwidth\empty \ifx\ASYviewportheight\empty @@ -135,8 +135,8 @@ \gdef\ASYviewportheight{}% \immediate\closeout\AsyStream - \ifASYtex - \openin\AsyTestStream=\AsyFile_.tex + \ifASYinline + \openin\AsyTestStream=\AsyFile.tex \else \ifASYPDF \openin\AsyTestStream=\AsyFile.pdf @@ -145,28 +145,29 @@ \fi \fi \ifeof\AsyTestStream - \ifASYtex - \PackageWarning{asymptote}{file \AsyFile_.tex does not exist}% + \ifASYinline + \PackageWarning{asymptote}{file `\AsyFile.tex' not found}% + \closein\AsyTestStream% \else - \openin\AsyTestTeXStream=\AsyFile_.tex - \ifeof\AsyTestTeXStream + \closein\AsyTestStream% + \openin\AsyTestStream=\AsyFile.tex + \ifeof\AsyTestStream \ifASYPDF - \PackageWarning{asymptote}{file \AsyFile.pdf does not exist}% + \PackageWarning{asymptote}{file `\AsyFile.pdf' not found}% \else - \PackageWarning{asymptote}{file \AsyFile.eps does not exist}% + \PackageWarning{asymptote}{file `\AsyFile.eps' not found}% \fi \else \catcode`:=12 - \input \AsyFile_.tex% + \input \AsyFile.tex% \fi - \closein\AsyTestTeXStream% + \closein\AsyTestStream% \fi - \closein\AsyTestStream% \else \closein\AsyTestStream% - \ifASYtex + \ifASYinline \catcode`:=12 - \input \AsyFile_.tex% + \input \AsyFile.tex% \else \ifASYattach \ifASYPDF @@ -187,7 +188,6 @@ \fi \fi \fi - \global\ASYattachfalse \relax% \endgroup} \gdef\ASYwidth{}% @@ -209,15 +209,23 @@ \define@key{ASYkeys}{attach}[true]{% \ifthenelse{\equal{#1}{true}}{\global\ASYattachtrue}{\global\ASYattachfalse}% } +\define@key{ASYkeys}{inline}[true]{% + \ifthenelse{\equal{#1}{true}}{\global\ASYinlinetrue}{\global\ASYinlinefalse}% +} \newcommand\asy[1][]{% \begingroup \let\par\empty \stepcounter{asy}% + \global\let\ifASYinline\ifASYdefaultinline + \global\let\ifASYattach\ifASYdefaultattach \setkeys{ASYkeys}{#1}% - \immediate\write\AsyAllStream% - {eval(quote\@charlb include "\jobname-\the\c@asy";\@charrb);}% - \immediate\openout\AsyStream=\jobname-\the\c@asy.asy - \gdef\AsyFile{\Jobname-\the\c@asy} + \ifASYattach + \global\ASYinlinefalse + \fi + \immediate\write\AsyPreStream% + {\@backslashchar AsyInput{\jobname-\the\c@asy.pre}} + \immediate\openout\AsyStream=\jobname-\the\c@asy.asy + \gdef\AsyFile{\Jobname-\the\c@asy}% \immediate\write\AsyStream{if(!settings.multipleView)}% \immediate\write\AsyStream{ settings.batchView=false;}% \ifx\XeTeXversion\undefined @@ -258,7 +266,7 @@ \AsymptoteEndDef{asydef} \def\AfterasydefAsymptote{} -\AtEndDocument{\immediate\closeout\AsyAllStream} +\AtEndDocument{\immediate\closeout\AsyPreStream} \newcommand{\ASYanimategraphics}[5][]{% \openin\AsyTestStream=_#3.pdf diff --git a/Master/texmf/tex/latex/asymptote/latexmkrc b/Master/texmf/tex/latex/asymptote/latexmkrc new file mode 100644 index 00000000000..1cca8732e94 --- /dev/null +++ b/Master/texmf/tex/latex/asymptote/latexmkrc @@ -0,0 +1,4 @@ +sub asy {return system("asy '$_[0]'");} +add_cus_dep("asy","eps",0,"asy"); +add_cus_dep("asy","pdf",0,"asy"); +add_cus_dep("asy","tex",0,"asy"); diff --git a/Master/tlpkg/asymptote/asy.exe b/Master/tlpkg/asymptote/asy.exe Binary files differindex 3daf4a36e76..01deb9e10d0 100755 --- a/Master/tlpkg/asymptote/asy.exe +++ b/Master/tlpkg/asymptote/asy.exe |