Alfredo's second patch

[lyx.git] / src / texrow.C

diff --git a/src/texrow.C b/src/texrow.C
index e85d661b444de8c5e68182e9ed09772ebd6ddaa5..80adc8463ee7c8b15332b48d73965b10b4a34bf8 100644 (file)
--- a/src/texrow.C
+++ b/src/texrow.C
@@ -1,25 +1,71 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *      
- *         Copyright (C) 1995 Matthias Ettrich
- *          Copyright (C) 1995-1999 The LyX Team.
+/**
+ * \file texrow.C
+ * Copyright 1995-2002 the LyX Team
+ * Read the file COPYING
  *
- * ====================================================== */
+ * \author Matthias Ettrich
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <algorithm>
 
 #include "texrow.h"
-#include "lyxparagraph.h"
+#include "paragraph.h"
 #include "debug.h"
 
+using std::find_if;
+using std::for_each;
+using std::endl;
+
+namespace {
+
+/// function object returning true when row number is found
+class same_rownumber {
+public:
+       same_rownumber(int row) : row_(row) {}
+       bool operator()(TexRow::RowList::value_type const & vt) const {
+               return vt.rownumber() == row_;
+       }
+
+private:
+       int row_;
+};
+
+
+/// increment the pos value of the argument if the par id
+/// is the same, and the pos parameter is larger
+class increase_pos {
+public:
+       increase_pos(int id, int pos)
+               : id_(id), pos_(pos) {}
+
+       void operator()(TexRow::RowList::value_type & vt) const {
+               if (vt.id() != id_ || vt.pos() >= pos_)
+                       return;
+               vt.pos(vt.pos() + 1);
+
+               lyxerr[Debug::INFO]
+                       << "TeXRow::increasePos: ideally this "
+                       "should never happen..." << endl;
+
+               // FIXME: When verified to work this clause should be deleted.
+               if (id_ == vt.id() && pos_ == vt.pos()) {
+                       lyxerr[Debug::INFO]
+                               << "TexRow::increasePos: this should happen "
+                               "maximum one time for each run of "
+                               "increasePos!" << endl;
+               }
+       }
+
+private:
+       int id_;
+       int pos_;
+};
+
+} // namespace anon
+
 
-// Delete linked list
 void TexRow::reset()
 {
        rowlist.clear();
@@ -29,55 +75,46 @@ void TexRow::reset()
 }
 
 
-// Defines paragraph and position for the beginning of this row
-void TexRow::start(LyXParagraph * par, int pos)
+void TexRow::start(Paragraph * par, int pos)
 {
        lastpar = par;
        lastpos = pos;
 }
 
 
-// Insert node when line is completed
 void TexRow::newline()
 {
-       RowItem tmp;
-       tmp.pos = lastpos;
-       if (lastpar)
-               tmp.id = lastpar->id();
-       else
-               tmp.id = -1;
-       tmp.rownumber = ++count;
+       int const id = lastpar ? lastpar->id() : -1;
+       RowList::value_type tmp(id, lastpos, ++count);
        rowlist.push_back(tmp);
 }
 
 
-void TexRow::getIdFromRow(int row, int & id, int & pos)
+bool TexRow::getIdFromRow(int row, int & id, int & pos) const
 {
-       RowList::const_iterator cit = rowlist.begin();
-       for (; cit != rowlist.end(); ++cit) {
-               if ((*cit).rownumber == row) break;
-       }
+       RowList::const_iterator cit =
+               find_if(rowlist.begin(), rowlist.end(),
+                       same_rownumber(row));
+
        if (cit != rowlist.end()) {
-               RowList::iterator kit = rowlist.begin();
-               // Increase the pos of all rows with the
-               // same id (and where the pos is larger)
-               // to avoid putting errorinsets at the
-               // same pos.
-               for(; kit != rowlist.end(); ++kit) {
-                       if (&(*kit) != &(*cit)
-                           && (*kit).id == (*cit).id
-                           && (*kit).pos >= (*cit).pos)
-                               (*kit).pos++;
-               }
-       } else {
-               id = -1;
-               pos = 0;
+               id = cit->id();
+               pos = cit->pos();
+               return true;
        }
+       id = -1;
+       pos = 0;
+       return false;
 }
 
 
-TexRow & TexRow::operator+= (TexRow const & tr)
+void TexRow::increasePos(int id, int pos)
+{
+       for_each(rowlist.begin(), rowlist.end(), increase_pos(id, pos));
+}
+
+
+TexRow & TexRow::operator+=(TexRow const & tr)
 {
        rowlist.insert(rowlist.end(), tr.rowlist.begin(), tr.rowlist.end());
        return *this;
-}      
+}