X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.cpp;h=46cba97231dfea6949b0cb8875f2e54b1894cd5f;hb=f6f32ca0ee1d341e39f202e2921ccbd4d5537f5b;hp=c24ddc6c4edf36e69ddb8ce8c3e2d7a7b9bddeca;hpb=0cd51c41a884832a2207a240cb0f7f9faf02285a;p=lyx.git diff --git a/src/Font.cpp b/src/Font.cpp index c24ddc6c4e..46cba97231 100644 --- a/src/Font.cpp +++ b/src/Font.cpp @@ -189,7 +189,7 @@ docstring const Font::stateText(BufferParams * params) const 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(), ", "); } @@ -438,7 +438,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams, /// 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, @@ -531,7 +531,7 @@ int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams, // 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 const c = switchEncoding(os, bparams, + pair const c = switchEncoding(os.os(), bparams, runparams, *ascii); LASSERT(c.first, /**/); count += c.second;