EmbeddedObjects.lyx:

- update table toolbar and table settings description
- describe longtable alignment

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

diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 5c36def77db2f834a811f9025680589f55f97866..de1f3a1ae69bf05d3305c97976542c2ce139fe1d 100644 (file)
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -2062,7 +2062,11 @@ reference "sub:Multicolumns"
 
 \end_inset
 
-.
+ or the cells of one column as multirow cell, see section
+\begin_inset space ~
+\end_inset
+
+??.
 \begin_inset Newline newline
 \end_inset
 
@@ -2371,6 +2375,17 @@ The toolbar has the following icons:
  right-aligns the content of the current cell / column
 \end_layout
 
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+\begin_inset Graphics
+       filename ../images/tabular-feature_align-decimal.png
+       scaleBeforeRotation
+
+\end_inset
+
+ aligns the content of the current column at a character
+\end_layout
+
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
 \begin_inset Graphics
@@ -2437,6 +2452,17 @@ The toolbar has the following icons:
  sets the current cell or selection as a multicolumn
 \end_layout
 
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+\begin_inset Graphics
+       filename ../images/tabular-feature_multirow.png
+       scaleBeforeRotation
+
+\end_inset
+
+ sets the current cell or selection as a multirow
+\end_layout
+
 \begin_layout Standard
 \begin_inset Note Greyedout
 status open
@@ -5305,23 +5331,23 @@ Longtables ! Alignment
 \end_layout
 
 \begin_layout Standard
-Longtables are by default centered.
- Unlike the alignment of the table columns and rows, the table alignment
- can currently not be changed in the table dialog.
- To change the alignment of longtables you have to change the value of the
- lengths 
+The horizontal alignment of longtables can be set in the table settings
+ dialog.
+ For left- and right-alignment the table will be directly at the page border.
+ To add space between the table and the border one has to set the alignment
+ to center and change the value of the LaTeX-lengths 
 \series bold
 
 \backslash
 LTleft 
 \series default
-and 
+or 
 \series bold
 
 \backslash
 LTright
 \series default
- by inserting this line as TeX-Code before the corresponding longtable:
+ by inserting this line as TeX-Code before the longtable:
 \end_layout
 
 \begin_layout Standard
@@ -5335,7 +5361,7 @@ LTleft}{value}
 \end_layout
 
 \begin_layout Standard
-where the value can have any of the units listed in Table
+The value can have any of the units listed in Table
 \begin_inset space ~
 \end_inset
 
@@ -5371,17 +5397,19 @@ fill
 \end_layout
 
 \begin_layout Standard
-The following longtable was left-aligned by setting 
+The following longtable was centered and 
 \series bold
 
 \backslash
 LTleft
 \series default
- to 0
-\begin_inset space \thinspace{}
-\end_inset
-
-pt.
+ set to 
+\family sans
+0.1
+\backslash
+columnwidth
+\family default
+:
 \begin_inset ERT
 status collapsed
 
@@ -5391,7 +5419,9 @@ status collapsed
 \backslash
 setlength{
 \backslash
-LTleft}{0pt}
+LTleft}{0.1
+\backslash
+columnwidth}
 \end_layout
 
 \end_inset
@@ -5404,7 +5434,7 @@ LTleft}{0pt}
 <lyxtabular version="3" rows="5" columns="5">
 <features islongtable="true" longtabularalignment="center">
 <column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0pt">
 <column alignment="center" valignment="top" width="0">
 <column alignment="center" valignment="top" width="0">
 <column alignment="center" valignment="top" width="0">

diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 78af18067464cd813c2844224b85d8478dd0a646..e3cc5cf9c034691552a885c24c7fa257ada66d05 100644 (file)
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -1978,11 +1978,7 @@ reference "uab:Mehrfache-Zeilen-in"
 \end_inset
 
 Außerdem können Sie mehrere Zellen einer Zeile markieren und die Auswahl
- als 
-\family sans
-Mehrfachspalte
-\family default
- definieren, wie in Abschnitt
+ als Mehrfachspalte oder Mehrfachzeile definieren, wie in Abschnitt
 \begin_inset space ~
 \end_inset
 
@@ -1993,7 +1989,7 @@ reference "uab:Mehrfachspalten"
 
 \end_inset
 
- beschrieben.
+ und ?? beschrieben.
 \begin_inset Newline newline
 \end_inset
 
