Fix bug 5090 also in branch

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@25915 a592a061-630c-0410-9148-cb99ea01b6c8

development/Win32/packaging/AltInstaller/Updated.nsh

@@ -1,45 +1,43 @@
 Function UpdateModifiedFiles
 
- # list with modified files for LyX 1.5.6
+ # list with modified files for LyX 1.5.7
  SetOutPath "$INSTDIR\bin" # always here
  File "${PRODUCT_SOURCEDIR}\bin\lyx.exe" # always here
  File "${PRODUCT_SOURCEDIR}\bin\tex2lyx.exe" # always here
- SetOutPath "$INSTDIR\bin\Lib"
- File "${PRODUCT_SOURCEDIR}\bin\Lib\copy.py"
  File /r "${PRODUCT_SOURCEDIR}\Resources\locale" # always here
  SetOutPath "$INSTDIR\Resources"
- File "${PRODUCT_SOURCEDIR}\Resources\configure.py"
+ #File "${PRODUCT_SOURCEDIR}\Resources\configure.py"
- File "${PRODUCT_SOURCEDIR}\Resources\CREDITS"
+ #File "${PRODUCT_SOURCEDIR}\Resources\CREDITS"
- File "${PRODUCT_SOURCEDIR}\Resources\symbols"
+ #File "${PRODUCT_SOURCEDIR}\Resources\symbols"
- File "${PRODUCT_SOURCEDIR}\Resources\unicodesymbols"
+ #File "${PRODUCT_SOURCEDIR}\Resources\unicodesymbols"
  SetOutPath "$INSTDIR\Resources\doc"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\EmbeddedObjects.lyx"
+ #File "${PRODUCT_SOURCEDIR}\Resources\doc\EmbeddedObjects.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\Intro.lyx"
+ #File "${PRODUCT_SOURCEDIR}\Resources\doc\Intro.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\LaTeXConfig.lyx.in"
+ #File "${PRODUCT_SOURCEDIR}\Resources\doc\LaTeXConfig.lyx.in"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\Math.lyx"
  SetOutPath "$INSTDIR\Resources\doc\de"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\de\EmbeddedObjects.lyx"
+ #File "${PRODUCT_SOURCEDIR}\Resources\doc\de\EmbeddedObjects.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Extended.lyx"
+ #File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Extended.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Math.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Userguide.lyx"
+ #File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Userguide.lyx"
  SetOutPath "$INSTDIR\Resources\doc\es"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\es\EmbeddedObjects.lyx"
+ #File "${PRODUCT_SOURCEDIR}\Resources\doc\es\EmbeddedObjects.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\es\Extended.lyx"
+ File "${PRODUCT_SOURCEDIR}\Resources\doc\es\Math.lyx"
  SetOutPath "$INSTDIR\Resources\doc\fr"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\EmbeddedObjects.lyx"
+ #File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\EmbeddedObjects.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\Extended.lyx"
+ File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\Math.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\Userguide.lyx"
+ #File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\Userguide.lyx"
  SetOutPath "$INSTDIR\Resources\layouts"
- File "${PRODUCT_SOURCEDIR}\Resources\layouts\aa.layout"
+ #File "${PRODUCT_SOURCEDIR}\Resources\layouts\aa.layout"
- File "${PRODUCT_SOURCEDIR}\Resources\layouts\amsmaths.inc"
+ #File "${PRODUCT_SOURCEDIR}\Resources\layouts\amsmaths.inc"
- File "${PRODUCT_SOURCEDIR}\Resources\layouts\jss.layout"
+ #File "${PRODUCT_SOURCEDIR}\Resources\layouts\jss.layout"
  SetOutPath "$INSTDIR\Resources\lyx2lyx" # always here
  File "${PRODUCT_SOURCEDIR}\Resources\lyx2lyx\lyx2lyx_version.py" # always here
  SetOutPath "$INSTDIR\Resources\scripts"
