The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit e43295640e953fa51d7008587cde5243bfda0ef5
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Tue Oct 16 23:54:24 2012 +0200

    Math.lyx: add info about character ^ in chemical formulas

diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx
index 0ce8080..36dd725 100644
--- a/lib/doc/Math.lyx
+++ b/lib/doc/Math.lyx
@@ -31518,9 +31518,14 @@ status open
 \begin_layout Plain Layout
 
 \series bold
+\color none
 Note:
 \series default
- Only maximal 26 formulas can be numbered with Latin letters in one document.
+ Only maximal 26
+\begin_inset space ~
+\end_inset
+
+formulas can be numbered with Latin letters in one document.
 \end_layout
 
 \end_inset
@@ -32371,6 +32376,7 @@ status open
 \begin_layout Plain Layout
 
 \series bold
+\color none
 Note:
 \series default
  Inserting a formula to a 
@@ -32416,6 +32422,40 @@ hyphen$Cl}
 \end_layout
 
 \begin_layout Standard
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\color none
+Note:
+\series default
+ It is not possible in LyX to use the character ^ to get an up-arrow as
+ described in the 
+\series bold
+mhchem
+\series default
+ manual.
+ One instead uses a negative thin space followed by the command 
+\series bold
+
+\backslash
+uparrow
+\series default
+: 
+\begin_inset Formula $\ce{Fe + 2H+ -> Fe^{2+} + H2\negthinspace\uparrow}$
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
 Using 
 \series bold
 
@@ -34760,7 +34800,7 @@ Maxima
 \begin_layout Standard
 
 \series bold
-command-alternatives paragraph-break;math-extern maxima
+command-alternatives break-paragraph;math-extern maxima
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx
index be4a8d7..e8dcb5c 100644
--- a/lib/doc/de/Math.lyx
+++ b/lib/doc/de/Math.lyx
@@ -31584,10 +31584,14 @@ status open
 \begin_layout Plain Layout
 
 \series bold
+\color none
 Achtung:
 \series default
- Es können nur maximal 26 Formeln in einem Dokument mit lateinischen 
Buchstaben
- nummeriert werden.
+ Es können nur maximal 26
+\begin_inset space ~
+\end_inset
+
+Formeln in einem Dokument mit lateinischen Buchstaben nummeriert werden.
 \end_layout
 
 \end_inset
@@ -32430,6 +32434,7 @@ status open
 \begin_layout Plain Layout
 
 \series bold
+\color none
 Achtung:
 \series default
  Wenn eine Formel in eine 
@@ -32444,7 +32449,11 @@ ce
 \end_inset
 
 B.
- für 
+ für
+\begin_inset Newline newline
+\end_inset
+
+
 \series bold
 
 \backslash
@@ -32480,6 +32489,45 @@ hyphen$Cl}
 \end_layout
 
 \begin_layout Standard
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\color none
+Achtung:
+\series default
+ Es ist nicht möglich in LyX das Zeichen ^ zu verwenden um einen Pfeil nach
+ oben zu bekommen, wie es im 
+\series bold
+mhchem
+\series default
+-Handbuch steht.
+ Man verwendet stattdessen einen kleinen negativen Leerraum gefolgt vom
+ Befehl 
+\series bold
+
+\backslash
+uparrow
+\series default
+:
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Formula $\ce{Fe + 2H+ -> Fe^{2+} + H2\negthinspace\uparrow}$
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
 Wird 
 \series bold
 
@@ -32808,6 +32856,13 @@ status collapsed
 \end_layout
 
 \begin_layout Standard
+\begin_inset Newpage pagebreak
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
 Zum Erstellen der Beziehungen gibt es folgende Befehle:
 \end_layout
 
@@ -34808,7 +34863,7 @@ Maxima
 \begin_layout Standard
 
 \series bold
-command-alternatives paragraph-break;math-extern maxima
+command-alternatives break-paragraph;math-extern maxima
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx
index a6f1a1f..f1848c2 100644
--- a/lib/doc/es/Math.lyx
+++ b/lib/doc/es/Math.lyx
@@ -31992,9 +31992,14 @@ status open
 \begin_layout Plain Layout
 
 \series bold
+\color none
 Nota:
 \series default
- Con letras latinas sólo se puede numerar hasta un máximo de 26 ecuaciones.
+ Con letras latinas sólo se puede numerar hasta un máximo de 26
+\begin_inset space ~
+\end_inset
+
+ecuaciones.
 \end_layout
 
 \end_inset
@@ -32917,6 +32922,7 @@ status open
 \begin_layout Plain Layout
 
 \series bold
+\color none
 Nota:
 \series default
  Insertar modo matemático en un marco 
@@ -32962,6 +32968,43 @@ hyphen$Cl}
 \end_layout
 
 \begin_layout Standard
