* do not lookup the same macro all the time

[lyx.git] / src / paragraph_funcs.cpp

diff --git a/src/paragraph_funcs.cpp b/src/paragraph_funcs.cpp
index 0ad45a897f7982abb60b9399b6b6d5f490690f59..cbac6caee1b9a5a15ea01bc2627186d9e23f19f9 100644 (file)
--- a/src/paragraph_funcs.cpp
+++ b/src/paragraph_funcs.cpp
@@ -14,7 +14,7 @@
 
 #include "BufferParams.h"
 #include "debug.h"
-#include "LyXText.h"
+#include "Text.h"
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
 
@@ -32,7 +32,7 @@ static bool moveItem(Paragraph & fromPar, pos_type fromPos,
        // Therefore, it should only be used for breaking and merging paragraphs
 
        Paragraph::value_type const tmpChar = fromPar.getChar(fromPos);
-       LyXFont const tmpFont = fromPar.getFontSettings(params, fromPos);
+       Font const tmpFont = fromPar.getFontSettings(params, fromPos);
        Change const tmpChange = fromPar.lookupChange(fromPos);
 
        if (tmpChar == Paragraph::META_INSET) {
@@ -71,7 +71,7 @@ void breakParagraph(BufferParams const & bparams,
 
        // without doing that we get a crash when typing <Return> at the
        // end of a paragraph
-       tmp->layout(bparams.getLyXTextClass().defaultLayout());
+       tmp->layout(bparams.getTextClass().defaultLayout());
        // remember to set the inset_owner
        tmp->setInsetOwner(par.inInset());
 
@@ -124,8 +124,8 @@ void breakParagraph(BufferParams const & bparams,
                // Make sure that we keep the language when
                // breaking paragraph.
                if (tmp->empty()) {
-                       LyXFont changed = tmp->getFirstFontSettings(bparams);
-                       LyXFont old = par.getFontSettings(bparams, par.size());
+                       Font changed = tmp->getFirstFontSettings(bparams);
+                       Font old = par.getFontSettings(bparams, par.size());
                        changed.setLanguage(old.language());
                        tmp->setFont(0, changed);
                }
@@ -135,7 +135,7 @@ void breakParagraph(BufferParams const & bparams,
 
        if (!isempty) {
                par.params().clear();
-               par.layout(bparams.getLyXTextClass().defaultLayout());
+               par.layout(bparams.getTextClass().defaultLayout());
        }
 
        // layout stays the same with latex-environments
@@ -258,7 +258,7 @@ int getEndLabel(pit_type p, ParagraphList const & pars)
        pit_type pit = p;
        depth_type par_depth = pars[p].getDepth();
        while (pit != pit_type(pars.size())) {
-               LyXLayout_ptr const & layout = pars[pit].layout();
+               Layout_ptr const & layout = pars[pit].layout();
                int const endlabeltype = layout->endlabeltype;
 
                if (endlabeltype != END_LABEL_NO_LABEL) {
@@ -282,10 +282,10 @@ int getEndLabel(pit_type p, ParagraphList const & pars)
 }
 
 
-LyXFont const outerFont(pit_type par_offset, ParagraphList const & pars)
+Font const outerFont(pit_type par_offset, ParagraphList const & pars)
 {
        depth_type par_depth = pars[par_offset].getDepth();
-       LyXFont tmpfont(LyXFont::ALL_INHERIT);
+       Font tmpfont(Font::ALL_INHERIT);
 
        // Resolve against environment font information
        while (par_offset != pit_type(pars.size())