\cprotect amendment

\cprotect'ed insets do not need forced local font switch; in fact files
with this break in compilation. E.g. a caption with an URL containing
the char '#' and caption text set to a secondary language.

(cherry picked from commit 8659924abd)
This commit is contained in:
Juergen Spitzmueller 2024-06-22 13:38:47 +02:00
parent ce88e46a3d
commit 59648b5d35
2 changed files with 8 additions and 2 deletions

View File

@ -1000,7 +1000,10 @@ void TeXOnePar(Buffer const & buf,
&& (prev_language->rightToLeft() != par_language->rightToLeft())); && (prev_language->rightToLeft() != par_language->rightToLeft()));
bool const localswitch = bool const localswitch =
(runparams_in.find_effective() (runparams_in.find_effective()
|| text.inset().forceLocalFontSwitch() // \cprotect'ed insets do not need, and actually
// break with, local switches
|| (text.inset().forceLocalFontSwitch()
&& !text.inset().needsCProtection(maintext, runparams.moving_arg))
|| (using_begin_end && text.inset().forcePlainLayout()) || (using_begin_end && text.inset().forcePlainLayout())
|| in_polyglossia_rtl_env) || in_polyglossia_rtl_env)
&& !text.inset().forceParDirectionSwitch(); && !text.inset().forceParDirectionSwitch();

View File

@ -67,6 +67,8 @@ What's new
- Fix some cases where beamer breaks with the new cprotect mechanism. - Fix some cases where beamer breaks with the new cprotect mechanism.
- Fix case where new cprotect mechanism breaks with caption.
- Update acknowledgments handling in aastex63 layout - Update acknowledgments handling in aastex63 layout
(cf. https://journals.aas.org/aastexguide/#acknowledgments) (cf. https://journals.aas.org/aastexguide/#acknowledgments)
@ -76,6 +78,7 @@ What's new
- Remove redundant code from preamble of double column Hebrew documents (bug 12919) - Remove redundant code from preamble of double column Hebrew documents (bug 12919)
* USER INTERFACE * USER INTERFACE
- Fix crash when deleting rows or columns from table. - Fix crash when deleting rows or columns from table.
@ -102,7 +105,6 @@ What's new
- Put new citation after selected item rather than at end of list (bug 12940). - Put new citation after selected item rather than at end of list (bug 12940).
- fix overflow of appendix red frame in document-bottom grey area. - fix overflow of appendix red frame in document-bottom grey area.
@ -121,6 +123,7 @@ What's new
- Fix crash when passing unknown value to textstyle-update - Fix crash when passing unknown value to textstyle-update
* DOCUMENTATION AND LOCALIZATION * DOCUMENTATION AND LOCALIZATION