Minor style.

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

diff --git a/lib/lyx2lyx/lyx2lyx_tools.py b/lib/lyx2lyx/lyx2lyx_tools.py
index 626e500c394552615ebabdc790a70baf7f587716..bff48085960ebe16c6cd65a3805f6501d385a1a4 100644 (file)
--- a/lib/lyx2lyx/lyx2lyx_tools.py
+++ b/lib/lyx2lyx/lyx2lyx_tools.py
@@ -27,12 +27,15 @@ add_to_preamble(document, text):
   we will handle that properly.
   The routine checks to see whether the provided material is
   already in the preamble. If not, it adds it.
   we will handle that properly.
   The routine checks to see whether the provided material is
   already in the preamble. If not, it adds it.

+  Prepends a comment "% Added by lyx2lyx" to text.

 
 

-insert_to_preamble(index, document, text):
+insert_to_preamble(document, text[, index]):

   Here, text can be either a single line or a list of lines. It
   is bad practice to pass something with embedded newlines, but
   we will handle that properly.
   Here, text can be either a single line or a list of lines. It
   is bad practice to pass something with embedded newlines, but
   we will handle that properly.

-  The routine inserts text at document.preamble[index].
+  The routine inserts text at document.preamble[index], where by
+  default index is 0, so the material is inserted at the beginning.
+  Prepends a comment "% Added by lyx2lyx" to text.

 
 put_cmd_in_ert(arg):
   Here arg should be a list of strings (lines), which we want to
 
 put_cmd_in_ert(arg):
   Here arg should be a list of strings (lines), which we want to


@@ -62,7 +65,7 @@ from unicode_symbols import unicode_reps
 
 
 # This will accept either a list of lines or a single line.
 
 
 # This will accept either a list of lines or a single line.

-# It is bad practice to pass something with embedded newlines, 
+# It is bad practice to pass something with embedded newlines,

 # though we will handle that.
 def add_to_preamble(document, text):
     " Add text to the preamble if it is not already there. "
 # though we will handle that.
 def add_to_preamble(document, text):
     " Add text to the preamble if it is not already there. "


@@ -89,12 +92,13 @@ def add_to_preamble(document, text):
       if matched:
         return
 
       if matched:
         return
 

+    document.preamble.extend(["% Added by lyx2lyx"])

     document.preamble.extend(text)
 
 
 # Note that text can be either a list of lines or a single line.
 # It should really be a list.
     document.preamble.extend(text)
 
 
 # Note that text can be either a list of lines or a single line.
 # It should really be a list.

-def insert_to_preamble(index, document, text):
+def insert_to_preamble(document, text, index = 0):

     """ Insert text to the preamble at a given line"""
     
     if not type(text) is list:
     """ Insert text to the preamble at a given line"""
     
     if not type(text) is list:


@@ -102,7 +106,8 @@ def insert_to_preamble(index, document, text):
       # it'll give us the one element list we want
       # if there's no \n, too
       text = text.split('\n')
       # it'll give us the one element list we want
       # if there's no \n, too
       text = text.split('\n')

-
+    
+    text.insert(0, "% Added by lyx2lyx")

     document.preamble[index:index] = text
 
 
     document.preamble[index:index] = text
 
 


@@ -283,104 +288,105 @@ def latex_length(slen):
     return (percent, slen)
 
 
     return (percent, slen)
 
 

-def revert_flex_inset(document, name, LaTeXname, position):
+def revert_flex_inset(lines, name, LaTeXname):

   " Convert flex insets to TeX code "
   " Convert flex insets to TeX code "

-  i = position
+  i = 0

   while True:
   while True:

-    i = find_token(document.body, '\\begin_inset Flex ' + name, i)
+    i = find_token(lines, '\\begin_inset Flex ' + name, i)

     if i == -1:
       return
     if i == -1:
       return

-    z = find_end_of_inset(document.body, i)
+    z = find_end_of_inset(lines, i)

     if z == -1:
     if z == -1:

-      document.warning("Malformed LyX document: Can't find end of Flex " + name + " inset.")
-      return
+      document.warning("Can't find end of Flex " + name + " inset.")
+      i += 1
+      continue

     # remove the \end_inset
     # remove the \end_inset

-    document.body[z - 2:z + 1] = put_cmd_in_ert("}")
+    lines[z - 2:z + 1] = put_cmd_in_ert("}")

     # we need to reset character layouts if necessary
     # we need to reset character layouts if necessary

-    j = find_token(document.body, '\\emph on', i, z)
-    k = find_token(document.body, '\\noun on', i, z)
-    l = find_token(document.body, '\\series', i, z)
-    m = find_token(document.body, '\\family', i, z)
-    n = find_token(document.body, '\\shape', i, z)
-    o = find_token(document.body, '\\color', i, z)
-    p = find_token(document.body, '\\size', i, z)
-    q = find_token(document.body, '\\bar under', i, z)
-    r = find_token(document.body, '\\uuline on', i, z)
-    s = find_token(document.body, '\\uwave on', i, z)
-    t = find_token(document.body, '\\strikeout on', i, z)
+    j = find_token(lines, '\\emph on', i, z)
+    k = find_token(lines, '\\noun on', i, z)
+    l = find_token(lines, '\\series', i, z)
+    m = find_token(lines, '\\family', i, z)
+    n = find_token(lines, '\\shape', i, z)
+    o = find_token(lines, '\\color', i, z)
+    p = find_token(lines, '\\size', i, z)
+    q = find_token(lines, '\\bar under', i, z)
+    r = find_token(lines, '\\uuline on', i, z)
+    s = find_token(lines, '\\uwave on', i, z)
+    t = find_token(lines, '\\strikeout on', i, z)

     if j != -1:
     if j != -1:

