fix reading the author field.

[lyx.git] / src / BufferView.C

diff --git a/src/BufferView.C b/src/BufferView.C
index f5177579664fae0ef2bfb9df2517afb9a9bba1f8..88f6ea25303a16963a7a076ec59765d28689bbec 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -23,6 +23,7 @@
 #include "CutAndPaste.h"
 #include "debug.h"
 #include "funcrequest.h"
+#include "FuncStatus.h"
 #include "gettext.h"
 #include "insetiterator.h"
 #include "language.h"
@@ -46,11 +47,7 @@
 #include "insets/updatableinset.h"
 #include "insets/insettext.h"
 
-#include "support/filetools.h"
-#include "support/lyxalgo.h" // lyx_count
-
 using lyx::support::bformat;
-using lyx::support::MakeAbsPath;
 
 using lyx::cap::setSelectionRange;
 
@@ -64,9 +61,8 @@ using std::vector;
 extern BufferList bufferlist;
 
 
-BufferView::BufferView(LyXView * owner, int xpos, int ypos,
-                      int width, int height)
-       : pimpl_(new Pimpl(*this, owner, xpos, ypos, width, height))
+BufferView::BufferView(LyXView * owner, int width, int height)
+       : pimpl_(new Pimpl(*this, owner, width, height))
 {}
 
 
@@ -241,39 +237,21 @@ void BufferView::stuffClipboard(string const & stuff) const
 }
 
 
-bool BufferView::dispatch(FuncRequest const & ev)
+FuncStatus BufferView::getStatus(FuncRequest const & cmd)
 {
-       return pimpl_->dispatch(ev);
+       return pimpl_->getStatus(cmd);
 }
 
 
-void BufferView::scroll(int lines)
+bool BufferView::dispatch(FuncRequest const & ev)
 {
-       pimpl_->scroll(lines);
+       return pimpl_->dispatch(ev);
 }
 
 
-// Inserts a file into current document
-bool BufferView::insertLyXFile(string const & filen)
-       //
-       // Copyright CHT Software Service GmbH
-       // Uwe C. Schroeder
-       //
-       // Insert a LyXformat - file into current buffer
-       //
-       // Moved from lyx_cb.C (Lgb)
+void BufferView::scroll(int lines)
 {
-       BOOST_ASSERT(!filen.empty());
-
-       string const fname = MakeAbsPath(filen);
-
-       cursor().clearSelection();
-       text()->breakParagraph(cursor());
-
-       BOOST_ASSERT(cursor().inTexted());
-       bool res = buffer()->readFile(fname, cursor().par());
-       resize();
-       return res;
+       pimpl_->scroll(lines);
 }
 
 
@@ -304,8 +282,7 @@ void BufferView::setCursorFromRow(int row)
        if (tmpid == -1)
                text()->setCursor(cursor(), 0, 0);
        else
-               text()->setCursor(cursor(), buffer()->getParFromID(tmpid).pit(),
-                       tmppos);
+               text()->setCursor(cursor(), buffer()->getParFromID(tmpid).pit(), tmppos);
 }
 
 
@@ -339,14 +316,6 @@ LyXText * BufferView::getLyXText() const
 }
 
 
-Language const * BufferView::getParentLanguage(InsetOld * inset) const
-{
-       Paragraph const & par = ownerPar(*buffer(), inset);
-       return par.getFontSettings(buffer()->params(),
-                                  par.getPositionOfInset(inset)).language();
-}
-
-
 void BufferView::haveSelection(bool sel)
 {
        pimpl_->workarea().haveSelection(sel);
@@ -371,24 +340,12 @@ void BufferView::setCursor(ParIterator const & par, lyx::pos_type pos)
        for (int i = 0; i < last; ++i)
                par[i].inset().edit(cursor(), true);
 
-       cursor().setCursor(makeDocIterator(par, pos), false);
+       cursor().setCursor(makeDocIterator(par, pos));
+       cursor().selection() = false;
+       par.bottom().text()->redoParagraph(par.bottom().par());
 }
 
 
-/*
-if the fitCursor call refers to some point in never-explored-land, then we
-don't have y information in insets there, then we cannot even do an update
-to get it (because we need the y infomation for setting top_y first). So
-this is solved in putSelectionAt with:
-
-- setting top_y to the y of the outerPar (that has good info)
-- calling update
-- calling cursor().updatePos()
-- then call fitCursor()
-
-Ab.
-*/
-
 void BufferView::putSelectionAt(DocIterator const & cur,
                                int length, bool backwards)
 {
@@ -396,28 +353,18 @@ void BufferView::putSelectionAt(DocIterator const & cur,
 
        cursor().clearSelection();
 
-       LyXText & text = *cur[0].text();
        setCursor(par, cur.pos());
-       
-       // hack for the chicken and egg problem
-       top_y(text.getPar(par.outerPar()).y);
-
-       update();
-       //text.setCursor(cursor(), cur.par(), cur.pos());
-       cursor().updatePos();
 
        if (length) {
                if (backwards) {
                        cursor().setSelection(cursor(), -length);
                        DocIterator const it = cursor();
-                       cursor().setCursor(cursor().anchor_, true);
+                       cursor().setCursor(cursor().anchor_);
+                       cursor().selection() = true;
                        cursor().anchor_ = it;
                } else
                        cursor().setSelection(cursor(), length);
        }
-
-       fitCursor();
-       update();
 }