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 293dcdb033ba97fe723764f7bff75dd5e8176785..075087d618fc1a4a7aff4f3ecbc0cd306a6b93af 100644 (file)
--- 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 7eb7ea1f70bc956de42c44baf40a3677d35ec4f9..a575b3e820c2b953ea6c2c4c6a92823a603ad3ef 100644 (file)
--- 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 dbbf27692b8390e63f6a829e3fea67830c28d2f0..a5b081250564f9d0c8d0d3df83d7f8e442daee1d 100644 (file)
--- 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 f3709bb7a95f3db242b1264029e273bc2a9ff893..cf9e2a69e2dc7023972a2e8ca16d16463255b8f4 100644 (file)
--- 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 c8ec1ba865593fc6c3732c395e635ea204696d32..dbfad7418cd0e1c5968a46b0d32d57e56df7601b 100644 (file)
--- 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 3dcea9aa72037a31c457cb06e4e3c8975dd3f1e0..252383b6179f56b2b0f75db6d183b98fb92e27df 100644 (file)
--- 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 d6a4f89fe91613e1cb3d21ad7620b08d24e31be8..ffc507d9c7a01725ccce4270bfb9be50964ed5b8 100644 (file)
--- 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 ad6ec01d1a278246a439a2a4780e79c9bd28638b..709f55881bbaee287fc716dcb9ba9329d0b7eb62 100644 (file)
--- 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();