asymptote 1.74

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

6 files changed, 154 insertions, 18 deletions

diff --git a/Build/source/utils/asymptote/doc/Makefile.in b/Build/source/utils/asymptote/doc/Makefile.in
index 93aba13dfe8..bf26747579e 100644
--- a/Build/source/utils/asymptote/doc/Makefile.in
+++ b/Build/source/utils/asymptote/doc/Makefile.in
@@ -48,7 +48,7 @@ options: ../settings.cc
 	$(ASY) -h 2>&1 | grep -iv Asymptote > options
 
 asy.1: options asy.1.begin asy.1.end
-	cat options | grep \^- | sed -e "s/-\(.*\)  \([A-Z].*\)/.TP\n.B -\1\n\2\./" | sed -e "/^.B/ s/-/\\\\-/g" | cat asy.1.begin - asy.1.end > asy.1
+	cat options | grep \^- | sed -e "s/-\(.*\)  \([a-zA-Z].*\)/.TP\n.B -\1\n\2\./" | sed -e "/^.B/ s/-/\\\\-/g" | cat asy.1.begin - asy.1.end > asy.1
 
 asymptote.dvi: $(SOURCE) $(ASYFILES:.asy=.eps)
 	ln -sf asymptote.texi asymptote_.texi
diff --git a/Build/source/utils/asymptote/doc/asy.1 b/Build/source/utils/asymptote/doc/asy.1
index 0e3cfed6d67..d0699897509 100644
--- a/Build/source/utils/asymptote/doc/asy.1
+++ b/Build/source/utils/asymptote/doc/asy.1
@@ -198,7 +198,9 @@ Scroll standard output n lines at a time [0].
 .TP
 .B \-tabcompletion      
 Interactive prompt auto-completion [true].
--tex engine           latex|pdflatex|xelatex|tex|pdftex|none [latex]
+.TP
+.B \-tex engine         
+latex|pdflatex|xelatex|tex|pdftex|context|none [latex].
 .TP
 .B \-thick              
 Render thick 3D lines [true].
@@ -225,7 +227,7 @@ Use two-sided 3D lighting model for rendering [true].
 General purpose user string.
 .TP
 .B \-v,\-verbose         
-Increase verbosity level [0].
+Increase verbosity level (can specify multiple times) [0].
 .TP
 .B \-version            
 Show version; command-line only.
diff --git a/Build/source/utils/asymptote/doc/asymptote.texi b/Build/source/utils/asymptote/doc/asymptote.texi
index 2c4872fd8e7..b04a940decb 100644
--- a/Build/source/utils/asymptote/doc/asymptote.texi
+++ b/Build/source/utils/asymptote/doc/asymptote.texi
@@ -1397,7 +1397,7 @@ and @code{rainbow.asy}.
 @cindex function shading
 @cindex @code{functionshade}
 More general shading possibilities are available with the @code{pdflatex},
-@code{xetex}, and @code{pdftex} @TeX{} engines: the routine
+@code{context}, and @code{pdftex} @TeX{} engines: the routine
 @verbatim
 void functionshade(picture pic=currentpicture, path[] g, bool stroke=false,
                    pen fillrule=currentpen, string shader);
@@ -2324,7 +2324,7 @@ path times along @code{p} and @code{q}, in the sense of
 @code{point(path, real)}, for one such intersection point (as chosen by
 the algorithm described on page 137 of @code{The MetaFontbook}). 
 The computations are performed to the absolute error specified by @code{fuzz}, 
-or, if @code{fuzz < 0}, to machine precision. If the paths do not 
+or if @code{fuzz < 0}, to machine precision. If the paths do not 
 intersect, return a real array of length 0.
 
 @cindex @code{intersections}
@@ -2332,7 +2332,7 @@ intersect, return a real array of length 0.
 Return all (unless there are infinitely many) intersection times of
 paths @code{p} and @code{q} as a sorted array of real arrays of length 2
 (@pxref{sort}). The computations are performed to the absolute error
