From 3e6966522504220eb57e75ae20f2e68b9046b5c8 Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sat, 30 Jan 2021 14:00:20 +0100
Subject: [PATCH] Improve \TestPackageVersion

No need to load packages manually
---
 lib/chkconfig.ltx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 3c0f0517fe..35128877c5 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -122,9 +122,14 @@
 
 % Tests whether an package is present in a specific version (or newer)
 % Syntax: \TestPackageVersion{<name>}{<yyyy/mm/dd>}
-% Note: This requires the package to be loaded first
 
 \newcommand{\TestPackageVersion}[2]{
+   % The actual test only works if the package has been loaded before
+   \IfFileExists{#1.sty}{\RequirePackage{#1}}{}
+   \@TestPackageVersion{#1}{#2}
+}
+
+\newcommand{\@TestPackageVersion}[2]{
   \message{^^J\prefix checking for package #1 at least as of #2...}
   \IfFileExists{#1.sty}
   {
@@ -575,11 +580,8 @@
 %\TestPackage{mathdesign}% But see above!
 
 %%% Specific package versions
-% This only works if the package has been loaded before
-\IfFileExists{babel.sty}{\RequirePackage{babel}}{}
 % This introduces \babelfonts
 \TestPackageVersion{babel}{2017/11/03}
-\IfFileExists{multirow.sty}{\RequirePackage{multirow}}{}
 % This introduces multiple paragraphs in multirows
 \TestPackageVersion{multirow}{2021/01/29}