Fix part of a problem reported by Vincent.

The asymmetry between how "Branch" is read and written still needs to be
addressed, as does the fact that InsetBranchParams ought to be created
with a param string.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33706 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index fa238674b39736d4c0690d2b29bcb897cb4e80f4..61f3353774e3e9f84914d66a78b2b497a0661c0b 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -49,6 +49,7 @@ InsetBranch::InsetBranch(Buffer * buf, InsetBranchParams const & params)
 void InsetBranch::write(ostream & os) const
 {
        params_.write(os);
+       os << '\n';
        InsetCollapsable::write(os);
 }
 
@@ -258,8 +259,8 @@ bool InsetBranch::isMacroScope() const
 string InsetBranch::params2string(InsetBranchParams const & params)
 {
        ostringstream data;
-       data << "branch" << ' ';
        params.write(data);
+       data << '\n';
        return data.str();
 }
 
@@ -274,7 +275,7 @@ void InsetBranch::string2params(string const & in, InsetBranchParams & params)
        Lexer lex;
        lex.setStream(data);
        lex.setContext("InsetBranch::string2params");
-       lex >> "branch" >> "Branch";
+       lex >> "Branch";
        params.read(lex);
 }
 
@@ -294,7 +295,7 @@ void InsetBranch::addToToc(DocIterator const & cpit)
 
 void InsetBranchParams::write(ostream & os) const
 {
-       os << "Branch " << to_utf8(branch) << '\n';
+       os << "Branch " << to_utf8(branch);
 }