From a3358f7394e3adabeff44a4858bab8f13cbe1180 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 8 Apr 2013 18:41:28 +0000 Subject: asymptote 2.21 git-svn-id: svn://tug.org/texlive/trunk@29753 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/asymptote/CAD.pdf | Bin 67553 -> 68115 bytes .../doc/asymptote/TeXShopAndAsymptote.pdf | Bin 31448 -> 31517 bytes Master/texmf-dist/doc/asymptote/asy-latex.pdf | Bin 194336 -> 194493 bytes Master/texmf-dist/doc/asymptote/asyRefCard.pdf | Bin 47440 -> 53907 bytes Master/texmf-dist/doc/asymptote/asymptote.pdf | Bin 1234515 -> 1235449 bytes .../texmf-dist/doc/asymptote/examples/100d.views | 39 ++++++++------------- .../doc/asymptote/examples/BezierPatch.asy | 2 +- .../doc/asymptote/examples/BezierSurface.asy | 1 - .../examples/animations/embeddedmovie.asy | 13 +++---- .../asymptote/examples/animations/embeddedu3d.asy | 4 ++- .../examples/animations/externalmovie.asy | 7 ++-- .../asymptote/examples/animations/slidemovies.asy | 13 +++---- .../doc/asymptote/examples/binarytreetest.asy | 4 +-- .../texmf-dist/doc/asymptote/examples/cheese.asy | 5 ++- .../texmf-dist/doc/asymptote/examples/loggraph.asy | 3 +- .../doc/asymptote/examples/parametricgraph.asy | 3 +- Master/texmf-dist/doc/asymptote/examples/pdb.asy | 14 ++------ .../doc/asymptote/examples/projectrevolution.asy | 4 +-- .../doc/asymptote/examples/triangles.asy | 19 ++++++++++ Master/texmf-dist/doc/asymptote/examples/tvgen.asy | 1 - .../doc/asymptote/examples/vertexshading.asy | 2 +- 21 files changed, 64 insertions(+), 70 deletions(-) create mode 100644 Master/texmf-dist/doc/asymptote/examples/triangles.asy (limited to 'Master/texmf-dist/doc/asymptote') diff --git a/Master/texmf-dist/doc/asymptote/CAD.pdf b/Master/texmf-dist/doc/asymptote/CAD.pdf index bb61b12dd4d..c5c3fef48b6 100644 Binary files a/Master/texmf-dist/doc/asymptote/CAD.pdf and b/Master/texmf-dist/doc/asymptote/CAD.pdf differ diff --git a/Master/texmf-dist/doc/asymptote/TeXShopAndAsymptote.pdf b/Master/texmf-dist/doc/asymptote/TeXShopAndAsymptote.pdf index 61dfa38cc71..83e2f90ea74 100644 Binary files a/Master/texmf-dist/doc/asymptote/TeXShopAndAsymptote.pdf and b/Master/texmf-dist/doc/asymptote/TeXShopAndAsymptote.pdf differ diff --git a/Master/texmf-dist/doc/asymptote/asy-latex.pdf b/Master/texmf-dist/doc/asymptote/asy-latex.pdf index 55883f461c8..49a797348ee 100644 Binary files a/Master/texmf-dist/doc/asymptote/asy-latex.pdf and b/Master/texmf-dist/doc/asymptote/asy-latex.pdf differ diff --git a/Master/texmf-dist/doc/asymptote/asyRefCard.pdf b/Master/texmf-dist/doc/asymptote/asyRefCard.pdf index bed262c88fd..fa105896284 100644 Binary files a/Master/texmf-dist/doc/asymptote/asyRefCard.pdf and b/Master/texmf-dist/doc/asymptote/asyRefCard.pdf differ diff --git a/Master/texmf-dist/doc/asymptote/asymptote.pdf b/Master/texmf-dist/doc/asymptote/asymptote.pdf index 914215456fb..d6463b5390c 100644 Binary files a/Master/texmf-dist/doc/asymptote/asymptote.pdf and b/Master/texmf-dist/doc/asymptote/asymptote.pdf differ diff --git a/Master/texmf-dist/doc/asymptote/examples/100d.views b/Master/texmf-dist/doc/asymptote/examples/100d.views index 5e73cb0c8b9..82dbb734792 100644 --- a/Master/texmf-dist/doc/asymptote/examples/100d.views +++ b/Master/texmf-dist/doc/asymptote/examples/100d.views @@ -1,30 +1,21 @@ -VIEW%={View A} - COO=0.000001944790710695088 -0.000000199754154551 -303.740966796875 - C2C=-0.43931567668914795 -0.011656288057565689 0.8982571363449097 - ROO=367.52660744556164 - ROLL=-75.86431813030065 +VIEW={View A} + COO=95.703857421875 -26.603919982910156 122.73419952392578 + C2C=-0.4144790768623352 0.7603927254676819 0.5000100135803223 + ROO=141.69743417830577 + ROLL=13.566625455930614 AAC=34.903342413559436 - BGCOLOR=1. 1. 1. - LIGHTS=Artwork - RENDERMODE=Solid END -VIEW%={View B} - COO=-52.16141891479492 50.85958480834961 -249.23748779296875 - C2C=-0.0608830563724041 0.722907543182373 -0.6882571578025818 - ROO=117.10558117788756 - ROLL=105.68252665017765 +VIEW={View B} + COO=15.9437837600708 -12.494922637939453 67.1521987915039 + C2C=0.9024380445480347 0.3321097493171692 0.27442431449890137 + ROO=303.7409567061654 + ROLL=66.40207458248847 AAC=34.903342413559436 - BGCOLOR=1. 1. 1. - LIGHTS=Artwork - RENDERMODE=Solid END -VIEW%={View C} - COO=2.2545230388641357 2.9914066791534424 -300.3456115722656 - C2C=0.8536049127578735 0.3032689690589905 -0.42354053258895874 - ROO=303.7410359852936 - ROLL=-126.08445879535664 +VIEW={View C} + COO=-42.11725616455078 -13.32657241821289 18.372915267944336 + C2C=0.6989848017692566 -0.009704185649752617 0.7150706648826599 + ROO=444.70718853041143 + ROLL=78.84753985408712 AAC=34.903342413559436 - BGCOLOR=1. 1. 1. - LIGHTS=Artwork - RENDERMODE=Solid END diff --git a/Master/texmf-dist/doc/asymptote/examples/BezierPatch.asy b/Master/texmf-dist/doc/asymptote/examples/BezierPatch.asy index 8d770e058ae..4e3e55cb40e 100644 --- a/Master/texmf-dist/doc/asymptote/examples/BezierPatch.asy +++ b/Master/texmf-dist/doc/asymptote/examples/BezierPatch.asy @@ -1,7 +1,7 @@ import three; size(10cm); -currentlight=Viewport; +currentlight=Headlamp; surface s=surface(patch(new triple[][] { {(0,0,0),(1,0,0),(1,0,0),(2,0,0)}, diff --git a/Master/texmf-dist/doc/asymptote/examples/BezierSurface.asy b/Master/texmf-dist/doc/asymptote/examples/BezierSurface.asy index f8cbc458ca0..62c01a55717 100644 --- a/Master/texmf-dist/doc/asymptote/examples/BezierSurface.asy +++ b/Master/texmf-dist/doc/asymptote/examples/BezierSurface.asy @@ -40,4 +40,3 @@ size3(pic,10cm); draw(pic,surface(P),blue); add(embed("label",pic),(0,0),N); -label(cameralink("label"),(0,0),10S,fontsize(24pt)); diff --git a/Master/texmf-dist/doc/asymptote/examples/animations/embeddedmovie.asy b/Master/texmf-dist/doc/asymptote/examples/animations/embeddedmovie.asy index 98dfd424db8..12fdf04dedc 100644 --- a/Master/texmf-dist/doc/asymptote/examples/animations/embeddedmovie.asy +++ b/Master/texmf-dist/doc/asymptote/examples/animations/embeddedmovie.asy @@ -6,8 +6,8 @@ import embed; // Add embedded movie //import external; // Add external movie (use this form under Linux). -// Generated needed mpeg file if it doesn't already exist. -asy("mpg","wheel"); +// Generated needed mp4 file if it doesn't already exist. +asy("mp4","wheel"); // Produce a pdf file. settings.outformat="pdf"; @@ -15,10 +15,5 @@ settings.outformat="pdf"; settings.twice=true; // An embedded movie: -label(embed("wheel.mpg","poster,text=wheel.mpg,label=wheel.mpg",20cm,5.6cm), - (0,0),N); - -// An optional button: -label(link("wheel.mpg","Play","play"),(0,0),S); - - +label(embed("wheel.mp4",20cm,5.6cm),(0,0),N); +label(link("wheel.mp4"),(0,0),S); diff --git a/Master/texmf-dist/doc/asymptote/examples/animations/embeddedu3d.asy b/Master/texmf-dist/doc/asymptote/examples/animations/embeddedu3d.asy index 1116c216fe2..b30ada927c2 100644 --- a/Master/texmf-dist/doc/asymptote/examples/animations/embeddedu3d.asy +++ b/Master/texmf-dist/doc/asymptote/examples/animations/embeddedu3d.asy @@ -1,6 +1,8 @@ // An embedded U3D object; // import embed; +settings.tex="pdflatex"; -label(embed("dice.u3d","poster,text=(dice.u3d),3Droo=27,label=dice",settings.paperwidth,settings.paperheight)); +label(embedplayer("dice.u3d","dice","activate=pagevisible,3Droo=27", + settings.paperwidth,settings.paperheight)); diff --git a/Master/texmf-dist/doc/asymptote/examples/animations/externalmovie.asy b/Master/texmf-dist/doc/asymptote/examples/animations/externalmovie.asy index 77c99528307..8dc8af74bb7 100644 --- a/Master/texmf-dist/doc/asymptote/examples/animations/externalmovie.asy +++ b/Master/texmf-dist/doc/asymptote/examples/animations/externalmovie.asy @@ -6,12 +6,11 @@ import external; settings.tex="pdflatex"; // Generated needed mpeg file if it doesn't already exist. -asy("mpg","wheel"); +asy("mp4","wheel"); // Produce a pdf file. settings.outformat="pdf"; // External movie: viewable even with the Linux version of acroread. -label(embed("wheel.mpg"),(0,0),N); - -label(link("wheel.mpg","Play"),(0,0),S); +label(embed("wheel.mp4"),(0,0),N); +label(link("wheel.mp4"),(0,0),S); diff --git a/Master/texmf-dist/doc/asymptote/examples/animations/slidemovies.asy b/Master/texmf-dist/doc/asymptote/examples/animations/slidemovies.asy index 205f94fbc85..bbfdd21eaba 100644 --- a/Master/texmf-dist/doc/asymptote/examples/animations/slidemovies.asy +++ b/Master/texmf-dist/doc/asymptote/examples/animations/slidemovies.asy @@ -33,15 +33,12 @@ display(a.pdf("autoplay,loop,controls",multipage=false)); display(b.pdf("controls",multipage=false)); // Generated needed files if they don't already exist. -asy("mpg","wheel"); +asy("mp4","wheel"); title("External Movie (portable)"); -display(external.embed("wheel.mpg", - "poster,text=wheel.mpg,label=wheel.mpg",20cm,5.6cm)); -display(external.link("wheel.mpg","Play","play")); +display(external.embed("wheel.mp4",20cm,5.6cm)); +display(external.link("wheel.mp4")); title("Embedded Movie (not portable)"); -display(embed.embed("wheel.mpg", - "poster,text=wheel.mpg,label=wheel.mpg", - 20cm,5.6cm)); -display(embed.link("wheel.mpg","Play","play")); +display(embed.embed("wheel.mp4",20cm,5.6cm)); +display(embed.link("wheel.mp4")); diff --git a/Master/texmf-dist/doc/asymptote/examples/binarytreetest.asy b/Master/texmf-dist/doc/asymptote/examples/binarytreetest.asy index 0078bb749e0..af55292e4a3 100644 --- a/Master/texmf-dist/doc/asymptote/examples/binarytreetest.asy +++ b/Master/texmf-dist/doc/asymptote/examples/binarytreetest.asy @@ -3,10 +3,10 @@ import binarytree; picture pic,pic2; binarytree bt=binarytree(1,2,4,nil,5,nil,nil,0,nil,nil,3,6,nil,nil,7); -draw(pic,bt); +draw(pic,bt,condensed=false); binarytree st=searchtree(10,5,2,1,3,4,7,6,8,9,15,13,12,11,14,17,16,18,19); -draw(pic2,st,blue); +draw(pic2,st,blue,condensed=true); add(pic.fit(),(0,0),10N); add(pic2.fit(),(0,0),10S); diff --git a/Master/texmf-dist/doc/asymptote/examples/cheese.asy b/Master/texmf-dist/doc/asymptote/examples/cheese.asy index 9a16e4130dc..05b9181fdf4 100644 --- a/Master/texmf-dist/doc/asymptote/examples/cheese.asy +++ b/Master/texmf-dist/doc/asymptote/examples/cheese.asy @@ -9,4 +9,7 @@ real f(real x, real y, real z) { surface sf=surface(contour3(f,(-2pi,-2pi,-2pi),(2pi,2pi,2pi),12)); sf.colors(palette(sf.map(abs),Gradient(red,yellow))); -draw(sf,nolight,render(merge=true)); + +currentlight=nolight; + +draw(sf,render(merge=true)); diff --git a/Master/texmf-dist/doc/asymptote/examples/loggraph.asy b/Master/texmf-dist/doc/asymptote/examples/loggraph.asy index edd9d3e0a67..d496fba1624 100644 --- a/Master/texmf-dist/doc/asymptote/examples/loggraph.asy +++ b/Master/texmf-dist/doc/asymptote/examples/loggraph.asy @@ -8,8 +8,7 @@ scale(Log,Log); draw(graph(f,0.1,10)); -//xlimits(1,10,Crop); -//ylimits(0.1,1,Crop); +//limits((1,0.1),(10,0.5),Crop); dot(Label("(3,5)",align=S),Scale((3,5))); diff --git a/Master/texmf-dist/doc/asymptote/examples/parametricgraph.asy b/Master/texmf-dist/doc/asymptote/examples/parametricgraph.asy index a5688a6f9dd..61c219d8104 100644 --- a/Master/texmf-dist/doc/asymptote/examples/parametricgraph.asy +++ b/Master/texmf-dist/doc/asymptote/examples/parametricgraph.asy @@ -7,8 +7,7 @@ real y(real t) {return sin(2pi*t);} draw(graph(x,y,0,1)); -//xlimits(0,1,Crop); -//ylimits(-1,0,Crop); +//limits((0,-1),(1,0),Crop); xaxis("$x$",BottomTop,LeftTicks); yaxis("$y$",LeftRight,RightTicks(trailingzero)); diff --git a/Master/texmf-dist/doc/asymptote/examples/pdb.asy b/Master/texmf-dist/doc/asymptote/examples/pdb.asy index b3b954c8c6a..ad86d5172c4 100644 --- a/Master/texmf-dist/doc/asymptote/examples/pdb.asy +++ b/Master/texmf-dist/doc/asymptote/examples/pdb.asy @@ -4,8 +4,6 @@ import cpkcolors; // A sample Protein Data Bank file for this example is available from // http://ndbserver.rutgers.edu/ftp/NDB/coordinates/na-biol/100d.pdb1 -bool getviews=true; - currentlight=White; //currentlight=nolight; @@ -160,13 +158,7 @@ string options; string viewfilename=prefix+".views"; if(!error(input(viewfilename,check=false))) - options="3Dviews2="+viewfilename; - -if(getviews && prc()) { - picture pic; - add(pic,embed("label",currentpicture,options=options),(0,0),N); - label(pic,cameralink("label"),(0,0),S,fontsize(12pt)); - shipout(prefix,pic,options=options); -} else - shipout(prefix,options=options); + options="3Dviews="+viewfilename; + +shipout(prefix,options=options); diff --git a/Master/texmf-dist/doc/asymptote/examples/projectrevolution.asy b/Master/texmf-dist/doc/asymptote/examples/projectrevolution.asy index 25cbe6d4902..8bbe7f38c3d 100644 --- a/Master/texmf-dist/doc/asymptote/examples/projectrevolution.asy +++ b/Master/texmf-dist/doc/asymptote/examples/projectrevolution.asy @@ -5,8 +5,8 @@ currentprojection=orthographic(20,0,3); size(400,300,IgnoreAspect); -revolution r=revolution(new real(real x) {return sin(x)*exp(-x/2);}, - 0,2pi,operator ..,Z); +revolution r=revolution(graph(new triple(real x) { + return (x,0,sin(x)*exp(-x/2));},0,2pi,operator ..),axis=Z); surface s=surface(r); surface S=planeproject(shift(-Z)*unitsquare3)*s; diff --git a/Master/texmf-dist/doc/asymptote/examples/triangles.asy b/Master/texmf-dist/doc/asymptote/examples/triangles.asy new file mode 100644 index 00000000000..c3b3c2aec84 --- /dev/null +++ b/Master/texmf-dist/doc/asymptote/examples/triangles.asy @@ -0,0 +1,19 @@ +import three; +size(10cm); + +triple[] v={O,X,X+Y,Y}; + +triple[] n={Z,X}; + +int[][] vi={{0,1,2},{2,3,0}}; +int[][] ni={{0,0,0},{1,1,1}}; + +pen[] p={red+opacity(0.5),green+opacity(0.5),blue+opacity(0.5), + black+opacity(0.5)}; + +// Adobe Reader exhibits a PRC rendering bug for opacities in (0.5,1): +//pen[] p={red+opacity(0.9),green+opacity(0.9),blue+opacity(0.9),black+opacity(0.9)}; + +int[][] pi={{0,1,2},{2,3,0}}; +draw(v,vi,n,ni,red); +draw(v+Z,vi,p,pi); diff --git a/Master/texmf-dist/doc/asymptote/examples/tvgen.asy b/Master/texmf-dist/doc/asymptote/examples/tvgen.asy index ade90e89211..1a9f151df26 100644 --- a/Master/texmf-dist/doc/asymptote/examples/tvgen.asy +++ b/Master/texmf-dist/doc/asymptote/examples/tvgen.asy @@ -23,7 +23,6 @@ * since local variants exist and parameters have varied over time. */ //papertype="a4"; -import plain; int verbose=settings.verbose/*+2*/; /* uncomment for debug info */ /* tv dot coordinates --> PS points */ diff --git a/Master/texmf-dist/doc/asymptote/examples/vertexshading.asy b/Master/texmf-dist/doc/asymptote/examples/vertexshading.asy index ea97b98daf3..13821ec0058 100644 --- a/Master/texmf-dist/doc/asymptote/examples/vertexshading.asy +++ b/Master/texmf-dist/doc/asymptote/examples/vertexshading.asy @@ -4,6 +4,6 @@ size(200); currentprojection=perspective(4,5,5); -draw(surface(unitcircle3,new pen[] {red,green,blue,white})); +draw(surface(unitcircle3,new pen[] {red,green,blue,black})); draw(surface(shift(Z)*unitsquare3, new pen[] {red,green+opacity(0.5),blue,black})); -- cgit v1.2.3