Implemented several features and fixed several bugs.

mhelvens · May 9, 2014 · 45be959 · 45be959
1 parent 50785e6
commit 45be959
Show file tree

Hide file tree

Showing 13 changed files with 325 additions and 205 deletions.
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 latex-pkgloader
 ===============
 
-LaTeX Package : latex-pkgloader 0.1.0
+LaTeX Package : latex-pkgloader 0.2.0
 
-Last Modified : 2014-01-29
+Last Modified : 2014-05-10
 
 Author        : Michiel Helvensteijn  (www.mhelvens.net)
 

diff --git a/archive b/archive
@@ -14,12 +14,11 @@ FILES="$DOC.sty          \
        $DOC-true.sty            \
        $DOC-false.sty            \
        $DOC-error.sty             \
-       $DOC-recommended.sty        \
-       $DOC-test-rules.sty          \
-       test1.sty test2.sty test3.sty \
+       $DOC-cls-pkg.sty            \
+       $DOC-recommended.sty         \
        README.md"
 
-VERSION=0.1.0
+VERSION=0.2.0
 
 ##################################################
 #

diff --git a/pkgloader-test-rules.sty → pkgloader-cls-pkg.sty b/pkgloader-test-rules.sty → pkgloader-cls-pkg.sty
@@ -11,12 +11,14 @@
 %  and version 1.3 or later is part of all distributions of LaTeX              %
 %  version 2005/12/01 or later.                                                %
 %                                                                              %
-%  This work has the LPPL maintenance status `author-maintained'.              %
+%  This work has the LPPL maintenance status `maintained'.                     %
 %                                                                              %
 %  The Current Maintainer of this work is Michiel Helvensteijn.                %
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \fi %%%%
-
-
-\Load [option=true] {test2} if {test1} before {test1}
-\Load               error   if {test1 && test3} because {I don't like this combination}
+%                                                       %
+%  This file is always loaded before the '\usepackage'  %
+%  requested packages and after all classes. It's       %
+%  really just a stub in the dependency graph.          %
+%                                                       %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/pkgloader-error.sty b/pkgloader-error.sty
@@ -45,12 +45,12 @@
 %%% package combination is illegal. None of them are
 %%% critical or fatal errors; we terminate the run manually.
 %
-\int_step_inline:nnvn {1} {1} {g__pkgloader_count_(pkgloader-error)_int} {
-	\bool_if:cT {g__pkgloader_used_(pkgloader-error)_(#1)_bool} {
+\int_step_inline:nnvn {1} {1} {g__pkgloader_count_(pkgloader-error.sty)_int} {
+	\bool_if:cT {g__pkgloader_used_(pkgloader-error.sty)_(#1)_bool} {
 		\msg_error:nnvv
 			{pkgloader} {illegal-combination}
-			{g__pkgloader_condition_(pkgloader-error)_(#1)_tl}
-			{g__pkgloader_reason_   (pkgloader-error)_(#1)_tl}
+			{g__pkgloader_condition_(pkgloader-error.sty)_(#1)_tl}
+			{g__pkgloader_reason_   (pkgloader-error.sty)_(#1)_tl}
 	}
 }
 

diff --git a/pkgloader-false.sty b/pkgloader-false.sty
@@ -19,6 +19,7 @@
 %                                                          %
 %  This file is never loaded by pkgloader, and that's its  %
 %  only function:  to be 'false' in loading conditions.    %
-%  Basically, it reserves the name 'pkgloader-false'.      %
+%  Basically, the file exists to reserve the name          %
+%  'pkgloader-false'.                                      %
 %                                                          %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/pkgloader-packagedoc.cls b/pkgloader-packagedoc.cls
@@ -108,7 +108,9 @@
 	alsoletter={_,:},
     morekeywords={before,after,late,early,if,
                   error,always,because,loaded},
-	moretexcs={RequirePackage,RequirePackageWithOptions,Load,LoadPackagesNow},
+	moretexcs={RequirePackage,RequirePackageWithOptions,%
+	           LoadClass,LoadClassWithOptions,%
+	           Load,LoadPackagesNow},
 	mathescape,
 	texcsstyle=*\bfseries
 }

diff --git a/pkgloader-recommended.sty b/pkgloader-recommended.sty
@@ -20,6 +20,10 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
+%  This is a preliminary list of recommended rules,
+%  gathered from a number of sources. It should be
+%  expanded.
+%
 %    \begin{macrocode}
 \Load {fixltx2e}  early              always
 \Load {fancyhdr}  before {hyperref}  if loaded

diff --git a/pkgloader-test.tex b/pkgloader-test.tex