ws changes only

[lyx.git] / src / paragraph_funcs.C

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 34d9b4376e4d2d7416ec14de8b7716a463fb4976..91bca9935817ba83568024db2d3051a5a562e956 100644 (file)
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -11,42 +11,49 @@
 #include <config.h>
 
 #include "paragraph_funcs.h"
-#include "paragraph_pimpl.h"
+
 #include "buffer.h"
-#include "ParagraphParameters.h"
-#include "lyxtextclasslist.h"
+#include "bufferparams.h"
+
 #include "debug.h"
+#include "encoding.h"
+#include "errorlist.h"
+#include "factory.h"
 #include "gettext.h"
+#include "iterators.h"
 #include "language.h"
-#include "encoding.h"
-#include "lyxrc.h"
 #include "lyxlex.h"
-#include "factory.h"
-#include "Lsstream.h"
-
-#include "support/lstrings.h"
-#include "support/LAssert.h"
+#include "lyxrc.h"
+#include "paragraph_pimpl.h"
+#include "texrow.h"
+#include "vspace.h"
 
-#include "insets/insetoptarg.h"
-#include "insets/insetcommandparams.h"
 #include "insets/insetbibitem.h"
+#include "insets/insethfill.h"
+#include "insets/insetlatexaccent.h"
+#include "insets/insetnewline.h"
+#include "insets/insetoptarg.h"
 #include "insets/insetspace.h"
 #include "insets/insetspecialchar.h"
-#include "insets/insetlatexaccent.h"
 #include "insets/insettabular.h"
-#include "insets/insethfill.h"
-#include "insets/insetnewline.h"
 
-extern string bibitemWidest(Buffer const *);
-
-using namespace lyx::support;
+#include "support/lstrings.h"
+#include "support/std_sstream.h"
 
 using lyx::pos_type;
-//using lyx::layout_type;
+
+using lyx::support::bformat;
+using lyx::support::subst;
+
 using std::endl;
+using std::string;
+using std::istringstream;
 using std::ostream;
 
 
