Natbib authoryear uses (Ref1; Ref2) by default.

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

diff --git a/src/insets/InsetNewline.cpp b/src/insets/InsetNewline.cpp
index 87a35def3585a2e67aea2786aeab1b3814f0a582..0927c7e7d06de1e247d99db091cd4d815b765247 100644 (file)
--- a/src/insets/InsetNewline.cpp
+++ b/src/insets/InsetNewline.cpp
@@ -142,7 +142,7 @@ ColorCode InsetNewline::ColorName() const
 }
 
 
-int InsetNewline::latex(otexstream & os, OutputParams const & rp) const
+void InsetNewline::latex(otexstream & os, OutputParams const & rp) const
 {
        switch (params_.kind) {
                case InsetNewlineParams::NEWLINE:
@@ -158,11 +158,11 @@ int InsetNewline::latex(otexstream & os, OutputParams const & rp) const
                        os << "\\\\\n";
                        break;
        }
-       return 0;
 }
 
 
-int InsetNewline::plaintext(odocstream & os, OutputParams const &) const
+int InsetNewline::plaintext(odocstringstream & os,
+        OutputParams const &, size_t) const
 {
        os << '\n';
        return PLAINTEXT_NEWLINE;
@@ -178,8 +178,7 @@ int InsetNewline::docbook(odocstream & os, OutputParams const &) const
 
 docstring InsetNewline::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
-       xs << html::CompTag("br");
-       xs.cr();
+       xs << html::CR() << html::CompTag("br") << html::CR();
        return docstring();
 }
 
@@ -261,9 +260,9 @@ void InsetNewline::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-docstring InsetNewline::contextMenuName() const
+string InsetNewline::contextMenuName() const
 {
-       return from_ascii("context-newline");
+       return "context-newline";
 }