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 = ¤t_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 5fd64ebe0c..2c1d9308dd 100644 --- a/status.24x +++ b/status.24x @@ -86,6 +86,10 @@ What's new - Improve the way spaces are handled in labels when refstyle is used. +- Re-allow relative paths for local bib files (bug 13097). + +- Only \protect labels in \thanks notes (see bug 9404). + * USER INTERFACE