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 ce357c679ac9fb94456059b54ae4e9ec5e4c914e..5e943a7ff1298e18d6d8b71c2b90ef7095a6b5df 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -24,6 +24,7 @@
 #include "FuncStatus.h"
 #include "Lexer.h"
 #include "OutputParams.h"
+#include "output_xhtml.h"
 #include "TextClass.h"
 #include "TocBackend.h"
 
@@ -45,15 +46,11 @@ InsetBranch::InsetBranch(Buffer * buf, InsetBranchParams const & params)
 {}
 
 
-InsetBranch::~InsetBranch()
-{
-       hideDialogs("branch", this);
-}
-
-
 void InsetBranch::write(ostream & os) const
 {
+       os << "Branch ";
        params_.write(os);
+       os << '\n';
        InsetCollapsable::write(os);
 }
 
@@ -103,10 +100,10 @@ docstring const InsetBranch::buttonLabel(BufferView const & bv) const
 }
 
 
-ColorCode InsetBranch::backgroundColor() const
+ColorCode InsetBranch::backgroundColor(PainterInfo const & pi) const
 {
        if (params_.branch.empty())
-               return Inset::backgroundColor();
+               return Inset::backgroundColor(pi);
        // FIXME UNICODE
        ColorCode c = lcolor.getFromLyXName(to_utf8(params_.branch));
        if (c == Color_none)
@@ -115,14 +112,6 @@ ColorCode InsetBranch::backgroundColor() const
 }
 
 
-bool InsetBranch::showInsetDialog(BufferView * bv) const
-{
-       bv->showDialog("branch", params2string(params()),
-                       const_cast<InsetBranch *>(this));
-       return true;
-}
-
-
 void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
@@ -132,11 +121,6 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd)
                params_.branch = params.branch;
                break;
        }
-
-       case LFUN_INSET_DIALOG_UPDATE:
-               cur.bv().updateDialog("branch", params2string(params()));
-               break;
-
        case LFUN_BRANCH_ACTIVATE:
        case LFUN_BRANCH_DEACTIVATE: {
                // FIXME: I do not like this cast, but have no other idea...
@@ -152,7 +136,6 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd)
                our_branch->setSelected(cmd.action == LFUN_BRANCH_ACTIVATE);
                break;
        }
-
        case LFUN_INSET_TOGGLE:
                if (cmd.argument() == "assign")
                        setStatus(cur, isBranchSelected() ? Open : Collapsed);
@@ -172,7 +155,6 @@ bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd,
 {
        switch (cmd.action) {
        case LFUN_INSET_MODIFY:
-       case LFUN_INSET_DIALOG_UPDATE:
                flag.setEnabled(true);
                break;
 
@@ -240,10 +222,10 @@ int InsetBranch::docbook(odocstream & os,
 }
 
 
-docstring InsetBranch::xhtml(odocstream & os, OutputParams const & rp) const
+docstring InsetBranch::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 {
        if (isBranchSelected())
-                return InsetText::xhtml(os, rp);
+                return InsetText::xhtml(xs, rp);
        return docstring();
 }
 
@@ -278,7 +260,6 @@ bool InsetBranch::isMacroScope() const
 string InsetBranch::params2string(InsetBranchParams const & params)
 {
        ostringstream data;
-       data << "branch" << ' ';
        params.write(data);
        return data.str();
 }
@@ -294,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);
 }
 
@@ -314,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