#include "Buffer.h"
#include "CoordCache.h"
#include "Cursor.h"
-#include "debug.h"
+#include "support/debug.h"
#include "BufferParams.h"
#include "BufferView.h"
#include "Changes.h"
#include "Encoding.h"
-#include "gettext.h"
+#include "support/gettext.h"
#include "Language.h"
#include "Layout.h"
#include "LyXRC.h"
#include <boost/crc.hpp>
-using std::endl;
-using std::max;
-using std::string;
+#include <ostream>
+using namespace std;
namespace lyx {
}
-Font const RowPainter::getLabelFont() const
+FontInfo const RowPainter::getLabelFont() const
{
return text_.getLabelFont(pi_.base.bv->buffer(), par_);
}
row_.pos());
}
-
-void RowPainter::paintHfill(pos_type const pos, pos_type const body_pos)
-{
- x_ += 1;
-
- int const y0 = yo_;
- int const y1 = y0 - defaultRowHeight() / 2;
-
- pi_.pain.line(int(x_), y1, int(x_), y0, Color_added_space);
-
- if (pm_.hfillExpansion(row_, pos)) {
- int const y2 = (y0 + y1) / 2;
-
- if (pos >= body_pos) {
- pi_.pain.line(int(x_), y2, int(x_ + row_.hfill), y2,
- Color_added_space,
- Painter::line_onoffdash);
- x_ += row_.hfill;
- } else {
- pi_.pain.line(int(x_), y2, int(x_ + row_.label_hfill), y2,
- Color_added_space,
- Painter::line_onoffdash);
- x_ += row_.label_hfill;
- }
- pi_.pain.line(int(x_), y1, int(x_), y0, Color_added_space);
- }
- x_ += 2;
-}
-
-
// If you want to debug inset metrics uncomment the following line:
//#define DEBUG_METRICS
// This draws green lines around each inset.
void RowPainter::paintInset(Inset const * inset, pos_type const pos)
{
- Font font = text_metrics_.getDisplayFont(pit_, pos);
+ Font const font = text_metrics_.getDisplayFont(pit_, pos);
BOOST_ASSERT(inset);
// FIXME: We should always use font, see documentation of
// noFontChange() in Inset.h.
pi_.base.font = inset->noFontChange() ?
- pi_.base.bv->buffer().params().getFont() :
- font;
+ pi_.base.bv->buffer().params().getFont().fontInfo() :
+ font.fontInfo();
pi_.ltr_pos = (bidi_.level(pos) % 2 == 0);
pi_.erased_ = erased_ || par_.isDeleted(pos);
pi_.base.bv->coordCache().insets().add(inset, int(x_), yo_);
Dimension const & dim = pm_.insetDimension(inset);
- paintForeignMark(x_, font, dim.descent());
+ paintForeignMark(x_, font.language(), dim.descent());
x_ += dim.width();
BOOST_ASSERT(max_witdh_ > 0);
int right_margin = text_metrics_.rightMargin(pm_);
int const w = max_witdh_ - leftMargin() - right_margin;
- MetricsInfo mi(pi_.base.bv, font, w);
+ MetricsInfo mi(pi_.base.bv, font.fontInfo(), w);
inset->metrics(mi, dim2);
if (dim.wid != dim2.wid)
lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
<< " draw width " << dim.width()
- << "> metrics width " << dim2.wid << "." << std::endl;
+ << "> metrics width " << dim2.wid << "." << endl;
if (dim->asc != dim2.asc)
lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
<< " draw ascent " << dim.ascent()
- << "> metrics ascent " << dim2.asc << "." << std::endl;
+ << "> metrics ascent " << dim2.asc << "." << endl;
if (dim2.descent() != dim.des)
lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
<< " draw ascent " << dim.descent()
- << "> metrics descent " << dim2.des << "." << std::endl;
+ << "> metrics descent " << dim2.des << "." << endl;
BOOST_ASSERT(dim2.wid == dim.wid);
BOOST_ASSERT(dim2.asc == dim.asc);
BOOST_ASSERT(dim2.des == dim.des);
}
-void RowPainter::paintHebrewComposeChar(pos_type & vpos, Font const & font)
+void RowPainter::paintHebrewComposeChar(pos_type & vpos, FontInfo const & font)
{
pos_type pos = bidi_.vis2log(vpos);
}
-void RowPainter::paintArabicComposeChar(pos_type & vpos, Font const & font)
+void RowPainter::paintArabicComposeChar(pos_type & vpos, FontInfo const & font)
{
pos_type pos = bidi_.vis2log(vpos);
docstring str;
}
-void RowPainter::paintChars(pos_type & vpos, Font const & font,
+void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
bool hebrew, bool arabic)
{
// This method takes up 70% of time when typing
Change::Type const prev_change = par_.lookupChange(pos).type;
// first character
- std::vector<char_type> str;
+ vector<char_type> str;
str.reserve(100);
str.push_back(par_.getChar(pos));
docstring s(&str[0], str.size());
if (prev_change != Change::UNCHANGED) {
- Font copy(font);
+ FontInfo copy = font;
if (prev_change == Change::DELETED) {
copy.setColor(Color_deletedtext);
} else if (prev_change == Change::INSERTED) {
}
-void RowPainter::paintForeignMark(double orig_x, Font const & font, int desc)
+void RowPainter::paintForeignMark(double orig_x, Language const * lang,
+ int desc)
{
if (!lyxrc.mark_foreign_language)
return;
- if (font.language() == latex_language)
+ if (lang == latex_language)
return;
- if (font.language() == pi_.base.bv->buffer().params().language)
+ if (lang == pi_.base.bv->buffer().params().language)
return;
int const y = yo_ + 1 + desc;
void RowPainter::paintFromPos(pos_type & vpos)
{
pos_type const pos = bidi_.vis2log(vpos);
- Font orig_font = text_metrics_.getDisplayFont(pit_, pos);
+ Font const orig_font = text_metrics_.getDisplayFont(pit_, pos);
double const orig_x = x_;
// usual characters, no insets
char_type const c = par_.getChar(pos);
// special case languages
- std::string const & lang = orig_font.language()->lang();
+ string const & lang = orig_font.language()->lang();
bool const hebrew = lang == "hebrew";
bool const arabic = lang == "arabic_arabtex" || lang == "arabic_arabi" ||
lang == "farsi";
if ((!hebrew && !arabic)
|| (hebrew && !Encodings::isComposeChar_hebrew(c))
|| (arabic && !Encodings::isComposeChar_arabic(c))) {
- paintChars(vpos, orig_font, hebrew, arabic);
+ paintChars(vpos, orig_font.fontInfo(), hebrew, arabic);
} else if (hebrew) {
- paintHebrewComposeChar(vpos, orig_font);
+ paintHebrewComposeChar(vpos, orig_font.fontInfo());
} else if (arabic) {
- paintArabicComposeChar(vpos, orig_font);
+ paintArabicComposeChar(vpos, orig_font.fontInfo());
}
- paintForeignMark(orig_x, orig_font);
+ paintForeignMark(orig_x, orig_font.language());
}
int RowPainter::paintAppendixStart(int y)
{
- Font pb_font;
+ FontInfo pb_font = sane_font;
pb_font.setColor(Color_appendix);
pb_font.decSize();
bool const is_rtl = text_.isRTL(buffer, par_);
bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
- //lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << std::endl;
+ //lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << endl;
// should we print a label?
if (layout->labeltype >= LABEL_STATIC
|| layout->latextype != LATEX_ENVIRONMENT
|| is_seq)) {
- Font const font = getLabelFont();
+ FontInfo const font = getLabelFont();
FontMetrics const & fm = theFontMetrics(font);
docstring const str = par_.getLabelstring();
(layout->labeltype == LABEL_TOP_ENVIRONMENT ||
layout->labeltype == LABEL_BIBLIO ||
layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
- Font font = getLabelFont();
+ FontInfo const font = getLabelFont();
if (!par_.getLabelstring().empty()) {
docstring const str = par_.getLabelstring();
double spacing_val = 1.0;
switch (endlabel) {
case END_LABEL_BOX:
case END_LABEL_FILLED_BOX: {
- Font const font = getLabelFont();
+ FontInfo const font = getLabelFont();
FontMetrics const & fm = theFontMetrics(font);
int const size = int(0.75 * fm.maxAscent());
int const y = yo_ - size;
}
case END_LABEL_STATIC: {
- Font font = getLabelFont();
+ FontInfo const font = getLabelFont();
FontMetrics const & fm = theFontMetrics(font);
docstring const & str = par_.layout()->endlabelstring();
double const x = is_rtl ?
x_ += row_.label_hfill + lwidth - width_pos;
}
- if (par_.isHfill(pos)) {
- paintHfill(pos, body_pos);
- ++vpos;
-
- } else if (par_.isSeparator(pos)) {
- Font orig_font = text_metrics_.getDisplayFont(pit_, pos);
+ if (par_.isSeparator(pos)) {
+ Font const orig_font = text_metrics_.getDisplayFont(pit_, pos);
double const orig_x = x_;
x_ += width_pos;
if (pos >= body_pos)
x_ += row_.separator;
- paintForeignMark(orig_x, orig_font);
+ paintForeignMark(orig_x, orig_font.language());
++vpos;
} else if (par_.isInset(pos)) {
projects / lyx.git / blobdiff