- EmbeddedObjects.lyx: avoid some LaTeX warnings (a hyperref and a dcolumn issue)

- French EmbeddedObjects.lyx: add missing paragraph that is already there in the other language version

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33060 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2010-01-16 23:43:20 +00:00
parent 2d14793959
commit 656a7b6955
4 changed files with 415 additions and 38 deletions

View File

@ -190,7 +190,7 @@
\pdf_colorlinks true
\pdf_backref false
\pdf_pdfusetitle false
\pdf_quoted_options " linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false, pdfpagelabels"
\pdf_quoted_options " linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false"
\papersize default
\use_geometry false
\use_amsmath 2
@ -16886,6 +16886,7 @@ reference "tab:Several-table-cell"
\begin_layout Standard
\begin_inset Float table
placement h
wide false
sideways false
status open
@ -17223,7 +17224,7 @@ LaTeX-packages ! dcolumn
\end_inset
that provides table cell alignments.
But this unfortunately treats the cell entries as math and doesn't allow
But this unfortunately treats the cell entries as math and does not allow
formulas in table cells: The first column of Table
\begin_inset space ~
\end_inset
@ -17269,6 +17270,13 @@ dcolumn
.
\end_layout
\begin_layout Standard
\begin_inset Newpage newpage
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Float table
placement h
@ -17302,7 +17310,7 @@ Alignments when LaTeX-package dcolumn is used.
<features>
<column alignment="center" valignment="top" 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" width="0" special="D{~}{\,}{9.7}">
<column alignment="center" valignment="top" width="0" special="D{+}{\,}{9.7}">
<row>
<cell multicolumn="1" alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
\begin_inset Text
@ -17380,7 +17388,7 @@ times
\end_inset
24~
24+
\begin_inset Formula $\mbox{bottles}$
\end_inset
@ -17438,7 +17446,7 @@ times
\end_inset
768~
768+
\begin_inset Formula $\mbox{Pixels}$
\end_inset
@ -17496,7 +17504,7 @@ times
\end_inset
6~
6+
\begin_inset Formula $\mbox{cm}$
\end_inset

View File

@ -191,7 +191,7 @@
\pdf_colorlinks true
\pdf_backref false
\pdf_pdfusetitle false
\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false, pdfpagelabels"
\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false"
\papersize a4paper
\use_geometry false
\use_amsmath 2
@ -17626,9 +17626,9 @@ reference "tab:Verschiedene-Ausrichtungen"
\end_inset
wird mit
\family typewriter
\series bold
dcolumn
\family default
\series default
wie die erste Spalte von Tabelle
\begin_inset space ~
\end_inset
@ -17659,6 +17659,13 @@ dcolumn
nicht möglich.
\end_layout
\begin_layout Standard
\begin_inset Newpage newpage
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Float table
placement h
@ -17709,7 +17716,7 @@ dcolumn
<features>
<column alignment="center" valignment="top" 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" width="0" special="D{~}{\,}{9.7}">
<column alignment="center" valignment="top" width="0" special="D{+}{\,}{9.7}">
<row>
<cell multicolumn="1" alignment="center" valignment="top" bottomline="true" usebox="none">
\begin_inset Text
@ -17748,11 +17755,7 @@ Einheiten
\begin_inset space \thinspace{}
\end_inset
\begin_inset Formula $\mbox{Flaschen}$
\end_inset
Flaschen
\end_layout
\end_inset
@ -17791,7 +17794,7 @@ times
\end_inset
24~
24+
\begin_inset Formula $\mbox{Flaschen}$
\end_inset
@ -17810,11 +17813,7 @@ times
\begin_inset space \thinspace{}
\end_inset
\begin_inset Formula $\mbox{Pixel}$
\end_inset
Pixel
\end_layout
\end_inset
@ -17853,7 +17852,7 @@ times
\end_inset
768~
768+
\begin_inset Formula $\mbox{Pixel}$
\end_inset
@ -17872,11 +17871,7 @@ times
\begin_inset space \thinspace{}
\end_inset
\begin_inset Formula $\mbox{cm}$
\end_inset
cm
\end_layout
\end_inset
@ -17915,7 +17910,7 @@ times
\end_inset
6~
6+
\begin_inset Formula $\mbox{cm}$
\end_inset

View File

@ -198,7 +198,7 @@
\pdf_colorlinks true
\pdf_backref false
\pdf_pdfusetitle false
\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false, pdfpagelabels"
\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false"
\papersize default
\use_geometry false
\use_amsmath 2
@ -16817,6 +16817,7 @@ o más pequeño al comienzo de la última columna para conseguir el espacio
\begin_layout Standard
\begin_inset Float table
placement h
wide false
sideways false
status open
@ -17200,6 +17201,13 @@ dcolumn
.
\end_layout
\begin_layout Standard
\begin_inset Newpage newpage
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Float table
placement h
@ -17249,7 +17257,7 @@ dcolumn
<features>
<column alignment="center" valignment="top" width="0" special="D{x}{\times}{4.9}">
<column alignment="center" valignment="top" width="0" special="D{x}{\times}{4.9}">
<column alignment="center" valignment="top" width="0" special="D{~}{\,}{9.7}">
<column alignment="center" valignment="top" width="0" special="D{+}{\,}{9.7}">
<row>
<cell multicolumn="1" alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
\begin_inset Text
@ -17327,7 +17335,7 @@ times
\end_inset
24~
24+
\begin_inset Formula $\mbox{bottles}$
\end_inset
@ -17385,7 +17393,7 @@ times
\end_inset
768~
768+
\begin_inset Formula $\mbox{Pixels}$
\end_inset
@ -17443,7 +17451,7 @@ times
\end_inset
6~
6+
\begin_inset Formula $\mbox{cm}$
\end_inset

View File

@ -193,7 +193,7 @@
\pdf_colorlinks true
\pdf_backref false
\pdf_pdfusetitle false
\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false, pdfpagelabels"
\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false"
\papersize default
\use_geometry false
\use_amsmath 2
@ -16727,6 +16727,372 @@ sera chargé automatiquement par LyX quand vous utilisez des formats de tableaux
dans la commande précédente.)
\end_layout
\begin_layout Standard
\lang english
In case you are using font sizes larger than the normal size, the table
borders are often too close to the letters.
This can be corrected by inserting the command
\series bold
\backslash
strut
\series default
in TeX code at the beginning of a table row.
Table
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "tab:Vertical-alignment-of"
\end_inset
visualizes the effect.
\end_layout
\begin_layout Standard
\noindent
\begin_inset Float table
placement h
wide false
sideways false
status open
\begin_layout Plain Layout
\begin_inset Caption
\begin_layout Plain Layout
\lang english
\begin_inset CommandInset label
LatexCommand label
name "tab:Vertical-alignment-of"
\end_inset
Vertical alignment of text with large font sizes.
\end_layout
\end_inset
\end_layout
\begin_layout Plain Layout
\begin_inset space \hfill{}
\end_inset
\begin_inset Float table
wide false
sideways false
status collapsed
\begin_layout Plain Layout
\begin_inset Caption
\begin_layout Plain Layout
\lang english
Normal table.
\end_layout
\end_inset
\end_layout
\begin_layout Plain Layout
\noindent
\align center
\begin_inset Tabular
<lyxtabular version="3" rows="6" columns="1">
<features>
<column alignment="left" valignment="top" width="0">
<row>
<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
Normal, g
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\size large
Large
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\size larger
Larger
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\size largest
Largest
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\size huge
Huge
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\size huge
Huger
\end_layout
\end_inset
</cell>
</row>
</lyxtabular>
\end_inset
\end_layout
\end_inset
\begin_inset space \hfill{}
\end_inset
\begin_inset Float table
wide false
sideways false
status collapsed
\begin_layout Plain Layout
\begin_inset Caption
\begin_layout Plain Layout
\lang english
Table using the command
\series bold
\backslash
strut
\series default
.
\end_layout
\end_inset
\end_layout
\begin_layout Plain Layout
\noindent
\align center
\begin_inset Tabular
<lyxtabular version="3" rows="6" columns="1">
<features>
<column alignment="left" valignment="top" width="0">
<row>
<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
Normal, g
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\size large
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
strut
\end_layout
\end_inset
Large
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\size larger
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
strut
\end_layout
\end_inset
Larger
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\size largest
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
strut
\end_layout
\end_inset
Largest
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\size huge
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
strut
\end_layout
\end_inset
Huge
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\size giant
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
strut
\end_layout
\end_inset
\size huge
Huger
\end_layout
\end_inset
</cell>
</row>
</lyxtabular>
\end_inset
\end_layout
\end_inset
\begin_inset space \hfill{}
\end_inset
\end_layout
\end_inset
\end_layout
\begin_layout Subsection
Alignements de cellules spéciaux
\begin_inset Index
@ -17340,7 +17706,7 @@ Alignements quand on utilise le paquetage LaTeX dcolumn.
<features>
<column alignment="center" valignment="top" width="0" special="D{x}{\times}{-1.0}">
<column alignment="center" valignment="top" width="0" special="D{x}{\times}{4.11}">
<column alignment="center" valignment="top" width="0" special="D{~}{\,}{9.9}">
<column alignment="center" valignment="top" width="0" special="D{+}{\,}{9.9}">
<row>
<cell multicolumn="1" alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
\begin_inset Text
@ -17418,7 +17784,7 @@ times
\end_inset
24~
24+
\begin_inset Formula $\mbox{bouteilles}$
\end_inset
@ -17476,7 +17842,7 @@ times
\end_inset
768~
768+
\begin_inset Formula $\mbox{Pixels}$
\end_inset
@ -17534,7 +17900,7 @@ times
\end_inset
6~
6+
\begin_inset Formula $\mbox{cm}$
\end_inset