mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 10:00:33 +00:00
Math.lyx: merge yesterday's changes
Please treat the doc files as frozen from now on, a an announcement how to proceed will follow later today.
This commit is contained in:
Uwe Stöhr
parent
5bc44b2cf2
commit
f5a9ee54e6
@ -2,7 +2,7 @@
|
||||
\lyxformat 503
|
||||
\begin_document
|
||||
\begin_header
|
||||
\origin /systemlyxdir/doc/
|
||||
\origin unavailable
|
||||
\textclass scrartcl
|
||||
\begin_preamble
|
||||
% DO NOT ALTER THIS PREAMBLE!!!
|
||||
@ -207,13 +207,11 @@
|
||||
\bullet 1 0 6 -1
|
||||
\bullet 2 2 35 -1
|
||||
\bullet 3 2 7 -1
|
||||
\tracking_changes true
|
||||
\tracking_changes false
|
||||
\output_changes false
|
||||
\html_math_output 0
|
||||
\html_css_as_file 0
|
||||
\html_be_strict false
|
||||
\author -1174727462 "Kornel Benko" Kornel.Benko@berlin.de
|
||||
\author 2047637253 "Guillaume Munch"
|
||||
\end_header
|
||||
|
||||
\begin_body
|
||||
@ -1174,11 +1172,7 @@ pt)
|
||||
\begin_inset Text
|
||||
|
||||
\begin_layout Plain Layout
|
||||
b
|
||||
\change_deleted -1174727462 1449863719
|
||||
ö
|
||||
\change_unchanged
|
||||
p
|
||||
bp
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
@ -27758,38 +27752,7 @@ arg "newline-insert newline"
|
||||
\end_inset
|
||||
|
||||
inside a formula.
|
||||
|
||||
\change_deleted 2047637253 1449850740
|
||||
This creates either an
|
||||
\series bold
|
||||
eqnarray environment
|
||||
\series default
|
||||
that is described in
|
||||
\begin_inset CommandInset ref
|
||||
LatexCommand ref
|
||||
reference "subsec:Eqnarray-Environment"
|
||||
|
||||
\end_inset
|
||||
|
||||
or, when the option
|
||||
\family sans
|
||||
Use AMS math package
|
||||
\family default
|
||||
in the document settings is selected, an
|
||||
\series bold
|
||||
align environment
|
||||
\series default
|
||||
that is described in
|
||||
\begin_inset CommandInset ref
|
||||
LatexCommand ref
|
||||
reference "subsec:Standard-align-Environment"
|
||||
|
||||
\end_inset
|
||||
|
||||
.
|
||||
|
||||
\change_inserted 2047637253 1449851860
|
||||
This creates either an
|
||||
This creates either an
|
||||
\series bold
|
||||
align environment
|
||||
\series default
|
||||
@ -27816,10 +27779,8 @@ reference "subsec:Eqnarray-Environment"
|
||||
\end_inset
|
||||
|
||||
.
|
||||
|
||||
\change_unchanged
|
||||
The align environment is recommended because it provides in any case a typograph
|
||||
ically correct output.
|
||||
The align environment is recommended because it provides in any case a
|
||||
typographically correct output.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
@ -4,6 +4,7 @@ Modified:
|
||||
|
||||
- sec. 15.1: Spanish only: new note behind the table
|
||||
- sec. 16.1: Spanish only: correct note in the table
|
||||
- sec. 18.1: Japanese only: updated paragraph
|
||||
|
||||
New:
|
||||
|
||||
|
||||
@ -27586,21 +27586,6 @@ Strg+Enter
|
||||
drückt.
|
||||
Dies erzeugt entweder eine
|
||||
\series bold
|
||||
eqnarray-Umgebung
|
||||
\series default
|
||||
, die in
|
||||
\begin_inset CommandInset ref
|
||||
LatexCommand ref
|
||||
reference "subsec:Eqnarray-Umgebung"
|
||||
|
||||
\end_inset
|
||||
|
||||
beschrieben ist oder, wenn die Option
|
||||
\family sans
|
||||
AMS-Mathe-Paket verwenden
|
||||
\family default
|
||||
in den Dokumenteinstellungen gewählt ist, eine
|
||||
\series bold
|
||||
align-Umgebung
|
||||
\series default
|
||||
, die in
|
||||
@ -27608,6 +27593,21 @@ align-Umgebung
|
||||
LatexCommand ref
|
||||
reference "subsec:Standard-align-Umgebung"
|
||||
|
||||
\end_inset
|
||||
|
||||
beschrieben ist, oder, wenn die Option
|
||||
\family sans
|
||||
AMS-Mathe-Paket automatisch verwenden
|
||||
\family default
|
||||
in den Dokumenteinstellungen nicht ausgewählt ist, eine
|
||||
\series bold
|
||||
eqnarray-Umgebung
|
||||
\series default
|
||||
, die in
|
||||
\begin_inset CommandInset ref
|
||||
LatexCommand ref
|
||||
reference "subsec:Eqnarray-Umgebung"
|
||||
|
||||
\end_inset
|
||||
|
||||
beschrieben ist.
|
||||
|
||||
@ -28088,7 +28088,11 @@ Ctrl+Entrar
|
||||
.
|
||||
Esto crea un
|
||||
\series bold
|
||||
entorno eqnarray
|
||||
entorno
|
||||
\series default
|
||||
|
||||
\series bold
|
||||
align
|
||||
\series default
|
||||
, que se describe en
|
||||
\begin_inset space ~
|
||||
@ -28097,11 +28101,11 @@ entorno eqnarray
|
||||
|
||||
\begin_inset CommandInset ref
|
||||
LatexCommand ref
|
||||
reference "subsec:Entorno-eqnarray"
|
||||
reference "subsec:Entorno-align-estándar"
|
||||
|
||||
\end_inset
|
||||
|
||||
o, si se ha marcado la opción
|
||||
o, si no se ha marcado la opción
|
||||
\family sans
|
||||
Usar
|
||||
\begin_inset space ~
|
||||
@ -28125,16 +28129,12 @@ ecuaciones
|
||||
|
||||
AMS
|
||||
\family default
|
||||
en la configuración del documento
|
||||
en la configuración del documento, un
|
||||
\family sans
|
||||
, un
|
||||
\series bold
|
||||
entorno
|
||||
\family default
|
||||
\series default
|
||||
|
||||
\family default
|
||||
\series bold
|
||||
align
|
||||
entorno eqnarray
|
||||
\series default
|
||||
, que se describe en
|
||||
\begin_inset space ~
|
||||
@ -28143,7 +28143,7 @@ align
|
||||
|
||||
\begin_inset CommandInset ref
|
||||
LatexCommand ref
|
||||
reference "subsec:Entorno-align-estándar"
|
||||
reference "subsec:Entorno-eqnarray"
|
||||
|
||||
\end_inset
|
||||
|
||||
|
||||
@ -27839,32 +27839,9 @@ Dans \SpecialChar LyX
|
||||
Ctrl+Entrée
|
||||
\family default
|
||||
à l'intérieur d'une formule.
|
||||
Cela crée soit un environnement
|
||||
Cela crée soit un
|
||||
\series bold
|
||||
eqnarray
|
||||
\series default
|
||||
qui est décrit dans
|
||||
\begin_inset space ~
|
||||
\end_inset
|
||||
|
||||
|
||||
\begin_inset CommandInset ref
|
||||
LatexCommand ref
|
||||
reference "subsec:Environnement-eqnarray"
|
||||
|
||||
\end_inset
|
||||
|
||||
|
||||
\series bold
|
||||
,
|
||||
\series default
|
||||
soit dans le cas où l'option
|
||||
\family sans
|
||||
Utiliser le paquetage math AMS
|
||||
\family default
|
||||
est activée dans les préférences du document, un environnement
|
||||
\series bold
|
||||
align
|
||||
environnement align
|
||||
\series default
|
||||
qui est décrit dans
|
||||
\begin_inset space ~
|
||||
@ -27877,13 +27854,32 @@ reference "subsec:Environnement-align-standard"
|
||||
|
||||
\end_inset
|
||||
|
||||
.
|
||||
L'environnement
|
||||
|
||||
\series bold
|
||||
align
|
||||
,
|
||||
\series default
|
||||
est recommandé car il produit une sortie typographiquement correcte dans
|
||||
tous les cas.
|
||||
soit dans le cas où l'option
|
||||
\family sans
|
||||
Utiliser le paquetage math AMS
|
||||
\family default
|
||||
est désactivée dans les préférences du document, un
|
||||
\series bold
|
||||
environnement eqnarray
|
||||
\series default
|
||||
qui est décrit dans
|
||||
\begin_inset space ~
|
||||
\end_inset
|
||||
|
||||
|
||||
\begin_inset CommandInset ref
|
||||
LatexCommand ref
|
||||
reference "subsec:Environnement-eqnarray"
|
||||
|
||||
\end_inset
|
||||
|
||||
.
|
||||
L'environnement align est recommandé car il produit une sortie typographiquemen
|
||||
t correcte dans tous les cas.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
@ -27311,7 +27311,52 @@ type "shortcut"
|
||||
arg "newline-insert newline"
|
||||
\end_inset
|
||||
|
||||
を押すことで作られます。この操作によって、第
|
||||
を押すことで作られます。
|
||||
\lang english
|
||||
This creates either an
|
||||
\series bold
|
||||
align environment
|
||||
\series default
|
||||
that is described in
|
||||
\lang japanese
|
||||
第
|
||||
\begin_inset CommandInset ref
|
||||
LatexCommand ref
|
||||
reference "subsec:標準align環境"
|
||||
|
||||
\end_inset
|
||||
|
||||
|
||||
\lang english
|
||||
or, when automatically loading the package
|
||||
\family sans
|
||||
AMS math
|
||||
\family default
|
||||
is disabled in the document settings, an
|
||||
\series bold
|
||||
eqnarray environment
|
||||
\series default
|
||||
that is described in
|
||||
\lang japanese
|
||||
第
|
||||
\begin_inset CommandInset ref
|
||||
LatexCommand ref
|
||||
reference "subsec:eqnarray環境"
|
||||
|
||||
\end_inset
|
||||
|
||||
。
|
||||
\lang english
|
||||
The align environment is recommended because it provides in any case a typograph
|
||||
ically correct output.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
\begin_inset Note Note
|
||||
status open
|
||||
|
||||
\begin_layout Plain Layout
|
||||
outdated, please remove after the translation: この操作によって、第
|
||||
\begin_inset CommandInset ref
|
||||
LatexCommand ref
|
||||
reference "subsec:eqnarray環境"
|
||||
@ -27340,6 +27385,11 @@ align環境
|
||||
が作り出されることになります。
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
他にも、
|
||||
\family sans
|
||||
|
||||
Loading…
Reference in New Issue
Block a user