tablor 4.04-h (21aug09)

git-svn-id: svn://tug.org/texlive/trunk@14803 c570f23f-e606-0410-a88d-b1316a301751
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
parent: 60961ff6e9cd5bde2a7a55e7099330f618ef0b87 (diff)
5 files changed, 162 insertions, 139 deletions
diff --git a/Master/texmf-dist/doc/latex/tablor/tablor.html b/Master/texmf-dist/doc/latex/tablor/tablor.html
index 74c0c505ef4..9ef0c59695b 100644
--- a/Master/texmf-dist/doc/latex/tablor/tablor.html
+++ b/Master/texmf-dist/doc/latex/tablor/tablor.html
@@ -87,7 +87,7 @@
   <body>
     <pre>
 <span class="font-latex-sedate">\NeedsTeXFormat</span>{LaTeX2e}[1995/12/01]
-<span class="font-latex-sedate">\ProvidesPackage</span>{tablor}[14/05/2009 v4.04-f la machine a creer des tableaux de signes et variations]
+<span class="font-latex-sedate">\ProvidesPackage</span>{<span class="flyspell-duplicate">tablor</span>}[21/08/2009 v4.04-h la machine a creer des tableaux de signes et variations]
 
 <span class="comment-delimiter">% </span><span class="font-latex-sedate"><span class="comment">\copyleft</span></span><span class="comment"> Connan le Barbare (aka Guillaume Connan) </span><span class="font-latex-sedate"><span class="comment">\copyright</span></span><span class="comment">
 </span><span class="comment-delimiter">% </span><span class="comment">This work may be distributed and/or mofified under the conditions
@@ -98,7 +98,7 @@
 </span><span class="comment-delimiter">% </span><span class="comment">tablor.pdf and tablor.</span><span class="comment"><span class="flyspell-incorrect">html</span></span><span class="comment">
 </span>
 
-<span class="comment-delimiter">%% </span><span class="comment">Cree 16 environnements :
+<span class="comment-delimiter">%% </span><span class="comment"><span class="flyspell-incorrect">Cree</span></span><span class="comment"> 16 environnements :
 </span><span class="comment-delimiter">%% </span><span class="comment">tableau de signes de 2 facteurs affines
 </span><span class="comment-delimiter">% </span><span class="font-latex-sedate"><span class="comment">\begin</span></span><span class="comment">{TSa}
 </span><span class="comment-delimiter">% </span><span class="comment">TSa(-2,3,-1,5,</span><span class="font-latex-sedate"><span class="comment">\tv</span></span><span class="comment">);
@@ -192,15 +192,15 @@
 <span class="font-latex-sedate">\RequirePackage</span>{filecontents}
 <span class="font-latex-sedate">\RequirePackage</span>{ifthen}
 <span class="font-latex-sedate">\RequirePackage</span>{fancyvrb}
-<span class="font-latex-sedate">\RequirePackage</span>{<span class="flyspell-duplicate">ifpdf</span>}
+<span class="font-latex-sedate">\RequirePackage</span>{ifpdf}
 
-<span class="font-latex-sedate">\fvset</span>{<span class="flyspell-incorrect">gobble</span>=0}
+<span class="font-latex-sedate">\fvset</span>{gobble=0}
 
-<span class="comment-delimiter">% </span><span class="comment">option xcas </span><span class="comment"><span class="flyspell-duplicate">present</span></span><span class="comment"> 
+<span class="comment-delimiter">% </span><span class="comment">option xcas present 
 </span>
 
 <span class="font-latex-sedate">\newboolean</span>{xcas}<span class="font-latex-sedate">\setboolean</span>{xcas}{false}
-<span class="font-latex-sedate">\DeclareOption</span>{xcas}{<span class="font-latex-sedate">\setboolean</span>{xcas}{<span class="flyspell-incorrect">true</span>}}
+<span class="font-latex-sedate">\DeclareOption</span>{xcas}{<span class="font-latex-sedate">\setboolean</span>{xcas}{true}}
 
 
 <span class="font-latex-sedate">\ProcessOptions</span><span class="font-latex-sedate">\relax</span>
@@ -209,22 +209,22 @@
 
 
 <span class="comment-delimiter">%% </span><span class="comment">Initialisation du choix d'OS
-</span><span class="font-latex-sedate">\newboolean</span>{windows}<span class="font-latex-sedate">\setboolean</span>{windows}{<span class="flyspell-duplicate">false</span>}
+</span><span class="font-latex-sedate">\newboolean</span>{windows}<span class="font-latex-sedate">\setboolean</span>{windows}{false}
 
 
 
 <span class="comment-delimiter">%% </span><span class="comment">on configure  tablor  dans un fichier exterieur pour la plateforme
 </span><span class="comment-delimiter">%% </span><span class="comment">et l'editeur
 </span>
-<span class="font-latex-sedate">\IfFileExists</span>{tablor.cfg}{<span class="font-latex-sedate"><span class="keyword">\input</span></span><span class="constant">{tablor.cfg}</span>}<span class="comment">%</span><span class="font-latex-sedate"><span class="comment">\typeout</span></span><span class="comment">{pas de fichier tablor.</span><span class="comment"><span class="flyspell-duplicate">cfg</span></span><span class="comment">}}
+<span class="font-latex-sedate">\IfFileExists</span>{tablor.cfg}{<span class="font-latex-sedate"><span class="keyword">\input</span></span><span class="constant">{tablor.cfg}</span>}<span class="comment">%</span><span class="font-latex-sedate"><span class="comment">\typeout</span></span><span class="comment">{pas de fichier tablor.cfg}}
 </span>
 
 <span class="comment-delimiter">%% </span><span class="comment">Definit des commandes disque selon l'OS utilise
 </span><span class="font-latex-sedate">\ifthenelse</span>{<span class="font-latex-sedate">\boolean</span>{windows}}<span class="comment">%
 </span>    {<span class="font-latex-sedate"><span class="keyword">\newcommand</span></span><span class="function-name">{</span><span class="font-latex-sedate"><span class="function-name">\rem</span></span><span class="function-name">}</span>{DEL } <span class="font-latex-sedate"><span class="keyword">\newcommand</span></span><span class="function-name">{</span><span class="font-latex-sedate"><span class="function-name">\cat</span></span><span class="function-name">}</span>{TYPE }
-      <span class="font-latex-sedate"><span class="keyword">\newcommand</span></span><span class="function-name">{</span><span class="font-latex-sedate"><span class="function-name">\cp</span></span><span class="function-name">}</span>{<span class="flyspell-incorrect">COPY</span> }}<span class="comment">%
+      <span class="font-latex-sedate"><span class="keyword">\newcommand</span></span><span class="function-name">{</span><span class="font-latex-sedate"><span class="function-name">\cp</span></span><span class="function-name">}</span>{COPY }}<span class="comment">%
 </span>    {<span class="font-latex-sedate"><span class="keyword">\newcommand</span></span><span class="function-name">{</span><span class="font-latex-sedate"><span class="function-name">\rem</span></span><span class="function-name">}</span>{rm }<span class="font-latex-sedate"><span class="keyword">\newcommand</span></span><span class="function-name">{</span><span class="font-latex-sedate"><span class="function-name">\cat</span></span><span class="function-name">}</span>{cat }
-      <span class="font-latex-sedate"><span class="keyword">\newcommand</span></span><span class="function-name">{</span><span class="font-latex-sedate"><span class="function-name">\cp</span></span><span class="function-name">}</span>{<span class="flyspell-duplicate">cp</span> }}
+      <span class="font-latex-sedate"><span class="keyword">\newcommand</span></span><span class="function-name">{</span><span class="font-latex-sedate"><span class="function-name">\cp</span></span><span class="function-name">}</span>{cp }}
 
 
 
@@ -240,18 +240,18 @@
 
 <span class="comment-delimiter">%% </span><span class="comment">pour nettoyer les fichiers auxiliaires
 </span>
