X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fchkconfig.ltx;h=6480354a69492ea92cfc9b236e85c98f791b2aca;hb=dab43e77955e5b21fa556f53143d42e09e439f40;hp=2ab3adcd57afb36a214883048f8e0e29b6afece3;hpb=26b3fc9a020248ece60b3c0431a0ed924f3d01b5;p=lyx.git diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx index 2ab3adcd57..6480354a69 100644 --- a/lib/chkconfig.ltx +++ b/lib/chkconfig.ltx @@ -4,7 +4,7 @@ % with minimal changes by Asger Alstrup (alstrup@diku.dk). % % This script should only be run from the configure script to update -% the files textclass.lst and doc/LaTeXConfig.lyx +% the files textclass.lst and doc/LyXConfig.lyx % % This script is in fact a complete rewrite of the original chkconfig % script. Expect bugs. @@ -12,14 +12,14 @@ %%% 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 , all you need most of %%% the times is a two-steps work: %%% 1- Add the command \TestPackage{}. The syntax is: %%% \TestPackage[]{}, which tests whether .sty %%% (or , if this optional parameter is provided) exists. -%%% 2- Add a description for in doc/LaTeXConfig.lyx.in, +%%% 2- Add a description for in doc/LyXConfig.lyx.in, %%% containing in particular a line like %%% Found @chk_@ %%% This line will be replaced at configure time by the proper text. @@ -27,7 +27,7 @@ %%% 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 -%%% LaTeXConfig.lyx.in, as described above. +%%% LyXConfig.lyx.in, as described above. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%% Initialization part (skip) %%%%%%%%%%%%%%%%%%%%% @@ -36,14 +36,12 @@ % we do not want to stop on errors \nonstopmode\makeatletter % Have we been called from the configure script? -\ifx\srcdir\undefined - \message{% +\@ifundefined{srcdir} + {\message{% **** WARNING: For proper results, you should not run this script directly.^^J% **** Please use the `configure' script.^^J} - \newcommand\srcdir{.} -\else - \def\input@path{{\srcdir/}} -\fi + \newcommand\srcdir{.}} + {\def\input@path{{\srcdir/}}} %%% Some useful macros. % Several commands are defined to test for packages: @@ -61,12 +59,9 @@ % the variable chk_. %%% \newcommand{\prefix}{+} % the character used by grep to filter 'good' output -\newcommand{\AddLayout}[3][=]{ - \ifx=#1 - \immediate\write\layouts{"#2" "#2" "#3"} - \else - \immediate\write\layouts{"#2" "#1" "#3"} - \fi} +\newcommand{\AddLayout}[3][\default]{ + \def\default{#2} + \immediate\write\layouts{"#2" "#1" "#3"}} \newcommand{\AddVariable}[2]{ \immediate\write\sed{s!@chk_#1@!#2!g} \immediate\write\vars{chk_#1='#2'}} @@ -75,14 +70,10 @@ % Tests whether an item is present % Syntax: \TestItem{}{}{}{}{}{} \newif\ifexists -\newcommand{\TestItem}[6]{ - \ifx=#1 - \def\files{#2} - \message{^^J\prefix checking for #3 #2 [#2.#4]...} - \else - \def\files{#1} - \message{^^J\prefix checking for #3 #2 [#1]...} - \fi +\newcommand{\TestItem}[6][\default]{ + \def\default{#2} + \def\files{#1} + \message{^^J\prefix checking for #3 #2 [#1]...} \let\firstelement\relax \existstrue \@for\file:=\files\do{ @@ -102,8 +93,8 @@ \AddVariable{#2}{no} #6 \fi} -\newcommand{\TestPackage}[2][=]{ - \TestItem{#1}{#2}{package}{sty}{\AddPackage{#2}}{}} +\newcommand{\TestPackage}[2][\default]{ + \TestItem[#1]{#2}{package}{sty}{\AddPackage{#2}}{}} \newcommand{\TestDocClass}[1]{ \def\layoutname{#1} % remember the name of the layout file \@ifundefined{layout@#1} @@ -114,12 +105,12 @@ \global\@namedef{layout@#1}{}} {} % we have already tried this one. } -\newcommand{\DeclareLaTeXClass}[2][=]{ - \TestItem{#1}{\layoutname}{document class}{cls} +\newcommand{\DeclareLaTeXClass}[2][\default]{ + \TestItem[#1]{\layoutname}{document class}{cls} {\AddLayout[\firstelement]{\layoutname}{#2}}{} \expandafter\endinput } -\newcommand{\DeclareLinuxDocClass}[2][=]{ +\newcommand{\DeclareLinuxDocClass}[2][\default]{ \message{^^J\prefix checking for linuxdoc class \layoutname... } \@ifundefined{haslinuxdoc} {\message{no^^J}} @@ -130,7 +121,7 @@ % Only for compatibility. Will be removed later. \let\DeclareSGMLClass=\DeclareDocBookClass -\newcommand{\DeclareDocBookClass}[2][=]{ +\newcommand{\DeclareDocBookClass}[2][\default]{ \message{^^J\prefix checking for docbook\space\space class \layoutname... } \@ifundefined{hasdocbook} {\message{no^^J}} @@ -218,6 +209,7 @@ %%% Packages \TestPackage{a4} \TestPackage{a4wide} +\TestPackage{array} \TestPackage{babel} \TestPackage{color} % this one should be there if graphics.sty is there. \TestPackage{fancyhdr} @@ -230,17 +222,20 @@ \TestPackage{rotating} \TestPackage{latex8} \TestPackage{url} +\TestPackage{varioref} +\TestPackage{prettyref} +\TestPackage{natbib} % 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} @@ -260,6 +255,6 @@ \immediate\closeout\vars \immediate\closeout\packages \typeout{\prefix Inspection done.} -\typeout{\prefix Read the file doc/LaTeXConfig.lyx for more information.} +\typeout{\prefix Read the file doc/LyXConfig.lyx for more information.} % Get the real \end command, that has been hidden by LaTeX \@@end