XHTML/DocBook: merge code duplicates for vertical alignment.

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

diff --git a/src/insets/InsetIPA.cpp b/src/insets/InsetIPA.cpp
index 29ed00037fa0e010577db6f3bcc2934b31c4d287..7745b8d946793362398726d128e13c0bb3bb61d1 100644 (file)
--- a/src/insets/InsetIPA.cpp
+++ b/src/insets/InsetIPA.cpp
@@ -15,12 +15,12 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
+#include "Dimension.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
-#include "OutputParams.h"
 #include "RenderPreview.h"
 #include "texstream.h"
 
@@ -35,7 +35,7 @@ using namespace std;
 namespace lyx {
 
 
-InsetIPA::InsetIPA(Buffer * buf) 
+InsetIPA::InsetIPA(Buffer * buf)
        : InsetText(buf),
          preview_(new RenderPreview(this))
 {
@@ -44,7 +44,7 @@ InsetIPA::InsetIPA(Buffer * buf)
 }
 
 
-InsetIPA::~InsetIPA() 
+InsetIPA::~InsetIPA()
 {}
 
 
@@ -119,14 +119,14 @@ void InsetIPA::addPreview(DocIterator const & inset_pos,
 }
 
 
-void InsetIPA::preparePreview(DocIterator const & pos) const  
+void InsetIPA::preparePreview(DocIterator const & pos) const
 {
        odocstringstream str;
        otexstream os(str);
        OutputParams runparams(&pos.buffer()->params().encoding());
        latex(os, runparams);
        docstring const snippet = str.str();
-       preview_->addPreview(snippet, *pos.buffer());  
+       preview_->addPreview(snippet, *pos.buffer());
 }
 
 
@@ -184,8 +184,8 @@ void InsetIPA::metrics(MetricsInfo & mi, Dimension & dim) const
                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.asc += topOffset(mi.base.bv);
+               dim.des += bottomOffset(mi.base.bv);
                // insert a one pixel gap
                dim.wid += 1;
                Dimension dim_dummy;
@@ -233,7 +233,15 @@ void InsetIPA::latex(otexstream & os, OutputParams const & runparams_in) const
 }
 
 
-docstring InsetIPA::xhtml(XHTMLStream & xs, OutputParams const & runparams_in) const
+void InsetIPA::docbook(XMLStream & xs, OutputParams const & runparams) const
+{
+       OutputParams rp(runparams);
+       rp.inIPA = true;
+       InsetText::docbook(xs, rp);
+}
+
+
+docstring InsetIPA::xhtml(XMLStream & xs, OutputParams const & runparams_in) const
 {
        OutputParams runparams(runparams_in);
        runparams.inIPA = true;