EmbeddedObjects.lyx: multirows:

- correct description about their alignment
- describe vertical offset

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

diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 8d4a8b903aec0aad73ae85f9fa45cb19a54b993a..9fc160b110bbca94ac096aa3d84ccc7084023d2e 100644 (file)
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -1,5 +1,5 @@
-#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 404
+#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/
+\lyxformat 407
 \begin_document
 \begin_header
 \textclass scrbook
@@ -12235,11 +12235,11 @@ Here is an example table with a multirow in the first column:
 <column alignment="center" valignment="top" width="0">
 <column alignment="center" valignment="top" width="0">
 <row>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-a
+a long cell entry
 \end_layout
 
 \end_inset
@@ -12264,11 +12264,11 @@ c
 </cell>
 </row>
 <row>
-<cell multirow="3" alignment="center" valignment="middle" topline="true" bottomline="true" leftline="true" usebox="none">
+<cell multirow="3" alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-multirow entry
+multirow
 \end_layout
 
 \end_inset
@@ -12293,7 +12293,7 @@ f
 </cell>
 </row>
 <row>
-<cell multirow="4" alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
+<cell multirow="4" alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -12329,8 +12329,244 @@ i
 \end_layout
 
 \begin_layout Standard
-The width and alignment of multirow cells is set by setting the width and
- alignment for the whole column.
+The width of multirow cells is set by setting the width and alignment for
+ the whole column.
+ The 
+\family sans
+Vertical Offset
+\family default
+ shifts the content of the multirow up/down if the offset is positive/negative.
+\end_layout
+
+\begin_layout Standard
+If the column of a multirow cell has no explicit width, the multirow cell
+ inherits the alignment of the column.
+ Otherwise it is by default left-aligned.
+ To override the default, renew the command 
+\series bold
+
+\backslash
+multirowsetup
+\series default
+ with the command
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+multirowsetup}{
+\backslash
+centering}
+\end_layout
+
+\begin_layout Standard
+in the document preamble.
+ Then all entries of multirow cells in the document are centered.
+ If centering is only needed for several tables, you can renew the command
+ in a TeX-Code box just before the table instead of the preamble.
+ If the text should be right-aligned, replace 
+\series bold
+
+\backslash
+centering
+\series default
+ by 
+\series bold
+
+\backslash
+raggedleft
+\series default
+.
+ To return to left-alignment 
+\series bold
+
+\backslash
+raggedright
+\series default
+ is used.
+\end_layout
+
+\begin_layout Standard
+This is an example table with a right-aligned multirow cell that has a vertical
+ offset of -4
+\begin_inset space \thinspace{}
+\end_inset
+
+mm and is in a 3
+\begin_inset space \thinspace{}
+\end_inset
+
+cm wide column:
+\end_layout
+
+\begin_layout Standard
+\noindent
+\align center
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+multirowsetup}{
+\backslash
+raggedleft}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Tabular
+<lyxtabular version="3" rows="4" columns="3">
+<features tabularvalignment="middle">
+<column alignment="center" valignment="top" width="3cm">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+a long cell entry
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+b
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+c
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+t
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+n
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+m
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell multirow="3" mroffset="-4mm" alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+multirow
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+e
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+f
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell multirow="4" alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+h
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+i
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+multirowsetup}{
+\backslash
+raggedright}
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Section

diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 746d97446cd399936a77906ba78f2fc55b504c1b..95c83cbc661a7151279236ed4f42a7dbb73ad26c 100644 (file)
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -1,5 +1,5 @@
-#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 404
+#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/
+\lyxformat 407
 \begin_document
 \begin_header
 \textclass scrbook
@@ -12364,7 +12364,7 @@ Mehrfachzeile
 \end_layout
 
 \begin_layout Standard
-Dies ist eine Beispieltabelle mit einer Mehrfachzeile in der ersten Spalte:
+Hier ist eine Beispieltabelle mit einer Mehrfachzeile in der ersten Spalte:
 \end_layout
 
 \begin_layout Standard
@@ -12376,11 +12376,11 @@ Dies ist eine Beispieltabelle mit einer Mehrfachzeile in der ersten Spalte:
 <column alignment="center" valignment="top" width="0">
 <column alignment="center" valignment="top" width="0">
 <row>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-a
