EmbeddedObjects:

- fix issues spotted by Hartmut
- fix vertical table cell alignment

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

diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index e7c1bf3820322b286dcc3c531dd60b7f5e9c4dd1..0cdf9e03097b3985111ba63212b0aecc7dc67a12 100644 (file)
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -1871,6 +1871,24 @@ The toolbar has the following icons:
  sets the current cell or selection as a multicolumn
 \end_layout
 
+\begin_layout Standard
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Standard
+
+\series bold
+Note:
+\series default
+ For the output the vertical alignment of the first cell in a row is used
+ for all following cells in the row.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
 \begin_layout Section
 Edit Table Menu
 \begin_inset LatexCommand index
@@ -9858,8 +9876,8 @@ Table with multiple lines in cells
 <lyxtabular version="3" rows="3" columns="3">
 <features>
 <column alignment="center" valignment="middle" leftline="true" width="2.5cm">
-<column alignment="center" valignment="middle" leftline="true" width="0.5cm">
-<column alignment="center" valignment="middle" leftline="true" rightline="true" width="0.5cm">
+<column alignment="center" valignment="middle" leftline="true" width="0">
+<column alignment="center" valignment="middle" leftline="true" rightline="true" width="0">
 <row topline="true">
 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
 \begin_inset Text
@@ -9989,6 +10007,7 @@ reference "tab:Table-with-multiple"
  In the appearing table dialog we set a cell width of 2.5\InsetSpace \thinspace{}
 cm and choose centered
  for the vertical and horizontal alignment.
+ The vertical alignment is used for all cells of the row.
  As our text is smaller than than 2.5\InsetSpace \thinspace{}
 cm, only one line will appear.
  To get two lines, we add a line break with the command
@@ -10008,14 +10027,6 @@ in ERT.
  to several lines.
 \end_layout
 
-\begin_layout Standard
-To center the text inside the two other cells of the first row vertically,
- right-click in the second cell, adjust a fixed width of 0.5\InsetSpace \thinspace{}
-cm and choose
- centered alignments.
- Then do the same for the third cell of the row.
-\end_layout
-
 \begin_layout Standard
 If you have a long word in a cell with a fixed width, it cannot be hyphenated
  by LaTeX if it is the first entry.
@@ -10076,8 +10087,8 @@ Table with and without hyphenation
 <lyxtabular version="3" rows="3" columns="3">
 <features>
 <column alignment="center" valignment="middle" leftline="true" width="2.5cm">
-<column alignment="center" valignment="middle" leftline="true" width="0.5cm">
-<column alignment="center" valignment="middle" leftline="true" rightline="true" width="0.5cm">
+<column alignment="center" valignment="middle" leftline="true" width="0">
+<column alignment="center" valignment="middle" leftline="true" rightline="true" width="0">
 <row topline="true">
 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
 \begin_inset Text
@@ -10176,8 +10187,8 @@ i
 <lyxtabular version="3" rows="3" columns="3">
 <features>
 <column alignment="center" valignment="middle" leftline="true" width="2.5cm">
-<column alignment="center" valignment="middle" leftline="true" width="0.5cm">
-<column alignment="center" valignment="middle" leftline="true" rightline="true" width="0.5cm">
+<column alignment="center" valignment="middle" leftline="true" width="0">
+<column alignment="center" valignment="middle" leftline="true" rightline="true" width="0">
 <row topline="true">
 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
 \begin_inset Text
@@ -18869,7 +18880,7 @@ page
 \end_layout
 
 \begin_layout Standard
-By default, each options has its own rules:
+By default, each option has its own rules:
 \end_layout
 
 \begin_layout Labeling
@@ -19397,7 +19408,7 @@ Figure #:
 \end_inset
 
  followed by the caption text.
- The number sign 
+ 
 \begin_inset Quotes eld
 \end_inset
 
@@ -19405,9 +19416,9 @@ Figure #:
 \begin_inset Quotes erd
 \end_inset
 
- is substituted in the printed output by the actual reference number.
+ is the actual reference number.
  By default the label and the number are in the same font as the caption
- text and a colon follows the number to divide then label from the text.
+ text and a colon follows the number to divide the label from the text.
  This caption format is not suitable for all document formats.
  
 \end_layout
@@ -21056,7 +21067,7 @@ Insert\SpecialChar \menuseparator
 Note
 \family default
 .
- There are three types of notes:
+ There are five types of notes:
 \end_layout
 
 \begin_layout Description
@@ -21326,7 +21337,7 @@ LyX\InsetSpace ~
 Note
 \family default
  is inserted.
- You can switch between the three note types by right-clicking on the note-box.
+ You can switch between the five note types by right-clicking on the note-box.
  
 \family roman
 \series medium
@@ -21840,42 +21851,6 @@ reference "foot:This-is-an"
 \end_inset
 
 .
-\newline
-
-\begin_inset Note Greyedout
-status open
-
-\begin_layout Standard
-
-\series bold
-Note:
-\series default
- LyX doesn't provide a prefix for labels in footnotes, so you have to insert
- e.\InsetSpace \thinspace{}
-g.\InsetSpace ~
-the prefix 
-\family sans
-
-\begin_inset Quotes eld
-\end_inset
-
-foot:
-\family default
-
-\begin_inset Quotes erd
-\end_inset
-
- manually when you want to use the reference style 
-\family sans
-Formatted\InsetSpace ~
-reference
-\family default
-.
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard

diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index ba9c92823cd4cda950c04a33fe4ec7e41d720cf3..4cab097080a53f45cc4775cb722d7ce44e4879ca 100644 (file)
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -1815,6 +1815,26 @@ La barra de herramientas tiene los siguientes iconos:
  establece la celda actual o selección como multicolumna
 \end_layout
 
+\begin_layout Standard
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Standard
+
+\series bold
+Nota:
+\lang english
+ 
+\series default
+For the output the vertical alignment of the first cell in a row is used
+ for all following cells in the row.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
 \begin_layout Section
 Menú Editar Tabla
 \begin_inset LatexCommand index
@@ -9833,8 +9853,8 @@ Tabla con líneas múltiples en celda
 <lyxtabular version="3" rows="3" columns="3">
 <features>
 <column alignment="center" valignment="middle" leftline="true" width="2.5cm">
-<column alignment="center" valignment="middle" leftline="true" width="0.5cm">
-<column alignment="center" valignment="middle" leftline="true" rightline="true" width="0.5cm">
+<column alignment="center" valignment="middle" leftline="true" width="0">
+<column alignment="center" valignment="middle" leftline="true" rightline="true" width="0">
 <row topline="true">
 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
 \begin_inset Text
@@ -9964,6 +9984,15 @@ reference "tab:Tabla-con-múltiples"
  En el diálogo que surge establece una anchura de 2.5\InsetSpace \thinspace{}
 cm y escoge centro en
  alineación vertical y horizontal.
+ 
+\lang english
+The 
+\lang spanish
+alineación vertical
+\lang english
+ is used for all cells of the row.
+
+\lang spanish
  Como nuestro texto es menor de 2.5\InsetSpace \thinspace{}
 cm, sólo aparece una línea.
  Para poner dos añadimos un salto de línea con el comando en ERT
@@ -9981,14 +10010,6 @@ linebreak
 Si el texto es más ancho que la celda será automáticamente dividido en líneas.
 \end_layout
 
-\begin_layout Standard
-Para centrar verticalmente el texto en las otras dos celdas de la primera
- fila, haz clic-derecha en la segunda celda, ajusta una anchura de 0.5\InsetSpace \thinspace{}
-cm
- y marca alineaciones centrales.
- Haz lo mismo con la tercera celda de la fila.
-\end_layout
-
 \begin_layout Standard
 Si hay una palabra larga en una celda con anchura fija, LaTeX no puede cortarla
  con guión si es la primera entrada.
@@ -10049,8 +10070,8 @@ Tablas con y sin guión
 <lyxtabular version="3" rows="3" columns="3">
 <features>
 <column alignment="center" valignment="middle" leftline="true" width="2.5cm">
-<column alignment="center" valignment="middle" leftline="true" width="0.5cm">
-<column alignment="center" valignment="middle" leftline="true" rightline="true" width="0.5cm">
+<column alignment="center" valignment="middle" leftline="true" width="0">
+<column alignment="center" valignment="middle" leftline="true" rightline="true" width="0">
 <row topline="true">
 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
 \begin_inset Text
@@ -10149,8 +10170,8 @@ i
 <lyxtabular version="3" rows="3" columns="3">
 <features>
 <column alignment="center" valignment="middle" leftline="true" width="2.5cm">
-<column alignment="center" valignment="middle" leftline="true" width="0.5cm">
-<column alignment="center" valignment="middle" leftline="true" rightline="true" width="0.5cm">
+<column alignment="center" valignment="middle" leftline="true" width="0">
+<column alignment="center" valignment="middle" leftline="true" rightline="true" width="0">
 <row topline="true">
 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
 \begin_inset Text
@@ -19524,7 +19545,7 @@ Figura #
 \end_inset
 
  seguida por el texto.
- El símbolo de número 
+ 
 \begin_inset Quotes eld
 \end_inset
 
@@ -19532,7 +19553,11 @@ Figura #
 \begin_inset Quotes erd
 \end_inset
 
- es sustituido en la salida impresa por el número de referencia real.
+ 
+\lang english
+is the actual reference number
+\lang spanish
+.
  Por defecto la etiqueta y el número usan la misma fuente que el texto del
  encabezado y el signo dos puntos sigue al número para separar la etiqueta
  del texto.
@@ -21236,7 +21261,7 @@ Insertar\SpecialChar \menuseparator
 Nota
 \family default
 .
- Hay tres tipos de notas:
+ Hay cinco tipos de notas:
 \end_layout
 
 \begin_layout Description
@@ -21534,7 +21559,8 @@ Nota\InsetSpace ~
 LyX
 \family default
 .
- Puedes cambiar entre los tres tipos de nota con cilc-derecha sobre el recuadro.
+ Puedes cambiar entre los cinco tipos de nota con cilc-derecha sobre el
+ recuadro.
  
 \family roman
 \series medium
@@ -22047,43 +22073,6 @@ reference "pie:Esto-es-una"
 \end_inset
 
 .
-\newline
-
-\begin_inset Note Greyedout
-status collapsed
-
-\begin_layout Standard
-
-\series bold
-Nota:
-\series default
- LyX no suministra prefijos para etiquetas en notas al pie, así que has
- de insertar un prefijo, p.\InsetSpace \thinspace{}
-e.\InsetSpace ~
-
-\family sans
-
-\begin_inset Quotes eld
-\end_inset
-
-pie:
-\family default
-
-\begin_inset Quotes erd
-\end_inset
-
- manualmente cuando quieras usar el estilo 
-\family sans
-Referencia\InsetSpace ~
-con\InsetSpace ~
-formato
-\family default
-.
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard