X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fchkconfig.ltx;h=004ffa7ed9e1f2fe7b0910fcf61820454fd815b7;hb=d896682aa2f91363dff6fb5c959234f55a29d60f;hp=2ab3adcd57afb36a214883048f8e0e29b6afece3;hpb=26b3fc9a020248ece60b3c0431a0ed924f3d01b5;p=lyx.git diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx index 2ab3adcd57..004ffa7ed9 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,22 +12,26 @@ %%% 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: +%%% 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, +%%% (or , if this optional parameter is provided) exists. +%%% 2- Add a description for in doc/LaTeXConfig.lyx, %%% containing in particular a line like -%%% Found @chk_@ -%%% This line will be replaced at configure time by the proper text. +%%% Found: [InsetInfo] +%%% where [InsetInfo] is obtained by entering in the minibuffer (Alt+X) +%%% info-insert package +%%% This inset will automatically display a boxed "yes" or "no" +%%% depending on the availability of the package. %%% %%% 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. +%%% LaTeXConfig.lyx, as described above but using +%%% "info-insert textclass " instead of "info-insert package ". %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%% Initialization part (skip) %%%%%%%%%%%%%%%%%%%%% @@ -35,63 +39,65 @@ % we do not want to stop on errors \nonstopmode\makeatletter -% Have we been called from the configure script? -\ifx\srcdir\undefined - \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 %%% Some useful macros. % Several commands are defined to test for packages: % \AddLayout{} adds an entry for in textclass.lst % \AddVariable{}{} creates a new variable chk_, % and gives it the value . -% \TestDocClass[]{} tests whether .cls (or , -% if it is provided) exists and creates a new entry with -% \AddLayout if this is the case. Note that you will probably not -% need to use this directly, since the configure script generates -% the needed macro calls automatically. +% \TestDocClass{}{} if layout has not already +% been tested for, execute . Note that you will +% probably not need to use this directly, since the configure +% script generates the needed macro calls automatically. % \TestPackage[]{} tests whether .sty (or , -% if it is provided) exists. +% if it is provided) exists. % Both commands call \AddVariable to give value 'yes' or 'no' to -% the variable chk_. +% 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}[5][\default]{ + \def\default{#2} + \immediate\write\layouts{"#2" "#1" "#3" "#4" "#5"}} + \newcommand{\AddVariable}[2]{ - \immediate\write\sed{s!@chk_#1@!#2!g} \immediate\write\vars{chk_#1='#2'}} + \newcommand{\AddPackage}[1]{ \immediate\write\packages{#1}} + % Tests whether an item is present -% Syntax: \TestItem{}{}{}{}{}{} +% 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 + \let\missingelements\empty \existstrue \@for\file:=\files\do{ \ifx\firstelement\relax \edef\firstelement{\file} \fi - \IfFileExists{\file} + \@expandtwoargs\in@{.}{\file} + \ifin@ + \def\myfile{\file} + \else + \def\myfile{\file.#4} + \fi + \IfFileExists{\myfile} {} - {\IfFileExists{\file.#4}{}{\existsfalse}} + { + \existsfalse + \ifx\missingelements\empty + \edef\missingelements{\myfile} + \else + \edef\missingelements{\missingelements,\myfile} + \fi + } } \ifexists \message{yes^^J} @@ -102,41 +108,34 @@ \AddVariable{#2}{no} #6 \fi} -\newcommand{\TestPackage}[2][=]{ - \TestItem{#1}{#2}{package}{sty}{\AddPackage{#2}}{}} -\newcommand{\TestDocClass}[1]{ + +\newcommand{\TestPackage}[2][\default]{ + \TestItem[#1]{#2}{package}{sty}{\AddPackage{#2}}{}} + +\newcommand{\TestDocClass}[2]{ \def\layoutname{#1} % remember the name of the layout file \@ifundefined{layout@#1} - {\bgroup - \catcode`\#=9 % consider # as a space - \input{layouts/#1.layout} % read the layout file - \egroup - \global\@namedef{layout@#1}{}} + {#2 % execute the command + \global\@namedef{layout@#1}{}} {} % we have already tried this one. } -\newcommand{\DeclareLaTeXClass}[2][=]{ - \TestItem{#1}{\layoutname}{document class}{cls} - {\AddLayout[\firstelement]{\layoutname}{#2}}{} - \expandafter\endinput -} -\newcommand{\DeclareLinuxDocClass}[2][=]{ - \message{^^J\prefix checking for linuxdoc class \layoutname... } - \@ifundefined{haslinuxdoc} - {\message{no^^J}} - {\message{yes^^J} - \AddLayout[#1]{\layoutname}{#2}} - \expandafter\endinput + +\newcommand{\DeclareLaTeXClass}[2][\default]{ + \TestItem[#1]{\layoutname}{document class}{cls} + {\AddLayout[\firstelement]{\layoutname}{#2}{true}{\missingelements}} + {\AddLayout[\firstelement]{\layoutname}{#2}{false}{\missingelements}} } + % 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}} + {\message{no^^J} + \AddLayout[#1]{\layoutname}{#2}{false}{docbook}} {\message{yes^^J} - \AddLayout[#1]{\layoutname}{#2}} - \expandafter\endinput + \AddLayout[#1]{\layoutname}{#2}{true}{}} } % Stolen from article.cls @@ -147,10 +146,9 @@ % Initializes the files \typeout{\prefix Inspecting your LaTeX configuration.} -\newwrite{\layouts} \immediate\openout \layouts = textclass.lst -\newwrite{\sed} \immediate\openout \sed = chkconfig.sed +\newwrite{\layouts} \immediate\openout \layouts = textclass.lst.tmp \newwrite{\vars} \immediate\openout \vars = chkconfig.vars -\newwrite{\packages} \immediate\openout \packages = packages.lst +\newwrite{\packages} \immediate\openout \packages = packages.lst.tmp \immediate\write\layouts{% # This file declares layouts and their associated definition files.^^J% @@ -172,6 +170,32 @@ \message{^^J\prefix checking for LaTeX version... \fmtversion} \AddVariable{fmtversion}{\fmtversion} +%%% And now, the list of available languages +% The trick is to know that \the\everyjob contains something like +% \typeout{LaTeX2e <2001/06/01>} +% \typeout{Babel and hyphenation patterns for american, french, german, ngerman, nohyphenation, loaded.} +% All we have to do is to extract the list from there: +% (1) concatenate all the messages that are displayed everytime the +% format is loaded. The is done by redefining locally \typeout to +% append its argument to the macro \mesg. +\def\mesg{} +{\def\typeout#1{\xdef\mesg{\mesg #1}} + \the\everyjob} + +% (2) strip the useless parts from \mesg. This uses the fact that TeX +% allows to define macros with parameters delimited by arbitrary text. +\def\platexname{pLaTeX2e} +\ifx\pfmtname\platexname + \def\langs{japanese} +\else + \def\strip#1patterns for #2, loaded.#3\endmark{\def\langs{#2}} + \expandafter\strip\mesg\endmark +\fi + +% (3) handle the result +\message{^^J\prefix checking for available hyphenation patterns... \langs} +\AddVariable{languages}{\langs} + %%% Check for ec fonts. Most of this code has been shamelessely stolen %%% from the file ltxcheck.tex in the LaTeX distribution. In particular, %%% don't ask me how the macro \ecrm works... @@ -188,6 +212,7 @@ \message{^^J\prefix checking for default encoding (this may take a long time)^^J} \font\test=ecrm1000\relax + \ifx\test\nullfont \message{^^J\prefix\prefix checking for ec fonts... no^^J} \AddVariable{ec}{no} @@ -198,12 +223,11 @@ \ecrm \ifin@ \message{yes^^J} - \AddVariable{ec}{yes} + \AddPackage{ec} \AddVariable{fontenc}{T1} - \message{^^J \prefix\space\space default encoding will be set to T1^^J} + \message{^^J\prefix\space\space default encoding will be set to T1^^J} \else \message{no^^J} - \AddVariable{ec}{no} \AddVariable{fontenc}{default} \fi \fi @@ -213,42 +237,95 @@ % The list of layout files has been put in this file here by the % configure script. \input{chklayouts} +\input{chkmodules} %%% Packages -\TestPackage{a4} -\TestPackage{a4wide} +\TestPackage{accents} +\TestPackage{algorithm} +\TestPackage{amstext} +\TestPackage{array} \TestPackage{babel} +\TestPackage{bibtopic} +\TestPackage{bm} +\TestPackage{booktabs} +\TestPackage{braille} +\TestPackage{CJKutf8} \TestPackage{color} % this one should be there if graphics.sty is there. +\TestPackage{covington} +\TestPackage{csquotes} +\TestPackage{dvipost} +\TestPackage{endnotes} +\TestPackage{enumitem} +\TestPackage{esint} +\TestPackage{ifsym} +\TestPackage{ifthen} +\TestPackage{fancybox} \TestPackage{fancyhdr} -\TestPackage{floatflt} -\TestPackage{setspace} -\TestPackage{subfigure} +\TestPackage{framed} \TestPackage{geometry} +\TestPackage{graphicx} +\TestPackage{hyperref} +\TestPackage[japanese.ldf]{japanese} +\TestPackage{jurabib} +\TestPackage{latex8} +\TestPackage{lettrine} +\TestPackage{listings} \TestPackage{longtable} -\TestPackage{algorithm} +\TestPackage{mathdots} +\TestPackage{mhchem} +\TestPackage{natbib} +\TestPackage{nicefrac} +\TestPackage{nomencl} +\TestPackage{pdfcolmk} +\TestPackage{pdfpages} +\TestPackage{prettyref} +\TestPackage{preview} \TestPackage{rotating} -\TestPackage{latex8} +\TestPackage{rotfloat} +\TestPackage{setspace} +\TestPackage{slashed} +\TestPackage{soul} +\TestPackage{splitidx} +\TestPackage{subfig} +\TestPackage{Sweave} +\TestPackage{textcomp} +\TestPackage{ulem} +\TestPackage{units} \TestPackage{url} - -% The test for the graphics package is slightly more involved... -\newcommand\groption{dvips} -\TestItem={graphics}{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 -% 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}} - {\renewcommand{\groption}{none}} -\message{^^J\prefix checking for graphics driver... \groption^^J} -\AddVariable{graphicsdriver}{\groption} +\TestPackage{varioref} +\TestPackage{wrapfig} +\TestPackage{xargs} +\TestPackage{xcolor} % 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. +% times.sty. If times.sty is here, we will assume that everything is fine. \TestPackage[times.sty]{psnfss} +% test the following fonts in case they are not in all versions of psnfss +\TestPackage{avant} +\TestPackage{bookman} +\TestPackage{chancery} +\TestPackage{charter} +\TestPackage{courier} +\TestPackage{helvet} +\TestPackage{mathpazo} +\TestPackage{mathpple} +\TestPackage{mathptm} +\TestPackage{mathptmx} +\TestPackage{newcent} +\TestPackage{pifont} +\TestPackage{utopia} +% Other font packages +\TestPackage{ae} +\TestPackage{bera} +\TestPackage{ccfonts} +\TestPackage{cmbright} +\TestPackage{eco} +\TestPackage{fourier} +\TestPackage{lmodern} +\TestPackage{luximono} +\TestPackage{tipa} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%% END ACTUAL CONFIGURATION INSPECTION CODE %%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -256,10 +333,10 @@ % End of the LaTeX job \immediate\closeout\layouts -\immediate\closeout\sed \immediate\closeout\vars \immediate\closeout\packages \typeout{\prefix Inspection done.} \typeout{\prefix Read the file doc/LaTeXConfig.lyx for more information.} + % Get the real \end command, that has been hidden by LaTeX \@@end