/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team.
*
#include "lyxrc.h"
#include "lyxlex.h"
#include "language.h"
-#include "FontLoader.h"
#include "support/lstrings.h"
#include "bufferparams.h" // stateText
namespace {
-char const * GUIFamilyNames[12] =
+char const * GUIFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
{ N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"),
- "cmr", "cmsy", "cmm", "cmex", "msa", "msb",
+ "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak",
N_("Inherit"), N_("Ignore") };
-char const * GUISeriesNames[4] =
+char const * GUISeriesNames[4] =
{ N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") };
-char const * GUIShapeNames[6] =
+char const * GUIShapeNames[6] =
{ N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"),
N_("Ignore") };
-char const * GUISizeNames[14] =
+char const * GUISizeNames[14] =
{ N_("Tiny"), N_("Smallest"), N_("Smaller"), N_("Small"), N_("Normal"), N_("Large"),
- N_("Larger"), N_("Largest"), N_("Huge"), N_("Huger"), N_("Increase"), N_("Decrease"),
+ N_("Larger"), N_("Largest"), N_("Huge"), N_("Huger"), N_("Increase"), N_("Decrease"),
N_("Inherit"), N_("Ignore") };
-
-char const * GUIMiscNames[5] =
+
+char const * GUIMiscNames[5] =
{ N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") };
//
// Strings used to read and write .lyx format files
//
-char const * LyXFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
+char const * LyXFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
{ "roman", "sans", "typewriter", "symbol",
"cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak",
"default", "error" };
-char const * LyXSeriesNames[4] =
+char const * LyXSeriesNames[4] =
{ "medium", "bold", "default", "error" };
-char const * LyXShapeNames[6] =
+char const * LyXShapeNames[6] =
{ "up", "italic", "slanted", "smallcaps", "default", "error" };
-char const * LyXSizeNames[14] =
+char const * LyXSizeNames[14] =
{ "tiny", "scriptsize", "footnotesize", "small", "normal", "large",
- "larger", "largest", "huge", "giant",
+ "larger", "largest", "huge", "giant",
"increase", "decrease", "default", "error" };
-char const * LyXMiscNames[5] =
+char const * LyXMiscNames[5] =
{ "off", "on", "toggle", "default", "error" };
//
// Strings used to write LaTeX files
//
-char const * LaTeXFamilyNames[6] =
+char const * LaTeXFamilyNames[6] =
{ "textrm", "textsf", "texttt", "error1", "error2", "error3" };
-char const * LaTeXSeriesNames[4] =
+char const * LaTeXSeriesNames[4] =
{ "textmd", "textbf", "error4", "error5" };
-char const * LaTeXShapeNames[6] =
+char const * LaTeXShapeNames[6] =
{ "textup", "textit", "textsl", "textsc", "error6", "error7" };
-char const * LaTeXSizeNames[14] =
+char const * LaTeXSizeNames[14] =
{ "tiny", "scriptsize", "footnotesize", "small", "normalsize", "large",
"Large", "LARGE", "huge", "Huge", "error8", "error9", "error10", "error11" };
IGNORE };
-bool LyXFont::FontBits::operator==(LyXFont::FontBits const & fb1) const
-{
- 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
+bool operator==(LyXFont::FontBits const & lhs,
+ LyXFont::FontBits const & rhs)
{
- 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;
}
}
-LColor::color LyXFont::color() const
+LColor::color LyXFont::color() const
{
return bits.color;
}
-Language const * LyXFont::language() const
+Language const * LyXFont::language() const
{
return lang;
}
-LyXFont::FONT_MISC_STATE LyXFont::number() const
+LyXFont::FONT_MISC_STATE LyXFont::number() const
{
return bits.number;
}
-bool LyXFont::isRightToLeft() const
+bool LyXFont::isRightToLeft() const
{
return lang->RightToLeft();
}
-bool LyXFont::isVisibleRightToLeft() const
+bool LyXFont::isVisibleRightToLeft() const
{
return (lang->RightToLeft() &&
number() != ON);
/// Decreases font size by one
-LyXFont & LyXFont::decSize()
+LyXFont & LyXFont::decSize()
{
switch (size()) {
case SIZE_HUGER: setSize(SIZE_HUGE); break;
/// Increases font size by one
-LyXFont & LyXFont::incSize()
+LyXFont & LyXFont::incSize()
{
switch (size()) {
case SIZE_HUGER: break;
/// Updates a misc setting according to request
-LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont,
+LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont,
FONT_MISC_STATE org)
{
if (newfont == TOGGLE) {
}
} else if (newfont == IGNORE)
return org;
- else
+ else
return newfont;
}
/// Updates font settings according to request
-void LyXFont::update(LyXFont const & newfont,
+void LyXFont::update(LyXFont const & newfont,
Language const * document_language,
bool toggleall)
{
case INHERIT_SERIES:
setSeries(newfont.series());
break;
- case IGNORE_SERIES:
+ case IGNORE_SERIES:
break;
}
setEmph(setMisc(newfont.emph(), emph()));
setUnderbar(setMisc(newfont.underbar(), underbar()));
setNoun(setMisc(newfont.noun(), noun()));
-
+
setNumber(setMisc(newfont.number(), number()));
if (newfont.language() == language() && toggleall)
if (language() == document_language)
else
#ifndef INHERIT_LANGUAGE
setLanguage(document_language);
-#else
+#else
setLanguage(inherit_language);
#endif
else if (newfont.language() != ignore_language)
bits = tmplt.bits;
return *this;
}
-
+
if (bits.family == INHERIT_FAMILY) {
bits.family = tmplt.bits.family;
}
{
return (family() != INHERIT_FAMILY && series() != INHERIT_SERIES &&
shape() != INHERIT_SHAPE && size() != INHERIT_SIZE &&
- emph() != INHERIT && underbar() != INHERIT &&
+ emph() != INHERIT && underbar() != INHERIT &&
noun() != INHERIT &&
#ifdef INHERIT_LANGUAGE
language() != inherit_language &&
/// 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,
+ Language const * doclang,
#endif
ostream & os) const
{
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{";
LyXFont f = *this;
f.reduce(base);
-
+
if (f.family() != INHERIT_FAMILY) {
os << '\\'
<< LaTeXFamilyNames[f.family()]
// Returns number of chars written
// This one corresponds to latexWriteStartChanges(). (Asger)
int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
- LyXFont const & next) const
+ LyXFont const & next) const
{
int count = 0;
bool env = false;