[EMAIL PROTECTED] wrote:
Author: jamatos
Date: Sat Apr 19 23:29:44 2008
New Revision: 24371

URL: http://www.lyx.org/trac/changeset/24371
Log:
Fix calls to find_default_layout (guarentee arguments consistency)

It's this kind of point you yearn for C++'s type safety.

Anyway, thanks. My mistake.

rh

Modified:
    lyx-devel/trunk/lib/lyx2lyx/lyx_1_6.py

Modified: lyx-devel/trunk/lib/lyx2lyx/lyx_1_6.py
URL: 
http://www.lyx.org/trac/file/lyx-devel/trunk/lib/lyx2lyx/lyx_1_6.py?rev=24371
==============================================================================
--- lyx-devel/trunk/lib/lyx2lyx/lyx_1_6.py (original)
+++ lyx-devel/trunk/lib/lyx2lyx/lyx_1_6.py Sat Apr 19 23:29:44 2008
@@ -378,7 +378,7 @@
 #  Discard PDF options for hyperref
 def revert_pdf_options(document):
         "Revert PDF options for hyperref."
-        # store the PDF options and delete the entries from the Lyx file       
+        # store the PDF options and delete the entries from the Lyx file
         i = 0
         hyperref = False
         title = ""
@@ -1468,7 +1468,7 @@
             i = i + 1
             continue
         if get_value(document.body, 'sideways', i, j) != "false":
-            l = find_default_layout(doc, i + 1, j)
+            l = find_default_layout(document, i + 1, j)
             if l == -1:
                 document.warning("Malformed LyX document: Missing `\\begin_layout' 
in Float inset.")
                 return
@@ -1607,7 +1607,7 @@
                 document.warning("Malformed lyx document: Missing '\\end_inset' 
(embedded float).")
                 i = i + 1
                 continue
-            m = find_default_layout(document.body, k + 1, l)
+            m = find_default_layout(document, k + 1, l)
             # caption?
             cap = find_token(document.body, '\\begin_inset Caption', k + 1, l)
             caption = ''
@@ -1640,7 +1640,7 @@
                     if optend == -1:
                         document.warning("Malformed lyx document: Missing 
'\\end_inset' (OptArg).")
                         return
-                    optc = find_default_layout(document.body, opt, optend)
+                    optc = find_default_layout(document, opt, optend)
                     if optc == -1:
                         document.warning("Malformed LyX document: Missing 
`\\begin_layout' in Float inset.")
                         return


_______________________________________________
Cvslog mailing list
[EMAIL PROTECTED]
http://www.lyx.org/mailman/listinfo/cvslog

Reply via email to