physconst (27mar20)

git-svn-id: svn://tug.org/texlive/trunk@54587 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 610 insertions, 569 deletions

diff --git a/Master/texmf-dist/doc/latex/physconst/CHANGELOG.md b/Master/texmf-dist/doc/latex/physconst/CHANGELOG.md
index c765c612a02..ec507efcf56 100644
--- a/Master/texmf-dist/doc/latex/physconst/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/physconst/CHANGELOG.md
@@ -59,3 +59,18 @@ Stefan-Boltzmann constants were incorrect.
 - Corrected formatting of README file.
 - Fixed sections of macros - the individual macros were unintentionally
 subsections of the Naming Conversion
+## [1.1.1] - 2020/03/26
+### Added
+- Acknowledgements section of documentation
+- Bug reporting section of documentation
+- Prerequisites / Dependencies section of documentation
+### Changes
+- The shortconst option was having the opposite of the intended effect. When
+not specified, constants were appearing with reduced precision, and when 
+specified, constants had full precision. Fixed operation to be as intended.
+- Corrected changelog (in the .pdf) and overall version of the file to 
+correctly be 1.1.x instead of 1.0.2
+- Upgraded macros subsection to section (this was a prior bug).
+- Corrected the description of the source of astronomical constants within the
+introduction.
+
diff --git a/Master/texmf-dist/doc/latex/physconst/physconst.pdf b/Master/texmf-dist/doc/latex/physconst/physconst.pdf
index ead2ea8bc7b..a4bc4e21724 100644
--- a/Master/texmf-dist/doc/latex/physconst/physconst.pdf
+++ b/Master/texmf-dist/doc/latex/physconst/physconst.pdf
diff --git a/Master/texmf-dist/source/latex/physconst/physconst.dtx b/Master/texmf-dist/source/latex/physconst/physconst.dtx
index 7ade1893813..498759fa434 100644
--- a/Master/texmf-dist/source/latex/physconst/physconst.dtx
+++ b/Master/texmf-dist/source/latex/physconst/physconst.dtx
@@ -22,7 +22,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1994/06/01]
 %<package> \ProvidesPackage{physconst}
 %<*package>
- [2020/01/26 v1.0.2 physconst package]
+ [2020/03/26 v1.1.1 physconst package]
 %</package>
 %<package>\RequirePackage{physunits}
 %<package>\DeclareOption{shortconst}{ \typeout{physconst: reduced precision}%
@@ -72,10 +72,12 @@
 % \changes{v1.0.0}{2020/01/25}{Initial version.}
 % \changes{v1.0.1}{2020/01/25}{Add options section and fix formatting.}
 % \changes{v1.0.2}{2020/01/26}{External changes for distribution.}
+% \changes{v1.1.0}{2020/02/03}{Add Earth, Sun, Jupiter mass and radius, fix Coulomb constant.}
+% \changes{v1.1.1}{2020/03/26}{Fixed bug that shortconst was having the opposite effect than intended. Additions and corrections to documentation.}
 %
 % \GetFileInfo{physconst.dtx}
-% \DeclareRobustCommand{\fileversion}{v1.0.2}
-% \DeclareRobustCommand{\filedate}{2020/01/26}
+% \DeclareRobustCommand{\fileversion}{v1.1.1}
+% \DeclareRobustCommand{\filedate}{2020/03/26}
 %
 % \DoNotIndex{\DeclareRobustCommand,\newenvironment,\DeclareRobustCommand%
 % ,\left,\right,\textbf,\mathrm}
@@ -89,6 +91,7 @@
 % \setlength{\parskip}{1em}
 %
 % \section{Introduction}
+% \changes{v1.1.1}{2020/03/26}{Corrected source of astronomical constants within the introduction.}
 %
 %
 % This package consists of several macros that are shorthand for a variety of
@@ -101,9 +104,10 @@
 % classroom settings, homework assignments, etc.
 %
 % Most constants are taken from CODATA 2018, with the exception of the
-% astronomical objects, whose values are taken from their current wikipedia
-% entries. If you have an interest and/or need for more reliable data, 
-% please contact me.
+% astronomical objects, whose values are taken from International Astronomical
+% Union specified values. Constants that are derived from true constants, e.g.
+% the fine structure constant, have been calculated using the accepted values
+% of the fundamental constants.
 %
 %\subsection{Options}
 %
@@ -123,10 +127,32 @@
 % decimal portion of full precision constants. E.g. the elementary charge 
 % would appear as $1.602176634\times10^{-19}\Coulomb$ instead of
 % $1.602\,176\,634\times10^{-19}\Coulomb$. (notice the gaps between digits
-% in the latter.
+% in the latter.)
 %
-%\subsection{Macros}
+% \section{Prerequisites / Dependencies}
+% \changes{v1.1.1}{2020/03/26}{Added section for dependencies.}
 %
+% \subsection{General}
+% This package requires the \verb|physunits| package.%
+% \subsection{Generating Documentation}
+% \verb|hyperref|, \verb|xcolor|, \verb|mdframed|, and 
+% \verb|imakeidx| packages are required to generate the documentation
+% (this file) for this package.
+%
+% \section{Acknowledgements}
+% \changes{v1.1.1}{2020/03/26}{Added section for acknowledgements.}
+%
+% The author would like to thank Dr. Florian Leupold for catching a glaring
+% error in the shortconst option.%
+% \section{Bug Reporting}
+% \changes{v1.1.1}{2020/03/26}{Added section for bug reporting.}
+%
+% Please report bugs or issues in this package using github, at
+% \url{https://github.com/astrobit/physconst/issues}.%
+%
+%\section{Macros}
+%
+% \changes{v1.1.1}{2020/03/26}{Upgraded macros to a section instead of a subsection.}
 %
 %\subsection{Normal Macros}
 %
@@ -5633,18 +5659,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassElectron}{%
-\k@SI@short@MassElectron}
+\k@SI@full@MassElectron}
 \else
 \DeclareRobustCommand {\kMassElectron}{%
-\k@SI@full@MassElectron}
+\k@SI@short@MassElectron}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassElectron}{%
-\k@cgs@short@MassElectron}
+\k@cgs@full@MassElectron}
 \else
 \DeclareRobustCommand {\kMassElectron}{%
-\k@cgs@full@MassElectron}
+\k@cgs@short@MassElectron}
 \fi
 \fi
 %    \end{macrocode}
@@ -5664,10 +5690,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVMassElectron}{%
-\k@eV@short@MassElectron}
+\k@eV@full@MassElectron}
 \else
 \DeclareRobustCommand {\keVMassElectron}{%
-\k@eV@full@MassElectron}
+\k@eV@short@MassElectron}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -5807,18 +5833,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassElectronNumeric}{%
-\k@SI@short@MassElectronNumeric}
+\k@SI@full@MassElectronNumeric}
 \else
 \DeclareRobustCommand {\kMassElectronNumeric}{%
-\k@SI@full@MassElectronNumeric}
+\k@SI@short@MassElectronNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassElectronNumeric}{%
-\k@cgs@short@MassElectronNumeric}
+\k@cgs@full@MassElectronNumeric}
 \else
 \DeclareRobustCommand {\kMassElectronNumeric}{%
-\k@cgs@full@MassElectronNumeric}
+\k@cgs@short@MassElectronNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -5838,10 +5864,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVMassElectronNumeric}{%
-\k@eV@short@MassElectronNumeric}
+\k@eV@full@MassElectronNumeric}
 \else
 \DeclareRobustCommand {\keVMassElectronNumeric}{%
-\k@eV@full@MassElectronNumeric}
+\k@eV@short@MassElectronNumeric}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -5994,18 +6020,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassProton}{%
-\k@SI@short@MassProton}
+\k@SI@full@MassProton}
 \else
 \DeclareRobustCommand {\kMassProton}{%
-\k@SI@full@MassProton}
+\k@SI@short@MassProton}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassProton}{%
-\k@cgs@short@MassProton}
+\k@cgs@full@MassProton}
 \else
 \DeclareRobustCommand {\kMassProton}{%
-\k@cgs@full@MassProton}
+\k@cgs@short@MassProton}
 \fi
 \fi
 %    \end{macrocode}
@@ -6025,10 +6051,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVMassProton}{%
-\k@eV@short@MassProton}
+\k@eV@full@MassProton}
 \else
 \DeclareRobustCommand {\keVMassProton}{%
-\k@eV@full@MassProton}
+\k@eV@short@MassProton}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -6166,18 +6192,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassProtonNumeric}{%
-\k@SI@short@MassProtonNumeric}
+\k@SI@full@MassProtonNumeric}
 \else
 \DeclareRobustCommand {\kMassProtonNumeric}{%
-\k@SI@full@MassProtonNumeric}
+\k@SI@short@MassProtonNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassProtonNumeric}{%
-\k@cgs@short@MassProtonNumeric}
+\k@cgs@full@MassProtonNumeric}
 \else
 \DeclareRobustCommand {\kMassProtonNumeric}{%
-\k@cgs@full@MassProtonNumeric}
+\k@cgs@short@MassProtonNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -6197,10 +6223,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVMassProtonNumeric}{%
-\k@eV@short@MassProtonNumeric}
+\k@eV@full@MassProtonNumeric}
 \else
 \DeclareRobustCommand {\keVMassProtonNumeric}{%
-\k@eV@full@MassProtonNumeric}
+\k@eV@short@MassProtonNumeric}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -6355,18 +6381,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassHydrogen}{%
-\k@SI@short@MassHydrogen}
+\k@SI@full@MassHydrogen}
 \else
 \DeclareRobustCommand {\kMassHydrogen}{%
-\k@SI@full@MassHydrogen}
+\k@SI@short@MassHydrogen}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassHydrogen}{%
-\k@cgs@short@MassHydrogen}
+\k@cgs@full@MassHydrogen}
 \else
 \DeclareRobustCommand {\kMassHydrogen}{%
-\k@cgs@full@MassHydrogen}
+\k@cgs@short@MassHydrogen}
 \fi
 \fi
 %    \end{macrocode}
@@ -6386,10 +6412,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVMassHydrogen}{%
-\k@eV@short@MassHydrogen}
+\k@eV@full@MassHydrogen}
 \else
 \DeclareRobustCommand {\keVMassHydrogen}{%
-\k@eV@full@MassHydrogen}
+\k@eV@short@MassHydrogen}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -6529,18 +6555,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassHydrogenNumeric}{%
-\k@SI@short@MassHydrogenNumeric}
+\k@SI@full@MassHydrogenNumeric}
 \else
 \DeclareRobustCommand {\kMassHydrogenNumeric}{%
-\k@SI@full@MassHydrogenNumeric}
+\k@SI@short@MassHydrogenNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassHydrogenNumeric}{%
-\k@cgs@short@MassHydrogenNumeric}
+\k@cgs@full@MassHydrogenNumeric}
 \else
 \DeclareRobustCommand {\kMassHydrogenNumeric}{%
-\k@cgs@full@MassHydrogenNumeric}
+\k@cgs@short@MassHydrogenNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -6560,10 +6586,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVMassHydrogenNumeric}{%
-\k@eV@short@MassHydrogenNumeric}
+\k@eV@full@MassHydrogenNumeric}
 \else
 \DeclareRobustCommand {\keVMassHydrogenNumeric}{%
-\k@eV@full@MassHydrogenNumeric}
+\k@eV@short@MassHydrogenNumeric}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -6659,18 +6685,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassSun}{%
-\k@SI@short@MassSun}
+\k@SI@full@MassSun}
 \else
 \DeclareRobustCommand {\kMassSun}{%
-\k@SI@full@MassSun}
+\k@SI@short@MassSun}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassSun}{%
-\k@cgs@short@MassSun}
+\k@cgs@full@MassSun}
 \else
 \DeclareRobustCommand {\kMassSun}{%
-\k@cgs@full@MassSun}
+\k@cgs@short@MassSun}
 \fi
 \fi
 %    \end{macrocode}
