commit e8eed35c5c82f10b03f029ff190217a89697a462
Author: Uwe Stöhr <[email protected]>
Date: Sun Feb 21 17:46:55 2016 +0100
Math.lyx: revise section about subnumbering
thanks to Andrew Aparsloe for the hint
diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx
index 846a07f..ce75016 100644
--- a/lib/doc/Math.lyx
+++ b/lib/doc/Math.lyx
@@ -30050,27 +30050,14 @@ end{subequations}
An example:
\begin_inset Formula
\begin{equation}
-A=C-B\label{eq:a}
+A=C-B
\end{equation}
\end_inset
\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-addtocounter{equation}{-1}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
+status open
\begin_layout Plain Layout
@@ -30106,7 +30093,7 @@ C=A+B\label{eq:c}
\begin_layout Standard
\begin_inset ERT
-status collapsed
+status open
\begin_layout Plain Layout
@@ -30133,21 +30120,7 @@ first formula is inserted
\series bold
\backslash
-addtocounter{equation}{-1}
-\backslash
begin{subequations}
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Commands ! A !
-\backslash
-addtocounter
-\end_layout
-
-\end_inset
-
-
\begin_inset Newline newline
\end_inset
@@ -30187,36 +30160,13 @@ begin
\backslash
end
\series default
- is subnumbered as a, b,
-\begin_inset Newline linebreak
-\end_inset
-
-c, \SpecialChar ldots
- For multiline formulas every line will be subnumbered.
- All subnumbered formulas are treated as
-\emph on
-one
-\emph default
- numbered formula.
- But as every numbered formula increases the counter
-\series bold
-equation
-\series default
- by one, the command
-\series bold
-
-\backslash
-addtocounter
-\series default
- is needed to decrease it.
- Otherwise the formulas
-\begin_inset CommandInset ref
-LatexCommand eqref
-reference "eq:a"
-
-\end_inset
+ is subnumbered as a, b, c, \SpecialChar ldots
+ For multiline formulas every line will be subnumber
+ed.
+\end_layout
-,
+\begin_layout Standard
+Referencing subequations work like for normal equations:
\begin_inset CommandInset ref
LatexCommand eqref
reference "eq:b"
@@ -30230,34 +30180,29 @@ reference "eq:c"
\end_inset
- would be numbered as
-\begin_inset CommandInset ref
-LatexCommand eqref
-reference "eq:a"
-
-\end_inset
-
-,
-\begin_inset CommandInset ref
-LatexCommand eqref
-reference "eq:d"
-
-\end_inset
-
-,
+.
+ If you want to reference the subequations collectively, insert a label
+ directly after
+\series bold
+
+\backslash
+begin{subequations}
+\series default
+ and reference it.
+ Formula
\begin_inset CommandInset ref
LatexCommand eqref
-reference "eq:f"
+reference "eq:Here-is-an"
\end_inset
-.
+ is an example.
\end_layout
\begin_layout Standard
-By inserting the commands in \SpecialChar TeX
- mode, a space is created between the first
- two formulas.
+By inserting commands in \SpecialChar TeX
+ mode, a space is created between the first two
+ formulas.
To revert this -5
\begin_inset space \thinspace{}
\end_inset
@@ -30298,8 +30243,57 @@ mm space is inserted instead.
\end_layout
\begin_layout Standard
-Here is an example for a multiline formula where the numbering was turned
- off for the second line:
+To get another subnumber instead of small Latin letters, insert this command
+ as TeX code after
+\series bold
+
+\backslash
+begin{subequations}
+\series default
+:
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+theequation}{
+\backslash
+theparentequation -
+\backslash
+roman{equation}}
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+theparentequation
+\series default
+ creates hereby the parent number and
+\series bold
+
+\backslash
+roman{equation}
+\series default
+ adds a small Roman number as subnumber.
+ For more information about the customization of the numbering, see
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "subsec:Numbering-with-Roman"
+
+\end_inset
+
+.
+\end_layout
+
+\begin_layout Standard
+Here is an example for a multiline formula where the numbering is customized
+ and turned off for the second line:
\begin_inset ERT
status collapsed
@@ -30313,6 +30307,32 @@ begin{subequations}
\end_inset
+\begin_inset CommandInset label
+LatexCommand label
+name "eq:Here-is-an"
+
+\end_inset
+
+
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+theequation}{
+\backslash
+theparentequation -
+\backslash
+roman{equation}}
+\end_layout
+
+\end_inset
+
+
\begin_inset Formula
\begin{eqnarray}
A & = & (B-Z)^{2}=(B-Z)(B-Z)\label{eq:d}\\
@@ -31009,6 +31029,13 @@ makeatother
\begin_layout Subsection
Numbering with Roman Numbers and Letters
+\begin_inset CommandInset label
+LatexCommand label
+name "subsec:Numbering-with-Roman"
+
+\end_inset
+
+
\begin_inset Index idx
status collapsed
@@ -32513,13 +32540,6 @@ Manuals
.
\end_layout
-\begin_layout Standard
-\begin_inset Newpage newpage
-\end_inset
-
-
-\end_layout
-
\begin_layout Section
User-defined Commands
\begin_inset Index idx
diff --git a/lib/doc/attic/Changelog-Math-LyX_22.txt
b/lib/doc/attic/Changelog-Math-LyX_22.txt
index a1b79ca..1fd71bf 100644
--- a/lib/doc/attic/Changelog-Math-LyX_22.txt
+++ b/lib/doc/attic/Changelog-Math-LyX_22.txt
@@ -9,3 +9,10 @@ Modified:
New:
- sec. 13.3: new note behind the table
+
+
+In the second step:
+
+Modified:
+
+- sec. 19.3: revised and new descriptiion of a feature
diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx
index a3aa30b..58a2e1f 100644
--- a/lib/doc/de/Math.lyx
+++ b/lib/doc/de/Math.lyx
@@ -29887,27 +29887,14 @@ end{subequations}
Dazu ein Beispiel:
\begin_inset Formula
\begin{equation}
-A=C-B\label{eq:a}
+A=C-B
\end{equation}
\end_inset
\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-addtocounter{equation}{-1}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
+status open
\begin_layout Plain Layout
@@ -29943,7 +29930,7 @@ C=A+B\label{eq:c}
\begin_layout Standard
\begin_inset ERT
-status collapsed
+status open
\begin_layout Plain Layout
@@ -29970,21 +29957,7 @@ erste Formel eingeben
\series bold
\backslash
-addtocounter{equation}{-1}
-\backslash
begin{subequations}
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Befehle ! A !
-\backslash
-addtocounter
-\end_layout
-
-\end_inset
-
-
\begin_inset Newline newline
\end_inset
@@ -30027,30 +30000,11 @@ end
steht, wird mit a, b, c, \SpecialChar ldots
untergliedert.
Bei mehrzeiligen Formeln wird jede Zeile untergliedert.
- Alle untergliederten Formeln gelten als
-\emph on
-eine
-\emph default
- nummerierte Formel.
- Da jede nummerierte Formel den Formelzähler
-\series bold
-equation
-\series default
- um Eins erhöht, ist der Befehl
-\series bold
-
-\backslash
-addtocounter
-\series default
- notwendig um den Zähler wieder zu erniedrigen.
- Ansonsten würden die Formeln
-\begin_inset CommandInset ref
-LatexCommand eqref
-reference "eq:a"
-
-\end_inset
+\end_layout
-,
+\begin_layout Standard
+Auf Unternummerierungen zu verweisen funktioniert wie bei normalen Formeln:
+
\begin_inset CommandInset ref
LatexCommand eqref
reference "eq:b"
@@ -30064,28 +30018,23 @@ reference "eq:c"
\end_inset
- als
-\begin_inset CommandInset ref
-LatexCommand eqref
-reference "eq:a"
-
-\end_inset
-
-,
-\begin_inset CommandInset ref
-LatexCommand eqref
-reference "eq:d"
-
-\end_inset
-
-,
+.
+ Wenn man kollektiv auf die untergliederten Formeln verweisen will, fügt
+ man eine Marke direkt nach
+\series bold
+
+\backslash
+begin{subequations}
+\series default
+ ein und verweist darauf.
+ Formel
\begin_inset CommandInset ref
LatexCommand eqref
-reference "eq:f"
+reference "eq:Hier-ist-ein"
\end_inset
- nummeriert werden.
+ ist ein Beispiel dafür.
\end_layout
\begin_layout Standard
@@ -30132,8 +30081,57 @@ mm Leerraum ein.
\end_layout
\begin_layout Standard
+Um eine andere Unternummer als kleine lateinische Buchstaben zu erhalten,
+ fügt man diesen Befehl im TeX-Modus nach
+\series bold
+
+\backslash
+begin{subequations}
+\series default
+ ein:
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+theequation}{
+\backslash
+theparentequation -
+\backslash
+roman{equation}}
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+theparentequation
+\series default
+ erzeugt hierbei die Hauptnummer und
+\series bold
+
+\backslash
+roman{equation}
+\series default
+ fügt eine kleine römische Zahl als Unternummer hinzu.
+ Für weitere Informationen zur benutzerdefinierten Nummerierung, siehe
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "subsec:Nummerierung-mit-römischen"
+
+\end_inset
+
+.
+\end_layout
+
+\begin_layout Standard
Hier ist ein Beispiel für mehrzeilige Formeln, bei dem die Nummerierung
- der zweiten Zeile abgeschaltet wurde:
+ angepasst und in der zweiten Zeile abgeschaltet wurde:
\begin_inset ERT
status collapsed
@@ -30147,6 +30145,32 @@ begin{subequations}
\end_inset
+\begin_inset CommandInset label
+LatexCommand label
+name "eq:Hier-ist-ein"
+
+\end_inset
+
+
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+theequation}{
+\backslash
+theparentequation -
+\backslash
+roman{equation}}
+\end_layout
+
+\end_inset
+
+
\begin_inset Formula
\begin{eqnarray}
A & = & (B-Z)^{2}=(B-Z)(B-Z)\label{eq:d}\\
@@ -30885,6 +30909,13 @@ makeatother
\begin_layout Subsection
Nummerierung mit römischen Zahlen und Buchstaben
+\begin_inset CommandInset label
+LatexCommand label
+name "subsec:Nummerierung-mit-römischen"
+
+\end_inset
+
+
\begin_inset Index idx
status collapsed
diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx
index c6e7caa..8fe2cef 100644
--- a/lib/doc/es/Math.lyx
+++ b/lib/doc/es/Math.lyx
@@ -30386,20 +30386,7 @@ A=C-B\label{eq:a}
\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-addtocounter{equation}{-1}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
+status open
\begin_layout Plain Layout
@@ -30435,7 +30422,7 @@ C=A+B\label{eq:c}
\begin_layout Standard
\begin_inset ERT
-status collapsed
+status open
\begin_layout Plain Layout
@@ -30466,21 +30453,7 @@ después de ella se inserta
\backslash
-addtocounter{equation}{-1}
-\backslash
begin{subequations}
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Comandos ! A !
-\backslash
-addtocounter
-\end_layout
-
-\end_inset
-
-
\end_layout
\begin_layout Enumerate
@@ -30516,30 +30489,14 @@ end
\series default
se subnumera con a, b, c\SpecialChar ldots
En ecuaciones multilínea se subnumerará cada línea.
- Todas las ecuaciones subnumeradas son tratadas como
-\emph on
-una
-\emph default
- ecuación numerada.
- Pero como cada ecuación numerada aumenta el contador
-\series bold
-equation
-\series default
- en uno, hay que disminuir el comando
-\series bold
-
-\backslash
-addtocounter
-\series default
-.
- De lo contrario, las ecuaciones
-\begin_inset CommandInset ref
-LatexCommand eqref
-reference "eq:a"
+\end_layout
-\end_inset
+\begin_layout Standard
-,
+\lang english
+Referencing subequations work like for normal equations
+\lang spanish
+:
\begin_inset CommandInset ref
LatexCommand eqref
reference "eq:b"
@@ -30553,28 +30510,32 @@ reference "eq:c"
\end_inset
- se numerarían
-\begin_inset CommandInset ref
-LatexCommand eqref
-reference "eq:a"
-
-\end_inset
-
-,
-\begin_inset CommandInset ref
-LatexCommand eqref
-reference "eq:d"
-
-\end_inset
-
-,
+.
+
+\lang english
+If you want to reference the subequations collectively, insert a label directly
+ after
+\series bold
+\lang spanish
+
+\backslash
+begin{subequations}
+\series default
+
+\lang english
+and reference it.
+ Formula
+\lang spanish
+
\begin_inset CommandInset ref
LatexCommand eqref
-reference "eq:f"
+reference "eq:Un-ejemplo-de"
\end_inset
-.
+
+\lang english
+is an example.
\end_layout
\begin_layout Standard
@@ -30625,8 +30586,72 @@ mm.
\end_layout
\begin_layout Standard
-Un ejemplo de ecuación multilínea en la que se ha eliminado la numeración
- de la segunda línea:
+
+\lang english
+To get another subnumber instead of small Latin letters, insert this command
+ as TeX code after
+\lang spanish
+
+\series bold
+
+\backslash
+begin{subequations}
+\series default
+:
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+theequation}{
+\backslash
+theparentequation -
+\backslash
+roman{equation}}
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+theparentequation
+\series default
+
+\lang english
+creates hereby the parent number and
+\lang spanish
+
+\series bold
+
+\backslash
+roman{equation}
+\series default
+
+\lang english
+adds a small Roman number as subnumber.
+ For more information about the customization of the numbering
+\lang spanish
+, véase
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "subsec:Numeración-con-números"
+
+\end_inset
+
+.
+\end_layout
+
+\begin_layout Standard
+Un ejemplo de ecuación multilínea en la que
+\lang english
+the numbering is customized
+\lang spanish
+ y eliminado la numeración de la segunda línea:
\begin_inset ERT
status collapsed
@@ -30640,6 +30665,32 @@ begin{subequations}
\end_inset
+\begin_inset CommandInset label
+LatexCommand label
+name "eq:Un-ejemplo-de"
+
+\end_inset
+
+
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+theequation}{
+\backslash
+theparentequation -
+\backslash
+roman{equation}}
+\end_layout
+
+\end_inset
+
+
\begin_inset Formula
\begin{eqnarray}
A & = & (B-Z)^{2}=(B-Z)(B-Z)\label{eq:d}\\
@@ -31354,6 +31405,13 @@ makeatother
\begin_layout Subsection
Numeración con números romanos y letras
+\begin_inset CommandInset label
+LatexCommand label
+name "subsec:Numeración-con-números"
+
+\end_inset
+
+
\begin_inset Index idx
status collapsed
@@ -32054,7 +32112,10 @@ ce
\series default
en modo matemático aparece un nuevo marco azul en el que se pueden escribir
ecuaciones químicas de una forma intuitiva.
-\begin_inset Separator parbreak
+\end_layout
+
+\begin_layout Standard
+\begin_inset Newpage newpage
\end_inset
@@ -32617,6 +32678,13 @@ xymatrix
, que se explican a continuación.
\end_layout
+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+
\begin_layout Subsection
Diagramas amscd
\begin_inset Index idx
@@ -33011,11 +33079,7 @@ Diagram
\series default
en una ecuación.
Después podrás añadir nuevas columnas y filas como en matrices normales,
- véase
-\begin_inset space ~
-\end_inset
-
-
+ véase
\begin_inset CommandInset ref
LatexCommand ref
reference "sec:Matrices"
@@ -33042,13 +33106,6 @@ específicos
, hay ejemplos de diagramas de este tipo.
\end_layout
-\begin_layout Standard
-\begin_inset Newpage newpage
-\end_inset
-
-
-\end_layout
-
\begin_layout Section
Comandos definidos por el usuario
\begin_inset Index idx
@@ -33232,6 +33289,13 @@ primer
\end_layout
\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
Veamos unos ejemplos:
\end_layout
@@ -34571,13 +34635,6 @@ Octave
se limita a casos muy simples.
\end_layout
-\begin_layout Standard
-\begin_inset Newpage newpage
-\end_inset
-
-
-\end_layout
-
\begin_layout Subsection
Utilización
\end_layout
diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx
index 56e0d30..96521b7 100644
--- a/lib/doc/fr/Math.lyx
+++ b/lib/doc/fr/Math.lyx
@@ -30361,27 +30361,14 @@ end{subequations}
Un exemple:
\begin_inset Formula
\begin{equation}
-A=C-B\label{eq:a}
+A=C-B
\end{equation}
\end_inset
\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-addtocounter{equation}{-1}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
+status open
\begin_layout Plain Layout
@@ -30417,7 +30404,7 @@ C=A+B\label{eq:c}
\begin_layout Standard
\begin_inset ERT
-status collapsed
+status open
\begin_layout Plain Layout
@@ -30448,21 +30435,7 @@ après la première formule on insère
\series bold
\backslash
-addtocounter{equation}{-1}
-\backslash
begin{subequations}
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Commandes ! A !
-\backslash
-addtocounter
-\end_layout
-
-\end_inset
-
-
\series default
;
\end_layout
@@ -30498,40 +30471,17 @@ begin
\backslash
end
\series default
- est sous-numérotée avec a, b,
-\begin_inset Newline linebreak
-\end_inset
-
-c, \SpecialChar ldots
- Pour les formules multi-lignes, chaque ligne sera numérotée.
- Toutes les formules sous-numérotées sont traitées comme
-\emph on
-une seule
-\emph default
-formule.
- Mais comme chaque formule numérotée incrémente le compteur
-\series bold
-equation
-\series default
- de un, on a besoin de la commande
-\series bold
-
-\backslash
-addtocounter
-\series default
- pour le décrémenter.
- Sinon les formules
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand eqref
-reference "eq:a"
+ est sous-numérotée avec a, b, c, \SpecialChar ldots
+ Pour les formules multi-lignes, chaque
+ ligne sera numérotée.
+\end_layout
-\end_inset
+\begin_layout Standard
-,
+\lang english
+Referencing subequations work like for normal equations:
+\lang french
+
\begin_inset CommandInset ref
LatexCommand eqref
reference "eq:b"
@@ -30545,32 +30495,32 @@ reference "eq:c"
\end_inset
- seraient numérotées comme
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand eqref
-reference "eq:a"
-
-\end_inset
-
-,
-\begin_inset CommandInset ref
-LatexCommand eqref
-reference "eq:d"
-
-\end_inset
-
-,
+.
+
+\lang english
+If you want to reference the subequations collectively, insert a label directly
+ after
+\series bold
+\lang french
+
+\backslash
+begin{subequations}
+\series default
+
+\lang english
+and reference it.
+ Formula
+\lang french
+
\begin_inset CommandInset ref
LatexCommand eqref
-reference "eq:f"
+reference "eq:Voici-un-exemple"
\end_inset
-.
+
+\lang english
+is an example.
\end_layout
\begin_layout Standard
@@ -30621,11 +30571,72 @@ mm à la place.
\end_layout
\begin_layout Standard
-Voici un exemple de formule multi-lignes où on a désactivé la numérotation
- pour la deuxième ligne:
+
+\lang english
+To get another subnumber instead of small Latin letters, insert this command
+ as TeX code after
+\lang french
+
+\series bold
+
+\backslash
+begin{subequations}
+\series default
+:
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+theequation}{
+\backslash
+theparentequation -
+\backslash
+roman{equation}}
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+theparentequation
+\series default
+
+\lang english
+creates hereby the parent number and
+\lang french
+
+\series bold
+
+\backslash
+roman{equation}
+\series default
+
+\lang english
+adds a small Roman number as subnumber.
+ For more information about the customization of the numbering
+\lang french
+, voi
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "subsec:Numérotation-avec-des"
+
+\end_inset
+
+.
\end_layout
\begin_layout Standard
+Voici un exemple de formule multi-lignes où
+\lang english
+the numbering is customized
+\lang french
+ et désactivé la numérotation pour la deuxième ligne:
\begin_inset ERT
status collapsed
@@ -30639,6 +30650,32 @@ begin{subequations}
\end_inset
+\begin_inset CommandInset label
+LatexCommand label
+name "eq:Voici-un-exemple"
+
+\end_inset
+
+
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+theequation}{
+\backslash
+theparentequation -
+\backslash
+roman{equation}}
+\end_layout
+
+\end_inset
+
+
\begin_inset Formula
\begin{eqnarray}
A & = & (B-Z)^{2}=(B-Z)(B-Z)\label{eq:d}\\
@@ -31339,6 +31376,13 @@ makeatother
\begin_layout Subsection
Numérotation avec des chiffres romains ou des lettres
+\begin_inset CommandInset label
+LatexCommand label
+name "subsec:Numérotation-avec-des"
+
+\end_inset
+
+
\begin_inset Index idx
status collapsed
@@ -32496,6 +32540,13 @@ amscd
qui sont décrits dans ce qui suit.
\end_layout
+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+
\begin_layout Subsection
Les diagrammes amscd
\begin_inset Index idx
@@ -32740,11 +32791,7 @@ xymatrix
\series default
dans une formule.
Ensuite vous pouvez ajouter de nouvelles lignes et de nouvelles colonnes
- comme pour une matrice normale, voi
-\begin_inset space ~
-\end_inset
-
-
+ comme pour une matrice normale, voi
\begin_inset CommandInset ref
LatexCommand ref
reference "sec:Matrices"
@@ -36492,6 +36539,13 @@ mm à la place.
\end_layout
\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
Comme exemple, voici un texte multi-colonnes avec une formule hors-ligne:
\end_layout
diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx
index d96d3a3..9a25d2a 100644
--- a/lib/doc/ja/Math.lyx
+++ b/lib/doc/ja/Math.lyx
@@ -29501,27 +29501,14 @@ end{subequations}
たとえば、
\begin_inset Formula
\begin{equation}
-A=C-B\label{eq:a}
+A=C-B
\end{equation}
\end_inset
\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-addtocounter{equation}{-1}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
+status open
\begin_layout Plain Layout
@@ -29557,7 +29544,7 @@ C=A+B\label{eq:c}
\begin_layout Standard
\begin_inset ERT
-status collapsed
+status open
\begin_layout Plain Layout
@@ -29588,21 +29575,7 @@ end{subequations}
\series bold
\backslash
-addtocounter{equation}{-1}
-\backslash
begin{subequations}
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-こまんど@コマンド ! A !
-\backslash
-addtocounter
-\end_layout
-
-\end_inset
-
-
\begin_inset Newline newline
\end_inset
@@ -29647,63 +29620,58 @@ end
\end_inset
c\SpecialChar ldots
-のように細目番号が振られます。多行数式の場合は、すべての行に細目番号が振られます。細目番号が振られた数式はすべて、
-\emph on
-ひとつの
-\emph default
-付番数式として扱われますが、それぞれの付番数式が
-\series bold
-equation
-\series default
-カウンタを一つずつ進めてしまうので、
-\series bold
+のように細目番号が振られます。
+\end_layout
-\backslash
-addtocounter
-\series default
-コマンドを使ってカウンタを戻さなくてはなりません。これを怠ると、
-\begin_inset CommandInset ref
-LatexCommand eqref
-reference "eq:a"
+\begin_layout Standard
-\end_inset
+\lang english
+Referencing subequations work like for normal equations:
+\lang japanese
-式・
\begin_inset CommandInset ref
LatexCommand eqref
reference "eq:b"
\end_inset
-式・
-\begin_inset CommandInset ref
-LatexCommand eqref
-reference "eq:c"
-\end_inset
+\lang english
+,
+\lang japanese
-式は、それぞれ
\begin_inset CommandInset ref
LatexCommand eqref
-reference "eq:a"
+reference "eq:c"
\end_inset
-式・
-\begin_inset CommandInset ref
-LatexCommand eqref
-reference "eq:d"
-\end_inset
+\lang english
+.
+ If you want to reference the subequations collectively, insert a label
+ directly after
+\series bold
+\lang japanese
+
+\backslash
+begin{subequations}
+\series default
+
+\lang english
+and reference it.
+ Formula
+\lang japanese
-式・
\begin_inset CommandInset ref
LatexCommand eqref
-reference "eq:f"
+reference "eq:以下は、二行めのみ付番を無効にしている多行数式の例です。"
\end_inset
-式として番号が振られてしまいます。
+
+\lang english
+ is an example.
\end_layout
\begin_layout Standard
@@ -29751,7 +29719,72 @@ mm空白にしてください。
\end_layout
\begin_layout Standard
-以下は、二行めのみ付番を無効にしている多行数式の例です。
+
+\lang english
+To get another subnumber instead of small Latin letters, insert this command
+ as TeX code after
+\lang japanese
+
+\series bold
+
+\backslash
+begin{subequations}
+\series default
+:
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+theequation}{
+\backslash
+theparentequation -
+\backslash
+roman{equation}}
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+theparentequation
+\series default
+
+\lang english
+creates hereby the parent number and
+\lang japanese
+
+\series bold
+
+\backslash
+roman{equation}
+\series default
+\lang english
+ adds a small Roman number as subnumber.
+ For more information about the customization of the numbering, see
+\lang japanese
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "subsec:ローマ数字や文字を使った付番"
+
+\end_inset
+
+。
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+Here is an example for a multiline formula where the numbering is customized
+ and turned off for the second line:
+\lang japanese
+
\begin_inset ERT
status collapsed
@@ -29765,6 +29798,32 @@ begin{subequations}
\end_inset
+\begin_inset CommandInset label
+LatexCommand label
+name "eq:以下は、二行めのみ付番を無効にしている多行数式の例です。"
+
+\end_inset
+
+
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+theequation}{
+\backslash
+theparentequation -
+\backslash
+roman{equation}}
+\end_layout
+
+\end_inset
+
+
\begin_inset Formula
\begin{eqnarray}
A & = & (B-Z)^{2}=(B-Z)(B-Z)\label{eq:d}\\
@@ -30416,6 +30475,13 @@ makeatother
\begin_layout Subsection
ローマ数字や文字を使った付番
+\begin_inset CommandInset label
+LatexCommand label
+name "subsec:ローマ数字や文字を使った付番"
+
+\end_inset
+
+
\begin_inset Index idx
status collapsed
