X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fchkconfig.ltx;h=141aba9b46770e6559732d6666c4a5d962293fe5;hb=e43295640e953fa51d7008587cde5243bfda0ef5;hp=eac93e2ea749cc1f0cfa456c6219ad27a58b66d5;hpb=e9ca6b6bf48b23559384e1108e01df68a9ee18b6;p=lyx.git

diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index eac93e2ea7..141aba9b46 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -9,7 +9,7 @@
 % This script is in fact a complete rewrite of the original chkconfig
 % script. Expect bugs.
 
-%%% If you want to add new packages/documentclasses to be recognized,
+%%% If you want to add new packages/document classes to be recognized,
 %%% read the explanation that follow and jump to the section 'Actual
 %%% inspection code' below. You do not need to understand the ugly
 %%% LaTeX code below to help improving chkconfig.ltx :-)
@@ -27,6 +27,9 @@
 %%%    This inset will automatically display a boxed "yes" or "no"
 %%%    depending on the availability of the package.
 %%%
+%%% Since \TestPackage does not find font metric (tfm) files, there's an
+%%% additional test \TestFont[<file>]{<name>} for this purpose.
+%%%
 %%% For document classes, things are even simpler, since you do not
 %%% need to edit this file. Just put your layout file in some place
 %%% where LyX can find it and add if you wish a description in
@@ -51,7 +54,9 @@
 %      script generates the needed macro calls automatically.
 %    \TestPackage[<file>]{<name>} tests whether <name>.sty (or <file>,
 %      if it is provided) exists.
-%   Both commands call \AddVariable to give value 'yes' or 'no' to
+%    \TestFont[<file>]{<name>} test whether <name>.tfm (or <file>.tfm,
+%      if provided) exists.
+%   These three commands call \AddVariable to give value 'yes' or 'no' to
 %   the variable chk_<name>.
 %%%
 
@@ -59,7 +64,13 @@
 
 \newcommand{\AddLayout}[5][\default]{
   \def\default{#2}
-  \immediate\write\layouts{"#2"   "#1"   "#3"   "#4"   "#5"}}
+  \@ifundefined{category@#2}{%
+       \immediate\write\layouts{"#2"   "#1"   "#3"   "#4"   "#5"   ""}%
+   }{%
+       \immediate\write\layouts{"#2"   "#1"   "#3"   "#4"   "#5"   "\@nameuse{category@#2}"}%
+   }
+}
+       
 
 \newcommand{\AddVariable}[2]{
   \immediate\write\vars{chk_#1='#2'}}
@@ -109,6 +120,23 @@
     #6
   \fi}
 
+% Adapted from ltxcheck.tex
+\newcommand{\TestFont}[2][\default]{
+  \def\default{#2}
+  \batchmode
+  \font\test=#1\relax
+  \nonstopmode
+  \message{^^J\prefix checking for font #2 [#1]...}
+  \ifx\test\nullfont
+    \message{no^^J}
+    \AddVariable{#2}{no}
+    \@tempswatrue
+  \else
+    \message{yes^^J}
+    \AddVariable{#2}{yes}
+    \AddPackage{#2}
+  \fi}
+
 \newcommand{\TestPackage}[2][\default]{
   \TestItem[#1]{#2}{package}{sty}{\AddPackage{#2}}{}}
 
@@ -126,6 +154,12 @@
            {\AddLayout[\firstelement]{\layoutname}{#2}{false}{\missingelements}}
 }
 
+\newcommand{\DeclareCategory}[2]{
+   \@ifundefined{category@#1}
+     {\global\@namedef{category@#1}{#2}}%
+     {}% we have already defined this one.
+}
+
 % Only for compatibility. Will be removed later.
 \let\DeclareSGMLClass=\DeclareDocBookClass
 
@@ -314,6 +348,7 @@
 \TestPackage[turkmen.ldf]{turkmen}
 \TestPackage{ulem}
 \TestPackage{undertilde}
+\TestPackage{unicode-math}
 \TestPackage{units}
 \TestPackage{url}
 \TestPackage{varioref}
@@ -354,12 +389,15 @@
 % Other font packages
 \TestPackage{ae}
 \TestPackage{bera}
+\TestPackage{biolinum-type1}
 \TestPackage{ccfonts}
 \TestPackage{cmbright}
 \TestPackage{eco}
+\TestPackage{eulervm}
 \TestPackage{feyn}
 \TestPackage{fourier}
 \TestPackage{libertine}
+\TestPackage{libertine-type1}
 \TestPackage{lmodern}
 \TestPackage{luximono}
 \TestPackage{mathdesign}% For Roman fonts
@@ -367,6 +405,8 @@
 \TestPackage{mdput}
 \TestPackage{mdugm}
 \TestPackage{MinionPro}
+\TestFont[rzmnr]{minion2newtx}
+\TestPackage{newtxmath}
 \TestPackage{tgadventor}
 \TestPackage{tgbonum}
 \TestPackage{tgchorus}