]> git.lyx.org Git - lyx.git/blobdiff - src/Text.cpp
adjust
[lyx.git] / src / Text.cpp
index 7a677f1849974625b516d4e943dbcbcb4e0c3c6d..c6c1d1dc875536ebd27fa47c61feef20ca450f76 100644 (file)
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "bufferview_funcs.h"
 #include "Cursor.h"
 #include "ParIterator.h"
-#include "CoordCache.h"
 #include "CutAndPaste.h"
 #include "debug.h"
 #include "DispatchResult.h"
 #include "Length.h"
 #include "Lexer.h"
 #include "LyXRC.h"
-#include "Row.h"
-#include "MetricsInfo.h"
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
-#include "rowpainter.h"
 #include "Undo.h"
+#include "TextMetrics.h"
 #include "VSpace.h"
 #include "WordLangTuple.h"
 
@@ -73,6 +69,7 @@
 #include "support/convert.h"
 
 #include <boost/current_function.hpp>
+#include <boost/next_prior.hpp>
 
 #include <sstream>
 
@@ -118,7 +115,7 @@ void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
 #endif
        } else if (token == "\\begin_layout") {
                lex.eatLine();
-               string layoutname = lex.getString();
+               docstring layoutname = lex.getDocString();
 
                font = Font(Font::ALL_INHERIT, bp.language);
                change = Change(Change::UNCHANGED);
@@ -134,14 +131,14 @@ void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
                if (!hasLayout) {
                        errorList.push_back(ErrorItem(_("Unknown layout"),
                        bformat(_("Layout '%1$s' does not exist in textclass '%2$s'\nTrying to use the default instead.\n"),
-                       from_utf8(layoutname), from_utf8(tclass.name())), par.id(), 0, par.size()));
+                       layoutname, from_utf8(tclass.name())), par.id(), 0, par.size()));
                        layoutname = tclass.defaultLayoutName();
                }
 
                par.layout(bp.getTextClass()[layoutname]);
 
                // Test whether the layout is obsolete.
-               Layout_ptr const & layout = par.layout();
+               LayoutPtr const & layout = par.layout();
                if (!layout->obsoleted_by().empty())
                        par.layout(bp.getTextClass()[layout->obsoleted_by()]);
 
@@ -344,6 +341,13 @@ void readParagraph(Buffer const & buf, Paragraph & par, Lexer & lex,
 } // namespace anon
 
 
+bool Text::empty() const
+{
+       return pars_.empty() || (pars_.size() == 1 && pars_[0].empty()
+               // FIXME: Should we consider the labeled type as empty too? 
+               && pars_[0].layout()->labeltype == LABEL_NO_LABEL);
+}
+
 
 double Text::spacing(Buffer const & buffer,
                Paragraph const & par) const
@@ -354,235 +358,7 @@ double Text::spacing(Buffer const & buffer,
 }
 
 
-int Text::singleWidth(Buffer const & buffer, Paragraph const & par,
-               pos_type pos) const
-{
-       return singleWidth(par, pos, par.getChar(pos),
-               getFont(buffer, par, pos));
-}
-
-
-int Text::singleWidth(Paragraph const & par,
-                        pos_type pos, char_type c, Font const & font) const
-{
-       // The most common case is handled first (Asger)
-       if (isPrintable(c)) {
-               Language const * language = font.language();
-               if (language->rightToLeft()) {
-                       if (language->lang() == "arabic" ||
-                           language->lang() == "farsi") {
-                               if (Encodings::isComposeChar_arabic(c))
-                                       return 0;
-                               c = par.transformChar(c, pos);
-                       } else if (language->lang() == "hebrew" &&
-                                  Encodings::isComposeChar_hebrew(c))
-                               return 0;
-               }
-               return theFontMetrics(font).width(c);
-       }
-
-       if (c == Paragraph::META_INSET)
-               return par.getInset(pos)->width();
-
-       return theFontMetrics(font).width(c);
-}
-
-
-int Text::leftMargin(Buffer const & buffer, int max_width, pit_type pit) const
-{
-       BOOST_ASSERT(pit >= 0);
-       BOOST_ASSERT(pit < int(pars_.size()));
-       return leftMargin(buffer, max_width, pit, pars_[pit].size());
-}
-
-
-int Text::leftMargin(Buffer const & buffer, int max_width,
-               pit_type const pit, pos_type const pos) const
-{
-       BOOST_ASSERT(pit >= 0);
-       BOOST_ASSERT(pit < int(pars_.size()));
-       Paragraph const & par = pars_[pit];
-       BOOST_ASSERT(pos >= 0);
-       BOOST_ASSERT(pos <= par.size());
-       //lyxerr << "Text::leftMargin: pit: " << pit << " pos: " << pos << endl;
-       TextClass const & tclass = buffer.params().getTextClass();
-       Layout_ptr const & layout = par.layout();
-
-       string parindent = layout->parindent;
-
-       int l_margin = 0;
-
-       if (isMainText(buffer))
-               l_margin += changebarMargin();
-
-       // FIXME UNICODE
-       docstring leftm = from_utf8(tclass.leftmargin());
-       l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(leftm);
-
-       if (par.getDepth() != 0) {
-               // find the next level paragraph
-               pit_type newpar = outerHook(pit, pars_);
-               if (newpar != pit_type(pars_.size())) {
-                       if (pars_[newpar].layout()->isEnvironment()) {
-                               l_margin = leftMargin(buffer, max_width, newpar);
-                       }
-                       if (par.layout() == tclass.defaultLayout()) {
-                               if (pars_[newpar].params().noindent())
-                                       parindent.erase();
-                               else
-                                       parindent = pars_[newpar].layout()->parindent;
-                       }
-               }
-       }
-
-       // This happens after sections in standard classes. The 1.3.x
-       // code compared depths too, but it does not seem necessary
-       // (JMarc)
-       if (par.layout() == tclass.defaultLayout()
-           && pit > 0 && pars_[pit - 1].layout()->nextnoindent)
-               parindent.erase();
-
-       Font const labelfont = getLabelFont(buffer, par);
-       FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
-
-       switch (layout->margintype) {
-       case MARGIN_DYNAMIC:
-               if (!layout->leftmargin.empty()) {
-                       // FIXME UNICODE
-                       docstring leftm = from_utf8(layout->leftmargin);
-                       l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(leftm);
-               }
-               if (!par.getLabelstring().empty()) {
-                       // FIXME UNICODE
-                       docstring labin = from_utf8(layout->labelindent);
-                       l_margin += labelfont_metrics.signedWidth(labin);
-                       docstring labstr = par.getLabelstring();
-                       l_margin += labelfont_metrics.width(labstr);
-                       docstring labsep = from_utf8(layout->labelsep);
-                       l_margin += labelfont_metrics.width(labsep);
-               }
-               break;
-
-       case MARGIN_MANUAL: {
-               // FIXME UNICODE
-               docstring labin = from_utf8(layout->labelindent);
-               l_margin += labelfont_metrics.signedWidth(labin);
-               // The width of an empty par, even with manual label, should be 0
-               if (!par.empty() && pos >= par.beginOfBody()) {
-                       if (!par.getLabelWidthString().empty()) {
-                               docstring labstr = par.getLabelWidthString();
-                               l_margin += labelfont_metrics.width(labstr);
-                               docstring labsep = from_utf8(layout->labelsep);
-                               l_margin += labelfont_metrics.width(labsep);
-                       }
-               }
-               break;
-       }
-
-       case MARGIN_STATIC: {
-               // FIXME UNICODE
-               docstring leftm = from_utf8(layout->leftmargin);
-               l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(leftm)
-                       * 4     / (par.getDepth() + 4);
-               break;
-       }
-
-       case MARGIN_FIRST_DYNAMIC:
-               if (layout->labeltype == LABEL_MANUAL) {
-                       if (pos >= par.beginOfBody()) {
-                               // FIXME UNICODE
-                               l_margin += labelfont_metrics.signedWidth(
-                                       from_utf8(layout->leftmargin));
-                       } else {
-                               // FIXME UNICODE
-                               l_margin += labelfont_metrics.signedWidth(
-                                       from_utf8(layout->labelindent));
-                       }
-               } else if (pos != 0
-                          // Special case to fix problems with
-                          // theorems (JMarc)
-                          || (layout->labeltype == LABEL_STATIC
-                              && layout->latextype == LATEX_ENVIRONMENT
-                              && !isFirstInSequence(pit, pars_))) {
-                       // FIXME UNICODE
-                       l_margin += labelfont_metrics.signedWidth(from_utf8(layout->leftmargin));
-               } else if (layout->labeltype != LABEL_TOP_ENVIRONMENT
-                          && layout->labeltype != LABEL_BIBLIO
-                          && layout->labeltype !=
-                          LABEL_CENTERED_TOP_ENVIRONMENT) {
-                       l_margin += labelfont_metrics.signedWidth(from_utf8(layout->labelindent));
-                       l_margin += labelfont_metrics.width(from_utf8(layout->labelsep));
-                       l_margin += labelfont_metrics.width(par.getLabelstring());
-               }
-               break;
-
-       case MARGIN_RIGHT_ADDRESS_BOX: {
-#if 0
-               // ok, a terrible hack. The left margin depends on the widest
-               // row in this paragraph.
-               RowList::iterator rit = par.rows().begin();
-               RowList::iterator end = par.rows().end();
-#ifdef WITH_WARNINGS
-#warning This is wrong.
-#endif
-               int minfill = max_width;
-               for ( ; rit != end; ++rit)
-                       if (rit->fill() < minfill)
-                               minfill = rit->fill();
-               l_margin += theFontMetrics(params.getFont()).signedWidth(layout->leftmargin);
-               l_margin += minfill;
-#endif
-               // also wrong, but much shorter.
-               l_margin += max_width / 2;
-               break;
-       }
-       }
-
-       if (!par.params().leftIndent().zero())
-               l_margin += par.params().leftIndent().inPixels(max_width);
-
-       LyXAlignment align;
-
-       if (par.params().align() == LYX_ALIGN_LAYOUT)
-               align = layout->align;
-       else
-               align = par.params().align();
-
-       // set the correct parindent
-       if (pos == 0
-           && (layout->labeltype == LABEL_NO_LABEL
-              || layout->labeltype == LABEL_TOP_ENVIRONMENT
-              || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
-              || (layout->labeltype == LABEL_STATIC
-                  && layout->latextype == LATEX_ENVIRONMENT
-                  && !isFirstInSequence(pit, pars_)))
-           && align == LYX_ALIGN_BLOCK
-           && !par.params().noindent()
-           // in some insets, paragraphs are never indented
-           && !(par.inInset() && par.inInset()->neverIndent(buffer))
-           // display style insets are always centered, omit indentation
-           && !(!par.empty()
-                   && par.isInset(pos)
-                   && par.getInset(pos)->display())
-           && (par.layout() != tclass.defaultLayout()
-               || buffer.params().paragraph_separation ==
-                  BufferParams::PARSEP_INDENT))
-       {
-               docstring din = from_utf8(parindent);
-               l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(din);
-       }
-
-       return l_margin;
-}
-
-
-Color_color Text::backgroundColor() const
-{
-       return Color_color(Color::color(background_color_));
-}
-
-
-void Text::breakParagraph(Cursor & cur, bool keep_layout)
+void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 {
        BOOST_ASSERT(this == cur.text());
 
@@ -590,7 +366,7 @@ void Text::breakParagraph(Cursor & cur, bool keep_layout)
        pit_type cpit = cur.pit();
 
        TextClass const & tclass = cur.buffer().params().getTextClass();
-       Layout_ptr const & layout = cpar.layout();
+       LayoutPtr const & layout = cpar.layout();
 
        // this is only allowed, if the current paragraph is not empty
        // or caption and if it has not the keepempty flag active
@@ -607,11 +383,9 @@ void Text::breakParagraph(Cursor & cur, bool keep_layout)
                cpar.eraseChar(cur.pos(), cur.buffer().params().trackChanges);
 
        // What should the layout for the new paragraph be?
-       int preserve_layout = 0;
-       if (keep_layout)
-               preserve_layout = 2;
-       else
-               preserve_layout = layout->isEnvironment();
+       bool keep_layout = inverse_logic ? 
+               !layout->isEnvironment() 
+               : layout->isEnvironment();
 
        // We need to remember this before we break the paragraph, because
        // that invalidates the layout variable
@@ -621,7 +395,7 @@ void Text::breakParagraph(Cursor & cur, bool keep_layout)
        bool const isempty = cpar.allowEmpty() && cpar.empty();
 
        lyx::breakParagraph(cur.buffer().params(), paragraphs(), cpit,
-                        cur.pos(), preserve_layout);
+                        cur.pos(), keep_layout);
 
        // After this, neither paragraph contains any rows!
 
