Add \nospellcheck font property

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

diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py
index 17821ec80bdde174b1736d1ab68fc20b71938a4f..941703a163a499879c53a97a1ad7cfba0302a556 100644 (file)
--- a/lib/lyx2lyx/lyx_2_4.py
+++ b/lib/lyx2lyx/lyx_2_4.py
@@ -170,12 +170,49 @@ def revert_lscape(document):
             i += 1
             continue
 
-        document.body[j - 2 : j + 1] = put_cmd_in_ert("\\end{landscape}")
-        document.body[i : i + 4] = put_cmd_in_ert("\\begin{landscape}")
+        if document.body[i] == "\\begin_inset Flex Landscape (Floating)":
+            document.body[j - 2 : j + 1] = put_cmd_in_ert("\\end{landscape}}")
+            document.body[i : i + 4] = put_cmd_in_ert("\\afterpage{\\begin{landscape}")
+            add_to_preamble(document, ["\\usepackage{afterpage}"])
+        else:
+            document.body[j - 2 : j + 1] = put_cmd_in_ert("\\end{landscape}")
+            document.body[i : i + 4] = put_cmd_in_ert("\\begin{landscape}")
+
         add_to_preamble(document, ["\\usepackage{pdflscape}"])
         # no need to reset i
 
 
+def convert_fontenc(document):
+    " Convert default fontenc setting "
+
+    i = find_token(document.header, "\\fontencoding global", 0)
+    if i == -1:
+        return
+
+    document.header[i] = document.header[i].replace("global", "auto")
+
+
+def revert_fontenc(document):
+    " Revert default fontenc setting "
+
+    i = find_token(document.header, "\\fontencoding auto", 0)
+    if i == -1:
+        return
+
+    document.header[i] = document.header[i].replace("auto", "global")
+
+
+def revert_nospellcheck(document):
+    " Remove nospellcheck font info param "
+
+    i = 0
+    while True:
+        i = find_token(document.body, '\\nospellcheck', i)
+        if i == -1:
+            return
+        del document.body[i]
+
+
 ##
 # Conversion hub
 #
@@ -185,10 +222,16 @@ convert = [
            [545, [convert_lst_literalparam]],
            [546, []],
            [547, []],
-           [548, []]
+           [548, []],
+           [549, []],
+           [550, [convert_fontenc]],
+           [551, []]
           ]
 
 revert =  [
+           [549, [revert_nospellcheck]],
+           [549, [revert_fontenc]],
+           [548, []],# dummy format change
            [547, [revert_lscape]],
            [546, [revert_xcharter]],
            [545, [revert_paratype]],