ctests: uninvert two xhtml tests

[features.git] / lib / lyx2lyx / lyx_1_5.py

diff --git a/lib/lyx2lyx/lyx_1_5.py b/lib/lyx2lyx/lyx_1_5.py
index c1d152127654e4ee1c902a4930779f16d99be005..4b0fd5cfbbe55ca083e020f787782482c8b35c94 100644 (file)
--- a/lib/lyx2lyx/lyx_1_5.py
+++ b/lib/lyx2lyx/lyx_1_5.py
@@ -24,6 +24,7 @@ import unicodedata
 import sys, os
 
 from parser_tools import find_re, find_token, find_token_backwards, find_token_exact, find_tokens, find_end_of, get_value, find_beginning_of, find_nonempty_line
+from lyx2lyx_tools import insert_document_option
 from LyX import get_encoding
 
 # Provide support for both python 2 and 3
@@ -420,7 +421,7 @@ def revert_unicode_line(document, i, insets, spec_chars, replacement_character =
                     else:
                         if insets and insets[-1] == "Formula":
                             # avoid putting an ERT in a math; instead put command as text
-                            command = command.replace('\\\\', '\mathrm{')
+                            command = command.replace('\\\\', r'\mathrm{')
                             command = command + '}'
                         elif not insets or insets[-1] != "ERT":
                             # add an ERT inset with the replacement character
@@ -490,7 +491,7 @@ def revert_cs_label(document):
 
 
 def convert_bibitem(document):
-    """ Convert
+    r""" Convert
 \bibitem [option]{argument}
 
 to
@@ -575,16 +576,16 @@ commandparams_info = {
 def convert_commandparams(document):
     """ Convert
 
- \begin_inset LatexCommand \cmdname[opt1][opt2]{arg}
- \end_inset
+ \\begin_inset LatexCommand \\cmdname[opt1][opt2]{arg}
+ \\end_inset
 
  to
 
- \begin_inset LatexCommand cmdname
+ \\begin_inset LatexCommand cmdname
  name1 "opt1"
  name2 "opt2"
  name3 "arg"
- \end_inset
+ \\end_inset
 
  name1, name2 and name3 can be different for each command.
 """
@@ -895,7 +896,7 @@ def revert_cleardoublepage(document):
 
 
 def convert_lyxline(document):
-    " remove fontsize commands for \lyxline "
+    r" remove fontsize commands for \lyxline "
     # The problematic is: The old \lyxline definition doesn't handle the fontsize
     # to change the line thickness. The new definiton does this so that imported
     # \lyxlines would have a different line thickness. The eventual fontsize command
@@ -1686,7 +1687,7 @@ def revert_CJK(document):
 
 
 def revert_preamble_listings_params(document):
-    " Revert preamble option \listings_params "
+    r" Revert preamble option \listings_params "
     i = find_token(document.header, "\\listings_params", 0)
     if i != -1:
         document.preamble.append('\\usepackage{listings}')
@@ -1907,13 +1908,7 @@ def revert_ext_font_sizes(document):
 
     i = find_token(document.header, '\\paperfontsize', 0)
     document.header[i] = '\\paperfontsize default'
-
-    i = find_token(document.header, '\\options', 0)
-    if i == -1:
-        i = find_token(document.header, '\\textclass', 0) + 1
-        document.header[i:i] = ['\\options %s' % fontsize]
-    else:
-        document.header[i] += ',%s' % fontsize
+    insert_document_option(document, fontsize)
 
 
 def convert_ext_font_sizes(document):
@@ -2010,10 +2005,10 @@ def convert_arabic (document):
             document.header[i] = "\\language arabic_arabtex"
     i = 0
     while i < len(document.body):
-        h = document.body[i].find("\lang arabic", 0, len(document.body[i]))
+        h = document.body[i].find(r"\lang arabic", 0, len(document.body[i]))
         if (h != -1):
             # change the language name
-            document.body[i] = '\lang arabic_arabtex'
+            document.body[i] = r'\lang arabic_arabtex'
         i = i + 1
 
 
@@ -2025,10 +2020,10 @@ def revert_arabic (document):
             document.header[i] = "\\language arabic"
     i = 0
     while i < len(document.body):
-        h = document.body[i].find("\lang arabic_arabtex", 0, len(document.body[i]))
+        h = document.body[i].find(r"\lang arabic_arabtex", 0, len(document.body[i]))
         if (h != -1):
             # change the language name
-            document.body[i] = '\lang arabic'
+            document.body[i] = r'\lang arabic'
         i = i + 1