don't rm emergency saves ever

[lyx.git] / src / paragraph_funcs.C

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 2a3994f38cc8867aeb1c6b8366a7e810b02169a1..6b27301b8d31232a68f9b80882345487f3d2c4a4 100644 (file)
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -149,10 +149,10 @@ void breakParagraphConservative(BufferParams const & bparams,
        // create a new paragraph
        ParagraphList::iterator tmp = paragraphs.insert(boost::next(par),
                                                        new Paragraph);
-       tmp->makeSameLayout(&*par);
+       tmp->makeSameLayout(*par);
 
-       // When can pos > Last()?
-       // I guess pos == Last() is possible.
+       // When can pos > size()?
+       // I guess pos == size() is possible.
        if (par->size() > pos) {
                // copy everything behind the break-position to the new
                // paragraph
@@ -196,66 +196,72 @@ void mergeParagraph(BufferParams const & bparams,
 }
 
 
-Paragraph * depthHook(Paragraph * par, Paragraph::depth_type depth)
+ParagraphList::iterator depthHook(ParagraphList::iterator pit,
+                                 ParagraphList const & plist,
+                                 Paragraph::depth_type depth)
 {
-       Paragraph * newpar = par;
+       ParagraphList::iterator newpit = pit;
+       ParagraphList::iterator beg = plist.begin();
 
-       do {
-               newpar = newpar->previous();
-       } while (newpar && newpar->getDepth() > depth);
-
-       if (!newpar) {
-               if (par->previous() || par->getDepth())
-                       lyxerr << "ERROR (Paragraph::DepthHook): "
-                               "no hook." << endl;
-               newpar = par;
+       if (newpit != beg)
+               --newpit;
+
+       while (newpit !=  beg && newpit->getDepth() > depth) {
+               --newpit;
        }
 
-       return newpar;
+       if (newpit->getDepth() > depth)
+               return pit;
+
+       return newpit;
 }
 
 
-Paragraph * outerHook(Paragraph * par)
+ParagraphList::iterator outerHook(ParagraphList::iterator pit,
+                                 ParagraphList const & plist)
 {
-       if (!par->getDepth())
-               return 0;
-       return depthHook(par, Paragraph::depth_type(par->getDepth() - 1));
+       if (!pit->getDepth())
+               return plist.end();
+       return depthHook(pit, plist,
+                        Paragraph::depth_type(pit->getDepth() - 1));
 }
 
 
-bool isFirstInSequence(Paragraph * par)
+bool isFirstInSequence(ParagraphList::iterator pit,
+                      ParagraphList const & plist)
 {
-       Paragraph const * dhook = depthHook(par, par->getDepth());
-       return (dhook == par
-               || dhook->layout() != par->layout()
-               || dhook->getDepth() != par->getDepth());
+       ParagraphList::iterator dhook = depthHook(pit, plist, pit->getDepth());
+       return (dhook == pit
+               || dhook->layout() != pit->layout()
+               || dhook->getDepth() != pit->getDepth());
 }
 
 
-int getEndLabel(Paragraph * p)
+int getEndLabel(ParagraphList::iterator p,
+               ParagraphList const & plist)
 {
-       Paragraph * par = p;
+       ParagraphList::iterator pit = p;
        Paragraph::depth_type par_depth = p->getDepth();
-       while (par) {
-               LyXLayout_ptr const & layout = par->layout();
+       while (pit != plist.end()) {
+               LyXLayout_ptr const & layout = pit->layout();
                int const endlabeltype = layout->endlabeltype;
 
                if (endlabeltype != END_LABEL_NO_LABEL) {
-                       if (!p->next())
+                       if (boost::next(p) == plist.end())
                                return endlabeltype;
 
-                       Paragraph::depth_type const next_depth = p->next()->getDepth();
+                       Paragraph::depth_type const next_depth = boost::next(p)->getDepth();
                        if (par_depth > next_depth ||
-                           (par_depth == next_depth
-                            && layout != p->next()->layout()))
+                           (par_depth == next_depth &&
+                            layout != boost::next(p)->layout()))
                                return endlabeltype;
                        break;
                }
                if (par_depth == 0)
                        break;
-               par = outerHook(par);
-               if (par)
-                       par_depth = par->getDepth();
+               pit = outerHook(pit, plist);
+               if (pit != plist.end())
+                       par_depth = pit->getDepth();
        }
        return END_LABEL_NO_LABEL;
 }
@@ -286,7 +292,8 @@ TeXDeeper(Buffer const * buf,
        lyxerr[Debug::LATEX] << "TeXDeeper...     " << &*pit << endl;
        ParagraphList::iterator par = pit;
 
-       while (par != paragraphs.end()&& par->params().depth() == pit->params().depth()) {
+       while (par != paragraphs.end() &&
+                    par->params().depth() == pit->params().depth()) {
                if (par->layout()->isEnvironment()) {
                        par = TeXEnvironment(buf, paragraphs, par,
                                                  os, texrow);
@@ -451,7 +458,7 @@ TeXOnePar(Buffer const * buf,
                }
 
                if (!pit->params().spacing().isDefault()
-                       && (pit == paragraphs.begin() || !boost::prior(pit)->hasSameLayout(&*pit))) {
+                       && (pit == paragraphs.begin() || !boost::prior(pit)->hasSameLayout(*pit))) {
                        os << pit->params().spacing().writeEnvirBegin() << '\n';
                        texrow.newline();
                }
@@ -471,7 +478,9 @@ TeXOnePar(Buffer const * buf,
                }
 
                if (pit->params().lineTop()) {
-                       os << "\\lyxline{\\" << pit->getFont(bparams, 0, outerFont(pit, paragraphs)).latexSize() << '}'
+                       os << "\\lyxline{\\"
+                          << pit->getFont(bparams, 0, outerFont(pit, paragraphs)).latexSize()
+                          << '}'
                           << "\\vspace{-1\\parskip}";
                        further_blank_line = true;
                }
@@ -631,7 +640,7 @@ TeXOnePar(Buffer const * buf,
                }
 
                if (!pit->params().spacing().isDefault()
-                       && (boost::next(pit) == paragraphs.end()|| !boost::next(pit)->hasSameLayout(&*pit))) {
+                       && (boost::next(pit) == paragraphs.end()|| !boost::next(pit)->hasSameLayout(*pit))) {
                        os << pit->params().spacing().writeEnvirEnd() << '\n';
                        texrow.newline();
                }
@@ -1031,18 +1040,18 @@ int readParagraph(Buffer & buf, Paragraph & par, LyXLex & lex)
 
 
 LyXFont const outerFont(ParagraphList::iterator pit,
-                       ParagraphList const & /*plist*/)
+                       ParagraphList const & plist)
 {
        Paragraph::depth_type par_depth = pit->getDepth();
        LyXFont tmpfont(LyXFont::ALL_INHERIT);
 
        // Resolve against environment font information
-       Paragraph * par = &*pit;
-       while (par && par_depth && !tmpfont.resolved()) {
-               par = outerHook(par);
-               if (par) {
-                       tmpfont.realize(par->layout()->font);
-                       par_depth = par->getDepth();
+       while (pit != plist.end() &&
+              par_depth && !tmpfont.resolved()) {
+               pit = outerHook(pit, plist);
+               if (pit != plist.end()) {
+                       tmpfont.realize(pit->layout()->font);
+                       par_depth = pit->getDepth();
                }
        }