"Inter-word Space"

[lyx.git] / src / paragraph_pimpl.C

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 16a57fee5db4149d5e95f77849ea391acd157a1a..912538e72df177cbfbd221e84a672fd10dc0760e 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -11,14 +11,16 @@
 #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"
 
@@ -61,16 +63,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()));
@@ -84,12 +83,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())));
        }
 }
 
@@ -336,29 +334,6 @@ void Paragraph::Pimpl::insertInset(pos_type pos,
 }
 
 
-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
@@ -403,27 +378,40 @@ void Paragraph::Pimpl::eraseIntern(pos_type pos)
 }
 
 
-void Paragraph::Pimpl::erase(pos_type pos)
+bool Paragraph::Pimpl::erase(pos_type pos)
 {
-       erasePos(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;
 }
 
 
-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)) {
+               if (!erase(i)) {
                        ++i;
-               } else {
-                       any_erased = true;
                }
                --count;
        }
-       return any_erased;
+       return end - i;
 }
 
 
@@ -452,7 +440,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 << '~';
@@ -494,7 +482,7 @@ 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,
@@ -545,13 +533,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;
                }
@@ -590,8 +578,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 << '}';
@@ -600,7 +587,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;
@@ -834,10 +821,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() == Inset::FOOT_CODE)
                                features.require("NeedLyXFootnoteCode");
                }
        }