#include "BufferView.h"
#include "Counters.h"
#include "Encoding.h"
-#include "support/debug.h"
-#include "support/gettext.h"
#include "Language.h"
#include "LaTeXFeatures.h"
#include "Layout.h"
#include "insets/InsetBibitem.h"
#include "insets/InsetOptArg.h"
+#include "support/convert.h"
+#include "support/debug.h"
+#include "support/gettext.h"
#include "support/lstrings.h"
#include "support/textutils.h"
-#include "support/convert.h"
#include <boost/bind.hpp>
#include <boost/crc.hpp>
namespace lyx {
-ParagraphMetrics::ParagraphMetrics(Paragraph const & par): position_(-1), par_(&par)
-{
-}
+ParagraphMetrics::ParagraphMetrics(Paragraph const & par) :
+ position_(-1), par_(&par)
+{}
ParagraphMetrics & ParagraphMetrics::operator=(
}
}
-int ParagraphMetrics::rightMargin(Buffer const & buffer) const
+int ParagraphMetrics::rightMargin(BufferView const & bv) const
{
- BufferParams const & params = buffer.params();
- TextClass const & tclass = params.getTextClass();
+ BufferParams const & params = bv.buffer().params();
+ DocumentClass const & tclass = params.documentClass();
frontend::FontMetrics const & fm = theFontMetrics(params.getFont());
int const r_margin =
- lyx::rightMargin()
+ bv.rightMargin()
+ fm.signedWidth(tclass.rightmargin())
- + fm.signedWidth(par_->layout()->rightmargin)
+ + fm.signedWidth(par_->layout().rightmargin)
* 4 / (par_->getDepth() + 4);
return r_margin;
}
// do not expand in some labels
- if (par_->layout()->margintype != MARGIN_MANUAL && pos < par_->beginOfBody())
+ if (par_->layout().margintype != MARGIN_MANUAL && pos < par_->beginOfBody())
return false;
// if there is anything between the first char of the row and