Allow removing words from the personal dictionary, that weren't previously added.

[features.git] / src / insets / InsetPreview.cpp

diff --git a/src/insets/InsetPreview.cpp b/src/insets/InsetPreview.cpp
index d327fe5b52bd17ce41b6ba32285d84270d0f58b1..c4f1b8d83db1b3e219643792ab10ef2b4b09c54d 100644 (file)
--- a/src/insets/InsetPreview.cpp
+++ b/src/insets/InsetPreview.cpp
@@ -15,10 +15,10 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
-#include "Lexer.h"
+#include "Dimension.h"
 #include "MetricsInfo.h"
-#include "OutputParams.h"
 #include "RenderPreview.h"
+#include "texstream.h"
 
 #include "frontends/Painter.h"
 
@@ -34,16 +34,15 @@ using namespace std;
 namespace lyx {
 
 
-InsetPreview::InsetPreview(Buffer * buf) 
-       : InsetText(buf),
-         preview_(new RenderPreview(this)), use_preview_(true)
+InsetPreview::InsetPreview(Buffer * buf)
+       : InsetText(buf), preview_(new RenderPreview(this))
 {
        setDrawFrame(true);
        setFrameColor(Color_previewframe);
 }
 
 
-InsetPreview::~InsetPreview() 
+InsetPreview::~InsetPreview()
 {}
 
 
@@ -80,39 +79,53 @@ void InsetPreview::addPreview(DocIterator const & inset_pos,
 }
 
 
-void InsetPreview::preparePreview(DocIterator const & pos) const  
+MacroNameSet gatherMacroDefinitions(const Buffer* buffer, const Inset * inset)
 {
-       TexRow texrow;
-       odocstringstream str;
-       otexstream os(str, texrow);
-       OutputParams runparams(&pos.buffer()->params().encoding());
-       latex(os, runparams);
-
-       // collect macros at this position
+       // Collect macros for this inset.
+       // Not done yet: this function returns a list of macro *definitions*.
        MacroNameSet macros;
-       pos.buffer()->listMacroNames(macros);
+       buffer->listMacroNames(macros);
 
-       // look for math insets and collect definitions for the used macros
+       // Look for math insets and collect definitions for the used macros.
        MacroNameSet defs;
-       DocIterator dit = doc_iterator_begin(pos.buffer(), this);
-       DocIterator const dend = doc_iterator_end(pos.buffer(), this);
+       DocIterator const dbeg = doc_iterator_begin(buffer, inset);
+       DocIterator dit = dbeg;
+       DocIterator const dend = doc_iterator_end(buffer, inset);
        if (!dit.nextInset())
                dit.forwardInset();
+
        for (; dit != dend; dit.forwardInset()) {
                InsetMath * im = dit.nextInset()->asInsetMath();
-               InsetMathHull * hull = im ? im->asHullInset() : 0;
+               InsetMathHull * hull = im ? im->asHullInset() : nullptr;
                if (!hull)
                        continue;
                for (idx_type idx = 0; idx < hull->nargs(); ++idx)
-                       hull->usedMacros(hull->cell(idx), pos, macros, defs);
+                       hull->usedMacros(hull->cell(idx), dbeg, macros, defs);
        }
-       MacroNameSet::iterator it = defs.begin();
-       MacroNameSet::iterator end = defs.end();
+
+       return defs;
+}
+
+
+docstring insetToLaTeXSnippet(const Buffer* buffer, const Inset * inset)
+{
+       odocstringstream str;
+       otexstream os(str);
+       OutputParams runparams(&buffer->params().encoding());
+       inset->latex(os, runparams);
+
+       MacroNameSet defs = gatherMacroDefinitions(buffer, inset);
        docstring macro_preamble;
-       for (; it != end; ++it)
-               macro_preamble.append(*it);
+       for (const auto& def : defs)
+               macro_preamble.append(def);
 
-       docstring const snippet = macro_preamble + str.str();
+       return macro_preamble + str.str();
+}
+
+
+void InsetPreview::preparePreview(DocIterator const & pos) const
+{
+       docstring const snippet = insetToLaTeXSnippet(pos.buffer(), this);
        preview_->addPreview(snippet, *pos.buffer());
 }
 
@@ -137,15 +150,11 @@ void InsetPreview::reloadPreview(DocIterator const & pos) const
 
 void InsetPreview::draw(PainterInfo & pi, int x, int y) const
 {
-       use_preview_ = previewState(pi.base.bv);
-
-       if (use_preview_) {
+       if (previewState(pi.base.bv)) {
                // one pixel gap in front
-               preview_->draw(pi, x + 1 + TEXT_TO_INSET_OFFSET, y);
-               setPosCache(pi, x, y);
-               return;
-       }
-       InsetText::draw(pi, x, y);
+               preview_->draw(pi, x + 1, y);
+       } else
+               InsetText::draw(pi, x, y);
 }
 
 
@@ -158,7 +167,7 @@ void InsetPreview::edit(Cursor & cur, bool front, EntryDirection entry_from)
 
 Inset * InsetPreview::editXY(Cursor & cur, int x, int y)
 {
-       if (use_preview_) {
+       if (previewState(&cur.bv())) {
                edit(cur, true, ENTRY_DIRECTION_IGNORE);
                return this;
        }
@@ -171,20 +180,14 @@ void InsetPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        if (previewState(mi.base.bv)) {
                preview_->metrics(mi, dim);
-               mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
-               
+
                dim.wid = max(dim.wid, 4);
                dim.asc = max(dim.asc, 4);
-               
-               dim.asc += TEXT_TO_INSET_OFFSET;
-               dim.des += TEXT_TO_INSET_OFFSET;
-               dim.wid += TEXT_TO_INSET_OFFSET;
-               dim_ = dim;
-               dim.wid += TEXT_TO_INSET_OFFSET;
+
+               dim.asc += topOffset(mi.base.bv);
+               dim.des += bottomOffset(mi.base.bv);
                // insert a one pixel gap
                dim.wid += 1;
-               // Cache the inset dimension.
-               setDimCache(mi, dim);
                Dimension dim_dummy;
                MetricsInfo mi_dummy = mi;
                InsetText::metrics(mi_dummy, dim_dummy);