Another assertion that got transformed in 1b1f8dd2

[lyx.git] / src / mathed / InsetFormulaMacro.cpp

diff --git a/src/mathed/InsetFormulaMacro.cpp b/src/mathed/InsetFormulaMacro.cpp
index 7676aa982349fc69a9baa21c9343be3dac866d56..88897021fe2bd63fa7fce8e95b8ecbb3d9ce77ee 100644 (file)
--- a/src/mathed/InsetFormulaMacro.cpp
+++ b/src/mathed/InsetFormulaMacro.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -36,7 +36,7 @@ namespace lyx {
 
 
 InsetFormulaMacro::InsetFormulaMacro()
-       : InsetMathNest(2), name_("unknownA")
+       : InsetMathNest(2), name_(from_ascii("unknownA"))
 {}
 
 
@@ -62,29 +62,32 @@ Inset * InsetFormulaMacro::clone() const
 }
 
 
-void InsetFormulaMacro::write(Buffer const &, ostream & os) const
+void InsetFormulaMacro::write(ostream & os) const
 {
        os << "FormulaMacro\n";
-       WriteStream wi(os, false, false);
+       WriteStream wi(os, false, false, WriteStream::wsDefault);
        tmpl()->write(wi);
 }
 
 
-int InsetFormulaMacro::latex(Buffer const &, odocstream & os,
-                            OutputParams const & runparams) const
+void InsetFormulaMacro::latex(otexstream & os,
+                             OutputParams const & runparams) const
 {
        //lyxerr << "InsetFormulaMacro::latex" << endl;
-       WriteStream wi(os, runparams.moving_arg, true);
+       WriteStream wi(os.os(), runparams.moving_arg, true,
+                      runparams.dryrun ? WriteStream::wsDryrun: WriteStream::wsDefault,
+                      runparams.encoding);
+       wi.canBreakLine(os.canBreakLine());
        tmpl()->write(wi);
-       return 2;
+       os.canBreakLine(wi.canBreakLine());
+       os.texrow().newlines(wi.line());
 }
 
 
-int InsetFormulaMacro::plaintext(Buffer const &, odocstream & os,
-                                OutputParams const &) const
+int InsetFormulaMacro::plaintext(odocstringstream & os, OutputParams const & runparams, size_t) const
 {
        odocstringstream oss;
-       WriteStream wi(oss, false, true);
+       WriteStream wi(oss, false, true, WriteStream::wsDefault, runparams.encoding);
        tmpl()->write(wi);
 
        docstring const str = oss.str();
@@ -93,14 +96,14 @@ int InsetFormulaMacro::plaintext(Buffer const &, odocstream & os,
 }
 
 
-int InsetFormulaMacro::docbook(Buffer const & buf, ostream & os,
+int InsetFormulaMacro::docbook(ostream & os,
                               OutputParams const & runparams) const
 {
-       return plaintext(buf, os, runparams);
+       return plaintext(os, runparams);
 }
 
 
-void InsetFormulaMacro::read(Buffer const &, Lexer & lex)
+void InsetFormulaMacro::read(Lexer & lex)
 {
        read(lex.getStream());
 }