-specified by @code{fuzz}, or, if @code{fuzz < 0}, to machine precision.
+specified by @code{fuzz}, or if @code{fuzz < 0}, to machine precision.
 
 @cindex @code{intersections}
 @item real[] intersections(path p, explicit pair a, explicit pair b,
@@ -2340,7 +2340,7 @@ specified by @code{fuzz}, or, if @code{fuzz < 0}, to machine precision.
 Return all (unless there are infinitely many) intersection times of path
 @code{p} with the (infinite) line through points @code{a} and @code{b}
 as a sorted array. The intersections returned are guaranteed to be
-correct to within the absolute error specified by @code{fuzz}, or, if
+correct to within the absolute error specified by @code{fuzz}, or if
 @code{fuzz < 0}, to machine precision.
 
 @cindex @code{times}
@@ -2377,7 +2377,7 @@ returns an array containing all intersection points of the paths
 @cindex @code{extension}
 @item pair extension(pair P, pair Q, pair p, pair q);
 returns the intersection point of the extensions of the line segments 
-@code{P--Q} and @code{p--q}, or, if the lines are parallel,
+@code{P--Q} and @code{p--q}, or if the lines are parallel,
 @code{(infinity,infinity)}.
 
 @cindex @code{cut}
@@ -2860,7 +2860,7 @@ skip of a pen can be examined with the routines
 @cindex @code{font command}
 @item A pen using a specific @code{LaTeX} @code{NFSS} font is returned
 by calling the function @code{pen font(string encoding, string family,
-string series="m", string shape="n")}. The default setting,
+string series, string shape)}. The default setting,
 @code{font("OT1","cmr","m","n")}, corresponds to 12pt Computer Modern Roman;
 this may be changed with @code{defaultpen(pen)}. 
 The font setting of a pen is returned by
@@ -6189,7 +6189,7 @@ This module provides an interface to the @code{LaTeX} package
 @noindent
 for embedding movies, sounds, and 3D objects into a @acronym{PDF} document.
 @noindent
-@cindex @code{XeLaTeX}
+@cindex @code{xelatex}
 However, @code{XeLaTeX} users need to rename the modified version
 @code{movie15_dvipdfmx.sty} from
 @quotation
@@ -6270,7 +6270,7 @@ To use Cyrillic fonts, you will need to change the font encoding:
 @verbatim
 import unicode;
 texpreamble("\usepackage{mathtext}\usepackage[russian]{babel}");
-defaultpen(font("T2A","cmr"));
+defaultpen(font("T2A","cmr","m","n"));
 @end verbatim
 @noindent
 @cindex Chinese
@@ -7704,6 +7704,31 @@ autoadjust,center)}.
 The default projection, @code{currentprojection}, is initially set to
 @code{perspective(5,4,2)}.
 
+@cindex @code{LeftView}
+@cindex @code{RightView}
+@cindex @code{FrontView}
+@cindex @code{BackView}
+@cindex @code{BottomView}
+@cindex @code{TopView}
+We also define standard orthographic views used in technical drawing:
+@verbatim
+projection LeftView=orthographic(-X,showtarget=true);
+projection RightView=orthographic(X,showtarget=true);
+projection FrontView=orthographic(-Y,showtarget=true);
+projection BackView=orthographic(Y,showtarget=true);
+projection BottomView=orthographic(-Z,showtarget=true);
+projection TopView=orthographic(Z,showtarget=true);
+@end verbatim
+@noindent
+The function
+@verbatim
+void addViews(picture dest=currentpicture, picture src, bool group=true,
+              filltype filltype=NoFill, bool above=true);
+@end verbatim
+@noindent
+adds picture @code{pic} as seen with @code{FrontView} aligned above the
+projection @code{TopView} and to the right of the projection @code{RightView}. 
+
 A triple or path3 can be projected to a pair or path,
 with @code{project(triple, projection P=currentprojection)} or
 @code{project(path3, projection P=currentprojection)}.
@@ -7829,7 +7854,24 @@ Three-dimensional versions of the path functions @code{length},
 @code{arclength}, @code{arctime}, @code{reverse}, @code{subpath},
 @code{intersect}, @code{intersections}, @code{intersectionpoint},
 @code{intersectionpoints}, @code{min}, @code{max}, @code{cyclic}, and
-@code{straight} are also defined.
+@code{straight} are also defined. 
+
+The routine
+@cindex @code{intersections}
+@verbatim
+real[][] intersections(path3 p, surface s, real fuzz=-1);
+@end verbatim
+@noindent
+returns the intersection times of a path @code{p} with a surface
+@code{s} as a sorted array of real arrays of length 2, and
+@cindex @code{intersectionpoints}
+@verbatim
+triple[] intersectionpoints(path3 p, surface s, real fuzz=-1);
+@end verbatim
+@noindent
+returns the corresponding intersection points.
+Here, the computations are performed to the absolute error specified by
+@code{fuzz}, or if @code{fuzz < 0}, to machine precision.
 
 Here is an example showing all five guide3 connectors:
 @verbatiminclude join3.asy
@@ -8520,10 +8562,15 @@ at the beginning of the configuration file, it can contain arbitrary
 @cindex @code{render}
 @cindex @code{antialias}
 @cindex @code{size}
+@cindex @code{latex}
+@cindex @code{tex}
+@cindex @code{pdflatex}
+@cindex @code{xelatex}
+@cindex @code{context}
 @anchor{convert}
 The default output format is @acronym{EPS} for the (default)
-@code{latex} tex engine and @acronym{PDF} for the @code{pdflatex} and
-@code{xelatex} tex engines.
+@code{latex} and @code{tex} tex engine and @acronym{PDF} for the
+@code{pdflatex}, @code{xelatex}, and @code{context} tex engines.
 Alternative output formats may be produced using the @code{-f} option 
 (or @code{outformat} setting). The optional setting @code{-render n} requests
 an output resolution of @code{n} pixels per @code{bp}. Antialiasing is
@@ -9149,5 +9196,7 @@ Melenchuk, Martin Wiebusch, and Stefan Knorr.
 @c  LocalWords:  minblockwidth minblockheight mincirclediameter nonassociative
 @c  LocalWords:  nonintegral gettriple enablerepo hexidecimal XeLaTeX xelatex
 @c  LocalWords:  dvipdfmx autoadjust viewportsize viewportwidth viewportheight
-@c  LocalWords:  subregions nonsimply functionshade xetex shader floatingdisk
-@c  LocalWords:  functionshading nonselfintersecting
+@c  LocalWords:  subregions nonsimply functionshade shader floatingdisk TopView
+@c  LocalWords:  functionshading nonselfintersecting maxlength LeftView
+@c  LocalWords:  vectorfieldsphere RightView FrontView BackView BottomView
+@c  LocalWords:  addViews
diff --git a/Build/source/utils/asymptote/doc/colo-asy.tex b/Build/source/utils/asymptote/doc/colo-asy.tex
new file mode 100644
index 00000000000..a9f2a9b636c
--- /dev/null
+++ b/Build/source/utils/asymptote/doc/colo-asy.tex
@@ -0,0 +1,84 @@
+%D \module
+%D   [       file=colo-asy,
+%D        version=2009.05.20,
+%D          title=\CONTEXT\ Color Macros,
+%D       subtitle=\asymptote\ Colors,
+%D         author=\asymptote\ developers,
+%D           date=\currentdate,
+%D      copyright={put something here}]
+%C
+%C any copyright notice may go here
+
+% call with \setupcolor[asy]
+
+\definecolor [cyan]          [c=1.00,m=0.00,y=0.00,k=0.00]
+\definecolor [magenta]       [c=0.00,m=1.00,y=0.00,k=0.00]
+\definecolor [yellow]        [c=0.00,m=0.00,y=1.00,k=0.00]
+\definecolor [black]         [c=0.00,m=0.00,y=0.00,k=1.00]
+
+\definecolor [white]         [c=0.00,m=0.00,y=0.00,k=0.00]
+\definecolor [gray]          [c=0.00,m=0.00,y=0.00,k=0.50]
+
+\definecolor [red]           [c=0.00,m=1.00,y=1.00,k=0.00]
+\definecolor [green]         [c=1.00,m=0.00,y=1.00,k=0.00]
+\definecolor [blue]          [c=1.00,m=1.00,y=0.00,k=0.00]
+
+\definecolor [palered]       [c=0.00,m=0.25,y=0.25,k=0.00]
+\definecolor [palegreen]     [c=0.25,m=0.00,y=0.25,k=0.00]
+\definecolor [paleblue]      [c=0.25,m=0.25,y=0.00,k=0.00]
+\definecolor [palecyan]      [c=0.25,m=0.00,y=0.00,k=0.00]
+\definecolor [palemagenta]   [c=0.00,m=0.25,y=0.00,k=0.00]
+\definecolor [paleyellow]    [c=0.00,m=0.00,y=0.25,k=0.00]
+\definecolor [palegray]      [c=0.00,m=0.00,y=0.00,k=0.05]
+\definecolor [lightred]      [c=0.00,m=0.50,y=0.50,k=0.00]
+\definecolor [lightgreen]    [c=0.50,m=0.00,y=0.50,k=0.00]
+\definecolor [lightblue]     [c=0.50,m=0.50,y=0.00,k=0.00]
+\definecolor [lightcyan]     [c=0.50,m=0.00,y=0.00,k=0.00]
+\definecolor [lightmagenta]  [c=0.00,m=0.50,y=0.00,k=0.00]
+\definecolor [lightyellow]   [c=0.00,m=0.00,y=0.50,k=0.00]
+\definecolor [lightgray]     [c=0.00,m=0.00,y=0.00,k=0.10]
+\definecolor [mediumred]     [c=0.00,m=0.75,y=0.75,k=0.00]
+\definecolor [mediumgreen]   [c=0.75,m=0.00,y=0.75,k=0.00]
+\definecolor [mediumblue]    [c=0.75,m=0.75,y=0.00,k=0.00]
+\definecolor [mediumcyan]    [c=0.75,m=0.00,y=0.00,k=0.00]
+\definecolor [mediummagenta] [c=0.00,m=0.75,y=0.00,k=0.00]
+\definecolor [mediumyellow]  [c=0.00,m=0.00,y=0.75,k=0.00]
+\definecolor [mediumgray]    [c=0.00,m=0.00,y=0.00,k=0.25]
+\definecolor [heavyred]      [c=0.00,m=1.00,y=1.00,k=0.25]
+\definecolor [heavygreen]    [c=1.00,m=0.00,y=1.00,k=0.25]
+\definecolor [heavyblue]     [c=1.00,m=1.00,y=0.00,k=0.25]
+\definecolor [heavycyan]     [c=1.00,m=0.00,y=0.00,k=0.25]
+\definecolor [heavymagenta]  [c=0.00,m=1.00,y=0.00,k=0.25]
+\definecolor [lightolive]    [c=0.00,m=0.00,y=1.00,k=0.25]
+\definecolor [heavygray]     [c=0.00,m=0.00,y=0.00,k=0.75]
+\definecolor [deepred]       [c=0.00,m=1.00,y=1.00,k=0.50]
+\definecolor [deepgreen]     [c=1.00,m=0.00,y=1.00,k=0.50]
+\definecolor [deepblue]      [c=1.00,m=1.00,y=0.00,k=0.50]
+\definecolor [deepcyan]      [c=1.00,m=0.00,y=0.00,k=0.50]
+\definecolor [deepmagenta]   [c=0.00,m=1.00,y=0.00,k=0.50]
+\definecolor [olive]         [c=0.00,m=0.00,y=1.00,k=0.50]
+\definecolor [deepgray]      [c=0.00,m=0.00,y=0.00,k=0.90]
+\definecolor [darkred]       [c=0.00,m=1.00,y=1.00,k=0.75]
+\definecolor [darkgreen]     [c=1.00,m=0.00,y=1.00,k=0.75]
+\definecolor [darkblue]      [c=1.00,m=1.00,y=0.00,k=0.75]
+\definecolor [darkcyan]      [c=1.00,m=0.00,y=0.00,k=0.75]
+\definecolor [darkmagenta]   [c=0.00,m=1.00,y=0.00,k=0.75]
+\definecolor [darkolive]     [c=0.00,m=0.00,y=1.00,k=0.75]
+\definecolor [darkgray]      [c=0.00,m=0.00,y=0.00,k=0.95]
+\definecolor [orange]        [c=0.00,m=0.50,y=1.00,k=0.00]
+\definecolor [fuchsia]       [c=0.00,m=1.00,y=0.50,k=0.00]
+\definecolor [chartreuse]    [c=0.50,m=0.00,y=1.00,k=0.00]
+\definecolor [springgreen]   [c=1.00,m=0.00,y=0.50,k=0.00]
+\definecolor [purple]        [c=0.50,m=1.00,y=0.00,k=0.00]
+\definecolor [royalblue]     [c=1.00,m=0.50,y=0.00,k=0.00]
+\definecolor [salmon]        [c=0.00,m=0.50,y=0.50,k=0.00]
+\definecolor [brown]         [c=0.00,m=1.00,y=1.00,k=0.50]
+\definecolor [darkbrown]     [c=0.00,m=1.00,y=1.00,k=0.75]
+\definecolor [pink]          [c=0.00,m=0.25,y=0.00,k=0.00]
+\definecolor [palegrey]      [c=0.00,m=0.00,y=0.00,k=0.05]
+\definecolor [lightgrey]     [c=0.00,m=0.00,y=0.00,k=0.10]
+\definecolor [mediumgrey]    [c=0.00,m=0.00,y=0.00,k=0.25]
+\definecolor [grey]          [c=0.00,m=0.00,y=0.00,k=0.50]
+\definecolor [heavygrey]     [c=0.00,m=0.00,y=0.00,k=0.50]
+\definecolor [deepgrey]      [c=0.00,m=0.00,y=0.00,k=0.90]
+\definecolor [darkgrey]      [c=0.00,m=0.00,y=0.00,k=0.95]
diff --git a/Build/source/utils/asymptote/doc/latexusage.tex b/Build/source/utils/asymptote/doc/latexusage.tex
index 5c10c4f83d9..6cbd1cb2a75 100644
--- a/Build/source/utils/asymptote/doc/latexusage.tex
+++ b/Build/source/utils/asymptote/doc/latexusage.tex
@@ -81,6 +81,7 @@ the \verb+{attach=true}+ option:
 \begin{center}
 \begin{asy}[height=4cm,attach=false]
 import three;
