commit 5513e465893ae255f75aaecc304133ba01a89e08
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun Jul 30 22:20:03 2017 +0200
UserGuide.lyx: accept and distribute description of inverted branches
---
lib/doc/Changelog-UserGuide-LyX_23x.txt | 1 +
lib/doc/UserGuide.lyx | 94 ++++++++++++++-----------------
lib/doc/de/UserGuide.lyx | 78 +++++++++++++------------
lib/doc/es/UserGuide.lyx | 69 ++++++++++++++++++++++-
lib/doc/fr/UserGuide.lyx | 69 ++++++++++++++++++++++-
lib/doc/ja/UserGuide.lyx | 69 ++++++++++++++++++++++-
6 files changed, 285 insertions(+), 95 deletions(-)
diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt
b/lib/doc/Changelog-UserGuide-LyX_23x.txt
index 80fcb12..7d4f19a 100644
--- a/lib/doc/Changelog-UserGuide-LyX_23x.txt
+++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt
@@ -5,6 +5,7 @@ Modified:
first step:
- sec. 3.9.3.2: section completely rewritten
- sec. 6.1: new reference format and new options
+- sec. 6.8: new feature "inverted branches"
- sec. C.1.2.3 new sentence
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 05829d2..e35d38f 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -146,7 +146,6 @@ enumitem
\html_css_as_file 0
\html_be_strict true
\author -712698321 "Jürgen Spitzmüller"
-\author 424524441 "rgheck"
\end_header
\begin_body
@@ -8338,12 +8337,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
@@ -8356,6 +8357,7 @@ The following 2 lines are empty:
\end_layout
\begin_layout Verbatim
+
Almost everything is allowed in Verbatim:"%&$§#~'`
\backslash
}][{|
@@ -8379,6 +8381,7 @@ Verbatim
\end_layout
\begin_layout Verbatim*
+
This is Verbatim*.
\end_layout
@@ -18086,13 +18089,7 @@ fest
\begin_layout Subsection
\SpecialChar LyX
and \SpecialChar LaTeX
-
-\change_deleted -712698321 1482669270
-l
-\change_inserted -712698321 1482669270
-L
-\change_unchanged
-ogos
+ Logos
\begin_inset Index idx
status collapsed
@@ -31848,7 +31845,11 @@ inverted 0
status open
\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_inset
@@ -31862,7 +31863,11 @@ inverted 0
status collapsed
\begin_layout Standard
-Answer: Wilhelm Conrad Röntgen
+
+\series bold
+Answer:
+\series default
+ Wilhelm Conrad Röntgen
\end_layout
\end_inset
@@ -31965,69 +31970,56 @@ Exam-Question-Answer.pdf
if both branches were active.
This helps you to export different versions of your document easily.
-\change_inserted 424524441 1468296009
+\begin_inset VSpace bigskip
+\end_inset
+
\end_layout
\begin_layout Standard
-
-\change_inserted 424524441 1468297080
-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
+There are also inverted branch insets, whose content is output just in case
+ the branch is
\emph on
not
\emph default
activated.
-
-\begin_inset Branch Question
+ 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 Answer
inverted 1
status open
\begin_layout Standard
-\change_inserted 424524441 1468296217
-For example, this material will only appear when the Question branch is
- deactivated.
-\change_unchanged
-
-\end_layout
-
-\end_inset
-
- This make it easy to add alternative text for different versions of a
document.
- To control whether a particular inset is
+\series bold
+No answer:
+\series default
+ Because the
\begin_inset Quotes eld
\end_inset
-inverted
+Answer
\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
+ branch is deactivated.
+\end_layout
-\begin_inset Quotes erd
\end_inset
-.
-\change_deleted 424524441 1468296150
-
-\end_layout
-\begin_layout Standard
\begin_inset VSpace bigskip
\end_inset
@@ -32151,7 +32143,7 @@ status collapsed
\begin_layout Standard
\begin_inset ERT
-status collapsed
+status open
\begin_layout Plain Layout
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 101524b..064b3f7 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -30946,7 +30946,11 @@ inverted 0
status open
\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_inset
@@ -30960,7 +30964,11 @@ inverted 0
status collapsed
\begin_layout Standard
-Antwort: Wilhelm Conrad Röntgen
+
+\series bold
+Antwort:
+\series default
+ Wilhelm Conrad Röntgen
\end_layout
\end_inset
@@ -30990,34 +30998,48 @@ Zweige
aktiv waren.
Dies hilft um verschiedene Versionen einer Datei zu exportieren ohne den
Überblick zu verlieren.
-\end_layout
-
-\begin_layout Standard
-Ab LyX 2.3.0 gibt es auch
-\begin_inset Quotes gld
+\begin_inset VSpace bigskip
\end_inset
-umgekehrte
-\begin_inset Quotes grd
-\end_inset
- Zweig-Einfügungen, deren Inhalt gerade dann ausgegeben wird, wenn der Zweig
-
+\end_layout
+
+\begin_layout Standard
+Es gibt auch umgekehrte Zweig-Einfügungen, deren Inhalt gerade dann ausgegeben
+ wird, wenn der Zweig
\emph on
nicht
\emph default
aktiviert ist.
-
-\begin_inset Branch Frage
+ 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
+
+umkehren
+\family default
+.
+\end_layout
+
+\begin_layout Standard
+\begin_inset Branch Antwort
inverted 1
status open
\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
\end_inset
-Frage
+Antwort
\begin_inset Quotes grd
\end_inset
@@ -31027,25 +31049,7 @@ Frage
\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
\end_inset
@@ -31053,7 +31057,7 @@ Einfügung umkehren
\end_layout
\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
-Definitionen für jeden Zweig angegeben
werden.
@@ -31169,10 +31173,8 @@ inverted 0
status collapsed
\begin_layout Standard
-
-\lang english
\begin_inset ERT
-status collapsed
+status open
\begin_layout Plain Layout
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 694e848..de17ab6 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -8559,12 +8559,14 @@ Literal
\end_layout
\begin_layout Verbatim
+
Esto es entorno Literal.
\end_layout
\begin_layout Verbatim
\noindent
\align block
+
Las dos líneas siguientes están vacías:
\end_layout
@@ -8577,6 +8579,7 @@ Las dos líneas siguientes están vacías:
\end_layout
\begin_layout Verbatim
+
Casi todo está permitido en entorno Literal:"%&$§#~'`
\backslash
}][{|
@@ -8601,6 +8604,7 @@ con la diferencia de que los espacios aparecen en la
salida como el carácter
\end_layout
\begin_layout Verbatim*
+
Esto es entorno Literal*.
\end_layout
@@ -31259,7 +31263,11 @@ inverted 0
status open
\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_inset
@@ -31273,7 +31281,11 @@ inverted 0
status collapsed
\begin_layout Standard
-Respuesta: Wilhelm Conrad Röntgen
+
+\series bold
+Respuesta:
+\series default
+ Wilhelm Conrad Röntgen
\end_layout
\end_inset
@@ -31377,6 +31389,59 @@ Examen-Pregunta-Respuesta.pdf
si ambas ramas están activas.
Esto ayuda a exportar fácilmente diferentes versiones del documento sin
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
\begin_layout Standard
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index f5d27d7..8115d98 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -9030,12 +9030,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
@@ -9048,6 +9050,7 @@ The following 2 lines are empty:
\end_layout
\begin_layout Verbatim
+
Almost everything is allowed in Verbatim:"%&$§#~'`
\backslash
}][{|
@@ -9080,6 +9083,7 @@ Verbatim
\end_layout
\begin_layout Verbatim*
+
This is Verbatim*.
\end_layout
@@ -32421,7 +32425,11 @@ inverted 0
status open
\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_inset
@@ -32435,7 +32443,11 @@ inverted 0
status collapsed
\begin_layout Standard
-Réponse: Wilhelm Conrad Röntgen
+
+\series bold
+Réponse:
+\series default
+ Wilhelm Conrad Röntgen
\end_layout
\end_inset
@@ -32520,6 +32532,59 @@ Examen-Question-Réponse
si les deux branches sont actives.
De cette façon, vous pouvez exporter différentes versions du document sans
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
\begin_layout Standard
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 9d6f062..097412c 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -7176,12 +7176,14 @@ Space
\end_layout
\begin_layout Verbatim
+
これは原文儘(verbatim)環境です．
\end_layout
\begin_layout Verbatim
\noindent
\align block
+
この下の2行は空白行です．
\end_layout
@@ -7194,6 +7196,7 @@ Space
\end_layout
\begin_layout Verbatim
+
右記の各文字を始め，ほぼすべての文字が使えます．例："%&$§#~'`
\backslash
}][{|
@@ -7216,6 +7219,7 @@ Space
\end_layout
\begin_layout Verbatim*
+
This is Verbatim*.
\end_layout
@@ -26261,7 +26265,11 @@ inverted 0
status open
\begin_layout Standard
-質問：最初のノーベル物理学賞受賞者は誰でしょう？
+
+\series bold
+質問：
+\series default
+最初のノーベル物理学賞受賞者は誰でしょう？
\end_layout
\end_inset
@@ -26275,7 +26283,11 @@ inverted 0
status collapsed
\begin_layout Standard
-解答：Wilhelm Conrad R
+
+\series bold
+解答：
+\series default
+Wilhelm Conrad R
\begin_inset ERT
status collapsed
@@ -26318,6 +26330,59 @@ ontgenです．
\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
+
+\begin_layout Standard
数式内など，派生枝を挿入することができない場所で条件付き出力を使用するには，各派生枝に特別な\SpecialChar LaTeX
定義を書くとよいでしょう．例えば，質問派生枝用に以下のように定義し
\begin_inset Foot
