From e01886327d365a570a7fb0b9bb361eec262fa0b8 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Sat, 27 Dec 2014 16:10:11 +0100 Subject: [PATCH] Output caption insets collapsed Like all other collapsable insets, there is not reason to treat captions specially. --- src/tex2lyx/test/algo2e.lyx.lyx | 1 + src/tex2lyx/test/test-insets.lyx.lyx | 7 +++++++ src/tex2lyx/test/test-refstyle-theorems.lyx.lyx | 3 +++ src/tex2lyx/test/test-scr.lyx.lyx | 2 ++ src/tex2lyx/test/test-structure.lyx.lyx | 8 ++++++++ src/tex2lyx/text.cpp | 1 + 6 files changed, 22 insertions(+) diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx index be80280b4a..07e47977de 100644 --- 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 0cb836fe93..3f65c43e8e 100644 --- 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 ba00fb9aed..45af40ce20 100644 --- 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 078be905db..62280a37c4 100644 --- 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 107bb669e1..a66412f7fd 100644 --- 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 721db0ce6b..883ba84921 100644 --- 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 -- 2.39.2