anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix layout2layout conversion for format 40. This is a big ugly,

Browse Source 
I'm afraid, but it's going to be. We skip all comment lines at
the start of the script, but what we want to convert here is in
those comment lines. My previous attempt to deal with this issue
produced an invalid file.
This commit is contained in:
Richard Heck 2012-10-12 09:49:10 -04:00
parent 47673f560f
commit b5e2fd7bb7
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/scripts/layout2layout.py
View File

@ -296,10 +296,21 @@ def convert(lines):
flexstyles = []
while i < len(lines):
# Skip comments and empty lines, but not if it's the declaration
# line (we'll deal with it below)
if (re_Comment.match(lines[i]) or re_Empty.match(lines[i])) \
and not re_Declaration.match(lines[i]):
# Skip comments and empty lines
if (re_Comment.match(lines[i]) or re_Empty.match(lines[i])):
# We need to deal with this conversion here, because it happens
# inside the initial comment block.
if only_comment and format == 39:
match = re_ExtractCategory.match(lines[i])
if match:
lpre = match.group(1)
lcat = match.group(2)
lnam = match.group(3)
if lcat in ConvDict:
lcat = ConvDict[lcat]
lines[i] = lpre + "{" + lnam + "}"
lines.insert(i+1, "# \\DeclareCategory{" + lcat + "}")
i += 1
i += 1
continue
@ -340,16 +351,6 @@ def convert(lines):
continue
if format == 39:
match = re_ExtractCategory.match(lines[i])
if match:
lpre = match.group(1)
lcat = match.group(2)
lnam = match.group(3)
if lcat in ConvDict:
lcat = ConvDict[lcat]
lines[i] = lpre + "{" + lnam + "}"
lines.insert(i+1, "# \\DeclareCategory{" + lcat + "}")
i += 1
i += 1
continue