Hi all,
while playing with beta4, my private layout modules broke :-)
I took the freedom to create ticket #7298 and add following patch.
The bug is: in layout2layout at format 28 to 29 conversion, Flex
InsetLayout statements get renamed, but occurances of CopyStyle do not
get rewritten.
Attached patch should fix this and will help users to migrate from 1.6 to 2.0.
Cheers,
/p
Index: lib/scripts/layout2layout.py
===================================================================
--- lib/scripts/layout2layout.py (revision 37640)
+++ lib/scripts/layout2layout.py (working copy)
@@ -210,6 +210,8 @@
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 @@
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
