Author: rgheck
Date: Fri Nov 5 16:07:32 2010
New Revision: 36112
URL: http://www.lyx.org/trac/changeset/36112
Log:
Move get_value_string to lyx_1_6, since it is only used there. A more
suitable replacement is forthcoming.
Modified:
lyx-devel/trunk/lib/lyx2lyx/lyx_1_6.py
lyx-devel/trunk/lib/lyx2lyx/lyx_2_0.py
lyx-devel/trunk/lib/lyx2lyx/parser_tools.py
Modified: lyx-devel/trunk/lib/lyx2lyx/lyx_1_6.py
==============================================================================
--- lyx-devel/trunk/lib/lyx2lyx/lyx_1_6.py Fri Nov 5 16:01:42 2010
(r36111)
+++ lyx-devel/trunk/lib/lyx2lyx/lyx_1_6.py Fri Nov 5 16:07:32 2010
(r36112)
@@ -22,11 +22,27 @@
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")
Modified: lyx-devel/trunk/lib/lyx2lyx/lyx_2_0.py
==============================================================================
--- lyx-devel/trunk/lib/lyx2lyx/lyx_2_0.py Fri Nov 5 16:01:42 2010
(r36111)
+++ lyx-devel/trunk/lib/lyx2lyx/lyx_2_0.py Fri Nov 5 16:07:32 2010
(r36112)
@@ -25,7 +25,7 @@
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, \
Modified: lyx-devel/trunk/lib/lyx2lyx/parser_tools.py
==============================================================================
--- lyx-devel/trunk/lib/lyx2lyx/parser_tools.py Fri Nov 5 16:01:42 2010
(r36111)
+++ lyx-devel/trunk/lib/lyx2lyx/parser_tools.py Fri Nov 5 16:07:32 2010
(r36112)
@@ -160,21 +160,6 @@
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
