X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fchkconfig.ltx;h=bde9d59e4b97f435b51e1259e82eda3ce4a29a15;hb=7a79a416b8ab501ec8158afeb4171b5d92094b5e;hp=14230d46741c214d3ab87bc3d107f4e4e16152a2;hpb=dc4823e7590de9891b5f04de298f046fa33f71b0;p=lyx.git

diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 14230d4674..bde9d59e4b 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -75,8 +75,8 @@
 \newcommand{\AddVariable}[2]{
   \immediate\write\vars{chk_#1='#2'}}
 
-\newcommand{\AddPackage}[1]{
-  \immediate\write\packages{#1}}
+\newcommand{\AddPackage}[2][]{
+  \immediate\write\packages{#2 #1}}
 
 % Tests whether an item is present
 % Syntax: \TestItem[<file>]{<name>}{<type>}{<ext>}{<iftrue>}{<iffalse>}
@@ -120,42 +120,18 @@
     #6
   \fi}
 
-% 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]{
-  \message{^^J\prefix checking for package #1 at least as of #2...}
-  \IfFileExists{#1.sty}
-  {
-    \@ifpackagelater{#1}{#2}{\existstrue}{\existsfalse}
-  }
-  {
-    \existsfalse
-  }
-  \ifexists
-    \message{yes^^J}
-    \AddVariable{#1}{yes}
-    \AddPackage{#1-#2}
-  \else
-    \message{no^^J}
-    \AddVariable{#1}{no}
-  \fi}
-
-
-% Test for the LaTeX version
-\newcommand{\TestLaTeXVersion}[1]{
-  \message{^^J\prefix checking for LaTeX version at least as of #1...}
-  \@ifl@t@r\fmtversion{#1}{\existstrue}{\existsfalse}
-  \ifexists
-    \message{yes^^J}
-    \AddVariable{#1}{yes}
-    \AddPackage{LaTeX-#1}
-  \else
-    \message{no^^J}
-    \AddVariable{#1}{no}
-  \fi}
-
+% Tests whether an package is present and also adds the version to the package list
+\newcommand{\TestPackageAddVersion}[2][\default]{
+   \def\default{#2}
+   \def\package@version{}
+   % The actual test only works after the package has been loaded
+   \IfFileExists{#1.sty}{%
+      \RequirePackage{#1}%
+      \protected@edef\package@@version{\csname ver@#1.sty\endcsname}%
+      \protected@edef\package@version{\expandafter\@parse@version\package@@version//00\@nil}%
+   }{}
+   \TestItem[#1]{#2}{package}{sty}{\AddPackage[\package@version]{#2}}{}
+}
 
 % Adapted from ltxcheck.tex
 \newcommand{\TestFont}[2][\default]{
@@ -175,6 +151,7 @@
   \fi}
 
 \newcommand{\TestPackage}[2][\default]{
+  \def\default{#2}
   \TestItem[#1]{#2}{package}{sty}{\AddPackage{#2}}{}}
 
 \newcommand{\TestDocClass}[2]{
@@ -197,18 +174,6 @@
      {}% we have already defined this one.
 }
 
-% Only for compatibility. Will be removed later.
-\let\DeclareSGMLClass=\DeclareDocBookClass
-
-\newcommand{\DeclareDocBookClass}[2][\default]{
-  \message{^^J\prefix checking for docbook\space\space class \layoutname... }
-  \@ifundefined{hasdocbook}
-    {\message{no^^J}
-     \AddLayout[#1]{\layoutname}{#2}{false}{docbook}}
-    {\message{yes^^J}
-     \AddLayout[#1]{\layoutname}{#2}{true}{}}
-}
-
 % Stolen from article.cls
 \newcommand{\today}{\ifcase\month\or
   January\or February\or March\or April\or May\or June\or
@@ -220,6 +185,8 @@
 \newwrite{\layouts} \immediate\openout \layouts = textclass.lst.tmp
 \newwrite{\vars} \immediate\openout \vars = chkconfig.vars
 \newwrite{\packages} \immediate\openout \packages = packages.lst.tmp
+% Version of the packages list
+\immediate\write\packages{!!fileformat 2}
 
 \immediate\write\layouts{%
 # This file declares layouts and their associated definition files.^^J%
@@ -241,9 +208,8 @@
 \message{^^J\prefix checking for LaTeX version... \fmtversion}
 \AddVariable{fmtversion}{\fmtversion}
 
-%%% Crucial versions
-% This one introduces path encoding changes
-\TestLaTeXVersion{2019/10/01}
+%%% Store the current LaTeX version
+\AddPackage[\expandafter\@parse@version\fmtversion//00\@nil]{LaTeX}
 
 %%% And now, the list of available languages
 % The trick is to know that \the\everyjob contains something like
@@ -328,7 +294,7 @@
 \TestPackage{array}
 \TestPackage{astron}
 \TestPackage{authordate1-4}
-\TestPackage{babel}
+\TestPackageAddVersion{babel}
 \TestPackage{beamerposter}
 \TestPackage{biblatex}
 \TestPackage{biblatex-chicago}
@@ -354,7 +320,6 @@
 \TestPackage{csquotes}
 \TestPackage{drs}
 \TestPackage[koi8-r.def]{cyrillic}
-\TestPackage{dvipost}
 \TestPackage{endnotes}
 \TestPackage{enotez}
 \TestPackage{enumitem}
@@ -378,7 +343,7 @@
 \TestPackage[iso-8859-7.def]{greek-inputenc}
 \TestPackage{harvard}
 \TestPackage{hhline}
-\TestPackage{hyperref}
+\TestPackageAddVersion{hyperref}
 \TestPackage{hyphenat}
 \TestPackage{iftex}
 \TestPackage{ifthen}
@@ -400,13 +365,13 @@
 \TestPackage{mhchem}
 \TestPackage[mongolian.ldf]{mongolian}
 \TestPackage{mslapa}
-\TestPackage{multirow}
+\TestPackageAddVersion{multirow}
 \TestPackage{named}
 \TestPackage{natbib}
 \TestPackage{nicefrac}
-\TestPackage{nomencl}
+\TestPackageAddVersion{nomencl}
 \TestPackage{paralist}
-\TestPackage{pdfcolmk}
+\TestPackage{parskip}
 \TestPackage{pdflscape}
 \TestPackage{polyglossia}
 \TestPackage{pdfcomment}
@@ -435,7 +400,9 @@
 \TestPackage{tcolorbox}
 \TestPackage{textcomp}
 \TestPackage{thswitch}
+\TestPackage{tikz}
 \TestPackage[turkmen.ldf]{turkmen}
+\TestPackageAddVersion{ucs}
 \TestPackage{ulem}
 \TestPackage{undertilde}
 \TestPackage{unicode-math}
@@ -530,6 +497,8 @@
 \TestPackage{libertineMono-type1}
 \TestPackage{libertineMono}
 \TestPackage{libertineRoman}
+\TestPackage{libertinus}
+\TestPackage{libertinust1math}
 \TestPackage{lmodern}
 \TestPackage{luximono}
 \TestPackage{mathdesign}% for Roman fonts
@@ -580,11 +549,6 @@
 %\TestPackage{mathabx}
 %\TestPackage{mathdesign}% But see above!
 
-%%% Specific package versions
-% This only works if the package has been loaded before
-\IfFileExists{babel.sty}{\RequirePackage{babel}}{}
-\TestPackageVersion{babel}{2017/11/03}
-
 %%% Document classes
 % The list of layout files has been put in this file here by the
 % configure script.