- Math.lyx: remove unneeded ERT

- UserGuide.lyx: update version number

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28506 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2009-02-16 03:07:55 +00:00
parent 580ac2213d
commit c6fbe700b9
5 changed files with 68 additions and 598 deletions

View File

@ -28068,43 +28068,13 @@ Long formulas can be typeset using these methods:
\begin_layout Itemize
When one side of the equation is much shorther than the line width, this
one is chosen for the left side and the right side is typeset over two
lines:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\end_inset
lines:
\begin_inset Formula \begin{eqnarray}
H & = & W_{SB}+W_{mv}+W_{D}-\frac{\hbar^{2}}{2m_{0}}\Delta-\frac{\hbar^{2}}{2m_{1}}\Delta_{1}-\frac{\hbar^{2}}{2m_{2}}\Delta_{2}-\frac{e^{2}}{4\pi\varepsilon_{0}|\mathbf{r}-\mathbf{R}_{1}|}\nonumber \\
& & -\hspace{3pt}\frac{e^{2}}{4\pi\varepsilon_{0}|\mathbf{r}-\mathbf{R}_{2}|}+\frac{e^{2}}{4\pi\varepsilon_{0}|\mathbf{R}_{1}-\mathbf{R}_{2}|}\label{eq:shortlong}\end{eqnarray}
\end_inset
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
smallskip
\end_layout
\end_inset
\begin_inset Newline newline
\end_inset
The minus sign at the beginning of the second line does normally not appear
as operator because it is the first character of the line.
Thus it would not be surrounded by space and could not be distinguished
@ -28176,19 +28146,6 @@ lefteqn
is used.
It is inserted to the first column of the first line and effects that all
further insertions overwrite the following columns:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\end_inset
\begin_inset Formula \begin{eqnarray}
\lefteqn{4x^{2}\left(B^{2}+x_{0}^{2}\right)+4x_{0}x\left(D-B^{2}\right)+B^{2}\left(B^{2}-2r_{g}^{2}+2x_{0}^{2}-2r_{k}^{2}\right)+D^{2}}\nonumber \\
& & -\hspace{3pt}B^{2}-2B\sqrt{r_{g}^{2}-x^{2}+2x_{0}x-x_{0}^{2}}+r_{g}^{2}-x^{2}+2x_{0}x-x_{0}^{2}\nonumber \\
@ -28196,23 +28153,6 @@ medskip
\end_inset
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
smallskip
\end_layout
\end_inset
\begin_inset Newline newline
\end_inset
After the insertion of
\series bold
@ -28222,35 +28162,13 @@ lefteqn
, the cursor is in a purple box that is a bit shifted to the left from the
blue one.
In this the formula is inserted.
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\end_inset
\begin_inset Newline newline
\end_inset
The content of the further lines is inserted to the second or another formula
column.
The greater the column number where it was inserted, the larger the indentation.
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
@ -31313,25 +31231,16 @@ gr
Longrightarrow
\series default
, the LaTeX-preamble line is:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series bold
\backslash
newcommand{
\backslash
@ -31355,25 +31264,16 @@ underline
\series default
, the argument (that should be underlined) must be taken into account.
For this the preamble line is:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series bold
\backslash
newcommand{
\backslash
@ -31382,26 +31282,13 @@ us}[1]{
underline{#1}}
\series default
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series default
The character
\series bold
#
@ -31435,25 +31322,16 @@ define the command
fb
\series default
:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series bold
\backslash
newcommand{
\backslash
@ -31462,26 +31340,13 @@ fb}[3]{
framebox#1#2{$#3$}}
\series default
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series default
The two Dollar signs creates the extra formula needed for
\series bold
@ -31507,25 +31372,16 @@ fcolorbox
\series default
where the color for the box needn't to be specified, the argument for the
color is defined optional:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series bold
\backslash
newcommand{
\backslash
@ -31534,16 +31390,7 @@ cb}[3][white]{
fcolorbox{#2}{#1}{$#3$}}
\series default
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset

View File

@ -143,7 +143,7 @@ type "mailto:"
\begin_inset Newline newline
\end_inset
Version 1.6.1
Version 2.0.x
\begin_inset Note Note
status open

View File

@ -28061,18 +28061,6 @@ Lange Formeln kann man wie folgt setzen:
\begin_layout Itemize
Ist eine Seite der Gleichung deutlich kürzer als die Zeilenbreite, wählt
man man diese als linke Seite und schreibt die rechte über zwei Zeilen:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\end_inset
\begin_inset Formula \begin{eqnarray}
H & = & W_{SB}+W_{mv}+W_{D}-\frac{\hbar^{2}}{2m_{0}}\Delta-\frac{\hbar^{2}}{2m_{1}}\Delta_{1}-\frac{\hbar^{2}}{2m_{2}}\Delta_{2}-\frac{e^{2}}{4\pi\varepsilon_{0}|\mathbf{r}-\mathbf{R}_{1}|}\nonumber \\
@ -28080,23 +28068,6 @@ H & = & W_{SB}+W_{mv}+W_{D}-\frac{\hbar^{2}}{2m_{0}}\Delta-\frac{\hbar^{2}}{2m_{
\end_inset
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
smallskip
\end_layout
\end_inset
\begin_inset Newline newline
\end_inset
Das Minuszeichen zu Beginn der zweiten Zeile erscheint eigentlich nicht
als Operator, da es das erste Zeichen der Zeile ist.
Deswegen wäre es nicht von Leerraum umgeben und ließe sich schlecht vom
@ -28167,19 +28138,6 @@ lefteqn
.
Dieser wird in die erste Spalte der ersten Zeile eingegeben und bewirkt,
dass alle weiteren Eingaben die folgenden Spalten überschreiben:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\end_inset
\begin_inset Formula \begin{eqnarray}
\lefteqn{4x^{2}\left(B^{2}+x_{0}^{2}\right)+4x_{0}x\left(D-B^{2}\right)+B^{2}\left(B^{2}-2r_{g}^{2}+2x_{0}^{2}-2r_{k}^{2}\right)+D^{2}}\nonumber \\
& & -\hspace{3pt}B^{2}-2B\sqrt{r_{g}^{2}-x^{2}+2x_{0}x-x_{0}^{2}}+r_{g}^{2}-x^{2}+2x_{0}x-x_{0}^{2}\nonumber \\
@ -28187,23 +28145,6 @@ medskip
\end_inset
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
smallskip
\end_layout
\end_inset
\begin_inset Newline newline
\end_inset
Nachdem man
\series bold
@ -28213,19 +28154,6 @@ lefteqn
eingegeben hat, befindet sich der Cursor in einem pinkfarbenen Kästchen,
das gegenüber dem blauen leicht verschoben ist.
In dieses wird die Formel eingegeben.
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\end_inset
\begin_inset Newline newline
\end_inset
@ -28233,16 +28161,7 @@ Der Inhalt der weiteren Zeilen wird in die zweite oder eine andere Formelspalte
eingegeben.
Je größer die Spaltennummer in die eingegeben wurde, desto größer ist die
Einrückung.
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
@ -31352,25 +31271,16 @@ gr
\series default
definieren, lautet die LaTeX-Vor\SpecialChar \-
spannzeile:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series bold
\backslash
newcommand{
\backslash
@ -31395,25 +31305,16 @@ us
zu definieren, muss das Argument (was unterstrichen werden soll) berücksichtigt
werden.
Dazu sieht die Vorspannzeile wie folgt aus:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series bold
\backslash
newcommand{
\backslash
@ -31422,26 +31323,13 @@ us}[1]{
underline{#1}}
\series default
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series default
Das Zeichen
\series bold
#
@ -31472,25 +31360,16 @@ B.
fb
\series default
definieren:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series bold
\backslash
newcommand{
\backslash
@ -31499,26 +31378,13 @@ fb}[3]{
framebox#1#2{$#3$}}
\series default
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series default
Die beiden Dollarzeichen erstellen hierbei die für
\series bold
@ -31544,25 +31410,16 @@ fcolorbox
\series default
zu erstellen, bei dem die Farbe der Box nicht mehr angegeben werden muss,
definiert man das Argument für die Farbe als optional:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series bold
\backslash
newcommand{
\backslash
@ -31571,16 +31428,7 @@ cb}[3][white]{
fcolorbox{#2}{#1}{$#3$}}
\series default
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset

View File

@ -28605,16 +28605,7 @@ lefteqn
El contenido de las restantes líneas se inserta en la segunda columna o
en otra.
A mayor número de columna donde se inserte, mayor sangrado.
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
@ -31751,25 +31742,16 @@ gr
Longrightarrow
\series default
, la línea de preámbulo LaTeX es:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series bold
\backslash
newcommand{
\backslash
@ -31792,26 +31774,17 @@ us
underline
\series default
, el argumento (que sería subrayado) debe tenerse en cuenta.
Para esto la línea de preámbulo es: :
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
Para esto la línea de preámbulo es:
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series bold
\backslash
newcommand{
\backslash
@ -31820,16 +31793,7 @@ us}[1]{
underline{#1}}
\series default
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
@ -31866,25 +31830,16 @@ e.
fb
\series default
:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series bold
\backslash
newcommand{
\backslash
@ -31893,16 +31848,7 @@ fb}[3]{
framebox#1#2{$#3$}}
\series default
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
@ -31934,25 +31880,16 @@ fcolorbox
\series default
donde no es necesario especificar el color para el cuadro, el argumento
para el color se define opcional:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series bold
\backslash
newcommand{
\backslash
@ -31961,16 +31898,7 @@ cb}[3][white]{
fcolorbox{#2}{#1}{$#3$}}
\series default
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset

View File

@ -27792,43 +27792,13 @@ Les formules longues peuvent être mises en forme en utilisant une de ces
\begin_layout Itemize
Quand un des membres de l'équation est beaucoup plus court que la largeur
de la ligne, c'est lui qui est choisi comme membre de gauche et le membre
de droite est écrit sur deux lignes:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\end_inset
de droite est écrit sur deux lignes:
\begin_inset Formula \begin{eqnarray}
H & = & W_{SB}+W_{mv}+W_{D}-\frac{\hbar^{2}}{2m_{0}}\Delta-\frac{\hbar^{2}}{2m_{1}}\Delta_{1}-\frac{\hbar^{2}}{2m_{2}}\Delta_{2}-\frac{e^{2}}{4\pi\varepsilon_{0}|\mathbf{r}-\mathbf{R}_{1}|}\nonumber \\
& & -\hspace{3pt}\frac{e^{2}}{4\pi\varepsilon_{0}|\mathbf{r}-\mathbf{R}_{2}|}+\frac{e^{2}}{4\pi\varepsilon_{0}|\mathbf{R}_{1}-\mathbf{R}_{2}|}\label{eq:courtlong}\end{eqnarray}
\end_inset
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
smallskip
\end_layout
\end_inset
\begin_inset Newline newline
\end_inset
Le signe moins au début de la deuxième ligne n'apparaît normalement pas
comme un opérateur puisqu'il est le premier caractère de la ligne.
À cause de cela, il ne devrait pas être entouré d'espace ce qui le rendrait
@ -27901,19 +27871,6 @@ lefteqn
.
Elle est insérée dans la première colonne de la première ligne et a comme
effet que tout ce qui sera inséré après va recouvrir les colonnes qui suivent:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\end_inset
\begin_inset Formula \begin{eqnarray}
\lefteqn{4x^{2}\left(B^{2}+x_{0}^{2}\right)+4x_{0}x\left(D-B^{2}\right)+B^{2}\left(B^{2}-2r_{g}^{2}+2x_{0}^{2}-2r_{k}^{2}\right)+D^{2}}\nonumber \\
& & -\hspace{3pt}B^{2}-2B\sqrt{r_{g}^{2}-x^{2}+2x_{0}x-x_{0}^{2}}+r_{g}^{2}-x^{2}+2x_{0}x-x_{0}^{2}\nonumber \\
@ -27921,23 +27878,6 @@ medskip
\end_inset
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
smallskip
\end_layout
\end_inset
\begin_inset Newline newline
\end_inset
Après l'insertion de la commande
\series bold
@ -27947,35 +27887,13 @@ lefteqn
, le curseur se trouve dans une boîte violette qui est légèrement décalée
vers la gauche par rapport à la boîte bleue.
C'est dans cette dernière que l'on insère la formule.
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\end_inset
\begin_inset Newline newline
\end_inset
Le contenu des lignes suivantes est inséré dans la deuxième colonne ou dans
celles d'après.
Plus le numéro de la colonne sera élevé, plus l'indentation sera importante.
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
@ -31044,25 +30962,16 @@ gr
Longrightarrow
\series default
, la ligne à insérer dans le préambule LaTeX est:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series bold
\backslash
newcommand{
\backslash
@ -31086,25 +30995,16 @@ underline
\series default
, l'argument (qui doit être souligné) doit être pris en compte.
Pour cela, la ligne à insérer dans le préambule est:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series bold
\backslash
newcommand{
\backslash
@ -31113,26 +31013,13 @@ us}[1]{
underline{#1}}
\series default
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series default
Le caractère
\series bold
#
@ -31158,25 +31045,16 @@ framebox
fb
\series default
:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series bold
\backslash
newcommand{
\backslash
@ -31185,26 +31063,13 @@ fb}[3]{
framebox#1#2{$#3$}}
\series default
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series default
Les deux dollars créent une formule supplémentaire pour la commande
\series bold
@ -31230,25 +31095,16 @@ fcolorbox
\series default
où la couleur de la boîte n'aurait pas besoin d'être précisée, l'argument
pour la couleur est défini comme optionnel:
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset
\series bold
\begin_inset Newline newline
\end_inset
\series bold
\backslash
newcommand{
\backslash
@ -31257,16 +31113,7 @@ cb}[3][white]{
fcolorbox{#2}{#1}{$#3$}}
\series default
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
medskip
\end_layout
\begin_inset VSpace medskip
\end_inset