"Inter-word Space"

[lyx.git] / src / paragraph_pimpl.C

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 260d5d801dedac578fb3eb28006a4e9e0c2b638d..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()));
@@ -483,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,
@@ -534,7 +533,7 @@ 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";
@@ -579,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 << '}';
@@ -823,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");
                }
        }