diff options
author | Karl Berry <karl@freefriends.org> | 2011-06-19 12:38:30 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-06-19 12:38:30 +0000 |
commit | 1e36e2153080d89f519641dbfc1351b35176a7ea (patch) | |
tree | 1bb33b550d07ff5aecd2b254642d1b7345e65b78 | |
parent | 276a6e58c0fcd94e0243d402e864433950fa9a2c (diff) |
asy 2.12 sources
git-svn-id: svn://tug.org/texlive/trunk@23054 c570f23f-e606-0410-a88d-b1316a301751
17 files changed, 569 insertions, 235 deletions
diff --git a/Build/source/utils/README b/Build/source/utils/README index 306b54a2472..e05c98062d7 100644 --- a/Build/source/utils/README +++ b/Build/source/utils/README @@ -4,7 +4,7 @@ Public domain. Originally written 2005 by Karl Berry. Extra utilities we (optionally) compile for TeX Live. See comments in ../texk/README. -asymptote 2.11 - checked 19jun11 +asymptote 2.12 - checked 19jun11 update to TL from CTAN, to include prebuilt doc. see http://tug.org/texlive/build.html#asymptote and tlpkg/bin/tl-update-asy diff --git a/Build/source/utils/asymptote/ChangeLog b/Build/source/utils/asymptote/ChangeLog index 7c082a767e4..3f5566027ef 100644 --- a/Build/source/utils/asymptote/ChangeLog +++ b/Build/source/utils/asymptote/ChangeLog @@ -1,4 +1,31 @@ ------------------------------------------------------------------------ +r5313 | jcbowman | 2011-06-18 17:29:56 -0600 (Sat, 18 Jun 2011) | 2 lines +Changed paths: + M /trunk/asymptote/picture.cc + +Support --disable-gl again. + +------------------------------------------------------------------------ +r5312 | jcbowman | 2011-06-18 10:55:00 -0600 (Sat, 18 Jun 2011) | 2 lines +Changed paths: + M /trunk/asymptote/prc/PRCdouble.h + +Include cstring instead of string.h. + +------------------------------------------------------------------------ +r5311 | jcbowman | 2011-06-18 10:50:11 -0600 (Sat, 18 Jun 2011) | 2 lines +Changed paths: + M /trunk/asymptote/prc/PRCdouble.h + +Add missing include. + +------------------------------------------------------------------------ +r5310 | jcbowman | 2011-06-18 01:55:15 -0600 (Sat, 18 Jun 2011) | 1 line +Changed paths: + M /trunk/asymptote/configure.ac + +Increment version to 2.12svn. +------------------------------------------------------------------------ r5309 | jcbowman | 2011-06-18 00:40:24 -0600 (Sat, 18 Jun 2011) | 1 line Changed paths: M /trunk/asymptote/README diff --git a/Build/source/utils/asymptote/ReleaseNotes b/Build/source/utils/asymptote/ReleaseNotes index 74fdf9ab5e3..feb5969956e 100644 --- a/Build/source/utils/asymptote/ReleaseNotes +++ b/Build/source/utils/asymptote/ReleaseNotes @@ -1,3 +1,7 @@ +Release Notes for Version 2.12 + +Minor compilation issues were addressed. + Release Notes for Version 2.11 A new offscreen (software) 3D rendering option supports rendering on diff --git a/Build/source/utils/asymptote/asy-keywords.el b/Build/source/utils/asymptote/asy-keywords.el index f3cb3ba8be6..ac4d86b3799 100644 --- a/Build/source/utils/asymptote/asy-keywords.el +++ b/Build/source/utils/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 "2.11") +(defvar asy-keywords-version "2.12") (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 )) diff --git a/Build/source/utils/asymptote/asy.list b/Build/source/utils/asymptote/asy.list index 818affd5e9a..dd7fde3e287 100644 --- a/Build/source/utils/asymptote/asy.list +++ b/Build/source/utils/asymptote/asy.list @@ -239,32 +239,32 @@ pair min(frame f); pair min(path p); pair min(explicit path[] p); triple min(path3 p); -pair min(picture pic, bool user=<default>); -real min(real m, scaling s, coord[] c); real min(... real[] a); real min(real m, scaling s, coord[] c); +real min(real m, scaling s, coord[] c); +pair min(picture pic, bool user=<default>); int min(... int[] a); filltype RadialShade(pen penc, pen penr); int search(int[] a, int key); int search(real[] a, real key); int search(string[] a, string key); int search(void()()[] a, void key()(), bool less(void()(), void()())); -int search(marker[] a, marker key, bool less(marker, marker)); int search(real[] a, real key, bool less(real, real)); +int search(picture[] a, picture key, bool less(picture, picture)); int search(guide[] a, guide key, bool less(guide, guide)); -int search(object[] a, object key, bool less(object, object)); -int search(coord[] a, coord key, bool less(coord, coord)); +int search(Legend[] a, Legend key, bool less(Legend, Legend)); int search(pair[] a, pair key, bool less(pair, pair)); +int search(Label[] a, Label key, bool less(Label, Label)); int search(coord[] a, coord key, bool less(coord, coord)); int search(frame[] a, frame key, bool less(frame, frame)); int search(int[] a, int key, bool less(int, int)); -int search(picture[] a, picture key, bool less(picture, picture)); -int search(Legend[] a, Legend key, bool less(Legend, Legend)); +int search(marker[] a, marker key, bool less(marker, marker)); int search(string[] a, string key, bool less(string, string)); int search(path[] a, path key, bool less(path, path)); -int search(Label[] a, Label key, bool less(Label, Label)); +int search(object[] a, object key, bool less(object, object)); int search(pen[] a, pen key, bool less(pen, pen)); int search(bool3[] a, bool3 key, bool less(bool3, bool3)); +int search(coord[] a, coord key, bool less(coord, coord)); int search(bool[] a, bool key, bool less(bool, bool)); int search(triple[] a, triple key, bool less(triple, triple)); filltype RadialShadeDraw(real xmargin=<default>, real ymargin=<default>, pen penc, pen penr, pen drawpen=<default>); @@ -341,9 +341,9 @@ pair max(frame f); pair max(path p); pair max(explicit path[] p); triple max(path3 p); -int max(... int[] a); -pair max(picture pic, bool user=<default>); real max(real M, scaling s, coord[] c); +pair max(picture pic, bool user=<default>); +int max(... int[] a); real max(... real[] a); real max(real M, scaling s, coord[] c); Label Label(Label L, explicit position position, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); @@ -510,28 +510,28 @@ marginT EndMargin(path, pen); pen nullpen; side LeftSide; path nullpath; +marker[] copy(marker[] a); real[][] copy(real[][] a); guide[] copy(guide[] a); -marker[] copy(marker[] a); string[] copy(string[] a); pair[][] copy(pair[][] a); void()()[] copy(void()()[] a); +coord[] copy(coord[] a); pen[][] copy(pen[][] a); path[] copy(path[] a); bool3[] copy(bool3[] a); +coord[] copy(coord[] a); pair[] copy(pair[] a); bool[] copy(bool[] a); -coord[] copy(coord[] a); Legend[] copy(Legend[] a); -pen[] copy(pen[] a); picture[] copy(picture[] a); +pen[] copy(pen[] a); triple[] copy(triple[] a); int[] copy(int[] a); string[][] copy(string[][] a); frame[] copy(frame[] a); -coord[] copy(coord[] a); -real[] copy(real[] a); Label[] copy(Label[] a); +real[] copy(real[] a); object[] copy(object[] a); real[] abs(pair[] a); real[] abs(triple[] a); @@ -563,24 +563,24 @@ pen deepblue; pen palered; real[] map(real f(pair), pair[] a); int[] map(int f(real), real[] a); -picture[] map(picture f(picture), picture[] a); frame[] map(frame f(frame), frame[] a); +coord[] map(coord f(coord), coord[] a); triple[] map(triple f(triple), triple[] a); pen[] map(pen f(pen), pen[] a); -coord[] map(coord f(coord), coord[] a); -coord[] map(coord f(coord), coord[] a); +Label[] map(Label f(Label), Label[] a); +Legend[] map(Legend f(Legend), Legend[] a); pair[] map(pair f(pair), pair[] a); -object[] map(object f(object), object[] a); +picture[] map(picture f(picture), picture[] a); string[] map(string f(string), string[] a); -marker[] map(marker f(marker), marker[] a); void()()[] map(void f()()(void()()), void()()[] a); real[] map(real f(real), real[] a); int[] map(int f(int), int[] a); bool3[] map(bool3 f(bool3), bool3[] a); -Label[] map(Label f(Label), Label[] a); +coord[] map(coord f(coord), coord[] a); +object[] map(object f(object), object[] a); bool[] map(bool f(bool), bool[] a); path[] map(path f(path), path[] a); -Legend[] map(Legend f(Legend), Legend[] a); +marker[] map(marker f(marker), marker[] a); guide[] map(guide f(guide), guide[] a); path unstraighten(path p); path3 unstraighten(path3 p); @@ -594,23 +594,23 @@ pair minratio(frame f); pair minratio(triple[][] p, pair b); pair minratio(path3 g); int[] sequence(int n); -object[] sequence(object f(int), int n); -Legend[] sequence(Legend f(int), int n); int[] sequence(int f(int), int n); pair[] sequence(pair f(int), int n); guide[] sequence(guide f(int), int n); pen[] sequence(pen f(int), int n); +coord[] sequence(coord f(int), int n); +picture[] sequence(picture f(int), int n); +marker[] sequence(marker f(int), int n); void()()[] sequence(void f()()(int), int n); bool[] sequence(bool f(int), int n); string[] sequence(string f(int), int n); bool3[] sequence(bool3 f(int), int n); coord[] sequence(coord f(int), int n); -picture[] sequence(picture f(int), int n); -marker[] sequence(marker f(int), int n); +Label[] sequence(Label f(int), int n); real[] sequence(real f(int), int n); int[] sequence(int n, int m); -coord[] sequence(coord f(int), int n); -Label[] sequence(Label f(int), int n); +object[] sequence(object f(int), int n); +Legend[] sequence(Legend f(int), int n); triple[] sequence(triple f(int), int n); path[] sequence(path f(int), int n); frame[] sequence(frame f(int), int n); @@ -685,20 +685,20 @@ void report(int i); void report(transform t); void add(frame dest, frame src); void add(picture pic=<default>, void d(frame f, transform t), bool exact=<default>); -void add(picture pic=<default>, void d(frame f, real[][] t, picture pic, projection P), bool exact=<default>); void add(picture pic=<default>, void d(picture, real[][]), bool exact=<default>); void add(picture src, pair position, bool group=<default>, filltype filltype=<default>, bool above=<default>); void add(picture dest=<default>, frame src, pair position, pair align, bool group=<default>, filltype filltype=<default>, bool above=<default>); void add(frame dest, frame src, pair position, pair align, bool group=<default>, filltype filltype=<default>, bool above=<default>); void add(picture src, bool group=<default>, filltype filltype=<default>, bool above=<default>); -void add(picture dest, picture src, bool group=<default>, filltype filltype=<default>, bool above=<default>); void add(picture pic=<default>, Label L); +void add(picture dest, picture src, bool group=<default>, filltype filltype=<default>, bool above=<default>); void add(picture dest, picture src, pair position, bool group=<default>, filltype filltype=<default>, bool above=<default>); void add(picture dest=<default>, object F, pair position=<default>, bool group=<default>, filltype filltype=<default>, bool above=<default>); void add(picture pic=<default>, void d(picture, transform), bool exact=<default>); void add(frame f, transform t=<default>, Label L); void add(frame dest, frame src, filltype filltype, bool above=<default>); void add(frame dest, frame src, bool group, filltype filltype=<default>, bool above=<default>); +void add(picture pic=<default>, void d(frame f, real[][] t, picture pic, projection P), bool exact=<default>); void add(frame dest, frame src, pair position, bool group=<default>, filltype filltype=<default>, bool above=<default>); void add(picture dest=<default>, frame src, pair position=<default>, bool group=<default>, filltype filltype=<default>, bool above=<default>); plain plain; @@ -728,23 +728,23 @@ string[] array(int n, string value, int depth=<default>); pair[][] array(int n, pair[] value, int depth=<default>); bool3[] array(int n, bool3 value, int depth=<default>); coord[] array(int n, coord value, int depth=<default>); -picture[] array(int n, picture value, int depth=<default>); -marker[] array(int n, marker value, int depth=<default>); +Label[] array(int n, Label value, int depth=<default>); real[][] array(int n, real[] value, int depth=<default>); real[] array(int n, real value, int depth=<default>); -coord[] array(int n, coord value, int depth=<default>); -Label[] array(int n, Label value, int depth=<default>); +object[] array(int n, object value, int depth=<default>); +Legend[] array(int n, Legend value, int depth=<default>); triple[] array(int n, triple value, int depth=<default>); path[] array(int n, path value, int depth=<default>); frame[] array(int n, frame value, int depth=<default>); pen[][] array(int n, pen[] value, int depth=<default>); -object[] array(int n, object value, int depth=<default>); -Legend[] array(int n, Legend value, int depth=<default>); int[] array(int n, int value, int depth=<default>); string[][] array(int n, string[] value, int depth=<default>); pair[] array(int n, pair value, int depth=<default>); guide[] array(int n, guide value, int depth=<default>); pen[] array(int n, pen value, int depth=<default>); +coord[] array(int n, coord value, int depth=<default>); +picture[] array(int n, picture value, int depth=<default>); +marker[] array(int n, marker value, int depth=<default>); file binput(string name, bool check=<default>); bool BeginBar(picture, path, pen, marginT(path, pen))(real size=<default>); bool BeginBar(picture, path, pen, marginT(path, pen)); @@ -787,15 +787,15 @@ void draw(frame f, triple[] p, real[] knot, real[] weights=<default>, pen p); void draw(frame f, triple[][] p, real[] uknot, real[] vknot, real[][] weights=<default>, pen[] p, real opacity, real shininess, real prcshininess, pen[] colors, bool lighton); void draw(picture pic=<default>, path[] g, pen fillrule=<default>, pen[] p); void draw(frame f, explicit path[] g, pen p=<default>); -object draw(picture pic=<default>, Label L, path e(frame dest, frame src=<default>, real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>), pair position, real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>); void draw(picture pic=<default>, Label L=<default>, path g, align align=<default>, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, bool bar(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, Label legend=<default>, marker marker=<default>); void draw(pair origin, picture pic=<default>, Label L=<default>, path g, align align=<default>, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, bool bar(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, Label legend=<default>, marker marker=<default>); +object draw(picture pic=<default>, Label L, path e(frame dest, frame src=<default>, real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>), pair position, real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>); void draw(picture pic=<default>, guide[] g, pen p=<default>, Label legend=<default>, marker marker=<default>); void draw(pair origin, picture pic=<default>, guide[] g, pen p=<default>, Label legend=<default>, marker marker=<default>); -void draw(frame f, guide[] g, pen p=<default>); -void draw(frame f, path g, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))); void draw(picture pic=<default>, explicit path[] g, pen p=<default>, Label legend=<default>, marker marker=<default>); void draw(pair origin, picture pic=<default>, explicit path[] g, pen p=<default>, Label legend=<default>, marker marker=<default>); +void draw(frame f, guide[] g, pen p=<default>); +void draw(frame f, path g, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))); object draw(picture pic=<default>, Label L, path e(frame dest, frame src=<default>, real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>), real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>); void draw(frame f, path g, pen p=<default>); int mantissaBits; @@ -862,19 +862,19 @@ void write(file file=<default>, string s=<default>, transform x, void suffix(fil void write(file file=<default>, string s=<default>, guide x, void suffix(file)=<default> ... guide[]); void write(file file=<default>, string s=<default>, pen x, void suffix(file)=<default> ... pen[]); void write(file file, string s=<default>, explicit guide[] x, void suffix(file)=<default>); +void write(pairOrTriple a); void write(string s=<default>, cputime c, string format=<default>, void suffix(file)=<default>); -void write(file file=<default>, Label L, void suffix(file)=<default>); +void write(file file=<default>, align align, void suffix(file)=<default>); void write(string s=<default>, explicit path[] x, void suffix(file)=<default>); void write(file file, void suffix(file)=<default>); void write(file file=<default>, string s=<default>, pen[] p); void write(void suffix(file)=<default>); void write(file file, string s=<default>, explicit path[] x, void suffix(file)=<default>); -void write(file file=<default>, align align, void suffix(file)=<default>); void write(file file, string s=<default>, cputime c, string format=<default>, void suffix(file)=<default>); void write(string s=<default>, bool3 b, void suffix(file)=<default>); void write(file file, string s=<default>, bool3 b, void suffix(file)=<default>); void write(string s=<default>, explicit guide[] x, void suffix(file)=<default>); -void write(pairOrTriple a); +void write(file file=<default>, Label L, void suffix(file)=<default>); void save()(); marginT EndPenMargin(path, pen); pair NNE; @@ -929,21 +929,21 @@ real[] concat(... real[][]); marker[] concat(... marker[][]); pair[] concat(... pair[][]); object[] concat(... object[][]); -Label[] concat(... Label[][]); pen[] concat(... pen[][]); -coord[] concat(... coord[][]); +Label[] concat(... Label[][]); path[] concat(... path[][]); int[] concat(... int[][]); void()()[] concat(... void()()[][]); -picture[] concat(... picture[][]); string[] concat(... string[][]); -Legend[] concat(... Legend[][]); +picture[] concat(... picture[][]); triple[] concat(... triple[][]); -coord[] concat(... coord[][]); +Legend[] concat(... Legend[][]); bool3[] concat(... bool3[][]); +coord[] concat(... coord[][]); frame[] concat(... frame[][]); guide[] concat(... guide[][]); bool[] concat(... bool[][]); +coord[] concat(... coord[][]); int OR(int a, int b); real log1p(real x); real[] log1p(real[] a); @@ -951,60 +951,60 @@ real infinity; bool alias(pair[][] a, pair[][] b); bool alias(guide[] a, guide[] b); bool alias(coords2 a, coords2 b); -bool alias(Legend a, Legend b); -bool alias(light a, light b); +bool alias(scaling a, scaling b); +bool alias(pairOrTriple a, pairOrTriple b); +bool alias(coords3 a, coords3 b); +bool alias(marker[] a, marker[] b); bool alias(arrowhead a, arrowhead b); bool alias(pair[] a, pair[] b); bool alias(bool3[] a, bool3[] b); -bool alias(coord a, coord b); -bool alias(position a, position b); +bool alias(coord[] a, coord[] b); +bool alias(Label a, Label b); bool alias(int[] a, int[] b); bool alias(string[][] a, string[][] b); bool alias(hsv a, hsv b); -bool alias(scaling a, scaling b); -bool alias(pairOrTriple a, pairOrTriple b); -bool alias(coords3 a, coords3 b); -bool alias(object[] a, object[] b); -bool alias(processtime a, processtime b); -bool alias(real[][] a, real[][] b); -bool alias(coords2 a, coords2 b); -bool alias(Label a, Label b); -bool alias(slice a, slice b); bool alias(freezableBounds a, freezableBounds b); bool alias(picture a, picture b); -bool alias(picture[] a, picture[] b); -bool alias(string[] a, string[] b); bool alias(scaleT a, scaleT b); -bool alias(framedTransformStack a, framedTransformStack b); -bool alias(Label[] a, Label[] b); -bool alias(cputime a, cputime b); -bool alias(frame[] a, frame[] b); +bool alias(processtime a, processtime b); +bool alias(real[][] a, real[][] b); +bool alias(coord[] a, coord[] b); bool alias(scaling a, scaling b); bool alias(bounds a, bounds b); bool alias(object a, object b); +bool alias(slice a, slice b); +bool alias(string[] a, string[] b); +bool alias(coord a, coord b); +bool alias(autoscaleT a, autoscaleT b); +bool alias(object[] a, object[] b); +bool alias(cputime a, cputime b); +bool alias(frame[] a, frame[] b); +bool alias(transformation a, transformation b); bool alias(bool[] a, bool[] b); bool alias(void()()[] a, void()()[] b); bool alias(filltype a, filltype b); +bool alias(align a, align b); +bool alias(picture[] a, picture[] b); bool alias(pen[][] a, pen[][] b); bool alias(bool3 a, bool3 b); -bool alias(coord[] a, coord[] b); -bool alias(autoscaleT a, autoscaleT b); -bool alias(path[] a, path[] b); -bool alias(transformation a, transformation b); -bool alias(triple[] a, triple[] b); -bool alias(marginT a, marginT b); -bool alias(align a, align b); -bool alias(Legend[] a, Legend[] b); -bool alias(real[] a, real[] b); bool alias(coord a, coord b); bool alias(ScaleT a, ScaleT b); -bool alias(pen[] a, pen[] b); +bool alias(Label[] a, Label[] b); +bool alias(path[] a, path[] b); bool alias(projection a, projection b); bool alias(indexedTransform a, indexedTransform b); bool alias(marker a, marker b); -bool alias(marker[] a, marker[] b); -bool alias(coord[] a, coord[] b); +bool alias(triple[] a, triple[] b); +bool alias(marginT a, marginT b); bool alias(side a, side b); +bool alias(real[] a, real[] b); +bool alias(coords2 a, coords2 b); +bool alias(Legend a, Legend b); +bool alias(pen[] a, pen[] b); +bool alias(light a, light b); +bool alias(framedTransformStack a, framedTransformStack b); +bool alias(position a, position b); +bool alias(Legend[] a, Legend[] b); real pi; int getint(string name=<default>, int default=<default>, string prompt=<default>, bool store=<default>); bool IgnoreAspect; @@ -1031,23 +1031,23 @@ real[][] sort(real[][] a); string[] sort(string[] a); string[][] sort(string[][] a); bool3[] sort(bool3[] a, bool less(bool3, bool3)); +coord[] sort(coord[] a, bool less(coord, coord)); path[] sort(path[] a, bool less(path, path)); +coord[] sort(coord[] a, bool less(coord, coord)); pair[] sort(pair[] a, bool less(pair, pair)); void()()[] sort(void()()[] a, bool less(void()(), void()())); real[] sort(real[] a, bool less(real, real)); bool[] sort(bool[] a, bool less(bool, bool)); marker[] sort(marker[] a, bool less(marker, marker)); object[] sort(object[] a, bool less(object, object)); -Label[] sort(Label[] a, bool less(Label, Label)); pen[] sort(pen[] a, bool less(pen, pen)); -coord[] sort(coord[] a, bool less(coord, coord)); +Label[] sort(Label[] a, bool less(Label, Label)); guide[] sort(guide[] a, bool less(guide, guide)); triple[] sort(triple[] a, bool less(triple, triple)); string[] sort(string[] a, bool less(string, string)); int[] sort(int[] a, bool less(int, int)); picture[] sort(picture[] a, bool less(picture, picture)); Legend[] sort(Legend[] a, bool less(Legend, Legend)); -coord[] sort(coord[] a, bool less(coord, coord)); frame[] sort(frame[] a, bool less(frame, frame)); pen salmon; bool ignore; @@ -1337,8 +1337,8 @@ Label operator *(real[][] t, Label L); picture operator *(real[][] t, picture orig); bounds operator *(transform t, bounds b); object operator *(transform t, explicit object F); -Label operator *(transform t, Label L); path[] operator *(transform t, explicit path[] p); +Label operator *(transform t, Label L); pair[] operator *(transform t, pair[] z); picture operator *(transform t, picture orig); side operator *(real x, side s); @@ -1356,21 +1356,24 @@ pen operator init(); frame operator init(); file operator init(); hsv operator init(); +picture operator init(); +coords2 operator init(); scaling operator init(); pairOrTriple operator init(); coords2 operator init(); Legend operator init(); +bool3 operator init(); coord operator init(); ScaleT operator init(); -bool3 operator init(); +coord operator init(); autoscaleT operator init(); -scaleT operator init(); -framedTransformStack operator init(); cputime operator init(); -coords3 operator init(); +scaleT operator init(); processtime operator init(); -light operator init(); +coords3 operator init(); arrowhead operator init(); +light operator init(); +framedTransformStack operator init(); projection operator init(); indexedTransform operator init(); marker operator init(); @@ -1378,16 +1381,13 @@ transformation operator init(); scaling operator init(); bounds operator init(); object operator init(); -coords2 operator init(); Label operator init(); -coord operator init(); position operator init(); -side operator init(); marginT operator init(); -align operator init(); +side operator init(); filltype operator init(); +align operator init(); slice operator init(); -picture operator init(); real operator cast(int); pair operator cast(int); pair operator cast(real); @@ -1430,32 +1430,32 @@ guide operator cast(cycleToken tok); guide operator cast(curlSpecifier spec); guide operator cast(tensionSpecifier t); guide[] operator cast(path[] g); -frame operator cast(object F); bool3 operator cast(bool b); +frame operator cast(object F); position operator cast(pair x); pair operator cast(position P); +align operator cast(pair dir); object operator cast(Label L); Label operator cast(object F); -align operator cast(pair dir); -object operator cast(frame f); guide[] operator cast(pair[] z); -align operator cast(triple dir); path[] operator cast(guide[] g); +object operator cast(frame f); +align operator cast(triple dir); bool[] operator cast(bool3[] b); -pair operator cast(pairOrTriple a); -triple operator cast(pairOrTriple a); pen operator cast(hsv hsv); path[] operator cast(guide g); -align operator cast(side side); +pair operator cast(pairOrTriple a); +triple operator cast(pairOrTriple a); path[] operator cast(pair[] z); path[] operator cast(path p); hsv operator cast(pen p); bool operator cast(bool3 b); +align operator cast(side side); position operator cast(int x); position operator cast(real x); object operator cast(string s); -Label operator cast(string s); bool3[] operator cast(bool[] b); +Label operator cast(string s); pen deepred; bool error(file f); string operator ecast(int); @@ -1552,41 +1552,41 @@ bool operator ==(file a, file b); bool operator ==(path a, path b); bool operator ==(path3 a, path3 b); bool operator ==(slice a, slice b); -bool operator ==(freezableBounds a, freezableBounds b); -bool operator ==(picture a, picture b); -bool operator ==(scaleT a, scaleT b); -bool operator ==(framedTransformStack a, framedTransformStack b); +bool operator ==(coord a, coord b); +bool operator ==(autoscaleT a, autoscaleT b); bool operator ==(cputime a, cputime b); bool operator ==(bool a, bool3 b); -bool operator ==(scaling a, scaling b); -bool operator ==(bounds a, bounds b); -bool operator ==(object a, object b); -bool operator ==(filltype a, filltype b); -bool operator ==(bool3 a, bool3 b); -bool operator ==(autoscaleT a, autoscaleT b); bool operator ==(transformation a, transformation b); -bool operator ==(marginT a, marginT b); +bool operator ==(filltype a, filltype b); bool operator ==(align a, align b); +bool operator ==(bool3 a, bool3 b); bool operator ==(coord a, coord b); bool operator ==(ScaleT a, ScaleT b); bool operator ==(projection a, projection b); bool operator ==(indexedTransform a, indexedTransform b); bool operator ==(marker a, marker b); -bool operator ==(bool3 a, bool b); +bool operator ==(marginT a, marginT b); bool operator ==(side a, side b); bool operator ==(coords2 a, coords2 b); bool operator ==(Legend a, Legend b); bool operator ==(light a, light b); -bool operator ==(arrowhead a, arrowhead b); -bool operator ==(coord a, coord b); +bool operator ==(framedTransformStack a, framedTransformStack b); +bool operator ==(bool3 a, bool b); bool operator ==(position a, position b); -bool operator ==(hsv a, hsv b); +bool operator ==(coords2 a, coords2 b); bool operator ==(scaling a, scaling b); bool operator ==(pairOrTriple a, pairOrTriple b); bool operator ==(coords3 a, coords3 b); -bool operator ==(processtime a, processtime b); -bool operator ==(coords2 a, coords2 b); +bool operator ==(arrowhead a, arrowhead b); bool operator ==(Label a, Label b); +bool operator ==(hsv a, hsv b); +bool operator ==(freezableBounds a, freezableBounds b); +bool operator ==(picture a, picture b); +bool operator ==(scaleT a, scaleT b); +bool operator ==(processtime a, processtime b); +bool operator ==(scaling a, scaling b); +bool operator ==(bounds a, bounds b); +bool operator ==(object a, object b); bool operator !=(bool a, bool b); bool[] operator !=(bool a, bool[] b); bool[] operator !=(bool[] a, bool b); @@ -1624,41 +1624,41 @@ bool operator !=(file a, file b); bool operator !=(path a, path b); bool operator !=(path3 a, path3 b); bool operator !=(slice a, slice b); -bool operator !=(freezableBounds a, freezableBounds b); -bool operator !=(picture a, picture b); -bool operator !=(scaleT a, scaleT b); -bool operator !=(framedTransformStack a, framedTransformStack b); +bool operator !=(coord a, coord b); +bool operator !=(autoscaleT a, autoscaleT b); bool operator !=(cputime a, cputime b); bool operator !=(bool a, bool3 b); -bool operator !=(scaling a, scaling b); -bool operator !=(bounds a, bounds b); -bool operator !=(object a, object b); -bool operator !=(filltype a, filltype b); -bool operator !=(bool3 a, bool3 b); -bool operator !=(autoscaleT a, autoscaleT b); bool operator !=(transformation a, transformation b); -bool operator !=(marginT a, marginT b); +bool operator !=(filltype a, filltype b); bool operator !=(align a, align b); +bool operator !=(bool3 a, bool3 b); bool operator !=(coord a, coord b); bool operator !=(ScaleT a, ScaleT b); bool operator !=(projection a, projection b); bool operator !=(indexedTransform a, indexedTransform b); bool operator !=(marker a, marker b); -bool operator !=(bool3 a, bool b); +bool operator !=(marginT a, marginT b); bool operator !=(side a, side b); bool operator !=(coords2 a, coords2 b); bool operator !=(Legend a, Legend b); bool operator !=(light a, light b); -bool operator !=(arrowhead a, arrowhead b); -bool operator !=(coord a, coord b); +bool operator !=(framedTransformStack a, framedTransformStack b); +bool operator !=(bool3 a, bool b); bool operator !=(position a, position b); -bool operator !=(hsv a, hsv b); +bool operator !=(coords2 a, coords2 b); bool operator !=(scaling a, scaling b); bool operator !=(pairOrTriple a, pairOrTriple b); bool operator !=(coords3 a, coords3 b); -bool operator !=(processtime a, processtime b); -bool operator !=(coords2 a, coords2 b); +bool operator !=(arrowhead a, arrowhead b); bool operator !=(Label a, Label b); +bool operator !=(hsv a, hsv b); +bool operator !=(freezableBounds a, freezableBounds b); +bool operator !=(picture a, picture b); +bool operator !=(scaleT a, scaleT b); +bool operator !=(processtime a, processtime b); +bool operator !=(scaling a, scaling b); +bool operator !=(bounds a, bounds b); +bool operator !=(object a, object b); bool operator <(int a, int b); bool[] operator <(int a, int[] b); bool[] operator <(int[] a, int b); @@ -1838,8 +1838,8 @@ void updatefunction(); void _draw(frame f, path g, pen p); void _draw(frame f, path3 g, triple center=<default>, pen p, int interaction=<default>); void _draw(picture pic, path g, pen p, marginT margin(path, pen)); -frame align(frame f, pair align); object align(object F, pair align); +frame align(frame f, pair align); path[] align(path[] g, transform t=<default>, pair position, pair align, pen p=<default>); real unitrand(); string[] history(string name, int n=<default>); @@ -1907,8 +1907,8 @@ triple accel(path3 p, real t); frame Portrait(frame f); void tex(frame f, string s); void tex(frame f, string s, pair min, pair max); -void tex(picture pic=<default>, string s); void tex(picture pic=<default>, string s, pair min, pair max); +void tex(picture pic=<default>, string s); pen Black; triple size3(frame f); void size3(picture pic=<default>, real x, real y=<default>, real z=<default>, bool keepAspect=<default>); diff --git a/Build/source/utils/asymptote/asymptote.spec b/Build/source/utils/asymptote/asymptote.spec index 2641db43be1..c817fcad32c 100644 --- a/Build/source/utils/asymptote/asymptote.spec +++ b/Build/source/utils/asymptote/asymptote.spec @@ -1,7 +1,7 @@ %{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFLOCAL'`")} Name: asymptote -Version: 2.11 +Version: 2.12 Release: 1%{?dist} Summary: Descriptive vector graphics language diff --git a/Build/source/utils/asymptote/configure b/Build/source/utils/asymptote/configure index ca99e27347d..e8272fc74a6 100755 --- a/Build/source/utils/asymptote/configure +++ b/Build/source/utils/asymptote/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.66 for Asymptote 2.11. +# Generated by GNU Autoconf 2.66 for Asymptote 2.12. # # Report bugs to <http://sourceforge.net/projects/asymptote>. # @@ -552,8 +552,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Asymptote' PACKAGE_TARNAME='asymptote' -PACKAGE_VERSION='2.11' -PACKAGE_STRING='Asymptote 2.11' +PACKAGE_VERSION='2.12' +PACKAGE_STRING='Asymptote 2.12' PACKAGE_BUGREPORT='http://sourceforge.net/projects/asymptote' PACKAGE_URL='' @@ -1242,7 +1242,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Asymptote 2.11 to adapt to many kinds of systems. +\`configure' configures Asymptote 2.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1303,7 +1303,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Asymptote 2.11:";; + short | recursive ) echo "Configuration of Asymptote 2.12:";; esac cat <<\_ACEOF @@ -1414,7 +1414,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Asymptote configure 2.11 +Asymptote configure 2.12 generated by GNU Autoconf 2.66 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1954,7 +1954,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Asymptote $as_me 2.11, which was +It was created by Asymptote $as_me 2.12, which was generated by GNU Autoconf 2.66. Invocation command line was $ $0 $@ @@ -7882,7 +7882,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Asymptote $as_me 2.11, which was +This file was extended by Asymptote $as_me 2.12, which was generated by GNU Autoconf 2.66. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7944,7 +7944,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Asymptote config.status 2.11 +Asymptote config.status 2.12 configured by $0, generated by GNU Autoconf 2.66, with options \\"\$ac_cs_config\\" diff --git a/Build/source/utils/asymptote/configure.ac b/Build/source/utils/asymptote/configure.ac index d9f4c377bd1..518107fc9bd 100644 --- a/Build/source/utils/asymptote/configure.ac +++ b/Build/source/utils/asymptote/configure.ac @@ -3,7 +3,7 @@ # this file. AC_PREREQ(2) -AC_INIT([Asymptote],[2.11],[http://sourceforge.net/projects/asymptote]) +AC_INIT([Asymptote],[2.12],[http://sourceforge.net/projects/asymptote]) VERSION=$PACKAGE_VERSION AC_SUBST(VERSION) diff --git a/Build/source/utils/asymptote/doc/CAD.pdf b/Build/source/utils/asymptote/doc/CAD.pdf Binary files differindex afaad32261c..997b619bf8e 100644 --- a/Build/source/utils/asymptote/doc/CAD.pdf +++ b/Build/source/utils/asymptote/doc/CAD.pdf diff --git a/Build/source/utils/asymptote/doc/FAQ/asy-faq.info b/Build/source/utils/asymptote/doc/FAQ/asy-faq.info index 6fc4b7ce85c..15dcadac710 100644 --- a/Build/source/utils/asymptote/doc/FAQ/asy-faq.info +++ b/Build/source/utils/asymptote/doc/FAQ/asy-faq.info @@ -10,7 +10,7 @@ END-INFO-DIR-ENTRY File: asy-faq.info, Node: Top, Next: Question 1.1, Up: (dir) ASYMPTOTE FREQUENTLY ASKED QUESTIONS - 26 May 2011 + 18 Jun 2011 This is the list of Frequently Asked Questions about Asymptote (asy). diff --git a/Build/source/utils/asymptote/doc/TeXShopAndAsymptote.pdf b/Build/source/utils/asymptote/doc/TeXShopAndAsymptote.pdf Binary files differnew file mode 100755 index 00000000000..e3b70f867b2 --- /dev/null +++ b/Build/source/utils/asymptote/doc/TeXShopAndAsymptote.pdf diff --git a/Build/source/utils/asymptote/doc/asy-latex.pdf b/Build/source/utils/asymptote/doc/asy-latex.pdf Binary files differnew file mode 100755 index 00000000000..7dd6d2780c9 --- /dev/null +++ b/Build/source/utils/asymptote/doc/asy-latex.pdf diff --git a/Build/source/utils/asymptote/doc/asy.1 b/Build/source/utils/asymptote/doc/asy.1 new file mode 100755 index 00000000000..7f3d2a40772 --- /dev/null +++ b/Build/source/utils/asymptote/doc/asy.1 @@ -0,0 +1,294 @@ +.\" Hey, EMACS: -*- nroff -*- +.TH ASY 1 "1 Dec 2004" +.SH NAME +asy \- Asymptote: a script-based vector graphics language +.SH SYNOPSIS +.B asy +.RI [ options ] +.RI [ file \ ...] +.SH DESCRIPTION +\fBAsymptote\fP is a powerful descriptive vector graphics language for +technical drawings, inspired by MetaPost but with an improved C++-like syntax. +Asymptote provides for figures the same high-quality level of typesetting that +LaTeX does for scientific text. +.SH OPTIONS +If no arguments are given, Asymptote runs in interactive mode. +.PP +If "\-" is given as the file argument, Asymptote reads from standard input. +.PP +A summary of options is included below. The effect of most options +can be negated by prepending +.B no +to the option name. +Default values for most options may also be entered in the +file +.B .asy/config.asy +in the user's home directory using the long form: +.PP + import settings; + batchView=true; +.PP +For a complete +description, see the Info files. +.TP +.B \-V,\-View +View output; command-line only. +.TP +.B \-a,\-align C|B|T|Z +Center, Bottom, Top, or Zero page alignment [C]. +.TP +.B \-antialias n +Antialiasing width for rasterized output [2]. +.TP +.B \-arcballradius pixels +Arcball radius [750]. +.TP +.B \-auto3D +Automatically activate 3D scene [true]. +.TP +.B \-autobillboard +3D labels always face viewer by default [true]. +.TP +.B \-autoimport string +Module to automatically import. +.TP +.B \-autoplain +Enable automatic importing of plain [true]. +.TP +.B \-autoplay +Autoplay 3D animations [false]. +.TP +.B \-autorotate +Enable automatic PDF page rotation [false]. +.TP +.B \-batchMask +Mask fpu exceptions in batch mode [false]. +.TP +.B \-batchView +View output in batch mode [false]. +.TP +.B \-bw +Convert all colors to black and white [false]. +.TP +.B \-cd directory +Set current directory; command-line only. +.TP +.B \-cmyk +Convert rgb colors to cmyk [false]. +.TP +.B \-c,\-command string +Command to autoexecute. +.TP +.B \-compact +Conserve memory at the expense of speed [false]. +.TP +.B \-d,\-debug +Enable debugging messages [false]. +.TP +.B \-divisor n +Garbage collect using purge(divisor=n) [2]. +.TP +.B \-doubleclick ms +Emulated double-click timeout [200]. +.TP +.B \-embed +Embed rendered preview image [true]. +.TP +.B \-exitonEOF +Exit interactive mode on EOF [true]. +.TP +.B \-fitscreen +Fit rendered image to screen [true]. +.TP +.B \-framedelay ms +Additional frame delay [0]. +.TP +.B \-framerate frames/s +Animation speed [30]. +.TP +.B \-globalwrite +Allow write to other directory [false]. +.TP +.B \-gray +Convert all colors to grayscale [false]. +.TP +.B \-h,\-help +Show summary of options; command-line only. +.TP +.B \-historylines n +Retain n lines of history [1000]. +.TP +.B \-iconify +Iconify rendering window [false]. +.TP +.B \-inlineimage +Generate inline embedded image [false]. +.TP +.B \-inlinetex +Generate inline TeX code [false]. +.TP +.B \-interactiveMask +Mask fpu exceptions in interactive mode [true]. +.TP +.B \-interactiveView +View output in interactive mode [true]. +.TP +.B \-interactiveWrite +Write expressions entered at the prompt to stdout [true]. +.TP +.B \-k,\-keep +Keep intermediate files [false]. +.TP +.B \-keepaux +Keep intermediate LaTeX .aux files [false]. +.TP +.B \-level n +Postscript level [3]. +.TP +.B \-l,\-listvariables +List available global functions and variables [false]. +.TP +.B \-localhistory +Use a local interactive history file [false]. +.TP +.B \-loop +Loop 3D animations [false]. +.TP +.B \-m,\-mask +Mask fpu exceptions; command-line only. +.TP +.B \-maxtile pair +Maximum rendering tile size [(1024,768)]. +.TP +.B \-maxviewport pair +Maximum viewport size [(2048,2048)]. +.TP +.B \-multiline +Input code over multiple lines at the prompt [false]. +.TP +.B \-multipleView +View output from multiple batch-mode files [false]. +.TP +.B \-multisample n +Multisampling width for screen images [4]. +.TP +.B \-offscreen +Use offscreen rendering [false]. +.TP +.B \-O,\-offset pair +PostScript offset [(0,0)]. +.TP +.B \-f,\-outformat format +Convert each output file to specified format. +.TP +.B \-o,\-outname name +Alternative output directory/filename. +.TP +.B \-p,\-parseonly +Parse file [false]. +.TP +.B \-pdfreload +Automatically reload document in pdfviewer [false]. +.TP +.B \-pdfreloaddelay usec +Delay before attempting initial pdf reload [750000]. +.TP +.B \-position pair +Initial 3D rendering screen position [(0,0)]. +.TP +.B \-prc +Embed 3D PRC graphics in PDF output [true]. +.TP +.B \-prompt string +Prompt [> ]. +.TP +.B \-prompt2 string +Continuation prompt for multiline input [..]. +.TP +.B \-q,\-quiet +Suppress welcome message [false]. +.TP +.B \-render n +Render 3D graphics using n pixels per bp (-1=auto) [-1]. +.TP +.B \-resizestep step +Resize step [1.2]. +.TP +.B \-reverse +reverse 3D animations [false]. +.TP +.B \-rgb +Convert cmyk colors to rgb [false]. +.TP +.B \-safe +Disable system call [true]. +.TP +.B \-scroll n +Scroll standard output n lines at a time [0]. +.TP +.B \-spinstep deg/s +Spin speed [60]. +.TP +.B \-svgemulation +Emulate unimplemented SVG shading [false]. +.TP +.B \-tabcompletion +Interactive prompt auto-completion [true]. +.TP +.B \-tex engine +latex|pdflatex|xelatex|tex|pdftex|context|none [latex]. +.TP +.B \-thick +Render thick 3D lines [true]. +.TP +.B \-thin +Render thin 3D lines [true]. +.TP +.B \-threads +Use POSIX threads for 3D rendering [true]. +.TP +.B \-toolbar +Show 3D toolbar in PDF output [true]. +.TP +.B \-s,\-translate +Show translated virtual machine code [false]. +.TP +.B \-twice +Run LaTeX twice (to resolve references) [false]. +.TP +.B \-twosided +Use two-sided 3D lighting model for rendering [true]. +.TP +.B \-u,\-user string +General purpose user string. +.TP +.B \-v,\-verbose +Increase verbosity level (can specify multiple times) [0]. +.TP +.B \-version +Show version; command-line only. +.TP +.B \-wait +Wait for child processes to finish before exiting [false]. +.TP +.B \-warn string +Enable warning; command-line only. +.TP +.B \-where +Show where listed variables are declared [false]. +.TP +.B \-zoomfactor factor +Zoom step factor [1.05]. +.TP +.B \-zoomstep step +Mouse motion zoom step [0.1]. + +.SH SEE ALSO +Asymptote is documented fully in the asymptote Info page. +The manual can also be accessed in interactive mode with the "help" command. + +.SH AUTHOR +Asymptote was written by Andy Hammerlindl, John Bowman, and Tom Prince. +.PP +This manual page was written by Hubert Chan for the Debian project (but may +be used by others). diff --git a/Build/source/utils/asymptote/doc/asymptote.pdf b/Build/source/utils/asymptote/doc/asymptote.pdf Binary files differindex 5ae18cf90b3..89ad91f2698 100644 --- a/Build/source/utils/asymptote/doc/asymptote.pdf +++ b/Build/source/utils/asymptote/doc/asymptote.pdf diff --git a/Build/source/utils/asymptote/doc/png/asymptote.info b/Build/source/utils/asymptote/doc/png/asymptote.info index 55fbad3858a..484466be8be 100644 --- a/Build/source/utils/asymptote/doc/png/asymptote.info +++ b/Build/source/utils/asymptote/doc/png/asymptote.info @@ -1,11 +1,11 @@ This is asymptote.info, produced by makeinfo version 4.13 from ../asymptote.texi. -This file documents `Asymptote', version 2.10. +This file documents `Asymptote', version 2.12. `http://asymptote.sourceforge.net' - Copyright (C) 2004-10 Andy Hammerlindl, John Bowman, and Tom Prince. + Copyright (C) 2004-11 Andy Hammerlindl, John Bowman, and Tom Prince. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Lesser General Public License @@ -23,11 +23,11 @@ File: asymptote.info, Node: Top, Next: Description, Up: (dir) Asymptote ********* -This file documents `Asymptote', version 2.10. +This file documents `Asymptote', version 2.12. `http://asymptote.sourceforge.net' - Copyright (C) 2004-10 Andy Hammerlindl, John Bowman, and Tom Prince. + Copyright (C) 2004-11 Andy Hammerlindl, John Bowman, and Tom Prince. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Lesser General Public License @@ -6446,7 +6446,7 @@ these palettes to the CMYK colorspace. A color density plot using palette `palette' can be generated from a function `f'(x,y) and added to a picture `pic': -bounds image(picture pic=currentpicture, real f(real,real), +bounds image(picture pic=currentpicture, real f(real, real), range range=Full, pair initial, pair final, int nx=ngraph, int ny=nx, pen[] palette, bool antialias=false) The function `f' will be sampled at `nx' and `ny' evenly spaced points @@ -6562,7 +6562,9 @@ void image(picture pic=currentpicture, pen[][] data, bool transpose=(initial.x < final.x && initial.y < final.y), bool copy=true, bool antialias=false); void image(picture pic=currentpicture, pen f(int, int), int width, int height, - pair initial, pair final, bool antialias=false); + pair initial, pair final, + bool transpose=(initial.x < final.x && initial.y < final.y), + bool antialias=false); as illustrated in the following examples: size(200); @@ -6834,18 +6836,18 @@ There are four choices for viewing 3D `Asymptote' output: at twice the specified resolution; this can be disabled by setting `antialias=1'. High resolution rendering is done by tiling the image. If your graphics card allows it, the rendering can be made - more efficient by increasing the maximum tile size `maxtile' - beyond the screen dimensions (indicated by `maxtile=(0,0)'. If - your video card generates unwanted black stripes in the output, - try setting the horizontal and vertical components of `maxtiles' - to something less than your screen dimensions. The tile size is - also limited by the setting `maxviewport', which restricts the - maximum width and height of the viewport. On `UNIX' systems some - graphics drivers support batch mode (`-noV') rendering in an - iconified window; this can be enabled with the setting - `iconify=true'. Some (broken) `UNIX' graphics drivers may require - the command line setting `-glOptions=-indirect', which requests - (slower) indirect rendering. + more efficient by increasing the maximum tile size `maxtile' to + your screen dimensions (indicated by `maxtile=(0,0)'. If your + video card generates unwanted black stripes in the output, try + setting the horizontal and vertical components of `maxtiles' to + something less than your screen dimensions. The tile size is also + limited by the setting `maxviewport', which restricts the maximum + width and height of the viewport. On `UNIX' systems some graphics + drivers support batch mode (`-noV') rendering in an iconified + window; this can be enabled with the setting `iconify=true'. Some + (broken) `UNIX' graphics drivers may require the command line + setting `-glOptions=-indirect', which requests (slower) indirect + rendering. 3. Embed the 3D PRC format in a PDF file and view the resulting PDF file with version `9.0' or later of `Adobe Reader'. In addition @@ -7951,11 +7953,12 @@ Options (negate by replacing - with -no): -localhistory Use a local interactive history file [false] -loop Loop 3D animations [false] -m,-mask Mask fpu exceptions; command-line only --maxtile pair Maximum rendering tile size [(0,0)] +-maxtile pair Maximum rendering tile size [(1024,768)] -maxviewport pair Maximum viewport size [(2048,2048)] -multiline Input code over multiple lines at the prompt [false] -multipleView View output from multiple batch-mode files [false] -multisample n Multisampling width for screen images [4] +-offscreen Use offscreen rendering [false] -O,-offset pair PostScript offset [(0,0)] -f,-outformat format Convert each output file to specified format -o,-outname name Alternative output directory/filename @@ -8466,9 +8469,9 @@ Index * ---: Bezier curves. (line 83) * -=: Self & prefix operators. (line 6) -* -c: Options. (line 173) -* -l: Options. (line 192) -* -u: Options. (line 183) +* -c: Options. (line 174) +* -l: Options. (line 193) +* -u: Options. (line 184) * -V <1>: Tutorial. (line 19) * -V: Configuring. (line 6) * ..: Tutorial. (line 127) @@ -8531,7 +8534,7 @@ Index (line 48) * alias <1>: Arrays. (line 187) * alias: Structures. (line 52) -* align: Options. (line 167) +* align: Options. (line 168) * Align: label. (line 12) * all: Arrays. (line 335) * Allow: Pens. (line 327) @@ -8544,7 +8547,7 @@ Index * animate: Configuring. (line 67) * animation: animation. (line 6) * annotate: annotate. (line 6) -* antialias <1>: Options. (line 142) +* antialias <1>: Options. (line 143) * antialias: three. (line 210) * antialiasing: Compiling from UNIX source. (line 16) @@ -8591,7 +8594,7 @@ Index * asyinclude: LaTeX usage. (line 44) * asymptote.sty: LaTeX usage. (line 6) * asymptote.xml: Editing modes. (line 49) -* ASYMPTOTE_CONFIG: Options. (line 114) +* ASYMPTOTE_CONFIG: Options. (line 115) * aTan: Mathematical functions. (line 20) * atan: Mathematical functions. @@ -8604,7 +8607,7 @@ Index * attach <1>: graph. (line 415) * attach: LaTeX usage. (line 49) * autoadjust: three. (line 354) -* autoimport: Options. (line 110) +* autoimport: Options. (line 111) * automatic scaling: graph. (line 682) * axialshade: fill. (line 43) * axis <1>: graph3. (line 66) @@ -8741,13 +8744,13 @@ Index * conditional <1>: Arithmetic & logical. (line 73) * conditional: Programming. (line 8) -* config: Options. (line 114) -* configuration file <1>: Options. (line 114) +* config: Options. (line 115) +* configuration file <1>: Options. (line 115) * configuration file: Configuring. (line 23) * configuring: Configuring. (line 6) * conj: Data types. (line 57) * constructors: Structures. (line 91) -* context: Options. (line 142) +* context: Options. (line 143) * continue <1>: Debugger. (line 31) * continue: Programming. (line 29) * contour: contour. (line 9) @@ -8755,11 +8758,11 @@ Index * controls <1>: three. (line 6) * controls: Bezier curves. (line 45) * controlSpecifier: Paths and guides. (line 379) -* convert <1>: Options. (line 142) +* convert <1>: Options. (line 143) * convert <2>: animation. (line 6) * convert <3>: Files. (line 154) * convert: Configuring. (line 67) -* convertOptions: Options. (line 129) +* convertOptions: Options. (line 130) * Coons shading: fill. (line 74) * copy: Arrays. (line 174) * Cos: Mathematical functions. @@ -8852,7 +8855,7 @@ Index * drawline: math. (line 9) * drawtree: drawtree. (line 9) * dvips: Configuring. (line 67) -* dvipsOptions: Options. (line 129) +* dvipsOptions: Options. (line 130) * dvisvgm: Configuring. (line 67) * E <1>: Mathematical functions. (line 48) @@ -8890,7 +8893,7 @@ Index * eof: Files. (line 92) * eol <1>: Arrays. (line 350) * eol: Files. (line 92) -* EPS <1>: Options. (line 142) +* EPS <1>: Options. (line 143) * EPS: label. (line 80) * erase <1>: Frames and pictures. (line 7) * erase <2>: Data types. (line 239) @@ -8964,7 +8967,7 @@ Index * fontcommand: Pens. (line 207) * fontsize: Pens. (line 178) * for: Programming. (line 8) -* format <1>: Options. (line 142) +* format <1>: Options. (line 143) * format: Data types. (line 267) * forum: Help. (line 6) * frame: Frames and pictures. (line 7) @@ -8989,7 +8992,7 @@ Index * getreal: Files. (line 117) * getstring: Files. (line 117) * gettriple: Files. (line 117) -* glOptions <1>: Options. (line 129) +* glOptions <1>: Options. (line 130) * glOptions: three. (line 210) * GNU Scientific Library: Mathematical functions. (line 48) @@ -9011,7 +9014,7 @@ Index (line 48) * GSL: Compiling from UNIX source. (line 58) -* gsOptions: Options. (line 129) +* gsOptions: Options. (line 130) * GUI: GUI. (line 6) * GUI installation: GUI installation. (line 6) * GUI usage: GUI usage. (line 6) @@ -9037,7 +9040,7 @@ Index * HookHead: draw. (line 26) * HookHead3: three. (line 543) * Horizontal: flowchart. (line 81) -* hyperrefOptions: Options. (line 129) +* hyperrefOptions: Options. (line 130) * hypot: Mathematical functions. (line 6) * I: Mathematical functions. @@ -9053,7 +9056,7 @@ Index * if: Programming. (line 8) * IgnoreAspect: Frames and pictures. (line 58) * image: palette. (line 34) -* ImageMagick <1>: Options. (line 142) +* ImageMagick <1>: Options. (line 143) * ImageMagick <2>: animation. (line 6) * ImageMagick: Configuring. (line 67) * images: palette. (line 6) @@ -9132,7 +9135,7 @@ Index * Landscape: Frames and pictures. (line 95) * lastcut: Paths and guides. (line 251) * lasy-mode: Editing modes. (line 6) -* latex: Options. (line 142) +* latex: Options. (line 143) * LaTeX fonts: Pens. (line 192) * LaTeX usage: LaTeX usage. (line 6) * latexmk: LaTeX usage. (line 29) @@ -9267,7 +9270,7 @@ Index * none: Files. (line 60) * None: draw. (line 19) * normal: three. (line 488) -* nosafe: Options. (line 162) +* nosafe: Options. (line 163) * NOT: Arithmetic & logical. (line 80) * notaknot: graph. (line 37) @@ -9284,7 +9287,7 @@ Index * obliqueY: three. (line 334) * obliqueZ: three. (line 319) * ode: ode. (line 9) -* offset <1>: Options. (line 167) +* offset <1>: Options. (line 168) * offset: Pens. (line 115) * OmitTick: graph. (line 239) * OmitTickInterval: graph. (line 239) @@ -9310,7 +9313,7 @@ Index * orthographic: three. (line 338) * outformat: three. (line 127) * outprefix: Frames and pictures. (line 83) -* output <1>: Options. (line 142) +* output <1>: Options. (line 143) * output: Files. (line 35) * OutTicks: graph3. (line 34) * overloading functions: Functions. (line 44) @@ -9338,10 +9341,10 @@ Index * path[]: Tutorial. (line 134) * patterns <1>: patterns. (line 6) * patterns: Pens. (line 238) -* PDF: Options. (line 142) -* pdflatex: Options. (line 142) +* PDF: Options. (line 143) +* pdflatex: Options. (line 143) * pdfviewer: Configuring. (line 6) -* pdfviewerOptions: Options. (line 129) +* pdfviewerOptions: Options. (line 130) * pen: Pens. (line 6) * PenMargin: draw. (line 42) * PenMargin2: three. (line 559) @@ -9391,7 +9394,7 @@ Index (line 6) * psview: Microsoft Windows. (line 16) * psviewer: Configuring. (line 6) -* psviewerOptions: Options. (line 129) +* psviewerOptions: Options. (line 130) * pt: Tutorial. (line 63) * public: Structures. (line 6) * push: Arrays. (line 39) @@ -9435,7 +9438,7 @@ Index * remainder: Mathematical functions. (line 6) * rename: Files. (line 151) -* render <1>: Options. (line 142) +* render <1>: Options. (line 143) * render: three. (line 47) * replace: Data types. (line 252) * resetdefaultpen: Pens. (line 353) @@ -9470,7 +9473,7 @@ Index * runtime imports: Import. (line 98) * Russian: unicode. (line 7) * S: Tutorial. (line 106) -* safe: Options. (line 162) +* safe: Options. (line 163) * save: Frames and pictures. (line 262) * saveline: Files. (line 134) * scale: three. (line 452) @@ -9497,7 +9500,7 @@ Index * self operators: Self & prefix operators. (line 6) * sequence: Arrays. (line 128) -* settings <1>: Options. (line 114) +* settings <1>: Options. (line 115) * settings: Configuring. (line 23) * sgn: Mathematical functions. (line 26) @@ -9527,7 +9530,7 @@ Index * SixViews: three. (line 396) * SixViewsFR: three. (line 396) * SixViewsUS: three. (line 396) -* size <1>: Options. (line 142) +* size <1>: Options. (line 143) * size <2>: three. (line 502) * size <3>: Frames and pictures. (line 43) * size: Paths and guides. (line 70) @@ -9582,9 +9585,9 @@ Index * SuppressQuiet: Pens. (line 335) * surface <1>: graph3. (line 100) * surface: three. (line 47) -* SVG: Options. (line 142) +* SVG: Options. (line 143) * SVN: Subversion. (line 6) -* system <1>: Options. (line 162) +* system <1>: Options. (line 163) * system: Files. (line 159) * syzygy: syzygy. (line 6) * tab: Files. (line 60) @@ -9602,7 +9605,7 @@ Index * tensionSpecifier: Paths and guides. (line 385) * tensor product shading: fill. (line 74) * tensorshade: fill. (line 74) -* tex <1>: Options. (line 142) +* tex <1>: Options. (line 143) * tex: Frames and pictures. (line 278) * TeX fonts: Pens. (line 201) * TeX string: Data types. (line 179) @@ -9720,7 +9723,7 @@ Index * X: three. (line 274) * xasy: GUI. (line 6) * xaxis3: graph3. (line 7) -* xelatex <1>: Options. (line 142) +* xelatex <1>: Options. (line 143) * xelatex: embed. (line 10) * xequals: graph. (line 294) * XEquals: graph. (line 280) @@ -9893,36 +9896,36 @@ Ref: errorbars235104 Ref: automatic scaling239160 Node: palette249806 Ref: images249924 -Ref: image254095 -Ref: logimage254573 -Ref: penimage255551 -Ref: penfunctionimage255772 -Node: three256496 -Ref: PostScript3D281241 -Node: obj282933 -Node: graph3283185 -Ref: GaussianSurface288310 -Node: grid3289414 -Node: solids290154 -Node: tube291102 -Node: flowchart293337 -Node: contour297906 -Node: contour3303031 -Node: slopefield303338 -Node: ode304775 -Node: Options305035 -Ref: configuration file310963 -Ref: settings310963 -Ref: convert312164 -Node: Interactive mode315131 -Ref: history317284 -Node: GUI318589 -Node: GUI installation319092 -Node: GUI usage320222 -Node: PostScript to Asymptote321125 -Node: Help321881 -Node: Debugger323617 -Node: Credits325402 -Node: Index326334 +Ref: image254096 +Ref: logimage254574 +Ref: penimage255635 +Ref: penfunctionimage255856 +Node: three256580 +Ref: PostScript3D281322 +Node: obj283014 +Node: graph3283266 +Ref: GaussianSurface288391 +Node: grid3289495 +Node: solids290235 +Node: tube291183 +Node: flowchart293418 +Node: contour297987 +Node: contour3303112 +Node: slopefield303419 +Node: ode304856 +Node: Options305116 +Ref: configuration file311104 +Ref: settings311104 +Ref: convert312305 +Node: Interactive mode315272 +Ref: history317425 +Node: GUI318730 +Node: GUI installation319233 +Node: GUI usage320363 +Node: PostScript to Asymptote321266 +Node: Help322022 +Node: Debugger323758 +Node: Credits325543 +Node: Index326475 End Tag Table diff --git a/Build/source/utils/asymptote/picture.cc b/Build/source/utils/asymptote/picture.cc index 9cbbafb66a3..c11e6e93ae0 100644 --- a/Build/source/utils/asymptote/picture.cc +++ b/Build/source/utils/asymptote/picture.cc @@ -1008,10 +1008,13 @@ bool picture::shipout3(const string& prefix, const string& format, const string outputformat=format.empty() ? getSetting<string>("outformat") : format; + +#ifdef HAVE_GL bool View=settings::view() && view; static int oldpid=0; bool animating=getSetting<bool>("animating"); bool Wait=!interact::interactive || !View || animating; +#endif #ifdef HAVE_LIBGLUT if(glthread && !offscreen) { @@ -1067,6 +1070,7 @@ bool picture::shipout3(const string& prefix, const string& format, } } #endif +#ifdef HAVE_GL glrender(prefix,this,outputformat,width,height,angle,zoom,m,M,shift,t, background,nlights,lights,diffuse,ambient,specular,viewportlighting, View,oldpid); @@ -1077,6 +1081,7 @@ bool picture::shipout3(const string& prefix, const string& format, } return true; #endif +#endif return false; } diff --git a/Build/source/utils/asymptote/prc/PRCdouble.h b/Build/source/utils/asymptote/prc/PRCdouble.h index 06c1b741a59..f05b2c8e5ec 100644 --- a/Build/source/utils/asymptote/prc/PRCdouble.h +++ b/Build/source/utils/asymptote/prc/PRCdouble.h @@ -3,6 +3,7 @@ #include <cstdlib> #include <cmath> +#include <cstring> #ifdef HAVE_CONFIG_H #include "config.h" |