#include "BufferView.h"
#include "BranchList.h"
#include "ColorSet.h"
-#include "Counters.h"
#include "Cursor.h"
#include "DispatchResult.h"
#include "FuncRequest.h"
#include "Lexer.h"
#include "LyX.h"
#include "OutputParams.h"
+#include "output_docbook.h"
#include "output_xhtml.h"
#include "TextClass.h"
#include "TocBackend.h"
namespace lyx {
InsetBranch::InsetBranch(Buffer * buf, InsetBranchParams const & params)
- : InsetCollapsable(buf, InsetText::DefaultLayout), params_(params)
+ : InsetCollapsible(buf, InsetText::DefaultLayout), params_(params)
{}
os << "Branch ";
params_.write(os);
os << '\n';
- InsetCollapsable::write(os);
+ InsetCollapsible::write(os);
}
void InsetBranch::read(Lexer & lex)
{
params_.read(lex);
- InsetCollapsable::read(lex);
+ InsetCollapsible::read(lex);
}
support::bformat(_("master %1$s, child %2$s"),
masteron, childon);
- docstring const heading =
+ docstring const heading =
support::bformat(_("Branch Name: %1$s\nBranch Status: %2$s\nInset Status: %3$s"),
params_.branch, status, onoff);
// cur.forceBufferUpdate() is not enough
buf->updateBuffer();
}
+
+ // if branch exists in a descendant, update previews.
+ // TODO: only needed if "Show preview" is enabled in the included inset.
+ bool exists_in_desc = false;
+ for (auto const & it : buf->getDescendants()) {
+ if (it->params().branchlist().find(params_.branch))
+ exists_in_desc = true;
+ }
+ if (exists_in_desc) {
+ // TODO: ideally we would only update the previews of the
+ // specific children that have this branch directly or
+ // in one of their descendants
+ buf->removePreviews();
+ buf->updatePreviews();
+ }
break;
}
case LFUN_BRANCH_INVERT:
if (cmd.argument() == "assign")
setStatus(cur, isBranchSelected() ? Open : Collapsed);
else
- InsetCollapsable::doDispatch(cur, cmd);
+ InsetCollapsible::doDispatch(cur, cmd);
break;
default:
- InsetCollapsable::doDispatch(cur, cmd);
+ InsetCollapsible::doDispatch(cur, cmd);
break;
}
}
if (cmd.argument() == "assign")
flag.setEnabled(true);
else
- return InsetCollapsable::getStatus(cur, cmd, flag);
+ return InsetCollapsible::getStatus(cur, cmd, flag);
break;
default:
- return InsetCollapsable::getStatus(cur, cmd, flag);
+ return InsetCollapsible::getStatus(cur, cmd, flag);
}
return true;
}
void InsetBranch::latex(otexstream & os, OutputParams const & runparams) const
{
- if (producesOutput())
- InsetText::latex(os, runparams);
+ if (producesOutput()) {
+ OutputParams rp = runparams;
+ rp.inbranch = true;
+ InsetText::latex(os, rp);
+ // These need to be passed upstream
+ runparams.need_maketitle = rp.need_maketitle;
+ runparams.have_maketitle = rp.have_maketitle;
+ }
}
}
-int InsetBranch::docbook(odocstream & os,
- OutputParams const & runparams) const
+void InsetBranch::docbook(XMLStream & xs, OutputParams const & runparams) const
{
- return producesOutput() ? InsetText::docbook(os, runparams) : 0;
+ if (producesOutput()) {
+ OutputParams rp = runparams;
+ rp.par_begin = 0;
+ rp.par_end = text().paragraphs().size();
+ docbookParagraphs(text(), buffer(), xs, rp);
+ }
}
-docstring InsetBranch::xhtml(XHTMLStream & xs, OutputParams const & rp) const
+docstring InsetBranch::xhtml(XMLStream & xs, OutputParams const & rp) const
{
if (producesOutput()) {
OutputParams newrp = rp;
void InsetBranch::toString(odocstream & os) const
{
if (producesOutput())
- InsetCollapsable::toString(os);
+ InsetCollapsible::toString(os);
}
bool const shorten) const
{
if (producesOutput())
- InsetCollapsable::forOutliner(os, maxlen, shorten);
+ InsetCollapsible::forOutliner(os, maxlen, shorten);
}
void InsetBranch::validate(LaTeXFeatures & features) const
{
if (producesOutput())
- InsetCollapsable::validate(features);
+ InsetCollapsible::validate(features);
}
}
-bool InsetBranch::isMacroScope() const
+bool InsetBranch::isMacroScope() const
{
// Its own scope if not selected by buffer
return !producesOutput();
}
-void InsetBranch::updateBuffer(ParIterator const & it, UpdateType utype)
+void InsetBranch::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted)
{
setLabel(params_.branch + (params_.inverted ? " (-)" : ""));
- InsetCollapsable::updateBuffer(it, utype);
+ InsetCollapsible::updateBuffer(it, utype, deleted);
}
void InsetBranchParams::write(ostream & os) const
{
- os << to_utf8(branch)
- << '\n'
- << "inverted "
+ os << to_utf8(branch)
+ << '\n'
+ << "inverted "
<< inverted;
}
void InsetBranchParams::read(Lexer & lex)
{
- lex >> branch;
+ // There may be a space in branch name
+ // if we wanted to use lex>>, the branch name should be properly in quotes
+ lex.eatLine();
+ branch = lex.getDocString();
lex >> "inverted" >> inverted;
}