version 5.8

cgnieder · Apr 24, 2017 · d5c7fd0 · d5c7fd0
1 parent 9e446a9
commit d5c7fd0
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 9 deletions.
diff --git a/README b/README
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------
-the CHEMMACROS package v5.7d 2017/09/10
+the CHEMMACROS package v5.8 2017/04/24
 
   comprehensive support for typesetting chemistry documents
 

diff --git a/chemmacros.history b/chemmacros.history
@@ -359,7 +359,7 @@ Version history
                           - change \hapto and \dento to follow iupacs rules
                             according to IUPAC Red Book 2005. IR-10.2.5.2 The
                             eta convention (p.216) and IR-9.2.4.2 The
-                            kappa convention (p.155f)
+                            kappa convention (p.155f) (nomenclature)
                           - fix error in \chemmacros_allow_hyphens: definition
                             (nomenclature)
                           - new options `cip-inner-format', `cip-outer-format'

diff --git a/chemmacros.module.nomenclature.code.tex b/chemmacros.module.nomenclature.code.tex
@@ -282,7 +282,7 @@
     cip-outer-format  .tl_set:N  = \l__chemmacros_cip_outer_tl ,
     cip-outer-format  .initial:n = \upshape ,
     cip-number-format .tl_set:N  = \l__chemmacros_cip_number_tl ,
-    cip-number-format .initial:n = \upshape
+    cip-number-format .initial:n = \itshape
   }
 
 \cs_new_protected:Npn \__chemmacros_cip:n #1
@@ -386,7 +386,7 @@
     \chemmacros_coordination_symbol:nnnn
       { \l__chemmacros_coord_use_hyphen_bool }
       {
-        \chemmacros_if_compatibility_p:nn {>} {5.7}
+        \chemmacros_if_compatibility:nnTF {>} {5.7}
           { \c_true_bool }
           { \c_false_bool }
       }
@@ -399,7 +399,7 @@
     \chemmacros_coordination_symbol:nnnn
       { \l__chemmacros_coord_use_hyphen_bool }
       {
-        \chemmacros_if_compatibility_p:nn {>} {5.7}
+        \chemmacros_if_compatibility:nnTF {>} {5.7}
           { \c_true_bool }
           { \c_false_bool }
       }

diff --git a/chemmacros.sty b/chemmacros.sty
@@ -31,10 +31,10 @@
 
 % --------------------------------------------------------------------------
 % package information:
-\tl_const:Nn \c_chemmacros_date_tl {2017/04/17}
+\tl_const:Nn \c_chemmacros_date_tl {2017/04/24}
 \tl_const:Nn \c_chemmacros_version_major_number_tl {5}
 \tl_const:Nn \c_chemmacros_version_minor_number_tl {8}
-\tl_const:Nn \c_chemmacros_version_subrelease_tl   {0}
+\tl_const:Nn \c_chemmacros_version_subrelease_tl   {}
 \tl_const:Nx \c_chemmacros_version_number_tl
   {
     \c_chemmacros_version_major_number_tl .

diff --git a/chemmacros_en.pdf b/chemmacros_en.pdf
diff --git a/chemmacros_en.tex b/chemmacros_en.tex
@@ -1,4 +1,4 @@
-: pdflatex
+% arara: pdflatex
 % arara: biber
 % arara: pdflatex
 % arara: pdflatex
@@ -433,6 +433,8 @@
 
 \AtBeginDocument{\renewcommand*\reftextfaraway[1]{starting on page~\pageref{#1}}}
 
+\usepackage{bookmark}
+
 \begin{document}
 
 \part{Preliminaries}
@@ -1185,6 +1187,19 @@ \subsubsection{Macros Defined (Not Only) For Usage in \cs*{iupac}}
   \keyval{cip-kern}{dim}\Module{nomenclature}\Default{.075em}
     Set the amount of kerning after the closing parenthesis.
 \end{options}
+The entries typeset by and implemented with \cs{cip} can be customized
+further:
+\begin{options}
+  \keyval{cip-outer-format}{format}\Default{\cs*{upshape}}
+    \sinceversion{5.8}The format of parentheses and commas typeset by
+    \cs{cip}.
+  \keyval{cip-inner-format}{format}\Default{\cs*{itshape}}
+    \sinceversion{5.8}The format of the entries in \cs{cip}.  This format
+    works additive to the outer format.
+  \keyval{cip-number-format}{format}\Default{\cs*{itshape}}
+    \sinceversion{5.8}The format of numbers in \cs{cip}.  This format works
+    additive to the outer format and is applied to arabic figures only.
+\end{options}
 
 \paragraph{Fischer}
 \begin{commands}
@@ -1252,9 +1267,12 @@ \subsubsection{Macros Defined (Not Only) For Usage in \cs*{iupac}}
     Appends the number as a subscript or superscript, depending on the choice.
     The \ac{iupac} recommendation is the subscript~\cite{iupac:redbook}.
   \keybool{coord-use-hyphen}\Module{nomenclature}\Default{true}
-    Append a hyphen to \cs{hapto}, \cs{dent} and \cs{bridge} or don't.
+    Append a hyphen to \cs{hapto}, \cs{dento} and \cs{bridge} or don't.
 \end{options}
 
+The default behaviour\sinceversion{5.8} of \cs{hapto} and \cs{dento} has
+changed with version~5.8 to follow \ac{iupac} recommendations.
+
 \paragraph{Examples}
 \begin{example}
   \iupac{\dexter-Wein|s\"aure} =
@@ -2959,6 +2977,8 @@ \subsubsection{An Environment to Typeset Experimental Data}
     The measuring method.
   \keyval{format}{commands}\Module{spectroscopy}\Default
     For example \cs*{bfseries}.
+  \keyval{nmr-base-format}{commands}\Module{spectroscopy}\Default
+    \sinceversion{5.8}Formatting instructions for the NMR base.
   \keychoice{pos-number}{side,sub,super}\Module{spectroscopy}\Default{side}
     Position of the number next to the atom.
   \keyval{coupling-symbol}{code}\Module{spectroscopy}\Default{J}