Point fix, earlier forgotten

[lyx.git] / src / paragraph_pimpl.C

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 912538e72df177cbfbd221e84a672fd10dc0760e..8c0573d7ee34895561e251244f640e1f262bad60 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -1,12 +1,15 @@
-/* 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>
 
@@ -24,6 +27,7 @@
 
 #include "support/LAssert.h"
 
+using namespace lyx::support;
 using lyx::pos_type;
 using std::endl;
 using std::ostream;
@@ -170,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
@@ -255,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 "
@@ -266,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
 }
@@ -282,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);
@@ -317,17 +321,16 @@ 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);
@@ -380,7 +383,7 @@ void Paragraph::Pimpl::eraseIntern(pos_type pos)
 
 bool Paragraph::Pimpl::erase(pos_type pos)
 {
-       lyx::Assert(pos < size());
+       Assert(pos < size());
 
        if (tracking()) {
                Change::Type changetype(changes_->lookup(pos));
@@ -389,7 +392,7 @@ bool Paragraph::Pimpl::erase(pos_type 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));
+                               InsetOld * i(owner_->getInset(pos));
                                i->markErased();
                        }
                        return false;
@@ -429,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
@@ -478,7 +480,7 @@ 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,
@@ -499,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;
@@ -510,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) {
@@ -553,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;
@@ -824,7 +826,7 @@ void Paragraph::Pimpl::validate(LaTeXFeatures & features,
                if (icit->inset) {
                        icit->inset->validate(features);
                        if (layout.needprotect &&
-                           icit->inset->lyxCode() == Inset::FOOT_CODE)
+                           icit->inset->lyxCode() == InsetOld::FOOT_CODE)
                                features.require("NeedLyXFootnoteCode");
                }
        }