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