bohr (24jun15)

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

4 files changed, 32 insertions, 758 deletions

diff --git a/Master/texmf-dist/tex/latex/bohr/bohr.sty b/Master/texmf-dist/tex/latex/bohr/bohr.sty
index ebac01901d2..a0ddc2565af 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-2014 Clemens Niederberger
+% Copyright 2012-2015 Clemens Niederberger
 % 
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -25,23 +25,34 @@
 % If you have any ideas, questions, suggestions or bugs to report, please
 % feel free to contact me.
 % --------------------------------------------------------------------------
-\newcommand*\@bohr@date{2014/11/06}
-\newcommand*\@bohr@version{v0.4b}
+\newcommand*\@bohr@date{2015/06/24}
+\newcommand*\@bohr@version{v1.0}
 \newcommand*\@bohr@description{simple atom representation according to the Bohr model}
 
 \ProvidesPackage{bohr}[\@bohr@date\space \@bohr@version\space \@bohr@description]
-\RequirePackage{tikz,cnltx-base}
+\RequirePackage{tikz,pgfopts,elements}
 
 % --------------------------------------------------------------------------
 % message handling
 \newcommand*\@bohr@error@message{%
-  For details have a look at the `exsheets' manual.%
+  For details have a look at the `bohr' manual.%
 }
 
