summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-04-29 21:52:26 +0000
committerKarl Berry <karl@freefriends.org>2018-04-29 21:52:26 +0000
commitc76f355c3545fe41d7bb10f49f35c133f6fa8fcb (patch)
treec4e52f9f907ac8c26164b69070c55641147ece06 /Master
parent398ae888a882af3b901d7e6564634e4611988fe3 (diff)
pkgloader (29apr18)
git-svn-id: svn://tug.org/texlive/trunk@47486 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/pkgloader/README4
-rw-r--r--Master/texmf-dist/doc/latex/pkgloader/pkgloader-packagedoc.cls2
-rw-r--r--Master/texmf-dist/doc/latex/pkgloader/pkgloader.pdfbin469328 -> 469532 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pkgloader/pkgloader.tex5
-rw-r--r--Master/texmf-dist/tex/latex/pkgloader/pkgloader-cls-pkg.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pkgloader/pkgloader-dry.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pkgloader/pkgloader-early.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pkgloader/pkgloader-error.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pkgloader/pkgloader-false.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pkgloader/pkgloader-late.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pkgloader/pkgloader-recommended.sty33
-rw-r--r--Master/texmf-dist/tex/latex/pkgloader/pkgloader-true.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pkgloader/pkgloader.sty4
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
14 files changed, 48 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/latex/pkgloader/README b/Master/texmf-dist/doc/latex/pkgloader/README
index afc208c6ac3..3765933955a 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.6.0
+LaTeX Package : latex-pkgloader 0.7.0
-Last Modified : 2018-03-24
+Last Modified : 2018-04-29
Author : Michiel Helvensteijn (www.mhelvens.net)
diff --git a/Master/texmf-dist/doc/latex/pkgloader/pkgloader-packagedoc.cls b/Master/texmf-dist/doc/latex/pkgloader/pkgloader-packagedoc.cls
index efc48cf8ba6..eb81fc4dcff 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) 2014 - Michiel Helvensteijn (www.mhelvens.net) %
+% Copyright (c) 2018 - Michiel Helvensteijn (www.mhelvens.net) %
% %
% https://github.com/mhelvens/latex-lt3graph %
% %
diff --git a/Master/texmf-dist/doc/latex/pkgloader/pkgloader.pdf b/Master/texmf-dist/doc/latex/pkgloader/pkgloader.pdf
index f0fd99e7c23..1f587291100 100644
--- a/Master/texmf-dist/doc/latex/pkgloader/pkgloader.pdf
+++ b/Master/texmf-dist/doc/latex/pkgloader/pkgloader.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pkgloader/pkgloader.tex b/Master/texmf-dist/doc/latex/pkgloader/pkgloader.tex
index 5dd3bc0d164..93ffd780806 100644
--- a/Master/texmf-dist/doc/latex/pkgloader/pkgloader.tex
+++ b/Master/texmf-dist/doc/latex/pkgloader/pkgloader.tex
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffalse %%%%
% %
-% Copyright (c) 2014 - Michiel Helvensteijn (www.mhelvens.net) %
+% Copyright (c) 2018 - Michiel Helvensteijn (www.mhelvens.net) %
% %
% https://github.com/mhelvens/latex-pkgloader %
% %
@@ -54,6 +54,9 @@
\changes{0.6.0}{2018/03/24}
{integrates a number of new package loading rules contributed by the community}
+\changes{0.7.0}{2018/04/29}
+ {integrates a number of new package loading rules contributed by the community}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document} %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-cls-pkg.sty b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-cls-pkg.sty
index 695921beb88..2849c8098e7 100644
--- a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-cls-pkg.sty
+++ b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-cls-pkg.sty
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffalse %%%%
% %
-% Copyright (c) 2014 - Michiel Helvensteijn (www.mhelvens.net) %
+% Copyright (c) 2018 - Michiel Helvensteijn (www.mhelvens.net) %
% %
% https://github.com/mhelvens/latex-pkgloader %
% %
diff --git a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-dry.sty b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-dry.sty
index 2ae2efce3e8..ea2b6f55576 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) 2014 - Michiel Helvensteijn (www.mhelvens.net) %
+% Copyright (c) 2018 - Michiel Helvensteijn (www.mhelvens.net) %
% %
% https://github.com/mhelvens/latex-lt3graph %
% %
diff --git a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-early.sty b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-early.sty
index c698a494835..b374a123733 100644
--- a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-early.sty
+++ b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-early.sty
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffalse %%%%
% %
-% Copyright (c) 2014 - Michiel Helvensteijn (www.mhelvens.net) %
+% Copyright (c) 2018 - Michiel Helvensteijn (www.mhelvens.net) %
% %
% https://github.com/mhelvens/latex-pkgloader %
% %
diff --git a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-error.sty b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-error.sty
index cb626e7d2aa..7ec796ef6e5 100644
--- a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-error.sty
+++ b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-error.sty
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffalse %%%%
% %
-% Copyright (c) 2014 - Michiel Helvensteijn (www.mhelvens.net) %
+% Copyright (c) 2018 - Michiel Helvensteijn (www.mhelvens.net) %
% %
% https://github.com/mhelvens/latex-pkgloader %
% %
diff --git a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-false.sty b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-false.sty
index ad55557ff2d..d83e5808d1f 100644
--- a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-false.sty
+++ b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-false.sty
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffalse %%%%
% %
-% Copyright (c) 2014 - Michiel Helvensteijn (www.mhelvens.net) %
+% Copyright (c) 2018 - Michiel Helvensteijn (www.mhelvens.net) %
% %
% https://github.com/mhelvens/latex-pkgloader %
% %
diff --git a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-late.sty b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-late.sty
index 745a4e9aac5..601196a6b9f 100644
--- a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-late.sty
+++ b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-late.sty
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffalse %%%%
% %
-% Copyright (c) 2014 - Michiel Helvensteijn (www.mhelvens.net) %
+% Copyright (c) 2018 - Michiel Helvensteijn (www.mhelvens.net) %
% %
% https://github.com/mhelvens/latex-pkgloader %
% %
diff --git a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-recommended.sty b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-recommended.sty
index 6c487fefa0a..db98c07cd44 100644
--- a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-recommended.sty
+++ b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-recommended.sty
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffalse %%%%
% %
-% Copyright (c) 2014 - Michiel Helvensteijn (www.mhelvens.net) %
+% Copyright (c) 2018 - Michiel Helvensteijn (www.mhelvens.net) %
% %
% https://github.com/mhelvens/latex-pkgloader %
% %
@@ -175,7 +175,6 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% A list of recommended rules derived from
@@ -243,3 +242,33 @@
% \end{macrocode}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% A list of recommended rules derived from
+% <http://texdoc.net/pkg/microtype> (v2.7a, page 23):
+%
+% \begin{macrocode}
+\Load {babel} before {microtype}
+ if loaded
+ because {microtype can use the language setting of babel}
+% \end{macrocode}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% A list of recommended rules extracted from:
+% <http://texdoc.net/pkg/uri> (section 2) and uses of
+% |\@ifpackageloaded| and |\RequirePackage| in |uri.sty|:
+%
+% \begin{macrocode}
+\Load {hyperref} before {uri}
+ if loaded
+ because {uri uses hyperref's commands if hyperref is loaded}
+\Load {url} before {uri}
+ if loaded
+ because {uri has a RequirePackage on url}
+% \end{macrocode}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-true.sty b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-true.sty
index 2db6b108209..b949a504a42 100644
--- a/Master/texmf-dist/tex/latex/pkgloader/pkgloader-true.sty
+++ b/Master/texmf-dist/tex/latex/pkgloader/pkgloader-true.sty
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffalse %%%%
% %
-% Copyright (c) 2014 - Michiel Helvensteijn (www.mhelvens.net) %
+% Copyright (c) 2018 - Michiel Helvensteijn (www.mhelvens.net) %
% %
% https://github.com/mhelvens/latex-pkgloader %
% %
diff --git a/Master/texmf-dist/tex/latex/pkgloader/pkgloader.sty b/Master/texmf-dist/tex/latex/pkgloader/pkgloader.sty
index 531f862b339..66b1613e0d7 100644
--- a/Master/texmf-dist/tex/latex/pkgloader/pkgloader.sty
+++ b/Master/texmf-dist/tex/latex/pkgloader/pkgloader.sty
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffalse %%%%
% %
-% Copyright (c) 2014 - Michiel Helvensteijn (www.mhelvens.net) %
+% Copyright (c) 2018 - Michiel Helvensteijn (www.mhelvens.net) %
% %
% https://github.com/mhelvens/latex-pkgloader %
% %
@@ -48,7 +48,7 @@
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\ProvidesExplPackage{pkgloader}{2018/03/24}{0.6.0}
+\ProvidesExplPackage{pkgloader}{2018/04/29}{0.7.0}
{managing the options and loading order of LaTeX packages}
% \end{macrocode}
%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 3846e0d738a..cc9e29dbf5e 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -794,6 +794,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'newsletr', "&MAKEnewsletr",
'newthm', "die 'skipping, obsolete, no longer on ctan'",
'newtxsf', "&MAKEflatten",
+ 'nexus-otf', "die 'skipping, font is likely nonfree?'",
'niceframe-type1', "&MAKEflatten",
'nlatexdb', "die 'skipping, C#/.NET'",
'nohyph', "die 'skipping, nohyph must be done by hand'",