-<span class="font-latex-sedate">\AtEndDocument</span>{<span class="font-latex-sedate">\immediate</span><span class="font-latex-sedate">\write</span>18{<span class="font-latex-sedate">\rem</span> *.user XCas* Xcas* *.<span class="flyspell-incorrect">mpx</span>}
+<span class="font-latex-sedate">\AtEndDocument</span>{<span class="font-latex-sedate">\immediate</span><span class="font-latex-sedate">\write</span>18{<span class="font-latex-sedate">\rem</span> *.user XCas* Xcas* *.mpx}
                          }
 
 
 
 
-<span class="comment-delimiter">%% </span><span class="comment">Pour clore les fichiers </span><span class="comment"><span class="flyspell-duplicate">metapost</span></span><span class="comment"> 
+<span class="comment-delimiter">%% </span><span class="comment">Pour clore les fichiers metapost 
 </span>
 
   <span class="font-latex-sedate"><span class="keyword">\begin</span></span><span class="function-name">{VerbatimOut}</span>{queue.mp}
   
-  <span class="flyspell-duplicate">end</span>
+  end
 
   <span class="font-latex-sedate"><span class="keyword">\end</span></span><span class="function-name">{VerbatimOut}</span>
 
@@ -264,7 +264,7 @@
 
 
 <span class="font-latex-sedate"><span class="keyword">\newcommand</span></span><span class="function-name">{</span><span class="font-latex-sedate"><span class="function-name">\nettoyer</span></span><span class="function-name">}</span>[1][<span class="font-latex-sedate">\jobname</span>]<span class="comment">%
-</span>{<span class="font-latex-sedate">\immediate</span><span class="font-latex-sedate">\write</span>18{<span class="font-latex-sedate">\rem</span> #1.Tab.log  queue.mp enteteMP.cfg session.tex config.<span class="flyspell-duplicate">cxx</span>}
+</span>{<span class="font-latex-sedate">\immediate</span><span class="font-latex-sedate">\write</span>18{<span class="font-latex-sedate">\rem</span> #1.Tab.log  queue.mp enteteMP.cfg session.tex config.cxx}
 }
 
 
@@ -286,7 +286,7 @@
 
 
 <span class="comment-delimiter">%% </span><span class="comment">permet de donner un prefixe aux tableaux produits (</span><span class="font-latex-sedate"><span class="comment">\jobname</span></span><span class="comment"> par defaut)
-</span><span class="comment-delimiter">%% </span><span class="comment">effectue quelques </span><span class="comment"><span class="flyspell-incorrect">verifications</span></span><span class="comment"> :
+</span><span class="comment-delimiter">%% </span><span class="comment">effectue quelques verifications :
 </span>
 
 <span class="font-latex-sedate"><span class="keyword">\newcommand</span></span><span class="function-name">{</span><span class="font-latex-sedate"><span class="function-name">\initablor</span></span><span class="function-name">}</span>[1][<span class="font-latex-sedate">\jobname</span>]{<span class="comment">%
@@ -294,16 +294,16 @@
 </span><span class="font-latex-sedate"><span class="keyword">\setcounter</span></span><span class="variable-name">{TVn}{0}</span><span class="comment">%     Initialisation du compteur de tableaux.
 </span><span class="font-latex-sedate">\ifthenelse</span>{<span class="font-latex-sedate">\boolean</span>{xcas}}<span class="comment">%    Avec l'option XCas
 </span>{<span class="font-latex-sedate">\IfFileExists</span>{<span class="font-latex-sedate">\nomtravail</span>.Tab.mp}<span class="comment">%      Si Tableaux.mp est present...
-</span>        {<span class="font-latex-sedate">\immediate</span><span class="font-latex-sedate">\write</span>18{<span class="font-latex-sedate">\rem</span> <span class="font-latex-sedate">\nomtravail</span>.Tab.mp}}<span class="comment">%  le </span><span class="comment"><span class="flyspell-incorrect">detruire</span></span><span class="comment">
+</span>        {<span class="font-latex-sedate">\immediate</span><span class="font-latex-sedate">\write</span>18{<span class="font-latex-sedate">\rem</span> <span class="font-latex-sedate">\nomtravail</span>.Tab.mp}}<span class="comment">%  le detruire
 </span>        {}<span class="comment">%   
-</span> <span class="font-latex-sedate">\immediate</span><span class="font-latex-sedate">\write</span>18{<span class="font-latex-sedate">\cp</span>  enteteMP.cfg <span class="font-latex-sedate">\nomtravail</span>.Tab.mp}<span class="comment">% Reconstituer l'ent&#234;te de Tableaux.</span><span class="comment"><span class="flyspell-duplicate">mp</span></span><span class="comment">
+</span> <span class="font-latex-sedate">\immediate</span><span class="font-latex-sedate">\write</span>18{<span class="font-latex-sedate">\cp</span>  enteteMP.cfg <span class="font-latex-sedate">\nomtravail</span>.Tab.mp}<span class="comment">% Reconstituer l'ent&#234;te de Tableaux.mp
 </span>} 
 {<span class="font-latex-sedate">\IfFileExists</span>{<span class="font-latex-sedate">\nomtravail</span>.Tab.mp}<span class="comment">%      Sans l'option XCas, si
 </span>                                <span class="comment">%      Tableaux.mp existe
 </span>{<span class="font-latex-sedate">\immediate</span><span class="font-latex-sedate">\write</span>18{mpost -interaction=batchmode <span class="font-latex-sedate">\nomtravail</span>.Tab}}<span class="comment">% l'executer pour reconstituer les figures
 </span>{<span class="font-latex-sedate">\PackageWarning</span>{tablor}{Pas de source metapost pour creer les tableaux.}}<span class="comment">% sinon message d'erreur
 </span>                                <span class="comment">% (mais pas d'arret car les tableaux
-</span>                                <span class="comment">% peuvent &#234;tre </span><span class="comment"><span class="flyspell-incorrect">presents</span></span><span class="comment"> )
+</span>                                <span class="comment">% peuvent &#234;tre presents )
 </span>}}<span class="comment">%
 </span>
 
@@ -313,7 +313,7 @@
 <span class="font-latex-sedate">\makeatletter</span>
 <span class="font-latex-sedate"><span class="keyword">\newcommand</span></span><span class="function-name">{</span><span class="font-latex-sedate"><span class="function-name">\executGiacmp</span></span><span class="function-name">}</span>[1]{<span class="comment">%
 </span><span class="font-latex-sedate">\ifthenelse</span>{<span class="font-latex-sedate">\boolean</span>{windows}}<span class="comment">%
-</span>{<span class="font-latex-sedate">\immediate</span><span class="font-latex-sedate">\write</span>18{<span class="flyspell-duplicate">giac</span> #1 }}<span class="comment">%
+</span>{<span class="font-latex-sedate">\immediate</span><span class="font-latex-sedate">\write</span>18{giac #1 }}<span class="comment">%
 </span>{<span class="font-latex-sedate">\immediate</span><span class="font-latex-sedate">\write</span>18{giac  &lt;#1 }}}
 <span class="font-latex-sedate">\makeatother</span>
 
@@ -335,22 +335,22 @@
 </span>
 
 <span class="font-latex-sedate"><span class="keyword">\begin</span></span><span class="function-name">{VerbatimOut}</span>{XcasTV.cxx}
-<span class="flyspell-duplicate">TV</span>(L,F,nom,nomv,f,ftt,trigo,nmr):={
-<span class="flyspell-duplicate">nl</span>:=size(L);
+TV(L,F,nom,nomv,f,ftt,trigo,nmr):={
+nl:=size(L);
 f:=unapply(f,x);
-<span class="flyspell-duplicate">fp</span>:=function_diff(f);
+fp:=function_diff(f);
 Z:=concat(L,F);
 S:=[];
 
 
 if(trigo==t){
-<span class="flyspell-duplicate">all</span>_trig_solutions:=1;
+all_trig_solutions:=1;
 reset_solve_counter(-1,-1);
 SS:=solve(factor(simplify(fp(x))),x);
 ns:=size(SS);
 for(k:=0;k&lt;ns;k++){
 m:=0;
-<span class="flyspell-duplicate">while</span>(evalf(simplify(subst(SS[k],n_1=m)))&lt;=evalf(L[nl-1])){
+while(evalf(simplify(subst(SS[k],n_1=m)))&lt;=evalf(L[nl-1])){
 S:=concat(S,simplify(subst(SS[k],n_1=m)));m:=m+1;
 };m:=-1;
 while(evalf(subst(SS[k],n_1=m))&gt;=L[0]){
@@ -373,7 +373,7 @@ nz:=size(Z);
 
 
  tantque evalf(Z[0])==evalf(Z[1]) faire Z:=Z[1..nz-1];nz:=size(Z);
-     <span class="flyspell-duplicate">ftantque</span>;
+     ftantque;
 
 
 
@@ -385,7 +385,7 @@ nz:=size(Z);
                              kk:=(evalf(S[j])&gt;=evalf(L[0])) and (evalf(S[j])&lt;=evalf(L[nl-1]));
                           if(kk==1){Z:=append(Z,simplify(S[j]))};
                           fpour
-  <span class="flyspell-duplicate">fsi</span>;
+  fsi;
 
 
 Z:=sort([op(set[op(Z)])]);
@@ -398,11 +398,11 @@ pour m de 0 jusque nz-1 faire l0:=l0+"val(btex <span class="font-latex-math">$"+
        k0:= evalf(limit(f(x),x=Z[0],1))&gt; evalf(limit(f(x),x=Z[1],-1));
        kz:=evalf(limit(f(x),x=Z[nz-1],-1))&gt; evalf(limit(f(x),x=Z[nz-2],1));
                           
-<span class="flyspell-duplicate">lsi</span>:=lsic+nom+"'("+nomv+")}<span class="font-latex-math">$ etex);"+
-     if(Z[0]==-infinity){if(sign(evalf(fp(if(Z[1]==+infinity){0}else{Z[1]-10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)})))==1){"plus;"}else{"moins;"}}else{if(member(Z[0],F)==0){
+lsi:=lsic+nom+"'("+nomv+")}<span class="font-latex-math">$ etex);"+
+     if(Z[0]==-infinity){if(sign(evalf(fp(if(Z[1]==+infinity){0}else{Z[1]-10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)})))==1.0){"plus;"}else{"moins;"}}else{if(member(Z[0],F)==0){
                                                     if(fp(Z[0])==0){"valBarre(btex 0 etex);"}else{" "}+
-                                                    if(sign(fp(Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)))==1){"plus;"}else{"moins;"}}else{"nonDefBarre;"+
-                                                         if(sign(fp((Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5))))==1){"plus;"}else{"moins;"} }}
+                                                    if(evalf(sign(fp(Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5))))==1.0){"plus;"}else{"moins;"}}else{"nonDefBarre;"+
+                                                         if(evalf(sign(fp((Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)))))==1.0){"plus;"}else{"moins;"} }}
  
 if(nz&gt;2){ for(r:=1; r&lt;=nz-2;r++){      ksp:=evalf(fp(Z[r]+0.1))&gt;0;                     
                                                lsp:=lsp+if(member(Z[r],F)==0){"valBarre(btex 0 etex);"}else{"nonDefBarre;"}+
@@ -411,7 +411,7 @@ if(nz&gt;2){ for(r:=1; r&lt;=nz-2;r++){      ksp:=evalf(fp(Z[r]+0.1))&gt;0;
 
 lsf:=if(member(Z[nz-1],F)==0){""}else{"nonDefBarre;
 "}
-</span><span class="font-latex-math"><span class="flyspell-duplicate">lm</span></span><span class="font-latex-math">0:=limit(f(x),x=Z[0],1)==-infinity;
+lm0:=limit(f(x),x=Z[0],1)==-infinity;
      li:=lvic+nom+"}$</span> etex);"+
            if(member(Z[0],F)==0){"valPos(btex <span class="font-latex-math">$"+if(lm0==1){"-\\infty"}else{latex(simplify(limit(f(x),x=Z[0],1)))}+"$</span> etex,"}
              else{"nonDefBarre;limDroite(btex <span class="font-latex-math">$"+if(lm0==1){"-\\infty"}else{latex(simplify(limit(f(x),x=Z[0],1)))}+"$</span> etex,"}+                               
@@ -430,7 +430,7 @@ lsf:=if(member(Z[nz-1],F)==0){""}else{"nonDefBarre;
 "}}}
                                                    }; }
 
-lnz:=limit(f(x),x=Z[nz-1],-1)==-<span class="flyspell-duplicate">infinity</span>;
+lnz:=limit(f(x),x=Z[nz-1],-1)==-infinity;
                           
 
 
@@ -438,24 +438,24 @@ lf:=if(member(Z[nz-1],F)==0){"valPos(btex <span class="font-latex-math">$"+
            if(lnz==1){"-\\infty"}else{latex(simplify(limit(f(x),x=Z[nz-1],-1)))}+"$</span> etex,"+
              if(kz==1){"1);"}else{"0);"}}
     else{"limGauche(btex <span class="font-latex-math">$"+
-         if(lnz==1){"-\\infty"}else{latex(simplify(limit(f(x),x=Z[nz-1],-1)))}+"$</span> <span class="flyspell-duplicate">etex</span>,"+ 
+         if(lnz==1){"-\\infty"}else{latex(simplify(limit(f(x),x=Z[nz-1],-1)))}+"$</span> etex,"+ 
            if(kz==1){"1);nonDefBarre;"}else{"0);nonDefBarre;"}};    
     
 
 
 
 
-<span class="flyspell-duplicate">MetaLfc</span>:=if(ftt==2){if(nz&gt;2){"
+MetaLfc:=if(ftt==2){if(nz&gt;2){"
 
 beginTableau("+nmr+")"+
         l0+lsi+lsp+lsf+"
-<span class="flyspell-duplicate">endTableau</span>;
+endTableau;
 
 ";}else{
 intro+"beginTableau("+nmr+")"+
         l0+
 lsi+lsf+"
-<span class="flyspell-duplicate">endTableau</span>;
+endTableau;
 
 ";
 }
@@ -463,7 +463,7 @@ lsi+lsf+"
         l0+
 li+
 lp+
-<span class="flyspell-duplicate">lf</span>
+lf
 +"
 endTableau;
 
@@ -480,7 +480,7 @@ if(nz&gt;2){"beginTableau("+nmr+")"+
 lsi+lsp+lsf+
 li+
 lp+
-<span class="flyspell-duplicate">lf</span>
+lf
 +"
 endTableau;
 
@@ -490,13 +490,13 @@ lsi+lsf+
 li+
 lf
 +"
-<span class="flyspell-duplicate">endTableau</span>;
+endTableau;
 
 ";}
 }}
 
 
-sortie:=<span class="flyspell-duplicate">fopen</span>("XCasmpfc.mp");
+sortie:=fopen("XCasmpfc.mp");
 fprint(sortie,Unquoted,MetaLfc);
 fclose(sortie);
 
@@ -588,10 +588,10 @@ pour m de 0 jusque nz-1 faire l0:=l0+"val(btex <span class="font-latex-math">$"+
        kz:=evalf(limit(f(x),x=Z[nz-1],-1))&gt; evalf(limit(f(x),x=Z[nz-2],1));
                           
 lsi:=lsic+nom+"'("+nomv+")}<span class="font-latex-math">$ etex);"+
-     if(Z[0]==-infinity){if(sign(evalf(fp(if(Z[1]==+infinity){0}else{Z[1]-10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)})))==1){"plus;"}else{"moins;"}}else{if(member(Z[0],FP)==0){
+     if(Z[0]==-infinity){if(sign(evalf(fp(if(Z[1]==+infinity){0}else{Z[1]-10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)})))==1.0){"plus;"}else{"moins;"}}else{if(member(Z[0],FP)==0){
                                                     if(fp(Z[0])==0){"valBarre(btex 0 etex);"}else{" "}+
-                                                    if(sign(fp(Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)))==1){"plus;"}else{"moins;"}}else{"nonDefBarre;"+
-                                                         if(sign(fp((Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5))))==1){"plus;"}else{"moins;"} }}
+                                                    if(evalf(sign(fp(Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5))))==1.0){"plus;"}else{"moins;"}}else{"nonDefBarre;"+
+                                                         if(evalf(sign(fp((Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)))))==1.0){"plus;"}else{"moins;"} }}
  
 if(nz&gt;2){ for(r:=1; r&lt;=nz-2;r++){      ksp:=evalf(fp(Z[r]+0.1))&gt;0;                     
                                                lsp:=lsp+if(member(Z[r],FP)==0){"valBarre(btex 0 etex);"}else{"nonDefBarre;"}+
@@ -685,7 +685,7 @@ endTableau;
 }}
 
 
-sortie:=<span class="flyspell-duplicate">fopen</span>("XCasmpfc.mp");
+sortie:=fopen("XCasmpfc.mp");
 fprint(sortie,Unquoted,MetaLfc);
 fclose(sortie);
 
@@ -793,10 +793,10 @@ pour m de 0 jusque nz-1 faire l0:=l0+"val(btex <span class="font-latex-math">$"+
        kz:=evalf(limit(f(x),x=Z[nz-1],-1))&gt; evalf(limit(f(x),x=Z[nz-2],1));
                           
 lsi:=lsic+nom+"'("+nomv+")}<span class="font-latex-math">$ etex);"+
-if(member(Z[0],IMIN)!=0){if((member(Z[0],F)==0) and (fp(Z[0])!=undef)){"debutNonDef;"}else{"debutNonDefStrict;"}}else{if(Z[0]==-infinity){if(sign(evalf(fp(if(Z[1]==+infinity){0}else{Z[1]-10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)})))==1){"plus;"}else{"moins;"}}else{if(member(Z[0],F)==0){
+if(member(Z[0],IMIN)!=0){if((member(Z[0],F)==0) and (fp(Z[0])!=undef)){"debutNonDef;"}else{"debutNonDefStrict;"}}else{if(Z[0]==-infinity){if(sign(evalf(fp(if(Z[1]==+infinity){0}else{Z[1]-10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)})))==1.0){"plus;"}else{"moins;"}}else{if(member(Z[0],F)==0){
                                                     if(fp(Z[0])==0){"valBarre(btex 0 etex);"}else{" "}+
-                                                    if(sign(fp(Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)))==1){"plus;"}else{"moins;"}}else{"nonDefBarre;"+
-                                                         if(sign(fp((Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5))))==1){"plus;"}else{"moins;"} }}}
+                                                    if(evalf(sign(fp(Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5))))==1.0){"plus;"}else{"moins;"}}else{"nonDefBarre;"+
+                                                         if(evalf(sign(fp((Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)))))==1.0){"plus;"}else{"moins;"} }}}
 
 
 
@@ -929,7 +929,7 @@ endTableau;
 }}
 
 
-sortie:=<span class="flyspell-duplicate">fopen</span>("XCasmpfc.mp");
+sortie:=fopen("XCasmpfc.mp");
 fprint(sortie,Unquoted,MetaLfc);
 fclose(sortie);
 
@@ -969,7 +969,7 @@ nz:=size(z);
 
 
 
-S:=op(<span class="flyspell-duplicate">fsolve</span>(fp(x),x));
+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&lt;=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;
@@ -1023,10 +1023,10 @@ pour m de 0 jusque nz-1 faire l0:=l0+"val(btex <span class="font-latex-math">$"+
        kz:=evalf(limit(f(x),x=Z[nz-1],-1))&gt; evalf(limit(f(x),x=Z[nz-2],1));
                           
 lsi:=lsic+nom+"'("+nomv+")}<span class="font-latex-math">$ etex);"+
-     if(Z[0]==-infinity){if(sign(evalf(fp(if(Z[1]==+infinity){0}else{Z[1]-10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)})))==1){"plus;"}else{"moins;"}}else{if(member(Z[0],F)==0){
+     if(Z[0]==-infinity){if(sign(evalf(fp(if(Z[1]==+infinity){0}else{Z[1]-10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)})))==1.0){"plus;"}else{"moins;"}}else{if(member(Z[0],F)==0){
                                                     if(fp(Z[0])==0){"valBarre(btex 0 etex);"}else{" "}+
-                                                    if(sign(fp(Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)))==1){"plus;"}else{"moins;"}}else{"nonDefBarre;"+
-                                                         if(sign(fp((Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5))))==1){"plus;"}else{"moins;"} }}
+                                                    if(evalf(sign(fp(Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5))))==1.0){"plus;"}else{"moins;"}}else{"nonDefBarre;"+
+                                                         if(evalf(sign(fp((Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)))))==1.0){"plus;"}else{"moins;"} }}
  
 if(nz&gt;2){ for(r:=1; r&lt;=nz-2;r++){      ksp:=evalf(fp(Z[r]+0.01))&gt;0;                     
                                                lsp:=lsp+if(member(Z[r],F)==0){"valBarre(btex 0 etex);"}else{"nonDefBarre;"}+
@@ -1228,10 +1228,13 @@ TestS:=(evalf(sign(LL[0]-ao))==evalf(sign(LL[1]-ao))) or (evalf(sign(LL[0]-ao))=
        kz:=evalf(limit(f(x),x=Z[nz-1],-1))&gt; evalf(limit(f(x),x=Z[nz-2],1));
                           
 lsi:=lsic+nom+"'("+nomv+")}<span class="font-latex-math">$ etex);"+
-     if(Z[0]==-infinity){if(evalf(sign(fp(if(Z[1]==+infinity){0}else{Z[1]-10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)})))==1){"plus;"}else{"moins;"}}else{if(member(Z[0],F)==0){
+     if(Z[0]==-infinity){if(evalf(sign(fp(if(Z[1]==+infinity){0}else{Z[1]-10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)})))==1.0){"plus;"}else{"moins;"}}else{if(member(Z[0],F)==0){
                                                     if(fp(Z[0])==0){"valBarre(btex 0 etex);"}else{" "}+
-                                                    if(sign(fp((Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-3))))==1){"plus;"}else{"moins;"}}else{"nonDefBarre;"+
-                                                         if(sign(fp(10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-3)+Z[0]))==1){"plus;"}else{"moins;"} }}+if(TestS==0){"valBarre(btex$</span>  <span class="font-latex-math">$ etex);"+ if(sign(fp(10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-3)+Z[0]))==1){"plus;"}else{"moins;"}}else{" "}; 
+                                                    if(evalf(sign(fp((Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-3)))))==1.0){"plus;"}else{"moins;"}}else{"nonDefBarre;"+
+                                                         if(evalf(sign(fp(10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-3)+Z[0])))==1.0){"plus;"}else{"moins;"} }}+if(TestS==0){"valBarre(btex$</span>
+                                                       <span class="font-latex-math">$ etex);"+ 
+if(evalf(sign(fp(10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-3)+ifte(Z[0]==-infinity,ifte(Z[1]==+infinity,ifte(member(0,F)==0,0,0.01),ifte(member(Z[1]-1,F)==0,Z[1]-1,Z[1]-1.1)),Z[0]))))==1.0){"plus;"}else{"moins;"}}else{" "}; 
+
 
 
 
