Dekel's patch -- I didn't fix the xforms-0.88 keysyms stuff so it still doesn't finis...

[lyx.git] / src / bufferview_funcs.C

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 67782547a678b3ea0ee7f8504da5e655ea0d9375..48d23a6a9ab24abbe3e3d30cd790108527732b48 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -1,5 +1,19 @@
+/* This file is part of
+ * ====================================================== 
+ * 
+ *           LyX, The Document Processor
+ *        
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team.
+ *
+ * ====================================================== */
+
 #include <config.h>
 
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
 #include "bufferview_funcs.h"
 #include "LyXView.h"
 #include "BufferView.h"
@@ -16,7 +30,7 @@
 extern FD_form_paragraph * fd_form_paragraph;
 extern FD_form_character * fd_form_character;
 
-
+#ifndef NEW_INSETS
 void Foot(BufferView * bv)
 {
        if (!bv->available()) 
@@ -29,6 +43,7 @@ void Foot(BufferView * bv)
        bv->text->InsertFootnoteEnvironment(bv, LyXParagraph::FOOTNOTE);
        bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 }
+#endif
 
 
 void Emph(BufferView * bv)
@@ -55,6 +70,7 @@ void Noun(BufferView * bv)
 }
 
 
+#ifndef NEW_INSETS
 void Margin(BufferView * bv)
 {
        if (bv->available()) {
@@ -65,6 +81,7 @@ void Margin(BufferView * bv)
                bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
        }
 }
+#endif
 
 
 void Lang(BufferView * bv, string const & l)
@@ -79,6 +96,7 @@ void Lang(BufferView * bv, string const & l)
 }
 
 
+#ifndef NEW_INSETS
 void Melt(BufferView * bv)
 {
        if (!bv->available()) return;
@@ -90,6 +108,7 @@ void Melt(BufferView * bv)
        bv->text->MeltFootnoteEnvironment(bv);
        bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 }
+#endif
 
 
 void Tex(BufferView * bv)
@@ -122,7 +141,7 @@ void changeDepth(BufferView * bv, int decInc)
 
 void Free(BufferView * bv)
 {
-       ToggleAndShow(bv, UserFreeFont());
+       ToggleAndShow(bv, UserFreeFont(bv->buffer()->params));
 }
 
 
@@ -227,10 +246,7 @@ void FontSize(BufferView * bv, string const & size)
 }
 
 
-/* -------> Returns the current font and depth by printing a message. In the
- * future perhaps we could try to implement a callback to the button-bar.
- * That is, `light' the bold button when the font is currently bold, etc.
- */
+// Returns the current font and depth as a message. 
 string CurrentState(BufferView * bv)
 {
        string state;