[LyX/master] Amend 0f782b0d: add the required changes to lyx2lyx.

Thibaut Cuvelier tcuvelier at lyx.org
Tue Mar 23 20:06:14 UTC 2021


commit 7a1e048f448f4db587624f0e4f76ff421dd46e9e
Author: Thibaut Cuvelier <tcuvelier at lyx.org>
Date:   Tue Mar 23 21:12:34 2021 +0100

    Amend 0f782b0d: add the required changes to lyx2lyx.
---
 lib/lyx2lyx/lyx_2_4.py |   18 ++++++++++++++----
 src/version.h          |    4 ++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py
index 8d1c4d6..3fed7ee 100644
--- a/lib/lyx2lyx/lyx_2_4.py
+++ b/lib/lyx2lyx/lyx_2_4.py
@@ -4397,14 +4397,22 @@ def revert_koma_frontispiece(document):
 
 
 def revert_spellchecker_ignore(document):
-    """Revert document spellchecker disctionary"""
-    i = 0
+    """Revert document spellchecker dictionary"""
     while True:
         i = find_token(document.header, "\\spellchecker_ignore")
         if i == -1:
             return
         del document.header[i]
 
+
+def revert_docbook_mathml_prefix(document):
+    """Revert the DocBook parameter to choose the prefix for the MathML name space"""
+    while True:
+        i = find_token(document.header, "\\docbook_mathml_prefix")
+        if i == -1:
+            return
+        del document.header[i]
+
 ##
 # Conversion hub
 #
@@ -4473,10 +4481,12 @@ convert = [
            [604, []],
            [605, [convert_vcolumns2]],
            [606, [convert_koma_frontispiece]],
-           [607, []]
+           [607, []],
+           [608, []]
           ]
 
-revert =  [[606, [revert_spellchecker_ignore]],
+revert =  [[607, [revert_docbook_mathml_prefix]],
+           [606, [revert_spellchecker_ignore]],
            [605, [revert_koma_frontispiece]],
            [604, [revert_vcolumns2]],
            [603, [revert_branch_darkcols]],
diff --git a/src/version.h b/src/version.h
index cc1f2a2..aba9db0 100644
--- a/src/version.h
+++ b/src/version.h
@@ -32,8 +32,8 @@ extern char const * const lyx_version_info;
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 607 // spitz: \\spellchecker_ignore buffer param
-#define LYX_FORMAT_TEX2LYX 607
+#define LYX_FORMAT_LYX 608 // tcuvelier: \\docbook_mathml_prefix
+#define LYX_FORMAT_TEX2LYX 608
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER


More information about the lyx-cvs mailing list