diff options
author | Karl Berry <karl@freefriends.org> | 2016-07-16 21:41:37 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-07-16 21:41:37 +0000 |
commit | 42cb2732743e6530de625c577c0e0e180652300e (patch) | |
tree | 8debe23057aa66802556683e189e4ac805954cd2 /Master/texmf-dist/doc/latex | |
parent | 23eedd602689c3c8d52dcf5deadd50b7819e7131 (diff) |
ghsystem (16jul16)
git-svn-id: svn://tug.org/texlive/trunk@41714 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex')
-rw-r--r-- | Master/texmf-dist/doc/latex/ghsystem/README | 5 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/ghsystem/ghsystem_en.pdf | bin | 787301 -> 786209 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/ghsystem/ghsystem_en.tex | 92 |
3 files changed, 58 insertions, 39 deletions
diff --git a/Master/texmf-dist/doc/latex/ghsystem/README b/Master/texmf-dist/doc/latex/ghsystem/README index 391031c14a4..57e19fc82ef 100644 --- a/Master/texmf-dist/doc/latex/ghsystem/README +++ b/Master/texmf-dist/doc/latex/ghsystem/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -the GHSYSTEM package v4.6 2014/08/08 +the GHSYSTEM package v4.8 2016/07/16 globally harmonized system @@ -8,7 +8,7 @@ Clemens Niederberger Web: https://github.com/cgnieder/ghsystem/ E-Mail: contact@mychemistry.eu -------------------------------------------------------------------------- -Copyright 2011-2014 Clemens Niederberger +Copyright 2011-2016 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 @@ -30,6 +30,7 @@ image files: language-definition files: - ghsystem_german.def, - ghsystem_english.def, + - ghsystem_french.def, - ghsystem_italian.def - ghsystem_langtemplate.def documentation and README: diff --git a/Master/texmf-dist/doc/latex/ghsystem/ghsystem_en.pdf b/Master/texmf-dist/doc/latex/ghsystem/ghsystem_en.pdf Binary files differindex 7758b72e42d..a793a3c68ba 100644 --- a/Master/texmf-dist/doc/latex/ghsystem/ghsystem_en.pdf +++ b/Master/texmf-dist/doc/latex/ghsystem/ghsystem_en.pdf diff --git a/Master/texmf-dist/doc/latex/ghsystem/ghsystem_en.tex b/Master/texmf-dist/doc/latex/ghsystem/ghsystem_en.tex index d67024a2224..718d5317c21 100644 --- a/Master/texmf-dist/doc/latex/ghsystem/ghsystem_en.tex +++ b/Master/texmf-dist/doc/latex/ghsystem/ghsystem_en.tex @@ -16,7 +16,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2014 Clemens Niederberger +% Copyright 2011-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,11 +32,12 @@ % -------------------------------------------------------------------------- \documentclass[load-preamble+]{cnltx-doc} \usepackage[utf8]{inputenc} -\usepackage[greek=newtx]{chemmacros} +% \usepackage[greek=newtx]{chemmacros} \usepackage{ghsystem} \setcnltx{ package = {ghsystem}, - url = https://bitbucket.org/cgnieder/chemmacros/ , + info = \acl*{ghs} , + url = https://github.com/cgnieder/ghsystem/ , authors = Clemens Niederberger , email = contact@mychemistry.eu , abstract = {% @@ -46,8 +47,9 @@ } , add-cmds = { chemsetup, - ghs, ghslistall, ghspic - } + ghs, ghslistall, ghspic, ghssetup + } , + index-setup = noclearpage } \usepackage{booktabs} @@ -98,10 +100,15 @@ } \chemsetup{ - option/synchronize , + greek = newtx , + formula = chemformula , chemformula/format = \libertineLF } +\ghssetup{ + language = {german,english} +} + \sisetup{ detect-mode=false, mode=text, @@ -114,14 +121,15 @@ \addbibresource{\jobname.bib} \begin{filecontents*}{\jobname.bib} @misc{eu:ghsystem_regulation, - author = {{The European Parliament and The Council of the European Union}}, - title = {Regulation (EC) No 1272/2008 of the European Parliament and of + author = {{The European Parliament and The Council of the European Union}}, + title = {Regulation (EC) No 1272/2008 of the European Parliament and of the Council} , + shorthand = {EuP} , subtitle = {on classification, labelling and packaging of substances and mixtures, amending and repealing Directives 67/548/EEC and 1999/45/EC, and amending Regulation (EC) No 1907/2006} , - journal = {Official Journal of the European Union} , - date = {2008-12-16} + journal = {Official Journal of the European Union} , + date = {2008-12-16} } @online{unece:ghsystem_implementation, author = {{United Nations Economic Commission for Europe}} , @@ -154,6 +162,7 @@ are taken from \acs{eu} regulation 1272/2008~\cite{eu:ghsystem_regulation}. \ghsystem\ loads the following packages: \pkg{expl3}\footnote{\CTANurl{l3kernel}}~\cite{bnd:l3kernel}, \pkg{xparse} and \pkg{l3keys2e}\footnote{\CTANurl{l3packages}}~\cite{bnd:l3packages}, +\needpackage{chemmacros}~\cite{pkg:translations}, \needpackage{translations}~\cite{pkg:translations}, \needpackage{siunitx}~\cite{pkg:siunitx}, \needpackage{graphicx}~\cite{pkg:graphicx}, @@ -161,19 +170,20 @@ are taken from \acs{eu} regulation 1272/2008~\cite{eu:ghsystem_regulation}. \needpackage{ifpdf}~\cite{pkg:ifpdf}. \section{Setup} -The simplest way is to load \pkg{chemmacros}~\cite{pkg:chemmacros} which loads -\ghsystem{} implicitily. All of \ghsystem's options belong to -\pkg{chemmacros}' module \module{ghsystem}. This means they can be setup with -\begin{sourcecode} - \chemsetup[ghsystem]{<options>} or - \chemsetup{ghsystem/<option1>,ghsystem/<option2>} -\end{sourcecode} -\sinceversion{4.0}However, \ghsystem{} can be loaded as a standalone package -and thus provides its own setup command: -\begin{commands} - \command{ghssetup}[\marg{options}] - Setup command for \ghsystem. -\end{commands} +% TODO +% The simplest way is to load \pkg{chemmacros}~\cite{pkg:chemmacros} which loads +% \ghsystem{} implicitily. All of \ghsystem's options belong to +% \pkg{chemmacros}' module \module{ghsystem}. This means they can be setup with +% \begin{sourcecode} +% \chemsetup[ghsystem]{<options>} or +% \chemsetup{ghsystem/<option1>,ghsystem/<option2>} +% \end{sourcecode} +% \sinceversion{4.0}However, \ghsystem{} can be loaded as a standalone package +% and thus provides its own setup command: +% \begin{commands} +% \command{ghssetup}[\marg{options}] +% Setup command for \ghsystem. +% \end{commands} \section{Get Hazard and Precautionary Statements} \subsection{Simple Statements} @@ -393,8 +403,10 @@ pictograms. You are free to choose the picture type yourself with the option \end{options} \section{Available Languages}\label{sec:ghsystem_language} -Right now the H and P statements are only available in English, German, -Italian and Spanish. The package adapts \pkg{chemmacros}' option +Right now the H and P statements are available in English, +French\footnote{Thanks to Bréal Frédéric and Beaude Aurélien!}, German, +Italian\footnote{Thanks to Jonas Rivetti!} and Spanish\footnote{Thanks to + Ignacio Fernández Galván!}. The package adapts \pkg{chemmacros}' option \option{language} or if the option hasn't been used recognizes the language settings made with \pkg{babel} or \pkg{polyglossia}. To be more precise: the language selected at begin document is recognized. Later changes won't affect @@ -403,29 +415,35 @@ language option then. You can also choose the language explicitly. \begin{options} - \keychoice{language}{english,german,italian,spanish}\Default{english} - Selects and loads language file. Falls back to \code{english} if the - chosen file doesn't exist. + \keyval{language}{lang}\Default{english} + Selects a language and if called in the preamble also loads the necessary + language file if it hasn't been loaded, yet. If the chosen file doesn't + exist it falls back to \code{english}. Currently available choices are + English, French, German, Italian, and Spanish. \meta{lang} can be a comma + separated list. Then the last language in the list will be the active + one. If you plan to switch languages within the document then you should + make sure to load all needed languages in the preamble first. \end{options} \begin{example}[side-by-side] \ghs{h}{201} - \chemsetup[ghsystem]{language=german} + \ghssetup{language=german} \ghs{h}{201} \end{example} -There is another alternative: -\begin{commands} - \command{loadghsystemlanguage}[\marg{language}] - \sinceversion{4.0}Load the language used by \ghsystem. -\end{commands} +% There is another alternative: +% \begin{commands} +% \command{loadghsystemlanguage}[\marg{language}] +% \sinceversion{4.0}Load the language used by \ghsystem. +% \end{commands} I will add other languages some time in future. This may take a while, though. If you would be willing to contribute and write the statements of another language please feel free to contact -me\footnote{\href{mailto:contact@mychemistry.eu}{contact@mychemistry.eu}}. I -would provide you with a template file, a \acs{pdf} containing the official -translations, and help to all your questions. +me\footnote{\href{mailto:contact@mychemistry.eu}{contact@mychemistry.eu}}. +Your \TeX\ distribution should contain a file +\code{ghsystem\_langtemplate.def} which \emph{should} explain all immediate +questions and can be used as a basis for a new language file. \section{List of All Statements} If for some reason you want to list all sentences you can use |