IPADecoTranslator const & ipadecotranslator()
{
- static IPADecoTranslator decotranslator = init_ipadecotranslator();
+ static IPADecoTranslator const decotranslator =
+ init_ipadecotranslator();
return decotranslator;
}
IPADecoTranslatorLoc const & ipadecotranslator_loc()
{
- static IPADecoTranslatorLoc translator = init_ipadecotranslator_loc();
+ static IPADecoTranslatorLoc const translator =
+ init_ipadecotranslator_loc();
return translator;
}
IPACharTranslator const & ipachartranslator()
{
- static IPACharTranslator chartranslator = init_ipachartranslator();
+ static IPACharTranslator const chartranslator =
+ init_ipachartranslator();
return chartranslator;
}
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
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
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);
}
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);
}
}
}
-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());
void InsetIPADeco::validate(LaTeXFeatures & features) const
{
- if (!buffer_->params().useNonTeXFonts)
- features.require("tipa");
+ features.require("tipa");
InsetText::validate(features);
}
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);
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);
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);
}
-int InsetIPAChar::plaintext(odocstream & os, OutputParams const &) const
+int InsetIPAChar::plaintext(odocstringstream & os, OutputParams const &, size_t) const
{
switch (kind_) {
case TONE_FALLING:
void InsetIPAChar::toString(odocstream & os) const
{
- plaintext(os, OutputParams(0));
+ odocstringstream ods;
+ plaintext(ods, OutputParams(0));
+ os << ods.str();
}
-void InsetIPAChar::forToc(docstring & os, size_t) const
+void InsetIPAChar::forOutliner(docstring & os, size_t) const
{
odocstringstream ods;
plaintext(ods, OutputParams(0));
case TONE_HIGH_RISING:
case TONE_LOW_RISING:
case TONE_HIGH_RISING_FALLING:
- if (!buffer_->params().useNonTeXFonts)
- features.require("tone");
+ features.require("tone");
break;
default:
break;