diff options
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/actuarialsymbol/actuarialsymbol.sty | 190 |
1 files changed, 96 insertions, 94 deletions
diff --git a/Master/texmf-dist/tex/latex/actuarialsymbol/actuarialsymbol.sty b/Master/texmf-dist/tex/latex/actuarialsymbol/actuarialsymbol.sty index 3180bc68f50..2cae4d7fe79 100644 --- a/Master/texmf-dist/tex/latex/actuarialsymbol/actuarialsymbol.sty +++ b/Master/texmf-dist/tex/latex/actuarialsymbol/actuarialsymbol.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2017 David Beauchemin, Vincent Goulet +%% Copyright (C) 2019 David Beauchemin, Vincent Goulet %% %% This file may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c of this @@ -28,7 +28,7 @@ %% This work consists of actuarialsymbol.dtx and the derived files. %% \NeedsTeXFormat{LaTeX2e}[2009/09/24] -\ProvidesPackage{actuarialsymbol}[2017/06/14 v1.0a Actuarial symbols] +\ProvidesPackage{actuarialsymbol}[2019/06/13 v1.1 Actuarial symbols] \RequirePackage{amsmath} \RequirePackage{actuarialangle} \newif\ifacts@alignpreced \acts@alignprecedfalse @@ -37,77 +37,79 @@ \DeclareOption{compactpreced}{\acts@compactprecedtrue} \ProcessOptions \DeclareRobustCommand{\actsymb}{\acts@actsymb} -\newcommand\acts@actsymb{% - \@ifnextchar[{\acts@@actsymb}% - {\acts@@actsymb[]}} -\newcommand\acts@@actsymb{} +\newcommand*\acts@actsymb{% + \new@ifnextchar[{\acts@@actsymb}% + {\acts@@actsymb[]}} +\newcommand*\acts@@actsymb{} \def\acts@@actsymb[#1]{% - \@ifnextchar[{\acts@@@actsymb[#1]}% - {\acts@@@actsymb[#1][]}} -\newcommand\acts@@@actsymb{} + \new@ifnextchar[{\acts@@@actsymb[#1]}% + {\acts@@@actsymb[#1][]}} +\newcommand*\acts@@@actsymb{} \def\acts@@@actsymb[#1][#2]{% - \@ifnextchar[{\acts@@@@actsymb[#1][#2]}% - {\acts@@@@actsymb[#1][#2][]}} -\newcommand\acts@@@@actsymb{} + \new@ifnextchar[{\acts@@@@actsymb[#1][#2]}% + {\acts@@@@actsymb[#1][#2][]}} +\newcommand*\acts@@@@actsymb{} \def\acts@@@@actsymb[#1][#2][#3]#4#5{% - \@ifnextchar[{\@actsymbol[#1][#2][#3]{#4}{#5}}% - {\@actsymbol[#1][#2][#3]{#4}{#5}[]}} -\def\@actsymbol[#1][#2][#3]#4#5[#6]{ - \@mathmeasure\z@\displaystyle{#3} - \@mathmeasure\@ne\scriptstyle{#1} - \@mathmeasure\tw@\scriptstyle{#2} - \@mathmeasure\thr@@\scriptstyle{#5} - \@mathmeasure4\scriptstyle{#6} - \mathord{} - \ifdim \wd\tw@>\z@ \ifdim \wd\tw@>\wd\@ne - \setbox\@ne\hbox to\wd\tw@{\hfil\unhbox\@ne} + \new@ifnextchar[{\@actsymbol[#1][#2][#3]{#4}{#5}}% + {\@actsymbol[#1][#2][#3]{#4}{#5}[]}} +\newcommand*\@actsymbol{} +\def\@actsymbol[#1][#2][#3]#4#5[#6]{% + \@mathmeasure\z@\displaystyle{#3}% + \@mathmeasure\tw@\scriptstyle{#1}% + \@mathmeasure4\scriptstyle{#2}% + \@mathmeasure6\scriptstyle{#5}% + \@mathmeasure8\scriptstyle{#6}% + \mathord{}% + \ifdim \wd4>\z@ \ifdim \wd4>\wd\tw@ + \setbox\tw@\hbox to\wd4{\hfil\unhbox\tw@}% \else - \setbox\tw@\hbox to\wd\@ne{\hfil\unhbox\tw@} + \setbox4\hbox to\wd\tw@{\hfil\unhbox4}% \fi\fi - \ifdim \ht\@ne>\ht\thr@@ - \ht\thr@@=\ht\@ne + \ifdim \ht\tw@>\ht6 + \ht6=\ht\tw@ \else - \ht\@ne=\ht\thr@@ + \ht\tw@=\ht6% \fi - \ifnum\ifdim \wd\tw@>\z@ 1\else\ifdim \wd4>\z@ 1\else 0\fi\fi - =1 - \ifdim \dp\tw@>\dp4 \dp4=\dp\tw@\else \dp\tw@=\dp4\fi - \mathopen{\vphantom{\textstyle #4}^{\box\tw@}\sb{\box\@ne}}% + \ifnum\ifdim \wd4>\z@ 1\else\ifdim \wd8>\z@ 1\else 0\fi\fi + =1 % + \ifdim \dp4>\dp8 \dp8=\dp4\else \dp4=\dp8\fi + \mathopen{\vphantom{\textstyle #4}\sp{\box4}\sb{\box\tw@}}% \ifdim\wd\z@=\z@ - #4^{\box4}\sb{\box\thr@@}% + #4\sp{\box8}\sb{\box6}% \else - #3^{\box4}\sb{\vphantom{\copy\thr@@}}(#4\sb{\box\thr@@})% + #3\sp{\box8}\sb{\vphantom{\copy6}}(#4\sb{\box6})% \fi \else - \mathopen{\vphantom{\textstyle #4}\sb{\box\@ne}}% + \mathopen{\vphantom{\textstyle #4}\sb{\box\tw@}}% \ifdim\wd\z@=\z@ - #4\sb{\box\thr@@}% + #4\sb{\box6}% \else - #3(#4\sb{\box\thr@@})% + #3(#4\sb{\box6})% \fi \fi } -\newcommand\@actinssc[1]{% +\newcommand*\@actinssc[1]{% \@ifstar{\acts@actsc{\bar{#1}}}% {\acts@actsc{#1}}} -\newcommand\@actannsc[1]{% +\newcommand*\@actannsc[1]{% \@ifstar{\@ifstar{\acts@actsc{\ddot{#1}}}% - {\acts@actsc{\bar{#1}}}} + {\acts@actsc{\bar{#1}}}}% {\acts@actsc{#1}}} -\newcommand\acts@actsc[1]{% - \@ifnextchar[{\acts@@actsc{#1}}% - {\acts@@actsc{#1}[]}} +\newcommand*\acts@actsc[1]{% + \new@ifnextchar[{\acts@@actsc{#1}}% + {\acts@@actsc{#1}[]}} +\newcommand*\@actothersc{} \let\@actothersc\acts@actsc -\newcommand\acts@@actsc{} +\newcommand*\acts@@actsc{} \def\acts@@actsc#1[#2]{% - \@ifnextchar[{\acts@@@actsc{#1}[#2]}% - {\acts@@@actsc{#1}[#2][]}} -\newcommand\acts@@@actsc{} + \new@ifnextchar[{\acts@@@actsc{#1}[#2]}% + {\acts@@@actsc{#1}[#2][]}} +\newcommand*\acts@@@actsc{} \def\acts@@@actsc#1[#2][#3]#4{% - \@ifnextchar[{\@actsymbol[#2][#3][]{#1}{#4}}% - {\@actsymbol[#2][#3][]{#1}{#4}[]}} -\DeclareRobustCommand{\lx}{\@actothersc {\ell}} -\DeclareRobustCommand{\Lx}{\@actothersc {\mathcal{L}}} + \new@ifnextchar[{\@actsymbol[#2][#3][]{#1}{#4}}% + {\@actsymbol[#2][#3][]{#1}{#4}[]}} +\DeclareRobustCommand{\lx}{\@actothersc\ell} +\DeclareRobustCommand{\Lx}{\@actothersc{\mathcal{L}}} \DeclareRobustCommand{\dx}{\@actothersc d} \DeclareRobustCommand{\Dx}{\@actothersc{\mathcal{D}}} \DeclareRobustCommand{\px}{\@actothersc p} @@ -118,91 +120,91 @@ \DeclareRobustCommand{\sx}{\@actannsc s} \DeclareRobustCommand{\aringx}{\@actothersc{\mathring{a}}} \DeclareRobustCommand{\eringx}{\@actothersc{\mathring{e}}} -\newcommand\@actpremres[1]{% +\newcommand*\@actpremres[1]{% \@ifstar{\acts@actpremres{\bar{#1}}}% {\acts@actpremres{#1}}} -\newcommand\acts@actpremres[1]{% - \@ifnextchar[{\acts@@actpremres{#1}}% - {\acts@@actpremres{#1}[]}} -\newcommand\acts@@actpremres{} +\newcommand*\acts@actpremres[1]{% + \new@ifnextchar[{\acts@@actpremres{#1}}% + {\acts@@actpremres{#1}[]}} +\newcommand*\acts@@actpremres{} \def\acts@@actpremres#1[#2]{% - \@ifnextchar[{\acts@@@actpremres{#1}[#2]}% - {\acts@@@actpremres{#1}[#2][]}} -\newcommand\acts@@@actpremres{} + \new@ifnextchar[{\acts@@@actpremres{#1}[#2]}% + {\acts@@@actpremres{#1}[#2][]}} +\newcommand*\acts@@@actpremres{} \def\acts@@@actpremres#1[#2][#3]#4{% - \@ifnextchar[{\@actsymbol[#2][#3][#1]{{#4}}{}}% - {\@actsymbol[#2][#3][#1]{{#4}}{}[]}} + \new@ifnextchar[{\@actsymbol[#2][#3][#1]{{#4}}{}}% + {\@actsymbol[#2][#3][#1]{{#4}}{}[]}} \DeclareRobustCommand{\Px}{\@actothersc P} \DeclareRobustCommand{\Vx}{\@actothersc V} \DeclareRobustCommand{\Wx}{\@actothersc W} \DeclareRobustCommand{\premium}{\@actpremres P} \DeclareRobustCommand{\reserve}{\@actpremres V} \DeclareRobustCommand{\paidup}{\@actpremres W} -\DeclareRobustCommand{\term}[2]{\itop{#1}:\angl{#2}} -\DeclareRobustCommand{\termxn}{{\itop{x}:\angln}} -\DeclareRobustCommand{\pureendow}[2]{#1:\itop{\angl{#2}}} -\DeclareRobustCommand{\pureendowxn}{{x:\itop{\angln}}} -\DeclareRobustCommand{\endow}[2]{#1:\angl{#2}} -\DeclareRobustCommand{\endowxn}{{x:\angln}} +\DeclareRobustCommand{\term}[2]{\itop{#1}{:}\angl{#2}} +\DeclareRobustCommand{\termxn}{{\itop{x}{:}\angln}} +\DeclareRobustCommand{\pureendow}[2]{#1{:}\itop{\angl{#2}}} +\DeclareRobustCommand{\pureendowxn}{{x{:}\itop{\angln}}} +\DeclareRobustCommand{\endow}[2]{#1{:}\angl{#2}} +\DeclareRobustCommand{\endowxn}{{x{:}\angln}} \let\joint\overline \newlength{\twoletkern} -\setlength{\twoletkern}{1.2pt} +\setlength{\twoletkern}{0.1em} \DeclareRobustCommand{\twoletsymb}[3][\twoletkern]{(#2\kern-#1#3)} -\newcommand\@twoletinssc[3][\twoletkern]{% +\newcommand*\@twoletinssc[3][\twoletkern]{% \@ifstar{\twoletsymb[#1]{#2}{\bar{#3}}}% {\twoletsymb[#1]{#2}{#3}}} -\newcommand\@twoletannsc[3][\twoletkern]{% +\newcommand*\@twoletannsc[3][\twoletkern]{% \@ifstar{\@ifstar{\twoletsymb[#1]{#2}{\ddot{#3}}}% {\twoletsymb[#1]{#2}{\bar{#3}}}}% {\twoletsymb[#1]{#2}{#3}}} -\newcommand{\IA}{\@twoletinssc IA} -\newcommand{\IbA}{\@twoletinssc{\bar{I}}A} -\newcommand{\ImA}{\@twoletinssc{I^{(m)}}A} -\newcommand{\DA}{\@twoletinssc DA} -\newcommand{\DbA}{\@twoletinssc{\bar{D}}A} -\newcommand{\DmA}{\@twoletinssc{D^{(m)}}A} -\newcommand{\Ia}{\@twoletannsc[0.5\twoletkern]Ia} -\newcommand{\Is}{\@twoletannsc[0.5\twoletkern]Is} -\newcommand{\Da}{\@twoletannsc[0.5\twoletkern]Da} -\newcommand{\Ds}{\@twoletannsc[0.5\twoletkern]Ds} +\newcommand*{\IA}{\@twoletinssc IA} +\newcommand*{\IbA}{\@twoletinssc{\bar{I}}A} +\newcommand*{\ImA}{\@twoletinssc{I^{(m)}}A} +\newcommand*{\DA}{\@twoletinssc DA} +\newcommand*{\DbA}{\@twoletinssc{\bar{D}}A} +\newcommand*{\DmA}{\@twoletinssc{D^{(m)}}A} +\newcommand*{\Ia}{\@twoletannsc[0.5\twoletkern]Ia} +\newcommand*{\Is}{\@twoletannsc[0.5\twoletkern]Is} +\newcommand*{\Da}{\@twoletannsc[0.5\twoletkern]Da} +\newcommand*{\Ds}{\@twoletannsc[0.5\twoletkern]Ds} \newlength{\nthtopsep} -\setlength{\nthtopsep}{2\p@} +\setlength{\nthtopsep}{0.18em} \newlength{\nthtopskip} -\setlength{\nthtopskip}{7\p@} +\setlength{\nthtopskip}{0.64em} \newlength{\nthbottomsep} -\setlength{\nthbottomsep}{2\p@} +\setlength{\nthbottomsep}{0.18em} \newlength{\nthbottomskip} -\setlength{\nthbottomskip}{9\p@} +\setlength{\nthbottomskip}{0.82em} \DeclareRobustCommand{\nthtop}{\@ifstar\@varnthtop\@nthtop} \DeclareRobustCommand{\nthbottom}{\@ifstar\@varnthbottom\@nthbottom} -\newcommand{\@nthtop}[3][\nthtopsep]{% +\newcommand*{\@nthtop}[3][\nthtopsep]{% \mathpalette{\@precedence t\z@{#1}{#2}}{#3}} -\newcommand{\@varnthtop}[3][\nthtopskip]{% +\newcommand*{\@varnthtop}[3][\nthtopskip]{% \mathpalette{\@precedence t{#1}\z@{#2}}{#3}} -\newcommand{\@nthbottom}[3][\nthbottomsep]{% +\newcommand*{\@nthbottom}[3][\nthbottomsep]{% \mathpalette{\@precedence b\z@{#1}{#2}}{#3}} -\newcommand{\@varnthbottom}[3][\nthbottomskip]{% +\newcommand*{\@varnthbottom}[3][\nthbottomskip]{% \mathpalette{\@precedence b{#1}\z@{#2}}{#3}} \ifacts@alignpreced \let\@nthtop\@varnthtop \let\@nthbottom\@varnthbottom \fi \ifacts@compactpreced - \let\@varnthtop\nthtop - \let\@varnthbottom\nthbottom + \let\@varnthtop\@nthtop + \let\@varnthbottom\@nthbottom \fi -\def\@precedence#1#2#3#4#5#6{% +\newcommand*\@precedence[6]{% \setbox\tw@\hbox{$\m@th#5#4$}% - \setbox\z@\hbox{$\m@th#5#6$} + \setbox\z@\hbox{$\m@th#5#6$}% \dimen@\wd\z@ \vbox to\ht\z@{% - \baselineskip=#2 - \lineskip=#3 + \baselineskip=#2% + \lineskip=#3% \lineskiplimit\lineskip \if b#1\relax\box\z@\else\vss\fi \hbox to\dimen@{\hss\unhbox\tw@\hss}% \if t#1\relax\box\z@\else\vss\fi - } + }% } \DeclareRobustCommand{\firsttop}{% \@ifstar{\@varnthtop{1}}{\@nthtop{1}}} |