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

Move get_value_string to lyx_1_6, since it is only used there. A more

Browse Source 
suitable replacement is forthcoming.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36112 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-11-05 15:07:32 +00:00
parent f477341474
commit 23499e63ba
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/lyx2lyx/lyx_1_6.py
View File

@ -22,11 +22,27 @@ import re
import unicodedata
import sys, os
from parser_tools import find_token, find_end_of, find_tokens, get_value, get_value_string
from parser_tools import find_token, find_end_of, find_tokens, get_value
####################################################################
# Private helper functions
def get_value_string(lines, token, start, end = 0, trim = False, default = ""):
""" get_value_string(lines, token, start[[, end], trim, default]) -> string
Return tokens after token as string, in lines, where
token is the first element. When trim is used, the first and last character
of the string is trimmed."""
val = get_value(lines, token, start, end, "")
if not val:
return default
if trim:
return val[1:-1]
return val
def find_end_of_inset(lines, i):
" Find end of inset, where lines[i] is included."
return find_end_of(lines, i, "\\begin_inset", "\\end_inset")

2
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, \
find_end_of_inset, find_end_of_layout, find_token_backwards, \
get_containing_inset, get_value, get_value_string
get_containing_inset, get_value
from lyx2lyx_tools import add_to_preamble, insert_to_preamble, \
put_cmd_in_ert, lyx2latex, latex_length, revert_flex_inset, \

15
lib/lyx2lyx/parser_tools.py
View File

@ -160,21 +160,6 @@ def get_value(lines, token, start, end = 0, default = ""):
return default
def get_value_string(lines, token, start, end = 0, trim = False, default = ""):
""" get_value_string(lines, token, start[[, end], trim, default]) -> string
Return tokens after token as string, in lines, where
token is the first element. When trim is used, the first and last character
of the string is trimmed."""
val = get_value(lines, token, start, end, "")
if not val:
return default
if trim:
return val[1:-1]
return val
def del_token(lines, token, start, end):
""" del_token(lines, token, start, end) -> int