Alfredo's second patch

[lyx.git] / src / paragraph.C

diff --git a/src/paragraph.C b/src/paragraph.C
index 4ecbf5f9db23ef8afd6e00724674bac8694cb1c7..b46293a4dbdd3ee15bec61fa9bb14906016da8a1 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -330,7 +330,7 @@ void Paragraph::erase(pos_type pos)
 }
 
 
-bool Paragraph::erase(pos_type start, pos_type end)
+int Paragraph::erase(pos_type start, pos_type end)
 {
        return pimpl_->erase(start, end);
 }
@@ -453,29 +453,33 @@ LyXFont const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
        tmpfont.realize(layoutfont);
        tmpfont.realize(outerfont);
 
-       return realizeFont(tmpfont, bparams, 0, false);
+       return realizeFont(tmpfont, bparams);
 }
 
 
-LyXFont const Paragraph::getLabelFont(BufferParams const & bparams) const
+LyXFont const Paragraph::getLabelFont(BufferParams const & bparams,
+                                     LyXFont const & outerfont) const
 {
        LyXLayout_ptr const & lout = layout();
 
        LyXFont tmpfont = lout->labelfont;
        tmpfont.setLanguage(getParLanguage(bparams));
+       tmpfont.realize(outerfont);
 
-       return pimpl_->realizeFont(tmpfont, bparams);
+       return realizeFont(tmpfont, bparams);
 }
 
 
-LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams) const
+LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams,
+                                      LyXFont const & outerfont) const
 {
        LyXLayout_ptr const & lout = layout();
 
        LyXFont tmpfont = lout->font;
        tmpfont.setLanguage(getParLanguage(bparams));
+       tmpfont.realize(outerfont);
 
-       return pimpl_->realizeFont(tmpfont, bparams);
+       return realizeFont(tmpfont, bparams);
 }
 
 
@@ -660,11 +664,11 @@ Paragraph const * Paragraph::previous() const
 #endif
 
 
-void Paragraph::makeSameLayout(Paragraph const * par)
+void Paragraph::makeSameLayout(Paragraph const & par)
 {
-       layout(par->layout());
+       layout(par.layout());
        // move to pimpl?
-       params() = par->params();
+       params() = par.params();
 }
 
 
@@ -683,11 +687,11 @@ int Paragraph::stripLeadingSpaces()
 }
 
 
-bool Paragraph::hasSameLayout(Paragraph const * par) const
+bool Paragraph::hasSameLayout(Paragraph const & par) const
 {
        return
-               par->layout() == layout() &&
-               params().sameLayout(par->params());
+               par.layout() == layout() &&
+               params().sameLayout(par.params());
 }
 
 
@@ -961,9 +965,9 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
        if (body_pos > 0) {
                os << '[';
                ++column;
-               basefont = getLabelFont(bparams);
+               basefont = getLabelFont(bparams, outerfont);
        } else {
-               basefont = getLayoutFont(bparams);
+               basefont = getLayoutFont(bparams, outerfont);
        }
 
        moving_arg |= style->needprotect;
@@ -997,7 +1001,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                                        column += running_font.latexWriteEndChanges(os, basefont, basefont);
                                        open_font = false;
                                }
-                               basefont = getLayoutFont(bparams);
+                               basefont = getLayoutFont(bparams, outerfont);
                                running_font = basefont;
                                os << ']';
                                ++column;
@@ -1070,7 +1074,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                pimpl_->simpleTeXSpecialChars(buf, bparams,
                                              os, texrow, moving_arg,
                                              font, running_font,
-                                             basefont, open_font,
+                                             basefont, outerfont, open_font,
                                              running_change,
                                              *style, i, column, c);
        }
@@ -1183,9 +1187,12 @@ Paragraph::getParLanguage(BufferParams const & bparams) const
 {
        if (!empty()) {
                return getFirstFontSettings().language();
-       } else if (previous_)
+#warning FIXME we should check the prev par as well (Lgb)
+#if 0
+       } else if (previous_) {
                return previous_->getParLanguage(bparams);
-       else
+#endif
+       }else
                return bparams.language;
 }
 
@@ -1296,7 +1303,7 @@ void Paragraph::resizeInsetsLyXText(BufferView * bv)
 }
 
 
-void Paragraph::setContentsFromPar(Paragraph * par)
+void Paragraph::setContentsFromPar(Paragraph const & par)
 {
        pimpl_->setContentsFromPar(par);
 }