mandi (10apr13)

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

5 files changed, 663 insertions, 402 deletions

diff --git a/Master/texmf-dist/doc/latex/mandi/README.txt b/Master/texmf-dist/doc/latex/mandi/README.txt
deleted file mode 100644
index eaa43321f25..00000000000
--- a/Master/texmf-dist/doc/latex/mandi/README.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-The mandi package  provides commands  for typesetting symbols, expressions, and
-quantities used in introductory physics and astronomy. Many of the commands are
-inspired by  Matter & Interactions  by Ruth Chabay  and Bruce Sherwood. Many of
-the  astronomical commands  were inspired by my own classroom needs. It must be
-understood that mandi does  not do any  computations! It only provides commands
-for typesetting.
-
-Run  the  file  mandi.dtx  through (pdf)LaTeX  to  generate README (this file),
-mandi.ins, mandi.sty,  vdemo.py,  and  mandi.pdf (user documentation). I assume
-a TeXLive2011 or later distribution is installed.
diff --git a/Master/texmf-dist/doc/latex/mandi/mandi.pdf b/Master/texmf-dist/doc/latex/mandi/mandi.pdf
index 07cbcbcb0fd..85590a4e470 100644
--- a/Master/texmf-dist/doc/latex/mandi/mandi.pdf
+++ b/Master/texmf-dist/doc/latex/mandi/mandi.pdf
diff --git a/Master/texmf-dist/source/latex/mandi/mandi.dtx b/Master/texmf-dist/source/latex/mandi/mandi.dtx
index 20b03d7c31b..564715327bd 100644
--- a/Master/texmf-dist/source/latex/mandi/mandi.dtx
+++ b/Master/texmf-dist/source/latex/mandi/mandi.dtx
@@ -32,23 +32,10 @@
 %</internal>
 %
 %<*package>
-\ProvidesPackage{mandi}[2012/12/31 2.0.0 Macros for intro physics and astronomy]
+\ProvidesPackage{mandi}[2013/04/10 2.1.0 Macros for intro physics and astronomy]
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %</package>
 %
-%<*readme>
-The mandi package  provides commands  for typesetting symbols, expressions, and
-quantities used in introductory physics and astronomy. Many of the commands are
-inspired by  Matter & Interactions  by Ruth Chabay  and Bruce Sherwood. Many of
-the  astronomical commands  were inspired by my own classroom needs. It must be
-understood that mandi does  not do any  computations! It only provides commands
-for typesetting.
-
-Run  the  file  mandi.dtx  through (pdf)LaTeX  to  generate README (this file),
-mandi.ins, mandi.sty,  vdemo.py,  and  mandi.pdf (user documentation). I assume
-a TeXLive2011 or later distribution is installed.
-%</readme>
-%
 %<*vdemo>
 from __future__ import print_function, division
 from visual import *
@@ -117,8 +104,6 @@ and includes the derived files  README
 \generate{\file{\jobname.ins}{\from{\jobname.dtx}{install}}}
 \generate{\usepreamble\empty\usepostamble\empty
           \file{vdemo.py}{\from{\jobname.dtx}{vdemo}}}
-\generate{\usepreamble\empty\usepostamble\empty
-          \file{README.txt}{\from{\jobname.dtx}{readme}}}
 
 \obeyspaces
 \Msg{*************************************************************}
@@ -140,8 +125,6 @@ and includes the derived files  README
 \generate{\file{\jobname.ins}{\from{\jobname.dtx}{install}}}
 \generate{\usepreamble\empty\usepostamble\empty
           \file{vdemo.py}{\from{\jobname.dtx}{vdemo}}}
-\generate{\usepreamble\empty\usepostamble\empty
-          \file{README.txt}{\from{\jobname.dtx}{readme}}}
 \ifx\fmtname\nameofplainTeX
   \expandafter\endbatchfile
 \else
@@ -205,7 +188,7 @@ and includes the derived files  README
 %                 underlined refer to the definition; numbers in roman refer to the 
 %                 pages/codelines where the entry is used.}
 % 
-% \CheckSum{4386}
+% \CheckSum{4843}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -227,7 +210,7 @@ and includes the derived files  README
 %   \active,\advance,\AtBeginOfPackageFile,\baselineskip,\begin,\begingroup,\Big,\Bigg,
 %   \boolean,\bullet,\boldsymbol,\BODY,\box,\cancelto,\caption,\catcode,\cbcolor,\cbend,
 %   \cbstart,\centerline,\color,\changebarsep,\changebarwidth,\char,\clist,\cr,\cs,
-%   \csname,\csundef,
+%   \csname,\csundef,\circ,\cdot,
 %   \DeclareFontShape,\DeclareGraphicsRule,\DeclareMathAlphabet,\DeclareMathOperator,
 %   \DeclareOption,\def,\definecolor,\dimen,\displaystyle,\dp,\else,\end,\endcsname,
 %   \endgroup,\ensuremath,\equal,\ExecuteOptions,\expandafter,\ExplSyntaxOff,
@@ -249,12 +232,12 @@ and includes the derived files  README
 % \DoNotIndex{\activity@fbox,\@eolst,\@firstofone,\@firstoftwo,\Mathstrutbox@,\mi@delim,
 %   \mi@exchangeargs,\mi@forkifnull,\mi@innername,\mi@name,\mi@vector,\oldr@@t,\rc@delim,
 %   \rc@vector,\response@fbox,\resetMathstrut@,\r@@t,\@tempa,\@tempb,\@tempboxa,
-%   \@secondoftwo,\z@}
+%   \@secondoftwo,\z@,\@ifpackageloaded}
 %
 % \DoNotIndex{\selectbaseunit,\selectdrvdunit,\selecttradunit,\selectunit,
 %   \redefinephysicsquantity,\redefinephysicsconstant,\definephysicsquantity,
 %   \definephysicsconstant,\innerdefinewhatsoeverquantity,
-%   \innerdefinewhatsoeverquantityfork,}
+%   \innerdefinewhatsoeverquantityfork,\chkphysicsquantity}
 %
 % \DoNotIndex{\alpha,\beta,\chi,\delta,\Delta,\epsilon,\eta,\gamma,\Gamma,\iota,\kappa,
 %   \lambda,\Lambda,\mu,\nu,\omega,\Omega,\phi,\Phi,\pi,\Pi,\psi,\Psi,\rho,\sigma,\Sigma,
@@ -265,19 +248,16 @@ and includes the derived files  README
 %   \ldots,\ln,\log,\mathcalligra,\nabla,\oint,\oldsqrt,\prime,\pm,\sec,\sech,\sin,\sinh,
 %   \sqrt,\star,\tan,\tanh,\times,\vec}
 %
-% \DoNotIndex{\ampere,\arcminute,\arcsecond,\candela,\coulomb,\coulombbase,\cubed,\cubic,
-%   \degree,\derjoule,\electronvolt,\farad,\fourth,\henry,\hertz,\hertzbase,\hour,\joule,
-%   \jouleperkelvin,\kelvin,\kilogram,\kilogrammetrepersecond,\kilogrampermetre,
-%   \kilogrammetrepersecondnp,\kilogrammetrepersquaresecondnp,\kilogrampermetrenp,
-%   \kilogrampersquaremetre,\kilogrampersquaremetrenp,\kilogrampercubicmetre,
-%   \kilogrampercubicmetrenp,\kilogramsquaremetrepersecondnp,\kilogramsquaremetre,
-%   \kilogramsquaremetrepersecond,\metre,\metrepersecond,\metrepersecondnp,
-%   \metrepersquaresecond,\metrepersquaresecondnp,\mole,\nano,\newton,\newtonpermetre,
-%   \newtonperkilogram,\newtonpersquaremetre,\newtonsecond,\pascal,\pascalbase,\per,
-%   \radian,\radianpersecond,\radianpersecondnp,\radianpersquaresecond,
-%   \radianpersquaresecondnp,\reciprocal,\rp,\rpsquare,\rpsquared,\rpcubed,\rpcubic,
-%   \rpfourth,\second,\SIminus,\sipower,\square,\squared,\squaremetre,\steradian,\tesla,
-%   \unit,\usk,\volt,\watt,\wattbase}
+% \DoNotIndex{\ampere,\arcminute,\arcsecond,\atomicmassunit,\candela,\coulomb,
+%   \degree,\electronvolt,\farad,\henry,\hertz,\hour,\joule,\kelvin,\kilogram,
+%   \metre,\minute,\mole,\newton,\ohm,\pascal,\per,\radian,\second,\siemens,
+%   \steradian,\tesla,\unit,\usk,\volt,\watt,\weber}
+%
+% \DoNotIndex{\C,\F,\H,\J,\N,\rad,\S,\T,\V,\W}
+%
+% \DoNotIndex{\square,\cubic,\quartic,\reciprocal,\reciprocalsquare,\reciprocalcubic,
+%   \reciprocalquartic,\squared,\cubed,\quarted,\reciprocaled,\reciprocalsquared,
+%   \reciprocalcubed,\reciprocalquarted}
 %
 % \providecommand*{\url}{\texttt}
 % \GetFileInfo{\jobname.sty}
@@ -291,7 +271,13 @@ and includes the derived files  README
 %
 % ^^A \centerline{\textbf{PLEASE DO NOT DISTRIBUTE THIS VERSION.}}
 %
