commit f1f4d7f632d6a1bb275734acdf4531997296ed5b
Author: Uwe Stöhr <[email protected]>
Date: Sat Mar 8 02:13:24 2014 +0100
UserGuide.lyx: describe the new menu Edit→Start New Environment
- also correct some changes LFUNs
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index ed9c089..6fbeb16 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -5527,7 +5527,7 @@ Standard
depth, you can use
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
.
@@ -8040,12 +8040,14 @@ Verbatim
\end_layout
\begin_layout Verbatim
+
This is verbatim.
\end_layout
\begin_layout Verbatim
\noindent
\align block
+
The following 2 lines are empty:
\end_layout
@@ -8058,6 +8060,7 @@ The following 2 lines are empty:
\end_layout
\begin_layout Verbatim
+
Almost everything is allowed in verbatim:"%&$§#~'`
\backslash
}][{|
@@ -8339,6 +8342,12 @@ List
LyX-Code
\end_layout
+\begin_layout Itemize
+
+\family sans
+Verbatim
+\end_layout
+
\end_deeper
\begin_layout Description
Nestable-Inside You can nest them inside other things.
@@ -9103,7 +9112,7 @@ List
We created it by using
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
followed by
@@ -9134,7 +9143,7 @@ arg "depth-increment"
by entering
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
followed by
@@ -9165,7 +9174,7 @@ Standard
We did this by entering
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
, then
@@ -9203,7 +9212,7 @@ Standard
paragraph, also at level #4, made with just a
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
.
@@ -9215,7 +9224,7 @@ arg "break-paragraph inverse"
We enter
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
and changed the paragraph environment back to
@@ -9265,7 +9274,7 @@ and this is level #6.
Just enter
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
followed by a
@@ -9283,7 +9292,7 @@ arg "depth-decrement"
#4-b After another
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
followed by a
@@ -9458,7 +9467,7 @@ This is level #2.
We used
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
followed by
@@ -9492,7 +9501,7 @@ Itemize
(We got here by using
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
, then
@@ -9513,7 +9522,7 @@ Itemize
Here's level #4, produced using
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
, then
@@ -9576,7 +9585,7 @@ don't
Oh, as if you couldn't guess by now, we're just using
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
to keep the current environment and depth but create a new item.
@@ -9592,7 +9601,7 @@ arg "depth-decrement"
to decrease the depth after the next
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
.
@@ -9633,7 +9642,7 @@ did
Another
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
@@ -9656,7 +9665,7 @@ Enumerate
The same thing happens if we do another
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
@@ -9787,7 +9796,7 @@ Bippitey boppitey boo!
(
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
@@ -9902,7 +9911,7 @@ blue-fish
(
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
@@ -9918,12 +9927,16 @@ arg "depth-increment"
3 times,
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
\family sans
-, Verse,
+, Verse,
+\begin_inset Newline newline
+\end_inset
+
+
\family default
\begin_inset Info
@@ -9994,7 +10007,7 @@ Quotation
We will use
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
to preserve the depth.
@@ -10104,6 +10117,83 @@ Itemize
You have a huge variety of options at your disposal.
\end_layout
+\begin_layout Subsection
+Separate Nestings
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Nesting ! Separation
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+It is sometimes necessary to have two consecutive environments of the same
+ type.
+ For example you need two different enumerations:
+\end_layout
+
+\begin_layout Enumerate
+Hello
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+this is an
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+enumeration
+\end_layout
+
+\begin_layout --Separator--
+
+\end_layout
+
+\begin_layout Itemize
+itemize list
+\end_layout
+
+\end_deeper
+\end_deeper
+\begin_layout --Separator--
+
+\end_layout
+
+\begin_layout Enumerate
+Hi
+\end_layout
+
+\begin_layout Enumerate
+this is another
+\end_layout
+
+\begin_layout Enumerate
+enumeration
+\end_layout
+
+\begin_layout Standard
+To tell LyX that there are two lists an not one, set the cursor at the end
+ of the last item and use the menu
+\family sans
+Edit\SpecialChar \menuseparator
+Start New Parent Environment
+\family default
+.
+ This adds an environment separator and a new list behind it.
+ If you use instead the menu
+\family sans
+Edit\SpecialChar \menuseparator
+Start New Environment
+\family default
+ a new list will also be created, but in the same besting level.
+\end_layout
+
\begin_layout Section
Spacing, pagination and line breaks
\begin_inset Index idx
@@ -32053,7 +32143,7 @@ Next
button at the bottom of the dialog (or just press the
\begin_inset Info
type "shortcut"
-arg "break-paragraph"
+arg "paragraph-break"
\end_inset
key).
@@ -32062,7 +32152,7 @@ arg "break-paragraph"
Pressing
\begin_inset Info
type "shortcut"
-arg "break-paragraph"
+arg "paragraph-break"
\end_inset
repeatedly keeps searching forward while pressing
@@ -32195,7 +32285,7 @@ Replace
button or alternatively press
\begin_inset Info
type "shortcut"
-arg "break-paragraph"
+arg "paragraph-break"
\end_inset
or
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 767591b..dbe4284 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -8484,10 +8484,12 @@ Verbatim
\end_layout
\begin_layout Verbatim
+
Dies ist Verbatim.
\end_layout
\begin_layout Verbatim
+
Die folgenden 2 Zeilen sind leer:
\end_layout
@@ -8500,6 +8502,7 @@ Die folgenden 2 Zeilen sind leer:
\end_layout
\begin_layout Verbatim
+
Fast alles ist in Verbatim erlaubt:"%&$§#~'`
\backslash
}][{|
@@ -8511,7 +8514,7 @@ Umgebungen schachteln
status collapsed
\begin_layout Plain Layout
-Umgebungen schachteln
+Schachtelung ! Umgebungen
\end_layout
\end_inset
@@ -8756,299 +8759,229 @@ Nicht
\begin_inset space ~
\end_inset
-schachtelbar
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-schachtelbar!nicht
-\end_layout
-
-\end_inset
-
- Man kann sie nicht schachteln.
+schachtelbar Man kann sie nicht schachteln.
Man kann nichts in sie hineinschachteln.
\end_layout
\begin_deeper
-\begin_layout Standard
+\begin_layout Itemize
\family sans
-Literaturverzeichnis,
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
Literaturverzeichnis
\end_layout
-\end_inset
-
- Zusammenfassung,
-\begin_inset Index idx
-status collapsed
+\begin_layout Itemize
-\begin_layout Plain Layout
+\family sans
Zusammenfassung
\end_layout
-\end_inset
-
- Titel,
-\begin_inset Index idx
-status collapsed
+\begin_layout Itemize
-\begin_layout Plain Layout
+\family sans
Titel
\end_layout
-\end_inset
-
- Autor,
-\begin_inset Index idx
-status collapsed
+\begin_layout Itemize
-\begin_layout Plain Layout
+\family sans
Autor
\end_layout
-\end_inset
-
- Datum.
-\begin_inset Index idx
-status collapsed
+\begin_layout Itemize
-\begin_layout Plain Layout
+\family sans
Datum
\end_layout
-\end_inset
-
-
-\end_layout
-
\end_deeper
\begin_layout Description
Vollständig
\begin_inset space ~
\end_inset
-schachtelbar
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-schachtelbar!vollstandig@vollständig
+schachtelbar Man kann sie schachteln.
+ Man kann andere Dinge in sie hineinschachteln.
\end_layout
-\end_inset
+\begin_deeper
+\begin_layout Itemize
- Man kann sie schachteln.
- Man kann andere Dinge in sie hineinschachteln.
+\family sans
+Gedicht
\end_layout
-\begin_deeper
-\begin_layout Standard
+\begin_layout Itemize
\family sans
-Gedicht, Zitat
+Zitat
\begin_inset space ~
\end_inset
-(kurz), Zitat
+(kurz)
+\end_layout
+
+\begin_layout Itemize
+
+\family sans
+Zitat
\begin_inset space ~
\end_inset
-(lang), Auflistung, Aufzählung, Beschreibung, Liste, LyX-Code
-\family default
-.
+(lang)
\end_layout
-\end_deeper
-\begin_layout Description
-Teilweise
-\begin_inset space ~
-\end_inset
+\begin_layout Itemize
-schachtelbar
-\begin_inset Index idx
-status collapsed
+\family sans
+Auflistung
+\end_layout
-\begin_layout Plain Layout
-schachtelbar!teilweise
+\begin_layout Itemize
+
+\family sans
+Aufzählung
\end_layout
+\begin_layout Itemize
+
+\family sans
+Beschreibung
+\end_layout
+
+\begin_layout Itemize
+
+\family sans
+Liste
+\end_layout
+
+\begin_layout Itemize
+
+\family sans
+LyX-Code
+\end_layout
+
+\begin_layout Itemize
+
+\family sans
+Verbatim
+\end_layout
+
+\end_deeper
+\begin_layout Description
+Teilweise
+\begin_inset space ~
\end_inset
- Man kann sie in andere Dinge schachteln.
+schachtelbar Man kann sie in andere Dinge schachteln.
Man kann nichts in sie hineinschachteln.
\end_layout
\begin_deeper
-\begin_layout Standard
+\begin_layout Itemize
\family sans
-Standard,
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
Standard
\end_layout
-\end_inset
-
-, Teil
-\begin_inset Index idx
-status collapsed
+\begin_layout Itemize
-\begin_layout Plain Layout
+\family sans
Teil
\end_layout
-\end_inset
-
-, Kapitel,
-\begin_inset Index idx
-status collapsed
+\begin_layout Itemize
-\begin_layout Plain Layout
+\family sans
Kapitel
\end_layout
-\end_inset
-
- Abschnitt,
-\begin_inset Index idx
-status collapsed
+\begin_layout Itemize
-\begin_layout Plain Layout
+\family sans
Abschnitt
\end_layout
-\end_inset
-
- Unterabschnitt,
-\begin_inset Index idx
-status collapsed
+\begin_layout Itemize
-\begin_layout Plain Layout
+\family sans
Unterabschnitt
\end_layout
-\end_inset
-
- Unterunterabschn.,
-\begin_inset Index idx
-status collapsed
+\begin_layout Itemize
-\begin_layout Plain Layout
+\family sans
Unterunterabschn.
\end_layout
-\end_inset
-
- Paragraph,
-\begin_inset Index idx
-status collapsed
+\begin_layout Itemize
-\begin_layout Plain Layout
+\family sans
Paragraph
\end_layout
-\end_inset
-
- Unterparagraph,
-\begin_inset Index idx
-status collapsed
+\begin_layout Itemize
-\begin_layout Plain Layout
+\family sans
Unterparagraph
\end_layout
-\end_inset
-
- Teil*,
-\begin_inset Index idx
-status collapsed
+\begin_layout Itemize
-\begin_layout Plain Layout
+\family sans
Teil*
\end_layout
-\end_inset
-
- Kapitel*,
-\begin_inset Index idx
-status collapsed
+\begin_layout Itemize
-\begin_layout Plain Layout
+\family sans
Kapitel*
\end_layout
-\end_inset
-
- Abschnitt*,
-\begin_inset Index idx
-status collapsed
+\begin_layout Itemize
-\begin_layout Plain Layout
+\family sans
Abschnitt*
\end_layout
-\end_inset
-
- Unterabschnitt*,
-\begin_inset Index idx
-status collapsed
+\begin_layout Itemize
-\begin_layout Plain Layout
+\family sans
Unterabschnitt*
\end_layout
-\end_inset
-
- Unterunterabschn.*,
-\begin_inset Index idx
-status collapsed
+\begin_layout Itemize
-\begin_layout Plain Layout
+\family sans
Unterunterabschn.*
\end_layout
-\end_inset
+\begin_layout Itemize
- Adresse
+\family sans
+Adresse
\begin_inset space ~
\end_inset
-rechts,
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Rechte Adresse
+rechts
\end_layout
-\end_inset
-
- Adresse.
-\begin_inset Index idx
-status collapsed
+\begin_layout Itemize
-\begin_layout Plain Layout
+\family sans
Adresse
\end_layout
-\end_inset
-
-
-\end_layout
-
\end_deeper
\begin_layout Standard
\series bold
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
Anmerkung:
\series default
Obwohl es möglich ist, nummerierte Gliederungen wie
@@ -9069,43 +9002,28 @@ in zum Beispiel Listen zu schachteln, wird dringend
davon abgeraten.
verstoßen dagegen.
\end_layout
-\begin_layout Subsection
-Andere Dinge schachteln: Tabellen
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Tabellen
-\end_layout
-
\end_inset
-, Mathematik
-\begin_inset Index idx
-status collapsed
-\begin_layout Plain Layout
-Mathematik
\end_layout
-\end_inset
-
-, Gleitobjekte
-\begin_inset Index idx
+\begin_layout Subsection
+Andere Dinge schachteln: Tabellen, Mathematik, Gleitobjekte usw.
+\begin_inset Argument 1
status collapsed
\begin_layout Plain Layout
-Gleitobjekte
+Andere Dinge schachteln
\end_layout
\end_inset
- usw.
-\begin_inset Argument 1
+
+\begin_inset Index idx
status collapsed
\begin_layout Plain Layout
-Andere Dinge schachteln
+Schachtelung ! Tabellen usw.
\end_layout
\end_inset
@@ -9741,6 +9659,16 @@ Noch einmal: LyX kümmert sich nicht um die Grenze,
sondern LaTeX produziert
\begin_layout Subsection
Einige Beispiele
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Schachtelung ! Beispiele
+\end_layout
+
+\end_inset
+
+
\end_layout
\begin_layout Standard
@@ -9753,16 +9681,6 @@ Der beste Weg zu erklären, was Sie mit schachteln
erreichen können, sind
\begin_layout Subsubsection
Beispiel 1: Sechsfache und gemischte Schachtelung
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Schachtelungs!-beispiele
-\end_layout
-
-\end_inset
-
-
\end_layout
\begin_layout Labeling
@@ -10046,16 +9964,6 @@ Liste
\begin_layout Subsubsection
Beispiel 2: Vererbung
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Schachtelungs!-beispiele
-\end_layout
-
-\end_inset
-
-
\end_layout
\begin_layout LyX-Code
@@ -10143,16 +10051,6 @@ Aufzählung
Auflistung
\family default
-Umgebungen
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Schachtelungs!-beispiele
-\end_layout
-
-\end_inset
-
-
\begin_inset Argument 1
status collapsed
@@ -10441,16 +10339,6 @@ Auflistung
\begin_layout Subsubsection
Beispiel 4: Übergeschnappt
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Schachtelungs!-beispiele
-\end_layout
-
-\end_inset
-
-
\end_layout
\begin_layout Enumerate
@@ -10835,12 +10723,89 @@ Auflistung
Sie haben jede Menge Möglichkeiten zur Auswahl.
\end_layout
+\begin_layout Subsection
+Schachtelungen trennen
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Schachtelung ! trennen
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Es ist manchmal notwendig zwei aufeinanderfolgende Umgebungen gleichen Typs
+ zu haben.
+ Zum Beispiel benötigt man zwei verschiedenen Aufzählungen:
+\end_layout
+
+\begin_layout Enumerate
+Hallo
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+dies ist eine
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+Aufzählung
+\end_layout
+
+\begin_layout --Separator--
+
+\end_layout
+
+\begin_layout Itemize
+Auflistung
+\end_layout
+
+\end_deeper
+\end_deeper
+\begin_layout --Separator--
+
+\end_layout
+
+\begin_layout Enumerate
+Servus
+\end_layout
+
+\begin_layout Enumerate
+dies ist eine andere
+\end_layout
+
+\begin_layout Enumerate
+Aufzählung
+\end_layout
+
+\begin_layout Standard
+Um LyX zu sagen, dass es zwei Listen sind und nicht eine, setzt man den
+ Cursor ans Ende des letzten Listeneintrags und verwendet das Menü
+\family sans
+Bearbeiten\SpecialChar \menuseparator
+Neue äußere Umgebung
+\family default
+.
+ Dies fügt einen Umgebungstrenner und dahinter eine neue Liste ein.
+ Verwendet man stattdessen das Menü
+\family sans
+Bearbeiten\SpecialChar \menuseparator
+Neue Umgebung
+\family default
+ wird ebenfalls eine neue Liste eingefügt, aber in derselben
Schachtelungstiefe.
+\end_layout
+
\begin_layout Section
Abstände, Seiten- und Zeilenumbrüche
\end_layout
\begin_layout Standard
-Was ist ein Abstand? Während es andere Programme erleuben, mehrfach
hintereinand
+Was ist ein Abstand? Während es andere Programme erlauben, mehrfach
hintereinand
er Leerzeichen zu verwenden, bietet LyX stattdessen verschiedene
Leerräume/Abstä
nde an: Abstände mit verschiedener Breite und Leerzeichen, die am Zeilenende
umgebrochen werden können oder davor geschützt sind.
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index ce1982c..c358ff7 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -8643,6 +8643,12 @@ Lista
Código-LyX
\end_layout
+\begin_layout Itemize
+
+\family sans
+Verbatim
+\end_layout
+
\end_deeper
\begin_layout Description
Parcialmente
@@ -9742,7 +9748,11 @@ Este es el nivel #2.
\family sans
Alt+Entrar
\family default
- seguido de
+ seguido de
+\begin_inset Newline newline
+\end_inset
+
+
\family sans
Mayúsculas+Alt+Derecha
\family default
@@ -10410,6 +10420,110 @@ Enumeración*
Tienes a tu disposición una amplia variedad de opciones.
\end_layout
+\begin_layout Subsection
+
+\lang english
+Separate Nestings
+\lang spanish
+
+\begin_inset Index idx
+status open
+
+\begin_layout Plain Layout
+Anidación
+\noun on
+ !
+\noun default
+\lang english
+Separation
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+It is sometimes necessary to have two consecutive environments of the same
+ type.
+ For example you need two different enumerations:
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+Hello
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+
+\lang english
+this is an
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+
+\lang english
+enumeration
+\end_layout
+
+\begin_layout --Separator--
+
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+itemize list
+\end_layout
+
+\end_deeper
+\end_deeper
+\begin_layout --Separator--
+
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+Hi
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+this is another
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+enumeration
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+To tell LyX that there are two lists an not one, set the cursor at the end
+ of the last item and use the menu
+\family sans
+Edit\SpecialChar \menuseparator
+Start New Parent Environment
+\family default
+.
+ This adds an environment separator and a new list behind it.
+ If you use instead the menu
+\family sans
+Edit\SpecialChar \menuseparator
+Start New Environment
+\family default
+ a new list will also be created, but in the same besting level.
+\end_layout
+
\begin_layout Section
Espacios, paginación y saltos de línea
\begin_inset Index idx
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 10eb499..40bcff8 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -5814,7 +5814,7 @@ Standard
la profondeur d'emboîtement courante, vous pouvez utiliser
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
.
@@ -8933,6 +8933,12 @@ Liste
LyX-Code
\end_layout
+\begin_layout Itemize
+
+\family sans
+Verbatim
+\end_layout
+
\end_deeper
\begin_layout Description
Emboîtables
@@ -9757,7 +9763,7 @@ Liste;
Nous l'avons obtenu avec
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
suivi de
@@ -9777,7 +9783,11 @@ arg "depth-increment"
\family sans
Entrée
\family default
-, puis
+, puis
+\begin_inset Newline newline
+\end_inset
+
+
\begin_inset Info
type "shortcut"
arg "depth-increment"
@@ -9787,10 +9797,14 @@ arg "depth-increment"
Nous aurions pu le créer de la même manière que le précédent, avec
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
- suivi de
+ suivi de
+\begin_inset Newline newline
+\end_inset
+
+
\begin_inset Info
type "shortcut"
arg "depth-increment"
@@ -9818,10 +9832,14 @@ Standard
Nous l'avons obtenu avec
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
-, puis
+, puis
+\begin_inset Newline newline
+\end_inset
+
+
\begin_inset Info
type "shortcut"
arg "depth-increment"
@@ -9856,7 +9874,7 @@ Standard
, également au niveau n°4, obtenu juste avec
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
.
@@ -9868,7 +9886,7 @@ arg "break-paragraph inverse"
Nous avons tapé
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
et remis l'environnement de paragraphe à
@@ -9916,7 +9934,7 @@ pouvons
Tapez
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
puis
@@ -9934,7 +9952,7 @@ arg "depth-decrement"
4-b Après un autre
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
suivi de
@@ -10125,7 +10143,7 @@ Voici le niveau n°2.
Nous avons fait
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
suivi de
@@ -10162,7 +10180,7 @@ ListePuces
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
, puis
@@ -10183,7 +10201,7 @@ ListePuces
Voici le niveau n°4, obtenu avec
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
, puis
@@ -10245,7 +10263,7 @@ pas
Au fait, vous aurez deviné que nous utilisons
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
pour conserver le même environnement et la même profondeur mais créer un
@@ -10262,7 +10280,7 @@ arg "depth-decrement"
pour diminuer la profondeur après le prochain
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
.
@@ -10301,7 +10319,7 @@ toujours
Après un autre
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
suivi de
@@ -10326,7 +10344,7 @@ Gauche
Nous obtenons la même chose avec une autre suite
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
@@ -10460,7 +10478,7 @@ PooPooPiDoo !
(
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
)
@@ -10537,7 +10555,7 @@ poisson bleu
(
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
,
@@ -10553,14 +10571,18 @@ arg "depth-increment"
3 fois,
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
,
\family sans
Vers
\family default
-,
+,
+\begin_inset Newline newline
+\end_inset
+
+
\begin_inset Info
type "shortcut"
arg "depth-decrement"
@@ -10630,7 +10652,7 @@ Citation
Nous utilisons
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
pour préserver la profondeur.
@@ -10734,6 +10756,107 @@ ListePuces
Vous avez une énorme variété d'options à votre disposition.
\end_layout
+\begin_layout Subsection
+
+\lang english
+Separate Nestings
+\lang french
+
+\begin_inset Index idx
+status open
+
+\begin_layout Plain Layout
+Emboîtements !
+\lang english
+Separation
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+It is sometimes necessary to have two consecutive environments of the same
+ type.
+ For example you need two different enumerations:
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+Hello
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+
+\lang english
+this is an
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+
+\lang english
+enumeration
+\end_layout
+
+\begin_layout --Separator--
+
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+itemize list
+\end_layout
+
+\end_deeper
+\end_deeper
+\begin_layout --Separator--
+
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+Hi
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+this is another
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+enumeration
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+To tell LyX that there are two lists an not one, set the cursor at the end
+ of the last item and use the menu
+\family sans
+Edit\SpecialChar \menuseparator
+Start New Parent Environment
+\family default
+.
+ This adds an environment separator and a new list behind it.
+ If you use instead the menu
+\family sans
+Edit\SpecialChar \menuseparator
+Start New Environment
+\family default
+ a new list will also be created, but in the same besting level.
+\end_layout
+
\begin_layout Standard
\end_layout
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 16e7ab1..037a5a5 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -4736,7 +4736,7 @@ Return
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
@@ -7284,6 +7284,13 @@ LyXは、入れ子の階層を変えることが有効な場合にしか、変
LyXコード
\end_layout
+\begin_layout Itemize
+
+\family sans
+\lang english
+Verbatim
+\end_layout
+
\end_deeper
\begin_layout Description
他の環境に入れるもの 他の環境には入れるが、他の環境を入れることができないもの。
@@ -7897,7 +7904,7 @@ arg "depth-increment"
を2回続けて押しました。前の階層で行ったように、
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
を押してから
@@ -7918,7 +7925,7 @@ arg "depth-increment"
環境です。つまり第4階層になります。私たちはこれを作るのに、
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
を押してから
@@ -7954,7 +7961,7 @@ arg "depth-increment"
環境です。
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
を押して作りました。
@@ -7965,7 +7972,7 @@ arg "break-paragraph inverse"
#4-a ここは第4階層です。
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
を押してから、段落環境を
@@ -8004,7 +8011,7 @@ arg "break-paragraph inverse"
#5-b 第5階層に戻りました。
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
を押した後に
@@ -8022,7 +8029,7 @@ arg "depth-decrement"
#4-b もう一度
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
を押した後に
@@ -8178,7 +8185,7 @@ status collapsed
ここは第2階層です。
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
の後に
@@ -8207,7 +8214,7 @@ arg "depth-increment"
環境なので、ラベルが黒丸になるのです(ここに来るには、
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
の後に
@@ -8228,7 +8235,7 @@ arg "depth-increment"
ここは第4階層です。
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
の後に
@@ -8281,7 +8288,7 @@ arg "depth-increment"
おっと、その前に
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
だけを押して現在の環境と階層を維持しながら新しい項目を作ってみましょう。
@@ -8291,7 +8298,7 @@ arg "break-paragraph inverse"
次に
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
と押してから
@@ -8333,7 +8340,7 @@ arg "depth-increment"
もう一度
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
と
@@ -8354,7 +8361,7 @@ arg "depth-decrement"
もう一度
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
と
@@ -8497,7 +8504,7 @@ arg "depth-increment"
(
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
)
@@ -8574,7 +8581,7 @@ arg "break-paragraph inverse"
(
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
、
@@ -8590,7 +8597,7 @@ arg "depth-increment"
を3回、
\begin_inset Info
type "shortcut"
-arg "depth-increment"
+arg "paragraph-break inverse"
\end_inset
、
@@ -8652,7 +8659,7 @@ Return
環境を使います。階層を保持するためには
\begin_inset Info
type "shortcut"
-arg "break-paragraph inverse"
+arg "paragraph-break inverse"
\end_inset
を使うことにします。
@@ -8760,6 +8767,107 @@ status collapsed
を入れることも簡単にできます。膨大な選択肢を自由にお使いいただけるのです。
\end_layout
+\begin_layout Subsection
+
+\lang english
+Separate Nestings
+\lang japanese
+
+\begin_inset Index idx
+status open
+
+\begin_layout Plain Layout
+
+\lang english
+Nesting ! Separation
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+It is sometimes necessary to have two consecutive environments of the same
+ type.
+ For example you need two different enumerations:
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+Hello
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+
+\lang english
+this is an
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+
+\lang english
+enumeration
+\end_layout
+
+\begin_layout --Separator--
+
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+itemize list
+\end_layout
+
+\end_deeper
+\end_deeper
+\begin_layout --Separator--
+
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+Hi
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+this is another
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+enumeration
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+To tell LyX that there are two lists an not one, set the cursor at the end
+ of the last item and use the menu
+\family sans
+Edit\SpecialChar \menuseparator
+Start New Parent Environment
+\family default
+.
+ This adds an environment separator and a new list behind it.
+ If you use instead the menu
+\family sans
+Edit\SpecialChar \menuseparator
+Start New Environment
+\family default
+ a new list will also be created, but in the same besting level.
+\end_layout
+
\begin_layout Section
余白取りとページ付けおよび改行
\begin_inset Index idx
