Fix bug 5297

http://bugzilla.lyx.org/show_bug.cgi?id=5297

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26657 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index d439a0a6616c0df0e392ef346992bacb5bcedba5..53cc03585170c5595e4ef8d0844fe76a155c9b96 100644 (file)
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -21,13 +21,17 @@
 %%%    (or <file>, if this optional parameter is provided) exists.
 %%% 2- Add a description for <name> in doc/LaTeXConfig.lyx,
 %%%    containing in particular a line like
-%%%         Found   @chk_<name>@
-%%%    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 <name>
+%%%    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, as described above.
+%%% LaTeXConfig.lyx, as described above but using
+%%% "info-insert textclass <name>" instead of "info-insert package <name>".
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%% Initialization part (skip) %%%%%%%%%%%%%%%%%%%%%
@@ -64,7 +68,7 @@
   \immediate\write\packages{#1}}
 
 % Tests whether an item is present
-% Syntax: \TestItem{<file>}{<name>}{<type>}{<ext>}{<iftrue>}{<iffalse>}
+% Syntax: \TestItem[<file>]{<name>}{<type>}{<ext>}{<iftrue>}{<iffalse>}
 \newif\ifexists
 
 \newcommand{\TestItem}[6][\default]{
@@ -205,12 +209,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
@@ -243,6 +246,7 @@
 \TestPackage{fancyhdr}
 \TestPackage{framed}
 \TestPackage{geometry}
+\TestPackage{graphicx}
 \TestPackage{hyperref}
 \TestPackage{jurabib}
 \TestPackage{latex8}
@@ -270,23 +274,6 @@
 \TestPackage{xargs}
 \TestPackage{xcolor}
 
-
-% The test for the graphics package is slightly more involved...
-\newcommand\groption{dvips}
-\TestItem{graphicx}{package}{sty}
-
-%  Let's do some clever things to guess the default driver for the
-%  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{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.

diff --git a/lib/doc/LaTeXConfig.lyx b/lib/doc/LaTeXConfig.lyx
index 5ace94de739cd3c9cb3a35a708ab5eedd1a16106..ee22c63ac904897a30c0071546fc7eb361539376 100644 (file)
--- a/lib/doc/LaTeXConfig.lyx
+++ b/lib/doc/LaTeXConfig.lyx
@@ -1,4 +1,4 @@
-#LyX 1.6.0rc3 created this file. For more info see http://www.lyx.org/
+#LyX 1.6.0svn created this file. For more info see http://www.lyx.org/
 \lyxformat 340
 \begin_document
 \begin_header
@@ -3411,44 +3411,6 @@ ghost
 script
 \family default
  to see them on screen.
- The configuration script has determined that the graphics driver used by
- the package should be 
-\family sans
-
-\begin_inset Quotes eld
-\end_inset
-
-
-\begin_inset Info
-type  "package"
-arg   "graphicsdriver"
-\end_inset
-
-
-\begin_inset Quotes erd
-\end_inset
-
-
-\family default
-
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-Here, a value of 
-\begin_inset Quotes eld
-\end_inset
-
-default
-\begin_inset Quotes erd
-\end_inset
-
- means that your LaTeX installation provides a sensible value for this parameter.
-\end_layout
-
-\end_inset
-
-.
 \end_layout
 
 \begin_layout Subsection