Let tex2lyx really produce format 458.

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index 3af96805b1a9598a642e0805766f2c8a7b344361..43ece811731d387062ca7ddbe4b8c5ed22ce31a1 100644 (file)
--- a/src/tex2lyx/test/CJK.lyx.lyx
+++ b/src/tex2lyx/test/CJK.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 457
+\lyxformat 458
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx
index 1472ff2a181e593c93a52edb2af0758322c055d4..d79f60f81c9c3febb2822a2bcf8c12914ae74496 100644 (file)
--- a/src/tex2lyx/test/CJKutf8.lyx.lyx
+++ b/src/tex2lyx/test/CJKutf8.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 457
+\lyxformat 458
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/tex2lyx/test/Dummy Document.lyx b/src/tex2lyx/test/Dummy Document.lyx
index b610a889e78f13dee03ce6de900ae6e2ce10f597..37f658c1edc5b645cfe2d8b654269d8643505087 100644 (file)
--- a/src/tex2lyx/test/Dummy Document.lyx
+++ b/src/tex2lyx/test/Dummy Document.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 457
+\lyxformat 458
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/tex2lyx/test/DummyDocument.lyx b/src/tex2lyx/test/DummyDocument.lyx
index 38d6bc323f44fe5192b22106b3e02fff3e160fca..9b3911675ea53b96845e4d2f6ef20b0e9949ec7a 100644 (file)
--- a/src/tex2lyx/test/DummyDocument.lyx
+++ b/src/tex2lyx/test/DummyDocument.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 457
+\lyxformat 458
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/tex2lyx/test/Dummy~Document.lyx b/src/tex2lyx/test/Dummy~Document.lyx
index 51ea560b4860ee32302917b04bb2f6576c9b43d8..12bcb1940de6519bbbbc15cd9ce470ffc6c19a98 100644 (file)
--- a/src/tex2lyx/test/Dummy~Document.lyx
+++ b/src/tex2lyx/test/Dummy~Document.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 457
+\lyxformat 458
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
index 2a41e69065c2db94b5ca9c135fb07436ccec3e88..b756a74e1bbe742a2b8600fb075aeaf48ed1280c 100644 (file)
--- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
+++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 457
+\lyxformat 458
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
index 1f63c36355a68cf98b12e49668f60a3530374a12..d9a36a914aa59cfe9c3b9152f0d609b5098def67 100644 (file)
--- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
+++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 457
+\lyxformat 458
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx
index 93d652691f5c4317188a1e2853b611ee13bd96c5..a7bb68915c9d4b6f177fb490f6db046dfdbd95b1 100644 (file)
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 457
+\lyxformat 458
 \begin_document
 \begin_header
 \textclass article
@@ -1345,7 +1345,7 @@ kill
 \end_inset
 
  
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 
@@ -1426,7 +1426,7 @@ Second
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 
@@ -3338,7 +3338,7 @@ LyX
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 A long table
@@ -3363,7 +3363,7 @@ A long table
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 A long table -- continued
@@ -4348,7 +4348,7 @@ status open
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 

diff --git a/src/tex2lyx/test/test-modules.lyx.lyx b/src/tex2lyx/test/test-modules.lyx.lyx
index 8f3300221cfc2bb236c91cc834c8526a390b075b..4895c7abf0487e7f0aa117d06bc14cc17d7b0e51 100644 (file)
--- a/src/tex2lyx/test/test-modules.lyx.lyx
+++ b/src/tex2lyx/test/test-modules.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 457
+\lyxformat 458
 \begin_document
 \begin_header
 \textclass amsart

diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx
index a7b04b3783675fd6a0bcb292d0cde1e54085dffb..11ec5d26085145378cd0e19afd4fd0855658a358 100644 (file)
--- a/src/tex2lyx/test/test-structure.lyx.lyx
+++ b/src/tex2lyx/test/test-structure.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 457
+\lyxformat 458
 \begin_document
 \begin_header
 \textclass article
@@ -244,7 +244,7 @@ status open
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
  
@@ -278,7 +278,7 @@ status open
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 
@@ -322,7 +322,7 @@ status open
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 rotated table, spanning all columns
@@ -431,7 +431,7 @@ fdgsdfdh
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 test1
@@ -468,7 +468,7 @@ fdgs
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 test2
@@ -500,7 +500,7 @@ status open
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 fdg
@@ -556,7 +556,7 @@ status open
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 lkälöä
@@ -580,7 +580,7 @@ klöä
 \end_layout
 
 \begin_layout Plain Layout
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 ölkälö
@@ -627,7 +627,7 @@ u%re 1
 \end_layout
 
 \begin_layout Plain Layout
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 te%st
@@ -662,7 +662,7 @@ subfigure 2ö
 \end_layout
 
 \begin_layout Plain Layout
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 
@@ -698,7 +698,7 @@ subfigure 3
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 figure caption

diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx
index a9bb1ec1317dc05cecb5af9f13ba73ccc8b9ab67..44d58d5b1ab59f9b17f40bb86474109f4f0ccc45 100644 (file)
--- a/src/tex2lyx/test/test.lyx.lyx
+++ b/src/tex2lyx/test/test.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 457
+\lyxformat 458
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index cdf274094b693ae71c80d6efb2eccee7bf4270d3..5df8ef255d1ae2c413dbcfd21304a2868d8cd49f 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -2786,7 +2786,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                        p.skip_spaces();
                        context.check_layout(os);
                        p.skip_spaces();
-                       begin_inset(os, "Caption\n");
+                       begin_inset(os, "Caption Standard\n");
                        Context newcontext(true, context.textclass, 0, 0, context.font);
                        newcontext.check_layout(os);
                        // FIXME InsetArgument is now properly implemented in InsetLayout
@@ -2838,7 +2838,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                                        // we must make sure that the caption gets a \begin_layout
                                        os << "\n\\begin_layout Plain Layout";
                                        p.skip_spaces();
-                                       begin_inset(os, "Caption\n");
+                                       begin_inset(os, "Caption Standard\n");
                                        Context newcontext(true, context.textclass,
                                                           0, 0, context.font);
                                        newcontext.check_layout(os);