Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetIPA.cpp b/src/insets/InsetIPA.cpp
index 387635831537a4c8b97bfec17f6e1addc1259809..29ed00037fa0e010577db6f3bcc2934b31c4d287 100644 (file)
--- a/src/insets/InsetIPA.cpp
+++ b/src/insets/InsetIPA.cpp
@@ -122,7 +122,7 @@ void InsetIPA::addPreview(DocIterator const & inset_pos,
 void InsetIPA::preparePreview(DocIterator const & pos) const  
 {
        odocstringstream str;
-       otexstream os(str, false);
+       otexstream os(str);
        OutputParams runparams(&pos.buffer()->params().encoding());
        latex(os, runparams);
        docstring const snippet = str.str();
@@ -151,8 +151,7 @@ void InsetIPA::reloadPreview(DocIterator const & pos) const
 void InsetIPA::draw(PainterInfo & pi, int x, int y) const
 {
        if (previewState(pi.base.bv)) {
-               preview_->draw(pi, x + TEXT_TO_INSET_OFFSET, y);
-               setPosCache(pi, x, y);
+               preview_->draw(pi, x, y);
                return;
        }
        InsetText::draw(pi, x, y);
@@ -181,19 +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.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);