-\cnltx@create@generic@message{@bohr}{bohr}{Error}{\@bohr@error@message}
-\cnltx@create@generic@message{@bohr}{bohr}{Warning}{}
-\cnltx@create@generic@message{@bohr}{bohr}{WarningNoLine}{}
-\cnltx@create@generic@message{@bohr}{bohr}{Info}{}
+\newrobustcmd*\@bohr@error[1]{\PackageError{bohr}{#1}{#1 \@bohr@error@message}}
+\newrobustcmd*\@bohr@warning[1]{\PackageWarning{bohr}{#1}}
+\newrobustcmd*\@bohr@warningnoline[1]{\PackageWarningNoLine{bohr}{#1}}
+\newrobustcmd*\@bohr@info[1]{\PackageInfo{bohr}{#1}}
+
+\newrobustcmd*\@bohr@expand@arg[2]{%
+  \edef\@bohr@tmpa{{#2}}%
+  \expandafter#1\@bohr@tmpa
+}
+
+\newrobustcmd*\@bohr@expand@second@arg[3]{%
+  \edef\@bohr@tmpa{{#3}}%
+  \def\@bohr@tmpb{{#2}}%
+  \expandafter\expandafter\expandafter#1\expandafter\@bohr@tmpb\@bohr@tmpa
+}
 
 % --------------------------------------------------------------------------
 % options
@@ -61,7 +72,7 @@
   \ifbool{bohr@insert@symbol}
     {%
       \ifblank{#2}
-        {\@bohr@get@atom@symbol{#1}}
+        {\@elements@get@atom@symbol{#1}}
         {\@bohr@write@atom{#2}}%
     }
     {\@bohr@write@atom{#2}}%
@@ -133,27 +144,24 @@
     {% no
       \ifboolexpr{ bool {bohr@insert@number} and test {\ifblank{#3}} }
         {%
-          \@bohr@error{I can't insert the electron number.}
-            {I can't insert the electron number. You haven't specified the
-            element.}%
+          \@bohr@error{I can't insert the electron number. You haven't
+            specified the element.}%
         }{%
           \ifboolexpr
             {
               bool {bohr@insert@number} and not
-              test {\lowercase{\ifcsvoid{@bohr@atom@number@#3}}}
+              test {\lowercase{\ifcsvoid{@elements@atom@number@#3}}}
             }
             {%
               \lowercase{%
-                \def\@bohr@electron@current@number{\csuse{@bohr@atom@number@#3}}}%
+                \def\@bohr@electron@current@number{\csuse{@elements@atom@number@#3}}}%
             }{%
-              \@bohr@error{You must specify an electron number, possibly 0.}
-                {You must specify an electron number, possibly 0.}%
+              \@bohr@error{You must specify an electron number, possibly 0.}%
             }%
         }%
     }{% yes
       \ifnum#2<0\relax
-        \@bohr@error{The electron number cannot be negative!}
-          {The electron number cannot be negative!}%
+        \@bohr@error{The electron number cannot be negative!}%
       \else
         \ifnum#2>112\relax
           \@bohr@warning{I only know atoms up to 112 (Copernicium). You
@@ -300,32 +308,19 @@
 
 % --------------------------------------------------------------------------
 % electron distribution per electron number
-\newrobustcmd*\DeclareElectronDistribution[2]{%
-  \@bohr@define@electron@distribution{#1}{#2}%
-}
-\@onlypreamble\DeclareElectronDistribution
-
-\newrobustcmd*\setelectrondistribution[2]{%
-  \@bohr@define@electron@distribution{#1}{#2}%
-}
-
-\newrobustcmd*\@bohr@define@electron@distribution[2]{%
-  \csdef{@bohr@electron@distribution@\romannumeral#1}{#2}%
-}
-
 \newcounter{@bohr@shell@number}
 
 \newrobustcmd*\@bohr@get@shell@num@quantum[1]{%
   \setcounter{@bohr@shell@number}{0}%
-  \cnltx@expandargs(nx)\forcsvlist
+  \@bohr@expand@second@arg\forcsvlist
     {\stepcounter{@bohr@shell@number}\@gobble}
-    {\csuse{@bohr@electron@distribution@\romannumeral#1}}%
+    {\csuse{@elements@electron@distribution@\romannumeral#1}}%
   \edef\@bohr@shell@num{\arabic{@bohr@shell@number}}%
 }
 
 \newrobustcmd*\@bohr@draw@electrons@quantum[1]{%
-  \cnltx@expandargs(x)\@bohr@get@shell@electrons
-    {\csuse{@bohr@electron@distribution@\romannumeral#1}}%
+  \@bohr@expand@arg\@bohr@get@shell@electrons
+    {\csuse{@elements@electron@distribution@\romannumeral#1}}%
 }
 
 \newrobustcmd*\@bohr@get@shell@electrons[1]{%
@@ -387,386 +382,6 @@
 }
 
 % --------------------------------------------------------------------------
-% atomic numbers and element symbols and names
-\newrobustcmd*\@bohr@define@atom@symbol[2]{%
-  \csdef{@bohr@atom@symbol@num@\romannumeral#1}{#2}%
-  \lowercase{\csdef{@bohr@atom@number@#2}}{#1}%
-}
-\newrobustcmd*\@bohr@define@atom@name[3]{%
-  \csdef{@bohr@atom@name@\romannumeral#1}{#2}%
-  \lowercase{\csdef{@bohr@atom@name@num@#3}}{#1}%
-}
-
-% #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}}%
-}
-% \@onlypreamble\DeclareAtomName
-\newrobustcmd*\setatomname[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}%
-}
-\@onlypreamble\DeclareAtomSymbol
-\newrobustcmd*\declareatomsymbol[2]{%
-  \@bohr@define@atom@symbol{#1}{#2}%
-}
-
-\newrobustcmd*\@bohr@get@atom@symbol[1]{%
-  \cnltx@expandargs(x)\@bohr@write@atom
-    {\csuse{@bohr@atom@symbol@num@\romannumeral#1}}%
-}
-\newrobustcmd*\@bohr@get@atom@number[1]{%
-  \lowercase{\csuse{@bohr@atom@number@#1}}%
-}
-\newcommand*\@bohr@get@atom@name[1]{%
-  \csuse{@bohr@atom@name@\romannumeral#1}%
-}
-
-\newrobustcmd*\@bohr@element@symbol[1]{%
-  \lowercase{\ifcsdef{@bohr@atom@name@num@#1}}
-    {\lowercase{\@bohr@get@atom@symbol{\csuse{@bohr@atom@name@num@#1}}}}
-    {\@bohr@get@atom@symbol{#1}}%
-}
-
-\newrobustcmd*\@bohr@atomic@number[1]{%
-  \lowercase{\ifcsdef{@bohr@atom@number@#1}}
-    {\@bohr@get@atom@number{#1}}
-    {\lowercase{\csuse{@bohr@atom@name@num@#1}}}%
-}
-
-\newrobustcmd*\@bohr@element@name[1]{%
-  \cnltx@ifisnum{#1}
-    {\@bohr@get@atom@name{#1}}
-    {\lowercase{\@bohr@get@atom@name{\csuse{@bohr@atom@number@#1}}}}%
-}
-
-\newrobustcmd*\elementsymbol[1]{\@bohr@element@symbol{#1}}
-\newrobustcmd*\atomicnumber[1]{\@bohr@atomic@number{#1}}
-\newrobustcmd*\elementname[1]{\@bohr@element@name{#1}}
-\AtBeginDocument{\ifdef\Z{}{\let\Z\atomicnumber}}
-
-% --------------------------------------------------------------------------
-% electron distribution
-\newcounter{@bohr@orbital@type}
-% \newbool{@bohr@short@elconf}
-
-\newrobustcmd*\elconf[1]{\@bohr@elconf{#1}}
-\newrobustcmd*\writeelconf[1]{\@bohr@read@elconf{#1}}
-
-\newcommand*\@bohr@elconf[1]{%
-  \cnltx@ifisnum{#1}
-    {\def\@bohr@tmpa{#1}}
-    {%
-      \lowercase{\ifcsdef{@bohr@atom@number@#1}}
-        {\lowercase{\edef\@bohr@tmpa{\csuse{@bohr@atom@number@#1}}}}
-        {\lowercase{\edef\@bohr@tmpa{\csuse{@bohr@atom@name@num@#1}}}}%
-    }%
-  \cnltx@expandargs(Nf)%
-  \def\@bohr@tmpb{%
-    \csuse{@bohr@electron@distribution@\romannumeral\@bohr@tmpa}%
-  }%
-  \expandafter\@bohr@read@elconf\expandafter{\@bohr@tmpb}%
-}
-
-\newrobustcmd*\@bohr@read@elconf[1]{%
-  \def\@bohr@current@elconf{}%
-  \setcounter{@bohr@shell@number}{0}%
-  \@bohr@getelconf{#1}%
-  \expandafter\@bohr@write@elconf\expandafter{\@bohr@current@elconf}%
-}
-
-\newcommand*\@bohr@getelconf[1]{%
-  \forcsvlist{\@bohr@getelconf@aux}{#1}%
-}
-\newcommand*\@bohr@getelconf@aux[1]{%
-  \stepcounter{@bohr@shell@number}%
-  \setcounter{@bohr@orbital@type}{0}%
-  \@bohr@parse@elconf#1+\q@stop
-}
-\protected\def\@bohr@parse@elconf#1+#2\q@stop{%
-  \eappto\@bohr@current@elconf{\arabic{@bohr@shell@number}}%
-  \ifcase\value{@bohr@orbital@type}\relax
-    \appto\@bohr@current@elconf{s}%
-  \or
-    \appto\@bohr@current@elconf{p}%
-  \or
-    \appto\@bohr@current@elconf{d}%
-  \or
-    \appto\@bohr@current@elconf{f}%
-  \fi
-  \appto\@bohr@current@elconf{^{#1}}%
-  \stepcounter{@bohr@orbital@type}%
-  \ifblank{#2}
-    {}
-    {\@bohr@parse@elconf#2\q@stop}%
-}
-
-\newrobustcmd*\@bohr@write@elconf[1]{$#1$}
-
-% --------------------------------------------------------------------------
-% declare atom symbols
-\DeclareAtomSymbol{1}{H}
-\DeclareAtomSymbol{2}{He}
-\DeclareAtomSymbol{3}{Li}
-\DeclareAtomSymbol{4}{Be}
-\DeclareAtomSymbol{5}{B}
-\DeclareAtomSymbol{6}{C}
-\DeclareAtomSymbol{7}{N}
-\DeclareAtomSymbol{8}{O}
-\DeclareAtomSymbol{9}{F}
-\DeclareAtomSymbol{10}{Ne}
-\DeclareAtomSymbol{11}{Na}
-\DeclareAtomSymbol{12}{Mg}
-\DeclareAtomSymbol{13}{Al}
-\DeclareAtomSymbol{14}{Si}
-\DeclareAtomSymbol{15}{P}
-\DeclareAtomSymbol{16}{S}
-\DeclareAtomSymbol{17}{Cl}
-\DeclareAtomSymbol{18}{Ar}
-\DeclareAtomSymbol{19}{K}
-\DeclareAtomSymbol{20}{Ca}
-\DeclareAtomSymbol{21}{Sc}
-\DeclareAtomSymbol{22}{Ti}
-\DeclareAtomSymbol{23}{V}
-\DeclareAtomSymbol{24}{Cr}
-\DeclareAtomSymbol{25}{Mn}
-\DeclareAtomSymbol{26}{Fe}
-\DeclareAtomSymbol{27}{Co}
-\DeclareAtomSymbol{28}{Ni}
-\DeclareAtomSymbol{29}{Cu}
-\DeclareAtomSymbol{30}{Zn}
-\DeclareAtomSymbol{31}{Ga}
-\DeclareAtomSymbol{32}{Ge}
-\DeclareAtomSymbol{33}{As}
-\DeclareAtomSymbol{34}{Se}
-\DeclareAtomSymbol{35}{Br}
-\DeclareAtomSymbol{36}{Kr}
-\DeclareAtomSymbol{37}{Rb}
-\DeclareAtomSymbol{38}{Sr}
-\DeclareAtomSymbol{39}{Y}
-\DeclareAtomSymbol{40}{Zr}
-\DeclareAtomSymbol{41}{Nb}
-\DeclareAtomSymbol{42}{Mo}
-\DeclareAtomSymbol{43}{Tc}
-\DeclareAtomSymbol{44}{Ru}
-\DeclareAtomSymbol{45}{Rh}
-\DeclareAtomSymbol{46}{Pd}
-\DeclareAtomSymbol{47}{Ag}
-\DeclareAtomSymbol{48}{Cd}
-\DeclareAtomSymbol{49}{In}
-\DeclareAtomSymbol{50}{Sn}
-\DeclareAtomSymbol{51}{Sb}
-\DeclareAtomSymbol{52}{Te}
-\DeclareAtomSymbol{53}{I}
-\DeclareAtomSymbol{54}{Xe}
-\DeclareAtomSymbol{55}{Cs}
-\DeclareAtomSymbol{56}{Ba}
-\DeclareAtomSymbol{57}{La}
-\DeclareAtomSymbol{58}{Ce}
-\DeclareAtomSymbol{59}{Pr}
-\DeclareAtomSymbol{60}{Nd}
-\DeclareAtomSymbol{61}{Pm}
-\DeclareAtomSymbol{62}{Sm}
-\DeclareAtomSymbol{63}{Eu}
-\DeclareAtomSymbol{64}{Gd}
-\DeclareAtomSymbol{65}{Tb}
-\DeclareAtomSymbol{66}{Dy}
-\DeclareAtomSymbol{67}{Ho}
-\DeclareAtomSymbol{68}{Er}
-\DeclareAtomSymbol{69}{Tm}
-\DeclareAtomSymbol{70}{Yb}
-\DeclareAtomSymbol{71}{Lu}
-\DeclareAtomSymbol{72}{Hf}
-\DeclareAtomSymbol{73}{Ta}
-\DeclareAtomSymbol{74}{W}
-\DeclareAtomSymbol{75}{Re}
-\DeclareAtomSymbol{76}{Os}
-\DeclareAtomSymbol{77}{Ir}
-\DeclareAtomSymbol{78}{Pt}
-\DeclareAtomSymbol{79}{Au}
-\DeclareAtomSymbol{80}{Hg}
-\DeclareAtomSymbol{81}{Tl}
-\DeclareAtomSymbol{82}{Pb}
-\DeclareAtomSymbol{83}{Bi}
-\DeclareAtomSymbol{84}{Po}
-\DeclareAtomSymbol{85}{At}
-\DeclareAtomSymbol{86}{Rn}
-\DeclareAtomSymbol{87}{Fr}
-\DeclareAtomSymbol{88}{Ra}
-\DeclareAtomSymbol{89}{Ac}
-\DeclareAtomSymbol{90}{Th}
-\DeclareAtomSymbol{91}{Pa}
-\DeclareAtomSymbol{92}{U}
-\DeclareAtomSymbol{93}{Np}
-\DeclareAtomSymbol{94}{Pu}
-\DeclareAtomSymbol{95}{Am}
-\DeclareAtomSymbol{96}{Cm}
-\DeclareAtomSymbol{97}{Bk}
-\DeclareAtomSymbol{98}{Cf}
-\DeclareAtomSymbol{99}{Es}
-\DeclareAtomSymbol{100}{Fm}
-\DeclareAtomSymbol{101}{Md}
-\DeclareAtomSymbol{102}{No}
-\DeclareAtomSymbol{103}{Lr}
-\DeclareAtomSymbol{104}{Rf}
-\DeclareAtomSymbol{105}{Db}
-\DeclareAtomSymbol{106}{Sg}
-\DeclareAtomSymbol{107}{Bh}
-\DeclareAtomSymbol{108}{Hs}
-\DeclareAtomSymbol{109}{Mt}
-\DeclareAtomSymbol{110}{Ds}
-\DeclareAtomSymbol{111}{Rg}
-\DeclareAtomSymbol{112}{Cn}
-
-% --------------------------------------------------------------------------
-% declare electron distributions
-% period 1
-\DeclareElectronDistribution{1}{1}
-\DeclareElectronDistribution{2}{2}% He
-% period 2
-\DeclareElectronDistribution{3}{2,1}
-\DeclareElectronDistribution{4}{2,2}
-\DeclareElectronDistribution{5}{2,2+1}
-\DeclareElectronDistribution{6}{2,2+2}
-\DeclareElectronDistribution{7}{2,2+3}
-\DeclareElectronDistribution{8}{2,2+4}
-\DeclareElectronDistribution{9}{2,2+5}
-\DeclareElectronDistribution{10}{2,2+6}
-% period 3
-\DeclareElectronDistribution{11}{2,2+6,1}% Ne
-\DeclareElectronDistribution{12}{2,2+6,2}
-\DeclareElectronDistribution{13}{2,2+6,2+1}
-\DeclareElectronDistribution{14}{2,2+6,2+2}
-\DeclareElectronDistribution{15}{2,2+6,2+3}
-\DeclareElectronDistribution{16}{2,2+6,2+4}
-\DeclareElectronDistribution{17}{2,2+6,2+5}
-\DeclareElectronDistribution{18}{2,2+6,2+6}% Ar
-% period 4
-\DeclareElectronDistribution{19}{2,2+6,2+6,1}
-\DeclareElectronDistribution{20}{2,2+6,2+6,2}
-\DeclareElectronDistribution{21}{2,2+6,2+6+1,2}
-\DeclareElectronDistribution{22}{2,2+6,2+6+2,2}
-\DeclareElectronDistribution{23}{2,2+6,2+6+3,2}
-\DeclareElectronDistribution{24}{2,2+6,2+6+5,1}
-\DeclareElectronDistribution{25}{2,2+6,2+6+5,2}
-\DeclareElectronDistribution{26}{2,2+6,2+6+6,2}
-\DeclareElectronDistribution{27}{2,2+6,2+6+7,2}
-\DeclareElectronDistribution{28}{2,2+6,2+6+8,2}
-\DeclareElectronDistribution{29}{2,2+6,2+6+10,1}
-\DeclareElectronDistribution{30}{2,2+6,2+6+10,2}
-\DeclareElectronDistribution{31}{2,2+6,2+6+10,2+1}
-\DeclareElectronDistribution{32}{2,2+6,2+6+10,2+2}
-\DeclareElectronDistribution{33}{2,2+6,2+6+10,2+3}
-\DeclareElectronDistribution{34}{2,2+6,2+6+10,2+4}
-\DeclareElectronDistribution{35}{2,2+6,2+6+10,2+5}
-\DeclareElectronDistribution{36}{2,2+6,2+6+10,2+6}% Kr
-% period 5
-\DeclareElectronDistribution{37}{2,2+6,2+6+10,2+6,1}
-\DeclareElectronDistribution{38}{2,2+6,2+6+10,2+6,2}
-\DeclareElectronDistribution{39}{2,2+6,2+6+10,2+6+1,2}
-\DeclareElectronDistribution{40}{2,2+6,2+6+10,2+6+2,2}
-\DeclareElectronDistribution{41}{2,2+6,2+6+10,2+6+4,1}
-\DeclareElectronDistribution{42}{2,2+6,2+6+10,2+6+5,1}
-\DeclareElectronDistribution{43}{2,2+6,2+6+10,2+6+6,1}
-\DeclareElectronDistribution{44}{2,2+6,2+6+10,2+6+7,1}
-\DeclareElectronDistribution{45}{2,2+6,2+6+10,2+6+8,1}
-\DeclareElectronDistribution{46}{2,2+6,2+6+10,2+6+10}
-\DeclareElectronDistribution{47}{2,2+6,2+6+10,2+6+10,1}
-\DeclareElectronDistribution{48}{2,2+6,2+6+10,2+6+10,2}
-\DeclareElectronDistribution{49}{2,2+6,2+6+10,2+6+10,2+1}
-\DeclareElectronDistribution{50}{2,2+6,2+6+10,2+6+10,2+2}
-\DeclareElectronDistribution{51}{2,2+6,2+6+10,2+6+10,2+3}
-\DeclareElectronDistribution{52}{2,2+6,2+6+10,2+6+10,2+4}
-\DeclareElectronDistribution{53}{2,2+6,2+6+10,2+6+10,2+5}
-\DeclareElectronDistribution{54}{2,2+6,2+6+10,2+6+10,2+6}% Xe
-% period 6
-\DeclareElectronDistribution{55}{2,2+6,2+6+10,2+6+10,2+6,1}
-\DeclareElectronDistribution{56}{2,2+6,2+6+10,2+6+10,2+6,2}
-\DeclareElectronDistribution{57}{2,2+6,2+6+10,2+6+10,2+6+1,2}
-\DeclareElectronDistribution{58}{2,2+6,2+6+10,2+6+10+2,2+6,2}
-\DeclareElectronDistribution{59}{2,2+6,2+6+10,2+6+10+3,2+6,2}
-\DeclareElectronDistribution{60}{2,2+6,2+6+10,2+6+10+4,2+6,2}
-\DeclareElectronDistribution{61}{2,2+6,2+6+10,2+6+10+5,2+6,2}
-\DeclareElectronDistribution{62}{2,2+6,2+6+10,2+6+10+6,2+6,2}
-\DeclareElectronDistribution{63}{2,2+6,2+6+10,2+6+10+7,2+6,2}
-\DeclareElectronDistribution{64}{2,2+6,2+6+10,2+6+10+7,2+6+1,2}
-\DeclareElectronDistribution{65}{2,2+6,2+6+10,2+6+10+9,2+6,2}
-\DeclareElectronDistribution{66}{2,2+6,2+6+10,2+6+10+10,2+6,2}
-\DeclareElectronDistribution{67}{2,2+6,2+6+10,2+6+10+11,2+6,2}
-\DeclareElectronDistribution{68}{2,2+6,2+6+10,2+6+10+12,2+6,2}
-\DeclareElectronDistribution{69}{2,2+6,2+6+10,2+6+10+13,2+6,2}
-\DeclareElectronDistribution{70}{2,2+6,2+6+10,2+6+10+14,2+6,2}
-\DeclareElectronDistribution{71}{2,2+6,2+6+10,2+6+10+14,2+6+1,2}
-\DeclareElectronDistribution{72}{2,2+6,2+6+10,2+6+10+14,2+6+2,2}
-\DeclareElectronDistribution{73}{2,2+6,2+6+10,2+6+10+14,2+6+3,2}
-\DeclareElectronDistribution{74}{2,2+6,2+6+10,2+6+10+14,2+6+4,2}
-\DeclareElectronDistribution{75}{2,2+6,2+6+10,2+6+10+14,2+6+5,2}
-\DeclareElectronDistribution{76}{2,2+6,2+6+10,2+6+10+14,2+6+6,2}
-\DeclareElectronDistribution{77}{2,2+6,2+6+10,2+6+10+14,2+6+7,2}
-\DeclareElectronDistribution{78}{2,2+6,2+6+10,2+6+10+14,2+6+9,1}
-\DeclareElectronDistribution{79}{2,2+6,2+6+10,2+6+10+14,2+6+10,1}
-\DeclareElectronDistribution{80}{2,2+6,2+6+10,2+6+10+14,2+6+10,2}
-\DeclareElectronDistribution{81}{2,2+6,2+6+10,2+6+10+14,2+6+10,2+1}
-\DeclareElectronDistribution{82}{2,2+6,2+6+10,2+6+10+14,2+6+10,2+2}
-\DeclareElectronDistribution{83}{2,2+6,2+6+10,2+6+10+14,2+6+10,2+3}
-\DeclareElectronDistribution{84}{2,2+6,2+6+10,2+6+10+14,2+6+10,2+4}
-\DeclareElectronDistribution{85}{2,2+6,2+6+10,2+6+10+14,2+6+10,2+5}
-\DeclareElectronDistribution{86}{2,2+6,2+6+10,2+6+10+14,2+6+10,2+6}% Rn
-% period 7
-\DeclareElectronDistribution{87}{2,2+6,2+6+10,2+6+10+14,2+6+10,2+6,1}
-\DeclareElectronDistribution{88}{2,2+6,2+6+10,2+6+10+14,2+6+10,2+6,2}
-\DeclareElectronDistribution{89}{2,2+6,2+6+10,2+6+10+14,2+6+10,2+6+1,2}
-\DeclareElectronDistribution{90}{2,2+6,2+6+10,2+6+10+14,2+6+10,2+6+2,2}
-\DeclareElectronDistribution{91}{2,2+6,2+6+10,2+6+10+14,2+6+10+2,2+6+1,2}
-\DeclareElectronDistribution{92}{2,2+6,2+6+10,2+6+10+14,2+6+10+3,2+6+1,2}
-\DeclareElectronDistribution{93}{2,2+6,2+6+10,2+6+10+14,2+6+10+4,2+6+1,2}
-\DeclareElectronDistribution{94}{2,2+6,2+6+10,2+6+10+14,2+6+10+6,2+6,2}
-\DeclareElectronDistribution{95}{2,2+6,2+6+10,2+6+10+14,2+6+10+7,2+6,2}
-\DeclareElectronDistribution{96}{2,2+6,2+6+10,2+6+10+14,2+6+10+7,2+6+1,2}
-\DeclareElectronDistribution{97}{2,2+6,2+6+10,2+6+10+14,2+6+10+9,2+6,2}
-\DeclareElectronDistribution{98}{2,2+6,2+6+10,2+6+10+14,2+6+10+10,2+6,2}
-\DeclareElectronDistribution{99}{2,2+6,2+6+10,2+6+10+14,2+6+10+11,2+6,2}
-\DeclareElectronDistribution{100}{2,2+6,2+6+10,2+6+10+14,2+6+10+12,2+6,2}
-\DeclareElectronDistribution{101}{2,2+6,2+6+10,2+6+10+14,2+6+10+13,2+6,2}
-\DeclareElectronDistribution{102}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6,2}
-\DeclareElectronDistribution{103}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+1,2}
-\DeclareElectronDistribution{104}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+2,2}
-\DeclareElectronDistribution{105}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+3,2}
-\DeclareElectronDistribution{106}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+4,2}
-\DeclareElectronDistribution{107}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+5,2}
-\DeclareElectronDistribution{108}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+6,2}
-\DeclareElectronDistribution{109}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+7,2}
-\DeclareElectronDistribution{110}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+9,1}
-\DeclareElectronDistribution{111}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+10,1}
-\DeclareElectronDistribution{112}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+10,2}
-
-% --------------------------------------------------------------------------
-% extendable language settings
-\RequirePackage{translations}
-\AfterEndPreamble{
-  % this will load a file `bohr_elements_<lang>.def', <lang> is a
-  % `translations' base language
-  % currently only German and English are available, English being the
-  % fallback; other languages are added by providing the corresponding file
-  \ifdef\@bohr@language
-    {\edef\@bohr@language{\@trnslt@language{\@bohr@language}}}
-    {\def\@bohr@language{\@trnslt@language{\@trnslt@current@language}}}
-  \InputIfFileExists
-    {bohr_elements_\@bohr@language.def}
-    {}
-    {\input{bohr_elements_english.def}}
-}
 
 \endinput
 
@@ -792,3 +407,4 @@
                    `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
+2015/06/14 v1.0  -
diff --git a/Master/texmf-dist/tex/latex/bohr/bohr_elements_english.def b/Master/texmf-dist/tex/latex/bohr/bohr_elements_english.def
deleted file mode 100644
index e5fb902ed90..00000000000
--- a/Master/texmf-dist/tex/latex/bohr/bohr_elements_english.def
+++ /dev/null
@@ -1,114 +0,0 @@
-\DeclareAtomName{1}{Hydrogen}
-\DeclareAtomName{2}{Helium}
-\DeclareAtomName{3}{Lithium}
-\DeclareAtomName{4}{Beryllium}
-\DeclareAtomName{5}{Boron}
-\DeclareAtomName{6}{Carbon}
-\DeclareAtomName{7}{Nitrogen}
-\DeclareAtomName{8}{Oxygen}
-\DeclareAtomName{9}{Fluorine}
-\DeclareAtomName{10}{Neon}
-\DeclareAtomName{11}{Sodium}
-\DeclareAtomName{12}{Magnesium}
-\DeclareAtomName{13}{Aluminium}
-\DeclareAtomName{14}{Silicon}
-\DeclareAtomName{15}{Phosphorus}
-\DeclareAtomName{16}{Sulfur}
-\DeclareAtomName{17}{Chlorine}
-\DeclareAtomName{18}{Argon}
-\DeclareAtomName{19}{Potassium}
-\DeclareAtomName{20}{Calcium}
-\DeclareAtomName{21}{Scandium}
-\DeclareAtomName{22}{Titanium}
-\DeclareAtomName{23}{Vanadium}
-\DeclareAtomName{24}{Chromium}
-\DeclareAtomName{25}{Manganese}
-\DeclareAtomName{26}{Iron}
-\DeclareAtomName{27}{Cobalt}
-\DeclareAtomName{28}{Nickel}
-\DeclareAtomName{29}{Copper}
-\DeclareAtomName{30}{Zinc}
-\DeclareAtomName{31}{Gallium}
-\DeclareAtomName{32}{Germanium}
-\DeclareAtomName{33}{Arsenic}
-\DeclareAtomName{34}{Selenium}
-\DeclareAtomName{35}{Bromine}
-\DeclareAtomName{36}{Krypton}
-\DeclareAtomName{37}{Rubidium}
-\DeclareAtomName{38}{Strontium}
-\DeclareAtomName{39}{Yttrium}
-\DeclareAtomName{40}{Zirconium}
-\DeclareAtomName{41}{Niobium}
-\DeclareAtomName{42}{Molybdenum}
-\DeclareAtomName{43}{Technetium}
-\DeclareAtomName{44}{Ruthenium}
-\DeclareAtomName{45}{Rhodium}
-\DeclareAtomName{46}{Palladium}
-\DeclareAtomName{47}{Silver}
-\DeclareAtomName{48}{Cadmium}
-\DeclareAtomName{49}{Indium}
-\DeclareAtomName{50}{Tin}
-\DeclareAtomName{51}{Antimony}
-\DeclareAtomName{52}{Tellurium}
-\DeclareAtomName{53}{Iodine}
-\DeclareAtomName{54}{Xenon}
-\DeclareAtomName{55}{Caesium}
-\DeclareAtomName{56}{Barium}
-\DeclareAtomName{57}{Lanthanum}
-\DeclareAtomName{58}{Cerium}
-\DeclareAtomName{59}{Praseodymium}
-\DeclareAtomName{60}{Neodymium}
-\DeclareAtomName{61}{Promethium}
-\DeclareAtomName{62}{Samarium}
-\DeclareAtomName{63}{Europium}
-\DeclareAtomName{64}{Gadolinium}
-\DeclareAtomName{65}{Terbium}
-\DeclareAtomName{66}{Dysprosium}
-\DeclareAtomName{67}{Holmium}
-\DeclareAtomName{68}{Erbium}
-\DeclareAtomName{69}{Thulium}
-\DeclareAtomName{70}{Ytterbium}
-\DeclareAtomName{71}{Lutetium}
-\DeclareAtomName{72}{Hafnium}
-\DeclareAtomName{73}{Tantalium}
-\DeclareAtomName{74}{Tungsten}
-\DeclareAtomName{75}{Rhenium}
-\DeclareAtomName{76}{Osmium}
-\DeclareAtomName{77}{Iridium}
-\DeclareAtomName{78}{Platinum}
-\DeclareAtomName{79}{Gold}
-\DeclareAtomName{80}{Mercury}
-\DeclareAtomName{81}{Thallium}
-\DeclareAtomName{82}{Lead}
-\DeclareAtomName{83}{Bismuth}
-\DeclareAtomName{84}{Polonium}
-\DeclareAtomName{85}{Astatine}
-\DeclareAtomName{86}{Radon}
-\DeclareAtomName{87}{Francium}
-\DeclareAtomName{88}{Radium}
-\DeclareAtomName{89}{Actinium}
-\DeclareAtomName{90}{Thorium}
-\DeclareAtomName{91}{Protactinium}
-\DeclareAtomName{92}{Uranium}
-\DeclareAtomName{93}{Neptunium}
-\DeclareAtomName{94}{Plutonium}
-\DeclareAtomName{95}{Americium}
-\DeclareAtomName{96}{Curium}
-\DeclareAtomName{97}{Berkelium}
-\DeclareAtomName{98}{Californium}
-\DeclareAtomName{99}{Einsteinium}
-\DeclareAtomName{100}{Fermium}
-\DeclareAtomName{101}{Mendelevium}
-\DeclareAtomName{102}{Nobelium}
-\DeclareAtomName{103}{Lawrencium}
-\DeclareAtomName{104}{Rutherfordium}
-\DeclareAtomName{105}{Dubnium}
-\DeclareAtomName{106}{Seaborgium}
-\DeclareAtomName{107}{Bohrium}
-\DeclareAtomName{108}{Hassium}
-\DeclareAtomName{109}{Meitnerium}
-\DeclareAtomName{110}{Darmstadtium}
-\DeclareAtomName{111}{Roentgenium}
-\DeclareAtomName{112}{Copernicium}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/bohr/bohr_elements_french.def b/Master/texmf-dist/tex/latex/bohr/bohr_elements_french.def
deleted file mode 100644
index b729ff7bb8b..00000000000
--- a/Master/texmf-dist/tex/latex/bohr/bohr_elements_french.def
+++ /dev/null
@@ -1,114 +0,0 @@
-\DeclareAtomName[Hydrogene]{1}{Hydrog\`ene}
-\DeclareAtomName[Helium]{2}{H\'elium}
-\DeclareAtomName{3}{Lithium}
-\DeclareAtomName[Beryllium]{4}{B\'eryllium}
-\DeclareAtomName{5}{Bore}
-\DeclareAtomName{6}{Carbone}
-\DeclareAtomName{7}{Azote}
-\DeclareAtomName[Oxygene]{8}{Oxyg\`ene}
-\DeclareAtomName{9}{Fluor}
-\DeclareAtomName[Neon]{10}{N\'eon}
-\DeclareAtomName{11}{Sodium}
-\DeclareAtomName[Magnesium]{12}{Magn\'esium}
-\DeclareAtomName{13}{Aluminium}
-\DeclareAtomName{14}{Silicium}
-\DeclareAtomName{15}{Phosphore}
-\DeclareAtomName{16}{Soufre}
-\DeclareAtomName{17}{Chlor}
-\DeclareAtomName{18}{Argon}
-\DeclareAtomName{19}{Potassium}
-\DeclareAtomName{20}{Calcium}
-\DeclareAtomName{21}{Scandium}
-\DeclareAtomName{22}{Titane}
-\DeclareAtomName{23}{Vanadium}
-\DeclareAtomName{24}{Chrome}
-\DeclareAtomName[Manganese]{25}{Mangan\`ese}
-\DeclareAtomName{26}{Fer}
-\DeclareAtomName{27}{Cobalt}
-\DeclareAtomName{28}{Nickel}
-\DeclareAtomName{29}{Cuivre}
-\DeclareAtomName{30}{Zinc}
-\DeclareAtomName{31}{Gallium}
-\DeclareAtomName{32}{Germanium}
-\DeclareAtomName{33}{Arsenic}
-\DeclareAtomName[Selenium]{34}{S\'el\'enium}
-\DeclareAtomName{35}{Brome}
-\DeclareAtomName{36}{Krypton}
-\DeclareAtomName{37}{Rubidium}
-\DeclareAtomName{38}{Strontium}
-\DeclareAtomName{39}{Yttrium}
-\DeclareAtomName{40}{Zirconium}
-\DeclareAtomName{41}{Niobium}
-\DeclareAtomName[Molybdene]{42}{Molybd\`en}
-\DeclareAtomName[Technetium]{43}{Techn\'etium}
-\DeclareAtomName[Ruthenium]{44}{Ruth\'enium}
-\DeclareAtomName{45}{Rhodium}
-\DeclareAtomName{46}{Palladium}
-\DeclareAtomName{47}{Argent}
-\DeclareAtomName{48}{Cadmium}
-\DeclareAtomName{49}{Indium}
-\DeclareAtomName{50}{Etain}
-\DeclareAtomName{51}{Antimoine}
-\DeclareAtomName{52}{Tellure}
-\DeclareAtomName{53}{Iode}
-\DeclareAtomName[Xenon]{54}{X\'enon}
-\DeclareAtomName[Cesium]{55}{C\'esium}
-\DeclareAtomName{56}{Baryum}
-\DeclareAtomName{57}{Lanthane}
-\DeclareAtomName[Cerium]{58}{C\'erium}
-\DeclareAtomName[Praseodyme]{59}{Pras\'eodyme}
-\DeclareAtomName[Neodyme]{60}{N\'eodyme}
-\DeclareAtomName{61}{Prom\'ethium}
-\DeclareAtomName{62}{Samarium}
-\DeclareAtomName{63}{Europium}
-\DeclareAtomName{64}{Gadolinium}
-\DeclareAtomName{65}{Terbium}
-\DeclareAtomName{66}{Dysprosium}
-\DeclareAtomName{67}{Holmium}
-\DeclareAtomName{68}{Erbium}
-\DeclareAtomName{69}{Thulium}
-\DeclareAtomName{70}{Ytterbium}
-\DeclareAtomName[Luthetium]{71}{Lut\'etium}
-\DeclareAtomName{72}{Hafnium}
-\DeclareAtomName{73}{Tantale}
-\DeclareAtomName[Tungstene]{74}{Tungst\`ene}
-\DeclareAtomName[Rhenium]{75}{Rh\'enium}
-\DeclareAtomName{76}{Osmium}
-\DeclareAtomName{77}{Iridium}
-\DeclareAtomName{78}{Platine}
-\DeclareAtomName{79}{Or}
-\DeclareAtomName{80}{Mercure}
-\DeclareAtomName{81}{Thallium}
-\DeclareAtomName{82}{Plomb}
-\DeclareAtomName{83}{Bismuth}
-\DeclareAtomName{84}{Polonium}
-\DeclareAtomName{85}{Astate}
-\DeclareAtomName{86}{Radon}
-\DeclareAtomName{87}{Francium}
-\DeclareAtomName{88}{Radium}
-\DeclareAtomName{89}{Actinium}
-\DeclareAtomName{90}{Thorium}
-\DeclareAtomName{91}{Protactinium}
-\DeclareAtomName{92}{Uranium}
-\DeclareAtomName{93}{Neptunium}
-\DeclareAtomName{94}{Plutonium}
-\DeclareAtomName[Americium]{95}{Am\'ericium}
-\DeclareAtomName{96}{Curium}
-\DeclareAtomName[Berkelium]{97}{Berk\'elium}
-\DeclareAtomName{98}{Californium}
-\DeclareAtomName{99}{Einsteinium}
-\DeclareAtomName{100}{Fermium}
-\DeclareAtomName[Mendelevium]{101}{Mendel\'evium}
-\DeclareAtomName[Nobelium]{102}{Nob\'elium}
-\DeclareAtomName{103}{Lawrencium}
-\DeclareAtomName{104}{Rutherfordium}
-\DeclareAtomName{105}{Dubnium}
-\DeclareAtomName{106}{Seaborgium}
-\DeclareAtomName{107}{Bohrium}
-\DeclareAtomName{108}{Hassium}
-\DeclareAtomName{109}{Meitnerium}
-\DeclareAtomName{110}{Darmstadtium}
-\DeclareAtomName{111}{Roentgenium}
-\DeclareAtomName{112}{Copernicium}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/bohr/bohr_elements_german.def b/Master/texmf-dist/tex/latex/bohr/bohr_elements_german.def
deleted file mode 100644
index c9af43eaa86..00000000000
--- a/Master/texmf-dist/tex/latex/bohr/bohr_elements_german.def
+++ /dev/null
@@ -1,114 +0,0 @@
-\DeclareAtomName{1}{Wasserstoff}
-\DeclareAtomName{2}{Helium}
-\DeclareAtomName{3}{Lithium}
-\DeclareAtomName{4}{Beryllium}
-\DeclareAtomName{5}{Bor}
-\DeclareAtomName{6}{Kohlenstoff}
-\DeclareAtomName{7}{Stickstoff}
-\DeclareAtomName{8}{Souerstoff}
-\DeclareAtomName{9}{Fluor}
-\DeclareAtomName{10}{Neon}
-\DeclareAtomName{11}{Natrium}
-\DeclareAtomName{12}{Magnesium}
-\DeclareAtomName{13}{Aluminium}
-\DeclareAtomName{14}{Silicium}
-\DeclareAtomName{15}{Phosphor}
-\DeclareAtomName{16}{Schwefel}
-\DeclareAtomName{17}{Chlor}
-\DeclareAtomName{18}{Argon}
-\DeclareAtomName{19}{Kalium}
-\DeclareAtomName{20}{Calcium}
-\DeclareAtomName{21}{Scandium}
-\DeclareAtomName{22}{Titan}
-\DeclareAtomName{23}{Vanadium}
-\DeclareAtomName{24}{Chrom}
-\DeclareAtomName{25}{Mangan}
-\DeclareAtomName{26}{Eisen}
-\DeclareAtomName{27}{Cobalt}
-\DeclareAtomName{28}{Nickel}
-\DeclareAtomName{29}{Kupfer}
-\DeclareAtomName{30}{Zink}
-\DeclareAtomName{31}{Gallium}
-\DeclareAtomName{32}{Germanium}
-\DeclareAtomName{33}{Arsen}
-\DeclareAtomName{34}{Selen}
-\DeclareAtomName{35}{Brom}
-\DeclareAtomName{36}{Krypton}
-\DeclareAtomName{37}{Rubidium}
-\DeclareAtomName{38}{Strontium}
-\DeclareAtomName{39}{Yttrium}
-\DeclareAtomName{40}{Zirconium}
-\DeclareAtomName{41}{Niobium}
-\DeclareAtomName[Molybdaen]{42}{Molybd\"{a}n}
-\DeclareAtomName{43}{Technetium}
-\DeclareAtomName{44}{Ruthenium}
-\DeclareAtomName{45}{Rhodium}
-\DeclareAtomName{46}{Palladium}
-\DeclareAtomName{47}{Silber}
-\DeclareAtomName{48}{Cadmium}
-\DeclareAtomName{49}{Indium}
-\DeclareAtomName{50}{Zinn}
-\DeclareAtomName{51}{Antimon}
-\DeclareAtomName{52}{Tellur}
-\DeclareAtomName{53}{Iod}
-\DeclareAtomName{54}{Xenon}
-\DeclareAtomName[Caesium]{55}{C\"{a}sium}
-\DeclareAtomName{56}{Barium}
-\DeclareAtomName{57}{Lanthan}
-\DeclareAtomName{58}{Cer}
-\DeclareAtomName{59}{Praseodym}
-\DeclareAtomName{60}{Neodym}
-\DeclareAtomName{61}{Promethium}
-\DeclareAtomName{62}{Samarium}
-\DeclareAtomName{63}{Europium}
-\DeclareAtomName{64}{Gadolinium}
-\DeclareAtomName{65}{Terbium}
-\DeclareAtomName{66}{Dysprosium}
-\DeclareAtomName{67}{Holmium}
-\DeclareAtomName{68}{Erbium}
-\DeclareAtomName{69}{Thulium}
-\DeclareAtomName{70}{Ytterbium}
-\DeclareAtomName{71}{Lutetium}
-\DeclareAtomName{72}{Hafnium}
-\DeclareAtomName{73}{Tantal}
-\DeclareAtomName{74}{Wolfram}
-\DeclareAtomName{75}{Rhenium}
-\DeclareAtomName{76}{Osmium}
-\DeclareAtomName{77}{Iridium}
-\DeclareAtomName{78}{Platin}
-\DeclareAtomName{79}{Gold}
-\DeclareAtomName{80}{Quecksilber}
-\DeclareAtomName{81}{Thallium}
-\DeclareAtomName{82}{Blei}
-\DeclareAtomName{83}{Bismut}
-\DeclareAtomName{84}{Polonium}
-\DeclareAtomName{85}{Astat}
-\DeclareAtomName{86}{Radon}
-\DeclareAtomName{87}{Francium}
-\DeclareAtomName{88}{Radium}
-\DeclareAtomName{89}{Actinium}
-\DeclareAtomName{90}{Thorium}
-\DeclareAtomName{91}{Protactinium}
-\DeclareAtomName{92}{Uran}
-\DeclareAtomName{93}{Neptunium}
-\DeclareAtomName{94}{Plutonium}
-\DeclareAtomName{95}{Americium}
-\DeclareAtomName{96}{Curium}
-\DeclareAtomName{97}{Berkelium}
-\DeclareAtomName{98}{Californium}
-\DeclareAtomName{99}{Einsteinium}
-\DeclareAtomName{100}{Fermium}
-\DeclareAtomName{101}{Mendelevium}
-\DeclareAtomName{102}{Nobelium}
-\DeclareAtomName{103}{Lawrencium}
-\DeclareAtomName{104}{Rutherfordium}
-\DeclareAtomName{105}{Dubnium}
-\DeclareAtomName{106}{Seaborgium}
-\DeclareAtomName{107}{Bohrium}
-\DeclareAtomName{108}{Hassium}
-\DeclareAtomName{109}{Meitnerium}
-\DeclareAtomName{110}{Darmstadtium}
-\DeclareAtomName{111}{Roentgenium}
-\DeclareAtomName{112}{Copernicium}
-
-\endinput