#include <config.h>
#include <clocale>
+#include <cctype>
#ifdef __GNUG__
-#pragma implementation "lyxfont.h"
+#pragma implementation
#endif
-#include <cctype>
#include "gettext.h"
#include "lyxfont.h"
#include "lyxlex.h"
#include "FontLoader.h"
#include "support/lstrings.h"
+#include "bufferparams.h" // stateText
using std::ostream;
using std::endl;
// Names for the GUI
//
-static
+namespace {
+
char const * GUIFamilyNames[6] =
{ N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"), N_("Inherit"),
N_("Ignore") };
-static
char const * GUISeriesNames[4] =
{ N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") };
-static
char const * GUIShapeNames[6] =
{ N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"),
N_("Ignore") };
-static
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_("Inherit"), N_("Ignore") };
-static
char const * GUIMiscNames[5] =
{ N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") };
//
// Strings used to read and write .lyx format files
//
-static
char const * LyXFamilyNames[6] =
{ "roman", "sans", "typewriter", "symbol", "default", "error" };
-static
char const * LyXSeriesNames[4] =
{ "medium", "bold", "default", "error" };
-static
char const * LyXShapeNames[6] =
{ "up", "italic", "slanted", "smallcaps", "default", "error" };
-static
char const * LyXSizeNames[14] =
{ "tiny", "scriptsize", "footnotesize", "small", "normal", "large",
"larger", "largest", "huge", "giant",
"increase-error", "decrease-error", "default", "error" };
-static
char const * LyXMiscNames[5] =
{ "off", "on", "toggle", "default", "error" };
//
// Strings used to write LaTeX files
//
-static
char const * LaTeXFamilyNames[6] =
{ "textrm", "textsf", "texttt", "error1", "error2", "error3" };
-static
char const * LaTeXSeriesNames[4] =
{ "textmd", "textbf", "error4", "error5" };
-static
char const * LaTeXShapeNames[6] =
{ "textup", "textit", "textsl", "textsc", "error6", "error7" };
-static
char const * LaTeXSizeNames[14] =
{ "tiny", "scriptsize", "footnotesize", "small", "normalsize", "large",
"Large", "LARGE", "huge", "Huge", "error8", "error9", "error10", "error11" };
+} // namespace anon
+
+// Initialize static member
LyXFont::FontBits LyXFont::sane = {
ROMAN_FAMILY,
MEDIUM_SERIES,
OFF,
OFF,
OFF,
+ OFF,
OFF };
+// Initialize static member
LyXFont::FontBits LyXFont::inherit = {
INHERIT_FAMILY,
INHERIT_SERIES,
INHERIT,
INHERIT,
INHERIT,
- INHERIT };
+ INHERIT,
+ OFF };
+// Initialize static member
LyXFont::FontBits LyXFont::ignore = {
IGNORE_FAMILY,
IGNORE_SERIES,
IGNORE,
IGNORE,
IGNORE,
+ IGNORE,
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.latex == latex;
+ 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.latex == latex &&
+ fb1.number == number;
}
}
+LyXFont::LyXFont()
+{
+ bits = sane;
+ lang = default_language;
+}
+
+
+LyXFont::LyXFont(LyXFont::FONT_INIT1)
+{
+ bits = inherit;
+ lang = default_language;
+}
+
+
+LyXFont::LyXFont(LyXFont::FONT_INIT2)
+{
+ bits = ignore;
+ lang = ignore_language;
+}
+
+
+LyXFont::LyXFont(LyXFont::FONT_INIT3)
+{
+ bits = sane;
+ lang = default_language;
+}
+
+
+LyXFont::LyXFont(LyXFont::FONT_INIT1, Language const * l)
+{
+ bits = inherit;
+ lang = l;
+}
+
+
+LyXFont::LyXFont(LyXFont::FONT_INIT2, Language const * l)
+{
+ bits = ignore;
+ lang = l;
+}
+
+
+LyXFont::LyXFont(LyXFont::FONT_INIT3, Language const * l)
+{
+ bits = sane;
+ lang = l;
+}
+
+
+LyXFont::FONT_FAMILY LyXFont::family() const
+{
+ return bits.family;
+}
+
+
+LyXFont::FONT_SERIES LyXFont::series() const
+{
+ return bits.series;
+}
+
+
+LyXFont::FONT_SHAPE LyXFont::shape() const
+{
+ return bits.shape;
+}
+
+
+LyXFont::FONT_SIZE LyXFont::size() const
+{
+ return bits.size;
+}
+
+
+LyXFont::FONT_MISC_STATE LyXFont::emph() const
+{
+ return bits.emph;
+}
+
+
+LyXFont::FONT_MISC_STATE LyXFont::underbar() const
+{
+ return bits.underbar;
+}
+
+
+LyXFont::FONT_MISC_STATE LyXFont::noun() const
+{
+ return bits.noun;
+}
+
+
+LyXFont::FONT_MISC_STATE LyXFont::latex() const
+{
+ return bits.latex;
+}
+
+
+LColor::color LyXFont::color() const
+{
+ return bits.color;
+}
+
+
+Language const * LyXFont::language() const
+{
+ return lang;
+}
+
+
+LyXFont::FONT_MISC_STATE LyXFont::number() const
+{
+ return bits.number;
+}
+
+
+bool LyXFont::isRightToLeft() const
+{
+ return lang->RightToLeft();
+}
+
+
+bool LyXFont::isVisibleRightToLeft() const
+{
+ return (lang->RightToLeft() && latex() != ON && number() != ON);
+}
+
+
+LyXFont & LyXFont::setFamily(LyXFont::FONT_FAMILY f)
+{
+ bits.family = f;
+ return *this;
+}
+
+
+LyXFont & LyXFont::setSeries(LyXFont::FONT_SERIES s)
+{
+ bits.series = s;
+ return *this;
+}
+
+
+LyXFont & LyXFont::setShape(LyXFont::FONT_SHAPE s)
+{
+ bits.shape = s;
+ return *this;
+}
+
+
+LyXFont & LyXFont::setSize(LyXFont::FONT_SIZE s)
+{
+ bits.size = s;
+ return *this;
+}
+
+
+LyXFont & LyXFont::setEmph(LyXFont::FONT_MISC_STATE e)
+{
+ bits.emph = e;
+ return *this;
+}
+
+
+LyXFont & LyXFont::setUnderbar(LyXFont::FONT_MISC_STATE u)
+{
+ bits.underbar = u;
+ return *this;
+}
+
+
+LyXFont & LyXFont::setNoun(LyXFont::FONT_MISC_STATE n)
+{
+ bits.noun = n;
+ return *this;
+}
+
+
+LyXFont & LyXFont::setLatex(LyXFont::FONT_MISC_STATE l)
+{
+ bits.latex = l;
+ return *this;
+}
+
+
+LyXFont & LyXFont::setColor(LColor::color c)
+{
+ bits.color = c;
+ return *this;
+}
+
+
+LyXFont & LyXFont::setLanguage(Language const * l)
+{
+ lang = l;
+ return *this;
+}
+
+
+LyXFont & LyXFont::setNumber(LyXFont::FONT_MISC_STATE n)
+{
+ bits.number = n;
+ return *this;
+}
+
+
/// Decreases font size by one
LyXFont & LyXFont::decSize()
{
/// Increases font size by one
LyXFont & LyXFont::incSize()
{
- switch(size()) {
+ switch (size()) {
case SIZE_HUGER: break;
case SIZE_HUGE: setSize(SIZE_HUGER); break;
case SIZE_LARGEST: setSize(SIZE_HUGE); break;
void LyXFont::update(LyXFont const & newfont,
Language const * document_language, bool toggleall)
{
- if(newfont.family() == family() && toggleall)
+ if (newfont.family() == family() && toggleall)
setFamily(INHERIT_FAMILY); // toggle 'back'
else if (newfont.family() != IGNORE_FAMILY)
setFamily(newfont.family());
break;
}
- if(newfont.shape() == shape() && toggleall)
+ if (newfont.shape() == shape() && toggleall)
setShape(INHERIT_SHAPE); // toggle 'back'
else if (newfont.shape() != IGNORE_SHAPE)
setShape(newfont.shape());
incSize();
else if (newfont.size() == DECREASE_SIZE)
decSize();
- else if (newfont.size() == size() && toggleall)
- setSize(INHERIT_SIZE); // toggle 'back'
else
setSize(newfont.size());
}
setNoun(setMisc(newfont.noun(), noun()));
setLatex(setMisc(newfont.latex(), latex()));
+ setNumber(setMisc(newfont.number(), number()));
if (newfont.language() == language() && toggleall)
if (language() == document_language)
setLanguage(default_language);
if (bits.color == LColor::inherit) {
bits.color = tmplt.bits.color;
}
-
return *this;
}
/// Build GUI description of font state
-string LyXFont::stateText() const
+string const LyXFont::stateText(BufferParams * params) const
{
-#ifdef HAVE_SSTREAM
std::ostringstream ost;
-#else
- char str[1024];
- ostrstream ost(str, 1024);
-#endif
if (family() != INHERIT_FAMILY)
ost << _(GUIFamilyNames[family()]) << ", ";
if (series() != INHERIT_SERIES)
ost << _("Noun ") << _(GUIMiscNames[noun()]) << ", ";
if (latex() != INHERIT)
ost << _("Latex ") << _(GUIMiscNames[latex()]) << ", ";
- //if (buf.empty())
- // ost << _("Default");
- unsigned int opos = ost.tellp();
- //lyxerr << "Opos: " << opos << endl;
- if (opos == 0 || opos == -1)
+ if (bits == inherit)
ost << _("Default") << ", ";
- ost << _("Language: ") << _(language()->display.c_str());
-#ifdef HAVE_SSTREAM
+ if (!params || (language() != params->language))
+ ost << _("Language: ") << _(language()->display()) << ", ";
+ if (number() != OFF)
+ ost << _(" Number ") << _(GUIMiscNames[number()]);
+
string buf(ost.str().c_str());
-#else
- ost << '\0';
- string buf(ost.str());
-#endif
buf = strip(buf, ' ');
buf = strip(buf, ',');
return buf;
// Set family according to lyx format string
LyXFont & LyXFont::setLyXFamily(string const & fam)
{
- string s = lowercase(fam);
+ string const s = 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 s = lowercase(ser);
+ string const s = 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 s = lowercase(sha);
+ string const s = 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 s = lowercase(siz);
+ string const s = 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 s = lowercase(siz);
+ string const s = lowercase(siz);
int i = 0;
while (s != LyXMiscNames[i] && LyXMiscNames[i] != "error") ++i;
if (s == LyXMiscNames[i])
}
-/// Sets size after GUI name
-LyXFont & LyXFont::setGUISize(string const & siz)
-{
- // CHECK this might be wrong.
- /// ??????
- // this is how it was how it was done in the lyx repository...
- // but this does not make sense.
- setColor(lcolor.getFromGUIName(siz));
- return *this;
-}
-
-
// Returns size in latex format
-string LyXFont::latexSize() const
+string const LyXFont::latexSize() const
{
return LaTeXSizeNames[size()];
}
bool finished = false;
while (!finished && lex.IsOK() && !error) {
lex.next();
- string tok = lowercase(lex.GetString());
+ string const tok = lowercase(lex.GetString());
if (tok.empty()) {
continue;
finished = true;
} else if (tok == "family") {
lex.next();
- string tok = lex.GetString();
- setLyXFamily(tok);
+ string const ttok = lex.GetString();
+ setLyXFamily(ttok);
} else if (tok == "series") {
lex.next();
- string tok = lex.GetString();
- setLyXSeries(tok);
+ string const ttok = lex.GetString();
+ setLyXSeries(ttok);
} else if (tok == "shape") {
lex.next();
- string tok = lex.GetString();
- setLyXShape(tok);
+ string const ttok = lex.GetString();
+ setLyXShape(ttok);
} else if (tok == "size") {
lex.next();
- string tok = lex.GetString();
- setLyXSize(tok);
+ string const ttok = lex.GetString();
+ setLyXSize(ttok);
} else if (tok == "latex") {
lex.next();
- string tok = lowercase(lex.GetString());
+ string const ttok = lowercase(lex.GetString());
- if (tok == "no_latex") {
+ if (ttok == "no_latex") {
setLatex(OFF);
- } else if (tok == "latex") {
+ } else if (ttok == "latex") {
setLatex(ON);
} else {
lex.printError("Illegal LaTeX type`$$Token'");
}
} else if (tok == "misc") {
lex.next();
- string tok = lowercase(lex.GetString());
+ string const ttok = lowercase(lex.GetString());
- if (tok == "no_bar") {
+ if (ttok == "no_bar") {
setUnderbar(OFF);
- } else if (tok == "no_emph") {
+ } else if (ttok == "no_emph") {
setEmph(OFF);
- } else if (tok == "no_noun") {
+ } else if (ttok == "no_noun") {
setNoun(OFF);
- } else if (tok == "emph") {
+ } else if (ttok == "emph") {
setEmph(ON);
- } else if (tok == "underbar") {
+ } else if (ttok == "underbar") {
setUnderbar(ON);
- } else if (tok == "noun") {
+ } else if (ttok == "noun") {
setNoun(ON);
} else {
lex.printError("Illegal misc type `$$Token´");
}
} else if (tok == "color") {
lex.next();
- string tok = lex.GetString();
- setLyXColor(tok);
+ string const ttok = lex.GetString();
+ setLyXColor(ttok);
} else {
lex.printError("Unknown tag `$$Token'");
error = true;
if (orgfont.emph() != emph()) {
os << "\\emph " << LyXMiscNames[emph()] << " \n";
}
+ if (orgfont.number() != number()) {
+ os << "\\numeric " << LyXMiscNames[number()] << " \n";
+ }
if (orgfont.underbar() != underbar()) {
// This is only for backwards compatibility
switch (underbar()) {
}
}
if (orgfont.color() != color()) {
- os << "\\color " << lcolor.getLyXName(color()) << "\n";
+ // 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.language() != language()) {
if (language())
- os << "\\lang " << language()->lang << "\n";
+ os << "\\lang " << language()->lang() << "\n";
else
os << "\\lang unknown\n";
}
int count = 0;
bool env = false;
- if (language() != base.language() && language() != prev.language()) {
+ if (language()->babel() != base.language()->babel() &&
+ language()->babel() != prev.language()->babel()) {
if (isRightToLeft() != prev.isRightToLeft()) {
if (isRightToLeft()) {
os << "\\R{";
count += 3;
- env = true; //We have opened a new environment
} else {
os << "\\L{";
count += 3;
- env = true; //We have opened a new environment
}
} else {
- string tmp = '{' +
- subst(lyxrc.language_command_begin,
- "$$lang", language()->lang);
+ string const tmp =
+ subst(lyxrc.language_command_local,
+ "$$lang", language()->babel());
os << tmp;
count += tmp.length();
- env = true; //We have opened a new environment
}
}
+ if (number() == ON && prev.number() != ON &&
+ language()->lang() == "hebrew") {
+ os << "{\\beginL ";
+ count += 9;
+ }
+
LyXFont f = *this;
f.reduce(base);
count += strlen(LaTeXShapeNames[f.shape()]) + 2;
env = true; //We have opened a new environment
}
- if (f.color() != LColor::inherit) {
+ if (f.color() != LColor::inherit && f.color() != LColor::ignore) {
os << "\\textcolor{"
<< lcolor.getLaTeXName(f.color())
<< "}{";
int count = 0;
bool env = false;
- if (language() != base.language() && language() != next.language()) {
- os << "}";
- ++count;
- env = true; // Size change need not bother about closing env.
- }
-
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)
+
if (f.family() != INHERIT_FAMILY) {
os << '}';
++count;
++count;
env = true; // Size change need not bother about closing env.
}
- if (f.color() != LColor::inherit) {
+ if (f.color() != LColor::inherit && f.color() != LColor::ignore) {
os << '}';
++count;
env = true; // Size change need not bother about closing env.
}
}
+ if (number() == ON && next.number() != ON &&
+ language()->lang() == "hebrew") {
+ os << "\\endL}";
+ count += 6;
+ }
+
+ if (language() != base.language() && language() != next.language()) {
+ os << "}";
+ ++count;
+ }
+
return count;
}
projects / lyx.git / blobdiff