Introducing a number of tags parametrizing various

[features.git] / src / text2.C

diff --git a/src/text2.C b/src/text2.C
index c32a0edf72ff8d88f71994f16fb5c0f0c60c5189..73d96266eecdc224a1e5295d5fa2298f1ef3b7e9 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -70,40 +70,14 @@ using std::ostringstream;
 using std::string;
 
 
-LyXText::LyXText(BufferView * bv, InsetText * inset, bool ininset,
+LyXText::LyXText(BufferView * bv, InsetText * inset, bool in_inset,
          ParagraphList & paragraphs)
-       : height(0), width(0), inset_owner(inset), bv_owner(bv),
-         in_inset_(ininset), paragraphs_(&paragraphs), xo_(0), yo_(0),
-         cache_pos_(-1)
+       : height(0), width(0), textwidth_(bv ? bv->workWidth() : 100),
+         inset_owner(inset), bv_owner(bv),
+         in_inset_(in_inset), paragraphs_(&paragraphs), xo_(0), yo_(0)
 {}
 
 
-LyXText & LyXText::operator=(LyXText const & lt)
-{
-       // Copy all public variables
-       height = lt.height;
-       width = lt.width;
-       current_font = lt.current_font;
-       real_current_font = lt.real_current_font;
-       defaultfont_ = lt.defaultfont_;
-       inset_owner = lt.inset_owner;
-       bv_owner = lt.bv_owner;
-       bidi = lt.bidi;
-       in_inset_ = lt.in_inset_;
-       paragraphs_ = lt.paragraphs_;
-       xo_ = lt.xo_;
-       yo_ = lt.yo_;
-
-       // Copy all the private variables
-
-       // we cannot initailize a iterator with a singular iterator.
-       //cache_par_ = lt.cache_par_;
-       cache_pos_ = lt.cache_pos_;
-
-       return *this;
-}
-
-
 void LyXText::init(BufferView * bview)
 {
        bv_owner = bview;
@@ -115,7 +89,6 @@ void LyXText::init(BufferView * bview)
 
        width = 0;
        height = 0;
-       cache_pos_ = -1;
 
        current_font = getFont(beg, 0);
 
@@ -432,8 +405,6 @@ bool LyXText::changeDepth(bv_funcs::DEPTH_CHANGE type, bool test_only)
                start = pit;
        }
 
-       ParagraphList::iterator pastend = boost::next(end);
-
        if (!test_only)
                recUndo(parOffset(start), parOffset(end));
 
@@ -473,7 +444,7 @@ bool LyXText::changeDepth(bv_funcs::DEPTH_CHANGE type, bool test_only)
        if (test_only)
                return changed;
 
-       redoParagraphs(start, pastend);
+       redoParagraphs(start, boost::next(end));
 
        // We need to actually move the text->cursor. I don't
        // understand why ...
@@ -619,7 +590,8 @@ void LyXText::toggleFree(LyXFont const & font, bool toggleall)
        // If the mask is completely neutral, tell user
        if (font == LyXFont(LyXFont::ALL_IGNORE)) {
                // Could only happen with user style
-               bv()->owner()->message(_("No font change defined. Use Character under the Layout menu to define font change."));
+               bv()->owner()->message(_("No font change defined. "
+                       "Use Character under the Layout menu to define font change."));
                return;
        }
 
@@ -752,8 +724,6 @@ void LyXText::setParagraph(
 }
 
 
-namespace {
-
 string expandLabel(LyXTextClass const & textclass,
        LyXLayout_ptr const & layout, bool appendix)
 {
@@ -776,13 +746,14 @@ string expandLabel(LyXTextClass const & textclass,
 }
 
 
+namespace {
+
 void incrementItemDepth(ParagraphList::iterator pit,
                        ParagraphList::iterator first_pit)
 {
        int const cur_labeltype = pit->layout()->labeltype;
 
-       if (cur_labeltype != LABEL_ENUMERATE &&
-           cur_labeltype != LABEL_ITEMIZE)
+       if (cur_labeltype != LABEL_ENUMERATE && cur_labeltype != LABEL_ITEMIZE)
                return;
 
        int const cur_depth = pit->getDepth();
@@ -1009,7 +980,9 @@ void LyXText::setCounter(Buffer const & buf, ParagraphList::iterator pit)
 }
 
 
-// Updates all counters. Paragraphs with changed label string will be rebroken
+// Updates all counters. Paragraphs with changed label string will be
+// not be rebroken as this is too expensive. The next round will get it
+// right anyway...
 void LyXText::updateCounters()
 {
        // start over
@@ -1018,8 +991,6 @@ void LyXText::updateCounters()
        ParagraphList::iterator beg = ownerParagraphs().begin();
        ParagraphList::iterator end = ownerParagraphs().end();
        for (ParagraphList::iterator pit = beg; pit != end; ++pit) {
-               string const oldLabel = pit->params().labelString();
-
                size_t maxdepth = 0;
                if (pit != beg)
                        maxdepth = boost::prior(pit)->getMaxDepthAfter();
@@ -1029,11 +1000,6 @@ void LyXText::updateCounters()
 
                // setCounter can potentially change the labelString.
                setCounter(*bv()->buffer(), pit);
-
-               string const & newLabel = pit->params().labelString();
-
-               if (oldLabel != newLabel)
-                       redoParagraph(pit);
        }
 }
 
@@ -1050,7 +1016,7 @@ void LyXText::insertInset(InsetOld * inset)
        // The character will not be inserted a second time
        insertChar(Paragraph::META_INSET);
        // If we enter a highly editable inset the cursor should be before
-       // the inset. After an Undo LyX tries to call inset->edit(...)
+       // the inset. After an undo LyX tries to call inset->edit(...)
        // and fails if the cursor is behind the inset and getInset
        // does not return the inset!
        if (isHighlyEditableInset(inset))
@@ -1587,7 +1553,7 @@ void LyXText::setCursorFromCoordinates(int x, int y)
        deleteEmptyParagraphMechanism(old_cursor);
 }
 
-//x,y are coordinates relative to this LyXText
+// x,y are coordinates relative to this LyXText
 void LyXText::setCursorFromCoordinates(LyXCursor & cur, int x, int y)
 {
        // Get the row first.
@@ -1606,7 +1572,6 @@ void LyXText::setCursorFromCoordinates(LyXCursor & cur, int x, int y)
 }
 
 
-
 bool LyXText::checkAndActivateInset(bool front)
 {
        if (cursor.pos() == cursorPar()->size())