bohr (24sep12)

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

3 files changed, 15 insertions, 8 deletions

diff --git a/Master/texmf-dist/doc/latex/bohr/bohr_en.pdf b/Master/texmf-dist/doc/latex/bohr/bohr_en.pdf
index 3dd6f0cab73..5138626c932 100644
--- a/Master/texmf-dist/doc/latex/bohr/bohr_en.pdf
+++ b/Master/texmf-dist/doc/latex/bohr/bohr_en.pdf
diff --git a/Master/texmf-dist/tex/latex/bohr/bohr.sty b/Master/texmf-dist/tex/latex/bohr/bohr.sty
index 663ec4bd93c..bb92c960924 100644
--- a/Master/texmf-dist/tex/latex/bohr/bohr.sty
+++ b/Master/texmf-dist/tex/latex/bohr/bohr.sty
@@ -31,8 +31,8 @@
 % If you have any ideas, questions, suggestions or bugs to report, please
 % feel free to contact me.
 % --------------------------------------------------------------------------
-\def\@bohr@date{2012/09/22}
-\def\@bohr@version{v0.2}
+\def\@bohr@date{2012/09/23}
+\def\@bohr@version{v0.2a}
 \def\@bohr@description{simple atom representation according to the Bohr model}
 
 \ProvidesPackage{bohr}[\@bohr@date\space \@bohr@version\space \@bohr@description]
@@ -226,12 +226,19 @@
 \def\@bohr@define@atom@symbol#1#2{%
   \csdef{@bohr@atom@symbol@num@\romannumeral#1}{#2}%
   \lowercase{\csdef{@bohr@atom@number@#2}}{#1}}
-\def\@bohr@define@atom@name#1#2{%
+\def\@bohr@define@atom@name#1#2#3{%
   \csdef{@bohr@atom@name@\romannumeral#1}{#2}%
-  \lowercase{\csdef{@bohr@atom@name@num@#2}}{#1}}
+  \lowercase{\csdef{@bohr@atom@name@num@#3}}{#1}}
 
-\newrobustcmd*\DeclareAtomName[2]{%
-  \@bohr@define@atom@name{#1}{#2}}
+% #1: optional name (umlauts...)
+% #2: atomic number
+% #3: element name
+\newrobustcmd*\DeclareAtomName[3][]{%
+  \ifblank{#1}
+    {\@bohr@define@atom@name{#2}{#3}{#3}}
+    {\@bohr@define@atom@name{#2}{#3}{#1}}}
+% #1: atomic number
+% #2: element symbol
 \newrobustcmd*\DeclareAtomSymbol[2]{%
   \@bohr@define@atom@symbol{#1}{#2}}
 
diff --git a/Master/texmf-dist/tex/latex/bohr/bohr_elements_german.def b/Master/texmf-dist/tex/latex/bohr/bohr_elements_german.def
index 3e3a73d4066..e6b451ad0bb 100644
--- a/Master/texmf-dist/tex/latex/bohr/bohr_elements_german.def
+++ b/Master/texmf-dist/tex/latex/bohr/bohr_elements_german.def
@@ -39,7 +39,7 @@
 \DeclareAtomName{39}{Yttrium}
 \DeclareAtomName{40}{Zirconium}
 \DeclareAtomName{41}{Niobium}
-\DeclareAtomName{42}{Molybd\"{a}n}
+\DeclareAtomName[Molybdaen]{42}{Molybd\"{a}n}
 \DeclareAtomName{43}{Technetium}
 \DeclareAtomName{44}{Ruthenium}
 \DeclareAtomName{45}{Rhodium}
@@ -52,7 +52,7 @@
 \DeclareAtomName{52}{Tellur}
 \DeclareAtomName{53}{Iod}
 \DeclareAtomName{54}{Xenon}
-\DeclareAtomName{55}{C\"{a}sium}
+\DeclareAtomName[Caesium]{55}{C\"{a}sium}
 \DeclareAtomName{56}{Barium}
 \DeclareAtomName{57}{Lanthan}
 \DeclareAtomName{58}{Cer}