commit f790bb046eafe1b3e32eb59c3af639e1fdaa166b
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.
diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index db9b243..f5fdb6d 100644
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -529,6 +529,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 fd8624d..94a4098 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 e4a4799..c32fadc 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 b0f20af..e3faec2 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 f0e0c3c..845f274 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 95aa4f0..126606b 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 635dfdb..5dbfee0 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -555,6 +555,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 a6b8dfa..7d949f8 100644
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -238,10 +238,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();
diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx
index 18bec46..0d71827 100644
--- a/src/tex2lyx/test/algo2e.lyx.lyx
+++ b/src/tex2lyx/test/algo2e.lyx.lyx
@@ -203,7 +203,7 @@ status collapsed
\begin_inset Caption Standard
-\begin_layout Standard
+\begin_layout Plain Layout
An alg
\begin_inset CommandInset label
LatexCommand label
diff --git a/src/tex2lyx/test/test-insets.lyx.lyx
b/src/tex2lyx/test/test-insets.lyx.lyx
index 1291f7c..c60454e 100644
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -1436,7 +1436,7 @@ kill
\begin_inset Caption Standard
-\begin_layout Standard
+\begin_layout Plain Layout
\begin_inset Argument 1
status collapsed
@@ -1518,7 +1518,7 @@ Second
\begin_inset Caption Standard
-\begin_layout Standard
+\begin_layout Plain Layout
\begin_inset Argument 1
status collapsed
@@ -1594,7 +1594,7 @@ Second
\begin_inset Caption LongTableNoNumber
-\begin_layout Standard
+\begin_layout Plain Layout
standard foot
\end_layout
@@ -1639,7 +1639,7 @@ bottom.
\begin_inset Caption LongTableNoNumber
-\begin_layout Standard
+\begin_layout Plain Layout
(last foot)
\end_layout
@@ -3481,7 +3481,7 @@ LyX
\begin_inset Caption Standard
-\begin_layout Standard
+\begin_layout Plain Layout
A long table
\end_layout
@@ -3506,7 +3506,7 @@ A long table
\begin_inset Caption Standard
-\begin_layout Standard
+\begin_layout Plain Layout
A long table -- continued
\end_layout
@@ -4487,7 +4487,7 @@ status open
\begin_inset Caption Standard
-\begin_layout Standard
+\begin_layout Plain Layout
\begin_inset CommandInset label
LatexCommand label
diff --git a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
index b29f4c1..0b93c42 100644
--- a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
+++ b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
@@ -254,7 +254,7 @@ protect
\begin_inset Caption Standard
-\begin_layout Standard
+\begin_layout Plain Layout
figure
\begin_inset CommandInset label
LatexCommand label
@@ -310,7 +310,7 @@ protect
\begin_inset Caption Standard
-\begin_layout Standard
+\begin_layout Plain Layout
table
\begin_inset CommandInset label
LatexCommand label
@@ -366,7 +366,7 @@ protect
\begin_inset Caption Standard
-\begin_layout Standard
+\begin_layout Plain Layout
algorithm
\begin_inset CommandInset label
LatexCommand label
diff --git a/src/tex2lyx/test/test-structure.lyx.lyx
b/src/tex2lyx/test/test-structure.lyx.lyx
index 75a9506..f2f942d 100644
--- a/src/tex2lyx/test/test-structure.lyx.lyx
+++ b/src/tex2lyx/test/test-structure.lyx.lyx
@@ -243,7 +243,7 @@ status open
\begin_inset Caption Standard
-\begin_layout Standard
+\begin_layout Plain Layout
\emph on
@@ -277,7 +277,7 @@ status open
\begin_inset Caption Standard
-\begin_layout Standard
+\begin_layout Plain Layout
\begin_inset Argument 1
status collapsed
@@ -322,7 +322,7 @@ status open
\begin_inset Caption Standard
-\begin_layout Standard
+\begin_layout Plain Layout
rotated table, spanning all columns
\end_layout
@@ -431,7 +431,7 @@ fdgsdfdh
\begin_inset Caption Standard
-\begin_layout Standard
+\begin_layout Plain Layout
test1
\end_layout
@@ -468,7 +468,7 @@ fdgs
\begin_inset Caption Standard
-\begin_layout Standard
+\begin_layout Plain Layout
test2
\end_layout
@@ -500,7 +500,7 @@ status open
\begin_inset Caption Standard
-\begin_layout Standard
+\begin_layout Plain Layout
fdg
\end_layout
@@ -556,7 +556,7 @@ status open
\begin_inset Caption Standard
-\begin_layout Standard
+\begin_layout Plain Layout
lkälöä
\end_layout
@@ -698,7 +698,7 @@ subfigure 3
\begin_inset Caption Standard
-\begin_layout Standard
+\begin_layout Plain Layout
figure caption
\end_layout
diff --git a/status.21x b/status.21x
index bdf066e..9a866f5 100644
--- a/status.21x
+++ b/status.21x
@@ -67,6 +67,8 @@ What's new
- Do not output \protect unnecessarily in subfigure contents (bug 9421).
+- Fix LaTeX error with font sizes in caption.
+
- Fix wrong listings preamble encoding (bug 9382).
- Fix reversion of beamer description overlay arguments.