@@ -643,12 +417,7 @@ void Text::breakParagraph(Cursor & cur, bool keep_layout)
                        break; // the character couldn't be deleted physically due to change tracking
        }
 
-       ParIterator current_it(cur);
-       ParIterator last_it(cur);
-       ++last_it;
-       ++last_it;
-
-       updateLabels(cur.buffer(), current_it, last_it);
+       updateLabels(cur.buffer());
 
        // A singlePar update is not enough in this case.
        cur.updateFlags(Update::Force);
@@ -671,6 +440,7 @@ void Text::insertChar(Cursor & cur, char_type c)
 
        recordUndo(cur, Undo::INSERT);
 
+       TextMetrics const & tm = cur.bv().textMetrics(this);
        Buffer const & buffer = cur.buffer();
        Paragraph & par = cur.paragraph();
        // try to remove this
@@ -684,17 +454,17 @@ void Text::insertChar(Cursor & cur, char_type c)
                static docstring const number_unary_operators = from_ascii("+-");
                static docstring const number_seperators = from_ascii(".,:");
 
-               if (current_font.number() == Font::ON) {
+               if (cur.current_font.number() == Font::ON) {
                        if (!isDigit(c) && !contains(number_operators, c) &&
                            !(contains(number_seperators, c) &&
                              cur.pos() != 0 &&
                              cur.pos() != cur.lastpos() &&
-                             getFont(buffer, par, cur.pos()).number() == Font::ON &&
-                             getFont(buffer, par, cur.pos() - 1).number() == Font::ON)
+                             tm.getDisplayFont(pit, cur.pos()).number() == Font::ON &&
+                             tm.getDisplayFont(pit, cur.pos() - 1).number() == Font::ON)
                           )
                                number(cur); // Set current_font.number to OFF
                } else if (isDigit(c) &&
-                          real_current_font.isVisibleRightToLeft()) {
+                          cur.real_current_font.isVisibleRightToLeft()) {
                        number(cur); // Set current_font.number to ON
 
                        if (cur.pos() != 0) {
@@ -704,11 +474,13 @@ void Text::insertChar(Cursor & cur, char_type c)
                                     || par.isSeparator(cur.pos() - 2)
                                     || par.isNewline(cur.pos() - 2))
                                  ) {
-                                       setCharFont(buffer, pit, cur.pos() - 1, current_font);
+                                       setCharFont(buffer, pit, cur.pos() - 1, cur.current_font,
+                                               tm.font_);
                                } else if (contains(number_seperators, c)
                                     && cur.pos() >= 2
-                                    && getFont(buffer, par, cur.pos() - 2).number() == Font::ON) {
-                                       setCharFont(buffer, pit, cur.pos() - 1, current_font);
+                                    && tm.getDisplayFont(pit, cur.pos() - 2).number() == Font::ON) {
+                                       setCharFont(buffer, pit, cur.pos() - 1, cur.current_font,
+                                               tm.font_);
                                }
                        }
                }
@@ -739,8 +511,8 @@ void Text::insertChar(Cursor & cur, char_type c)
        if ((cur.pos() >= 2) && (par.isLineSeparator(cur.pos() - 1))) {
                // get font in front and behind the space in question. But do NOT 
                // use getFont(cur.pos()) because the character c is not inserted yet
-               Font const & pre_space_font  = getFont(buffer, par, cur.pos() - 2);
-               Font const & post_space_font = real_current_font;
+               Font const & pre_space_font  = tm.getDisplayFont(cur.pit(), cur.pos() - 2);
+               Font const & post_space_font = cur.real_current_font;
                bool pre_space_rtl  = pre_space_font.isVisibleRightToLeft();
                bool post_space_rtl = post_space_font.isVisibleRightToLeft();
                
@@ -749,10 +521,10 @@ void Text::insertChar(Cursor & cur, char_type c)
                        // adjacent character whose direction is the paragraph's
                        // direction; don't touch other properties of the font
                        Language const * lang = 
-                               (pre_space_rtl == par.isRightToLeftPar(buffer.params())) ?
+                               (pre_space_rtl == par.isRTL(buffer.params())) ?
                                pre_space_font.language() : post_space_font.language();
 
-                       Font space_font = getFont(buffer, par, cur.pos() - 1);
+                       Font space_font = tm.getDisplayFont(cur.pit(), cur.pos() - 1);
                        space_font.setLanguage(lang);
                        par.setFont(cur.pos() - 1, space_font);
                }
@@ -789,7 +561,7 @@ void Text::insertChar(Cursor & cur, char_type c)
                }
        }
 
-       par.insertChar(cur.pos(), c, current_font, cur.buffer().params().trackChanges);
+       par.insertChar(cur.pos(), c, cur.current_font, cur.buffer().params().trackChanges);
        checkBufferStructure(cur.buffer(), cur);
 
 //             cur.updateFlags(Update::Force);
@@ -870,7 +642,6 @@ void Text::selectWord(Cursor & cur, word_location loc)
        cur.resetAnchor();
        setCursor(cur, to.pit(), to.pos());
        cur.setSelection();
-       cap::saveSelection(cur);
 }
 
 
@@ -992,36 +763,8 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
 
 void Text::acceptChanges(BufferParams const & bparams)
 {
-       pit_type pars_size = static_cast<pit_type>(pars_.size());
-
-       // first, accept changes within each individual paragraph
-       // (do not consider end-of-par)
-       for (pit_type pit = 0; pit < pars_size; ++pit) {
-               if (!pars_[pit].empty())   // prevent assertion failure
-                       pars_[pit].acceptChanges(bparams, 0, pars_[pit].size());
-       }
-
-       // next, accept imaginary end-of-par characters
-       for (pit_type pit = 0; pit < pars_size; ++pit) {
-               pos_type pos = pars_[pit].size();
-
-               if (pars_[pit].isInserted(pos)) {
-                       pars_[pit].setChange(pos, Change(Change::UNCHANGED));
-               } else if (pars_[pit].isDeleted(pos)) {
-                       if (pit == pars_size - 1) {
-                               // we cannot remove a par break at the end of the last
-                               // paragraph; instead, we mark it unchanged
-                               pars_[pit].setChange(pos, Change(Change::UNCHANGED));
-                       } else {
-                               mergeParagraph(bparams, pars_, pit);
-                               --pit;
-                               --pars_size;
-                       }
-               }
-       }
-
-       // finally, invoke the DEPM
-       deleteEmptyParagraphMechanism(0, pars_size - 1, bparams.trackChanges);
+       lyx::acceptChanges(pars_, bparams);
+       deleteEmptyParagraphMechanism(0, pars_.size() - 1, bparams.trackChanges);
 }
 
 
@@ -1060,7 +803,6 @@ void Text::rejectChanges(BufferParams const & bparams)
 }
 
 
-// Delete from cursor up to the end of the current or next word.
 void Text::deleteWordForward(Cursor & cur)
 {
        BOOST_ASSERT(this == cur.text());
@@ -1077,7 +819,6 @@ void Text::deleteWordForward(Cursor & cur)
 }
 
 
-// Delete from cursor to start of current or prior word.
 void Text::deleteWordBackward(Cursor & cur)
 {
        BOOST_ASSERT(this == cur.text());
@@ -1095,27 +836,6 @@ void Text::deleteWordBackward(Cursor & cur)
 
 
 // Kill to end of line.
-void Text::deleteLineForward(Cursor & cur)
-{
-       BOOST_ASSERT(this == cur.text());
-       if (cur.lastpos() == 0) {
-               // Paragraph is empty, so we just go to the right
-               cursorRight(cur);
-       } else {
-               cur.resetAnchor();
-               cur.selection() = true; // to avoid deletion
-               cursorEnd(cur);
-               cur.setSelection();
-               // What is this test for ??? (JMarc)
-               if (!cur.selection())
-                       deleteWordForward(cur);
-               else
-                       cutSelection(cur, true, false);
-               checkBufferStructure(cur.buffer(), cur);
-       }
-}
-
-
 void Text::changeCase(Cursor & cur, Text::TextCase action)
 {
        BOOST_ASSERT(this == cur.text());
@@ -1261,7 +981,7 @@ bool Text::erase(Cursor & cur)
                recordUndo(cur, Undo::DELETE);
                if(!par.eraseChar(cur.pos(), cur.buffer().params().trackChanges)) {
                        // the character has been logically deleted only => skip it
-                       cur.forwardPosNoDescend();
+                       cur.top().forwardPos();
                }
                checkBufferStructure(cur.buffer(), cur);
                needsUpdate = true;
@@ -1377,7 +1097,7 @@ bool Text::backspace(Cursor & cur)
        }
 
        if (cur.pos() == cur.lastpos())
-               setCurrentFont(cur);
+               cur.setCurrentFont();
 
        needsUpdate |= handleBibitems(cur);
 
@@ -1392,7 +1112,7 @@ bool Text::backspace(Cursor & cur)
 bool Text::dissolveInset(Cursor & cur) {
        BOOST_ASSERT(this == cur.text());
 
-       if (isMainText(*cur.bv().buffer()) || cur.inset().nargs() != 1)
+       if (isMainText(cur.bv().buffer()) || cur.inset().nargs() != 1)
                return false;
 
        recordUndoInset(cur);
@@ -1421,7 +1141,7 @@ bool Text::dissolveInset(Cursor & cur) {
                                        b.getLanguage());
                }
 
-               pasteParagraphList(cur, plist, b.params().textclass,
+               pasteParagraphList(cur, plist, b.params().getTextClassPtr(),
                                   b.errorList("Paste"));
                // restore position
                cur.pit() = std::min(cur.lastpit(), spit);
@@ -1433,189 +1153,6 @@ bool Text::dissolveInset(Cursor & cur) {
 }
 
 
-// only used for inset right now. should also be used for main text
-void Text::draw(PainterInfo & pi, int x, int y) const
-{
-       paintTextInset(*this, pi, x, y);
-}
-
-
-// only used for inset right now. should also be used for main text
-void Text::drawSelection(PainterInfo & pi, int x, int) const
-{
-       Cursor & cur = pi.base.bv->cursor();
-       if (!cur.selection())
-               return;
-       if (!ptr_cmp(cur.text(), this))
-               return;
-
-       LYXERR(Debug::DEBUG)
-               << BOOST_CURRENT_FUNCTION
-               << "draw selection at " << x
-               << endl;
-
-       DocIterator beg = cur.selectionBegin();
-       DocIterator end = cur.selectionEnd();
-
-       BufferView & bv = *pi.base.bv;
-
-       // the selection doesn't touch the visible screen?
-       if (bv_funcs::status(&bv, beg) == bv_funcs::CUR_BELOW
-           || bv_funcs::status(&bv, end) == bv_funcs::CUR_ABOVE)
-               return;
-
-       TextMetrics const & tm = bv.textMetrics(this);
-       ParagraphMetrics const & pm1 = tm.parMetrics(beg.pit());
-       ParagraphMetrics const & pm2 = tm.parMetrics(end.pit());
-       Row const & row1 = pm1.getRow(beg.pos(), beg.boundary());
-       Row const & row2 = pm2.getRow(end.pos(), end.boundary());
-
-       // clip above
-       int middleTop;
-       bool const clipAbove = 
-               (bv_funcs::status(&bv, beg) == bv_funcs::CUR_ABOVE);
-       if (clipAbove)
-               middleTop = 0;
-       else
-               middleTop = bv_funcs::getPos(bv, beg, beg.boundary()).y_ + row1.descent();
-       
-       // clip below
-       int middleBottom;
-       bool const clipBelow = 
-               (bv_funcs::status(&bv, end) == bv_funcs::CUR_BELOW);
-       if (clipBelow)
-               middleBottom = bv.workHeight();
-       else
-               middleBottom = bv_funcs::getPos(bv, end, end.boundary()).y_ - row2.ascent();
-
-       // start and end in the same line?
-       if (!(clipAbove || clipBelow) && &row1 == &row2)
-               // then only draw this row's selection
-               drawRowSelection(pi, x, row1, beg, end, false, false);
-       else {
-               if (!clipAbove) {
-                       // get row end
-                       DocIterator begRowEnd = beg;
-                       begRowEnd.pos() = row1.endpos();
-                       begRowEnd.boundary(true);
-                       
-                       // draw upper rectangle
-                       drawRowSelection(pi, x, row1, beg, begRowEnd, false, true);
-               }
-                       
-               if (middleTop < middleBottom) {
-                       // draw middle rectangle
-                       pi.pain.fillRectangle(x, middleTop, 
-                                                                                                               tm.width(), middleBottom - middleTop, 
-                                                                                                               Color::selection);
-               }
-
-               if (!clipBelow) {
-                       // get row begin
-                       DocIterator endRowBeg = end;
-                       endRowBeg.pos() = row2.pos();
-                       endRowBeg.boundary(false);
-                       
-                       // draw low rectangle
-                       drawRowSelection(pi, x, row2, endRowBeg, end, true, false);
-               }
-       }
-}
-
-
-void Text::drawRowSelection(PainterInfo & pi, int x, Row const & row,
-                                                                                                               DocIterator const & beg, DocIterator const & end, 
-                                                                                                               bool drawOnBegMargin, bool drawOnEndMargin) const
-{
-       BufferView & bv = *pi.base.bv;
-       Buffer & buffer = *bv.buffer();
-       TextMetrics const & tm = bv.textMetrics(this);
-       DocIterator cur = beg;
-       int x1 = cursorX(bv, beg.top(), beg.boundary());
-       int x2 = cursorX(bv, end.top(), end.boundary());
-       int y1 = bv_funcs::getPos(bv, cur, cur.boundary()).y_ - row.ascent();
-       int y2 = y1 + row.height();
-       
-       // draw the margins
-       if (drawOnBegMargin) {
-               if (isRTL(buffer, beg.paragraph()))
-                       pi.pain.fillRectangle(x + x1, y1, tm.width() - x1, y2 - y1, Color::selection);
-               else
-                       pi.pain.fillRectangle(x, y1, x1, y2 - y1, Color::selection);
-       }
-       
-       if (drawOnEndMargin) {
-               if (isRTL(buffer, beg.paragraph()))
-                       pi.pain.fillRectangle(x, y1, x2, y2 - y1, Color::selection);
-               else
-                       pi.pain.fillRectangle(x + x2, y1, tm.width() - x2, y2 - y1, Color::selection);
-       }
-       
-       // if we are on a boundary from the beginning, it's probably
-       // a RTL boundary and we jump to the other side directly as this
-       // segement is 0-size and confuses the logic below
-       if (cur.boundary())
-               cur.boundary(false);
-       
-       // go through row and draw from RTL boundary to RTL boundary
-       while (cur < end) {
-               bool drawNow = false;
-               
-               // simplified cursorRight code below which does not
-               // descend into insets and which does not go into the
-               // next line. Compare the logic with the original cursorRight
-               
-               // if left of boundary -> just jump to right side
-               // but for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi
-               if (cur.boundary()) {
-                       cur.boundary(false);
-               }       else if (isRTLBoundary(buffer, cur.paragraph(), cur.pos() + 1)) {
-                       // in front of RTL boundary -> Stay on this side of the boundary because:
-                       //   ab|cDDEEFFghi -> abc|DDEEFFghi
-                       ++cur.pos();
-                       cur.boundary(true);
-                       drawNow = true;
-               } else {
-                       // move right
-                       ++cur.pos();
-                       
-                       // line end?
-                       if (cur.pos() == row.endpos())
-                               cur.boundary(true);
-               }
-                       
-               if (x1 == -1) {
-                       // the previous segment was just drawn, now the next starts
-                       x1 = cursorX(bv, cur.top(), cur.boundary());
-               }
-               
-               if (!(cur < end) || drawNow) {
-                       x2 = cursorX(bv, cur.top(), cur.boundary());
-                       pi.pain.fillRectangle(x + min(x1,x2), y1, abs(x2 - x1), y2 - y1,
-                                                                                                               Color::selection);
-                       
-                       // reset x1, so it is set again next round (which will be on the 
-                       // right side of a boundary or at the selection end)
-                       x1 = -1;
-               }
-       }
-}
-
-
-
-bool Text::isLastRow(pit_type pit, Row const & row) const
-{
-       return row.endpos() >= pars_[pit].size()
-               && pit + 1 == pit_type(paragraphs().size());
-}
-
-
-bool Text::isFirstRow(pit_type pit, Row const & row) const
-{
-       return row.pos() == 0 && pit == 0;
-}
-
-
 void Text::getWord(CursorSlice & from, CursorSlice & to,
        word_location const loc)
 {
@@ -1663,6 +1200,10 @@ void Text::write(Buffer const & buf, std::ostream & os) const
        depth_type dth = 0;
        for (; pit != end; ++pit)
                pit->write(buf, os, buf.params(), dth);
+
+       // Close begin_deeper
+       for(; dth > 0; --dth)
+               os << "\n\\end_deeper";
 }
 
 
@@ -1717,118 +1258,6 @@ bool Text::read(Buffer const & buf, Lexer & lex, ErrorList & errorList)
        return true;
 }
 
-int Text::cursorX(BufferView const & bv, CursorSlice const & sl,
-               bool boundary) const
-{
-       TextMetrics const & tm = bv.textMetrics(sl.text());
-       pit_type const pit = sl.pit();
-       Paragraph const & par = pars_[pit];
-       ParagraphMetrics const & pm = tm.parMetrics(pit);
-       if (pm.rows().empty())
-               return 0;
-
-       pos_type ppos = sl.pos();
-       // Correct position in front of big insets
-       bool const boundary_correction = ppos != 0 && boundary;
-       if (boundary_correction)
-               --ppos;
-
-       Row const & row = pm.getRow(sl.pos(), boundary);
-
-       pos_type cursor_vpos = 0;
-
-       Buffer const & buffer = *bv.buffer();
-       RowMetrics const m = tm.computeRowMetrics(pit, row);
-       double x = m.x;
-       Bidi bidi;
-       bidi.computeTables(par, buffer, row);
-
-       pos_type const row_pos  = row.pos();
-       pos_type const end      = row.endpos();
-
-       if (end <= row_pos)
-               cursor_vpos = row_pos;
-       else if (ppos >= end)
-               cursor_vpos = isRTL(buffer, par) ? row_pos : end;
-       else if (ppos > row_pos && ppos >= end)
-               // Place cursor after char at (logical) position pos - 1
-               cursor_vpos = (bidi.level(ppos - 1) % 2 == 0)
-                       ? bidi.log2vis(ppos - 1) + 1 : bidi.log2vis(ppos - 1);
-       else
-               // Place cursor before char at (logical) position ppos
-               cursor_vpos = (bidi.level(ppos) % 2 == 0)
-                       ? bidi.log2vis(ppos) : bidi.log2vis(ppos) + 1;
-
-       pos_type body_pos = par.beginOfBody();
-       if (body_pos > 0 &&
-           (body_pos > end || !par.isLineSeparator(body_pos - 1)))
-               body_pos = 0;
-
-       // Use font span to speed things up, see below
-       FontSpan font_span;
-       Font font;
-       FontMetrics const & labelfm = theFontMetrics(
-               getLabelFont(buffer, par));
-
-       for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
-               pos_type pos = bidi.vis2log(vpos);
-               if (body_pos > 0 && pos == body_pos - 1) {
-                       // FIXME UNICODE
-                       docstring const lsep = from_utf8(par.layout()->labelsep);
-                       x += m.label_hfill + labelfm.width(lsep);
-                       if (par.isLineSeparator(body_pos - 1))
-                               x -= singleWidth(buffer, par, body_pos - 1);
-               }
-
-               // Use font span to speed things up, see above
-               if (pos < font_span.first || pos > font_span.last) {
-                       font_span = par.fontSpan(pos);
-                       font = getFont(buffer, par, pos);
-               }
-
-               x += singleWidth(par, pos, par.getChar(pos), font);
-
-               if (par.hfillExpansion(row, pos))
-                       x += (pos >= body_pos) ? m.hfill : m.label_hfill;
-               else if (par.isSeparator(pos) && pos >= body_pos)
-                       x += m.separator;
-       }
-
-       // see correction above
-       if (boundary_correction) {
-               if (isRTL(buffer, sl, boundary))
-                       x -= singleWidth(buffer, par, ppos);
-               else
-                       x += singleWidth(buffer, par, ppos);
-       }
-
-       return int(x);
-}
-
-
-int Text::cursorY(BufferView const & bv, CursorSlice const & sl, bool boundary) const
-{
-       //lyxerr << "Text::cursorY: boundary: " << boundary << std::endl;
-       ParagraphMetrics const & pm = bv.parMetrics(this, sl.pit());
-       if (pm.rows().empty())
-               return 0;
-
-       int h = 0;
-       h -= bv.parMetrics(this, 0).rows()[0].ascent();
-       for (pit_type pit = 0; pit < sl.pit(); ++pit) {
-               h += bv.parMetrics(this, pit).height();
-       }
-       int pos = sl.pos();
-       if (pos && boundary)
-               --pos;
-       size_t const rend = pm.pos2row(pos);
-       for (size_t rit = 0; rit != rend; ++rit)
-               h += pm.rows()[rit].height();
-       h += pm.rows()[rend].ascent();
-       return h;
-}
-
-
 // Returns the current font and depth as a message.
 docstring Text::currentState(Cursor & cur)
 {
@@ -1855,7 +1284,7 @@ docstring Text::currentState(Cursor & cur)
        // I think we should only show changes from the default
        // font. (Asger)
        // No, from the document font (MV)
-       Font font = real_current_font;
+       Font font = cur.real_current_font;
        font.reduce(buf.params().getFont());
 
        os << bformat(_("Font: %1$s"), font.stateText(&buf.params()));
@@ -1913,7 +1342,7 @@ docstring Text::getPossibleLabel(Cursor & cur) const
 {
        pit_type pit = cur.pit();
 
-       Layout_ptr layout = pars_[pit].layout();
+       LayoutPtr layout = pars_[pit].layout();
 
        docstring text;
        docstring par_text = pars_[pit].asString(cur.buffer(), false);
@@ -1937,7 +1366,7 @@ docstring Text::getPossibleLabel(Cursor & cur) const
 
        // For section, subsection, etc...
        if (layout->latextype == LATEX_PARAGRAPH && pit != 0) {
-               Layout_ptr const & layout2 = pars_[pit - 1].layout();
+               LayoutPtr const & layout2 = pars_[pit - 1].layout();
                if (layout2->latextype != LATEX_PARAGRAPH) {
                        --pit;
                        layout = layout2;
@@ -1947,17 +1376,17 @@ docstring Text::getPossibleLabel(Cursor & cur) const
                name = from_ascii(layout->latexname());
 
        // for captions, we just take the caption type
-       Inset * caption_inset = cur.innerInsetOfType(Inset::CAPTION_CODE);
+       Inset * caption_inset = cur.innerInsetOfType(CAPTION_CODE);
        if (caption_inset)
                name = from_ascii(static_cast<InsetCaption *>(caption_inset)->type());
 
        // If none of the above worked, we'll see if we're inside various
        // types of insets and take our abbreviation from them.
        if (name.empty()) {
-               Inset::Code const codes[] = {
-                       Inset::FLOAT_CODE,
-                       Inset::WRAP_CODE,
-                       Inset::FOOT_CODE
+               InsetCode const codes[] = {
+                       FLOAT_CODE,
+                       WRAP_CODE,
+                       FOOT_CODE
                };
                for (unsigned int i = 0; i < (sizeof codes / sizeof codes[0]); ++i) {
                        Inset * float_inset = cur.innerInsetOfType(codes[i]);
@@ -1983,56 +1412,6 @@ docstring Text::getPossibleLabel(Cursor & cur) const
 }
 
 
-void Text::setCursorFromCoordinates(Cursor & cur, int const x, int const y)
-{
-       BOOST_ASSERT(this == cur.text());
-       pit_type pit = getPitNearY(cur.bv(), y);
-
-       TextMetrics const & tm = cur.bv().textMetrics(this);
-       ParagraphMetrics const & pm = tm.parMetrics(pit);
-
-       int yy = cur.bv().coordCache().get(this, pit).y_ - pm.ascent();
-       LYXERR(Debug::DEBUG)
-               << BOOST_CURRENT_FUNCTION
-               << ": x: " << x
-               << " y: " << y
-               << " pit: " << pit
-               << " yy: " << yy << endl;
-
-       int r = 0;
-       BOOST_ASSERT(pm.rows().size());
-       for (; r < int(pm.rows().size()) - 1; ++r) {
-               Row const & row = pm.rows()[r];
-               if (int(yy + row.height()) > y)
-                       break;
-               yy += row.height();
-       }
-
-       Row const & row = pm.rows()[r];
-
-       LYXERR(Debug::DEBUG)
-               << BOOST_CURRENT_FUNCTION
-               << ": row " << r
-               << " from pos: " << row.pos()
-               << endl;
-
-       bool bound = false;
-       int xx = x;
-       pos_type const pos = row.pos()
-               + tm.getColumnNearX(pit, row, xx, bound);
-
-       LYXERR(Debug::DEBUG)
-               << BOOST_CURRENT_FUNCTION
-               << ": setting cursor pit: " << pit
-               << " pos: " << pos
-               << endl;
-
-       setCursor(cur, pit, pos, true, bound);
-       // remember new position.
-       cur.setTargetX();
-}
-
-
 void Text::charsTranspose(Cursor & cur)
 {
        BOOST_ASSERT(this == cur.text());