bohr (6nov14)

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

4 files changed, 18 insertions, 34 deletions

diff --git a/Master/texmf-dist/doc/latex/bohr/README b/Master/texmf-dist/doc/latex/bohr/README
index c6176a24d51..255b712fa7a 100644
--- a/Master/texmf-dist/doc/latex/bohr/README
+++ b/Master/texmf-dist/doc/latex/bohr/README
@@ -1,15 +1,15 @@
 --------------------------------------------------------------------------
-the BOHR package v0.4
+the BOHR package v0.4b
 
   simple atom representation according to the Bohr model
 
-2013/11/10
+2014/11/06
 --------------------------------------------------------------------------
 Clemens Niederberger
 Web:    https://bitbucket.org/cgnieder/bohr/
 E-Mail: contact@mychemistry.eu
 --------------------------------------------------------------------------
-Copyright 2012-2013 Clemens Niederberger
+Copyright 2012-2014 Clemens Niederberger
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/bohr/bohr_en.pdf b/Master/texmf-dist/doc/latex/bohr/bohr_en.pdf
index 0581d8f075e..8fecdc415fe 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 1cf7d6bbb40..76ad5f3ac82 100644
--- a/Master/texmf-dist/doc/latex/bohr/bohr_en.tex
+++ b/Master/texmf-dist/doc/latex/bohr/bohr_en.tex
@@ -10,7 +10,7 @@
 % Web:    https://bitbucket.org/cgnieder/bohr/
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2012 Clemens Niederberger
+% Copyright 2012-2014 Clemens Niederberger
 % 
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -24,20 +24,9 @@
 % 
 % The Current Maintainer of this work is Clemens Niederberger.
 % --------------------------------------------------------------------------
-% The bohr package consists of the files
-%  - bohr.sty
-%  - bohr_en.tex, bohr_en.pdf
-%  - bohr_elements_english.def, bohr_elements_german.def
-%  - README
-% --------------------------------------------------------------------------
 % If you have any ideas, questions, suggestions or bugs to report, please
 % feel free to contact me.
 % --------------------------------------------------------------------------
-%
-% if you want to compile this documentation you'll need my `cnltx` bundle
-% which you can get here:
-%    https://github.com/cgnieder/cnltx/
-%
 \documentclass[load-preamble+]{cnltx-doc}
 \usepackage[utf8]{inputenc}
 \usepackage{bohr}
@@ -189,7 +178,7 @@ There is not much more to it.  Another example using the optional argument:
     \sinceversion{0.3}Determines how the electrons are distributed on the
     shells.  \code{periodic} distributes the electrons 2-8-8-18-18-32-32, \ie,
     according to the place of the corresponding atom in the periodic table of
-    elements.  \code{quantum} distributes the electrons according the the
+    elements.  \code{quantum} distributes the electrons according to the
     electron configuration of the corresponding atom where each shell
     represents the main quantum number.  \ch{Pd} for example has the
     configuration $1s^22s^22p^63s^23p^63d^{10}4s^24p^64d^{10}$ and would get
@@ -269,8 +258,8 @@ element name to a given atomic number and vice versa.
     comma-separated list of the number of electrons placed on each shell from
     inner to outer shell.  For example
     \verbcode+\setelectrondistribution{3}{2,0,1}+ would be an excited
-    Lithium.  The distribution thus declared is only used for drawing when
-    \keyis{distribution-method}{quantum} but is also used by \cs{elconf}.  The
+    Lithium.  The distribution thus declared is used for drawing with
+    \keyis{distribution-method}{quantum} and is also used by \cs{elconf}.  The
     number of electrons with the same principal quantum number but a different
     angular quantum number are separated with a \code{+} ordered by the
     angular quantum number, \ie, first $s$, then $p$, then $d$, and then $f$.
diff --git a/Master/texmf-dist/tex/latex/bohr/bohr.sty b/Master/texmf-dist/tex/latex/bohr/bohr.sty
index 71d94a75509..ebac01901d2 100644
--- a/Master/texmf-dist/tex/latex/bohr/bohr.sty
+++ b/Master/texmf-dist/tex/latex/bohr/bohr.sty
@@ -8,7 +8,7 @@
 % Web:    https://bitbucket.org/cgnieder/bohr/
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2012-2013 Clemens Niederberger
+% Copyright 2012-2014 Clemens Niederberger
 % 
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -22,18 +22,11 @@
 % 
 % The Current Maintainer of this work is Clemens Niederberger.
 % --------------------------------------------------------------------------
-% The bohr package consists of the files
-%  - bohr.sty
-%  - bohr_en.tex, bohr_en.pdf
-%  - bohr_elements_english.def, bohr_elements_german.def,
-%    bohr_elements_french.def
-%  - README
-% --------------------------------------------------------------------------
 % If you have any ideas, questions, suggestions or bugs to report, please
 % feel free to contact me.
 % --------------------------------------------------------------------------
-\newcommand*\@bohr@date{2013/11/10}
-\newcommand*\@bohr@version{v0.4}
+\newcommand*\@bohr@date{2014/11/06}
+\newcommand*\@bohr@version{v0.4b}
 \newcommand*\@bohr@description{simple atom representation according to the Bohr model}
 
 \ProvidesPackage{bohr}[\@bohr@date\space \@bohr@version\space \@bohr@description]
@@ -108,10 +101,10 @@
     shell-options-set/.code    = \def\@bohr@shell@options{#1} ,
     shell-options-add/.code    =
       \@bohr@add@options@to\@bohr@shell@options{#1} ,
-    german/.code               =
-      \@bohr@option@deprecated{german}{language=german} ,
-    ngerman/.code              =
-      \@bohr@option@deprecated{ngerman}{language=german} ,
+    german/.code               = \def\@bohr@language{german} ,
+    ngerman/.code              = \def\@bohr@language{german} ,
+    french/.code               = \def\@bohr@language{french} ,
+    frenchb/.code              = \def\@bohr@language{french} ,
     language/.code             = \def\@bohr@language{#1} ,
     distribution-method/.is choice ,
     distribution-method/periodic/.code =
@@ -597,7 +590,7 @@
 \DeclareAtomSymbol{72}{Hf}
 \DeclareAtomSymbol{73}{Ta}
 \DeclareAtomSymbol{74}{W}
-\DeclareAtomSymbol{75}{Rh}
+\DeclareAtomSymbol{75}{Re}
 \DeclareAtomSymbol{76}{Os}
 \DeclareAtomSymbol{77}{Ir}
 \DeclareAtomSymbol{78}{Pt}
@@ -759,7 +752,7 @@
 \DeclareElectronDistribution{112}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+10,2}
 
 % --------------------------------------------------------------------------
-% extandable language settings
+% extendable language settings
 \RequirePackage{translations}
 \AfterEndPreamble{
   % this will load a file `bohr_elements_<lang>.def', <lang> is a
@@ -797,3 +790,5 @@
                  - new commands \elconf and \writeelconf
                  - \elementsymbol prints symbols according to option
                    `atom-style'
+2014/09/29 v0.4a - alias options for `language=german' and `language=french'
+2014/11/06 v0.4b - corrected wrong element symbol for Rhenium