From 385afb0fdaada6fc33d842f965b21d9e058a2a94 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 2 Dec 2009 23:58:59 +0000 Subject: tablor 4.06-c (1dec09) git-svn-id: svn://tug.org/texlive/trunk@16271 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/tablor/tablor.sty | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tablor/tablor.sty') 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