mhchem = "on"
del document.header[i]
+ if mhchem == "off":
+ # don't load case
+ return
+
if mhchem == "auto":
i = 0
while True:
if i == -1:
break
line = document.body[i]
- if line.find("\\ce{") != -1 or line.find("\\cf{") != 1:
+ if line.find("\\ce{") != -1 or line.find("\\cf{") != -1:
mhchem = "on"
break
i += 1
" Load mathdots if used in the document "
mathdots = find_token(document.header, "\\use_mathdots" , 0)
- usedots = 1
if mathdots == -1:
document.warning("No \\usemathdots line. Assuming auto.")
else:
- del document.header[mathdots]
val = get_value(document.header, "\\use_mathdots", mathdots)
+ del document.header[mathdots]
try:
usedots = int(val)
except:
- document.warning("Invalid \\use_mathdots value: " + val)
+ document.warning("Invalid \\use_mathdots value: " + val + ". Assuming auto.")
# probably usedots has not been changed, but be safe.
usedots = 1
- if usedots == 0:
- # do not load case
- return
-
- if usedots == 2:
- # force load case
- add_to_preamble(["% lyx2lyx mathdots addition", "\\usepackage{mathdots}"])
- return
+ if usedots == 0:
+ # do not load case
+ return
+ if usedots == 2:
+ # force load case
+ add_to_preamble(["% lyx2lyx mathdots addition", "\\usepackage{mathdots}"])
+ return
# so we are in the auto case. we want to load mathdots if \iddots is used.
i = 0
def convert_rule(document):
- " Convert \\lyxline to CommandInset line "
+ " Convert \\lyxline to CommandInset line. "
i = 0
+
+ inset = ['\\begin_inset CommandInset line',
+ 'LatexCommand rule',
+ 'offset "0.5ex"',
+ 'width "100line%"',
+ 'height "1pt"', '',
+ '\\end_inset', '', '']
+
+ # if paragraphs are indented, we may have to unindent to get the
+ # line to be full-width.
+ indent = get_value(document.header, "\\paragraph_separation", 0)
+ have_indent = (indent == "indent")
+
while True:
i = find_token(document.body, "\\lyxline" , i)
if i == -1:
return
-
- j = find_token(document.body, "\\color" , i - 2)
- if j == i - 2:
- color = document.body[j] + '\n'
- else:
- color = ''
- k = find_token(document.body, "\\begin_layout Standard" , i - 4)
- # we need to handle the case that \lyxline is in a separate paragraph and that it is colored
- # the result is then an extra empty paragraph which we get by adding an empty ERT inset
- if k == i - 4 and j == i - 2 and document.body[i - 1] == '':
- layout = '\\begin_inset ERT\nstatus collapsed\n\n\\begin_layout Plain Layout\n\n\n\\end_layout\n\n\\end_inset\n' \
- + '\\end_layout\n\n' \
- + '\\begin_layout Standard\n'
- elif k == i - 2 and document.body[i - 1] == '':
- layout = ''
- else:
- layout = '\\end_layout\n\n' \
- + '\\begin_layout Standard\n'
- l = find_token(document.body, "\\begin_layout Standard" , i + 4)
- if l == i + 4 and document.body[i + 1] == '':
- layout2 = ''
+
+ # we need to find out if this line follows other content
+ # in its paragraph. find its layout....
+ lastlay = find_token_backwards(document.body, "\\begin_layout", i)
+ if lastlay == -1:
+ document.warning("Can't find layout for line at " + str(i))
+ # do the best we can.
+ document.body[i:i+1] = inset
+ i += len(inset)
+ continue
+
+ # ...and look for other content before it.
+ lineisfirst = True
+ for line in document.body[lastlay + 1:i]:
+ # is it empty or a paragraph option?
+ if not line or line[0] == '\\':
+ continue
+ lineisfirst = False
+ break
+
+ if lineisfirst:
+ document.body[i:i+1] = inset
+ if indent:
+ # we need to unindent, lest the line be too long
+ document.body.insert(lastlay + 1, "\\noindent")
+ i += len(inset)
else:
- layout2 = '\\end_layout\n' \
- + '\n\\begin_layout Standard\n'
- subst = layout \
- + '\\noindent\n\n' \
- + color \
- + '\\begin_inset CommandInset line\n' \
- + 'LatexCommand rule\n' \
- + 'offset "0.5ex"\n' \
- + 'width "100line%"\n' \
- + 'height "1pt"\n' \
- + '\n\\end_inset\n\n\n' \
- + layout2
- document.body[i] = subst
- i += 1
+ # so our line is in the middle of a paragraph
+ # we need to add a new line, lest this line follow the
+ # other content on that line and run off the side of the page
+ document.body[i:i+1] = inset
+ document.body[i:i] = ["\\begin_inset Newline newline", "\\end_inset", ""]
+ i += len(inset)
def revert_rule(document):
return
# find end of inset
j = find_token(document.body, "\\end_inset" , i)
- # assure we found the end_inset of the current inset
- if j > i + 6 or j == -1:
+ if j == -1:
document.warning("Malformed LyX document: Can't find end of line inset.")
return
# determine the optional offset
- k = find_token(document.body, 'offset', i, j)
- if k != -1:
- offset = document.body[k][8:-1]
- else:
- offset = ""
+ offset = get_value(document.body, 'offset', i, j).strip('"')
+ if offset:
+ offset = '[' + offset + ']'
# determine the width
- l = find_token(document.body, 'width', i, j)
- if l != -1:
- width = document.body[l][7:-1]
- else:
- width = "100col%"
+ width = get_value(document.body, 'width', i, j, "100col%").strip('"')
+ width = latex_length(width)[1]
# determine the height
- m = find_token(document.body, 'height', i, j)
- if m != -1:
- height = document.body[m][8:-1]
- else:
- height = "1pt"
+ height = get_value(document.body, 'height', i, j, "1pt").strip('"')
+ height = latex_length(height)[1]
# output the \rule command
- if offset:
- subst = "\\rule[" + offset + "]{" + width + "}{" + height + "}"
- else:
- subst = "\\rule{" + width + "}{" + height + "}"
+ subst = "\\rule[" + offset + "]{" + width + "}{" + height + "}"
document.body[i:j + 1] = put_cmd_in_ert(subst)
- i += 1
+ i += len(subst) - (j - i)
def revert_diagram(document):
" Add the feyn package if \\Diagram is used in math "
i = 0
- re_diagram = re.compile(r'\\begin_inset Formula .*\\Diagram', re.DOTALL)
while True:
i = find_token(document.body, '\\begin_inset Formula', i)
if i == -1:
if j == -1:
document.warning("Malformed LyX document: Can't find end of Formula inset.")
return
- m = re_diagram.search("\n".join(document.body[i:j]))
- if not m:
- i += 1
+ lines = "\n".join(document.body[i:j])
+ if lines.find("\\Diagram") == -1:
+ i = j
continue
- add_to_preamble(document, ["% this command was inserted by lyx2lyx"])
- add_to_preamble(document, "\\usepackage{feyn}")
+ add_to_preamble(document, ["% lyx2lyx feyn package insertion ", "\\usepackage{feyn}"])
# only need to do it once!
return
projects / lyx.git / blobdiff