[LyX/2.4.x] Only \protect labels in \thanks notes

[Richard Kimberly Heck]

commit 897fa089192d28afd65880190a3bbd6e05c56942
Author: Juergen Spitzmueller <sp...@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 +++---
 status.24x                | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 22a75c7d19..25cba9581e 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -3084,7 +3084,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;
        }
diff --git a/status.24x b/status.24x
index 439fffa9e9..6bd7151aff 100644
--- a/status.24x
+++ b/status.24x
@@ -43,6 +43,9 @@ What's new
 
 * DOCUMENT INPUT/OUTPUT
 
+- Re-allow relative paths for local bib files (bug 13097).
+
+- Only \protect labels in \thanks notes (see bug 9404).
 
 
 * USER INTERFACE
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs