physymb (10may11)

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

1 files changed, 31 insertions, 30 deletions

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}}%
  {}