#include "support/lstrings.h"
-#include <sstream>
-using lyx::support::ascii_lowercase;
-using lyx::support::bformat;
-using lyx::support::rtrim;
-using lyx::support::subst;
+namespace lyx {
+
+using support::ascii_lowercase;
+using support::bformat;
+using support::rtrim;
+using support::subst;
using std::endl;
using std::string;
using std::ostream;
-using std::ostringstream;
#ifndef CXX_GLOBAL_CSTD
using std::strlen;
char const * GUIFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
{ N_("Roman"), N_("Sans Serif"), N_("Typewriter"), N_("Symbol"),
- "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy",
+ "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
N_("Inherit"), N_("Ignore") };
char const * GUISeriesNames[4] =
//
char const * LyXFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
{ "roman", "sans", "typewriter", "symbol",
- "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy",
+ "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
"default", "error" };
char const * LyXSeriesNames[4] =
}
-/// Build GUI description of font state
-string const LyXFont::stateText(BufferParams * params) const
+docstring const LyXFont::stateText(BufferParams * params) const
{
- ostringstream os;
+ odocstringstream os;
if (family() != INHERIT_FAMILY)
os << _(GUIFamilyNames[family()]) << ", ";
if (series() != INHERIT_SERIES)
if (color() != LColor::inherit)
os << lcolor.getGUIName(color()) << ", ";
if (emph() != INHERIT)
- os << bformat(_("Emphasis %1$s, "), _(GUIMiscNames[emph()]));
+ os << bformat(_("Emphasis %1$s, "),
+ _(GUIMiscNames[emph()]));
if (underbar() != INHERIT)
- os << bformat(_("Underline %1$s, "), _(GUIMiscNames[underbar()]));
+ os << bformat(_("Underline %1$s, "),
+ _(GUIMiscNames[underbar()]));
if (noun() != INHERIT)
- os << bformat(_("Noun %1$s, "), _(GUIMiscNames[noun()]));
+ os << bformat(_("Noun %1$s, "),
+ _(GUIMiscNames[noun()]));
if (bits == inherit)
os << _("Default") << ", ";
if (!params || (language() != params->language))
- os << bformat(_("Language: %1$s, "), _(language()->display()));
+ os << bformat(_("Language: %1$s, "),
+ _(language()->display()));
if (number() != OFF)
- os << bformat(_(" Number %1$s"), _(GUIMiscNames[number()]));
+ os << bformat(_(" Number %1$s"),
+ _(GUIMiscNames[number()]));
return rtrim(os.str(), ", ");
}
if (orgfont.noun() != noun()) {
os << "\\noun " << LyXMiscNames[noun()] << "\n";
}
- if (orgfont.color() != color()) {
- // To make us file compatible with older
- // lyx versions we emit "default" instead
- // of "inherit"
- string col_str(lcolor.getLyXName(color()));
- if (col_str == "inherit") col_str = "default";
- os << "\\color " << col_str << "\n";
- }
+ if (orgfont.color() != color())
+ os << "\\color " << lcolor.getLyXName(color()) << '\n';
if (orgfont.language() != language() &&
language() != latex_language) {
if (language())
/// Writes the head of the LaTeX needed to impose this font
// Returns number of chars written.
-int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
- LyXFont const & prev) const
+int LyXFont::latexWriteStartChanges(odocstream & os, LyXFont const & base,
+ LyXFont const & prev) const
{
- int count = 0;
bool env = false;
+ int count = 0;
if (language()->babel() != base.language()->babel() &&
language() != prev.language()) {
if (isRightToLeft() != prev.isRightToLeft()) {
string const tmp =
subst(lyxrc.language_command_local,
"$$lang", language()->babel());
- os << tmp;
+ os << from_ascii(tmp);
count += tmp.length();
}
}
}
if (f.color() != LColor::inherit && f.color() != LColor::ignore) {
os << "\\textcolor{"
- << lcolor.getLaTeXName(f.color())
+ << from_ascii(lcolor.getLaTeXName(f.color()))
<< "}{";
count += lcolor.getLaTeXName(f.color()).length() + 13;
env = true; //We have opened a new environment
/// Writes ending block of LaTeX needed to close use of this font
// Returns number of chars written
// This one corresponds to latexWriteStartChanges(). (Asger)
-int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
- LyXFont const & next) const
+int LyXFont::latexWriteEndChanges(odocstream & os, LyXFont const & base,
+ LyXFont const & next) const
{
int count = 0;
bool env = false;
<< " number " << font.bits.number
<< " lang: " << (font.lang ? font.lang->lang() : 0);
}
+
+
+} // namespace lyx