From: Richard Heck <rgheck@lyx.org>
Date: Mon, 20 Jun 2016 15:30:32 +0000 (-0400)
Subject: By default, charstyles should not permit layout changes internally.
X-Git-Tag: 2.2.1~102
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=774c00c4574a271c2b99068d70eac2c06e6ebc2f;p=features.git

By default, charstyles should not permit layout changes internally.

Fixes #10237.

(cherry picked from commit 152817576adaefaa1be8f124b9feecd5c2bfd7c2)
---

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 7291a60bf1..1612cd1a2d 100644
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -226,8 +226,11 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 			lyxtype_ = translateLyXType(lt);
 			if (lyxtype_  == NOLYXTYPE)
 				LYXERR0("Unknown LyXType `" << lt << "'.");
-			if (lyxtype_ == CHARSTYLE)
+			if (lyxtype_ == CHARSTYLE) {
+				// by default, charstyles force the plain layout
 				multipar_ = false;
+				forceplain_ = true;
+			}
 			break;
 		}
 		case IL_LATEXTYPE:  {
diff --git a/status.22x b/status.22x
index 193ebce70f..8072a9b844 100644
--- a/status.22x
+++ b/status.22x
@@ -81,6 +81,8 @@ What's new
 
 * USER INTERFACE
 
+- CharStyles now prohibit layout changes by default (bug 10237).
+
 - Fix display of labels in right-to-left languages (bug 10169).
 
 - When a counter is stepped, reset recursively all subcounters (bug #10063).
@@ -137,6 +139,7 @@ What's new
 
 - Fix drawing of buttons by enforcing equal left/right spacing (bug 10147).
 
+
 * INTERNALS