asymptote 1.79

git-svn-id: svn://tug.org/texlive/trunk@14080 c570f23f-e606-0410-a88d-b1316a301751

12 files changed, 461 insertions, 131 deletions

diff --git a/Master/texmf/asymptote/GUI/xasyMainWin.py b/Master/texmf/asymptote/GUI/xasyMainWin.py
index 865e057accb..0a1ddc63e36 100755
--- a/Master/texmf/asymptote/GUI/xasyMainWin.py
+++ b/Master/texmf/asymptote/GUI/xasyMainWin.py
@@ -57,13 +57,9 @@ class xasyMainWin:
     self.createWidgets()
     self.resetGUI()
     if sys.platform[:3] == "win":
-      site="http://effbot.org/downloads/PIL-1.1.6.win32-py2.5.exe"
-      if sys.version_info[0] != 2 or sys.version_info[1] != 5:
-        tkMessageBox.showerror("Failed Dependencies","Xasy requires Python 2.5 or 2.5.1. Please install http://www.python.org/ftp/python/2.5.1/python-2.5.1.msi")
-        self.parent.destroy()
-        sys.exit(1)
+      site="http://effbot.org/downloads/PIL-1.1.7b1.win32-py2.6.exe"
     else:
-      site="http://effbot.org/downloads/Imaging-1.1.6.tar.gz after applying the patch http://asymptote.svn.sourceforge.net/viewvc/asymptote/trunk/asymptote/patches/TkAlpha-Imaging-1.1.6.patch" 
+      site="http://effbot.org/downloads/Imaging-1.1.7b1.tar.gz" 
     if not PILAvailable:
       tkMessageBox.showerror("Failed Dependencies","An error occurred loading the required PIL library. Please install "+site)
       self.parent.destroy()
diff --git a/Master/texmf/asymptote/GUI/xasyVersion.py b/Master/texmf/asymptote/GUI/xasyVersion.py
index b257f838303..36de0c7c4c2 100755
--- a/Master/texmf/asymptote/GUI/xasyVersion.py
+++ b/Master/texmf/asymptote/GUI/xasyVersion.py
@@ -1,2 +1,2 @@
 #!/usr/bin/env python
-xasyVersion = "1.77"
+xasyVersion = "1.79"
diff --git a/Master/texmf/asymptote/asy-kate.sh b/Master/texmf/asymptote/asy-kate.sh
new file mode 100644
index 00000000000..5f482b376d9
--- /dev/null
+++ b/Master/texmf/asymptote/asy-kate.sh
@@ -0,0 +1,146 @@
+#!/bin/sh
+echo  '<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<!-- based on asy-keywords.el and Highlighting file asymptote.xml by Christoph Hormann-->
+<language version="1.0" kateversion="3.2.2" name="asymptote" section="Sources" extensions="*.asy" mimetype="text/x-asymptote" licence="LGPL" author="Carsten Brenner">
+
+<highlighting>
+' > asymptote.xml
+
+# 1. Change Name of lists in <\list> <list name="...">
+# 2. tail to get rid of the first lines
+# 3. building the right line ending
+# 4-5. kill linebreaks
+# 6. change spaces into <\item><item>
+# 7. Undo change (7.) in 'list name'
+# 8. do some formatting
+
+cat asy-keywords.el | sed 's/^(.*\-\([^\-]*\)\-.*/\n<list name="\1"><item>/' | tail -14 | sed 's/ ))/<\/item><\/list>/' |  tr '\n' '@' | sed 's/@//g' | sed 's/ /<\/item><item>/g' | sed 's/list<\/item><item>name/list name/g' | sed 's/></>\n</g' >> asymptote.xml
+
+echo '
+<contexts>
+			<context attribute="Normal Text" lineEndContext="#stay" name="Normal">
+				<DetectSpaces />
+				<RegExpr attribute="Preprocessor" context="Outscoped" String="#\s*if\s+0" beginRegion="Outscoped" firstNonSpace="true" />
+				<DetectChar attribute="Preprocessor" context="Preprocessor" char="#" firstNonSpace="true" />
+				<StringDetect attribute="Region Marker" context="Region Marker" String="//BEGIN" beginRegion="Region1" firstNonSpace="true" />
+				<StringDetect attribute="Region Marker" context="Region Marker" String="//END" endRegion="Region1" firstNonSpace="true" />
+				<keyword attribute="Keyword" context="#stay" String="keyword" />
+				<keyword attribute="Extensions" context="#stay" String="extensions" />
+				<keyword attribute="Function" context="#stay" String="function" />
+				<keyword attribute="Data Type" context="#stay" String="type" />
+				<keyword attribute="Constants" context="#stay" String="constants" />
+				<keyword attribute="Variable" context="#stay" String="variable" />
+				<HlCChar attribute="Char" context="#stay"/>
+				<DetectChar attribute="String" context="String" char="&quot;"/>
+				<DetectIdentifier />
+				<Float attribute="Float" context="#stay">
+					<AnyChar String="fF" attribute="Float" context="#stay"/>
+				</Float>
+				<HlCOct attribute="Octal" context="#stay"/>
+				<HlCHex attribute="Hex" context="#stay"/>
+				<Int attribute="Decimal" context="#stay">
+					<StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
+					<StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
+					<StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
+					<StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
+					<StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
+					<StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
+					<StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
+					<StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+				</Int>
+				<IncludeRules context="##Doxygen" />
+				<Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+				<Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
+				<DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
+				<DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
+				<AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]{|}~^&#59;"/>
+			</context>
+			<context attribute="String" lineEndContext="#pop" name="String">
+				<LineContinue attribute="String" context="#stay"/>
+				<HlCStringChar attribute="String Char" context="#stay"/>
+				<DetectChar attribute="String" context="#pop" char="&quot;"/>
+			</context>
+			<context attribute="Region Marker" lineEndContext="#pop" name="Region Marker">
+			</context>
+			<context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
+				<DetectSpaces />
+				<IncludeRules context="##Alerts" />
+				<DetectIdentifier />
+			</context>
+			<context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
+				<DetectSpaces />
+				<Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
+				<IncludeRules context="##Alerts" />
+				<DetectIdentifier />
+			</context>
+			<context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor">
+				<LineContinue attribute="Preprocessor" context="#stay"/>
+				<RegExpr attribute="Preprocessor" context="Define" String="define.*((?=\\))"/>
+				<RegExpr attribute="Preprocessor" context="#stay" String="define.*"/>
+				<RangeDetect attribute="Prep. Lib" context="#stay" char="&quot;" char1="&quot;"/>
+				<RangeDetect attribute="Prep. Lib" context="#stay" char="&lt;" char1="&gt;"/>
+				<IncludeRules context="##Doxygen" />
+				<Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+				<Detect2Chars attribute="Comment" context="Commentar/Preprocessor" char="/" char1="*"/>
+			</context>
+			<context attribute="Preprocessor" lineEndContext="#pop" name="Define">
+				<LineContinue attribute="Preprocessor" context="#stay"/>
+			</context>
+			<context attribute="Comment" lineEndContext="#stay" name="Commentar/Preprocessor">
+				<DetectSpaces />
+				<Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" />
+				<DetectIdentifier />
+			</context>
+			<context attribute="Comment" lineEndContext="#stay" name="Outscoped" >
+				<DetectSpaces />
+				<IncludeRules context="##Alerts" />
+				<DetectIdentifier />
+				<DetectChar attribute="String" context="String" char="&quot;"/>
+				<IncludeRules context="##Doxygen" />
+				<Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+				<Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
+				<RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="Outscoped" firstNonSpace="true" />
+				<RegExpr attribute="Preprocessor" context="#pop" String="#\s*(endif|else|elif)" endRegion="Outscoped" firstNonSpace="true" />
+			</context>
+			<context attribute="Comment" lineEndContext="#stay" name="Outscoped intern">
+				<DetectSpaces />
+				<IncludeRules context="##Alerts" />
+				<DetectIdentifier />
+				<DetectChar attribute="String" context="String" char="&quot;"/>
+				<IncludeRules context="##Doxygen" />
+				<Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+				<Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
+				<RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="Outscoped" firstNonSpace="true"/>
+				<RegExpr attribute="Comment" context="#pop" String="#\s*endif" endRegion="Outscoped" firstNonSpace="true"/>
+			</context>
+		</contexts>
+		<itemDatas>
+			<itemData name="Char"         defStyleNum="dsChar"/>
+			<itemData name="Comment"      defStyleNum="dsComment"/>
+			<itemData name="Data Type"    defStyleNum="dsDataType"/>
+			<itemData name="Decimal"      defStyleNum="dsDecVal"/>
+			<itemData name="Extensions"   defStyleNum="dsKeyword" color="#0095ff" selColor="#ffffff" bold="1" italic="0"/>
+			<itemData name="Float"        defStyleNum="dsFloat"/>
+			<itemData name="Function"     defStyleNum="dsFunction" />			
+			<itemData name="Hex"          defStyleNum="dsBaseN"/>
+			<itemData name="Keyword"      defStyleNum="dsKeyword"/>
+			<itemData name="Normal Text"  defStyleNum="dsNormal"/>
+			<itemData name="Octal"        defStyleNum="dsBaseN"/>
+			<itemData name="Prep. Lib"    defStyleNum="dsOthers"/>
+			<itemData name="Preprocessor" defStyleNum="dsOthers"/>
+			<itemData name="Region Marker" defStyleNum="dsRegionMarker" />
+			<itemData name="String Char"  defStyleNum="dsChar"/>
+			<itemData name="String"       defStyleNum="dsString"/>
+			<itemData name="Symbol"       defStyleNum="dsNormal"/>
+			<itemData name="Variable"     defStyleNum="dsOthers" />
+		</itemDatas>
+	</highlighting>
+	<general>
+		<comments>
+			<comment name="singleLine" start="//" />
+			<comment name="multiLine" start="/*" end="*/" region="Comment"/>
+		</comments>
+		<keywords casesensitive="1" />
+	</general>
+  </language>' >> asymptote.xml
diff --git a/Master/texmf/asymptote/asy-keywords.el b/Master/texmf/asymptote/asy-keywords.el
index 1f7ac00ee75..d3ba80bafcb 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 "1.77")
+(defvar asy-keywords-version "1.79")
 
 (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 Rmf 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 line linefit marginT marker mass object pair parabola path path3 pen picture point position projection real revolution scaleT scientific segment side slice 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 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 J 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 OutTicks Ox Oy Palatino PaletteTicks Pen PenMargin PenMargins Pentype Portrait RadialShade 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 Z ZX ZXgrid ZYgrid ZapfChancery ZapfDingbats _cputime _draw _eval _image _labelpath _strokepath _texpath aCos aSin aTan abort abs accel acos acosh acot acsc add addArrow addMargins addSaveFunction addnode addnodes addpenarc addpenline addseg 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 boutput box bqe breakpoint breakpoints brick buildRestoreDefaults buildRestoreThunk buildcycle bulletcolor canonical canonicalcartesiansystem cartesiansystem case1 case2 case3 cbrt cd ceil center centerToFocus centroid cevian change2 changecoordsys checkSegment checkconditionlength checker 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 containmentTree contains contour contour3 controlSpecifier convert coordinates coordsys copy cos cosh cot countIntersections cputime crop cropcode cross crossframe crosshatch crossmarksize csc csv cubicroots curabscissa curlSpecifier curpoint currentarrow currentexitfunction currentmomarrow currentpolarconicroutine curve cut cutafter cutbefore cyclic cylinder debugger deconstruct defaultdir defaultformat defaultpen defaultspline defined degenerate degrees delete deletepreamble determinant diagonal diamond diffdiv dimension dir dirSpecifier dirtime display distance divisors do_overpaint dot dotframe dotsize downcase draw drawAll drawDoubleLine drawFermion drawGhost drawGluon drawMomArrow 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 endl endpoint endpoints eof eol equation equations erase erf erfc error errorbar errorbars eval excenter excircle exit exitXasyMode exitfunction exp 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 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 initXasyMode initdefaults input inradius insert inside integrate interactive interior interp interpolate intersect intersection intersectionpoint intersectionpoints intersections intouch inverse inversion invisible is3D 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 lift limits line linear linecap 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 maxbound maxcoords maxlength maxratio maxtimes mean medial median midpoint min min3 minbound minipage minratio mintimes miterlimit momArrowPath momarrowsize monotonic nativeformat natural needshipout newl newpage newslide newton newtree nextframe nextnormal nextpage nib nodabscissa none normalvideo notaknot 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 outprefix output overwrite pack pad pairs palette parabola parabolanodesnumber parallel partialsum path path3 pattern pause pdf pedal periodic perp perpendicular perpendicularmark phantom 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 read1 read2 read3 readline realmult realquarticroots rectangle rectangular rectify reflect relabscissa relative relativedistance reldir relpoint reltime remainder remark removeDuplicates rename replace report rescale rescale2 resetdefaultpen restore restoredefaults reverse reversevideo rf rfind rgb rgba rgbint rmf 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 sequence 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 unit unitrand unitsize unityroot unstraighten upcase updatefunction upscale uptodate usepackage usersetting usetypescript usleep value variance variancebiased vbox vector vectorfield verbatim view vline vprojection windingnumber word 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 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 J 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 OutTicks Ox Oy Palatino PaletteTicks Pen PenMargin PenMargins Pentype Portrait RadialShade 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 Z ZX ZXgrid ZYgrid ZapfChancery ZapfDingbats _cputime _draw _eval _image _labelpath _strokepath _texpath aCos aSin aTan abort abs accel acos acosh acot acsc add addArrow addMargins addSaveFunction addnode addnodes addpenarc addpenline addseg 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 boutput box bqe breakpoint breakpoints brick buildRestoreDefaults buildRestoreThunk buildcycle bulletcolor canonical canonicalcartesiansystem cartesiansystem case1 case2 case3 cbrt cd ceil center centerToFocus centroid cevian change2 changecoordsys checkSegment checkconditionlength checker 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 containmentTree contains contour contour3 controlSpecifier convert coordinates coordsys copy cos cosh cot countIntersections cputime crop cropcode cross crossframe crosshatch crossmarksize csc csv cubicroots curabscissa curlSpecifier curpoint currentarrow currentexitfunction currentmomarrow currentpolarconicroutine curve cut cutafter cutbefore cyclic cylinder debugger deconstruct defaultdir defaultformat defaultpen defaultspline defined degenerate degrees delete deletepreamble determinant diagonal diamond diffdiv dimension dir dirSpecifier dirtime display distance divisors do_overpaint dot dotframe dotsize downcase draw drawAll drawDoubleLine drawFermion drawGhost drawGluon drawMomArrow 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 endl endpoint endpoints eof eol equation equations erase 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 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 initXasyMode initdefaults input inradius insert inside integrate interactive interior interp interpolate intersect intersection intersectionpoint intersectionpoints intersections intouch inverse inversion invisible is3D 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 lift limits line linear linecap 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 maxbound maxcoords maxlength maxratio maxtimes mean medial median midpoint min min3 minbound minipage minratio mintimes miterlimit momArrowPath momarrowsize monotonic nativeformat natural needshipout newl newpage newslide newton newtree nextframe nextnormal nextpage nib nodabscissa none normalvideo notaknot 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 outprefix output overwrite pack pad pairs palette parabola parabolanodesnumber parallel 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 read1 read2 read3 readline realmult realquarticroots rectangle rectangular rectify reflect relabscissa relative relativedistance reldir relpoint reltime remainder remark removeDuplicates rename replace report rescale rescale2 resetdefaultpen restore restoredefaults reverse reversevideo rf rfind rgb rgba rgbint rmf 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 sequence 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 unit unitrand unitsize unityroot unstraighten upcase updatefunction upscale uptodate usepackage usersetting usetypescript usleep value variance variancebiased vbox vector vectorfield verbatim view vline vprojection windingnumber word 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 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 Draw E ENE EPS ESE 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 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 RK5CK RK5DP RK5F RawSienna Red RedOrange RedViolet Rhodamine 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 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 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 defaultfilename defaultformat defaultmassformat defaultpen diagnostics differentlengths dot dotfactor dotframe dotted doublelinepen doublelinespacing down duplicateFuzz ellipsenodesnumberfactor eps epsgeo epsilon evenodd extendcap 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 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 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 ))
