anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use get_quoted_value.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36114 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-11-05 15:11:46 +00:00
parent 0e9a0224c1
commit 462c3c39bb
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/lyx2lyx/lyx_2_0.py
View File

@ -25,7 +25,7 @@ import sys, os
from parser_tools import find_token, find_end_of, find_tokens, \ from parser_tools import find_token, find_end_of, find_tokens, \
find_end_of_inset, find_end_of_layout, find_token_backwards, \ find_end_of_inset, find_end_of_layout, find_token_backwards, \
get_containing_inset, get_value get_containing_inset, get_value, get_quoted_value
from lyx2lyx_tools import add_to_preamble, insert_to_preamble, \ from lyx2lyx_tools import add_to_preamble, insert_to_preamble, \
put_cmd_in_ert, lyx2latex, latex_length, revert_flex_inset, \ put_cmd_in_ert, lyx2latex, latex_length, revert_flex_inset, \
@ -397,7 +397,7 @@ def revert_splitindex(document):
if i == -1: if i == -1:
return return
k = find_end_of_inset(document.body, i) k = find_end_of_inset(document.body, i)
ptype = get_value(document.body, 'type', i, k).strip('"') ptype = get_quoted_value(document.body, 'type', i, k)
if ptype == "idx": if ptype == "idx":
j = find_token(document.body, "type", i, k) j = find_token(document.body, "type", i, k)
del document.body[j] del document.body[j]
@ -450,7 +450,7 @@ def revert_subindex(document):
if ctype != "printsubindex": if ctype != "printsubindex":
i = k + 1 i = k + 1
continue continue
ptype = get_value(document.body, 'type', i, k).strip('"') ptype = get_quoted_value(document.body, 'type', i, k)
if not useindices: if not useindices:
del document.body[i:k + 1] del document.body[i:k + 1]
else: else:
@ -566,7 +566,7 @@ def revert_nomencl_cwidth(document):
document.warning("Can't find width option for nomencl_print!") document.warning("Can't find width option for nomencl_print!")
i = j i = j
continue continue
width = get_value(document.body, "width", i, j).strip('"') width = get_quoted_value(document.body, "width", i, j)
del document.body[l] del document.body[l]
add_to_preamble(document, ["% this command was inserted by lyx2lyx"]) add_to_preamble(document, ["% this command was inserted by lyx2lyx"])
add_to_preamble(document, ["\\setlength{\\nomlabelwidth}{" + width + "}"]) add_to_preamble(document, ["\\setlength{\\nomlabelwidth}{" + width + "}"])
@ -1485,9 +1485,9 @@ def revert_makebox(document):
i = z i = z
continue continue
# determine the alignment # determine the alignment
align = get_value(document.body, 'hor_pos', i, blay, "c").strip('"') align = get_quoted_value(document.body, 'hor_pos', i, blay, "c")
# determine the width # determine the width
length = get_value(document.body, 'width', i, blay, "50col%").strip('"') length = get_quoted_value(document.body, 'width', i, blay, "50col%")
length = latex_length(length)[1] length = latex_length(length)[1]
# remove the \end_layout \end_inset pair # remove the \end_layout \end_inset pair
document.body[bend:z + 1] = put_cmd_in_ert("}") document.body[bend:z + 1] = put_cmd_in_ert("}")
@ -1894,14 +1894,14 @@ def revert_rule(document):
document.warning("Malformed LyX document: Can't find end of line inset.") document.warning("Malformed LyX document: Can't find end of line inset.")
return return
# determine the optional offset # determine the optional offset
offset = get_value(document.body, 'offset', i, j).strip('"') offset = get_quoted_value(document.body, 'offset', i, j)
if offset: if offset:
offset = '[' + offset + ']' offset = '[' + offset + ']'
# determine the width # determine the width
width = get_value(document.body, 'width', i, j, "100col%").strip('"') width = get_quoted_value(document.body, 'width', i, j, "100col%")
width = latex_length(width)[1] width = latex_length(width)[1]
# determine the height # determine the height
height = get_value(document.body, 'height', i, j, "1pt").strip('"') height = get_quoted_value(document.body, 'height', i, j, "1pt")
height = latex_length(height)[1] height = latex_length(height)[1]
# output the \rule command # output the \rule command
subst = "\\rule[" + offset + "]{" + width + "}{" + height + "}" subst = "\\rule[" + offset + "]{" + width + "}{" + height + "}"