* BufferParams:

[lyx.git] / src / insets / insetnewline.C

diff --git a/src/insets/insetnewline.C b/src/insets/insetnewline.C
index 0079488fe54f1586a0f4e20f4ef71066d7c750c0..320570f94d9d446c095df73ae31d9b0b9b9d9835 100644 (file)
--- a/src/insets/insetnewline.C
+++ b/src/insets/insetnewline.C
@@ -16,12 +16,16 @@
 #include "LColor.h"
 #include "lyxtext.h"
 #include "metricsinfo.h"
+#include "outputparams.h"
 #include "paragraph.h"
 #include "paragraph_funcs.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+
+namespace lyx {
+
 using std::endl;
 using std::ostream;
 
@@ -38,18 +42,19 @@ void InsetNewline::write(Buffer const &, ostream & os) const
 }
 
 
-void InsetNewline::metrics(MetricsInfo & mi, Dimension & dim) const
+bool InsetNewline::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       lyx::frontend::FontMetrics const & fm 
-               =       theFontMetrics(mi.base.font);
+       frontend::FontMetrics const & fm = theFontMetrics(mi.base.font);
        dim.asc = fm.maxAscent();
        dim.des = fm.maxDescent();
        dim.wid = fm.width('n');
+       bool const changed = dim_ != dim;
        dim_ = dim;
+       return changed;
 }
 
 
-int InsetNewline::latex(Buffer const &, ostream &,
+int InsetNewline::latex(Buffer const &, odocstream &,
                        OutputParams const &) const
 {
        lyxerr << "Eek, calling InsetNewline::latex !" << endl;
@@ -57,15 +62,15 @@ int InsetNewline::latex(Buffer const &, ostream &,
 }
 
 
-int InsetNewline::plaintext(Buffer const &, lyx::odocstream & os,
-                       OutputParams const &) const
+int InsetNewline::plaintext(Buffer const &, odocstream & os,
+                            OutputParams const &) const
 {
        os << '\n';
-       return 0;
+       return PLAINTEXT_NEWLINE;
 }
 
 
-int InsetNewline::docbook(Buffer const &, std::ostream & os,
+int InsetNewline::docbook(Buffer const &, odocstream & os,
                          OutputParams const &) const
 {
        os << '\n';
@@ -75,8 +80,7 @@ int InsetNewline::docbook(Buffer const &, std::ostream & os,
 
 void InsetNewline::draw(PainterInfo & pi, int x, int y) const
 {
-       lyx::frontend::FontMetrics const & fm =
-               theFontMetrics(pi.base.font);
+       frontend::FontMetrics const & fm = theFontMetrics(pi.base.font);
        int const wid = fm.width('n');
        int const asc = fm.maxAscent();
 
@@ -121,3 +125,6 @@ bool InsetNewline::isSpace() const
 {
        return true;
 }
+
+
+} // namespace lyx