tex2lyx: Also factor out error and debug messages

[lyx.git] / lib / chkconfig.ltx

diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 35128877c55753c8bca9fe6f92bbac52fa15ced5..d7c161c2ee1e69c6a218aeab57e1a511d051927f 100644 (file)
--- 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,48 +120,19 @@
     #6
   \fi}
 
-% Tests whether an package is present in a specific version (or newer)
-% Syntax: \TestPackageVersion{<name>}{<yyyy/mm/dd>}
-
-\newcommand{\TestPackageVersion}[2]{
-   % The actual test only works if the package has been loaded before
-   \IfFileExists{#1.sty}{\RequirePackage{#1}}{}
-   \@TestPackageVersion{#1}{#2}
+% 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}}{}
 }
 
-\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}
-
-
 % Adapted from ltxcheck.tex
 \newcommand{\TestFont}[2][\default]{
   \def\default{#2}
@@ -180,6 +151,7 @@
   \fi}
 
 \newcommand{\TestPackage}[2][\default]{
+  \def\default{#2}
   \TestItem[#1]{#2}{package}{sty}{\AddPackage{#2}}{}}
 
 \newcommand{\TestDocClass}[2]{
@@ -234,12 +206,8 @@
 \message{^^J\prefix checking for LaTeX version... \fmtversion}
 \AddVariable{fmtversion}{\fmtversion}
 
-%%% Crucial versions
-% This one introduces path encoding changes
-\TestLaTeXVersion{2019/10/01}
-% This introduces all math and text spaces
-% previously only available via amsmath
-\TestLaTeXVersion{2020/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
@@ -324,7 +292,7 @@
 \TestPackage{array}
 \TestPackage{astron}
 \TestPackage{authordate1-4}
-\TestPackage{babel}
+\TestPackageAddVersion{babel}
 \TestPackage{beamerposter}
 \TestPackage{biblatex}
 \TestPackage{biblatex-chicago}
@@ -373,7 +341,7 @@
 \TestPackage[iso-8859-7.def]{greek-inputenc}
 \TestPackage{harvard}
 \TestPackage{hhline}
-\TestPackage{hyperref}
+\TestPackageAddVersion{hyperref}
 \TestPackage{hyphenat}
 \TestPackage{iftex}
 \TestPackage{ifthen}
@@ -395,7 +363,7 @@
 \TestPackage{mhchem}
 \TestPackage[mongolian.ldf]{mongolian}
 \TestPackage{mslapa}
-\TestPackage{multirow}
+\TestPackageAddVersion{multirow}
 \TestPackage{named}
 \TestPackage{natbib}
 \TestPackage{nicefrac}
@@ -433,6 +401,7 @@
 \TestPackage{thswitch}
 \TestPackage{tikz}
 \TestPackage[turkmen.ldf]{turkmen}
+\TestPackageAddVersion{ucs}
 \TestPackage{ulem}
 \TestPackage{undertilde}
 \TestPackage{unicode-math}
@@ -579,12 +548,6 @@
 %\TestPackage{mathabx}
 %\TestPackage{mathdesign}% But see above!
 
-%%% Specific package versions
-% This introduces \babelfonts
-\TestPackageVersion{babel}{2017/11/03}
-% This introduces multiple paragraphs in multirows
-\TestPackageVersion{multirow}{2021/01/29}
-
 %%% Document classes
 % The list of layout files has been put in this file here by the
 % configure script.