#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 "FontLoader.h"
#include "support/lstrings.h"
#include "bufferparams.h" // stateText
+#include "BoostFormat.h"
+
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"),
- "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak",
+{ N_("Roman"), N_("Sans Serif"), N_("Typewriter"), N_("Symbol"),
+ "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy",
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",
+ "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy",
"default", "error" };
char const * LyXSeriesNames[4] =
IGNORE };
-bool LyXFont::FontBits::operator==(LyXFont::FontBits const & fb1) const
+bool operator==(LyXFont::FontBits const & lhs,
+ LyXFont::FontBits const & rhs)
{
- return fb1.family == family &&
- fb1.series == series &&
- fb1.shape == shape &&
- fb1.size == size &&
- fb1.color == color &&
- fb1.emph == emph &&
- fb1.underbar == underbar &&
- fb1.noun == noun &&
- fb1.number == number;
-}
-
-
-bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const
-{
- return !(fb1 == *this);
+ return lhs.family == rhs.family &&
+ lhs.series == rhs.series &&
+ lhs.shape == rhs.shape &&
+ lhs.size == rhs.size &&
+ lhs.color == rhs.color &&
+ lhs.emph == rhs.emph &&
+ lhs.underbar == rhs.underbar &&
+ lhs.noun == rhs.noun &&
+ lhs.number == rhs.number;
}
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);
}
ost << _(GUISizeNames[size()]) << ", ";
if (color() != LColor::inherit)
ost << lcolor.getGUIName(color()) << ", ";
- if (emph() != INHERIT)
- ost << _("Emphasis ")
- << _(GUIMiscNames[emph()]) << ", ";
- if (underbar() != INHERIT)
- ost << _("Underline ")
- << _(GUIMiscNames[underbar()]) << ", ";
- if (noun() != INHERIT)
+ if (emph() != INHERIT) {
+#if USE_BOOST_FORMAT
+ ost << boost::format(_("Emphasis %1$s, "))
+ % _(GUIMiscNames[emph()]);
+#else
+ ost << _("Emphasis ") << _(GUIMiscNames[emph()]) << ", ";
+#endif
+ }
+ if (underbar() != INHERIT) {
+#if USE_BOOST_FORMAT
+ ost << boost::format(_("Underline %1$s, "))
+ % _(GUIMiscNames[underbar()]);
+#else
+ ost << _("Underline ") << _(GUIMiscNames[underbar()]) << ", ";
+#endif
+ }
+ if (noun() != INHERIT) {
+#if USE_BOOST_FORMAT
+ ost << boost::format(_("Noun %1$s, "))
+ % _(GUIMiscNames[noun()]);
+#else
ost << _("Noun ") << _(GUIMiscNames[noun()]) << ", ";
+#endif
+ }
if (bits == inherit)
ost << _("Default") << ", ";
- if (!params || (language() != params->language))
+ if (!params || (language() != params->language)) {
+#if USE_BOOST_FORMAT
+ ost << boost::format(_("Language: %1$s, "))
+ % _(language()->display());
+#else
ost << _("Language: ") << _(language()->display()) << ", ";
- if (number() != OFF)
+#endif
+ }
+ if (number() != OFF) {
+#if USE_BOOST_FORMAT
+ ost << boost::format(_(" Number %1$s"))
+ % _(GUIMiscNames[number()]);
+#else
ost << _(" Number ") << _(GUIMiscNames[number()]);
+#endif
+ }
- string buf(ost.str().c_str());
- buf = strip(buf, ' ');
- buf = strip(buf, ',');
+ string const buf = rtrim(STRCONV(ost.str()), ", ");
return buf;
}
// Set family according to lyx format string
LyXFont & LyXFont::setLyXFamily(string const & fam)
{
- string const s = lowercase(fam);
+ string const s = ascii_lowercase(fam);
int i = 0;
while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error") ++i;
// Set series according to lyx format string
LyXFont & LyXFont::setLyXSeries(string const & ser)
{
- string const s = lowercase(ser);
+ string const s = ascii_lowercase(ser);
int i = 0;
while (s != LyXSeriesNames[i] && LyXSeriesNames[i] != "error") ++i;
// Set shape according to lyx format string
LyXFont & LyXFont::setLyXShape(string const & sha)
{
- string const s = lowercase(sha);
+ string const s = ascii_lowercase(sha);
int i = 0;
while (s != LyXShapeNames[i] && LyXShapeNames[i] != "error") ++i;
// Set size according to lyx format string
LyXFont & LyXFont::setLyXSize(string const & siz)
{
- string const s = lowercase(siz);
+ string const s = ascii_lowercase(siz);
int i = 0;
while (s != LyXSizeNames[i] && LyXSizeNames[i] != "error") ++i;
if (s == LyXSizeNames[i]) {
// Set size according to lyx format string
LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz)
{
- string const s = lowercase(siz);
+ string const s = ascii_lowercase(siz);
int i = 0;
while (s != LyXMiscNames[i] && LyXMiscNames[i] != "error") ++i;
if (s == LyXMiscNames[i])
bool finished = false;
while (!finished && lex.isOK() && !error) {
lex.next();
- string const tok = lowercase(lex.getString());
+ string const tok = ascii_lowercase(lex.getString());
if (tok.empty()) {
continue;
setLyXSize(ttok);
} else if (tok == "misc") {
lex.next();
- string const ttok = lowercase(lex.getString());
+ string const ttok = ascii_lowercase(lex.getString());
if (ttok == "no_bar") {
setUnderbar(OFF);
/// 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";
bool env = false;
if (language()->babel() != base.language()->babel() &&
- language()->babel() != prev.language()->babel()) {
+ language() != prev.language()) {
if (isRightToLeft() != prev.isRightToLeft()) {
if (isRightToLeft()) {
os << "\\R{";
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;
}
projects / lyx.git / blobdiff