#include "Buffer.h"
#include "BufferParams.h"
+#include "BufferView.h"
#include "Counters.h"
#include "Cursor.h"
-#include "BufferView.h"
+#include "Dimension.h"
#include "Floating.h"
#include "FloatList.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
-#include "gettext.h"
-#include "Color.h"
+#include "support/gettext.h"
+#include "InsetList.h"
#include "MetricsInfo.h"
#include "output_latex.h"
#include "OutputParams.h"
#include "Paragraph.h"
#include "paragraph_funcs.h"
+#include "TextClass.h"
#include "TocBackend.h"
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
#include "support/lstrings.h"
-#include "support/convert.h"
#include <sstream>
-
-using std::auto_ptr;
-using std::endl;
-using std::string;
-using std::ostream;
-
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::bformat;
InsetCaption::InsetCaption(InsetCaption const & ic)
: InsetText(ic), textclass_(ic.textclass_)
{
setAutoBreakRows(true);
setDrawFrame(true);
- setFrameColor(Color::captionframe);
+ setFrameColor(Color_captionframe);
}
+
InsetCaption::InsetCaption(BufferParams const & bp)
: InsetText(bp), textclass_(bp.getTextClass())
{
setAutoBreakRows(true);
setDrawFrame(true);
- setFrameColor(Color::captionframe);
+ setFrameColor(Color_captionframe);
+ //FIXME Do we need to set all paragraphs here? or will there
+ //always only be one?
+ paragraphs().back().layout(bp.getTextClass().emptyLayout());
}
void InsetCaption::setCustomLabel(docstring const & label)
{
- if (!support::isAscii(label) || label.empty())
+ if (!isAscii(label) || label.empty())
// This must be a user defined layout. We cannot translate
// this, since gettext accepts only ascii keys.
custom_label_ = label;
}
-void InsetCaption::addToToc(TocList & toclist, Buffer const & buf, ParConstIterator const &) const
+void InsetCaption::addToToc(Buffer const & buf,
+ ParConstIterator const & cpit) const
{
if (type_.empty())
return;
- ParConstIterator pit = par_const_iterator_begin(*this);
+ ParConstIterator pit = cpit;
+ pit.push_back(*this);
- Toc & toc = toclist[type_];
+ Toc & toc = buf.tocBackend().toc(type_);
docstring const str = full_label_ + ". " + pit->asString(buf, false);
toc.push_back(TocItem(pit, 0, str));
}
-bool InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
{
- int const width_offset = TEXT_TO_INSET_OFFSET / 2;
- mi.base.textwidth -= width_offset;
-
+ FontInfo tmpfont = mi.base.font;
+ mi.base.font = mi.base.bv->buffer().params().getFont().fontInfo();
labelwidth_ = theFontMetrics(mi.base.font).width(full_label_);
// add some space to separate the label from the inset text
labelwidth_ += 2 * TEXT_TO_INSET_OFFSET;
dim.wid = labelwidth_;
Dimension textdim;
- InsetText::metrics(mi, textdim);
- // Correct for button width, and re-fit
+ // Correct for button and label width
mi.base.textwidth -= dim.wid;
InsetText::metrics(mi, textdim);
- dim.des = std::max(dim.des - textdim.asc + dim.asc, textdim.des);
+ mi.base.font = tmpfont;
+ mi.base.textwidth += dim.wid;
+ dim.des = max(dim.des - textdim.asc + dim.asc, textdim.des);
dim.asc = textdim.asc;
dim.wid += textdim.wid;
- dim.asc += TEXT_TO_INSET_OFFSET;
- dim.des += TEXT_TO_INSET_OFFSET;
- dim.wid += width_offset;
- mi.base.textwidth += width_offset;
- bool const changed = dim_ != dim;
- dim_ = dim;
- return changed;
}
// Answer: the text inset (in buffer_funcs.cpp: setCaption).
- labelwidth_ = pi.pain.text(x, y, full_label_, pi.base.font);
- // add some space to separate the label from the inset text
- labelwidth_ += 2 * TEXT_TO_INSET_OFFSET;
+ FontInfo tmpfont = pi.base.font;
+ pi.base.font = pi.base.bv->buffer().params().getFont().fontInfo();
+ pi.pain.text(x, y, full_label_, pi.base.font);
InsetText::draw(pi, x + labelwidth_, y);
- setPosCache(pi, x, y);
-}
-
-
-void InsetCaption::drawSelection(PainterInfo & pi, int x, int y) const
-{
- InsetText::drawSelection(pi, x + labelwidth_, y);
+ pi.base.font = tmpfont;
}
-void InsetCaption::edit(Cursor & cur, bool left)
+void InsetCaption::edit(Cursor & cur, bool front, EntryDirection entry_from)
{
cur.push(*this);
- InsetText::edit(cur, left);
+ InsetText::edit(cur, front, entry_from);
}
}
-bool InsetCaption::insetAllowed(Inset::Code code) const
+bool InsetCaption::insetAllowed(InsetCode code) const
{
switch (code) {
case FLOAT_CODE:
case TABULAR_CODE:
case WRAP_CODE:
case CAPTION_CODE:
- case PAGEBREAK_CODE:
+ case NEWPAGE_CODE:
+ case MATHMACRO_CODE:
return false;
default:
return InsetText::insetAllowed(code);
switch (cmd.action) {
case LFUN_BREAK_PARAGRAPH:
- case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
case LFUN_BREAK_PARAGRAPH_SKIP:
status.enabled(false);
return true;
case LFUN_OPTIONAL_INSERT:
- status.enabled(numberOfOptArgs(cur.paragraph()) == 0);
+ status.enabled(cur.paragraph().insetList().find(OPTARG_CODE) == -1);
return true;
default:
TextClass const & tclass = buf.params().getTextClass();
Counters & cnts = tclass.counters();
string const & type = cnts.current_float();
+ // Memorize type for addToToc().
+ type_ = type;
if (type.empty())
full_label_ = buf.B_("Senseless!!! ");
else {
cnts.step(from_utf8(type));
full_label_ = bformat(from_ascii("%1$s %2$s:"),
name,
- convert<docstring>(cnts.value(from_utf8(type))));
+ cnts.theCounter(from_utf8(type)));
} else
full_label_ = bformat(from_ascii("%1$s #:"), name);
}
}
-auto_ptr<Inset> InsetCaption::doClone() const
+Inset * InsetCaption::clone() const
{
- return auto_ptr<Inset>(new InsetCaption(*this));
+ return new InsetCaption(*this);
}
projects / lyx.git / blobdiff