-% \changes{v2.0.0beta}{\today}{First public release}
+% \changes{v2.0.0}{\today}{First public release}
+% \changes{v2.1.0}{\today}{No longer needs \pkgname{SIunits}. It's deprecated}
+% \changes{v2.1.0}{\today}{Coexists with \pkgname{siunitx}.}
+% \changes{v2.1.0}{\today}{Coexists with \pkgname{physymb}. Load \pkgname{physymb} 
+%    before \pkgname{mandi}.}
+% \changes{v2.1.0}{\today}{Added more predefined quantities.}
+% \changes{v2.1.0}{\today}{Improved vector operators.}
 % 
 % \tableofcontents
 % \newpage
@@ -550,13 +536,12 @@ and includes the derived files  README
 % particular combinations of base units. An example of a derived unit is the 
 % newton, for which the symbol (it is not an abbreviation) is \newton. However, 
 % the symbol \newton\ is merely a nickname for a particular combination of base 
-% units, specifically \newtonbase. It is not the case that every unique combination 
-% of base units has a nickname, but those that do are usually named in honor of a 
-% scientist. Incidentally, in such cases, the symbol is capitalized but the 
-% \textit{name} of the unit is \textbf{never} capitalized. Thus we would write the 
-% name of the derived unit of force as newton and not Newton. Again, using these 
-% select nicknames for certain combinations of base units is what we mean by 
-% \drvdunits\ form.
+% units. It is not the case that every unique combination of base units has a nickname, 
+% but those that do are usually named in honor of a scientist. Incidentally, in such 
+% cases, the symbol is capitalized but the \textit{name} of the unit is \textbf{never} 
+% capitalized. Thus we would write the name of the derived unit of force as newton and 
+% not Newton. Again, using these select nicknames for certain combinations of base units 
+% is what we mean by \drvdunits\ form.
 %
 % \newpage
 % \subsection{Defining Physics Quantities}
@@ -565,9 +550,11 @@ and includes the derived files  README
 %\iffalse
 %<*example>
 %\fi
-\begin{tcblisting}{title=define a physics quantity,listing only}
-\newphysicsquantity\marg{foobar}\marg{\baseunits}\oarg{\drvdunits}
-  \oarg{\tradunits}
+\begin{tcblisting}{listing only,title=define a physics quantity\\
+  \cs{newphysicsquantity}\marg{newname}\marg{\baseunits}\oarg{\drvdunits}
+  \oarg{\tradunits}}
+Here is how spatial displacement is defined internally.
+\newphysicsconstant{displacement}{\m}[\m][\m]
 \end{tcblisting}
 %\iffalse
 %</example>
@@ -575,61 +562,44 @@ and includes the derived files  README
 %
 % Using this command causes several things to happen.
 % \begin{itemize}
-%   \item A command |\yournewquantity|\marg{magnitude}, where |foobar| is the first 
+%   \item A command |\newname|\marg{magnitude}, where |newname| is the first 
 %   argument passed to \\
 %   |\newphysicsquantity|, is created that takes one mandatory 
 %   argument, a numerical magnitude. Subsequent use of your defined scalar quantity 
-%   can be invoked by typing \\ |\yournewquantity|\marg{magnitude} and the units will be 
+%   can be invoked by typing \\ |\newname|\marg{magnitude} and the units will be 
 %   typeset according to the options given when \mandi\ was loaded. Note that if the
 %   \drvdunits\ and \tradunits\ forms are not specified, they will be
 %   populated with the \baseunits\ form.
-%   \item A command |\yournewquantitybaseunit|\marg{magnitude} is created that expresses 
+%   \item A command |\newnamebaseunit|\marg{magnitude} is created that expresses 
 %   the quantity and its units in \baseunits\ form.
-%   \item A command |\yournewquantitydrvdunit|\marg{magnitude} is created that expresses 
+%   \item A command |\newnamedrvdunit|\marg{magnitude} is created that expresses 
 %   the quantity and its units in \drvdunits\ form. This command is created whether 
 %   or not the first optional argument is provided.
-%   \item A command |\yournewquantitytradunit|\marg{magnitude} is created that 
+%   \item A command |\newnametradunit|\marg{magnitude} is created that 
 %   expresses the quantity and its units in \tradunits\ form. This command is 
 %   created whether or not the first optional argument is provided.
-%   \item A command |\yournewquantityonlybaseunit|\marg{magnitude} is created that
+%   \item A command |\newnameonlybaseunit|\marg{magnitude} is created that
 %   expresses 
 %   \textbf{only} the quantity's units in \baseunits\ form.
-%   \item A command |\yournewquantityonlydrvdunit|\marg{magnitude} is created that 
+%   \item A command |\newnameonlydrvdunit|\marg{magnitude} is created that 
 %   expresses \textbf{only} the quantity's units in \drvdunits\ form. 
-%   \item A command |\yournewquantityonlytradunit|\marg{magnitude} is created that 
+%   \item A command |\newnameonlytradunit|\marg{magnitude} is created that 
 %   expresses \textbf{only} the quantity's units in \tradunits\ form. 
-%   \item A command |\yournewquantityvalue|\marg{magnitude} is created that expresses
+%   \item A command |\newnamevalue|\marg{magnitude} is created that expresses
 %   \textbf{only} the quantity's numerical value.
 % \end{itemize}
 %
-% The following command defines the quantity |\displacement| and its
-% associated commands containing its units.
-% \begin{quotation}
-% \begin{tabular}{l}
-%   |\newphysicsquantity{displacement}{\m}[\m][\m]|    
-% \end{tabular}
-% \end{quotation}
-%
-% You would then invoke this quantity with |\displacement{3}|
+% To typeset a numerical displacement, you would merely type |\displacement{3}|
 % to get \displacement{3} in a calculation.
 %
 % \subsubsection{Defining Vector Quantities}
 %
-% Vector quantities are defined exactly like other quantities, except a formatted
-% vector is used when invoking the value of that quantity. The following command defines 
-% a vector |\displacementvector| and its associated commands containing its units.
-%
-% \begin{quotation}
-% \begin{tabular}{l}
-%   |\newphysicsquantity{displacementvector}{\m}[\m][\m]| 
-% \end{tabular}
-% \end{quotation}
-%
-% \newphysicsquantity{displacementvector}{\m}[\m][\m]
-% 
-% You would then invoke this quantity with |\displacementvector{\mivector{2,3,-5}}|
-% to get \displacementvector{\mivector{2,3,-5}} in a calculation.
+% Nothing special is necessary for defining vector quantities, but a formatted
+% vector is used when invoking the value of that quantity. Thus, typing 
+% |\displacement{\mivector{3,2,-1}}| gives \displacement{\mivector{3,2,-1}} precisely
+% as expected.
 %
+% \newpage
 % \subsection{First Semester Physics}
 % The first semester of \mi\ focuses on mechanics, dynamics, and statistical mechanics.
 %
@@ -726,13 +696,35 @@ and includes the derived files  README
 %
 % \begin{center}
 % \begin{tabular}{c c}
-%   |\charge{\scin[2]{-9}}|             & \charge{\scin[2]{-9}}             \\
-%   |\permittivity{\scin[9]{-12}}|      & \permittivity{\scin[9]{-12}}      \\
-%   |\electricfield{\scin[2]{5}}|       & \electricfield{\scin[2]{5}}       \\
-%   |\electricdipolemom{\scin[3]{-22}}| & \electricdipolemom{\scin[3]{-22}} \\
-%   |\permeability{\scin[4\pi]{-7}}|    & \permeability{\scin[4\pi]{-7}}    \\
-%   |\magneticfield{1.25}|              & \magneticfield{1.25}              \\
-%   |\cmagneticfield{1.25}|             & \cmagneticfield{1.25}
+%   |\charge{\scin[2]{-9}}|                & \charge{\scin[2]{-9}}                \\
+%   |\permittivity{\scin[9]{-12}}|         & \permittivity{\scin[9]{-12}}         \\
+%   |\electricfield{\scin[2]{5}}|          & \electricfield{\scin[2]{5}}          \\
+%   |\electricdipolemoment{\scin[3]{-22}}| & \electricdipolemoment{\scin[3]{-22}} \\
+%   |\permeability{\scin[4\pi]{-7}}|       & \permeability{\scin[4\pi]{-7}}       \\
+%   |\magneticfield{1.25}|                 & \magneticfield{1.25}                 \\
+%   |\cmagneticfield{1.25}|                & \cmagneticfield{1.25}                \\
+%   |\linearchargedensity{1.25}|           & \linearchargedensity{1.25}           \\
+%   |\areachargedensity{1.25}|             & \areachargedensity{1.25}             \\
+%   |\volumechargedensity{1.25}|           & \volumechargedensity{1.25}           \\
+%   |\mobility{\scin[4.5]{-3}}|            & \mobility{\scin[4.5]{-3}}            \\
+%   |\numberdensity{\scin[2]{18}}|         & \numberdensity{\scin[2]{18}}         \\
+%   |\polarizability{\scin[1.96]{-40}}|    & \polarizability{\scin[1.96]{-40}}    \\
+%   |\electricpotential{1.5}|              & \electricpotential{1.5}              \\
+%   |\emf{1.5}|                            & \emf{1.5}                            \\
+%   |\dielectricconstant{1.5}|             & \dielectricconstant{1.5}             \\
+%   |\indexofrefraction{1.5}|              & \indexofrefraction{1.5}              \\
+%   |\relativepermittivity{0.9}|           & \relativepermittivity{0.9}           \\
+%   |\relativepermeability{0.9}|           & \relativepermeability{0.9}           \\
+%   |\energydensity{1.25}|                 & \energydensity{1.25}                 \\
+%   |\electroncurrent{\scin[2]{18}}|       & \electroncurrent{\scin[2]{18}}       \\
+%   |\conventionalcurrent{0.003}|          & \conventionalcurrent{0.003}          \\
+%   |\magneticdipolemoment{1.25}|          & \magneticdipolemoment{1.25}          \\
+%   |\currentdensity{1.25}|                & \currentdensity{1.25}                \\
+%   |\capacitance{1.00}|                   & \capacitance{1.00}                   \\
+%   |\conductivity{1.25}|                  & \conductivity{1.25}                  \\
+%   |\resistivity{1.25}|                   & \resistivity{1.25}                   \\
+%   |\resistance{\scin[1]{6}}|             & \resistance{\scin[1]{6}}             \\
+%   |\conductance{1.25}|                   & \conductance{1.25}
 % \end{tabular}
 % \end{center}
 %
@@ -1917,7 +1909,7 @@ and includes the derived files  README
 %<*example>
 %\fi
 \begin{tcblisting}{listing only,title=define a physical constant\\
-  \cs{newphysicsconstant}\marg{symbol}\marg{value}\marg{foobar}\marg{\baseunits}
+  \cs{newphysicsconstant}\marg{newname}\marg{symbol}\marg{value}\marg{\baseunits}
   \oarg{\drvdunits}\oarg{\tradunits}}
 Here is how \oofpez (the Coulomb constant) is defined internally.
 \newphysicsconstant{oofpez}
@@ -1933,23 +1925,23 @@ Here is how \oofpez (the Coulomb constant) is defined internally.
 %
 % Using this command causes several things to happen.
 % \begin{itemize}
-%   \item A command |\physconstantmathsymbol| is created that expresses
+%   \item A command |\newname| is created and contains the constant and units  
+%   typeset according to the options given when \mandi\ was loaded.
+%   \item A command |\newnamemathsymbol| is created that expresses
 %   \textbf{only} the constant's mathematical symbol.
-%   \item A command |\physconstantvalue| is created that expresses
+%   \item A command |\newnamevalue| is created that expresses
 %   \textbf{only} the constant's numerical value.
-%   \item A command |\physconstant| is created and contains the constant and units  
-%   typeset according to the options given when \mandi\ was loaded.
-%   \item A command |\physconstantbaseunit| is created that expresses 
+%   \item A command |\newnamebaseunit| is created that expresses 
 %   the constant and its units in \baseunits\ form.
-%   \item A command |\physconstantdrvdunit| is created that expresses 
+%   \item A command |\newnamedrvdunit| is created that expresses 
 %   the constant and its units in \drvdunits\ form.
-%   \item A command |\physconstanttradunit| is created that 
+%   \item A command |\newnametradunit| is created that 
 %   expresses the constant and its units in \tradunits\ form.
-%   \item A command |\physconstantonlybaseunit| is created that expresses 
+%   \item A command |\newnameonlybaseunit| is created that expresses 
 %   \textbf{only} the constant's units in \baseunits\ form.
-%   \item A command |\physconstantonlydrvdunit| is created that 
+%   \item A command |\newnameonlydrvdunit| is created that 
 %   expresses \textbf{only} the constant's units in \drvdunits\ form. 
-%   \item A command |\physconstantonlytradunit| is created that 
+%   \item A command |\newnameonlytradunit| is created that 
 %   expresses \textbf{only} the constant's units in \tradunits\ form. 
 % \end{itemize}
 % None of these commands takes any arguments.
@@ -2801,15 +2793,18 @@ Here is how \oofpez (the Coulomb constant) is defined internally.
 %</example>
 %\fi
 %
+% \DescribeMacro{\gradient}
 % \DescribeMacro{\divergence}
 % \DescribeMacro{\curl}
+% \DescribeMacro{\laplacian}
+% \DescribeMacro{\dalembertian}
 %\iffalse
 %<*example>
 %\fi
-\begin{tcblisting}{title=divergence and curl of a quantity (you must explicitly
-  provide an arrow with \cs{vect} if you want one)\\
-  \cs{divergence}\marg{vector} and \cs{curl}\marg{vector}}
-\divergence{\vect{E}} and \curl{\vect{E}}
+\begin{tcblisting}{title=vector operators\\
+  \cs{gradiant} and\cs{divergence} and \cs{curl} and \cs{laplacian} and \cs{dalembertian}}
+\gradient\(f\) and \divergence\vect{E} and \curl\vect{E} and \laplacian\(f\) 
+  and \dalembertian\(F\)
 \end{tcblisting}
 %\iffalse
 %</example>
@@ -2924,6 +2919,7 @@ Here is how \oofpez (the Coulomb constant) is defined internally.
 %</example>
 %\fi
 %
+% \newpage
 % \subsection{Other Useful Commands}
 %
 % \DescribeMacro{\asin}
@@ -2944,7 +2940,6 @@ Here is how \oofpez (the Coulomb constant) is defined internally.
 %</example>
 %\fi
 %
-% \newpage
 % \DescribeMacro{\sech}
 % \DescribeMacro{\csch}
 % \DescribeMacro{\asinh}
@@ -2991,6 +2986,7 @@ Here is how \oofpez (the Coulomb constant) is defined internally.
 %</example>
 %\fi
 %
+% \newpage
 % \DescribeMacro{\eV}
 % \DescribeMacro{\ev}
 %\iffalse
@@ -3004,18 +3000,6 @@ Here is how \oofpez (the Coulomb constant) is defined internally.
 %</example>
 %\fi
 %
-% \DescribeMacro{\emf}
-%\iffalse
-%<*example>
-%\fi
-\begin{tcblisting}{title=symbol for electromotive force\\
-  \cs{emf}}
-\emf
-\end{tcblisting}
-%\iffalse
-%</example>
-%\fi
-%
 % \newpage
 % \DescribeMacro{\logb}
 %\iffalse
@@ -4533,7 +4517,7 @@ neque, id pulvinar odio lorem non turpis. Nullam sit amet enim.]
 % \fi
 % Note the packages that must be present.
 %    \begin{macrocode}
-\RequirePackage[intlimits]{amsmath}
+\RequirePackage{amsmath}
 \RequirePackage{amssymb}
 \RequirePackage{bigints}
 \RequirePackage{cancel}
@@ -4541,8 +4525,8 @@ neque, id pulvinar odio lorem non turpis. Nullam sit amet enim.]
 \RequirePackage[dvipsnames]{xcolor}
 \RequirePackage{environ}
 \RequirePackage{etoolbox}
-\RequirePackage{extarrows}
 \RequirePackage{filehook}
+\RequirePackage{extarrows}
 \RequirePackage[T1]{fontenc}
 \RequirePackage{graphicx}
 \RequirePackage{epstopdf}
@@ -4550,7 +4534,6 @@ neque, id pulvinar odio lorem non turpis. Nullam sit amet enim.]
 \RequirePackage{letltxmacro}
 \RequirePackage{listings}
 \RequirePackage[framemethod=TikZ]{mdframed}
