Allow defaultfamily change with non_TeX fonts (#12608)

development/FORMAT

@@ -7,6 +7,9 @@ changes happened in particular if possible. A good example would be
 
 -----------------------
 
+2022-12-11 Jürgen Spitzmüller <spitz@lyx.org> 
+	* Format incremented to 613: Support \\fonts_default_family for non-TeX fonts.
+
 2022-12-04 Daniel Ramöller <d.lyx@web.de>
 	* Format incremented to 612: Implement support for starred crossref commands (with
 	  hyperref) which suppress links:

lib/lyx2lyx/lyx_2_4.py

@@ -4540,6 +4540,7 @@ def revert_index_macros(document):
             
 
 def revert_starred_refs(document):
+    " Revert starred refs "
     i = find_token(document.header, "\\use_hyperref true", 0)
     use_hyperref = (i != -1)
     i = 0
@@ -4604,6 +4605,7 @@ def revert_starred_refs(document):
 
 
 def convert_starred_refs(document):
+    " Convert inset index macros "
     i = 0
     while True:
         i = find_token(document.body, "\\begin_inset CommandInset ref", i)
@@ -4619,6 +4621,24 @@ def convert_starred_refs(document):
         i = end + 1
 
 
+def revert_familydefault(document):
+    " Revert \\font_default_family for non-TeX fonts "
+
+    if find_token(document.header, "\\use_non_tex_fonts true", 0) == -1:
+        return
+ 
+    i = find_token(document.header, "\\font_default_family", 0)
+    if i == -1:
+        document.warning("Malformed LyX document: Can't find \\font_default_family header")
+        return
+ 
+    dfamily = get_value(document.header, "\\font_default_family", i)
+    if dfamily == "default":
+        return
+        
+    document.header[i] = "\\font_default_family default"
+    add_to_preamble(document, ["\\renewcommand{\\familydefault}{\\" + dfamily + "}"])
+        
 ##
 # Conversion hub
 #
@@ -4692,10 +4712,12 @@ convert = [
            [609, []],
            [610, []],
            [611, []],
-           [612, [convert_starred_refs]]
+           [612, [convert_starred_refs]],
+           [613, []]
           ]
 
-revert =  [[611, [revert_starred_refs]],
+revert =  [[612, [revert_familydefault]],
+           [611, [revert_starred_refs]],
            [610, []],
            [609, [revert_index_macros]],
            [608, [revert_document_metadata]],

src/frontends/qt/GuiDocument.cpp

@@ -2448,8 +2448,6 @@ void GuiDocument::osFontsChanged(bool nontexfonts)
 	langModule->encodingCO->setEnabled(tex_fonts);
 	inputencodingToDialog();
 
-	fontModule->fontsDefaultCO->setEnabled(tex_fonts);
-	fontModule->fontsDefaultLA->setEnabled(tex_fonts);
 	fontModule->cjkFontLE->setEnabled(tex_fonts);
 	fontModule->cjkFontLA->setEnabled(tex_fonts);
 
@@ -3864,9 +3862,6 @@ void GuiDocument::applyView()
 	bp_.fonts_sans_osf = fontModule->fontSansOsfCB->isChecked();
 	bp_.fonts_typewriter_osf = fontModule->fontTypewriterOsfCB->isChecked();
 
-	if (nontexfonts)
-		bp_.fonts_default_family = "default";
-	else
 	bp_.fonts_default_family = GuiDocument::fontfamilies[
 		fontModule->fontsDefaultCO->currentIndex()];
 

src/tex2lyx/test/CJK.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/CJKutf8.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/DummyDocument.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/Dummy~Document.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/algo2e.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/beamer.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/box-color-size-space-align.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/listpreamble.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/tabular-x-test.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/test-insets-basic.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/test-insets.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/test-memoir.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/test-minted.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/test-modules.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/test-refstyle-theorems.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/test-scr.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/test-structure.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/test.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

src/tex2lyx/test/verbatim.lyx.lyx

@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 612
+\lyxformat 613
 \begin_document
 \begin_header
 \save_transient_properties true

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 612 // RKH & DR: Starred cross-references
-#define LYX_FORMAT_TEX2LYX 612
+#define LYX_FORMAT_LYX 613 // spitz: \defaultfamily for non-TeX fonts
+#define LYX_FORMAT_TEX2LYX 613
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER