Fix off by one error

Looks like I forgot to test this case without quotes, but fortunately the new
export test found it.

diff --git a/development/autotests/revertedTests b/development/autotests/revertedTests
index bc385c79ab05f05d1e52a6a73ab69d6011f5b8f6..5619e40d9cdfeed33bbfc046d9294eede0ad6a4e 100644 (file)
--- a/development/autotests/revertedTests
+++ b/development/autotests/revertedTests
@@ -218,7 +218,6 @@ export/mathmacros/testcases_master_child_.*
 export/mathmacros/testcases_speed_(dvi|pdf|pdf[23]|(dvi3|pdf[45])_(texF|systemF))
 
 # Language nesting, document is OK, fails because of a bug in LyX
-export/export/languagenesting1_lyx16 
 export/export/languagenesting1_dvi
 export/export/languagenesting1_pdf
 export/export/languagenesting1_pdf2

diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py
index b9ea26038282b47cc893af11477fb7e1d6067a8c..7e92c665f4117aa9b124cc14c8785b5846cea6a5 100644 (file)
--- a/lib/lyx2lyx/lyx_2_2.py
+++ b/lib/lyx2lyx/lyx_2_2.py
@@ -2105,9 +2105,9 @@ def revert_fontsettings(document):
                 document.header[i:i+1] = [f + ' ' + line[q1+1:q2]]
         else:
             if use_non_tex_fonts == "true":
-                document.header[i:i+1] = [f + ' ' + line.split()[2]]
-            else:
                 document.header[i:i+1] = [f + ' ' + line.split()[1]]
+            else:
+                document.header[i:i+1] = [f + ' ' + line.split()[0]]
         j = j + 1