From ac74abc03c273f2e4598f77eeea60d260012090b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Mon, 28 Jul 2003 10:41:47 +0000 Subject: [PATCH] cache and use the textclass default font in each LyXText git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7409 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/lyxtext.h | 2 +- src/text2.C | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lyxtext.h b/src/lyxtext.h index a0ee412a9a..8bc14f870d 100644 --- a/src/lyxtext.h +++ b/src/lyxtext.h @@ -61,7 +61,7 @@ public: /// the current font LyXFont real_current_font; /// our buffer's default layout font - //LyXFont defaultfont_; + LyXFont defaultfont_; private: /** the 'anchor' row: the position of this row remains constant * with respect to the top of the screen diff --git a/src/text2.C b/src/text2.C index fa968541e5..c5f30869c3 100644 --- a/src/text2.C +++ b/src/text2.C @@ -156,7 +156,7 @@ LyXFont LyXText::getFont(ParagraphList::iterator pit, pos_type pos) const // Realize with the fonts of lesser depth. tmpfont.realize(outerFont(pit, ownerParagraphs())); - //tmpfont.realize(defaultfont_); + tmpfont.realize(defaultfont_); return tmpfont; } @@ -173,7 +173,7 @@ LyXFont LyXText::getLayoutFont(ParagraphList::iterator pit) const LyXFont font = layout->font; // Realize with the fonts of lesser depth. font.realize(outerFont(pit, ownerParagraphs())); - //font.realize(defaultfont_); + font.realize(defaultfont_); return font; } @@ -190,7 +190,7 @@ LyXFont LyXText::getLabelFont(ParagraphList::iterator pit) const LyXFont font = layout->labelfont; // Realize with the fonts of lesser depth. font.realize(outerFont(pit, ownerParagraphs())); - //font.realize(defaultfont_); + font.realize(defaultfont_); return font; } @@ -243,7 +243,7 @@ void LyXText::setCharFont( } } - //layoutfont.realize(defaultfont_); + layoutfont.realize(defaultfont_); // Now, reduce font against full layout font font.reduce(layoutfont); -- 2.39.2