@@ -6759,18 +6785,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassSunNumeric}{%
-\k@SI@short@MassSunNumeric}
+\k@SI@full@MassSunNumeric}
 \else
 \DeclareRobustCommand {\kMassSunNumeric}{%
-\k@SI@full@MassSunNumeric}
+\k@SI@short@MassSunNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassSunNumeric}{%
-\k@cgs@short@MassSunNumeric}
+\k@cgs@full@MassSunNumeric}
 \else
 \DeclareRobustCommand {\kMassSunNumeric}{%
-\k@cgs@full@MassSunNumeric}
+\k@cgs@short@MassSunNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -6828,10 +6854,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassEarth}{%
-\k@short@MassEarth}
+\k@full@MassEarth}
 \else
 \DeclareRobustCommand {\kMassEarth}{%
-\k@full@MassEarth}
+\k@short@MassEarth}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -6885,10 +6911,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassEarthNumeric}{%
-\k@short@MassEarthNumeric}
+\k@full@MassEarthNumeric}
 \else
 \DeclareRobustCommand {\kMassEarthNumeric}{%
-\k@full@MassEarthNumeric}
+\k@short@MassEarthNumeric}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -6946,10 +6972,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassJupiter}{%
-\k@short@MassJupiter}
+\k@full@MassJupiter}
 \else
 \DeclareRobustCommand {\kMassJupiter}{%
-\k@full@MassJupiter}
+\k@short@MassJupiter}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -7003,10 +7029,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassJupiterNumeric}{%
-\k@short@MassJupiterNumeric}
+\k@full@MassJupiterNumeric}
 \else
 \DeclareRobustCommand {\kMassJupiterNumeric}{%
-\k@full@MassJupiterNumeric}
+\k@short@MassJupiterNumeric}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -7161,18 +7187,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassAMU}{%
-\k@SI@short@MassAMU}
+\k@SI@full@MassAMU}
 \else
 \DeclareRobustCommand {\kMassAMU}{%
-\k@SI@full@MassAMU}
+\k@SI@short@MassAMU}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassAMU}{%
-\k@cgs@short@MassAMU}
+\k@cgs@full@MassAMU}
 \else
 \DeclareRobustCommand {\kMassAMU}{%
-\k@cgs@full@MassAMU}
+\k@cgs@short@MassAMU}
 \fi
 \fi
 %    \end{macrocode}
@@ -7192,10 +7218,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVMassAMU}{%
-\k@eV@short@MassAMU}
+\k@eV@full@MassAMU}
 \else
 \DeclareRobustCommand {\keVMassAMU}{%
-\k@eV@full@MassAMU}
+\k@eV@short@MassAMU}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -7335,18 +7361,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassAMUNumeric}{%
-\k@SI@short@MassAMUNumeric}
+\k@SI@full@MassAMUNumeric}
 \else
 \DeclareRobustCommand {\kMassAMUNumeric}{%
-\k@SI@full@MassAMUNumeric}
+\k@SI@short@MassAMUNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassAMUNumeric}{%
-\k@cgs@short@MassAMUNumeric}
+\k@cgs@full@MassAMUNumeric}
 \else
 \DeclareRobustCommand {\kMassAMUNumeric}{%
-\k@cgs@full@MassAMUNumeric}
+\k@cgs@short@MassAMUNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -7366,10 +7392,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVMassAMUNumeric}{%
-\k@eV@short@MassAMUNumeric}
+\k@eV@full@MassAMUNumeric}
 \else
 \DeclareRobustCommand {\keVMassAMUNumeric}{%
-\k@eV@full@MassAMUNumeric}
+\k@eV@short@MassAMUNumeric}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -7470,18 +7496,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeFundamental}{%
-\k@SI@short@ChargeFundamental}
+\k@SI@full@ChargeFundamental}
 \else
 \DeclareRobustCommand {\kChargeFundamental}{%
-\k@SI@full@ChargeFundamental}
+\k@SI@short@ChargeFundamental}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeFundamental}{%
-\k@cgs@short@ChargeFundamental}
+\k@cgs@full@ChargeFundamental}
 \else
 \DeclareRobustCommand {\kChargeFundamental}{%
-\k@cgs@full@ChargeFundamental}
+\k@cgs@short@ChargeFundamental}
 \fi
 \fi
 %    \end{macrocode}
@@ -7572,18 +7598,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeFundamentalNumeric}{%
-\k@SI@short@ChargeFundamentalNumeric}
+\k@SI@full@ChargeFundamentalNumeric}
 \else
 \DeclareRobustCommand {\kChargeFundamentalNumeric}{%
-\k@SI@full@ChargeFundamentalNumeric}
+\k@SI@short@ChargeFundamentalNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeFundamentalNumeric}{%
-\k@cgs@short@ChargeFundamentalNumeric}
+\k@cgs@full@ChargeFundamentalNumeric}
 \else
 \DeclareRobustCommand {\kChargeFundamentalNumeric}{%
-\k@cgs@full@ChargeFundamentalNumeric}
+\k@cgs@short@ChargeFundamentalNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -7682,18 +7708,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeElectron}{%
-\k@SI@short@ChargeElectron}
+\k@SI@full@ChargeElectron}
 \else
 \DeclareRobustCommand {\kChargeElectron}{%
-\k@SI@full@ChargeElectron}
+\k@SI@short@ChargeElectron}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeElectron}{%
-\k@cgs@short@ChargeElectron}
+\k@cgs@full@ChargeElectron}
 \else
 \DeclareRobustCommand {\kChargeElectron}{%
-\k@cgs@full@ChargeElectron}
+\k@cgs@short@ChargeElectron}
 \fi
 \fi
 %    \end{macrocode}
@@ -7784,18 +7810,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeElectronNumeric}{%
-\k@SI@short@ChargeElectronNumeric}
+\k@SI@full@ChargeElectronNumeric}
 \else
 \DeclareRobustCommand {\kChargeElectronNumeric}{%
-\k@SI@full@ChargeElectronNumeric}
+\k@SI@short@ChargeElectronNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeElectronNumeric}{%
-\k@cgs@short@ChargeElectronNumeric}
+\k@cgs@full@ChargeElectronNumeric}
 \else
 \DeclareRobustCommand {\kChargeElectronNumeric}{%
-\k@cgs@full@ChargeElectronNumeric}
+\k@cgs@short@ChargeElectronNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -7894,18 +7920,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeProton}{%
-\k@SI@short@ChargeProton}
+\k@SI@full@ChargeProton}
 \else
 \DeclareRobustCommand {\kChargeProton}{%
-\k@SI@full@ChargeProton}
+\k@SI@short@ChargeProton}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeProton}{%
-\k@cgs@short@ChargeProton}
+\k@cgs@full@ChargeProton}
 \else
 \DeclareRobustCommand {\kChargeProton}{%
-\k@cgs@full@ChargeProton}
+\k@cgs@short@ChargeProton}
 \fi
 \fi
 %    \end{macrocode}
@@ -7996,18 +8022,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeProtonNumeric}{%
-\k@SI@short@ChargeProtonNumeric}
+\k@SI@full@ChargeProtonNumeric}
 \else
 \DeclareRobustCommand {\kChargeProtonNumeric}{%
-\k@SI@full@ChargeProtonNumeric}
+\k@SI@short@ChargeProtonNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeProtonNumeric}{%
-\k@cgs@short@ChargeProtonNumeric}
+\k@cgs@full@ChargeProtonNumeric}
 \else
 \DeclareRobustCommand {\kChargeProtonNumeric}{%
-\k@cgs@full@ChargeProtonNumeric}
+\k@cgs@short@ChargeProtonNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -8109,18 +8135,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusBohr}{%
-\k@SI@short@RadiusBohr}
+\k@SI@full@RadiusBohr}
 \else
 \DeclareRobustCommand {\kRadiusBohr}{%
-\k@SI@full@RadiusBohr}
+\k@SI@short@RadiusBohr}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusBohr}{%
-\k@cgs@short@RadiusBohr}
+\k@cgs@full@RadiusBohr}
 \else
 \DeclareRobustCommand {\kRadiusBohr}{%
-\k@cgs@full@RadiusBohr}
+\k@cgs@short@RadiusBohr}
 \fi
 \fi
 %    \end{macrocode}
@@ -8211,18 +8237,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusBohrNumeric}{%
-\k@SI@short@RadiusBohrNumeric}
+\k@SI@full@RadiusBohrNumeric}
 \else
 \DeclareRobustCommand {\kRadiusBohrNumeric}{%
-\k@SI@full@RadiusBohrNumeric}
+\k@SI@short@RadiusBohrNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusBohrNumeric}{%
-\k@cgs@short@RadiusBohrNumeric}
+\k@cgs@full@RadiusBohrNumeric}
 \else
 \DeclareRobustCommand {\kRadiusBohrNumeric}{%
-\k@cgs@full@RadiusBohrNumeric}
+\k@cgs@short@RadiusBohrNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -8322,18 +8348,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAstronomicalUnit}{%
-\k@SI@short@AstronomicalUnit}
+\k@SI@full@AstronomicalUnit}
 \else
 \DeclareRobustCommand {\kAstronomicalUnit}{%
-\k@SI@full@AstronomicalUnit}
+\k@SI@short@AstronomicalUnit}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAstronomicalUnit}{%
-\k@cgs@short@AstronomicalUnit}
+\k@cgs@full@AstronomicalUnit}
 \else
 \DeclareRobustCommand {\kAstronomicalUnit}{%
-\k@cgs@full@AstronomicalUnit}
+\k@cgs@short@AstronomicalUnit}
 \fi
 \fi
 %    \end{macrocode}
@@ -8425,18 +8451,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAstronomicalUnitNumeric}{%
-\k@SI@short@AstronomicalUnitNumeric}
+\k@SI@full@AstronomicalUnitNumeric}
 \else
 \DeclareRobustCommand {\kAstronomicalUnitNumeric}{%
-\k@SI@full@AstronomicalUnitNumeric}
+\k@SI@short@AstronomicalUnitNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAstronomicalUnitNumeric}{%
-\k@cgs@short@AstronomicalUnitNumeric}
+\k@cgs@full@AstronomicalUnitNumeric}
 \else
 \DeclareRobustCommand {\kAstronomicalUnitNumeric}{%
-\k@cgs@full@AstronomicalUnitNumeric}
+\k@cgs@short@AstronomicalUnitNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -8535,18 +8561,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kParsec}{%
-\k@SI@short@Parsec}
+\k@SI@full@Parsec}
 \else
 \DeclareRobustCommand {\kParsec}{%
-\k@SI@full@Parsec}
+\k@SI@short@Parsec}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kParsec}{%
-\k@cgs@short@Parsec}
+\k@cgs@full@Parsec}
 \else
 \DeclareRobustCommand {\kParsec}{%
-\k@cgs@full@Parsec}
+\k@cgs@short@Parsec}
 \fi
 \fi
 %    \end{macrocode}
@@ -8637,18 +8663,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kParsecNumeric}{%
-\k@SI@short@ParsecNumeric}
+\k@SI@full@ParsecNumeric}
 \else
 \DeclareRobustCommand {\kParsecNumeric}{%
-\k@SI@full@ParsecNumeric}
+\k@SI@short@ParsecNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kParsecNumeric}{%
-\k@cgs@short@ParsecNumeric}
+\k@cgs@full@ParsecNumeric}
 \else
 \DeclareRobustCommand {\kParsecNumeric}{%
-\k@cgs@full@ParsecNumeric}
+\k@cgs@short@ParsecNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -8743,18 +8769,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusSun}{%
-\k@SI@short@RadiusSun}
+\k@SI@full@RadiusSun}
 \else
 \DeclareRobustCommand {\kRadiusSun}{%
-\k@SI@full@RadiusSun}
+\k@SI@short@RadiusSun}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusSun}{%
-\k@cgs@short@RadiusSun}
+\k@cgs@full@RadiusSun}
 \else
 \DeclareRobustCommand {\kRadiusSun}{%
-\k@cgs@full@RadiusSun}
+\k@cgs@short@RadiusSun}
 \fi
 \fi
 %    \end{macrocode}
@@ -8845,18 +8871,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusSunNumeric}{%
-\k@SI@short@RadiusSunNumeric}
+\k@SI@full@RadiusSunNumeric}
 \else
 \DeclareRobustCommand {\kRadiusSunNumeric}{%
-\k@SI@full@RadiusSunNumeric}
+\k@SI@short@RadiusSunNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusSunNumeric}{%
-\k@cgs@short@RadiusSunNumeric}
+\k@cgs@full@RadiusSunNumeric}
 \else
 \DeclareRobustCommand {\kRadiusSunNumeric}{%
-\k@cgs@full@RadiusSunNumeric}
+\k@cgs@short@RadiusSunNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -8914,10 +8940,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusEarth}{%
-\k@short@RadiusEarth}
+\k@full@RadiusEarth}
 \else
 \DeclareRobustCommand {\kRadiusEarth}{%
-\k@full@RadiusEarth}
+\k@short@RadiusEarth}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -8971,10 +8997,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusEarthNumeric}{%
-\k@short@RadiusEarthNumeric}
+\k@full@RadiusEarthNumeric}
 \else
 \DeclareRobustCommand {\kRadiusEarthNumeric}{%
-\k@full@RadiusEarthNumeric}
+\k@short@RadiusEarthNumeric}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -9031,10 +9057,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusJupiter}{%
-\k@short@RadiusJupiter}
+\k@full@RadiusJupiter}
 \else
 \DeclareRobustCommand {\kRadiusJupiter}{%
-\k@full@RadiusJupiter}
+\k@short@RadiusJupiter}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -9088,10 +9114,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusJupiterNumeric}{%
-\k@short@RadiusJupiterNumeric}
+\k@full@RadiusJupiterNumeric}
 \else
 \DeclareRobustCommand {\kRadiusJupiterNumeric}{%
-\k@full@RadiusJupiterNumeric}
+\k@short@RadiusJupiterNumeric}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -9232,18 +9258,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRydberg}{%
-\k@SI@short@Rydberg}
+\k@SI@full@Rydberg}
 \else
 \DeclareRobustCommand {\kRydberg}{%
-\k@SI@full@Rydberg}
+\k@SI@short@Rydberg}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRydberg}{%
-\k@cgs@short@Rydberg}
+\k@cgs@full@Rydberg}
 \else
 \DeclareRobustCommand {\kRydberg}{%
-\k@cgs@full@Rydberg}
+\k@cgs@short@Rydberg}
 \fi
 \fi
 %    \end{macrocode}
@@ -9261,10 +9287,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVRydberg}{%
-\k@eV@short@Rydberg}
+\k@eV@full@Rydberg}
 \else
 \DeclareRobustCommand {\keVRydberg}{%
-\k@eV@full@Rydberg}
+\k@eV@short@Rydberg}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -9390,18 +9416,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRydbergNumeric}{%
-\k@SI@short@RydbergNumeric}
+\k@SI@full@RydbergNumeric}
 \else
 \DeclareRobustCommand {\kRydbergNumeric}{%
-\k@SI@full@RydbergNumeric}
+\k@SI@short@RydbergNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRydbergNumeric}{%
-\k@cgs@short@RydbergNumeric}
+\k@cgs@full@RydbergNumeric}
 \else
 \DeclareRobustCommand {\kRydbergNumeric}{%
-\k@cgs@full@RydbergNumeric}
+\k@cgs@short@RydbergNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -9419,10 +9445,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVRydbergNumeric}{%
-\k@eV@short@RydbergNumeric}
+\k@eV@full@RydbergNumeric}
 \else
 \DeclareRobustCommand {\keVRydbergNumeric}{%
-\k@eV@full@RydbergNumeric}
+\k@eV@short@RydbergNumeric}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -9516,18 +9542,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kLuminositySun}{%
-\k@SI@short@LuminositySun}
+\k@SI@full@LuminositySun}
 \else
 \DeclareRobustCommand {\kLuminositySun}{%
-\k@SI@full@LuminositySun}
+\k@SI@short@LuminositySun}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kLuminositySun}{%
-\k@cgs@short@LuminositySun}
+\k@cgs@full@LuminositySun}
 \else
 \DeclareRobustCommand {\kLuminositySun}{%
-\k@cgs@full@LuminositySun}
+\k@cgs@short@LuminositySun}
 \fi
 \fi
 %    \end{macrocode}
@@ -9618,18 +9644,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kLuminositySunNumeric}{%
-\k@SI@short@LuminositySunNumeric}
+\k@SI@full@LuminositySunNumeric}
 \else
 \DeclareRobustCommand {\kLuminositySunNumeric}{%
-\k@SI@full@LuminositySunNumeric}
+\k@SI@short@LuminositySunNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kLuminositySunNumeric}{%
-\k@cgs@short@LuminositySunNumeric}
+\k@cgs@full@LuminositySunNumeric}
 \else
 \DeclareRobustCommand {\kLuminositySunNumeric}{%
-\k@cgs@full@LuminositySunNumeric}
+\k@cgs@short@LuminositySunNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -9732,18 +9758,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPressureAtmosphere}{%
-\k@SI@short@PressureAtmosphere}
+\k@SI@full@PressureAtmosphere}
 \else
 \DeclareRobustCommand {\kPressureAtmosphere}{%
-\k@SI@full@PressureAtmosphere}
+\k@SI@short@PressureAtmosphere}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPressureAtmosphere}{%
-\k@cgs@short@PressureAtmosphere}
+\k@cgs@full@PressureAtmosphere}
 \else
 \DeclareRobustCommand {\kPressureAtmosphere}{%
-\k@cgs@full@PressureAtmosphere}
+\k@cgs@short@PressureAtmosphere}
 \fi
 \fi
 %    \end{macrocode}
@@ -9839,18 +9865,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPressureAtmosphereNumeric}{%
-\k@SI@short@PressureAtmosphereNumeric}
+\k@SI@full@PressureAtmosphereNumeric}
 \else
 \DeclareRobustCommand {\kPressureAtmosphereNumeric}{%
-\k@SI@full@PressureAtmosphereNumeric}
+\k@SI@short@PressureAtmosphereNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPressureAtmosphereNumeric}{%
-\k@cgs@short@PressureAtmosphereNumeric}
+\k@cgs@full@PressureAtmosphereNumeric}
 \else
 \DeclareRobustCommand {\kPressureAtmosphereNumeric}{%
-\k@cgs@full@PressureAtmosphereNumeric}
+\k@cgs@short@PressureAtmosphereNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -9950,18 +9976,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPressureStandard}{%
-\k@SI@short@PressureStandard}
+\k@SI@full@PressureStandard}
 \else
 \DeclareRobustCommand {\kPressureStandard}{%
-\k@SI@full@PressureStandard}
+\k@SI@short@PressureStandard}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPressureStandard}{%
-\k@cgs@short@PressureStandard}
+\k@cgs@full@PressureStandard}
 \else
 \DeclareRobustCommand {\kPressureStandard}{%
-\k@cgs@full@PressureStandard}
+\k@cgs@short@PressureStandard}
 \fi
 \fi
 %    \end{macrocode}
@@ -10057,18 +10083,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPressureStandardNumeric}{%
-\k@SI@short@PressureStandardNumeric}
+\k@SI@full@PressureStandardNumeric}
 \else
 \DeclareRobustCommand {\kPressureStandardNumeric}{%
-\k@SI@full@PressureStandardNumeric}
+\k@SI@short@PressureStandardNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPressureStandardNumeric}{%
-\k@cgs@short@PressureStandardNumeric}
+\k@cgs@full@PressureStandardNumeric}
 \else
 \DeclareRobustCommand {\kPressureStandardNumeric}{%
-\k@cgs@full@PressureStandardNumeric}
+\k@cgs@short@PressureStandardNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -10169,18 +10195,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kSpeedLight}{%
-\k@SI@short@SpeedLight}
+\k@SI@full@SpeedLight}
 \else
 \DeclareRobustCommand {\kSpeedLight}{%
-\k@SI@full@SpeedLight}
+\k@SI@short@SpeedLight}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kSpeedLight}{%
-\k@cgs@short@SpeedLight}
+\k@cgs@full@SpeedLight}
 \else
 \DeclareRobustCommand {\kSpeedLight}{%
-\k@cgs@full@SpeedLight}
+\k@cgs@short@SpeedLight}
 \fi
 \fi
 %    \end{macrocode}
@@ -10270,18 +10296,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kSpeedLightNumeric}{%
-\k@SI@short@SpeedLightNumeric}
+\k@SI@full@SpeedLightNumeric}
 \else
 \DeclareRobustCommand {\kSpeedLightNumeric}{%
-\k@SI@full@SpeedLightNumeric}
+\k@SI@short@SpeedLightNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kSpeedLightNumeric}{%
-\k@cgs@short@SpeedLightNumeric}
+\k@cgs@full@SpeedLightNumeric}
 \else
 \DeclareRobustCommand {\kSpeedLightNumeric}{%
-\k@cgs@full@SpeedLightNumeric}
+\k@cgs@short@SpeedLightNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -10387,18 +10413,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAccelGravity}{%
-\k@SI@short@AccelGravity}
+\k@SI@full@AccelGravity}
 \else
 \DeclareRobustCommand {\kAccelGravity}{%
-\k@SI@full@AccelGravity}
+\k@SI@short@AccelGravity}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAccelGravity}{%
-\k@cgs@short@AccelGravity}
+\k@cgs@full@AccelGravity}
 \else
 \DeclareRobustCommand {\kAccelGravity}{%
-\k@cgs@full@AccelGravity}
+\k@cgs@short@AccelGravity}
 \fi
 \fi
 %    \end{macrocode}
@@ -10500,18 +10526,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAccelGravityNumeric}{%
-\k@SI@short@AccelGravityNumeric}
+\k@SI@full@AccelGravityNumeric}
 \else
 \DeclareRobustCommand {\kAccelGravityNumeric}{%
-\k@SI@full@AccelGravityNumeric}
+\k@SI@short@AccelGravityNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAccelGravityNumeric}{%
-\k@cgs@short@AccelGravityNumeric}
+\k@cgs@full@AccelGravityNumeric}
 \else
 \DeclareRobustCommand {\kAccelGravityNumeric}{%
-\k@cgs@full@AccelGravityNumeric}
+\k@cgs@short@AccelGravityNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -10616,18 +10642,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kCoulomb}{%
-\k@SI@short@Coulomb}
+\k@SI@full@Coulomb}
 \else
 \DeclareRobustCommand {\kCoulomb}{%
-\k@SI@full@Coulomb}
+\k@SI@short@Coulomb}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kCoulomb}{%
-\k@cgs@short@Coulomb}
+\k@cgs@full@Coulomb}
 \else
 \DeclareRobustCommand {\kCoulomb}{%
-\k@cgs@full@Coulomb}
+\k@cgs@short@Coulomb}
 \fi
 \fi
 %    \end{macrocode}
@@ -10723,18 +10749,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kCoulombNumeric}{%
-\k@SI@short@CoulombNumeric}
+\k@SI@full@CoulombNumeric}
 \else
 \DeclareRobustCommand {\kCoulombNumeric}{%
-\k@SI@full@CoulombNumeric}
+\k@SI@short@CoulombNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kCoulombNumeric}{%
-\k@cgs@short@CoulombNumeric}
+\k@cgs@full@CoulombNumeric}
 \else
 \DeclareRobustCommand {\kCoulombNumeric}{%
-\k@cgs@full@CoulombNumeric}
+\k@cgs@short@CoulombNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -10835,18 +10861,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumPermittivity}{%
-\k@SI@short@VacuumPermittivity}
+\k@SI@full@VacuumPermittivity}
 \else
 \DeclareRobustCommand {\kVacuumPermittivity}{%
-\k@SI@full@VacuumPermittivity}
+\k@SI@short@VacuumPermittivity}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumPermittivity}{%
-\k@cgs@short@VacuumPermittivity}
+\k@cgs@full@VacuumPermittivity}
 \else
 \DeclareRobustCommand {\kVacuumPermittivity}{%
-\k@cgs@full@VacuumPermittivity}
+\k@cgs@short@VacuumPermittivity}
 \fi
 \fi
 %    \end{macrocode}
@@ -10937,18 +10963,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumPermittivityNumeric}{%
-\k@SI@short@VacuumPermittivityNumeric}
+\k@SI@full@VacuumPermittivityNumeric}
 \else
 \DeclareRobustCommand {\kVacuumPermittivityNumeric}{%
-\k@SI@full@VacuumPermittivityNumeric}
+\k@SI@short@VacuumPermittivityNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumPermittivityNumeric}{%
-\k@cgs@short@VacuumPermittivityNumeric}
+\k@cgs@full@VacuumPermittivityNumeric}
 \else
 \DeclareRobustCommand {\kVacuumPermittivityNumeric}{%
-\k@cgs@full@VacuumPermittivityNumeric}
+\k@cgs@short@VacuumPermittivityNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -11054,18 +11080,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumPermeability}{%
-\k@SI@short@VacuumPermeability}
+\k@SI@full@VacuumPermeability}
 \else
 \DeclareRobustCommand {\kVacuumPermeability}{%
-\k@SI@full@VacuumPermeability}
+\k@SI@short@VacuumPermeability}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumPermeability}{%
-\k@cgs@short@VacuumPermeability}
+\k@cgs@full@VacuumPermeability}
 \else
 \DeclareRobustCommand {\kVacuumPermeability}{%
-\k@cgs@full@VacuumPermeability}
+\k@cgs@short@VacuumPermeability}
 \fi
 \fi
 %    \end{macrocode}
