Cmake lyx2lyx tests: Correct use of value for \use_non_tex_fonts

Amend eec3d1eb,7568571a
We are trying to check if the resulting file after lyx2lyx
is compilable, we have to ensure that copying the original file
to the test directory does not mangle use_non_tex_fonts-entry.

diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake
index 9ce8f298ce04f67fc4b57c621daa13de7d584c54..833231b278a59b34d4dc10fc65449bf96e7608e5 100755 (executable)
--- a/development/autotests/export.cmake
+++ b/development/autotests/export.cmake
@@ -69,7 +69,7 @@ else()
   set(LYX_SOURCE "${TempDir}/${file}.lyx")
   message(STATUS "Using source \"${LYX_ROOT}/${file}.lyx\"")
   message(STATUS "Using dest \"${LYX_SOURCE}\"")
-  execute_process(COMMAND ${PERL_EXECUTABLE} "${Perl_Script}" "${LYX_ROOT}/${file}.lyx" "${LYX_SOURCE}" ${format} "default" "default" ${LanguageFile}
+  execute_process(COMMAND ${PERL_EXECUTABLE} "${Perl_Script}" "${LYX_ROOT}/${file}.lyx" "${LYX_SOURCE}" ${format} "dontChange" "default" ${LanguageFile}
     RESULT_VARIABLE _err)
   string(COMPARE EQUAL  ${_err} 0 _erg)
   if(NOT _erg)

diff --git a/development/autotests/lyxStatus.pm b/development/autotests/lyxStatus.pm
index ce4c85d8b4ec1b094b9e0593f5e5cafa3663e237..3fd5cef6210d55205d2c8af0c6651cacda4494a3 100644 (file)
--- a/development/autotests/lyxStatus.pm
+++ b/development/autotests/lyxStatus.pm
@@ -56,6 +56,9 @@ sub initLyxStack($$$)
   if ($_[1] eq "systemF") {
     $useNonTexFont = "true";
   }
+  elsif ($_[1] eq "dontChange") {
+    $useNonTexFont = "dontChange";
+  }
   else {
     $useNonTexFont = "false";
     $inputEncoding = $_[2];
@@ -220,10 +223,12 @@ sub checkForHeader($)
        push(@rElems, $elem, $elem1, $elem2);
       }
     }
-    my $elemntf = newMatch("search" => qr/^\\use_non_tex_fonts\s+(false|true)/,
-                           "filetype" => "replace_only",
-                           "result" => ["\\use_non_tex_fonts $useNonTexFont"]);
-    push(@rElems, $elemntf);
+    if ($useNonTexFont ne "dontChange") {
+      my $elemntf = newMatch("search" => qr/^\\use_non_tex_fonts\s+(false|true)/,
+                             "filetype" => "replace_only",
+                             "result" => ["\\use_non_tex_fonts $useNonTexFont"]);
+      push(@rElems, $elemntf);
+    }
     if (defined($inputEncoding)) {
       my $inputenc = newMatch("search" =>  qr/^\\inputencoding\s+($inputEncoding->{search})/,
                              "filetype" => "replace_only",