diff options
Diffstat (limited to 'Master/texmf-dist')
| -rw-r--r-- | Master/texmf-dist/doc/latex/pkgloader/README | 9 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/pkgloader/pkgloader-packagedoc.cls | 3 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/pkgloader/pkgloader.pdf | bin | 454292 -> 454647 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/pkgloader/pkgloader.tex | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pkgloader/pkgloader-dry.sty | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pkgloader/pkgloader-recommended.sty | 31 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pkgloader/pkgloader.sty | 7 |
7 files changed, 43 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/latex/pkgloader/README b/Master/texmf-dist/doc/latex/pkgloader/README index e90a6bb1aa4..679ba9a2e9e 100644 --- a/Master/texmf-dist/doc/latex/pkgloader/README +++ b/Master/texmf-dist/doc/latex/pkgloader/README @@ -1,9 +1,9 @@ latex-pkgloader =============== -LaTeX Package : latex-pkgloader 0.2.0 +LaTeX Package : latex-pkgloader 0.3.0 -Last Modified : 2014-05-10 +Last Modified : 2014-08-31 Author : Michiel Helvensteijn (www.mhelvens.net) @@ -17,7 +17,8 @@ A LaTeX package for managing the options and loading order of other packages Prerequisites ------------- -To use this package, you need the following packages: +To use this package you need, apart from packages installed by default, +the following package: * `lt3graph` @@ -48,4 +49,4 @@ License This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html -for the details of that license.
\ No newline at end of file +for the details of that license. diff --git a/Master/texmf-dist/doc/latex/pkgloader/pkgloader-packagedoc.cls b/Master/texmf-dist/doc/latex/pkgloader/pkgloader-packagedoc.cls index be82b57e9f9..c1c0997ab31 100644 --- a/Master/texmf-dist/doc/latex/pkgloader/pkgloader-packagedoc.cls +++ b/Master/texmf-dist/doc/latex/pkgloader/pkgloader-packagedoc.cls @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % -% Copyright (c) 2013 - Michiel Helvensteijn - www.mhelvens.net % +% Copyright (c) 2014 - Michiel Helvensteijn (www.mhelvens.net) % % % % https://github.com/mhelvens/latex-lt3graph % % % @@ -43,7 +43,6 @@ \RequirePackage{pkgloader-dry} \LoadPackagesNow - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Documentation Options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/doc/latex/pkgloader/pkgloader.pdf b/Master/texmf-dist/doc/latex/pkgloader/pkgloader.pdf Binary files differindex c2768ffce6b..b7c50c69ec3 100644 --- a/Master/texmf-dist/doc/latex/pkgloader/pkgloader.pdf +++ b/Master/texmf-dist/doc/latex/pkgloader/pkgloader.pdf diff --git a/Master/texmf-dist/doc/latex/pkgloader/pkgloader.tex b/Master/texmf-dist/doc/latex/pkgloader/pkgloader.tex index 420453ad6a7..8d1e519c308 100644 --- a/Master/texmf-dist/doc/latex/pkgloader/pkgloader.tex +++ b/Master/texmf-dist/doc/latex/pkgloader/pkgloader.tex @@ -36,6 +36,11 @@ \changes{0.2.0}{2014/05/10} {an important release, which implements most features described in the pkgloader TUGBoat article, and fixes a ton of bugs} + +\changes{0.3.0}{2014/08/31} + {fixed the package to work with more recent releases of expl3, + which removed the individual l3kernel .sty files; additionally, + pkgloader now understands preferred loading orders of cleveref} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} % 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} |