diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/profcollege/PfCConversion.tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/profcollege/PfCConversion.tex | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCConversion.tex b/Master/texmf-dist/tex/latex/profcollege/PfCConversion.tex index 78fa6d03517..e6ed80f0125 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCConversion.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCConversion.tex @@ -1,7 +1,10 @@ -\setKVdefault[ClesConversion]{Longueur,Aire=false,Vol=false,Masses=false,Capas=false,Sans=false,Complete=40pt}% +\setKVdefault[ClesConversion]{Longueur,Aire=false,Vol=false,Masses=false,Capas=false,Sans=false,Completes=false}% +\defKV[ClesConversion]{Complete=\setKV[ClesConversion]{Completes}}% \defKV[ClesConversion]{Masse=\setKV[ClesConversion]{Longueur=false}\setKV[ClesConversion]{Masses}}% \defKV[ClesConversion]{Capa=\setKV[ClesConversion]{Longueur=false}\setKV[ClesConversion]{Capas}}% +\newlength{\PfCConversionLongueur}% + \NewDocumentCommand\ChoixUniteD{m}{% \IfStrEqCase{#1}{% {G}{\DeclareSIUnit{\TempoPrefixeD}{\giga}\xdef\ExposantD{9}}% @@ -41,21 +44,21 @@ \NewDocumentCommand\Convertir{somm}{% \useKVdefault[ClesConversion]% \setKV[ClesConversion]{#2}% - \StrBefore{#3}{>}[\PrefixeDepart] - \StrBehind{#3}{>}[\PrefixeArrivee] + \StrBefore{#3}{>}[\PrefixeDepart]% + \StrBehind{#3}{>}[\PrefixeArrivee]% \ChoixUniteD{\PrefixeDepart}% \ChoixUniteA{\PrefixeArrivee}% \ifboolKV[ClesConversion]{Aire}{% \DeclareSIUnit{\TempoAvant}{\square}% \DeclareSIUnit{\TempoBase}{\meter} - \xdef\PfCConvExposant{2} + \xdef\PfCConvExposant{2}% }{\ifboolKV[ClesConversion]{Vol}{% \DeclareSIUnit{\TempoAvant}{\cubic}% \DeclareSIUnit{\TempoBase}{\meter} - \xdef\PfCConvExposant{3} + \xdef\PfCConvExposant{3}% }{% \DeclareSIUnit{\TempoAvant}{}% - \xdef\PfCConvExposant{1} + \xdef\PfCConvExposant{1}% }% }% \ifboolKV[ClesConversion]{Masses}{% @@ -67,14 +70,14 @@ \ifboolKV[ClesConversion]{Capas}{% \DeclareSIUnit{\TempoBase}{\liter}% }{}% - \ensuremath{ + \ensuremath{% \IfBooleanTF{#1}{% \IfStrEq{\PrefixeDepart}{t}{\DeclareSIUnit{\TempoBase}{\relax}}{}\IfStrEq{\PrefixeDepart}{q}{\DeclareSIUnit{\TempoBase}{\relax}}{} \SI{#4}{\TempoAvant\TempoPrefixeD\TempoBase} \IfStrEq{\PrefixeDepart}{t}{\DeclareSIUnit{\TempoBase}{\gram}}{}\IfStrEq{\PrefixeDepart}{q}{\DeclareSIUnit{\TempoBase}{\gram}}{} = \IfStrEq{\PrefixeArrivee}{t}{\DeclareSIUnit{\TempoBase}{\relax}}{}\IfStrEq{\PrefixeArrivee}{q}{\DeclareSIUnit{\TempoBase}{\relax}}{} - \PointsSuspension{\fpeval{#4*(10**((\ExposantD-(\ExposantA))*\PfCConvExposant))}\fpeval{#4*(10**((\ExposantD-(\ExposantA))*\PfCConvExposant))}}~\si{\TempoAvant\TempoPrefixeA\TempoBase} + \ifboolKV[ClesConversion]{Completes}{\setlength{\PfCConversionLongueur}{\useKV[ClesConversion]{Complete}}\pointilles[\PfCConversionLongueur]}{\PointsSuspension{\fpeval{#4*(10**((\ExposantD-(\ExposantA))*\PfCConvExposant))}\fpeval{#4*(10**((\ExposantD-(\ExposantA))*\PfCConvExposant))}}}~\si{\TempoAvant\TempoPrefixeA\TempoBase} \IfStrEq{\PrefixeArrivee}{t}{\DeclareSIUnit{\TempoBase}{\gram}}{}\IfStrEq{\PrefixeArrivee}{q}{\DeclareSIUnit{\TempoBase}{\gram}}{} }{% \ifboolKV[ClesConversion]{Sans}{% |