diff options
Diffstat (limited to 'Build/source/utils/asymptote/asy.list')
-rw-r--r-- | Build/source/utils/asymptote/asy.list | 454 |
1 files changed, 228 insertions, 226 deletions
diff --git a/Build/source/utils/asymptote/asy.list b/Build/source/utils/asymptote/asy.list index 6e94649b60b..f2ef45381c4 100644 --- a/Build/source/utils/asymptote/asy.list +++ b/Build/source/utils/asymptote/asy.list @@ -64,8 +64,8 @@ path3 subpath(path3 p, real a, real b); bool isnan(real x); string jobname(string name); void print_random_addresses(int n=<default>); -void attach(picture dest=<default>, frame src, pair position=<default>, bool group=<default>, filltype filltype=<default>, bool above=<default>); void attach(picture dest=<default>, frame src, pair position, pair align, bool group=<default>, filltype filltype=<default>, bool above=<default>); +void attach(picture dest=<default>, frame src, pair position=<default>, bool group=<default>, filltype filltype=<default>, bool above=<default>); real[] quadraticroots(real a, real b, real c); pair[] quadraticroots(explicit pair a, explicit pair b, explicit pair c); pen darkcyan; @@ -100,8 +100,8 @@ void atupdate(void f()); void atupdate()(); void unfill(frame f, path[] g, bool copy=<default>); void unfill(picture pic=<default>, path[] g, bool copy=<default>); -bool Bar(picture, path, pen, marginT(path, pen)); bool Bar(picture, path, pen, marginT(path, pen))(real size=<default>); +bool Bar(picture, path, pen, marginT(path, pen)); bool eol(file f); pen zerowinding; void atbreakpoint(string f(string, int, int, code)); @@ -141,8 +141,8 @@ pen rgb(pen p); pen rgb(real r, real g, real b); pen rgb(string s); real inch; -bool ArcArrow(picture, path, pen, marginT(path, pen))(arrowhead arrowhead=<default>, real size=<default>, real angle=<default>, filltype filltype=<default>, position position=<default>); bool ArcArrow(picture, path, pen, marginT(path, pen)); +bool ArcArrow(picture, path, pen, marginT(path, pen))(arrowhead arrowhead=<default>, real size=<default>, real angle=<default>, filltype filltype=<default>, position position=<default>); bool ArcArrows(picture, path, pen, marginT(path, pen))(arrowhead arrowhead=<default>, real size=<default>, real angle=<default>, filltype filltype=<default>); bool ArcArrows(picture, path, pen, marginT(path, pen)); pen currentpen; @@ -236,10 +236,10 @@ string min(string[][][] a); pair min(pen p); pair min(frame f); pair min(path p); -pair min(explicit path[] p); +pair min(path[] p); triple min(path3 p); -real min(... real[] a); pair min(picture pic, bool user=<default>); +real min(... real[] a); real min(real m, scaling s, coord[] c); real min(real m, scaling s, coord[] c); int min(... int[] a); @@ -248,17 +248,17 @@ 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(object[] a, object key, bool less(object, object)); int search(real[] a, real key, bool less(real, real)); int search(guide[] a, guide key, bool less(guide, guide)); int search(coord[] a, coord key, bool less(coord, coord)); -int search(Label[] a, Label key, bool less(Label, Label)); int search(pair[] a, pair key, bool less(pair, pair)); -int search(frame[] a, frame key, bool less(frame, frame)); int search(coord[] a, coord key, bool less(coord, coord)); +int search(object[] a, object key, bool less(object, object)); +int search(picture[] a, picture key, bool less(picture, picture)); +int search(frame[] a, frame key, bool less(frame, frame)); +int search(Label[] a, Label key, bool less(Label, Label)); int search(int[] a, int key, bool less(int, int)); int search(bool3[] a, bool3 key, bool less(bool3, bool3)); -int search(picture[] a, picture key, bool less(picture, picture)); 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)); @@ -290,7 +290,7 @@ void shipout(string prefix=<default>, frame f, frame preamble=<default>, string void shipout(string prefix=<default>, frame f, string format=<default>, bool wait=<default>, bool view=<default>, string options=<default>, string script=<default>, light light=<default>, projection P=<default>); void shipout(string prefix=<default>, picture pic=<default>, frame orientation(frame)=<default>, string format=<default>, bool wait=<default>, bool view=<default>, string options=<default>, string script=<default>, light light=<default>, projection P=<default>); void shipout3(string prefix, frame f, string format=<default>, real width, real height, real angle, real zoom, triple m, triple m, pair shift, real[][] t, real[] background, triple[] lights, real[][] diffuse, real[][] ambient, real[][] specular, bool viewportlighting, bool view=<default>); -void shipout3(string prefix, frame f, int[] index, triple[] center); +void shipout3(string prefix, frame f); string getstring(string name=<default>, string default=<default>, string prompt=<default>, bool store=<default>); int debuggerlines; frame bbox(picture pic=<default>, real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>); @@ -309,7 +309,7 @@ pair maxbound(pair[][][] a); triple maxbound(triple[] a); triple maxbound(triple[][] a); triple maxbound(triple[][][] a); -string Embed(string name, string options=<default>, real width=<default>, real height=<default>); +string Embed(string name, string text=<default>, string options=<default>, real width=<default>, real height=<default>); pair postcontrol(path p, int t); pair postcontrol(path p, real t); triple postcontrol(path3 p, int t); @@ -338,21 +338,21 @@ string max(string[][][] a); pair max(pen p); pair max(frame f); pair max(path p); -pair max(explicit path[] p); +pair max(path[] p); triple max(path3 p); -pair max(picture pic, bool user=<default>); -real max(real M, scaling s, coord[] c); real max(real M, scaling s, coord[] c); int max(... int[] a); +pair max(picture pic, bool user=<default>); real max(... real[] a); -Label Label(Label L, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); +real max(real M, scaling s, coord[] c); Label Label(Label L, pair position, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); Label Label(string s, string size=<default>, explicit position position, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); Label Label(Label L, explicit position position, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); -Label Label; Label Label(explicit pair position, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); +Label Label; Label Label(string s=<default>, string size=<default>, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); Label Label(string s, string size=<default>, pair position, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); +Label Label(Label L, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); string font(pen p=<default>); pen font(string name, string options=<default>); pen font(string encoding, string family, string series, string shape); @@ -371,8 +371,8 @@ pen squarepen; bool EndArrow(picture, path, pen, marginT(path, pen)); bool EndArrow(picture, path, pen, marginT(path, pen))(arrowhead arrowhead=<default>, real size=<default>, real angle=<default>, filltype filltype=<default>, position position=<default>); real barsize(pen p=<default>); -bool EndArcArrow(picture, path, pen, marginT(path, pen))(arrowhead arrowhead=<default>, real size=<default>, real angle=<default>, filltype filltype=<default>, position position=<default>); bool EndArcArrow(picture, path, pen, marginT(path, pen)); +bool EndArcArrow(picture, path, pen, marginT(path, pen))(arrowhead arrowhead=<default>, real size=<default>, real angle=<default>, filltype filltype=<default>, position position=<default>); void tensorshade(frame f, path[] g, bool stroke=<default>, pen fillrule=<default>, pen[][] p, path[] b=<default>, pair[][] z=<default>, bool copy=<default>); void tensorshade(picture pic=<default>, path[] g, bool stroke=<default>, pen fillrule=<default>, pen[][] p, path[] b=<default>, pair[][] z=<default>, bool copy=<default>); void tensorshade(frame f, path[] g, bool stroke=<default>, pen fillrule=<default>, pen[] p, path b=<default>, pair[] z); @@ -424,10 +424,10 @@ pen fuchsia; bool needshipout(); filltype filltype(int type=<default>, pen fillpen=<default>, pen drawpen=<default>, void fill2(frame f, path[] g, pen fillpen)); frame[] fit(string prefix=<default>, picture[] pictures, string format=<default>, bool view=<default>, string options=<default>, string script=<default>, projection P=<default>); -path box(pair a, pair b); +pen Bookman(string series=<default>, string shape=<default>); path box(frame dest, frame src=<default>, real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>); path box(frame f, Label L, real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>); -pen Bookman(string series=<default>, string shape=<default>); +path box(pair a, pair b); void seekeof(file f); path unitcircle; framedTransformStack xformStack; @@ -460,7 +460,7 @@ hsv hsv(pen p); void deconstruct(frame f, frame preamble=<default>, real magnification=<default>, transform xform()); void deconstruct(picture pic=<default>, real magnification=<default>); int sgn(real x); -pair minAfterTransform(transform t, path[] a); +pair minAfterTransform(transform t, path[] p); int seconds(string t=<default>, string format=<default>); pen cyan; pen grey; @@ -483,11 +483,10 @@ void drawpixel(frame f, triple v, pen p, real width=<default>); pen fontsize(real size, real lineskip); real fontsize(pen p=<default>); pen fontsize(real size); -string Link(string label, string text, string options=<default>); void close(file f); real lineskip(pen p=<default>); pen dashed; -pair maxAfterTransform(transform t, path[] a); +pair maxAfterTransform(transform t, path[] p); int[][] triangulate(pair[] z); void fill(frame f, path[] g, pen p=<default>, bool copy=<default>); path fill(frame dest, frame src, filltype filltype=<default>, real xmargin=<default>, real ymargin=<default>); @@ -519,8 +518,6 @@ bool[] copy(bool[] a, int depth=<default>); real[][] copy(real[][] a, int depth=<default>); pen[] copy(pen[] a, int depth=<default>); coord[] copy(coord[] a, int depth=<default>); -coord[] copy(coord[] a, int depth=<default>); -picture[] copy(picture[] a, int depth=<default>); marker[] copy(marker[] a, int depth=<default>); Legend[] copy(Legend[] a, int depth=<default>); Label[] copy(Label[] a, int depth=<default>); @@ -533,7 +530,9 @@ string[][] copy(string[][] a, int depth=<default>); frame[] copy(frame[] a, int depth=<default>); pair[] copy(pair[] a, int depth=<default>); bool3[] copy(bool3[] a, int depth=<default>); +coord[] copy(coord[] a, int depth=<default>); object[] copy(object[] a, int depth=<default>); +picture[] copy(picture[] a, int depth=<default>); pair[][] copy(pair[][] a, int depth=<default>); real[] abs(pair[] a); real[] abs(triple[] a); @@ -567,15 +566,16 @@ real[] map(real f(pair), pair[] a); int[] map(int f(real), real[] a); bool3[] map(bool3 f(bool3), bool3[] a); frame[] map(frame f(frame), frame[] a); -coord[] map(coord f(coord), coord[] a); +Label[] map(Label f(Label), Label[] a); pen[][] map(pen[] f(pen[]), pen[][] a); triple[] map(triple f(triple), triple[] a); pen[] map(pen f(pen), pen[] a); +coord[] map(coord f(coord), coord[] a); +object[] map(object f(object), object[] a); +picture[] map(picture f(picture), picture[] a); pair[] map(pair f(pair), pair[] a); coord[] map(coord f(coord), coord[] a); -Label[] map(Label f(Label), Label[] a); string[] map(string f(string), string[] a); -object[] map(object f(object), object[] a); void()()[] map(void f()()(void()()), void()()[] a); pair[][] map(pair[] f(pair[]), pair[][] a); real[] map(real f(real), real[] a); @@ -585,7 +585,6 @@ string[][] map(string[] f(string[]), string[][] a); bool[] map(bool f(bool), bool[] a); path[] map(path f(path), path[] a); real[][] map(real[] f(real[]), real[][] a); -picture[] map(picture f(picture), picture[] a); marker[] map(marker f(marker), marker[] a); guide[] map(guide f(guide), guide[] a); path unstraighten(path p); @@ -602,8 +601,6 @@ pair minratio(path3 g); int[] sequence(int n); pen[][] sequence(pen[] f(int), int n); coord[] sequence(coord 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); Legend[] sequence(Legend f(int), int n); Label[] sequence(Label f(int), int n); @@ -617,7 +614,9 @@ bool[] sequence(bool f(int), int n); string[] sequence(string f(int), int n); pair[][] sequence(pair[] f(int), int n); bool3[] sequence(bool3 f(int), int n); +coord[] sequence(coord f(int), int n); object[] sequence(object f(int), int n); +picture[] sequence(picture f(int), int n); real[][] sequence(real[] f(int), int n); real[] sequence(real f(int), int n); int[] sequence(int n, int m); @@ -635,10 +634,11 @@ string cd(string s=<default>); int size(guide g); pair size(frame f); int size(path p); +int size(path[] p); int size(path3 p); +void size(picture dest, picture src); pair size(picture pic, bool user=<default>); void size(picture pic=<default>, real x, real y=<default>, bool keepAspect=<default>); -void size(picture dest, picture src); void size(picture pic=<default>, real xsize, real ysize, pair min, pair max); void clear(file f); void clear(string file, int line); @@ -694,23 +694,23 @@ void report(string text); void report(int i); void report(transform t); void add(frame dest, frame src); -void add(picture pic=<default>, Label L); -void add(picture pic=<default>, void d(frame f, transform t), bool exact=<default>); -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(picture, real[][]), 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>); -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 pic=<default>, void d(frame f, real[][] t, picture pic, projection P), bool exact=<default>); -void add(frame f, transform t=<default>, Label L); -void add(picture pic=<default>, void d(picture, transform), bool exact=<default>); +void add(picture pic=<default>, void d(frame f, transform t), bool exact=<default>); +void add(picture pic=<default>, void d(picture, real[][]), bool exact=<default>); 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(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>); +void add(picture pic=<default>, void d(picture, transform), bool exact=<default>); +void add(picture pic=<default>, Label L); +void add(frame f, transform t=<default>, Label L); +void add(picture src, pair position, bool group=<default>, filltype filltype=<default>, bool above=<default>); plain plain; void purge(int divisor=<default>); int Round(real x); @@ -728,16 +728,18 @@ plain_scaling plain_scaling; string file(string s); plain_bounds plain_bounds; string outprefix(string prefix=<default>); +object object(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>); object object(frame f); object object(Label L); -object object(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>); file stdin; void()()[] array(int n, void value()(), int depth=<default>); bool[] array(int n, bool value, int depth=<default>); 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>); object[] array(int n, object value, int depth=<default>); +picture[] array(int n, picture value, int depth=<default>); real[][] array(int n, real[] value, int depth=<default>); real[] array(int n, real value, int depth=<default>); triple[] array(int n, triple value, int depth=<default>); @@ -745,8 +747,6 @@ 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>); coord[] array(int n, coord 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>); Legend[] array(int n, Legend value, int depth=<default>); Label[] array(int n, Label value, int depth=<default>); @@ -790,22 +790,23 @@ real inf; real arctime(path p, real l); real arctime(path3 p, real dval); pen palemagenta; -void draw(frame f, triple[][] p, triple center, bool straight, pen[] p, real opacity, real shininess, real prcshininess, triple normal, pen[] colors, bool lighton, int interaction, bool prc=<default>); +void draw(frame f, triple[][] p, triple center, bool straight, pen[] p, real opacity, real shininess, real prcshininess, triple normal, pen[] colors, int interaction, bool prc=<default>); 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(frame f, triple[][] p, real[] uknot, real[] vknot, real[][] weights=<default>, pen[] p, real opacity, real shininess, real prcshininess, pen[] colors); +void draw(frame f, triple[] v, int[][] vi, triple[] n, int[][] ni, pen[] p, real opacity, real shininess, real prcshininess, pen[] c=<default>, int[][] ci=<default>); void draw(picture pic=<default>, path[] g, pen fillrule=<default>, pen[] p); -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>); +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(frame f, explicit path[] 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>, 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>); 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>); -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>); +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(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>); +void draw(frame f, path g, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))); int mantissaBits; real identity(real x); real[] identity(real[] a); @@ -870,19 +871,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(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=<default>, Label L, void suffix(file)=<default>); void write(file file, string s=<default>, cputime c, string format=<default>, void suffix(file)=<default>); +void write(pairOrTriple a); 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(file file=<default>, align align, void suffix(file)=<default>); void save()(); marginT EndPenMargin(path, pen); pair NNE; @@ -936,18 +937,18 @@ arrowhead HookHead; arrowhead HookHead(real dir=<default>, real barb=<default>); Legend[] concat(... Legend[][]); real[] concat(... real[][]); -object[] concat(... object[][]); pair[] concat(... pair[][]); coord[] concat(... coord[][]); -Label[] concat(... Label[][]); pen[] concat(... pen[][]); -path[] concat(... path[][]); coord[] concat(... coord[][]); +object[] concat(... object[][]); +picture[] concat(... picture[][]); +path[] concat(... path[][]); +Label[] concat(... Label[][]); int[] concat(... int[][]); void()()[] concat(... void()()[][]); bool3[] concat(... bool3[][]); string[] concat(... string[][]); -picture[] concat(... picture[][]); marker[] concat(... marker[][]); triple[] concat(... triple[][]); frame[] concat(... frame[][]); @@ -959,68 +960,68 @@ real[] log1p(real[] a); real infinity; bool alias(pair[][] a, pair[][] b); bool alias(guide[] a, guide[] b); -bool alias(hsv a, hsv b); -bool alias(coord[] a, coord[] b); +bool alias(marginT a, marginT b); bool alias(projection a, projection b); -bool alias(picture a, picture b); +bool alias(side a, side b); bool alias(marker a, marker b); +bool alias(Label[] a, Label[] b); bool alias(pair[] a, pair[] b); -bool alias(scaling a, scaling b); +bool alias(coord a, coord b); bool alias(bounds a, bounds b); bool alias(scaleT a, scaleT b); -bool alias(position a, position b); +bool alias(picture a, picture b); +bool alias(object a, object b); bool alias(cputime a, cputime b); bool alias(int[] a, int[] b); bool alias(string[][] a, string[][] b); -bool alias(filltype a, filltype b); +bool alias(slice a, slice b); bool alias(coord[] a, coord[] b); bool alias(coords2 a, coords2 b); bool alias(Legend a, Legend b); -bool alias(align a, align b); bool alias(framedTransformStack a, framedTransformStack b); -bool alias(Label[] a, Label[] b); bool alias(real[][] a, real[][] b); bool alias(bool3 a, bool3 b); bool alias(bool3[] a, bool3[] b); bool alias(light a, light b); -bool alias(indexedTransform a, indexedTransform b); +bool alias(position a, position b); bool alias(arrowhead a, arrowhead b); bool alias(string[] a, string[] b); bool alias(frame[] a, frame[] b); -bool alias(coords2 a, coords2 b); +bool alias(scaling a, scaling b); bool alias(coord a, coord b); bool alias(autoscaleT a, autoscaleT b); -bool alias(Label a, Label b); bool alias(Legend[] a, Legend[] b); bool alias(bool[] a, bool[] b); bool alias(void()()[] a, void()()[] b); bool alias(pen[][] a, pen[][] b); -bool alias(marginT a, marginT b); +bool alias(filltype a, filltype b); +bool alias(coord[] a, coord[] b); bool alias(freezableBounds a, freezableBounds b); bool alias(transformation a, transformation b); -bool alias(pairOrTriple a, pairOrTriple b); +bool alias(align a, align b); +bool alias(object[] a, object[] b); +bool alias(picture[] a, picture[] b); bool alias(path[] a, path[] b); bool alias(triple[] a, triple[] b); -bool alias(coord a, coord b); bool alias(coords3 a, coords3 b); -bool alias(side a, side b); -bool alias(picture[] a, picture[] b); +bool alias(pairOrTriple a, pairOrTriple b); +bool alias(Label a, Label b); bool alias(marker[] a, marker[] b); bool alias(processtime a, processtime b); bool alias(real[] a, real[] b); bool alias(pen[] a, pen[] b); -bool alias(slice a, slice b); +bool alias(hsv a, hsv b); +bool alias(coords2 a, coords2 b); bool alias(scaling a, scaling b); bool alias(ScaleT a, ScaleT b); -bool alias(object a, object b); -bool alias(object[] a, object[] b); +bool alias(indexedTransform a, indexedTransform b); real pi; int getint(string name=<default>, int default=<default>, string prompt=<default>, bool store=<default>); bool IgnoreAspect; void postscript(frame f, string s); void postscript(frame f, string s, pair min, pair max); -void postscript(picture pic=<default>, string s, pair min, pair max); void postscript(picture pic=<default>, string s); +void postscript(picture pic=<default>, string s, pair min, pair max); transform slant(real s); void breakpoint(code s=<default>); void breakpoints(); @@ -1045,21 +1046,21 @@ 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)); -object[] sort(object[] a, bool less(object, object)); coord[] sort(coord[] a, bool less(coord, coord)); -Label[] sort(Label[] a, bool less(Label, Label)); pen[] sort(pen[] a, bool less(pen, pen)); pen[][] sort(pen[][] a, bool less(pen[], pen[])); +coord[] sort(coord[] a, bool less(coord, coord)); +object[] sort(object[] a, bool less(object, object)); +picture[] sort(picture[] a, bool less(picture, picture)); guide[] sort(guide[] a, bool less(guide, guide)); real[][] sort(real[][] a, bool less(real[], real[])); triple[] sort(triple[] a, bool less(triple, triple)); -coord[] sort(coord[] a, bool less(coord, coord)); +Label[] sort(Label[] a, bool less(Label, Label)); string[] sort(string[] a, bool less(string, string)); int[] sort(int[] a, bool less(int, int)); string[][] sort(string[][] a, bool less(string[], string[])); bool3[] sort(bool3[] a, bool less(bool3, bool3)); pair[][] sort(pair[][] a, bool less(pair[], pair[])); -picture[] sort(picture[] a, bool less(picture, picture)); marker[] sort(marker[] a, bool less(marker, marker)); frame[] sort(frame[] a, bool less(frame, frame)); pen salmon; @@ -1071,8 +1072,8 @@ void latticeshade(picture pic=<default>, path[] g, bool stroke=<default>, pen fi pair[] pairs(real[] x, real[] y); void eval(code s, bool embedded=<default>); void eval(string s, bool embedded=<default>); -bool Arrow(picture, path, pen, marginT(path, pen)); bool Arrow(picture, path, pen, marginT(path, pen))(arrowhead arrowhead=<default>, real size=<default>, real angle=<default>, filltype filltype=<default>, position position=<default>); +bool Arrow(picture, path, pen, marginT(path, pen)); bool Arrows(picture, path, pen, marginT(path, pen))(arrowhead arrowhead=<default>, real size=<default>, real angle=<default>, filltype filltype=<default>); bool Arrows(picture, path, pen, marginT(path, pen)); int tell(file f); @@ -1099,9 +1100,9 @@ pen mean(pen[] p, real opacity(real[])=<default>); pen[] mean(pen[][] palette, real opacity(real[])=<default>); string mktemp(string s); void sleep(int seconds); -void unitsize(picture pic=<default>, real x, real y=<default>, real z=<default>); void arrow(picture pic=<default>, Label L=<default>, pair b, pair dir, real length=<default>, align align=<default>, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>); picture arrow(arrowhead arrowhead=<default>, path g, pen p=<default>, real size=<default>, real angle=<default>, filltype filltype=<default>, position position=<default>, bool forwards=<default>, marginT margin(path, pen)=<default>, bool center=<default>); +void unitsize(picture pic=<default>, real x, real y=<default>, real z=<default>); picture arrow2(arrowhead arrowhead=<default>, path g, pen p=<default>, real size=<default>, real angle=<default>, filltype filltype=<default>, marginT margin(path, pen)=<default>); path unitsquare; real arrowdir; @@ -1271,9 +1272,9 @@ triple[] operator +(triple[] a); pen operator +(pen a, pen b); transform operator +(transform a, transform b); pen operator +(pen p, real w); -marginT operator +(path, pen)(marginT ma(path, pen), marginT mb(path, pen)); pen[] operator +(pen a, pen[] b); pen operator +(real w, pen p); +marginT operator +(path, pen)(marginT ma(path, pen), marginT mb(path, pen)); pen[] operator +(pen[] a, pen b); int operator -(int a, int b); int[] operator -(int a, int[] b); @@ -1346,15 +1347,15 @@ triple operator *(real[][] t, triple v); triple operator *(real x, triple v); triple operator *(triple v, real x); path3 operator *(real[][] t, path3 g); -object operator *(transform t, explicit object F); -Label operator *(transform t, Label L); picture operator *(real[][] t, picture orig); +side operator *(real x, side s); +Label operator *(real[][] t, Label L); path[] operator *(transform t, explicit path[] p); bounds operator *(transform t, bounds b); -pair[] operator *(transform t, pair[] z); picture operator *(transform t, picture orig); -side operator *(real x, side s); -Label operator *(real[][] t, Label L); +object operator *(transform t, explicit object F); +pair[] operator *(transform t, pair[] z); +Label operator *(transform t, Label L); bool operator init(); int operator init(); real operator init(); @@ -1368,38 +1369,38 @@ path3 operator init(); pen operator init(); frame operator init(); file operator init(); -hsv operator init(); +marginT operator init(); projection operator init(); -picture operator init(); +side operator init(); marker operator init(); -marginT operator init(); -transformation operator init(); -pairOrTriple operator init(); filltype operator init(); +transformation operator init(); +align operator init(); +slice operator init(); coords2 operator init(); Legend operator init(); -align operator init(); framedTransformStack operator init(); -slice operator init(); +hsv operator init(); +coords2 operator init(); scaling operator init(); ScaleT operator init(); -object operator init(); -coords2 operator init(); +indexedTransform operator init(); +scaling operator init(); coord operator init(); autoscaleT operator init(); -Label operator init(); -scaling operator init(); +coord operator init(); bounds operator init(); scaleT operator init(); -position operator init(); +picture operator init(); +object operator init(); cputime operator init(); -coord operator init(); coords3 operator init(); -side operator init(); +pairOrTriple operator init(); +Label operator init(); processtime operator init(); bool3 operator init(); light operator init(); -indexedTransform operator init(); +position operator init(); arrowhead operator init(); real operator cast(int); pair operator cast(int); @@ -1442,33 +1443,33 @@ string[][][] operator cast(file); guide operator cast(cycleToken tok); guide operator cast(curlSpecifier spec); guide operator cast(tensionSpecifier t); -object operator cast(Label L); -Label operator cast(object F); guide[] operator cast(path[] g); -position operator cast(pair x); -align operator cast(side side); -pair operator cast(position P); +position operator cast(real x); +hsv operator cast(pen p); +Label operator cast(string s); +frame operator cast(object F); bool3[] operator cast(bool[] b); -object operator cast(frame f); +align operator cast(side side); +pair operator cast(pairOrTriple a); +triple operator cast(pairOrTriple a); +position operator cast(pair x); guide[] operator cast(pair[] z); path[] operator cast(guide[] g); bool operator cast(bool3 b); +pair operator cast(position P); +object operator cast(frame f); path[] operator cast(guide g); -pen operator cast(hsv hsv); +object operator cast(Label L); +Label operator cast(object F); +align operator cast(pair dir); path[] operator cast(pair[] z); path[] operator cast(path p); -pair operator cast(pairOrTriple a); -triple operator cast(pairOrTriple a); bool[] operator cast(bool3[] b); +align operator cast(triple dir); +bool3 operator cast(bool b); +pen operator cast(hsv hsv); position operator cast(int x); -hsv operator cast(pen p); object operator cast(string s); -align operator cast(pair dir); -bool3 operator cast(bool b); -position operator cast(real x); -Label operator cast(string s); -align operator cast(triple dir); -frame operator cast(object F); pen deepred; bool error(file f); string operator ecast(int); @@ -1502,6 +1503,7 @@ real[] operator /(int[] a, int b); real[] operator /(int a, int[] b); real[] operator /(int[] a, int[] b); triple operator /(triple v, real x); +path[] texpath(string s, pen p, bool tex=<default>, bool bbox=<default>); path[] texpath(Label L, bool tex=<default>, bool bbox=<default>); bool uptodate(); int operator %(int a, int b); @@ -1569,39 +1571,39 @@ bool operator ==(path a, path b); bool operator ==(path3 a, path3 b); bool operator ==(bool3 a, bool3 b); bool operator ==(light a, light b); -bool operator ==(indexedTransform a, indexedTransform b); +bool operator ==(position a, position b); bool operator ==(arrowhead a, arrowhead b); -bool operator ==(coords2 a, coords2 b); +bool operator ==(scaling a, scaling b); bool operator ==(coord a, coord b); bool operator ==(autoscaleT a, autoscaleT b); -bool operator ==(Label a, Label b); -bool operator ==(marginT a, marginT b); +bool operator ==(filltype a, filltype b); bool operator ==(freezableBounds a, freezableBounds b); bool operator ==(transformation a, transformation b); -bool operator ==(pairOrTriple a, pairOrTriple b); -bool operator ==(coord a, coord b); +bool operator ==(align a, align b); bool operator ==(coords3 a, coords3 b); -bool operator ==(side a, side b); +bool operator ==(pairOrTriple a, pairOrTriple b); +bool operator ==(Label a, Label b); bool operator ==(processtime a, processtime b); -bool operator ==(slice a, slice b); +bool operator ==(hsv a, hsv b); +bool operator ==(coords2 a, coords2 b); bool operator ==(scaling a, scaling b); bool operator ==(ScaleT a, ScaleT b); -bool operator ==(object a, object b); +bool operator ==(indexedTransform a, indexedTransform b); bool operator ==(bool3 a, bool b); -bool operator ==(hsv a, hsv b); +bool operator ==(marginT a, marginT b); bool operator ==(projection a, projection b); -bool operator ==(picture a, picture b); +bool operator ==(side a, side b); bool operator ==(marker a, marker b); -bool operator ==(scaling a, scaling b); +bool operator ==(coord a, coord b); bool operator ==(bounds a, bounds b); bool operator ==(scaleT a, scaleT b); -bool operator ==(position a, position b); +bool operator ==(picture a, picture b); +bool operator ==(object a, object b); bool operator ==(cputime a, cputime b); bool operator ==(bool a, bool3 b); -bool operator ==(filltype a, filltype b); +bool operator ==(slice a, slice b); bool operator ==(coords2 a, coords2 b); bool operator ==(Legend a, Legend b); -bool operator ==(align a, align b); bool operator ==(framedTransformStack a, framedTransformStack b); bool operator !=(bool a, bool b); bool[] operator !=(bool a, bool[] b); @@ -1641,39 +1643,39 @@ bool operator !=(path a, path b); bool operator !=(path3 a, path3 b); bool operator !=(bool3 a, bool3 b); bool operator !=(light a, light b); -bool operator !=(indexedTransform a, indexedTransform b); +bool operator !=(position a, position b); bool operator !=(arrowhead a, arrowhead b); -bool operator !=(coords2 a, coords2 b); +bool operator !=(scaling a, scaling b); bool operator !=(coord a, coord b); bool operator !=(autoscaleT a, autoscaleT b); -bool operator !=(Label a, Label b); -bool operator !=(marginT a, marginT b); +bool operator !=(filltype a, filltype b); bool operator !=(freezableBounds a, freezableBounds b); bool operator !=(transformation a, transformation b); -bool operator !=(pairOrTriple a, pairOrTriple b); -bool operator !=(coord a, coord b); +bool operator !=(align a, align b); bool operator !=(coords3 a, coords3 b); -bool operator !=(side a, side b); +bool operator !=(pairOrTriple a, pairOrTriple b); +bool operator !=(Label a, Label b); bool operator !=(processtime a, processtime b); -bool operator !=(slice a, slice b); +bool operator !=(hsv a, hsv b); +bool operator !=(coords2 a, coords2 b); bool operator !=(scaling a, scaling b); bool operator !=(ScaleT a, ScaleT b); -bool operator !=(object a, object b); +bool operator !=(indexedTransform a, indexedTransform b); bool operator !=(bool3 a, bool b); -bool operator !=(hsv a, hsv b); +bool operator !=(marginT a, marginT b); bool operator !=(projection a, projection b); -bool operator !=(picture a, picture b); +bool operator !=(side a, side b); bool operator !=(marker a, marker b); -bool operator !=(scaling a, scaling b); +bool operator !=(coord a, coord b); bool operator !=(bounds a, bounds b); bool operator !=(scaleT a, scaleT b); -bool operator !=(position a, position b); +bool operator !=(picture a, picture b); +bool operator !=(object a, object b); bool operator !=(cputime a, cputime b); bool operator !=(bool a, bool3 b); -bool operator !=(filltype a, filltype b); +bool operator !=(slice a, slice b); bool operator !=(coords2 a, coords2 b); bool operator !=(Legend a, Legend b); -bool operator !=(align a, align b); bool operator !=(framedTransformStack a, framedTransformStack b); bool operator <(int a, int b); bool[] operator <(int a, int[] b); @@ -1821,9 +1823,9 @@ marker dot(pen p=<default>, filltype filltype=<default>); void dot(picture pic=<default>, pair z, pen p=<default>, filltype filltype=<default>); void dot(frame f, pair z, pen p=<default>, filltype filltype=<default>); void dot(picture pic=<default>, Label L, pen p=<default>, filltype filltype=<default>); -marker dot; void dot(picture pic=<default>, Label[] L=<default>, pair[] z, align align=<default>, string format=<default>, pen p=<default>, filltype filltype=<default>); void dot(picture pic=<default>, path[] g, pen p=<default>, filltype filltype=<default>); +marker dot; void dot(picture pic=<default>, Label L, pair z, align align=<default>, string format=<default>, pen p=<default>, filltype filltype=<default>); void list(string s, bool imports=<default>); pair NNW; @@ -1909,8 +1911,8 @@ real expm1(real x); real[] expm1(real[] a); void activatequote(picture pic=<default>); int undefined; -frame[] fit2(picture[] pictures, picture all); string ask(string prompt); +frame[] fit2(picture[] pictures, picture all); pen linecap(int n); int linecap(pen p=<default>); string outname(); @@ -1924,8 +1926,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, pair min, pair max); void tex(picture pic=<default>, string s); +void tex(picture pic=<default>, string s, pair min, pair max); pen Black; triple size3(frame f); void size3(picture pic=<default>, real x, real y=<default>, real z=<default>, bool keepAspect=<default>); @@ -1965,8 +1967,8 @@ path section(path p, real t1, real t2, bool loop=<default>); real fuzz; path[][] containmentTree(path[] paths); binarytree searchtree(... int[] keys); -object draw(picture pic=<default>, binarytreeNode node, pair pos, int height, real minDist, real levelDist, real nodeDiameter, pen p=<default>); -void draw(picture pic=<default>, binarytree tree, real minDist=<default>, real nodeMargin=<default>, pen p=<default>); +object draw(picture pic=<default>, binarytreeNode node, pair pos, int height, real minDist, real levelDist, real nodeDiameter, pen p=<default>, bool condensed=<default>); +void draw(picture pic=<default>, binarytree tree, real minDist=<default>, real nodeMargin=<default>, pen p=<default>, bool condensed=<default>); real nodeMarginDefault; key key(int n, bool active=<default>); binarytree binarytree(... key[] keys); @@ -1998,11 +2000,11 @@ void draw(picture pic=<default>, Label L, guide[] g, pen p=<default>); int interior; pen[][] interior(picture pic=<default>, guide[][] g, pen[] palette); pen[] extend(pen[] palette, pen below, pen above); -bool same(gridpoint gp1, gridpoint gp2); guide connect(Segment S, pair[][] z, guide join(... guide[])); guide[] connect(Segment[] S, pair[][] z, guide join(... guide[])); guide[][] connect(Segment[][] S, pair[][] z, guide join(... guide[])); guide[][] connect(pair[][][] points, real[] c, guide join(... guide[])); +bool same(gridpoint gp1, gridpoint gp2); bool connected(boxcontour bc1, boxcontour bc2); int exterior; int connectedindex(boxcontour bc, boxcontour[] bca, bool activeonly=<default>); @@ -2052,14 +2054,16 @@ real treeLevelStep; real treeMinNodeWidth; TreeNode makeNode(TreeNode parent=<default>, frame f); TreeNode makeNode(TreeNode parent=<default>, Label label); -string link(string label, string text, string options=<default>); -string embed(string name, string options=<default>, real width=<default>, real height=<default>); -string hyperlink(string url, string text); -string link(string url, string text, string options=<default>); -string embed(string name, string options=<default>, real width=<default>, real height=<default>, string image=<default>); +string link(string label, string text=<default>); +string embed(string name, string text=<default>, string options=<default>, real width=<default>, real height=<default>); +string embedplayer(string name, string text=<default>, string options=<default>, real width=<default>, real height=<default>); +string link(string label, string text=<default>); +string embed(string name, string text=<default>, string options=<default>, real width=<default>, real height=<default>, string image=<default>); string hyperlink(string url, string text); real gluonratio; real gluonamplitude; +pen doublelinepen; +real doublelinespacing; void drawGluon(picture pic=<default>, path p, real amp=<default>, real width=<default>, pen fgpen=<default>, bool erasebg=<default>, pen bgpen=<default>, real vertexangle=<default>, real margin=<default>); void drawGhost(picture pic=<default>, path p, pen fgpen=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, bool erasebg=<default>, pen bgpen=<default>, real vertexangle=<default>, real margin=<default>); void drawVertex(picture pic=<default>, pair xy, real r=<default>, pen fgpen=<default>); @@ -2071,8 +2075,8 @@ void drawVertexOX(picture pic=<default>, pair xy, real r=<default>, pen fgpen=<d void drawVertexTriangle(picture pic=<default>, pair xy, real r=<default>, pen fgpen=<default>); void drawVertexTriangleO(picture pic=<default>, pair xy, real r=<default>, pen fgpen=<default>, bool erasebg=<default>, pen bgpen=<default>); void drawVertexBoxX(picture pic=<default>, pair xy, real r=<default>, pen fgpen=<default>, bool erasebg=<default>, pen bgpen=<default>); -bool XYAlign; void do_overpaint(picture pic, path p, pen bgpen, real halfwidth, real vertexangle); +bool XYAlign; void texshipout(string stem, picture pic=<default>, bool xalign=<default>); void drawDoubleLine(picture pic=<default>, path p, pen fgpen=<default>, real dlspacing=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, bool erasebg=<default>, pen bgpen=<default>, real vertexangle=<default>, real margin=<default>); void drawScalar(picture pic=<default>, path p, pen fgpen=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, bool erasebg=<default>, pen bgpen=<default>, real vertexangle=<default>, real margin=<default>); @@ -2094,8 +2098,8 @@ path momArrowPath(path p, align align, position pos, real offset=<default>, real void drawPhoton(picture pic=<default>, path p, real amp=<default>, real width=<default>, pen fgpen=<default>, bool erasebg=<default>, pen bgpen=<default>, real vertexangle=<default>, real margin=<default>); bool YAlign; pen backgroundpen; -pen ghostpen; pen scalarpen; +pen ghostpen; pen fermionpen; pen bigvertexpen; real bigvertexsize; @@ -2107,8 +2111,6 @@ void drawFermion(picture pic=<default>, path p, pen fgpen=<default>, bool arrow( bool currentarrow(picture, path, pen, marginT(path, pen)); bool currentmomarrow(picture, path, pen, marginT(path, pen)); bool appendsuffix; -pen doublelinepen; -real doublelinespacing; path gluon(path p, real amp=<default>, real width=<default>); pen gluonpen; Dir Left; @@ -2216,7 +2218,6 @@ int ellipsenodesnumber(real a, real b); int ellipsenodesnumber(real a, real b, real angle1, real angle2, bool dir); int ellipsenodesnumberfactor; bool byfoci; -point[] standardizecoordsys(coordsys R=<default>, bool warn=<default> ... point[] M); transform reflect(line l); transform reflect(line l1, line l2, bool safe=<default>); abscissa relabscissa(real x); @@ -2233,6 +2234,7 @@ vector unit(point M); vector unit(vector u); line Ox(coordsys R=<default>); line Ox; +point[] standardizecoordsys(coordsys R=<default>, bool warn=<default> ... point[] M); conic conic(point F, line l, real e); conic conic(point M1, point M2, point M3, point M4, point M5); conic conic(bqe bqe); @@ -2333,7 +2335,6 @@ line bisector(point A, point B, real angle=<default>); line bisector(vertex V, real angle=<default>); line bisector(side side); bqe canonical(bqe bqe); -bool between(point M, point O, point N); point bisectorpoint(side side); abscissa angabscissa(real x, path polarconicroutine(conic co, real angle1, real angle2, int n, bool direction)=<default>); abscissa angabscissa(int x, path polarconicroutine(conic co, real angle1, real angle2, int n, bool direction)=<default>); @@ -2361,6 +2362,7 @@ arc arc(explicit arc a, abscissa x1, abscissa x2); arc arc(explicit arc a, point M, point N); path arc(explicit pair B, explicit pair A, explicit pair C, real r); void markrightangle(picture pic=<default>, point A, point O, point B, real size=<default>, pen p=<default>, marginT margin(path, pen)=<default>, filltype filltype=<default>); +bool between(point M, point O, point N); real epsgeo; real sharpangle(line l1, line l2); bool isparabola(bqe bqe); @@ -2687,9 +2689,6 @@ bool operator @(point m, line l); bool operator @(point M, conic co); bool operator @(point M, explicit circle c); bool operator @(point M, arc a); -triangle cevian(triangle t, point P); -point cevian(side side, point P); -line cevian(vertex V, point P); triangle triangle(line l1, line l2, line l3); trilinear trilinear(triangle t, real a, real b, real c); trilinear trilinear(triangle t, point M); @@ -2705,6 +2704,9 @@ real degrees(line l1, line l2); real degrees(arc a); real linemargin; real linemargin(); +triangle cevian(triangle t, point P); +point cevian(side side, point P); +line cevian(vertex V, point P); line Oy(coordsys R=<default>); line Oy; path fromCenter(conic co, real angle1, real angle2, int n, bool direction); @@ -2728,8 +2730,6 @@ bool onpath(picture pic=<default>, path g, point M, pen p=<default>); int parabolanodesnumber(parabola p, real angle1, real angle2); int parabolanodesnumberfactor; path NoModifier(path); -real[] bangles(picture pic=<default>, parabola p); -real[][] bangles(picture pic=<default>, hyperbola h); coordsys currentcoordsys; point foot(vertex V); point foot(side side); @@ -2739,6 +2739,8 @@ transform rotate(explicit vector dir); transform rotate(explicit point dir); real EPS; transform rotateO(real a); +real[] bangles(picture pic=<default>, parabola p); +real[][] bangles(picture pic=<default>, hyperbola h); pair attract(pair m, path g, real fuzz=<default>); point attract(point M, path g, real fuzz=<default>); line perpendicular(point M, line l); @@ -2753,10 +2755,6 @@ void perpendicularmark(picture pic=<default>, point z, vector align, vector dir= void perpendicularmark(picture pic=<default>, point z, explicit pair align, path g, real size=<default>, pen p=<default>, marginT margin(path, pen)=<default>, filltype filltype=<default>); void perpendicularmark(picture pic=<default>, point z, vector align, path g, real size=<default>, pen p=<default>, marginT margin(path, pen)=<default>, filltype filltype=<default>); void perpendicularmark(picture pic=<default>, line l1, line l2, real size=<default>, pen p=<default>, int quarter=<default>, marginT margin(path, pen)=<default>, filltype filltype=<default>); -point isogonalconjugate(triangle t, point M); -point isogonal(side side, point M); -line isogonal(vertex V, point M); -triangle isogonal(triangle t, point M); void Drawline(picture pic=<default>, Label L=<default>, pair P, bool dirP=<default>, pair Q, bool dirQ=<default>, align align=<default>, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, Label legend=<default>, marker marker=<default>, path pathModifier(path)=<default>); bool simeq(point A, point B, real fuzz=<default>); bool simeq(point a, real b, real fuzz=<default>); @@ -2769,7 +2767,11 @@ inversion inversion(point C, real k); inversion inversion(circle c1, circle c2, real sgn=<default>); inversion inversion(circle c1, circle c2, circle c3); inversion inversion(circle c); +point isogonalconjugate(triangle t, point M); coordsys cartesiansystem(pair O=<default>, pair i, pair j); +point isogonal(side side, point M); +line isogonal(vertex V, point M); +triangle isogonal(triangle t, point M); line tangent(circle c, abscissa x); line tangent(circle c, point M); line tangent(circle c, explicit vector v); @@ -2833,15 +2835,15 @@ void Left(picture, axisT); autoscaleT defaultS; void XEquals(picture, axisT)(real x, bool extend=<default>); void YEquals(picture, axisT)(real y, bool extend=<default>); -tickvalues OmitTickIntervals(tickvalues)(real[] a, real[] b); -tickvalues OmitTickInterval(tickvalues)(real a, real b); -tickvalues OmitTick(tickvalues)(... real[] x); string LogFormat(real)(int base); string LogFormat(real); axisT axis; void axis(picture pic=<default>, Label L=<default>, path g, path g2=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>), ticklocate locate, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, int[] divisor=<default>, bool above=<default>, bool opposite=<default>); void drawtick(frame f, transform T, path g, path g2, ticklocate locate, real val, real Size, int sign, pen p, bool extend); +tickvalues OmitTickIntervals(tickvalues)(real[] a, real[] b); real maxlength(pair a, pair b, int nx, int ny); +tickvalues OmitTickInterval(tickvalues)(real a, real b); +tickvalues OmitTick(tickvalues)(... real[] x); void errorbar(picture pic, pair z, pair dp, pair dm, pen p=<default>, real size=<default>); void errorbars(picture pic=<default>, pair[] z, pair[] dp, pair[] dm=<default>, bool[] cond=<default>, pen p=<default>, real size=<default>); void errorbars(picture pic=<default>, real[] x, real[] y, real[] dpx, real[] dpy, real[] dmx=<default>, real[] dmy=<default>, bool[] cond=<default>, pen p=<default>, real size=<default>); @@ -2874,11 +2876,11 @@ void labelaxis(frame f, transform T, Label L, path g, ticklocate locate=<default void xaxisAt(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>, bool opposite=<default>); void yaxisAt(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>, bool opposite=<default>); void xaxis(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>); -void yaxis(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>, bool autorotate=<default>); void xtick(picture pic=<default>, explicit pair z, pair dir=<default>, real size=<default>, pen p=<default>); void xtick(picture pic=<default>, real x, pair dir=<default>, real size=<default>, pen p=<default>); void xtick(picture pic=<default>, Label L, explicit pair z, pair dir=<default>, string format=<default>, real size=<default>, pen p=<default>); void xtick(picture pic=<default>, Label L, real x, pair dir=<default>, string format=<default>, real size=<default>, pen p=<default>); +void yaxis(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>, bool autorotate=<default>); void ytick(picture pic=<default>, explicit pair z, pair dir=<default>, real size=<default>, pen p=<default>); void ytick(picture pic=<default>, real y, pair dir=<default>, real size=<default>, pen p=<default>); void ytick(picture pic=<default>, Label L, explicit pair z, pair dir=<default>, string format=<default>, real size=<default>, pen p=<default>); @@ -2936,7 +2938,7 @@ tickvalues operator init(); axisT operator init(); path[] segment(pair[] z, bool[] cond, guide join(... guide[])=<default>); int Both; -void axes(picture pic=<default>, Label xlabel=<default>, Label ylabel=<default>, pair min=<default>, pair max=<default>, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>); +void axes(picture pic=<default>, Label xlabel=<default>, Label ylabel=<default>, bool extend=<default>, pair min=<default>, pair max=<default>, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>); string signedtrailingzero; ticklocate ticklocate(real a, real b, autoscaleT S=<default>, real tickmin=<default>, real tickmax=<default>, real time(real)=<default>, pair dir(real)=<default>); pair ticklabelshift(pair align, pen p=<default>); @@ -3038,7 +3040,7 @@ void Spline(flatguide3)(... void(flatguide3)[]); void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N=<default>, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>); void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks, real[] ticks=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>); void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>); -void axes3(picture pic=<default>, Label xlabel=<default>, Label ylabel=<default>, Label zlabel=<default>, triple min=<default>, triple max=<default>, pen p=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>); +void axes3(picture pic=<default>, Label xlabel=<default>, Label ylabel=<default>, Label zlabel=<default>, bool extend=<default>, triple min=<default>, triple max=<default>, pen p=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>); void label(picture pic, Label L, triple v, real x, align align, string format, pen p); void labelx(picture pic=<default>, Label L=<default>, triple v, align align=<default>, string format=<default>, pen p=<default>); void labely(picture pic=<default>, Label L=<default>, triple v, align align=<default>, string format=<default>, pen p=<default>); @@ -3149,11 +3151,11 @@ grid3 YXgrid(picture pic)(position pos=<default>); grid3 YXgrid(picture pic); grid3 ZXgrid(picture pic)(position pos=<default>); grid3 ZXgrid(picture pic); +triple XY(picture pic); grid3 XZgrid(picture pic)(position pos=<default>); grid3 XZgrid(picture pic); grid3 YZgrid(picture pic)(position pos=<default>); grid3 YZgrid(picture pic); -triple XY(picture pic); position middle; grid3(picture pic)[][] XYZgrid(position pos=<default>); grid3(picture pic)[][] XYZgrid; @@ -3358,9 +3360,9 @@ void add(string name, picture pic, pair lb=<default>, pair rt=<default>); frame tiling(string name, picture pic, pair lb=<default>, pair rt=<default>); picture tile(real Hx=<default>, real Hy=<default>, pen p=<default>, filltype filltype=<default>); void grestore(picture pic=<default>); +pen textpen; void gsave(picture pic=<default>); pair align; -pen textpen; path roundedpath(path A, real R, real S=<default>); problem operator init(); real infinity; @@ -3386,14 +3388,12 @@ void asyfilecode(bool center=<default>, string s, string options=<default>, stri bool itemstep; real itemskip; void remark(bool center=<default>, string s, pair align=<default>, pen p=<default>, real indent=<default>, bool minipage=<default>, real skip=<default>, filltype filltype=<default>, bool step=<default>); -int page; void usersetting(); bool landscape; real codeskip; +int page; void newslide(bool stepping=<default>); -void nextpage(pen p=<default>); pen itempen; -void filecode(bool center=<default>, string s, pen p=<default>, real indent=<default>, real skip=<default>, filltype filltype=<default>); bool reverse; void reversevideo(); void vbox(string s, pen p=<default>); @@ -3405,6 +3405,7 @@ real pagewidth; picture background; void background(); pen backgroundcolor; +void nextpage(pen p=<default>); void normalvideo(); void title(string s, pair position=<default>, pair align=<default>, pen p=<default>, bool newslide=<default>); pen titlepen; @@ -3415,6 +3416,7 @@ pen titlepagepen; void titlepage(string title, string author, string institution=<default>, string date=<default>, string url=<default>, bool newslide=<default>); pair titlepageposition; pen codepen; +void filecode(bool center=<default>, string s, pen p=<default>, real indent=<default>, real skip=<default>, filltype filltype=<default>); void erasestep(int erasenode); bool checkposition(); void setpens(pen red=<default>, pen blue=<default>, pen steppen=<default>); @@ -3423,7 +3425,6 @@ transform tinv; pair urlskip; void numberpage(pen p=<default>); pen urlpen; -void item(string s, pen p=<default>, bool step=<default>); int[] firstnode; bool firststep; string asywrite(string s, string preamble=<default>); @@ -3433,17 +3434,16 @@ string newbulletcolor; pen datepen; void incrementposition(pair z); pen institutionpen; -string cropcode(string s); +void item(string s, pen p=<default>, bool step=<default>); void skip(real n=<default>); bool stepping; real pagemargin; pen steppagenumberpen; -bool allowstepping; -pair currentposition; bool empty(); void currentexitfunction(); void step(); string[] codefile; +string cropcode(string s); void outline(string s=<default>, pair position=<default>, pair align=<default>, pen p=<default>); void center(string s, pen p=<default>); void equation(string s, pen p=<default>); @@ -3454,6 +3454,8 @@ void figure(string s, string options=<default>, string caption=<default>, pair a real figureborder; pen figuremattpen; string bullet; +bool allowstepping; +pair currentposition; int preamblenodes; string bulletcolor(string color); real minipagewidth; @@ -3483,8 +3485,8 @@ int[][] frequency(real[] x, real[] y, pair a, pair b, int nx, int ny=<default>); int[][] frequency(pair[] z, pair a, pair b, int nx, int ny=<default>); real mean(real[] A); int bins(real[] data, int max=<default>); -real stdev(real[] A); path topbox(pair a, pair b); +real stdev(real[] A); path halfbox(pair a, pair b); real Gaussian(real x, real sigma); real Gaussian(real x); @@ -3505,22 +3507,23 @@ Relation r3; picture tableau(frame[] cards, bool number=<default>); pair min(pair[] z); Component bp; -Braid apply(Relation r, Braid b, int step, int place); Component phi; real gapfactor; +Braid apply(Relation r, Braid b, int step, int place); Component bm; -Component wye; Relation operator -(Relation r); Component operator init(); Braid operator init(); Relation operator init(); Syzygy operator init(); Relation r4b; +Component wye; real hwratio; Relation r4a; pair max(pair[] z); pen Orchid; pen Magenta; +pen Salmon; pen BrickRed; pen CadetBlue; pen CarnationPink; @@ -3528,26 +3531,23 @@ pen SpringGreen; pen MidnightBlue; pen OliveGreen; pen Apricot; -pen Aquamarine; pen Cyan; -pen Lavender; pen Red; pen RawSienna; pen Mahogany; pen Gray; +pen Aquamarine; pen Plum; pen BlueGreen; pen Cerulean; pen Blue; +pen Lavender; pen BlueViolet; pen RedOrange; pen Goldenrod; pen ForestGreen; pen BurntOrange; pen Tan; -pen YellowOrange; -pen Maroon; -pen YellowGreen; pen Brown; pen RubineRed; pen TealBlue; @@ -3557,31 +3557,33 @@ pen Bittersweet; pen Orange; pen OrangeRed; pen Fuchsia; +pen YellowOrange; +pen Maroon; pen Peach; -pen Sepia; +pen YellowGreen; pen PineGreen; pen Dandelion; pen Black; -pen VioletRed; pen NavyBlue; -pen Violet; pen Rhodamine; pen ProcessBlue; +pen Sepia; pen LimeGreen; -pen Thistle; pen Green; pen GreenYellow; -pen DarkOrchid; +pen VioletRed; +pen Violet; pen Emerald; pen Mulberry; pen RedViolet; +pen Thistle; pen SkyBlue; pen SeaGreen; -pen WildStrawberry; pen Periwinkle; +pen DarkOrchid; pen Yellow; +pen WildStrawberry; pen JungleGreen; -pen Salmon; pen CornflowerBlue; pen RoyalBlue; pen Melon; @@ -3616,20 +3618,19 @@ pen Beige; pen SlateBlue; pen SlateGray; pen Magenta; -pen SteelBlue; +pen Salmon; pen CadetBlue; pen DeepPink; +pen LavenderBlush; pen SpringGreen; +pen Wheat; pen MidnightBlue; pen Olive; pen OliveDrab; -pen LemonChiffon; -pen Aquamarine; pen Chocolate; +pen SteelBlue; pen Cyan; pen Gainsboro; -pen Lavender; -pen Aqua; pen Ivory; pen PapayaWhip; pen Red; @@ -3644,22 +3645,24 @@ pen MediumSeaGreen; pen MediumSlateBlue; pen MediumAquamarine; pen MediumSpringGreen; +pen LemonChiffon; pen MediumTurquoise; pen MediumVioletRed; +pen Aquamarine; pen Plum; pen Blue; pen Gold; pen Sienna; +pen Lavender; pen BlueViolet; pen Goldenrod; +pen Aqua; pen ForestGreen; pen Chartreuse; pen NavajoWhite; pen Tan; pen DarkMagenta; -pen Maroon; pen AntiqueWhite; -pen YellowGreen; pen PaleTurquoise; pen IndianRed; pen Crimson; @@ -3674,51 +3677,51 @@ pen White; pen Purple; pen WhiteSmoke; pen DimGray; -pen DarkOliveGreen; -pen DarkOrange; pen Orange; pen OrangeRed; pen Fuchsia; +pen Maroon; pen PeachPuff; +pen YellowGreen; pen Honeydew; pen Bisque; pen RosyBrown; -pen Silver; pen Black; pen Khaki; pen FireBrick; -pen Violet; pen Snow; -pen SandyBrown; +pen DarkOliveGreen; +pen DarkOrange; pen LimeGreen; pen Lime; -pen Thistle; -pen DeepSkyBlue; +pen Silver; pen OldLace; pen Green; pen GreenYellow; +pen Violet; pen DarkCyan; pen FloralWhite; pen DarkRed; -pen DarkOrchid; -pen Cornsilk; +pen SandyBrown; pen BlanchedAlmond; pen PowderBlue; +pen Thistle; pen DarkGray; pen DarkGreen; pen DarkGoldenrod; pen SkyBlue; pen SeaGreen; pen DarkViolet; +pen DeepSkyBlue; pen Teal; pen AliceBlue; pen HotPink; -pen Seashell; +pen DarkOrchid; pen DodgerBlue; pen SaddleBrown; pen Tomato; pen DarkKhaki; -pen GhostWhite; +pen Cornsilk; pen LightBlue; pen LightCoral; pen LightCyan; @@ -3736,18 +3739,17 @@ pen Navy; pen LightSkyBlue; pen LightSlateGray; pen PaleVioletRed; -pen Salmon; pen LightSteelBlue; pen LightYellow; pen CornflowerBlue; +pen Seashell; pen rgbint(int r, int g, int b); pen Coral; pen MistyRose; -pen LavenderBlush; pen DarkSalmon; -pen Wheat; pen DarkSeaGreen; pen RoyalBlue; pen DarkSlateBlue; pen DarkSlateGray; pen Turquoise; +pen GhostWhite; |