@@ -11161,18 +11187,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumPermeabilityNumeric}{%
-\k@SI@short@VacuumPermeabilityNumeric}
+\k@SI@full@VacuumPermeabilityNumeric}
 \else
 \DeclareRobustCommand {\kVacuumPermeabilityNumeric}{%
-\k@SI@full@VacuumPermeabilityNumeric}
+\k@SI@short@VacuumPermeabilityNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumPermeabilityNumeric}{%
-\k@cgs@short@VacuumPermeabilityNumeric}
+\k@cgs@full@VacuumPermeabilityNumeric}
 \else
 \DeclareRobustCommand {\kVacuumPermeabilityNumeric}{%
-\k@cgs@full@VacuumPermeabilityNumeric}
+\k@cgs@short@VacuumPermeabilityNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -11231,10 +11257,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumImpedance}{%
-\k@short@VacuumImpedance}
+\k@full@VacuumImpedance}
 \else
 \DeclareRobustCommand {\kVacuumImpedance}{%
-\k@full@VacuumImpedance}
+\k@short@VacuumImpedance}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -11287,10 +11313,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumImpedanceNumeric}{%
-\k@short@VacuumImpedanceNumeric}
+\k@full@VacuumImpedanceNumeric}
 \else
 \DeclareRobustCommand {\kVacuumImpedanceNumeric}{%
-\k@full@VacuumImpedanceNumeric}
+\k@short@VacuumImpedanceNumeric}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -11424,18 +11450,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kBoltzmann}{%
-\k@SI@short@Boltzmann}
+\k@SI@full@Boltzmann}
 \else
 \DeclareRobustCommand {\kBoltzmann}{%
-\k@SI@full@Boltzmann}
+\k@SI@short@Boltzmann}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kBoltzmann}{%
-\k@cgs@short@Boltzmann}
+\k@cgs@full@Boltzmann}
 \else
 \DeclareRobustCommand {\kBoltzmann}{%
-\k@cgs@full@Boltzmann}
+\k@cgs@short@Boltzmann}
 \fi
 \fi
 %    \end{macrocode}
@@ -11453,10 +11479,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVBoltzmann}{%
-\k@eV@short@Boltzmann}
+\k@eV@full@Boltzmann}
 \else
 \DeclareRobustCommand {\keVBoltzmann}{%
-\k@eV@full@Boltzmann}
+\k@eV@short@Boltzmann}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -11581,18 +11607,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kBoltzmannNumeric}{%
-\k@SI@short@BoltzmannNumeric}
+\k@SI@full@BoltzmannNumeric}
 \else
 \DeclareRobustCommand {\kBoltzmannNumeric}{%
-\k@SI@full@BoltzmannNumeric}
+\k@SI@short@BoltzmannNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kBoltzmannNumeric}{%
-\k@cgs@short@BoltzmannNumeric}
+\k@cgs@full@BoltzmannNumeric}
 \else
 \DeclareRobustCommand {\kBoltzmannNumeric}{%
-\k@cgs@full@BoltzmannNumeric}
+\k@cgs@short@BoltzmannNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -11610,10 +11636,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVBoltzmannNumeric}{%
-\k@eV@short@BoltzmannNumeric}
+\k@eV@full@BoltzmannNumeric}
 \else
 \DeclareRobustCommand {\keVBoltzmannNumeric}{%
-\k@eV@full@BoltzmannNumeric}
+\k@eV@short@BoltzmannNumeric}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -11754,18 +11780,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPlanck}{%
-\k@SI@short@Planck}
+\k@SI@full@Planck}
 \else
 \DeclareRobustCommand {\kPlanck}{%
-\k@SI@full@Planck}
+\k@SI@short@Planck}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPlanck}{%
-\k@cgs@short@Planck}
+\k@cgs@full@Planck}
 \else
 \DeclareRobustCommand {\kPlanck}{%
-\k@cgs@full@Planck}
+\k@cgs@short@Planck}
 \fi
 \fi
 %    \end{macrocode}
@@ -11784,10 +11810,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVPlanck}{%
-\k@eV@short@Planck}
+\k@eV@full@Planck}
 \else
 \DeclareRobustCommand {\keVPlanck}{%
-\k@eV@full@Planck}
+\k@eV@short@Planck}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -11916,18 +11942,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPlanckNumeric}{%
-\k@SI@short@PlanckNumeric}
+\k@SI@full@PlanckNumeric}
 \else
 \DeclareRobustCommand {\kPlanckNumeric}{%
-\k@SI@full@PlanckNumeric}
+\k@SI@short@PlanckNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPlanckNumeric}{%
-\k@cgs@short@PlanckNumeric}
+\k@cgs@full@PlanckNumeric}
 \else
 \DeclareRobustCommand {\kPlanckNumeric}{%
-\k@cgs@full@PlanckNumeric}
+\k@cgs@short@PlanckNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -11946,10 +11972,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVPlanckNumeric}{%
-\k@eV@short@PlanckNumeric}
+\k@eV@full@PlanckNumeric}
 \else
 \DeclareRobustCommand {\keVPlanckNumeric}{%
-\k@eV@full@PlanckNumeric}
+\k@eV@short@PlanckNumeric}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -12095,18 +12121,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPlanckReduced}{%
-\k@SI@short@PlanckReduced}
+\k@SI@full@PlanckReduced}
 \else
 \DeclareRobustCommand {\kPlanckReduced}{%
-\k@SI@full@PlanckReduced}
+\k@SI@short@PlanckReduced}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPlanckReduced}{%
-\k@cgs@short@PlanckReduced}
+\k@cgs@full@PlanckReduced}
 \else
 \DeclareRobustCommand {\kPlanckReduced}{%
-\k@cgs@full@PlanckReduced}
+\k@cgs@short@PlanckReduced}
 \fi
 \fi
 %    \end{macrocode}
@@ -12126,10 +12152,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVPlanckReduced}{%
-\k@eV@short@PlanckReduced}
+\k@eV@full@PlanckReduced}
 \else
 \DeclareRobustCommand {\keVPlanckReduced}{%
-\k@eV@full@PlanckReduced}
+\k@eV@short@PlanckReduced}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -12263,18 +12289,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPlanckReducedNumeric}{%
-\k@SI@short@PlanckReducedNumeric}
+\k@SI@full@PlanckReducedNumeric}
 \else
 \DeclareRobustCommand {\kPlanckReducedNumeric}{%
-\k@SI@full@PlanckReducedNumeric}
+\k@SI@short@PlanckReducedNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPlanckReducedNumeric}{%
-\k@cgs@short@PlanckReducedNumeric}
+\k@cgs@full@PlanckReducedNumeric}
 \else
 \DeclareRobustCommand {\kPlanckReducedNumeric}{%
-\k@cgs@full@PlanckReducedNumeric}
+\k@cgs@short@PlanckReducedNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -12294,10 +12320,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVPlanckReducedNumeric}{%
-\k@eV@short@PlanckReducedNumeric}
+\k@eV@full@PlanckReducedNumeric}
 \else
 \DeclareRobustCommand {\keVPlanckReducedNumeric}{%
-\k@eV@full@PlanckReducedNumeric}
+\k@eV@short@PlanckReducedNumeric}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -12398,18 +12424,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kGravity}{%
-\k@SI@short@Gravity}
+\k@SI@full@Gravity}
 \else
 \DeclareRobustCommand {\kGravity}{%
-\k@SI@full@Gravity}
+\k@SI@short@Gravity}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kGravity}{%
-\k@cgs@short@Gravity}
+\k@cgs@full@Gravity}
 \else
 \DeclareRobustCommand {\kGravity}{%
-\k@cgs@full@Gravity}
+\k@cgs@short@Gravity}
 \fi
 \fi
 %    \end{macrocode}
@@ -12505,18 +12531,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kGravityNumeric}{%
-\k@SI@short@GravityNumeric}
+\k@SI@full@GravityNumeric}
 \else
 \DeclareRobustCommand {\kGravityNumeric}{%
-\k@SI@full@GravityNumeric}
+\k@SI@short@GravityNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kGravityNumeric}{%
-\k@cgs@short@GravityNumeric}
+\k@cgs@full@GravityNumeric}
 \else
 \DeclareRobustCommand {\kGravityNumeric}{%
-\k@cgs@full@GravityNumeric}
+\k@cgs@short@GravityNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -12623,18 +12649,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kStefanBoltzmann}{%
-\k@SI@short@StefanBoltzmann}
+\k@SI@full@StefanBoltzmann}
 \else
 \DeclareRobustCommand {\kStefanBoltzmann}{%
-\k@SI@full@StefanBoltzmann}
+\k@SI@short@StefanBoltzmann}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kStefanBoltzmann}{%
-\k@cgs@short@StefanBoltzmann}
+\k@cgs@full@StefanBoltzmann}
 \else
 \DeclareRobustCommand {\kStefanBoltzmann}{%
-\k@cgs@full@StefanBoltzmann}
+\k@cgs@short@StefanBoltzmann}
 \fi
 \fi
 %    \end{macrocode}
@@ -12735,18 +12761,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kStefanBoltzmannNumeric}{%
-\k@SI@short@StefanBoltzmannNumeric}
+\k@SI@full@StefanBoltzmannNumeric}
 \else
 \DeclareRobustCommand {\kStefanBoltzmannNumeric}{%
-\k@SI@full@StefanBoltzmannNumeric}
+\k@SI@short@StefanBoltzmannNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kStefanBoltzmannNumeric}{%
-\k@cgs@short@StefanBoltzmannNumeric}
+\k@cgs@full@StefanBoltzmannNumeric}
 \else
 \DeclareRobustCommand {\kStefanBoltzmannNumeric}{%
-\k@cgs@full@StefanBoltzmannNumeric}
+\k@cgs@short@StefanBoltzmannNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -12848,18 +12874,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiation}{%
-\k@SI@short@Radiation}
+\k@SI@full@Radiation}
 \else
 \DeclareRobustCommand {\kRadiation}{%
-\k@SI@full@Radiation}
+\k@SI@short@Radiation}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiation}{%
-\k@cgs@short@Radiation}
+\k@cgs@full@Radiation}
 \else
 \DeclareRobustCommand {\kRadiation}{%
-\k@cgs@full@Radiation}
+\k@cgs@short@Radiation}
 \fi
 \fi
 %    \end{macrocode}
@@ -12955,18 +12981,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiationNumeric}{%
-\k@SI@short@RadiationNumeric}
+\k@SI@full@RadiationNumeric}
 \else
 \DeclareRobustCommand {\kRadiationNumeric}{%
-\k@SI@full@RadiationNumeric}
+\k@SI@short@RadiationNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiationNumeric}{%
-\k@cgs@short@RadiationNumeric}
+\k@cgs@full@RadiationNumeric}
 \else
 \DeclareRobustCommand {\kRadiationNumeric}{%
-\k@cgs@full@RadiationNumeric}
+\k@cgs@short@RadiationNumeric}
 \fi
 \fi
 %    \end{macrocode}
@@ -13023,10 +13049,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kFineStructure}{%
-\k@short@FineStructure}
+\k@full@FineStructure}
 \else
 \DeclareRobustCommand {\kFineStructure}{%
-\k@full@FineStructure}
+\k@short@FineStructure}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -13078,10 +13104,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kFineStructureNumeric}{%
-\k@short@FineStructureNumeric}
+\k@full@FineStructureNumeric}
 \else
 \DeclareRobustCommand {\kFineStructureNumeric}{%
-\k@full@FineStructureNumeric}
+\k@short@FineStructureNumeric}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -13138,10 +13164,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kFineStructureReciprocal}{%
-\k@short@FineStructureReciprocal}
+\k@full@FineStructureReciprocal}
 \else
 \DeclareRobustCommand {\kFineStructureReciprocal}{%
-\k@full@FineStructureReciprocal}
+\k@short@FineStructureReciprocal}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -13194,10 +13220,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kFineStructureReciprocalNumeric}{%
-\k@short@FineStructureReciprocalNumeric}
+\k@full@FineStructureReciprocalNumeric}
 \else
 \DeclareRobustCommand {\kFineStructureReciprocalNumeric}{%
-\k@full@FineStructureReciprocalNumeric}
+\k@short@FineStructureReciprocalNumeric}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -13254,10 +13280,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAvogadro}{%
-\k@short@Avogadro}
+\k@full@Avogadro}
 \else
 \DeclareRobustCommand {\kAvogadro}{%
-\k@full@Avogadro}
+\k@short@Avogadro}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -13310,10 +13336,10 @@
 %    \begin{macrocode}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAvogadroNumeric}{%
-\k@short@AvogadroNumeric}
+\k@full@AvogadroNumeric}
 \else
 \DeclareRobustCommand {\kAvogadroNumeric}{%
-\k@full@AvogadroNumeric}
+\k@short@AvogadroNumeric}
 \fi
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/tex/latex/physconst/physconst.sty b/Master/texmf-dist/tex/latex/physconst/physconst.sty
index c1231f2e241..53089d3168b 100644
--- a/Master/texmf-dist/tex/latex/physconst/physconst.sty
+++ b/Master/texmf-dist/tex/latex/physconst/physconst.sty
@@ -22,7 +22,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]
  \ProvidesPackage{physconst}
- [2020/01/26 v1.0.2 physconst package]
+ [2020/03/26 v1.1.1 physconst package]
 \RequirePackage{physunits}
 \DeclareOption{shortconst}{ \typeout{physconst: reduced precision}%
  \DeclareRobustCommand{\shortconst}{1} }
@@ -74,26 +74,26 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassElectron}{%
-\k@SI@short@MassElectron}
+\k@SI@full@MassElectron}
 \else
 \DeclareRobustCommand {\kMassElectron}{%
-\k@SI@full@MassElectron}
+\k@SI@short@MassElectron}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassElectron}{%
-\k@cgs@short@MassElectron}
+\k@cgs@full@MassElectron}
 \else
 \DeclareRobustCommand {\kMassElectron}{%
-\k@cgs@full@MassElectron}
+\k@cgs@short@MassElectron}
 \fi
 \fi
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVMassElectron}{%
-\k@eV@short@MassElectron}
+\k@eV@full@MassElectron}
 \else
 \DeclareRobustCommand {\keVMassElectron}{%
-\k@eV@full@MassElectron}
+\k@eV@short@MassElectron}
 \fi
 \DeclareRobustCommand{\k@SI@short@MassElectronNumeric}{%
 \ensuremath{%
@@ -116,26 +116,26 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassElectronNumeric}{%
-\k@SI@short@MassElectronNumeric}
+\k@SI@full@MassElectronNumeric}
 \else
 \DeclareRobustCommand {\kMassElectronNumeric}{%
-\k@SI@full@MassElectronNumeric}
+\k@SI@short@MassElectronNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassElectronNumeric}{%
-\k@cgs@short@MassElectronNumeric}
+\k@cgs@full@MassElectronNumeric}
 \else
 \DeclareRobustCommand {\kMassElectronNumeric}{%
-\k@cgs@full@MassElectronNumeric}
+\k@cgs@short@MassElectronNumeric}
 \fi
 \fi
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVMassElectronNumeric}{%
-\k@eV@short@MassElectronNumeric}
+\k@eV@full@MassElectronNumeric}
 \else
 \DeclareRobustCommand {\keVMassElectronNumeric}{%
-\k@eV@full@MassElectronNumeric}
+\k@eV@short@MassElectronNumeric}
 \fi
 \DeclareRobustCommand{\k@SI@short@MassProton}{%
 \ensuremath{%
@@ -173,26 +173,26 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassProton}{%
-\k@SI@short@MassProton}
+\k@SI@full@MassProton}
 \else
 \DeclareRobustCommand {\kMassProton}{%
-\k@SI@full@MassProton}
+\k@SI@short@MassProton}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassProton}{%
-\k@cgs@short@MassProton}
+\k@cgs@full@MassProton}
 \else
 \DeclareRobustCommand {\kMassProton}{%
-\k@cgs@full@MassProton}
+\k@cgs@short@MassProton}
 \fi
 \fi
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVMassProton}{%
-\k@eV@short@MassProton}
+\k@eV@full@MassProton}
 \else
 \DeclareRobustCommand {\keVMassProton}{%
-\k@eV@full@MassProton}
+\k@eV@short@MassProton}
 \fi
 \DeclareRobustCommand{\k@SI@short@MassProtonNumeric}{%
 \ensuremath{%
@@ -215,26 +215,26 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassProtonNumeric}{%
-\k@SI@short@MassProtonNumeric}
+\k@SI@full@MassProtonNumeric}
 \else
 \DeclareRobustCommand {\kMassProtonNumeric}{%
-\k@SI@full@MassProtonNumeric}
+\k@SI@short@MassProtonNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassProtonNumeric}{%
-\k@cgs@short@MassProtonNumeric}
+\k@cgs@full@MassProtonNumeric}
 \else
 \DeclareRobustCommand {\kMassProtonNumeric}{%
-\k@cgs@full@MassProtonNumeric}
+\k@cgs@short@MassProtonNumeric}
 \fi
 \fi
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVMassProtonNumeric}{%
-\k@eV@short@MassProtonNumeric}
+\k@eV@full@MassProtonNumeric}
 \else
 \DeclareRobustCommand {\keVMassProtonNumeric}{%
-\k@eV@full@MassProtonNumeric}
+\k@eV@short@MassProtonNumeric}
 \fi
 \DeclareRobustCommand{\k@SI@short@MassHydrogen}{%
 \ensuremath{%
@@ -272,26 +272,26 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassHydrogen}{%
-\k@SI@short@MassHydrogen}
+\k@SI@full@MassHydrogen}
 \else
 \DeclareRobustCommand {\kMassHydrogen}{%
-\k@SI@full@MassHydrogen}
+\k@SI@short@MassHydrogen}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassHydrogen}{%
-\k@cgs@short@MassHydrogen}
+\k@cgs@full@MassHydrogen}
 \else
 \DeclareRobustCommand {\kMassHydrogen}{%
-\k@cgs@full@MassHydrogen}
+\k@cgs@short@MassHydrogen}
 \fi
 \fi
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVMassHydrogen}{%
-\k@eV@short@MassHydrogen}
+\k@eV@full@MassHydrogen}
 \else
 \DeclareRobustCommand {\keVMassHydrogen}{%
-\k@eV@full@MassHydrogen}
+\k@eV@short@MassHydrogen}
 \fi
 \DeclareRobustCommand{\k@SI@short@MassHydrogenNumeric}{%
 \ensuremath{%
@@ -314,26 +314,26 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassHydrogenNumeric}{%
-\k@SI@short@MassHydrogenNumeric}
+\k@SI@full@MassHydrogenNumeric}
 \else
 \DeclareRobustCommand {\kMassHydrogenNumeric}{%
-\k@SI@full@MassHydrogenNumeric}
+\k@SI@short@MassHydrogenNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassHydrogenNumeric}{%
-\k@cgs@short@MassHydrogenNumeric}
+\k@cgs@full@MassHydrogenNumeric}
 \else
 \DeclareRobustCommand {\kMassHydrogenNumeric}{%
-\k@cgs@full@MassHydrogenNumeric}
+\k@cgs@short@MassHydrogenNumeric}
 \fi
 \fi
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVMassHydrogenNumeric}{%
-\k@eV@short@MassHydrogenNumeric}
+\k@eV@full@MassHydrogenNumeric}
 \else
 \DeclareRobustCommand {\keVMassHydrogenNumeric}{%
-\k@eV@full@MassHydrogenNumeric}
+\k@eV@short@MassHydrogenNumeric}
 \fi
 \DeclareRobustCommand{\k@SI@short@MassSun}{%
 \ensuremath{%
@@ -358,18 +358,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassSun}{%
-\k@SI@short@MassSun}
+\k@SI@full@MassSun}
 \else
 \DeclareRobustCommand {\kMassSun}{%
-\k@SI@full@MassSun}
+\k@SI@short@MassSun}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassSun}{%
-\k@cgs@short@MassSun}
+\k@cgs@full@MassSun}
 \else
 \DeclareRobustCommand {\kMassSun}{%
-\k@cgs@full@MassSun}
+\k@cgs@short@MassSun}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@MassSunNumeric}{%
@@ -387,18 +387,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassSunNumeric}{%
-\k@SI@short@MassSunNumeric}
+\k@SI@full@MassSunNumeric}
 \else
 \DeclareRobustCommand {\kMassSunNumeric}{%
-\k@SI@full@MassSunNumeric}
+\k@SI@short@MassSunNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassSunNumeric}{%
-\k@cgs@short@MassSunNumeric}
+\k@cgs@full@MassSunNumeric}
 \else
 \DeclareRobustCommand {\kMassSunNumeric}{%
-\k@cgs@full@MassSunNumeric}
+\k@cgs@short@MassSunNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@short@MassEarth}{%
@@ -412,10 +412,10 @@
 \times 10^{24}\kg}}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassEarth}{%
-\k@short@MassEarth}
+\k@full@MassEarth}
 \else
 \DeclareRobustCommand {\kMassEarth}{%
-\k@full@MassEarth}
+\k@short@MassEarth}
 \fi
 \DeclareRobustCommand{\k@short@MassEarthNumeric}{%
 \ensuremath{%
@@ -425,10 +425,10 @@
 5.972168e+24}}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassEarthNumeric}{%
-\k@short@MassEarthNumeric}
+\k@full@MassEarthNumeric}
 \else
 \DeclareRobustCommand {\kMassEarthNumeric}{%
-\k@full@MassEarthNumeric}
+\k@short@MassEarthNumeric}
 \fi
 \DeclareRobustCommand{\k@short@MassJupiter}{%
 \ensuremath{%
@@ -442,10 +442,10 @@
 \times 10^{27}\kg}}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassJupiter}{%
-\k@short@MassJupiter}
+\k@full@MassJupiter}
 \else
 \DeclareRobustCommand {\kMassJupiter}{%
-\k@full@MassJupiter}
+\k@short@MassJupiter}
 \fi
 \DeclareRobustCommand{\k@short@MassJupiterNumeric}{%
 \ensuremath{%
@@ -455,10 +455,10 @@
 1.8981246e+27}}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassJupiterNumeric}{%
-\k@short@MassJupiterNumeric}
+\k@full@MassJupiterNumeric}
 \else
 \DeclareRobustCommand {\kMassJupiterNumeric}{%
-\k@full@MassJupiterNumeric}
+\k@short@MassJupiterNumeric}
 \fi
 \DeclareRobustCommand{\k@SI@short@MassAMU}{%
 \ensuremath{%
@@ -496,26 +496,26 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassAMU}{%
-\k@SI@short@MassAMU}
+\k@SI@full@MassAMU}
 \else
 \DeclareRobustCommand {\kMassAMU}{%
-\k@SI@full@MassAMU}
+\k@SI@short@MassAMU}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassAMU}{%
-\k@cgs@short@MassAMU}
+\k@cgs@full@MassAMU}
 \else
 \DeclareRobustCommand {\kMassAMU}{%
-\k@cgs@full@MassAMU}
+\k@cgs@short@MassAMU}
 \fi
 \fi
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVMassAMU}{%
-\k@eV@short@MassAMU}
+\k@eV@full@MassAMU}
 \else
 \DeclareRobustCommand {\keVMassAMU}{%
-\k@eV@full@MassAMU}
+\k@eV@short@MassAMU}
 \fi
 \DeclareRobustCommand{\k@SI@short@MassAMUNumeric}{%
 \ensuremath{%
@@ -538,26 +538,26 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassAMUNumeric}{%
-\k@SI@short@MassAMUNumeric}
+\k@SI@full@MassAMUNumeric}
 \else
 \DeclareRobustCommand {\kMassAMUNumeric}{%
-\k@SI@full@MassAMUNumeric}
+\k@SI@short@MassAMUNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kMassAMUNumeric}{%
-\k@cgs@short@MassAMUNumeric}
+\k@cgs@full@MassAMUNumeric}
 \else
 \DeclareRobustCommand {\kMassAMUNumeric}{%
-\k@cgs@full@MassAMUNumeric}
+\k@cgs@short@MassAMUNumeric}
 \fi
 \fi
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVMassAMUNumeric}{%
-\k@eV@short@MassAMUNumeric}
+\k@eV@full@MassAMUNumeric}
 \else
 \DeclareRobustCommand {\keVMassAMUNumeric}{%
-\k@eV@full@MassAMUNumeric}
+\k@eV@short@MassAMUNumeric}
 \fi
 \DeclareRobustCommand{\k@SI@short@ChargeFundamental}{%
 \ensuremath{%
@@ -582,18 +582,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeFundamental}{%
-\k@SI@short@ChargeFundamental}
+\k@SI@full@ChargeFundamental}
 \else
 \DeclareRobustCommand {\kChargeFundamental}{%
-\k@SI@full@ChargeFundamental}
+\k@SI@short@ChargeFundamental}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeFundamental}{%
-\k@cgs@short@ChargeFundamental}
+\k@cgs@full@ChargeFundamental}
 \else
 \DeclareRobustCommand {\kChargeFundamental}{%
-\k@cgs@full@ChargeFundamental}
+\k@cgs@short@ChargeFundamental}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@ChargeFundamentalNumeric}{%
@@ -611,18 +611,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeFundamentalNumeric}{%
-\k@SI@short@ChargeFundamentalNumeric}
+\k@SI@full@ChargeFundamentalNumeric}
 \else
 \DeclareRobustCommand {\kChargeFundamentalNumeric}{%
-\k@SI@full@ChargeFundamentalNumeric}
+\k@SI@short@ChargeFundamentalNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeFundamentalNumeric}{%
-\k@cgs@short@ChargeFundamentalNumeric}
+\k@cgs@full@ChargeFundamentalNumeric}
 \else
 \DeclareRobustCommand {\kChargeFundamentalNumeric}{%
-\k@cgs@full@ChargeFundamentalNumeric}
+\k@cgs@short@ChargeFundamentalNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@ChargeElectron}{%
@@ -648,18 +648,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeElectron}{%
-\k@SI@short@ChargeElectron}
+\k@SI@full@ChargeElectron}
 \else
 \DeclareRobustCommand {\kChargeElectron}{%
-\k@SI@full@ChargeElectron}
+\k@SI@short@ChargeElectron}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeElectron}{%
-\k@cgs@short@ChargeElectron}
+\k@cgs@full@ChargeElectron}
 \else
 \DeclareRobustCommand {\kChargeElectron}{%
-\k@cgs@full@ChargeElectron}
+\k@cgs@short@ChargeElectron}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@ChargeElectronNumeric}{%
@@ -677,18 +677,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeElectronNumeric}{%
-\k@SI@short@ChargeElectronNumeric}
+\k@SI@full@ChargeElectronNumeric}
 \else
 \DeclareRobustCommand {\kChargeElectronNumeric}{%
-\k@SI@full@ChargeElectronNumeric}
+\k@SI@short@ChargeElectronNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeElectronNumeric}{%
-\k@cgs@short@ChargeElectronNumeric}
+\k@cgs@full@ChargeElectronNumeric}
 \else
 \DeclareRobustCommand {\kChargeElectronNumeric}{%
-\k@cgs@full@ChargeElectronNumeric}
+\k@cgs@short@ChargeElectronNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@ChargeProton}{%
@@ -714,18 +714,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeProton}{%
-\k@SI@short@ChargeProton}
+\k@SI@full@ChargeProton}
 \else
 \DeclareRobustCommand {\kChargeProton}{%
-\k@SI@full@ChargeProton}
+\k@SI@short@ChargeProton}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeProton}{%
-\k@cgs@short@ChargeProton}
+\k@cgs@full@ChargeProton}
 \else
 \DeclareRobustCommand {\kChargeProton}{%
-\k@cgs@full@ChargeProton}
+\k@cgs@short@ChargeProton}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@ChargeProtonNumeric}{%
@@ -743,18 +743,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeProtonNumeric}{%
-\k@SI@short@ChargeProtonNumeric}
+\k@SI@full@ChargeProtonNumeric}
 \else
 \DeclareRobustCommand {\kChargeProtonNumeric}{%
-\k@SI@full@ChargeProtonNumeric}
+\k@SI@short@ChargeProtonNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kChargeProtonNumeric}{%
-\k@cgs@short@ChargeProtonNumeric}
+\k@cgs@full@ChargeProtonNumeric}
 \else
 \DeclareRobustCommand {\kChargeProtonNumeric}{%
-\k@cgs@full@ChargeProtonNumeric}
+\k@cgs@short@ChargeProtonNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@RadiusBohr}{%
@@ -780,18 +780,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusBohr}{%
-\k@SI@short@RadiusBohr}
+\k@SI@full@RadiusBohr}
 \else
 \DeclareRobustCommand {\kRadiusBohr}{%
-\k@SI@full@RadiusBohr}
+\k@SI@short@RadiusBohr}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusBohr}{%
-\k@cgs@short@RadiusBohr}
+\k@cgs@full@RadiusBohr}
 \else
 \DeclareRobustCommand {\kRadiusBohr}{%
-\k@cgs@full@RadiusBohr}
+\k@cgs@short@RadiusBohr}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@RadiusBohrNumeric}{%
@@ -809,18 +809,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusBohrNumeric}{%
-\k@SI@short@RadiusBohrNumeric}
+\k@SI@full@RadiusBohrNumeric}
 \else
 \DeclareRobustCommand {\kRadiusBohrNumeric}{%
-\k@SI@full@RadiusBohrNumeric}
+\k@SI@short@RadiusBohrNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusBohrNumeric}{%
-\k@cgs@short@RadiusBohrNumeric}
+\k@cgs@full@RadiusBohrNumeric}
 \else
 \DeclareRobustCommand {\kRadiusBohrNumeric}{%
-\k@cgs@full@RadiusBohrNumeric}
+\k@cgs@short@RadiusBohrNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@AstronomicalUnit}{%
@@ -846,18 +846,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAstronomicalUnit}{%
-\k@SI@short@AstronomicalUnit}
+\k@SI@full@AstronomicalUnit}
 \else
 \DeclareRobustCommand {\kAstronomicalUnit}{%
-\k@SI@full@AstronomicalUnit}
+\k@SI@short@AstronomicalUnit}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAstronomicalUnit}{%
-\k@cgs@short@AstronomicalUnit}
+\k@cgs@full@AstronomicalUnit}
 \else
 \DeclareRobustCommand {\kAstronomicalUnit}{%
-\k@cgs@full@AstronomicalUnit}
+\k@cgs@short@AstronomicalUnit}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@AstronomicalUnitNumeric}{%
@@ -875,18 +875,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAstronomicalUnitNumeric}{%
-\k@SI@short@AstronomicalUnitNumeric}
+\k@SI@full@AstronomicalUnitNumeric}
 \else
 \DeclareRobustCommand {\kAstronomicalUnitNumeric}{%
-\k@SI@full@AstronomicalUnitNumeric}
+\k@SI@short@AstronomicalUnitNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAstronomicalUnitNumeric}{%
-\k@cgs@short@AstronomicalUnitNumeric}
+\k@cgs@full@AstronomicalUnitNumeric}
 \else
 \DeclareRobustCommand {\kAstronomicalUnitNumeric}{%
-\k@cgs@full@AstronomicalUnitNumeric}
+\k@cgs@short@AstronomicalUnitNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@Parsec}{%
@@ -912,18 +912,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kParsec}{%
-\k@SI@short@Parsec}
+\k@SI@full@Parsec}
 \else
 \DeclareRobustCommand {\kParsec}{%
-\k@SI@full@Parsec}
+\k@SI@short@Parsec}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kParsec}{%
-\k@cgs@short@Parsec}
+\k@cgs@full@Parsec}
 \else
 \DeclareRobustCommand {\kParsec}{%
-\k@cgs@full@Parsec}
+\k@cgs@short@Parsec}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@ParsecNumeric}{%
@@ -941,18 +941,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kParsecNumeric}{%
-\k@SI@short@ParsecNumeric}
+\k@SI@full@ParsecNumeric}
 \else
 \DeclareRobustCommand {\kParsecNumeric}{%
-\k@SI@full@ParsecNumeric}
+\k@SI@short@ParsecNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kParsecNumeric}{%
-\k@cgs@short@ParsecNumeric}
+\k@cgs@full@ParsecNumeric}
 \else
 \DeclareRobustCommand {\kParsecNumeric}{%
-\k@cgs@full@ParsecNumeric}
+\k@cgs@short@ParsecNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@RadiusSun}{%
@@ -974,18 +974,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusSun}{%
-\k@SI@short@RadiusSun}
+\k@SI@full@RadiusSun}
 \else
 \DeclareRobustCommand {\kRadiusSun}{%
-\k@SI@full@RadiusSun}
+\k@SI@short@RadiusSun}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusSun}{%
-\k@cgs@short@RadiusSun}
+\k@cgs@full@RadiusSun}
 \else
 \DeclareRobustCommand {\kRadiusSun}{%
-\k@cgs@full@RadiusSun}
+\k@cgs@short@RadiusSun}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@RadiusSunNumeric}{%
@@ -1003,18 +1003,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusSunNumeric}{%
-\k@SI@short@RadiusSunNumeric}
+\k@SI@full@RadiusSunNumeric}
 \else
 \DeclareRobustCommand {\kRadiusSunNumeric}{%
-\k@SI@full@RadiusSunNumeric}
+\k@SI@short@RadiusSunNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusSunNumeric}{%
-\k@cgs@short@RadiusSunNumeric}
+\k@cgs@full@RadiusSunNumeric}
 \else
 \DeclareRobustCommand {\kRadiusSunNumeric}{%
-\k@cgs@full@RadiusSunNumeric}
+\k@cgs@short@RadiusSunNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@short@RadiusEarth}{%
@@ -1028,10 +1028,10 @@
 \times 10^{6}\m}}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusEarth}{%
-\k@short@RadiusEarth}
+\k@full@RadiusEarth}
 \else
 \DeclareRobustCommand {\kRadiusEarth}{%
-\k@full@RadiusEarth}
+\k@short@RadiusEarth}
 \fi
 \DeclareRobustCommand{\k@short@RadiusEarthNumeric}{%
 \ensuremath{%
@@ -1041,10 +1041,10 @@
 6.3710e+06}}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusEarthNumeric}{%
-\k@short@RadiusEarthNumeric}
+\k@full@RadiusEarthNumeric}
 \else
 \DeclareRobustCommand {\kRadiusEarthNumeric}{%
-\k@full@RadiusEarthNumeric}
+\k@short@RadiusEarthNumeric}
 \fi
 \DeclareRobustCommand{\k@short@RadiusJupiter}{%
 \ensuremath{%
@@ -1057,10 +1057,10 @@
 \times 10^{7}\m}}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusJupiter}{%
-\k@short@RadiusJupiter}
+\k@full@RadiusJupiter}
 \else
 \DeclareRobustCommand {\kRadiusJupiter}{%
-\k@full@RadiusJupiter}
+\k@short@RadiusJupiter}
 \fi
 \DeclareRobustCommand{\k@short@RadiusJupiterNumeric}{%
 \ensuremath{%
@@ -1070,10 +1070,10 @@
 6.9911e+07}}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiusJupiterNumeric}{%
-\k@short@RadiusJupiterNumeric}
+\k@full@RadiusJupiterNumeric}
 \else
 \DeclareRobustCommand {\kRadiusJupiterNumeric}{%
-\k@full@RadiusJupiterNumeric}
+\k@short@RadiusJupiterNumeric}
 \fi
 \DeclareRobustCommand{\k@SI@short@Rydberg}{%
 \ensuremath{%
@@ -1108,26 +1108,26 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRydberg}{%
-\k@SI@short@Rydberg}
+\k@SI@full@Rydberg}
 \else
 \DeclareRobustCommand {\kRydberg}{%
-\k@SI@full@Rydberg}
+\k@SI@short@Rydberg}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRydberg}{%
-\k@cgs@short@Rydberg}
+\k@cgs@full@Rydberg}
 \else
 \DeclareRobustCommand {\kRydberg}{%
-\k@cgs@full@Rydberg}
+\k@cgs@short@Rydberg}
 \fi
 \fi
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVRydberg}{%
-\k@eV@short@Rydberg}
+\k@eV@full@Rydberg}
 \else
 \DeclareRobustCommand {\keVRydberg}{%
-\k@eV@full@Rydberg}
+\k@eV@short@Rydberg}
 \fi
 \DeclareRobustCommand{\k@SI@short@RydbergNumeric}{%
 \ensuremath{%
@@ -1150,26 +1150,26 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRydbergNumeric}{%
-\k@SI@short@RydbergNumeric}
+\k@SI@full@RydbergNumeric}
 \else
 \DeclareRobustCommand {\kRydbergNumeric}{%
-\k@SI@full@RydbergNumeric}
+\k@SI@short@RydbergNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRydbergNumeric}{%
-\k@cgs@short@RydbergNumeric}
+\k@cgs@full@RydbergNumeric}
 \else
 \DeclareRobustCommand {\kRydbergNumeric}{%
-\k@cgs@full@RydbergNumeric}
+\k@cgs@short@RydbergNumeric}
 \fi
 \fi
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVRydbergNumeric}{%
-\k@eV@short@RydbergNumeric}
+\k@eV@full@RydbergNumeric}
 \else
 \DeclareRobustCommand {\keVRydbergNumeric}{%
-\k@eV@full@RydbergNumeric}
+\k@eV@short@RydbergNumeric}
 \fi
 \DeclareRobustCommand{\k@SI@short@LuminositySun}{%
 \ensuremath{%
@@ -1190,18 +1190,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kLuminositySun}{%
-\k@SI@short@LuminositySun}
+\k@SI@full@LuminositySun}
 \else
 \DeclareRobustCommand {\kLuminositySun}{%
-\k@SI@full@LuminositySun}
+\k@SI@short@LuminositySun}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kLuminositySun}{%
-\k@cgs@short@LuminositySun}
+\k@cgs@full@LuminositySun}
 \else
 \DeclareRobustCommand {\kLuminositySun}{%
-\k@cgs@full@LuminositySun}
+\k@cgs@short@LuminositySun}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@LuminositySunNumeric}{%
@@ -1219,18 +1219,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kLuminositySunNumeric}{%
-\k@SI@short@LuminositySunNumeric}
+\k@SI@full@LuminositySunNumeric}
 \else
 \DeclareRobustCommand {\kLuminositySunNumeric}{%
-\k@SI@full@LuminositySunNumeric}
+\k@SI@short@LuminositySunNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kLuminositySunNumeric}{%
-\k@cgs@short@LuminositySunNumeric}
+\k@cgs@full@LuminositySunNumeric}
 \else
 \DeclareRobustCommand {\kLuminositySunNumeric}{%
-\k@cgs@full@LuminositySunNumeric}
+\k@cgs@short@LuminositySunNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@PressureAtmosphere}{%
@@ -1252,18 +1252,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPressureAtmosphere}{%
-\k@SI@short@PressureAtmosphere}
+\k@SI@full@PressureAtmosphere}
 \else
 \DeclareRobustCommand {\kPressureAtmosphere}{%
-\k@SI@full@PressureAtmosphere}
+\k@SI@short@PressureAtmosphere}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPressureAtmosphere}{%
-\k@cgs@short@PressureAtmosphere}
+\k@cgs@full@PressureAtmosphere}
 \else
 \DeclareRobustCommand {\kPressureAtmosphere}{%
-\k@cgs@full@PressureAtmosphere}
+\k@cgs@short@PressureAtmosphere}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@PressureAtmosphereNumeric}{%
@@ -1281,18 +1281,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPressureAtmosphereNumeric}{%
-\k@SI@short@PressureAtmosphereNumeric}
+\k@SI@full@PressureAtmosphereNumeric}
 \else
 \DeclareRobustCommand {\kPressureAtmosphereNumeric}{%
-\k@SI@full@PressureAtmosphereNumeric}
+\k@SI@short@PressureAtmosphereNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPressureAtmosphereNumeric}{%
-\k@cgs@short@PressureAtmosphereNumeric}
+\k@cgs@full@PressureAtmosphereNumeric}
 \else
 \DeclareRobustCommand {\kPressureAtmosphereNumeric}{%
-\k@cgs@full@PressureAtmosphereNumeric}
+\k@cgs@short@PressureAtmosphereNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@PressureStandard}{%
@@ -1314,18 +1314,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPressureStandard}{%
-\k@SI@short@PressureStandard}
+\k@SI@full@PressureStandard}
 \else
 \DeclareRobustCommand {\kPressureStandard}{%
-\k@SI@full@PressureStandard}
+\k@SI@short@PressureStandard}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPressureStandard}{%
-\k@cgs@short@PressureStandard}
+\k@cgs@full@PressureStandard}
 \else
 \DeclareRobustCommand {\kPressureStandard}{%
-\k@cgs@full@PressureStandard}
+\k@cgs@short@PressureStandard}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@PressureStandardNumeric}{%
@@ -1343,18 +1343,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPressureStandardNumeric}{%
-\k@SI@short@PressureStandardNumeric}
+\k@SI@full@PressureStandardNumeric}
 \else
 \DeclareRobustCommand {\kPressureStandardNumeric}{%
-\k@SI@full@PressureStandardNumeric}
+\k@SI@short@PressureStandardNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPressureStandardNumeric}{%
-\k@cgs@short@PressureStandardNumeric}
+\k@cgs@full@PressureStandardNumeric}
 \else
 \DeclareRobustCommand {\kPressureStandardNumeric}{%
-\k@cgs@full@PressureStandardNumeric}
+\k@cgs@short@PressureStandardNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@SpeedLight}{%
@@ -1380,18 +1380,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kSpeedLight}{%
-\k@SI@short@SpeedLight}
+\k@SI@full@SpeedLight}
 \else
 \DeclareRobustCommand {\kSpeedLight}{%
-\k@SI@full@SpeedLight}
+\k@SI@short@SpeedLight}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kSpeedLight}{%
-\k@cgs@short@SpeedLight}
+\k@cgs@full@SpeedLight}
 \else
 \DeclareRobustCommand {\kSpeedLight}{%
-\k@cgs@full@SpeedLight}
+\k@cgs@short@SpeedLight}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@SpeedLightNumeric}{%
@@ -1409,18 +1409,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kSpeedLightNumeric}{%
-\k@SI@short@SpeedLightNumeric}
+\k@SI@full@SpeedLightNumeric}
 \else
 \DeclareRobustCommand {\kSpeedLightNumeric}{%
-\k@SI@full@SpeedLightNumeric}
+\k@SI@short@SpeedLightNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kSpeedLightNumeric}{%
-\k@cgs@short@SpeedLightNumeric}
+\k@cgs@full@SpeedLightNumeric}
 \else
 \DeclareRobustCommand {\kSpeedLightNumeric}{%
-\k@cgs@full@SpeedLightNumeric}
+\k@cgs@short@SpeedLightNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@AccelGravity}{%
@@ -1442,18 +1442,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAccelGravity}{%
-\k@SI@short@AccelGravity}
+\k@SI@full@AccelGravity}
 \else
 \DeclareRobustCommand {\kAccelGravity}{%
-\k@SI@full@AccelGravity}
+\k@SI@short@AccelGravity}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAccelGravity}{%
-\k@cgs@short@AccelGravity}
+\k@cgs@full@AccelGravity}
 \else
 \DeclareRobustCommand {\kAccelGravity}{%
-\k@cgs@full@AccelGravity}
+\k@cgs@short@AccelGravity}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@AccelGravityNumeric}{%
@@ -1471,18 +1471,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAccelGravityNumeric}{%
-\k@SI@short@AccelGravityNumeric}
+\k@SI@full@AccelGravityNumeric}
 \else
 \DeclareRobustCommand {\kAccelGravityNumeric}{%
-\k@SI@full@AccelGravityNumeric}
+\k@SI@short@AccelGravityNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAccelGravityNumeric}{%
-\k@cgs@short@AccelGravityNumeric}
+\k@cgs@full@AccelGravityNumeric}
 \else
 \DeclareRobustCommand {\kAccelGravityNumeric}{%
-\k@cgs@full@AccelGravityNumeric}
+\k@cgs@short@AccelGravityNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@Coulomb}{%
@@ -1506,18 +1506,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kCoulomb}{%
-\k@SI@short@Coulomb}
+\k@SI@full@Coulomb}
 \else
 \DeclareRobustCommand {\kCoulomb}{%
-\k@SI@full@Coulomb}
+\k@SI@short@Coulomb}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kCoulomb}{%
-\k@cgs@short@Coulomb}
+\k@cgs@full@Coulomb}
 \else
 \DeclareRobustCommand {\kCoulomb}{%
-\k@cgs@full@Coulomb}
+\k@cgs@short@Coulomb}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@CoulombNumeric}{%
@@ -1535,18 +1535,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kCoulombNumeric}{%
-\k@SI@short@CoulombNumeric}
+\k@SI@full@CoulombNumeric}
 \else
 \DeclareRobustCommand {\kCoulombNumeric}{%
-\k@SI@full@CoulombNumeric}
+\k@SI@short@CoulombNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kCoulombNumeric}{%
-\k@cgs@short@CoulombNumeric}
+\k@cgs@full@CoulombNumeric}
 \else
 \DeclareRobustCommand {\kCoulombNumeric}{%
-\k@cgs@full@CoulombNumeric}
+\k@cgs@short@CoulombNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@VacuumPermittivity}{%
@@ -1574,18 +1574,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumPermittivity}{%
-\k@SI@short@VacuumPermittivity}
+\k@SI@full@VacuumPermittivity}
 \else
 \DeclareRobustCommand {\kVacuumPermittivity}{%
-\k@SI@full@VacuumPermittivity}
+\k@SI@short@VacuumPermittivity}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumPermittivity}{%
-\k@cgs@short@VacuumPermittivity}
+\k@cgs@full@VacuumPermittivity}
 \else
 \DeclareRobustCommand {\kVacuumPermittivity}{%
-\k@cgs@full@VacuumPermittivity}
+\k@cgs@short@VacuumPermittivity}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@VacuumPermittivityNumeric}{%
@@ -1603,18 +1603,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumPermittivityNumeric}{%
-\k@SI@short@VacuumPermittivityNumeric}
+\k@SI@full@VacuumPermittivityNumeric}
 \else
 \DeclareRobustCommand {\kVacuumPermittivityNumeric}{%
-\k@SI@full@VacuumPermittivityNumeric}
+\k@SI@short@VacuumPermittivityNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumPermittivityNumeric}{%
-\k@cgs@short@VacuumPermittivityNumeric}
+\k@cgs@full@VacuumPermittivityNumeric}
 \else
 \DeclareRobustCommand {\kVacuumPermittivityNumeric}{%
-\k@cgs@full@VacuumPermittivityNumeric}
+\k@cgs@short@VacuumPermittivityNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@VacuumPermeability}{%
@@ -1642,18 +1642,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumPermeability}{%
-\k@SI@short@VacuumPermeability}
+\k@SI@full@VacuumPermeability}
 \else
 \DeclareRobustCommand {\kVacuumPermeability}{%
-\k@SI@full@VacuumPermeability}
+\k@SI@short@VacuumPermeability}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumPermeability}{%
-\k@cgs@short@VacuumPermeability}
+\k@cgs@full@VacuumPermeability}
 \else
 \DeclareRobustCommand {\kVacuumPermeability}{%
-\k@cgs@full@VacuumPermeability}
+\k@cgs@short@VacuumPermeability}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@VacuumPermeabilityNumeric}{%
@@ -1671,18 +1671,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumPermeabilityNumeric}{%
-\k@SI@short@VacuumPermeabilityNumeric}
+\k@SI@full@VacuumPermeabilityNumeric}
 \else
 \DeclareRobustCommand {\kVacuumPermeabilityNumeric}{%
-\k@SI@full@VacuumPermeabilityNumeric}
+\k@SI@short@VacuumPermeabilityNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumPermeabilityNumeric}{%
-\k@cgs@short@VacuumPermeabilityNumeric}
+\k@cgs@full@VacuumPermeabilityNumeric}
 \else
 \DeclareRobustCommand {\kVacuumPermeabilityNumeric}{%
-\k@cgs@full@VacuumPermeabilityNumeric}
+\k@cgs@short@VacuumPermeabilityNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@short@VacuumImpedance}{%
@@ -1698,10 +1698,10 @@
 \times 10^{2}\Ohm}}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumImpedance}{%
-\k@short@VacuumImpedance}
+\k@full@VacuumImpedance}
 \else
 \DeclareRobustCommand {\kVacuumImpedance}{%
-\k@full@VacuumImpedance}
+\k@short@VacuumImpedance}
 \fi
 \DeclareRobustCommand{\k@short@VacuumImpedanceNumeric}{%
 \ensuremath{%
@@ -1711,10 +1711,10 @@
 3.76730313668e+02}}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kVacuumImpedanceNumeric}{%
-\k@short@VacuumImpedanceNumeric}
+\k@full@VacuumImpedanceNumeric}
 \else
 \DeclareRobustCommand {\kVacuumImpedanceNumeric}{%
-\k@full@VacuumImpedanceNumeric}
+\k@short@VacuumImpedanceNumeric}
 \fi
 \DeclareRobustCommand{\k@SI@short@Boltzmann}{%
 \ensuremath{%
@@ -1746,26 +1746,26 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kBoltzmann}{%
-\k@SI@short@Boltzmann}
+\k@SI@full@Boltzmann}
 \else
 \DeclareRobustCommand {\kBoltzmann}{%
-\k@SI@full@Boltzmann}
+\k@SI@short@Boltzmann}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kBoltzmann}{%
-\k@cgs@short@Boltzmann}
+\k@cgs@full@Boltzmann}
 \else
 \DeclareRobustCommand {\kBoltzmann}{%
-\k@cgs@full@Boltzmann}
+\k@cgs@short@Boltzmann}
 \fi
 \fi
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVBoltzmann}{%
-\k@eV@short@Boltzmann}
+\k@eV@full@Boltzmann}
 \else
 \DeclareRobustCommand {\keVBoltzmann}{%
-\k@eV@full@Boltzmann}
+\k@eV@short@Boltzmann}
 \fi
 \DeclareRobustCommand{\k@SI@short@BoltzmannNumeric}{%
 \ensuremath{%
@@ -1788,26 +1788,26 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kBoltzmannNumeric}{%
-\k@SI@short@BoltzmannNumeric}
+\k@SI@full@BoltzmannNumeric}
 \else
 \DeclareRobustCommand {\kBoltzmannNumeric}{%
-\k@SI@full@BoltzmannNumeric}
+\k@SI@short@BoltzmannNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kBoltzmannNumeric}{%
-\k@cgs@short@BoltzmannNumeric}
+\k@cgs@full@BoltzmannNumeric}
 \else
 \DeclareRobustCommand {\kBoltzmannNumeric}{%
-\k@cgs@full@BoltzmannNumeric}
+\k@cgs@short@BoltzmannNumeric}
 \fi
 \fi
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVBoltzmannNumeric}{%
-\k@eV@short@BoltzmannNumeric}
+\k@eV@full@BoltzmannNumeric}
 \else
 \DeclareRobustCommand {\keVBoltzmannNumeric}{%
-\k@eV@full@BoltzmannNumeric}
+\k@eV@short@BoltzmannNumeric}
 \fi
 \DeclareRobustCommand{\k@SI@short@Planck}{%
 \ensuremath{%
@@ -1842,26 +1842,26 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPlanck}{%
-\k@SI@short@Planck}
+\k@SI@full@Planck}
 \else
 \DeclareRobustCommand {\kPlanck}{%
-\k@SI@full@Planck}
+\k@SI@short@Planck}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPlanck}{%
-\k@cgs@short@Planck}
+\k@cgs@full@Planck}
 \else
 \DeclareRobustCommand {\kPlanck}{%
-\k@cgs@full@Planck}
+\k@cgs@short@Planck}
 \fi
 \fi
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVPlanck}{%
-\k@eV@short@Planck}
+\k@eV@full@Planck}
 \else
 \DeclareRobustCommand {\keVPlanck}{%
-\k@eV@full@Planck}
+\k@eV@short@Planck}
 \fi
 \DeclareRobustCommand{\k@SI@short@PlanckNumeric}{%
 \ensuremath{%
@@ -1884,26 +1884,26 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPlanckNumeric}{%
-\k@SI@short@PlanckNumeric}
+\k@SI@full@PlanckNumeric}
 \else
 \DeclareRobustCommand {\kPlanckNumeric}{%
-\k@SI@full@PlanckNumeric}
+\k@SI@short@PlanckNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPlanckNumeric}{%
-\k@cgs@short@PlanckNumeric}
+\k@cgs@full@PlanckNumeric}
 \else
 \DeclareRobustCommand {\kPlanckNumeric}{%
-\k@cgs@full@PlanckNumeric}
+\k@cgs@short@PlanckNumeric}
 \fi
 \fi
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVPlanckNumeric}{%
-\k@eV@short@PlanckNumeric}
+\k@eV@full@PlanckNumeric}
 \else
 \DeclareRobustCommand {\keVPlanckNumeric}{%
-\k@eV@full@PlanckNumeric}
+\k@eV@short@PlanckNumeric}
 \fi
 \DeclareRobustCommand{\k@SI@short@PlanckReduced}{%
 \ensuremath{%
@@ -1938,26 +1938,26 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPlanckReduced}{%
-\k@SI@short@PlanckReduced}
+\k@SI@full@PlanckReduced}
 \else
 \DeclareRobustCommand {\kPlanckReduced}{%
-\k@SI@full@PlanckReduced}
+\k@SI@short@PlanckReduced}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPlanckReduced}{%
-\k@cgs@short@PlanckReduced}
+\k@cgs@full@PlanckReduced}
 \else
 \DeclareRobustCommand {\kPlanckReduced}{%
-\k@cgs@full@PlanckReduced}
+\k@cgs@short@PlanckReduced}
 \fi
 \fi
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVPlanckReduced}{%
-\k@eV@short@PlanckReduced}
+\k@eV@full@PlanckReduced}
 \else
 \DeclareRobustCommand {\keVPlanckReduced}{%
-\k@eV@full@PlanckReduced}
+\k@eV@short@PlanckReduced}
 \fi
 \DeclareRobustCommand{\k@SI@short@PlanckReducedNumeric}{%
 \ensuremath{%
@@ -1980,26 +1980,26 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPlanckReducedNumeric}{%
-\k@SI@short@PlanckReducedNumeric}
+\k@SI@full@PlanckReducedNumeric}
 \else
 \DeclareRobustCommand {\kPlanckReducedNumeric}{%
-\k@SI@full@PlanckReducedNumeric}
+\k@SI@short@PlanckReducedNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kPlanckReducedNumeric}{%
-\k@cgs@short@PlanckReducedNumeric}
+\k@cgs@full@PlanckReducedNumeric}
 \else
 \DeclareRobustCommand {\kPlanckReducedNumeric}{%
-\k@cgs@full@PlanckReducedNumeric}
+\k@cgs@short@PlanckReducedNumeric}
 \fi
 \fi
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\keVPlanckReducedNumeric}{%
-\k@eV@short@PlanckReducedNumeric}
+\k@eV@full@PlanckReducedNumeric}
 \else
 \DeclareRobustCommand {\keVPlanckReducedNumeric}{%
-\k@eV@full@PlanckReducedNumeric}
+\k@eV@short@PlanckReducedNumeric}
 \fi
 \DeclareRobustCommand{\k@SI@short@Gravity}{%
 \ensuremath{%
@@ -2022,18 +2022,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kGravity}{%
-\k@SI@short@Gravity}
+\k@SI@full@Gravity}
 \else
 \DeclareRobustCommand {\kGravity}{%
-\k@SI@full@Gravity}
+\k@SI@short@Gravity}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kGravity}{%
-\k@cgs@short@Gravity}
+\k@cgs@full@Gravity}
 \else
 \DeclareRobustCommand {\kGravity}{%
-\k@cgs@full@Gravity}
+\k@cgs@short@Gravity}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@GravityNumeric}{%
@@ -2051,18 +2051,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kGravityNumeric}{%
-\k@SI@short@GravityNumeric}
+\k@SI@full@GravityNumeric}
 \else
 \DeclareRobustCommand {\kGravityNumeric}{%
-\k@SI@full@GravityNumeric}
+\k@SI@short@GravityNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kGravityNumeric}{%
-\k@cgs@short@GravityNumeric}
+\k@cgs@full@GravityNumeric}
 \else
 \DeclareRobustCommand {\kGravityNumeric}{%
-\k@cgs@full@GravityNumeric}
+\k@cgs@short@GravityNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@StefanBoltzmann}{%
@@ -2086,18 +2086,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kStefanBoltzmann}{%
-\k@SI@short@StefanBoltzmann}
+\k@SI@full@StefanBoltzmann}
 \else
 \DeclareRobustCommand {\kStefanBoltzmann}{%
-\k@SI@full@StefanBoltzmann}
+\k@SI@short@StefanBoltzmann}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kStefanBoltzmann}{%
-\k@cgs@short@StefanBoltzmann}
+\k@cgs@full@StefanBoltzmann}
 \else
 \DeclareRobustCommand {\kStefanBoltzmann}{%
-\k@cgs@full@StefanBoltzmann}
+\k@cgs@short@StefanBoltzmann}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@StefanBoltzmannNumeric}{%
@@ -2115,18 +2115,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kStefanBoltzmannNumeric}{%
-\k@SI@short@StefanBoltzmannNumeric}
+\k@SI@full@StefanBoltzmannNumeric}
 \else
 \DeclareRobustCommand {\kStefanBoltzmannNumeric}{%
-\k@SI@full@StefanBoltzmannNumeric}
+\k@SI@short@StefanBoltzmannNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kStefanBoltzmannNumeric}{%
-\k@cgs@short@StefanBoltzmannNumeric}
+\k@cgs@full@StefanBoltzmannNumeric}
 \else
 \DeclareRobustCommand {\kStefanBoltzmannNumeric}{%
-\k@cgs@full@StefanBoltzmannNumeric}
+\k@cgs@short@StefanBoltzmannNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@Radiation}{%
@@ -2150,18 +2150,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiation}{%
-\k@SI@short@Radiation}
+\k@SI@full@Radiation}
 \else
 \DeclareRobustCommand {\kRadiation}{%
-\k@SI@full@Radiation}
+\k@SI@short@Radiation}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiation}{%
-\k@cgs@short@Radiation}
+\k@cgs@full@Radiation}
 \else
 \DeclareRobustCommand {\kRadiation}{%
-\k@cgs@full@Radiation}
+\k@cgs@short@Radiation}
 \fi
 \fi
 \DeclareRobustCommand{\k@SI@short@RadiationNumeric}{%
@@ -2179,18 +2179,18 @@
 \ifx\cgsunits\undefined
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiationNumeric}{%
-\k@SI@short@RadiationNumeric}
+\k@SI@full@RadiationNumeric}
 \else
 \DeclareRobustCommand {\kRadiationNumeric}{%
-\k@SI@full@RadiationNumeric}
+\k@SI@short@RadiationNumeric}
 \fi
 \else
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kRadiationNumeric}{%
-\k@cgs@short@RadiationNumeric}
+\k@cgs@full@RadiationNumeric}
 \else
 \DeclareRobustCommand {\kRadiationNumeric}{%
-\k@cgs@full@RadiationNumeric}
+\k@cgs@short@RadiationNumeric}
 \fi
 \fi
 \DeclareRobustCommand{\k@short@FineStructure}{%
@@ -2205,10 +2205,10 @@
 \times 10^{-3}}}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kFineStructure}{%
-\k@short@FineStructure}
+\k@full@FineStructure}
 \else
 \DeclareRobustCommand {\kFineStructure}{%
-\k@full@FineStructure}
+\k@short@FineStructure}
 \fi
 \DeclareRobustCommand{\k@short@FineStructureNumeric}{%
 \ensuremath{%
@@ -2218,10 +2218,10 @@
 7.29735257e-03}}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kFineStructureNumeric}{%
-\k@short@FineStructureNumeric}
+\k@full@FineStructureNumeric}
 \else
 \DeclareRobustCommand {\kFineStructureNumeric}{%
-\k@full@FineStructureNumeric}
+\k@short@FineStructureNumeric}
 \fi
 \DeclareRobustCommand{\k@short@FineStructureReciprocal}{%
 \ensuremath{%
@@ -2235,10 +2235,10 @@
 \times 10^{2}}}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kFineStructureReciprocal}{%
-\k@short@FineStructureReciprocal}
+\k@full@FineStructureReciprocal}
 \else
 \DeclareRobustCommand {\kFineStructureReciprocal}{%
-\k@full@FineStructureReciprocal}
+\k@short@FineStructureReciprocal}
 \fi
 \DeclareRobustCommand{\k@short@FineStructureReciprocalNumeric}{%
 \ensuremath{%
@@ -2248,10 +2248,10 @@
 1.37035999e+02}}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kFineStructureReciprocalNumeric}{%
-\k@short@FineStructureReciprocalNumeric}
+\k@full@FineStructureReciprocalNumeric}
 \else
 \DeclareRobustCommand {\kFineStructureReciprocalNumeric}{%
-\k@full@FineStructureReciprocalNumeric}
+\k@short@FineStructureReciprocalNumeric}
 \fi
 \DeclareRobustCommand{\k@short@Avogadro}{%
 \ensuremath{%
@@ -2265,10 +2265,10 @@
 \times 10^{23}}}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAvogadro}{%
-\k@short@Avogadro}
+\k@full@Avogadro}
 \else
 \DeclareRobustCommand {\kAvogadro}{%
-\k@full@Avogadro}
+\k@short@Avogadro}
 \fi
 \DeclareRobustCommand{\k@short@AvogadroNumeric}{%
 \ensuremath{%
@@ -2278,10 +2278,10 @@
 6.02240760e+23}}
 \ifx\shortconst\undefined
 \DeclareRobustCommand {\kAvogadroNumeric}{%
-\k@short@AvogadroNumeric}
+\k@full@AvogadroNumeric}
 \else
 \DeclareRobustCommand {\kAvogadroNumeric}{%
-\k@full@AvogadroNumeric}
+\k@short@AvogadroNumeric}
 \fi
 \makeatother
 \endinput