@@ -2321,6 +2317,17 @@ Die Werkzeugleiste hat folgende Knöpfe:
  Richtet den Inhalt der ausgewählte(n) Spalte(n) rechtsbündig aus
 \end_layout
 
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+\begin_inset Graphics
+       filename ../../images/tabular-feature_align-decimal.png
+       scaleBeforeRotation
+
+\end_inset
+
+ Richtet den Inhalt der ausgewählten Spalte an einem Zeichen aus
+\end_layout
+
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
 \begin_inset Graphics
@@ -2387,6 +2394,17 @@ Die Werkzeugleiste hat folgende Knöpfe:
  Setzt die ausgewählte(n) Zelle(n) einer Zeile als Mehrfachspalte
 \end_layout
 
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+\begin_inset Graphics
+       filename ../../images/tabular-feature_multirow.png
+       scaleBeforeRotation
+
+\end_inset
+
+ Setzt die ausgewählte(n) Zelle(n) einer Zeile als Mehrfachzeile
+\end_layout
+
 \begin_layout Standard
 \begin_inset Note Greyedout
 status open
@@ -5286,11 +5304,12 @@ Tabellen ! lange ! Ausrichtung
 \end_layout
 
 \begin_layout Standard
-Lange Tabellen sind standardmäßig zentriert ausgerichtet.
- Im Gegensatz zur Ausrichtung von Tabellenspalten und -zeilen kann die Ausrichtu
-ng von Tabellen nicht im Tabellen-Dialogfenster geändert werden.
- Um die Ausrichtung von langen Tabellen zu ändern, müssen die Werte der
- Längen 
+Die horizontale Ausrichtung von langen Tabellen kann in den Tabelleneinstellunge
+n festgelegt werden.
+ Bei linker und rechter Ausrichtung befindet sich die Tabelle direkt am
+ Seitenrand.
+ Um Platz zwischen Seitenrand und Tabelle einzufügen, muss die Tabelle zentriert
+ ausgerichtet werden und die Werte der Längen 
 \series bold
 
 \backslash
@@ -5317,7 +5336,7 @@ LTleft}{Wert}
 \end_layout
 
 \begin_layout Standard
-Wobei der Wert eine der in Tabelle
+Der Wert kann eine der in Tabelle
 \begin_inset space ~
 \end_inset
 
@@ -5328,7 +5347,7 @@ reference "tab:Maßeinheiten"
 
 \end_inset
 
- aufgelisteten Einheiten haben kann.
+ aufgelisteten Einheiten kann.
  
 \series bold
 
@@ -5354,17 +5373,19 @@ fill
 \end_layout
 
 \begin_layout Standard
-Die folgende lange Tabelle wurde links ausgerichtet, indem 
+Die folgende lange Tabelle wurde zentriert und 
 \series bold
 
 \backslash
 LTleft
 \series default
- auf den Wert 0
-\begin_inset space \thinspace{}
-\end_inset
-
-pt gesetzt wurde.
+ auf den Wert 
+\family sans
+0.1
+\backslash
+columnwidth
+\family default
+ gesetzt:
 \begin_inset ERT
 status collapsed
 
@@ -5374,7 +5395,9 @@ status collapsed
 \backslash
 setlength{
 \backslash
-LTleft}{0pt}
+LTleft}{0.1
+\backslash
+columnwidth}
 \end_layout
 
 \end_inset
@@ -5388,7 +5411,7 @@ LTleft}{0pt}
 <features islongtable="true" longtabularalignment="center">
 <column alignment="center" valignment="top" width="0">
 <column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0pt">
 <column alignment="center" valignment="top" width="0">
 <column alignment="center" valignment="top" width="0">
 <row>

diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index cf9b6de581b951922996372905f9b0bb927e8bc8..7fac3b01a7b8ed5d731bd1e0a7f5fb6607946fe7 100644 (file)
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -1909,7 +1909,7 @@ tabla
  actual.
  Una vez puesta la anchura puedes ajustar también el alineamiento vertical.
  Una anchura determinada permite tener saltos de línea y distintos párrafos
- de texto, véase sección 
+ de texto, véase sección
 \begin_inset space ~
 \end_inset
 
@@ -1938,7 +1938,19 @@ reference "sub:Multicolumnas"
 
 \end_inset
 
-.
+ 
+\lang english
+or the cells of one column as multirow cell
+\lang spanish
+, véase sección
+\begin_inset space ~
+\end_inset
+
+
+\lang english
+??
+\lang spanish
+..
 \begin_inset Newline newline
 \end_inset
 
@@ -2232,6 +2244,19 @@ La barra de herramientas tiene los siguientes iconos:
  alinea a la derecha el contenido de la celda/columna
 \end_layout
 
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+\begin_inset Graphics
+       filename ../../images/tabular-feature_align-decimal.png
+       scaleBeforeRotation
+
+\end_inset
+
+ alinea el contenido de la celda/columna 
+\lang english
+at a character
+\end_layout
+
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
 \begin_inset Graphics
@@ -2292,6 +2317,19 @@ La barra de herramientas tiene los siguientes iconos:
  establece la celda actual o selección como multicolumna
 \end_layout
 
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+\begin_inset Graphics
+       filename ../../images/tabular-feature_multirow.png
+       scaleBeforeRotation
+
+\end_inset
+
+ establece la celda actual o selección como 
+\lang english
+multirow
+\end_layout
+
 \begin_layout Standard
 \begin_inset Note Greyedout
 status open
@@ -5191,11 +5229,15 @@ Tablas largas ! Alineación
 \end_layout
 
 \begin_layout Standard
-Las tablas largas se centran por omisión.
- Al contrario de la alineación de filas y columnas, la alineación de una
- tabla no se puede cambiar por ahora en el diálogo de tablas.
- Para cambiar la alineación de tablas largas debes cambiar el valor de las
- longitudes 
+
+\lang english
+The horizontal alignment of longtables can be set in the table settings
+ dialog.
+ For left- and right-alignment the table will be directly at the page border.
+ To add space between the table and the border one has to set the alignment
+ to center
+\lang spanish
+ y cambiar el valor de las longitudes 
 \series bold
 
 \backslash
@@ -5258,13 +5300,27 @@ fill
 \end_layout
 
 \begin_layout Standard
-La siguiente tabla larga se ha alineado a la izquierda poniendo 
+La siguiente tabla larga se ha alineado 
+\lang english
+centered
+\lang spanish
+ y 
 \series bold
 
 \backslash
 LTleft
 \series default
- 0 pt.
+ 
+\lang english
+set to
+\lang spanish
+ 
+\family sans
+0.1
+\backslash
+columnwidth
+\family default
+:
 \begin_inset ERT
 status collapsed
 
@@ -5274,7 +5330,9 @@ status collapsed
 \backslash
 setlength{
 \backslash
-LTleft}{0pt}
+LTleft}{0.1
+\backslash
+columnwidth}
 \end_layout
 
 \end_inset

diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index 74318a02b22cd7ea31fc09618b8df2ad2b129268..8524fa08259bddbd03ad2243d6b44c51080e24d8 100644 (file)
--- a/lib/doc/fr/EmbeddedObjects.lyx
+++ b/lib/doc/fr/EmbeddedObjects.lyx
@@ -2226,7 +2226,15 @@ reference "sub:Multicolonnes"
 
 \end_inset
 
-.
+ 
+\lang english
+or the cells of one column as multirow cell
+\lang french
+, voir la section
+\begin_inset space ~
+\end_inset
+
+??.
 \begin_inset Newline newline
 \end_inset
 
@@ -2626,6 +2634,19 @@ ou colonne ?
  aligne à droite le contenu de la cellule ou de la colonne courante
 \end_layout
 
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+\begin_inset Graphics
+       filename ../../images/tabular-feature_align-decimal.png
+       scaleBeforeRotation
+
+\end_inset
+
+ aligne le contenu de la colonne courante 
+\lang english
+at a character
+\end_layout
+
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
 \begin_inset Graphics
@@ -2693,6 +2714,21 @@ re
  transforme en multi-colonne la cellule ou la sélection courante
 \end_layout
 
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+\begin_inset Graphics
+       filename ../../images/tabular-feature_multirow.png
+       scaleBeforeRotation
+
+\end_inset
+
+ transforme en 
+\lang english
+multirow
+\lang french
+ la cellule ou la sélection courante
+\end_layout
+
 \begin_layout Standard
 \begin_inset Note Greyedout
 status open
@@ -5518,12 +5554,15 @@ Tableaux longs ! Alignement
 \end_layout
 
 \begin_layout Standard
-Implicitement les Tableaux Longs sont centrés.
- Contrairement à l'alignement dans les colonnes et les lignes, l'alignement
- du tableau ne peut actuellement pas être modifié à partir de la fenêtre
- de dialogue.
- Pour modifier l'alignement d'un tableau long, vous devez modifier les valeurs
- des longueurs 
+
+\lang english
+The horizontal alignment of longtables can be set in the table settings
+ dialog.
+ For left- and right-alignment the table will be directly at the page border.
+ To add space between the table and the border one has to set the alignment
+ to center
+\lang french
+ et modifier les valeurs des longueurs 
 \series bold
 
 \backslash
@@ -5590,17 +5629,19 @@ fill
 \end_layout
 
 \begin_layout Standard
-Le tableau long suivant a été aligné à gauche en mettant 
+Le tableau long suivant a été centrée en mettant 
 \series bold
 
 \backslash
 LTleft
 \series default
- à 0
-\begin_inset space \thinspace{}
-\end_inset
-
-pt.
+ à 
+\family sans
+0.1
+\backslash
+columnwidth
+\family default
+:
 \begin_inset ERT
 status collapsed
 
@@ -5610,7 +5651,9 @@ status collapsed
 \backslash
 setlength{
 \backslash
-LTleft}{0pt}
+LTleft}{0.1
+\backslash
+columnwidth}
 \end_layout
 
 \end_inset

diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index 6860fa13752b4004cbb38fa67ab134baa0f2bc61..d8ec6fabbcfabff5e0f842969d37ff157e9db339 100644 (file)
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -1672,7 +1672,15 @@ reference "sub:連結列"
 
 \end_inset
 
-節をご参照下さい。
+節をご参照下さい 
+\lang english
+or the cells of one column as multirow cell, see section
+\begin_inset space ~
+\end_inset
+
+??
+\lang japanese
+。
 \begin_inset Newline newline
 \end_inset
 
@@ -1932,6 +1940,18 @@ status collapsed
 は、現在セルあるいは現在列の内容を右揃えにします。
 \end_layout
 
+\begin_layout Labeling
+\begin_inset Graphics
+       filename ../../images/tabular-feature_align-decimal.png
+       scaleBeforeRotation
+
+\end_inset
+
+ 
+\lang english
+aligns the content of the current column at a character
+\end_layout
+
 \begin_layout Labeling
 \begin_inset Graphics
        filename ../../images/tabular-feature_m-valign-top.png
@@ -1992,6 +2012,18 @@ status collapsed
 は、現在セルあるいは選択範囲を連結列にします。
 \end_layout
 
+\begin_layout Labeling
+\begin_inset Graphics
+       filename ../../images/tabular-feature_multirow.png
+       scaleBeforeRotation
+
+\end_inset
+
+ 
+\lang english
+sets the current cell or selection as a multirow
+\end_layout
+
 \begin_layout Standard
 \begin_inset Note Greyedout
 status open
@@ -4784,7 +4816,25 @@ status collapsed
 \end_layout
 
 \begin_layout Standard
-長尺表は、既定値では中央揃えになっています。行や列の揃えとは異なり、表の揃えは、いまのところ表ダイアログで変更することができません。長尺表の揃えを変更するには、
+
+\lang english
+The horizontal alignment of longtables can be set in the table settings
+ dialog.
+ For left- and right-alignment the table will be directly at the page border.
+ To add space between the table and the border one has to set the alignment
+ to center and change the value of the LaTeX-lengths 
+\series bold
+
+\backslash
+LTleft 
+\series default
+or 
+\series bold
+
+\backslash
+LTright
+\series default
+ by inserting this line as TeX-Code before the longtable:
 \end_layout
 
 \begin_layout Standard
@@ -4839,17 +4889,27 @@ fill
 \end_layout
 
 \begin_layout Standard
-以下の長尺表は
+
+\lang english
+The following longtable was centered and
+\lang japanese
+ 
 \series bold
 
 \backslash
 LTleft
 \series default
-を0
-\begin_inset space \thinspace{}
-\end_inset
-
-ptに設定して、左揃えにした例です。
+ 
+\lang english
+set to
+\lang japanese
+ 
+\family sans
+0.1
+\backslash
+columnwidth
+\family default
+:
 \begin_inset ERT
 status collapsed
 
@@ -4859,7 +4919,9 @@ status collapsed
 \backslash
 setlength{
 \backslash
-LTleft}{0pt}
+LTleft}{0.1
+\backslash
+columnwidth}
 \end_layout
 
 \end_inset
@@ -5147,7 +5209,7 @@ addtocounter{table}{-1}
 
 
 \begin_inset Note Note
-status open
+status collapsed
 
 \begin_layout Plain Layout
 このコマンドの説明に関しては、第