chemnum (26feb12)

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

1 files changed, 30 insertions, 15 deletions

diff --git a/Master/texmf-dist/tex/latex/chemnum/chemnum.sty b/Master/texmf-dist/tex/latex/chemnum/chemnum.sty
index 8578febc43c..a8dd423aaae 100644
--- a/Master/texmf-dist/tex/latex/chemnum/chemnum.sty
+++ b/Master/texmf-dist/tex/latex/chemnum/chemnum.sty
@@ -3,7 +3,7 @@
 % - a comprehensive approach for the numbering of chemical compounds        - %
 % --------------------------------------------------------------------------- %
 % - Clemens NIEDERBERGER                                                    - %
-% - 2011/12/08                                                              - %
+% - 2012/02/26                                                              - %
 % --------------------------------------------------------------------------- %
 % - http://www.mychemistry.eu/                                              - %
 % - contact@mychemistry.eu                                                  - %
@@ -11,7 +11,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      - %
@@ -32,7 +32,11 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \RequirePackage { expl3 , xparse , l3keys2e , etoolbox , psfrag }
 
-\ProvidesExplPackage {chemnum} {2011/12/08} {0.4} {An approach for the numbering of chemical compounds}
+\ProvidesExplPackage
+  {chemnum}
+  {2012/02/26}
+  {0.4a}
+  {An approach for the numbering of chemical compounds}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % CHECK FOR SUPPORT
@@ -56,14 +60,14 @@
       }
     \tex_endinput:D
   }
-\@ifpackagelater { expl3 } { 2011/06/04 }
+\@ifpackagelater { expl3 } { 2011/09/17 }
   { }
   {
     \msg_error:nnx { chemnum } { support-outdated } { expl3 }
     \tex_endinput:D
   }
 
-\@ifpackagelater { xparse } { 2011/06/04 }
+\@ifpackagelater { xparse } { 2011/09/17 }
   { }
   {
     \msg_error:nnx { chemnum } { support-outdated } { xparse }
@@ -402,7 +406,7 @@
 %   {
     \cs_set:Npn \int_to_greek:n #1
       {
-        \int_convert_to_symbols:nnn {#1} { 24 }
+        \int_to_symbols:nnn {#1} { 24 }
           {
             {  1 } { \exp_not:o \chemnum_alpha }
             {  2 } { \exp_not:o \chemnum_beta }
@@ -441,7 +445,7 @@
   {
     \cs_set:Npn \int_to_Greek:n #1
       {
-        \int_convert_to_symbols:nnn { #1 } { 24 }
+        \int_to_symbols:nnn { #1 } { 24 }
           {
             {  1 } { \exp_not:o \chemnum_Alpha }
             {  2 } { \exp_not:o \chemnum_Beta }
@@ -477,7 +481,7 @@
 % define \int_to_Symbol function
 \cs_new:Npn \int_to_Symbol:n #1
   {
-    \int_convert_to_symbols:nnn { #1 } { 9 }
+    \int_to_symbols:nnn { #1 } { 9 }
       {
         { 1 } {\exp_not:o \textasteriskcentered }
         { 2 } {\exp_not:o \textdagger}
@@ -642,8 +646,10 @@
 \keys_define:nn { chemnum } {
   cmpd-style           .code:n             = \chemnum_cmpd_set_style:n { #1 } ,
   cmpd-weight          .choice: ,
-  cmpd-weight / bold   .code:n             = \bool_set_true:N \l_chemnum_cmpd_bold_bool ,
-  cmpd-weight / normal .code:n             = \bool_set_false:N \l_chemnum_cmpd_bold_bool ,
+  cmpd-weight / bold   .code:n             =
+    \bool_set_true:N \l_chemnum_cmpd_bold_bool ,
+  cmpd-weight / normal .code:n             =
+    \bool_set_false:N \l_chemnum_cmpd_bold_bool ,
   cmpd-label           .code:n             =
     {
       \bool_set_true:N \l_chemnum_cmpd_name_bool
@@ -786,8 +792,10 @@
   list-last-sep      .tl_set:N   = \l_chemnum_list_last_separator_tl ,
   list-last-sep      .default:n  = \l_chemnum_list_last_separator_lang_tl ,
   list-serial-comma  .choice: ,
-  list-serial-comma / true .code:n = \bool_set_false:N \l_chemnum_no_serial_comma_bool ,
-  list-serial-comma / false .code:n = \bool_set_true:N \l_chemnum_no_serial_comma_bool ,
+  list-serial-comma / true .code:n =
+    \bool_set_false:N \l_chemnum_no_serial_comma_bool ,
+  list-serial-comma / false .code:n =
+    \bool_set_true:N \l_chemnum_no_serial_comma_bool ,
   list-serial-comma  .default:n  = true ,
   list-lang          .choice: ,
   list-lang / US     .code:n     =
@@ -1254,7 +1262,11 @@
                     }
                     {
                       \int_compare:nTF
-                        { \l_chemnum_list_separate_int = \int_eval:n { \l_chemnum_list_items_int - 1 } }
+                        {
+                          \l_chemnum_list_separate_int
+                          =
+                          \int_eval:n { \l_chemnum_list_items_int - 1 }
+                        }
                         {
                           \tl_if_eq:NNTF
                             \l_chemnum_list_last_separator_tl
@@ -1264,7 +1276,8 @@
                               \l_chemnum_list_space_tl
                             }
                             {
-                              \int_compare:nNnF { \l_chemnum_list_separate_int } = { 1 }
+                              \int_compare:nNnF
+                                { \l_chemnum_list_separate_int } = { 1 }
                                 {
                                   \bool_if:NF \l_chemnum_no_serial_comma_bool
                                     { \l_chemnum_list_separator_tl }
@@ -1342,7 +1355,8 @@
       {
         \tl_if_blank:VF \l_chemnum_cmpd_sub_label_tl
           {
-            \exp_args:No \chemnum_cmpd_sublist:n { \l_chemnum_cmpd_sub_label_tl }
+            \exp_args:No \chemnum_cmpd_sublist:n
+              { \l_chemnum_cmpd_sub_label_tl }
             \exp_args:No \tl_map_inline:nn { \l_chemnum_cmpd_sublist_tl }
               {
                 \cs_if_exist:cF
@@ -1590,6 +1604,7 @@ HISTORY:
                          - new key: "hyper-link"
                          - new key: "ref-style"
                          - documentation got an index
+ 2012/02/22 version 0.4a - corrected outdated expl3 function
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % TODO:
  - (rudimentäre) Unterstützung für hyperref und pdfstrings