modiagram (23jan12)

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

6 files changed, 49 insertions, 49 deletions

diff --git a/Master/texmf-dist/doc/latex/modiagram/README b/Master/texmf-dist/doc/latex/modiagram/README
index 8ca17886a2e..ef7824de6c1 100644
--- a/Master/texmf-dist/doc/latex/modiagram/README
+++ b/Master/texmf-dist/doc/latex/modiagram/README
@@ -1,4 +1,4 @@
-MOdiagram v0.2 - easy creation of molecular orbital diagrams
+MOdiagram v0.2a - easy creation of molecular orbital diagrams
 
 The environment `MOdiagram' and some commands are provided to create
 molecular orbital (MO) diagrams using TikZ.
@@ -17,7 +17,7 @@ MOdiagram also needs the packages `tikz' and `textgreek' as well as
 the tikzlibraries `arrows' and `calc' to be fully functioning.
 
 Clemens NIEDERBERGER
-2011/10/27
+2012/01/23
 
 http://www.mychemistry.eu/
 contact@mychemistry.eu
@@ -25,7 +25,7 @@ contact@mychemistry.eu
 If you have any ideas, questions, suggestions or bugs to report,
 please feel free to contact me.
 
-Copyright 2011 Clemens Niederberger
+Copyright 2011-2012 Clemens Niederberger
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
@@ -40,4 +40,4 @@ This work has the LPPL maintenance status `maintained'.
 The Current Maintainer of this work is Clemens Niederberger.
 
 This work consists of the files modiagram.sty, modiagram_doc_de.tex,
-modiagram_doc_de.tex and README.
\ No newline at end of file
+modiagram_doc_en.tex, modiagram_doc_de.pdf, modiagram_doc_en.pdf and README.
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/modiagram/modiagram_doc_de.pdf b/Master/texmf-dist/doc/latex/modiagram/modiagram_doc_de.pdf
index 26a2c26ff8e..448e8cd02af 100644
--- a/Master/texmf-dist/doc/latex/modiagram/modiagram_doc_de.pdf
+++ b/Master/texmf-dist/doc/latex/modiagram/modiagram_doc_de.pdf
diff --git a/Master/texmf-dist/doc/latex/modiagram/modiagram_doc_de.tex b/Master/texmf-dist/doc/latex/modiagram/modiagram_doc_de.tex
index 24f3ca9cf7e..4f9d979bedd 100644
--- a/Master/texmf-dist/doc/latex/modiagram/modiagram_doc_de.tex
+++ b/Master/texmf-dist/doc/latex/modiagram/modiagram_doc_de.tex
@@ -4,7 +4,7 @@
 % - easy creation of molecular orbital diagrams                             - %
 % --------------------------------------------------------------------------- %
 % - Clemens NIEDERBERGER                                                    - %
-% - 2011/10/27                                                              - %
+% - 2012/01/23                                                              - %
 % --------------------------------------------------------------------------- %
 % - http://www.mychemistry.eu/                                              - %
 % - contact@mychemistry.eu                                                  - %
@@ -12,7 +12,7 @@
 % - If you have any ideas, questions, suggestions or bugs to report, please - %
 % - feel free to contact me.                                                - %
 % --------------------------------------------------------------------------- %
-% - Copyright 2011 Clemens Niederberger                                     - %
+% - Copyright 2011-2012 Clemens Niederberger                                - %
 % -                                                                         - %
 % - This work may be distributed and/or modified under the                  - %
 % - conditions of the LaTeX Project Public License, either version 1.3      - %
@@ -30,9 +30,13 @@
 % - modiagram_doc_de.tex, README                                            - %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass{scrartcl}
-\usepackage[ngerman]{babel}
-\usepackage[utf8]{inputenx}
-\usepackage{lmodern,emerald,microtype}
+\usepackage{fontspec,xltxtra}
+\usepackage{polyglossia}
+  \setmainlanguage{german}
+  \defaultfontfeatures{Scale=MatchLowercase}
+  \setmainfont[SmallCapsFont=Linux Libertine Capitals O,SlantedFont=Linux Libertine Slanted O]{Linux Libertine O}
+  \setsansfont[SmallCapsFont=Linux Biolinum Capitals O,SlantedFont=Linux Biolinum Slanted O]{Linux Biolinum O}
+  \setmonofont{Inconsolata}
 \usepackage[dvipsnames]{xcolor}
   \colorlet{code}{RawSienna}
 \usepackage{modiagram,xspace,siunitx,framed,chemfig,booktabs}
@@ -114,17 +118,11 @@
   }
 
 \newcommand*\MOname{\textsf{MOdiagram}\xspace}
-\newcommand*\MOversion{0.2\xspace}
-\newcommand*\MOdate{2011/10/27}
+\newcommand*\MOversion{0.2a\xspace}
+\newcommand*\MOdate{2012/01/23}
 
 \newcommand*\paket[1]{\textsf{#1}\footnote{\url{http://www.ctan.org/pkg/#1}}}
 
-\newcommand*\changefont[3]{\fontfamily{#1}\fontseries{#2}\fontshape{#3}\selectfont}
-
-\DeclareDocumentEnvironment{myquote}{o}
-  {\quote\small\changefont{cmss}{m}{sl}}
-  {\IfNoValueF{#1}{\par\noindent\parbox{\linewidth}{\raggedleft\normalfont\itshape#1}}\endquote}
-
 \newcommand*\TikZ{\mbox{Ti\textbf{\textit{k}}Z}\xspace}
 \newcommand*\bzw{\mbox{bzw.}\xspace}
 \newcommand*\usw{\mbox{usw.}\xspace}
@@ -132,10 +130,10 @@
 \newcommand*\zB{\mbox{z.\,B.}\xspace}
 
 \newlength\marginnotewidth
-\NewDocumentCommand\marginnote { s O{TeenSpirit} m } {%
-  \settowidth\marginnotewidth{\small\csname ECF#2\endcsname\color{red}#3}
+\NewDocumentCommand\marginnote { sm } {%
+  \settowidth\marginnotewidth{\small\color{red}#2}
   \addtolength\marginnotewidth{20pt}
-  \noindent\makebox[0cm]{\hskip-\marginnotewidth\small\csname ECF#2\endcsname\color{red}#3}%
+  \noindent\makebox[0cm]{\hskip-\marginnotewidth\small\color{red}#2}%
   \IfBooleanF{#1}{\hspace{\parindent}}%
 }
 
@@ -193,15 +191,15 @@ Kenntnisse des \textsf{pgf}- \bzw des \textsf{tikz}-Paketes sind von Vorteil.
 
 \section{Motivation}
 Dieses Paket ist enstanden wegen einer Frage auf \url{http://tex.stackexchange.com/}, genauer gesagt wegen der Frage \href{http://tex.stackexchange.com/questions/13863/molecular-orbital-diagrams-in-latex}{Molecular orbital diagrams in LaTeX}. Dort heißt es
-\begin{myquote}
+\begin{quote}\small\sffamily
  I'm wondering if anyone has seen a package for drawing (qualitative) molecular orbital splitting diagrams in \LaTeX? Or if there exist any packages that can be easily re-purposed to this task?
 
  Otherwise, I think I'll have a go at it in \TikZ.
-\end{myquote}
+\end{quote}
 Dort wird das Problem mit \TikZ gelöst, da es bis dato noch kein Paket für diese Aufgabe gab. Zum einen soll \MOname diese Lücke nun füllen. Zum anderen fand ich es persönlich immer mühsam, aus vorherigem Code mit Copy \&\ Paste ein zweites, drittes, \ldots\ zu erstellen. Das hat sich mit \MOname erledigt.
 
 \section{Befehle}
-Alle MO-Diagramme werden mit der Umgebung \lstinline=MOdiagram= erzeugt. Bei den in den folgenden Abschnitten beschriebenen Befehlen werden verschiedene Argumente mit (o) oder mit (m) markiert. Das steht for \emph{optional} \bzw for \emph{mandatory} (also \emph{obligatorisch}).
+Alle MO-Diagramme werden mit der Umgebung \lstinline=MOdiagram= erzeugt. Bei den in den folgenden Abschnitten beschriebenen Befehlen werden verschiedene Argumente mit (o) oder mit (m) markiert. Das steht für \emph{optional} \bzw für \emph{mandatory} (also \emph{obligatorisch}).
 
 \subsection{Der \texttt{\textbackslash atom} Befehl}
 \begin{framed}
@@ -782,8 +780,8 @@ Verwendet man die Option \lstinline=names=, werden den Atomen und dem Molekül B
  \end{MOdiagram}
 \end{LTXexample}
 
-\subsubsection{Oprionen \texttt{names-style} und \texttt{names-style-add}}\label{option:names_style}
-\marginnote*{NEU}Diese Optionen erlauben die Gestaltung der Beschriftung der Atome und des Moleküls. Per Default wird folgende Einstellung verwendet: \lstinline+\names-style={anchor=base}+\footnote{Zur Bedeutung siehe "`\TikZ und PGF -- Manual for Version 2.10"' S.\,183 Abschnitt 16.4.4 (pgfmanual.pdf)}.
+\subsubsection{Optionen \texttt{names-style} und \texttt{names-style-add}}\label{option:names_style}
+\marginnote*{NEU}Diese Optionen erlauben die Gestaltung der Beschriftung der Atome und des Moleküls. Per Default wird folgende Einstellung verwendet: \lstinline+\names-style={anchor=base}+\footnote{Zur Bedeutung siehe „\TikZ und PGF \textendash\ Manual for Version 2.10“ S.\,183 Abschnitt 16.4.4 (pgfmanual.pdf)}.
 \begin{LTXexample}
  % use package `mhchem'
  \begin{MOdiagram}[names,names-style={draw=blue}]
diff --git a/Master/texmf-dist/doc/latex/modiagram/modiagram_doc_en.pdf b/Master/texmf-dist/doc/latex/modiagram/modiagram_doc_en.pdf
index f88d1b0b39b..ed4cb1c11d8 100644
--- a/Master/texmf-dist/doc/latex/modiagram/modiagram_doc_en.pdf
+++ b/Master/texmf-dist/doc/latex/modiagram/modiagram_doc_en.pdf
diff --git a/Master/texmf-dist/doc/latex/modiagram/modiagram_doc_en.tex b/Master/texmf-dist/doc/latex/modiagram/modiagram_doc_en.tex
index a1008bea4d5..d9526477530 100644
--- a/Master/texmf-dist/doc/latex/modiagram/modiagram_doc_en.tex
+++ b/Master/texmf-dist/doc/latex/modiagram/modiagram_doc_en.tex
@@ -1,10 +1,10 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % --------------------------------------------------------------------------- %
-% - MOdiagram - modiagram_doc_de.tex                                        - %
+% - MOdiagram - modiagram_doc_en.tex                                        - %
 % - easy creation of molecular orbital diagrams                             - %
 % --------------------------------------------------------------------------- %
 % - Clemens NIEDERBERGER                                                    - %
-% - 2011/10/27                                                              - %
+% - 2012/01/23                                                              - %
 % --------------------------------------------------------------------------- %
 % - http://www.mychemistry.eu/                                              - %
 % - contact@mychemistry.eu                                                  - %
@@ -12,7 +12,7 @@
 % - If you have any ideas, questions, suggestions or bugs to report, please - %
 % - feel free to contact me.                                                - %
 % --------------------------------------------------------------------------- %
-% - Copyright 2011 Clemens Niederberger                                     - %
+% - Copyright 2011-2012 Clemens Niederberger                                - %
 % -                                                                         - %
 % - This work may be distributed and/or modified under the                  - %
 % - conditions of the LaTeX Project Public License, either version 1.3      - %
@@ -30,9 +30,13 @@
 % - modiagram_doc_de.tex, README                                            - %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass{scrartcl}
-\usepackage[english]{babel}
-\usepackage[utf8]{inputenx}
-\usepackage{lmodern,emerald,microtype}
+\usepackage{fontspec,xltxtra}
+\usepackage{polyglossia}
+  \setmainlanguage{english}
+  \defaultfontfeatures{Scale=MatchLowercase}
+  \setmainfont[SmallCapsFont=Linux Libertine Capitals O,SlantedFont=Linux Libertine Slanted O]{Linux Libertine O}
+  \setsansfont[SmallCapsFont=Linux Biolinum Capitals O,SlantedFont=Linux Biolinum Slanted O]{Linux Biolinum O}
+  \setmonofont{Inconsolata}
 \usepackage[dvipsnames]{xcolor}
   \colorlet{code}{RawSienna}
 \usepackage{modiagram,xspace,siunitx,framed,chemfig,booktabs}
@@ -114,26 +118,20 @@
   }
 
 \newcommand*\MOname{\textsf{MOdiagram}\xspace}
-\newcommand*\MOversion{0.2\xspace}
-\newcommand*\MOdate{2011/10/27}
+\newcommand*\MOversion{0.2a\xspace}
+\newcommand*\MOdate{2012/01/23}
 
 \newcommand*\paket[1]{\textsf{#1}\footnote{\url{http://www.ctan.org/pkg/#1}}}
 
-\newcommand*\changefont[3]{\fontfamily{#1}\fontseries{#2}\fontshape{#3}\selectfont}
-
-\DeclareDocumentEnvironment{myquote}{o}
-  {\quote\small\changefont{cmss}{m}{sl}}
-  {\IfNoValueF{#1}{\par\noindent\parbox{\linewidth}{\raggedleft\normalfont\itshape#1}}\endquote}
-
 \newcommand*\TikZ{\mbox{Ti\textbf{\textit{k}}Z}\xspace}
 \newcommand*\etc{\mbox{etc.}\xspace}
 \newcommand*\ie{\mbox{i.e.}\xspace}
 
 \newlength\marginnotewidth
-\NewDocumentCommand\marginnote { s O{TeenSpirit} m } {%
-  \settowidth\marginnotewidth{\small\csname ECF#2\endcsname\color{red}#3}
+\NewDocumentCommand\marginnote { sm } {%
+  \settowidth\marginnotewidth{\small\color{red}#2}
   \addtolength\marginnotewidth{20pt}
-  \noindent\makebox[0cm]{\hskip-\marginnotewidth\small\csname ECF#2\endcsname\color{red}#3}%
+  \noindent\makebox[0cm]{\hskip-\marginnotewidth\small\color{red}#2}%
   \IfBooleanF{#1}{\hspace{\parindent}}%
 }
 
@@ -191,11 +189,11 @@ Knowledge of \textsf{pgf} or \textsf{tikz} would be useful.
 
 \section{Motivation}
 This package has been written as a reaction to a question on \url{http://tex.stackexchange.com/}. To be more precise: as a reaction to the question \href{http://tex.stackexchange.com/questions/13863/molecular-orbital-diagrams-in-latex}{Molecular orbital diagrams in LaTeX}. There it says
-\begin{myquote}
+\begin{quote}\small\sffamily
  I'm wondering if anyone has seen a package for drawing (qualitative) molecular orbital splitting diagrams in \LaTeX? Or if there exist any packages that can be easily re-purposed to this task?
 
  Otherwise, I think I'll have a go at it in \TikZ.
-\end{myquote}
+\end{quote}
 The problem was solved using \TikZ, since no package existed for that purpose. For one thing \MOname is intended to fill this gap. I also found it very tedious, to make all this copying and pasting when I needed a second, third, \ldots\ diagram. \MOname took care of that. 
 
 \section{Main Commands}
@@ -779,8 +777,8 @@ If you use the option \lstinline=names=, the atoms and the molecule get captions
  \end{MOdiagram}
 \end{LTXexample}
 
-\subsubsection{Oprionen \texttt{names-style} und \texttt{names-style-add}}\label{option:names_style}
-\marginnote*{NEW}These options enable to customize the style of the captions of the atoms and of the molecule. By default this setting is used: \lstinline+\names-style={anchor=base}+\footnote{Please see "`\TikZ und PGF -- Manual for Version 2.10"' p.\,183 section 16.4.4 (pgfmanual.pdf) for the meaning}.
+\subsubsection{Optionens \texttt{names-style} and \texttt{names-style-add}}\label{option:names_style}
+\marginnote*{NEW}These options enable to customize the style of the captions of the atoms and of the molecule. By default this setting is used: \lstinline+\names-style={anchor=base}+\footnote{Please see “\TikZ and PGF \textendash\ Manual for Version 2.10” p.\,183 section 16.4.4 (pgfmanual.pdf) for the meaning}.
 \begin{LTXexample}
  % use package `mhchem'
  \begin{MOdiagram}[names,names-style={draw=blue}]
diff --git a/Master/texmf-dist/tex/latex/modiagram/modiagram.sty b/Master/texmf-dist/tex/latex/modiagram/modiagram.sty
index 764eee8f50f..7a0834ff9d9 100644
--- a/Master/texmf-dist/tex/latex/modiagram/modiagram.sty
+++ b/Master/texmf-dist/tex/latex/modiagram/modiagram.sty
@@ -4,7 +4,7 @@
 % - easy creation of molecular orbital diagrams                             - %
 % --------------------------------------------------------------------------- %
 % - Clemens Niederberger                                                    - %
-% - 2011/10/27                                                              - %
+% - 2012/01/23                                                              - %
 % --------------------------------------------------------------------------- %
 % - http://www.mychemistry.eu/                                              - %
 % - contact@mychemistry.eu                                                  - %
@@ -12,7 +12,7 @@
 % - If you have any ideas, questions, suggestions or bugs to report, please - %
 % - feel free to contact me.                                                - %
 % --------------------------------------------------------------------------- %
-% - Copyright 2011 Clemens Niederberger                                     - %
+% - Copyright 2011-2012 Clemens Niederberger                                - %
 % -                                                                         - %
 % - This work may be distributed and/or modified under the                  - %
 % - conditions of the LaTeX Project Public License, either version 1.3      - %
@@ -31,7 +31,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \RequirePackage{ expl3 , xparse , l3keys2e , tikz , textgreek }
 \usetikzlibrary{calc,arrows}
-\ProvidesExplPackage {modiagram} {2011/10/27} {0.2} {easy creation of molecular orbital diagrams}
+\ProvidesExplPackage {modiagram} {2012/01/23} {0.2a} {easy creation of molecular orbital diagrams}
 
 % --------------------------------------------------------------------------- %
 % error messages
@@ -67,6 +67,8 @@
     \IfNoValueF { #1 } { \keys_set:nn { MOdiagram / diagram } { #1 } }
     \MOdiagram_set_labels:
     \MOdiagram_tikzpicture:n { }
+    \char_set_catcode_letter:N \:
+    \char_set_catcode_other:N \;
   }
   {
     \bool_if:NT \l_MOdiagram_names_bool
@@ -2033,6 +2035,8 @@ Version history
                        - default values for the AO and MO; if empty values are
                          used, the ";" and "," can be omitted
                        - default node names for the arbitrary AOs
+                       - horizontal shift of electrons possible
+                       - customization of atom- and molecule names possible
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % TODO