port from branch:

EmbeddedObjects.lyx: Typos and grammar fixes by John Hudson, part 2/2

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35017 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2010-07-26 01:40:09 +00:00
parent 737bec1805
commit 6d474927ae
3 changed files with 74 additions and 64 deletions

View File

@ -16869,8 +16869,8 @@ This table was created with a 4×2 table.
point and the decimal point. point and the decimal point.
The second column is left aligned and contains the digits after the decimal The second column is left aligned and contains the digits after the decimal
point. point.
To omit the space that is normally between two table columns, use the following To omit the space that is normally between two table columns, the following
LaTeX-argument for the second column: LaTeX-argument was used for the second column:
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -17264,7 +17264,7 @@ reference "tab:Alignments-when"
\end_inset \end_inset
and only with some tricks like the expected. and only with some tricks as you would want.
The alignment of the second and third column of Table The alignment of the second and third column of Table
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
@ -19090,8 +19090,8 @@ x
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
LyX doesn't natively support dashed lines, so you have to use TeX-Code. LyX does not natively support dashed lines, so you have to use TeX-Code.
As prerequisite the LaTeX-package As a prerequisite the LaTeX-package
\series bold \series bold
arydshln arydshln
\series default \series default
@ -19160,9 +19160,9 @@ cdashline{line number
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
in TeX-Code as first element of the first cell in the table row. in TeX-Code as the first element of the first cell in the table row.
If you have for example a multicolumn spanning over columns 2 to 4 and If you have for example a multicolumn spanning columns 2 to 4 and you want
you want to have a dashed line above, add the command to have a dashed line above, add the command
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -19174,7 +19174,7 @@ cdashline{2-4}
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
as first element of the first cell in the row of the multicolumn. as the first element of the first cell in the row of the multicolumn.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -19215,7 +19215,7 @@ reference "tab:Table-with-dashed"
\backslash \backslash
hdashline hdashline
\series default \series default
was inserted to the first cell of the third row and the TeX-Code command was inserted in the first cell of the third row and the TeX-Code command
\begin_inset Newline newline \begin_inset Newline newline
\end_inset \end_inset
@ -19225,7 +19225,7 @@ hdashline
\backslash \backslash
cdashline{4-5} cdashline{4-5}
\series default \series default
was inserted to the first cell of the fourth row. was inserted in the first cell of the fourth row.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -19237,7 +19237,7 @@ status open
\series bold \series bold
Note: Note:
\series default \series default
The used LaTeX-package The LaTeX-package
\series bold \series bold
arydshln arydshln
\series default \series default
@ -19389,12 +19389,12 @@ Margin
Notes Notes
\family default \family default
are also floats, because they can float to the next page when there are are also floats, because they can float to the next page when there are
too many notes at the page. too many notes on the page.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
Floats allow a high quality layout. Floats allow a high quality layout.
Images and tables can evenly be spread to the pages to avoid white space Images and tables can be spread evenly to the pages to avoid white space
and pages without text. and pages without text.
As the floating often destroys the context between the text and the image/table As the floating often destroys the context between the text and the image/table
, every float can be referenced in the text. , every float can be referenced in the text.
@ -19427,10 +19427,10 @@ Caption
inset, a box with a label. inset, a box with a label.
The label will automatically be translated to the document language in The label will automatically be translated to the document language in
the output. the output.
Behind the label you can insert the caption text. After the label you can insert the caption text.
The image or table is inserted above or below the caption in a separate The image or table is inserted above or below the caption in a separate
paragraph within the float. paragraph within the float.
More about the caption placement is described in section More about the caption placement is contained in section
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
@ -19456,13 +19456,14 @@ reference "sec:Caption-Placement"
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
It is recommended to insert floats as a separate paragraph to avoid possible It is recommended that you insert floats as a separate standard paragraph
LaTeX-errors that can occur when the surrounding text is specially formatted. to avoid possible LaTeX-errors that can occur when the surrounding text
is specially formatted.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
Existing figures or tables can be put into a float by marking them and then Existing figures or tables can be put into a float by highlighting them
pressing the corresponding toolbar button for a new float. and then pressing the corresponding toolbar button for a new float.
\end_layout \end_layout
\begin_layout Section \begin_layout Section
@ -19922,8 +19923,8 @@ Line
span span
\family default \family default
that specifies how many text lines the float will approximately need. that specifies how many text lines the float will approximately need.
The line span is often hard to be approximated, so better only use it when The line span is often hard to approximate; so it is better only to use
you encounter float placement problems. it when you encounter float placement problems.
You can furthermore decide if LaTeX is allowed to let the float float within You can furthermore decide if LaTeX is allowed to let the float float within
the paragraph or to surrounding paragraphs. the paragraph or to surrounding paragraphs.
Figure Figure
@ -19991,7 +19992,7 @@ g.
\end_inset \end_inset
having a figure too close to the bottom of the page can mess things up in having a figure too close to the bottom of the page can mess things up in
the way that the float doesn't appear in the output or that it is placed such a way that the float does not appear in the output or that it is placed
over some other text. over some other text.
\end_layout \end_layout
@ -20006,18 +20007,18 @@ In general:
\begin_layout Itemize \begin_layout Itemize
Wrap floats should not be placed in paragraphs that run over a page break. Wrap floats should not be placed in paragraphs that run over a page break.
That means that wrap floats should better be inserted to the exact place That means that wrap floats are better inserted in their exact place when
when the document is nearly finished and you are able to estimate where the document is almost finished and you are able to estimate where page
page breaks will appear. breaks will appear.
\end_layout \end_layout
\begin_layout Itemize \begin_layout Itemize
Wrap floats should either be placed in an own paragraph before the paragraph Wrap floats should either be placed in their own paragraph before the paragraph
where they should wrap into or within a paragraph. where they should wrap into or within a paragraph.
\end_layout \end_layout
\begin_layout Itemize \begin_layout Itemize
Wrap floats in consecutive paragraphs may cause troubles, so assure that Wrap floats in consecutive paragraphs may cause troubles, so ensure that
there is a text paragraph between them as separator. there is a text paragraph between them as separator.
\end_layout \end_layout
@ -20040,7 +20041,7 @@ Floats ! Numbering
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
Floats are usually numbered either independent from the sections the floats Floats are usually numbered either independently from the sections the floats
are in, or in the scheme are in, or in the scheme
\begin_inset Quotes eld \begin_inset Quotes eld
\end_inset \end_inset
@ -20058,12 +20059,12 @@ section.number
\end_inset \end_inset
. .
This depends on the used document class. This depends on the document class used.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
To change the section independent numbering, you can use this command in To change section-independent numbering, you can use this command in the
the document preamble: document preamble:
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -20093,13 +20094,13 @@ thetable
thefigure thefigure
\series default \series default
. .
The command
\series bold \series bold
\backslash \backslash
roman roman
\series default \series default
prints in the command above the table number as small roman number. in the command above prints the table number as small roman number.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -20502,13 +20503,13 @@ on this page
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
The number and current page of the referred document part in the output, The number and current page of the part of the document referred to in the
is automatically calculated by LaTeX. output is automatically calculated by LaTeX.
The varieties are adjusted in the field The varieties are adjusted in the field
\family sans \family sans
Format Format
\family default \family default
of the cross-reference window, that appear when you click on the cross-referenc of the cross-reference window that appears when you click on the cross-referenc
e box. e box.
\end_layout \end_layout
@ -20553,7 +20554,7 @@ fig:
\end_inset \end_inset
and is not internationalized. and is not internationalized.
How to tell To find out how to tell
\series bold \series bold
prettyref prettyref
\series default \series default
@ -20649,7 +20650,7 @@ Document Settings
section section
\emph default \emph default
). ).
So you will save to write e. So you will save having to write e.
\begin_inset space \thinspace{} \begin_inset space \thinspace{}
\end_inset \end_inset
@ -20711,7 +20712,7 @@ sec.
\begin_inset Quotes eld \begin_inset Quotes eld
\end_inset \end_inset
, you can redefine the name by inserting this to the preamble: , you can redefine the name by inserting this in the preamble:
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -20764,7 +20765,7 @@ extrasenglish
\backslash \backslash
extras*** extras***
\series default \series default
, where *** is the name of the used language. , where *** is the name of the language used.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -21012,7 +21013,7 @@ Note:
\series bold \series bold
hypcap hypcap
\series default \series default
has no effect for references to subfigures. has no effect on references to subfigures.
\end_layout \end_layout
\end_inset \end_inset
@ -21056,8 +21057,7 @@ Span
columns columns
\family default \family default
is only useful for two-column documents: If you select it, the float will is only useful for two-column documents: If you select it, the float will
span across both columns on the page instead of being confined to just span both columns on the page instead of being confined to just one.
one.
\begin_inset Newline newline \begin_inset Newline newline
\end_inset \end_inset
@ -21105,7 +21105,7 @@ if
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
possible try to place the float on the position where it is inserted possible try to place the float on the position where it has been inserted
\end_layout \end_layout
\begin_layout Description \begin_layout Description
@ -21117,7 +21117,7 @@ of
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
page try to place the float on the top of the current page page try to place the float at the top of the current page
\end_layout \end_layout
\begin_layout Description \begin_layout Description
@ -21129,7 +21129,7 @@ of
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
page try to place the float on the bottom of the current page page try to place the float at the bottom of the current page
\end_layout \end_layout
\begin_layout Description \begin_layout Description
@ -21141,7 +21141,7 @@ of
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
floats try to place the float on an own page floats try to place the float on its own page
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -21176,10 +21176,14 @@ of
page page
\family default \family default
, and then the others. , and then the others.
If you don't use the default, LaTeX will try only the checked options but If you do not use the default, LaTeX will try only the checked options
in the same order. but in the same order.
If none of the 4 placements are possible the procedure is internally repeated If none of the 4
but it is tried to put the float on the following page. \begin_inset space ~
\end_inset
placements are possible the procedure is internally repeated but it is tried
to put the float on the following page.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -21289,7 +21293,7 @@ rules
\end_inset \end_inset
You can also redefine the rules with LaTeX-commands that are given in parenthese You can also redefine the rules with LaTeX-commands that are given in parenthese
s behind the rules description above. s after the rules description above.
To increase for example the often too small default of the bottom-rule To increase for example the often too small default of the bottom-rule
to 50 to 50
\begin_inset space \thinspace{} \begin_inset space \thinspace{}
@ -21320,9 +21324,8 @@ Here
definitely definitely
\family default \family default
. .
Use this option very rarely and only if the document is nearly ready to Use this option very rarely and only if the document is almost ready to
be printed. be printed, because the float is then no longer able to
Because the float is then no longer able to
\begin_inset Quotes eld \begin_inset Quotes eld
\end_inset \end_inset
@ -21354,8 +21357,7 @@ suppressfloats
\series default \series default
can be used. can be used.
It suppresses a given float placement for the page where it is inserted It suppresses a given float placement for the page where it is inserted
and can therefore be used to avoid that floats could be set before a section and can therefore be used to avoid floats being set before a section starts.
starts.
To get this, add these commands to your document preamble: To get this, add these commands to your document preamble:
\end_layout \end_layout
@ -21386,7 +21388,7 @@ mySection}
\begin_layout Standard \begin_layout Standard
You can define the same for all section headings, like chapters and subsections. You can define the same for all section headings, like chapters and subsections.
This definition is not recommended to be used for small text parts like This definition is not recommended to be used for small text parts like
subsubsections because LaTeX may then have problems to find a suitable subsubsections because LaTeX may then have problems finding a suitable
placement. placement.
\end_layout \end_layout
@ -21411,8 +21413,8 @@ LaTeX-packages ! endfloat
\end_inset \end_inset
was developed. was developed.
It puts all figure and table floats at the end of the document into own It puts all figure and table floats at the end of the document into their
sections. own sections.
At the original float position a text hint like At the original float position a text hint like
\begin_inset Quotes eld \begin_inset Quotes eld
\end_inset \end_inset

View File

@ -16797,8 +16797,12 @@ Esta es una tabla 4×2.
y los dígitos anteriores. y los dígitos anteriores.
La segunda columna está alineada a la izquierda y contiene los dígitos La segunda columna está alineada a la izquierda y contiene los dígitos
posteriores al punto decimal. posteriores al punto decimal.
Para omitir el espacio que hay normalmente entre dos columnas usa el siguiente Para omitir el espacio que hay normalmente entre dos columnas el siguiente
argumento LaTeX para la segunda columna: argumento LaTeX
\lang english
was used
\lang spanish
para la segunda columna:
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard

View File

@ -17268,7 +17268,11 @@ Ce tableau a été créé comme un tableau 4×2.
La deuxième colonne est alignée à gauche et contient les chiffres situés La deuxième colonne est alignée à gauche et contient les chiffres situés
après la virgule. après la virgule.
Pour éviter l'espace qui est normalement placé entre deux colonnes d'un Pour éviter l'espace qui est normalement placé entre deux colonnes d'un
tableau, utilisez le paramètre LaTeX suivant pour la deuxième colonne : tableau, le paramètre LaTeX suivant
\lang english
was used
\lang french
pour la deuxième colonne :
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard