summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-05-10 23:47:06 +0000
committerKarl Berry <karl@freefriends.org>2011-05-10 23:47:06 +0000
commit76479dc4a0cc72535dbc4f47205cbfb8f58ae5e7 (patch)
treeadda23c347b00c9322ce8e830171323ab5db9d21
parent043e18a7242664faaaeb2c0e57e8ce4e35381e43 (diff)
physymb (10may11)
git-svn-id: svn://tug.org/texlive/trunk@22406 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/physymb/README5
-rw-r--r--Master/texmf-dist/doc/latex/physymb/physymb.pdfbin307244 -> 289060 bytes
-rw-r--r--Master/texmf-dist/source/latex/physymb/physymb.dtx193
-rw-r--r--Master/texmf-dist/source/latex/physymb/physymb.ins8
-rw-r--r--Master/texmf-dist/tex/latex/physymb/physymb.sty61
5 files changed, 107 insertions, 160 deletions
diff --git a/Master/texmf-dist/doc/latex/physymb/README b/Master/texmf-dist/doc/latex/physymb/README
index 41db520a62a..a35b8dde6a7 100644
--- a/Master/texmf-dist/doc/latex/physymb/README
+++ b/Master/texmf-dist/doc/latex/physymb/README
@@ -4,16 +4,15 @@
The physymb package contains a bunch of assorted macros that may
be useful to physicists (and perhaps occasionally mathematicians).
-The package contains five files:
+The package contains four files:
* README: This file :)
-* physymb.sty: The package itself.
* physymb.pdf: The PDF documentation, which details all the macros
defined by the package.
* physymb.dtx: The documented source. Running pdflatex on this
reproduces the PDF documentation.
* physymb.ins: The installer file. Running latex or pdflatex on
- this will regenerate physymb.sty.
+ this will generate the actual package file, physymb.sty.
To install the package, it should be enough to just copy physymb.sty
to the tex/latex/physymb/ directory (which you may need to create)
diff --git a/Master/texmf-dist/doc/latex/physymb/physymb.pdf b/Master/texmf-dist/doc/latex/physymb/physymb.pdf
index 2e70ca094fc..b77a18aefdc 100644
--- a/Master/texmf-dist/doc/latex/physymb/physymb.pdf
+++ b/Master/texmf-dist/doc/latex/physymb/physymb.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/physymb/physymb.dtx b/Master/texmf-dist/source/latex/physymb/physymb.dtx
index a79a674d718..838d2361569 100644
--- a/Master/texmf-dist/source/latex/physymb/physymb.dtx
+++ b/Master/texmf-dist/source/latex/physymb/physymb.dtx
@@ -21,11 +21,11 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{physymb}[2010/12/15 v0.1 Physics symbol definitions]
+%<package>\ProvidesPackage{physymb}[2011/05/09 v0.2 Physics symbol definitions]
%
%<*driver>
\documentclass{ltxdoc}
-\usepackage[boldvectors,units]{physymb}
+\usepackage[boldvectors,units,particle]{physymb}
\usepackage{hyperref}
\EnableCrossrefs
\CodelineIndex
@@ -36,7 +36,7 @@
%</driver>
% \fi
-% \CheckSum{0}
+% \CheckSum{706}
%% \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
%% Lower-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
@@ -58,11 +58,11 @@
% \GetFileInfo{physymb.sty}
%
% \DoNotIndex{\#,\$,\%,\&,\@,\\,\{,\},\^,\_,\~,\ }
-% \DoNotIndex{\accentset,\addunit,\allowdisplaybreaks}
+% \DoNotIndex{\accentset,\allowdisplaybreaks}
% \DoNotIndex{\bar,\boolean}
% \DoNotIndex{\cos,\cubic}
% \DoNotIndex{\dagger,\DeclareFontShape,\DeclareMathAlphabet,\DeclareMathOperator}
-% \DoNotIndex{\DeclareOption,\Delta}
+% \DoNotIndex{\DeclareOption,\DeclareSIUnit,\Delta}
% \DoNotIndex{\ell\ensuremath,\equal}
% \DoNotIndex{\frac}
% \DoNotIndex{\gamma}
@@ -91,20 +91,10 @@
% may be useful for typesetting physics papers.
% \end{abstract}
%
-% \paragraph{What's so great about it?}
-% If you're scanning over this document wondering what good a bunch of simple macro
-% definitions are, allow me to point out some highlights:
-% \begin{itemize}
-% \item Total and partial derivatives can be typeset using two character macros.\\
-% $\ud{y}{x}$ is now as easy as |\ud{y}{x}|.
-% \item Numbers in scientific notation can also be typeset using a two character macro.
-% $\sn{6.23}{6}$ is written |\sn{6.23}{6}|.
-% \item Doing the same thing with units added is similarly convenient; you can write
-% $\snunit{3.1}{6}{\meter^3}$ as |\snunit{3.1}{6}{\meter^3}|, which is a lot more
-% convenient than writing the whole thing out ``manually.''
-% \item There are standard, simple macros for writing Dirac notation: $\ket{\psi}$ is
-% as easy as |\ket{\psi}|.
-% \end{itemize}
+% Most of the functionality of |physymb| is provided by importing the |siunitx| and
+% |braket| packages. If you're just looking to write numbers in scientific notation,
+% quantities with units, and/or Dirac notation, I recommend using those packages
+% directly.
%
% There are a lot of macros in this package, and it typically doesn't take as many
% lines to explain their meanings as it does to list them all. For that reason, when
@@ -120,12 +110,12 @@
% with an arrow above the symbol.
% \item |boldvectors| causes vectors (again, from |\vec|) to be rendered by typesetting
% the symbol in bold. It's the alternative to |arrowvectors|.
+% \item |braket| pulls in the |braket| package. (It's precisely equivalent to
+% |\usepackage{braket}|, it's just here for convenience.)
% \item |feynman| pulls in the |feynmp| package. (It's precisely equivalent to
% |\usepackage{feynmp}|, it's just here for convenience.)
-% \item |particle| enables all the particle physics macros. (It's actually not implemented
-% yet, so in practice the particle macros get defined regardless of whether you pass this
-% option or not, but that will be fixed soon.)
-% \item |units| pulls in the |SIunits| package and enables the additional unit macros.
+% \item |particle| enables all the particle physics macros.
+% \item |units| pulls in the |siunitx| package and enables the additional unit macros.
% \end{itemize}
%
% \section{Macros}
@@ -262,7 +252,8 @@
% \DescribeMacro{\imag}
% Why the |op|? Well, there are alternate versions that will also put curly braces
% around the following argument, |\real| and |\imag|. This is the way $\realop$ and
-% $\imagop$ are often used.
+% $\imagop$ are often used. (I'm open to changing the definitions of these based on
+% feedback.)
%
% \begin{minipage}{.64\textwidth}
% \begin{center}
@@ -378,53 +369,16 @@
%
% \subsection{Quantum Mechanics}
%
-% |physymb| includes a full set of macros for working with Dirac notation.
-%
-% \DescribeMacro{\ket} To typeset a ket ($\ket\psi$), use |\ket|\marg{label}.
-% \DescribeMacro{\bra} Similarly, you can get a bra ($\bra\psi$), with |\bra|\marg{label}.
-% \DescribeMacro{\braket} To typeset a bracket (inner product), use
-% |\braket|\marg{bra label}\marg{ket label}.
-%
-% \DescribeMacro{\melement} To typeset a matrix element ($\melement{\phi}{A}{\psi}$), or any
-% case in which you have an operator between the bra and the ket, use
-% |\melement|\marg{bra label}\marg{operator}\marg{ket label}.
-% It should work fine to put an arbitrarily complicated expression in the middle of |\melement|,
-% but if your operator is something complicated, you \emph{could} consider just using |\bra|
-% and |\ket| for clarity,
-% \begin{center}
-% |\bra{|\meta{bra label}|}|\meta{operator}|\ket{|\meta{ket label}|}|
-% \end{center}
-%
-% \DescribeMacro{\expect} To get an expectation value (an on-diagonal matrix element with
-% the state left implicit, $\expect{A}$), use |\expect|\marg{operator}. Again, you can put
-% an arbitrary expression within |\expect| but if it would make the code unclear, consider
-% using |\langle| and |\rangle|.
-%
-% \DescribeMacro{\projop} For a projection operator (outer product between a state and itself),
-% we have the command |\projop|\marg{label}\marg{value}, which comes out as $\projop{\psi}{x}$.
-% To get a general outer product between two different states, use |\bra| and |\ket|,
-% \begin{center}
-% |\ket{|\meta{ket label}|}|\meta{value}|\bra{|\meta{bra label}|}|
-% \end{center}
+% If the |braket| option is passed, |physymb| pulls in the |braket| package for
+% writing Dirac notation. See the documentation for that package for details.
%
% \subsection{Units}
%
-% If the |units| option is provided to |physymb|, it automatically includes the |SIunits|
-% package and defines some additional units that are often useful in practice.
-%
-% \DescribeMacro{\snunit} |\snunit|\marg{abcissa}\marg{exponent}\marg{unit} combines
-% the functionality of |\sn| and |\unit|: it typesets a number in scientific notation
-% with a following unit. If the abcissa is equal to $1$, it is omitted, so that
-% |\snunit{1}{6}{\meter}| gives you $\snunit{1}{6}{\meter}$.
-%
-% \paragraph{SI units}
-% \DescribeMacro{\joulepercubicmeter}
-% \DescribeMacro{\joulepercubicmeterrp}
-% These units of energy density have been useful to me approximately twice.
-% Naturally, I had to include them. These augment the list of
-% composite units made available by |SIunits| itself.
+% If the |units| option is provided to |physymb|, it automatically includes the
+% |siunitx| package and defines some additional units that are often useful in practice.
+% See the documentation of |siunitx| for commands provided by that package.
%
-% \paragraph{Additional units} The |SIunits| package only includes SI units (as
+% \paragraph{Additional units} The |siunitx| package only includes SI units (as
% the name would suggest), but there are certain non-SI units that turn out to
% be occasionally useful when dealing with American non-scientists. |physymb|
% defines a selection of them as macros.
@@ -438,15 +392,15 @@
% atom.
%
% \DescribeMacro{\yr}
-% |\yr| represents a year with the symbol $\yr$. There are various definitions of
+% |\yr| represents a year with the symbol $\si{\yr}$. There are various definitions of
% different kinds of years floating around, but generally the symbol is the same.
%
% \DescribeMacro{\erg}
% |\erg| represents an erg, the CGS unit of energy, which still finds occasional use.
-% Its value is $\snunit{1}{-7}{\joule}$.
+% Its value is $\SI{1e-7}{\joule}$.
%
% \DescribeMacro{\gauss}
-% |\gauss| is the Gauss, a unit of magnetic field equal to $\snunit{1}{-4}{\tesla}$.
+% |\gauss| is the Gauss, a unit of magnetic field equal to $\SI{1e-4}{\tesla}$.
%
% \DescribeMacro{\molar}
% |\molar| represents a molar, a unit of concentration equal to one mole per liter.
@@ -454,24 +408,27 @@
% physics so it shouldn't hurt to have the macro around.
%
% \DescribeMacro{\poise}
-% The poise is the CGS unit of viscosity, equal to $\unit{0.1}{\pascal\usk\second}$.
+% The poise is the CGS unit of viscosity, equal to $\SI{0.1}{\pascal\second}$.
%
% \DescribeMacro{\foot}
-% The foot is the Imperial unit of length, equal to $\unit{30.48}{\centi\meter}$.
+% The foot is the Imperial unit of length, equal to $\SI{30.48}{\centi\meter}$.
%
% \DescribeMacro{\mileperhour}
% This is typically (or perhaps almost exclusively) used to measure transportation
% speeds: cars, trains, airplanes, etc. It's equal to about
-% $\unit{0.447}{\frac{\meter}{\second}}$.
+% $\SI{0.447}{\meter\per\second}$.
%
% \DescribeMacro{\pound}
+% \DescribeMacro{\poundforce}
% The pound is the Imperial unit of either force or mass, depending on who you
% ask. Technically I believe it is a force, but in many situations
-% I've often found it clearer to treat it as a unit of mass and use $\mathrm{lbf}$
-% (pound of force) as the unit of force. In this sense, it's equal to about
-% $\unit{453.59}{\gram}$, and the pound of force is the weight of that mass
+% I've often found it clearer to treat it as a unit of mass and use $\si{\poundforce}$
+% (pound of force) as the unit of force. |physymb| defines macros for both.
+%
+% In this sense, a pound is equal to about
+% $\SI{453.59}{\gram}$, and the pound of force is the weight of that mass
% under standard Earth surface gravity, which works out to about
-% $\unit{4.448}{\newton}$.
+% $\SI{4.448}{\newton}$.
%
% \subsection{Particle Physics}
%
@@ -586,10 +543,6 @@
%
% \subsection{Miscellaneous}
%
-% \DescribeMacro{\sn} |\sn|\marg{abcissa}\marg{exponent} is a shorthand for setting a number
-% in scientific notation. It works just like |\snunit| except that it does not take any unit
-% as an argument.
-%
% \DescribeMacro{\scriptr} |\scriptr| produces the script r found in Griffiths'
% electromagnetism textbook, or at least the closest equivalent in LaTeX, $\scriptr$.
%
@@ -668,7 +621,11 @@
% \begin{macrocode}
\newboolean{pfeynman}
% \end{macrocode}
-% This flag is set if the |units| option is enabled. It pulls in the |SIunits| package and provides additional unit definitions.
+% This flag is set if the |braket| option is enabled. It pulls in the |braket| package.
+% \begin{macrocode}
+\newboolean{pbraket}
+% \end{macrocode}
+% This flag is set if the |units| option is enabled. It pulls in the |siunitx| package and provides additional unit definitions.
% \begin{macrocode}
\newboolean{punits}
% \end{macrocode}
@@ -680,6 +637,7 @@
% \subsection{Option Declarations}
% These are the option declarations, pretty self-explanatory.
% \begin{macrocode}
+\DeclareOption{braket}{\setboolean{pbraket}{true}}
\DeclareOption{particle}{\setboolean{pparticle}{true}}
\DeclareOption{units}{\setboolean{punits}{true}}
\DeclareOption{feynman}{\setboolean{pfeynman}{true}}
@@ -705,39 +663,34 @@
\DeclareFontShape{T1}{calligra}{m}{n}{<->s*[2.2]callig15}{}
\newcommand{\scriptr}{\mathcalligra{r}}
% \end{macrocode}
-% Scientific notation is implemented in the obvious way.
+% Here we load the |braket| package if the corresponding option was passed.
% \begin{macrocode}
-\newcommand{\sn}[2]{\ensuremath{#1\times10^{#2}}}
+\ifthenelse{\boolean{pbraket}}
+{
+ \RequirePackage{braket}
+}
+{}
% \end{macrocode}
-% Here we load SIunits if the |units| option was passed.
+% Here we load |siunitx| if the |units| option was passed.
% \begin{macrocode}
\ifthenelse{\boolean{punits}}
{
- \RequirePackage[thinspace,mediumqspace,Gray,squaren]{SIunits}
-% \end{macrocode}
-% These are some SI derived units that have been useful on occasion
-% \begin{macrocode}
- \addunit{\joulepercubicmeter}{\joule\per\cubic\meter}
- \addunit{\joulepercubicmeterrp}{\joule\usk\rpcubic\meter}
-% \end{macrocode}
-% These are some useful non-SI units, defined using the SIunits internal command |\addunits|
-% \begin{macrocode}
- \addunit{\torr}{torr}
- \addunit{\mmhg}{mmHg}
- \addunit{\amu}{amu}
- \addunit{\yr}{yr}
- \addunit{\erg}{erg}
- \addunit{\gauss}{Ga}
- \addunit{\molar}{M}
- \addunit{\poise}{P}
- \addunit{\foot}{ft}
- \addunit{\mileperhour}{mph}
- \addunit{\pound}{lb}
-% \end{macrocode}
-% |\snunit| is implemented using a combination of |\sn| and |\unit|
-% \begin{macrocode}
- \newcommand{\snunit}[3]{\ifthenelse{\equal{#1}{1}}%
- {\unit{10^{#2}}{#3}}{\unit{\sn{#1}{#2}}{#3}}}
+ \RequirePackage{siunitx}
+% \end{macrocode}
+% These are some useful non-SI units
+% \begin{macrocode}
+ \DeclareSIUnit{\torr}{torr}
+ \DeclareSIUnit{\mmhg}{mmHg}
+ \DeclareSIUnit{\amu}{amu}
+ \DeclareSIUnit{\yr}{yr}
+ \DeclareSIUnit{\erg}{erg}
+ \DeclareSIUnit{\gauss}{Ga}
+ \DeclareSIUnit{\molar}{\textsc{M}} % this follows the style set up in the siunitx manual
+ \DeclareSIUnit{\poise}{P}
+ \DeclareSIUnit{\foot}{ft}
+ \DeclareSIUnit{\mileperhour}{mph}
+ \DeclareSIUnit{\pound}{lb}
+ \DeclareSIUnit{\poundforce}{lbf}
}
{}
% \end{macrocode}
@@ -828,8 +781,8 @@
% \begin{macrocode}
\newcommand{\unitd}{\hat{d}}
\newcommand{\unite}{\hat{e}}
-\newcommand{\uniti}{\hat{i}}
-\newcommand{\unitj}{\hat{j}}
+\newcommand{\uniti}{\hat{\imath}}
+\newcommand{\unitj}{\hat{\jmath}}
\newcommand{\unitk}{\hat{k}}
\newcommand{\unitl}{\hat{\ell}}
\newcommand{\unitn}{\hat{n}}
@@ -931,15 +884,6 @@
\newcommand{\realset}{\mathbb{R}}
\newcommand{\imagset}{\mathbb{I}}
% \end{macrocode}
-% Now Dirac notation, implemented using vertical bars and angle brackets in various combinations
-% \begin{macrocode}
-\newcommand{\bra}[1]{\left\langle #1 \right\rvert}
-\newcommand{\ket}[1]{\left\lvert #1 \right\rangle}
-\newcommand{\braket}[2]{\langle #1 \vert #2 \rangle}
-\newcommand{\melement}[3]{\langle #1 \vert #2 \vert #3 \rangle}
-\newcommand{\projop}[2]{\vert #1 \rangle #2 \langle #1 \vert}
-\newcommand{\expect}[1]{\left\langle #1 \right\rangle}
-% \end{macrocode}
% Commutators and anticommutators are done in the obvious way
% \begin{macrocode}
\newcommand{\commut}[2]{\left[ #1, #2 \right]}
@@ -962,9 +906,10 @@
% particles. Each one is set in math roman font, as opposed to text roman font if it makes
% a difference. They're followed by an empty token |{}| for reasons which I forget.
%
-% Theoretically these should only be loaded if the |particle| option was passed but I'll get
-% to that later; in the meantime they're unlikely to conflict with anything important.
+% These are only defined if the |particle| option was passed.
% \begin{macrocode}
+\ifthenelse{\boolean{pparticle}}
+{
\newcommand{\upq}{\ensuremath{\mathrm{u}}{}}
\newcommand{\dnq}{\ensuremath{\mathrm{d}}{}}
\newcommand{\srq}{\ensuremath{\mathrm{s}}{}}
@@ -1038,6 +983,8 @@
\newcommand{\Zzbsn}{\ensuremath{\mathrm{Z}^{0}}{}}
\newcommand{\hbsn}{\ensuremath{\mathrm{h}}{}}
\newcommand{\photon}{\phbsn}
+}
+{}
% \end{macrocode}
% The |feynman| option is implemented by just loading the package |feynmp|.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/physymb/physymb.ins b/Master/texmf-dist/source/latex/physymb/physymb.ins
index 9d49f53a89d..4526c957031 100644
--- a/Master/texmf-dist/source/latex/physymb/physymb.ins
+++ b/Master/texmf-dist/source/latex/physymb/physymb.ins
@@ -21,14 +21,14 @@
\usedir{tex/latex/physymb}
\preamble
This is a generated file.
-Copyright (C) 2006-2010 by David Zaslavsky
+Copyright (C) 2005-2011 by David Zaslavsky <diazona@ellipsix.net>
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
-version 1.2 of this license or (at your option) any later
+version 1.3 of this license or (at your option) any later
version. The latest version of this license is in:
http://www.latex-project.org/lppl.txt
-and version 1.2 or later is part of all distributions of
-LaTeX version 1999/12/01 or later.
+and version 1.3 or later is part of all distributions of
+LaTeX version 2005/12/01 or later.
\endpreamble
\generate{\file{physymb.sty}{\from{physymb.dtx}{package}}}
\Msg{*********************************************************}
diff --git a/Master/texmf-dist/tex/latex/physymb/physymb.sty b/Master/texmf-dist/tex/latex/physymb/physymb.sty
index ea88e502349..f913b4de7d5 100644
--- a/Master/texmf-dist/tex/latex/physymb/physymb.sty
+++ b/Master/texmf-dist/tex/latex/physymb/physymb.sty
@@ -6,17 +6,17 @@
%%
%% physymb.dtx (with options: `package')
%% This is a generated file.
-%% Copyright (C) 2006-2010 by David Zaslavsky
+%% Copyright (C) 2005-2011 by David Zaslavsky <diazona@ellipsix.net>
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
-%% version 1.2 of this license or (at your option) any later
+%% version 1.3 of this license or (at your option) any later
%% version. The latest version of this license is in:
%% http://www.latex-project.org/lppl.txt
-%% and version 1.2 or later is part of all distributions of
-%% LaTeX version 1999/12/01 or later.
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{physymb}[2010/12/15 v0.1 Physics symbol definitions]
+\ProvidesPackage{physymb}[2011/05/09 v0.2 Physics symbol definitions]
%% \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
@@ -36,8 +36,10 @@
\RequirePackage{ifthen}
\newboolean{pparticle}
\newboolean{pfeynman}
+\newboolean{pbraket}
\newboolean{punits}
\newboolean{pboldvectors}
+\DeclareOption{braket}{\setboolean{pbraket}{true}}
\DeclareOption{particle}{\setboolean{pparticle}{true}}
\DeclareOption{units}{\setboolean{punits}{true}}
\DeclareOption{feynman}{\setboolean{pfeynman}{true}}
@@ -54,25 +56,26 @@
\DeclareMathAlphabet{\mathcalligra}{T1}{calligra}{m}{n}
\DeclareFontShape{T1}{calligra}{m}{n}{<->s*[2.2]callig15}{}
\newcommand{\scriptr}{\mathcalligra{r}}
-\newcommand{\sn}[2]{\ensuremath{#1\times10^{#2}}}
+\ifthenelse{\boolean{pbraket}}
+{
+ \RequirePackage{braket}
+}
+{}
\ifthenelse{\boolean{punits}}
{
- \RequirePackage[thinspace,mediumqspace,Gray,squaren]{SIunits}
- \addunit{\joulepercubicmeter}{\joule\per\cubic\meter}
- \addunit{\joulepercubicmeterrp}{\joule\usk\rpcubic\meter}
- \addunit{\torr}{torr}
- \addunit{\mmhg}{mmHg}
- \addunit{\amu}{amu}
- \addunit{\yr}{yr}
- \addunit{\erg}{erg}
- \addunit{\gauss}{Ga}
- \addunit{\molar}{M}
- \addunit{\poise}{P}
- \addunit{\foot}{ft}
- \addunit{\mileperhour}{mph}
- \addunit{\pound}{lb}
- \newcommand{\snunit}[3]{\ifthenelse{\equal{#1}{1}}%
- {\unit{10^{#2}}{#3}}{\unit{\sn{#1}{#2}}{#3}}}
+ \RequirePackage{siunitx}
+ \DeclareSIUnit{\torr}{torr}
+ \DeclareSIUnit{\mmhg}{mmHg}
+ \DeclareSIUnit{\amu}{amu}
+ \DeclareSIUnit{\yr}{yr}
+ \DeclareSIUnit{\erg}{erg}
+ \DeclareSIUnit{\gauss}{Ga}
+ \DeclareSIUnit{\molar}{\textsc{M}} % this follows the style set up in the siunitx manual
+ \DeclareSIUnit{\poise}{P}
+ \DeclareSIUnit{\foot}{ft}
+ \DeclareSIUnit{\mileperhour}{mph}
+ \DeclareSIUnit{\pound}{lb}
+ \DeclareSIUnit{\poundforce}{lbf}
}
{}
\newcommand{\orderof}[1]{\ensuremath{\mathcal{O}\left(#1\right)}}
@@ -112,8 +115,8 @@
\DeclareMathOperator{\trace}{Tr}
\newcommand{\unitd}{\hat{d}}
\newcommand{\unite}{\hat{e}}
-\newcommand{\uniti}{\hat{i}}
-\newcommand{\unitj}{\hat{j}}
+\newcommand{\uniti}{\hat{\imath}}
+\newcommand{\unitj}{\hat{\jmath}}
\newcommand{\unitk}{\hat{k}}
\newcommand{\unitl}{\hat{\ell}}
\newcommand{\unitn}{\hat{n}}
@@ -164,17 +167,13 @@
\newcommand{\whlset}{\mathbb{Q}}
\newcommand{\realset}{\mathbb{R}}
\newcommand{\imagset}{\mathbb{I}}
-\newcommand{\bra}[1]{\left\langle #1 \right\rvert}
-\newcommand{\ket}[1]{\left\lvert #1 \right\rangle}
-\newcommand{\braket}[2]{\langle #1 \vert #2 \rangle}
-\newcommand{\melement}[3]{\langle #1 \vert #2 \vert #3 \rangle}
-\newcommand{\projop}[2]{\vert #1 \rangle #2 \langle #1 \vert}
-\newcommand{\expect}[1]{\left\langle #1 \right\rangle}
\newcommand{\commut}[2]{\left[ #1, #2 \right]}
\newcommand{\acommut}[2]{\left\{ #1, #2 \right\}}
\DeclareMathOperator{\round}{round}
\DeclareMathOperator{\exd}{\mathbf{d}}
\newcommand{\hodge}{\star}
+\ifthenelse{\boolean{pparticle}}
+{
\newcommand{\upq}{\ensuremath{\mathrm{u}}{}}
\newcommand{\dnq}{\ensuremath{\mathrm{d}}{}}
\newcommand{\srq}{\ensuremath{\mathrm{s}}{}}
@@ -248,6 +247,8 @@
\newcommand{\Zzbsn}{\ensuremath{\mathrm{Z}^{0}}{}}
\newcommand{\hbsn}{\ensuremath{\mathrm{h}}{}}
\newcommand{\photon}{\phbsn}
+}
+{}
\ifthenelse{\boolean{pfeynman}}%
{\RequirePackage{feynmp}}%
{}