commit fe2e5dcf35221e6e04653635410b1f4b94fe424a
Author: Juergen Spitzmueller <[email protected]>
Date: Wed May 15 13:58:28 2024 +0200
Document NeedCProtect -1 InsetLayout option
---
lib/doc/Customization.lyx | 73 +++++++++++++-
lib/doc/de/Customization.lyx | 220 +++++++++++++++++++++++++++++++++++++++++++
status.24x | 2 +
3 files changed, 294 insertions(+), 1 deletion(-)
diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index bb97630c58..0500d0fce1 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -20803,6 +20803,17 @@ NeedCProtect
\begin_inset Flex Code
status collapsed
+\begin_layout Plain Layout
+-1
+\end_layout
+
+\end_inset
+
+,
+
+\begin_inset Flex Code
+status collapsed
+
\begin_layout Plain Layout
\emph on
@@ -20825,7 +20836,17 @@ status collapsed
\end_inset
-] This causes macros that contain this inset to be protected with
+] Value
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+
+ causes macros that contain this inset to be protected with
\begin_inset Flex Code
status collapsed
@@ -20844,6 +20865,54 @@ cprotect
\family default
) if necessary and thus allows (some) verbatim stuff in macros.
Default is false.
+ With the default setting (value
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+0
+\end_layout
+
+\end_inset
+
+),
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+cprotect
+\end_layout
+
+\end_inset
+
+ is used if a nested element requires it.
+ Value
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+-1
+\end_layout
+
+\end_inset
+
+ prevents any use of
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+cprotect
+\end_layout
+
+\end_inset
+
+ within this inset,
+ even if required by a nested element.
\end_layout
\begin_layout Description
@@ -31439,6 +31508,8 @@ status collapsed
\change_inserted -712698321 1712389749
$$OrigAbsName
+\change_unchanged
+
\end_layout
\end_inset
diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx
index 6164c0721d..396898f8ff 100644
--- a/lib/doc/de/Customization.lyx
+++ b/lib/doc/de/Customization.lyx
@@ -19607,6 +19607,226 @@ MultiPar
\begin_inset Flex Code
status collapsed
+\begin_layout Plain Layout
+NeedCProtect
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+-1
+\end_layout
+
+\end_inset
+
+,
+\begin_inset space \thinspace{}
+\end_inset
+
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\emph on
+0
+\end_layout
+
+\end_inset
+
+,
+\begin_inset space \thinspace{}
+\end_inset
+
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+
+] Wert
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+
+ bewirkt,
+ dass Makros,
+ die diese Einfügung enthalten,
+ mittels
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+cprotect
+\end_layout
+
+\end_inset
+
+ (Paket
+\family sans
+cprotect
+\family default
+) geschützt werden,
+ falls nötig.
+ Damit wird die Verwendung (mancher) Verbatim-Dinge in Makros ermöglicht.
+ In der Voreinstellung (Wert
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+0
+\end_layout
+
+\end_inset
+
+) wird
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+cprotect
+\end_layout
+
+\end_inset
+
+ verwendet,
+ sobald ein eingebettetes Element dies verlangt.
+ Der Wert
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+-1
+\end_layout
+
+\end_inset
+
+ unterbindet die Verwendung von
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+cprotect
+\end_layout
+
+\end_inset
+
+ selbst dann,
+ wenn eingebettete Elemente dies verlangen.
+\end_layout
+
+\begin_layout Description
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+NeedMBoxProtect
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\emph on
+0
+\end_layout
+
+\end_inset
+
+,
+\begin_inset space \thinspace{}
+\end_inset
+
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+
+] legt fest,
+ ob bestimmte Befehle in dieser Einfügung (bspw.
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+cite
+\end_layout
+
+\end_inset
+
+ und
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+ref
+\end_layout
+
+\end_inset
+
+) in einer
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+mbox
+\end_layout
+
+\end_inset
+
+ geschützt werden sollen.
+ Das ist vor allem für Einfügungen nötig,
+ die auf Befehle der Pakete
+\family sans
+ulem
+\family default
+ oder
+\family sans
+soul
+\family default
+ aufbauen,
+ welche ihren Inhalt in komplexer Art und Weise auslesen.
+\end_layout
+
+\begin_layout Description
+\begin_inset Flex Code
+status collapsed
+
\begin_layout Plain Layout
NeedProtect
\end_layout
diff --git a/status.24x b/status.24x
index 694e43136f..e6a9c112ae 100644
--- a/status.24x
+++ b/status.24x
@@ -60,6 +60,8 @@ What's new
- The g-brief and g-brief2 letter classes load babel internally. LyX now
is aware of that.
+- Fix some cases where beamer breaks with the new cprotect mechanism.
+
* USER INTERFACE
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
