removed a warning from screen and added CFLAGS in lyx.spec.in.

[lyx.git] / src / text2.C

diff --git a/src/text2.C b/src/text2.C
index 57d5e30318ef0df123e82023d8f57dfd4c7639e4..6515b58c7aef9fdf121a4a9ebebbf47c00046c52 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -1,12 +1,12 @@
 /* This file is part of
-* ======================================================
-* 
-*           LyX, The Document Processor
-*       
-*          Copyright (C) 1995 Matthias Ettrich
-*           Copyright (C) 1995-1998 The LyX Team.
-*
-*======================================================*/
+ * ======================================================
+ * 
+ *           LyX, The Document Processor
+ *      
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-1999 The LyX Team.
+ *
+ * ======================================================*/
 
 #include <config.h>
 
@@ -1463,7 +1463,7 @@ void LyXText::SetCounter(LyXParagraph *par)
        }
    
        if (!par->labelstring.empty()) {
-               par->labelstring.erase();
+               par->labelstring.clear();
        }
    
        if (layout->margintype == MARGIN_MANUAL) {
@@ -1489,13 +1489,13 @@ void LyXText::SetCounter(LyXParagraph *par)
                                if (!layout->labelstring.empty())
                                        par->labelstring = layout->labelstring;
                                else
-                                       par->labelstring.erase();
+                                       par->labelstring.clear();
                         }
                        else {
                                if (!layout->labelstring_appendix.empty())
                                        par->labelstring = layout->labelstring_appendix;
                                else
-                                       par->labelstring.erase();
+                                       par->labelstring.clear();
                        }
  
                        if (!par->appendix){
@@ -2807,11 +2807,15 @@ void LyXText::SetCursorIntern(LyXParagraph *par, int pos)
                pos = par->PositionInParFromPos(pos);
                par = tmppar;
        }
-       if (par->IsDummy() && par->previous && 
+       if (par->IsDummy() && par->previous &&
            par->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
-               while (par->previous && 
-                      par->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE){
+               while (par->previous &&
+                      ((par->previous->IsDummy() && par->previous->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) ||
+                       (par->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE))) {
                        par = par->previous ;
+                       if (par->IsDummy() &&
+                           par->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
+                               pos += par->last + 1;
                }
                if (par->previous) {
                        par = par->previous;