Allow defaultfamily change with non_TeX fonts (#12608)

diff --git a/development/FORMAT b/development/FORMAT
index ba4ea20f71217ff2ebf31e068122fdfae0888e70..1003fa07741fa483a4b0debd227e5afd735ed700 100644 (file)
--- a/development/FORMAT
+++ b/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:

diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py
index e75cdbf2c4bcfb2f69337deff03fc7043340ba3a..e0db0d60091d29b9f76253fa2f0197efa1fbfd10 100644 (file)
--- a/lib/lyx2lyx/lyx_2_4.py
+++ b/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)
@@ -4617,7 +4619,25 @@ def convert_starred_refs(document):
         newlineat = end - 2
         document.body.insert(newlineat, "nolink \"false\"")
         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]],

diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp
index beaed5cf9b7edd9a3bb84faedd3700e58783dc94..6a6221915eb722e2ab8d1bc087097ef15aaf9179 100644 (file)
--- a/src/frontends/qt/GuiDocument.cpp
+++ b/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,11 +3862,8 @@ 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()];
+       bp_.fonts_default_family = GuiDocument::fontfamilies[
+               fontModule->fontsDefaultCO->currentIndex()];
 
        if (fontModule->fontsizeCO->currentIndex() == 0)
                bp_.fontsize = "default";

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index 661dd30e6483a936631ac63abd6eb63efee5f289..fa59b3f976200de1b4c93ad39cdc32f6bbf11275 100644 (file)
--- a/src/tex2lyx/test/CJK.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx
index a09ffde8d0104d4e18265208ab247778d92344c3..050689e5adcd8d865ae6d7bc259d3a9de8b8cfad 100644 (file)
--- a/src/tex2lyx/test/CJKutf8.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/DummyDocument.lyx.lyx b/src/tex2lyx/test/DummyDocument.lyx.lyx
index 37322e8a8952f2cdbfd5a870685668c70b00272d..8bb9ae29f54f6b40f82b3a6e55f4dfdfafad7988 100644 (file)
--- a/src/tex2lyx/test/DummyDocument.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/Dummy~Document.lyx.lyx b/src/tex2lyx/test/Dummy~Document.lyx.lyx
index 7386c081e7198bf206233af7eaf9d072281a8f03..54b14ccccbd42a35b9c44bf38d3027024bbf8159 100644 (file)
--- a/src/tex2lyx/test/Dummy~Document.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
index 234b7f8552a84aa4bd3420cd56f940410f2e30d9..0e392bfdd071b3f05f3b58d4c5a876fe45a2c32f 100644 (file)
--- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx
index 0edbb2f1e61b8cfd220c008064881f968ee01a1e..843262cddd514c8c20ae1eccf4850e9ff0f5ba5c 100644 (file)
--- a/src/tex2lyx/test/algo2e.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/beamer.lyx.lyx b/src/tex2lyx/test/beamer.lyx.lyx
index 3a96a2fb3777a6228156928de0469b557ed04141..55f6297b16b0ae9470f1241e76a03415c651a38c 100644 (file)
--- a/src/tex2lyx/test/beamer.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
index bac468ff2b68f8f320fe09f3ea3ae8ab8f7c90bf..5631c946161bfe680c04cafd9798643f26f49bf2 100644 (file)
--- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/listpreamble.lyx.lyx b/src/tex2lyx/test/listpreamble.lyx.lyx
index 678320a836b11d39c41df4f9d4459b1b68dcb678..ac5850a09f727251eefdaf1211788b83d28eafb1 100644 (file)
--- a/src/tex2lyx/test/listpreamble.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/tabular-x-test.lyx.lyx b/src/tex2lyx/test/tabular-x-test.lyx.lyx
index 542e131ffcca0c148d909353d935c07207a73933..13ab5f440be0de8942635d0879d6ae269f91e58f 100644 (file)
--- a/src/tex2lyx/test/tabular-x-test.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/test-insets-basic.lyx.lyx b/src/tex2lyx/test/test-insets-basic.lyx.lyx
index 4c9f57ec976de7bfaace8d3afb7c914c73039dc7..da3150e96e1c5a3c2501491a9b3d4152658d2581 100644 (file)
--- a/src/tex2lyx/test/test-insets-basic.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx
index c8596257cee19a69d28ddf936f6ffdee8f40314f..dc30a2169ec1573a061d29c822dcc1cc9e6a00a6 100644 (file)
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/test-memoir.lyx.lyx b/src/tex2lyx/test/test-memoir.lyx.lyx
index 980c3eaa6ea11750ffe5b0b0b48618731278640c..b58641fb48f15bc3265c59334aa6f4126ec5ec53 100644 (file)
--- a/src/tex2lyx/test/test-memoir.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/test-minted.lyx.lyx b/src/tex2lyx/test/test-minted.lyx.lyx
index a9f621a393431204c4dbb23af436e444268d6c82..6e470f478b1f9a3f1384a31b0eb7e81cc0601153 100644 (file)
--- a/src/tex2lyx/test/test-minted.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/test-modules.lyx.lyx b/src/tex2lyx/test/test-modules.lyx.lyx
index f54592b856132bfc37426aebd5e4952e7f2329e0..2445b75986a352304572770da13de9587612d110 100644 (file)
--- a/src/tex2lyx/test/test-modules.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
index 3fb61a2610c3a30cc58405c719d9870477278861..c86ea68bea7ad9cfc712a4914097d11a33849516 100644 (file)
--- a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/test-scr.lyx.lyx b/src/tex2lyx/test/test-scr.lyx.lyx
index e13e9b86bce7329e0f8bdb782cec7efa3fd67583..f49e9018f4a443073095681a68f87d60901329f2 100644 (file)
--- a/src/tex2lyx/test/test-scr.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx
index 9997030332799d51d7b262ffb680b025c83d58f1..b47591bb0ed1bee33245d889b721e43b492e4567 100644 (file)
--- a/src/tex2lyx/test/test-structure.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx
index 8b1d6fd1fe5140df02eda42f065e296bcab4d144..8484f04213ff78535213534fc87e62589231205d 100644 (file)
--- a/src/tex2lyx/test/test.lyx.lyx
+++ b/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

diff --git a/src/tex2lyx/test/verbatim.lyx.lyx b/src/tex2lyx/test/verbatim.lyx.lyx
index 35c5651889245f2194688df44b0f027a45918953..c3b4dffc0214ded11ef4f81e3c983ec440785929 100644 (file)
--- a/src/tex2lyx/test/verbatim.lyx.lyx
+++ b/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

diff --git a/src/version.h b/src/version.h
index a643509834c62a3328ef549b7041b74548eef4ce..c14f36db626382c2106a95601b433e7017c9200d 100644 (file)
--- 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 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