Output caption insets collapsed

Like all other collapsable insets, there is not reason to treat captions
specially.

diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx
index be80280b4a70ee19da3392c274f4df2041051439..07e47977de8294754a3c9bc0b003beed744f388c 100644 (file)
--- a/src/tex2lyx/test/algo2e.lyx.lyx
+++ b/src/tex2lyx/test/algo2e.lyx.lyx
@@ -202,6 +202,7 @@ status collapsed
 
  
 \begin_inset Caption Standard
+status collapsed
 
 \begin_layout Standard
 An alg 

diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx
index 0cb836fe93506f91a3b837dbc99ebecdec5cf4cd..3f65c43e8ef15a805dd660b73fa80a78ee2567b6 100644 (file)
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -1413,6 +1413,7 @@ kill
 
  
 \begin_inset Caption Standard
+status collapsed
 
 \begin_layout Standard
 
@@ -1494,6 +1495,7 @@ Second
 \begin_layout Standard
 
 \begin_inset Caption Standard
+status collapsed
 
 \begin_layout Standard
 
@@ -1569,6 +1571,7 @@ Second
 \begin_layout Standard
 
 \begin_inset Caption LongTableNoNumber
+status collapsed
 
 \begin_layout Standard
 standard foot
@@ -1614,6 +1617,7 @@ bottom.
 \begin_layout Standard
 
 \begin_inset Caption LongTableNoNumber
+status collapsed
 
 \begin_layout Standard
 (last foot)
@@ -3456,6 +3460,7 @@ LyX
 \begin_layout Standard
 
 \begin_inset Caption Standard
+status collapsed
 
 \begin_layout Standard
 A long table
@@ -3481,6 +3486,7 @@ A long table
 \begin_layout Standard
 
 \begin_inset Caption Standard
+status collapsed
 
 \begin_layout Standard
 A long table -- continued
@@ -4462,6 +4468,7 @@ status open
 \begin_layout Standard
 
 \begin_inset Caption Standard
+status collapsed
 
 \begin_layout Standard
 

diff --git a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
index ba00fb9aedae708fe7f77115ddf725ef89cb6ba9..45af40ce2010bd2d925d324d66b96577013ca1fb 100644 (file)
--- a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
+++ b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
@@ -253,6 +253,7 @@ protect
 
 
 \begin_inset Caption Standard
+status collapsed
 
 \begin_layout Standard
 figure
@@ -309,6 +310,7 @@ protect
 
 
 \begin_inset Caption Standard
+status collapsed
 
 \begin_layout Standard
 table
@@ -365,6 +367,7 @@ protect
 
 
 \begin_inset Caption Standard
+status collapsed
 
 \begin_layout Standard
 algorithm

diff --git a/src/tex2lyx/test/test-scr.lyx.lyx b/src/tex2lyx/test/test-scr.lyx.lyx
index 078be905db67d6f47ad110d0b311b926487ab651..62280a37c4aaeb36f182438150380229ac916ffa 100644 (file)
--- a/src/tex2lyx/test/test-scr.lyx.lyx
+++ b/src/tex2lyx/test/test-scr.lyx.lyx
@@ -161,6 +161,7 @@ status open
 \begin_layout Standard
 
 \begin_inset Caption Above
+status collapsed
 
 \begin_layout Standard
 figure
@@ -194,6 +195,7 @@ status open
 \begin_layout Standard
 
 \begin_inset Caption Below
+status collapsed
 
 \begin_layout Standard
 table

diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx
index 107bb669e153c37cf57b852a0c2571b5acb72855..a66412f7fdb89b5569dc96a9eb9ec2b6110dc096 100644 (file)
--- a/src/tex2lyx/test/test-structure.lyx.lyx
+++ b/src/tex2lyx/test/test-structure.lyx.lyx
@@ -242,6 +242,7 @@ status open
 \begin_layout Standard
 
 \begin_inset Caption Standard
+status collapsed
 
 \begin_layout Standard
  
@@ -276,6 +277,7 @@ status open
 \begin_layout Standard
 
 \begin_inset Caption Standard
+status collapsed
 
 \begin_layout Standard
 
@@ -320,6 +322,7 @@ status open
 \begin_layout Standard
 
 \begin_inset Caption Standard
+status collapsed
 
 \begin_layout Standard
 rotated table, spanning all columns
@@ -429,6 +432,7 @@ fdgsdfdh
 \begin_layout Standard
 
 \begin_inset Caption Standard
+status collapsed
 
 \begin_layout Standard
 test1
@@ -466,6 +470,7 @@ fdgs
 \begin_layout Standard
 
 \begin_inset Caption Standard
+status collapsed
 
 \begin_layout Standard
 test2
@@ -498,6 +503,7 @@ status open
 \begin_layout Standard
 
 \begin_inset Caption Standard
+status collapsed
 
 \begin_layout Standard
 fdg
@@ -554,6 +560,7 @@ status open
 \begin_layout Standard
 
 \begin_inset Caption Standard
+status collapsed
 
 \begin_layout Standard
 lkälöä
@@ -696,6 +703,7 @@ subfigure 3
 \begin_layout Standard
 
 \begin_inset Caption Standard
+status collapsed
 
 \begin_layout Standard
 figure caption

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 721db0ce6bb9212a386ed3e5a03663d1854ac7a7..883ba84921918efd5c16e03f1bbaac47e7b1a244 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -2831,6 +2831,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                                begin_inset(os, "Caption Above\n");
                        else if (t.cs() == "captionbelow")
                                begin_inset(os, "Caption Below\n");
+                       os << "status collapsed\n";
                        Context newcontext(true, context.textclass, 0, 0, context.font);
                        newcontext.check_layout(os);
                        // FIXME InsetArgument is now properly implemented in InsetLayout