-\RequirePackage[amssymb,cdot,derivedinbase,derived,thickqspace]{SIunits}
 \RequirePackage{suffix}
 \RequirePackage{xargs}
 \RequirePackage{xparse}
@@ -4581,27 +4564,78 @@ neque, id pulvinar odio lorem non turpis. Nullam sit amet enim.]
 %    \end{macrocode}
 %
 % \newpage
-% \noindent This block of code corrects conflicts with SIunits.
+% \noindent This block of code fixes a conflict with the amssymb package.
 %    \begin{macrocode}
-\AtBeginOfPackageFile*{SIunits}{%
-	\csundef{power}
+\@ifpackageloaded{amssymb}{%
   \csundef{square}
-  \newcommand*{\square}[1]{\ensuremath{\mathrm{#1}^{2}}}
-  \renewcommand*{\squared}{\ensuremath{^{\mathrm{2}}}}
-  \renewcommand*{\cubic}[1]{\ensuremath{\mathrm{#1}^{3}}}
-  \renewcommand*{\cubed}{\ensuremath{^{\mathrm{3}}}}
-	\renewcommand*{\fourth}[1]{\ensuremath{\mathrm{#1}^{4}}}
-	\renewcommand*{\reciprocal}[1]{\ensuremath{\mathrm{#1}^{\SIminus1}}}
-	\renewcommand*{\rp}{\ensuremath{^{\mathrm{\SIminus1}}}}
-	\renewcommand*{\rpsquare}[1]{\ensuremath{\mathrm{#1}^{\SIminus2}}}
-	\renewcommand*{\rpsquared}{\ensuremath{^{\mathrm{\SIminus2}}}}
-	\renewcommand*{\rpcubic}[1]{\ensuremath{\mathrm{#1}^{\SIminus3}}}
-	\renewcommand*{\rpcubed}{\ensuremath{^{\mathrm{\SIminus3}}}}
-	\renewcommand*{\rpfourth}[1]{\ensuremath{\mathrm{#1}^{\SIminus4}}}
-	\typeout{mandi: SIunits conflicts fixed, but don't use \protect\square\space.}
+  \typeout{mandi: Package amssymb detected. Its \protect\square\space has been redefined.}
+}{%
+  \typeout{mandi: Package amssymb not detected.}
 }%
 %    \end{macrocode}
 %
+% \noindent This block of code defines unit names and symbols.
+%    \begin{macrocode}
+\newcommand{\per}{\ensuremath{/}}
+\newcommand{\usk}{\ensuremath{\cdot}}
+\newcommand{\unit}[2]{\ensuremath{{#1}\,{#2}}}
+\newcommand{\ampere}{\ensuremath{\mathrm{A}}}
+\newcommand{\arcminute}{\ensuremath{'}}
+\newcommand{\arcsecond}{\ensuremath{''}}
+\newcommand{\atomicmassunit}{\ensuremath{\mathrm{u}}}
+\newcommand{\candela}{\ensuremath{\mathrm{cd}}}
+\newcommand{\coulomb}{\ensuremath{\mathrm{C}}}
+\newcommand{\degree}{\ensuremath{^{\circ}}}
+\newcommand{\electronvolt}{\ensuremath{\mathrm{eV}}}
+\newcommand{\farad}{\ensuremath{\mathrm{F}}}
+\newcommand{\henry}{\ensuremath{\mathrm{H}}}
+\newcommand{\hertz}{\ensuremath{\mathrm{Hz}}}
+\newcommand{\hour}{\ensuremath{\mathrm{h}}}
+\newcommand{\joule}{\ensuremath{\mathrm{J}}}
+\newcommand{\kelvin}{\ensuremath{\mathrm{K}}}
+\newcommand{\kilogram}{\ensuremath{\mathrm{kg}}}
+\newcommand{\metre}{\ensuremath{\mathrm{m}}}
+\newcommand{\minute}{\ensuremath{\mathrm{min}}}
+\newcommand{\mole}{\ensuremath{\mathrm{mol}}}
+\newcommand{\newton}{\ensuremath{\mathrm{N}}}
+\newcommand{\ohm}{\ensuremath{\Omega}}
+\newcommand{\pascal}{\ensuremath{\mathrm{Pa}}}
+\newcommand{\radian}{\ensuremath{\mathrm{rad}}}
+\newcommand{\second}{\ensuremath{\mathrm{s}}}
+\newcommand{\siemens}{\ensuremath{\mathrm{S}}}
+\newcommand{\steradian}{\ensuremath{\mathrm{sr}}}
+\newcommand{\tesla}{\ensuremath{\mathrm{T}}}
+\newcommand{\volt}{\ensuremath{\mathrm{V}}}
+\newcommand{\watt}{\ensuremath{\mathrm{W}}}
+\newcommand{\weber}{\ensuremath{\mathrm{Wb}}}
+\newcommand{\C}{\coulomb}
+\newcommand{\F}{\farad}
+%\H is already defined as a LaTeX accent
+\newcommand{\J}{\joule}
+\newcommand{\N}{\newton}
+\newcommand{\Pa}{\pascal}
+\newcommand{\rad}{\radian}
+\newcommand{\sr}{\steradian}
+%\S is already defined as a LaTeX symbol
+\newcommand{\T}{\tesla}
+\newcommand{\V}{\volt}
+\newcommand{\W}{\watt}
+\newcommand{\square}[1]{\ensuremath{\mathrm{#1}^{2}}}              % prefix   2
+\newcommand*{\cubic}[1]{\ensuremath{\mathrm{#1}^{3}}}              % prefix   3
+\newcommand*{\quartic}[1]{\ensuremath{\mathrm{#1}^{4}}}            % prefix   4
+\newcommand*{\reciprocal}[1]{\ensuremath{\mathrm{#1}^{-1}}}        % prefix  -1 
+\newcommand*{\reciprocalsquare}[1]{\ensuremath{\mathrm{#1}^{-2}}}  % prefix  -2
+\newcommand*{\reciprocalcubic}[1]{\ensuremath{\mathrm{#1}^{-3}}}   % prefix  -3
+\newcommand*{\reciprocalquartic}[1]{\ensuremath{\mathrm{#1}^{-4}}} % prefix  -4
+\newcommand*{\squared}{\ensuremath{^{\mathrm{2}}}}                 % postfix  2
+\newcommand*{\cubed}{\ensuremath{^{\mathrm{3}}}}                   % postfix  3
+\newcommand*{\quarted}{\ensuremath{^{\mathrm{4}}}}                 % postfix  4
+\newcommand*{\reciprocaled}{\ensuremath{^{\mathrm{-1}}}}           % postfix -1
+\newcommand*{\reciprocalsquared}{\ensuremath{^{\mathrm{-2}}}}      % postfix -2
+\newcommand*{\reciprocalcubed}{\ensuremath{^{\mathrm{-3}}}}        % postfix -3
+\newcommand*{\reciprocalquarted}{\ensuremath{^{\mathrm{-4}}}}      % postfix -4
+%    \end{macrocode}
+%
 % \begin{macro}{\newphysicsquantity}
 % \begin{macro}{\newphysicsconstant}
 % \begin{macro}{\hereusebaseunit}
@@ -4823,13 +4857,13 @@ neque, id pulvinar odio lorem non turpis. Nullam sit amet enim.]
 %
 % \begin{macro}{\planeangle}
 %    \begin{macrocode}
-\newphysicsquantity{planeangle}{\m\usk\reciprocal\m}[\radian][\radian]
+\newphysicsquantity{planeangle}{\m\usk\reciprocal\m}[\rad][\rad]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\solidangle}
 %    \begin{macrocode}
-\newphysicsquantity{solidangle}{\m\squared\usk\rpsquare\m}[\steradian][\steradian]
+\newphysicsquantity{solidangle}{\m\squared\usk\reciprocalsquare\m}[\sr][\sr]
 %    \end{macrocode}
 % \end{macro}
 %
@@ -4859,7 +4893,7 @@ neque, id pulvinar odio lorem non turpis. Nullam sit amet enim.]
 %
 % \begin{macro}{\inAU}
 %    \begin{macrocode}
-\newcommand{\inAU}[1]{\ensuremath{\unit{#1}{AU}}}
+\newcommand{\inAU}[1]{\ensuremath{\unit{#1}{\mathrm{AU}}}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -4877,7 +4911,7 @@ neque, id pulvinar odio lorem non turpis. Nullam sit amet enim.]
 %
 % \begin{macro}{\acceleration}
 %    \begin{macrocode}
-\newphysicsquantity{acceleration}{\m\usk\s\rpsquared}[\newton\per\kg][\m\per\s\squared]
+\newphysicsquantity{acceleration}{\m\usk\s\reciprocalsquared}[\N\per\kg][\m\per\s\squared]
 %    \end{macrocode}
 % \end{macro}
 %
@@ -4889,25 +4923,25 @@ neque, id pulvinar odio lorem non turpis. Nullam sit amet enim.]
 %
 % \begin{macro}{\momentum}
 %    \begin{macrocode}
-\newphysicsquantity{momentum}{\m\usk\kg\usk\reciprocal\s}[\newton\usk\s][\kg\usk\m\per\s]
+\newphysicsquantity{momentum}{\m\usk\kg\usk\reciprocal\s}[\N\usk\s][\kg\usk\m\per\s]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\impulse}
 %    \begin{macrocode}
-\newphysicsquantity{impulse}{\m\usk\kg\usk\reciprocal\s}[\newton\usk\s][\kg\usk\m\per\s]
+\newphysicsquantity{impulse}{\m\usk\kg\usk\reciprocal\s}[\N\usk\s][\kg\usk\m\per\s]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\force}
 %    \begin{macrocode}
-\newphysicsquantity{force}{\m\usk\kg\usk\s\rpsquared}[\newton][\newton]
+\newphysicsquantity{force}{\m\usk\kg\usk\s\reciprocalsquared}[\N][\N]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\springstiffness}
 %    \begin{macrocode}
-\newphysicsquantity{springstiffness}{\kg\usk\s\rpsquared}[\newton\per\m][\newton\per\m]
+\newphysicsquantity{springstiffness}{\kg\usk\s\reciprocalsquared}[\N\per\m][\N\per\m]
 %    \end{macrocode}
 % \end{macro}
 %
@@ -4937,84 +4971,83 @@ neque, id pulvinar odio lorem non turpis. Nullam sit amet enim.]
 %
 % \begin{macro}{\areamassdensity}
 %    \begin{macrocode}
-\newphysicsquantity{areamassdensity}{\m\rpsquared\usk\kg}[\kg\per\m\squared]
+\newphysicsquantity{areamassdensity}{\m\reciprocalsquared\usk\kg}[\kg\per\m\squared]
 [\kg\per\m\squared]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\volumemassdensity}
 %    \begin{macrocode}
-\newphysicsquantity{volumemassdensity}{\m\rpcubed\usk\kg}[\kg\per\m\cubed]
+\newphysicsquantity{volumemassdensity}{\m\reciprocalcubed\usk\kg}[\kg\per\m\cubed]
 [\kg\per\m\cubed]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\youngsmodulus}
 %    \begin{macrocode}
-\newphysicsquantity{youngsmodulus}{\reciprocal\m\usk\kg\usk\s\rpsquared}
-[\newton\per\m\squared][\pascal]
+\newphysicsquantity{youngsmodulus}{\reciprocal\m\usk\kg\usk\s\reciprocalsquared}
+[\N\per\m\squared][\Pa]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\work}
 %    \begin{macrocode}
-\newphysicsquantity{work}{\m\squared\usk\kilogram\usk\s\rpsquared}[\joule]
-[\newton\usk\m]
+\newphysicsquantity{work}{\m\squared\usk\kg\usk\s\reciprocalsquared}[\J]
+[\N\usk\m]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\energy}
 %    \begin{macrocode}
-\newphysicsquantity{energy}{\m\squared\usk\kilogram\usk\s\rpsquared}[\joule]
-[\newton\usk\m]
+\newphysicsquantity{energy}{\m\squared\usk\kg\usk\s\reciprocalsquared}[\J]
+[\N\usk\m]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\power}
 %    \begin{macrocode}
-\newphysicsquantity{power}{\m\squared\usk\kg\usk\s\rpcubed}[\watt][\joule\per\s]
+\newphysicsquantity{power}{\m\squared\usk\kg\usk\s\reciprocalcubed}[\W][\J\per\s]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\angularvelocity}
 %    \begin{macrocode}
-\newphysicsquantity{angularvelocity}{\radian\usk\reciprocal\s}[\radian\per\s]
-[\radian\per\s]
+\newphysicsquantity{angularvelocity}{\rad\usk\reciprocal\s}[\rad\per\s][\rad\per\s]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\angularacceleration}
 %    \begin{macrocode}
-\newphysicsquantity{angularacceleration}{\radian\usk\s\rpsquared}[\radian\per\s\squared]
-[\radian\per\s\squared]
+\newphysicsquantity{angularacceleration}{\rad\usk\s\reciprocalsquared}[\rad\per\s\squared]
+[\rad\per\s\squared]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\angularmomentum}
 %    \begin{macrocode}
-\newphysicsquantity{angularmomentum}{\m\squared\usk\kg\usk\reciprocal\s}[\joule\usk\s]
+\newphysicsquantity{angularmomentum}{\m\squared\usk\kg\usk\reciprocal\s}[\J\usk\s]
 [\kg\usk\m\squared\per\s]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\momentofinertia}
 %    \begin{macrocode}
-\newphysicsquantity{momentofinertia}{\m\squared\usk\kg}[\joule\usk\s\squared]
+\newphysicsquantity{momentofinertia}{\m\squared\usk\kg}[\J\usk\s\squared]
 [\kg\usk\m\squared]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\torque}
 %    \begin{macrocode}
-\newphysicsquantity{torque}{\m\squared\usk\kg\usk\s\rpsquared}[\joule\per\radian]
-[\newton\usk\m]
+\newphysicsquantity{torque}{\m\squared\usk\kg\usk\s\reciprocalsquared}[\J\per\rad]
+[\N\usk\m]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\entropy}
 %    \begin{macrocode}
-\newphysicsquantity{entropy}{\m\squared\usk\kilogram\usk\s\rpsquared\usk\reciprocal\K}
-[\joule\per\K][\joule\per\K]
+\newphysicsquantity{entropy}{\m\squared\usk\kg\usk\s\reciprocalsquared\usk\reciprocal\K}
+[\J\per\K][\J\per\K]
 %    \end{macrocode}
 % \end{macro}
 %
@@ -5038,55 +5071,203 @@ neque, id pulvinar odio lorem non turpis. Nullam sit amet enim.]
 %
 % \begin{macro}{\angularfrequency}
 %    \begin{macrocode}
-\newphysicsquantity{angularfrequency}{\radian\usk\reciprocal\s}[\radian\per\s]
-[\radian\per\s]
+\newphysicsquantity{angularfrequency}{\rad\usk\reciprocal\s}[\rad\per\s][\rad\per\s]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\charge}
 %    \begin{macrocode}
-\newphysicsquantity{charge}{\A\usk\s}[\coulomb][\coulomb]
+\newphysicsquantity{charge}{\A\usk\s}[\C][\C]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\permittivity}
 %    \begin{macrocode}
-\newphysicsquantity{permittivity}{\m\rpcubed\usk\reciprocal\kg\usk\s^{4}\usk\A\squared}
-[\farad\per\m][\coulomb\squared\per\newton\usk\m\squared]
+\newphysicsquantity{permittivity}{\m\reciprocalcubed\usk\reciprocal\kg\usk\s
+  \reciprocalquarted\usk\A\squared}[\F\per\m][\C\squared\per\N\usk\m\squared]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\permeability}
 %    \begin{macrocode}
-\newphysicsquantity{permeability}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}
-[\henry\per\m][\tesla\usk\m\per\A]
+\newphysicsquantity{permeability}{\m\usk\kg\usk\s\reciprocalsquared\usk\A
+  \reciprocalsquared}[\henry\per\m][\T\usk\m\per\A]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\electricfield}
 %    \begin{macrocode}
-\newphysicsquantity{electricfield}{\m\usk\kg\usk\s\rpcubed\usk\reciprocal\A}[\volt\per\m]
-[\newton\per\coulomb]
+\newphysicsquantity{electricfield}{\m\usk\kg\usk\s\reciprocalcubed\usk\reciprocal\A}
+[\V\per\m][\N\per\C]
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\electricdipolemom}
+% \begin{macro}{\electricdipolemoment}
 %    \begin{macrocode}
-\newphysicsquantity{electricdipolemom}{\m\usk\s\usk\A}[\coulomb\usk\m][\coulomb\usk\m]
+\newphysicsquantity{electricdipolemoment}{\m\usk\s\usk\A}[\C\usk\m][\C\usk\m]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\magneticfield}
 %    \begin{macrocode}
-\newphysicsquantity{magneticfield}{\kg\usk\s\rpsquared\usk\reciprocal\A}[\tesla]
-[\newton\per\coulomb\usk(\m\per\s)]
+\newphysicsquantity{magneticfield}{\kg\usk\s\reciprocalsquared\usk\reciprocal\A}[\T]
+[\N\per\C\usk(\m\per\s)]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\cmagneticfield}
 %    \begin{macrocode}
-\newphysicsquantity{cmagneticfield}{\m\usk\kg\usk\s\rpcubed\usk\reciprocal\A}[\volt\per\m]
-[\newton\per\coulomb]
+\newphysicsquantity{cmagneticfield}{\m\usk\kg\usk\s\reciprocalcubed\usk\reciprocal\A}
+[\V\per\m][\N\per\C]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\linearchargedensity}
+%    \begin{macrocode}
+\newphysicsquantity{linearchargedensity}{\reciprocal\m\usk\s\usk\A}[\C\per\m][\C\per\m]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\areachargedensity}
+%    \begin{macrocode}
+\newphysicsquantity{areachargedensity}{\reciprocalsquare\m\usk\s\usk\A}
+[\C\per\square\m][\C\per\square\m]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\volumechargedensity}
+%    \begin{macrocode}
+\newphysicsquantity{volumechargedensity}{\reciprocalcubic\m\usk\s\usk\A}
+[\C\per\cubic\m][\C\per\cubic\m]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\mobility}
+%    \begin{macrocode}
+\newphysicsquantity{mobility}
+{\m\squared\usk\kg\usk\s\reciprocalquarted\usk\reciprocal\A}[\m\squared\per\volt\usk\s]
+[(\m\per\s)\per(\N\per\C)]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\numberdensity}
+%    \begin{macrocode}
+\newphysicsquantity{numberdensity}{\reciprocalcubic\m}[\per\cubic\m][\per\cubic\m]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\polarizability}
+%    \begin{macrocode}
+\newphysicsquantity{polarizability}{\reciprocal\kg\usk\s\quarted\usk\square\A}
+[\C\usk\square\m\per\V][\C\usk\m\per(\N\per\C)]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\electricpotential}
+%    \begin{macrocode}
+\newphysicsquantity{electricpotential}
+{\square\m\usk\kg\usk\reciprocalcubic\s\usk\reciprocal\A}[\J\per\C][\V]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\emf}
+%    \begin{macrocode}
+\newphysicsquantity{emf}{\square\m\usk\kg\usk\reciprocalcubic\s\usk\reciprocal\A}
+[\J\per\C][\V]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\dielectricconstant}
+%    \begin{macrocode}
+\newphysicsquantity{dielectricconstant}{}[][]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\indexofrefraction}
+%    \begin{macrocode}
+\newphysicsquantity{indexofrefraction}{}[][]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\relativepermittivity}
+%    \begin{macrocode}
+\newphysicsquantity{relativepermittivity}{}[][]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\relativepermeability}
+%    \begin{macrocode}
+\newphysicsquantity{relativepermeability}{}[][]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\energydensity}
+%    \begin{macrocode}
+\newphysicsquantity{energydensity}{\m\reciprocaled\usk\kg\usk\reciprocalsquare\s}
+[\J\per\cubic\m][\J\per\cubic\m]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\electroncurrent}
+%    \begin{macrocode}
+\newphysicsquantity{electroncurrent}{\reciprocal\s}
+[\ensuremath{\mathrm{e}}\per\s][\ensuremath{\mathrm{e}}\per\s]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\conventionalcurrent}
+%    \begin{macrocode}
+\newphysicsquantity{conventionalcurrent}{\A}[\C\per\s][\A]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\magneticdipolemoment}
+%    \begin{macrocode}
+\newphysicsquantity{magneticdipolemoment}{\square\m\usk\A}[\J\per\T][\A\usk\square\m]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\currentdensity}
+%    \begin{macrocode}
+\newphysicsquantity{currentdensity}{\reciprocalsquare\m\usk\A}[\C\usk\s\per\square\m]
+[\A\per\square\m]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\capacitance}
+%    \begin{macrocode}
+\newphysicsquantity{capacitance}
+{\reciprocalsquare\m\usk\reciprocal\kg\usk\quartic\s\usk\square\A}[\C\per\V][\F]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\conductivity}
+%    \begin{macrocode}
+\newphysicsquantity{conductivity}
+{\reciprocalcubic\m\usk\reciprocal\kg\usk\cubic\s\usk\square\A}[\siemens\per\m]
+[\A\per\V\usk\m]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\resistivity}
+%    \begin{macrocode}
+\newphysicsquantity{resistivity}
+{\cubic\m\usk\kg\usk\reciprocalcubic\s\usk\reciprocalsquare\A}[\m\per\siemens]
+[\ohm\usk\m]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\resistance}
+%    \begin{macrocode}
+\newphysicsquantity{resistance}
+{\square\m\usk\kg\usk\reciprocalcubic\s\usk\reciprocalsquare\A}[\V\per\A][\ohm]
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\conductance}
+%    \begin{macrocode}
+\newphysicsquantity{conductance}
+{\reciprocalsquare\m\usk\reciprocal\kg\usk\cubic\s\usk\square\A}[\A\per\V][\siemens]
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6331,8 +6512,8 @@ neque, id pulvinar odio lorem non turpis. Nullam sit amet enim.]
 % Coulomb constant
 %    \begin{macrocode}
 \newphysicsconstant{oofpez}{\ensuremath{\frac{1}{\phantom{_o}4\pi\ssub{\epsilon}{o}}}}
-{\scin[9]{9}}{\ensuremath{\m\cubed\usk\kg\usk\s^{-4}\usk\A\rpsquared}}[\m\per\farad]
-[\newton\usk\m\squared\per\coulomb\squared]
+{\scin[9]{9}}{\ensuremath{\m\cubed\usk\kg\usk\reciprocalquartic\s\usk\\reciprocalsquared}}
+[\m\per\farad][\newton\usk\m\squared\per\coulomb\squared]
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6340,8 +6521,8 @@ neque, id pulvinar odio lorem non turpis. Nullam sit amet enim.]
 % Coulomb constant (alternate)
 %    \begin{macrocode}
 \newphysicsconstant{oofpezcs}{\ensuremath{\frac{1}{\phantom{_o}4\pi\ssub{\epsilon}{o}
-c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\usk\m
-\squared][\newton\usk\s\squared\per\coulomb\squared]
+c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\reciprocalsquared\usk\A\reciprocalsquared}
+[\T\usk\m\squared][\N\usk\s\squared\per\C\squared]
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6349,8 +6530,8 @@ c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\
 % vacuum permittivity
 %    \begin{macrocode}
 \newphysicsconstant{epsz}{\ensuremath{\ssub{\epsilon}{o}}}{\scin[9]{-12}}
-{\m\rpcubed\usk\reciprocal\kg\usk\s^{4}\usk\A\squared}[\farad\per\m]
-[\coulomb\squared\per\newton\usk\m\squared]
+{\m\reciprocalcubed\usk\reciprocal\kg\usk\s\quarted\usk\A\squared}[\F\per\m]
+[\C\squared\per\N\usk\m\squared]
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6358,7 +6539,8 @@ c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\
 % Biot-Savart constant
 %    \begin{macrocode}
 \newphysicsconstant{mzofp}{\ensuremath{\frac{\phantom{_oo}\ssub{\mu}{o}\phantom{_o}}
-{4\pi}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\henry\per\m]
+{4\pi}}}{\scin{-7}}{\m\usk\kg\usk\s\reciprocalsquared\usk\A\reciprocalsquared}
+[\henry\per\m]
 [\tesla\usk\m\per\A]
 %    \end{macrocode}
 % \end{macro}
@@ -6367,7 +6549,8 @@ c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\
 % vacuum permeability
 %    \begin{macrocode}
 \newphysicsconstant{muz}{\ensuremath{\ssub{\mu}{o}}}{\scin[4\pi]{-7}}
-{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\henry\per\m][\tesla\usk\m\per\A]
+{\m\usk\kg\usk\s\reciprocalsquared\usk\A\reciprocalsquared}[\henry\per\m]
+[\T\usk\m\per\A]
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6375,7 +6558,7 @@ c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\
 % Boltzmann constant
 %    \begin{macrocode}
 \newphysicsconstant{kboltz}{\ensuremath{\ssub{k}{B}}}{\scin[1.38]{-23}}
-{\kg\usk\m\squared\usk\rpsquare\s\usk\reciprocal\K}[\joule\per\K][\joule\per\K]
+{\kg\usk\m\squared\usk\reciprocalsquare\s\usk\reciprocal\K}[\joule\per\K][\J\per\K]
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6389,8 +6572,9 @@ c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\
 % \begin{macro}{\stefan}
 % Stefan-Boltzmann constant
 %    \begin{macrocode}
-\newphysicsconstant{stefan}{\ensuremath{\sigma}}{\scin[5.67]{-8}}{\kg\usk\s\rpcubed\usk
-\K^{-4}}[\watt\per\m\squared\usk\K^4][\watt\per\m\squared\usk\K^4]
+\newphysicsconstant{stefan}{\ensuremath{\sigma}}{\scin[5.67]{-8}}
+{\kg\usk\s\reciprocalcubed\usk\K\reciprocalquarted}[\W\per\m\squared\usk\K^4]
+[\W\per\m\squared\usk\K\quarted]
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6398,7 +6582,7 @@ c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\
 % Planck constant
 %    \begin{macrocode}
 \newphysicsconstant{planck}{\ensuremath{h}}{\scin[6.62]{-34}}
-{\m\squared\usk\kg\usk\reciprocal\s}[\joule\usk\s][\kg\usk\m\squared\per\s]
+{\m\squared\usk\kg\usk\reciprocal\s}[\J\usk\s][\kg\usk\m\squared\per\s]
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6427,8 +6611,8 @@ c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\
 % \begin{macro}{\Navogadro}
 % Avogadro constant
 %    \begin{macrocode}
-\newphysicsconstant{Navogadro}{\ensuremath{\ssub{N}{A}}}{\scin[6.022]{23}}{\reciprocal
-\mol}[\reciprocal\mol][\reciprocal\mol]
+\newphysicsconstant{Navogadro}{\ensuremath{\ssub{N}{A}}}{\scin[6.022]{23}}
+{\reciprocal\mol}[\reciprocal\mol][\reciprocal\mol]
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6436,16 +6620,16 @@ c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\
 % universal gravitational constant
 %    \begin{macrocode}
 \newphysicsconstant{bigG}{\ensuremath{G}}{\scin[6.67]{-11}}
-{\m\cubed\usk\reciprocal\kg\usk\s\rpsquared}[\joule\usk\m\per\kg\squared]
-[\newton\usk\m\squared\per\kg\squared]
+{\m\cubed\usk\reciprocal\kg\usk\s\reciprocalsquared}[\J\usk\m\per\kg\squared]
+[\N\usk\m\squared\per\kg\squared]
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\littleg}
 % gravitational field strength at Earth's surface
 %    \begin{macrocode}
-\newphysicsconstant{littleg}{\ensuremath{g}}{9.80}{\m\usk\s\rpsquared}[\newton\per\kg]
-[\m\per\s\squared]
+\newphysicsconstant{littleg}{\ensuremath{g}}{9.80}{\m\usk\s\reciprocalsquared}
+[\N\per\kg][\m\per\s\squared]
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6460,7 +6644,7 @@ c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\
 % \begin{macro}{\clightnfn}
 % light's speed (alternate)
 %    \begin{macrocode}
-\newcommand{\clightnfn}{\ensuremath{\unit{1}{ft\per\nano\s}}}
+\newcommand{\clightnfn}{\ensuremath{\unit{1}{\mathrm{ft}\per\mathrm{n}\s}}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6474,8 +6658,8 @@ c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\
 % \begin{macro}{\Mproton}
 % proton's mass
 %    \begin{macrocode}
-\newphysicsconstant{Mproton}{\ensuremath{\ssub{m}{proton}}}{\scin[1.673]{-27}}{\kg}
-[\kg][\kg]
+\newphysicsconstant{Mproton}{\ensuremath{\ssub{m}{proton}}}{\scin[1.673]{-27}}
+{\kg}[\kg][\kg]
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6506,8 +6690,7 @@ c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\
 % \begin{macro}{\echarge}
 % charge quantum
 %    \begin{macrocode}
-\newphysicsconstant{echarge}{\ensuremath{e}}{\scin[1.602]{-19}}{\A\usk\s}[\coulomb]
-[\coulomb]
+\newphysicsconstant{echarge}{\ensuremath{e}}{\scin[1.602]{-19}}{\A\usk\s}[\C][\C]
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6516,9 +6699,9 @@ c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\
 % electron's charge
 %    \begin{macrocode}
 \newphysicsconstant{Qelectron}{\ensuremath{\ssub{Q}{electron}}}{-\echargevalue}
-{\A\usk\s}[\coulomb][\coulomb]
+{\A\usk\s}[\C][\C]
 \newphysicsconstant{qelectron}{\ensuremath{\ssub{q}{electron}}}{-\echargevalue}
-{\A\usk\s}[\coulomb][\coulomb]
+{\A\usk\s}[\C][\C]
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -6528,9 +6711,9 @@ c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\
 % proton's charge
 %    \begin{macrocode}
 \newphysicsconstant{Qproton}{\ensuremath{\ssub{Q}{proton}}}{+\echargevalue}
-{\A\usk\s}[\coulomb][\coulomb]
+{\A\usk\s}[\C][\C]
 \newphysicsconstant{qproton}{\ensuremath{\ssub{q}{proton}}}{+\echargevalue}
-{\A\usk\s}[\coulomb][\coulomb]
+{\A\usk\s}[\C][\C]
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -6626,7 +6809,7 @@ c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\
 % Sun's luminosity
 %    \begin{macrocode}
 \newphysicsconstant{LSun}{\ensuremath{\ssub{L}{Sun}}}{\scin[4]{26}}
-  {\m\squared\usk\kg\usk\s\rpcubed}[\watt][\joule\per\s]
+  {\m\squared\usk\kg\usk\s\reciprocalcubed}[\W][\J\per\s]
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6824,7 +7007,11 @@ c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\
 %
 % \begin{macro}{\evalat}
 %    \begin{macrocode}
-\newcommand{\evalat}[2]{\ensuremath{\Bigg.{#1}\Bigg\rvert_{#2}}}
+\@ifpackageloaded{physymb}{%
+  \typeout{mandi: Package physymb detected. Its commands will be used.}
+}{%
+  \newcommand{\evalat}[2]{\ensuremath{\Bigg.{#1}\Bigg\rvert_{#2}}}
+}%
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6995,15 +7182,28 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
 % \end{macro}
 % \end{macro}
 %
+% \begin{macro}{\gradient}
 % \begin{macro}{\divergence}
 % \begin{macro}{\curl}
+% \begin{macro}{\laplacian}
+% \begin{macro}{\dalembertian}
 % user must specify |\vect{}| around the argument to get arrows
 %    \begin{macrocode}
-\newcommand{\divergence}[1]{\ensuremath{\vectdotvect{\nabla}{#1}}}
-\newcommand{\curl}[1]{\ensuremath{\nabla\times{#1}}}
+\@ifpackageloaded{physymb}{%
+    \typeout{mandi: Package physymb detected. Its commands will be used.}
+}{%
+  \newcommand{\gradient}{\ensuremath{\nabla}}
+  \newcommand{\divergence}{\ensuremath{\nabla\bullet}}
+  \newcommand{\curl}{\ensuremath{\nabla\times}}
+  \newcommand{\laplacian}{\ensuremath{\msup{\nabla}{2}}}
+  \newcommand{\dalembertian}{\ensuremath{\Box}}
+}%
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\diracdelta}
 %    \begin{macrocode}
@@ -7012,94 +7212,56 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
 % \end{macro}
 %
 % \begin{macro}{\asin}
-%    \begin{macrocode}
-\DeclareMathOperator{\asin}{\sin^{-1}}
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\acos}
-%    \begin{macrocode}
-\DeclareMathOperator{\acos}{\cos^{-1}}
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\atan}
-%    \begin{macrocode}
-\DeclareMathOperator{\atan}{\tan^{-1}}
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\asec}
-%    \begin{macrocode}
-\DeclareMathOperator{\asec}{\sec^{-1}}
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\acsc}
-%    \begin{macrocode}
-\DeclareMathOperator{\acsc}{\csc^{-1}}
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\acot}
-%    \begin{macrocode}
-\DeclareMathOperator{\acot}{\cot^{-1}}
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\sech}
-%    \begin{macrocode}
-\DeclareMathOperator{\sech}{sech}
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\csch}
-%    \begin{macrocode}
-\DeclareMathOperator{\csch}{csch}
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\asinh}
-%    \begin{macrocode}
-\DeclareMathOperator{\asinh}{\sinh^{-1}}
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\acosh}
-%    \begin{macrocode}
-\DeclareMathOperator{\acosh}{\cosh^{-1}}
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\atanh}
-%    \begin{macrocode}
-\DeclareMathOperator{\atanh}{\tanh^{-1}}
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\asech}
-%    \begin{macrocode}
-\DeclareMathOperator{\asech}{\sech^{-1}}
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\acsch}
-%    \begin{macrocode}
-\DeclareMathOperator{\acsch}{\csch^{-1}}
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\acoth}
-%    \begin{macrocode}
-\DeclareMathOperator{\acoth}{\coth^{-1}}
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\sgn}
 %    \begin{macrocode}
-\DeclareMathOperator{\sgn}{sgn}
+\@ifpackageloaded{physymb}{%
+  \typeout{mandi: Package physymb detected. Its commands will be used.}
+}{%
+	\DeclareMathOperator{\asin}{\sin^{-1}}
+	\DeclareMathOperator{\acos}{\cos^{-1}}
+	\DeclareMathOperator{\atan}{\tan^{-1}}
+	\DeclareMathOperator{\asec}{\sec^{-1}}
+	\DeclareMathOperator{\acsc}{\csc^{-1}}
+	\DeclareMathOperator{\acot}{\cot^{-1}}
+	\DeclareMathOperator{\sech}{sech}
+	\DeclareMathOperator{\csch}{csch}
+	\DeclareMathOperator{\asinh}{\sinh^{-1}}
+	\DeclareMathOperator{\acosh}{\cosh^{-1}}
+	\DeclareMathOperator{\atanh}{\tanh^{-1}}
+	\DeclareMathOperator{\asech}{\sech^{-1}}
+	\DeclareMathOperator{\acsch}{\csch^{-1}}
+	\DeclareMathOperator{\acoth}{\coth^{-1}}
+	\DeclareMathOperator{\sgn}{sgn}
+}%
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\dex}
 %    \begin{macrocode}
