#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 "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 <sstream>
-
-using std::endl;
-using std::string;
-using std::ostream;
-
+using namespace std;
+using namespace lyx::support;
namespace lyx {
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::metrics(MetricsInfo & mi, Dimension & dim) const
{
- Font tmpfont = mi.base.font;
- mi.base.font = mi.base.bv->buffer().params().getFont();
+ 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;
InsetText::metrics(mi, textdim);
mi.base.font = tmpfont;
mi.base.textwidth += dim.wid;
- dim.des = std::max(dim.des - textdim.asc + dim.asc, textdim.des);
+ dim.des = max(dim.des - textdim.asc + dim.asc, textdim.des);
dim.asc = textdim.asc;
dim.wid += textdim.wid;
}
// Answer: the text inset (in buffer_funcs.cpp: setCaption).
- Font tmpfont = pi.base.font;
- pi.base.font = pi.base.bv->buffer().params().getFont();
+ 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);
pi.base.font = tmpfont;
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);
void InsetCaption::updateLabels(Buffer const & buf, ParIterator const & it)
{
- using support::bformat;
TextClass const & tclass = buf.params().getTextClass();
Counters & cnts = tclass.counters();
string const & type = cnts.current_float();