- Link against qt-mt333.lib which is what the current qt3 cvs produces

[lyx.git] / src / paragraph_pimpl.C

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 84c269d04b8845b0fb352a714f104bde55f00c6d..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;
 
@@ -504,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;
                }
 
@@ -666,7 +673,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
                        column += 17;
                        break;
 
-               case '*': case '[': 
+               case '*': case '[':
                        // avoid being mistaken for optional arguments
                        os << '{' << c << '}';
                        column += 2;