Fix copy-paste error.

(cherry picked from commit 305d449a47bf54d4f8ec594b0d1a2b5cf070c30b)

diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index f56d3adbc8e07b090410d0e3c03ba9b437be0f0f..6e7d8266baf8bf14ee9caba4e558500cf03cd295 100644 (file)
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -3670,7 +3670,7 @@ def convert_captionlayouts(document):
 
             document.body[j:j] = ["\\end_layout", "", "\\end_inset", "", ""]
             document.body[i:i+1] = ["\\begin_layout %s" % document.default_layout,
-                                    "\\begin_inset Caption %s" % caption_dict[val], "",
+                                    "\\begin_inset Caption %s" % caption_dict[captype], "",
                                     "\\begin_layout %s" % document.default_layout]
         i += 1
 

diff --git a/status.23x b/status.23x
index 1d6f7f4e78e651377311d8b11d15f2fc84a75232..77f72af5985a90d2fb6d6db9d39317af90f95559 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -100,6 +100,8 @@ What's new
 
 - Do not mark the import converters for Sweave and knitr as needauth.
 
+- Fix conversion of captions from LyX 2.0 documents.
+
 
 
 * USER INTERFACE