From 45c5b39692c1ec101369ee93027d849f2eae3e4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Milde?= <milde@lyx.org>
Date: Sat, 25 May 2019 13:55:34 +0200
Subject: [PATCH] Adapt lyx2lyx to the lineno support fix in
 [88f471899/lyxgit].

---
 lib/lyx2lyx/lyx_2_4.py                  | 39 ++++++++++++-------------
 src/tex2lyx/test/DummyDocument.lyx.lyx  |  2 +-
 src/tex2lyx/test/Dummy~Document.lyx.lyx |  2 +-
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py
index 2f0081a344..61d45f282b 100644
--- a/lib/lyx2lyx/lyx_2_4.py
+++ b/lib/lyx2lyx/lyx_2_4.py
@@ -1698,34 +1698,31 @@ def revert_utf8_japanese(document):
 def revert_lineno(document):
     " Replace lineno setting with user-preamble code."
 
+    options = get_quoted_value(document.header, "\\lineno_options",
+                               delete=True)
     if not get_bool_value(document.header, "\\use_lineno", delete=True):
         return
-    lineno_options = get_quoted_value(document.header, "\\lineno_options",
-                                      delete=True)
-    if lineno_options:
-        usepkg = "\\usepackage[%s]{lineno}"%lineno_options
-    else:
-        usepkg = "\\usepackage{lineno}"
-    add_to_preamble(document, [usepkg, "\\linenumbers"])
+    if options:
+        options = "[" + options + "]"
+    add_to_preamble(document, ["\\usepackage%s{lineno}" % options,
+                               "\\linenumbers"])
 
 def convert_lineno(document):
     " Replace user-preamble code with native lineno support."
+    use_lineno = 0
+    options = ""
     j = find_token(document.preamble, "\\linenumbers", 1)
-    if j == -1:
-        return
-    usepkg = re.match(r"\\usepackage(.*){lineno}", document.preamble[j-1])
-    if usepkg is None:
-        return
-    options = usepkg.group(1).strip("[]")
-    
-    del(document.preamble[j-1:j+1])
-    print (j, document.preamble[j-2])
-    del_token(document.preamble, "% Added by lyx2lyx", j-2, j-1)
-    
+    if j > -1:
+        usepkg = re.match(r"\\usepackage(.*){lineno}", document.preamble[j-1])
+        if usepkg:
+            use_lineno = 1
+            options = usepkg.group(1).strip("[]")
+            del(document.preamble[j-1:j+1])
+            del_token(document.preamble, "% Added by lyx2lyx", j-2, j-1)
+
     k = find_token(document.header, "\\index ")
-    document.header.insert(k, "\\use_lineno 1")
-    if options:
-        document.header.insert(k+1 or -1, '\\lineno_options %s'%options)
+    document.header[k:k] = ["\\use_lineno %d" % use_lineno,
+                            "\\lineno_options %s" % options]
 
 
 ##
diff --git a/src/tex2lyx/test/DummyDocument.lyx.lyx b/src/tex2lyx/test/DummyDocument.lyx.lyx
index 158ba2ae1f..ee2f32e10b 100644
--- a/src/tex2lyx/test/DummyDocument.lyx.lyx
+++ b/src/tex2lyx/test/DummyDocument.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 574
+\lyxformat 575
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/Dummy~Document.lyx.lyx b/src/tex2lyx/test/Dummy~Document.lyx.lyx
index c9cfcf29ee..e40906c310 100644
--- a/src/tex2lyx/test/Dummy~Document.lyx.lyx
+++ b/src/tex2lyx/test/Dummy~Document.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 574
+\lyxformat 575
 \begin_document
 \begin_header
 \save_transient_properties true