diff options
author | Karl Berry <karl@freefriends.org> | 2009-08-21 23:50:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-08-21 23:50:26 +0000 |
commit | 26818a7ca7d93f98a728445e3c48c6e22ac704b8 (patch) | |
tree | 38cca680bdee23679ecc128e3f939031edc35028 /Master/texmf-dist/tex/latex/tablor | |
parent | 60961ff6e9cd5bde2a7a55e7099330f618ef0b87 (diff) |
tablor 4.04-h (21aug09)
git-svn-id: svn://tug.org/texlive/trunk@14803 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tablor')
-rw-r--r-- | Master/texmf-dist/tex/latex/tablor/tablor-xetex.sty | 15 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/tablor/tablor.sty | 17 |
2 files changed, 17 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 074f4b1eac8..7f4c17d6592 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}[14/05/2009 v4.04-g la machine a creer des +\ProvidesPackage{tablor-xetex}[21/08/2009 v4.04-h la machine a creer des tableaux de signes et variations compatible xetex] % \copyleft Connan le Barbare (aka Guillaume Connan) \copyright @@ -2588,19 +2588,19 @@ S:=solve(f(x),x); -if(size(S)==0){ +if(size(S)==0 and size(F)==0){ l0:="val(btex $"+latex(D[0])+"$ etex);val(btex $"+latex(D[1])+"$ etex);"; li:=if(member(mini,F)!=0){"nonDefBarre;"}else{if(mini!=-infinity and f(mini)==0){" valBarre(btex 0 etex);"}else{" "}}+ -if(mini!=-infinity or maxi!=+infinity){if(f((mini+maxi)*0.5>0)){"plus;"}else{"moins;"}}else{if(f(0)>0){"plus;"}else{"moins;"}}; +if(mini!=-infinity or maxi!=+infinity){if(f((mini+maxi)*0.5>0)){"plus;"}else{"moins;"}}else{if(f(0.3145274774464545777744)>0){"plus;"}else{"moins;"}}; lf:=if(member(maxi,F)!=0){"nonDefBarre;"}else{if(maxi!=+infinity and f(maxi)==0){" valBarre(btex 0 etex);"}else{" "}}; -} -else{pour j de 0 jusque size(S)-1 faire +}else{ +if(size(S!=0)){pour j de 0 jusque size(S)-1 faire if(S[j]>mini and S[j]<maxi){Z:=Z,simplify(S[j])}; - fpour; + fpour} Z:=concat([Z],F); @@ -2641,7 +2641,8 @@ if(f((Z[r+1]-1))>0){"plus;"}else{"moins;"} lf:=if(f(Z[nz-2]+0.1)>0){"plus;"}else{"moins;"}+if(maxi!=+infinity and f(maxi)==0){"valBarre(btex 0 etex);"}else{if(member(maxi,F)==0){" "}else{"nonDefBarre;"} }; -}}; +} +}; diff --git a/Master/texmf-dist/tex/latex/tablor/tablor.sty b/Master/texmf-dist/tex/latex/tablor/tablor.sty index 1ebaddb78d2..f7a6eeaef78 100644 --- a/Master/texmf-dist/tex/latex/tablor/tablor.sty +++ b/Master/texmf-dist/tex/latex/tablor/tablor.sty @@ -1,5 +1,5 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{tablor}[14/05/2009 v4.04-g la machine a creer des tableaux de signes et variations] +\ProvidesPackage{tablor}[21/08/2009 v4.04-h la machine a creer des tableaux de signes et variations] % \copyleft Connan le Barbare (aka Guillaume Connan) \copyright % This work may be distributed and/or mofified under the conditions @@ -2522,6 +2522,7 @@ fclose(sortie); \begin{VerbatimOut}{XcasTSc.cxx} + TSc(g,D,F,trigo,nmr):={ f:=unapply(g,x); mini:=D[0]; maxi:=D[1];lm:=" "; @@ -2553,19 +2554,19 @@ S:=solve(f(x),x); -if(size(S)==0){ +if(size(S)==0 and size(F)==0){ l0:="val(btex $"+latex(D[0])+"$ etex);val(btex $"+latex(D[1])+"$ etex);"; li:=if(member(mini,F)!=0){"nonDefBarre;"}else{if(mini!=-infinity and f(mini)==0){" valBarre(btex 0 etex);"}else{" "}}+ -if(mini!=-infinity or maxi!=+infinity){if(f((mini+maxi)*0.5>0)){"plus;"}else{"moins;"}}else{if(f(0)>0){"plus;"}else{"moins;"}}; +if(mini!=-infinity or maxi!=+infinity){if(f((mini+maxi)*0.5>0)){"plus;"}else{"moins;"}}else{if(f(0.3145274774464545777744)>0){"plus;"}else{"moins;"}}; lf:=if(member(maxi,F)!=0){"nonDefBarre;"}else{if(maxi!=+infinity and f(maxi)==0){" valBarre(btex 0 etex);"}else{" "}}; -} -else{pour j de 0 jusque size(S)-1 faire +}else{ +if(size(S!=0)){pour j de 0 jusque size(S)-1 faire if(S[j]>mini and S[j]<maxi){Z:=Z,simplify(S[j])}; - fpour; + fpour} Z:=concat([Z],F); @@ -2606,7 +2607,8 @@ if(f((Z[r+1]-1))>0){"plus;"}else{"moins;"} lf:=if(f(Z[nz-2]+0.1)>0){"plus;"}else{"moins;"}+if(maxi!=+infinity and f(maxi)==0){"valBarre(btex 0 etex);"}else{if(member(maxi,F)==0){" "}else{"nonDefBarre;"} }; -}}; +} +}; @@ -2631,7 +2633,6 @@ fprint(sortie,Unquoted,MetaLfc); fclose(sortie); }:; - \end{VerbatimOut} |