From d2dc4652face26b0a7572cb40fb09f865c0e2c70 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Thu, 14 Jan 2010 21:43:44 +0000
Subject: [PATCH] Character styles should have MultiPar = false, by default.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33041 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/doc/Customization.lyx  | 58 +++++++++++++++++++++++++++++++++++++-
 src/insets/InsetLayout.cpp |  2 ++
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 0403efddd5..d9785f6dc8 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -13921,7 +13921,7 @@ reference "des:LatexType"
 status collapsed
 
 \begin_layout Plain Layout
-LyxType 
+LyxType
 \end_layout
 
 \end_inset
@@ -13969,6 +13969,62 @@ end
  (indicating a dummy definition ending definitions of charstyles, etc).
  This entry is required in and is only meaningful for Flex insets.
  Among other things, it determines on which menu this inset will appear.
+ Setting 
+\begin_inset Flex CharStyle:Code
+status collapsed
+
+\begin_layout Plain Layout
+LyXType
+\end_layout
+
+\end_inset
+
+ to 
+\begin_inset Flex CharStyle:Code
+status collapsed
+
+\begin_layout Plain Layout
+charstyle
+\end_layout
+
+\end_inset
+
+ will set 
+\begin_inset Flex CharStyle:Code
+status collapsed
+
+\begin_layout Plain Layout
+MultiPar
+\end_layout
+
+\end_inset
+
+ to false.
+ 
+\begin_inset Flex CharStyle:Code
+status collapsed
+
+\begin_layout Plain Layout
+MultiPar
+\end_layout
+
+\end_inset
+
+ can be set to true for charstyle insets, if you wish, by setting it 
+\emph on
+after
+\emph default
+ you set the 
+\begin_inset Flex CharStyle:Code
+status collapsed
+
+\begin_layout Plain Layout
+LyXType
+\end_layout
+
+\end_inset
+
+.
 \end_layout
 
 \begin_layout Description
diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index e326d26c9f..e8298d4b1c 100644
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -180,6 +180,8 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 			lyxtype_ = translateLyXType(lt);
 			if (lyxtype_  == NOLYXTYPE)
 				LYXERR0("Unknown LyXType `" << lt << "'.");
+			if (lyxtype_ == CHARSTYLE)
+				multipar_ = false;
 			break;
 		}
 		case IL_LATEXTYPE:  {
-- 
2.39.5