UserGuide.lyx: merge changes to all language variants

(The UserGuide is currently not compilable because of bug #9632)
This commit is contained in:
Uwe Stöhr 2015-06-17 01:23:57 +02:00
parent 35f9acd11d
commit 1c71f1eaab
6 changed files with 172 additions and 224 deletions

View File

@ -141,14 +141,11 @@ enumitem
\papercolumns 1
\papersides 2
\paperpagestyle default
\tracking_changes true
\tracking_changes false
\output_changes false
\html_math_output 0
\html_css_as_file 0
\html_be_strict true
\author -1966299584 "ef"
\author -712698321 "Jürgen Spitzmüller"
\author 2089657418 "Usti"
\end_header
\begin_body
@ -8267,12 +8264,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
@ -8285,6 +8284,7 @@ The following 2 lines are empty:
\end_layout
\begin_layout Verbatim
Almost everything is allowed in verbatim:"%&$§#~'`
\backslash
}][{|
@ -10547,57 +10547,29 @@ enumeration
\end_layout
\begin_layout Standard
To tell \SpecialChar LyX
that there are two lists and 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
To split an existing list into two lists, set the cursor at the end of a
list item and use the menu
\family sans
Edit\SpecialChar menuseparator
Start New Environment
\family default
a new list will also be created, but in the same nesting level.
\end_layout
\begin_layout Standard
To split an existing list into two lists, set the cursor at the end of a
list item
\change_deleted -1966299584 1432227810
,
\change_inserted -1966299584 1432227815
and repeatedly
\change_unchanged
press
.
This inserts a plain separator (red line in LyX) and behind it the new
list.
Alternatively set the cursor at the end of a list item and press
\begin_inset Info
type "shortcut"
arg "paragraph-break"
\end_inset
three times.
This inserts a paragraph separator (red arrow in LyX).
The difference between both separator types is that the plain separator
only splits the list and not the current paragraph.
One can change the separator type by right-clicking on it.
\end_layout
\change_deleted -1966299584 1432227824
and select
\family sans
Separator
\family default
in the pull-down box for environments in \SpecialChar LyX
's main toolbar
\change_inserted -1966299584 1432229616
until you get an environment separator in the form of a small angled arrow.
The only difference between this separator and the one you obtain by using
the menu (a reddish line) is that it will also insert a blank line in the
\SpecialChar LaTeX
output
\change_unchanged
.
\change_inserted -1966299584 1432230601
However, each kind of separator can be turned into the other kind by right-clic
king it and choosing the wanted type through the context menu that opens.
\begin_layout Standard
In general, you get an environment separator when you press
\begin_inset Info
type "shortcut"
@ -10605,37 +10577,6 @@ arg "paragraph-break"
\end_inset
in a Standard environment immediately after a non-Standard one.
Thus, in a normal workflow, you can insert two consecutive environments
of the same type by simply pressing
\begin_inset Info
type "shortcut"
arg "paragraph-break"
\end_inset
until you get an environment separator, after which any other kind of environme
nt can be inserted (even of the same type).
\end_layout
\begin_layout Standard
\change_inserted -1966299584 1432231566
If you load documents produced with a previous version of \SpecialChar LyX
, you may notice
that the angled-arrow separator may appear at the end of a line.
In this case it is not used to separate environments but rather to assure
that the same \SpecialChar LaTeX
output is obtained.
Indeed, previous versions of \SpecialChar LyX
could insert spurious blank lines in the
\SpecialChar LaTeX
output, which are now avoided.
As those blank lines may affect vertical spacing, \SpecialChar LyX
takes care that you
obtain the same results as before.
You can safely remove the separators automatically inserted for this purpose
if you like better the resulting vertical spacing.
\change_unchanged
\end_layout
\begin_layout Section
@ -41674,16 +41615,9 @@ status collapsed
\end_inset
is more appropriate (is the case when using Xe\SpecialChar TeX
\change_inserted -712698321 1432730145
or LuaTeX
\change_unchanged
and
\change_deleted -712698321 1432730156
/or
\change_unchanged
non-\SpecialChar TeX
fonts), this package will be used instead of
or LuaTeX and non-\SpecialChar TeX
fonts),
this package will be used instead of
\series bold
babel
\series default
@ -45848,26 +45782,6 @@ Additional
Features
\emph default
manual.
\change_inserted 2089657418 1433036195
\begin_inset Note Note
status open
\begin_layout Plain Layout
\change_inserted 2089657418 1433036213
\color red
Check why this does no longer exists
\change_unchanged
\end_layout
\end_inset
\change_unchanged
\end_layout
\begin_layout Subsection

View File

@ -0,0 +1,14 @@
Modified:
- sec. 3.4.6: changed paragraph
- sec. B.9: (Japanese only) changed sentence
TODO from LyX 2.1.x
Modified:
- sec. 2.2: last paragraph has been rewritten
- sec. A.1.13: added new PDF export format
- sec. A.1.13: add note for the HTML format

View File

@ -8734,10 +8734,12 @@ Verbatim
\end_layout
\begin_layout Verbatim
Dies ist Verbatim.
\end_layout
\begin_layout Verbatim
Die folgenden 2 Zeilen sind leer:
\end_layout
@ -8750,6 +8752,7 @@ Die folgenden 2 Zeilen sind leer:
\end_layout
\begin_layout Verbatim
Fast alles ist in Verbatim erlaubt:"%&$§#~'`
\backslash
}][{|
@ -11191,43 +11194,55 @@ dies ist eine andere
Aufzählung
\end_layout
\begin_layout Standard
\begin_inset Separator plain
\end_inset
\end_layout
\begin_layout Enumerate
sd
\end_layout
\begin_layout Standard
\begin_inset Separator parbreak
\end_inset
\end_layout
\begin_layout Standard
Um \SpecialChar 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.
.
Dies fügt einen einfachen Trenner (rote Linie in LyX) und dahinter eine
neue Liste ein.
Alternativ setzt man den Cursor ans Ende des letzten Listeneintrags und
drückt dreimal
\family sans
Enter
\family default
.
Es wird dann ein Absatzumbruch eingefügt (roter Pfeil in LyX).
Der Unterschied zwischen beiden Trennern ist, dass der einfache Trenner
nur die Listen, nicht aber den aktuellen Absatz trennt.
Klickt man mit der rechten Maustaste auf einen Trenner, kann man zwischen
beiden Typen umschalten.
\end_layout
\begin_layout Standard
Um eine bestehende Liste in zwei Listen zu teilen, setzt man den Cursor
ans Ende eines Listeneintrags, drückt
Allgemein erhält man einen Trenner wenn man
\family sans
Eingabe
Enter
\family default
und wählt im
\begin_inset Quotes gld
\end_inset
pull-down
\begin_inset Quotes grd
\end_inset
-Menü am Anfang der Standard-Werkzeugleiste
\family sans
Trenner
\family default
aus.
in einer leeren Standard-Umgebung drückt, die auf eine Nicht-Standard-Umgebung
folgt.
\end_layout
\begin_layout Section

View File

@ -10841,36 +10841,43 @@ enumeración
\end_layout
\begin_layout Standard
Para indicar a \SpecialChar LyX
que hay dos listas y no una, pon el cursor al final del
último ítem y usa el menú
\lang english
To split an existing list into two lists,
\lang spanish
pon el cursor al final del último ítem y usa el menú
\family sans
Editar\SpecialChar menuseparator
Iniciar nuevo entorno padre
\lang english
Start New Environment
\family default
.
Esto añade un separador de entornos y una nueva lista tras él.
El menú
This inserts a plain separator (red line in LyX) and behind it the new
list.
Alternatively set the cursor at the end of a list item and press
\family sans
Editar\SpecialChar menuseparator
Iniciar nuevo entorno
\lang spanish
Entrar
\family default
también crea una nueva lista pero en el mismo nivel de anidación.
\lang english
three times.
This inserts a paragraph separator (red arrow in LyX).
The difference between both separator types is that the plain separator
only splits the list and not the current paragraph.
One can change the separator type by right-clicking on it.
\end_layout
\begin_layout Standard
Para dividir una lista existente en dos, pon el cursor al final de un ítem,
pulsa la tecla
\lang english
In general, you get an environment separator when you press
\family sans
\lang spanish
Entrar
\family default
y selecciona
\family sans
Separador
\family default
en el cuadro desplegable de entornos en la barra de herramientas principal
de \SpecialChar LyX
.
\lang english
in a Standard environment immediately after a non-Standard one.
\end_layout
\begin_layout Section
@ -41788,9 +41795,10 @@ status collapsed
\end_inset
(es el caso cuando se usa Xe\SpecialChar TeX
y/o tipografías no \SpecialChar TeX
), se usará este en vez
de
y Lua\SpecialChar TeX
y tipografías no \SpecialChar TeX
), se usará este en
vez de
\series bold
babel
\series default

View File

@ -8710,12 +8710,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
@ -8728,6 +8730,7 @@ The following 2 lines are empty:
\end_layout
\begin_layout Verbatim
Almost everything is allowed in verbatim:"%&$§#~'`
\backslash
}][{|
@ -11169,66 +11172,43 @@ ceci est une autre
\end_layout
\begin_layout Standard
Pour dire à \SpecialChar LyX
qu'il y a deux listes et pas une seule, mettez le curseur à
la fin du dernier élément et utilisez le menu
\lang english
To split an existing list into two lists,
\lang french
mettez le curseur à la fin du dernier élément et utilisez le menu
\family sans
Édition\SpecialChar menuseparator
Commencer
\begin_inset space ~
\end_inset
un
\begin_inset space ~
\end_inset
nouvel
\begin_inset space ~
\end_inset
environnement
\begin_inset space ~
\end_inset
parent
\lang english
Start New Environment
\family default
.
Cela ajoute un séparateur d'environnement et une nouvelle liste après lui.
Si vous utilisez le menu
\family sans
Édition\SpecialChar menuseparator
Commencer
\begin_inset space ~
\end_inset
un
\begin_inset space ~
\end_inset
nouvel
\begin_inset space ~
\end_inset
environnement
\family default
une nouvelle liste va être créée, mais au même niveau demboîtement.
\end_layout
\begin_layout Standard
Pour couper une liste existante en deux listes, mettez le curseur à la fin
d'un élément de la liste et appuyez
This inserts a plain separator (red line in LyX) and behind it the new
list.
Alternatively set the cursor at the end of a list item and press
\begin_inset Info
type "shortcut"
arg "paragraph-break"
\end_inset
et choisissez
\family sans
Séparateur
\family default
dans la liste déroulante pour choisir les environnements dans la barre
d'outils principale de \SpecialChar LyX
.
three times.
This inserts a paragraph separator (red arrow in LyX).
The difference between both separator types is that the plain separator
only splits the list and not the current paragraph.
One can change the separator type by right-clicking on it.
\end_layout
\begin_layout Standard
\lang english
In general, you get an environment separator when you press
\begin_inset Info
type "shortcut"
arg "paragraph-break"
\end_inset
in a Standard environment immediately after a non-Standard one.
\end_layout
\begin_layout Standard
@ -43013,7 +42993,8 @@ Paquetages \SpecialChar LaTeX
\end_inset
et plus approprié (comme dans avec Xe\SpecialChar TeX
ou des polices non-\SpecialChar TeX
ou Lua\SpecialChar TeX
et des polices non-\SpecialChar TeX
), ce dernier
sera utilisé à la place de
\series bold

View File

@ -9319,33 +9319,40 @@ name "subsec:入れ子の分離"
\end_layout
\begin_layout Standard
箇条書きが、単一の箇条書きではなく、別々のものだと\SpecialChar LyX
に教えるには、カーソルを最後の項目の終わりにおいて、
\family sans
編集\SpecialChar menuseparator
新たな親環境を開始
\family default
メニューを選択します。すると、環境分離線が挿入され、その後に新規箇条書きが置かれます。この代わりに、
\family sans
編集\SpecialChar menuseparator
新たな環境を開始
\family default
メニューを選択したとすると、やはり新規箇条書きが作られますが、同じ深度に置かれます。
\end_layout
\begin_layout Standard
既存の箇条書きを2つに分けるには、箇条書き項目の後ろにカーソルを置いて、
\lang english
To split an existing list into two lists, set the cursor at the end of a
list item and use the menu
\family sans
Edit\SpecialChar menuseparator
Start New Environment
\family default
.
This inserts a plain separator (red line in LyX) and behind it the new
list.
Alternatively set the cursor at the end of a list item and press
\begin_inset Info
type "shortcut"
arg "paragraph-break"
\end_inset
を押し、\SpecialChar LyX
のメインツールバーにある環境プルダウンボックスから
\family sans
―分離線―
\family default
を選択してください。
three times.
This inserts a paragraph separator (red arrow in LyX).
The difference between both separator types is that the plain separator
only splits the list and not the current paragraph.
One can change the separator type by right-clicking on it.
\end_layout
\begin_layout Standard
\lang english
In general, you get an environment separator when you press
\begin_inset Info
type "shortcut"
arg "paragraph-break"
\end_inset
in a Standard environment immediately after a non-Standard one.
\end_layout
\begin_layout Section
@ -35347,6 +35354,15 @@ latexはつけじ@\SpecialChar LaTeX
\end_inset
の方が適当であれば(Xe\SpecialChar TeX
\lang english
or Lua
\lang japanese
\SpecialChar TeX
\lang english
and
\lang japanese
や非\SpecialChar TeX
フォントを使用している場合など)、
\series bold