+extern string bibitemWidest(Buffer const &);
+
+
 namespace {
 
 bool moveItem(Paragraph & from, Paragraph & to,
@@ -298,14 +305,14 @@ int getEndLabel(ParagraphList::iterator p, ParagraphList const & plist)
 namespace {
 
 ParagraphList::iterator
-TeXEnvironment(Buffer const * buf,
+TeXEnvironment(Buffer const & buf,
               ParagraphList const & paragraphs,
               ParagraphList::iterator pit,
               ostream & os, TexRow & texrow,
               LatexRunParams const & runparams);
 
 ParagraphList::iterator
-TeXOnePar(Buffer const * buf,
+TeXOnePar(Buffer const & buf,
          ParagraphList const & paragraphs,
          ParagraphList::iterator pit,
          ostream & os, TexRow & texrow,
@@ -314,7 +321,7 @@ TeXOnePar(Buffer const * buf,
 
 
 ParagraphList::iterator
-TeXDeeper(Buffer const * buf,
+TeXDeeper(Buffer const & buf,
          ParagraphList const & paragraphs,
          ParagraphList::iterator pit,
          ostream & os, TexRow & texrow,
@@ -340,7 +347,7 @@ TeXDeeper(Buffer const * buf,
 
 
 ParagraphList::iterator
-TeXEnvironment(Buffer const * buf,
+TeXEnvironment(Buffer const & buf,
               ParagraphList const & paragraphs,
               ParagraphList::iterator pit,
               ostream & os, TexRow & texrow,
@@ -348,7 +355,7 @@ TeXEnvironment(Buffer const * buf,
 {
        lyxerr[Debug::LATEX] << "TeXEnvironment...     " << &*pit << endl;
 
-       BufferParams const & bparams = buf->params;
+       BufferParams const & bparams = buf.params();
 
        LyXLayout_ptr const & style = pit->layout();
 
@@ -465,7 +472,7 @@ InsetOptArg * optArgInset(Paragraph const & par)
 
 
 ParagraphList::iterator
-TeXOnePar(Buffer const * buf,
+TeXOnePar(Buffer const & buf,
          ParagraphList const & paragraphs,
          ParagraphList::iterator pit,
          ostream & os, TexRow & texrow,
@@ -474,7 +481,7 @@ TeXOnePar(Buffer const * buf,
 {
        lyxerr[Debug::LATEX] << "TeXOnePar...     " << &*pit << " '"
                << everypar << "'" << endl;
-       BufferParams const & bparams = buf->params;
+       BufferParams const & bparams = buf.params();
 
        InsetOld const * in = pit->inInset();
        bool further_blank_line = false;
@@ -720,7 +727,7 @@ TeXOnePar(Buffer const * buf,
 //
 // LaTeX all paragraphs from par to endpar, if endpar == 0 then to the end
 //
-void latexParagraphs(Buffer const * buf,
+void latexParagraphs(Buffer const & buf,
                     ParagraphList const & paragraphs,
                     ostream & os,
                     TexRow & texrow,
@@ -729,7 +736,7 @@ void latexParagraphs(Buffer const * buf,
 {
        bool was_title = false;
        bool already_title = false;
-       LyXTextClass const & tclass = buf->params.getLyXTextClass();
+       LyXTextClass const & tclass = buf.params().getLyXTextClass();
        ParagraphList::iterator par = const_cast<ParagraphList&>(paragraphs).begin();
        ParagraphList::iterator endpar = const_cast<ParagraphList&>(paragraphs).end();
 
@@ -810,7 +817,7 @@ int readParToken(Buffer & buf, Paragraph & par, LyXLex & lex, string const & tok
        static LyXFont font;
        static Change change;
 
-       BufferParams const & bp = buf.params;
+       BufferParams const & bp = buf.params();
 
        if (token[0] != '\\') {
                string::const_iterator cit = token.begin();
@@ -929,27 +936,27 @@ int readParToken(Buffer & buf, Paragraph & par, LyXLex & lex, string const & tok
                                inset = new InsetSpecialChar;
                        else
                                inset = new InsetSpace;
-                       inset->read(&buf, lex);
+                       inset->read(buf, lex);
                        par.insertInset(par.size(), inset, font, change);
                }
        } else if (token == "\\i") {
                InsetOld * inset = new InsetLatexAccent;
-               inset->read(&buf, lex);
+               inset->read(buf, lex);
                par.insertInset(par.size(), inset, font, change);
        } else if (token == "\\backslash") {
                par.insertChar(par.size(), '\\', font, change);
        } else if (token == "\\newline") {
                InsetOld * inset = new InsetNewline;
-               inset->read(&buf, lex);
+               inset->read(buf, lex);
                par.insertInset(par.size(), inset, font, change);
        } else if (token == "\\LyXTable") {
                InsetOld * inset = new InsetTabular(buf);
-               inset->read(&buf, lex);
+               inset->read(buf, lex);
                par.insertInset(par.size(), inset, font, change);
        } else if (token == "\\bibitem") {
                InsetCommandParams p("bibitem", "dummy");
                InsetBibitem * inset = new InsetBibitem(p);
-               inset->read(&buf, lex);
+               inset->read(buf, lex);
                par.insertInset(par.size(), inset, font, change);
        } else if (token == "\\hfill") {
                par.insertInset(par.size(), new InsetHFill, font, change);
@@ -961,14 +968,14 @@ int readParToken(Buffer & buf, Paragraph & par, LyXLex & lex, string const & tok
                change = Change(Change::UNCHANGED);
        } else if (token == "\\change_inserted") {
                lex.nextToken();
-               istringstream is(STRCONV(lex.getString()));
+               istringstream is(lex.getString());
                int aid;
                lyx::time_type ct;
                is >> aid >> ct;
                change = Change(Change::INSERTED, bp.author_map[aid], ct);
        } else if (token == "\\change_deleted") {
                lex.nextToken();
-               istringstream is(STRCONV(lex.getString()));
+               istringstream is(lex.getString());
                int aid;
                lyx::time_type ct;
                is >> aid >> ct;
@@ -1052,15 +1059,22 @@ ParagraphList::iterator outerPar(Buffer const & buf, InsetOld const * inset)
        ParIterator pit = const_cast<Buffer &>(buf).par_iterator_begin();
        ParIterator end = const_cast<Buffer &>(buf).par_iterator_end();
        for ( ; pit != end; ++pit) {
+
+               ParagraphList * plist;
+               // the second '=' below is intentional
+               for (int i = 0; (plist = inset->getParagraphs(i)); ++i)
+                       if (plist == &pit.plist())
+                               return pit.outerPar();
+
                InsetList::iterator ii = pit->insetlist.begin();
                InsetList::iterator iend = pit->insetlist.end();
                for ( ; ii != iend; ++ii)
                        if (ii->inset == inset)
                                return pit.outerPar();
        }
-       lyxerr << "outerPar: should not happen\n";
-       Assert(false);
-       return const_cast<Buffer &>(buf).paragraphs.end(); // shut up compiler
+       lyxerr << "outerPar: should not happen" << endl;
+       BOOST_ASSERT(false);
+       return const_cast<Buffer &>(buf).paragraphs().end(); // shut up compiler
 }
 
 
@@ -1069,13 +1083,19 @@ Paragraph const & ownerPar(Buffer const & buf, InsetOld const * inset)
        ParConstIterator pit = buf.par_iterator_begin();
        ParConstIterator end = buf.par_iterator_end();
        for ( ; pit != end; ++pit) {
+               ParagraphList * plist;
+               // the second '=' below is intentional
+               for (int i = 0; (plist = inset->getParagraphs(i)); ++i)
+                       if (plist == &pit.plist())
+                               return *pit.pit();
+
                InsetList::const_iterator ii = pit->insetlist.begin();
                InsetList::const_iterator iend = pit->insetlist.end();
                for ( ; ii != iend; ++ii)
                        if (ii->inset == inset)
                                return *pit.pit();
        }
-       lyxerr << "ownerPar: should not happen\n";
-       Assert(false);
-       return buf.paragraphs.front(); // shut up compiler
+       lyxerr << "ownerPar: should not happen" << endl;
+       BOOST_ASSERT(false);
+       return buf.paragraphs().front(); // shut up compiler
 }