diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 9fc160b110..92c58df78b 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -1,5 +1,5 @@
#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/
-\lyxformat 407
+\lyxformat 408
\begin_document
\begin_header
\textclass scrbook
@@ -2009,7 +2009,26 @@ You can alter a table by clicking on it with the right mouse button, which
contents
\emph default
of the cell, and the cell itself.
- You can alter tables with the following tabs of the table dialog:
+\begin_inset Newline newline
+\end_inset
+
+With the dialog option
+\family sans
+Immediate
+\begin_inset space ~
+\end_inset
+
+Apply
+\family default
+ every change you make in the dialog is directly applied.
+ If you move the cursor to another table cell the dialog will then also
+ be updated with the parameters of the new cell.
+ If you change length values in the dialog you must press return to get
+ the change applied.
+\begin_inset Newline newline
+\end_inset
+
+You can alter tables with the following tabs of the table dialog:
\end_layout
\begin_layout Description
@@ -2062,7 +2081,7 @@ reference "sub:Multiple-Lines-in"
\end_inset
.
- If you set no width, the column is as wide as the content of the widest
+ If you set no width, the column is as wide as the content of its widest
cell.
\begin_inset Newline newline
\end_inset
@@ -2115,6 +2134,218 @@ Note:
\end_inset
+\begin_inset Newline newline
+\end_inset
+
+The table-wide vertical alignment is used for tables within text lines:
+\begin_inset Newline newline
+\end_inset
+
+A line with tables with different alignments:
+\begin_inset Tabular
+
+
+
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\family roman
+\series medium
+\shape up
+\size normal
+\emph off
+\bar no
+\noun off
+\color none
+1
+\end_layout
+
+\end_inset
+ |
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\family roman
+\series medium
+\shape up
+\size normal
+\emph off
+\bar no
+\noun off
+\color none
+A
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\end_inset
+
+
+\begin_inset Tabular
+
+
+
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\family roman
+\series medium
+\shape up
+\size normal
+\emph off
+\bar no
+\noun off
+\color none
+1
+\end_layout
+
+\end_inset
+ |
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\family roman
+\series medium
+\shape up
+\size normal
+\emph off
+\bar no
+\noun off
+\color none
+A
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\end_inset
+
+
+\begin_inset Tabular
+
+
+
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\family roman
+\series medium
+\shape up
+\size normal
+\emph off
+\bar no
+\noun off
+\color none
+1
+\end_layout
+
+\end_inset
+ |
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\family roman
+\series medium
+\shape up
+\size normal
+\emph off
+\bar no
+\noun off
+\color none
+A
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\end_inset
+
+
\begin_inset Newline newline
\end_inset
@@ -2221,12 +2452,6 @@ reference "sec:Special-Longtable-Issues"
describe the longtable features in detail.
\end_layout
-\begin_layout Standard
-When the table dialog is open, you can move the cursor with the arrow keys
- from cell to cell and the property of the current cell will immediately
- be displayed in the dialog.
-\end_layout
-
\begin_layout Section
Table Toolbar
\begin_inset Index idx
@@ -12010,7 +12235,8 @@ n
:
\begin_inset Formula \begin{equation}
-W_{g\, n}=(W_{g\,\mathrm{multicolumn}}+(1-n)\cdot(12.4\,\mathrm{pt}))/n\label{eq:Wgn}\end{equation}
+W_{g\, n}=(W_{g\,\mathrm{multicolumn}}+(1-n)\cdot(12.4\,\mathrm{pt}))/n\label{eq:Wgn}
+\end{equation}
\end_inset
@@ -12035,7 +12261,8 @@ reference "eq:Wgn"
becomes
\begin_inset Formula \begin{equation}
-W_{g\,2}=1.25\,\mathrm{cm}-6.2\,\mathrm{pt}\end{equation}
+W_{g\,2}=1.25\,\mathrm{cm}-6.2\,\mathrm{pt}
+\end{equation}
\end_inset
@@ -34625,7 +34852,8 @@ n
\begin_layout Standard
\begin_inset Formula \begin{equation}
-W_{\mathrm{tot}\, n}=n\cdot(W_{g\, n}+2\cdot\backslash\mbox{tabcolsep})+(n+1)\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_n}\end{equation}
+W_{\mathrm{tot}\, n}=n\cdot(W_{g\, n}+2\cdot\backslash\mbox{tabcolsep})+(n+1)\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_n}
+\end{equation}
\end_inset
@@ -34679,7 +34907,8 @@ reference "eq:Wtot_n"
\begin_layout Standard
\begin_inset Formula \begin{equation}
-W_{\mathrm{tot\, mult}}=W_{g\,\mathrm{mult}}+2\cdot\backslash\mbox{tabcolsep}+2\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_mult}\end{equation}
+W_{\mathrm{tot\, mult}}=W_{g\,\mathrm{mult}}+2\cdot\backslash\mbox{tabcolsep}+2\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_mult}
+\end{equation}
\end_inset
@@ -34722,7 +34951,8 @@ n
\begin_layout Standard
\begin_inset Formula \begin{equation}
-W_{g\, n}=(W_{g\,\mathrm{mult}}+(1-n)\cdot(2\cdot\backslash\mbox{tabcolsep}+\backslash\mbox{arrayrulewidth}))/n\end{equation}
+W_{g\, n}=(W_{g\,\mathrm{mult}}+(1-n)\cdot(2\cdot\backslash\mbox{tabcolsep}+\backslash\mbox{arrayrulewidth}))/n
+\end{equation}
\end_inset
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 95c83cbc66..7a7d9eb9c6 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -1,5 +1,5 @@
#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/
-\lyxformat 407
+\lyxformat 408
\begin_document
\begin_header
\textclass scrbook
@@ -1878,7 +1878,7 @@ D
\end_layout
\begin_layout Section
-Tabellen-Einstellungen
+Tabellen-Dialog
\begin_inset Index idx
status collapsed
@@ -1899,11 +1899,7 @@ Sie können das Aussehen einer Tabelle ändern, indem Sie mit der rechten
Einstellungen
\family default
steht.
- Ein Klick darauf öffnet das Fenster
-\family sans
-Tabellen-Einstellungen
-\family default
-.
+ Ein Klick darauf öffnet den Tabellen-Dialog.
Hier können die Einstellungen der Zelle, in der der Mauszeiger beim Rechtsklick
gerade war, geändert werden und auch die der zugehörigen Zeile und Spalte.
Viele Optionen sind auch für eine Zellenauswahl wirksam.
@@ -1915,11 +1911,26 @@ Tabellen-Einstellungen
Inhalt
\emph default
einer Zelle oder die Zelle selber ausgewählt haben.
- Das
+\begin_inset Newline newline
+\end_inset
+
+Mit der Dialog-Option
\family sans
-Tabellen-Einstellungen
+Direkt
+\begin_inset space ~
+\end_inset
+
+übernehmen
\family default
--Menü hat folgende Karteikarten:
+ wird jede Änderung, die Sie machen, direkt übernommen.
+ Wenn Sie den Cursor in eine andere Tabellenzelle setzen, zeigt der Dialog
+ dann auch die Parameter der neuen Zelle an.
+ Wenn Sie Längenwerte im Dialog ändern, müssen Sie Enter drücken, um die
+ Änderung zu übernehmen.
+\begin_inset Newline newline
+\end_inset
+
+Der Tabellen-Dialog hat folgende Karteikarten:
\end_layout
\begin_layout Description
@@ -1999,7 +2010,7 @@ reference "uab:Mehrfachzeilen"
Weiterhin können Sie eine Zelle, eine Auswahl oder die gesamte Tabelle gegen
den Uhrzeigersinn um 90° drehen.
- LyX zeigt diese Drehung nicht, nur die druckfertige Ausgabe.
+ LyX zeigt diese Drehung nur in der Ausgabe.
\begin_inset Newline newline
\end_inset
@@ -2018,6 +2029,165 @@ Achtung:
\end_inset
+\begin_inset Newline newline
+\end_inset
+
+Die tabellenweite vertikale Ausrichtung wird für Tabellen innerhalb von
+ Textzeilen verwendet:
+\begin_inset Newline newline
+\end_inset
+
+Zeile mit Tabellen mit verschiedenen Ausrichtungen:
+\begin_inset Tabular
+
+
+
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+ |
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+A
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\end_inset
+
+
+\begin_inset Tabular
+
+
+
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+ |
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+A
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\end_inset
+
+
+\begin_inset Tabular
+
+
+
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+ |
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+A
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\end_inset
+
+
\begin_inset Newline newline
\end_inset
@@ -2126,15 +2296,6 @@ reference "abs:Special-Longtable-Issues"
beschreiben diese Funktion genauer.
\end_layout
-\begin_layout Standard
-Wenn das Menü
-\family sans
-Tabellen-Einstellungen
-\family default
- geöffnet ist, können Sie den Cursor mit den Pfeiltasten von Zelle zu Zelle
- bewegen, und die Eigenschaften der jeweiligen Zelle werden angezeigt.
-\end_layout
-
\begin_layout Section
Tabellen-Werkzeugleiste
\begin_inset Index idx
@@ -12065,7 +12226,8 @@ n
sein soll, wie folgt:
\begin_inset Formula \begin{equation}
-W_{g\, n}=(W_{g\,\mathrm{multicolumn}}+(1-n)\cdot(12.4\,\mathrm{pt}))/n\label{eq:Wgn}\end{equation}
+W_{g\, n}=(W_{g\,\mathrm{multicolumn}}+(1-n)\cdot(12.4\,\mathrm{pt}))/n\label{eq:Wgn}
+\end{equation}
\end_inset
@@ -12094,7 +12256,8 @@ reference "eq:Wgn"
\begin_inset Formula \begin{equation}
-W_{g\,2}=1.25\,\mathrm{cm}-6.2\,\mathrm{pt}\end{equation}
+W_{g\,2}=1.25\,\mathrm{cm}-6.2\,\mathrm{pt}
+\end{equation}
\end_inset
@@ -34805,7 +34968,8 @@ Die Gesamtbreite von
\begin_layout Standard
\begin_inset Formula \begin{equation}
-W_{\mathrm{tot}\, n}=n\cdot(W_{g\, n}+2\cdot\backslash\mbox{tabcolsep})+(n+1)\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_n}\end{equation}
+W_{\mathrm{tot}\, n}=n\cdot(W_{g\, n}+2\cdot\backslash\mbox{tabcolsep})+(n+1)\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_n}
+\end{equation}
\end_inset
@@ -34864,7 +35028,8 @@ reference "eq:Wtot_n"
\begin_layout Standard
\begin_inset Formula \begin{equation}
-W_{\mathrm{tot\, mult}}=W_{g\,\mathrm{mult}}+2\cdot\backslash\mbox{tabcolsep}+2\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_mult}\end{equation}
+W_{\mathrm{tot\, mult}}=W_{g\,\mathrm{mult}}+2\cdot\backslash\mbox{tabcolsep}+2\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_mult}
+\end{equation}
\end_inset
@@ -34907,7 +35072,8 @@ n
\begin_layout Standard
\begin_inset Formula \begin{equation}
-W_{g\, n}=(W_{g\,\mathrm{mult}}+(1-n)\cdot(2\cdot\backslash\mbox{tabcolsep}+\backslash\mbox{arrayrulewidth}))/n\end{equation}
+W_{g\, n}=(W_{g\,\mathrm{mult}}+(1-n)\cdot(2\cdot\backslash\mbox{tabcolsep}+\backslash\mbox{arrayrulewidth}))/n
+\end{equation}
\end_inset
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index 80f92426b6..cb1290c651 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -1,5 +1,5 @@
#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/
-\lyxformat 407
+\lyxformat 408
\begin_document
\begin_header
\textclass scrbook
@@ -1878,7 +1878,30 @@ Una tabla se puede cambiar mediante el cuadro de diálogo que aparece al
contenido
\emph default
.
- En el cuadro de diálogo aparecen las siguientes solapas:
+\begin_inset Newline newline
+\end_inset
+
+
+\lang english
+With the dialog option
+\family sans
+Immediate
+\begin_inset space ~
+\end_inset
+
+Apply
+\family default
+ every change you make in the dialog is directly applied.
+ If you move the cursor to another table cell the dialog will then also
+ be updated with the parameters of the new cell.
+ If you change length values in the dialog you must press return to get
+ the change applied.
+\lang spanish
+
+\begin_inset Newline newline
+\end_inset
+
+En el cuadro de diálogo aparecen las siguientes solapas:
\end_layout
\begin_layout Description
@@ -1998,6 +2021,168 @@ Nota:
\end_inset
+\begin_inset Newline newline
+\end_inset
+
+
+\lang english
+The table-wide vertical alignment is used for tables within text lines:
+\begin_inset Newline newline
+\end_inset
+
+A line with tables with different alignments
+\lang spanish
+:
+\begin_inset Tabular
+
+
+
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+ |
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+A
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\end_inset
+
+
+\begin_inset Tabular
+
+
+
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+ |
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+A
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\end_inset
+
+
+\begin_inset Tabular
+
+
+
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+ |
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+A
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\end_inset
+
+
\begin_inset Newline newline
\end_inset
@@ -2102,12 +2287,6 @@ reference "sec:Particularidades-tablas-largas"
describen sus características en detalle.
\end_layout
-\begin_layout Standard
-Si la barra de herramientas de tabla está abierta, puedes mover el cursor
- con las teclas de flecha de celda en celda y la propiedad de la celda actual
- aparecerá inmediatamente en el diálogo.
-\end_layout
-
\begin_layout Section
Barra de herramientas de tabla
\begin_inset Index idx
@@ -11877,7 +12056,8 @@ n
:
\begin_inset Formula \begin{equation}
-W_{g\, n}=(W_{g\,\mathrm{multicolumn}}+(1-n)\cdot(12.4\,\mathrm{pt}))/n\label{eq:Wgn}\end{equation}
+W_{g\, n}=(W_{g\,\mathrm{multicolumn}}+(1-n)\cdot(12.4\,\mathrm{pt}))/n\label{eq:Wgn}
+\end{equation}
\end_inset
@@ -11910,7 +12090,8 @@ reference "eq:Wgn"
queda
\begin_inset Formula \begin{equation}
-W_{g\,2}=1.25\,\mathrm{cm}-6.2\,\mathrm{pt}\end{equation}
+W_{g\,2}=1.25\,\mathrm{cm}-6.2\,\mathrm{pt}
+\end{equation}
\end_inset
@@ -34178,7 +34359,8 @@ n
\begin_layout Standard
\begin_inset Formula \begin{equation}
-W_{\mathrm{tot}\, n}=n\cdot(W_{g\, n}+2\cdot\backslash\mbox{tabcolsep})+(n+1)\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_n}\end{equation}
+W_{\mathrm{tot}\, n}=n\cdot(W_{g\, n}+2\cdot\backslash\mbox{tabcolsep})+(n+1)\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_n}
+\end{equation}
\end_inset
@@ -34236,7 +34418,8 @@ reference "eq:Wtot_n"
\begin_layout Standard
\begin_inset Formula \begin{equation}
-W_{\mathrm{tot\, mult}}=W_{g\,\mathrm{mult}}+2\cdot\backslash\mbox{tabcolsep}+2\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_mult}\end{equation}
+W_{\mathrm{tot\, mult}}=W_{g\,\mathrm{mult}}+2\cdot\backslash\mbox{tabcolsep}+2\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_mult}
+\end{equation}
\end_inset
@@ -34279,7 +34462,8 @@ n
\begin_layout Standard
\begin_inset Formula \begin{equation}
-W_{g\, n}=(W_{g\,\mathrm{mult}}+(1-n)\cdot(2\cdot\backslash\mbox{tabcolsep}+\backslash\mbox{arrayrulewidth}))/n\end{equation}
+W_{g\, n}=(W_{g\,\mathrm{mult}}+(1-n)\cdot(2\cdot\backslash\mbox{tabcolsep}+\backslash\mbox{arrayrulewidth}))/n
+\end{equation}
\end_inset
diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index 32cf38f3d3..af31dcbd1c 100644
--- a/lib/doc/fr/EmbeddedObjects.lyx
+++ b/lib/doc/fr/EmbeddedObjects.lyx
@@ -1,5 +1,5 @@
#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/
-\lyxformat 407
+\lyxformat 408
\begin_document
\begin_header
\textclass scrbook
@@ -2180,8 +2180,31 @@ Vous pouvez agir sur un tableau en cliquant dessus avec le bouton droit
contenu
\emph default
d'une cellule et sélectionner la cellule elle-même.
- Vous pouvez utiliser les onglets suivants de la fenêtre de dialogue de
- tableaux :
+\begin_inset Newline newline
+\end_inset
+
+
+\lang english
+With the dialog option
+\family sans
+Immediate
+\begin_inset space ~
+\end_inset
+
+Apply
+\family default
+ every change you make in the dialog is directly applied.
+ If you move the cursor to another table cell the dialog will then also
+ be updated with the parameters of the new cell.
+ If you change length values in the dialog you must press return to get
+ the change applied.
+\lang french
+
+\begin_inset Newline newline
+\end_inset
+
+Vous pouvez utiliser les onglets suivants de la fenêtre de dialogue de tableaux
+ :
\end_layout
\begin_layout Description
@@ -2331,13 +2354,175 @@ pas
\end_inset
-\lang english
-
\begin_inset Newline newline
\end_inset
+\lang english
+The table-wide vertical alignment is used for tables within text lines
\lang french
+ :
+\begin_inset Newline newline
+\end_inset
+
+
+\lang english
+A line with tables with different alignments:
+\lang french
+
+\begin_inset Tabular
+
+
+
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+ |
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+A
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\end_inset
+
+
+\begin_inset Tabular
+
+
+
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+ |
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+A
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\end_inset
+
+
+\begin_inset Tabular
+
+
+
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+ |
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+A
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
On peut aussi entrer des paramètres LaTeX pour obtenir des mise en formes
spéciales pour le tableau, voir les sections
\begin_inset space ~
@@ -2450,12 +2635,6 @@ reference "sec:Questions-sur-tableaux-longs"
décrivent ces tableaux longs plus en détail.
\end_layout
-\begin_layout Standard
-Quand la barre d'outils tableau est activée, vous pouvez déplacer le curseur
- de cellule en cellule avec les touches de déplacement et voir s'afficher
- les propriétés de la cellule courante dans la fenêtre de dialogue.
-\end_layout
-
\begin_layout Section
La barre d'outils tableau
\begin_inset Index idx
@@ -12290,7 +12469,8 @@ n
:
\begin_inset Formula \begin{equation}
-W_{g\, n}=(W_{g\,\mathrm{multicolonne}}+(1-n)\cdot(12.4\,\mathrm{pt}))/n\label{eq:Wgn}\end{equation}
+W_{g\, n}=(W_{g\,\mathrm{multicolonne}}+(1-n)\cdot(12.4\,\mathrm{pt}))/n\label{eq:Wgn}
+\end{equation}
\end_inset
@@ -12319,7 +12499,8 @@ reference "eq:Wgn"
devient
\begin_inset Formula \begin{equation}
-W_{g\,2}=1.25\,\mathrm{cm}-6.2\,\mathrm{pt}\end{equation}
+W_{g\,2}=1.25\,\mathrm{cm}-6.2\,\mathrm{pt}
+\end{equation}
\end_inset
@@ -35573,7 +35754,8 @@ n
\begin_layout Standard
\begin_inset Formula \begin{equation}
-W_{\mathrm{tot}\, n}=n\cdot(W_{g\, n}+2\cdot\backslash\mbox{tabcolsep})+(n+1)\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_n}\end{equation}
+W_{\mathrm{tot}\, n}=n\cdot(W_{g\, n}+2\cdot\backslash\mbox{tabcolsep})+(n+1)\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_n}
+\end{equation}
\end_inset
@@ -35632,7 +35814,8 @@ reference "eq:Wtot_n"
\begin_layout Standard
\begin_inset Formula \begin{equation}
-W_{\mathrm{tot\, mult}}=W_{g\,\mathrm{mult}}+2\cdot\backslash\mbox{tabcolsep}+2\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_mult}\end{equation}
+W_{\mathrm{tot\, mult}}=W_{g\,\mathrm{mult}}+2\cdot\backslash\mbox{tabcolsep}+2\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_mult}
+\end{equation}
\end_inset
@@ -35676,7 +35859,8 @@ n
\begin_layout Standard
\begin_inset Formula \begin{equation}
-W_{g\, n}=(W_{g\,\mathrm{mult}}+(1-n)\cdot(2\cdot\backslash\mbox{tabcolsep}+\backslash\mbox{arrayrulewidth}))/n\end{equation}
+W_{g\, n}=(W_{g\,\mathrm{mult}}+(1-n)\cdot(2\cdot\backslash\mbox{tabcolsep}+\backslash\mbox{arrayrulewidth}))/n
+\end{equation}
\end_inset
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index faded2b689..0f6d950823 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -1,5 +1,5 @@
#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/
-\lyxformat 407
+\lyxformat 408
\begin_document
\begin_header
\textclass jbook
@@ -1638,7 +1638,31 @@ status collapsed
\emph on
内容
\emph default
-を選択するのと、セル自体を選択するのは違うことに注意して下さい。表ダイアログの以下の各タブを使用して、表に変更を加えることができます。
+を選択するのと、セル自体を選択するのは違うことに注意して下さい。
+\begin_inset Newline newline
+\end_inset
+
+
+\lang english
+With the dialog option
+\family sans
+Immediate
+\begin_inset space ~
+\end_inset
+
+Apply
+\family default
+ every change you make in the dialog is directly applied.
+ If you move the cursor to another table cell the dialog will then also
+ be updated with the parameters of the new cell.
+ If you change length values in the dialog you must press return to get
+ the change applied.
+\lang japanese
+
+\begin_inset Newline newline
+\end_inset
+
+表ダイアログの以下の各タブを使用して、表に変更を加えることができます。
\end_layout
\begin_layout Description
@@ -1725,6 +1749,168 @@ DVIビューアのすべてが回転を表示できるわけではありませ
\end_inset
+\begin_inset Newline newline
+\end_inset
+
+
+\lang english
+The table-wide vertical alignment is used for tables within text lines:
+\begin_inset Newline newline
+\end_inset
+
+A line with tables with different alignments
+\lang japanese
+:
+\begin_inset Tabular
+
+
+
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+ |
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+A
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\end_inset
+
+
+\begin_inset Tabular
+
+
+
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+ |
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+A
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\end_inset
+
+
+\begin_inset Tabular
+
+
+
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+ |
+
+
+|
+\begin_inset Text
+
+\begin_layout Plain Layout
+A
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\end_inset
+
+
\begin_inset Newline newline
\end_inset
@@ -1805,10 +1991,6 @@ reference "sec:長尺表にまつわる諸点"
節に、長尺表の機能に関する詳細な説明があります。
\end_layout
-\begin_layout Standard
-表ダイアログを開いたままでも、セル間をカーソルを使って移動することができ、その際、現在セルの特性が直ちにダイアログに表示されます。
-\end_layout
-
\begin_layout Section
表ツールバー
\begin_inset Index idx
@@ -11334,7 +11516,8 @@ n
は、
\begin_inset Formula \begin{equation}
-W_{\mbox{指}:n}=(W_{\mbox{指}:\text{連結列}}+(1-n)\cdot(12.4\,\mathrm{pt}))/n\label{eq:Wgn}\end{equation}
+W_{\mbox{指}:n}=(W_{\mbox{指}:\text{連結列}}+(1-n)\cdot(12.4\,\mathrm{pt}))/n\label{eq:Wgn}
+\end{equation}
\end_inset
@@ -11359,7 +11542,8 @@ reference "eq:Wgn"
式は
\begin_inset Formula \begin{equation}
-W_{\text{指}:2}=1.25\,\mathrm{cm}-6.2\,\mathrm{pt}\end{equation}
+W_{\text{指}:2}=1.25\,\mathrm{cm}-6.2\,\mathrm{pt}
+\end{equation}
\end_inset
@@ -32256,7 +32440,8 @@ name "cha:式の説明"
\begin_layout Standard
\begin_inset Formula \begin{equation}
-W_{\mathrm{tot}\, n}=n\cdot(W_{g\, n}+2\cdot\backslash\mbox{tabcolsep})+(n+1)\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_n}\end{equation}
+W_{\mathrm{tot}\, n}=n\cdot(W_{g\, n}+2\cdot\backslash\mbox{tabcolsep})+(n+1)\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_n}
+\end{equation}
\end_inset
@@ -32308,7 +32493,8 @@ reference "eq:Wtot_n"
\begin_layout Standard
\begin_inset Formula \begin{equation}
-W_{\mathrm{tot\, mult}}=W_{g\,\mathrm{mult}}+2\cdot\backslash\mbox{tabcolsep}+2\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_mult}\end{equation}
+W_{\mathrm{tot\, mult}}=W_{g\,\mathrm{mult}}+2\cdot\backslash\mbox{tabcolsep}+2\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_mult}
+\end{equation}
\end_inset
@@ -32347,7 +32533,8 @@ reference "eq:Wtot_mult"
\begin_layout Standard
\begin_inset Formula \begin{equation}
-W_{g\, n}=(W_{g\,\mathrm{mult}}+(1-n)\cdot(2\cdot\backslash\mbox{tabcolsep}+\backslash\mbox{arrayrulewidth}))/n\end{equation}
+W_{g\, n}=(W_{g\,\mathrm{mult}}+(1-n)\cdot(2\cdot\backslash\mbox{tabcolsep}+\backslash\mbox{arrayrulewidth}))/n
+\end{equation}
\end_inset