Updates from Jean Pierre.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37532 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2011-02-07 01:02:34 +00:00
parent 0103a7757e
commit acc7437ec4

View File

@ -133,10 +133,11 @@ End
\papercolumns 1 \papercolumns 1
\papersides 2 \papersides 2
\paperpagestyle headings \paperpagestyle headings
\tracking_changes false \tracking_changes true
\output_changes false \output_changes false
\html_math_output 0 \html_math_output 0
\html_be_strict true \html_be_strict true
\author 34634807 "Jean-Pierre"
\end_header \end_header
\begin_body \begin_body
@ -7403,6 +7404,11 @@ status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
Document\SpecialChar \menuseparator Document\SpecialChar \menuseparator
Settings Settings
\change_inserted 34634807 1296981553
\SpecialChar \menuseparator
Modules
\change_unchanged
\end_layout \end_layout
\end_inset \end_inset
@ -7457,7 +7463,25 @@ to
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
The module declaration should then be followed by lines like the following: The module declaration should then be followed by lines like the following
\change_inserted 34634807 1296981696
\begin_inset Foot
status open
\begin_layout Plain Layout
\change_inserted 34634807 1296981696
Preferably in English if the module should be published with LyX.
This description will appear in the list of messages to be translated and
will be thus translated with the next interface update.
\end_layout
\end_inset
\change_unchanged
:
\end_layout \end_layout
\begin_layout LyX-Code \begin_layout LyX-Code
@ -7500,6 +7524,11 @@ status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
Document\SpecialChar \menuseparator Document\SpecialChar \menuseparator
Settings Settings
\change_inserted 34634807 1296981581
\SpecialChar \menuseparator
Modules
\change_unchanged
\end_layout \end_layout
\end_inset \end_inset
@ -7578,7 +7607,17 @@ somemodule.module
\end_layout \end_layout
\begin_layout Subsection \begin_layout Subsection
File format
\change_inserted 34634807 1296981875
F
\change_deleted 34634807 1296981874
File f
\change_unchanged
ormat
\change_inserted 34634807 1296981882
number
\change_unchanged
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -9455,7 +9494,13 @@ A paragraph style description looks like this:
status collapsed status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
Note that this will either define a new layout or modify an existing one. Note that this will either define a new
\change_deleted 34634807 1296982902
layout
\change_inserted 34634807 1296982902
style
\change_unchanged
or modify an existing one.
\end_layout \end_layout
\end_inset \end_inset
@ -9620,9 +9665,20 @@ Note that a `float' here is a real number, such as: 1.5.
\end_inset \end_inset
The vertical space with which the last of a chain of paragraphs with this The vertical space with which the last of a chain of paragraphs with this
layout is separated from the following paragraph.
If the next paragraph has another layout, the separations are not simply \change_deleted 34634807 1296982906
added, but the maximum is taken. layout
\change_inserted 34634807 1296982906
style
\change_unchanged
is separated from the following paragraph.
If the next paragraph has another
\change_deleted 34634807 1296982915
layout
\change_inserted 34634807 1296982915
style
\change_unchanged
, the separations are not simply added, but the maximum is taken.
\end_layout \end_layout
\begin_layout Description \begin_layout Description
@ -9646,7 +9702,13 @@ status collapsed
\end_inset \end_inset
The category for this style. The category for this style.
This is used to group related styles in the Layout combobox on the toolbar. This is used to group related styles in the
\change_deleted 34634807 1296982925
Layout
\change_inserted 34634807 1296982925
style
\change_unchanged
combobox on the toolbar.
Any string can be used, but you may want to use existing categories with Any string can be used, but you may want to use existing categories with
your own styles. your own styles.
@ -9898,6 +9960,8 @@ EndLabelType
\end_layout \end_layout
\begin_layout Description \begin_layout Description
\change_deleted 34634807 1296982079
\begin_inset Flex Code \begin_inset Flex Code
status collapsed status collapsed
@ -9935,6 +9999,8 @@ Fill_Top
\end_layout \end_layout
\begin_layout Description \begin_layout Description
\change_deleted 34634807 1296982079
\begin_inset Flex Code \begin_inset Flex Code
status collapsed status collapsed
@ -9992,6 +10058,8 @@ Settings
\end_inset \end_inset
dialog can be set when initializing a paragraph with this style. dialog can be set when initializing a paragraph with this style.
\change_unchanged
\begin_inset Foot \begin_inset Foot
status collapsed status collapsed
@ -10007,6 +10075,45 @@ Note from Jean-Marc:
\end_inset \end_inset
\change_inserted 34634807 1296982107
\begin_inset Note Note
status open
\begin_layout Plain Layout
\change_inserted 34634807 1296982125
I do not find any
\begin_inset Quotes eld
\end_inset
Vertical space above
\begin_inset Quotes erd
\end_inset
or
\begin_inset Quotes eld
\end_inset
Vertical space below
\begin_inset Quotes erd
\end_inset
in Edit\SpecialChar \menuseparator
Paragraph
\begin_inset space ~
\end_inset
Settings, so this seems obsolete, as Jean-Marc noticed (Note by J.P.
Chrétien, feb.
2011)
\end_layout
\end_inset
\change_unchanged
\end_layout \end_layout
\begin_layout Description \begin_layout Description
@ -10173,11 +10280,23 @@ status collapsed
\end_inset \end_inset
If 1, marks the layout as to be included in the document preamble rather If 1, marks the
than in the document body. \change_deleted 34634807 1296982928
layout
\change_inserted 34634807 1296982928
style
\change_unchanged
as to be included in the document preamble rather than in the document
body.
This is useful for document classes that want such information as the title This is useful for document classes that want such information as the title
and author to appear in the preamble. and author to appear in the preamble.
Note that this works only for layouts for which the Note that this works only for
\change_deleted 34634807 1296982930
layout
\change_inserted 34634807 1296982930
style
\change_unchanged
s for which the
\begin_inset Flex Code \begin_inset Flex Code
status collapsed status collapsed
@ -10230,7 +10349,13 @@ status collapsed
\end_inset \end_inset
If 1, marks the layout as being part of a title block (see also the If 1, marks the
\change_deleted 34634807 1296982932
layout
\change_inserted 34634807 1296982932
style
\change_unchanged
as being part of a title block (see also the
\begin_inset Flex Code \begin_inset Flex Code
status collapsed status collapsed
@ -10273,9 +10398,20 @@ float=0
\end_inset \end_inset
] This provides extra space between paragraphs that have the same layout. ] This provides extra space between paragraphs that have the same
If you put other layouts into an environment, each is separated with the \change_deleted 34634807 1296982933
environment's layout
\change_inserted 34634807 1296982933
style
\change_unchanged
.
If you put other
\change_deleted 34634807 1296982940
layout
\change_inserted 34634807 1296982940
style
\change_unchanged
s into an environment, each is separated with the environment's
\begin_inset Flex Code \begin_inset Flex Code
status collapsed status collapsed
@ -10359,8 +10495,13 @@ status collapsed
lead to empty LaTeX output. lead to empty LaTeX output.
There are some cases where this could be desirable however: in a letter There are some cases where this could be desirable however: in a letter
template, the required fields can be provided as empty fields, so that template, the required fields can be provided as empty fields, so that
people do not forget them; in some special classes, a layout can be used people do not forget them; in some special classes, a
as some kind of break, which does not contain actual text. \change_deleted 34634807 1296982945
layout
\change_inserted 34634807 1296982945
style
\change_unchanged
can be used as some kind of break, which does not contain actual text.
\end_layout \end_layout
\begin_layout Description \begin_layout Description
@ -10451,7 +10592,13 @@ Counter
\end_inset \end_inset
. .
In that case, the counter will be stepped each time the layout appears. In that case, the counter will be stepped each time the
\change_deleted 34634807 1296982948
layout
\change_inserted 34634807 1296982948
style
\change_unchanged
appears.
\begin_inset Newline newline \begin_inset Newline newline
\end_inset \end_inset
@ -10895,7 +11042,13 @@ Static
. .
The label will be printed above the paragraph, but only at the top of an The label will be printed above the paragraph, but only at the top of an
environment or the top of a chain of paragraphs with this layout. environment or the top of a chain of paragraphs with this
\change_deleted 34634807 1296982950
layout
\change_inserted 34634807 1296982950
style
\change_unchanged
.
This might be used with the This might be used with the
\begin_inset Flex MenuItem \begin_inset Flex MenuItem
status collapsed status collapsed
@ -10906,7 +11059,13 @@ Abstract
\end_inset \end_inset
layout, for example.
\change_deleted 34634807 1296982953
layout
\change_inserted 34634807 1296982953
style
\change_unchanged
, for example.
\end_layout \end_layout
\begin_layout Itemize \begin_layout Itemize
@ -11189,7 +11348,13 @@ List_Environment, Bib_Environment
\end_inset \end_inset
] How the layout should be translated into LaTeX. ] How the
\change_deleted 34634807 1296982955
layout
\change_inserted 34634807 1296982955
style
\change_unchanged
should be translated into LaTeX.
\begin_inset Foot \begin_inset Foot
status collapsed status collapsed
@ -11377,15 +11542,33 @@ status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
\change_deleted 34634807 1296982208
\bar under \bar under
L L
\bar default \bar default
ayout\SpecialChar \menuseparator ayout
\change_inserted 34634807 1296982209
\bar under
Edit
\change_unchanged
\bar default
\SpecialChar \menuseparator
\bar under \bar under
P P
\bar default \bar default
aragraph aragraph
\change_inserted 34634807 1296982216
\begin_inset space ~
\end_inset
settings
\change_unchanged
\end_layout \end_layout
\end_inset \end_inset
@ -11443,8 +11626,14 @@ string=""
\end_inset \end_inset
] If you put layouts into environments, the leftmargins are not simply added, ] If you put
but added with a factor \change_deleted 34634807 1296982960
layout
\change_inserted 34634807 1296982960
style
\change_unchanged
s into environments, the leftmargins are not simply added, but added with
a factor
\begin_inset Formula $\frac{4}{depth+4}$ \begin_inset Formula $\frac{4}{depth+4}$
\end_inset \end_inset
@ -11565,7 +11754,13 @@ Static
\begin_inset Newline newline \begin_inset Newline newline
\end_inset \end_inset
The kind of margin that the layout has on the left side. The kind of margin that the
\change_deleted 34634807 1296982962
layout
\change_inserted 34634807 1296982962
style
\change_unchanged
has on the left side.
\begin_inset Flex Code \begin_inset Flex Code
status collapsed status collapsed
@ -11708,7 +11903,13 @@ status collapsed
\end_inset \end_inset
] Whether fragile commands in this layout should be ] Whether fragile commands in this
\change_deleted 34634807 1296982964
layout
\change_inserted 34634807 1296982964
style
\change_unchanged
should be
\begin_inset Flex Code \begin_inset Flex Code
status collapsed status collapsed
@ -11845,8 +12046,26 @@ ObsoletedBy
\end_inset \end_inset
Name of a layout that has replaced this layout. Name of a
This is used to rename a layout, while keeping backward compatibility. \change_deleted 34634807 1296982966
layout
\change_inserted 34634807 1296982966
style
\change_unchanged
that has replaced this
\change_deleted 34634807 1296982967
layout
\change_inserted 34634807 1296982967
style
\change_unchanged
.
This is used to rename a
\change_deleted 34634807 1296982969
layout
\change_inserted 34634807 1296982969
style
\change_unchanged
, while keeping backward compatibility.
\end_layout \end_layout
\begin_layout Description \begin_layout Description
@ -11869,7 +12088,13 @@ int=0
\end_inset \end_inset
] The number of optional arguments that can be used with this layout. ] The number of optional arguments that can be used with this
\change_deleted 34634807 1296982970
layout
\change_inserted 34634807 1296982970
style
\change_unchanged
.
This is useful for things like section headings, and only makes sense with This is useful for things like section headings, and only makes sense with
LaTeX. LaTeX.
Note that, on output, the optional arguments will all precede any required Note that, on output, the optional arguments will all precede any required
@ -11984,8 +12209,65 @@ Parindent
\end_inset \end_inset
will be fixed for a certain layout. will be fixed for a certain
The exception is Standard layout, since the indentation of a Standard layout \change_deleted 34634807 1296982972
layout
\change_inserted 34634807 1296982972
style
\change_unchanged
.
The exception is
\change_deleted 34634807 1296982262
Standard
\change_inserted 34634807 1296982262
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
\change_inserted 34634807 1296982262
Standard
\change_unchanged
\end_layout
\end_inset
\change_unchanged
\change_deleted 34634807 1296982974
layout
\change_inserted 34634807 1296982974
style
\change_unchanged
, since the indentation of a
\change_deleted 34634807 1296982283
Standard
\change_inserted 34634807 1296982283
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
\change_inserted 34634807 1296982283
Standard
\change_unchanged
\end_layout
\end_inset
\change_unchanged
\change_deleted 34634807 1296982976
layout
\change_inserted 34634807 1296982976
style
\change_unchanged
paragraph can be prohibited with paragraph can be prohibited with
\begin_inset Flex Code \begin_inset Flex Code
status collapsed status collapsed
@ -11997,7 +12279,33 @@ NextNoIndent
\end_inset \end_inset
. .
Also, Standard layout paragraphs inside environments use the Also,
\change_deleted 34634807 1296982295
Standard
\change_inserted 34634807 1296982295
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
\change_inserted 34634807 1296982295
Standard
\change_unchanged
\end_layout
\end_inset
\change_unchanged
\change_deleted 34634807 1296982977
layout
\change_inserted 34634807 1296982977
style
\change_unchanged
paragraphs inside environments use the
\begin_inset Flex Code \begin_inset Flex Code
status collapsed status collapsed
@ -12008,7 +12316,27 @@ Parindent
\end_inset \end_inset
of the environment, not their native one. of the environment, not their native one.
For example, Standard paragraphs inside an enumeration are not indented. For example,
\change_deleted 34634807 1296982308
Standard
\change_inserted 34634807 1296982308
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
\change_inserted 34634807 1296982308
Standard
\change_unchanged
\end_layout
\end_inset
\change_unchanged
paragraphs inside an enumeration are not indented.
\end_layout \end_layout
\begin_layout Description \begin_layout Description
@ -12031,7 +12359,13 @@ float=0
\end_inset \end_inset
] The vertical space between two paragraphs of this layout. ] The vertical space between two paragraphs of this
\change_deleted 34634807 1296982979
layout
\change_inserted 34634807 1296982979
style
\change_unchanged
.
\end_layout \end_layout
\begin_layout Description \begin_layout Description
@ -12096,7 +12430,13 @@ Paragraph
\begin_inset Quotes erd \begin_inset Quotes erd
\end_inset \end_inset
layout is ignored and all paragraphs are separated by this parskip argument.
\change_deleted 34634807 1296982981
layout
\change_inserted 34634807 1296982981
style
\change_unchanged
is ignored and all paragraphs are separated by this parskip argument.
The vertical space is calculated with The vertical space is calculated with
\begin_inset Flex Code \begin_inset Flex Code
status collapsed status collapsed
@ -12255,7 +12595,13 @@ int=0
\end_inset \end_inset
] The number of required arguments that the LaTeX command or environment ] The number of required arguments that the LaTeX command or environment
corresponding to this layout expects. corresponding to this
\change_deleted 34634807 1296982982
layout
\change_inserted 34634807 1296982982
style
\change_unchanged
expects.
In the case of a command, these are required arguments In the case of a command, these are required arguments
\emph on \emph on
other than other than
@ -12304,7 +12650,13 @@ name "des:Requires"
\end_inset \end_inset
Whether the layout requires the feature Whether the
\change_deleted 34634807 1296982984
layout
\change_inserted 34634807 1296982984
style
\change_unchanged
requires the feature
\begin_inset Flex Code \begin_inset Flex Code
status collapsed status collapsed
@ -12397,7 +12749,13 @@ single
\emph on \emph on
value value
\emph default \emph default
] This defines what the default spacing should be in the layout. ] This defines what the default spacing should be in the
\change_deleted 34634807 1296982985
layout
\change_inserted 34634807 1296982985
style
\change_unchanged
.
The arguments The arguments
\begin_inset Flex Code \begin_inset Flex Code
status collapsed status collapsed
@ -12574,9 +12932,20 @@ float=0
\end_inset \end_inset
] The vertical space with which the very first of a chain of paragraphs ] The vertical space with which the very first of a chain of paragraphs
with this layout is separated from the previous paragraph. with this
If the previous paragraph has another layout, the separations are not simply \change_deleted 34634807 1296982986
added, but the maximum is taken. layout
\change_inserted 34634807 1296982986
style
\change_unchanged
is separated from the previous paragraph.
If the previous paragraph has another
\change_deleted 34634807 1296982988
layout
\change_inserted 34634807 1296982988
style
\change_unchanged
, the separations are not simply added, but the maximum is taken.
\end_layout \end_layout
\begin_layout Subsection \begin_layout Subsection
@ -14527,8 +14896,28 @@ status collapsed
\end_inset \end_inset
] Indicates whether the PlainLayout should be used or, instead, the user ] Indicates whether the
can change the paragraph style used in the inset. \change_deleted 34634807 1296982392
PlainLayout
\change_inserted 34634807 1296982392
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
\change_inserted 34634807 1296982392
PlainLayout
\change_unchanged
\end_layout
\end_inset
\change_unchanged
should be used or, instead, the user can change the paragraph style used
in the inset.
Default is false. Default is false.
\end_layout \end_layout
@ -14682,7 +15071,47 @@ LabelString
\end_inset \end_inset
What will be displayed on the button or elsewhere as the inset label. What will be displayed on the button or elsewhere as the inset label.
Some inset types (TeX code and Branch) modify this label on the fly. Some inset types (
\change_deleted 34634807 1296982426
TeX code
\change_inserted 34634807 1296982426
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
\change_inserted 34634807 1296982426
TeX code
\change_unchanged
\end_layout
\end_inset
\change_unchanged
and
\change_deleted 34634807 1296982433
Branch
\change_inserted 34634807 1296982433
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
\change_inserted 34634807 1296982433
Branch
\change_unchanged
\end_layout
\end_inset
\change_unchanged
) modify this label on the fly.
\end_layout \end_layout
\begin_layout Description \begin_layout Description
@ -14968,7 +15397,13 @@ status collapsed
\end_inset \end_inset
] Whether fragile commands in this layout should be ] Whether fragile commands in this
\change_deleted 34634807 1296982465
layout
\change_inserted 34634807 1296982466
inset
\change_unchanged
should be
\begin_inset Flex Code \begin_inset Flex Code
status collapsed status collapsed
@ -19160,7 +19595,17 @@ InputFormat
\end_inset \end_inset
The file format of the original file. The file format of the original file.
This must be the name of a format that is known to LyX (see section This must be the name of a format that is known to LyX (see section
\change_inserted 34634807 1296982650
\begin_inset space ~
\end_inset
\change_deleted 34634807 1296982649
\change_unchanged
\begin_inset CommandInset ref \begin_inset CommandInset ref
LatexCommand ref LatexCommand ref
reference "sec:Formats" reference "sec:Formats"
@ -19301,7 +19746,25 @@ Format
\end_inset \end_inset
section for all formats. section for all
\change_deleted 34634807 1296982695
formats
\change_inserted 34634807 1296982711
templates
\begin_inset Note Note
status open
\begin_layout Plain Layout
\change_inserted 34634807 1296982711
format or template here ?
\end_layout
\end_inset
\change_unchanged
.
Use a dummy text when no representation is available. Use a dummy text when no representation is available.
Then you can at least see a reference to the external material in the exported Then you can at least see a reference to the external material in the exported
document. document.
@ -19669,7 +20132,22 @@ ools\SpecialChar \menuseparator
\bar under \bar under
P P
\bar default \bar default
references:Conversion references
\change_deleted 34634807 1296982746
:Conversion
\change_inserted 34634807 1296982770
File
\begin_inset space ~
\end_inset
handling\SpecialChar \menuseparator
File
\begin_inset space ~
\end_inset
Format
\change_unchanged
\end_layout \end_layout
\end_inset \end_inset