diff options
18 files changed, 196 insertions, 158 deletions
diff --git a/Build/source/utils/README b/Build/source/utils/README index e05c98062d7..b1957b8a0f3 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.12 - checked 19jun11 +asymptote 2.13 - 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 3f5566027ef..2ee11ce1ef3 100644 --- a/Build/source/utils/asymptote/ChangeLog +++ b/Build/source/utils/asymptote/ChangeLog @@ -1,4 +1,27 @@ ------------------------------------------------------------------------ +r5316 | jcbowman | 2011-06-19 07:40:51 -0600 (Sun, 19 Jun 2011) | 2 lines +Changed paths: + M /trunk/asymptote/configure.ac + M /trunk/asymptote/prc/PRCdouble.cc + M /trunk/asymptote/prc/PRCdouble.h + +Autodetect memrchr. + +------------------------------------------------------------------------ +r5315 | jcbowman | 2011-06-19 07:31:50 -0600 (Sun, 19 Jun 2011) | 2 lines +Changed paths: + M /trunk/asymptote/Makefile.in + +Make install-prebuilt also install asy-keywords.el. + +------------------------------------------------------------------------ +r5314 | jcbowman | 2011-06-18 20:03:42 -0600 (Sat, 18 Jun 2011) | 1 line +Changed paths: + M /trunk/asymptote/asymptote.spec + M /trunk/asymptote/configure.ac + +Increment version to 2.13svn. +------------------------------------------------------------------------ r5313 | jcbowman | 2011-06-18 17:29:56 -0600 (Sat, 18 Jun 2011) | 2 lines Changed paths: M /trunk/asymptote/picture.cc diff --git a/Build/source/utils/asymptote/Makefile.in b/Build/source/utils/asymptote/Makefile.in index b57dfc988d7..9e323a5345b 100644 --- a/Build/source/utils/asymptote/Makefile.in +++ b/Build/source/utils/asymptote/Makefile.in @@ -184,8 +184,7 @@ asy-keywords.el: asy grep -v three_\* | grep -v featpost3D | xargs $(ASY) -l >> asy.list perl ./asy-list.pl asy.list @VERSION@ -install: asy-keywords.el install-man install-texhash - ${INSTALL} -p -m 644 asy-keywords.el $(asydir) +install: install-texhash install-man install-all: install install-html @@ -194,13 +193,14 @@ install-texhash: install-asy texhash; \ fi -install-asy: asy sty +install-asy: asy sty asy-keywords.el ${INSTALL} -d $(bindir) $(asydir) $(GUIdir) $(exampledir) \ $(animationsdir) -${INSTALL} -d $(latexdir) -${INSTALL} -d $(contextdir) ${INSTALL} -p -m 755 $(NAME) $(bindir) - ${INSTALL} -p -m 644 base/*.asy $(addprefix base/,$(EXTRA)) $(asydir) + ${INSTALL} -p -m 644 base/*.asy $(addprefix base/,$(EXTRA)) \ + asy-keywords.el $(asydir) ${INSTALL} -p -m 755 GUI/*.py $(GUIdir) ln -sf @datadir@/asymptote/GUI/xasy.py $(bindir)/$(XNAME) ${INSTALL} -p -m 644 examples/*.asy $(addprefix examples/,$(EXEXTRA)) \ diff --git a/Build/source/utils/asymptote/ReleaseNotes b/Build/source/utils/asymptote/ReleaseNotes index feb5969956e..ebaad6556e1 100644 --- a/Build/source/utils/asymptote/ReleaseNotes +++ b/Build/source/utils/asymptote/ReleaseNotes @@ -1,3 +1,7 @@ +Release Notes for Version 2.13 + +Compilation and installation issues were addressed. + Release Notes for Version 2.12 Minor compilation issues were addressed. diff --git a/Build/source/utils/asymptote/asy-keywords.el b/Build/source/utils/asymptote/asy-keywords.el index ac4d86b3799..d004bc7e9b3 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.12") +(defvar asy-keywords-version "2.13") (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 dd7fde3e287..818affd5e9a 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); -real min(... real[] a); +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); -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(Legend[] a, Legend key, bool less(Legend, Legend)); +int search(object[] a, object key, bool less(object, object)); +int search(coord[] a, coord key, bool less(coord, coord)); 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(marker[] a, marker key, bool less(marker, marker)); +int search(picture[] a, picture key, bool less(picture, picture)); +int search(Legend[] a, Legend key, bool less(Legend, Legend)); int search(string[] a, string key, bool less(string, string)); int search(path[] a, path key, bool less(path, path)); -int search(object[] a, object key, bool less(object, object)); +int search(Label[] a, Label key, bool less(Label, Label)); 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); -real max(real M, scaling s, coord[] c); -pair max(picture pic, bool user=<default>); int max(... int[] a); +pair max(picture pic, bool user=<default>); +real max(real M, scaling s, coord[] c); 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); -picture[] copy(picture[] a); pen[] copy(pen[] a); +picture[] copy(picture[] a); triple[] copy(triple[] a); int[] copy(int[] a); string[][] copy(string[][] a); frame[] copy(frame[] a); -Label[] copy(Label[] a); +coord[] copy(coord[] a); real[] copy(real[] a); +Label[] copy(Label[] 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); -Label[] map(Label f(Label), Label[] a); -Legend[] map(Legend f(Legend), Legend[] a); +coord[] map(coord f(coord), coord[] a); +coord[] map(coord f(coord), coord[] a); pair[] map(pair f(pair), pair[] a); -picture[] map(picture f(picture), picture[] a); +object[] map(object f(object), object[] 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); -coord[] map(coord f(coord), coord[] a); -object[] map(object f(object), object[] a); +Label[] map(Label f(Label), Label[] a); bool[] map(bool f(bool), bool[] a); path[] map(path f(path), path[] a); -marker[] map(marker f(marker), marker[] a); +Legend[] map(Legend f(Legend), Legend[] 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); -Label[] sequence(Label f(int), int n); +picture[] sequence(picture f(int), int n); +marker[] sequence(marker f(int), int n); real[] sequence(real f(int), int n); int[] sequence(int n, int m); -object[] sequence(object f(int), int n); -Legend[] sequence(Legend f(int), int n); +coord[] sequence(coord f(int), int n); +Label[] sequence(Label 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 pic=<default>, Label L); 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, 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>); -Label[] array(int n, Label value, int depth=<default>); +picture[] array(int n, picture value, int depth=<default>); +marker[] array(int n, marker value, int depth=<default>); real[][] array(int n, real[] value, int depth=<default>); real[] array(int n, real value, int depth=<default>); -object[] array(int n, object value, int depth=<default>); -Legend[] array(int n, Legend value, int depth=<default>); +coord[] array(int n, coord value, int depth=<default>); +Label[] array(int n, Label 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(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))); +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>); 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>, align align, void suffix(file)=<default>); +void write(file file=<default>, Label L, 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(file file=<default>, Label L, void suffix(file)=<default>); +void write(pairOrTriple a); void save()(); marginT EndPenMargin(path, pen); pair NNE; @@ -929,21 +929,21 @@ real[] concat(... real[][]); marker[] concat(... marker[][]); pair[] concat(... pair[][]); object[] concat(... object[][]); -pen[] concat(... pen[][]); Label[] concat(... Label[][]); +pen[] concat(... pen[][]); +coord[] concat(... coord[][]); path[] concat(... path[][]); int[] concat(... int[][]); void()()[] concat(... void()()[][]); -string[] concat(... string[][]); picture[] concat(... picture[][]); -triple[] concat(... triple[][]); +string[] concat(... string[][]); Legend[] concat(... Legend[][]); -bool3[] concat(... bool3[][]); +triple[] concat(... triple[][]); coord[] concat(... coord[][]); +bool3[] concat(... bool3[][]); 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(scaling a, scaling b); -bool alias(pairOrTriple a, pairOrTriple b); -bool alias(coords3 a, coords3 b); -bool alias(marker[] a, marker[] b); +bool alias(Legend a, Legend b); +bool alias(light a, light 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(Label a, Label b); +bool alias(coord a, coord b); +bool alias(position a, position b); bool alias(int[] a, int[] b); bool alias(string[][] a, string[][] b); bool alias(hsv a, hsv b); -bool alias(freezableBounds a, freezableBounds b); -bool alias(picture a, picture b); -bool alias(scaleT a, scaleT 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(coord[] a, coord[] b); -bool alias(scaling a, scaling b); -bool alias(bounds a, bounds b); -bool alias(object a, object 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(coord a, coord b); -bool alias(autoscaleT a, autoscaleT b); -bool alias(object[] a, object[] 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(transformation a, transformation b); +bool alias(scaling a, scaling b); +bool alias(bounds a, bounds b); +bool alias(object a, object 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(Label[] a, Label[] b); -bool alias(path[] a, path[] b); +bool alias(pen[] a, pen[] b); bool alias(projection a, projection b); bool alias(indexedTransform a, indexedTransform b); bool alias(marker a, marker b); -bool alias(triple[] a, triple[] b); -bool alias(marginT a, marginT b); +bool alias(marker[] a, marker[] b); +bool alias(coord[] a, coord[] 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)); -pen[] sort(pen[] a, bool less(pen, pen)); Label[] sort(Label[] a, bool less(Label, Label)); +pen[] sort(pen[] a, bool less(pen, pen)); +coord[] sort(coord[] a, bool less(coord, coord)); 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); -path[] operator *(transform t, explicit path[] p); Label operator *(transform t, Label L); +path[] operator *(transform t, explicit path[] p); pair[] operator *(transform t, pair[] z); picture operator *(transform t, picture orig); side operator *(real x, side s); @@ -1356,24 +1356,21 @@ 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(); -coord operator init(); +bool3 operator init(); autoscaleT operator init(); -cputime operator init(); scaleT operator init(); -processtime operator init(); +framedTransformStack operator init(); +cputime operator init(); coords3 operator init(); -arrowhead operator init(); +processtime operator init(); light operator init(); -framedTransformStack operator init(); +arrowhead operator init(); projection operator init(); indexedTransform operator init(); marker operator init(); @@ -1381,13 +1378,16 @@ transformation operator init(); scaling operator init(); bounds operator init(); object operator init(); +coords2 operator init(); Label operator init(); +coord operator init(); position operator init(); -marginT operator init(); side operator init(); -filltype operator init(); +marginT operator init(); align operator init(); +filltype 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); -bool3 operator cast(bool b); frame operator cast(object F); +bool3 operator cast(bool b); 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); -guide[] operator cast(pair[] z); -path[] operator cast(guide[] g); +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); bool[] operator cast(bool3[] b); -pen operator cast(hsv hsv); -path[] operator cast(guide g); 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); 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); -bool3[] operator cast(bool[] b); Label operator cast(string s); +bool3[] operator cast(bool[] b); 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 ==(coord a, coord b); -bool operator ==(autoscaleT a, autoscaleT 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 ==(cputime a, cputime b); bool operator ==(bool a, bool3 b); -bool operator ==(transformation a, transformation 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 ==(align a, align 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 ==(align a, align 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 ==(marginT a, marginT b); +bool operator ==(bool3 a, bool 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 ==(framedTransformStack a, framedTransformStack b); -bool operator ==(bool3 a, bool b); +bool operator ==(arrowhead a, arrowhead b); +bool operator ==(coord a, coord b); bool operator ==(position a, position b); -bool operator ==(coords2 a, coords2 b); +bool operator ==(hsv a, hsv b); bool operator ==(scaling a, scaling b); bool operator ==(pairOrTriple a, pairOrTriple b); bool operator ==(coords3 a, coords3 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 ==(coords2 a, coords2 b); +bool operator ==(Label a, Label 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 !=(coord a, coord b); -bool operator !=(autoscaleT a, autoscaleT 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 !=(cputime a, cputime b); bool operator !=(bool a, bool3 b); -bool operator !=(transformation a, transformation 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 !=(align a, align 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 !=(align a, align 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 !=(marginT a, marginT b); +bool operator !=(bool3 a, bool 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 !=(framedTransformStack a, framedTransformStack b); -bool operator !=(bool3 a, bool b); +bool operator !=(arrowhead a, arrowhead b); +bool operator !=(coord a, coord b); bool operator !=(position a, position b); -bool operator !=(coords2 a, coords2 b); +bool operator !=(hsv a, hsv b); bool operator !=(scaling a, scaling b); bool operator !=(pairOrTriple a, pairOrTriple b); bool operator !=(coords3 a, coords3 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 !=(coords2 a, coords2 b); +bool operator !=(Label a, Label 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)); -object align(object F, pair align); frame align(frame f, pair align); +object align(object 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, 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>); diff --git a/Build/source/utils/asymptote/asymptote.spec b/Build/source/utils/asymptote/asymptote.spec index c817fcad32c..752681f4d22 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.12 +Version: 2.13 Release: 1%{?dist} Summary: Descriptive vector graphics language diff --git a/Build/source/utils/asymptote/config.h.in b/Build/source/utils/asymptote/config.h.in index 6c47fa1e18c..f5df1ca19cd 100644 --- a/Build/source/utils/asymptote/config.h.in +++ b/Build/source/utils/asymptote/config.h.in @@ -90,6 +90,9 @@ /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H +/* Define to 1 if you have the `memrchr' function. */ +#undef HAVE_MEMRCHR + /* Define to 1 if you have the `memset' function. */ #undef HAVE_MEMSET diff --git a/Build/source/utils/asymptote/configure b/Build/source/utils/asymptote/configure index e8272fc74a6..19569694ab1 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.12. +# Generated by GNU Autoconf 2.66 for Asymptote 2.13. # # 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.12' -PACKAGE_STRING='Asymptote 2.12' +PACKAGE_VERSION='2.13' +PACKAGE_STRING='Asymptote 2.13' 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.12 to adapt to many kinds of systems. +\`configure' configures Asymptote 2.13 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.12:";; + short | recursive ) echo "Configuration of Asymptote 2.13:";; 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.12 +Asymptote configure 2.13 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.12, which was +It was created by Asymptote $as_me 2.13, which was generated by GNU Autoconf 2.66. Invocation command line was $ $0 $@ @@ -7186,7 +7186,7 @@ $as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h fi -for ac_func in dup2 floor memset pow sqrt strchr tgamma +for ac_func in dup2 floor memset pow sqrt strchr tgamma memrchr do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -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.12, which was +This file was extended by Asymptote $as_me 2.13, 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.12 +Asymptote config.status 2.13 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 518107fc9bd..1dc70088baf 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.12],[http://sourceforge.net/projects/asymptote]) +AC_INIT([Asymptote],[2.13],[http://sourceforge.net/projects/asymptote]) VERSION=$PACKAGE_VERSION AC_SUBST(VERSION) @@ -358,7 +358,7 @@ AC_DEFUN([ac_FUNC_STRPTIME], [ # Checks for library functions. AC_FUNC_FORK -AC_CHECK_FUNCS([dup2 floor memset pow sqrt strchr tgamma]) +AC_CHECK_FUNCS([dup2 floor memset pow sqrt strchr tgamma memrchr]) AC_FUNC_STRFTIME ac_FUNC_STRPTIME AC_FUNC_ERROR_AT_LINE diff --git a/Build/source/utils/asymptote/doc/CAD.pdf b/Build/source/utils/asymptote/doc/CAD.pdf Binary files differindex 997b619bf8e..af88c9c9895 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 15dcadac710..379b772757c 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 - 18 Jun 2011 + 19 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 differindex e3b70f867b2..669f1660b2f 100755 --- a/Build/source/utils/asymptote/doc/TeXShopAndAsymptote.pdf +++ 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 differindex 7dd6d2780c9..c028d584dd5 100755 --- a/Build/source/utils/asymptote/doc/asy-latex.pdf +++ b/Build/source/utils/asymptote/doc/asy-latex.pdf diff --git a/Build/source/utils/asymptote/doc/asymptote.pdf b/Build/source/utils/asymptote/doc/asymptote.pdf Binary files differindex 89ad91f2698..03e6987937e 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 484466be8be..3bc2bee2a7f 100644 --- a/Build/source/utils/asymptote/doc/png/asymptote.info +++ b/Build/source/utils/asymptote/doc/png/asymptote.info @@ -1,7 +1,7 @@ This is asymptote.info, produced by makeinfo version 4.13 from ../asymptote.texi. -This file documents `Asymptote', version 2.12. +This file documents `Asymptote', version 2.13. `http://asymptote.sourceforge.net' @@ -23,7 +23,7 @@ File: asymptote.info, Node: Top, Next: Description, Up: (dir) Asymptote ********* -This file documents `Asymptote', version 2.12. +This file documents `Asymptote', version 2.13. `http://asymptote.sourceforge.net' diff --git a/Build/source/utils/asymptote/prc/PRCdouble.cc b/Build/source/utils/asymptote/prc/PRCdouble.cc index 9a1668ab007..69d4b02f160 100644 --- a/Build/source/utils/asymptote/prc/PRCdouble.cc +++ b/Build/source/utils/asymptote/prc/PRCdouble.cc @@ -23,6 +23,7 @@ int stCOFDOECompare(const void* pcofdoe1,const void* pcofdoe2) } #ifdef WORDS_BIGENDIAN +#ifndef HAVE_MEMRCHR void *memrchr(const void *buf,int c,size_t count) { unsigned char @@ -36,6 +37,7 @@ void *memrchr(const void *buf,int c,size_t count) return(NULL); } #endif +#endif sCodageOfFrequentDoubleOrExponent acofdoe[NUMBEROFELEMENTINACOFDOE] = { diff --git a/Build/source/utils/asymptote/prc/PRCdouble.h b/Build/source/utils/asymptote/prc/PRCdouble.h index f05b2c8e5ec..4a3a79dccc5 100644 --- a/Build/source/utils/asymptote/prc/PRCdouble.h +++ b/Build/source/utils/asymptote/prc/PRCdouble.h @@ -131,4 +131,10 @@ struct sCodageOfFrequentDoubleOrExponent* getcofdoe(unsigned,short); int stCOFDOECompare(const void*,const void*); +#ifdef WORDS_BIGENDIAN +#ifndef HAVE_MEMRCHR +void *memrchr(const void *,int,size_t); +#endif +#endif + #endif // __PRC_DOUBLE_H |