Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetIPA.cpp b/src/insets/InsetIPA.cpp
index 33ede5515fd57b604991d5fe1d6c0a51a04e5cdd..29ed00037fa0e010577db6f3bcc2934b31c4d287 100644 (file)
--- a/src/insets/InsetIPA.cpp
+++ b/src/insets/InsetIPA.cpp
@@ -22,6 +22,7 @@
 #include "MetricsInfo.h"
 #include "OutputParams.h"
 #include "RenderPreview.h"
+#include "texstream.h"
 
 #include "frontends/Painter.h"
 
@@ -36,9 +37,8 @@ namespace lyx {
 
 InsetIPA::InsetIPA(Buffer * buf) 
        : InsetText(buf),
-         preview_(new RenderPreview(this)), use_preview_(true)
+         preview_(new RenderPreview(this))
 {
-       setAutoBreakRows(true);
        setDrawFrame(true);
        setFrameColor(Color_insetframe);
 }
@@ -55,6 +55,18 @@ InsetIPA::InsetIPA(InsetIPA const & other)
 }
 
 
+InsetIPA & InsetIPA::operator=(InsetIPA const & other)
+{
+       if (&other == this)
+               return *this;
+
+       InsetText::operator=(other);
+       preview_.reset(new RenderPreview(*other.preview_, this));
+
+       return *this;
+}
+
+
 void InsetIPA::write(ostream & os) const
 {
        os << "IPA" << "\n";
@@ -109,9 +121,8 @@ void InsetIPA::addPreview(DocIterator const & inset_pos,
 
 void InsetIPA::preparePreview(DocIterator const & pos) const  
 {
-       TexRow texrow;
-       odocstringstream str;  
-       otexstream os(str, texrow);
+       odocstringstream str;
+       otexstream os(str);
        OutputParams runparams(&pos.buffer()->params().encoding());
        latex(os, runparams);
        docstring const snippet = str.str();
@@ -139,11 +150,8 @@ void InsetIPA::reloadPreview(DocIterator const & pos) const
 
 void InsetIPA::draw(PainterInfo & pi, int x, int y) const
 {
-       use_preview_ = previewState(pi.base.bv);
-
-       if (use_preview_) {
-               preview_->draw(pi, x + TEXT_TO_INSET_OFFSET, y);
-               setPosCache(pi, x, y);
+       if (previewState(pi.base.bv)) {
+               preview_->draw(pi, x, y);
                return;
        }
        InsetText::draw(pi, x, y);
@@ -159,7 +167,7 @@ void InsetIPA::edit(Cursor & cur, bool front, EntryDirection entry_from)
 
 Inset * InsetIPA::editXY(Cursor & cur, int x, int y)
 {
-       if (use_preview_) {
+       if (previewState(&cur.bv())) {
                edit(cur, true, ENTRY_DIRECTION_IGNORE);
                return this;
        }
@@ -172,20 +180,14 @@ void InsetIPA::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;
                // 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);
@@ -231,6 +233,14 @@ void InsetIPA::latex(otexstream & os, OutputParams const & runparams_in) const
 }
 
 
+docstring InsetIPA::xhtml(XHTMLStream & xs, OutputParams const & runparams_in) const
+{
+       OutputParams runparams(runparams_in);
+       runparams.inIPA = true;
+       return InsetText::xhtml(xs, runparams);
+}
+
+
 bool InsetIPA::insetAllowed(InsetCode code) const
 {
        switch (code) {