X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fchkconfig.ltx;h=3e992653cf433e0d6833a9343ce41fe2673562d6;hb=2e66a01e8ff46086bf0f64381201b1cf55e473c1;hp=dbdf6d6e3db89bfedcbac4162dcd2389ccea6149;hpb=50b65ca806e62f76738a364af6b948d92863aefa;p=lyx.git

diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index dbdf6d6e3d..3e992653cf 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -1,5 +1,5 @@
 % This is chkconfig.ltx, a script which tries to autodetect and
-%    document your LaTeX configuration. 
+%    document your LaTeX configuration.
 % Author: Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr)
 % with minimal changes by Asger Alstrup (alstrup@diku.dk).
 %
@@ -12,13 +12,13 @@
 %%% If you want to add new packages/documentclasses 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 chklatex.ltx :-)
+%%% LaTeX code below to help improving chkconfig.ltx :-)
 %%%
 %%% If you want to add the new package <name>, all you need most of
-%%% the times is a two-steps work: 
+%%% the times is a two-steps work:
 %%% 1- Add the command \TestPackage{<name>}. The syntax is:
 %%%    \TestPackage[<file>]{<name>}, which  tests whether <name>.sty
-%%%    (or <file>, if this optional parameter is provided) exists. 
+%%%    (or <file>, if this optional parameter is provided) exists.
 %%% 2- Add a description for <name> in doc/LyXConfig.lyx.in,
 %%%    containing in particular a line like
 %%%         Found   @chk_<name>@
@@ -54,14 +54,14 @@
 %      need to use this directly, since the configure script generates
 %      the needed macro calls automatically.
 %    \TestPackage[<file>]{<name>} tests whether <name>.sty (or <file>,
-%      if it is provided) exists. 
+%      if it is provided) exists.
 %   Both commands call \AddVariable to give value 'yes' or 'no' to
-%   the variable chk_<name>.  
+%   the variable chk_<name>.
 %%%
 \newcommand{\prefix}{+} % the character used by grep to filter 'good' output
-\newcommand{\AddLayout}[3][\default]{
+\newcommand{\AddLayout}[4][\default]{
   \def\default{#2}
-  \immediate\write\layouts{"#2"   "#1"   "#3"}}
+  \immediate\write\layouts{"#2"   "#1"   "#3"   "#4"}}
 \newcommand{\AddVariable}[2]{
   \immediate\write\sed{s!@chk_#1@!#2!g}
   \immediate\write\vars{chk_#1='#2'}}
@@ -102,20 +102,22 @@
         \catcode`\#=9  % consider # as a space
         \input{layouts/#1.layout}  % read the layout file
       \egroup
-      \global\@namedef{layout@#1}{}} 
+      \global\@namedef{layout@#1}{}}
      {} % we have already tried this one.
 }
 \newcommand{\DeclareLaTeXClass}[2][\default]{
   \TestItem[#1]{\layoutname}{document class}{cls}
-           {\AddLayout[\firstelement]{\layoutname}{#2}}{}
+           {\AddLayout[\firstelement]{\layoutname}{#2}{true}}
+           {\AddLayout[\firstelement]{\layoutname}{#2}{false}}
   \expandafter\endinput
 }
 \newcommand{\DeclareLinuxDocClass}[2][\default]{
   \message{^^J\prefix checking for linuxdoc class \layoutname... }
   \@ifundefined{haslinuxdoc}
-    {\message{no^^J}}
+    {\message{no^^J}
+     \AddLayout[#1]{\layoutname}{#2}{false}}
     {\message{yes^^J}
-     \AddLayout[#1]{\layoutname}{#2}}
+     \AddLayout[#1]{\layoutname}{#2}{true}}
   \expandafter\endinput
 }
 % Only for compatibility. Will be removed later.
@@ -124,9 +126,10 @@
 \newcommand{\DeclareDocBookClass}[2][\default]{
   \message{^^J\prefix checking for docbook\space\space class \layoutname... }
   \@ifundefined{hasdocbook}
-    {\message{no^^J}}
+    {\message{no^^J}
+     \AddLayout[#1]{\layoutname}{#2}{false}}
     {\message{yes^^J}
-     \AddLayout[#1]{\layoutname}{#2}}
+     \AddLayout[#1]{\layoutname}{#2}{true}}
   \expandafter\endinput
 }
 
@@ -225,24 +228,25 @@
 \TestPackage{varioref}
 \TestPackage{prettyref}
 \TestPackage{natbib}
+\TestPackage{dvipost}
 
 % The test for the graphics package is slightly more involved...
 \newcommand\groption{dvips}
-\TestItem{graphics}{package}{sty}
+\TestItem{graphicx}{package}{sty}
 %  Let's do some clever things to guess the default driver for the
-%  graphics package. The maintainer of the site might have declared it
+%  graphicx package. The maintainer of the site might have declared it
 %  in the file 'graphics.cfg'. Let's hope there are no strange commands
 %  in there...
   {\renewcommand\ExecuteOptions[1]{\renewcommand\groption{default}}
    \InputIfFileExists{graphics.cfg}{}{}
-   \AddPackage{graphics}}
+   \AddPackage{graphicx}}
   {\renewcommand{\groption}{none}}
 \message{^^J\prefix checking for graphics driver... \groption^^J}
 \AddVariable{graphicsdriver}{\groption}
 
 % psnfss is in fact the name of a set of style files, among which
 % times.sty. If times.sty is here, we will assume that everything is
-% fine. 
+% fine.
 \TestPackage[times.sty]{psnfss}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -255,6 +259,6 @@
 \immediate\closeout\vars
 \immediate\closeout\packages
 \typeout{\prefix Inspection done.}
-\typeout{\prefix Read the file doc/LyXConfig.lyx for more information.}
+\typeout{\prefix Read the file doc/LaTeXConfig.lyx for more information.}
 % Get the real \end command, that has been hidden by LaTeX
 \@@end