anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 10:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

RowPainter::paintForeignMark(): take a Language instead of a Font.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21253 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2007-10-29 08:52:13 +00:00
parent d58f8cf7f6
commit cff2f03285
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rowpainter.cpp
View File

@ -141,7 +141,7 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
Dimension const & dim = pm_.insetDimension(inset); Dimension const & dim = pm_.insetDimension(inset);
paintForeignMark(x_, font, dim.descent()); paintForeignMark(x_, font.language(), dim.descent());
x_ += dim.width(); x_ += dim.width();
@ -335,13 +335,14 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
} }
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) if (!lyxrc.mark_foreign_language)
return; return;
if (font.language() == latex_language) if (lang == latex_language)
return; return;
if (font.language() == pi_.base.bv->buffer().params().language) if (lang == pi_.base.bv->buffer().params().language)
return; return;
int const y = yo_ + 1 + desc; int const y = yo_ + 1 + desc;
@ -375,7 +376,7 @@ void RowPainter::paintFromPos(pos_type & vpos)
paintArabicComposeChar(vpos, orig_font.fontInfo()); paintArabicComposeChar(vpos, orig_font.fontInfo());
} }
paintForeignMark(orig_x, orig_font); paintForeignMark(orig_x, orig_font.language());
} }
@ -781,7 +782,7 @@ void RowPainter::paintText()
x_ += width_pos; x_ += width_pos;
if (pos >= body_pos) if (pos >= body_pos)
x_ += row_.separator; x_ += row_.separator;
paintForeignMark(orig_x, orig_font); paintForeignMark(orig_x, orig_font.language());
++vpos; ++vpos;
} else if (par_.isInset(pos)) { } else if (par_.isInset(pos)) {

3
src/rowpainter.h
View File

@ -23,6 +23,7 @@ class BufferView;
class Font; class Font;
class FontInfo; class FontInfo;
class Inset; class Inset;
class Language;
class PainterInfo; class PainterInfo;
class Paragraph; class Paragraph;
class ParagraphList; class ParagraphList;
@ -55,7 +56,7 @@ public:
void paintOnlyInsets(); void paintOnlyInsets();
private: private:
void paintForeignMark(double orig_x, Font const & font, int desc = 0); void paintForeignMark(double orig_x, Language const * lang, int desc = 0);
void paintHebrewComposeChar(pos_type & vpos, FontInfo const & font); void paintHebrewComposeChar(pos_type & vpos, FontInfo const & font);
void paintArabicComposeChar(pos_type & vpos, FontInfo const & font); void paintArabicComposeChar(pos_type & vpos, FontInfo const & font);
void paintChars(pos_type & vpos, FontInfo const & font, void paintChars(pos_type & vpos, FontInfo const & font,