bohr (2jan13)

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

4 files changed, 21 insertions, 16 deletions

diff --git a/Master/texmf-dist/doc/latex/bohr/README b/Master/texmf-dist/doc/latex/bohr/README
index 5a2356c018b..e521e1022a2 100644
--- a/Master/texmf-dist/doc/latex/bohr/README
+++ b/Master/texmf-dist/doc/latex/bohr/README
@@ -1,9 +1,9 @@
 --------------------------------------------------------------------------
-the BOHR package v0.2b
+the BOHR package v0.2c
 
   simple atom representation according to the Bohr model
 
-2012/09/26
+2012/12/30
 --------------------------------------------------------------------------
 Clemens Niederberger
 Web:    https://bitbucket.org/cgnieder/bohr/
diff --git a/Master/texmf-dist/doc/latex/bohr/bohr_en.pdf b/Master/texmf-dist/doc/latex/bohr/bohr_en.pdf
index 8768de29e2c..4b4549ba79c 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/doc/latex/bohr/bohr_en.tex b/Master/texmf-dist/doc/latex/bohr/bohr_en.tex
index e9d9e4d9b92..d08e45bff10 100644
--- a/Master/texmf-dist/doc/latex/bohr/bohr_en.tex
+++ b/Master/texmf-dist/doc/latex/bohr/bohr_en.tex
@@ -108,7 +108,7 @@
 \begin{document}
 
 \section{Licence and Requirements}\secidx{License}
-\BOHR is placed under the terms of the LaTeX Project Public License,
+\BOHR is placed under the terms of the \LaTeX{} Project Public License,
 version 1.3 or later (\url{http://www.latex-project.org/lppl.txt}).
 It has the status ``maintained.''
 
@@ -165,7 +165,7 @@ There is not much more to it. Another example using the optional argument:
    \cmd{bohr} is placed in.
  \Option{name-options-add}{<tikz>}\Default{}
    This value will be added to options set with \key{name-options-set}.
- \Option{nucleus-option-set}{<tikz>}\Default{draw=black!80,fill=black!10,opacity=.25}
+ \Option{nucleus-options-set}{<tikz>}\Default{draw=black!80,fill=black!10,opacity=.25}
    This value is passed to the options of the \cmd*{draw} command that draws the
    circle around the name-node.
  \Option{nucleus-options-add}{<tikz>}\Default{}
diff --git a/Master/texmf-dist/tex/latex/bohr/bohr.sty b/Master/texmf-dist/tex/latex/bohr/bohr.sty
index 77ce7618370..4d9e60a76b2 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/26}
-\def\@bohr@version{v0.2b}
+\def\@bohr@date{2012/12/30}
+\def\@bohr@version{v0.2c}
 \def\@bohr@description{simple atom representation according to the Bohr model}
 
 \ProvidesPackage{bohr}[\@bohr@date\space \@bohr@version\space \@bohr@description]
@@ -88,7 +88,13 @@
         \@bohr@error{The electron number cannot be negative!}
           {The electron number cannot be negative!}%
       \else
-        \def\@bohr@electron@current@number{#2}%
+        \ifnum#2>112\relax
+          \@bohr@warning{I only know atoms up to 112 (Copernicium). You
+            gave me #1 so I am using 112 instead.}
+          \def\@bohr@electron@current@number{112}%
+        \else
+          \def\@bohr@electron@current@number{#2}%
+        \fi
       \fi
     }%
   \ifblank{#1}
@@ -142,13 +148,7 @@
             \ifnum#1<87\relax
               \def\@bohr@shell@num{6}%
             \else
-              \ifnum#1<110\relax
-                \def\@bohr@shell@num{7}%
-              \else
-                \def\@bohr@shell@num{112}%
-                \@bohr@warning{I only know atoms up to 112 (Copernicium). You
-                  gave me #1 so I am using 112 instead.}
-              \fi
+              \def\@bohr@shell@num{7}%
             \fi
           \fi
         \fi
@@ -203,14 +203,18 @@
                 \@bohr@distribute@electrons{1}{18}{20}{5}%
                 \@bohr@distribute@electrons{1}{#1-54}{11.25}{6}%
               \else
-                \ifnum#1<113\relax
                   \@bohr@distribute@electrons{1}{2}{180}{1}%
                   \@bohr@distribute@electrons{1}{8}{45}{2}%
                   \@bohr@distribute@electrons{1}{8}{45}{3}%
                   \@bohr@distribute@electrons{1}{18}{20}{4}%
                   \@bohr@distribute@electrons{1}{18}{20}{5}%
                   \@bohr@distribute@electrons{1}{32}{11.25}{6}%
+                \ifnum#1<113\relax
                   \@bohr@distribute@electrons{1}{#1-86}{11.25}{7}%
+                \else
+                  \@bohr@distribute@electrons{1}{26}{11.25}{7}%
+                  \@bohr@warning{I only know atoms up to 112 (Copernicium). You
+                    gave me #1 so I am using 112 instead.}
                 \fi
               \fi
             \fi
@@ -460,4 +464,5 @@
 2012/09/22 v0.2  - added compatibility up to atomic number 112
                  - added the commands \elementname and \elementsymbol with
                    language support German and English
-                 - improved error checking
\ No newline at end of file
+                 - improved error checking
+2012/12/30 v0.2c - bug fixes in error checking
\ No newline at end of file