anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

UserGuide.lyx: accept and distribute description of inverted branches

Browse Source
This commit is contained in:
Uwe Stöhr 2017-07-30 22:20:03 +02:00
parent 040527f628
commit 5513e46589
6 changed files with 289 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/doc/Changelog-UserGuide-LyX_23x.txt
View File

@ -5,6 +5,7 @@ Modified:
first step: first step:
- sec. 3.9.3.2: section completely rewritten - sec. 3.9.3.2: section completely rewritten
- sec. 6.1: new reference format and new options - sec. 6.1: new reference format and new options
- sec. 6.8: new feature "inverted branches"
- sec. C.1.2.3 new sentence - sec. C.1.2.3 new sentence

100
lib/doc/UserGuide.lyx
View File

@ -146,7 +146,6 @@ enumitem
\html_css_as_file 0 \html_css_as_file 0
\html_be_strict true \html_be_strict true
\author -712698321 "Jürgen Spitzmüller" \author -712698321 "Jürgen Spitzmüller"
\author 424524441 "rgheck"
\end_header \end_header
\begin_body \begin_body
@ -8338,12 +8337,14 @@ Verbatim
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
This is Verbatim. This is Verbatim.
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
\noindent \noindent
\align block \align block
The following 2 lines are empty: The following 2 lines are empty:
\end_layout \end_layout
@ -8356,6 +8357,7 @@ The following 2 lines are empty:
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
Almost everything is allowed in Verbatim:"%&$§#~'` Almost everything is allowed in Verbatim:"%&$§#~'`
\backslash \backslash
}][{| }][{|
@ -8379,6 +8381,7 @@ Verbatim
\end_layout \end_layout
\begin_layout Verbatim* \begin_layout Verbatim*
This is Verbatim*. This is Verbatim*.
\end_layout \end_layout
@ -18086,13 +18089,7 @@ fest
\begin_layout Subsection \begin_layout Subsection
\SpecialChar LyX \SpecialChar LyX
and \SpecialChar LaTeX and \SpecialChar LaTeX
Logos
\change_deleted -712698321 1482669270
l
\change_inserted -712698321 1482669270
L
\change_unchanged
ogos
\begin_inset Index idx \begin_inset Index idx
status collapsed status collapsed
@ -31848,7 +31845,11 @@ inverted 0
status open status open
\begin_layout Standard \begin_layout Standard
Question: Who was the first physics Nobel prize winner?
\series bold
Question:
\series default
Who was the first physics Nobel prize winner?
\end_layout \end_layout
\end_inset \end_inset
@ -31862,7 +31863,11 @@ inverted 0
status collapsed status collapsed
\begin_layout Standard \begin_layout Standard
Answer: Wilhelm Conrad Röntgen
\series bold
Answer:
\series default
Wilhelm Conrad Röntgen
\end_layout \end_layout
\end_inset \end_inset
@ -31965,69 +31970,56 @@ Exam-Question-Answer.pdf
if both branches were active. if both branches were active.
This helps you to export different versions of your document easily. This helps you to export different versions of your document easily.
\change_inserted 424524441 1468296009 \begin_inset VSpace bigskip
\end_inset
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
There are also inverted branch insets, whose content is output just in case
\change_inserted 424524441 1468297080 the branch is
As of LyX 2.3.0, there are also
\begin_inset Quotes eld
\end_inset
inverted
\begin_inset Quotes erd
\end_inset
branch insets, whose content is output just in case the branch is
\emph on \emph on
not not
\emph default \emph default
activated. activated.
This make it easy to add alternative text for different versions of a document.
To control whether a particular inset is inverted, right-click on the inset
button and choose
\family sans
Invert
\begin_inset space ~
\end_inset
\begin_inset Branch Question Inset
\family default
.
\end_layout
\begin_layout Standard
\begin_inset Branch Answer
inverted 1 inverted 1
status open status open
\begin_layout Standard \begin_layout Standard
\change_inserted 424524441 1468296217 \series bold
For example, this material will only appear when the Question branch is No answer:
deactivated. \series default
\change_unchanged Because the
\begin_inset Quotes eld
\end_inset
Answer
\begin_inset Quotes erd
\end_inset
branch is deactivated.
\end_layout \end_layout
\end_inset \end_inset
This make it easy to add alternative text for different versions of a document.
To control whether a particular inset is
\begin_inset Quotes eld
\end_inset
inverted
\begin_inset Quotes erd
\end_inset
, right-click on the inset button and choose
\begin_inset Quotes eld
\end_inset
\change_unchanged
Invert Inset
\change_inserted 424524441 1468297080
\begin_inset Quotes erd
\end_inset
.
\change_deleted 424524441 1468296150
\end_layout
\begin_layout Standard
\begin_inset VSpace bigskip \begin_inset VSpace bigskip
\end_inset \end_inset
@ -32151,7 +32143,7 @@ status collapsed
\begin_layout Standard \begin_layout Standard
\begin_inset ERT \begin_inset ERT
status collapsed status open
\begin_layout Plain Layout \begin_layout Plain Layout

76
lib/doc/de/UserGuide.lyx
View File

@ -30946,7 +30946,11 @@ inverted 0
status open status open
\begin_layout Standard \begin_layout Standard
Frage: Wer war der erste Physik-Nobelpreis-Gewinner?
\series bold
Frage:
\series default
Wer war der erste Physik-Nobelpreis-Gewinner?
\end_layout \end_layout
\end_inset \end_inset
@ -30960,7 +30964,11 @@ inverted 0
status collapsed status collapsed
\begin_layout Standard \begin_layout Standard
Antwort: Wilhelm Conrad Röntgen
\series bold
Antwort:
\series default
Wilhelm Conrad Röntgen
\end_layout \end_layout
\end_inset \end_inset
@ -30990,34 +30998,48 @@ Zweige
aktiv waren. aktiv waren.
Dies hilft um verschiedene Versionen einer Datei zu exportieren ohne den Dies hilft um verschiedene Versionen einer Datei zu exportieren ohne den
Überblick zu verlieren. Überblick zu verlieren.
\begin_inset VSpace bigskip
\end_inset
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
Ab LyX 2.3.0 gibt es auch Es gibt auch umgekehrte Zweig-Einfügungen, deren Inhalt gerade dann ausgegeben
\begin_inset Quotes gld wird, wenn der Zweig
\end_inset
umgekehrte
\begin_inset Quotes grd
\end_inset
Zweig-Einfügungen, deren Inhalt gerade dann ausgegeben wird, wenn der Zweig
\emph on \emph on
nicht nicht
\emph default \emph default
aktiviert ist. aktiviert ist.
Dadurch kann leicht alternativer Text für verschiedene Versionen eines
Dokuments eingegeben werden.
Um zu schauen, ob eine spezifische Einfügung umgekehrt ist, klicken Sie
mit der rechten Maustaste auf den Knopf der Einfügung und wählen
\family sans
Einfügung
\begin_inset space ~
\end_inset
\begin_inset Branch Frage umkehren
\family default
.
\end_layout
\begin_layout Standard
\begin_inset Branch Antwort
inverted 1 inverted 1
status open status open
\begin_layout Standard \begin_layout Standard
Zum Beispiel wird dieser Text nur ausgegeben, wenn der Zweig
\series bold
Keine Antwort:
\series default
Weil der Zweig
\begin_inset Quotes gld \begin_inset Quotes gld
\end_inset \end_inset
Frage Antwort
\begin_inset Quotes grd \begin_inset Quotes grd
\end_inset \end_inset
@ -31027,25 +31049,7 @@ Frage
\end_inset \end_inset
Dadurch kann leicht alternativer Text für verschiedene Versionen eines Dokuments
eingegeben werden.
Um zu kontrollieren, ob eine spezifische Einfügung
\begin_inset Quotes gld
\end_inset
umgekehrt
\begin_inset Quotes grd
\end_inset
ist, klicken Sie mit der rechten Maustaste auf den Knopf der Einfügung
und wählen Sie
\family sans
Einfügung umkehren
\family default
.
\end_layout
\begin_layout Standard
\begin_inset VSpace bigskip \begin_inset VSpace bigskip
\end_inset \end_inset
@ -31053,7 +31057,7 @@ Einfügung umkehren
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
Um konditionale Ausgaben zu erzeugen, wo keine Zweige angegeben werden können Um konditionale Ausgaben zu erzeugen, wo keine Zweige angegeben werden können,
wie in Formeln, können spezielle \SpecialChar LaTeX wie in Formeln, können spezielle \SpecialChar LaTeX
-Definitionen für jeden Zweig angegeben -Definitionen für jeden Zweig angegeben
werden. werden.
@ -31169,10 +31173,8 @@ inverted 0
status collapsed status collapsed
\begin_layout Standard \begin_layout Standard
\lang english
\begin_inset ERT \begin_inset ERT
status collapsed status open
\begin_layout Plain Layout \begin_layout Plain Layout

69
lib/doc/es/UserGuide.lyx
View File

@ -8559,12 +8559,14 @@ Literal
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
Esto es entorno Literal. Esto es entorno Literal.
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
\noindent \noindent
\align block \align block
Las dos líneas siguientes están vacías: Las dos líneas siguientes están vacías:
\end_layout \end_layout
@ -8577,6 +8579,7 @@ Las dos líneas siguientes están vacías:
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
Casi todo está permitido en entorno Literal:"%&$§#~'` Casi todo está permitido en entorno Literal:"%&$§#~'`
\backslash \backslash
}][{| }][{|
@ -8601,6 +8604,7 @@ con la diferencia de que los espacios aparecen en la salida como el carácter
\end_layout \end_layout
\begin_layout Verbatim* \begin_layout Verbatim*
Esto es entorno Literal*. Esto es entorno Literal*.
\end_layout \end_layout
@ -31259,7 +31263,11 @@ inverted 0
status open status open
\begin_layout Standard \begin_layout Standard
Pregunta: ¿Quién fue el primer Nobel de Física?
\series bold
Pregunta:
\series default
¿Quién fue el primer Nobel de Física?
\end_layout \end_layout
\end_inset \end_inset
@ -31273,7 +31281,11 @@ inverted 0
status collapsed status collapsed
\begin_layout Standard \begin_layout Standard
Respuesta: Wilhelm Conrad Röntgen
\series bold
Respuesta:
\series default
Wilhelm Conrad Röntgen
\end_layout \end_layout
\end_inset \end_inset
@ -31377,6 +31389,59 @@ Examen-Pregunta-Respuesta.pdf
si ambas ramas están activas. si ambas ramas están activas.
Esto ayuda a exportar fácilmente diferentes versiones del documento sin Esto ayuda a exportar fácilmente diferentes versiones del documento sin
mucha molestia. mucha molestia.
\begin_inset VSpace bigskip
\end_inset
\end_layout
\begin_layout Standard
\lang english
There are also inverted branch insets, whose content is output just in case
the branch is
\emph on
not
\emph default
activated.
This make it easy to add alternative text for different versions of a document.
To control whether a particular inset is inverted, right-click on the inset
button and choose
\family sans
Invert
\begin_inset space ~
\end_inset
Inset
\family default
.
\end_layout
\begin_layout Standard
\begin_inset Branch Respuesta
inverted 1
status open
\begin_layout Standard
\series bold
\lang english
No answer:
\series default
Because the
\begin_inset Quotes eld
\end_inset
Answer
\begin_inset Quotes erd
\end_inset
branch is deactivated.
\end_layout
\end_inset
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard

69
lib/doc/fr/UserGuide.lyx
View File

@ -9030,12 +9030,14 @@ Verbatim
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
This is Verbatim. This is Verbatim.
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
\noindent \noindent
\align block \align block
The following 2 lines are empty: The following 2 lines are empty:
\end_layout \end_layout
@ -9048,6 +9050,7 @@ The following 2 lines are empty:
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
Almost everything is allowed in Verbatim:"%&$§#~'` Almost everything is allowed in Verbatim:"%&$§#~'`
\backslash \backslash
}][{| }][{|
@ -9080,6 +9083,7 @@ Verbatim
\end_layout \end_layout
\begin_layout Verbatim* \begin_layout Verbatim*
This is Verbatim*. This is Verbatim*.
\end_layout \end_layout
@ -32421,7 +32425,11 @@ inverted 0
status open status open
\begin_layout Standard \begin_layout Standard
Question: Qui a été le premier prix Nobel de physique ?
\series bold
Question:
\series default
Qui a été le premier prix Nobel de physique ?
\end_layout \end_layout
\end_inset \end_inset
@ -32435,7 +32443,11 @@ inverted 0
status collapsed status collapsed
\begin_layout Standard \begin_layout Standard
Réponse: Wilhelm Conrad Röntgen
\series bold
Réponse:
\series default
Wilhelm Conrad Röntgen
\end_layout \end_layout
\end_inset \end_inset
@ -32520,6 +32532,59 @@ Examen-Question-Réponse
si les deux branches sont actives. si les deux branches sont actives.
De cette façon, vous pouvez exporter différentes versions du document sans De cette façon, vous pouvez exporter différentes versions du document sans
trop de peine. trop de peine.
\begin_inset VSpace bigskip
\end_inset
\end_layout
\begin_layout Standard
\lang english
There are also inverted branch insets, whose content is output just in case
the branch is
\emph on
not
\emph default
activated.
This make it easy to add alternative text for different versions of a document.
To control whether a particular inset is inverted, right-click on the inset
button and choose
\family sans
Invert
\begin_inset space ~
\end_inset
Inset
\family default
.
\end_layout
\begin_layout Standard
\begin_inset Branch Réponse
inverted 1
status open
\begin_layout Standard
\series bold
\lang english
No answer:
\series default
Because the
\begin_inset Quotes eld
\end_inset
Answer
\begin_inset Quotes erd
\end_inset
branch is deactivated.
\end_layout
\end_inset
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard

69
lib/doc/ja/UserGuide.lyx
View File

@ -7176,12 +7176,14 @@ Space
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
これは原文儘(verbatim)環境です． これは原文儘(verbatim)環境です．
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
\noindent \noindent
\align block \align block
この下の2行は空白行です． この下の2行は空白行です．
\end_layout \end_layout
@ -7194,6 +7196,7 @@ Space
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
右記の各文字を始め，ほぼすべての文字が使えます．例："%&$§#~'` 右記の各文字を始め，ほぼすべての文字が使えます．例："%&$§#~'`
\backslash \backslash
}][{| }][{|
@ -7216,6 +7219,7 @@ Space
\end_layout \end_layout
\begin_layout Verbatim* \begin_layout Verbatim*
This is Verbatim*. This is Verbatim*.
\end_layout \end_layout
@ -26261,7 +26265,11 @@ inverted 0
status open status open
\begin_layout Standard \begin_layout Standard
質問：最初のノーベル物理学賞受賞者は誰でしょう？
\series bold
質問：
\series default
最初のノーベル物理学賞受賞者は誰でしょう？
\end_layout \end_layout
\end_inset \end_inset
@ -26275,7 +26283,11 @@ inverted 0
status collapsed status collapsed
\begin_layout Standard \begin_layout Standard
解答：Wilhelm Conrad R
\series bold
解答：
\series default
Wilhelm Conrad R
\begin_inset ERT \begin_inset ERT
status collapsed status collapsed
@ -26315,6 +26327,59 @@ ontgenです．
\end_inset \end_inset
\end_layout
\begin_layout Standard
\lang english
There are also inverted branch insets, whose content is output just in case
the branch is
\emph on
not
\emph default
activated.
This make it easy to add alternative text for different versions of a document.
To control whether a particular inset is inverted, right-click on the inset
button and choose
\family sans
Invert
\begin_inset space ~
\end_inset
Inset
\family default
.
\end_layout
\begin_layout Standard
\begin_inset Branch 解答
inverted 1
status open
\begin_layout Standard
\series bold
\lang english
No answer:
\series default
Because the
\begin_inset Quotes eld
\end_inset
Answer
\begin_inset Quotes erd
\end_inset
branch is deactivated.
\end_layout
\end_inset
\begin_inset VSpace bigskip
\end_inset
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard