diff options
author | Karl Berry <karl@freefriends.org> | 2009-04-20 00:11:54 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-04-20 00:11:54 +0000 |
commit | 66177f74989fac44bc5003990547ae9fcb5e8b00 (patch) | |
tree | 6b7378caf0dfd78309958f2246b7c319478abe16 /Master/texmf-dist/tex/latex/tablor/tablor-xetex.sty | |
parent | b3594201954d5e5c7b4894579aeddaa5c0112c1c (diff) |
tablor update (19apr09)
git-svn-id: svn://tug.org/texlive/trunk@12753 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tablor/tablor-xetex.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/tablor/tablor-xetex.sty | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/latex/tablor/tablor-xetex.sty b/Master/texmf-dist/tex/latex/tablor/tablor-xetex.sty index f836d5061d1..58c3d1df703 100644 --- a/Master/texmf-dist/tex/latex/tablor/tablor-xetex.sty +++ b/Master/texmf-dist/tex/latex/tablor/tablor-xetex.sty @@ -1,5 +1,5 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{tablor-xetex}[17/03/2009 v4.04-b la machine a creer des +\ProvidesPackage{tablor-xetex}[19/04/2009 v4.04-d la machine a creer des tableaux de signes et variations compatible xetex] % \copyleft Connan le Barbare (aka Guillaume Connan) \copyright @@ -915,12 +915,16 @@ nz:=size(z); - -S:=NULL; -if(L==[-infinity,+infinity]){j:=[seq(-100+k,k=0..200)]minus F;for k in j do S:=S,fsolve(fp(x),x,k/10,newton_solver);end_for} -else{if(L[0]==-infinity){j:=[seq(k,k=100..floor(L[1]))] minus F;for k in j do S:=S,fsolve(fp(x),x,k/10,newton_solver);end_for} -else{if(L[1]==+infinity){j:=[seq(k,k=floor(L[0])..100)] minus F;for k in j do S:=S,fsolve(fp(x),x,k/10,newton_solver);end_for;} -else{ j:=[seq(k,k=floor(z[0])..floor(z[nz-1]))] minus F;for k in j do S:=S,fsolve(fp(x),x,k/10,newton_solver);end_for; }}}; +S:=op(fsolve(fp(x),x)); +if(L==[-infinity,+infinity]){j:=[seq(-100+k,k=0..200)]minus F; + for k in j do for(m:=-5;m<=5;m++){S:=S,fsolve(fp(x),x,k+m*0.1,newton_solver)};end_for} +else{if(L[0]==-infinity){j:=[seq(k,k=-100..floor(L[1]))] minus F; + for k in j do for(m:=-5;m<=5;m++){ S:=S,fsolve(fp(x),x,k+m*0.1,newton_solver)};end_for} +else{if(L[1]==+infinity){j:=[seq(k,k=floor(L[0])..100)] minus F; + for k in j do for(m:=-5;m<=5;m++){ S:=S,fsolve(fp(x),x,k+m*0.1,newton_solver)};end_for;} +else{ j:=[seq(k,k=floor(z[0])..floor(z[nz-1]))] minus F; + for k in j do + for(m:=-5;m<=5;m++){S:=S,fsolve(fp(x),x,k+m*0.1,newton_solver)};end_for; }}}; @@ -1625,11 +1629,16 @@ nz:=size(z); -S:=NULL; -if(L==[-infinity,+infinity]){j:=[seq(-100+k,k=0..200)]minus F;for k in j do S:=S,resoudre_numerique(fp(x),x,k/10,newton_solver);end_for} -else{if(L[0]==-infinity){j:=[seq(k,k=100..floor(L[1]))] minus F;for k in j do S:=S,resoudre_numerique(fp(x),x,k/10,newton_solver);end_for} -else{if(L[1]==+infinity){j:=[seq(k,k=floor(L[0])..100)] minus F;for k in j do S:=S,resoudre_numerique(fp(x),x,k/10,newton_solver);end_for;} -else{ j:=[seq(k,k=floor(z[0])..floor(z[nz-1]))] minus F;for k in j do S:=S,resoudre_numerique(fp(x),x,k/10,newton_solver);end_for; }}}; +S:=op(fsolve(fp(x),x)); +if(L==[-infinity,+infinity]){j:=[seq(-100+k,k=0..200)]minus F; + for k in j do for(m:=-5;m<=5;m++){S:=S,fsolve(fp(x),x,k+m*0.1,newton_solver)};end_for} +else{if(L[0]==-infinity){j:=[seq(k,k=-100..floor(L[1]))] minus F; + for k in j do for(m:=-5;m<=5;m++){ S:=S,fsolve(fp(x),x,k+m*0.1,newton_solver)};end_for} +else{if(L[1]==+infinity){j:=[seq(k,k=floor(L[0])..100)] minus F; + for k in j do for(m:=-5;m<=5;m++){ S:=S,fsolve(fp(x),x,k+m*0.1,newton_solver)};end_for;} +else{ j:=[seq(k,k=floor(z[0])..floor(z[nz-1]))] minus F; + for k in j do + for(m:=-5;m<=5;m++){S:=S,fsolve(fp(x),x,k+m*0.1,newton_solver)};end_for; }}}; @@ -2314,7 +2323,7 @@ S:=concat(S,simplify(subst(SS[j],n_1=mm)));mm:=mm-1; } }else{ -S:=solve(L[k](x),x); +S:=concat(S,solve(L[k](x),x)); } @@ -2348,7 +2357,7 @@ SF:=concat(SF,simplify(subst(SSF[j],n_1=mm)));mm:=mm-1; } }else{ -SF:=solve(Fo[k](x),x); +SF:=concat(SF,solve(Fo[k](x),x)); } si size(SF)>0 alors pour j de 0 jusque size(SF)-1 faire @@ -2368,7 +2377,7 @@ if(nz>2){pour u de 1 jusque nz-2 faire fpour;} -Z:=concat(Z,F); +Z:=[Z,F]; Z:=sort([op(set[op(Z)])]); |