+ein langer Eintrag
 \end_layout
 
 \end_inset
@@ -12405,11 +12405,11 @@ c
 </cell>
 </row>
 <row>
-<cell multirow="3" alignment="center" valignment="middle" topline="true" bottomline="true" leftline="true" usebox="none">
+<cell multirow="3" alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-mehrzeiliger Text
+Mehrfachzeile
 \end_layout
 
 \end_inset
@@ -12434,7 +12434,7 @@ f
 </cell>
 </row>
 <row>
-<cell multirow="4" alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
+<cell multirow="4" alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -12470,8 +12470,246 @@ i
 \end_layout
 
 \begin_layout Standard
-Die Breite und Ausrichtung einer Mehrfachzeile wird durch Setzen der Breite
- und Ausrichtung für die komplette Spalte festgelegt.
+Die Breite einer Mehrfachzeile wird durch Setzen der Breite für die komplette
+ Spalte festgelegt.
+ Der 
+\family sans
+Vertikale Versatz
+\family default
+ verschiebt den Inhalt der Mehrfachzeile nach oben/unten wenn der Versatz
+ positiv/negativ ist.
+\end_layout
+
+\begin_layout Standard
+Wenn die Spalte der Mehrfachzeile keine explizite Breite hat, übernimmt
+ die Mehrfachzeile die Ausrichtung der Spalte.
+ Ansonsten ist sie standardmäßig links ausgerichtet.
+ Um die Ausrichtung zu ändern, erneuern Sie den Befehl 
+\series bold
+
+\backslash
+multirowsetup
+\series default
+ mit dem Befehl
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+multirowsetup}{
+\backslash
+centering}
+\end_layout
+
+\begin_layout Standard
+im LaTeX-Vorspann.
+ Es werden dann die Inhalte aller Mehrfachzeilen-Zellen des Dokuments zentriert.
+ Wenn diese Ausrichtung nur für einige Tabellen gelten soll, kann der Befehl
+ auch mittels TeX-Code vor der jeweiligen Tabelle, statt im LaTeX-Vorspann,
+ erneuert werden.
+ Für rechtsbündigen Text ersetzt man 
+\series bold
+
+\backslash
+centering
+\series default
+ durch 
+\series bold
+
+\backslash
+raggedleft
+\series default
+.
+ Um zur linksbündigen Ausrichtung zurückzukehren, wird 
+\series bold
+
+\backslash
+raggedright
+\series default
+ verwendet.
+\end_layout
+
+\begin_layout Standard
+Dies ist eine Beispieltabelle mit einer rechts ausgerichteten Mehrfachzeile
+ die -4
+\begin_inset space \thinspace{}
+\end_inset
+
+mm vertikalen Versatz hat und sich in einer 3
+\begin_inset space \thinspace{}
+\end_inset
+
+cm breiten Spalte befindet:
+\end_layout
+
+\begin_layout Standard
+\noindent
+\align center
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+multirowsetup}{
+\backslash
+raggedleft}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Tabular
+<lyxtabular version="3" rows="4" columns="3">
+<features tabularvalignment="middle">
+<column alignment="center" valignment="top" width="3cm">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+ein langer Eintrag
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+b
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+c
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+t
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+n
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+m
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell multirow="3" mroffset="-4mm" alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Mehrfachzeile
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+e
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+f
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell multirow="4" alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+h
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+i
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+multirowsetup}{
+\backslash
+raggedright}
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Section

diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index 88aa50a04bf0655f0e08f10e6cfe935c08807934..80f92426b6cc1b416cc22f1c14edf2a57c562e65 100644 (file)
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -1,5 +1,5 @@
-#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 404
+#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/
+\lyxformat 407
 \begin_document
 \begin_header
 \textclass scrbook
@@ -12102,6 +12102,8 @@ Here is an example table with a multirow in the first column:
 
 \begin_layout Standard
 \align center
+
+\lang english
 \begin_inset Tabular
 <lyxtabular version="3" rows="3" columns="3">
 <features tabularvalignment="middle">
@@ -12109,11 +12111,13 @@ Here is an example table with a multirow in the first column:
 <column alignment="center" valignment="top" width="0">
 <column alignment="center" valignment="top" width="0">
 <row>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-a
+
+\lang english
+a long cell entry
 \end_layout
 
 \end_inset
@@ -12122,6 +12126,8 @@ a
 \begin_inset Text
 
 \begin_layout Plain Layout
+
+\lang english
 b
 \end_layout
 
@@ -12131,6 +12137,8 @@ b
 \begin_inset Text
 
 \begin_layout Plain Layout
+
+\lang english
 c
 \end_layout
 
@@ -12138,11 +12146,13 @@ c
 </cell>
 </row>
 <row>
-<cell multirow="3" alignment="center" valignment="middle" topline="true" bottomline="true" leftline="true" usebox="none">
+<cell multirow="3" alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-entrada multifila
+
+\lang english
+multifila
 \end_layout
 
 \end_inset
@@ -12151,6 +12161,8 @@ entrada multifila
 \begin_inset Text
 
 \begin_layout Plain Layout
+
+\lang english
 e
 \end_layout
 
@@ -12160,6 +12172,8 @@ e
 \begin_inset Text
 
 \begin_layout Plain Layout
+
+\lang english
 f
 \end_layout
 
@@ -12167,7 +12181,7 @@ f
 </cell>
 </row>
 <row>
-<cell multirow="4" alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
+<cell multirow="4" alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -12180,6 +12194,8 @@ f
 \begin_inset Text
 
 \begin_layout Plain Layout
+
+\lang english
 h
 \end_layout
 
@@ -12189,6 +12205,8 @@ h
 \begin_inset Text
 
 \begin_layout Plain Layout
+
+\lang english
 i
 \end_layout
 
@@ -12205,8 +12223,250 @@ i
 \begin_layout Standard
 
 \lang english
-The width and alignment of multirow cells is set by setting the width and
- alignment for the whole column.
+The width of multirow cells is set by setting the width and alignment for
+ the whole column.
+ The 
+\family sans
+Vertical Offset
+\family default
+ shifts the content of the multirow up/down if the offset is positive/negative.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+If the column of a multirow cell has no explicit width, the multirow cell
+ inherits the alignment of the column.
+ Otherwise it is by default left-aligned.
+
+\lang spanish
+ Para cambiarlo renombra el comando 
+\series bold
+
+\backslash
+multirowsetup
+\series default
+ con el comando
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+multirowsetup}{
+\backslash
+centering}
+\end_layout
+
+\begin_layout Standard
+en el preámbulo del documento.
+ Entonces se centran todas las entradas de celdas multifila en el documento.
+ Si sólo queremos centrar en algunas tablas, se puede renombrar el comando
+ en código TeX justo antes de la tabla en lugar de en el preámbulo.
+ Si el texto debe estar alineado a la derecha, reemplaza 
+\series bold
+
+\backslash
+centering
+\series default
+ por 
+\series bold
+
+\backslash
+raggedleft
+\series default
+.
+ Para volver a alineado a la izquierda usa 
+\series bold
+
+\backslash
+raggedright
+\series default
+.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+This is an example table with a right-aligned multirow cell that has a vertical
+ offset of -4
+\begin_inset space \thinspace{}
+\end_inset
+
+mm and is in a 3
+\begin_inset space \thinspace{}
+\end_inset
+
+cm wide column:
+\end_layout
+
+\begin_layout Standard
+\noindent
+\align center
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+multirowsetup}{
+\backslash
+raggedleft}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Tabular
+<lyxtabular version="3" rows="4" columns="3">
+<features tabularvalignment="middle">
+<column alignment="center" valignment="top" width="3cm">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+a long cell entry
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+b
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+c
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+t
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+n
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+m
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell multirow="3" mroffset="-4mm" alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+multifila
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+e
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+f
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell multirow="4" alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+h
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+i
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+multirowsetup}{
+\backslash
+raggedright}
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Section

diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index cc523ca497bb088ca37ba12595a8e952ec7c8f10..32cf38f3d3e7c87d31d502b13d6b5f7e7cf62a45 100644 (file)
--- a/lib/doc/fr/EmbeddedObjects.lyx
+++ b/lib/doc/fr/EmbeddedObjects.lyx
@@ -1,5 +1,5 @@
-#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 404
+#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/
+\lyxformat 407
 \begin_document
 \begin_header
 \textclass scrbook
@@ -12526,11 +12526,11 @@ Here is an example table with a multirow in the first column:
 <column alignment="center" valignment="top" width="0">
 <column alignment="center" valignment="top" width="0">
 <row>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-a
+a long cell entry
 \end_layout
 
 \end_inset
@@ -12555,11 +12555,11 @@ c
 </cell>
 </row>
 <row>
-<cell multirow="3" alignment="center" valignment="middle" topline="true" bottomline="true" leftline="true" usebox="none">
+<cell multirow="3" alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-cellule multi-lignes
+multi-ligne
 \end_layout
 
 \end_inset
@@ -12584,7 +12584,7 @@ f
 </cell>
 </row>
 <row>
-<cell multirow="4" alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
+<cell multirow="4" alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -12622,8 +12622,253 @@ i
 \begin_layout Standard
 
 \lang english
-The width and alignment of multirow cells is set by setting the width and
- alignment for the whole column.
+The width of multirow cells is set by setting the width and alignment for
+ the whole column.
+ The 
+\family sans
+Vertical Offset
+\family default
+ shifts the content of the multirow up/down if the offset is positive/negative.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+If the column of a multirow cell has no explicit width, the multirow cell
+ inherits the alignment of the column.
+ Otherwise it is by default left-aligned.
+
+\lang french
+ Pour passer outre le comportement implicite, vous devez redéfinir la commande
+ 
+\series bold
+
+\backslash
+multirowsetup
+\series default
+ avec la commande
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+multirowsetup}{
+\backslash
+centering}
+\end_layout
+
+\begin_layout Standard
+dans le préambule du document.
+ Après ça, tous les contenus de cellules multi-lignes du document seront
+ centrés.
+ Si vous ne souhaitez utiliser des contenus centrés que pour quelques tableaux,
+ vous pouvez redéfinir la commande en l'insérant sous forme de code TeX
+ juste avant le tableau concerné, plutôt que dans le préambule.
+ Si le texte doit être aligné à droite, remplacez 
+\series bold
+
+\backslash
+centering
+\series default
+ par 
+\series bold
+
+\backslash
+raggedleft
+\series default
+.
+ Pour revenir à l'alignement à gauche utilisez 
+\series bold
+
+\backslash
+raggedright
+\series default
+.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+This is an example table with a right-aligned multirow cell that has a vertical
+ offset of -4
+\begin_inset space \thinspace{}
+\end_inset
+
+mm and is in a 3
+\begin_inset space \thinspace{}
+\end_inset
+
+cm wide column:
+\end_layout
+
+\begin_layout Standard
+\noindent
+\align center
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+multirowsetup}{
+\backslash
+raggedleft}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Tabular
+<lyxtabular version="3" rows="4" columns="3">
+<features tabularvalignment="middle">
+<column alignment="center" valignment="top" width="3cm">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+a long cell entry
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+b
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+c
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+t
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+n
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+m
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell multirow="3" mroffset="-4mm" alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+multi-ligne
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+e
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+f
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell multirow="4" alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+h
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+i
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+multirowsetup}{
+\backslash
+raggedright}
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Section

diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index 2092165779cfd2b713b22fe3f03c67c52815c48f..faded2b68956f6c52402f82dc48f979c2360b431 100644 (file)
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -1,5 +1,5 @@
-#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 404
+#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/
+\lyxformat 407
 \begin_document
 \begin_header
 \textclass jbook
@@ -11553,6 +11553,8 @@ Here is an example table with a multirow in the first column:
 
 \begin_layout Standard
 \align center
+
+\lang english
 \begin_inset Tabular
 <lyxtabular version="3" rows="3" columns="3">
 <features tabularvalignment="middle">
@@ -11560,11 +11562,13 @@ Here is an example table with a multirow in the first column:
 <column alignment="center" valignment="top" width="0">
 <column alignment="center" valignment="top" width="0">
 <row>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-い
+
+\lang english
+a long cell entry
 \end_layout
 
 \end_inset
@@ -11573,7 +11577,9 @@ Here is an example table with a multirow in the first column:
 \begin_inset Text
 
 \begin_layout Plain Layout
-ろ
+
+\lang english
+b
 \end_layout
 
 \end_inset
@@ -11582,18 +11588,22 @@ Here is an example table with a multirow in the first column:
 \begin_inset Text
 
 \begin_layout Plain Layout
-は
+
+\lang english
+c
 \end_layout
 
 \end_inset
 </cell>
 </row>
 <row>
-<cell multirow="3" alignment="center" valignment="middle" topline="true" bottomline="true" leftline="true" usebox="none">
+<cell multirow="3" alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-連結行の項目
+
+\lang english
+multirow
 \end_layout
 
 \end_inset
@@ -11602,7 +11612,9 @@ Here is an example table with a multirow in the first column:
 \begin_inset Text
 
 \begin_layout Plain Layout
-ほ
+
+\lang english
+e
 \end_layout
 
 \end_inset
@@ -11611,14 +11623,16 @@ Here is an example table with a multirow in the first column:
 \begin_inset Text
 
 \begin_layout Plain Layout
-へ
+
+\lang english
+f
 \end_layout
 
 \end_inset
 </cell>
 </row>
 <row>
-<cell multirow="4" alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
+<cell multirow="4" alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -11631,7 +11645,9 @@ Here is an example table with a multirow in the first column:
 \begin_inset Text
 
 \begin_layout Plain Layout
-ち
+
+\lang english
+h
 \end_layout
 
 \end_inset
@@ -11640,7 +11656,9 @@ Here is an example table with a multirow in the first column:
 \begin_inset Text
 
 \begin_layout Plain Layout
-り
+
+\lang english
+i
 \end_layout
 
 \end_inset
@@ -11656,8 +11674,250 @@ Here is an example table with a multirow in the first column:
 \begin_layout Standard
 
 \lang english
-The width and alignment of multirow cells is set by setting the width and
- alignment for the whole column.
+The width of multirow cells is set by setting the width and alignment for
+ the whole column.
+ The 
+\family sans
+Vertical Offset
+\family default
+ shifts the content of the multirow up/down if the offset is positive/negative.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+If the column of a multirow cell has no explicit width, the multirow cell
+ inherits the alignment of the column.
+ Otherwise it is by default left-aligned.
+ To override the default, renew the command 
+\series bold
+
+\backslash
+multirowsetup
+\series default
+ with the command
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+multirowsetup}{
+\backslash
+centering}
+\end_layout
+
+\begin_layout Standard
+というコマンドを使用して、コマンド
+\series bold
+
+\backslash
+multirowsetup
+\series default
+を書き換えて下さい。すると、文書中の連結行の中身が、すべて中央揃えになります。もしいくつかの表だけ中央揃えにしたいのであれば、プリアンブルではなく表の直前にTe
+Xコードボックスを入れて、このコマンドを書き換えれば済みます。文章を右揃えにしたい場合には、
+\series bold
+
+\backslash
+centering
+\series default
+の代わりに
+\series bold
+
+\backslash
+raggedleft
+\series default
+を使用して下さい。左揃えに戻すには、
+\series bold
+
+\backslash
+raggedright
+\series default
+とします。
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+This is an example table with a right-aligned multirow cell that has a vertical
+ offset of -4
+\begin_inset space \thinspace{}
+\end_inset
+
+mm and is in a 3
+\begin_inset space \thinspace{}
+\end_inset
+
+cm wide column:
+\end_layout
+
+\begin_layout Standard
+\noindent
+\align center
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+multirowsetup}{
+\backslash
+raggedleft}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Tabular
+<lyxtabular version="3" rows="4" columns="3">
+<features tabularvalignment="middle">
+<column alignment="center" valignment="top" width="3cm">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+a long cell entry
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+b
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+c
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+t
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+n
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+m
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell multirow="3" mroffset="-4mm" alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+multirow
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+e
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+f
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell multirow="4" alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+h
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+i
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+multirowsetup}{
+\backslash
+raggedright}
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Section