From c33d0a26d7170d12ce536de221152a6d46e9160e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Thu, 29 Mar 2007 22:10:45 +0000
Subject: [PATCH] EmbeddedObjects: dcolum fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17636 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/doc/EmbeddedObjects.lyx    | 63 +++++++++++++++++++++++++++-------
 lib/doc/es/EmbeddedObjects.lyx | 57 ++++++++++++++++++++++--------
 2 files changed, 93 insertions(+), 27 deletions(-)

diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 68819b14a6..ce4082f860 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -15355,7 +15355,7 @@ name "tab:Alignments-when"
 \end_inset
 
 Alignments when LaTeX-package dcolumn is used.
- For the second and third alignment some tricks were used.
+ For all column alignments tricks have to be used to get the output.
 \end_layout
 
 \end_inset
@@ -15368,8 +15368,8 @@ Alignments when LaTeX-package dcolumn is used.
 \begin_inset Tabular
 <lyxtabular version="3" rows="4" columns="3">
 <features>
-<column alignment="center" valignment="top" rightline="true" width="0" special="D{×}{\times}{-1}|">
-<column alignment="center" valignment="top" width="0" special="D{×}{\times}{4.9}|">
+<column alignment="center" valignment="top" rightline="true" width="0" special="D{x}{\times}{-1}|">
+<column alignment="center" valignment="top" width="0" special="D{x}{\times}{4.9}|">
 <column alignment="center" valignment="top" rightline="true" width="0" special="D{~}{\,}{9.7}">
 <row bottomline="true">
 <cell multicolumn="1" alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
@@ -15405,7 +15405,7 @@ units
 \begin_inset Text
 
 \begin_layout Standard
-12×24\InsetSpace \thinspace{}
+12x24\InsetSpace \thinspace{}
 bottles
 \end_layout
 
@@ -15415,7 +15415,7 @@ bottles
 \begin_inset Text
 
 \begin_layout Standard
-12×24\InsetSpace \thinspace{}
+12x24\InsetSpace \thinspace{}
 
 \begin_inset Formula $\mbox{bottles}$
 \end_inset
@@ -15429,7 +15429,20 @@ bottles
 \begin_inset Text
 
 \begin_layout Standard
-12×24~
+12
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+times 
+\end_layout
+
+\end_inset
+
+24~
 \begin_inset Formula $\mbox{bottles}$
 \end_inset
 
@@ -15444,7 +15457,7 @@ bottles
 \begin_inset Text
 
 \begin_layout Standard
-1024×768\InsetSpace \thinspace{}
+1024x768\InsetSpace \thinspace{}
 Pixels
 \end_layout
 
@@ -15454,7 +15467,7 @@ Pixels
 \begin_inset Text
 
 \begin_layout Standard
-1024×768\InsetSpace \thinspace{}
+1024x768\InsetSpace \thinspace{}
 
 \begin_inset Formula $\mbox{Pixels}$
 \end_inset
@@ -15468,7 +15481,20 @@ Pixels
 \begin_inset Text
 
 \begin_layout Standard
-1024×768~
+1024
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+times 
+\end_layout
+
+\end_inset
+
+768~
 \begin_inset Formula $\mbox{Pixels}$
 \end_inset
 
@@ -15483,7 +15509,7 @@ Pixels
 \begin_inset Text
 
 \begin_layout Standard
-32×6\InsetSpace \thinspace{}
+32x6\InsetSpace \thinspace{}
 cm
 \end_layout
 
@@ -15493,7 +15519,7 @@ cm
 \begin_inset Text
 
 \begin_layout Standard
-32×6\InsetSpace \thinspace{}
+32x6\InsetSpace \thinspace{}
 
 \begin_inset Formula $\mbox{cm}$
 \end_inset
@@ -15507,7 +15533,20 @@ cm
 \begin_inset Text
 
 \begin_layout Standard
-32×6~
+32
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+times 
+\end_layout
+
+\end_inset
+
+6~
 \begin_inset Formula $\mbox{cm}$
 \end_inset
 
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index 106acf7636..0742b9b5e0 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -1,5 +1,5 @@
-#LyX 1.5.0beta1 created this file. For more info see http://www.lyx.org/
-\lyxformat 262
+#LyX 1.5.0svn created this file. For more info see http://www.lyx.org/
+\lyxformat 263
 \begin_document
 \begin_header
 \textclass scrbook
@@ -203,11 +203,9 @@
 \bullet 3 2 7 -1
 \tracking_changes false
 \output_changes false
-\author "IG" 
 \author "usti" 
-\author "IG,,," 
+\author "IG" 
 \author "Uwe Stöhr" 
-\author "" 
 \end_header
 
 \begin_body
@@ -15392,7 +15390,9 @@ Alineaciones con el paquete LaTeX
 dcolumn
 \series default
 .
- Para la segunda y tercera alineaciones se han hecho algunos trucos.
+ 
+\lang english
+For all column alignments tricks have to be used to get the output.
 \end_layout
 
 \end_inset
@@ -15467,9 +15467,18 @@ bottles
 
 \begin_layout Standard
 12
-\emph on
-×
-\emph default
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+times 
+\end_layout
+
+\end_inset
+
 24~
 \begin_inset Formula $\mbox{bottles}$
 \end_inset
@@ -15510,9 +15519,18 @@ Pixels
 
 \begin_layout Standard
 1024
-\emph on
-×
-\emph default
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+times 
+\end_layout
+
+\end_inset
+
 768~
 \begin_inset Formula $\mbox{Pixels}$
 \end_inset
@@ -15553,9 +15571,18 @@ cm
 
 \begin_layout Standard
 32
-\emph on
-×
-\emph default
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+times 
+\end_layout
+
+\end_inset
+
 6~
 \begin_inset Formula $\mbox{cm}$
 \end_inset
-- 
2.39.2