Simplify revert_backgroundcolor.

[lyx.git] / lib / lyx2lyx / lyx_2_0.py

diff --git a/lib/lyx2lyx/lyx_2_0.py b/lib/lyx2lyx/lyx_2_0.py
index 39b1f6b1d055dc65160fdc9f81f3c2ce7d916fd0..5385f87d19a04b35623a9038e23f47f4af63eb84 100644 (file)
--- a/lib/lyx2lyx/lyx_2_0.py
+++ b/lib/lyx2lyx/lyx_2_0.py
@@ -503,11 +503,11 @@ def revert_tabularvalign(document):
       i = end + len(subst) # adjust i to save a few cycles
 
 
-def revert_phantom(document):
+def revert_phantom_types(document, ptype, cmd):
     " Reverts phantom to ERT "
     i = 0
     while True:
-      i = find_token(document.body, "\\begin_inset Phantom Phantom", i)
+      i = find_token(document.body, "\\begin_inset Phantom " + ptype, i)
       if i == -1:
           return
       end = find_end_of_inset(document.body, i)
@@ -527,7 +527,7 @@ def revert_phantom(document):
           continue
       substi = ["\\begin_inset ERT", "status collapsed", "",
                 "\\begin_layout Plain Layout", "", "", "\\backslash", 
-                "phantom{", "\\end_layout", "", "\\end_inset"]
+                cmd + "{", "\\end_layout", "", "\\end_inset"]
       substj = ["\\size default", "", "\\begin_inset ERT", "status collapsed", "",
                 "\\begin_layout Plain Layout", "", "}", "\\end_layout", "", "\\end_inset"]
       # do the later one first so as not to mess up the numbering
@@ -536,60 +536,14 @@ def revert_phantom(document):
       i = end + len(substi) + len(substj) - (end - bend) - (blay - i) - 2
 
 
+def revert_phantom(document):
+    revert_phantom_types(document, "Phantom", "phantom")
+    
 def revert_hphantom(document):
-    " Reverts hphantom to ERT "
-    i = 0
-    j = 0
-    while True:
-      i = find_token(document.body, "\\begin_inset Phantom HPhantom", i)
-      if i == -1:
-          return
-      substi = document.body[i].replace('\\begin_inset Phantom HPhantom', \
-                '\\begin_inset ERT\nstatus collapsed\n\n' \
-                '\\begin_layout Plain Layout\n\n\n\\backslash\n' \
-                'hphantom{\n\\end_layout\n\n\\end_inset\n')
-      substi = substi.split('\n')
-      document.body[i:i + 4] = substi
-      i += len(substi)
-      j = find_token(document.body, "\\end_layout", i)
-      if j == -1:
-          document.warning("Malformed LyX document: Could not find end of HPhantom inset.")
-          return
-      substj = document.body[j].replace('\\end_layout', \
-                '\\size default\n\n\\begin_inset ERT\nstatus collapsed\n\n' \
-                '\\begin_layout Plain Layout\n\n' \
-                '}\n\\end_layout\n\n\\end_inset\n')
-      substj = substj.split('\n')
-      document.body[j:j + 4] = substj
-      i += len(substj)
-
+    revert_phantom_types(document, "HPhantom", "hphantom")
 
 def revert_vphantom(document):
-    " Reverts vphantom to ERT "
-    i = 0
-    j = 0
-    while True:
-      i = find_token(document.body, "\\begin_inset Phantom VPhantom", i)
-      if i == -1:
-          return
-      substi = document.body[i].replace('\\begin_inset Phantom VPhantom', \
-                '\\begin_inset ERT\nstatus collapsed\n\n' \
-                '\\begin_layout Plain Layout\n\n\n\\backslash\n' \
-                'vphantom{\n\\end_layout\n\n\\end_inset\n')
-      substi = substi.split('\n')
-      document.body[i:i + 4] = substi
-      i += len(substi)
-      j = find_token(document.body, "\\end_layout", i)
-      if j == -1:
-          document.warning("Malformed LyX document: Could not find end of VPhantom inset.")
-          return
-      substj = document.body[j].replace('\\end_layout', \
-                '\\size default\n\n\\begin_inset ERT\nstatus collapsed\n\n' \
-                '\\begin_layout Plain Layout\n\n' \
-                '}\n\\end_layout\n\n\\end_inset\n')
-      substj = substj.split('\n')
-      document.body[j:j + 4] = substj
-      i += len(substj)
+    revert_phantom_types(document, "VPhantom", "vphantom")
 
 
 def revert_xetex(document):
@@ -692,42 +646,32 @@ def revert_outputformat(document):
     del document.header[i]
 
 
+def hex2ratio(s):
+    val = string.atoi(s, 16)
+    if val != 0:
+      val += 1
+    return str(val / 256.0)
+
+
 def revert_backgroundcolor(document):
     " Reverts background color to preamble code "
-    i = 0
-    colorcode = ""
-    while True:
-      i = find_token(document.header, "\\backgroundcolor", i)
-      if i == -1:
-          return
-      colorcode = get_value(document.header, '\\backgroundcolor', 0)
-      del document.header[i]
-      # don't clutter the preamble if backgroundcolor is not set
-      if colorcode == "#ffffff":
-          continue
-      # the color code is in the form #rrggbb where every character denotes a hex number
-      # convert the string to an int
-      red = string.atoi(colorcode[1:3],16)
-      # we want the output "0.5" for the value "127" therefore add here
-      if red != 0:
-          red = red + 1
-      redout = float(red) / 256
-      green = string.atoi(colorcode[3:5],16)
-      if green != 0:
-          green = green + 1
-      greenout = float(green) / 256
-      blue = string.atoi(colorcode[5:7],16)
-      if blue != 0:
-          blue = blue + 1
-      blueout = float(blue) / 256
-      # write the preamble
-      insert_to_preamble(0, document,
-                           '% Commands inserted by lyx2lyx to set the background color\n'
-                           + '\\@ifundefined{definecolor}{\\usepackage{color}}{}\n'
-                           + '\\definecolor{page_backgroundcolor}{rgb}{'
-                           + str(redout) + ', ' + str(greenout)
-                           + ', ' + str(blueout) + '}\n'
-                           + '\\pagecolor{page_backgroundcolor}\n')
+    i = find_token(document.header, "\\backgroundcolor", 0)
+    if i == -1:
+        return
+    colorcode = get_value(document.header, '\\backgroundcolor', 0)
+    del document.header[i]
+    # don't clutter the preamble if backgroundcolor is not set
+    if colorcode == "#ffffff":
+        return
+    red   = hex2ratio(colorcode[1:3])
+    green = hex2ratio(colorcode[3:5])
+    blue  = hex2ratio(colorcode[5:7])
+    insert_to_preamble(0, document,
+                          '% Commands inserted by lyx2lyx to set the background color\n'
+                          + '\\@ifundefined{definecolor}{\\usepackage{color}}{}\n'
+                          + '\\definecolor{page_backgroundcolor}{rgb}{'
+                          + red + ',' + green + ',' + blue + '}\n'
+                          + '\\pagecolor{page_backgroundcolor}\n')
 
 
 def revert_splitindex(document):