]> git.lyx.org Git - lyx.git/blobdiff - src/Text.cpp
adjust
[lyx.git] / src / Text.cpp
index 09606366ac596d330cb9476a24e65a192102b175..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 "Undo.h"
+#include "TextMetrics.h"
 #include "VSpace.h"
 #include "WordLangTuple.h"
 
@@ -72,6 +69,7 @@
 #include "support/convert.h"
 
 #include <boost/current_function.hpp>
+#include <boost/next_prior.hpp>
 
 #include <sstream>
 
@@ -360,183 +358,7 @@ double Text::spacing(Buffer const & buffer,
 }
 
 
-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();
-       LayoutPtr const & layout = par.layout();
-
-       docstring parindent = layout->parindent;
-
-       int l_margin = 0;
-
-       if (isMainText(buffer))
-               l_margin += changebarMargin();
-
-       l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
-               tclass.leftmargin());
-
-       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()) {
-                       l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
-                               layout->leftmargin);
-               }
-               if (!par.getLabelstring().empty()) {
-                       l_margin += labelfont_metrics.signedWidth(layout->labelindent);
-                       l_margin += labelfont_metrics.width(par.getLabelstring());
-                       l_margin += labelfont_metrics.width(layout->labelsep);
-               }
-               break;
-
-       case MARGIN_MANUAL: {
-               l_margin += labelfont_metrics.signedWidth(layout->labelindent);
-               // 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);
-                               l_margin += labelfont_metrics.width(layout->labelsep);
-                       }
-               }
-               break;
-       }
-
-       case MARGIN_STATIC: {
-               l_margin += theFontMetrics(buffer.params().getFont()).
-                       signedWidth(layout->leftmargin) * 4     / (par.getDepth() + 4);
-               break;
-       }
-
-       case MARGIN_FIRST_DYNAMIC:
-               if (layout->labeltype == LABEL_MANUAL) {
-                       if (pos >= par.beginOfBody()) {
-                               l_margin += labelfont_metrics.signedWidth(layout->leftmargin);
-                       } else {
-                               l_margin += labelfont_metrics.signedWidth(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_))) {
-                       l_margin += labelfont_metrics.signedWidth(layout->leftmargin);
-               } else if (layout->labeltype != LABEL_TOP_ENVIRONMENT
-                          && layout->labeltype != LABEL_BIBLIO
-                          && layout->labeltype !=
-                          LABEL_CENTERED_TOP_ENVIRONMENT) {
-                       l_margin += labelfont_metrics.signedWidth(layout->labelindent);
-                       l_margin += labelfont_metrics.width(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();
-               // FIXME: This is wrong.
-               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))
-       {
-               l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
-                       parindent);
-       }
-
-       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());
 
@@ -561,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
@@ -575,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!
 
@@ -620,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
@@ -633,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) {
@@ -653,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_);
                                }
                        }
                }
@@ -688,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();
                
@@ -698,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);
                }
@@ -738,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);
@@ -980,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());
@@ -997,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());
@@ -1015,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());
@@ -1297,7 +1097,7 @@ bool Text::backspace(Cursor & cur)
        }
 
        if (cur.pos() == cur.lastpos())
-               setCurrentFont(cur);
+               cur.setCurrentFont();
 
        needsUpdate |= handleBibitems(cur);
 
@@ -1341,7 +1141,7 @@ bool Text::dissolveInset(Cursor & cur) {
                                        b.getLanguage());
                }
 
-               pasteParagraphList(cur, plist, b.params().getTextClass_ptr(),
+               pasteParagraphList(cur, plist, b.params().getTextClassPtr(),
                                   b.errorList("Paste"));
                // restore position
                cur.pit() = std::min(cur.lastpit(), spit);
@@ -1353,19 +1153,6 @@ bool Text::dissolveInset(Cursor & cur) {
 }
 
 
-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)
 {
@@ -1471,129 +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();
-       double x = row.x;
-       Bidi bidi;
-       bidi.computeTables(par, buffer, row);
-
-       pos_type const row_pos  = row.pos();
-       pos_type const end      = row.endpos();
-       // Spaces at logical line breaks in bidi text must be skipped during 
-       // cursor positioning. However, they may appear visually in the middle
-       // of a row; they must be skipped, wherever they are...
-       // * logically "abc_[HEBREW_\nHEBREW]"
-       // * visually "abc_[_WERBEH\nWERBEH]"
-       pos_type skipped_sep_vpos = -1;
-
-       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;
-
-       // If the last logical character is a separator, skip it, unless
-       // it's in the last row of a paragraph; see skipped_sep_vpos declaration
-       if (end > 0 && end < par.size() && par.isSeparator(end - 1))
-               skipped_sep_vpos = bidi.log2vis(end - 1);
-       
-       for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
-               // Skip the separator which is at the logical end of the row
-               if (vpos == skipped_sep_vpos)
-                       continue;
-               pos_type pos = bidi.vis2log(vpos);
-               if (body_pos > 0 && pos == body_pos - 1) {
-                       FontMetrics const & labelfm = theFontMetrics(
-                               getLabelFont(buffer, par));
-                       x += row.label_hfill + labelfm.width(par.layout()->labelsep);
-                       if (par.isLineSeparator(body_pos - 1))
-                               x -= tm.singleWidth(pit, 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 += pm.singleWidth(pos, font);
-
-               if (par.hfillExpansion(row, pos))
-                       x += (pos >= body_pos) ? row.hfill : row.label_hfill;
-               else if (par.isSeparator(pos) && pos >= body_pos)
-                       x += row.separator;
-       }
-
-       // see correction above
-       if (boundary_correction) {
-               if (isRTL(buffer, sl, boundary))
-                       x -= tm.singleWidth(pit, ppos);
-               else
-                       x += tm.singleWidth(pit, 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)
 {
@@ -1620,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()));
@@ -1712,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]);
@@ -1748,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());