X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetIPA.cpp;h=29ed00037fa0e010577db6f3bcc2934b31c4d287;hb=239b9919ffe28338d789e6dc9122228f77ab77a7;hp=986c02c60123d1da9f3b0b8891df3cbe5fcae1fa;hpb=b6a63bfce81819ae0edf3dded0e02c4439e27f90;p=lyx.git

diff --git a/src/insets/InsetIPA.cpp b/src/insets/InsetIPA.cpp
index 986c02c601..29ed00037f 100644
--- a/src/insets/InsetIPA.cpp
+++ b/src/insets/InsetIPA.cpp
@@ -19,10 +19,10 @@
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
-#include "LyXRC.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
 #include "RenderPreview.h"
+#include "texstream.h"
 
 #include "frontends/Painter.h"
 
@@ -37,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);
 }
@@ -56,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";
@@ -110,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();
@@ -122,8 +132,7 @@ void InsetIPA::preparePreview(DocIterator const & pos) const
 
 bool InsetIPA::previewState(BufferView * bv) const
 {
-	if (!editing(bv) && (RenderPreview::status() == LyXRC::PREVIEW_ON ||
-			     RenderPreview::status() == LyXRC::PREVIEW_NO_MATH)) {
+	if (!editing(bv) && RenderPreview::previewText()) {
 		graphics::PreviewImage const * pimage =
 			preview_->getPreviewImage(bv->buffer());
 		return pimage && pimage->image();
@@ -141,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);
@@ -161,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;
 	}
@@ -174,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);
@@ -207,10 +207,9 @@ bool InsetIPA::notifyCursorLeaves(Cursor const & old, Cursor & cur)
 
 void InsetIPA::validate(LaTeXFeatures & features) const
 {
-	if (buffer_->params().useNonTeXFonts)
-		return;
 	features.require("tipa");
 	features.require("tipx");
+
 	InsetText::validate(features);
 }
 
@@ -234,11 +233,21 @@ 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) {
 	// code that is allowed
 	case ERT_CODE:
+	case IPACHAR_CODE:
+	case IPADECO_CODE:
 	case SCRIPT_CODE:
 		return true;
 	default: