diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/chemmacros/README | 14 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/chemmacros/chemformula_en.pdf | bin | 935617 -> 935928 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/chemmacros/chemformula_en.tex | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.pdf | bin | 528829 -> 528915 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.tex | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf | bin | 890101 -> 890874 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex | 10 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf | bin | 787909 -> 787978 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.tex | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/chemmacros/chemformula.sty | 93 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty | 15 |
11 files changed, 100 insertions, 42 deletions
diff --git a/Master/texmf-dist/doc/latex/chemmacros/README b/Master/texmf-dist/doc/latex/chemmacros/README index 545b2eff066..02e95dbc1d9 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/README +++ b/Master/texmf-dist/doc/latex/chemmacros/README @@ -1,12 +1,12 @@ -------------------------------------------------------------------------- the CHEMMACROS bundle --> chemmacros package v4.2a -> macros and commands for chemists --> chemformula package v4.2 -> typeset chemical compounds and reactions --> ghsystem package v4.0 -> typeset H & P statements and pictograms - from the globally harmonised system (GHS) --> chemgreek package v0.2 -> handle mapping of upright greek letters to - the \chemalpha ... commands -2013/10/31 +-> chemmacros package v4.2b -> macros and commands for chemists +-> chemformula package v4.2a -> typeset chemical compounds and reactions +-> ghsystem package v4.0 -> typeset H & P statements and pictograms + from the globally harmonised system (GHS) +-> chemgreek package v0.2 -> handle mapping of upright greek letters to + the \chemalpha ... commands +2013/11/04 -------------------------------------------------------------------------- This bundle succeeds the chemmacros package which is now part of the bundle diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.pdf Binary files differindex 59af1643ae4..1aff4138e8f 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.pdf +++ b/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.pdf diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.tex b/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.tex index 81fc8b7229c..69254ccb2a1 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.tex +++ b/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.tex @@ -30,6 +30,7 @@ % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- \documentclass[load-preamble+]{cnltx-doc} +\usepackage[utf8]{inputenc} \usepackage[greek=newtx]{chemmacros} \setcnltx{ package = {chemformula}, @@ -181,6 +182,7 @@ \usepackage{filecontents} +\defbibheading{bibliography}{\addsec{References}} \addbibresource{\jobname.bib} \begin{filecontents*}{\jobname.bib} @book{iupac:greenbook, diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.pdf Binary files differindex 6292d2e775e..e18727edff3 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.pdf +++ b/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.pdf diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.tex b/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.tex index b0812580446..d7a12d09514 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.tex +++ b/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.tex @@ -1,6 +1,6 @@ % arara: pdflatex -% arara: biber -% arara: pdflatex +% !arara: biber +% !arara: pdflatex % arara: pdflatex % -------------------------------------------------------------------------- % the CHEMMACROS bundle @@ -30,6 +30,7 @@ % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- \documentclass[load-preamble+]{cnltx-doc} +\usepackage[utf8]{inputenc} \usepackage[greek=newtx]{chemmacros} \setcnltx{ package = {chemgreek}, @@ -176,6 +177,7 @@ \usepackage{filecontents} +\defbibheading{bibliography}{\addsec{References}} \addbibresource{\jobname.bib} \begin{filecontents*}{\jobname.bib} @book{iupac:greenbook, diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf Binary files differindex 42e857e56cc..3a355ba5db4 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf +++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex index bf87b1a3597..d6f3e10db95 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex +++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex @@ -30,6 +30,7 @@ % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- \documentclass[load-preamble+]{cnltx-doc} +\usepackage[utf8]{inputenc} \usepackage[greek=newtx]{chemmacros} \setcnltx{ package = {chemmacros}, @@ -183,6 +184,7 @@ \usepackage{filecontents} +\defbibheading{bibliography}{\addsec{References}} \addbibresource{\jobname.bib} \begin{filecontents*}{\jobname.bib} @book{iupac:greenbook, @@ -422,7 +424,8 @@ then only be set using the setup command. and \code{newest}. \emph{This option can only be chosen in the preamble}. % ghsystem \keybool{ghsystem}\Module{option}\Default{true} - Disable the automatic loading of the \ghsystem\ package. + \keyis{ghsystem}{false} disables the automatic loading of the \ghsystem\ + package. % greek \keychoice{greek}{\default{auto},kpfonts,math,newtx,textgreek,upgreek}% \Module{option}\Default{auto} @@ -814,7 +817,7 @@ be changed through the following option: Set the amount of kerning after the closing parenthesis. \end{options} -\paragraph{Fischer}\index{Fischer} +\paragraph{Fischer} \begin{itemize} \item[] \cs{D} \iupac{\D} \quad @@ -824,11 +827,12 @@ Since the command \cs{L} has another meaning already (\L) it is only available inside \cs{iupac} in the default setting. \paragraph{cis/trans, zusammen/entgegen, syn/anti \& tert} - \begin{itemize} \item[] \cs{cis} \iupac{\cis} \quad \cs{trans} \iupac{\trans} \quad + \cs{fac} \iupac{\fac} \quad + \cs{mer} \iupac{\mer} \quad \cs{Z} \iupac{\Z} \quad \cs{E} \iupac{\E} \quad \cs{syn} \iupac{\syn} \quad diff --git a/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf Binary files differindex a1e29a653ff..8054cd8eab3 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf +++ b/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf diff --git a/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.tex b/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.tex index f4a2c54f7d3..aa0d6b971e4 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.tex +++ b/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.tex @@ -30,6 +30,7 @@ % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- \documentclass[load-preamble+]{cnltx-doc} +\usepackage[utf8]{inputenc} \usepackage[greek=newtx]{chemmacros} \setcnltx{ package = {ghsystem}, @@ -178,6 +179,7 @@ \usepackage{filecontents} +\defbibheading{bibliography}{\addsec{References}} \addbibresource{\jobname.bib} \begin{filecontents*}{\jobname.bib} @book{iupac:greenbook, diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty index 38408cde11b..5a284390463 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty @@ -27,8 +27,8 @@ % -------------------------------------------------------------------------- \RequirePackage{ expl3 , xparse , l3keys2e , tikz , amsmath , xfrac , nicefrac , scrlfile } \usetikzlibrary{arrows} -\def\chemformula@version{4.2} -\def\chemformula@date{2013/10/24} +\def\chemformula@version{4.2a} +\def\chemformula@date{2013/11/04} \ProvidesExplPackage {chemformula} @@ -919,7 +919,7 @@ \group_begin: \seq_set_split:Nnn \l__chemformula_input_seq { ~ } { #1 } \cs_set_eq:NN \xspace \scan_stop: - % the next two necessary any more but shouldn't do harm, too: + % the next two aren't necessary any more but shouldn't do harm, too: \cs_set_nopar:Npn \[ { [ } \cs_set_nopar:Npn \] { ] } \bool_set_true:N \l_chemformula_inside_ch_bool @@ -932,9 +932,7 @@ \seq_map_function:NN \l__chemformula_input_seq \chemformula_input:n - \tl_set_rescan:NnV \l__chemformula_input_tl - { \ExplSyntaxOn \makeatletter } - \l__chemformula_input_tl + \__chemformula_prepare_output:N \l__chemformula_input_tl \chemformula_write:V \l__chemformula_input_tl \group_end: } @@ -1037,8 +1035,13 @@ { \group_begin: \keys_set:nn { chemmacros / chemformula } { #1 } - - \chemformula_input_cmpd:nN { #2 } \l__chemformula_compound_tl + \__chemformula_sanitize:Nn + \l__chemformula_chemformula_tmpa_tl + { #2 } + \chemformula_input_cmpd:VN + \l__chemformula_chemformula_tmpa_tl + \l__chemformula_compound_tl + \__chemformula_prepare_output:N \l__chemformula_compound_tl \chemformula_write:V \l__chemformula_compound_tl \group_end: } @@ -1081,20 +1084,23 @@ \cs_new:Npn \chemformula_chwritebelow:nn #1#2 { - \( - \underset - { - \bool_if:NF \l__chemformula_name_width_bool - { - \chemformula_dim_to_width:Nn \l__chemformula_name_dim - { \l__chemformula_name_format_tl #1 } - } - \parbox - { \dim_use:N \l__chemformula_name_dim } - { \l__chemformula_name_format_tl #1 } - } - { \text { \strut #2 } } - \) +% \group_begin: +% \__chemformula_reset:Nn \l__chemformula_tmpa_tl { #1 } + \( + \underset + { + \bool_if:NF \l__chemformula_name_width_bool + { + \chemformula_dim_to_width:Nn \l__chemformula_name_dim + { \l__chemformula_name_format_tl #1 } + } + \parbox + { \dim_use:N \l__chemformula_name_dim } + { \l__chemformula_name_format_tl #1 } + } + { \text { \strut #2 } } + \) +% \group_end: } \cs_new_protected:Npn \__chemformula_generate_name:Nn #1#2 @@ -1237,7 +1243,8 @@ \cs_new_protected:Npn \__chemformula_bond_draw:n #1 { - \tl_set_rescan:Nnn \l__chemformula_tmpa_tl {} { #1 } + \__chemformula_reset:Nn \l__chemformula_tmpa_tl { #1 } + % \tl_set_rescan:Nnn \l__chemformula_tmpa_tl {} { #1 } \prop_get:NV \l__chemformula_bonds_prop \l__chemformula_tmpa_tl } @@ -1674,7 +1681,8 @@ % set options for next compound: \cs_new_protected:Npn \chemformula_input_options:n #1 { - \makeatother + % \makeatother + \char_set_catcode_other:N \@ \tl_set_rescan:Nnn \l__chemformula_tmpa_tl { \char_set_catcode_letter:N \@ } { #1 } @@ -1683,7 +1691,8 @@ \bool_set_true:N \l__chemformula_options_bool \bool_set_true:N \l__chemformula_is_option_bool \tl_remove_all:Nn \l__chemformula_tmpa_tl { @ } - \exp_last_unbraced:Nno \tl_set:Nn \l__chemformula_internal_options_tl + \exp_last_unbraced:Nno + \tl_set:Nn \l__chemformula_internal_options_tl { \l__chemformula_tmpa_tl } } { \bool_set_false:N \l__chemformula_is_option_bool } @@ -1913,6 +1922,17 @@ \cs_new_protected:Npn \__chemformula_sanitize:Nn #1#2 { + \cs_gset_protected:Npx \__chemformula_restore: + { + \char_set_catcode:nn { 95 } { \char_value_catcode:n { 95 } }% _ + \char_set_catcode:nn { 58 } { \char_value_catcode:n { 58 } }% : + \char_set_catcode:nn { 94 } { \char_value_catcode:n { 94 } }% ^ + \char_set_catcode:nn { 123 } { \char_value_catcode:n { 123 } }% { + \char_set_catcode:nn { 125 } { \char_value_catcode:n { 125 } }% } + \char_set_catcode:nn { 35 } { \char_value_catcode:n { 35 } }% # + \char_set_catcode:nn { 33 } { \char_value_catcode:n { 33 } }% ! + \char_set_catcode:nn { 34 } { \char_value_catcode:n { 34 } }% " + } \tl_set_rescan:Nnn #1 { % expl3 catcodes: @@ -1936,6 +1956,21 @@ } \cs_generate_variant:Nn \__chemformula_sanitize:Nn { NV } +\cs_new_protected:Npn \__chemformula_prepare_output:N #1 + { + \tl_set_rescan:NnV #1 + { + \__chemformula_restore: + \ExplSyntaxOn + \makeatletter + } + #1 + } + +\cs_new_protected:Npn \__chemformula_reset:Nn #1#2 + { \tl_set_rescan:Nnn #1 { \__chemformula_restore: } { #2 } } +\cs_generate_variant:Nn \__chemformula_reset:Nn { NV } + \cs_new_protected:Npn \__chemformula_handle_sub_and_superscripts:nN #1#2 { \__chemformula_sanitize:Nn \l__chemformula_tmpa_tl { #1 } @@ -2149,6 +2184,7 @@ { _ } { \sb } \tl_replace_all:Nnn \l__chemformula_tmpa_tl { chemformulaplaceholder } { \_ } + % \__chemformula_reset:NV \l__chemformula_tmpa_tl \l__chemformula_tmpa_tl \tl_put_right:NV \l__chemformula_input_tl \l__chemformula_tmpa_tl } @@ -2207,6 +2243,7 @@ { _ } { \sb } \tl_replace_all:Nnn \l__chemformula_tmpa_tl { chemformulaplaceholder } { \_ } + % \__chemformula_reset:NV \l__chemformula_tmpa_tl \l__chemformula_tmpa_tl \tl_put_right:NV \l__chemformula_input_tl \l__chemformula_tmpa_tl \tl_put_right:Nn \l__chemformula_input_tl { \chemformula_skip_nobreak:N \l__chemformula_math_space_skip } @@ -2691,10 +2728,14 @@ VERSION HISTORY - fixed wrong setting of the TikZ bond style - new option `arrow-style' - new command \chlewis +2013/11/04 - version 4.2a - bug fix in \chcpd, + - change sanitizing/restoring of category codes % -------------------------------------------------------------------------- % TODO - https://bitbucket.org/cgnieder/chemmacros/issue/23/ - Addukte: Zahlen nach * und . automatisch erkennen? -- optionale Argumente von \\ nach außen +- optionale Argumente von \\ nach außen +- make escaped text/math /truely/ escaped, i.e., behave as if it's been input + /outside/ of \ch diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty index 2c0e7272907..a392fbe6d81 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty @@ -26,8 +26,8 @@ % - The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- \RequirePackage{ expl3 , xparse , l3keys2e } -\def\chemmacros@version{4.2a} -\def\chemmacros@date{2013/10/31} +\def\chemmacros@version{4.2b} +\def\chemmacros@date{2013/11/04} \ProvidesExplPackage {chemmacros} @@ -1089,9 +1089,15 @@ \DeclareChemIUPAC \E { \cip { E } } \DeclareChemIUPAC \Z { \cip { Z } } -% cis/trans & tert -\DeclareChemIUPAC \cis { \textit{ cis } } +% cis/trans +\DeclareChemIUPAC \cis { \textit { cis } } \DeclareChemIUPAC \trans { \textit { trans } } + +% fac/mer +\DeclareChemIUPAC \fac { \textit { fac } } +\DeclareChemIUPAC \mer { \textit { mer } } + +% tert \DeclareChemIUPAC \tert { \textit { tert } } % Fischer @@ -4048,6 +4054,7 @@ Version history \RenewChemState and improved both internal definition and user interface 2013/10/31 - version 4.2a - bug bix in \hapto and \bridge +2013/11/04 - version 4.2b - new IUPAC commands: \fac/\mer % --------------------------------------------------------------------------- % % TODO: |