Pure HTML output for math macros.

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

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index 61f3353774e3e9f84914d66a78b2b497a0661c0b..5e943a7ff1298e18d6d8b71c2b90ef7095a6b5df 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -48,6 +48,7 @@ InsetBranch::InsetBranch(Buffer * buf, InsetBranchParams const & params)
 
 void InsetBranch::write(ostream & os) const
 {
+       os << "Branch ";
        params_.write(os);
        os << '\n';
        InsetCollapsable::write(os);
@@ -260,7 +261,6 @@ string InsetBranch::params2string(InsetBranchParams const & params)
 {
        ostringstream data;
        params.write(data);
-       data << '\n';
        return data.str();
 }
 
@@ -275,7 +275,6 @@ void InsetBranch::string2params(string const & in, InsetBranchParams & params)
        Lexer lex;
        lex.setStream(data);
        lex.setContext("InsetBranch::string2params");
-       lex >> "Branch";
        params.read(lex);
 }
 
@@ -295,14 +294,13 @@ void InsetBranch::addToToc(DocIterator const & cpit)
 
 void InsetBranchParams::write(ostream & os) const
 {
-       os << "Branch " << to_utf8(branch);
+       os << to_utf8(branch);
 }
 
 
 void InsetBranchParams::read(Lexer & lex)
 {
-       lex.eatLine();
-       branch = lex.getDocString();
+       lex >> branch;
 }
 
 } // namespace lyx