beilstein (10nov17)

git-svn-id: svn://tug.org/texlive/trunk@45741 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 84 insertions, 60 deletions

diff --git a/Master/texmf-dist/bibtex/bst/beilstein/bjnano.bst b/Master/texmf-dist/bibtex/bst/beilstein/bjnano.bst
index 072faf68f2d..d512197812a 100644
--- a/Master/texmf-dist/bibtex/bst/beilstein/bjnano.bst
+++ b/Master/texmf-dist/bibtex/bst/beilstein/bjnano.bst
@@ -9,7 +9,7 @@
 %% beilstein -- Support for submissions to the ``Beilstein Journal
 %% of Nanotechnology'' published by the Beilstein-Institut
 %% for the Advancement of Chemical Sciences
-%% Version:     1.2
+%% Version:     1.3
 %% E-mail:      journals-support@beilstein-institut.de
 %% License:     Released under the LaTeX Project Public License v1.3c or later
 %% See          http://www.latex-project.org/lppl.txt
diff --git a/Master/texmf-dist/doc/latex/beilstein/BJNANO_Technical_Handbook.pdf b/Master/texmf-dist/doc/latex/beilstein/BJNANO_Technical_Handbook.pdf
index 29b5759ad7e..6a5b1c4a78d 100644
--- a/Master/texmf-dist/doc/latex/beilstein/BJNANO_Technical_Handbook.pdf
+++ b/Master/texmf-dist/doc/latex/beilstein/BJNANO_Technical_Handbook.pdf
diff --git a/Master/texmf-dist/doc/latex/beilstein/CHANGELOG.md b/Master/texmf-dist/doc/latex/beilstein/CHANGELOG.md
index 65f7a44b89a..c082bc194cd 100644
--- a/Master/texmf-dist/doc/latex/beilstein/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/beilstein/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.3 - 2017-11-09
+
+### Changed
+- Loading of `cleveref` was postponed till the end of the preamble in order to avoid problems with `hyperref`
+
 
 ## 1.2 - 2017-08-21
 
diff --git a/Master/texmf-dist/doc/latex/beilstein/README.md b/Master/texmf-dist/doc/latex/beilstein/README.md
index 07611f135ef..82a6230e3cf 100644
--- a/Master/texmf-dist/doc/latex/beilstein/README.md
+++ b/Master/texmf-dist/doc/latex/beilstein/README.md
@@ -3,7 +3,7 @@
     beilstein -- Support for submissions to the ``Beilstein Journal
     of Nanotechnology'' published by the Beilstein-Institut
     for the Advancement of Chemical Sciences
-    Version:     1.2
+    Version:     1.3
     E-mail:      journals-support@beilstein-institut.de
     License:     Released under the LaTeX Project Public License v1.3c or later
     See          http://www.latex-project.org/lppl.txt
@@ -15,7 +15,8 @@ files can be used for any kind of document, they have only been
 designed and tested to be suitable for submission to the [Beilstein Journal of Nanotechnology].
 
 
