[LyX/master] By default, charstyles should not permit layout changes internally.

[Richard Heck]

commit 152817576adaefaa1be8f124b9feecd5c2bfd7c2
Author: Richard Heck <rgh...@lyx.org>
Date:   Mon Jun 20 11:30:32 2016 -0400

    By default, charstyles should not permit layout changes internally.
    
    Fixes #10237.

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index a1677de..088e4bc 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:  {