Alfredo's second patch

[lyx.git] / src / paragraph_pimpl.C

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index fd47d46e8a45c5017ae98c9aaeae81b3a85d214d..f7a3a6425b5a13749f32925d3c041ec011fd7d6a 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -18,6 +18,7 @@
 #include "encoding.h"
 #include "lyxrc.h"
 #include "debug.h"
+#include "paragraph_funcs.h"
 
 #include "support/LAssert.h"
 
@@ -83,12 +84,11 @@ void Paragraph::Pimpl::clear()
 }
 
 
-void Paragraph::Pimpl::setContentsFromPar(Paragraph const * par)
+void Paragraph::Pimpl::setContentsFromPar(Paragraph const & par)
 {
-       lyx::Assert(par);
-       text = par->pimpl_->text;
-       if (par->pimpl_->tracking()) {
-               changes_.reset(new Changes(*(par->pimpl_->changes_.get())));
+       text = par.pimpl_->text;
+       if (par.pimpl_->tracking()) {
+               changes_.reset(new Changes(*(par.pimpl_->changes_.get())));
        }
 }
 
@@ -252,22 +252,24 @@ void Paragraph::Pimpl::rejectChange(pos_type start, pos_type end)
 
 Paragraph::value_type Paragraph::Pimpl::getChar(pos_type pos) const
 {
+#if 1
        // This is in the critical path for loading!
        pos_type const siz = size();
+
        lyx::Assert(pos <= siz);
-       // This is stronger, and I belive that this is the assertion
-       // that we should really use. (Lgb)
-       //Assert(pos < size());
 
-       // Then this has no meaning. (Lgb)
-       if (!siz || pos == siz) {
+       if (pos == siz) {
                lyxerr << "getChar() on pos " << pos << " in par id "
-                       << owner_->id() << " of size " << siz
-                       << "  is a bit silly !" << endl;
+                      << owner_->id() << " of size " << siz
+                      << "  is a bit silly !" << endl;
                return '\0';
        }
 
        return text[pos];
+#else
+       lyx::Assert(pos < size());
+       return text[pos];
+#endif
 }
 
 
@@ -406,21 +408,17 @@ void Paragraph::Pimpl::erase(pos_type pos)
 }
 
 
-bool Paragraph::Pimpl::erase(pos_type start, pos_type end)
+int Paragraph::Pimpl::erase(pos_type start, pos_type end)
 {
        pos_type i = start;
        pos_type count = end - start;
-       bool any_erased = false;
-
        while (count) {
                if (!erasePos(i)) {
                        ++i;
-               } else {
-                       any_erased = true;
-               }
+               } 
                --count;
        }
-       return any_erased;
+       return end - i;
 }
 
 
@@ -430,7 +428,9 @@ void Paragraph::Pimpl::simpleTeXBlanks(ostream & os, TexRow & texrow,
                                       LyXFont const & font,
                                       LyXLayout const & style)
 {
-       if (style.pass_thru) return;
+       if (style.pass_thru)
+               return;
+
        if (column > lyxrc.ascii_linelen
            && i
            && getChar(i - 1) != ' '
@@ -493,6 +493,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                                             LyXFont & font,
                                             LyXFont & running_font,
                                             LyXFont & basefont,
+                                            LyXFont const & outerfont,
                                             bool & open_font,
                                             Change::Type & running_change,
                                             LyXLayout const & style,
@@ -501,8 +502,13 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                                             value_type const c)
 {
        if (style.pass_thru) {
-               if (c != '\0')
-                       os << c;
+               if (c != Paragraph::META_INSET) {
+                       if (c != '\0')
+                               os << c;
+               } else {
+                       Inset const * inset = owner_->getInset(i);
+                       inset->ascii(buf, os, 0);
+               }
                return;
        }
 
@@ -528,7 +534,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                                        column += running_font.latexWriteEndChanges(os, basefont, basefont);
                                        open_font = false;
                                }
-                               basefont = owner_->getLayoutFont(bparams);
+                               basefont = owner_->getLayoutFont(bparams, outerfont);
                                running_font = basefont;
 
                                if (font.family() == LyXFont::TYPEWRITER_FAMILY)
@@ -575,7 +581,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                                                     basefont,
                                                     basefont);
                        open_font = false;
-                       basefont = owner_->getLayoutFont(bparams);
+                       basefont = owner_->getLayoutFont(bparams, outerfont);
                        running_font = basefont;
                }
 
@@ -842,26 +848,3 @@ void Paragraph::Pimpl::validate(LaTeXFeatures & features,
                }
        }
 }
-
-
-LyXFont const Paragraph::Pimpl::realizeFont(LyXFont const & font,
-                                           BufferParams const & bparams) const
-{
-       LyXFont tmpfont(font);
-
-       // check for environment font information
-       char par_depth = owner_->getDepth();
-       Paragraph const * par = owner_;
-       LyXTextClass const & tclass = bparams.getLyXTextClass();
-
-       while (par && par->getDepth() && !tmpfont.resolved()) {
-               par = par->outerHook();
-               if (par) {
-                       tmpfont.realize(par->layout()->font);
-                       par_depth = par->getDepth();
-               }
-       }
-
-       tmpfont.realize(tclass.defaultfont());
-       return tmpfont;
-}