[LyX/master] Only \protect labels in \thanks notes

Juergen Spitzmueller spitz at lyx.org
Sat Sep 21 09:31:40 UTC 2024


commit d43e82a5a79e167c27140b609895ffdcd1ed8997
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Sat Sep 21 11:30:08 2024 +0200

    Only \protect labels in \thanks notes
    
    See https://marc.info/?l=lyx-users&m=136394387505489
---
 src/Paragraph.cpp         | 2 +-
 src/insets/InsetLabel.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index eb94ac2f09..72fdd85dde 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -3110,7 +3110,7 @@ void Paragraph::latex(BufferParams const & bparams,
 		OutputParams rp = runparams;
 		rp.free_spacing = style.free_spacing;
 		rp.local_font = &current_font;
-		rp.intitle = style.intitle;
+		rp.intitle |= style.intitle;
 
 		// Two major modes:  LaTeX or plain
 		// Handle here those cases common to both modes
diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index ab5a5e1716..b4b885ad9d 100644
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -346,10 +346,10 @@ void InsetLabel::latex(otexstream & os, OutputParams const & runparams_in) const
 	if (runparams_in.postpone_fragile_stuff)
 		runparams_in.post_macro += command;
 	else {
-		// protect label in moving argument (#9404),
-		// but not in subfloat caption (#11950)
+		// protect label in \thanks notes (#9404)
 		if (runparams.moving_arg
-		    && runparams.inFloat != OutputParams::SUBFLOAT)
+		    && runparams.intitle
+		    && runparams.inFootnote)
 			os << "\\protect";
 		os << command;
 	}


More information about the lyx-cvs mailing list