From 53eae4e2e335f5e6e2f04db4931c70c5f1084741 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 9 May 2016 23:34:26 +0000 Subject: substances (9may16) git-svn-id: svn://tug.org/texlive/trunk@40989 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/substances/README | 4 ++-- .../doc/latex/substances/substances-examples.sub | 2 +- .../doc/latex/substances/substances_en.pdf | Bin 576775 -> 576993 bytes .../doc/latex/substances/substances_en.tex | 9 ++++++-- .../tex/latex/substances/substances-default.def | 2 +- .../texmf-dist/tex/latex/substances/substances.sty | 23 ++++++++++++--------- 6 files changed, 24 insertions(+), 16 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/substances/README b/Master/texmf-dist/doc/latex/substances/README index a7dbfee3982..c67260365f9 100644 --- a/Master/texmf-dist/doc/latex/substances/README +++ b/Master/texmf-dist/doc/latex/substances/README @@ -3,13 +3,13 @@ the SUBSTANCES package A Chemical Database -2015/10/21 v0.2 +2016/01/07 v0.2a -------------------------------------------------------------------------- Clemens Niederberger Web: https://bitbucket.org/cgnieder/substances/ E-Mail: contact@mychemistry.eu -------------------------------------------------------------------------- -Copyright 2012-2015 Clemens Niederberger +Copyright 2012-2016 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/doc/latex/substances/substances-examples.sub b/Master/texmf-dist/doc/latex/substances/substances-examples.sub index 79a8f6b5434..4d48c8d544b 100644 --- a/Master/texmf-dist/doc/latex/substances/substances-examples.sub +++ b/Master/texmf-dist/doc/latex/substances/substances-examples.sub @@ -8,7 +8,7 @@ % Web: https://bitbucket.org/cgnieder/substances/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012--2015 Clemens Niederberger +% Copyright 2012--2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/doc/latex/substances/substances_en.pdf b/Master/texmf-dist/doc/latex/substances/substances_en.pdf index bfd21bd18de..8f563ec611a 100644 Binary files a/Master/texmf-dist/doc/latex/substances/substances_en.pdf and b/Master/texmf-dist/doc/latex/substances/substances_en.pdf differ diff --git a/Master/texmf-dist/doc/latex/substances/substances_en.tex b/Master/texmf-dist/doc/latex/substances/substances_en.tex index b54c70a3303..eb8f4aa183f 100644 --- a/Master/texmf-dist/doc/latex/substances/substances_en.tex +++ b/Master/texmf-dist/doc/latex/substances/substances_en.tex @@ -10,7 +10,7 @@ % Web: https://bitbucket.org/cgnieder/substances/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012--2015 Clemens Niederberger +% Copyright 2012--2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -202,7 +202,12 @@ in the document via \code{\substancesdatabase{\meta{database name}}}. \end{commands} Suppose you have the file \code{\substancesdatabase{mydatabase}} then you -input it in the document preamble via \cs{LoadSubstances}\Marg{mydatabase}. +input it in the document preamble via \cs{LoadSubstances}\Marg{mydatabase}. A +database file should typically start with the following declaration: +\begin{commands} + \command{SubstancesDatabase}[\marg{database name}] + Declare\sinceversion{0.2} the database \meta{database name} +\end{commands} \subsection{Available Fields} \subsubsection{Always Defined Fields} diff --git a/Master/texmf-dist/tex/latex/substances/substances-default.def b/Master/texmf-dist/tex/latex/substances/substances-default.def index c88c6a98fc3..36fac6456b3 100644 --- a/Master/texmf-dist/tex/latex/substances/substances-default.def +++ b/Master/texmf-dist/tex/latex/substances/substances-default.def @@ -8,7 +8,7 @@ % Web: https://bitbucket.org/cgnieder/substances/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012--2015 Clemens Niederberger +% Copyright 2012--2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/substances/substances.sty b/Master/texmf-dist/tex/latex/substances/substances.sty index 286c9463218..5ef0a4cb68c 100644 --- a/Master/texmf-dist/tex/latex/substances/substances.sty +++ b/Master/texmf-dist/tex/latex/substances/substances.sty @@ -8,7 +8,7 @@ % Web: https://bitbucket.org/cgnieder/substances/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012--2015 Clemens Niederberger +% Copyright 2012--2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -32,8 +32,8 @@ \RequirePackage{ expl3 , xparse , l3keys2e , xtemplate } \ProvidesExplPackage {substances} - {2015/10/21} - {0.2} + {2016/01/07} + {0.2a} {A Chemical Database} \RequirePackage{chemmacros,chemfig,ghsystem} @@ -64,6 +64,8 @@ \tl_new:N \l__substances_style_tl \tl_set:Nn \l__substances_style_tl {default} +\cs_generate_variant:Nn \prop_get:NnN { c } + \AtBeginDocument { \@ifpackageloaded {imakeidx} @@ -190,7 +192,7 @@ \prop_if_in:NnTF \l__substances_sort_prop {#1} { \substances_remove_braces_set:xN - { \prop_get:Nn \l__substances_sort_prop {#1} } + { \prop_item:Nn \l__substances_sort_prop {#1} } \l__substances_tmpa_tl } { @@ -209,7 +211,7 @@ \prop_if_in:NnTF \l__substances_altsort_prop {#1} { \substances_remove_braces_set:xN - { \prop_get:Nn \l__substances_altsort_prop {#1} } + { \prop_item:Nn \l__substances_altsort_prop {#1} } \l__substances_tmpa_tl } { @@ -248,7 +250,7 @@ \IfSubstanceFieldTF {#2} { \IfSubstancePropertyTF {#1} {#2} - { \prop_get:cn { l__substances_#2_prop } {#1} } + { \prop_item:cn { l__substances_#2_prop } {#1} } { {??} \substances_msg:nnn {property-missing} {#1} {#2} } } { {??} \substances_msg:nnn {field-missing} {#1} {#2} } @@ -365,7 +367,7 @@ \cs_new_protected:Npn \substances_remove_str_unbrace_set:nnnN #1#2#3#4 { - \tl_set:Nx #4 { \prop_get:cn { l__substances_#3_prop } {#2} } + \prop_get:cnN { l__substances_#3_prop } {#2} #4 \tl_remove_all:Nn #4 {#1} \substances_remove_braces_set:xN {#4} #4 } @@ -398,7 +400,7 @@ \substances_index:nx { \c_job_name_tl -chem } { \SubstanceIndexNameAltEntry - { \prop_get:Nn \l__substances_sort_prop {#1} } + { \prop_item:Nn \l__substances_sort_prop {#1} } { \GetSubstanceProperty {#1} {name} } { \GetSubstanceProperty {#1} {alt} } } @@ -412,7 +414,7 @@ \substances_index:nx { \c_job_name_tl -chem } { \SubstanceIndexNameEntry - { \prop_get:Nn \l__substances_sort_prop {#1} } + { \prop_item:Nn \l__substances_sort_prop {#1} } { \GetSubstanceProperty {#1} {name} } } } @@ -431,7 +433,7 @@ \substances_index:nx { \c_job_name_tl -chem } { \SubstanceIndexAltEntry - { \prop_get:Nn \l__substances_altsort_prop {#1} } + { \prop_item:Nn \l__substances_altsort_prop {#1} } { \GetSubstanceProperty {#1} {name} } { \GetSubstanceProperty {#1} {alt} } } @@ -583,5 +585,6 @@ 2015/10/21 v0.2 - maintenance: minor fixes, adapt to chemmacros v5 - change implementation of how style files are loaded - change implementation of how database files are loaded +2016/01/07 v0.2a - \prop_get:Nn => \prop_item:Nn % TODO: -- cgit v1.2.3