-Stable versions are uploaded to CTAN (https://www.ctan.org/pkg/beilstein).
+Stable versions are uploaded to CTAN (https://www.ctan.org/pkg/beilstein). From there they usually 
+make their way into TeX Live and MiKTeX rather quickly.
 In addition you will find the most recent version at https://www.beilstein-journals.org/bjnano/templates.
 The most recent documentation is available at BJNANO_Technical_Handbook.pdf within the doc directory. 
 `texdoc beilstein` should give you this file. It includes a short description how to use the template and 
diff --git a/Master/texmf-dist/source/latex/beilstein/beilstein.dtx b/Master/texmf-dist/source/latex/beilstein/beilstein.dtx
index 5f90e8f008f..ba2e37632c5 100644
--- a/Master/texmf-dist/source/latex/beilstein/beilstein.dtx
+++ b/Master/texmf-dist/source/latex/beilstein/beilstein.dtx
@@ -19,7 +19,7 @@
 beilstein -- Support for submissions to the ``Beilstein Journal
 of Nanotechnology'' published by the Beilstein-Institut
 for the Advancement of Chemical Sciences
-Version:     1.2
+Version:     1.3
 E-mail:      journals-support@beilstein-institut.de
 License:     Released under the LaTeX Project Public License v1.3c or later
 See          http://www.latex-project.org/lppl.txt
@@ -90,7 +90,7 @@ This work consists of the files beilstein.dtx,
 %</internal>
 %<*driver>
 \ProvidesFile{beilstein.dtx}%
-[2017/08/21 v1.2 Bundle for submissions to the\MessageBreak ``Beilstein Journal
+[2017/11/09 v1.3 Bundle for submissions to the\MessageBreak ``Beilstein Journal
    of Nanotechnology'' (BJNANO)]
 \documentclass[a4paper]{ltxdoc}
 \usepackage[american]{babel}
@@ -102,7 +102,7 @@ This work consists of the files beilstein.dtx,
 \usepackage{array,booktabs,tabularx,longtable}
 \usepackage{fancyhdr}
 \pagestyle{fancy}
-\lfoot{\footnotesize BJNANO Technical Handbook (Version 1.2)}
+\lfoot{\footnotesize BJNANO Technical Handbook (Version 1.3)}
 \cfoot{}
 \rfoot{\thepage}
 \usepackage[final]{listings}
@@ -118,6 +118,10 @@ This work consists of the files beilstein.dtx,
 \DeclareSymbolFont{ugrf@m}{U}{eur}{m}{n}
 \SetSymbolFont{ugrf@m}{bold}{U}{eur}{b}{n}
 \DeclareMathSymbol{\upalpha}{\mathord}{ugrf@m}{"0B}
+\providecommand*\env[1]{\texttt{#1}}
+\providecommand*\file[1]{\texttt{#1}}
+\providecommand*\opt[1]{\texttt{#1}}
+\providecommand*\pkg[1]{\textsf{#1}}
 \usepackage[%
 	pdftitle={A LaTeX class for submissions to the ``Beilstein Journal of
    Nanotechnology'' (BJNANO)},
@@ -164,6 +168,8 @@ This work consists of the files beilstein.dtx,
 % \changes{v1.2}{2017/08/21}{Fix for the declaration of \cs{-} as a robust 
 % command. There is a conflict between package bpchem and the latest 
 % \LaTeX{} release.}
+% \changes{v1.3}{2017/11/09}{Fix: Loading of \pkg{cleveref} is postponed to the
+% very end of the preamble in order to avoid problems with \pkg{hyperref}.}
 % \GetFileInfo{\jobname.dtx}
 % \DoNotIndex{\newcommand,\newenvironment}
 % \DoNotIndex{\def,\edef,\gdef,\xdef,\global,\long,\let}
@@ -328,10 +334,10 @@ This work consists of the files beilstein.dtx,
 % \renewcommand*{\fps@table}{htb}
 % \setlength\belowcaptionskip{10pt}
 %
-% \providecommand*\env{\texttt}
-% \providecommand*\file{\texttt}
-% \providecommand*\opt{\texttt}
-% \providecommand*\pkg{\textsf}
+% \providecommand*\env[1]{\texttt{#1}}
+% \providecommand*\file[1]{\texttt{#1}}
+% \providecommand*\opt[1]{\texttt{#1}}
+% \providecommand*\pkg[1]{\textsf{#1}}
 % \newcommand*{\BJNANO}{\emph{Beilstein Journal of Nano\-tech\-nology}\xspace}
 % \def\testbx{bx}
 % \DeclareRobustCommand*{\chem}[1]{\ensuremath{%
@@ -369,8 +375,8 @@ This work consists of the files beilstein.dtx,
 % \begin{abstract}
 % \noindent The \pkg{Beilstein} bundle provides a \LaTeX\ class file and a
 % \BibTeX\ style file in accordance with the requirements of
-% submissions to the \BJNANO. Although the files can be used for any kind of document,
-% they have only been designed and tested to be suitable for
+% submissions to the \BJNANO. Although the files can be used for any kind of 
+% document, they have only been designed and tested to be suitable for
 % submissions to the \BJNANO.
 % \end{abstract}
 % \end{titlepage}
@@ -381,22 +387,23 @@ This work consists of the files beilstein.dtx,
 % based on the standard \pkg{article} class, but was modified
 % to meet the requirements for submissions to the \BJNANO as
 % published in the ``Instructions for Authors'' \cite{Beilstein-MSG}.
-% Moreover the \LaTeX class \file{beilstein.cls} facilitates ease of use by providing the authors with a
-% set of useful macros and environments.
+% Moreover the \LaTeX class \file{beilstein.cls} facilitates ease of use by 
+% providing the authors with a set of useful macros and environments.
 %
 % The \BibTeX\ style \file{bjnano.bst} is used by the class to format
 % citations and references correctly. It is based on Joseph Wright's
 % \file{achemso.bst}, but was largely adjusted to work exactly on
 % \BJNANO submissions.
 %
-% Finally an example document is included in the \pkg{Beilstein} bundle. It is intended to act as a
-% potential template for submissions, and illustrates the usage of the
-% class and the \BibTeX\ file.
+% Finally an example document is included in the \pkg{Beilstein} bundle. It is 
+% intended to act as a potential template for submissions, and illustrates the 
+% usage of the class and the \BibTeX\ file.
 %
 % \section{Installation}
 % \subsection{Global installation via your \TeX{} distribution}
-% From version 1.2 onwards, the \pkg{Beilstein} bundle is distributed via CTAN and the major 
-% \TeX{} distribution. Therefore after having updated your \TeX{} Live or MiKTeX installation 
+% From version 1.2 onwards, the \pkg{Beilstein} bundle is distributed via CTAN 
+% and the major \TeX{} distribution. Therefore after having updated your \TeX{} 
+% Live or MiKTeX installation 
 % you can use the \pkg{Beilstein} files rightaway.
 %
 % \subsection{Local TDS installation}
@@ -1273,7 +1280,7 @@ This work consists of the files beilstein.dtx,
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{beilstein}
-[2017/08/21 v1.2 Template for submissions to the ``Beilstein Journal %
+[2017/11/09 v1.3 Template for submissions to the ``Beilstein Journal %
    of Nanotechnology'' (BJNANO)]
 %    \end{macrocode}
 % For class options key-value pairs are used. They are provided by the
@@ -1583,7 +1590,8 @@ This work consists of the files beilstein.dtx,
          \Prep}%
       \expandafter\DeclareRobustCommand\expandafter\|\expandafter{\|}
 %    \end{macrocode}
-% \changes{v1.2}{201/08/21}{Removed definition for robust \cs{-} due to conflict with recent 
+% \changes{v1.2}{2017/08/21}{Removed definition for robust \cs{-} due to 
+%conflict with recent 
 % \LaTeX{} versions.}
 %    \begin{macrocode}
    }%
@@ -1788,35 +1796,42 @@ This work consists of the files beilstein.dtx,
 %    \end{macrocode}
 % Referencing floats is one of LaTeXs advantages. The \pkg{cleveref} %
 % package extends those abilities even further.
+%
+% To avoid problems when \pkg{hyperref} is used as well, we postpone the 
+% packages's loading to the very end of the preamble.
+% \changes{1.3}{2017/11/09}{Postpone loading of \pkg{cleveref}}
 %    \begin{macrocode}
-\IfFileExists{cleveref.sty}{%
-  \RequirePackage{cleveref}[2009/12/11]
-}{\ClassInfo{beilstein}{Package ``cleveref'' was not found and %
-  \MessageBreak therefore has not been loaded.}}
+\RequirePackage{etoolbox}%
+\AtEndPreamble{%
+   \IfFileExists{cleveref.sty}{%
+     \RequirePackage{cleveref}[2009/12/11]
+   }{\ClassInfo{beilstein}{Package ``cleveref'' was not found and %
+     \MessageBreak therefore has not been loaded.}}
 %    \end{macrocode}
 % The standard types just need a little adaption for the names.
 %    \begin{macrocode}
-\@ifpackageloaded{cleveref}{%
-	\crefname{figure}{Figure}{Figures}
-	\crefname{table}{Table}{Tables}
+   \@ifpackageloaded{cleveref}{%
+   	\crefname{figure}{Figure}{Figures}
+   	\crefname{table}{Table}{Tables}
 %    \end{macrocode}
 % The new type ``scheme'' should be recognized as well.
 %    \begin{macrocode}
-	\crefname{scheme}{Scheme}{Schemes}
-	\crefformat{scheme}{Scheme~#2#1#3}
-	\Crefformat{scheme}{Scheme~#2#1#3}
+   	\crefname{scheme}{Scheme}{Schemes}
+   	\crefformat{scheme}{Scheme~#2#1#3}
+   	\Crefformat{scheme}{Scheme~#2#1#3}
 %    \end{macrocode}
 % The authors use extended information stored in extra files as well
 % and cross-reference to them. So those ones are also adapted.
 %    \begin{macrocode}
-	\crefname{suppinfo}{Supporting Information File}{Supporting
-Information Files}
-	\crefformat{suppinfo}{Supporting Information File~#2#1#3}
-	\Crefformat{suppinfo}{Supporting Information File~#2#1#3}
-}{\newcommand{\cref}[1]%
-   {\ClassError{beilstein}{Macro \string\cref\space has not been
-    defined\MessageBreak since the cleveref package could not be
-    loaded}{Please install the package cleveref first}
+   	\crefname{suppinfo}{Supporting Information File}{Supporting
+   Information Files}
+	  \crefformat{suppinfo}{Supporting Information File~#2#1#3}
+   	\Crefformat{suppinfo}{Supporting Information File~#2#1#3}
+   }{\newcommand{\cref}[1]%
+      {\ClassError{beilstein}{Macro \string\cref\space has not been
+       defined\MessageBreak since the cleveref package could not be
+       loaded}{Please install the package cleveref first}
+      }%
    }%
 }%
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/beilstein/beilstein.ins b/Master/texmf-dist/source/latex/beilstein/beilstein.ins
index 7218eefdbb2..4a1bd03809a 100644
--- a/Master/texmf-dist/source/latex/beilstein/beilstein.ins
+++ b/Master/texmf-dist/source/latex/beilstein/beilstein.ins
@@ -6,7 +6,7 @@
 beilstein -- Support for submissions to the ``Beilstein Journal
 of Nanotechnology'' published by the Beilstein-Institut
 for the Advancement of Chemical Sciences
-Version:     1.2
+Version:     1.3
 E-mail:      journals-support@beilstein-institut.de
 License:     Released under the LaTeX Project Public License v1.3c or later
 See          http://www.latex-project.org/lppl.txt
diff --git a/Master/texmf-dist/tex/latex/beilstein/beilstein.cls b/Master/texmf-dist/tex/latex/beilstein/beilstein.cls
index b17a0727f7d..455805f21ea 100644
--- a/Master/texmf-dist/tex/latex/beilstein/beilstein.cls
+++ b/Master/texmf-dist/tex/latex/beilstein/beilstein.cls
@@ -9,7 +9,7 @@
 %% beilstein -- Support for submissions to the ``Beilstein Journal
 %% of Nanotechnology'' published by the Beilstein-Institut
 %% for the Advancement of Chemical Sciences
-%% Version:     1.2
+%% Version:     1.3
 %% E-mail:      journals-support@beilstein-institut.de
 %% License:     Released under the LaTeX Project Public License v1.3c or later
 %% See          http://www.latex-project.org/lppl.txt
@@ -17,7 +17,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{beilstein}
-[2017/08/21 v1.2 Template for submissions to the ``Beilstein Journal %
+[2017/11/09 v1.3 Template for submissions to the ``Beilstein Journal %
    of Nanotechnology'' (BJNANO)]
 \RequirePackage{xkeyval}
 \RequirePackage{ifthen}
@@ -410,24 +410,27 @@ bookreport,review,letter}
 {\includegraphics[width=8.2cm,keepaspectratio]{#1}}
 \newcommand{\dblcolscheme}[1]%
 {\includegraphics[width=16.8cm,keepaspectratio]{#1}}
-\IfFileExists{cleveref.sty}{%
-  \RequirePackage{cleveref}[2009/12/11]
-}{\ClassInfo{beilstein}{Package ``cleveref'' was not found and %
-  \MessageBreak therefore has not been loaded.}}
-\@ifpackageloaded{cleveref}{%
-\crefname{figure}{Figure}{Figures}
-\crefname{table}{Table}{Tables}
-\crefname{scheme}{Scheme}{Schemes}
-\crefformat{scheme}{Scheme~#2#1#3}
-\Crefformat{scheme}{Scheme~#2#1#3}
-\crefname{suppinfo}{Supporting Information File}{Supporting
-Information Files}
-\crefformat{suppinfo}{Supporting Information File~#2#1#3}
-\Crefformat{suppinfo}{Supporting Information File~#2#1#3}
-}{\newcommand{\cref}[1]%
-   {\ClassError{beilstein}{Macro \string\cref\space has not been
-    defined\MessageBreak since the cleveref package could not be
-    loaded}{Please install the package cleveref first}
+\RequirePackage{etoolbox}%
+\AtEndPreamble{%
+   \IfFileExists{cleveref.sty}{%
+     \RequirePackage{cleveref}[2009/12/11]
+   }{\ClassInfo{beilstein}{Package ``cleveref'' was not found and %
+     \MessageBreak therefore has not been loaded.}}
+   \@ifpackageloaded{cleveref}{%
+    \crefname{figure}{Figure}{Figures}
+    \crefname{table}{Table}{Tables}
+    \crefname{scheme}{Scheme}{Schemes}
+    \crefformat{scheme}{Scheme~#2#1#3}
+    \Crefformat{scheme}{Scheme~#2#1#3}
+    \crefname{suppinfo}{Supporting Information File}{Supporting
+   Information Files}
+  \crefformat{suppinfo}{Supporting Information File~#2#1#3}
+    \Crefformat{suppinfo}{Supporting Information File~#2#1#3}
+   }{\newcommand{\cref}[1]%
+      {\ClassError{beilstein}{Macro \string\cref\space has not been
+       defined\MessageBreak since the cleveref package could not be
+       loaded}{Please install the package cleveref first}
+      }%
    }%
 }%
 \RequirePackage[sort&compress,numbers]{natbib}