X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flyx2lyx%2Fparser_tools.py;h=78459d21d9ce4afc59b7f5bee5ac35d700fc1a73;hb=2d6bc1d0aa1236e21227bcb196afaa7860121cb9;hp=c0c891f5346d6847a90cd044b4691128859837eb;hpb=552a471c99a23d1e36921d078f6491d1c0230900;p=lyx.git diff --git a/lib/lyx2lyx/parser_tools.py b/lib/lyx2lyx/parser_tools.py index c0c891f534..78459d21d9 100644 --- a/lib/lyx2lyx/parser_tools.py +++ b/lib/lyx2lyx/parser_tools.py @@ -141,8 +141,8 @@ def find_tokens_backwards(lines, tokens, start): return -1 -def get_value(lines, token, start, end = 0): - """ get_value(lines, token, start[, end]) -> list of strings +def get_value(lines, token, start, end = 0, default = ""): + """ get_value(lines, token, start[[, end], default]) -> list of strings Return tokens after token for the first line, in lines, where token is the first element.""" @@ -153,7 +153,7 @@ def get_value(lines, token, start, end = 0): if len(lines[i].split()) > 1: return lines[i].split()[1] else: - return "" + return default def del_token(lines, token, start, end): @@ -176,6 +176,8 @@ def find_beginning_of(lines, i, start_token, end_token): count = 1 while i > 0: i = find_tokens_backwards(lines, [start_token, end_token], i-1) + if i == -1: + return -1 if check_token(lines[i], end_token): count = count+1 else: @@ -190,6 +192,8 @@ def find_end_of(lines, i, start_token, end_token): n = len(lines) while i < n: i = find_tokens(lines, [end_token, start_token], i+1) + if i == -1: + return -1 if check_token(lines[i], start_token): count = count+1 else: