namespace lyx {
-InsetCaption::InsetCaption(InsetCaption const & ic)
- : InsetText(ic), textclass_(ic.textclass_)
+InsetCaption::InsetCaption(Buffer const & buf)
+ : InsetText(buf)
{
setAutoBreakRows(true);
setDrawFrame(true);
setFrameColor(Color_captionframe);
-}
-
-
-InsetCaption::InsetCaption(BufferParams const & bp)
- : InsetText(bp), textclass_(bp.textClass())
-{
- setAutoBreakRows(true);
- setDrawFrame(true);
- setFrameColor(Color_captionframe);
- //FIXME Do we need to set all paragraphs here? or will there
- //always only be one?
- paragraphs().back().setLayout(bp.textClass().emptyLayout());
+ // There will always be only one
+ paragraphs().back().setLayout(buf.params().documentClass().emptyLayout());
}
int InsetCaption::latex(odocstream & os,
OutputParams const & runparams_in) const
{
+ if (in_subfloat_)
+ // caption is output as an optional argument
+ return 0;
// This is a bit too simplistic to take advantage of
// caption options we must add more later. (Lgb)
// This code is currently only able to handle the simple
void InsetCaption::updateLabels(ParIterator const & it)
{
- TextClass const & tclass = buffer().params().textClass();
+ DocumentClass const & tclass = buffer().params().documentClass();
Counters & cnts = tclass.counters();
string const & type = cnts.current_float();
// Memorize type for addToToc().
type_ = type;
+ in_subfloat_ = cnts.isSubfloat();
if (type.empty())
full_label_ = buffer().B_("Senseless!!! ");
else {
name = buffer().B_("Listing");
else
name = buffer().B_(tclass.floats().getType(type).name());
- if (cnts.hasCounter(from_utf8(type))) {
- cnts.step(from_utf8(type));
+ docstring counter = from_utf8(type);
+ if (in_subfloat_) {
+ counter = "sub-" + from_utf8(type);
+ name = bformat(_("Sub-%1$s"),
+ buffer().B_(tclass.floats().getType(type).name()));
+ }
+ if (cnts.hasCounter(counter)) {
+ cnts.step(counter);
full_label_ = bformat(from_ascii("%1$s %2$s:"),
- name,
- cnts.theCounter(from_utf8(type)));
+ name,
+ cnts.theCounter(counter));
} else
full_label_ = bformat(from_ascii("%1$s #:"), name);
}
}
-Inset * InsetCaption::clone() const
-{
- return new InsetCaption(*this);
-}
-
-
} // namespace lyx