]> git.lyx.org Git - features.git/commitdiff
Allow use of InsetLayout with InsetCaption.
authorRichard Heck <rgheck@comcast.net>
Mon, 14 Dec 2009 17:15:32 +0000 (17:15 +0000)
committerRichard Heck <rgheck@comcast.net>
Mon, 14 Dec 2009 17:15:32 +0000 (17:15 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32533 a592a061-630c-0410-9148-cb99ea01b6c8

src/insets/InsetCaption.cpp
src/insets/InsetCaption.h

index 7f96e35433c894d804b33572fbfef44c474c8666..7eb0889dd708cee78bab6c01e0d7a5f017ab16e4 100644 (file)
@@ -64,6 +64,14 @@ void InsetCaption::write(ostream & os) const
 }
 
 
+docstring InsetCaption::name() const
+{
+       if (type_.empty())
+               return from_ascii("Caption");
+       return from_utf8("Caption:" + type_);
+}
+
+
 void InsetCaption::read(Lexer & lex)
 {
 #if 0
@@ -256,7 +264,11 @@ docstring InsetCaption::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 {
        if (rp.html_disable_captions)
                return docstring();
-       xs << StartTag("div", "class='float-caption'");
+       string attr = "class='float-caption";
+       if (!type_.empty())
+               attr += " float-caption-" + type_;
+       attr += "'";
+       xs << StartTag("div", attr);
        docstring def = getCaptionAsHTML(xs, rp);
        xs << EndTag("div");
        return def;
index 3686ec21951e569893e19a4cd83aa7779697bd95..81eee6ee12cdcf674210f68726e2e38a49c031d5 100644 (file)
@@ -13,6 +13,7 @@
 #define INSETCAPTION_H
 
 #include "InsetText.h"
+#include "support/strfwd.h"
 
 namespace lyx {
 
@@ -24,6 +25,8 @@ public:
        InsetCaption(Buffer *);
        ///
        std::string const & type() const { return type_; }
+       ///
+       docstring name() const;
        /// return the mandatory argument (LaTeX format) only
        int getArgument(odocstream & os, OutputParams const &) const;
        /// return the optional argument(s) only