return find_end_of(lines, i, "\\begin_inset", "\\end_inset")
+def find_end_of_layout(lines, i):
+ " Find end of layout, where lines[i] is included."
+ return find_end_of(lines, i, "\\begin_layout", "\\end_layout")
+
+
# Note that text can be either a list of lines or a single line.
def add_to_preamble(document, text):
""" Add text to the preamble if it is not already there.
line = "\\,"
elif hspace != "":
# The LyX length is in line[8:], after the \length keyword
- # latex_length returns "bool,length"
- length = latex_length(line[8:]).split(",")[1]
+ length = latex_length(line[8:])[1]
line = hspace + "{" + length + "}"
hspace = ""
elif line.isspace() or \
return content
-def latex_length(string):
- 'Convert lengths to their LaTeX representation.'
+def latex_length(slen):
+ '''
+ Convert lengths to their LaTeX representation. Returns (bool, length),
+ where the bool tells us if it was a percentage, and the length is the
+ LaTeX representation.
+ '''
i = 0
percent = False
- # the string has the form
+ # the slen has the form
# ValueUnit+ValueUnit-ValueUnit or
# ValueUnit+-ValueUnit
# the + and - (glue lengths) are optional
"page%":"\\paperwidth", "line%":"\\linewidth",
"theight%":"\\textheight", "pheight%":"\\paperheight"}
for unit in units.keys():
- i = string.find(unit)
- if i != -1:
- percent = True
- minus = string.rfind("-", 1, i)
- plus = string.rfind("+", 0, i)
- latex_unit = units[unit]
- if plus == -1 and minus == -1:
- value = string[:i]
- value = str(float(value)/100)
- end = string[i + len(unit):]
- string = value + latex_unit + end
- if plus > minus:
- value = string[plus + 1:i]
- value = str(float(value)/100)
- begin = string[:plus + 1]
- end = string[i+len(unit):]
- string = begin + value + latex_unit + end
- if plus < minus:
- value = string[minus + 1:i]
- value = str(float(value)/100)
- begin = string[:minus + 1]
- string = begin + value + latex_unit
+ i = slen.find(unit)
+ if i == -1:
+ continue
+ percent = True
+ minus = slen.rfind("-", 1, i)
+ plus = slen.rfind("+", 0, i)
+ latex_unit = units[unit]
+ if plus == -1 and minus == -1:
+ value = slen[:i]
+ value = str(float(value)/100)
+ end = slen[i + len(unit):]
+ slen = value + latex_unit + end
+ if plus > minus:
+ value = slen[plus + 1:i]
+ value = str(float(value)/100)
+ begin = slen[:plus + 1]
+ end = slen[i+len(unit):]
+ slen = begin + value + latex_unit + end
+ if plus < minus:
+ value = slen[minus + 1:i]
+ value = str(float(value)/100)
+ begin = slen[:minus + 1]
+ slen = begin + value + latex_unit
# replace + and -, but only if the - is not the first character
- string = string[0] + string[1:].replace("+", " plus ").replace("-", " minus ")
+ slen = slen[0] + slen[1:].replace("+", " plus ").replace("-", " minus ")
# handle the case where "+-1mm" was used, because LaTeX only understands
# "plus 1mm minus 1mm"
- if string.find("plus minus"):
- lastvaluepos = string.rfind(" ")
- lastvalue = string[lastvaluepos:]
- string = string.replace(" ", lastvalue + " ")
- if percent == False:
- return "False," + string
- else:
- return "True," + string
+ if slen.find("plus minus"):
+ lastvaluepos = slen.rfind(" ")
+ lastvalue = slen[lastvaluepos:]
+ slen = slen.replace(" ", lastvalue + " ")
+ return (percent, slen)
def revert_flex_inset(document, name, LaTeXname, position):
i += 1
-def revert_charstyles(document, name, LaTeXname, changed):
- " Reverts character styles to TeX code "
+def revert_font_attrs(document, name, LaTeXname):
+ " Reverts font changes to TeX code "
i = 0
+ changed = False
while True:
i = find_token(document.body, name + ' on', i)
if i == -1:
end = find_end_of_inset(document.body, i)
if end == -1:
document.warning("Can't find end of inset at line " + str(i))
- i = j
+ i += 1
continue
fline = find_token(document.body, "<features", i, end)
if fline == -1:
document.warning("Can't find features for inset at line " + str(i))
- i = end
+ i += 1
continue
p = document.body[fline].find("islongtable")
if p != -1:
# This seems wrong: It removes everything after
# tabularvalignment, too.
document.body[fline] = document.body[fline][:q - 1] + '>'
- i = end
+ i += 1
continue
# no longtable
'',
'\\begin_layout Plain Layout']
document.body[i:i] = subst # this just inserts the array at i
- i = end + len(subst) # adjust i to save a few cycles
+ # since there could be a tabular inside a tabular, we cannot
+ # jump to end
+ i += len(subst)
def revert_phantom_types(document, ptype, cmd):
i = find_token(document.header, "\\backgroundcolor", 0)
if i == -1:
return
- colorcode = get_value(document.header, '\\backgroundcolor', 0)
+ colorcode = get_value(document.header, '\\backgroundcolor', i)
del document.header[i]
# don't clutter the preamble if backgroundcolor is not set
if colorcode == "#ffffff":
return
indices = get_value(document.header, "\\use_indices", i)
preamble = ""
- if indices == "true":
+ useindices = (indices == "true")
+ if useindices:
preamble += "\\usepackage{splitidx}\n"
del document.header[i]
+
+ # deal with index declarations in the preamble
i = 0
while True:
i = find_token(document.header, "\\index", i)
if k == -1:
document.warning("Malformed LyX document: Missing \\end_index.")
return
- line = document.header[i]
- l = re.compile(r'\\index (.*)$')
- m = l.match(line)
- iname = m.group(1)
- ishortcut = get_value(document.header, '\\shortcut', i, k)
- if ishortcut != "" and indices == "true":
- preamble += "\\newindex[" + iname + "]{" + ishortcut + "}\n"
+ if useindices:
+ line = document.header[i]
+ l = re.compile(r'\\index (.*)$')
+ m = l.match(line)
+ iname = m.group(1)
+ ishortcut = get_value(document.header, '\\shortcut', i, k)
+ if ishortcut != "":
+ preamble += "\\newindex[" + iname + "]{" + ishortcut + "}\n"
del document.header[i:k + 1]
- i = 0
if preamble != "":
insert_to_preamble(0, document, preamble)
+
+ # deal with index insets
+ # these need to have the argument removed
i = 0
while True:
i = find_token(document.body, "\\begin_inset Index", i)
else:
k = find_end_of_inset(document.body, i)
if k == -1:
- return
+ document.warning("Can't find end of index inset!")
+ i += 1
+ continue
content = lyx2latex(document, document.body[i:k])
# escape quotes
content = content.replace('"', r'\"')
- subst = [old_put_cmd_in_ert("\\sindex[" + itype + "]{" + content + "}")]
+ subst = put_cmd_in_ert("\\sindex[" + itype + "]{" + content + "}")
document.body[i:k + 1] = subst
i = i + 1
+
+ # deal with index_print insets
i = 0
while True:
i = find_token(document.body, "\\begin_inset CommandInset index_print", i)
if ptype == "idx":
j = find_token(document.body, "type", i, k)
del document.body[j]
- elif indices == "false":
+ elif not useindices:
del document.body[i:k + 1]
else:
- subst = [old_put_cmd_in_ert("\\printindex[" + ptype + "]{}")]
+ subst = put_cmd_in_ert("\\printindex[" + ptype + "]{}")
document.body[i:k + 1] = subst
i = i + 1
document.warning("Malformed LyX document: Missing \\use_indices.")
return
indices = get_value(document.header, "\\use_indices", i)
+ useindices = (indices == "true")
i = 0
while True:
i = find_token(document.body, "\\begin_inset CommandInset index_print", i)
k = find_end_of_inset(document.body, i)
ctype = get_value(document.body, 'LatexCommand', i, k)
if ctype != "printsubindex":
- i = i + 1
+ i = k + 1
continue
ptype = get_value(document.body, 'type', i, k).strip('"')
- if indices == "false":
+ if not useindices:
del document.body[i:k + 1]
else:
- subst = [old_put_cmd_in_ert("\\printsubindex[" + ptype + "]{}")]
+ subst = put_cmd_in_ert("\\printsubindex[" + ptype + "]{}")
document.body[i:k + 1] = subst
i = i + 1
document.warning("Malformed LyX document: Missing \\use_indices.")
return
indices = get_value(document.header, "\\use_indices", i)
+ useindices = (indices == "true")
i = 0
while True:
i = find_token(document.body, "\\begin_inset CommandInset index_print", i)
k = find_end_of_inset(document.body, i)
ctype = get_value(document.body, 'LatexCommand', i, k)
if ctype != "printindex*" and ctype != "printsubindex*":
- i = i + 1
+ i = k
continue
- if indices == "false":
+ if not useindices:
del document.body[i:k + 1]
else:
- subst = [old_put_cmd_in_ert("\\" + ctype + "{}")]
+ subst = put_cmd_in_ert("\\" + ctype + "{}")
document.body[i:k + 1] = subst
i = i + 1
def revert_strikeout(document):
- " Reverts \\strikeout character style "
- changed = False
- changed = revert_charstyles(document, "\\uuline", "\\uuline", changed)
- changed = revert_charstyles(document, "\\uwave", "\\uwave", changed)
- changed = revert_charstyles(document, "\\strikeout", "\\sout", changed)
+ " Reverts \\strikeout font attribute "
+ changed = revert_font_attrs(document, "\\uuline", "\\uuline")
+ changed = revert_font_attrs(document, "\\uwave", "\\uwave") or changed
+ changed = revert_font_attrs(document, "\\strikeout", "\\sout") or changed
if changed == True:
insert_to_preamble(0, document,
'% Commands inserted by lyx2lyx for proper underlining\n'
def revert_ulinelatex(document):
- " Reverts \\uline character style "
+ " Reverts \\uline font attribute "
i = find_token(document.body, '\\bar under', 0)
if i == -1:
return
i = find_token(document.header, '\\bibtex_command', 0)
if i == -1:
document.warning("Malformed LyX document: Missing \\bibtex_command.")
- return
- del document.header[i]
+ else:
+ del document.header[i]
i = find_token(document.header, '\\index_command', 0)
if i == -1:
document.warning("Malformed LyX document: Missing \\index_command.")
- return
- del document.header[i]
+ else:
+ del document.header[i]
def convert_nomencl_width(document):
i = j
continue
del document.body[l]
- i = i + 1
+ i = j - 1
def revert_nomencl_cwidth(document):
j = find_end_of_inset(document.body, i)
l = find_token(document.body, "width", i, j)
if l == -1:
- #Can't find width option for nomencl_print
- i = j
- continue
+ document.warning("Can't find width option for nomencl_print!")
+ i = j
+ continue
width = get_value(document.body, "width", i, j).strip('"')
del document.body[l]
add_to_preamble(document, ["% this command was inserted by lyx2lyx"])
add_to_preamble(document, ["\\setlength{\\nomlabelwidth}{" + width + "}"])
- i = i + 1
+ i = j - 1
def revert_applemac(document):
" Revert applemac encoding to auto "
- i = 0
- if document.encoding == "applemac":
- document.encoding = "auto"
- i = find_token(document.header, "\\encoding", 0)
- if i != -1:
- document.header[i] = "\\encoding auto"
+ if document.encoding != "applemac":
+ return
+ document.encoding = "auto"
+ i = find_token(document.header, "\\encoding", 0)
+ if i != -1:
+ document.header[i] = "\\encoding auto"
def revert_longtable_align(document):
" Remove longtable alignment setting "
i = 0
- j = 0
while True:
i = find_token(document.body, "\\begin_inset Tabular", i)
if i == -1:
break
- # the alignment is 2 lines below \\begin_inset Tabular
- j = document.body[i + 2].find("longtabularalignment")
+ end = find_end_of_inset(document.body, i)
+ if end == -1:
+ document.warning("Can't find end of inset at line " + str(i))
+ i += 1
+ continue
+ fline = find_token(document.body, "<features", i, end)
+ if fline == -1:
+ document.warning("Can't find features for inset at line " + str(i))
+ i += 1
+ continue
+ j = document.body[fline].find("longtabularalignment")
if j == -1:
- break
- document.body[i + 2] = document.body[i + 2][:j - 1]
- document.body[i + 2] = document.body[i + 2] + '>'
- i = i + 1
+ i += 1
+ continue
+ # FIXME Is this correct? It wipes out everything after the
+ # one we found.
+ document.body[fline] = document.body[fline][:j - 1] + '>'
+ # since there could be a tabular inside this one, we
+ # cannot jump to end.
+ i += 1
def revert_branch_filename(document):
def revert_paragraph_indentation(document):
" Revert custom paragraph indentation to preamble code "
- i = 0
- while True:
- i = find_token(document.header, "\\paragraph_indentation", i)
- if i == -1:
- break
- # only remove the preamble line if default
- # otherwise also write the value to the preamble
- length = get_value(document.header, "\\paragraph_indentation", i)
- if length == "default":
- del document.header[i]
- break
- else:
- # handle percent lengths
- # latex_length returns "bool,length"
- length = latex_length(length).split(",")[1]
- add_to_preamble(document, ["% this command was inserted by lyx2lyx"])
- add_to_preamble(document, ["\\setlength{\\parindent}{" + length + "}"])
- del document.header[i]
- i = i + 1
+ i = find_token(document.header, "\\paragraph_indentation", 0)
+ if i == -1:
+ return
+ length = get_value(document.header, "\\paragraph_indentation", i)
+ # we need only remove the line if indentation is default
+ if length != "default":
+ # handle percent lengths
+ length = latex_length(length)[1]
+ add_to_preamble(document, ["% this command was inserted by lyx2lyx"])
+ add_to_preamble(document, ["\\setlength{\\parindent}{" + length + "}"])
+ del document.header[i]
def revert_percent_skip_lengths(document):
" Revert relative lengths for paragraph skip separation to preamble code "
- i = 0
- while True:
- i = find_token(document.header, "\\defskip", i)
- if i == -1:
- break
- length = get_value(document.header, "\\defskip", i)
- # only revert when a custom length was set and when
- # it used a percent length
- if length not in ('smallskip', 'medskip', 'bigskip'):
- # handle percent lengths
- length = latex_length(length)
- # latex_length returns "bool,length"
- percent = length.split(",")[0]
- length = length.split(",")[1]
- if percent == "True":
- add_to_preamble(document, ["% this command was inserted by lyx2lyx"])
- add_to_preamble(document, ["\\setlength{\\parskip}{" + length + "}"])
- # set defskip to medskip as default
- document.header[i] = "\\defskip medskip"
- i = i + 1
+ i = find_token(document.header, "\\defskip", 0)
+ if i == -1:
+ return
+ length = get_value(document.header, "\\defskip", i)
+ # only revert when a custom length was set and when
+ # it used a percent length
+ if length in ('smallskip', 'medskip', 'bigskip'):
+ return
+ # handle percent lengths
+ percent, length = latex_length(length)
+ if percent == "True":
+ add_to_preamble(document, ["% this command was inserted by lyx2lyx"])
+ add_to_preamble(document, ["\\setlength{\\parskip}{" + length + "}"])
+ # set defskip to medskip as default
+ document.header[i] = "\\defskip medskip"
def revert_percent_vspace_lengths(document):
break
# only revert if a custom length was set and if
# it used a percent length
- line = document.body[i]
r = re.compile(r'\\begin_inset VSpace (.*)$')
- m = r.match(line)
+ m = r.match(document.body[i])
length = m.group(1)
- if length not in ('defskip', 'smallskip', 'medskip', 'bigskip', 'vfill'):
- # check if the space has a star (protected space)
- protected = (document.body[i].rfind("*") != -1)
+ if length in ('defskip', 'smallskip', 'medskip', 'bigskip', 'vfill'):
+ i += 1
+ continue
+ # check if the space has a star (protected space)
+ protected = (document.body[i].rfind("*") != -1)
+ if protected:
+ length = length.rstrip('*')
+ # handle percent lengths
+ percent, length = latex_length(length)
+ # revert the VSpace inset to ERT
+ if percent == "True":
if protected:
- length = length.rstrip('*')
- # handle percent lengths
- length = latex_length(length)
- # latex_length returns "bool,length"
- percent = length.split(",")[0]
- length = length.split(",")[1]
- # revert the VSpace inset to ERT
- if percent == "True":
- if protected:
- subst = [old_put_cmd_in_ert("\\vspace*{" + length + "}")]
- else:
- subst = [old_put_cmd_in_ert("\\vspace{" + length + "}")]
- document.body[i:i + 2] = subst
- i = i + 1
+ subst = put_cmd_in_ert("\\vspace*{" + length + "}")
+ else:
+ subst = put_cmd_in_ert("\\vspace{" + length + "}")
+ document.body[i:i + 2] = subst
+ i += 1
def revert_percent_hspace_lengths(document):
i = find_token(document.body, "\\begin_inset space \\hspace", i)
if i == -1:
break
- protected = (document.body[i].find("\\hspace*{}") != -1)
- # only revert if a custom length was set and if
- # it used a percent length
- length = get_value(document.body, '\\length', i + 1)
+ j = find_end_of_inset(document.body, i)
+ if j == -1:
+ document.warning("Can't find end of inset at line " + str(i))
+ i += 1
+ continue
+ # only revert if a custom length was set...
+ length = get_value(document.body, '\\length', i + 1, j)
if length == '':
document.warning("Malformed lyx document: Missing '\\length' in Space inset.")
- return
- # handle percent lengths
- length = latex_length(length)
- # latex_length returns "bool,length"
- percent = length.split(",")[0]
- length = length.split(",")[1]
+ i = j
+ continue
+ protected = ""
+ if document.body[i].find("\\hspace*{}") != -1:
+ protected = "*"
+ # ...and if it used a percent length
+ percent, length = latex_length(length)
# revert the HSpace inset to ERT
if percent == "True":
- if protected:
- subst = [old_put_cmd_in_ert("\\hspace*{" + length + "}")]
- else:
- subst = [old_put_cmd_in_ert("\\hspace{" + length + "}")]
- document.body[i:i + 3] = subst
- i = i + 2
+ subst = put_cmd_in_ert("\\hspace" + protected + "{" + length + "}")
+ document.body[i:j + 1] = subst
+ # if we did a substitution, this will still be ok
+ i = j
def revert_hspace_glue_lengths(document):
i = find_token(document.body, "\\begin_inset space \\hspace", i)
if i == -1:
break
- protected = (document.body[i].find("\\hspace*{}") != -1)
- length = get_value(document.body, '\\length', i + 1)
+ j = find_end_of_inset(document.body, i)
+ if j == -1:
+ document.warning("Can't find end of inset at line " + str(i))
+ i += 1
+ continue
+ length = get_value(document.body, '\\length', i + 1, j)
if length == '':
document.warning("Malformed lyx document: Missing '\\length' in Space inset.")
- return
+ i = j
+ continue
+ protected = ""
+ if document.body[i].find("\\hspace*{}") != -1:
+ protected = "*"
# only revert if the length contains a plus or minus at pos != 0
- glue = re.compile(r'.+[\+-]')
- if glue.search(length):
+ if length.find('-',1) != -1 or length.find('+',1) != -1:
# handle percent lengths
- # latex_length returns "bool,length"
- length = latex_length(length).split(",")[1]
+ length = latex_length(length)[1]
# revert the HSpace inset to ERT
- if protected:
- subst = [old_put_cmd_in_ert("\\hspace*{" + length + "}")]
- else:
- subst = [old_put_cmd_in_ert("\\hspace{" + length + "}")]
- document.body[i:i + 3] = subst
- i = i + 2
+ subst = put_cmd_in_ert("\\hspace" + protected + "{" + length + "}")
+ document.body[i:j+1] = subst
+ i = j
+
def convert_author_id(document):
" Add the author_id to the \\author definition and make sure 0 is not used"
i = 0
- j = 1
+ anum = 1
+ re_author = re.compile(r'(\\author) (\".*\")\s*(.*)$')
+
while True:
i = find_token(document.header, "\\author", i)
if i == -1:
break
-
- r = re.compile(r'(\\author) (\".*\")\s?(.*)$')
- m = r.match(document.header[i])
- if m != None:
+ m = re_author.match(document.header[i])
+ if m:
name = m.group(2)
-
- email = ''
- if m.lastindex == 3:
- email = m.group(3)
- document.header[i] = "\\author %i %s %s" % (j, name, email)
- j = j + 1
- i = i + 1
+ email = m.group(3)
+ document.header[i] = "\\author %i %s %s" % (anum, name, email)
+ # FIXME Should this really be incremented if we didn't match?
+ anum += 1
+ i += 1
- k = 0
+ i = 0
while True:
- k = find_token(document.body, "\\change_", k)
- if k == -1:
+ i = find_token(document.body, "\\change_", i)
+ if i == -1:
break
-
- change = document.body[k].split(' ');
+ change = document.body[i].split(' ');
if len(change) == 3:
type = change[0]
author_id = int(change[1])
time = change[2]
- document.body[k] = "%s %i %s" % (type, author_id + 1, time)
- k = k + 1
+ document.body[i] = "%s %i %s" % (type, author_id + 1, time)
+ i += 1
+
def revert_author_id(document):
" Remove the author_id from the \\author definition "
i = 0
- j = 0
+ anum = 0
+ rx = re.compile(r'(\\author)\s+(\d+)\s+(\".*\")\s*(.*)$')
idmap = dict()
+
while True:
i = find_token(document.header, "\\author", i)
if i == -1:
break
-
- r = re.compile(r'(\\author) (\d+) (\".*\")\s?(.*)$')
- m = r.match(document.header[i])
- if m != None:
+ m = rx.match(document.header[i])
+ if m:
author_id = int(m.group(2))
- idmap[author_id] = j
+ idmap[author_id] = anum
name = m.group(3)
-
- email = ''
- if m.lastindex == 4:
- email = m.group(4)
+ email = m.group(4)
document.header[i] = "\\author %s %s" % (name, email)
- i = i + 1
- j = j + 1
+ i += 1
+ # FIXME Should this be incremented if we didn't match?
+ anum += 1
- k = 0
+ i = 0
while True:
- k = find_token(document.body, "\\change_", k)
- if k == -1:
+ i = find_token(document.body, "\\change_", i)
+ if i == -1:
break
-
- change = document.body[k].split(' ');
+ change = document.body[i].split(' ');
if len(change) == 3:
type = change[0]
author_id = int(change[1])
time = change[2]
- document.body[k] = "%s %i %s" % (type, idmap[author_id], time)
- k = k + 1
+ document.body[i] = "%s %i %s" % (type, idmap[author_id], time)
+ i += 1
def revert_suppress_date(document):
" Revert suppressing of default document date to preamble code "
- i = 0
- while True:
- i = find_token(document.header, "\\suppress_date", i)
- if i == -1:
- break
- # remove the preamble line and write to the preamble
- # when suppress_date was true
- date = get_value(document.header, "\\suppress_date", i)
- if date == "true":
- add_to_preamble(document, ["% this command was inserted by lyx2lyx"])
- add_to_preamble(document, ["\\date{}"])
- del document.header[i]
- i = i + 1
+ i = find_token(document.header, "\\suppress_date", 0)
+ if i == -1:
+ return
+ # remove the preamble line and write to the preamble
+ # when suppress_date was true
+ date = get_value(document.header, "\\suppress_date", i)
+ if date == "true":
+ add_to_preamble(document, ["% this command was inserted by lyx2lyx"])
+ add_to_preamble(document, ["\\date{}"])
+ del document.header[i]
def revert_mhchem(document):
"Revert mhchem loading to preamble code"
- i = 0
- j = 0
- k = 0
+
mhchem = "off"
- i = find_token(document.header, "\\use_mhchem 1", 0)
- if i != -1:
+ i = find_token(document.header, "\\use_mhchem", 0)
+ if i == -1:
+ document.warning("Malformed LyX document: Could not find mhchem setting.")
mhchem = "auto"
else:
- i = find_token(document.header, "\\use_mhchem 2", 0)
- if i != -1:
+ val = get_value(document.header, "\\use_mhchem", i)
+ if val == "1":
+ mhchem = "auto"
+ elif val == "2":
mhchem = "on"
+ del document.header[i]
+
if mhchem == "auto":
- j = find_token(document.body, "\\cf{", 0)
- if j != -1:
- mhchem = "on"
- else:
- j = find_token(document.body, "\\ce{", 0)
- if j != -1:
- mhchem = "on"
+ i = 0
+ while True:
+ i = find_token(document.body, "\\begin_inset Formula", i)
+ line = document.body[i]
+ if line.find("\\ce{") != -1 or line.find("\\cf{") != 1:
+ mhchem = "on"
+ break
+
if mhchem == "on":
- add_to_preamble(document, ["% this command was inserted by lyx2lyx"])
- add_to_preamble(document, ["\\PassOptionsToPackage{version=3}{mhchem}"])
- add_to_preamble(document, ["\\usepackage{mhchem}"])
- k = find_token(document.header, "\\use_mhchem", 0)
- if k == -1:
- document.warning("Malformed LyX document: Could not find mhchem setting.")
- return
- del document.header[k]
+ pre = ["% lyx2lyx mhchem commands",
+ "\\PassOptionsToPackage{version=3}{mhchem}",
+ "\\usepackage{mhchem}"]
+ add_to_preamble(document, pre)
def revert_fontenc(document):
return
j = find_end_of(document.header, i, "\\begin_includeonly", "\\end_includeonly")
if j == -1:
- # this should not happen
+ document.warning("Unable to find end of includeonly section!!")
break
document.header[i : j + 1] = []
multirow = True
# remove the multirow tag, set the valignment to top
# and remove the bottom line
+ # FIXME Are we sure these always have space around them?
document.body[i] = document.body[i].replace(' multirow="3" ', ' ')
document.body[i] = document.body[i].replace('valignment="middle"', 'valignment="top"')
document.body[i] = document.body[i].replace(' bottomline="true" ', ' ')
# write ERT to create the multirow cell
# use 2 rows and 2cm as default with because the multirow span
# and the column width is only hardly accessible
- subst = [old_put_cmd_in_ert("\\multirow{2}{2cm}{")]
- document.body[i + 4:i + 4] = subst
- i = find_token(document.body, "</cell>", i)
- if i == -1:
- document.warning("Malformed LyX document: Could not find end of tabular cell.")
- break
- subst = [old_put_cmd_in_ert("}")]
- document.body[i - 3:i - 3] = subst
- # cell type 4 is multirow part cell
- i = find_token(document.body, '<cell multirow="4"', i)
- if i == -1:
- break
- # remove the multirow tag, set the valignment to top
- # and remove the top line
- document.body[i] = document.body[i].replace(' multirow="4" ', ' ')
- document.body[i] = document.body[i].replace('valignment="middle"', 'valignment="top"')
- document.body[i] = document.body[i].replace(' topline="true" ', ' ')
- i = i + 1
+ cend = find_token(document.body, "</cell>", i)
+ if cend == -1:
+ document.warning("Malformed LyX document: Could not find end of tabular cell.")
+ i += 1
+ continue
+ blay = find_token(document.body, "\\begin_layout", i, cend)
+ if blay == -1:
+ document.warning("Can't find layout for cell!")
+ i = j
+ continue
+ bend = find_end_of_layout(document.body, blay)
+ if blay == -1:
+ document.warning("Can't find end of layout for cell!")
+ i = cend
+ continue
+
+ # do the later one first, so as not to mess up the numbering
+ # we are wrapping the whole cell in this ert
+ # so before the end of the layout...
+ document.body[bend:bend] = put_cmd_in_ert("}")
+ # ...and after the beginning
+ document.body[blay+1:blay+1] = put_cmd_in_ert("\\multirow{2}{2cm}{")
+
+ while True:
+ # cell type 4 is multirow part cell
+ k = find_token(document.body, '<cell multirow="4"', cend)
+ if k == -1:
+ break
+ # remove the multirow tag, set the valignment to top
+ # and remove the top line
+ # FIXME Are we sure these always have space around them?
+ document.body[k] = document.body[k].replace(' multirow="4" ', ' ')
+ document.body[k] = document.body[k].replace('valignment="middle"', 'valignment="top"')
+ document.body[k] = document.body[k].replace(' topline="true" ', ' ')
+ k += 1
+ # this will always be ok
+ i = cend
+
if multirow == True:
- add_to_preamble(document, ["% this command was inserted by lyx2lyx"])
- add_to_preamble(document, ["\\usepackage{multirow}"])
+ add_to_preamble(document,
+ ["% lyx2lyx multirow additions ", "\\usepackage{multirow}"])
def convert_math_output(document):
length = document.body[l][7:]
# remove trailing '"'
length = length[:-1]
- # latex_length returns "bool,length"
- length = latex_length(length).split(",")[1]
+ length = latex_length(length)[1]
subst = "\\makebox[" + length + "][" \
+ align + "]{"
document.body[i:y + 1] = put_cmd_in_ert(subst)
projects / lyx.git / blobdiff