resolve issues #28 and #30

cgnieder · Feb 29, 2020 · 019a932 · 019a932
1 parent 489695f
commit 019a932
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/README b/README
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------
-the CHEMMACROS package v5.10 2020/02/03
+the CHEMMACROS package v5.11 2020/02/29
 
   comprehensive support for typesetting chemistry documents
 

diff --git a/chemmacros.history b/chemmacros.history
@@ -388,5 +388,9 @@ Version history
 2020/01/16 - version 5.9a - adapt to renaming of string case changing functions
 2020/02/03 - version 5.10 - define \torr as well as \Torr (units)
                           - prefer lazy boolean evaluation
-			  - prefer the kernel commands to
+                          - prefer the kernel commands to
                             \chemmacros_leave_vmode: and \chemmacros_tex_if:
+2020/02/29 - version 5.11 - use \ch even for simple formulas – resolves issue
+                            #28 (chemformula)
+			  - let \chemmacros_iupac:nn think we're in the
+                            document – fixes issue #30 (nomenclature)
diff --git a/chemmacros.module.chemformula.code.tex b/chemmacros.module.chemformula.code.tex
@@ -131,7 +131,11 @@
   {
     \chemmacros_integrate_package:nnn {} {chemformula} {2015/09/08}
     \cs_set_protected:Npn \chemmacros_chemformula:n #1
-      { \chemformula_chcpd:nn {} {#1} }
+      {
+        \chemmacros_if_compatibility:nnTF {>} {5.10}
+          { \chemformula_ch:nn {} {#1} }
+          { \chemformula_chcpd:nn {} {#1} }
+      }
     \cs_set_protected:Npn \chemmacros_reaction:n #1
       { \chemformula_ch:nn {} {#1} }
   }
@@ -238,3 +242,4 @@
              if the users haven't decided for themselves and issue a warning
 2016/05/03 - correct wrong method check
 2020/02/02 - lazy boolean evaluation
+2020/02/29 - use \ch even for simple formulas – resolves issue #28
diff --git a/chemmacros.module.nomenclature.code.tex b/chemmacros.module.nomenclature.code.tex
@@ -711,6 +711,8 @@
   {
     \group_begin:
       \bool_set_true:N \l__chemmacros_inside_iupac_bool
+      \chemmacros_if_compatibility:nnT {>} {5.10}
+        { \bool_set_true:N \l__chemmacros_in_document_bool }
       \chemmacros_set_keys:nn {nomenclature} {#1}
       \chemmacros_make_iupac:
       \chemmacros_make_shorthands:
@@ -972,3 +974,5 @@
              it does nothing as last token in \iupac
 2020/01/02 - \chemmacros_show_iupac:N
            - \chemmacros_if_iupac:NTF
+2020/02/29 - let \chemmacros_iupac:nn think we're in the document – fixes
+             issue #30
diff --git a/chemmacros.sty b/chemmacros.sty
@@ -31,9 +31,9 @@
 
 % --------------------------------------------------------------------------
 % package information:
-\tl_const:Nn \c_chemmacros_date_tl {2020/02/03}
+\tl_const:Nn \c_chemmacros_date_tl {2020/02/29}
 \tl_const:Nn \c_chemmacros_version_major_number_tl {5}
-\tl_const:Nn \c_chemmacros_version_minor_number_tl {10}
+\tl_const:Nn \c_chemmacros_version_minor_number_tl {11}
 \tl_const:Nn \c_chemmacros_version_subrelease_tl   {}
 \tl_const:Nx \c_chemmacros_version_number_tl
   {