os << bformat(_("Language: %1$s, "),
_(language()->display()));
if (bits_.number() != FONT_OFF)
- os << bformat(_(" Number %1$s"),
+ os << " " << bformat(_("Number %1$s"),
_(GUIMiscNames[bits_.number()]));
return rtrim(os.str(), ", ");
}
int count = 0;
// polyglossia or babel?
- if (runparams.use_polyglossia) {
+ if (runparams.use_polyglossia
+ && language()->lang() != base.language()->lang()
+ && language() != prev.language()) {
if (!language()->polyglossia().empty()) {
string tmp = "\\text" + language()->polyglossia();
if (!language()->polyglossiaOpts().empty())
/// Writes ending block of LaTeX needed to close use of this font
// Returns number of chars written
// This one corresponds to latexWriteStartChanges(). (Asger)
-int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
+int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
OutputParams const & runparams,
Font const & base,
Font const & next,
// We need to close the encoding even if it does not change
// to do correct environment nesting
Encoding const * const ascii = encodings.fromLyXName("ascii");
- pair<bool, int> const c = switchEncoding(os, bparams,
+ pair<bool, int> const c = switchEncoding(os.os(), bparams,
runparams, *ascii);
LASSERT(c.first, /**/);
count += c.second;