- InsetMathAMSArray.cpp: code cosmetic

- Math.lyx: leftovers from bug 5090

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

diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx
index e7bfb943696f5c6aa5d8dbe5aea561c1ff33bfc3..9fb9a80c45908d5637badabcbd6d9a9033af46d3 100644 (file)
--- a/lib/doc/es/Math.lyx
+++ b/lib/doc/es/Math.lyx
@@ -83,9 +83,6 @@
 \usepackage{multirow}
 \usepackage{multicol}
 
-% needed for diagrams
-\usepackage{amscd}
-
 % needed in sec. 19.4
 \usepackage{remreset}
 
@@ -31887,51 +31884,11 @@ Diagramas
 \end_layout
 
 \begin_layout Standard
-Para componer diagramas se necesita el paquete LaTeX 
-\series bold
-amscd
-\series default
-.
-\series bold
-
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-
-\series bold
-amscd
-\series default
- forma parte de las instalaciones estándar de LaTeX.
-\end_layout
-
-\end_inset
-
-
-\series default
-
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-Paquetes ! amscd
-\end_layout
-
-\end_inset
-
- Se carga en el preámbulo LaTeX con la línea:
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-
-\backslash
-usepackage{amscd}
-\end_layout
-
-\begin_layout Standard
-Los diagramas visualizan relaciones y su aspecto es como este:
+Los diagramas 
+\lang english
+of this type visualize relations by vertical and horizontal lines or arrows:
+\lang spanish
+:
 \begin_inset Formula \[
 \begin{CD}A@)))B@)))C\\
 @AAA@.@VVV\\

diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx
index 678e1b133de47aee317b141ada78ea54b312fb90..a560a374c8ed10f9131164c54461222a4ce32ae1 100644 (file)
--- a/lib/doc/fr/Math.lyx
+++ b/lib/doc/fr/Math.lyx
@@ -83,9 +83,6 @@
 \usepackage{multirow}
 \usepackage{multicol}
 
-% needed for diagrams
-\usepackage{amscd}
-
 % needed in sec. 19.4
 \usepackage{remreset}
 
@@ -31322,49 +31319,11 @@ Diagrammes
 \end_layout
 
 \begin_layout Standard
-Pour créer des diagrammes, on utilise le paquetage LaTeX 
-\series bold
-amscd
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-
-\series bold
-amscd
-\series default
- fait partie de toutes les installations LateX standard.
-\end_layout
-
-\end_inset
-
-
-\series default
-
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-Paquetages ! amscd
-\end_layout
-
-\end_inset
-
-.
- On le charge dans le préambule LaTeX avec la ligne suivante:
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-
-\backslash
-usepackage{amscd}
-\end_layout
-
-\begin_layout Standard
-Les diagrammes permettent la visualisation de relations et ressemblent à
- ceci:
+Des diagrammes de cette type 
+\lang english
+visualize relations by vertical and horizontal lines or arrows:
+\lang french
+:
 \begin_inset Formula \[
 \begin{CD}A@>>>B@>>>C\\
 @AAA@.@VVV\\

diff --git a/src/mathed/InsetMathAMSArray.cpp b/src/mathed/InsetMathAMSArray.cpp
index 39589649780e6eabb513302c5736369fab3d204f..1b343decbdbae6605d391e620d59bac629bb7201 100644 (file)
--- a/src/mathed/InsetMathAMSArray.cpp
+++ b/src/mathed/InsetMathAMSArray.cpp
@@ -147,11 +147,12 @@ void InsetMathAMSArray::normalize(NormalStream & os) const
 
 void InsetMathAMSArray::validate(LaTeXFeatures & features) const
 {
-       if (name_ != "CD")
-               features.require("amsmath");
-       // amscd is independent of amsmath although it is part of the amsmath bundle
        if (name_ == "CD")
+               // amscd is independent of amsmath although it is part of
+               // the amsmath bundle
                features.require("amscd");
+       else
+               features.require("amsmath");
        InsetMathGrid::validate(features);
 }