modiagram (23sep15)

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

4 files changed, 12 insertions, 8 deletions

diff --git a/Master/texmf-dist/doc/latex/modiagram/README b/Master/texmf-dist/doc/latex/modiagram/README
index 133c4919095..31c6a50b819 100644
--- a/Master/texmf-dist/doc/latex/modiagram/README
+++ b/Master/texmf-dist/doc/latex/modiagram/README
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------
-the MODIAGRAM package 2015/07/19 v0.2f
+the MODIAGRAM package 2015/09/23 v0.2g
 
   easy creation of molecular orbital diagrams
 
diff --git a/Master/texmf-dist/doc/latex/modiagram/modiagram_en.pdf b/Master/texmf-dist/doc/latex/modiagram/modiagram_en.pdf
index 736249d0950..d63a233e3a9 100644
--- a/Master/texmf-dist/doc/latex/modiagram/modiagram_en.pdf
+++ b/Master/texmf-dist/doc/latex/modiagram/modiagram_en.pdf
diff --git a/Master/texmf-dist/doc/latex/modiagram/modiagram_en.tex b/Master/texmf-dist/doc/latex/modiagram/modiagram_en.tex
index 2ed4e404898..3d5cc900ed7 100644
--- a/Master/texmf-dist/doc/latex/modiagram/modiagram_en.tex
+++ b/Master/texmf-dist/doc/latex/modiagram/modiagram_en.tex
@@ -87,8 +87,12 @@
 \usepackage[libertine]{newtxmath}
 \expandafter\def\csname libertine@figurestyle\endcsname{OsF}
 
-\usepackage[greek=newtx]{chemmacros}
-\chemsetup[chemformula]{font-family=fxl}
+\usepackage{chemmacros,chemformula}
+\chemsetup{
+  greek = newtx,
+  modules = units
+}
+\setchemformula{format=\libertineLF}
 
 \NewDocumentCommand \AOinline { o m }
   {%
diff --git a/Master/texmf-dist/tex/latex/modiagram/modiagram.sty b/Master/texmf-dist/tex/latex/modiagram/modiagram.sty
index 508c9410a44..b240da4c613 100644
--- a/Master/texmf-dist/tex/latex/modiagram/modiagram.sty
+++ b/Master/texmf-dist/tex/latex/modiagram/modiagram.sty
@@ -32,8 +32,8 @@
 \usetikzlibrary{calc,arrows}
 \ProvidesExplPackage
   {modiagram}
-  {2015/07/19}
-  {0.2f}
+  {2015/09/23}
+  {0.2g}
   {easy creation of molecular orbital diagrams}
 
 % --------------------------------------------------------------------------- %
@@ -210,8 +210,7 @@
 % place the right atom
 \cs_new_protected:Npn \__MOdiagram_molecule_position:n #1
   {
-    \fp_set_from_dim:Nn \l__MOdiagram_tmpa_fp { #1 }
-    \fp_set:Nn \l__MOdiagram_tmpa_fp { .5 * \l__MOdiagram_tmpa_fp }
+    \fp_set:Nn \l__MOdiagram_tmpa_fp { .5 * \dim_to_fp:n {#1} }
     \dim_set:Nn \l__MOdiagram_molecule_position_dim
       { \fp_to_dim:N \l__MOdiagram_tmpa_fp + \l__MOdiagram_left_atom_position_dim }
   }
@@ -593,7 +592,7 @@
 % place the x, y, and z orbitals
 \cs_new_protected:Npn \__MOdiagram_p_orbitals_shift:nnn #1#2#3
   {
-    \fp_set_from_dim:Nn \l__MOdiagram_tmpa_fp { \l__MOdiagram_AO_width_dim } 
+    \fp_set:Nn \l__MOdiagram_tmpa_fp { \dim_to_fp:n { \l__MOdiagram_AO_width_dim } }
     {
       \fp_set:Nn \l__MOdiagram_tmpa_fp { #1 * \l__MOdiagram_tmpa_fp }
       \dim_gset:Nn \l__MOdiagram_atom_px_shift_dim { \fp_to_dim:N \l__MOdiagram_tmpa_fp }
@@ -2081,6 +2080,7 @@ Version history
                         - change dependency from `textgreek' to `chemgreek'
 2014/06/28 version 0.2e - fix: adapt to deprecated expl3 command
 2015/07/19 version 0.2f - fix: adapt to deprecated expl3 command
+2015/09/23 version 0.2g - fix: adapt to deprecated expl3 command
 
 TODO
 - 3s, 3p , 3sMO , 3pMO , 4s , sp3