ctests: uninvert two xhtml tests

[features.git] / lib / lyx2lyx / parser_tools.py

diff --git a/lib/lyx2lyx/parser_tools.py b/lib/lyx2lyx/parser_tools.py
index 12d6aa6be05cd5396c833c3d0ab442f84fddd504..cc2223615af07c367dbaae341005abc4ea202ece 100644 (file)
--- a/lib/lyx2lyx/parser_tools.py
+++ b/lib/lyx2lyx/parser_tools.py
@@ -1,7 +1,7 @@
 # This file is part of lyx2lyx
 # -*- coding: utf-8 -*-
 # Copyright (C) 2002-2011 Dekel Tsur <dekel@lyx.org>,
-# José Matos <jamatos@lyx.org>, Richard Heck <rgheck@comcast.net>
+# José Matos <jamatos@lyx.org>, Richard Kimberly Heck <rikiheck@lyx.org>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -66,6 +66,7 @@ get_value(lines, token[, start[, end[, default[, delete]]]]):
   is stripped.) The final argument, default, defaults to "",
   and is what is returned if we do not find anything. So you
   can use that to set a default.
+  If delete is True, then delete the line if found.
 
 get_quoted_value(lines, token[, start[, end[, default[, delete]]]]):
   Similar to get_value, but it will strip quotes off the
@@ -88,6 +89,9 @@ del_token(lines, token[, start[, end]]):
   Like find_token, but deletes the line if it finds one.
   Returns True if a line got deleted, otherwise False.
 
+  Use get_* with the optional argument "delete=True", if you want to
+  get and delete a token.
+
 find_beginning_of(lines, i, start_token, end_token):
   Here, start_token and end_token are meant to be a matching
   pair, like "\\begin_layout" and "\\end_layout". We look for
@@ -117,8 +121,8 @@ find_end_of_layout(lines, i):
 find_end_of_sequence(lines, i):
   Find the end of the sequence of layouts of the same kind.
   Considers nesting. If the last paragraph in sequence is nested,
-  the position of the last \end_deeper is returned, else
-  the position of the last \end_layout.
+  the position of the last \\end_deeper is returned, else
+  the position of the last \\end_layout.
 
 is_in_inset(lines, i, inset, default=(-1,-1)):
   Check if line i is in an inset of the given type.
@@ -135,7 +139,7 @@ is_in_inset(lines, i, inset, default=(-1,-1)):
 
 get_containing_inset(lines, i):
   Finds out what kind of inset line i is within. Returns a
-  list containing what follows \begin_inset on the line
+  list containing what follows \\begin_inset on the line
   on which the inset begins, plus the starting and ending line.
   Returns False on any kind of error or if it isn't in an inset.
   So get_containing_inset(document.body, i) might return:
@@ -226,6 +230,7 @@ def find_tokens(lines, tokens, start=0, end=0, ignorews=False):
     the first element, in lines[start, end].
 
     Return -1 on failure."""
+
     if end == 0 or end > len(lines):
         end = len(lines)
 
@@ -425,25 +430,21 @@ def get_quoted_value(lines, token, start=0, end=0, default="", delete=False):
       return default
     return val.strip('"')
 
-bool_values = {True:  ("true", "1"), 
-               False: ("false", "0")}
+
+bool_values = {"true": True, "1": True,
+               "false": False, "0": False}
 
 def get_bool_value(lines, token, start=0, end=0, default=None, delete=False):
     """ get_bool_value(lines, token, start[[, end], default]) -> string
 
     Find the next line that looks like:
-      token <bool_value>
+      `token` <bool_value>
 
-    Return True if <bool_value> is 1 or "true", False if bool_value
+    Return True if <bool_value> is 1 or "true", False if <bool_value>
     is 0 or "false", else `default`.
     """
-
     val = get_quoted_value(lines, token, start, end, default, delete)
-    if val in bool_values[True]:
-        return True
-    if val in bool_values[False]:
-        return False
-    return default
+    return bool_values.get(val, default)
 
 
 def set_bool_value(lines, token, value, start=0, end=0):
@@ -459,19 +460,17 @@ def set_bool_value(lines, token, value, start=0, end=0):
     oldvalue = get_bool_value(lines, token, i, i+1)
     if oldvalue is value:
         return oldvalue
-    # Use 0/1 or true/false?
+    # set to new value
     if get_quoted_value(lines, token, i, i+1) in ('0', '1'):
-        value_string = bool_values[value][1]
+        lines[i] = "%s %d" % (token, value)
     else:
-        value_string = bool_values[value][0]
-    # set to new value
-    lines[i] = "%s %s" % (token, value_string)
+        lines[i] = "%s %s" % (token, str(value).lower())
 
     return oldvalue
 
 
 def get_option_value(line, option):
-    rx = option + '\s*=\s*"([^"]+)"'
+    rx = option + r'\s*=\s*"([^"]+)"'
     rx = re.compile(rx)
     m = rx.search(line)
     if not m:
@@ -480,12 +479,12 @@ def get_option_value(line, option):
 
 
 def set_option_value(line, option, value):
-    rx = '(' + option + '\s*=\s*")[^"]+"'
+    rx = '(' + option + r'\s*=\s*")[^"]+"'
     rx = re.compile(rx)
     m = rx.search(line)
     if not m:
         return line
-    return re.sub(rx, '\g<1>' + value + '"', line)
+    return re.sub(rx, r'\g<1>' + value + '"', line)
 
 
 def del_token(lines, token, start=0, end=0):
@@ -613,7 +612,7 @@ def is_in_inset(lines, i, inset, default=(-1,-1)):
 def get_containing_inset(lines, i):
   '''
   Finds out what kind of inset line i is within. Returns a
-  list containing (i) what follows \begin_inset on the line
+  list containing (i) what follows \\begin_inset on the line
   on which the inset begins, plus the starting and ending line.
   Returns False on any kind of error or if it isn't in an inset.
   '''
@@ -690,7 +689,7 @@ def count_pars_in_inset(lines, i):
   pars = 0
   for j in range(ins[1], ins[2]):
       m = re.match(r'\\begin_layout (.*)', lines[j])
-      if m and get_containing_inset(lines, j)[0] == ins[0]:
+      if m and get_containing_inset(lines, j)[1] == ins[1]:
           pars += 1
 
   return pars