+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 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 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 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 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 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 defaultfilename defaultformat defaultmassformat defaultpen diagnostics differentlengths dot dotfactor dotframe dotted doublelinepen doublelinespacing down duplicateFuzz ellipsenodesnumberfactor eps epsgeo epsilon evenodd extendcap 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 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 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/ode.asy b/Master/texmf/asymptote/ode.asy
index 643c56feec7..77ab8d6e589 100644
--- a/Master/texmf/asymptote/ode.asy
+++ b/Master/texmf/asymptote/ode.asy
@@ -1,40 +1,151 @@
-real stepfactor=2.0; // Maximum dynamic step size adjustment factor.
+real stepfactor=2; // Maximum dynamic step size adjustment factor.
 
-struct RKTableau
+struct coefficients
 {
-  int order;
   real[] steps;
+  real[] factors;
   real[][] weights;
   real[] highOrderWeights;
   real[] lowOrderWeights;
+}
+
+struct RKTableau
+{
+  int order;
+  coefficients a;
+  void stepDependence(real h, real c, coefficients a) {}
+   
   real pgrow;
   real pshrink;
+  bool exponential;
 
   void operator init(int order, real[][] weights, real[] highOrderWeights,
                      real[] lowOrderWeights=new real[],
                      real[] steps=sequence(new real(int i) {
-                         return sum(weights[i]);},weights.length)) {
+                         return sum(weights[i]);},weights.length),
+                     void stepDependence(real, real, coefficients)=null) {
     this.order=order;
-    this.steps=steps;
-    this.weights=weights;
-    this.highOrderWeights=highOrderWeights;
-    this.lowOrderWeights=lowOrderWeights;
+    a.steps=steps;
+    a.factors=array(a.steps.length+1,1);
+    a.weights=weights;
+    a.highOrderWeights=highOrderWeights;
+    a.lowOrderWeights=lowOrderWeights;
+    if(stepDependence != null) {
+      this.stepDependence=stepDependence;
+      exponential=true;
+    }
     pgrow=(order > 0) ? 1/order : 0;
     pshrink=(order > 1) ? 1/(order-1) : pgrow;
   }
 }
 
+real[] Coeff={1,1/2,1/6,1/24,1/120,1/720,1/5040,1/40320,1/362880,1/3628800,
+              1/39916800.0,1/479001600.0,1/6227020800.0,1/87178291200.0,
+              1/1307674368000.0,1/20922789888000.0,1/355687428096000.0,
+              1/6402373705728000.0,1/121645100408832000.0,
+              1/2432902008176640000.0,1/51090942171709440000.0,
+              1/1124000727777607680000.0};
+
+real phi1(real x) {return x != 0 ? expm1(x)/x : 1;}
+
+real phi2(real x)
+{
+  real x2=x*x;
+  if(fabs(x) > 1) return (exp(x)-x-1)/x2;
+  real x3=x2*x;
+  real x5=x2*x3;
+  if(fabs(x) < 0.1) 
+    return Coeff[1]+x*Coeff[2]+x2*Coeff[3]+x3*Coeff[4]+x2*x2*Coeff[5]
+      +x5*Coeff[6]+x3*x3*Coeff[7]+x5*x2*Coeff[8]+x5*x3*Coeff[9];
+    else {
+      real x7=x5*x2;
+      real x8=x7*x;
+      return Coeff[1]+x*Coeff[2]+x2*Coeff[3]+x3*Coeff[4]+x2*x2*Coeff[5]
+        +x5*Coeff[6]+x3*x3*Coeff[7]+x7*Coeff[8]+x8*Coeff[9]
+        +x8*x*Coeff[10]+x5*x5*Coeff[11]+x8*x3*Coeff[12]+x7*x5*Coeff[13]+
+        x8*x5*Coeff[14]+x7*x7*Coeff[15]+x8*x7*Coeff[16]+x8*x8*Coeff[17];
+    }
+}
+
+real phi3(real x)
+{
+  real x2=x*x;
+  real x3=x2*x;
+  if(fabs(x) > 1.6) return (exp(x)-0.5*x2-x-1)/x3;
+  real x5=x2*x3;
+  if(fabs(x) < 0.1) 
+    return Coeff[2]+x*Coeff[3]+x2*Coeff[4]+x3*Coeff[5]
+      +x2*x2*Coeff[6]+x5*Coeff[7]+x3*x3*Coeff[8]+x5*x2*Coeff[9]
+      +x5*x3*Coeff[10];
+    else {
+      real x7=x5*x2;
+      real x8=x7*x;
+      real x16=x8*x8;
+      return Coeff[2]+x*Coeff[3]+x2*Coeff[4]+x3*Coeff[5]
+        +x2*x2*Coeff[6]+x5*Coeff[7]+x3*x3*Coeff[8]+x5*x2*Coeff[9]
+        +x5*x3*Coeff[10]+x8*x*Coeff[11]
+        +x5*x5*Coeff[12]+x8*x3*Coeff[13]+x7*x5*Coeff[14]
+        +x8*x5*Coeff[15]+x7*x7*Coeff[16]+x8*x7*Coeff[17]+x16*Coeff[18]
+        +x16*x*Coeff[19]+x16*x2*Coeff[20];
+    }
+}
+
+void expfactors(real x, coefficients a) 
+{
+  for(int i=0; i < a.steps.length; ++i)
+    a.factors[i]=exp(x*a.steps[i]);
+  a.factors[a.steps.length]=exp(x);
+}
+      
 // First-Order Euler
 RKTableau Euler=RKTableau(1,new real[][],
                           new real[] {1});
 
