Routines for calculating numerical labels for BibTeX citations.

[lyx.git] / src / Text2.cpp

diff --git a/src/Text2.cpp b/src/Text2.cpp
index d83402b3c37edd145b5f4f0ce468a93f56a7cbe0..974f9a89a1ab1241a048ae63e2457a109b7aebdf 100644 (file)
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -94,7 +94,7 @@ FontInfo Text::layoutFont(pit_type const pit) const
 
        FontInfo font = layout.font;
        // Realize with the fonts of lesser depth.
-       //font.realize(outerFont(pit, paragraphs()));
+       //font.realize(outerFont(pit));
        font.realize(owner_->buffer().params().getFont().fontInfo());
 
        return font;
@@ -144,7 +144,7 @@ void Text::setCharFont(pit_type pit,
                while (!layoutfont.resolved() &&
                       tp != pit_type(paragraphs().size()) &&
                       pars_[tp].getDepth()) {
-                       tp = outerHook(tp, paragraphs());
+                       tp = outerHook(tp);
                        if (tp != pit_type(paragraphs().size()))
                                layoutfont.realize(pars_[tp].layout().font);
                }
@@ -436,8 +436,8 @@ void Text::setLabelWidthStringToSequence(pit_type const par_offset,
 {
        pit_type offset = par_offset;
        // Find first of same layout in sequence
-       while (!isFirstInSequence(offset, pars_)) {
-               offset = depthHook(offset, pars_, pars_[offset].getDepth());
+       while (!isFirstInSequence(offset)) {
+               offset = depthHook(offset, pars_[offset].getDepth());
        }
 
        // now apply label width string to every par
@@ -548,12 +548,12 @@ void Text::setCursor(CursorSlice & cur, pit_type par, pos_type pos)
 
        // None of these should happen, but we're scaredy-cats
        if (pos < 0) {
-               lyxerr << "dont like -1" << endl;
+               lyxerr << "don't like -1" << endl;
                LASSERT(false, /**/);
        }
 
        if (pos > para.size()) {
-               lyxerr << "dont like 1, pos: " << pos
+               lyxerr << "don't like 1, pos: " << pos
                       << " size: " << para.size()
                       << " par: " << par << endl;
                LASSERT(false, /**/);