From: Juergen Spitzmueller <spitz@lyx.org>
Date: Wed, 14 Aug 2019 16:32:34 +0000 (+0200)
Subject: Correct ^ catcode for \cprotect
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e5e418fc4c10dc43037533d1d3d723cdd5cd3d94;p=features.git

Correct ^ catcode for \cprotect
---

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 86e35f745f..3ed3a9c613 100644
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -442,8 +442,8 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
 				os << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}";
 			else {
 				if (!cprotect.empty() && contains(runparams.active_chars, '^')) {
-					// cprotect relies on ^ being ignored
-					os << "\\begingroup\\catcode`\\^=9";
+					// cprotect relies on ^ being on catcode 7
+					os << "\\begingroup\\catcode`\\^=7";
 					needendgroup = true;
 				}
 				os << cprotect << "\\fbox";
diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index d264b2f59f..f2073f6cdf 100644
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -462,8 +462,8 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const
 			//    commands, but we do not provide this information yet.
 			if (hasCProtectContent(runparams.moving_arg)) {
 				if (contains(runparams.active_chars, '^')) {
-					// cprotect relies on ^ being ignored
-					os << "\\begingroup\\catcode`\\^=9";
+					// cprotect relies on ^ being on catcode 7
+					os << "\\begingroup\\catcode`\\^=7";
 					needendgroup = true;
 				}
 				os << "\\cprotect";
diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index ad4db9b527..d320e0efe6 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -681,8 +681,8 @@ void parStartCommand(Paragraph const & par, otexstream & os,
 	case LATEX_COMMAND:
 		if (par.needsCProtection(runparams.moving_arg)) {
 			if (contains(runparams.active_chars, '^'))
-				// cprotect relies on ^ being ignored
-				os << "\\begingroup\\catcode`\\^=9";
+				// cprotect relies on ^ being on catcode 7
+				os << "\\begingroup\\catcode`\\^=7";
 			os << "\\cprotect";
 		}
 		os << '\\' << from_ascii(style.latexname());