Properly define MultiPar status of caption in the layout definition.

Also remove hardcoded paragraph break disabling.

Candidate for branch.

lib/layouts/aastex.layout

@@ -530,6 +530,7 @@ InsetLayout Caption:FigCaption
 	LabelString	fig.
 	LaTeXType	command
 	LatexName	figcaption
+	MultiPar        false
 	Argument 1
 	  LabelString	"Filename"
 	  Tooltip	"Filename to identify the corresponding figure file"

lib/layouts/aguplus.inc

@@ -208,6 +208,7 @@ InsetLayout Caption:Table
 	LaTeXType            command
 	LatexName            tablecaption
 	NeedProtect          1
+	MultiPar             false
 	HTMLStyle
 		div.float-caption {
 			text-align: center;

lib/layouts/apa.layout

@@ -252,6 +252,7 @@ InsetLayout Caption:Centered
 	LaTeXType            command
 	LatexName            centeredcaption
 	NeedProtect          1
+	MultiPar             false
 	Argument 1
 		LabelString   "Short Title|S"
 		Tooltip       "The caption as it appears in the list of figures/tables"

lib/layouts/apa6.layout

@@ -352,6 +352,7 @@ InsetLayout Caption:Centered
 	LaTeXType            command
 	LatexName            centeredcaption
 	NeedProtect          1
+	MultiPar             false
 	Argument 1
 		LabelString   "Short Title|S"
 		Tooltip       "The caption as it appears in the list of figures/tables"

lib/layouts/bicaption.module

@@ -41,6 +41,7 @@ InsetLayout Caption:Bicaption
 	LaTeXType	command
 	LatexName	bicaption
 	NeedProtect     1
+	MultiPar        false
 	Argument 1
 	  LabelString	"Main Language Short Title"
 	  Tooltip	"Short title for the main(document) language"

lib/layouts/scrclass.inc

@@ -270,6 +270,7 @@ InsetLayout Caption:Above
 	LaTeXType            command
 	LatexName            captionabove
 	NeedProtect          1
+	MultiPar             false
 	Argument 1
 		LabelString   "Short Title|S"
 		Tooltip       "The caption as it appears in the list of figures/tables"
@@ -291,6 +292,7 @@ InsetLayout Caption:Below
 	LaTeXType            command
 	LatexName            captionbelow
 	NeedProtect          1
+	MultiPar             false
 	Argument 1
 		LabelString   "Short Title|S"
 		Tooltip       "The caption as it appears in the list of figures/tables"

lib/layouts/stdinsets.inc

@@ -557,6 +557,7 @@ InsetLayout Caption:Standard
 	LaTeXType            command
 	LatexName            caption
 	NeedProtect	     1
+	MultiPar             false
 	Argument 1
 		LabelString   "Short Title|S"
 		Tooltip       "The caption as it appears in the list of figures/tables"

src/insets/InsetCaption.cpp

@@ -237,10 +237,6 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd,
 		return InsetText::getStatus(cur, cmd, status);
 	}
 
-	case LFUN_PARAGRAPH_BREAK:
-		status.setEnabled(false);
-		return true;
-
 	case LFUN_INSET_TOGGLE:
 		// pass back to owner
 		cur.undispatched();