summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-12-02 23:58:59 +0000
committerKarl Berry <karl@freefriends.org>2009-12-02 23:58:59 +0000
commit385afb0fdaada6fc33d842f965b21d9e058a2a94 (patch)
tree66ae9f59febd3a80f124c6c60c45d6bfcde53e0e /Master
parent01cf362a741bf898878089e4dfaff7e25c97c823 (diff)
tablor 4.06-c (1dec09)
git-svn-id: svn://tug.org/texlive/trunk@16271 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/tablor/tablor.html68
-rw-r--r--Master/texmf-dist/doc/latex/tablor/tablor.pdfbin428386 -> 468061 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tablor/tablor.tex42
-rw-r--r--Master/texmf-dist/tex/latex/tablor/tablor-xetex.sty20
-rw-r--r--Master/texmf-dist/tex/latex/tablor/tablor.cfg9
-rw-r--r--Master/texmf-dist/tex/latex/tablor/tablor.sty20
6 files changed, 90 insertions, 69 deletions
diff --git a/Master/texmf-dist/doc/latex/tablor/tablor.html b/Master/texmf-dist/doc/latex/tablor/tablor.html
index 200783cdcff..c1fdde694b2 100644
--- a/Master/texmf-dist/doc/latex/tablor/tablor.html
+++ b/Master/texmf-dist/doc/latex/tablor/tablor.html
@@ -87,13 +87,13 @@
<body>
<pre>
<span class="font-latex-sedate">\NeedsTeXFormat</span>{LaTeX2e}[1995/12/01]
-<span class="font-latex-sedate">\ProvidesPackage</span>{<span class="flyspell-duplicate">tablor</span>}[11/11/2009 v4.06-b la machine a creer des tableaux de signes et variations]
+<span class="font-latex-sedate">\ProvidesPackage</span>{<span class="flyspell-duplicate">tablor</span>}[02/12/2009 v4.06-d 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
</span><span class="comment-delimiter">% </span><span class="comment">or the LaTeX Project Public Licence, either v1.3 or (at your option)
</span><span class="comment-delimiter">% </span><span class="comment">any later version. The latest version is in
-</span><span class="comment-delimiter">% </span><span class="comment">http://www.latex-project.org/</span><span class="comment"><span class="flyspell-incorrect">lppl</span></span><span class="comment">/
+</span><span class="comment-delimiter">% </span><span class="comment">http://www.latex-project.org/lppl/
</span><span class="comment-delimiter">% </span><span class="comment">This work consists of the files tablor.sty, tablor-xetex.sty, tablor.cfg, tablor.tex,
</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>
@@ -127,7 +127,7 @@
</span><span class="comment-delimiter">%</span><span class="comment">
</span><span class="comment-delimiter">% </span><span class="comment">tableau de variation avec liste de valeurs
</span><span class="comment-delimiter">% </span><span class="font-latex-sedate"><span class="comment">\begin</span></span><span class="comment">{TVS}
-</span><span class="comment-delimiter">% </span><span class="comment"><span class="flyspell-duplicate">TVS</span></span><span class="comment">([1,2,3,4],[-1,-infinity,+infinity,2,9],[2],"f","x",</span><span class="font-latex-sedate"><span class="comment">\tv</span></span><span class="comment">)
+</span><span class="comment-delimiter">% </span><span class="comment">TVS([1,2,3,4],[-1,-infinity,+infinity,2,9],[2],"f","x",</span><span class="font-latex-sedate"><span class="comment">\tv</span></span><span class="comment">)
</span><span class="comment-delimiter">% </span><span class="font-latex-sedate"><span class="comment">\end</span></span><span class="comment">{TVS}
</span><span class="comment-delimiter">%</span><span class="comment">
</span><span class="comment-delimiter">%</span><span class="comment">
@@ -455,7 +455,7 @@ beginTableau("+nmr+")"+
endTableau;
";}else{
-intro+"beginTableau("+nmr+")"+
+"beginTableau("+nmr+")"+
l0+
lsi+lsf+"
endTableau;
@@ -644,7 +644,7 @@ beginTableau("+nmr+")"+
endTableau;
";}else{
-intro+"beginTableau("+nmr+")"+
+"beginTableau("+nmr+")"+
l0+
lsi+lsf+"
endTableau;
@@ -888,7 +888,7 @@ beginTableau("+nmr+")"+
endTableau;
";}else{
-intro+"beginTableau("+nmr+")"+
+"beginTableau("+nmr+")"+
l0+
lsi+lsf+"
endTableau;
@@ -1074,7 +1074,7 @@ beginTableau("+nmr+")"+
endTableau;
";}else{
-intro+"beginTableau("+nmr+")"+
+"beginTableau("+nmr+")"+
l0+
lsi+lsf+"
endTableau;
@@ -1953,7 +1953,7 @@ fclose(sortie);
<span class="comment-delimiter">%%</span><span class="comment">
-</span><span class="comment-delimiter">%% </span><span class="comment">Code giac/Xcas pour les Tableaux de variations de courbes parametrees
+</span><span class="comment-delimiter">%% </span><span class="comment">Code giac/Xcas pour les Tableaux de variations de courbes </span><span class="comment"><span class="flyspell-duplicate">parametrees</span></span><span class="comment">
</span><span class="comment-delimiter">%%</span><span class="comment">
</span>
@@ -1963,12 +1963,13 @@ fclose(sortie);
<span class="font-latex-sedate"><span class="keyword">\begin</span></span><span class="function-name">{VerbatimOut}</span>{XcasTVP.cxx}
-TVP(L,F,nom,nomv,ff,ftt,trigo,nmr):={
-//local Z,LLL,FFF,nl,fp,f,S,d,t,ns,k,m,x,j,kk,nz,u,l0;
+<span class="flyspell-duplicate">TVP</span>(L,F,nom,nomv,ff,ftt,trigo,<span class="flyspell-duplicate">nmr</span>):={
+
nl:=size(L);
fp:=[];
S:=[];
-f:=ff;
+f:=[unapply(ff[0],x),unapply(ff[1],x)];
+fp:=[function_diff(f[0]),function_diff(f[1])];
Z:=[];
LLL:=[];
@@ -1977,12 +1978,11 @@ all_trig_solutions:=1;
reset_solve_counter(-1,-1);
for(d:=0;d&lt;=1;d++){
-f:=subst(f,f[d]=unapply(f[d],t));
-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(SS);
+ns:=size(<span class="flyspell-duplicate">SS</span>);
+
for(k:=0;k&lt;ns;k++){
if(trigo==t){
@@ -2113,7 +2113,7 @@ lf[d]:=if(member(Z[nz-1],F[d])==0){"valPos(btex <span class="font-latex-math">$"
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);nonDefBarre;"}};
+ if(Kz[d]==1){"1);nonDefBarre;"}else{"0);<span class="flyspell-duplicate">nonDefBarre</span>;"}};
@@ -2131,12 +2131,12 @@ lf[d]:=if(member(Z[nz-1],F[d])==0){"valPos(btex <span class="font-latex-math">$"
MetaLfc:=if(ftt==2){if(nz&gt;2){"
-beginTableau("+nmr+")"+
+<span class="flyspell-duplicate">beginTableau</span>("+nmr+")"+
l0+lsi[0]+lsp[0]+lsf[0]+lsi[1]+lsp[1]+lsf[1]+"
endTableau;
-";}else{
-intro+"beginTableau("+nmr+")"+
+";}<span class="flyspell-duplicate">else</span>{
+"beginTableau("+nmr+")"+
l0+
lsi[0]+lsf[0]+lsi[1]+lsf[1]+"
endTableau;
@@ -2748,20 +2748,20 @@ fclose(sortie);
<span class="font-latex-sedate"><span class="keyword">\begin</span></span><span class="function-name">{VerbatimOut}</span>{<span class="flyspell-duplicate">XcasTVS</span>.cxx}
-TVS(La,Lo,F,nomf,nomv,<span class="flyspell-duplicate">nmr</span>):={
+TVS(La,Lo,F,nomf,nomv,nmr):={
na:=size(La);
f:=F;
if(member(La[0],F)){f:=f[1..size(f)-1]};
if(member(La[na-1],F)){f:=f[0..size(f)-2]};
Z:=sort(concat(La,f));
-<span class="flyspell-duplicate">Zo</span>:=sort([op(set[op(Z)])]);
+Zo:=sort([op(set[op(Z)])]);
nz:=size(Z);
-nzo:=size(<span class="flyspell-duplicate">Zo</span>);
+nzo:=size(Zo);
k0:= evalf(Lo[0])&gt; evalf(Lo[1]);
-<span class="flyspell-duplicate">kz</span>:=evalf(Lo[nz-1])&gt; evalf(Lo[nz-2]);
+kz:=evalf(Lo[nz-1])&gt; evalf(Lo[nz-2]);
l0:=" newLigneVariables(btex <span class="font-latex-math">$"+nomv+"$</span> etex);";lp:=" "; lf:=" ";
@@ -2778,30 +2778,30 @@ li:=lvic+nomf+"}<span class="font-latex-math">$ etex);"+
krp:=evalf(Lo[r])&gt; evalf(Lo[r+1]) ;
lp:=lp+if(Z[r]==Z[r+1]){
- "limGauche(btex$</span>"+latex(Lo[r])+"<span class="font-latex-math">$</span><span class="font-latex-math"><span class="flyspell-duplicate">etex</span></span><span class="font-latex-math">,"+
- if(</span><span class="font-latex-math"><span class="flyspell-duplicate">krm</span></span><span class="font-latex-math">==1){"1);"}
+ "limGauche(btex$</span>"+latex(Lo[r])+"<span class="font-latex-math">$etex,"+
+ if(krm==1){"1);"}
else{"0);"}
- }// fin if zr=</span><span class="font-latex-math"><span class="flyspell-incorrect">zr</span></span><span class="font-latex-math">+1
+ }// fin if zr=zr+1
else{
if(Z[r]==Z[r-1]){
- "nonDefBarre;limDroite(btex$</span>"+latex(Lo[r])+"<span class="font-latex-math">$</span><span class="font-latex-math"><span class="flyspell-duplicate">etex</span></span><span class="font-latex-math">,"+
- if(</span><span class="font-latex-math"><span class="flyspell-duplicate">krp</span></span><span class="font-latex-math">==1){"1);"}
+ "nonDefBarre;limDroite(btex$</span>"+latex(Lo[r])+"<span class="font-latex-math">$etex,"+
+ if(krp==1){"1);"}
else{"0);"}
}//fin if zr=zr-1
else{
"valPos(btex $</span>"+latex(Lo[r])+"<span class="font-latex-math">$etex,"+
- if(krp==1){"1);"}</span><span class="font-latex-math"><span class="flyspell-duplicate">else</span></span><span class="font-latex-math">{"0);"}
+ if(krp==1){"1);"}else{"0);"}
}//fin else zr=zr-1
}//fin else zr=zr+1
}//fin for
-}//fin de if </span><span class="font-latex-math"><span class="flyspell-duplicate">nz</span></span><span class="font-latex-math">&gt;2
+}//fin de if nz&gt;2
lf:=if(member(Z[nz-1],F)==0){"valPos(btex $</span>"+latex(Lo[nz-1])+"<span class="font-latex-math">$ etex,"+
if(kz==1){"1);"}else{"0);"}}
- else{"</span><span class="font-latex-math"><span class="flyspell-duplicate">limGauche</span></span><span class="font-latex-math">(btex $</span>"+latex(Lo[nz-1])+"<span class="font-latex-math">$ etex,"+
- if(kz==1){"1);nonDefBarre;"}else{"0);</span><span class="font-latex-math"><span class="flyspell-duplicate">nonDefBarre</span></span><span class="font-latex-math">;"}};
+ else{"limGauche(btex $</span>"+latex(Lo[nz-1])+"<span class="font-latex-math">$ etex,"+
+ if(kz==1){"1);nonDefBarre;"}else{"0);nonDefBarre;"}};
MetaLfc:=
@@ -2809,12 +2809,12 @@ MetaLfc:=
if(nz&gt;2){"beginTableau("+nmr+")"+
l0+
li+
-</span><span class="font-latex-math"><span class="flyspell-duplicate">lp</span></span><span class="font-latex-math">+
+lp+
lf
+"
endTableau;
-";}else{"beginTableau("+</span><span class="font-latex-math"><span class="flyspell-duplicate">nmr</span></span><span class="font-latex-math">+")"+
+";}else{"beginTableau("+nmr+")"+
l0+
li+
lf
@@ -3062,7 +3062,7 @@ read("XCasTV.user");
-<span class="font-latex-sedate"><span class="keyword">\begin</span></span><span class="function-name">{VerbatimOut}</span>{XCasTVP.giac}
+<span class="font-latex-sedate"><span class="keyword">\begin</span></span><span class="function-name">{VerbatimOut}</span>{<span class="flyspell-duplicate">XCasTVP</span>.giac}
maple_mode(0);
approx_mode:=0;
read("config.cxx");
diff --git a/Master/texmf-dist/doc/latex/tablor/tablor.pdf b/Master/texmf-dist/doc/latex/tablor/tablor.pdf
index 7942887b437..e45a74149ed 100644
--- a/Master/texmf-dist/doc/latex/tablor/tablor.pdf
+++ b/Master/texmf-dist/doc/latex/tablor/tablor.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tablor/tablor.tex b/Master/texmf-dist/doc/latex/tablor/tablor.tex
index 216ba2a86e1..6423788d872 100644
--- a/Master/texmf-dist/doc/latex/tablor/tablor.tex
+++ b/Master/texmf-dist/doc/latex/tablor/tablor.tex
@@ -16,6 +16,7 @@
\usepackage[T1]{fontenc}
\usepackage[french]{babel}
\usepackage[upright]{kpfonts}
+\usepackage{bold-extra}
\usepackage[scaled=0.85]{luximono}
\usepackage[xcas]{tablor}
\usepackage{listings,keystroke}
@@ -43,18 +44,17 @@
\definecolor{0.2white}{rgb}{.2,.2,.2}
\definecolor{0.4white}{rgb}{.4,.4,.4}
\definecolor{0.6white}{rgb}{.6,.6,.6}
-
+\definecolor{0.1white}{rgb}{.1,.1,.1}
% style des listings
-\newcommand{\lat}{
-\lstset{numbers=none,language=[LaTeX]{TeX},xleftmargin=10pt,%
-keywordstyle =\color{0.2white}\bfseries,basicstyle=\ttfamily,commentstyle=\normalfont\scriptsize\slshape,
- backgroundcolor=\color{0.8white},breaklines=true,morecomment=[l]\%}
+
+
+\newcommand\xcas{\lstset{numbers=none,language=XCAS,xleftmargin=10pt,%
+keywordstyle =\color{black}\usefont{OT1}{cmtt}{b}{n},basicstyle=\ttfamily\color{0.1white},commentstyle=\normalfont\scriptsize\slshape,breaklines=true,backgroundcolor=\color{0.9white},frame=trBL,framerule=1pt,framesep=4pt,rulesep=1pt,showstringspaces=false,stringstyle=\slshape,captionpos=b}
}
-\newcommand{\xcas}{\lstset{numbers=none,language=mupad,xleftmargin=10pt,%
-keywordstyle =\color{0.2white}\bfseries,basicstyle=\ttfamily,commentstyle=\normalfont\scriptsize\slshape,
- backgroundcolor=\color{0.8white},breaklines=true}
+\newcommand\lat{\lstset{numbers=none,language=[LaTeX]{TeX},xleftmargin=10pt,%
+keywordstyle =\color{black}\usefont{OT1}{cmtt}{b}{n},basicstyle=\ttfamily\color{0.1white},commentstyle=\normalfont\scriptsize\slshape,breaklines=true,backgroundcolor=\color{0.9white},frame=trBL,framerule=1pt,framesep=4pt,rulesep=1pt,showstringspaces=false,stringstyle=\slshape,captionpos=b}
}
@@ -95,7 +95,7 @@ keywordstyle =\color{0.2white}\bfseries,basicstyle=\ttfamily,commentstyle=\norma
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{2 novembre 2009 - Version 4.06}
+\date{1\up{er} décembre 2009 - Version 4.06-c}
@@ -203,6 +203,20 @@ Création de l'option windows : on peu maintenant déclarer l'utilisation
de l'OS windows en option sans aller modifier le fichier tablor.cfg
(version 4.06).
+
+Nouveau \verb+tablor.cfg+ : on peut régler l'epsilon de XCAS qui fixe le
+seuil du zéro des flottants. Il est réglé à $10^{-100}$ par
+défaut. Il faut une version récente de XCAS, postérieure au 20 novembre
+2009. (version tablor : 4.06-c)
+
+
+
+\xcas
+\begin{lstlisting}[caption={}]
+//reglage de epsilon : seuil du zero de giac
+epsilon:=1e-100;
+\end{lstlisting}
+
\subsection{Professor.sty}
@@ -590,11 +604,11 @@ etex
% II - Déclaration de l'éditeur utilisé
% ================================
%
-% Remplacez "kile" par la commande qui lance un autre editeur que
+% Remplacez "emacsclient -c" par la commande qui lance un autre editeur que
% votre éditeur favori pour afficher les tableaux a modifier.
% Laissez une espace avant de fermer l'accolade.
-\newcommand{\editeur}{kile }
+\newcommand{\editeur}{emacsclient -c }
@@ -611,6 +625,9 @@ etex
\begin{VerbatimOut}{config.cxx}
+//reglage de epsilon : seuil du zero de giac
+epsilon:=1e-100;
+
// POUR LES TV, TVI,TVZ,TVapp,TSq,TSa
// pour la ligne signe
lsic:="
@@ -697,7 +714,8 @@ Voir aussi le paragraphe~\ref{modif};
«~variations de ~». Vous pouvez modifier ces réglages ici comme indiqué; deux exemples sont
donnés~:~en anglais ou en n'écrivant que les expressions.
-
+\item on peut régler l'epsilon de XCAS qui fixe le
+seuil du zéro des flottants. Il est réglé à $10^{-100}$ par défaut.
\end{itemize}
diff --git a/Master/texmf-dist/tex/latex/tablor/tablor-xetex.sty b/Master/texmf-dist/tex/latex/tablor/tablor-xetex.sty
index 5a715a71546..cd4bae7839e 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}[1/111/2009 v4.06-c la machine a creer des
+\ProvidesPackage{tablor-xetex}[02/12/2009 v4.06-d la machine a creer des
tableaux de signes et variations compatible xetex]
% \copyleft Connan le Barbare (aka Guillaume Connan) \copyright
@@ -405,7 +405,7 @@ beginTableau("+nmr+")"+
endTableau;
";}else{
-intro+"beginTableau("+nmr+")"+
+"beginTableau("+nmr+")"+
l0+
lsi+lsf+"
endTableau;
@@ -594,7 +594,7 @@ beginTableau("+nmr+")"+
endTableau;
";}else{
-intro+"beginTableau("+nmr+")"+
+"beginTableau("+nmr+")"+
l0+
lsi+lsf+"
endTableau;
@@ -838,7 +838,7 @@ beginTableau("+nmr+")"+
endTableau;
";}else{
-intro+"beginTableau("+nmr+")"+
+"beginTableau("+nmr+")"+
l0+
lsi+lsf+"
endTableau;
@@ -1024,7 +1024,7 @@ beginTableau("+nmr+")"+
endTableau;
";}else{
-intro+"beginTableau("+nmr+")"+
+"beginTableau("+nmr+")"+
l0+
lsi+lsf+"
endTableau;
@@ -1914,11 +1914,12 @@ fclose(sortie);
\begin{VerbatimOut}{XcasTVP.cxx}
TVP(L,F,nom,nomv,ff,ftt,trigo,nmr):={
-//local Z,LLL,FFF,nl,fp,f,S,d,t,ns,k,m,x,j,kk,nz,u,l0;
+
nl:=size(L);
fp:=[];
S:=[];
-f:=ff;
+f:=[unapply(ff[0],x),unapply(ff[1],x)];
+fp:=[function_diff(f[0]),function_diff(f[1])];
Z:=[];
LLL:=[];
@@ -1927,13 +1928,12 @@ all_trig_solutions:=1;
reset_solve_counter(-1,-1);
for(d:=0;d<=1;d++){
-f:=subst(f,f[d]=unapply(f[d],t));
-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(SS);
+
for(k:=0;k<ns;k++){
if(trigo==t){
m:=0;
@@ -2086,7 +2086,7 @@ beginTableau("+nmr+")"+
endTableau;
";}else{
-intro+"beginTableau("+nmr+")"+
+"beginTableau("+nmr+")"+
l0+
lsi[0]+lsf[0]+lsi[1]+lsf[1]+"
endTableau;
diff --git a/Master/texmf-dist/tex/latex/tablor/tablor.cfg b/Master/texmf-dist/tex/latex/tablor/tablor.cfg
index fc514f079f3..82048c71977 100644
--- a/Master/texmf-dist/tex/latex/tablor/tablor.cfg
+++ b/Master/texmf-dist/tex/latex/tablor/tablor.cfg
@@ -16,8 +16,8 @@ input tableauVariation;
verbatimtex
%&latex
\documentclass{article}
-\usepackage[upright]{fourier}% ou mathpazo, lmodern, etc. ou rien !
-\usepackage{amsmath}
+\usepackage[upright]{kpfonts}% ou mathpazo, lmodern, etc. ou rien !
+%\usepackage{amsmath}
\renewcommand\mbox[1]{ #1 } % pour les mbox intempestifs de xcas
\renewcommand\cdot{ } % idem pour les cdot
\begin{document}
@@ -31,7 +31,7 @@ etex
% II - Déclaration de l'éditeur utilisé
% ================================
%
-% Remplacez "emacsclient -c" par la commande qui lance un autre editeur que votre éditeur favori pour pouvoir modifier certains tableaux. (gedit, texmaker,notepad,kate,etc.)
+% Remplacez "gedit" par la commande qui lance un autre editeur que votre éditeur favori pour pouvoir modifier certains tableaux.
% Laissez une espace avant de fermer l'accolade.
\newcommand{\editeur}{emacsclient -c }
@@ -58,6 +58,9 @@ etex
\begin{VerbatimOut}{config.cxx}
+//reglage de epsilon : seuil du zero de giac
+epsilon:=1e-100;
+
// POUR LES TV, TVI,TVZ,TVapp,TSq,TSa
// pour la ligne signe
lsic:="
diff --git a/Master/texmf-dist/tex/latex/tablor/tablor.sty b/Master/texmf-dist/tex/latex/tablor/tablor.sty
index ef5fc779898..b2890910692 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}[11/11/2009 v4.06-b la machine a creer des tableaux de signes et variations]
+\ProvidesPackage{tablor}[02/12/2009 v4.06-d 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
@@ -367,7 +367,7 @@ beginTableau("+nmr+")"+
endTableau;
";}else{
-intro+"beginTableau("+nmr+")"+
+"beginTableau("+nmr+")"+
l0+
lsi+lsf+"
endTableau;
@@ -556,7 +556,7 @@ beginTableau("+nmr+")"+
endTableau;
";}else{
-intro+"beginTableau("+nmr+")"+
+"beginTableau("+nmr+")"+
l0+
lsi+lsf+"
endTableau;
@@ -800,7 +800,7 @@ beginTableau("+nmr+")"+
endTableau;
";}else{
-intro+"beginTableau("+nmr+")"+
+"beginTableau("+nmr+")"+
l0+
lsi+lsf+"
endTableau;
@@ -986,7 +986,7 @@ beginTableau("+nmr+")"+
endTableau;
";}else{
-intro+"beginTableau("+nmr+")"+
+"beginTableau("+nmr+")"+
l0+
lsi+lsf+"
endTableau;
@@ -1876,11 +1876,12 @@ fclose(sortie);
\begin{VerbatimOut}{XcasTVP.cxx}
TVP(L,F,nom,nomv,ff,ftt,trigo,nmr):={
-//local Z,LLL,FFF,nl,fp,f,S,d,t,ns,k,m,x,j,kk,nz,u,l0;
+
nl:=size(L);
fp:=[];
S:=[];
-f:=ff;
+f:=[unapply(ff[0],x),unapply(ff[1],x)];
+fp:=[function_diff(f[0]),function_diff(f[1])];
Z:=[];
LLL:=[];
@@ -1889,13 +1890,12 @@ all_trig_solutions:=1;
reset_solve_counter(-1,-1);
for(d:=0;d<=1;d++){
-f:=subst(f,f[d]=unapply(f[d],t));
-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(SS);
+
for(k:=0;k<ns;k++){
if(trigo==t){
m:=0;
@@ -2048,7 +2048,7 @@ beginTableau("+nmr+")"+
endTableau;
";}else{
-intro+"beginTableau("+nmr+")"+
+"beginTableau("+nmr+")"+
l0+
lsi[0]+lsf[0]+lsi[1]+lsf[1]+"
endTableau;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 02:28:31 +0000