add busy.gif to resources (in line with cmake)

[lyx.git] / src / Text.cpp

diff --git a/src/Text.cpp b/src/Text.cpp
index 702bcdf78041f26e8cbfabf1de7421e806c1c7b7..6c899a95e8f7f65d86210de687f785cd7dfa85ce 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -456,10 +456,10 @@ void Text::readParToken(Paragraph & par, Lexer & lex,
        } else if (token == "\\change_inserted" || token == "\\change_deleted") {
                lex.eatLine();
                istringstream is(lex.getString());
-               unsigned int aid;
+               int aid;
                time_t ct;
                is >> aid >> ct;
-               map<unsigned int, int> const & am = bp.author_map;
+               BufferParams::AuthorMap const & am = bp.author_map;
                if (am.find(aid) == am.end()) {
                        errorList.push_back(ErrorItem(_("Change tracking error"),
                                            bformat(_("Unknown author index for change: %1$d\n"), aid),
@@ -599,7 +599,6 @@ static void breakParagraph(Text & text, pit_type par_offset, pos_type pos,
        // end of a paragraph
        tmp->setPlainOrDefaultLayout(bparams.documentClass());
 
-       // layout stays the same with latex-environments
        if (keep_layout) {
                tmp->setLayout(par.layout());
                tmp->setLabelWidthString(par.params().labelWidthString());
@@ -665,7 +664,6 @@ static void breakParagraph(Text & text, pit_type par_offset, pos_type pos,
                par.setPlainOrDefaultLayout(bparams.documentClass());
        }
 
-       // layout stays the same with latex-environments
        if (keep_layout) {
                par.setLayout(tmp->layout());
                par.setLabelWidthString(tmp->params().labelWidthString());
@@ -701,9 +699,10 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
                cpar.eraseChar(cur.pos(), cur.buffer()->params().trackChanges);
 
        // What should the layout for the new paragraph be?
-       bool keep_layout = inverse_logic ? 
-               !layout.isEnvironment() 
-               : layout.isEnvironment();
+       bool keep_layout = layout.isEnvironment() 
+               || (layout.isParagraph() && layout.parbreak_is_newline);
+       if (inverse_logic)
+               keep_layout = !keep_layout;
 
        // We need to remember this before we break the paragraph, because
        // that invalidates the layout variable
@@ -851,7 +850,7 @@ void Text::insertChar(Cursor & cur, char_type c)
                static docstring const number_seperators = from_ascii(".,:");
 
                if (cur.current_font.fontInfo().number() == FONT_ON) {
-                       if (!isDigit(c) && !contains(number_operators, c) &&
+                       if (!isDigitASCII(c) && !contains(number_operators, c) &&
                            !(contains(number_seperators, c) &&
                              cur.pos() != 0 &&
                              cur.pos() != cur.lastpos() &&
@@ -859,7 +858,7 @@ void Text::insertChar(Cursor & cur, char_type c)
                              tm.displayFont(pit, cur.pos() - 1).fontInfo().number() == FONT_ON)
                           )
                                number(cur); // Set current_font.number to OFF
-               } else if (isDigit(c) &&
+               } else if (isDigitASCII(c) &&
                           cur.real_current_font.isVisibleRightToLeft()) {
                        number(cur); // Set current_font.number to ON
 
@@ -936,23 +935,17 @@ void Text::insertChar(Cursor & cur, char_type c)
        // disable the double-space checking
        if (!freeSpacing && isLineSeparatorChar(c)) {
                if (cur.pos() == 0) {
-                       static bool sent_space_message = false;
-                       if (!sent_space_message) {
-                               cur.message(_("You cannot insert a space at the "
-                                                          "beginning of a paragraph. Please read the Tutorial."));
-                               sent_space_message = true;
-                       }
+                       cur.message(_(
+                                       "You cannot insert a space at the "
+                                       "beginning of a paragraph. Please read the Tutorial."));
                        return;
                }
                LASSERT(cur.pos() > 0, /**/);
                if ((par.isLineSeparator(cur.pos() - 1) || par.isNewline(cur.pos() - 1))
-                   && !par.isDeleted(cur.pos() - 1)) {
-                       static bool sent_space_message = false;
-                       if (!sent_space_message) {
-                               cur.message(_("You cannot type two spaces this way. "
-                                                          "Please read the Tutorial."));
-                               sent_space_message = true;
-                       }
+                               && !par.isDeleted(cur.pos() - 1)) {
+                       cur.message(_(
+                                       "You cannot type two spaces this way. "
+                                       "Please read the Tutorial."));
                        return;
                }
        }
@@ -1904,8 +1897,6 @@ docstring Text::getPossibleLabel(Cursor const & cur) const
        }
 
        if (!name.empty())
-               // FIXME refstyle
-               // We should allow customization of the separator or else change it
                text = name + ':' + text;
 
        return text;
@@ -1930,6 +1921,15 @@ docstring Text::asString(pit_type beg, pit_type end, int options) const
 }
 
 
+void Text::forToc(docstring & os, size_t maxlen, bool shorten) const
+{
+       LASSERT(maxlen > 10, maxlen = 30);
+       for (size_t i = 0; i != pars_.size() && os.length() < maxlen; ++i)
+               pars_[i].forToc(os, maxlen);
+       if (shorten && os.length() >= maxlen)
+               os = os.substr(0, maxlen - 3) + from_ascii("...");
+}
+
 
 void Text::charsTranspose(Cursor & cur)
 {
@@ -2036,8 +2036,8 @@ bool Text::insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/
        LASSERT(cur.bv().cursor() == cur, /**/);
        cur.insert(s);
        cur.bv().cursor() = cur;
-       if (!(cur.result().update() & Update::Force))
-               cur.screenUpdateFlags(cur.result().update() | Update::SinglePar);
+       if (!(cur.result().screenUpdate() & Update::Force))
+               cur.screenUpdateFlags(cur.result().screenUpdate() | Update::SinglePar);
        return true;
 }