- File "${PRODUCT_SOURCEDIR}\Resources\scripts\csv2lyx.py"
+ #File "${PRODUCT_SOURCEDIR}\Resources\scripts\csv2lyx.py"
  SetOutPath "$INSTDIR\Resources\templates"
- File "${PRODUCT_SOURCEDIR}\Resources\templates\aa.lyx"
+ #File "${PRODUCT_SOURCEDIR}\Resources\templates\aa.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\templates\JSS-article.lyx"
+ #File "${PRODUCT_SOURCEDIR}\Resources\templates\JSS-article.lyx"
 
 FunctionEnd
 

lib/doc/Math.lyx

@@ -1,4 +1,4 @@
-#LyX 1.5.6svn created this file. For more info see http://www.lyx.org/
+#LyX 1.5.7svn created this file. For more info see http://www.lyx.org/
 \lyxformat 276
 \begin_document
 \begin_header
@@ -102,9 +102,6 @@
 \usepackage{multirow}
 \usepackage{multicol}
 
-% needed for diagrams
-\usepackage{amscd}
-
 % needed in sec. 19.4
 \usepackage{remreset}
 
@@ -262,7 +259,7 @@ author: Uwe Stöhr
 \newline
 
 \family sans
-Version 1.5.6
+Version 1.5.7
 \end_layout
 
 \begin_layout Standard
@@ -29792,44 +29789,8 @@ name "Diagrams"
 \end_layout
 
 \begin_layout Standard
-To create diagrams, the LaTeX-package 
+Diagrams of this type visualize relations by vertical and horizontal lines
-\series bold
+ or arrows:
-amscd
-\begin_inset Foot
-status collapsed
-
-\begin_layout Standard
-
-\series bold
-amscd
-\series default
- is part of every LaTeX standard installation.
-\end_layout
-
-\end_inset
-
-
-\series default
-
-\begin_inset LatexCommand index
-name "Packages ! amscd"
-
-\end_inset
-
- is needed.
- It is loaded in the LaTeX-preamble with the line
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-
-\backslash
-usepackage{amscd}
-\end_layout
-
-\begin_layout Standard
-Diagrams visualize relations and look like this:
 \begin_inset Formula \[
 \begin{CD}A@>>>B@>>>C\\
 @AAA@.@VVV\\

lib/doc/de/Math.lyx

@@ -1,4 +1,4 @@
-#LyX 1.5.6svn created this file. For more info see http://www.lyx.org/
+#LyX 1.5.7svn created this file. For more info see http://www.lyx.org/
 \lyxformat 276
 \begin_document
 \begin_header
@@ -103,9 +103,6 @@
 \usepackage{multirow}
 \usepackage{multicol}
 
-% für Diagramme
-\usepackage{amscd}
-
 % benutzt in Kap. 19.4
 \usepackage{remreset}
 
@@ -273,7 +270,7 @@ Verfasser: Uwe Stöhr
 \newline
 
 \family sans
-Version 1.5.6
+Version 1.5.7
 \end_layout
 
 \begin_layout Standard
@@ -30009,48 +30006,8 @@ name "Diagramme"
 \end_layout
 
 \begin_layout Standard
-Um Diagramme zu erstellen, wird das LaTeX-Paket 
+Diagramme dieses Typs stellen Beziehungen mittels horizontaler und vertikaler
-\series bold
+ Linien oder Pfeilen dar:
-amscd
-\begin_inset Foot
-status collapsed
-
-\begin_layout Standard
-
-\series bold
-amscd
-\series default
- ist Teil jeder LaTeX-Standardinstallation.
-\end_layout
-
-\end_inset
-
-
-\series default
-
-\begin_inset LatexCommand index
-name "Pakete ! amscd"
-
-\end_inset
-
- benötigt.
- Es wird im LaTeX-Vorspann mit der Zeile
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-
-\backslash
-usepackage{amscd}
-\end_layout
-
-\begin_layout Standard
-geladen.
-\end_layout
-
-\begin_layout Standard
-Diagramme stellen Beziehungen dar und sehen folgendermaßen aus:
 \begin_inset Formula \[
 \begin{CD}A@>>>B@>>>C\\
 @AAA@.@VVV\\

lib/doc/es/Math.lyx

@@ -1,4 +1,4 @@
-#LyX 1.5.5svn created this file. For more info see http://www.lyx.org/
+#LyX 1.5.7svn created this file. For more info see http://www.lyx.org/
 \lyxformat 276
 \begin_document
 \begin_header
@@ -102,9 +102,6 @@
 \usepackage{multirow}
 \usepackage{multicol}
 
-% needed for diagrams
-\usepackage{amscd}
-
 % needed in sec. 19.4
 \usepackage{remreset}
 
@@ -261,7 +258,7 @@ autor: Uwe Stöhr
 \newline
 
 \newline
-Versión 1.5.5
+Versión 1.5.7
 \end_layout
 
 \begin_layout Standard
@@ -30363,47 +30360,11 @@ name "Diagramas"
 \end_layout
 
 \begin_layout Standard
-Para componer diagramas se necesita el paquete LaTeX 
+Los diagramas 
-\series bold
+\lang english
-amscd
+of this type visualize relations by vertical and horizontal lines or arrows
-\series default
+\lang spanish
-.
+:
-\series bold
-
-\begin_inset Foot
-status collapsed
-
-\begin_layout Standard
-
-\series bold
-amscd
-\series default
- forma parte de las instalaciones estándar de LaTeX.
-\end_layout
-
-\end_inset
-
-
-\series default
-
-\begin_inset LatexCommand index
-name "Paquetes ! amscd"
-
-\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:
 \begin_inset Formula \[
 \begin{CD}A@)))B@)))C\\
 @AAA@.@VVV\\

