Fix bug 886 and others not reported related with the document paper size.

[lyx.git] / src / paragraph_pimpl.C

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index ab6c0080d7c17c645a4a50cd7bd9a448fee179e0..0606d440f030f4beb6169dffe9c2b170d59a544c 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -20,12 +20,13 @@
 #include "encoding.h"
 #include "language.h"
 #include "LaTeXFeatures.h"
-#include "latexrunparams.h"
 #include "LColor.h"
 #include "lyxlength.h"
 #include "lyxrc.h"
+#include "outputparams.h"
 #include "texrow.h"
 
+#include <boost/next_prior.hpp>
 
 using lyx::pos_type;
 
@@ -36,8 +37,6 @@ using std::string;
 using std::ostream;
 
 
-// Initialize static member.
-ShareContainer<LyXFont> Paragraph::Pimpl::FontTable::container;
 // Initialization of the counter for the paragraph id's,
 unsigned int Paragraph::Pimpl::paragraph_id = 0;
 
@@ -253,8 +252,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 +265,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 +282,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);
 }
 
 
@@ -362,8 +354,7 @@ bool Paragraph::Pimpl::erase(pos_type pos)
                // only allow the actual removal if it was /new/ text
                if (changetype != Change::INSERTED) {
                        if (owner_->text_[pos] == Paragraph::META_INSET) {
-                               InsetOld * i(owner_->getInset(pos));
-                               i->markErased();
+                               owner_->getInset(pos)->markErased();
                        }
                        return false;
                }
@@ -377,12 +368,9 @@ bool Paragraph::Pimpl::erase(pos_type pos)
 int Paragraph::Pimpl::erase(pos_type start, pos_type end)
 {
        pos_type i = start;
-       pos_type count = end - start;
-       while (count) {
-               if (!erase(i)) {
+       for (pos_type count = end - start; count; --count) {
+               if (!erase(i))
                        ++i;
-               }
-               --count;
        }
        return end - i;
 }
@@ -454,7 +442,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
                                             BufferParams const & bparams,
                                             ostream & os,
                                             TexRow & texrow,
-                                            LatexRunParams const & runparams,
+                                            OutputParams const & runparams,
                                             LyXFont & font,
                                             LyXFont & running_font,
                                             LyXFont & basefont,
@@ -471,8 +459,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
                        if (c != '\0')
                                os << c;
                } else {
-                       InsetOld const * inset = owner_->getInset(i);
-                       inset->ascii(buf, os, 0);
+                       owner_->getInset(i)->plaintext(buf, os, runparams);
                }
                return;
        }
@@ -482,14 +469,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) {
@@ -516,18 +503,26 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
                        break;
                }
 
+               // output change tracking marks only if desired,
+               // if dvipost is installed,
+               // and with dvi/ps (other formats don't work)
+               LaTeXFeatures features(buf, bparams, runparams.nice);
+               bool const output = bparams.output_changes
+                       && runparams.flavor == OutputParams::LATEX
+                       && features.isAvailable("dvipost");
+
                if (inset->isTextInset()) {
                        column += Changes::latexMarkChange(os, running_change,
-                               Change::UNCHANGED);
+                               Change::UNCHANGED, output);
                        running_change = Change::UNCHANGED;
                }
 
                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;
@@ -678,7 +673,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;
@@ -736,8 +731,6 @@ void Paragraph::Pimpl::validate(LaTeXFeatures & features,
        BufferParams const & bparams = features.bufferParams();
 
        // check the params.
-       if (params.lineTop() || params.lineBottom())
-               features.require("lyxline");
        if (!params.spacing().isDefault())
                features.require("setspace");
 
@@ -790,13 +783,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");
                }
        }