]> git.lyx.org Git - lyx.git/blobdiff - src/paragraph_pimpl.C
Point fix, earlier forgotten
[lyx.git] / src / paragraph_pimpl.C
index f7a3a6425b5a13749f32925d3c041ec011fd7d6a..8c0573d7ee34895561e251244f640e1f262bad60 100644 (file)
@@ -1,27 +1,33 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file paragraph_pimpl.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
+ * \author André Pönitz
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
 #include "paragraph_pimpl.h"
-#include "LaTeXFeatures.h"
-#include "texrow.h"
-#include "language.h"
+
 #include "bufferparams.h"
+#include "debug.h"
 #include "encoding.h"
+#include "language.h"
+#include "LaTeXFeatures.h"
+#include "latexrunparams.h"
 #include "lyxrc.h"
-#include "debug.h"
 #include "paragraph_funcs.h"
+#include "texrow.h"
 
 #include "support/LAssert.h"
 
+using namespace lyx::support;
 using lyx::pos_type;
 using std::endl;
 using std::ostream;
@@ -61,16 +67,13 @@ Paragraph::Pimpl::Pimpl(Paragraph * owner)
 }
 
 
-Paragraph::Pimpl::Pimpl(Pimpl const & p, Paragraph * owner, bool same_ids)
+Paragraph::Pimpl::Pimpl(Pimpl const & p, Paragraph * owner)
        : params(p.params), owner_(owner)
 {
        inset_owner = p.inset_owner;
        text = p.text;
        fontlist = p.fontlist;
-       if (same_ids)
-               id_ = p.id_;
-       else
-               id_ = paragraph_id++;
+       id_ = paragraph_id++;
 
        if (p.tracking())
                changes_.reset(new Changes(*p.changes_.get()));
@@ -171,7 +174,7 @@ Change const Paragraph::Pimpl::lookupChangeFull(pos_type pos) const
 
 void Paragraph::Pimpl::markErased()
 {
-       lyx::Assert(tracking());
+       Assert(tracking());
 
        // FIXME: we should actually remove INSERTED chars.
        // difficult because owning insettexts/tabulars need
@@ -256,7 +259,7 @@ Paragraph::value_type Paragraph::Pimpl::getChar(pos_type pos) const
        // This is in the critical path for loading!
        pos_type const siz = size();
 
-       lyx::Assert(pos <= siz);
+       Assert(pos <= siz);
 
        if (pos == siz) {
                lyxerr << "getChar() on pos " << pos << " in par id "
@@ -267,7 +270,7 @@ Paragraph::value_type Paragraph::Pimpl::getChar(pos_type pos) const
 
        return text[pos];
 #else
-       lyx::Assert(pos < size());
+       Assert(pos < size());
        return text[pos];
 #endif
 }
@@ -283,7 +286,7 @@ void Paragraph::Pimpl::setChar(pos_type pos, value_type c)
 void Paragraph::Pimpl::insertChar(pos_type pos, value_type c,
                                  LyXFont const & font, Change change)
 {
-       lyx::Assert(pos <= size());
+       Assert(pos <= size());
 
        if (tracking()) {
                changes_->record(change, pos);
@@ -318,46 +321,22 @@ void Paragraph::Pimpl::insertChar(pos_type pos, value_type c,
 
 
 void Paragraph::Pimpl::insertInset(pos_type pos,
-                                  Inset * inset, LyXFont const & font, Change change)
+                                  InsetOld * inset, LyXFont const & font, Change change)
 {
-       lyx::Assert(inset);
-       lyx::Assert(pos <= size());
+       Assert(inset);
+       Assert(pos <= size());
 
        insertChar(pos, META_INSET, font, change);
-       lyx::Assert(text[pos] == META_INSET);
+       Assert(text[pos] == META_INSET);
 
        // Add a new entry in the insetlist.
        owner_->insetlist.insert(inset, pos);
-       inset->parOwner(owner_);
 
        if (inset_owner)
                inset->setOwner(inset_owner);
 }
 
 
-bool Paragraph::Pimpl::erasePos(pos_type pos)
-{
-       lyx::Assert(pos < size());
-
-       if (tracking()) {
-               Change::Type changetype(changes_->lookup(pos));
-               changes_->record(Change(Change::DELETED), pos);
-
-               // only allow the actual removal if it was /new/ text
-               if (changetype != Change::INSERTED) {
-                       if (text[pos] == Paragraph::META_INSET) {
-                               Inset * i(owner_->getInset(pos));
-                               i->markErased();
-                       }
-                       return false;
-               }
-       }
-
-       eraseIntern(pos);
-       return true;
-}
-
-
 void Paragraph::Pimpl::eraseIntern(pos_type pos)
 {
        // if it is an inset, delete the inset entry
@@ -402,9 +381,26 @@ void Paragraph::Pimpl::eraseIntern(pos_type pos)
 }
 
 
-void Paragraph::Pimpl::erase(pos_type pos)
+bool Paragraph::Pimpl::erase(pos_type pos)
 {
-       erasePos(pos);
+       Assert(pos < size());
+
+       if (tracking()) {
+               Change::Type changetype(changes_->lookup(pos));
+               changes_->record(Change(Change::DELETED), pos);
+
+               // only allow the actual removal if it was /new/ text
+               if (changetype != Change::INSERTED) {
+                       if (text[pos] == Paragraph::META_INSET) {
+                               InsetOld * i(owner_->getInset(pos));
+                               i->markErased();
+                       }
+                       return false;
+               }
+       }
+
+       eraseIntern(pos);
+       return true;
 }
 
 
@@ -413,9 +409,9 @@ int Paragraph::Pimpl::erase(pos_type start, pos_type end)
        pos_type i = start;
        pos_type count = end - start;
        while (count) {
-               if (!erasePos(i)) {
+               if (!erase(i)) {
                        ++i;
-               } 
+               }
                --count;
        }
        return end - i;
@@ -436,8 +432,7 @@ void Paragraph::Pimpl::simpleTeXBlanks(ostream & os, TexRow & texrow,
            && getChar(i - 1) != ' '
            && (i < size() - 1)
            // same in FreeSpacing mode
-           && !style.free_spacing
-               && !owner_->isFreeSpacing()
+           && !owner_->isFreeSpacing()
            // In typewriter mode, we want to avoid
            // ! . ? : at the end of a line
            && !(font.family() == LyXFont::TYPEWRITER_FAMILY
@@ -447,7 +442,7 @@ void Paragraph::Pimpl::simpleTeXBlanks(ostream & os, TexRow & texrow,
                     || getChar(i - 1) == '!'))) {
                os << '\n';
                texrow.newline();
-               texrow.start(owner_, i + 1);
+               texrow.start(owner_->id(), i + 1);
                column = 0;
        } else if (style.free_spacing) {
                os << '~';
@@ -485,11 +480,11 @@ bool Paragraph::Pimpl::isTextAt(string const & str, pos_type pos) const
 }
 
 
-void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
+void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
                                             BufferParams const & bparams,
                                             ostream & os,
                                             TexRow & texrow,
-                                            bool moving_arg,
+                                            LatexRunParams const & runparams,
                                             LyXFont & font,
                                             LyXFont & running_font,
                                             LyXFont & basefont,
@@ -506,7 +501,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                        if (c != '\0')
                                os << c;
                } else {
-                       Inset const * inset = owner_->getInset(i);
+                       InsetOld const * inset = owner_->getInset(i);
                        inset->ascii(buf, os, 0);
                }
                return;
@@ -517,14 +512,14 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
        // and then split to handle the two modes separately.
        switch (c) {
        case Paragraph::META_INSET: {
-               Inset * inset = owner_->getInset(i);
+               InsetOld * inset = owner_->getInset(i);
 
                // FIXME: remove this check
                if (!inset)
                        break;
 
                // FIXME: move this to InsetNewline::latex
-               if (inset->lyxCode() == Inset::NEWLINE_CODE) {
+               if (inset->lyxCode() == InsetOld::NEWLINE_CODE) {
                        // newlines are handled differently here than
                        // the default in simpleTeXSpecialChars().
                        if (!style.newline_allowed) {
@@ -540,13 +535,13 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                                if (font.family() == LyXFont::TYPEWRITER_FAMILY)
                                        os << '~';
 
-                               if (moving_arg)
+                               if (runparams.moving_arg)
                                        os << "\\protect ";
 
                                os << "\\\\\n";
                        }
                        texrow.newline();
-                       texrow.start(owner_, i + 1);
+                       texrow.start(owner_->id(), i + 1);
                        column = 0;
                        break;
                }
@@ -560,9 +555,9 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                bool close = false;
                int const len = os.tellp();
                //ostream::pos_type const len = os.tellp();
-               if ((inset->lyxCode() == Inset::GRAPHICS_CODE
-                    || inset->lyxCode() == Inset::MATH_CODE
-                    || inset->lyxCode() == Inset::URL_CODE)
+               if ((inset->lyxCode() == InsetOld::GRAPHICS_CODE
+                    || inset->lyxCode() == InsetOld::MATH_CODE
+                    || inset->lyxCode() == InsetOld::URL_CODE)
                    && running_font.isRightToLeft()) {
                        os << "\\L{";
                        close = true;
@@ -585,8 +580,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                        running_font = basefont;
                }
 
-               int tmp = inset->latex(buf, os, moving_arg,
-                                      style.free_spacing);
+               int tmp = inset->latex(buf, os, runparams);
 
                if (close)
                        os << '}';
@@ -595,7 +589,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                        for (int j = 0; j < tmp; ++j) {
                                texrow.newline();
                        }
-                       texrow.start(owner_, i + 1);
+                       texrow.start(owner_->id(), i + 1);
                        column = 0;
                } else {
                        column += int(os.tellp()) - len;
@@ -829,10 +823,10 @@ void Paragraph::Pimpl::validate(LaTeXFeatures & features,
        InsetList::iterator icit = owner_->insetlist.begin();
        InsetList::iterator iend = owner_->insetlist.end();
        for (; icit != iend; ++icit) {
-               if (icit.getInset()) {
-                       icit.getInset()->validate(features);
+               if (icit->inset) {
+                       icit->inset->validate(features);
                        if (layout.needprotect &&
-                           icit.getInset()->lyxCode() == Inset::FOOT_CODE)
+                           icit->inset->lyxCode() == InsetOld::FOOT_CODE)
                                features.require("NeedLyXFootnoteCode");
                }
        }