-      document.body.insert(z - 2, "\\emph default")
+      lines.insert(z - 2, "\\emph default")

     if k != -1:
     if k != -1:

-      document.body.insert(z - 2, "\\noun default")
+      lines.insert(z - 2, "\\noun default")

     if l != -1:
     if l != -1:

-      document.body.insert(z - 2, "\\series default")
+      lines.insert(z - 2, "\\series default")

     if m != -1:
     if m != -1:

-      document.body.insert(z - 2, "\\family default")
+      lines.insert(z - 2, "\\family default")

     if n != -1:
     if n != -1:

-      document.body.insert(z - 2, "\\shape default")
+      lines.insert(z - 2, "\\shape default")

     if o != -1:
     if o != -1:

-      document.body.insert(z - 2, "\\color inherit")
+      lines.insert(z - 2, "\\color inherit")

     if p != -1:
     if p != -1:

-      document.body.insert(z - 2, "\\size default")
+      lines.insert(z - 2, "\\size default")

     if q != -1:
     if q != -1:

-      document.body.insert(z - 2, "\\bar default")
+      lines.insert(z - 2, "\\bar default")

     if r != -1:
     if r != -1:

-      document.body.insert(z - 2, "\\uuline default")
+      lines.insert(z - 2, "\\uuline default")

     if s != -1:
     if s != -1:

-      document.body.insert(z - 2, "\\uwave default")
+      lines.insert(z - 2, "\\uwave default")

     if t != -1:
     if t != -1:

-      document.body.insert(z - 2, "\\strikeout default")
-    document.body[i:i + 4] = put_cmd_in_ert(LaTeXname + "{")
+      lines.insert(z - 2, "\\strikeout default")
+    lines[i:i + 4] = put_cmd_in_ert(LaTeXname + "{")

     i += 1
 
 
     i += 1
 
 

-def revert_font_attrs(document, name, LaTeXname):
+def revert_font_attrs(lines, name, LaTeXname):

   " Reverts font changes to TeX code "
   i = 0
   changed = False
   while True:
   " Reverts font changes to TeX code "
   i = 0
   changed = False
   while True:

-    i = find_token(document.body, name + ' on', i)
+    i = find_token(lines, name + ' on', i)

     if i == -1:
       return changed
     if i == -1:
       return changed

-    j = find_token(document.body, name + ' default', i)
-    k = find_token(document.body, name + ' on', i + 1)
+    j = find_token(lines, name + ' default', i)
+    k = find_token(lines, name + ' on', i + 1)

     # if there is no default set, the style ends with the layout
     # assure hereby that we found the correct layout end
     if j != -1 and (j < k or k == -1):
     # if there is no default set, the style ends with the layout
     # assure hereby that we found the correct layout end
     if j != -1 and (j < k or k == -1):

-      document.body[j:j + 1] = put_cmd_in_ert("}")
+      lines[j:j + 1] = put_cmd_in_ert("}")

     else:
     else:

-      j = find_token(document.body, '\\end_layout', i)
-      document.body[j:j] = put_cmd_in_ert("}")
-    document.body[i:i + 1] = put_cmd_in_ert(LaTeXname + "{")
+      j = find_token(lines, '\\end_layout', i)
+      lines[j:j] = put_cmd_in_ert("}")
+    lines[i:i + 1] = put_cmd_in_ert(LaTeXname + "{")

     changed = True
     i += 1
 
 
     changed = True
     i += 1
 
 

-def revert_layout_command(document, name, LaTeXname, position):
+def revert_layout_command(lines, name, LaTeXname):

   " Reverts a command from a layout to TeX code "
   " Reverts a command from a layout to TeX code "

-  i = position
+  i = 0

   while True:
   while True:

-    i = find_token(document.body, '\\begin_layout ' + name, i)
+    i = find_token(lines, '\\begin_layout ' + name, i)

     if i == -1:
       return
     k = -1
     # find the next layout
     j = i + 1
     while k == -1:
     if i == -1:
       return
     k = -1
     # find the next layout
     j = i + 1
     while k == -1:

-      j = find_token(document.body, '\\begin_layout', j)
-      l = len(document.body)
+      j = find_token(lines, '\\begin_layout', j)
+      l = len(lines)

       # if nothing was found it was the last layout of the document
       if j == -1:
       # if nothing was found it was the last layout of the document
       if j == -1:

-        document.body[l - 4:l - 4] = put_cmd_in_ert("}")
+        lines[l - 4:l - 4] = put_cmd_in_ert("}")

         k = 0
       # exclude plain layout because this can be TeX code or another inset
         k = 0
       # exclude plain layout because this can be TeX code or another inset

-      elif document.body[j] != '\\begin_layout Plain Layout':
-        document.body[j - 2:j - 2] = put_cmd_in_ert("}")
+      elif lines[j] != '\\begin_layout Plain Layout':
+        lines[j - 2:j - 2] = put_cmd_in_ert("}")

         k = 0
       else:
         j += 1
         k = 0
       else:
         j += 1

-    document.body[i] = '\\begin_layout Standard'
-    document.body[i + 1:i + 1] = put_cmd_in_ert(LaTeXname + "{")
+    lines[i] = '\\begin_layout Standard'
+    lines[i + 1:i + 1] = put_cmd_in_ert(LaTeXname + "{")

     i += 1
 
 
     i += 1