Natbib authoryear uses (Ref1; Ref2) by default.

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

diff --git a/src/insets/InsetIPAMacro.cpp b/src/insets/InsetIPAMacro.cpp
index f5c07e33b2d9e9ce2a98bda1204a16bd3eb1b637..f8888ce96e7b4cd021128de71826fa65cec67d69 100644 (file)
--- a/src/insets/InsetIPAMacro.cpp
+++ b/src/insets/InsetIPAMacro.cpp
@@ -154,7 +154,7 @@ void InsetIPADeco::metrics(MetricsInfo & mi, Dimension & dim) const
                int d = 0;
                docstring const label(1, char_type(0x2040));
                theFontMetrics(font).rectText(label, w, a, d);
-               dim.asc += a * 0.5;
+               dim.asc += int(a * 0.5);
        }
        if (params_.type == InsetIPADecoParams::Bottomtiebar) {
                // consider width of the inset label
@@ -167,7 +167,7 @@ void InsetIPADeco::metrics(MetricsInfo & mi, Dimension & dim) const
                int d = 0;
                docstring const label(1, char_type(0x203f));
                theFontMetrics(font).rectText(label, w, a, d);
-               dim.des += d * 1.5;
+               dim.des += int(d * 1.5);
        }
 
        // cache the inset dimension
@@ -197,7 +197,7 @@ void InsetIPADeco::draw(PainterInfo & pi, int x, int y) const
                docstring const label(1, char_type(0x2040));
                theFontMetrics(font).rectText(label, w, a, d);
                int const ww = max(dim.wid, w);
-               pi.pain.rectText(x + (ww - w) / 2, y - (asc / 2.5),
+               pi.pain.rectText(x + (ww - w) / 2, y - int(asc / 2.5),
                        label, font, Color_none, Color_none);
        }
 
@@ -213,7 +213,7 @@ void InsetIPADeco::draw(PainterInfo & pi, int x, int y) const
                docstring const label(1, char_type(0x203f));
                theFontMetrics(font).rectText(label, w, a, d);
                int const ww = max(dim.wid, w);
-               pi.pain.rectText(x + (ww - w) / 2, y + (desc / 1.5),
+               pi.pain.rectText(x + (ww - w) / 2, y + int(desc / 1.5),
                        label, font, Color_none, Color_none);
        }
 }
@@ -281,11 +281,11 @@ void InsetIPADeco::latex(otexstream & os, OutputParams const & runparams) const
 }
 
 
-int InsetIPADeco::plaintext(odocstream & os,
-                           OutputParams const & runparams) const
+int InsetIPADeco::plaintext(odocstringstream & os,
+                           OutputParams const & runparams, size_t max_length) const
 {
        odocstringstream ods;
-       int h = (int)(InsetCollapsable::plaintext(ods, runparams) / 2);
+       int h = (int)(InsetCollapsable::plaintext(ods, runparams, max_length) / 2);
        docstring result = ods.str();
        docstring const before = result.substr(0, h);
        docstring const after = result.substr(h, result.size());
@@ -449,7 +449,7 @@ void InsetIPAChar::draw(PainterInfo & pi, int x, int y) const
                int h = fm.ascent(char_type('M'));
                int x2 = x + w;
                int y2 = y - h;
-               int y3 = y - (h * 0.75);
+               int y3 = y - int(h * 0.75);
 
                pi.pain.line(x2, y, x2, y2, Color_foreground);
                pi.pain.line(x2, y2, x, y3, Color_foreground);
@@ -461,7 +461,7 @@ void InsetIPAChar::draw(PainterInfo & pi, int x, int y) const
                int h = fm.ascent(char_type('M'));
                int x2 = x + w;
                int y2 = y - h;
-               int y3 = y - (h * 0.25);
+               int y3 = y - int(h * 0.25);
 
                pi.pain.line(x2, y, x2, y2, Color_foreground);
                pi.pain.line(x2, y3, x, y, Color_foreground);
@@ -473,8 +473,8 @@ void InsetIPAChar::draw(PainterInfo & pi, int x, int y) const
                int h = fm.ascent(char_type('M'));
                int x2 = x + w;
                int y2 = y - h;
-               int x3 = x + (w * 0.5);
-               int y3 = y - (h * 0.75);
+               int x3 = x + int(w * 0.5);
+               int y3 = y - int(h * 0.75);
 
                pi.pain.line(x2, y, x2, y2, Color_foreground);
                pi.pain.line(x2, y3, x3, y2, Color_foreground);
@@ -512,7 +512,7 @@ void InsetIPAChar::latex(otexstream & os,
 }
 
 
-int InsetIPAChar::plaintext(odocstream & os, OutputParams const &) const
+int InsetIPAChar::plaintext(odocstringstream & os, OutputParams const &, size_t) const
 {
        switch (kind_) {
        case TONE_FALLING:
@@ -588,7 +588,9 @@ docstring InsetIPAChar::xhtml(XHTMLStream & xs, OutputParams const &) const
 
 void InsetIPAChar::toString(odocstream & os) const
 {
-       plaintext(os, OutputParams(0));
+       odocstringstream ods;
+       plaintext(ods, OutputParams(0));
+       os << ods.str();
 }