Transfer Paragraph::hfillExpansion() to ParagraphMetrics. This also reduce the depend...

[features.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index c6c70209d9735149c81893b9706f89542b6ef36f..7a987dc5591cebedf74e9f66f20046a754efe0ba 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -37,7 +37,6 @@
 #include "output_latex.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
-#include "rowpainter.h"
 #include "sgml.h"
 #include "TexRow.h"
 #include "VSpace.h"
@@ -1084,7 +1083,7 @@ Paragraph::Paragraph(Paragraph const & par)
        InsetList::iterator it = insetlist.begin();
        InsetList::iterator end = insetlist.end();
        for (; it != end; ++it)
-               it->inset = it->inset->clone().release();
+               it->inset = it->inset->clone();
 }
 
 
@@ -1098,7 +1097,7 @@ Paragraph & Paragraph::operator=(Paragraph const & par)
                InsetList::iterator it = insetlist.begin();
                InsetList::iterator end = insetlist.end();
                for (; it != end; ++it)
-                       it->inset = it->inset->clone().release();
+                       it->inset = it->inset->clone();
 
                layout_ = par.layout();
                text_ = par.text_;
@@ -1378,18 +1377,14 @@ Font const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
 {
        BOOST_ASSERT(pos >= 0);
 
-       Layout_ptr const & lout = layout();
+       Font font = getFontSettings(bparams, pos);
 
        pos_type const body_pos = beginOfBody();
-
-       Font layoutfont;
        if (pos < body_pos)
-               layoutfont = lout->labelfont;
+               font.realize(layout_->labelfont);
        else
-               layoutfont = lout->font;
+               font.realize(layout_->font);
 
-       Font font = getFontSettings(bparams, pos);
-       font.realize(layoutfont);
        font.realize(outerfont);
        font.realize(bparams.getFont());
 
@@ -1651,7 +1646,7 @@ docstring const Paragraph::translateIfPossible(docstring const & s,
 }
 
 
-docstring Paragraph::expandLabel(Layout_ptr const & layout,
+docstring Paragraph::expandLabel(LayoutPtr const & layout,
                BufferParams const & bparams, bool process_appendix) const
 {
        TextClass const & tclass = bparams.getTextClass();
@@ -1685,7 +1680,7 @@ docstring Paragraph::expandLabel(Layout_ptr const & layout,
 }
 
 
-void Paragraph::applyLayout(Layout_ptr const & new_layout)
+void Paragraph::applyLayout(LayoutPtr const & new_layout)
 {
        layout(new_layout);
        LyXAlignment const oldAlign = params().align();
@@ -1962,7 +1957,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
 
        bool return_value = false;
 
-       Layout_ptr style;
+       LayoutPtr style;
 
        // well we have to check if we are in an inset with unlimited
        // length (all in one row) if that is true then we don't allow
@@ -2326,7 +2321,7 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf,
 {
        bool emph_flag = false;
 
-       Layout_ptr const & style = layout();
+       LayoutPtr const & style = layout();
        Font font_old =
                style->labeltype == LABEL_MANUAL ? style->labelfont : style->font;
 
@@ -2533,13 +2528,13 @@ int Paragraph::id() const
 }
 
 
-Layout_ptr const & Paragraph::layout() const
+LayoutPtr const & Paragraph::layout() const
 {
        return layout_;
 }
 
 
-void Paragraph::layout(Layout_ptr const & new_layout)
+void Paragraph::layout(LayoutPtr const & new_layout)
 {
        layout_ = new_layout;
 }
@@ -2629,42 +2624,6 @@ char_type Paragraph::transformChar(char_type c, pos_type pos) const
 }
 
 
-bool Paragraph::hfillExpansion(Row const & row, pos_type pos) const
-{
-       if (!isHfill(pos))
-               return false;
-
-       BOOST_ASSERT(pos >= row.pos() && pos < row.endpos());
-
-       // expand at the end of a row only if there is another hfill on the same row
-       if (pos == row.endpos() - 1) {
-               for (pos_type i = row.pos(); i < pos; i++) {
-                       if (isHfill(i))
-                               return true;
-               }
-               return false;
-       }
-
-       // expand at the beginning of a row only if it is the first row of a paragraph
-       if (pos == row.pos()) {
-               return pos == 0;
-       }
-
-       // do not expand in some labels
-       if (layout()->margintype != MARGIN_MANUAL && pos < beginOfBody())
-               return false;
-
-       // if there is anything between the first char of the row and
-       // the specified position that is neither a newline nor an hfill,
-       // the hfill will be expanded, otherwise it won't
-       for (pos_type i = row.pos(); i < pos; i++) {
-               if (!isNewline(i) && !isHfill(i))
-                       return true;
-       }
-       return false;
-}
-
-
 int Paragraph::checkBiblio(bool track_changes)
 {
        //FIXME From JS: