fix reading the author field.

[lyx.git] / src / paragraph_pimpl.C

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 91d67776610bbff0ca207c5353890633543ae561..84c269d04b8845b0fb352a714f104bde55f00c6d 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -253,8 +253,7 @@ Paragraph::value_type Paragraph::Pimpl::getChar(pos_type pos) const
 }
 
 
-void Paragraph::Pimpl::insertChar(pos_type pos, value_type c,
-                                 LyXFont const & font, Change change)
+void Paragraph::Pimpl::insertChar(pos_type pos, value_type c, Change change)
 {
        BOOST_ASSERT(pos <= size());
 
@@ -267,7 +266,6 @@ void Paragraph::Pimpl::insertChar(pos_type pos, value_type c,
        if (pos == size()) {
                // when appending characters, no need to update tables
                owner_->text_.push_back(c);
-               owner_->setFont(pos, font);
                return;
        }
 
@@ -285,25 +283,20 @@ void Paragraph::Pimpl::insertChar(pos_type pos, value_type c,
 
        // Update the insets
        owner_->insetlist.increasePosAfterPos(pos);
-
-       owner_->setFont(pos, font);
 }
 
 
 void Paragraph::Pimpl::insertInset(pos_type pos,
-                                  InsetOld * inset, LyXFont const & font, Change change)
+                                  InsetBase * inset, Change change)
 {
        BOOST_ASSERT(inset);
        BOOST_ASSERT(pos <= size());
 
-       insertChar(pos, META_INSET, font, change);
+       insertChar(pos, META_INSET, change);
        BOOST_ASSERT(owner_->text_[pos] == META_INSET);
 
        // Add a new entry in the insetlist.
        owner_->insetlist.insert(inset, pos);
-
-       if (inset_owner)
-               inset->setOwner(inset_owner);
 }
 
 
@@ -467,8 +460,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
                        if (c != '\0')
                                os << c;
                } else {
-                       InsetOld const * inset = owner_->getInset(i);
-                       inset->plaintext(buf, os, runparams);
+                       owner_->getInset(i)->plaintext(buf, os, runparams);
                }
                return;
        }
@@ -478,14 +470,14 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
        // and then split to handle the two modes separately.
        switch (c) {
        case Paragraph::META_INSET: {
-               InsetOld * inset = owner_->getInset(i);
+               InsetBase * inset = owner_->getInset(i);
 
                // FIXME: remove this check
                if (!inset)
                        break;
 
                // FIXME: move this to InsetNewline::latex
-               if (inset->lyxCode() == InsetOld::NEWLINE_CODE) {
+               if (inset->lyxCode() == InsetBase::NEWLINE_CODE) {
                        // newlines are handled differently here than
                        // the default in simpleTeXSpecialChars().
                        if (!style.newline_allowed) {
@@ -521,9 +513,9 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
                bool close = false;
                ostream::pos_type const len = os.tellp();
 
-               if ((inset->lyxCode() == InsetOld::GRAPHICS_CODE
-                    || inset->lyxCode() == InsetOld::MATH_CODE
-                    || inset->lyxCode() == InsetOld::URL_CODE)
+               if ((inset->lyxCode() == InsetBase::GRAPHICS_CODE
+                    || inset->lyxCode() == InsetBase::MATH_CODE
+                    || inset->lyxCode() == InsetBase::URL_CODE)
                    && running_font.isRightToLeft()) {
                        os << "\\L{";
                        close = true;
@@ -674,7 +666,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
                        column += 17;
                        break;
 
-               case '*': case '[': case ']':
+               case '*': case '[': 
                        // avoid being mistaken for optional arguments
                        os << '{' << c << '}';
                        column += 2;
@@ -784,13 +776,13 @@ void Paragraph::Pimpl::validate(LaTeXFeatures & features,
                features.require("ParagraphLeftIndent");
 
        // then the insets
-       InsetList::iterator icit = owner_->insetlist.begin();
-       InsetList::iterator iend = owner_->insetlist.end();
+       InsetList::const_iterator icit = owner_->insetlist.begin();
+       InsetList::const_iterator iend = owner_->insetlist.end();
        for (; icit != iend; ++icit) {
                if (icit->inset) {
                        icit->inset->validate(features);
                        if (layout.needprotect &&
-                           icit->inset->lyxCode() == InsetOld::FOOT_CODE)
+                           icit->inset->lyxCode() == InsetBase::FOOT_CODE)
                                features.require("NeedLyXFootnoteCode");
                }
        }