Fix bug #7298. Patch from Patrick Atamaniuk. Thanks!

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37644 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py
index 647a7fb47ada4fcb75675ca2b3168b0fc7d414cb..a36438eb950bf6f148c087e7c404833497c32094 100644 (file)
--- a/lib/scripts/layout2layout.py
+++ b/lib/scripts/layout2layout.py
@@ -210,6 +210,8 @@ def convert(lines):
     re_InsetLayout = re.compile(r'^\s*InsetLayout\s+(?:Custom|CharStyle|Element):(\S+)\s*$')
     # with quotes
     re_QInsetLayout = re.compile(r'^\s*InsetLayout\s+"(?:Custom|CharStyle|Element):([^"]+)"\s*$')
+    re_InsetLayout_CopyStyle = re.compile(r'^\s*CopyStyle\s+(?:Custom|CharStyle|Element):(\S+)\s*$')
+    re_QInsetLayout_CopyStyle = re.compile(r'^\s*CopyStyle\s+"(?:Custom|CharStyle|Element):([^"]+)"\s*$')
     re_NeedsFloatPkg = re.compile(r'^(\s*)NeedsFloatPkg\s+(\w+)\s*$')
 
     # counters for sectioning styles (hardcoded in 1.3)
@@ -326,6 +328,14 @@ def convert(lines):
             match = re_QInsetLayout.match(lines[i])
             if match:
               lines[i] = "InsetLayout \"Flex:" + match.group(1) + "\""
+            else:
+              match = re_InsetLayout_CopyStyle.match(lines[i])
+              if match:
+                lines[i] = "\tCopyStyle Flex:" + match.group(1)
+              else:
+                match = re_QInsetLayout_CopyStyle.match(lines[i])
+                if match:
+                  lines[i] = "\tCopyStyle \"Flex:" + match.group(1) + "\""
           i += 1
           continue