@@ -1377,7 +1380,7 @@ endTableau;
 
 
 
-sortie:=<span class="flyspell-duplicate">fopen</span>("XCasmpfc.mp");
+sortie:=fopen("XCasmpfc.mp");
 fprint(sortie,Unquoted,MetaLfc);
 fclose(sortie);
 
@@ -1502,7 +1505,9 @@ lsi:=lsic+nom+"'("+nomv+")}<span class="font-latex-math">$ etex);"+
      if(Z[0]==-infinity){if(evalf(sign(fp(if(Z[1]==+infinity){0}else{Z[1]-10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)})))==1){"plus;"}else{"moins;"}}else{if(member(Z[0],F)==0){
                                                     if(fp(Z[0])==0){"valBarre(btex 0 etex);"}else{" "}+
                                                     if(sign(fp((Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-3))))==1){"plus;"}else{"moins;"}}else{"nonDefBarre;"+
-                                                         if(sign(fp(10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-3)+Z[0]))==1){"plus;"}else{"moins;"} }}+if(TestS==0){"valBarre(btex$</span>  <span class="font-latex-math">$ etex);"+ if(sign(fp(10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-3)+Z[0]))==1){"plus;"}else{"moins;"}}else{" "}; 
+                                                         if(sign(fp(10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-3)+Z[0]))==1){"plus;"}else{"moins;"} }}+if(TestS==0){"valBarre(btex$</span>
+                                                       <span class="font-latex-math">$ etex);"+
+if(evalf(sign(fp(10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-3)+ifte(Z[0]==-infinity,ifte(Z[1]==+infinity,ifte(member(0,F)==0,0,0.01),ifte(member(Z[1]-1,F)==0,Z[1]-1,Z[1]-1.1)),Z[0]))))==1.0){"plus;"}else{"moins;"}}else{" "}; 
 
 
 
@@ -1647,7 +1652,7 @@ endTableau;
 
 
 
-sortie:=<span class="flyspell-duplicate">fopen</span>("XCasmpfc.mp");
+sortie:=fopen("XCasmpfc.mp");
 fprint(sortie,Unquoted,MetaLfc);
 fclose(sortie);
 
@@ -1688,7 +1693,7 @@ nz:=size(z);
 
 
 
-S:=op(<span class="flyspell-duplicate">fsolve</span>(fp(x),x));
+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&lt;=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;
@@ -1781,8 +1786,10 @@ lsi:=lsic+nom+"'("+nomv+")}<span class="font-latex-math">$ etex);"+
      if(Z[0]==-infinity){if(evalf(sign(fp(if(Z[1]==+infinity){0}else{Z[1]-10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-5)})))==1){"plus;"}else{"moins;"}}else{if(member(Z[0],F)==0){
                                                     if(fp(Z[0])==0){"valBarre(btex 0 etex);"}else{" "}+
                                                     if(sign(fp((Z[0]+10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-3))))==1){"plus;"}else{"moins;"}}else{"nonDefBarre;"+
-                                                         if(sign(fp(10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-3)+Z[0]))==1){"plus;"}else{"moins;"} }}+if(TestS==0){"valBarre(btex$</span>  <span class="font-latex-math">$ etex);"+ if(sign(fp(10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-3)+Z[0]))==1){"plus;"}else{"moins;"}}else{" "}; 
+                                                         if(sign(fp(10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-3)+Z[0]))==1){"plus;"}else{"moins;"} }}+if(TestS==0){"valBarre(btex$</span>
+                                                       <span class="font-latex-math">$ etex);"+
 
