From e38b581bcb69f0ec06c5b8487f644560bf5e6d50 Mon Sep 17 00:00:00 2001
From: Martin Vermeer <martin.vermeer@hut.fi>
Date: Wed, 22 Aug 2007 18:55:03 +0000
Subject: [PATCH] add preamble snippets to charstyles

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19732 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/layouts/stdcharstyles.inc   | 5 ++++-
 src/insets/InsetCharStyle.cpp   | 9 ---------
 src/insets/InsetCharStyle.h     | 2 --
 src/insets/InsetCollapsable.cpp | 9 +++++++++
 src/insets/InsetCollapsable.h   | 2 ++
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/lib/layouts/stdcharstyles.inc b/lib/layouts/stdcharstyles.inc
index c3f6b84c0f..5e3f687bfe 100644
--- a/lib/layouts/stdcharstyles.inc
+++ b/lib/layouts/stdcharstyles.inc
@@ -2,7 +2,7 @@
 # Author : Martin vermeer <amrtin.vermeer@hut.fi>
 # Character Styles definition
 
-Format 4
+Format 5
 InsetLayout CharStyle:Noun
 	LyxType               charstyle
 	LabelString           noun
@@ -11,6 +11,9 @@ InsetLayout CharStyle:Noun
 	Font
 	  Shape               Smallcaps
 	EndFont
+	Preamble
+	\newcommand{\noun}[1]{\textsc{#1}}
+	EndPreamble
 End
 
 
diff --git a/src/insets/InsetCharStyle.cpp b/src/insets/InsetCharStyle.cpp
index 3e38f8796e..c163f49112 100644
--- a/src/insets/InsetCharStyle.cpp
+++ b/src/insets/InsetCharStyle.cpp
@@ -22,7 +22,6 @@
 #include "FuncStatus.h"
 #include "Cursor.h"
 #include "gettext.h"
-#include "LaTeXFeatures.h"
 #include "Color.h"
 #include "Lexer.h"
 #include "Text.h"
@@ -242,14 +241,6 @@ void InsetCharStyle::textString(Buffer const & buf, odocstream & os) const
 }
 
 
-void InsetCharStyle::validate(LaTeXFeatures & features) const
-{
-	// Force inclusion of preamble snippet in layout file
-	features.require(layout_.latexname);
-	InsetText::validate(features);
-}
-
-
 void InsetCharStyleParams::write(ostream & os) const
 {
 	os << "CharStyle " << name << "\n";
diff --git a/src/insets/InsetCharStyle.h b/src/insets/InsetCharStyle.h
index dc264ae494..cb491bc986 100644
--- a/src/insets/InsetCharStyle.h
+++ b/src/insets/InsetCharStyle.h
@@ -76,8 +76,6 @@ public:
 		    OutputParams const &) const;
 	/// the string that is passed to the TOC
 	virtual void textString(Buffer const &, odocstream &) const;
-	///
-	void validate(LaTeXFeatures &) const;
 
 	///
 	InsetCharStyleParams const & params() const { return params_; }
diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 4108be2393..16027b444d 100644
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -24,6 +24,7 @@
 #include "FuncStatus.h"
 #include "gettext.h"
 #include "Color.h"
+#include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "FuncRequest.h"
 #include "MetricsInfo.h"
@@ -651,4 +652,12 @@ int InsetCollapsable::latex(Buffer const & buf, odocstream & os,
 }
 
 
+void InsetCollapsable::validate(LaTeXFeatures & features) const
+{
+	// Force inclusion of preamble snippet in layout file
+	features.addPreambleSnippet(layout_.preamble);
+	InsetText::validate(features);
+}
+
+
 } // namespace lyx
diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index 901c480d87..765d879ccb 100644
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -133,6 +133,8 @@ public:
 	///
 	int latex(Buffer const &, odocstream &,
 		  OutputParams const &) const;
+	///
+	void validate(LaTeXFeatures &) const;
 
 protected:
 	///
-- 
2.39.2