Amend a716fb96b53447

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 0dee0af3aea222ce0d8fb36531d1bc2fe47bda04..dd8d66d1fa705898372d994b101d09fec8d8348a 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1174,6 +1174,7 @@ void Paragraph::Private::latexInset(BufferParams const & bparams,
                          && !textinset->text().isMainText()
                          && inset->lyxCode() != BRANCH_CODE
                          && !runparams.no_cprotect
+                         && !inset->getLayout().noCProtect()
                        : false;
                unsigned int count2 = basefont.latexWriteStartChanges(os, bparams,
                                                      rp, running_font,

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 6df4d8eca8a200ef98f25640a428299693fb5f3d..b8be5c206bba74ffad8183803604b6b31c6e5512 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -500,7 +500,7 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const
                        // FIXME UNICODE
                        // FIXME \protect should only be used for fragile
                        //    commands, but we do not provide this information yet.
-                       if (!runparams.no_cprotect && hasCProtectContent(runparams.moving_arg)) {
+                       if (!il.noCProtect() && !runparams.no_cprotect && hasCProtectContent(runparams.moving_arg)) {
                                if (contains(runparams.active_chars, '^')) {
                                        // cprotect relies on ^ being on catcode 7
                                        os << "\\begingroup\\catcode`\\^=7";