Alfredo's second patch

[lyx.git] / src / paragraph.C

diff --git a/src/paragraph.C b/src/paragraph.C
index 9d733a73b59f020351e98852acea81cb89d7ede7..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);
 }
@@ -434,8 +434,8 @@ LyXFont const Paragraph::getFirstFontSettings() const
 // The difference is that this one is used for generating the LaTeX file,
 // and thus cosmetic "improvements" are disallowed: This has to deliver
 // the true picture of the buffer. (Asger)
-LyXFont const Paragraph::getFont(BufferParams const & bparams,
-                                pos_type pos) const
+LyXFont const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
+                                LyXFont const & outerfont) const
 {
        lyx::Assert(pos >= 0);
 
@@ -451,30 +451,35 @@ LyXFont const Paragraph::getFont(BufferParams const & bparams,
 
        LyXFont tmpfont = getFontSettings(bparams, pos);
        tmpfont.realize(layoutfont);
+       tmpfont.realize(outerfont);
 
-       return pimpl_->realizeFont(tmpfont, bparams);
+       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);
 }
 
 
@@ -659,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();
 }
 
 
@@ -682,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());
 }
 
 
@@ -919,6 +924,7 @@ int Paragraph::endTeXParParams(BufferParams const & bparams,
 // This one spits out the text of the paragraph
 bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                                BufferParams const & bparams,
+                               LyXFont const & outerfont,
                                ostream & os, TexRow & texrow,
                                bool moving_arg)
 {
@@ -959,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;
@@ -995,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;
@@ -1013,7 +1019,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                value_type c = getChar(i);
 
                // Fully instantiated font
-               LyXFont font = getFont(bparams, i);
+               LyXFont font = getFont(bparams, i, outerfont);
 
                LyXFont const last_font = running_font;
 
@@ -1021,7 +1027,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                // outside font change, i.e. we write "\textXX{text} "
                // rather than "\textXX{text }". (Asger)
                if (open_font && c == ' ' && i <= size() - 2) {
-                       LyXFont const & next_font = getFont(bparams, i + 1);
+                       LyXFont const & next_font = getFont(bparams, i + 1, outerfont);
                        if (next_font != running_font
                            && next_font != font) {
                                font = next_font;
@@ -1068,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);
        }
@@ -1083,7 +1089,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                        running_font
                                .latexWriteEndChanges(os, basefont,
                                                      next_->getFont(bparams,
-                                                     0));
+                                                     0, outerfont));
                } else {
                        running_font.latexWriteEndChanges(os, basefont,
                                                          basefont);
@@ -1181,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;
 }
 
@@ -1198,7 +1207,7 @@ bool Paragraph::isRightToLeftPar(BufferParams const & bparams) const
 
 
 void Paragraph::changeLanguage(BufferParams const & bparams,
-                                 Language const * from, Language const * to)
+                              Language const * from, Language const * to)
 {
        for (pos_type i = 0; i < size(); ++i) {
                LyXFont font = getFontSettings(bparams, i);
@@ -1294,7 +1303,7 @@ void Paragraph::resizeInsetsLyXText(BufferView * bv)
 }
 
 
-void Paragraph::setContentsFromPar(Paragraph * par)
+void Paragraph::setContentsFromPar(Paragraph const & par)
 {
        pimpl_->setContentsFromPar(par);
 }