From de252d25752922eade4f5921dc772887abba81dc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 22 Jun 2009 23:30:24 +0000 Subject: tdsfrmath 1.3 (22jun09) git-svn-id: svn://tug.org/texlive/trunk@13896 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/tdsfrmath/suite.sto | 12 ++-- Master/texmf-dist/tex/latex/tdsfrmath/taupe.sto | 10 +-- .../texmf-dist/tex/latex/tdsfrmath/tdsfrmath.sty | 74 ++++++++++++---------- 3 files changed, 54 insertions(+), 42 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tdsfrmath') diff --git a/Master/texmf-dist/tex/latex/tdsfrmath/suite.sto b/Master/texmf-dist/tex/latex/tdsfrmath/suite.sto index 33f7d338a6f..5ea4622588f 100644 --- a/Master/texmf-dist/tex/latex/tdsfrmath/suite.sto +++ b/Master/texmf-dist/tex/latex/tdsfrmath/suite.sto @@ -20,19 +20,19 @@ %% and version 1.2 or later is part of all distributions of LaTeX version %% 1999/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\def\fileversion{v1.2} -\def\filedate{2008/09/17} +\def\fileversion{v1.3} +\def\filedate{2009/06/22} \ProvidesFile{suite.sto}% [\filedate\space\fileversion\space Pour tdsfrmath -- option suite] \ifTdSM@suitedeco -\newcommandx\suite[2][1=\N,2=u]{\ensuremath{\parent{{#2}_{n}}_{#1}}} +\newcommandx\suite[2][1=\N,2=u]{\ensuremath{\parent{{#2}_{n}}_{#1}}\xspace} \newcommandx\suitar[6][1=\N,2=u,4=0,6={}]{% \suite[#1][#2]#6 la suite arithm\'etique de raison % $r = #3$ et de premier terme $#2_{#4}=#5$} \newcommandx\suitgeo[6][1=\N,2=u,4=0,6={}]{% \suite*[#1][#2]#6 la suite g\'eom\'etrique de raison % $q = #3$ et de premier terme $#2_{#4}=#5$} -\WithSuffix\newcommand\suite*[1][u]{\parent{{#1}_{n}}} +\WithSuffix\newcommand\suite*[1][u]{\parent{{#1}_{n}}\xspace} \WithSuffix\newcommandx\suitar*[5][1=u,3=0,5={}]{% \suite*[#1]#5 la suite arithm\'etique de raison % $r = #2$ et de premier terme $#1_{#3}=#4$} @@ -40,7 +40,7 @@ \suite*[#1]#5 la suite g\'eom\'etrique de raison % $q = #2$ et de premier terme $#1_{#3}=#4$} \else -\newcommand\suite[1][u]{\parent{{#1}_{n}}} +\newcommand\suite[1][u]{\parent{{#1}_{n}}\xspace} \newcommandx\suitar[5][1=u,3=0,5={}]{% \suite[#1]#5 la suite arithm\'etique de raison % $r = #2$ et de premier terme $#1_{#3}=#4$} @@ -48,7 +48,7 @@ \suite[#1]#5 la suite g\'eom\'etrique de raison % $q = #2$ et de premier terme $#1_{#3}=#4$} \WithSuffix\newcommandx\suite*[2][1=\N,2=u]{% - \ensuremath{\suite[#2]_{#1}}} + \ensuremath{\suite[#2]_{#1}}\xspace} \WithSuffix\newcommandx\suitar*[6][1=\N,2=u,4=0,6={}]{% \suite*[#1][#2]#6 la suite arithm\'etique de raison % $r = #3$ et de premier terme $#2_{#4}=#5$} diff --git a/Master/texmf-dist/tex/latex/tdsfrmath/taupe.sto b/Master/texmf-dist/tex/latex/tdsfrmath/taupe.sto index 3a5229b88c2..f9c1394cbff 100644 --- a/Master/texmf-dist/tex/latex/tdsfrmath/taupe.sto +++ b/Master/texmf-dist/tex/latex/tdsfrmath/taupe.sto @@ -20,8 +20,8 @@ %% and version 1.2 or later is part of all distributions of LaTeX version %% 1999/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\def\fileversion{v1.2} -\def\filedate{2008/09/17} +\def\fileversion{v1.3} +\def\filedate{2009/06/22} \ProvidesFile{taupe.sto}% [\filedate\space\fileversion\space Pour tdsfrmath -- option taupe] \newcommandx\K[2][1=1,2=X]% @@ -58,8 +58,10 @@ \newcommand*{\devlim}[2][0]{\ensuremath{\text{DL}_{#2}{\parent{#1}}}} \newcommand*{\parties}[2][-2]{% \ensuremath{\manus{p}\mspace{#1mu}\parent{{#2}}}} -\newcommand{\drv}[2]{\ensuremath{\frac{\D#1}{\D#2}}} -\newcommand{\ddrv}[2]{\ensuremath{\dfrac{\D#1}{\D#2}}} +\newcommand{\drv}[3][***]{\ensuremath{% + \frac{\D\ifthenelse{\equal{#1}{***}}{}{^{#1}}#2}% + {\D#3\ifthenelse{\equal{#1}{***}}{}{^{#1}}}}} +\newcommand{\ddrv}[3][***]{\ensuremath{\displaystyle\drv[#1]{#2}{#3}}} \newcommandx{\interent}[4][1=1,2=2,4=2]{% \EncloreExtensible[#1]{\llbracket}{\rrbracket}% {\TdSM@dedans{#2}{#3}{#4}}} diff --git a/Master/texmf-dist/tex/latex/tdsfrmath/tdsfrmath.sty b/Master/texmf-dist/tex/latex/tdsfrmath/tdsfrmath.sty index 0f09a0111df..f79b130d079 100644 --- a/Master/texmf-dist/tex/latex/tdsfrmath/tdsfrmath.sty +++ b/Master/texmf-dist/tex/latex/tdsfrmath/tdsfrmath.sty @@ -21,19 +21,21 @@ %% 1999/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] \def\PackageName{tdsfrmath} -\def\fileversion{v1.2} -\def\filedate{2008/09/17} +\def\fileversion{v1.3} +\def\filedate{2009/06/22} \def\fileinfo{macros pour les maths par Le TeXnicien de surface} \ProvidesPackage{tdsfrmath} [\filedate\space\fileversion\space\fileinfo] \RequirePackage{ifthen} \RequirePackage{xkeyval} +\RequirePackage{xstring} +\newcommand{\TdSM@separateur}{\string,\,} \define@choicekey*+[TdSM]{tdsfrmath.sty}{nupletsep}[\val\nr]% {virgule,pointvirgule}{% \ifcase\nr\relax - \newcommand{\TdSM@separateur}{\string,\,}\or - \newcommand{\TdSM@separateur}{\,\string;\,}\fi + \renewcommand{\TdSM@separateur}{\string,\,}\or + \renewcommand{\TdSM@separateur}{\,\string;\,}\fi }{% \PackageWarningNoLine{tdsfrmath}{la clef <> ne connait pas <<\val>>\MessageBreak <> en vigueur} @@ -53,22 +55,22 @@ \PackageWarningNoLine{tdsfrmath}{la clef <> ne connait pas <<\TdSM@PlaSiChoix>>\MessageBreak <> en vigueur}% \def\TdSM@PlaSiChoix{haut}} -\define@boolkey+[TdSM]{tdsfrmath.sty}[TdSM@]{CharPoCal}[]{}% +\define@boolkey+[TdSM]{tdsfrmath.sty}[TdSM@]{CharPoCal}[true]{}% {\PackageWarningNoLine{tdsfrmath}{CharPoCal attend la valeur << true >> ou << false >>}} \define@cmdkey[TdSM]{tdsfrmath.sty}[TdSM@]{calpack}[]{} \define@cmdkey[TdSM]{tdsfrmath.sty}[TdSM@]{calcomd}[]{} \define@cmdkey[TdSM]{tdsfrmath.sty}[TdSM@]{caloptn}[]{} -\define@boolkey[TdSM]{tdsfrmath.sty}[TdSM@]{CharPoGdT}[]{} +\define@boolkey[TdSM]{tdsfrmath.sty}[TdSM@]{CharPoGdT}[true]{} \define@cmdkey[TdSM]{tdsfrmath.sty}[TdSM@]{gdtpack}[]{} \define@cmdkey[TdSM]{tdsfrmath.sty}[TdSM@]{gdtcomd}[]{} \define@cmdkey[TdSM]{tdsfrmath.sty}[TdSM@]{gdtoptn}[]{} -\define@boolkey[TdSM]{tdsfrmath.sty}[TdSM@]{taupe}[]{} -\define@boolkey[TdSM]{tdsfrmath.sty}[TdSM@]{ArgArcMaj}[]{} -\define@boolkey[TdSM]{tdsfrmath.sty}[TdSM@]{suite}[]{} -\define@boolkey[TdSM]{tdsfrmath.sty}[TdSM@]{suitedeco}[]{} -\define@boolkey[TdSM]{tdsfrmath.sty}[TdSM@]{SepDefEnsExt}[]{} -\define@boolkey[TdSM]{tdsfrmath.sty}[TdSM@]{avecmathdesign}[]{} +\define@boolkey[TdSM]{tdsfrmath.sty}[TdSM@]{taupe}[true]{} +\define@boolkey[TdSM]{tdsfrmath.sty}[TdSM@]{ArgArcMaj}[true]{} +\define@boolkey[TdSM]{tdsfrmath.sty}[TdSM@]{suite}[true]{} +\define@boolkey[TdSM]{tdsfrmath.sty}[TdSM@]{suitedeco}[true]{} +\define@boolkey[TdSM]{tdsfrmath.sty}[TdSM@]{SepDefEnsExt}[true]{} +\define@boolkey[TdSM]{tdsfrmath.sty}[TdSM@]{avecmathdesign}[true]{} \ExecuteOptionsX[TdSM]{% avecmathdesign=false,% taupe=false,% @@ -197,19 +199,20 @@ \let\TdSM@PlaSiChoix=\relax \newcommandx\EnsembleDeNombre[4]{% \ensuremath{% - \grastab{#1}% - \ifthenelse{\equal{#2}{*}}{^{\ast}}{% - \ifthenelse{\equal{#2}{+}}{\TdSM@PlaceSigne{+}}{% - \ifthenelse{\equal{#2}{-}}{\TdSM@PlaceSigne{-}}{% - \ifthenelse{\equal{#2}{+*}\or\equal{#2}{*+}}{% + \grastab{#1}{% + \edef\TdSM@arg{\@firstofone#2}% + \ifthenelse{\equal{\TdSM@arg}{1}}{}{% + \ifthenelse{\equal{\TdSM@arg}{0}}{\mspace{#4mu}\left[#3\right]}{% + \ifthenelse{\equal{\TdSM@arg}{*}}{^{\ast}}{% + \ifthenelse{\equal{\TdSM@arg}{+}}{\TdSM@PlaceSigne{+}}{% + \ifthenelse{\equal{\TdSM@arg}{-}}{\TdSM@PlaceSigne{-}}{% + \ifthenelse{\equal{\TdSM@arg}{+*}\or\equal{\TdSM@arg}{*+}}{% \TdSM@Decoration{\ast}{+}}{% - \ifthenelse{\equal{#2}{-*}\or\equal{#2}{*-}}{% + \ifthenelse{\equal{\TdSM@arg}{-*}\or\equal{\TdSM@arg}{*-}}{% \TdSM@Decoration{\ast}{-}}{% - \ifthenelse{#2=1}{}{% - \ifthenelse{#2>1}{^{\number #2}}{% - \ifthenelse{#2<0}{_{\number -#2}\mspace{#4mu}\left[#3\right]}{% - [\string?\string?\string?]% - }}}}}}}}}\xspace} + \IfBeginWith{\TdSM@arg}{-}{% + _{\StrBehind{\TdSM@arg}{-}}\mspace{#4mu}\left[#3\right]}{% + ^{\TdSM@arg}}}}}}}}}}}\xspace} \newcommandx\N[2][1=1,2=X]% {\EnsembleDeNombre{N}{#1}{#2}{\TdSMReculParenthese}} \newcommandx\Z[2][1=1,2=X]% @@ -231,6 +234,9 @@ \WithSuffix\newcommand\R-{\R[-]} \WithSuffix\newcommand\R>{\R[+*]} \WithSuffix\newcommand\R<{\R[-*]} +\DeclareRobustCommand{\TdSM@Rcomplet}{\ensuremath{\overline{\R}}} +\WithSuffix\newcommand\TdSM@Rcomplet+{\ensuremath{\overline{\R+}}} +\WithSuffix\newcommand\R/{\TdSM@Rcomplet} \newcommand\TdSMnuplet[1]{\TdSM@nuplet #1 \@nil} \def\TdSM@nuplet #1#2 #3{% \ifx\@nil #3% @@ -243,18 +249,22 @@ \newboolean{TdSM@horstexterequis} \setboolean{TdSM@horstexterequis}{false} \newcommandx{\EncloreExtensible}[4][1=1]{% - \ifthenelse{#1=0} - {\setboolean{TdSM@horstexterequis}{true}} - {\setboolean{TdSM@horstexterequis}{false}} + \ifthenelse{#1=0}% + {\setboolean{TdSM@horstexterequis}{true}}% + {\setboolean{TdSM@horstexterequis}{false}}% \ifmmode\ifinner\else - \setboolean{TdSM@horstexterequis}{true} + \setboolean{TdSM@horstexterequis}{true}% \fi\else\fi {\ensuremath{% - \ifthenelse{\boolean{TdSM@horstexterequis}} - {\displaystyle\def\@v@nt{\left #2}\def\@pr@s{\right #3}} - {\ifthenelse{\equal{#2}{.}}{\def\@v@nt{\relax}}{\def\@v@nt{#2}}% - \ifthenelse{\equal{#3}{.}}{\def\@pr@s{\relax}}{\def\@pr@s{#3}}} - \@v@nt #4 \@pr@s}}} + \ifthenelse{\boolean{TdSM@horstexterequis}}% + {\displaystyle\def\TdS@v@nt{\left #2}\def\TdS@pr@s{\right #3}}% + {\ifthenelse{\equal{#2}{.}}% + {\def\TdS@v@nt{\relax}}% + {\def\TdS@v@nt{\mathopen#2}}% + \ifthenelse{\equal{#3}{.}}% + {\def\TdS@pr@s{\relax}} + {\def\TdS@pr@s{\mathclose#3}}}% + \TdS@v@nt #4 \TdS@pr@s}}} \newcommandx{\parent}[2][1=1]{\EncloreExtensible[#1]{(}{)}{#2}} \newcommandx{\accol}[2][1=1]{\EncloreExtensible[#1]{\{}{\}}{#2}} \newcommandx{\crochet}[2][1=1]{\EncloreExtensible[#1]{[}{]}{#2}} -- cgit v1.2.3