Point fix, earlier forgotten

[lyx.git] / src / paragraph_funcs.C

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index e46407a1971965744a1ee3df0ebe9c023628da8e..c13bf6e706ee48188bda7c738fdb1db24e894b57 100644 (file)
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -5,7 +5,7 @@
  *
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -25,6 +25,7 @@
 #include "Lsstream.h"
 
 #include "support/lstrings.h"
+#include "support/LAssert.h"
 
 #include "insets/insetoptarg.h"
 #include "insets/insetcommandparams.h"
@@ -36,7 +37,7 @@
 #include "insets/insethfill.h"
 #include "insets/insetnewline.h"
 
-extern string bibitemWidest(Buffer const *);
+extern string bibitemWidest(Buffer const &);
 
 using namespace lyx::support;
 
@@ -59,7 +60,6 @@ bool moveItem(Paragraph & from, Paragraph & to,
                if (from.getInset(i)) {
                        // the inset is not in a paragraph anymore
                        tmpinset = from.insetlist.release(i);
-                       tmpinset->parOwner(0);
                }
 
                if (!to.insetAllowed(tmpinset->lyxCode()))
@@ -235,7 +235,7 @@ ParagraphList::iterator depthHook(ParagraphList::iterator pit,
        if (newpit != beg)
                --newpit;
 
-       while (newpit !=  beg && newpit->getDepth() > depth) {
+       while (newpit != beg && newpit->getDepth() > depth) {
                --newpit;
        }
 
@@ -298,14 +298,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 +314,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 +340,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 +348,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,26 +465,26 @@ 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,
          LatexRunParams const & runparams,
          string const & everypar)
 {
-       lyxerr[Debug::LATEX] << "TeXOnePar...     " << &*pit << " '" << everypar
-<< "'" << endl;
-       BufferParams const & bparams = buf->params;
+       lyxerr[Debug::LATEX] << "TeXOnePar...     " << &*pit << " '"
+               << everypar << "'" << endl;
+       BufferParams const & bparams = buf.params;
 
        InsetOld const * in = pit->inInset();
        bool further_blank_line = false;
        LyXLayout_ptr style;
 
        // well we have to check if we are in an inset with unlimited
-       // lenght (all in one row) if that is true then we don't allow
+       // length (all in one row) if that is true then we don't allow
        // any special options in the paragraph and also we don't allow
        // any environment other then "Standard" to be valid!
-       if ((in == 0) || !in->forceDefaultParagraphs(in)) {
+       if (in == 0 || !in->forceDefaultParagraphs(in)) {
                style = pit->layout();
 
                if (pit->params().startOfAppendix()) {
@@ -657,7 +657,7 @@ TeXOnePar(Buffer const * buf,
                }
        }
 
-       if ((in == 0) || !in->forceDefaultParagraphs(in)) {
+       if (in == 0 || !in->forceDefaultParagraphs(in)) {
                further_blank_line = false;
                if (pit->params().lineBottom()) {
                        os << "\\lyxline{\\" << font.latexSize() << '}';
@@ -720,7 +720,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 +729,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();
 
@@ -740,7 +740,7 @@ void latexParagraphs(Buffer const * buf,
                // length (all in one row) if that is true then we don't allow
                // any special options in the paragraph and also we don't allow
                // any environment other then "Standard" to be valid!
-               if ((in == 0) || !in->forceDefaultParagraphs(in)) {
+               if (in == 0 || !in->forceDefaultParagraphs(in)) {
                        LyXLayout_ptr const & layout = par->layout();
 
                        if (layout->intitle) {
@@ -929,27 +929,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);
@@ -1045,3 +1045,50 @@ LyXFont const outerFont(ParagraphList::iterator pit,
 
        return tmpfont;
 }
+
+
+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" << endl;
+       Assert(false);
+       return const_cast<Buffer &>(buf).paragraphs.end(); // shut up compiler
+}
+
+
+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" << endl;
+       Assert(false);
+       return buf.paragraphs.front(); // shut up compiler
+}