[LyX/master] Correctly account for known packages

[Enrico Forestieri]

commit a956e049cb610e621c9f5e01dcb995dfecc13fb2
Author: Enrico Forestieri <for...@lyx.org>
Date:   Sun Aug 3 12:16:54 2025 +0200

    Correctly account for known packages
    
    Use LaTeXFeatures::isRequired rather than LaTeXFeatures::mustProvide.
    Amends 67938587.
---
 src/BufferParams.cpp  |  8 ++++----
 src/LaTeXFeatures.cpp | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index f26bb67bdb..d9e801e808 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -3066,15 +3066,15 @@ bool BufferParams::writeLaTeX(otexstream & os, 
LaTeXFeatures & features,
        // package-specific theorem definitions
        os << features.getThmExtraDefinitions();
 
-       // load last the unknown packages mentioned in the Require tag
-       // of layouts/custom insets
-       os << features.getUnknownPackages();
-
        // Since menukeys uses catoptions, which does some heavy changes on 
key-value options,
        // it is recommended to load menukeys as the last package (even after 
hyperref)
        if (features.isRequired("menukeys"))
                os << "\\usepackage{menukeys}\n";
 
+       // load last the unknown packages mentioned in the Require tag
+       // of layouts/custom insets
+       os << features.getUnknownPackages();
+
        docstring const i18npreamble =
                features.getTClassI18nPreamble(use_babel, use_polyglossia,
                                               use_minted);
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 59c73a8dd7..f076d917ea 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -734,7 +734,11 @@ void LaTeXFeatures::useInsetLayout(InsetLayout const & lay)
 
 bool LaTeXFeatures::isRequired(string const & name) const
 {
-       return features_.find(name) != features_.end();
+       if (features_.find(name) != features_.end()) {
+               features_loaded_.insert(name);
+               return true;
+       }
+       return false;
 }
 
 
@@ -775,11 +779,7 @@ bool LaTeXFeatures::isProvided(string const & name) const
 
 bool LaTeXFeatures::mustProvide(string const & name) const
 {
-       if (isRequired(name) && !isProvided(name)) {
-               features_loaded_.insert(name);
-               return true;
-       }
-       return false;
+       return isRequired(name) && !isProvided(name);
 }
 
 
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs