commit db1270765573eafc453fe903fcfb6f9ba91f9f31
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Wed Sep 21 16:11:53 2016 +0200
Do not hardcode required packages for Note inset
This does not change the default behavior, but allows to customize it.
---
lib/layouts/stdinsets.inc | 2 ++
src/insets/InsetNote.cpp | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index c5bf68d..06ab62c 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -115,6 +115,7 @@ InsetLayout Note:Comment
LabelString Comment
LatexType environment
LatexName comment
+ Requires verbatim
BgColor commentbg
LabelFont
Color comment
@@ -150,6 +151,7 @@ InsetLayout Note:Greyedout
LabelString Greyedout
LatexType environment
LatexName lyxgreyedout
+ Requires color,lyxgreyedout
BgColor greyedoutbg
Font
Color greyedouttext
diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index a2916fd..d5e7fb3 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -328,15 +328,15 @@ void InsetNote::validate(LaTeXFeatures & features) const
{
switch (params_.type) {
case InsetNoteParams::Comment:
- features.require("verbatim");
if (features.runparams().flavor == OutputParams::HTML)
// we do output this but set display to "none" by
default,
// but people might want to use it.
InsetCollapsable::validate(features);
+ else
+ // Only do the requires
+ features.useInsetLayout(getLayout());
break;
case InsetNoteParams::Greyedout:
- features.require("color");
- features.require("lyxgreyedout");
InsetCollapsable::validate(features);
break;
case InsetNoteParams::Note:
