EmbeddedObjects.lyx: English fixes from J.R. Hudson, part 2/2

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34271 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2010-04-23 01:40:59 +00:00
parent fe7196d6cd
commit 4a476e6490
4 changed files with 129 additions and 99 deletions

View File

@ -5705,7 +5705,7 @@ name "sub:Longtable-Captions"
A longtable cannot be put into a table float because floats can only be A longtable cannot be put into a table float because floats can only be
on one page. on one page.
But the caption environment of floats can also be used for longtables when But the caption environment of floats can also be used for longtables when
you use for a table row the longtable option you use the longtable option
\family sans \family sans
Caption Caption
\family default \family default
@ -6061,8 +6061,8 @@ Note
1: 1:
\series default \series default
The table number is increased for every longtable, also if you didn't set The table number is increased for for every longtable, even if you did
a caption for it. not set a caption for it.
For this reason you could have the case that e. For this reason you could have the case that e.
\begin_inset space \thinspace{} \begin_inset space \thinspace{}
\end_inset \end_inset
@ -6075,12 +6075,12 @@ Table
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
2.4 follows on Table 2.4 follows Table
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
2.1 in the list of tables if there are two longtables without captions. 2.1 in the list of tables if there are two longtables without captions.
To avoid this you can add the following command in TeX-Code behind every To avoid this you can add the following command in TeX-Code after every
longtable without a caption: longtable without a caption:
\end_layout \end_layout
@ -7401,7 +7401,7 @@ caption*{caption text}
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
in a dummy caption row that is marked as header. in a dummy caption row that is marked as a header.
Table Table
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
@ -7413,7 +7413,7 @@ reference "tab:DiffCaptions"
\end_inset \end_inset
is an example for a longtable with different heading where the second caption is an example of a longtable with different heading where the second caption
doesn't include the table number. doesn't include the table number.
\end_layout \end_layout
@ -9338,8 +9338,8 @@ Longtables ! Calculation
\begin_layout Standard \begin_layout Standard
LaTeX calculates the height of table pages and their page breaks using so LaTeX calculates the height of table pages and their page breaks using so
called chunks. called chunks.
Chunks are pieces of the tables that are at once in LaTeX's memory. Chunks are parts of tables that held at the same time in LaTeX's memory.
The default value is historically set to only 20 table rows. The default value was historically set to only 20 table rows.
If you are using longtables with many pages this may slow down the creation If you are using longtables with many pages this may slow down the creation
of your document. of your document.
You can safely increase the chunk size to values of 100-1000 by adding You can safely increase the chunk size to values of 100-1000 by adding
@ -9371,13 +9371,25 @@ Longtables ! Floats
\begin_layout Standard \begin_layout Standard
There might be problems when a float appears on the same page where a longtable There might be problems when a float appears on the same page where a longtable
starts. starts.
To avoid such situation, add the command To avoid such a situation, insert a
\series bold \begin_inset Quotes eld
\end_inset
\backslash clear page
clearpage \begin_inset Quotes erd
\series default \end_inset
as TeX-Code before your longtable.
(menu
\family sans
Insert\SpecialChar \menuseparator
Formatting\SpecialChar \menuseparator
Clear
\begin_inset space ~
\end_inset
Page
\family default
) before your longtable.
\end_layout \end_layout
\begin_layout Subsection \begin_layout Subsection
@ -9413,7 +9425,7 @@ By default tables are only broken between rows.
\begin_inset Quotes erd \begin_inset Quotes erd
\end_inset \end_inset
as TeX-Code at this point of the cell where it can be broken. as TeX-Code at the point of the cell where it can be broken.
Before the Before the
\series bold \series bold
@ -9422,7 +9434,7 @@ By default tables are only broken between rows.
\backslash \backslash
\series default \series default
command you have to insert in TeX-Code so many command you have to insert in TeX-Code as many
\begin_inset Quotes eld \begin_inset Quotes eld
\end_inset \end_inset
@ -9434,7 +9446,7 @@ By default tables are only broken between rows.
\begin_inset Quotes erd \begin_inset Quotes erd
\end_inset \end_inset
characters like the number of the following table columns. characters as the number of the following table columns.
The The
\series bold \series bold
& &
@ -9449,7 +9461,7 @@ By default tables are only broken between rows.
\begin_inset Newline newline \begin_inset Newline newline
\end_inset \end_inset
Behind the the After the the
\series bold \series bold
\backslash \backslash
@ -9457,11 +9469,11 @@ Behind the the
\backslash \backslash
\series default \series default
command, insert so many command, insert aso many
\series bold \series bold
& &
\series default \series default
characters like the number of table columns before the current column. characters as the number of table columns before the current column.
In Table In Table
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
@ -9475,7 +9487,7 @@ reference "tab:ForcedPagebreak"
the cell that should be broken is in the second column followed by another the cell that should be broken is in the second column followed by another
column. column.
Therefore the following command was inserted in the cell as TeX-Code behind Therefore the following command was inserted in the cell as TeX-Code after
\begin_inset Quotes eld \begin_inset Quotes eld
\end_inset \end_inset
@ -9516,15 +9528,15 @@ The
\begin_inset Quotes erd \begin_inset Quotes erd
\end_inset \end_inset
in the third columns of the row was deleted. in the third column of the row was deleted.
\series bold \series bold
\backslash \backslash
newpage newpage
\series default \series default
is only needed when a page break should definitively occur at this position, is only needed when a page break should definitely occur at this position,
otherwise it is only a possibility to break. otherwise it would be a conditional break.
If your footer row of the longtable has for a certain reason no upper line If your footer row of the longtable has for a certain reason no upper line
but you would have a horizontal line where the cell is broken, use this but you would have a horizontal line where the cell is broken, use this
command instead: command instead:
@ -9562,7 +9574,7 @@ parfillskip}{0pt}
\begin_layout Standard \begin_layout Standard
must be inserted as TeX-Code at the beginning of the cell. must be inserted as TeX-Code at the beginning of the cell.
This assures that the part of the cell that will be displayed on the new This ensures that the part of the cell that will be displayed on the new
page appears with the full width. page appears with the full width.
\end_layout \end_layout
@ -11004,8 +11016,8 @@ i
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
Adjusting a fixed width for a column, enables to enter text as a paragraph Setting a fixed width for a column enables you to enter text as a paragraph
with multiple lines and hyphenations. with multiple lines and hyphenation.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -11027,7 +11039,7 @@ reference "tab:Table-with-multiple"
cm and choose centered for the vertical and horizontal alignment. cm and choose centered for the vertical and horizontal alignment.
The vertical alignment is used for all cells of the row. The vertical alignment is used for all cells of the row.
As our text is smaller than than 2.5 As our text is smaller than 2.5
\begin_inset space \thinspace{} \begin_inset space \thinspace{}
\end_inset \end_inset
@ -11046,7 +11058,7 @@ arg "newline-insert linebreak"
\begin_layout Standard \begin_layout Standard
If you have a long word in a cell with a fixed width, it cannot be hyphenated 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. by LaTeX if it is the first entry.
Therefore you need to insert something, to make the word not being the Therefore you need to insert something to prevent the word not being the
first entry. first entry.
So add a horizontal space of 0 So add a horizontal space of 0
\begin_inset space \thinspace{} \begin_inset space \thinspace{}
@ -11349,8 +11361,8 @@ Multicolumn Basics
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
To span a cell over multiple columns, mark as much cells within a line that To merge cells over multiple columns, select as many cells within a row
should be one spanned cell and use either the table-toolbar button as you want to merge and use either the table-toolbar button
\begin_inset Graphics \begin_inset Graphics
filename ../images/tabular-feature_multicolumn.png filename ../images/tabular-feature_multicolumn.png
scale 85 scale 85
@ -11364,12 +11376,11 @@ Edit\SpecialChar \menuseparator
Table\SpecialChar \menuseparator Table\SpecialChar \menuseparator
Multicolumn Multicolumn
\family default \family default
, or right click on the marked cells and choose multicolumn in the appearing , or right click on the marked cells and choose
table dialog under the tab
\family sans \family sans
Table Settings Multicolumn
\family default \family default
. in the appearing context menu.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -11541,7 +11552,7 @@ Multicolumns ! Calculations
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
LyX supports multicolumns directly, but we have to take notice of the cell LyX supports multicolumns directly, but we have to take account of the cell
width of the columns spanned by the multicolumn cell. width of the columns spanned by the multicolumn cell.
\end_layout \end_layout
@ -11715,8 +11726,8 @@ centered alignment
\end_inset \end_inset
cm in the table dialog. cm in the table dialog.
The spanned columns should have exactly half the width of the multicolumn The merged columns should have exactly half the width of the multicolumn
cell, so that you would adjust a width of 1.25 cell, so that you would set a width of 1.25
\begin_inset space \thinspace{} \begin_inset space \thinspace{}
\end_inset \end_inset
@ -11883,7 +11894,7 @@ i
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
You can see that the first column has not the half width of the multicolumn You can see that the first column has not half the width of the multicolumn
cell, it is a bit bigger. cell, it is a bit bigger.
The reason is that the given width of a cell The reason is that the given width of a cell
\begin_inset Formula $W_{g}$ \begin_inset Formula $W_{g}$
@ -11905,15 +11916,15 @@ reference "cha:Explanation-of-Equation"
\end_inset \end_inset
explains it in detail. explains this in detail.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
The needed given width The given width
\begin_inset Formula $W_{g\, n}$ \begin_inset Formula $W_{g\, n}$
\end_inset \end_inset
when needed when
\emph on \emph on
n n
\emph default \emph default
@ -11983,8 +11994,11 @@ usepackage{calc}
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
LyX does not allow to calculate lengths in the width-field of the table LyX does not allow you to calculate lengths in the
dialog. \family sans
Width
\family default
field of the table dialog.
Therefore you have to format the column by inserting a LaTeX-argument in Therefore you have to format the column by inserting a LaTeX-argument in
the dialog. the dialog.
Here is an overview about the arguments: Here is an overview about the arguments:
@ -12068,7 +12082,7 @@ The command
Although we have chosen centered alignment for the text of the multicolumn Although we have chosen centered alignment for the text of the multicolumn
cell, it is still left aligned. cell, it is still left aligned.
This is because LyX only applies the alignment to single columns. This is because LyX only applies the alignment to single columns.
So we have to use for the multicolumn the LaTeX-argument So for the multicolumn cell we have to use the LaTeX-argument
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -12104,8 +12118,8 @@ Table ! Multirows
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
In contrary to multicolumns multirows are not yet supported by LyX so a Unlike multicolumns multirows are not yet supported by LyX; so a bit of
bit of TeX-Code needs to be used. TeX-Code needs to be used.
To use multirows load the LaTeX-package To use multirows load the LaTeX-package
\series bold \series bold
multirow multirow
@ -12334,7 +12348,7 @@ cm.
\series bold \series bold
} }
\series default \series default
in another TeX-Code-box behind the text. in another TeX-Code-box after the text.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -12370,7 +12384,7 @@ centering}
in TeX-Code in the document preamble. in TeX-Code in the document preamble.
Then all entries of multirow cells in the document are centered. Then all entries of multirow cells in the document are centered.
If centering is only needed for several tables, you can renew the command If centering is only needed for several tables, you can renew the command
in an TeX-Code box just before the table instead of the preamble. in a TeX-Code box just before the table instead of the preamble.
If the text should be right-aligned, replace If the text should be right-aligned, replace
\series bold \series bold

View File

@ -11449,45 +11449,19 @@ Bearbeiten\SpecialChar \menuseparator
Tabelle\SpecialChar \menuseparator Tabelle\SpecialChar \menuseparator
Mehrfachspalte Mehrfachspalte
\family default \family default
oder den , oder klicken Sie rechts auf die markierten Zellen und wählen im Kontextmenü
\family sans
Tabellen-Einstellungen
\family default
-Dialog, in dem Sie auf der Karteikarte
\family sans
Tabellen-Einstellungen
\family default
\family sans \family sans
Mehrfachspalte Mehrfachspalte
\family default \family default
ankreuzen. .
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
Mehrfachspalten haben ihre eigenen Einstellungen. Mehrfachspalten haben ihre eigenen Einstellungen.
Das bedeutet, dass sie sich nur auf die Mehrfachspalte auswirken. Das bedeutet, dass sie sich nur auf die Mehrfachspalte auswirken.
Hier ist ein Beispiel, wobei Hier ist ein Beispiel mit einer Mehrfachspalte in der ersten Zeile und
\begin_inset Quotes gld einer in der letzten Zeile, bei der die obere Linie weggelassen wurde:
\end_inset
B 2
\begin_inset Quotes grd
\end_inset
keine Mehrfachzeile ist, wie in Abschnitt
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "uab:Mehrfachzeilen"
\end_inset
beschrieben.
Es wurde nur eine Linie weggelassen:
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard

View File

@ -9254,13 +9254,29 @@ Tablas largas ! Flotantes
\begin_layout Standard \begin_layout Standard
Podría haber problemas si un flotante aparece en la misma página donde comienza Podría haber problemas si un flotante aparece en la misma página donde comienza
una tabla larga. una tabla larga.
Para evitarlo, añade el comando Para evitarlo, añade
\series bold \lang english
a
\begin_inset Quotes eld
\end_inset
\backslash clear page
clearpage \begin_inset Quotes erd
\series default \end_inset
en código TeX antes de la tabla.
\lang spanish
(menu
\family sans
Insertar\SpecialChar \menuseparator
Formato\SpecialChar \menuseparator
Limpiar
\begin_inset space ~
\end_inset
página
\family default
) antes de la tabla.
\end_layout \end_layout
\begin_layout Subsection \begin_layout Subsection
@ -11211,12 +11227,17 @@ Editar\SpecialChar \menuseparator
Tabla\SpecialChar \menuseparator Tabla\SpecialChar \menuseparator
Multicolumna Multicolumna
\family default \family default
, o clic derecho sobre las celdas marcadas y se selecciona en el diálogo, , o clic derecho sobre las celdas marcadas y
bajo la solapa \lang english
choose
\lang spanish
\family sans \family sans
Configuración Multicolumna
\family default \family default
, la casilla Multicolumna.
\lang english
in the appearing context menu.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard

View File

@ -9620,13 +9620,33 @@ Tableaux longs ! Flottants
\begin_layout Standard \begin_layout Standard
Il peut y avoir des problèmes quand un flottant apparaît sur la page où Il peut y avoir des problèmes quand un flottant apparaît sur la page où
commence un tableau long. commence un tableau long.
Pour éviter une telle situation, ajoutez la commande Pour éviter une telle situation,
\series bold \lang english
insert a
\begin_inset Quotes eld
\end_inset
\backslash clear page
clearpage \begin_inset Quotes erd
\series default \end_inset
en tant que code TeX juste avant votre tableau long.
(menu
\lang french
\family sans
Insérer\SpecialChar \menuseparator
Typographie
\begin_inset space ~
\end_inset
spéciale\SpecialChar \menuseparator
Saut de page (vide le tampon)
\family default
\begin_inset space \thinspace{}
\end_inset
) juste avant votre tableau long.
\end_layout \end_layout
\begin_layout Subsection \begin_layout Subsection
@ -11622,12 +11642,13 @@ Tableau\SpecialChar \menuseparator
Multi-colonnes Multi-colonnes
\family default \family default
, ou encore faites un clic droit sur les cellules sélectionnées et choisissez , ou encore faites un clic droit sur les cellules sélectionnées et choisissez
multicolonne dans la fenêtre de dialogue de tableau qui apparaît dans l'onglet
\family sans \family sans
Tableau Multi-colonnes
\family default \family default
.
\lang english
in the appearing context menu.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard