From: Juergen Spitzmueller <spitz@lyx.org>
Date: Wed, 10 Jul 2024 07:50:15 +0000 (+0200)
Subject: Fix glitch in revert_biblatex_chicago
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f96422fc9c0da2f06b8dcc0a038cab51be3bf7e6;p=lyx.git

Fix glitch in revert_biblatex_chicago
---

diff --git a/lib/lyx2lyx/lyx_2_5.py b/lib/lyx2lyx/lyx_2_5.py
index be291c5b33..2c90d465d0 100644
--- a/lib/lyx2lyx/lyx_2_5.py
+++ b/lib/lyx2lyx/lyx_2_5.py
@@ -273,20 +273,22 @@ def convert_biblatex_chicago(document):
 def revert_biblatex_chicago(document):
     """Revert biblatex-chicago to ERT where necessary"""
 
-    # 1. Get and reset cite engine
+    # 1. Get cite engine
     engine = "basic"
     i = find_token(document.header, "\\cite_engine", 0)
     if i == -1:
         document.warning("Malformed document! Missing \\cite_engine")
     else:
         engine = get_value(document.header, "\\cite_engine", i)
-        document.header[i] = "\\cite_engine biblatex"
 
     # 2. Do we use biblatex-chicago?
     if engine != "biblatex-chicago":
         return
+    
+    # 3. Reset cite engine
+    document.header[i] = "\\cite_engine biblatex"
 
-    # 3. Set cite type
+    # 4. Set cite type
     cetype = "authoryear"
     i = find_token(document.header, "\\cite_engine_type", 0)
     if i == -1:
@@ -295,7 +297,7 @@ def revert_biblatex_chicago(document):
         cetype = get_value(document.header, "\\cite_engine_type", i)
         document.header[i] = "\\cite_engine_type authoryear"
 
-    # 4. Add authordate option if needed
+    # 5. Add authordate option if needed
     if cetype == "authoryear":
         i = find_token(document.header, "\\biblio_options", 0)
         if i != -1:
@@ -309,10 +311,10 @@ def revert_biblatex_chicago(document):
             else:
                 document.header[i+1:i+1] = ["\\biblio_options authordate"]
 
-    # 5. Set local layout
+    # 6. Set local layout
     document.append_local_layout(chicago_local_layout)
 
-    # 6. Handle special citation commands
+    # 7. Handle special citation commands
     # Specific citation insets used in biblatex that need to be reverted to ERT
     new_citations = {
         "atcite": "atcite",