i = find_re(lines, lyxtable_re, i)
if i == -1:
break
+ prop_dict = {"family" : "default", "series" : "default",
+ "shape" : "default", "size" : "default",
+ "emph" : "default", "bar" : "default",
+ "noun" : "default", "latex" : "default", "color" : "default"}
+
# remove \LyXTable
lines[i] = lines[i][:-9]
i = i + 1
rows = int(head[0])
columns = int(head[1])
- lines[i] = '<LyXTabular version="1" rows="%s" columns="%s">' % (head[0],head[1])
+ tabular_line = i
i = i +1
- lines.insert(i, '<Features rotate="%s" islongtable="%s" endhead="0" endfirsthead="0" endfoot="0" endlastfoot="0">' % (head[2], head[3]))
+ lines.insert(i, '<Features rotate="%s" islongtable="%s" endhead="%s" endfirsthead="%s" endfoot="%s" endlastfoot="%s">' % (head[2],head[3],head[4],head[5],head[6],head[7]))
i = i +1
row_info = []
+ cont_row = []
for j in range(rows):
row_info.append(string.split(lines[i]))
+ if string.split(lines[i])[2] == '1':
+ cont_row.append(j)
del lines[i]
+
column_info = []
+ col_info_re = re.compile(r'(\d) (\d) (\d) (".*") (".*")')
for j in range(columns):
- column_info.append(string.split(lines[i]))
+ column_info.append(col_info_re.match(lines[i]).groups())
del lines[i]
cell_info = []
- cell_location = []
+ cell_col = []
ncells = 0
- l = 0
+ cell_re = re.compile(r'(\d) (\d) (\d) (\d) (\d) (\d) (\d) (".*") (".*")')
for j in range(rows):
- tmp = []
for k in range(columns):
- cell_info.append(string.split(lines[i]))
+ #add column location to read properties
+ cell_info.append(cell_re.match(lines[i]).groups())
+ cell_col.append(k)
if lines[i][0] != "2":
- tmp.append(l)
ncells = ncells + 1
del lines[i]
- l = l + 1
- cell_location.append(tmp)
-
- for j in range(rows):
- for k in cell_location[j]:
- sys.stderr.write("%d\t" % (k))
- sys.stderr.write("\n")
+ lines[tabular_line] = '<LyXTabular version="1" rows="%s" columns="%s">' % (rows-len(cont_row),columns)
del lines[i]
if not lines[i]:
del lines[i]
+ # Read cells
+ l = 0
+ cell_content = []
+ for j in range(rows):
+ cell_content.append([])
+
+ for j in range(rows):
+ for k in range(columns):
+ cell_content[j].append([])
+
+ for j in range(rows):
+ for k in range(columns):
+ m = j*columns + k
+ if cell_info[m][0] == '2':
+ continue
+
+ if l == ncells -1:
+ # the end variable refers to cell end, not to file end.
+ end = find_tokens(lines, ['\\layout','\\the_end','\\end_deeper','\\end_float'], i)
+ else:
+ end = find_token(lines, '\\newline', i)
+
+ if end == -1:
+ sys.stderr.write("Malformed lyx file\n")
+ sys.exit(1)
+
+ end = end - i
+ while end > 0:
+ cell_content[j][k].append(lines[i])
+ del lines[i]
+ end = end -1
+
+ if string.find(lines[i],'\\newline') != -1:
+ del lines[i]
+ l = l + 1
+
tmp = []
tmp.append("")
- l = 0
for j in range(rows):
- tmp.append('<Row topline="%s" bottomline="%s" newpage="%s">' % (row_info[j][0],row_info[j][1],row_info[j][2]))
+ if j in cont_row:
+ continue
+ tmp.append('<Row topline="%s" bottomline="%s" newpage="%s">' % (row_info[j][0],row_info[j][1],row_info[j][3]))
for k in range(columns):
if j:
else:
tmp.append('<Column alignment="%s" valignment="0" leftline="%s" rightline="%s" width=%s special=%s>' % (column_info[k][0],column_info[k][1], column_info[k][2], column_info[k][3], column_info[k][4]))
m = j*columns + k
- sys.stderr.write("%d\t%d\t%d\n" % (j,k,m))
- tmp.append('<Cell multicolumn="%s" alignment="%s" valignment="0" topline="%s" bottomline="%s" leftline="%s" rightline="%s" rotate="%s" usebox="0" width=%s special=%s>' % (cell_info[m][0],cell_info[m][1],cell_info[m][2],cell_info[m][3],cell_info[m][4],cell_info[m][5],cell_info[m][6],cell_info[m][7],cell_info[m][8]))
+
+ leftline = int(column_info[k][1])
+ if cell_info[m][0] == '1':
+ n = m + 1
+ while n < rows * columns - 1 and cell_info[n][0] == '2':
+ n = n + 1
+ rightline = int(column_info[cell_col[n-1]][2])
+ else:
+ # not a multicolumn main cell
+ rightline = int(column_info[k][2])
+
+ tmp.append('<Cell multicolumn="%s" alignment="%s" valignment="0" topline="%s" bottomline="%s" leftline="%d" rightline="%d" rotate="%s" usebox="%s" width=%s special=%s>' % (cell_info[m][0],cell_info[m][1],cell_info[m][2],cell_info[m][3],leftline,rightline,cell_info[m][5],cell_info[m][6],cell_info[m][7],cell_info[m][8]))
tmp.append('\\begin_inset Text')
tmp.append('')
tmp.append('\\layout Standard')
tmp.append('')
- if m not in cell_location[j]:
- tmp.append('\\end_inset ')
- tmp.append('</Cell>')
- tmp.append('</Column>')
- continue
-
- if l == ncells -1:
- end = find_tokens(lines, ['\\layout','\\the_end'], i)
- if end == -1:
- sys.stderr.write("Malformed lyx file\n")
- else:
- end = end - i
- paragraph = []
- while end > 0:
- paragraph.append(lines[i])
- del lines[i]
- end = end -1
- tmp.extend(set_paragraph_properties(paragraph))
- else:
+ if cell_info[m][0] != '2':
paragraph = []
- while lines[i] != '\\newline ':
- paragraph.append(lines[i])
- del lines[i]
- del lines[i]
- tmp.extend(set_paragraph_properties(paragraph))
+ if cell_info[m][4] == '1':
+ l = j
+ paragraph = paragraph + cell_content[j][k]
+ while cell_info[m][4] == '1':
+ m = m + columns
+ l = l + 1
+ paragraph = paragraph + cell_content[l][k]
+ else:
+ paragraph = cell_content[j][k]
+ tmp = tmp + set_paragraph_properties(paragraph, prop_dict)
tmp.append('\\end_inset ')
tmp.append('</Cell>')
tmp.append('</Column>')
- l = l + 1
tmp.append('</Row>')
tmp.append('</LyXTabular>')
tmp.append('')
tmp.append('\\end_inset ')
- tail = lines[i:]
- lines[i:] = []
- lines.extend(tmp)
- lines.extend(tail)
+ tmp.append('')
+ tmp.append('')
+ lines[i:i] = tmp
i = i + len(tmp)
prop_exp = re.compile(r"\\(\S*)\s*(\S*)")
-def set_paragraph_properties(lines):
+def set_paragraph_properties(lines, prop_dict):
# we need to preserve the order of options
properties = ["family","series","shape","size",
"emph","bar","noun","latex","color"]
- prop_value = {"family":"roman", "series" : "medium",
+ prop_value = {"family" : "default", "series" : "medium",
"shape" : "up", "size" : "normal",
"emph" : "off", "bar" : "no",
"noun" : "off", "latex" : "no_latex", "color" : "none"}
end = 0
i = 0
n = len(lines)
-
+
+ #skip empty lines
while i<n and lines[i] == "":
i = i + 1
start = i
+ #catch open char properties
while i<n and lines[i][:1] == "\\":
result = prop_exp.match(lines[i])
- sys.stderr.write(lines[i]+"\n")
+ # sys.stderr.write(lines[i]+"\n")
prop = result.group(1)
if prop not in properties:
- sys.stderr.write("Unknown property: %s\n" % (prop))
+ break
else:
- prop_value[prop] = result.group(2)
+ prop_dict[prop] = result.group(2)
i = i + 1
end = i
aux = []
+ insert = 0
for prop in properties:
- if prop == "color":
- aux.append("\\%s %s" % (prop, prop_value[prop]))
- elif prop == "family":
- if prop_value[prop] != "roman":
- aux.append("\\%s %s " % (prop, prop_value[prop]))
- else:
- aux.append("\\%s %s " % (prop, prop_value[prop]))
-
+ if prop_dict[prop] != 'default':
+ insert = 1
+ if prop == "color":
+ aux.append("\\%s %s" % (prop, prop_dict[prop]))
+ elif prop != "family" or prop_dict[prop] != "roman":
+ aux.append("\\%s %s " % (prop, prop_dict[prop]))
+
+ # remove final char properties
+ n = len(lines)
+ changed_prop = []
+
+ while n:
+ n = n - 1
+ if not lines[n]:
+ del lines[n]
+ continue
+
+ if lines[n][:1] == '\\':
+ result = prop_exp.match(lines[n])
+ prop = result.group(1)
+ if prop in properties:
+ changed_prop.append(prop)
+ prop_dict[prop] = result.group(2)
+ del lines[n]
+ continue
+
+ if check_token(lines[n],'\\end_inset'):
+ # ensure proper newlines after inset end
+ lines.append('')
+ lines.append('')
+ break
+
+ for line in lines[end:]:
+ if line[:1] == '\\':
+ result = prop_exp.match(line)
+ prop = result.group(1)
+ if prop in properties and prop not in changed_prop:
+ prop_dict[prop] = result.group(2)
+
+ if not lines[start:] and not lines[end:]:
+ return []
+
+ result = lines[:start] + aux[:] + lines[end:]
+ if insert and result[0] != '':
+ return [''] + result[:]
+
+ return result[:]
- return lines[:start] + aux[:] + lines[end:]
+def update_language(header):
+ i = find_token(header, "\\language", 0)
+ if i == -1:
+ # no language, should emit a warning
+ header.append('\\language english')
+ return
+ # This is the lyx behaviour: defaults to english
+ if string.split(header[i])[1] == 'default':
+ header[i] = '\\language english'
+ return
def convert(header,body):
- sys.stderr.write("%d\n" % len(body))
update_tabular(body)
- sys.stderr.write("%d\n" % len(body))
+ update_language(header)
if __name__ == "__main__":
pass
projects / lyx.git / blobdiff