From d4832cc656c83308ca1c4f665e585a0757de275a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 26 Nov 2017 23:26:32 +0000 Subject: pkgloader (26nov17) git-svn-id: svn://tug.org/texlive/trunk@45914 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/pkgloader/README | 11 ++++++----- .../doc/latex/pkgloader/pkgloader-packagedoc.cls | 5 +++-- .../texmf-dist/doc/latex/pkgloader/pkgloader.pdf | Bin 455056 -> 469551 bytes .../texmf-dist/doc/latex/pkgloader/pkgloader.tex | 3 +++ .../texmf-dist/tex/latex/pkgloader/pkgloader.sty | 6 +++--- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Master/texmf-dist/doc/latex/pkgloader/README b/Master/texmf-dist/doc/latex/pkgloader/README index a2372711901..368a04625c1 100644 --- a/Master/texmf-dist/doc/latex/pkgloader/README +++ b/Master/texmf-dist/doc/latex/pkgloader/README @@ -1,12 +1,14 @@ latex-pkgloader =============== -LaTeX Package : latex-pkgloader 0.5.0 +LaTeX Package : latex-pkgloader 0.5.1 -Last Modified : 2014-11-30 +Last Modified : 2017-09-20 Author : Michiel Helvensteijn (www.mhelvens.net) +CTAN page : https://www.ctan.org/pkg/pkgloader + Summary ------- @@ -38,12 +40,11 @@ it in a place where your LaTeX distribution can find it. Documentation ------------- -`pkgloader.pdf` is provided directly in the package archive. To -generate the documentation yourself, run LaTeX on pkgloader.tex. +`pkgloader.pdf` is provided directly in the package archive or [via CTAN](http://mirrors.ctan.org/macros/latex/contrib/pkgloader/pkgloader.pdf). +To generate the documentation yourself, run LaTeX on pkgloader.tex. (`pkgloader.tex` does not contain the package code itself; it inputs `pkgloader.sty` directly to document the implementation) - License ------- diff --git a/Master/texmf-dist/doc/latex/pkgloader/pkgloader-packagedoc.cls b/Master/texmf-dist/doc/latex/pkgloader/pkgloader-packagedoc.cls index c1c0997ab31..efc48cf8ba6 100644 --- a/Master/texmf-dist/doc/latex/pkgloader/pkgloader-packagedoc.cls +++ b/Master/texmf-dist/doc/latex/pkgloader/pkgloader-packagedoc.cls @@ -173,6 +173,7 @@ texcsstyle=*\bfseries,% keywordstyle=\bfseries% } +\lstMakeShortInline[style=examplecode]| %%% Setting up example code block @@ -318,7 +319,7 @@ \vskip-1.05\abovedisplayskip% } -\BeforeBeginEnvironment{macrocode}{\vskip.2\abovedisplayskip} +\BeforeBeginEnvironment{macrocode}{\lstDeleteShortInline|\vskip.2\abovedisplayskip} %%% Actually surround 'macrocode' with the frame % @@ -337,7 +338,7 @@ %%% always go back to it after one code block % \interesting -\AfterEndEnvironment{macrocode}{\vskip\belowdisplayskip\interesting\NoIndentAfterThis} +\AfterEndEnvironment{macrocode}{\lstMakeShortInline[style=examplecode]|\vskip\belowdisplayskip\interesting\NoIndentAfterThis} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Argument Specifiers and such % diff --git a/Master/texmf-dist/doc/latex/pkgloader/pkgloader.pdf b/Master/texmf-dist/doc/latex/pkgloader/pkgloader.pdf index 383a6fbcb12..3deb07d166f 100644 Binary files a/Master/texmf-dist/doc/latex/pkgloader/pkgloader.pdf and b/Master/texmf-dist/doc/latex/pkgloader/pkgloader.pdf differ diff --git a/Master/texmf-dist/doc/latex/pkgloader/pkgloader.tex b/Master/texmf-dist/doc/latex/pkgloader/pkgloader.tex index 8f9bb25cb2b..9e14ab93bb9 100644 --- a/Master/texmf-dist/doc/latex/pkgloader/pkgloader.tex +++ b/Master/texmf-dist/doc/latex/pkgloader/pkgloader.tex @@ -48,6 +48,9 @@ \changes{0.5.0}{2014/11/30} {integrates a number of new package loading rules contributed by the community} +\changes{0.5.1}{2017/09/20} + {fixed the package to work aafter \cs_new:Nn was changed to only allow 'N' and 'n' in function signatures (2016/08/20)} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/pkgloader/pkgloader.sty b/Master/texmf-dist/tex/latex/pkgloader/pkgloader.sty index 637fcff7c20..4cd11e35af4 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{527} +% \CheckSum{0} % % \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/11/30}{0.5.0} +\ProvidesExplPackage{pkgloader}{2017/09/20}{0.5.1} {managing the options and loading order of LaTeX packages} % \end{macrocode} % @@ -844,7 +844,7 @@ % filenames from their four character extension: % % \begin{macrocode} -\cs_new:Nn \__pkgloader_strip_extension:f { +\cs_new:Npn \__pkgloader_strip_extension:f #1 { \tl_reverse:f{ \tl_tail:f{\tl_tail:f{\tl_tail:f{\tl_tail:f{ \tl_reverse:n{#1} -- cgit v1.2.3