anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly define MultiPar status of caption in the layout definition.

Browse Source 
Also remove hardcoded paragraph break disabling.

Candidate for branch.
This commit is contained in:
Juergen Spitzmueller 2015-03-10 18:31:55 +01:00
parent dbc4c71ef5
commit 9d824a04d1
8 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/layouts/aastex.layout
View File

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

1
lib/layouts/aguplus.inc
View File

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

1
lib/layouts/apa.layout
View File

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

1
lib/layouts/apa6.layout
View File

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

1
lib/layouts/bicaption.module
View File

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

2
lib/layouts/scrclass.inc
View File

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

1
lib/layouts/stdinsets.inc
View File

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

4
src/insets/InsetCaption.cpp
View File

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