Rename rowpainter.* to RowPainter.*

[features.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 12a42e2d99d8e0517d82119112c921844dc4ef15..540537b1a7f6468559ff4e25cef921c5496ef76c 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -32,7 +32,7 @@
 #include "LyXRC.h"
 #include "MetricsInfo.h"
 #include "ParagraphParameters.h"
-#include "rowpainter.h"
+#include "RowPainter.h"
 #include "Text.h"
 #include "TextClass.h"
 #include "VSpace.h"
@@ -290,7 +290,7 @@ Font TextMetrics::displayFont(pit_type pit, pos_type pos) const
 
 bool TextMetrics::isRTL(CursorSlice const & sl, bool boundary) const
 {
-       if (!lyxrc.rtl_support || !sl.text())
+       if (!sl.text())
                return false;
 
        int correction = 0;
@@ -304,7 +304,7 @@ bool TextMetrics::isRTL(CursorSlice const & sl, bool boundary) const
 bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos) const
 {
        // no RTL boundary at paragraph start
-       if (!lyxrc.rtl_support || pos == 0)
+       if (pos == 0)
                return false;
 
        Font const & left_font = displayFont(pit, pos - 1);
@@ -319,9 +319,8 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos) const
 bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos,
                Font const & font) const
 {
-       if (!lyxrc.rtl_support
-           // no RTL boundary at paragraph start
-           || pos == 0
+       if (// no RTL boundary at paragraph start
+           pos == 0
            // if the metrics have not been calculated, then we are not
            // on screen and can safely ignore issues about boundaries.
            || !contains(pit))
@@ -346,6 +345,7 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos,
        // FED                          FED|                     FED     )
        if (startpos == pos && endpos == pos && endpos != par.size()
                && (par.isNewline(pos - 1)
+                       || par.isEnvSeparator(pos - 1)
                        || par.isLineSeparator(pos - 1)
                        || par.isSeparator(pos - 1)))
                return false;
@@ -565,7 +565,7 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 
        Paragraph const & par = text_->getPar(pit);
 
-       double w = width - row.right_margin - row.width();
+       double const w = width - row.right_margin - row.width();
        // FIXME: put back this assertion when the crash on new doc is solved.
        //LASSERT(w >= 0, /**/);
 
@@ -607,9 +607,7 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
        } else if (int(row.width()) < max_width_) {
                // is it block, flushleft or flushright?
                // set x how you need it
-               int const align = getAlign(par, row.pos());
-
-               switch (align) {
+               switch (getAlign(par, row.pos())) {
                case LYX_ALIGN_BLOCK: {
                        int const ns = numberOfSeparators(row);
                        /** If we have separators, and this row has
@@ -650,12 +648,12 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
        }
 #endif
 
+       // Finally,  handle hfill insets
        pos_type const endpos = row.endpos();
        pos_type body_pos = par.beginOfBody();
        if (body_pos > 0
            && (body_pos > endpos || !par.isLineSeparator(body_pos - 1)))
                body_pos = 0;
-
        ParagraphMetrics & pm = par_metrics_[pit];
        Row::iterator cit = row.begin();
        Row::iterator const cend = row.end();
@@ -680,7 +678,7 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 int TextMetrics::labelFill(pit_type const pit, Row const & row) const
 {
        Paragraph const & par = text_->getPar(pit);
-       LBUFERR(par.beginOfBody() > 0);
+       LBUFERR(par.beginOfBody() > 0 || par.isEnvSeparator(0));
 
        int w = 0;
        Row::const_iterator cit = row.begin();
@@ -798,8 +796,7 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
        int const width = max_width_ - right_margin;
        pos_type const body_pos = par.beginOfBody();
        row.clear();
-       row.x = leftMargin(max_width_, pit, pos);
-       row.dimension().wid = row.x;
+       row.dimension().wid = leftMargin(max_width_, pit, pos);
        row.right_margin = right_margin;
 
        if (pos >= end || row.width() > width) {
@@ -876,7 +873,7 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
                // - Before a display inset
                // - After a display inset
                Inset const * inset = 0;
-               if (par.isNewline(i)
+               if (par.isNewline(i) || par.isEnvSeparator(i)
                    || (i + 1 < end && (inset = par.getInset(i + 1))
                        && inset->display())
                    || (!row.empty() && row.back().inset
@@ -889,6 +886,8 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
                ++i;
                ++fi;
        }
+       row.finalizeLast();
+       row.endpos(i);
 
        // End of paragraph marker
        if (lyxrc.paragraph_markers
@@ -904,10 +903,8 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
                row.addVirtual(end, docstring(1, char_type(0x00B6)), f, Change());
        }
 
-       row.finalizeLast();
-       row.endpos(i);
        // if the row is too large, try to cut at last separator.
-       row.shorten_if_needed(body_pos, width);
+       row.shortenIfNeeded(body_pos, width);
 
        // if the row ends with a separator that is not at end of
        // paragraph, remove it
@@ -1547,7 +1544,8 @@ bool TextMetrics::cursorEnd(Cursor & cur)
        bool boundary = false;
        if (end != cur.lastpos()) {
                if (!cur.paragraph().isLineSeparator(end-1)
-                   && !cur.paragraph().isNewline(end-1))
+                   && !cur.paragraph().isNewline(end-1)
+                   && !cur.paragraph().isEnvSeparator(end-1))
                        boundary = true;
                else
                        --end;
@@ -1630,7 +1628,9 @@ int TextMetrics::leftMargin(int max_width,
                                l_margin = leftMargin(max_width, newpar);
                                // Remove the parindent that has been added
                                // if the paragraph was empty.
-                               if (pars[newpar].empty()) {
+                               if (pars[newpar].empty() &&
+                                   buffer.params().paragraph_separation ==
+                                   BufferParams::ParagraphIndentSeparation) {
                                        docstring pi = pars[newpar].layout().parindent;
                                        l_margin -= theFontMetrics(
                                                buffer.params().getFont()).signedWidth(pi);
@@ -1648,10 +1648,16 @@ int TextMetrics::leftMargin(int max_width,
 
        // This happens after sections or environments in standard classes.
        // We have to check the previous layout at same depth.
-       if (tclass.isDefaultLayout(par.layout()) && pit > 0
-           && pars[pit - 1].getDepth() >= par.getDepth()) {
+       if (buffer.params().paragraph_separation ==
+                       BufferParams::ParagraphSkipSeparation)
+               parindent.erase();
+       else if (pit > 0 && pars[pit - 1].getDepth() >= par.getDepth()) {
                pit_type prev = text_->depthHook(pit, par.getDepth());
-               if (pars[prev < pit ? prev : pit - 1].layout().nextnoindent)
+               if (par.layout() == pars[prev].layout()) {
+                       if (prev != pit - 1
+                           && pars[pit - 1].layout().nextnoindent)
+                               parindent.erase();
+               } else if (pars[prev].layout().nextnoindent)
                        parindent.erase();
        }