+if(evalf(sign(fp(10^</span><span class="font-latex-superscript"><span class="font-latex-math">(</span></span><span class="font-latex-math">-3)+ifte(Z[0]==-infinity,ifte(Z[1]==+infinity,ifte(member(0,F)==0,0,0.01),ifte(member(Z[1]-1,F)==0,Z[1]-1,Z[1]-1.1)),Z[0]))))==1.0){"plus;"}else{"moins;"}}else{" "}; 
 
 
 
@@ -1972,7 +1979,7 @@ fp:=append(fp,function_diff(f[d]));
 LLL:=concat(L,F[d]);
 Z:=LLL union Z;
 SS:=solve(factor(simplify(fp[d](t))),t);
-ns:=size(<span class="flyspell-duplicate">SS</span>);
+ns:=size(SS);
 
 for(k:=0;k&lt;ns;k++){
 if(trigo==t){
@@ -1988,7 +1995,7 @@ S:=concat(S,simplify(subst(SS[k],n_1=m)));m:=m-1;
 
 }
 }else{
-S:=concat(S,<span class="flyspell-duplicate">SS</span>);
+S:=concat(S,SS);
 }
 }
 
@@ -2009,12 +2016,12 @@ nz:=size(Z);
 
 
 
-<span class="flyspell-duplicate">nz</span>:=size(Z);
+nz:=size(Z);
 u:=1;
  tantque (u&lt;nz-2) and (nz&gt;2) faire
      tantque evalf(Z[u])==evalf(Z[u+1]) faire
          Z:=augment(Z[0..u-1],Z[u+1..nz-1]);nz:=size(Z);
-     <span class="flyspell-duplicate">ftantque</span>;
+     ftantque;
   u:=u+1;
  ftantque;
 
@@ -2032,12 +2039,12 @@ pour m de 0 jusque nz-1 faire l0:=l0+"val(btex <span class="font-latex-math">$"+
 
  lsi:="","";
 
-<span class="flyspell-duplicate">FFF</span>:=[[],[]];
+FFF:=[[],[]];
 
 for(d:=0;d&lt;=1;d++){
 FFF[d]:=concat(F[d],[-infinity,+infinity]);
        k0:= evalf(limit(f[d](x),x=Z[0],1))&gt; evalf(limit(f[d](x),x=Z[1],-1));
-       kz:=evalf(limit(f[d](x),x=Z[nz-1],-1))&gt; evalf(limit(f[d](x),x=Z[<span class="flyspell-duplicate">nz</span>-2],1));
+       kz:=evalf(limit(f[d](x),x=Z[nz-1],-1))&gt; evalf(limit(f[d](x),x=Z[nz-2],1));
 //}
 //<span class="font-latex-math">$
  lsi[d]:=lsic+nom[d]+"'("+nomv+")}$</span> etex);"+if(member(Z[0],FFF[d])==0){"valBarre(btex <span class="font-latex-math">$"+latex(simplify(fp[d](Z[0])))+"$</span> etex);"}else{if(Z[0]==-infinity){" "}else{"nonDefBarre;
@@ -2051,7 +2058,7 @@ if(nz&gt;2){ for(r:=1; r&lt;=nz-2;r++){      ksp:=evalf(fp[d](Z[r]+0.01))&gt;0;
                                                 if(ksp==1){"plus;"}else{"moins;"}
                                                   }; }
 
-lsf[d]:=if(member(Z[nz-1],FFF[d])==0){"valBarre(btex <span class="font-latex-math">$"+latex(simplify(fp[d](Z[nz-1])))+"$</span> etex);"}<span class="flyspell-duplicate">else</span>{if(Z[nz-1]==+infinity){" "}else{"<span class="flyspell-duplicate">nonDefBarre</span>;"}}
+lsf[d]:=if(member(Z[nz-1],FFF[d])==0){"valBarre(btex <span class="font-latex-math">$"+latex(simplify(fp[d](Z[nz-1])))+"$</span> etex);"}else{if(Z[nz-1]==+infinity){" "}else{"nonDefBarre;"}}
 
 
 
@@ -2073,37 +2080,37 @@ lsf[d]:=if(member(Z[nz-1],FFF[d])==0){"valBarre(btex <span class="font-latex-mat
 
 for(d:=0;d&lt;=1;d++){
    K0[d]:= evalf(limit(f[d](x),x=Z[0],1))&gt; evalf(limit(f[d](x),x=Z[1],-1));
-  Kz[d]:=evalf(limit(f[d](x),x,Z[nz-1],-1))&gt; evalf(limit(f[d](x),x,Z[<span class="flyspell-duplicate">nz</span>-2],1));
+  Kz[d]:=evalf(limit(f[d](x),x,Z[nz-1],-1))&gt; evalf(limit(f[d](x),x,Z[nz-2],1));
 //{
 //<span class="font-latex-math">$
 lm0[d]:=limit(f[d](x),x,Z[0],1)==-infinity;
      li[d]:=lvic+nom[d]+"}$</span> etex);"+
-           if(member(Z[0],F[d])==0){"valPos(btex <span class="font-latex-math">$"+if(lm0[d]==1){"-\\infty"}else{latex(simplify(limit(f[d](x),x,Z[0],1)))}+"$</span> <span class="flyspell-duplicate">etex</span>,"}
+           if(member(Z[0],F[d])==0){"valPos(btex <span class="font-latex-math">$"+if(lm0[d]==1){"-\\infty"}else{latex(simplify(limit(f[d](x),x,Z[0],1)))}+"$</span> etex,"}
              else{"nonDefBarre;limDroite(btex <span class="font-latex-math">$"+if(lm0[d]==1){"-\\infty"}else{latex(simplify(limit(f[d](x),x,Z[0],1)))}+"$</span> etex,"}+
            if(K0[d]==1){"1"}else{"0"}+
                          ");";
 
-                     if(nz&gt;2){ for(r:=1; r&lt;=nz-2;r++){ krm[d]:=evalf(limit(f[d](x),x=Z[r-1],1))&lt; <span class="flyspell-duplicate">evalf</span>(limit(f[d](x),x=Z[r],-1));
+                     if(nz&gt;2){ for(r:=1; r&lt;=nz-2;r++){ krm[d]:=evalf(limit(f[d](x),x=Z[r-1],1))&lt; evalf(limit(f[d](x),x=Z[r],-1));
                                                  krp[d]:=evalf(limit(f[d](x),x=Z[r],1))&gt; evalf(limit(f[d](x),x,Z[r+1],-1)) ;
                          lmrm[d]:=limit(f[d](x),x,Z[r],-1)==-infinity;lmrp[d]:=limit(f[d](x),x,Z[r],1)==-infinity;
                                                   lp[d]:=lp[d]+if(member(Z[r],F[d])){
                                     "limGauche(btex
                                     <span class="font-latex-math">$"+if(lmrm[d]==1){"-\\infty"}else{latex(simplify(limit(f[d](x),x,Z[r],-1)))}+"$</span>
-                                    etex,"+if(krm[d]==1){"1);"}else{"0);"}+"nonDefBarre;limDroite(btex <span class="font-latex-math">$"+if(lmrp[d]==1){"-\\infty"}else{latex(simplify(limit(f[d](x),x,Z[r],1)))}+"$</span> etex,"+if(krp[d]==1){"1);"}<span class="flyspell-duplicate">else</span>{"0);"}}
+                                    etex,"+if(krm[d]==1){"1);"}else{"0);"}+"nonDefBarre;limDroite(btex <span class="font-latex-math">$"+if(lmrp[d]==1){"-\\infty"}else{latex(simplify(limit(f[d](x),x,Z[r],1)))}+"$</span> etex,"+if(krp[d]==1){"1);"}else{"0);"}}
                                           else{"valPos(btex          <span class="font-latex-math">$"+latex(simplify(f[d](Z[r])))+"$</span>
                                             etex,"+if(sign(evalf(fp[d](Z[r]-0.001)))==sign(evalf((fp[d](Z[r]+0.001))) )){"0.5);"}else{if(krp[d]==1){"1);"}else{"0);
 "}}}
                                                    }; }
 
-<span class="flyspell-duplicate">lnz</span>[d]:=limit(f[d](x),x=Z[nz-1],-1)==-infinity;
+lnz[d]:=limit(f[d](x),x=Z[nz-1],-1)==-infinity;
 
 
 lf[d]:=if(member(Z[nz-1],F[d])==0){"valPos(btex <span class="font-latex-math">$"+
            if(lnz[d]==1){"-\\infty"}else{latex(simplify(limit(f[d](x),x=Z[nz-1],-1)))}+"$</span> etex,"+
-             if(Kz[d]==1){"1);"}<span class="flyspell-duplicate">else</span>{"0);"}}
+             if(Kz[d]==1){"1);"}else{"0);"}}
     else{"limGauche(btex <span class="font-latex-math">$"+
          if(lnz[d]==1){"-\\infty"}else{latex(simplify(limit(f[d](x),x=Z[nz-1],-1)))}+"$</span> etex,"+ 
-           if(Kz[d]==1){"1);nonDefBarre;"}else{"0);<span class="flyspell-duplicate">nonDefBarre</span>;"}};    
+           if(Kz[d]==1){"1);nonDefBarre;"}else{"0);nonDefBarre;"}};    
     
 
 
@@ -2119,17 +2126,17 @@ lf[d]:=if(member(Z[nz-1],F[d])==0){"valPos(btex <span class="font-latex-math">$"
 
 
 
-<span class="flyspell-duplicate">MetaLfc</span>:=if(ftt==2){if(nz&gt;2){"
+MetaLfc:=if(ftt==2){if(nz&gt;2){"
 
 beginTableau("+nmr+")"+
         l0+lsi[0]+lsp[0]+lsf[0]+lsi[1]+lsp[1]+lsf[1]+"
-<span class="flyspell-duplicate">endTableau</span>;
+endTableau;
 
 ";}else{
 intro+"beginTableau("+nmr+")"+
         l0+
 lsi[0]+lsf[0]+lsi[1]+lsf[1]+"
-<span class="flyspell-duplicate">endTableau</span>;
+endTableau;
 
 ";
 }
@@ -2137,24 +2144,24 @@ lsi[0]+lsf[0]+lsi[1]+lsf[1]+"
         l0+
 li[0]+
 lp[0]+
-<span class="flyspell-duplicate">lf</span>[0]+
+lf[0]+
 li[1]+
 lp[1]+
 lf[1]
 +"
-<span class="flyspell-duplicate">endTableau</span>;
+endTableau;
 
 ";}else{"beginTableau("+nmr+")"+
         l0+
 li[0]+
 lf[0]+
 li[1]+
-<span class="flyspell-duplicate">lf</span>[1]
+lf[1]
 +"
 endTableau;
 
 ";}}else{
-if(nz&gt;2){"beginTableau("+<span class="flyspell-duplicate">nmr</span>+")"+
+if(nz&gt;2){"beginTableau("+nmr+")"+
         l0+
 lsi[0]+lsp[0]+lsf[0]+
 li[0]+
@@ -2165,7 +2172,7 @@ li[1]+
 lp[1]+
 lf[1]
 +"
-<span class="flyspell-duplicate">endTableau</span>;
+endTableau;
 
 ";}else{"beginTableau("+nmr+")"+
         l0+
@@ -2176,7 +2183,7 @@ lsi[1]+lsf[1]+
 li[1]+
 lf[1]
 +"
-<span class="flyspell-duplicate">endTableau</span>;
+endTableau;
 
 ";}
 }
@@ -2241,7 +2248,7 @@ S:=solve(L[k](x),x);
                           if(S[j]&gt;mini and S[j]&lt;maxi){Z:=Z,simplify(S[j]);}
                       fpour;
   fsi;
-<span class="flyspell-duplicate">fpour</span>;
+fpour;
 
 
 
@@ -2256,7 +2263,7 @@ nz:=size(Z);
 
 nz:=size(Z);
 
-if(nz==0){li:="";l0:="val(btex <span class="font-latex-math">$"+latex(D[0])+"$</span> etex);val(btex <span class="font-latex-math">$"+latex(D[1])+"$</span> <span class="flyspell-duplicate">etex</span>);";
+if(nz==0){li:="";l0:="val(btex <span class="font-latex-math">$"+latex(D[0])+"$</span> etex);val(btex <span class="font-latex-math">$"+latex(D[1])+"$</span> etex);";
           for(p:=0;p&lt;=n-1;p++){li:=li+lsic+latex(L[p](x))+"}<span class="font-latex-math">$ etex);"+
 if(mini!=-infinity and L[p](mini)==0){"
                                 valBarre(btex 0 etex);"}else{"
@@ -2269,7 +2276,7 @@ if(L[p]((mini+maxi)*0.5&gt;0)){"plus;"}else{"moins;"}+if(maxi!=+infinity and L[p
            lf:=if(product(L[s]((mini+maxi)*.5),s,0,n-1)&gt;0){"plus;"}else{"moins;"};
 
 
-</span><span class="font-latex-math"><span class="flyspell-duplicate">MetaLfc</span></span><span class="font-latex-math">:="    beginTableau("+nmr+")
+MetaLfc:="    beginTableau("+nmr+")
 newLigneVariables(btex $</span> {x}<span class="font-latex-math">$ etex);
    "+l0+li+ lsic+nomf+"(x)}$</span> etex);"+
                if(mini!=-infinity and product(L[s](mini),s,0,n-1)==0){"
@@ -2394,7 +2401,7 @@ S:=concat(S,solve(L[k](x),x));
                           if(S[j]&gt;mini and S[j]&lt;maxi){Z:=Z,simplify(S[j]);}
                       fpour;
   fsi;
-<span class="flyspell-duplicate">fpour</span>;
+fpour;
 
 
 pour k de 0 jusque m-1 faire 
@@ -2425,7 +2432,7 @@ SF:=concat(SF,solve(Fo[k](x),x));
                           if(SF[j]&gt;mini and SF[j]&lt;maxi){F:=F,simplify(SF[j]);}
                       fpour;
   fsi;
-<span class="flyspell-duplicate">fpour</span>;
+fpour;
 
 
 
@@ -2436,7 +2443,7 @@ Z:=sort([op(set[op(Z)])]);
 
 nz:=size(Z);
 
-if(nz==0){li:="";l0:="val(btex <span class="font-latex-math">$"+latex(D[0])+"$</span> etex);val(btex <span class="font-latex-math">$"+latex(D[1])+"$</span> <span class="flyspell-duplicate">etex</span>);";
+if(nz==0){li:="";l0:="val(btex <span class="font-latex-math">$"+latex(D[0])+"$</span> etex);val(btex <span class="font-latex-math">$"+latex(D[1])+"$</span> etex);";
           for(p:=0;p&lt;=n-1;p++){li:=li+lsic+latex(L[p](x))+"}<span class="font-latex-math">$ etex);"+
 if(mini!=-infinity and L[p](mini)==0){"
                                 valBarre(btex 0 etex);"}else{"
@@ -2470,7 +2477,7 @@ endTableau;
 
 
 l0:="val(btex <span class="font-latex-math">$"+latex(D[0])+"$</span> etex);";li:=" ";lr:=" "; 
-pour m de 0 jusque nz-1 faire l0:=l0+"val(btex <span class="font-latex-math">$"+latex(Z[m])+"$</span> <span class="flyspell-duplicate">etex</span>);
+pour m de 0 jusque nz-1 faire l0:=l0+"val(btex <span class="font-latex-math">$"+latex(Z[m])+"$</span> etex);
 ";fpour; 
 l0:=l0+"val(btex <span class="font-latex-math">$"+latex(D[1])+"$</span> etex);";
 
@@ -2485,21 +2492,21 @@ for(p:=0;p&lt;=n-1;p++){lp:="";
  
                 li:=li+lp+ if(simplify(L[p](Z[nz-1]))==0){"valBarre(btex 0 etex);"}else{"barre;"}+ 
                           if(L[p](Z[nz-1]+1.0)&gt;0){"plus;"}else{"moins;
-    "}+if(maxi!=+infinity and L[p](maxi)==0){"valBarre(btex 0 etex);"}</span><span class="font-latex-math"><span class="flyspell-duplicate">else</span></span><span class="font-latex-math">{" "}
+    "}+if(maxi!=+infinity and L[p](maxi)==0){"valBarre(btex 0 etex);"}else{" "}
                               
     };  
 
 
 pour t de 0 jusque nz-2 faire 
                            lr:=lr+if(product(L[s]((Z[t]+Z[t+1])*.5),s,0,n-1)&gt;0){"plus;"}else{"moins;"}+
-                                      if(member(Z[t+1],FF)==0){"valBarre(btex 0 etex);"}else{ "</span><span class="font-latex-math"><span class="flyspell-duplicate">nonDefBarre</span></span><span class="font-latex-math">;"}                   
+                                      if(member(Z[t+1],FF)==0){"valBarre(btex 0 etex);"}else{ "nonDefBarre;"}                   
                          fpour
 
 
 
 
-</span><span class="font-latex-math"><span class="flyspell-duplicate">MetaLfc</span></span><span class="font-latex-math">:="
-</span><span class="font-latex-math"><span class="flyspell-duplicate">beginTableau</span></span><span class="font-latex-math">("+nmr+")
+MetaLfc:="
+beginTableau("+nmr+")
 newLigneVariables(btex $</span> {x}<span class="font-latex-math">$ etex);
    "+l0+
                      li
@@ -2544,12 +2551,12 @@ fclose(sortie);
 
 
 <span class="font-latex-sedate"><span class="keyword">\begin</span></span><span class="function-name">{VerbatimOut}</span>{XcasTabSigna.cxx}
-<span class="flyspell-duplicate">TSa</span>(a,b,c,d,nmr):={
+TSa(a,b,c,d,nmr):={
 zA:=solve(a*x+b=0,x)[0];
 zB:=solve(c*x+d=0,x)[0];
 zmin:=min(zA,zB);
 zmax:=max(zA,zB);
-  <span class="flyspell-duplicate">Meta</span>:= " 
+  Meta:= " 
           beginTableau("+nmr+")
    newLigneVariables(btex <span class="font-latex-math">$ {x}$</span> etex);
    val(btex <span class="font-latex-math">$-\\infty$</span> etex);val(btex <span class="font-latex-math">$"+latex(zmin)+"$</span> etex);
@@ -2567,7 +2574,7 @@ val(btex <span class="font-latex-math">$+\\infty$</span> etex);
                                  if(zmin==zB){"valBarre(btex 0 etex);"}else{"barre;"}+
                                  if(zmin==zB){si c&gt;0 alors "plus;"; sinon "moins;";fsi}
                                              else{si c&gt;0 alors "moins;"; sinon "plus;"; fsi}+
-                                 if(zmin==zB){"barre;"}else{"valBarre(btex 0 <span class="flyspell-duplicate">etex</span>);"}+
+                                 if(zmin==zB){"barre;"}else{"valBarre(btex 0 etex);"}+
                                  if(c&gt;0){"plus;"}else{"moins;"}  
      
    +lsic+"{("+if(a==1){"x+"}else{if(a==-1){"-x+"}else{a+"x+"}}+b+")("+if(c==1){"x+"}else{if(c==-1){"-x+"}else{c+"x+"}}+d+")}}<span class="font-latex-math">$ etex);"
@@ -2582,7 +2589,7 @@ endTableau;
 
 
 
-sortie:=</span><span class="font-latex-math"><span class="flyspell-duplicate">fopen</span></span><span class="font-latex-math">("XCasmpfc.mp");
+sortie:=fopen("XCasmpfc.mp");
 fprint(sortie,Unquoted,Meta);
 fclose(sortie);
 
@@ -2602,8 +2609,9 @@ fclose(sortie);
 
 
 
-<span class="font-latex-sedate"><span class="keyword">\begin</span></span><span class="function-name">{VerbatimOut}</span>{XcasTSc.cxx}
-<span class="flyspell-duplicate">TSc</span>(g,D,F,trigo,nmr):={
+<span class="font-latex-sedate"><span class="keyword">\begin</span></span><span class="function-name">{VerbatimOut}</span>{<span class="flyspell-duplicate">XcasTSc</span>.<span class="flyspell-duplicate">cxx</span>}
+
+TSc(g,D,F,trigo,nmr):={
 f:=unapply(g,x);
 mini:=D[0]; maxi:=D[1];lm:=" ";
 Z:=mini,maxi;
@@ -2615,13 +2623,13 @@ if(trigo==t){
 all_trig_solutions:=1;
 reset_solve_counter(-1,-1);
 SS:=solve(factor(simplify(f(x))),x);
-<span class="flyspell-duplicate">ns</span>:=size(SS);
+ns:=size(SS);
 for(j:=0;j&lt;ns;j++){
 m:=0;
 while(evalf(simplify(subst(SS[j],n_1=m)))&lt;=evalf(maxi)){
 S:=concat(S,simplify(subst(SS[j],n_1=m)));m:=m+1;
 };m:=-1;
-<span class="flyspell-duplicate">while</span>(evalf(subst(SS[j],n_1=m))&gt;=evalf(mini)){
+while(evalf(subst(SS[j],n_1=m))&gt;=evalf(mini)){
 S:=concat(S,simplify(subst(SS[j],n_1=m)));m:=m-1;
 }
 }
@@ -2634,19 +2642,19 @@ S:=solve(f(x),x);
 
 
 
-if(size(S)==0){
+if(size(S)==0 and size(F)==0){
 l0:="val(btex <span class="font-latex-math">$"+latex(D[0])+"$</span> etex);val(btex <span class="font-latex-math">$"+latex(D[1])+"$</span> etex);";
 li:=if(member(mini,F)!=0){"nonDefBarre;"}else{if(mini!=-infinity and f(mini)==0){"
-                                valBarre(btex 0 etex);"}else{"
+                                valBarre(btex 0 etex);"}<span class="flyspell-duplicate">else</span>{"
                               "}}+ 
-if(mini!=-infinity or maxi!=+infinity){if(f((mini+maxi)*0.5&gt;0)){"plus;"}else{"moins;"}}else{if(f(0)&gt;0){"plus;"}else{"moins;"}};
-lf:=if(member(maxi,F)!=0){"nonDefBarre;"}else{if(maxi!=+infinity and f(maxi)==0){"
-                                valBarre(btex 0 etex);"}else{"
+if(mini!=-infinity or maxi!=+infinity){if(f((mini+maxi)*0.5&gt;0)){"plus;"}else{"moins;"}}else{if(f(0.3145274774464545777744)&gt;0){"plus;"}else{"moins;"}};
+<span class="flyspell-duplicate">lf</span>:=if(member(maxi,F)!=0){"nonDefBarre;"}else{if(maxi!=+infinity and f(maxi)==0){"
+                                valBarre(btex 0 etex);"}<span class="flyspell-duplicate">else</span>{"
                               "}};
-}
-<span class="flyspell-duplicate">else</span>{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]&gt;mini and S[j]&lt;maxi){Z:=Z,simplify(S[j])};
-                      fpour;
+                      fpour}
 
 Z:=concat([Z],F);
 
@@ -2660,42 +2668,43 @@ li:=if(mini!=-infinity and f(mini)==0){"
                                 valBarre(btex 0 etex);"}else{if(member(mini,F)==0){"
                               "}else{"nonDefBarre;"}}+ 
 if(f((mini+maxi)*0.5)&gt;0){"plus;"}else{"moins;"};
-lf:=if(maxi!=+infinity and f(maxi)==0){"
+lf:=if(maxi!=+infinity and f(<span class="flyspell-duplicate">maxi</span>)==0){"
                                 valBarre(btex 0 etex);"}else{if(member(maxi,F)==0){"
-                              "}else{"nonDefBarre;"}
+                              "}else{"<span class="flyspell-duplicate">nonDefBarre</span>;"}
                               };
 
 }else{
 l0:="val(btex <span class="font-latex-math">$"+latex(Z[0])+"$</span> etex);";li:=" ";
-pour m de 1 jusque nz-1 faire l0:=l0+"val(btex <span class="font-latex-math">$"+latex(Z[m])+"$</span> <span class="flyspell-duplicate">etex</span>);
+pour m de 1 jusque nz-1 faire l0:=l0+"val(btex <span class="font-latex-math">$"+latex(Z[m])+"$</span> etex);
 ";
-fpour; 
+<span class="flyspell-duplicate">fpour</span>; 
 
                                      
 li:= if(mini!=-infinity and f(mini)==0){"
                                 valBarre(btex 0 etex);"}else{if(member(mini,F)==0){"
-                              "}else{"nonDefBarre;"}
+                              "}else{"<span class="flyspell-duplicate">nonDefBarre</span>;"}
                               }                         
 
 lm:=if(nz&gt;2){for(r:=0; r&lt;nz-2;r++){lm:=lm+if(Z[r]==-infinity){
 if(f((Z[r+1]-1))&gt;0){"plus;"}else{"moins;"}
 }else{if(f((Z[r]+Z[r+1])*.5)&gt;0){"plus;"}else{"moins;"}}
 +
-            if(member(Z[r+1],F)==0){"valBarre(btex 0 etex);"}else{"nonDefBarre;"} 
+            if(member(Z[r+1],F)==0){"valBarre(btex 0 etex);"}else{"<span class="flyspell-duplicate">nonDefBarre</span>;"} 
                            }}else{" "}; 
 
-lf:=if(f(Z[nz-2]+0.1)&gt;0){"plus;"}else{"moins;"}+if(maxi!=+infinity and f(maxi)==0){"valBarre(btex 0 etex);"}else{if(member(maxi,F)==0){"
+lf:=if(f(Z[nz-2]+0.1)&gt;0){"plus;"}else{"moins;"}+if(maxi!=+infinity and f(maxi)==0){"<span class="flyspell-duplicate">valBarre</span>(btex 0 etex);"}else{if(member(maxi,F)==0){"
                               "}else{"<span class="flyspell-duplicate">nonDefBarre</span>;"}
                               };
-}};  
+}
+};  
 
 
 
 
-MetaLfc:="
+<span class="flyspell-duplicate">MetaLfc</span>:="
 
 beginTableau("+nmr+")
-newLigneVariables(btex <span class="font-latex-math">$\\displaystyle  {x}$</span> etex);
+<span class="flyspell-duplicate">newLigneVariables</span>(btex <span class="font-latex-math">$\\displaystyle  {x}$</span> etex);
    "+l0+lsic+latex(f(x))+"}<span class="font-latex-math">$ etex);"+
                      li+lm+lf
                      +"
@@ -2712,7 +2721,6 @@ fprint(sortie,Unquoted,MetaLfc);
 </span><span class="font-latex-math"><span class="flyspell-duplicate">fclose</span></span><span class="font-latex-math">(sortie);
  }:;
 
-
 </span><span class="font-latex-sedate"><span class="keyword"><span class="font-latex-math">\end</span></span></span><span class="function-name"><span class="font-latex-math">{VerbatimOut}</span></span><span class="font-latex-math">
 
 
@@ -2739,7 +2747,7 @@ fprint(sortie,Unquoted,MetaLfc);
 </span>                                   <span class="comment">% exporter le source mp
 </span>                                   <span class="comment">% puis lancer metapost pour creer
 </span>                                   <span class="comment">% l'image du tableau
-</span>         <span class="font-latex-sedate">\immediate</span><span class="font-latex-sedate">\write</span>18{<span class="font-latex-sedate">\cat</span> XCasmpfc.mp &gt;&gt; <span class="font-latex-sedate">\nomtravail</span>.Tab.mp}
+</span>         <span class="font-latex-sedate">\immediate</span><span class="font-latex-sedate">\write</span>18{<span class="font-latex-sedate">\cat</span> XCasmpfc.mp &gt;&gt; <span class="font-latex-sedate">\nomtravail</span>.Tab.<span class="flyspell-duplicate">mp</span>}
          <span class="font-latex-sedate">\immediate</span><span class="font-latex-sedate">\write</span>18{<span class="font-latex-sedate">\cat</span> enteteMP.cfg &gt;&gt; <span class="font-latex-sedate">\nomtravail</span>.Tab#1.mp}
          <span class="font-latex-sedate">\immediate</span><span class="font-latex-sedate">\write</span>18{<span class="font-latex-sedate">\cat</span> XCasmpfc.mp &gt;&gt; <span class="font-latex-sedate">\nomtravail</span>.Tab#1.mp}
          <span class="font-latex-sedate">\immediate</span><span class="font-latex-sedate">\write</span>18{<span class="font-latex-sedate">\cat</span> queue.mp &gt;&gt; <span class="font-latex-sedate">\nomtravail</span>.Tab#1.mp}
diff --git a/Master/texmf-dist/doc/latex/tablor/tablor.pdf b/Master/texmf-dist/doc/latex/tablor/tablor.pdf
index babac2ec59e..14d44869295 100644
--- a/Master/texmf-dist/doc/latex/tablor/tablor.pdf
+++ b/Master/texmf-dist/doc/latex/tablor/tablor.pdf
diff --git a/Master/texmf-dist/doc/latex/tablor/tablor.tex b/Master/texmf-dist/doc/latex/tablor/tablor.tex
index c8ac39a2a28..4b876c73ac9 100644
--- a/Master/texmf-dist/doc/latex/tablor/tablor.tex
+++ b/Master/texmf-dist/doc/latex/tablor/tablor.tex
@@ -1,3 +1,14 @@
+% \copyleft Connan le Barbare (aka Guillaume Connan) \copyright
+% This work may be distributed and/or mofified under the conditions
+% or the LaTeX Project Public Licence, either v1.3 or (at your option)
+% any later version. The latest version is in
+%   http://www.latex-project.org/lppl/
+% This work consists of the files tablor.sty, tablor-xetex.sty,  tablor.cfg, tablor.tex,
+% tablor.pdf and tablor.html
+
+
+
+
 \documentclass[12pt]{article}
 \usepackage[height=250mm,width=183mm]{geometry}
 \usepackage[latin1]{inputenc}
@@ -8,7 +19,7 @@
 \usepackage{luximono}
 
 %\usepackage[upright]{fourier}
-\usepackage[xcas]{tablor}
+\usepackage{tablor}
 \usepackage{listings,keystroke}
 \usepackage{graphicx,bclogo,amssymb,amsbsy,amsfonts,amstext,amscd,amsopn,amsxtra}
 
@@ -86,7 +97,7 @@ keywordstyle =\color{0.2white}\usefont{OT1}{cmtt}{b}{n},basicstyle=\ttfamily,com
 avec l'efficace participation de Jean-Michel \textsc{Boucart}\\
 Forum d'aide ~:~\href{http://gconnan.free.fr/punbb/upload/index.php}{http://gconnan.free.fr/punbb/upload/index.php}}
 
-\date{19 avril 2009 - Version 4.04-d}
+\date{21 ao�t 2009 - Version 4.04-h}
 
 
 
@@ -179,6 +190,8 @@ pr�c�dentes).
 
 Des bugs dans TVapp et TVIapp corrig�s (version 4.04-c... puis 4.04-d).
 
+Bug dans TVc (version 4.04-h)
+
 \subsection{Professor.sty}
 
 
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}
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
parent	60961ff6e9cd5bde2a7a55e7099330f618ef0b87 (diff)