Fix quotation marks in PDF TOC

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

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index 073072b47dec4b03182422c787320e5dfbb54480..ad7cbc5cdc21fb6f83efc517a2be06a1842790b8 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -17,7 +17,6 @@
 #include "BufferView.h"
 #include "BranchList.h"
 #include "ColorSet.h"
-#include "Counters.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
@@ -44,7 +43,7 @@ using namespace std;
 namespace lyx {
 
 InsetBranch::InsetBranch(Buffer * buf, InsetBranchParams const & params)
-       : InsetCollapsable(buf, InsetText::DefaultLayout), params_(params)
+       : InsetCollapsible(buf, InsetText::DefaultLayout), params_(params)
 {}
 
 
@@ -53,14 +52,14 @@ void InsetBranch::write(ostream & os) const
        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);
 }
 
 
@@ -77,14 +76,15 @@ docstring InsetBranch::toolTip(BufferView const & bv, int, int) const
 
        docstring const masteron = producesOutput() ?
                _("on") : _("off");
-       docstring const childon = producesOutput(true) ?
-               _("on") : _("off");
+       docstring const childon =
+               (isBranchSelected(true) != params_.inverted) ?
+                       _("on") : _("off");
        docstring const onoff = (masteron == childon) ?
                masteron :
                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);
 
@@ -105,7 +105,7 @@ docstring const InsetBranch::buttonLabel(BufferView const &) const
        bool const inchild = buffer().params().branchlist().find(params_.branch);
 
        bool const master_selected = producesOutput();
-       bool const child_selected = producesOutput(true);
+       bool const child_selected = isBranchSelected(true) != params_.inverted;
 
        docstring symb = docstring(1, master_selected ? tick : cross);
        if (inchild && master_selected != child_selected)
@@ -190,6 +190,21 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd)
                        // 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:
@@ -206,11 +221,11 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd)
                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;
        }
 }
@@ -258,11 +273,11 @@ bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd,
                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;
 }
@@ -284,16 +299,19 @@ bool InsetBranch::isBranchSelected(bool const child) const
 }
 
 
-bool InsetBranch::producesOutput(bool const child) const
+bool InsetBranch::producesOutput() const
 {
-       return isBranchSelected(child) != params_.inverted;
+       return isBranchSelected() != params_.inverted;
 }
 
 
 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);
+       }
 }
 
 
@@ -330,7 +348,7 @@ docstring InsetBranch::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 void InsetBranch::toString(odocstream & os) const
 {
        if (producesOutput())
-               InsetCollapsable::toString(os);
+               InsetCollapsible::toString(os);
 }
 
 
@@ -338,14 +356,14 @@ void InsetBranch::forOutliner(docstring & os, size_t const maxlen,
                                                          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);
 }
 
 
@@ -355,7 +373,7 @@ string InsetBranch::contextMenuName() const
 }
 
 
-bool InsetBranch::isMacroScope() const 
+bool InsetBranch::isMacroScope() const
 {
        // Its own scope if not selected by buffer
        return !producesOutput();
@@ -384,37 +402,28 @@ void InsetBranch::string2params(string const & in, InsetBranchParams & params)
 }
 
 
-void InsetBranch::addToToc(DocIterator const & cpit, bool output_active,
-                                                  UpdateType utype) const
+void InsetBranch::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted)
 {
-       DocIterator pit = cpit;
-       pit.push_back(CursorSlice(const_cast<InsetBranch &>(*this)));
-
-       docstring str;
-       text().forOutliner(str, TOC_ENTRY_LENGTH);
-       str = params_.branch + (params_.inverted ? " (-):" : ": ") + str;
-
-       shared_ptr<Toc> toc = buffer().tocBackend().toc("branch");
-       toc->push_back(TocItem(pit, 0, str, output_active));
-
-       // Proceed with the rest of the inset.
-       bool const doing_output = output_active && producesOutput();
-       InsetCollapsable::addToToc(cpit, doing_output, utype);
+       setLabel(params_.branch + (params_.inverted ? " (-)" : ""));
+       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;
 }