[LyX/2.3.x] Cmake lyx2lyx tests: Correct use of value for \use_non_tex_fonts

[Kornel Benko]

commit db5fb78cfd16f53d1c94845a7db9ba24e4f5e205
Author: Kornel Benko <kor...@lyx.org>
Date:   Sat Jan 5 08:34:00 2019 +0100

    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.
    
    (cherry picked from commit c9e62dec53aee97fff6dffcb6d8ef84331ba5c30)
---
 development/autotests/export.cmake |    2 +-
 development/autotests/lyxStatus.pm |   20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/development/autotests/export.cmake 
b/development/autotests/export.cmake
index 4c803bc..1f53e21 100755
--- a/development/autotests/export.cmake
+++ b/development/autotests/export.cmake
@@ -68,7 +68,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 d1c5b56..21bcceb 100644
--- 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];
@@ -144,6 +147,13 @@ sub newMatch(%)
   if (! defined($elem{"fileidx"})) {
     $elem{"fileidx"} = 1;
   }
+  if (exists($elem{"search"})) {
+    my $ref = ref($elem{"search"});
+    diestack("Wrong or invalid regex (ref == $ref) specified") if ($ref ne 
"Regexp");
+  }
+  else {
+    diestack("No search defined");
+  }
   diestack("No result defined") if (! defined($elem{"result"}));
   return(\%elem);
 }
@@ -213,10 +223,12 @@ sub checkForHeader($)
        push(@rElems, $elem, $elem1, $elem2);
       }
     }
-    my $elemntf = newMatch("search" => '^\\\\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" =>  '^\\\\inputencoding\s+(' . 
$inputEncoding->{search} . ')',
                              "filetype" => "replace_only",