+// First-Order Exponential Euler
+RKTableau E_Euler=RKTableau(1,new real[][], new real[] {1},
+                            new void(real h, real c, coefficients a) {
+                              real x=-c*h;
+                              expfactors(x,a);
+                              a.highOrderWeights[0]=phi1(x);
+                            });
+
 // Second-Order Runge-Kutta
 RKTableau RK2=RKTableau(2,new real[][] {{1/2}},
-                        new real[] {0,1});
+                        new real[] {0,1}, // 2nd order
+                        new real[] {1,0}); // 1st order
+
+// Second-Order Exponential Runge-Kutta
+RKTableau E_RK2=RKTableau(2,new real[][] {{1/2}},
+                          new real[] {0,1}, // 2nd order
+                          new real[] {1,0}, // 1st order
+                          new void(real h, real c, coefficients a) {
+                            real x=-c*h;
+                            expfactors(x,a);
+                            a.weights[0][0]=1/2*phi1(x/2);
+                            real w=phi1(x);
+                            a.highOrderWeights[0]=0;
+                            a.highOrderWeights[1]=w;
+                            a.lowOrderWeights[0]=w;
+                          });
 
 // Second-Order Predictor-Corrector
 RKTableau PC=RKTableau(2,new real[][] {{1}},
-                       new real[] {1/2,1/2});
+                       new real[] {1/2,1/2}, // 2nd order
+                       new real[] {1,0}); // 1st order
+
+// Second-Order Exponential Predictor-Corrector
+RKTableau E_PC=RKTableau(2,new real[][] {{1}},
+                         new real[] {1/2,1/2}, // 2nd order
+                         new real[] {1,0}, // 1st order
+                         new void(real h, real c, coefficients a) {
+                           real x=-c*h;
+                           expfactors(x,a);
+                           real w=phi1(x);
+                           a.weights[0][0]=w;
+                           a.highOrderWeights[0]=w/2;
+                           a.highOrderWeights[1]=w/2;
+                           a.lowOrderWeights[0]=w;
+                         });
 
 // Third-Order Classical Runge-Kutta
 RKTableau RK3=RKTableau(3,new real[][] {{1/2},{-1,2}},
@@ -45,17 +156,41 @@ RKTableau RK3BS=RKTableau(3,new real[][] {{1/2},{0,3/4}},
                           new real[] {2/9,1/3,4/9}, // 3rd order
                           new real[] {7/24,1/4,1/3,1/8}); // 2nd order
 
+// Third-Order Exponential Bogacki-Shampine Runge-Kutta
+RKTableau E_RK3BS=RKTableau(3,new real[][] {{1/2},{0,3/4}},
+                            new real[] {2/9,1/3,4/9}, // 3rd order
+                            new real[] {7/24,1/4,1/3,1/8}, // 2nd order
+                            new void(real h, real c, coefficients a) {
+                              real x=-c*h;
+                              expfactors(x,a);
+                              real w=phi1(x);
+                              real w2=phi2(x);
+                              a.weights[0][0]=1/2*phi1(x/2);
+                              real a11=9/8*phi2(3/4*x)+3/8*phi2(x/2);
+                              a.weights[1][0]=3/4*phi1(3/4*x)-a11;
+                              a.weights[1][1]=a11;
+                              real a21=1/3*w;
+                              real a22=4/3*w2-2/9*w;
+                              a.highOrderWeights[0]=w-a21-a22;
+                              a.highOrderWeights[1]=a21;
+                              a.highOrderWeights[2]=a22;
+                              a.lowOrderWeights[0]=w-17/12*w2;
+                              a.lowOrderWeights[1]=w2/2;
+                              a.lowOrderWeights[2]=2/3*w2;
+                              a.lowOrderWeights[3]=w2/4;
+                            });
+
 // Fourth-Order Classical Runge-Kutta
 RKTableau RK4=RKTableau(4,new real[][] {{1/2},{0,1/2},{0,0,1}},
                         new real[] {1/6,1/3,1/3,1/6});
 
 // Fifth-Order Cash-Karp Runge-Kutta
-RKTableau RK5CK=RKTableau(5,new real[][] {{1/5},
-                                          {3/40,9/40},
-                                          {3/10,-9/10,6/5},
-                                          {-11/54,5/2,-70/27,35/27},
-                                          {1631/55296,175/512,575/13824,
-                                           44275/110592,253/4096}},
+RKTableau RK5=RKTableau(5,new real[][] {{1/5},
+                                        {3/40,9/40},
+                                        {3/10,-9/10,6/5},
+                                        {-11/54,5/2,-70/27,35/27},
+                                        {1631/55296,175/512,575/13824,
+                                         44275/110592,253/4096}},
   new real[] {37/378,0,250/621,125/594,
               0,512/1771},  // 5th order
   new real[] {2825/27648,0,18575/48384,13525/55296,
@@ -84,9 +219,9 @@ RKTableau RK5DP=RKTableau(5,new real[][] {{1/5},
   new real[] {5179/57600,0,7571/16695,393/640,
               -92097/339200,187/2100,1/40}); // 4th order
 
-real error(real error, real initial, real norm, real lowOrder, real diff) 
+real error(real error, real initial, real lowOrder, real norm, real diff) 
 {
-  if(initial != 0.0 && lowOrder != initial) {
+  if(initial != 0 && lowOrder != initial) {
     static real epsilon=realMin/realEpsilon;
     real denom=max(abs(norm),abs(initial))+epsilon;
     return max(error,max(abs(diff)/denom));
@@ -94,130 +229,154 @@ real error(real error, real initial, real norm, real lowOrder, real diff)
   return error;
 }
 
-real adjust(real h, real error, real t, real tolmin, real tolmax,
-            real dtmin, real dtmax, RKTableau tableau, bool verbose=true) 
+void report(real old, real h, real t)
 {
-  real dt=h;
-  void report(real t) {
-    if(h != dt)
-      write("Time step changed from "+(string) dt+" to "+(string) h+" at t="+
-            (string) t+".");
-  }
-  if(error > tolmax) {
-    h=max(h*max((tolmin/error)^tableau.pshrink,1/stepfactor),dtmin);
-    if(verbose) report(t);
-    return h;
-  }
-  if(error > 0 && error < tolmin) {
-    h=min(h*min((tolmin/error)^tableau.pgrow,stepfactor),dtmax);
-    if(verbose) report(t+dt);
-  }
+  write("Time step changed from "+(string) old+" to "+(string) h+" at t="+
+        (string) t+".");
+}
+
+real adjust(real h, real error, real tolmin, real tolmax, RKTableau tableau)
+{
+  if(error > tolmax)
+    h *= max((tolmin/error)^tableau.pshrink,1/stepfactor);
+  else if(error > 0 && error < tolmin)
+    h *= min((tolmin/error)^tableau.pgrow,stepfactor);
   return h;
 }
 
-// Integrate dy/dt=f(t,y) from a to b using initial conditions y,
+// Integrate dy/dt+cy=f(t,y) from a to b using initial conditions y,
 // specifying either the step size h or the number of steps n.
-real integrate(real y, real f(real t, real y), real a, real b=a, real h=0,
-               int n=0, bool dynamic=false, real tolmin=0, real tolmax=0,
-               real dtmin=0, real dtmax=realMax, RKTableau tableau,
-               bool verbose=false)
+real[] integrate(real y, real c=0, real g(real t, real y), real a, real b=a,
+                 real h=0, int n=0, bool dynamic=false, real tolmin=0,
+                 real tolmax=0, real dtmin=0, real dtmax=realMax,
+                 RKTableau tableau, bool verbose=false)
 {
+  real[] Y={y};
+
   if(h == 0) {
-    if(b == a) return y;
+    if(b == a) return Y;
     if(n == 0) abort("Either n or h must be specified");
     else h=(b-a)/n;
   }
+
+  real f(real t, real y)=(c == 0 || tableau.exponential) ? g :
+    new real(real t, real y) {return g(t,y)-c*y;};
+
+  tableau.stepDependence(h,c,tableau.a);
+      
   real t=a;
   real f0;
-  bool fsal=tableau.lowOrderWeights.length > tableau.highOrderWeights.length;
+  if(tableau.a.lowOrderWeights.length == 0) dynamic=false;
+  bool fsal=dynamic &&
+    (tableau.a.lowOrderWeights.length > tableau.a.highOrderWeights.length);
   if(fsal) f0=f(t,y);
-  if(tableau.lowOrderWeights.length == 0) dynamic=false;
 
+  real dt=h;
   while(t < b) {
+    h=min(h,b-t);
+    if(t+h == t) break;
+    if(h != dt) {
+      if(verbose) report(dt,h,t);
+      tableau.stepDependence(h,c,tableau.a);
+      dt=h;
+    }
+ 
     real[] predictions={fsal ? f0 : f(t,y)};
-    for(int i=0; i < tableau.steps.length; ++i)
-      predictions.push(f(t+h*tableau.steps[i],
-                         y+h*dot(tableau.weights[i],predictions)));
+    for(int i=0; i < tableau.a.steps.length; ++i)
+      predictions.push(f(t+h*tableau.a.steps[i],
+                         tableau.a.factors[i]*y+h*dot(tableau.a.weights[i],
+                                                      predictions)));
 
-    real highOrder=h*dot(tableau.highOrderWeights,predictions);
+    real highOrder=h*dot(tableau.a.highOrderWeights,predictions);
+    real y0=tableau.a.factors[tableau.a.steps.length]*y;
     if(dynamic) {
       real f1;
       if(fsal) {
-        f1=f(t+h,y+highOrder);
+        f1=f(t+h,y0+highOrder);
         predictions.push(f1);
       }
-      real lowOrder=h*dot(tableau.lowOrderWeights,predictions);
+      real lowOrder=h*dot(tableau.a.lowOrderWeights,predictions);
       real error;
-      error=error(error,y,y+highOrder,y+lowOrder,highOrder-lowOrder);
-      real dt=h;
-      h=adjust(h,error,t,tolmin,tolmax,dtmin,min(dtmax,b-t-h),tableau,verbose);
+      error=error(error,y,y0+lowOrder,y0+highOrder,highOrder-lowOrder);
+      h=adjust(h,error,tolmin,tolmax,tableau);
       if(h >= dt) {
         t += dt;
-        y += highOrder;
+        y=y0+highOrder;
+        Y.push(y);
         f0=f1;
       }
+      h=min(max(h,dtmin),dtmax);
     } else {
       t += h;
-      y += highOrder;
+      y=y0+highOrder;
+      Y.push(y);
     }
-    h=min(h,b-t);
-    if(t >= b || t+h == t) break;
   }
-  return y;
+  return Y;
 }
 
 // Integrate a set of equations, dy/dt=f(t,y), from a to b using initial
 // conditions y, specifying either the step size h or the number of steps n.
-real[] integrate(real[] y, real[] f(real t, real[] y), real a, real b=a,
-                 real h=0, int n=0, bool dynamic=false,
-                 real tolmin=0, real tolmax=0, real dtmin=0, real dtmax=realMax,
-                 RKTableau tableau, bool verbose=false)
+real[][] integrate(real[] y, real[] f(real t, real[] y), real a, real b=a,
+                   real h=0, int n=0, bool dynamic=false,
+                   real tolmin=0, real tolmax=0, real dtmin=0,
+                   real dtmax=realMax, RKTableau tableau, bool verbose=false)
 {
+  real[][] Y={copy(y)};
+      
   if(h == 0) {
-    if(b == a) return y;
+    if(b == a) return Y;
     if(n == 0) abort("Either n or h must be specified");
     else h=(b-a)/n;
   }
-  real[] y=copy(y);
   real t=a;
   real[] f0;
-  bool fsal=tableau.lowOrderWeights.length > tableau.highOrderWeights.length;
+  if(tableau.a.lowOrderWeights.length == 0) dynamic=false;
+  bool fsal=dynamic &&
+    (tableau.a.lowOrderWeights.length > tableau.a.highOrderWeights.length);
   if(fsal) f0=f(t,y);
-  if(tableau.lowOrderWeights.length == 0) dynamic=false;
 
+  real dt=h;
   while(t < b) {
+    h=min(h,b-t);
+    if(t+h == t) break;
+    if(h != dt) {
+      if(verbose) report(dt,h,t);
+      dt=h;
+    }
+
     real[][] predictions={fsal ? f0 : f(t,y)};
-    for(int i=0; i < tableau.steps.length; ++i)
-      predictions.push(f(t+h*tableau.steps[i],
-                         y+h*tableau.weights[i]*predictions));
+    for(int i=0; i < tableau.a.steps.length; ++i)
+      predictions.push(f(t+h*tableau.a.steps[i],
+                         y+h*tableau.a.weights[i]*predictions));
 
-    real[] highOrder=h*tableau.highOrderWeights*predictions;
+    real[] highOrder=h*tableau.a.highOrderWeights*predictions;
     if(dynamic) {
       real[] f1;
       if(fsal) {
         f1=f(t+h,y+highOrder);
         predictions.push(f1);
       }
-      real[] lowOrder=h*tableau.lowOrderWeights*predictions;
+      real[] lowOrder=h*tableau.a.lowOrderWeights*predictions;
       real error;
       for(int i=0; i < y.length; ++i)
-        error=error(error,y[i],y[i]+highOrder[i],y[i]+lowOrder[i],
+        error=error(error,y[i],y[i]+lowOrder[i],y[i]+highOrder[i],
                     highOrder[i]-lowOrder[i]);
-      real dt=h;
-      h=adjust(h,error,t,tolmin,tolmax,dtmin,min(dtmax,b-t-h),tableau,verbose);
+      h=adjust(h,error,tolmin,tolmax,tableau);
       if(h >= dt) {
         t += dt;
         y += highOrder;
+        Y.push(y);
         f0=f1;
       }
+      h=min(max(h,dtmin),dtmax);
     } else {
       t += h;
       y += highOrder;
+      Y.push(y);
     }
-    h=min(h,b-t);
-    if(t >= b || t+h == t) break;
   }
-  return y;
+  return Y;
 }
 
 real[][] finiteDifferenceJacobian(real[] f(real[]), real[] t,
@@ -253,7 +412,8 @@ real[] solveBVP(real[] f(real, real[]), real a, real b=a, real h=0, int n=0,
                 real[] guess, RKTableau tableau, int iterations=100)
 {
   real[] g(real[] t) {
-    return discrepancy(integrate(initial(t),f,a,b,h,n,tableau));
+    real[][] y=integrate(initial(t),f,a,b,h,n,tableau);
+    return discrepancy(y[y.length-1]);
   }
   real[][] jacobian(real[] t) {return finiteDifferenceJacobian(g,t);}
   return initial(newton(iterations,g,jacobian,guess));
diff --git a/Master/texmf/asymptote/plain_picture.asy b/Master/texmf/asymptote/plain_picture.asy
index 4d894dc6dea..b3836d7ef51 100644
--- a/Master/texmf/asymptote/plain_picture.asy
+++ b/Master/texmf/asymptote/plain_picture.asy
@@ -408,16 +408,18 @@ struct projection {
   bool infinity;
   bool oblique;
   bool absolute=false;
-  triple camera;
-  triple up;
-  triple target;
+  triple camera;        // Position of camera.
+  triple up;            // A vector that should be projected to direction (0,1).
+  triple target;        // Point where camera is looking at.
+  pair viewportshift;   // Fractional viewport shift.
+  real zoom=1;          // Zoom factor.
+  real angle;           // Lens angle (for perspective projection).
   bool showtarget=true; // Expand bounding volume to include target?
   typedef transformation projector(triple camera, triple up, triple target);
   projector projector;
   bool autoadjust=true; // Adjust camera to lie outside bounding volume?
-  bool center=false; // Center target within bounding volume?
-  real angle; // Lens angle (currently only used by PRC viewpoint).
-  int ninterpolate; // Used for projecting nurbs to 2D Bezier curves.
+  bool center=false;    // Center target within bounding volume?
+  int ninterpolate;     // Used for projecting nurbs to 2D Bezier curves.
 
   void calculate() {
     transformation T=projector(camera,up,target);
@@ -438,11 +440,15 @@ struct projection {
   }
 
   void operator init(triple camera, triple up=(0,0,1), triple target=(0,0,0),
+                     real zoom=1, real angle=0, pair viewportshift=0,
                      bool showtarget=true, bool autoadjust=true,
                      bool center=false, projector projector) {
     this.camera=camera;
     this.up=up;
     this.target=target;
+    this.zoom=zoom;
+    this.angle=angle;
+    this.viewportshift=viewportshift;
     this.showtarget=showtarget;
     this.autoadjust=autoadjust;
     this.center=center;
@@ -459,11 +465,13 @@ struct projection {
     P.camera=camera;
     P.up=up;
     P.target=target;
+    P.zoom=zoom;
+    P.angle=angle;
+    P.viewportshift=viewportshift;
     P.showtarget=showtarget;
     P.autoadjust=autoadjust;
     P.center=center;
     P.projector=projector;
-    P.angle=angle;
     P.ninterpolate=ninterpolate;
     return P;
   }
diff --git a/Master/texmf/asymptote/three.asy b/Master/texmf/asymptote/three.asy
index d454d032b23..63a497c497c 100644
--- a/Master/texmf/asymptote/three.asy
+++ b/Master/texmf/asymptote/three.asy
@@ -17,7 +17,6 @@ real linegranularity=0.01;
 real tubegranularity=0.003;
 real dotgranularity=0.0001;
 real viewportfactor=1.002;   // Factor used to expand orthographic viewport.
-real viewportpadding=1;      // Offset used to expand PRC viewport.
 real angleprecision=1e-3;    // Precision for centering perspective projections.
 real anglefactor=max(1.01,1+angleprecision);
 // Factor used to expand perspective viewport.
@@ -127,10 +126,6 @@ transform3 reflect(triple u, triple v, triple w)
   }*shift(-u);
 }
 
-bool operator != (real[][] a, real[][] b) {
-  return !(a == b);
-}
-
 // Project u onto v.
 triple project(triple u, triple v)
 {
@@ -219,38 +214,44 @@ pair dir(triple v, triple dir, projection P)
 // points in three space to a plane through target and
 // perpendicular to the vector camera-target.
 projection perspective(triple camera, triple up=Z, triple target=O,
+                       real zoom=1, real angle=0, pair viewportshift=0,
                        bool showtarget=true, bool autoadjust=true,
                        bool center=autoadjust)
 {
   if(camera == target)
     abort("camera cannot be at target");
-  return projection(camera,up,target,showtarget,autoadjust,center,
+  return projection(camera,up,target,zoom,angle,viewportshift,
+                    showtarget,autoadjust,center,
                     new transformation(triple camera, triple up, triple target)
                     {return transformation(look(camera,up,target),
                                            distort(camera-target));});
 }
 
 projection perspective(real x, real y, real z, triple up=Z, triple target=O,
+                       real zoom=1, real angle=0, pair viewportshift=0,
                        bool showtarget=true, bool autoadjust=true,
                        bool center=autoadjust)
 {
-  return perspective((x,y,z),up,target,showtarget,autoadjust,center);
+  return perspective((x,y,z),up,target,zoom,angle,viewportshift,showtarget,
+                     autoadjust,center);
 }
 
 projection orthographic(triple camera, triple up=Z, triple target=O,
+                        real zoom=1, pair viewportshift=0,
                         bool showtarget=true, bool center=false)
 {
-  return projection(camera,up,target,showtarget,center=center,
+  return projection(camera,up,target,zoom,viewportshift,showtarget,center=center,
                     new transformation(triple camera, triple up,
                                        triple target) {
                       return transformation(look(camera,up,target));});
 }
 
 projection orthographic(real x, real y, real z, triple up=Z,
-                        triple target=O, bool showtarget=true,
-                        bool center=false)
+                        triple target=O, real zoom=1, pair viewportshift=0,
+                        bool showtarget=true, bool center=false)
 {
-  return orthographic((x,y,z),up,target,showtarget,center=center);
+  return orthographic((x,y,z),up,target,zoom,viewportshift,showtarget,
+                      center=center);
 }
 
 projection oblique(real angle=45)
@@ -1956,7 +1957,7 @@ draw=new void(frame f, path3 g, material p=currentpen,
       if(settings.thick) {
         real width=linewidth(q);
         if(width > 0) {
-          surface s=tube(g,width);
+          surface s=tube(g,width,p.granularity);
           int L=length(g);
           if(L >= 0) {
             if(!cyclic(g)) {
@@ -2278,20 +2279,27 @@ string embed3D(string label="", string text=label, string prefix,
   real viewplanesize;
   if(P.infinity) {
     triple lambda=max3(f)-min3(f);
-    pair margin=viewportpadding*(1,1)+viewportmargin((lambda.x,lambda.y));
-    viewplanesize=(max(lambda.x+2*margin.x,lambda.y+2*margin.y))/cm;
+    pair margin=viewportmargin((lambda.x,lambda.y));
+    viewplanesize=(max(lambda.x+2*margin.x,lambda.y+2*margin.y))/(cm*P.zoom);
   } else
-    if(!P.absolute) angle=2*aTan(Tan(0.5*angle)-viewportpadding/P.target.z);
+    if(!P.absolute) angle=2*aTan(Tan(0.5*angle));
 
   string name=prefix+".js";
   writeJavaScript(name,lightscript+projection(P.infinity,viewplanesize),script);
 
   shipout3(prefix,f);
-  
+
   prefix += ".prc";
   if(!settings.inlinetex)
     file3.push(prefix);
 
+  triple target=P.target;
+  if(P.infinity && P.viewportshift != 0) {
+    triple lambda=max3(f)-min3(f);
+    target -= (P.viewportshift.x*lambda.x/P.zoom,
+               P.viewportshift.y*lambda.y/P.zoom,0);
+  }
+
   triple v=P.vector()/cm;
   triple u=unit(v);
   triple w=Z-u.z*u;
@@ -2310,7 +2318,7 @@ string embed3D(string label="", string text=label, string prefix,
     ",toolbar="+(settings.toolbar ? "true" : "false")+
     ",3Daac="+Format(P.absolute ? P.angle : angle)+
     ",3Dc2c="+Format(u)+
-    ",3Dcoo="+Format(P.target/cm)+
+    ",3Dcoo="+Format(target/cm)+
     ",3Droll="+Format(roll)+
     ",3Droo="+Format(abs(v))+
     ",3Dbg="+Format(light.background());
@@ -2437,9 +2445,7 @@ object embed(string label="", string text=label,
         viewportmargin=viewportmargin((lambda.x,lambda.y));
         width=lambda.x+2*viewportmargin.x;
         height=lambda.y+2*viewportmargin.y;
-
-        triple s=(-0.5(m.x+M.x),-0.5*(m.y+M.y),0);
-        f=shift(s)*f;  // Eye will be at (0,0,0).
+        f=shift((-0.5(m.x+M.x),-0.5*(m.y+M.y),0))*f;  // Eye will be at (0,0,0).
       } else {
         transform3 T=identity4;
         // Choose the angle to be just large enough to view the entire image:
@@ -2539,9 +2545,10 @@ object embed(string label="", string text=label,
         M += margin; 
         m -= margin;
       } else if(M.z >= 0) abort("camera too close");
-      
+
       shipout3(prefix,f,preview ? nativeformat() : format,
-               width,height,P.infinity ? 0 : angle,m,M,
+               width,height,P.infinity ? 0 : angle,P.zoom,m,M,
+               prc && !P.infinity ? 0 : P.viewportshift,
                tinv*inverse(modelview)*shift(0,0,zcenter),light.background(),
                P.absolute ? (modelview*light).position : light.position,
                light.diffuse,light.ambient,light.specular,
@@ -2557,8 +2564,13 @@ object embed(string label="", string text=label,
       if(!settings.inlinetex) file3.push(image);
       image=graphic(image,"hiresbb");
     }
-    if(prc) F.L=embed3D(label,text=image,prefix,f,format,
+    if(prc) {
+      if(!P.infinity && P.viewportshift != 0)
+        write("warning: PRC does not support off-axis projections; use pan instead of shift");
+      F.L=embed3D(label,text=image,prefix,f,format,
                         width,height,angle,options,script,light,Q);
+    }
+    
   }
 
   if(!is3D) {
diff --git a/Master/texmf/asymptote/three_arrows.asy b/Master/texmf/asymptote/three_arrows.asy
index 78ee56d9f04..418065e5e1e 100644
--- a/Master/texmf/asymptote/three_arrows.asy
+++ b/Master/texmf/asymptote/three_arrows.asy
@@ -48,7 +48,7 @@ void bend(surface s, path3 g, real L)
   }
 }
 
-void render(path3 s, void f(path3, real))
+void render(path3 s, real granularity=tubegranularity, void f(path3, real))
 {
   static int maxdepth=ceil(-log(realEpsilon)/log(2))+1;
   void Split(triple z0, triple c0, triple c1, triple z1, real t0=0, real t1=1,
@@ -62,7 +62,7 @@ void render(path3 s, void f(path3, real))
         --depth;
         for(int i=0; i <= nintervals; ++i) {
           R=min(R,radius(z0,c0,c1,z1,i/nintervals));
-          if(S > max(tubegranularity*R,fuzz)) {
+          if(S > max(granularity*R,fuzz)) {
             triple m0=0.5*(z0+c0);
             triple m1=0.5*(c0+c1);
             triple m2=0.5*(c1+z1);
@@ -82,7 +82,7 @@ void render(path3 s, void f(path3, real))
   Split(point(s,0),postcontrol(s,0),precontrol(s,1),point(s,1));
 }
 
-surface tube(path3 g, real width)
+surface tube(path3 g, real width, real granularity=tubegranularity)
 {
   surface tube;
   real r=0.5*width;
@@ -97,7 +97,7 @@ surface tube(path3 g, real width)
       triple u=point(g,i+1)-v;
       tube.append(shift(v)*align(unit(u))*scale(r,r,abs(u))*unitcylinder);
     } else {
-      render(subpath(g,i,i+1),new void(path3 q, real) {
+      render(subpath(g,i,i+1),granularity,new void(path3 q, real) {
           real L=arclength(q);
           surface segment=scale(r,r,L)*unitcylinder;
           bend(segment,q,L);
diff --git a/Master/texmf/asymptote/three_surface.asy b/Master/texmf/asymptote/three_surface.asy
index 597104ad202..2f5d80aacbe 100644
--- a/Master/texmf/asymptote/three_surface.asy
+++ b/Master/texmf/asymptote/three_surface.asy
@@ -731,14 +731,22 @@ struct surface {
     for(int i=0; i < L; ++i) {
       path3 h=subpath(g,i,i+1);
       path3 r=reverse(h);
-      triple max=max(h);
-      triple min=min(h);
-      triple perp=perp(max-c,axis);
-      real fuzz=epsilon*max(abs(max),abs(min));
-      if(abs(perp) < fuzz)
-        perp=perp(min-c,axis);
+      path3 H=shift(-c)*h;
+      real M=0;
+      triple perp;
+      void test(real[] t) {
+        for(int i=0; i < 3; ++i) {
+          triple v=point(H,t[i]);
+          triple V=v-dot(v,axis)*axis;
+          real a=abs(V);
+          if(a > M) {M=a; perp=V;}
+        }
+      }
+      test(maxtimes(H));
+      test(mintimes(H));
+      
       perp=unit(perp);
-      triple normal=cross(axis,perp);
+      triple normal=unit(cross(axis,perp));
       triple dir(real j) {return Cos(j)*normal-Sin(j)*perp;}
       real j=angle1;
       transform3 Tk=T[0];
diff --git a/Master/texmf/asymptote/version.asy b/Master/texmf/asymptote/version.asy
index d7aa99e46b9..ab6167a50a5 100644
--- a/Master/texmf/asymptote/version.asy
+++ b/Master/texmf/asymptote/version.asy
@@ -1 +1 @@
-string VERSION="1.77";
+string VERSION="1.79";
diff --git a/Master/texmf/doc/info/asy-faq.info b/Master/texmf/doc/info/asy-faq.info
index 32cecefe8af..4112c7fc9c3 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
-                            19 Jun 2009
+                            02 Jul 2009
                           
 This is the list of Frequently Asked Questions about Asymptote (asy).
 
diff --git a/Master/texmf/doc/man/man1/asy.1 b/Master/texmf/doc/man/man1/asy.1
index d0699897509..3ec3130e9aa 100644
--- a/Master/texmf/doc/man/man1/asy.1
+++ b/Master/texmf/doc/man/man1/asy.1
@@ -35,7 +35,7 @@ description, see the Info files.
 View output; command-line only.
 .TP
 .B \-a,\-align C|B|T|Z   
-Center, Bottom, Top, or Zero page alignment [Center].
+Center, Bottom, Top, or Zero page alignment [C].
 .TP
 .B \-antialias n        
 Antialiasing width for rasterized output [2].