@@ -7116,12 +7278,6 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\emf}
-%    \begin{macrocode}
-\newcommand{\emf}{\ensuremath{\mathrm{emf}}}
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\logb}
 %    \begin{macrocode}
 \newcommand{\logb}[1][\relax]{\ensuremath{\log_{_{#1}}}}
@@ -7156,7 +7312,11 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
 %
 % \begin{macro}{\abs}
 %    \begin{macrocode}
-\newcommand{\abs}[1]{\ensuremath{\left\lvert{#1}\right\rvert}}
+\@ifpackageloaded{physymb}{%
+  \typeout{mandi: Package physymb detected. Its commands will be used.}
+}{%
+  \newcommand{\abs}[1]{\ensuremath{\left\lvert{#1}\right\rvert}}
+}%
 %    \end{macrocode}
 % \end{macro}
 %
@@ -7871,7 +8031,8 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
          {#1}%
        \end{minipage}}%
      \vspace{\baselineskip}%
-   \end{center}}%
+   \end{center}%
+}%
 %    \end{macrocode}
 % \end{macro}
 %
@@ -7886,7 +8047,8 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
          \vspace{#7\textheight}%
        \end{minipage}}%
      \vspace{\baselineskip}%
-   \end{center}}%
+   \end{center}%
+}%
 %    \end{macrocode}
 % \end{macro}
 %
@@ -7899,7 +8061,8 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
          \emptyanswer[#5][#6]}%
      \vspace{\baselineskip}%
      \end{center}}%
-    {\emptybox[#1][#2][#3][#4][#5][#6]}}%
+    {\emptybox[#1][#2][#3][#4][#5][#6]}%
+}%
 %    \end{macrocode}
 % \end{macro}
 %
@@ -7913,7 +8076,8 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
          \emptyanswer[#5][#6]}%
      \vspace{\baselineskip}%
      \end{center}}%
-    {\adjemptybox[#1][#2][#3][#4][#5][#6][#7]}}%
+    {\adjemptybox[#1][#2][#3][#4][#5][#6][#7]}%
+}%
 %    \end{macrocode}
 % \end{macro}
 %
@@ -7928,7 +8092,8 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
          \emptyanswer[#5][#6]}%
      \vspace{\baselineskip}%
      \end{center}}%
-    {\emptybox[#1][#2][#3][#4][#5][#6]}}%
+    {\emptybox[#1][#2][#3][#4][#5][#6]}%
+}%
 %    \end{macrocode}
 % \end{macro}
 %
@@ -8038,7 +8203,8 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
          \emptyanswer[#5][#6]}%
      \vspace{\baselineskip}%
      \end{center}}%
-    {\emptybox[#1][#2][#3][#4][#5][#6]}}%
+    {\emptybox[#1][#2][#3][#4][#5][#6]}%
+}%
 %    \end{macrocode}
 % \end{macro}
 %
@@ -8156,7 +8322,7 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
       \BODY
     \end{align}
   \end{mdframed}
-}
+}%
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/Master/texmf-dist/source/latex/mandi/mandi.ins b/Master/texmf-dist/source/latex/mandi/mandi.ins
index 1d4ed942283..1b3a8710abe 100644
--- a/Master/texmf-dist/source/latex/mandi/mandi.ins
+++ b/Master/texmf-dist/source/latex/mandi/mandi.ins
@@ -62,8 +62,6 @@ and includes the derived files  README
 \generate{\file{\jobname.ins}{\from{\jobname.dtx}{install}}}
 \generate{\usepreamble\empty\usepostamble\empty
           \file{vdemo.py}{\from{\jobname.dtx}{vdemo}}}
-\generate{\usepreamble\empty\usepostamble\empty
-          \file{README.txt}{\from{\jobname.dtx}{readme}}}
 
 \obeyspaces
 \Msg{*************************************************************}
diff --git a/Master/texmf-dist/tex/latex/mandi/mandi.sty b/Master/texmf-dist/tex/latex/mandi/mandi.sty
index acaf0bf1399..d5206ea8965 100644
--- a/Master/texmf-dist/tex/latex/mandi/mandi.sty
+++ b/Master/texmf-dist/tex/latex/mandi/mandi.sty
@@ -28,9 +28,9 @@
 %%                                 vdemo.py.
 %% ---------------------------------------------------------------------------
 %% 
-\ProvidesPackage{mandi}[2012/12/31 2.0.0 Macros for intro physics and astronomy]
+\ProvidesPackage{mandi}[2013/04/10 2.1.0 Macros for intro physics and astronomy]
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\RequirePackage[intlimits]{amsmath}
+\RequirePackage{amsmath}
 \RequirePackage{amssymb}
 \RequirePackage{bigints}
 \RequirePackage{cancel}
@@ -38,8 +38,8 @@
 \RequirePackage[dvipsnames]{xcolor}
 \RequirePackage{environ}
 \RequirePackage{etoolbox}
-\RequirePackage{extarrows}
 \RequirePackage{filehook}
+\RequirePackage{extarrows}
 \RequirePackage[T1]{fontenc}
 \RequirePackage{graphicx}
 \RequirePackage{epstopdf}
@@ -47,7 +47,6 @@
 \RequirePackage{letltxmacro}
 \RequirePackage{listings}
 \RequirePackage[framemethod=TikZ]{mdframed}
-\RequirePackage[amssymb,cdot,derivedinbase,derived,thickqspace]{SIunits}
 \RequirePackage{suffix}
 \RequirePackage{xargs}
 \RequirePackage{xparse}
@@ -75,23 +74,68 @@
 \DeclareOption{baseunits}{\setboolean{@optbaseunits}{true}}
 \DeclareOption{drvdunits}{\setboolean{@optdrvdunits}{true}}
 \ProcessOptions\relax
-\AtBeginOfPackageFile*{SIunits}{%
-\csundef{power}
+\@ifpackageloaded{amssymb}{%
   \csundef{square}
-  \newcommand*{\square}[1]{\ensuremath{\mathrm{#1}^{2}}}
-  \renewcommand*{\squared}{\ensuremath{^{\mathrm{2}}}}
-  \renewcommand*{\cubic}[1]{\ensuremath{\mathrm{#1}^{3}}}
-  \renewcommand*{\cubed}{\ensuremath{^{\mathrm{3}}}}
-\renewcommand*{\fourth}[1]{\ensuremath{\mathrm{#1}^{4}}}
-\renewcommand*{\reciprocal}[1]{\ensuremath{\mathrm{#1}^{\SIminus1}}}
-\renewcommand*{\rp}{\ensuremath{^{\mathrm{\SIminus1}}}}
-\renewcommand*{\rpsquare}[1]{\ensuremath{\mathrm{#1}^{\SIminus2}}}
-\renewcommand*{\rpsquared}{\ensuremath{^{\mathrm{\SIminus2}}}}
-\renewcommand*{\rpcubic}[1]{\ensuremath{\mathrm{#1}^{\SIminus3}}}
-\renewcommand*{\rpcubed}{\ensuremath{^{\mathrm{\SIminus3}}}}
-\renewcommand*{\rpfourth}[1]{\ensuremath{\mathrm{#1}^{\SIminus4}}}
-\typeout{mandi: SIunits conflicts fixed, but don't use \protect\square\space.}
+  \typeout{mandi: Package amssymb detected. Its \protect\square\space has been redefined.}
+}{%
+  \typeout{mandi: Package amssymb not detected.}
 }%
+\newcommand{\per}{\ensuremath{/}}
+\newcommand{\usk}{\ensuremath{\cdot}}
+\newcommand{\unit}[2]{\ensuremath{{#1}\,{#2}}}
+\newcommand{\ampere}{\ensuremath{\mathrm{A}}}
+\newcommand{\arcminute}{\ensuremath{'}}
+\newcommand{\arcsecond}{\ensuremath{''}}
+\newcommand{\atomicmassunit}{\ensuremath{\mathrm{u}}}
+\newcommand{\candela}{\ensuremath{\mathrm{cd}}}
+\newcommand{\coulomb}{\ensuremath{\mathrm{C}}}
+\newcommand{\degree}{\ensuremath{^{\circ}}}
+\newcommand{\electronvolt}{\ensuremath{\mathrm{eV}}}
+\newcommand{\farad}{\ensuremath{\mathrm{F}}}
+\newcommand{\henry}{\ensuremath{\mathrm{H}}}
+\newcommand{\hertz}{\ensuremath{\mathrm{Hz}}}
+\newcommand{\hour}{\ensuremath{\mathrm{h}}}
+\newcommand{\joule}{\ensuremath{\mathrm{J}}}
+\newcommand{\kelvin}{\ensuremath{\mathrm{K}}}
+\newcommand{\kilogram}{\ensuremath{\mathrm{kg}}}
+\newcommand{\metre}{\ensuremath{\mathrm{m}}}
+\newcommand{\minute}{\ensuremath{\mathrm{min}}}
+\newcommand{\mole}{\ensuremath{\mathrm{mol}}}
+\newcommand{\newton}{\ensuremath{\mathrm{N}}}
+\newcommand{\ohm}{\ensuremath{\Omega}}
+\newcommand{\pascal}{\ensuremath{\mathrm{Pa}}}
+\newcommand{\radian}{\ensuremath{\mathrm{rad}}}
+\newcommand{\second}{\ensuremath{\mathrm{s}}}
+\newcommand{\siemens}{\ensuremath{\mathrm{S}}}
+\newcommand{\steradian}{\ensuremath{\mathrm{sr}}}
+\newcommand{\tesla}{\ensuremath{\mathrm{T}}}
+\newcommand{\volt}{\ensuremath{\mathrm{V}}}
+\newcommand{\watt}{\ensuremath{\mathrm{W}}}
+\newcommand{\weber}{\ensuremath{\mathrm{Wb}}}
+\newcommand{\C}{\coulomb}
+\newcommand{\F}{\farad}
+\newcommand{\J}{\joule}
+\newcommand{\N}{\newton}
+\newcommand{\Pa}{\pascal}
+\newcommand{\rad}{\radian}
+\newcommand{\sr}{\steradian}
+\newcommand{\T}{\tesla}
+\newcommand{\V}{\volt}
+\newcommand{\W}{\watt}
+\newcommand{\square}[1]{\ensuremath{\mathrm{#1}^{2}}}              % prefix   2
+\newcommand*{\cubic}[1]{\ensuremath{\mathrm{#1}^{3}}}              % prefix   3
+\newcommand*{\quartic}[1]{\ensuremath{\mathrm{#1}^{4}}}            % prefix   4
+\newcommand*{\reciprocal}[1]{\ensuremath{\mathrm{#1}^{-1}}}        % prefix  -1
+\newcommand*{\reciprocalsquare}[1]{\ensuremath{\mathrm{#1}^{-2}}}  % prefix  -2
+\newcommand*{\reciprocalcubic}[1]{\ensuremath{\mathrm{#1}^{-3}}}   % prefix  -3
+\newcommand*{\reciprocalquartic}[1]{\ensuremath{\mathrm{#1}^{-4}}} % prefix  -4
+\newcommand*{\squared}{\ensuremath{^{\mathrm{2}}}}                 % postfix  2
+\newcommand*{\cubed}{\ensuremath{^{\mathrm{3}}}}                   % postfix  3
+\newcommand*{\quarted}{\ensuremath{^{\mathrm{4}}}}                 % postfix  4
+\newcommand*{\reciprocaled}{\ensuremath{^{\mathrm{-1}}}}           % postfix -1
+\newcommand*{\reciprocalsquared}{\ensuremath{^{\mathrm{-2}}}}      % postfix -2
+\newcommand*{\reciprocalcubed}{\ensuremath{^{\mathrm{-3}}}}        % postfix -3
+\newcommand*{\reciprocalquarted}{\ensuremath{^{\mathrm{-4}}}}      % postfix -4
 \newcommand\mi@exchangeargs[2]{#2#1}%
 \newcommand\mi@name{}%
 \long\def\mi@name#1#{\romannumeral0\mi@innername{#1}}%
@@ -195,65 +239,102 @@
 \newphysicsquantity{temperature}{\K}[\K][\K]
 \newphysicsquantity{amount}{\mol}[\mol][\mol]
 \newphysicsquantity{luminous}{\cd}[\cd][\cd]
-\newphysicsquantity{planeangle}{\m\usk\reciprocal\m}[\radian][\radian]
-\newphysicsquantity{solidangle}{\m\squared\usk\rpsquare\m}[\steradian][\steradian]
+\newphysicsquantity{planeangle}{\m\usk\reciprocal\m}[\rad][\rad]
+\newphysicsquantity{solidangle}{\m\squared\usk\reciprocalsquare\m}[\sr][\sr]
 \newcommand{\indegrees}[1]{\ensuremath{\unit{#1}{\degree}}}
 \newcommand{\inarcminutes}[1]{\ensuremath{\unit{#1}{\arcminute}}}
 \newcommand{\inarcseconds}[1]{\ensuremath{\unit{#1}{\arcsecond}}}
 \newcommand{\ineV}[1]{\ensuremath{\unit{#1}{\electronvolt}}}
-\newcommand{\inAU}[1]{\ensuremath{\unit{#1}{AU}}}
+\newcommand{\inAU}[1]{\ensuremath{\unit{#1}{\mathrm{AU}}}}
 \newcommand{\velocityc}[1]{\ensuremath{#1c}}
 \newphysicsquantity{velocity}{\m\usk\reciprocal\s}[\m\usk\reciprocal\s][\m\per\s]
-\newphysicsquantity{acceleration}{\m\usk\s\rpsquared}[\newton\per\kg][\m\per\s\squared]
+\newphysicsquantity{acceleration}{\m\usk\s\reciprocalsquared}[\N\per\kg][\m\per\s\squared]
 \newcommand{\gamman}[1]{\ensuremath{#1}}
-\newphysicsquantity{momentum}{\m\usk\kg\usk\reciprocal\s}[\newton\usk\s][\kg\usk\m\per\s]
-\newphysicsquantity{impulse}{\m\usk\kg\usk\reciprocal\s}[\newton\usk\s][\kg\usk\m\per\s]
-\newphysicsquantity{force}{\m\usk\kg\usk\s\rpsquared}[\newton][\newton]
-\newphysicsquantity{springstiffness}{\kg\usk\s\rpsquared}[\newton\per\m][\newton\per\m]
+\newphysicsquantity{momentum}{\m\usk\kg\usk\reciprocal\s}[\N\usk\s][\kg\usk\m\per\s]
+\newphysicsquantity{impulse}{\m\usk\kg\usk\reciprocal\s}[\N\usk\s][\kg\usk\m\per\s]
+\newphysicsquantity{force}{\m\usk\kg\usk\s\reciprocalsquared}[\N][\N]
+\newphysicsquantity{springstiffness}{\kg\usk\s\reciprocalsquared}[\N\per\m][\N\per\m]
 \newphysicsquantity{springstretch}{\m}
 \newphysicsquantity{area}{\m\squared}
 \newphysicsquantity{volume}{\cubic\m}
 \newphysicsquantity{linearmassdensity}{\reciprocal\m\usk\kg}[\kg\per\m][\kg\per\m]
-\newphysicsquantity{areamassdensity}{\m\rpsquared\usk\kg}[\kg\per\m\squared]
+\newphysicsquantity{areamassdensity}{\m\reciprocalsquared\usk\kg}[\kg\per\m\squared]
 [\kg\per\m\squared]
-\newphysicsquantity{volumemassdensity}{\m\rpcubed\usk\kg}[\kg\per\m\cubed]
+\newphysicsquantity{volumemassdensity}{\m\reciprocalcubed\usk\kg}[\kg\per\m\cubed]
 [\kg\per\m\cubed]
-\newphysicsquantity{youngsmodulus}{\reciprocal\m\usk\kg\usk\s\rpsquared}
-[\newton\per\m\squared][\pascal]
-\newphysicsquantity{work}{\m\squared\usk\kilogram\usk\s\rpsquared}[\joule]
-[\newton\usk\m]
-\newphysicsquantity{energy}{\m\squared\usk\kilogram\usk\s\rpsquared}[\joule]
-[\newton\usk\m]
-\newphysicsquantity{power}{\m\squared\usk\kg\usk\s\rpcubed}[\watt][\joule\per\s]
-\newphysicsquantity{angularvelocity}{\radian\usk\reciprocal\s}[\radian\per\s]
-[\radian\per\s]
-\newphysicsquantity{angularacceleration}{\radian\usk\s\rpsquared}[\radian\per\s\squared]
-[\radian\per\s\squared]
-\newphysicsquantity{angularmomentum}{\m\squared\usk\kg\usk\reciprocal\s}[\joule\usk\s]
+\newphysicsquantity{youngsmodulus}{\reciprocal\m\usk\kg\usk\s\reciprocalsquared}
+[\N\per\m\squared][\Pa]
+\newphysicsquantity{work}{\m\squared\usk\kg\usk\s\reciprocalsquared}[\J]
+[\N\usk\m]
+\newphysicsquantity{energy}{\m\squared\usk\kg\usk\s\reciprocalsquared}[\J]
+[\N\usk\m]
+\newphysicsquantity{power}{\m\squared\usk\kg\usk\s\reciprocalcubed}[\W][\J\per\s]
+\newphysicsquantity{angularvelocity}{\rad\usk\reciprocal\s}[\rad\per\s][\rad\per\s]
+\newphysicsquantity{angularacceleration}{\rad\usk\s\reciprocalsquared}[\rad\per\s\squared]
+[\rad\per\s\squared]
+\newphysicsquantity{angularmomentum}{\m\squared\usk\kg\usk\reciprocal\s}[\J\usk\s]
 [\kg\usk\m\squared\per\s]
-\newphysicsquantity{momentofinertia}{\m\squared\usk\kg}[\joule\usk\s\squared]
+\newphysicsquantity{momentofinertia}{\m\squared\usk\kg}[\J\usk\s\squared]
 [\kg\usk\m\squared]
-\newphysicsquantity{torque}{\m\squared\usk\kg\usk\s\rpsquared}[\joule\per\radian]
-[\newton\usk\m]
-\newphysicsquantity{entropy}{\m\squared\usk\kilogram\usk\s\rpsquared\usk\reciprocal\K}
-[\joule\per\K][\joule\per\K]
+\newphysicsquantity{torque}{\m\squared\usk\kg\usk\s\reciprocalsquared}[\J\per\rad]
+[\N\usk\m]
+\newphysicsquantity{entropy}{\m\squared\usk\kg\usk\s\reciprocalsquared\usk\reciprocal\K}
+[\J\per\K][\J\per\K]
 \newphysicsquantity{wavelength}{\m}[\m][\m]
 \newphysicsquantity{wavenumber}{\reciprocal\m}[\per\m][\per\m]
 \newphysicsquantity{frequency}{\reciprocal\s}[\hertz][\hertz]
-\newphysicsquantity{angularfrequency}{\radian\usk\reciprocal\s}[\radian\per\s]
-[\radian\per\s]
-\newphysicsquantity{charge}{\A\usk\s}[\coulomb][\coulomb]
-\newphysicsquantity{permittivity}{\m\rpcubed\usk\reciprocal\kg\usk\s^{4}\usk\A\squared}
-[\farad\per\m][\coulomb\squared\per\newton\usk\m\squared]
-\newphysicsquantity{permeability}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}
-[\henry\per\m][\tesla\usk\m\per\A]
-\newphysicsquantity{electricfield}{\m\usk\kg\usk\s\rpcubed\usk\reciprocal\A}[\volt\per\m]
-[\newton\per\coulomb]
-\newphysicsquantity{electricdipolemom}{\m\usk\s\usk\A}[\coulomb\usk\m][\coulomb\usk\m]
-\newphysicsquantity{magneticfield}{\kg\usk\s\rpsquared\usk\reciprocal\A}[\tesla]
-[\newton\per\coulomb\usk(\m\per\s)]
-\newphysicsquantity{cmagneticfield}{\m\usk\kg\usk\s\rpcubed\usk\reciprocal\A}[\volt\per\m]
-[\newton\per\coulomb]
+\newphysicsquantity{angularfrequency}{\rad\usk\reciprocal\s}[\rad\per\s][\rad\per\s]
+\newphysicsquantity{charge}{\A\usk\s}[\C][\C]
+\newphysicsquantity{permittivity}{\m\reciprocalcubed\usk\reciprocal\kg\usk\s
+  \reciprocalquarted\usk\A\squared}[\F\per\m][\C\squared\per\N\usk\m\squared]
+\newphysicsquantity{permeability}{\m\usk\kg\usk\s\reciprocalsquared\usk\A
+  \reciprocalsquared}[\henry\per\m][\T\usk\m\per\A]
+\newphysicsquantity{electricfield}{\m\usk\kg\usk\s\reciprocalcubed\usk\reciprocal\A}
+[\V\per\m][\N\per\C]
+\newphysicsquantity{electricdipolemoment}{\m\usk\s\usk\A}[\C\usk\m][\C\usk\m]
+\newphysicsquantity{magneticfield}{\kg\usk\s\reciprocalsquared\usk\reciprocal\A}[\T]
+[\N\per\C\usk(\m\per\s)]
+\newphysicsquantity{cmagneticfield}{\m\usk\kg\usk\s\reciprocalcubed\usk\reciprocal\A}
+[\V\per\m][\N\per\C]
+\newphysicsquantity{linearchargedensity}{\reciprocal\m\usk\s\usk\A}[\C\per\m][\C\per\m]
+\newphysicsquantity{areachargedensity}{\reciprocalsquare\m\usk\s\usk\A}
+[\C\per\square\m][\C\per\square\m]
+\newphysicsquantity{volumechargedensity}{\reciprocalcubic\m\usk\s\usk\A}
+[\C\per\cubic\m][\C\per\cubic\m]
+\newphysicsquantity{mobility}
+{\m\squared\usk\kg\usk\s\reciprocalquarted\usk\reciprocal\A}[\m\squared\per\volt\usk\s]
+[(\m\per\s)\per(\N\per\C)]
+\newphysicsquantity{numberdensity}{\reciprocalcubic\m}[\per\cubic\m][\per\cubic\m]
+\newphysicsquantity{polarizability}{\reciprocal\kg\usk\s\quarted\usk\square\A}
+[\C\usk\square\m\per\V][\C\usk\m\per(\N\per\C)]
+\newphysicsquantity{electricpotential}
+{\square\m\usk\kg\usk\reciprocalcubic\s\usk\reciprocal\A}[\J\per\C][\V]
+\newphysicsquantity{emf}{\square\m\usk\kg\usk\reciprocalcubic\s\usk\reciprocal\A}
+[\J\per\C][\V]
+\newphysicsquantity{dielectricconstant}{}[][]
+\newphysicsquantity{indexofrefraction}{}[][]
+\newphysicsquantity{relativepermittivity}{}[][]
+\newphysicsquantity{relativepermeability}{}[][]
+\newphysicsquantity{energydensity}{\m\reciprocaled\usk\kg\usk\reciprocalsquare\s}
+[\J\per\cubic\m][\J\per\cubic\m]
+\newphysicsquantity{electroncurrent}{\reciprocal\s}
+[\ensuremath{\mathrm{e}}\per\s][\ensuremath{\mathrm{e}}\per\s]
+\newphysicsquantity{conventionalcurrent}{\A}[\C\per\s][\A]
+\newphysicsquantity{magneticdipolemoment}{\square\m\usk\A}[\J\per\T][\A\usk\square\m]
+\newphysicsquantity{currentdensity}{\reciprocalsquare\m\usk\A}[\C\usk\s\per\square\m]
+[\A\per\square\m]
+\newphysicsquantity{capacitance}
+{\reciprocalsquare\m\usk\reciprocal\kg\usk\quartic\s\usk\square\A}[\C\per\V][\F]
+\newphysicsquantity{conductivity}
+{\reciprocalcubic\m\usk\reciprocal\kg\usk\cubic\s\usk\square\A}[\siemens\per\m]
+[\A\per\V\usk\m]
+\newphysicsquantity{resistivity}
+{\cubic\m\usk\kg\usk\reciprocalcubic\s\usk\reciprocalsquare\A}[\m\per\siemens]
+[\ohm\usk\m]
+\newphysicsquantity{resistance}
+{\square\m\usk\kg\usk\reciprocalcubic\s\usk\reciprocalsquare\A}[\V\per\A][\ohm]
+\newphysicsquantity{conductance}
+{\reciprocalsquare\m\usk\reciprocal\kg\usk\cubic\s\usk\square\A}[\A\per\V][\siemens]
 \newcommand{\lv}{\ensuremath{\left\langle}}
 \newcommand{\rv}{\ensuremath{\right\rangle}}
 \newcommand{\symvect}{\mivector}
@@ -732,59 +813,61 @@
   }%
 }%
 \newphysicsconstant{oofpez}{\ensuremath{\frac{1}{\phantom{_o}4\pi\ssub{\epsilon}{o}}}}
-{\scin[9]{9}}{\ensuremath{\m\cubed\usk\kg\usk\s^{-4}\usk\A\rpsquared}}[\m\per\farad]
-[\newton\usk\m\squared\per\coulomb\squared]
+{\scin[9]{9}}{\ensuremath{\m\cubed\usk\kg\usk\reciprocalquartic\s\usk\\reciprocalsquared}}
+[\m\per\farad][\newton\usk\m\squared\per\coulomb\squared]
 \newphysicsconstant{oofpezcs}{\ensuremath{\frac{1}{\phantom{_o}4\pi\ssub{\epsilon}{o}
-c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\usk\m
-\squared][\newton\usk\s\squared\per\coulomb\squared]
+c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\reciprocalsquared\usk\A\reciprocalsquared}
+[\T\usk\m\squared][\N\usk\s\squared\per\C\squared]
 \newphysicsconstant{epsz}{\ensuremath{\ssub{\epsilon}{o}}}{\scin[9]{-12}}
-{\m\rpcubed\usk\reciprocal\kg\usk\s^{4}\usk\A\squared}[\farad\per\m]
-[\coulomb\squared\per\newton\usk\m\squared]
+{\m\reciprocalcubed\usk\reciprocal\kg\usk\s\quarted\usk\A\squared}[\F\per\m]
+[\C\squared\per\N\usk\m\squared]
 \newphysicsconstant{mzofp}{\ensuremath{\frac{\phantom{_oo}\ssub{\mu}{o}\phantom{_o}}
-{4\pi}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\henry\per\m]
+{4\pi}}}{\scin{-7}}{\m\usk\kg\usk\s\reciprocalsquared\usk\A\reciprocalsquared}
+[\henry\per\m]
 [\tesla\usk\m\per\A]
 \newphysicsconstant{muz}{\ensuremath{\ssub{\mu}{o}}}{\scin[4\pi]{-7}}
-{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\henry\per\m][\tesla\usk\m\per\A]
+{\m\usk\kg\usk\s\reciprocalsquared\usk\A\reciprocalsquared}[\henry\per\m]
+[\T\usk\m\per\A]
 \newphysicsconstant{kboltz}{\ensuremath{\ssub{k}{B}}}{\scin[1.38]{-23}}
-{\kg\usk\m\squared\usk\rpsquare\s\usk\reciprocal\K}[\joule\per\K][\joule\per\K]
+{\kg\usk\m\squared\usk\reciprocalsquare\s\usk\reciprocal\K}[\joule\per\K][\J\per\K]
 \newcommand{\kboltznev}{\ensuremath{\scin[8.62]{-5}{\eV\per\K}}}
-\newphysicsconstant{stefan}{\ensuremath{\sigma}}{\scin[5.67]{-8}}{\kg\usk\s\rpcubed\usk
-\K^{-4}}[\watt\per\m\squared\usk\K^4][\watt\per\m\squared\usk\K^4]
+\newphysicsconstant{stefan}{\ensuremath{\sigma}}{\scin[5.67]{-8}}
+{\kg\usk\s\reciprocalcubed\usk\K\reciprocalquarted}[\W\per\m\squared\usk\K^4]
+[\W\per\m\squared\usk\K\quarted]
 \newphysicsconstant{planck}{\ensuremath{h}}{\scin[6.62]{-34}}
-{\m\squared\usk\kg\usk\reciprocal\s}[\joule\usk\s][\kg\usk\m\squared\per\s]
+{\m\squared\usk\kg\usk\reciprocal\s}[\J\usk\s][\kg\usk\m\squared\per\s]
 \newcommand{\plancknev}{\ensuremath{\scin[4.136]{-15}{\eV\usk\s}}}
 \newphysicsconstant{planckbar}{\ensuremath{\hbar}}{\scin[1.05]{-34}}
 {\m\squared\usk\kg\usk\reciprocal\s}[\joule\usk\s][\kg\usk\m\squared\per\s]
 \newcommand{\planckbarnev}{\ensuremath{\scin[4.136]{-15}{\eV\usk\s}}}
-\newphysicsconstant{Navogadro}{\ensuremath{\ssub{N}{A}}}{\scin[6.022]{23}}{\reciprocal
-\mol}[\reciprocal\mol][\reciprocal\mol]
+\newphysicsconstant{Navogadro}{\ensuremath{\ssub{N}{A}}}{\scin[6.022]{23}}
+{\reciprocal\mol}[\reciprocal\mol][\reciprocal\mol]
 \newphysicsconstant{bigG}{\ensuremath{G}}{\scin[6.67]{-11}}
-{\m\cubed\usk\reciprocal\kg\usk\s\rpsquared}[\joule\usk\m\per\kg\squared]
-[\newton\usk\m\squared\per\kg\squared]
-\newphysicsconstant{littleg}{\ensuremath{g}}{9.80}{\m\usk\s\rpsquared}[\newton\per\kg]
-[\m\per\s\squared]
+{\m\cubed\usk\reciprocal\kg\usk\s\reciprocalsquared}[\J\usk\m\per\kg\squared]
+[\N\usk\m\squared\per\kg\squared]
+\newphysicsconstant{littleg}{\ensuremath{g}}{9.80}{\m\usk\s\reciprocalsquared}
+[\N\per\kg][\m\per\s\squared]
 \newphysicsconstant{clight}{\ensuremath{c}}{\scin[3.00]{8}}{\m\usk\reciprocal\s}
 [\m\usk\reciprocal\s][\m\per\s]
-\newcommand{\clightnfn}{\ensuremath{\unit{1}{ft\per\nano\s}}}
+\newcommand{\clightnfn}{\ensuremath{\unit{1}{\mathrm{ft}\per\mathrm{n}\s}}}
 \newphysicsconstant{Ratom}{\ensuremath{\ssub{r}{atom}}}{\scin{-10}}{\m}[\m][\m]
-\newphysicsconstant{Mproton}{\ensuremath{\ssub{m}{proton}}}{\scin[1.673]{-27}}{\kg}
-[\kg][\kg]
+\newphysicsconstant{Mproton}{\ensuremath{\ssub{m}{proton}}}{\scin[1.673]{-27}}
+{\kg}[\kg][\kg]
 \newphysicsconstant{Mneutron}{\ensuremath{\ssub{m}{neutron}}}{\scin[1.675]{-27}}
 {\kg}[\kg][\kg]
 \newphysicsconstant{Mhydrogen}{\ensuremath{\ssub{m}{hydrogen}}}{\scin[1.673]{-27}}
 {\kg}[\kg][\kg]
 \newphysicsconstant{Melectron}{\ensuremath{\ssub{m}{electron}}}{\scin[9.109]{-31}}
 {\kg}[\kg][\kg]
-\newphysicsconstant{echarge}{\ensuremath{e}}{\scin[1.602]{-19}}{\A\usk\s}[\coulomb]
-[\coulomb]
+\newphysicsconstant{echarge}{\ensuremath{e}}{\scin[1.602]{-19}}{\A\usk\s}[\C][\C]
 \newphysicsconstant{Qelectron}{\ensuremath{\ssub{Q}{electron}}}{-\echargevalue}
-{\A\usk\s}[\coulomb][\coulomb]
+{\A\usk\s}[\C][\C]
 \newphysicsconstant{qelectron}{\ensuremath{\ssub{q}{electron}}}{-\echargevalue}
-{\A\usk\s}[\coulomb][\coulomb]
+{\A\usk\s}[\C][\C]
 \newphysicsconstant{Qproton}{\ensuremath{\ssub{Q}{proton}}}{+\echargevalue}
-{\A\usk\s}[\coulomb][\coulomb]
+{\A\usk\s}[\C][\C]
 \newphysicsconstant{qproton}{\ensuremath{\ssub{q}{proton}}}{+\echargevalue}
-{\A\usk\s}[\coulomb][\coulomb]
+{\A\usk\s}[\C][\C]
 \newphysicsconstant{MEarth}{\ensuremath{\ssub{M}{Earth}}}{\scin[6]{24}}{\kg}[\kg][\kg]
 \newphysicsconstant{MMoon}{\ensuremath{\ssub{M}{Moon}}}{\scin[7]{22}}{\kg}[\kg][\kg]
 \newphysicsconstant{MSun}{\ensuremath{\ssub{M}{Sun}}}{\scin[2]{30}}{\kg}[\kg][\kg]
@@ -803,7 +886,7 @@ c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\
 \newcommand{\yr}{\ensuremath{\mathrm{yr}}}
 \newcommand{\parsec}{\ensuremath{\mathrm{pc}}}
 \newphysicsconstant{LSun}{\ensuremath{\ssub{L}{Sun}}}{\scin[4]{26}}
-  {\m\squared\usk\kg\usk\s\rpcubed}[\watt][\joule\per\s]
+  {\m\squared\usk\kg\usk\s\reciprocalcubed}[\W][\J\per\s]
 \newphysicsconstant{TSun}{\ensuremath{\ssub{T}{Sun}}}{5800}{\K}[\K][\K]
 \newphysicsconstant{MagSun}{\ensuremath{\ssub{M}{Sun}}}{+4.83}{}[][]
 \newphysicsconstant{magSun}{\ensuremath{\ssub{m}{Sun}}}{-26.74}{}[][]
@@ -851,7 +934,11 @@ c^2\phantom{_o}}}}{\scin{-7}}{\m\usk\kg\usk\s\rpsquared\usk\A\rpsquared}[\tesla\
 \newcommand{\fourthirds}{\ensuremath{\frac{4}{3}}\xspace}
 \newcommand{\dx}[1]{\ensuremath{\,\mathrm{d}{#1}}}
 \newcommand{\evalfromto}[3]{\ensuremath{\Bigg.{#1}\Bigg\rvert_{#2}^{#3}}}
-\newcommand{\evalat}[2]{\ensuremath{\Bigg.{#1}\Bigg\rvert_{#2}}}
+\@ifpackageloaded{physymb}{%
+  \typeout{mandi: Package physymb detected. Its commands will be used.}
+}{%
+  \newcommand{\evalat}[2]{\ensuremath{\Bigg.{#1}\Bigg\rvert_{#2}}}
+}%
 \newcommand{\evaluatedat}[1]{\ensuremath{\Bigg.\Bigg\rvert_{#1}}}
 \newcommandx{\integral}[4][1,2,usedefault]{\ensuremath{
   \int_{\ifthenelse{\equal{#1}{}}{}{#4=#1}}^{\ifthenelse{\equal{#2}{}}{}{#4=#2}}}
@@ -912,9 +999,19 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
 \xspace}
 \newcommand{\binomialseries}{\ensuremath{%
 (1 + x)^n \approx 1 + nx + \frac{n(n-1)}{2!}x^2 + \ldots}\xspace}
-\newcommand{\divergence}[1]{\ensuremath{\vectdotvect{\nabla}{#1}}}
-\newcommand{\curl}[1]{\ensuremath{\nabla\times{#1}}}
+\@ifpackageloaded{physymb}{%
+    \typeout{mandi: Package physymb detected. Its commands will be used.}
+}{%
+  \newcommand{\gradient}{\ensuremath{\nabla}}
+  \newcommand{\divergence}{\ensuremath{\nabla\bullet}}
+  \newcommand{\curl}{\ensuremath{\nabla\times}}
+  \newcommand{\laplacian}{\ensuremath{\msup{\nabla}{2}}}
+  \newcommand{\dalembertian}{\ensuremath{\Box}}
+}%
 \newcommand{\diracdelta}[1]{\ensuremath{\boldsymbol{\delta}\quant{#1}}}
+\@ifpackageloaded{physymb}{%
+  \typeout{mandi: Package physymb detected. Its commands will be used.}
+}{%
 \DeclareMathOperator{\asin}{\sin^{-1}}
 \DeclareMathOperator{\acos}{\cos^{-1}}
 \DeclareMathOperator{\atan}{\tan^{-1}}
@@ -930,10 +1027,10 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
 \DeclareMathOperator{\acsch}{\csch^{-1}}
 \DeclareMathOperator{\acoth}{\coth^{-1}}
 \DeclareMathOperator{\sgn}{sgn}
+}%
 \DeclareMathOperator{\dex}{dex}
 \newcommand{\eV}{\electronvolt}
 \newcommand{\ev}{\electronvolt}
-\newcommand{\emf}{\ensuremath{\mathrm{emf}}}
 \newcommand{\logb}[1][\relax]{\ensuremath{\log_{_{#1}}}}
 \ifthenelse{\boolean{@optitalicvectors}}
   {\newcommand{\cB}{\ensuremath{c\mskip -5.00mu B}}}
@@ -941,7 +1038,11 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
 \newcommand{\newpi}{\ensuremath{\pi\mskip -7.8mu\pi}}
 \newcommand{\scripty}[1]{\ensuremath{\mathcalligra{#1}}}
 \newcommandx{\flux}[1][1]{\ensuremath{\ssub{\Phi}{#1}}}
-\newcommand{\abs}[1]{\ensuremath{\left\lvert{#1}\right\rvert}}
+\@ifpackageloaded{physymb}{%
+  \typeout{mandi: Package physymb detected. Its commands will be used.}
+}{%
+  \newcommand{\abs}[1]{\ensuremath{\left\lvert{#1}\right\rvert}}
+}%
 \newcommand{\magof}[1]{\ensuremath{\left\lVert{#1}\right\rVert}}
 \newcommand{\dimsof}[1]{\ensuremath{\left[{#1}\right]}}
 \newcommand{\unitsof}[1]{\ensuremath{\left[{#1}\right]_{_{u}}}}
@@ -1135,7 +1236,8 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
          {#1}%
        \end{minipage}}%
      \vspace{\baselineskip}%
-   \end{center}}%
+   \end{center}%
+}%
 \newcommandx{\adjemptybox}[7][1=\hfill,2=white,3=black,4=black,5=0.90,6=,7=0.0,usedefault]
   {\begin{center}
      \fcolorbox{#3}{#2}{%
@@ -1145,7 +1247,8 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
          \vspace{#7\textheight}%
        \end{minipage}}%
      \vspace{\baselineskip}%
-   \end{center}}%
+   \end{center}%
+}%
 \newcommandx{\answerbox}[6][1=\hfill,2=white,3=black,4=black,5=0.90,6=0.1,usedefault]
   {\ifthenelse{\equal{#1}{}}
     {\begin{center}%
@@ -1153,7 +1256,8 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
          \emptyanswer[#5][#6]}%
      \vspace{\baselineskip}%
      \end{center}}%
-    {\emptybox[#1][#2][#3][#4][#5][#6]}}%
+    {\emptybox[#1][#2][#3][#4][#5][#6]}%
+}%
 \newcommandx{\adjanswerbox}[7][1=\hfill,2=white,3=black,4=black,5=0.90,6=0.1,7=0.0,
   usedefault]
   {\ifthenelse{\equal{#1}{}}%
@@ -1162,7 +1266,8 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
          \emptyanswer[#5][#6]}%
      \vspace{\baselineskip}%
      \end{center}}%
-    {\adjemptybox[#1][#2][#3][#4][#5][#6][#7]}}%
+    {\adjemptybox[#1][#2][#3][#4][#5][#6][#7]}%
+}%
 \newcommandx{\smallanswerbox}[6][1=\hfill,2=white,3=black,4=black,5=0.90,6=0.10,
   usedefault]
   {\ifthenelse{\equal{#1}{}}
@@ -1171,7 +1276,8 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
          \emptyanswer[#5][#6]}%
      \vspace{\baselineskip}%
      \end{center}}%
-    {\emptybox[#1][#2][#3][#4][#5][#6]}}%
+    {\emptybox[#1][#2][#3][#4][#5][#6]}%
+}%
 \newcommandx{\mediumanswerbox}[6][1=\hfill,2=white,3=black,4=black,5=0.90,6=0.20,
   usedefault]{%
   \ifthenelse{\equal{#1}{}}
@@ -1245,7 +1351,8 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
          \emptyanswer[#5][#6]}%
      \vspace{\baselineskip}%
      \end{center}}%
-    {\emptybox[#1][#2][#3][#4][#5][#6]}}%
+    {\emptybox[#1][#2][#3][#4][#5][#6]}%
+}%
 \mdfdefinestyle{miinstructornotestyle}{%
     hidealllines=false, skipbelow=\baselineskip, skipabove=\baselineskip,
     leftmargin=40pt, rightmargin=40pt, linewidth=1, roundcorner=10,
@@ -1331,7 +1438,7 @@ a^x \approx 1 + x \ln{a} + \frac{(x \ln a)^2}{2!} + \frac{(x \ln a)^3}{3!} + \ld
       \BODY
     \end{align}
   \end{mdframed}
-}
+}%
 \newcommand{\checkpoint}{%
   \vspace{1cm}\begin{center}|--------- CHECKPOINT ---------|\end{center}}%
 \newcommand{\image}[2]{%