From: Juergen Spitzmueller <spitz@lyx.org>
Date: Tue, 18 Aug 2020 07:02:14 +0000 (+0200)
Subject: Customization: Improve documentation of ResetsFont
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~351
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=09a49da0d72ceeb0c6de4599f00389691a28a683;p=features.git

Customization: Improve documentation of ResetsFont

Fixes #8454
---

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 69fa04ab68..541e562ce0 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -21936,9 +21936,141 @@ status collapsed
 
 \end_inset
 
-] Whether this inset should use the font of its surrounding environment
- or uses its own.
- Default is false: use the font of the surrounding environment.
+] 
+\change_inserted -712698321 1597733473
+If 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1597732178
+1
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+, font changes are redone inside the respective inset (in the output) even
+ if the inset itself is in the context of this font changes (e.
+\begin_inset space \thinspace{}
+\end_inset
+
+g., 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1597733683
+
+\backslash
+textbf{Sourrounding text 
+\backslash
+myinset{
+\backslash
+textbf{content}}\SpecialChar ldots
+}
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+ rather than 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1597733686
+
+\backslash
+textbf{Sourrounding text 
+\backslash
+myinset{content}\SpecialChar ldots
+}
+\end_layout
+
+\end_inset
+
+.
+ Setting this makes sense for commands that internally reset font settings
+ (e.
+\begin_inset space \thinspace{}
+\end_inset
+
+g., footnotes).
+ Note that wrongly setting this might lead to unwanted result (e.
+\begin_inset space \thinspace{}
+\end_inset
+
+g., with 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1597733688
+
+\backslash
+emph{Sourrounding text 
+\backslash
+myinset{
+\backslash
+emph{content}}\SpecialChar ldots
+}
+\end_layout
+
+\end_inset
+
+, content is upright, as 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1597733278
+
+\backslash
+emph
+\end_layout
+
+\end_inset
+
+ toggles.
+ 
+\change_deleted -712698321 1597733283
+Whether this inset should use the font of its surrounding environment or
+ uses its own.
+ 
+\change_unchanged
+Default is 
+\change_deleted -712698321 1597733290
+false
+\change_inserted -712698321 1597733290
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1597733292
+0
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
+: 
+\change_deleted -712698321 1597733327
+use the font of the surrounding environment
+\change_inserted -712698321 1597733343
+font changes are not redone inside the inset
+\change_unchanged
+.
 \end_layout
 
 \begin_layout Description
diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx
index 68ae174839..c2d141a4fb 100644
--- a/lib/doc/de/Customization.lyx
+++ b/lib/doc/de/Customization.lyx
@@ -19544,9 +19544,104 @@ status collapsed
 
 \end_inset
 
-] Legt fest, ob die Einfügung die Schrift der übergeordneten Umgebung verwenden
- soll oder eine eigene.
- Voreinstellung ist 
+] Wenn dies 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+
+ gesetzt ist, werden Schriftänderungen in der betreffenden Einfügung (in
+ der Ausgabe) neu initiiert, auch dann, wenn die Einfügung in einem Kontext
+ ist, in dem die Schriftänderungen bereits initiiert sind (bspw.
+ 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+textbf{Umgebender Text 
+\backslash
+meineEinfuegung{
+\backslash
+textbf{Inhalt}}\SpecialChar ldots
+}
+\end_layout
+
+\end_inset
+
+ statt 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+textbf{Umgebender Text 
+\backslash
+meineEinfuegung{Inhalt}\SpecialChar ldots
+}
+\end_layout
+
+\end_inset
+
+.
+ Diese Einstellung ist für solche Makros sinnvoll, die intern Schrifteinstellung
+en zurücksetzen (bspw.
+ 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+footnote
+\end_layout
+
+\end_inset
+
+).
+ Beachten Sie, dass eine nicht angebrachte Aktivierung dieser Einstellung
+ zu unerwünschten Ergebnissen führen kann (so wird z.
+\begin_inset space \thinspace{}
+\end_inset
+
+B.
+ mit 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+emph{Umgebender Text 
+\backslash
+myinset{
+\backslash
+emph{Inhalt}}\SpecialChar ldots
+}
+\end_layout
+
+\end_inset
+
+ Inhalt nicht kursiv ausgegeben, da 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+emph
+\end_layout
+
+\end_inset
+
+ zwischen Kursiv und Nicht-Kursiv hin- und herschaltet.
+ Die Voreinstellung ist 
 \begin_inset Flex Code
 status collapsed
 
@@ -19556,7 +19651,7 @@ status collapsed
 
 \end_inset
 
-: verwendet die Schrift der übergeordneten Umgebung.
+: Schriftänderungen werden innerhalb der Einfügung nicht neu initiiert.
 \end_layout
 
 \begin_layout Description