diff options
author | Karl Berry <karl@freefriends.org> | 2009-10-02 21:03:33 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-10-02 21:03:33 +0000 |
commit | 464da9a3c69fbde9a2d0981dcdff1330eb4a4296 (patch) | |
tree | 25a987e340b17089b18f1ecd55ea5dba8b43cd9b /Master/texmf/doc | |
parent | 42f3026da4fb6ba350f688a92a783b868725c780 (diff) |
asymptote 1.88
git-svn-id: svn://tug.org/texlive/trunk@15589 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf/doc')
-rw-r--r-- | Master/texmf/doc/asymptote/CAD.pdf | bin | 67399 -> 67399 bytes | |||
-rw-r--r-- | Master/texmf/doc/asymptote/asymptote.pdf | bin | 1568843 -> 1572915 bytes | |||
-rw-r--r-- | Master/texmf/doc/asymptote/examples/Klein.asy | 4 | ||||
-rw-r--r-- | Master/texmf/doc/asymptote/examples/bigdiagonal.asy | 2 | ||||
-rw-r--r-- | Master/texmf/doc/asymptote/examples/bigsquare.asy | 2 | ||||
-rw-r--r-- | Master/texmf/doc/asymptote/examples/billboard.asy | 5 | ||||
-rw-r--r-- | Master/texmf/doc/asymptote/examples/fequlogo.asy | 40 | ||||
-rw-r--r-- | Master/texmf/doc/asymptote/examples/labelsquare.asy | 2 | ||||
-rw-r--r-- | Master/texmf/doc/asymptote/examples/slidedemo.asy | 1 | ||||
-rw-r--r-- | Master/texmf/doc/asymptote/examples/square.asy | 3 | ||||
-rw-r--r-- | Master/texmf/doc/asymptote/examples/truncatedIcosahedron.asy | 66 | ||||
-rw-r--r-- | Master/texmf/doc/asymptote/examples/worksheet.asy | 45 | ||||
-rw-r--r-- | Master/texmf/doc/info/asy-faq.info | 2 | ||||
-rw-r--r-- | Master/texmf/doc/man/man1/asy.1 | 4 |
14 files changed, 161 insertions, 15 deletions
diff --git a/Master/texmf/doc/asymptote/CAD.pdf b/Master/texmf/doc/asymptote/CAD.pdf Binary files differindex c0710dfa00b..8cee0cb9c7d 100644 --- a/Master/texmf/doc/asymptote/CAD.pdf +++ b/Master/texmf/doc/asymptote/CAD.pdf diff --git a/Master/texmf/doc/asymptote/asymptote.pdf b/Master/texmf/doc/asymptote/asymptote.pdf Binary files differindex cb9f66d0168..318bcae923c 100644 --- a/Master/texmf/doc/asymptote/asymptote.pdf +++ b/Master/texmf/doc/asymptote/asymptote.pdf diff --git a/Master/texmf/doc/asymptote/examples/Klein.asy b/Master/texmf/doc/asymptote/examples/Klein.asy index 06ef4271660..4c8089dd86a 100644 --- a/Master/texmf/doc/asymptote/examples/Klein.asy +++ b/Master/texmf/doc/asymptote/examples/Klein.asy @@ -34,8 +34,8 @@ z=(2-\cos u)\sin v.\cr}$"; real h=0.0125; -draw(surface(xscale(-0.38)*yscale(-0.18)*lo,s,0,1.7,h)); -draw(surface(xscale(0.26)*yscale(0.1)*rotate(90)*hi,s,4.9,1.4,h)); +draw(surface(xscale(-0.38)*yscale(-0.18)*lo,s,0,1.7,h,bottom=false)); +draw(surface(xscale(0.26)*yscale(0.1)*rotate(90)*hi,s,4.9,1.4,h,bottom=false)); draw(s.uequals(0),blue+dashed); draw(s.uequals(pi),blue+dashed); diff --git a/Master/texmf/doc/asymptote/examples/bigdiagonal.asy b/Master/texmf/doc/asymptote/examples/bigdiagonal.asy new file mode 100644 index 00000000000..7242b7ae845 --- /dev/null +++ b/Master/texmf/doc/asymptote/examples/bigdiagonal.asy @@ -0,0 +1,2 @@ +size(0,100.5); +draw((0,0)--(2,1),Arrow); diff --git a/Master/texmf/doc/asymptote/examples/bigsquare.asy b/Master/texmf/doc/asymptote/examples/bigsquare.asy deleted file mode 100644 index ae1f3046c7a..00000000000 --- a/Master/texmf/doc/asymptote/examples/bigsquare.asy +++ /dev/null @@ -1,2 +0,0 @@ -size(3cm,3cm); -draw(unitsquare); diff --git a/Master/texmf/doc/asymptote/examples/billboard.asy b/Master/texmf/doc/asymptote/examples/billboard.asy index 13cc69bc7df..e126c1c5157 100644 --- a/Master/texmf/doc/asymptote/examples/billboard.asy +++ b/Master/texmf/doc/asymptote/examples/billboard.asy @@ -1,11 +1,8 @@ import three; -// Billboard support in PRC is not yet implemented. -settings.outformat="eps"; - size(100); draw(unitbox); label("Billboard",X,red,Billboard); -label("Fixed",Y,blue); +label("Embedded",Y,blue,Embedded); diff --git a/Master/texmf/doc/asymptote/examples/fequlogo.asy b/Master/texmf/doc/asymptote/examples/fequlogo.asy new file mode 100644 index 00000000000..29cae0be720 --- /dev/null +++ b/Master/texmf/doc/asymptote/examples/fequlogo.asy @@ -0,0 +1,40 @@ +// A compressed version of the required data file may be obtained from: +// http://www-roc.inria.fr/gamma/download/counter.php?dir=ARCHITEC/&get_obj=uhrturm.obj.gz + +import graph3; +import obj; + +size(200,0); +size3(200); + +settings.render=8; + +texpreamble("\usepackage[T1]{fontenc}"); +texpreamble("\usepackage{ccfonts,eulervm}"); + +currentprojection=perspective(4,1,2); +currentlight=(4,0,2); +currentlight.background=blue; + +real R=4; + +triple f1(pair t) {return (R*cos(t.x),R*sin(t.x),t.y);} + +draw(shift(-0.6Z)*scale3(0.66)*rotate(55,Z)*rotate(90,X)* + obj("uhrturm.obj",orange)); + +surface s=surface(f1,(0,0),(2pi,2),8,8,Spline); + +string lo="$\displaystyle f(x+y)=f(x)+f(y)$"; +string hi="$\displaystyle F_{t+s}=F_t\circ F_s$"; + +real h=0.0125; + +draw(surface(rotate(2)*xscale(0.32)*yscale(0.6)*lo,s,-pi/4-1.5*pi/20,0.5,h)); +draw(surface(rotate(0)*xscale(-0.45)*yscale(0.3)*hi,s,0.8*pi,0.25,h),blue); + +currentpicture.add(new void(frame f, transform3 t, picture pic, projection P) { + draw(f,surface(invert(box(min(f,P),max(f,P)),min3(f),P), + new pen[] {orange,red,yellow,brown})); + } +); diff --git a/Master/texmf/doc/asymptote/examples/labelsquare.asy b/Master/texmf/doc/asymptote/examples/labelsquare.asy index 193314ae4d4..9531792b6a1 100644 --- a/Master/texmf/doc/asymptote/examples/labelsquare.asy +++ b/Master/texmf/doc/asymptote/examples/labelsquare.asy @@ -1,4 +1,4 @@ -size(0,3cm); +size(3cm); draw(unitsquare); label("$A$",(0,0),SW); label("$B$",(1,0),SE); diff --git a/Master/texmf/doc/asymptote/examples/slidedemo.asy b/Master/texmf/doc/asymptote/examples/slidedemo.asy index c57c60adf7e..ae2f48c33a2 100644 --- a/Master/texmf/doc/asymptote/examples/slidedemo.asy +++ b/Master/texmf/doc/asymptote/examples/slidedemo.asy @@ -7,7 +7,6 @@ orientation=Landscape; import slide; import three; -settings.toolbar=false; viewportsize=pagewidth-2pagemargin; usersetting(); diff --git a/Master/texmf/doc/asymptote/examples/square.asy b/Master/texmf/doc/asymptote/examples/square.asy index f3f34a4c628..1bff4e438f5 100644 --- a/Master/texmf/doc/asymptote/examples/square.asy +++ b/Master/texmf/doc/asymptote/examples/square.asy @@ -1 +1,2 @@ -draw((0,0)--(100,0)--(100,100)--(0,100)--cycle); +size(100,100); +draw((0,0)--(1,0)--(1,1)--(0,1)--cycle); diff --git a/Master/texmf/doc/asymptote/examples/truncatedIcosahedron.asy b/Master/texmf/doc/asymptote/examples/truncatedIcosahedron.asy new file mode 100644 index 00000000000..436c6121b9f --- /dev/null +++ b/Master/texmf/doc/asymptote/examples/truncatedIcosahedron.asy @@ -0,0 +1,66 @@ +import graph3; + +size(200); + +real c=(1+sqrt(5))/2; + +triple[] z={(c,1,0),(-c,1,0),(-c,-1,0),(c,-1,0)}; +triple[] x={(0,c,1),(0,-c,1),(0,-c,-1),(0,c,-1)}; +triple[] y={(1,0,c),(1,0,-c),(-1,0,-c),(-1,0,c)}; + +triple[][] Q={ + {(c,1,0),(1,0,-c),(0,c,-1),(0,c,1),(1,0,c),(c,-1,0)}, + {(-c,1,0),(0,c,1),(0,c,-1),(-1,0,-c),(-c,-1,0),(-1,0,c)}, + {(-c,-1,0),(-c,1,0),(-1,0,-c),(0,-c,-1),(0,-c,1),(-1,0,c)}, + {(c,-1,0),(c,1,0),(1,0,c),(0,-c,1),(0,-c,-1),(1,0,-c)}, + {(0,c,1),(0,c,-1),(-c,1,0),(-1,0,c),(1,0,c),(c,1,0)}, + {(0,-c,1),(0,-c,-1),(-c,-1,0),(-1,0,c),(1,0,c),(c,-1,0)}, + {(0,-c,-1),(0,-c,1),(c,-1,0),(1,0,-c),(-1,0,-c),(-c,-1,0)}, + {(0,c,-1),(0,c,1),(c,1,0),(1,0,-c),(-1,0,-c),(-c,1,0)}, + {(1,0,c),(-1,0,c),(0,-c,1),(c,-1,0),(c,1,0),(0,c,1)}, + {(1,0,-c),(-1,0,-c),(0,-c,-1),(c,-1,0),(c,1,0),(0,c,-1)}, + {(-1,0,-c),(1,0,-c),(0,c,-1),(-c,1,0),(-c,-1,0),(0,-c,-1)}, + {(-1,0,c),(1,0,c),(0,c,1),(-c,1,0),(-c,-1,0),(0,-c,1)} +}; + +real R=abs(interp(Q[0][0],Q[0][1],1/3)); + +triple[][] P; +for(int i=0; i < Q.length; ++i) { + P[i]=new triple[] ; + for(int j=0; j < Q[i].length; ++j) { + P[i][j]=Q[i][j]/R; + } +} + +for(int i=0; i < P.length; ++i) { + for(int j=1; j < P[i].length; ++j) { + triple C=P[i][0]; + triple A=P[i][j]; + triple B=P[i][j % 5+1]; + triple[] sixout=new + triple[] {interp(C,A,1/3),interp(C,A,2/3),interp(A,B,1/3),interp(A,B,2/3), + interp(B,C,1/3),interp(B,C,2/3)}; + triple M=(sum(sixout))/6; + triple[] sixin=sequence(new triple(int k) { + return interp(sixout[k],M,0.1); + },6); + draw(surface(reverse(operator--(...sixout)--cycle)^^ + operator--(...sixin)--cycle,planar=true),magenta); + } +} + +for(int i=0; i < P.length; ++i) { + triple[] fiveout=sequence(new triple(int k) { + return interp(P[i][0],P[i][k+1],1/3); + },5); + triple M=(sum(fiveout))/5; + triple[] fivein=sequence(new triple(int k) { + return interp(fiveout[k],M,0.1); + },5); + draw(surface(reverse(operator--(...fiveout)--cycle)^^ + operator--(...fivein)--cycle,planar=true),cyan); +} + + + diff --git a/Master/texmf/doc/asymptote/examples/worksheet.asy b/Master/texmf/doc/asymptote/examples/worksheet.asy new file mode 100644 index 00000000000..b3aa2dba8a0 --- /dev/null +++ b/Master/texmf/doc/asymptote/examples/worksheet.asy @@ -0,0 +1,45 @@ +import fontsize; + +defaultpen(Helvetica()); + +picture pic; +unitsize(pic,mm); + +pair z=(0,0); +real length=88; +real height=8; +pair step=height*S; + +label(pic,"Word Wall Spelling",z,Align); +z += step; +frame f; +label(f,"Name:"); +pair z0=(max(f).x,min(f).y); +draw(f,z0--z0+50mm); +add(pic,f,z,Align); +z += step; + +for(int i=1; i <= 14; ++i) { + draw(pic,z--z+length); + z += step; + draw(pic,z--z+length,dashed); + z += step; + void label(int i) { + label(pic,string(i)+".",z,0.2NE,fontsize(0.8*1.5*2*height*mm)+gray); + } + if(i <= 10) label(i); + else if(i == 11) { + pair z0=z+length/2; + pen p=fontsize(20pt); + label(pic,"Challenge Word",z0+N*height,I*Align.y,p+basealign); + label(pic,"(optional)",z0,I*Align.y,p); + } + else if(i == 12) label(1); + else if(i == 13) label(2); +} +draw(pic,z--z+length); + +add(pic.fit(),(0,0),W); +add(pic.fit(),(0,0),E); + + diff --git a/Master/texmf/doc/info/asy-faq.info b/Master/texmf/doc/info/asy-faq.info index a32e2e9a481..41a897b34e5 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 - 28 Sep 2009 + 02 Oct 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 5dfac3a04f2..ea02a81a622 100644 --- a/Master/texmf/doc/man/man1/asy.1 +++ b/Master/texmf/doc/man/man1/asy.1 @@ -43,6 +43,7 @@ Antialiasing width for rasterized output [2]. .TP .B \-auto3D Automatically activate 3D scene [true]. +-autobillboard 3D labels always face viewer by default [true] .TP .B \-autoimport string Module to automatically import. @@ -62,9 +63,6 @@ Mask fpu exceptions in batch mode [false]. .B \-batchView View output in batch mode [false]. .TP -.B \-billboard -Force unnamed labels to always face viewer [false]. -.TP .B \-bw Convert all colors to black and white [false]. .TP |