#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>
}
}
-int ParagraphMetrics::rightMargin(Buffer const & buffer) const
+int ParagraphMetrics::rightMargin(BufferView const & bv) const
{
- BufferParams const & params = buffer.params();
+ BufferParams const & params = bv.buffer().params();
TextClass const & tclass = params.getTextClass();
frontend::FontMetrics const & fm = theFontMetrics(params.getFont());
int const r_margin =
- lyx::rightMargin()
+ bv.rightMargin()
+ fm.signedWidth(tclass.rightmargin())
+ fm.signedWidth(par_->layout()->rightmargin)
* 4 / (par_->getDepth() + 4);