#include <clocale>
#include <cctype>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-
#include "gettext.h"
#include "lyxfont.h"
#include "debug.h"
#include "lyxrc.h"
#include "lyxlex.h"
#include "language.h"
+#include "Lsstream.h"
#include "support/lstrings.h"
#include "bufferparams.h" // stateText
+using namespace lyx::support;
+
using std::ostream;
using std::endl;
namespace {
char const * GUIFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
-{ N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"),
+{ N_("Roman"), N_("Sans Serif"), N_("Typewriter"), N_("Symbol"),
"cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy",
N_("Inherit"), N_("Ignore") };
LyXFont::LyXFont(LyXFont::FONT_INIT1)
-#ifndef INHERIT_LANGUAGE
: bits(inherit), lang(default_language)
-#else
- : bits(inherit), lang(inherit_language)
-#endif
{}
if (language() == document_language)
setLanguage(default_language);
else
-#ifndef INHERIT_LANGUAGE
setLanguage(document_language);
-#else
- setLanguage(inherit_language);
-#endif
else if (newfont.language() != ignore_language)
setLanguage(newfont.language());
setNoun(INHERIT);
if (color() == tmplt.color())
setColor(LColor::inherit);
-#ifdef INHERIT_LANGUAGE
- if (language() == tmplt.language())
- setLanguage(inherit_language);
-#endif
}
/// Realize font from a template
-#ifndef INHERIT_LANGUAGE
LyXFont & LyXFont::realize(LyXFont const & tmplt)
-#else
-LyXFont & LyXFont::realize(LyXFont const & tmplt, Language const * deflang)
-#endif
{
-#ifdef INHERIT_LANGUAGE
- if (language() == inherit_language) {
- if (tmplt.language() == inherit_language ||
- tmplt.language() == ignore_language ||
- tmplt.language() == default_language)
- {
- setLanguage(deflang);
- } else {
- setLanguage(tmplt.language());
- }
- }
-#endif
if (bits == inherit) {
bits = tmplt.bits;
return *this;
shape() != INHERIT_SHAPE && size() != INHERIT_SIZE &&
emph() != INHERIT && underbar() != INHERIT &&
noun() != INHERIT &&
-#ifdef INHERIT_LANGUAGE
- language() != inherit_language &&
-#endif
color() != LColor::inherit);
}
/// Build GUI description of font state
string const LyXFont::stateText(BufferParams * params) const
{
- ostringstream ost;
+ ostringstream os;
if (family() != INHERIT_FAMILY)
- ost << _(GUIFamilyNames[family()]) << ", ";
+ os << _(GUIFamilyNames[family()]) << ", ";
if (series() != INHERIT_SERIES)
- ost << _(GUISeriesNames[series()]) << ", ";
+ os << _(GUISeriesNames[series()]) << ", ";
if (shape() != INHERIT_SHAPE)
- ost << _(GUIShapeNames[shape()]) << ", ";
+ os << _(GUIShapeNames[shape()]) << ", ";
if (size() != INHERIT_SIZE)
- ost << _(GUISizeNames[size()]) << ", ";
+ os << _(GUISizeNames[size()]) << ", ";
if (color() != LColor::inherit)
- ost << lcolor.getGUIName(color()) << ", ";
+ os << lcolor.getGUIName(color()) << ", ";
if (emph() != INHERIT)
- ost << _("Emphasis ")
- << _(GUIMiscNames[emph()]) << ", ";
+ os << bformat(_("Emphasis %1$s, "), _(GUIMiscNames[emph()]));
if (underbar() != INHERIT)
- ost << _("Underline ")
- << _(GUIMiscNames[underbar()]) << ", ";
+ os << bformat(_("Underline %1$s, "), _(GUIMiscNames[underbar()]));
if (noun() != INHERIT)
- ost << _("Noun ") << _(GUIMiscNames[noun()]) << ", ";
+ os << bformat(_("Noun %1$s, "), _(GUIMiscNames[noun()]));
if (bits == inherit)
- ost << _("Default") << ", ";
+ os << _("Default") << ", ";
if (!params || (language() != params->language))
- ost << _("Language: ") << _(language()->display()) << ", ";
+ os << bformat(_("Language: %1$s, "), _(language()->display()));
if (number() != OFF)
- ost << _(" Number ") << _(GUIMiscNames[number()]);
-
- string buf(ost.str().c_str());
- buf = strip(buf, ' ');
- buf = strip(buf, ',');
- return buf;
+ os << bformat(_(" Number %1$s"), _(GUIMiscNames[number()]));
+ return rtrim(STRCONV(os.str()), ", ");
}
string const s = ascii_lowercase(fam);
int i = 0;
- while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error") ++i;
- if (s == LyXFamilyNames[i]) {
+ while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error")
+ ++i;
+ if (s == LyXFamilyNames[i])
setFamily(LyXFont::FONT_FAMILY(i));
- } else
+ else
lyxerr << "LyXFont::setLyXFamily: Unknown family `"
<< s << '\'' << endl;
return *this;
/// Writes the changes from this font to orgfont in .lyx format in file
void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
-#ifdef INHERIT_LANGUAGE
- Language const * doclang,
-#endif
ostream & os) const
{
os << "\n";
os << "\\color " << col_str << "\n";
}
if (orgfont.language() != language()) {
-#ifndef INHERIT_LANGUAGE
if (language())
-#else
- if (language() == inherit_language)
- os << "\\lang " << doclang->lang() << "\n";
- else if (language())
-#endif
os << "\\lang " << language()->lang() << "\n";
else
os << "\\lang unknown\n";
// \noun{} is a LyX special macro
if (f.noun() == ON) {
os << "\\noun{";
- count += 8;
+ count += 6;
env = true; //We have opened a new environment
}
if (f.size() != INHERIT_SIZE) {
int count = 0;
bool env = false;
- LyXFont f = *this; // why do you need this?
- f.reduce(base); // why isn't this just "reduce(base);" (Lgb)
- // Because this function is const. Everything breaks if this
- // method changes the font it represents. There is no speed penalty
- // by using the temporary. (Asger)
-
+ // reduce the current font to changes against the base
+ // font (of the layout). We use a temporary for this to
+ // avoid changing this font instance, as that would break
+ LyXFont f = *this;
+ f.reduce(base);
if (f.family() != INHERIT_FAMILY) {
os << '}';
}
if (language() != base.language() && language() != next.language()) {
- os << "}";
+ os << '}';
++count;
}