lib/doc/fr/Math.lyx

@@ -1,4 +1,4 @@
-#LyX 1.5.5svn created this file. For more info see http://www.lyx.org/
+#LyX 1.5.7svn created this file. For more info see http://www.lyx.org/
 \lyxformat 276
 \begin_document
 \begin_header
@@ -102,9 +102,6 @@
 \usepackage{multirow}
 \usepackage{multicol}
 
-% needed for diagrams
-\usepackage{amscd}
-
 % needed in sec. 19.4
 \usepackage{remreset}
 
@@ -258,7 +255,7 @@ traducteur: Siegfried Meunier-Guttin-Cluzel
 \newline
 
 \family sans
-Version 1.5.5
+Version 1.5.7
 \end_layout
 
 \begin_layout Standard
@@ -29740,45 +29737,11 @@ name "Diagrammes"
 \end_layout
 
 \begin_layout Standard
-Pour créer des diagrammes, on utilise le paquetage LaTeX 
+Les diagrammes de cette type 
-\series bold
+\lang english
-amscd
+visualize relations by vertical and horizontal lines or arrows
-\begin_inset Foot
+\lang french
-status collapsed
+:
-
-\begin_layout Standard
-
-\series bold
-amscd
-\series default
- fait partie de toutes les installations LateX standard.
-\end_layout
-
-\end_inset
-
-
-\series default
-
-\begin_inset LatexCommand index
-name "Paquetages ! amscd"
-
-\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:
 \begin_inset Formula \[
 \begin{CD}A@>>>B@>>>C\\
 @AAA@.@VVV\\

src/LaTeXFeatures.cpp

@@ -444,7 +444,8 @@ char const * simplefeatures[] = {
 	"mathrsfs",
 	"ascii",
 	"url",
-	"bm"
+	"bm",
+	"amscd"
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);

src/mathed/InsetMathAMSArray.cpp

@@ -147,7 +147,12 @@ void InsetMathAMSArray::normalize(NormalStream & os) const
 
 void InsetMathAMSArray::validate(LaTeXFeatures & features) const
 {
-	features.require("amsmath");
+	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);
 }
 

status.15x

@@ -51,6 +51,9 @@ What's new
 
 * USER INTERFACE
 
+- The LaTeX-package amscd is now automaticaly loaded when creating math
+  diagrams (bug 5090).
+
 
 
 * DOCUMENTATION AND LOCALIZATION