+
+\lang english
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\color none
+\lang english
+Note:
+\series default
+ It is not possible in LyX to use the character ^ to get an up-arrow as
+ described in the 
+\series bold
+mhchem
+\series default
+ manual.
+ One instead uses a negative thin space followed by the command 
+\series bold
+
+\backslash
+uparrow
+\series default
+: 
+\begin_inset Formula $\ce{Fe + 2H+ -> Fe^{2+} + H2\negthinspace\uparrow}$
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
 El comando 
 \series bold
 
@@ -35284,7 +35327,16 @@ Maxima
 \begin_layout Standard
 
 \series bold
-command-alternatives paragraph-break;math-extern maxima
+command-alternatives break-paragraph;math-extern maxima
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+\begin_inset Newpage newpage
+\end_inset
+
+
 \end_layout
 
 \begin_layout Section
@@ -36504,7 +36556,7 @@ red
 
 \begin_layout Standard
 \begin_inset ERT
-status open
+status collapsed
 
 \begin_layout Plain Layout
 
@@ -36535,7 +36587,7 @@ color{red}}
 
 \begin_layout Standard
 \begin_inset ERT
-status open
+status collapsed
 
 \begin_layout Plain Layout
 
diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx
index ec837fe..81236f6 100644
--- a/lib/doc/fr/Math.lyx
+++ b/lib/doc/fr/Math.lyx
@@ -31627,10 +31627,14 @@ status open
 \begin_layout Plain Layout
 
 \series bold
+\color none
 Note:
 \series default
- On peut numéroter au maximum 26 formules avec des lettres latines dans
- un même document.
+ On peut numéroter au maximum 26
+\begin_inset space ~
+\end_inset
+
+formules avec des lettres latines dans un même document.
 \end_layout
 
 \end_inset
@@ -32470,6 +32474,7 @@ status open
 \begin_layout Plain Layout
 
 \series bold
+\color none
 Note:
 \series default
  L'insertion d'une formule mathématique dans une boîte 
@@ -32515,6 +32520,43 @@ hyphen$Cl}
 \end_layout
 
 \begin_layout Standard
+
+\lang english
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\color none
+\lang english
+Note:
+\series default
+ It is not possible in LyX to use the character ^ to get an up-arrow as
+ described in the 
+\series bold
+mhchem
+\series default
+ manual.
+ One instead uses a negative thin space followed by the command 
+\series bold
+
+\backslash
+uparrow
+\series default
+: 
+\begin_inset Formula $\ce{Fe + 2H+ -> Fe^{2+} + H2\negthinspace\uparrow}$
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
 L'utilisation de la commande 
 \series bold
 
@@ -35049,7 +35091,7 @@ Maxima
 \begin_layout Standard
 
 \series bold
-command-alternatives paragraph-break;math-extern maxima
+command-alternatives break-paragraph;math-extern maxima
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx
index 44fd4a9..a2af99d 100644
--- a/lib/doc/ja/Math.lyx
+++ b/lib/doc/ja/Math.lyx
@@ -30951,6 +30951,7 @@ status open
 \begin_layout Plain Layout
 
 \series bold
+\color none
 (注意)
 \series default
 
ラテン文字を使うと、一つの文書の中で、最大26個の数式しか番号を振ることができません。
@@ -31783,6 +31784,7 @@ status open
 \begin_layout Plain Layout
 
 \series bold
+\color none
 【註】
 \backslash
 ce
@@ -31824,6 +31826,43 @@ hyphen$Cl}
 
 \begin_layout Standard
 
+\lang english
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\color none
+\lang english
+Note:
+\series default
+ It is not possible in LyX to use the character ^ to get an up-arrow as
+ described in the 
+\series bold
+mhchem
+\series default
+ manual.
+ One instead uses a negative thin space followed by the command 
+\series bold
+
+\backslash
+uparrow
+\series default
+: 
+\begin_inset Formula $\ce{Fe + 2H+ -> Fe^{2+} + H2\negthinspace\uparrow}$
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
 \series bold
 
 \backslash
@@ -34050,7 +34089,7 @@ Maxima
 
 \series bold
 \lang english
-command-alternatives paragraph-break;math-extern maxima
+command-alternatives break-paragraph;math-extern maxima
 \end_layout
 
 \begin_layout Standard

-----------------------------------------------------------------------

Summary of changes:
 lib/doc/Math.lyx    |   44 ++++++++++++++++++++++++++++++++++-
 lib/doc/de/Math.lyx |   63 +++++++++++++++++++++++++++++++++++++++++++++++---
 lib/doc/es/Math.lyx |   60 +++++++++++++++++++++++++++++++++++++++++++++---
 lib/doc/fr/Math.lyx |   48 ++++++++++++++++++++++++++++++++++++--
 lib/doc/ja/Math.lyx |   41 ++++++++++++++++++++++++++++++++-
 5 files changed, 242 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to