diff options
author | Karl Berry <karl@freefriends.org> | 2010-07-05 22:26:04 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-07-05 22:26:04 +0000 |
commit | 648027bec248a7b000741a507b507f6d89941ce5 (patch) | |
tree | ce3b82b43a8b17403eda43db782bbf2e5bf0e161 /Build/source/utils/asymptote/base | |
parent | 5ff8f96c8ab3bd3aeb8fed8d512c57134fb2a6cc (diff) |
asy 2.00
git-svn-id: svn://tug.org/texlive/trunk@19250 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/asymptote/base')
-rw-r--r-- | Build/source/utils/asymptote/base/binarytree.asy | 2 | ||||
-rw-r--r-- | Build/source/utils/asymptote/base/fontsize.asy | 2 | ||||
-rw-r--r-- | Build/source/utils/asymptote/base/plain.asy | 4 | ||||
-rw-r--r-- | Build/source/utils/asymptote/base/three.asy | 7 |
4 files changed, 9 insertions, 6 deletions
diff --git a/Build/source/utils/asymptote/base/binarytree.asy b/Build/source/utils/asymptote/base/binarytree.asy index 7bbd1de2148..0a80aec4b66 100644 --- a/Build/source/utils/asymptote/base/binarytree.asy +++ b/Build/source/utils/asymptote/base/binarytree.asy @@ -154,7 +154,7 @@ object draw(picture pic=currentpicture, binarytreeNode node, pair pos, // calculate connection path transform T=shift(nodeDiameter/2*unit(t*childPos-t*parentPos)); path arr=(T*t*parentPos)--(inverse(T)*t*childPos); - draw(f,arr,p,Arrow(5)); + draw(f,PenMargin(arr,p).g,p,Arrow(5)); }); pic.addPoint(parentPos); pic.addPoint(childPos); diff --git a/Build/source/utils/asymptote/base/fontsize.asy b/Build/source/utils/asymptote/base/fontsize.asy index 4575f3480fa..54b01829550 100644 --- a/Build/source/utils/asymptote/base/fontsize.asy +++ b/Build/source/utils/asymptote/base/fontsize.asy @@ -1 +1 @@ -if(latex()) usepackage("fix-cm"); +if(latex()) usepackage("type1cm"); diff --git a/Build/source/utils/asymptote/base/plain.asy b/Build/source/utils/asymptote/base/plain.asy index 4d0b4e566fb..76f77aaf52c 100644 --- a/Build/source/utils/asymptote/base/plain.asy +++ b/Build/source/utils/asymptote/base/plain.asy @@ -190,8 +190,7 @@ void usersetting() // Conditionally process each file name in array s in a new environment. void asy(string format, bool overwrite=false ... string[] s) { - for(int i=0; i < s.length; ++i) { - string f=s[i]; + for(string f : s) { int n=rfind(f,".asy"); if(n != -1) f=erase(f,n,-1); if(overwrite || error(input(f+"."+format,check=false))) { @@ -201,6 +200,7 @@ void asy(string format, bool overwrite=false ... string[] s) settings.outformat=format; settings.interactiveView=false; settings.batchView=false; + delete(outname()+"_"+".aux"); eval("defaultfilename=\""+f+"\"; import \""+f+ "\" as dummy; exitfunction()"); settings.outformat=outformat; diff --git a/Build/source/utils/asymptote/base/three.asy b/Build/source/utils/asymptote/base/three.asy index 528a1da13c1..4221646f632 100644 --- a/Build/source/utils/asymptote/base/three.asy +++ b/Build/source/utils/asymptote/base/three.asy @@ -251,9 +251,12 @@ projection operator * (transform3 t, projection P) projection P=P.copy(); if(!P.absolute) { P.camera=t*P.camera; - P.normal=t*(P.target+P.normal); + triple target=P.target; P.target=t*P.target; - P.normal -= P.target; + if(P.infinity) + P.normal=t*(target+P.normal)-P.target; + else + P.normal=P.vector(); P.calculate(); } return P; |