+currentprojection=orthographic(5,4,2);
 draw(unitcube,blue);
 label("$V-E+F=2$",(0,1,0.5),3Y,blue+fontsize(17));
 \end{asy}
diff --git a/Build/source/utils/asymptote/doc/options b/Build/source/utils/asymptote/doc/options
index 48d821dfa40..dffc98eb199 100644
--- a/Build/source/utils/asymptote/doc/options
+++ b/Build/source/utils/asymptote/doc/options
@@ -58,7 +58,7 @@ Options (negate by replacing - with -no):
 -safe                 Disable system call [true]
 -scroll n             Scroll standard output n lines at a time [0]
 -tabcompletion        Interactive prompt auto-completion [true]
--tex engine           latex|pdflatex|xelatex|tex|pdftex|none [latex]
+-tex engine           latex|pdflatex|xelatex|tex|pdftex|context|none [latex]
 -thick                Render thick 3D lines [true]
 -thin                 Render thin 3D lines [true]
 -threads              Use POSIX threads for 3D rendering [true]
@@ -67,7 +67,7 @@ Options (negate by replacing - with -no):
 -twice                Run LaTeX twice (to resolve references) [false]
 -twosided             Use two-sided 3D lighting model for rendering [true]
 -u,-user string       General purpose user string
--v,-verbose           Increase verbosity level [0]
+-v,-verbose           Increase verbosity level (can specify multiple times) [0]
 -version              Show version; command-line only
 -wait                 Wait for child processes to finish before exiting [false]
 -where                Show where listed variables are declared [false]