+2004-09-12 Georg Baum <Georg.Baum@post.rwth-aachen.de>
+
+ * lyx_1_4.lyx: unify warning messages
+
2004-08-19 José Matos <jamatos@lyx.org>
* lyx_1_4.lyx (add_end_layout): fix \end_layout interaction with
2004-08-19 José Matos <jamatos@lyx.org>
* lyx_1_4.lyx (add_end_layout): fix \end_layout interaction with
return
j = find_end_of_inset(lines, i)
if j == -1:
return
j = find_end_of_inset(lines, i)
if j == -1:
- opt.warning("Malformed LyX file: Missing '\\end_inset'\n")
+ opt.warning("Malformed LyX file: Missing '\\end_inset'.")
i = i + 1
continue
del lines[i]
i = i + 1
continue
del lines[i]
def convert_jurabib(header, opt):
i = find_token(header, '\\use_numerical_citations', 0)
if i == -1:
def convert_jurabib(header, opt):
i = find_token(header, '\\use_numerical_citations', 0)
if i == -1:
- opt.warning("Malformed lyx file: Missing '\\use_numerical_citations'")
+ opt.warning("Malformed lyx file: Missing '\\use_numerical_citations'.")
return
header.insert(i + 1, '\\use_jurabib 0')
return
header.insert(i + 1, '\\use_jurabib 0')
def revert_jurabib(header, opt):
i = find_token(header, '\\use_jurabib', 0)
if i == -1:
def revert_jurabib(header, opt):
i = find_token(header, '\\use_jurabib', 0)
if i == -1:
- opt.warning("Malformed lyx file: Missing '\\use_jurabib'")
+ opt.warning("Malformed lyx file: Missing '\\use_jurabib'.")
return
if get_value(header, '\\use_jurabib', 0) != "0":
opt.warning("Conversion of '\\use_jurabib = 1' not yet implemented.")
return
if get_value(header, '\\use_jurabib', 0) != "0":
opt.warning("Conversion of '\\use_jurabib = 1' not yet implemented.")
def convert_bibtopic(header, opt):
i = find_token(header, '\\use_jurabib', 0)
if i == -1:
def convert_bibtopic(header, opt):
i = find_token(header, '\\use_jurabib', 0)
if i == -1:
- opt.warning("Malformed lyx file: Missing '\\use_jurabib'")
+ opt.warning("Malformed lyx file: Missing '\\use_jurabib'.")
return
header.insert(i + 1, '\\use_bibtopic 0')
return
header.insert(i + 1, '\\use_bibtopic 0')
def revert_bibtopic(header, opt):
i = find_token(header, '\\use_bibtopic', 0)
if i == -1:
def revert_bibtopic(header, opt):
i = find_token(header, '\\use_bibtopic', 0)
if i == -1:
- opt.warning("Malformed lyx file: Missing '\\use_bibtopic'")
+ opt.warning("Malformed lyx file: Missing '\\use_bibtopic'.")
return
if get_value(header, '\\use_bibtopic', 0) != "0":
opt.warning("Conversion of '\\use_bibtopic = 1' not yet implemented.")
return
if get_value(header, '\\use_bibtopic', 0) != "0":
opt.warning("Conversion of '\\use_bibtopic = 1' not yet implemented.")
lines.insert(i + 1, 'sideways false')
break
elif (lines[i][:13] == "\\begin_layout"):
lines.insert(i + 1, 'sideways false')
break
elif (lines[i][:13] == "\\begin_layout"):
- opt.warning("Malformed lyx file")
+ opt.warning("Malformed lyx file.")
break
i = i + 1
i = i + 1
break
i = i + 1
i = i + 1
return
j = find_end_of_inset(lines, i)
if j == -1:
return
j = find_end_of_inset(lines, i)
if j == -1:
- opt.warning("Malformed lyx file: Missing '\\end_inset'")
+ opt.warning("Malformed lyx file: Missing '\\end_inset'.")
i = i + 1
continue
if get_value(lines, 'sideways', i, j) != "false":
i = i + 1
continue
if get_value(lines, 'sideways', i, j) != "false":
i = find_end_of( lines, i+3, "\\begin_deeper","\\end_deeper")
if i == -1:
# something is really wrong, abort
i = find_end_of( lines, i+3, "\\begin_deeper","\\end_deeper")
if i == -1:
# something is really wrong, abort
- opt.warning("Missing \\end_deeper,after style Author")
- opt.warning("Aborted attempt to parse FirstName and Surname")
+ opt.warning("Missing \\end_deeper, after style Author.")
+ opt.warning("Aborted attempt to parse FirstName and Surname.")
return
firstname, surname = "", ""
return
firstname, surname = "", ""
def convert_cite_engine(header, opt):
a = find_token(header, "\\use_natbib", 0)
if a == -1:
def convert_cite_engine(header, opt):
a = find_token(header, "\\use_natbib", 0)
if a == -1:
- opt.warning("Malformed lyx file: Missing '\\use_natbib'")
+ opt.warning("Malformed lyx file: Missing '\\use_natbib'.")
return
b = find_token(header, "\\use_numerical_citations", 0)
if b == -1 or b != a+1:
return
b = find_token(header, "\\use_numerical_citations", 0)
if b == -1 or b != a+1:
- opt.warning("Malformed lyx file: Missing '\\use_numerical_citations'")
+ opt.warning("Malformed lyx file: Missing '\\use_numerical_citations'.")
return
c = find_token(header, "\\use_jurabib", 0)
if c == -1 or c != b+1:
return
c = find_token(header, "\\use_jurabib", 0)
if c == -1 or c != b+1:
- opt.warning("Malformed lyx file: Missing '\\use_jurabib'")
+ opt.warning("Malformed lyx file: Missing '\\use_jurabib'.")
return
use_natbib = int(split(header[a])[1])
return
use_natbib = int(split(header[a])[1])
def revert_cite_engine(header, opt):
i = find_token(header, "\\cite_engine", 0)
if i == -1:
def revert_cite_engine(header, opt):
i = find_token(header, "\\cite_engine", 0)
if i == -1:
- opt.warning("Malformed lyx file: Missing '\\cite_engine'")
+ opt.warning("Malformed lyx file: Missing '\\cite_engine'.")
return
cite_engine = split(header[i])[1]
return
cite_engine = split(header[i])[1]
def convert_paperpackage(header, opt):
i = find_token(header, "\\paperpackage", 0)
if i == -1:
def convert_paperpackage(header, opt):
i = find_token(header, "\\paperpackage", 0)
if i == -1:
- opt.warning("Malformed lyx file: Missing '\\paperpackage'")
+ opt.warning("Malformed lyx file: Missing '\\paperpackage'.")
return
packages = {'a4':'none', 'a4wide':'a4', 'widemarginsa4':'a4wide'}
return
packages = {'a4':'none', 'a4wide':'a4', 'widemarginsa4':'a4wide'}
def revert_paperpackage(header, opt):
i = find_token(header, "\\paperpackage", 0)
if i == -1:
def revert_paperpackage(header, opt):
i = find_token(header, "\\paperpackage", 0)
if i == -1:
- opt.warning("Malformed lyx file: Missing '\\paperpackage'")
+ opt.warning("Malformed lyx file: Missing '\\paperpackage'.")
return
packages = {'none':'a4', 'a4':'a4wide', 'a4wide':'widemarginsa4',
return
packages = {'none':'a4', 'a4':'a4wide', 'a4wide':'widemarginsa4',
if header[i][:12] == '\\bulletLaTeX':
n = find(header[i], '"')
if n == -1:
if header[i][:12] == '\\bulletLaTeX':
n = find(header[i], '"')
if n == -1:
- opt.warn("Malformed header")
+ opt.warning("Malformed header.")
return
else:
header[i:i+1] = [header[i][:n-1],'\t' + header[i][n:], '\\end_bullet']
return
else:
header[i:i+1] = [header[i][:n-1],'\t' + header[i][n:], '\\end_bullet']
else:
frag = split(header[i])
if len(frag) != 5:
else:
frag = split(header[i])
if len(frag) != 5:
- opt.warn("Malformed header")
+ opt.warning("Malformed header.")
return
else:
header[i:i+1] = [frag[0] + ' ' + frag[1],
return
else:
header[i:i+1] = [frag[0] + ' ' + frag[1],