More switches and whitespace fixes

[lyx.git] / src / insets / InsetFootlike.cpp

diff --git a/src/insets/InsetFootlike.cpp b/src/insets/InsetFootlike.cpp
index ce82e6461a2731a6236862621227936b326c00bd..cb92320cdfa048ff5a04c6ed28f6dec3888d7e97 100644 (file)
--- a/src/insets/InsetFootlike.cpp
+++ b/src/insets/InsetFootlike.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,25 +15,24 @@
 #include "Buffer.h"
 #include "BufferView.h"
 #include "BufferParams.h"
+#include "Font.h"
 #include "MetricsInfo.h"
 
+#include "support/lstrings.h"
+
 #include <iostream>
 
 using namespace std;
 
 namespace lyx {
 
+using support::token;
 
-InsetFootlike::InsetFootlike(Buffer const & buf)
+InsetFootlike::InsetFootlike(Buffer * buf)
        : InsetCollapsable(buf)
 {}
 
 
-InsetFootlike::InsetFootlike(InsetFootlike const & in)
-       : InsetCollapsable(in)
-{}
-
-
 void InsetFootlike::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        FontInfo tmpfont = mi.base.font;
@@ -54,14 +53,16 @@ void InsetFootlike::draw(PainterInfo & pi, int x, int y) const
 
 void InsetFootlike::write(ostream & os) const
 {
-       os << to_utf8(name()) << "\n";
+       // The layoutName may contain a "InTitle" qualifier
+       os << to_utf8(token(layoutName(), char_type(':'), 0)) << "\n";
        InsetCollapsable::write(os);
 }
 
 
 bool InsetFootlike::insetAllowed(InsetCode code) const
 {
-       if (code == FOOT_CODE || code == MARGIN_CODE || code == FLOAT_CODE)
+       if (code == FOOT_CODE || code == MARGIN_CODE || code == FLOAT_CODE
+               || code == LISTINGS_CODE)
                return false;
        return InsetCollapsable::insetAllowed(code);
 }