commit 9d824a04d11c3223db26d2fe146e86e90a432a6e
Author: Juergen Spitzmueller <[email protected]>
Date: Tue Mar 10 18:31:55 2015 +0100
Properly define MultiPar status of caption in the layout definition.
Also remove hardcoded paragraph break disabling.
Candidate for branch.
diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index 293dcdb..075087d 100644
--- a/lib/layouts/aastex.layout
+++ b/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"
diff --git a/lib/layouts/aguplus.inc b/lib/layouts/aguplus.inc
index 7eb7ea1..a575b3e 100644
--- a/lib/layouts/aguplus.inc
+++ b/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;
diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout
index dbbf276..a5b0812 100644
--- a/lib/layouts/apa.layout
+++ b/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"
diff --git a/lib/layouts/apa6.layout b/lib/layouts/apa6.layout
index f3709bb..cf9e2a6 100644
--- a/lib/layouts/apa6.layout
+++ b/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"
diff --git a/lib/layouts/bicaption.module b/lib/layouts/bicaption.module
index c8ec1ba..dbfad74 100644
--- a/lib/layouts/bicaption.module
+++ b/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"
diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc
index 3dcea9a..252383b 100644
--- a/lib/layouts/scrclass.inc
+++ b/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"
diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index d6a4f89..ffc507d 100644
--- a/lib/layouts/stdinsets.inc
+++ b/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"
diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index ad6ec01..709f558 100644
--- a/src/insets/InsetCaption.cpp
+++ b/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();
