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 6186259e59d8cd523689a5093e7fe728055f04d8..0606d440f030f4beb6169dffe9c2b170d59a544c 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -26,6 +26,7 @@
 #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,
-                                  InsetBase * 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);
 }
 
 
@@ -511,9 +503,17 @@ 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;
                }
 
@@ -673,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;
@@ -783,8 +783,8 @@ 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);