pkgloader (1sep14)

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

3 files changed, 32 insertions, 8 deletions

diff --git a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-dry.sty b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-dry.sty
index bcb21ea2e3d..2ae2efce3e8 100644
--- a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-dry.sty
+++ b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-dry.sty
@@ -1,6 +1,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffalse %%%%
 %                                                                              %
-%  Copyright (c) 2013 - Michiel Helvensteijn - www.mhelvens.net                %
+%  Copyright (c) 2014 - Michiel Helvensteijn   (www.mhelvens.net)              %
 %                                                                              %
 %  https://github.com/mhelvens/latex-lt3graph                                  %
 %                                                                              %
diff --git a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-recommended.sty b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-recommended.sty
index b1afd9753bf..3f61bb14551 100644
--- a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-recommended.sty
+++ b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-recommended.sty
@@ -20,9 +20,8 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  This is a preliminary list of recommended rules,
-%  gathered from a number of sources. It should be
-%  expanded.
+%  A list of recommended rules derived from
+%  <http://www.macfreek.nl/memory/LaTeX_package_conflicts>:
 %
 %    \begin{macrocode}
 \Load {fixltx2e}  early              always
@@ -40,3 +39,29 @@
 %    \end{macrocode}
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  A list of recommended rules extracted from the cleveref
+%  documentation and uses of |\@ifpackageloaded| in
+%  |cleveref.sty|:
+%
+%    \begin{macrocode}
+\Load {cleveref} after   {algorithm2e,algorithmicx,
+                          aliascnt,amsmath,amsthm,caption,
+                          hyperref,IEEEtrantools,listings,
+                          ntheorem,subfig,varioref}
+                 if loaded
+                 because {cleveref adds special support
+                          for this package}
+\Load {varioref} before  {hyperref}
+                 if      {varioref && hyperref && cleveref}
+                 because {the cleveref documentation
+                          explicitly requires varioref
+                          before hyperref if all three
+                          packages are loaded}
+%    \end{macrocode}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
diff --git a/Master/texmf-dist/tex/latex/pkgloader/pkgloader.sty b/Master/texmf-dist/tex/latex/pkgloader/pkgloader.sty
index e8a1f9f9962..4995d1596ed 100644
--- a/Master/texmf-dist/tex/latex/pkgloader/pkgloader.sty
+++ b/Master/texmf-dist/tex/latex/pkgloader/pkgloader.sty
@@ -17,7 +17,7 @@
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \fi %%%%
 
-% \CheckSum{528}
+% \CheckSum{527}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -48,7 +48,7 @@
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\ProvidesExplPackage{pkgloader}{2014/05/10}{0.2.0}
+\ProvidesExplPackage{pkgloader}{2014/08/31}{0.3.0}
   {managing the options and loading order of LaTeX packages}
 %    \end{macrocode}
 %
@@ -64,13 +64,12 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %  
-%  The following packages are required. Three standard |expl3|-related
+%  The following packages are required. Two standard |expl3|-related
 %  packages, one experimental package in |l3regex| and one user-contributed
 %  |expl3| package in |lt3graph|:
 %  
 %    \begin{macrocode}
 \RequirePackage{xparse}
-\RequirePackage{l3prop}
 \RequirePackage{l3keys2e}
 \RequirePackage{l3regex}
 \RequirePackage{lt3graph}