commit 8be9c8b1583869174a2a02f3287993f90acc672e
Author: Enrico Forestieri <[email protected]>
Date: Sat Aug 2 22:43:38 2025 +0200
Revert "Amend 35aa4bda"
This reverts commit 6cd54aa6db9bb77426cfcd52b6154386bb9c1da7.
---
src/LaTeXFeatures.cpp | 8 ++++++--
src/LaTeXFeatures.h | 2 ++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 6e48c15e42..bccc79ef64 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -775,7 +775,11 @@ bool LaTeXFeatures::isProvided(string const & name) const
bool LaTeXFeatures::mustProvide(string const & name) const
{
- return isRequired(name) && !isProvided(name);
+ if (isRequired(name) && !isProvided(name)) {
+ features_loaded_.insert(name);
+ return true;
+ }
+ return false;
}
@@ -1609,7 +1613,7 @@ string const LaTeXFeatures::getPackages() const
// Account for unknown packages mentioned in the Require tag
// of layouts/custom insets
for (string const & name : features_) {
- if (!mustProvide(name))
+ if (features_loaded_.find(name) == features_loaded_.end())
packages << "\\usepackage{" << name << "}\n";
}
diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index 2d6fce25ca..2909a89e94 100644
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -224,6 +224,8 @@ private:
Features features_;
/// Features that are provided
Features provides_;
+ /// Already accounted for features
+ mutable Features features_loaded_;
/// Static preamble bits, from external templates, or anywhere else
typedef std::list<TexString> SnippetList;
///
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs