-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+/**
+ * \file src/lyxfont.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * ====================================================== */
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author André Pönitz
+ * \author Dekel Tsur
+ *
+ * Full author contact details are available in file CREDITS.
+ */
#include <config.h>
-#include <clocale>
-
-#ifdef __GNUG__
-#pragma implementation "lyxfont.h"
-#endif
-
-#include <cctype>
-#include "gettext.h"
#include "lyxfont.h"
+
+#include "bufferparams.h" // stateText
#include "debug.h"
-#include "lyxrc.h"
+#include "gettext.h"
+#include "language.h"
+#include "LColor.h"
#include "lyxlex.h"
-#include "FontLoader.h"
+#include "lyxrc.h"
+
#include "support/lstrings.h"
+#include <sstream>
+
+using lyx::support::ascii_lowercase;
+using lyx::support::bformat;
+using lyx::support::rtrim;
+using lyx::support::subst;
-// The global fontloader
-FontLoader fontloader;
+using std::endl;
+using std::string;
+using std::ostream;
+using std::ostringstream;
+
+#ifndef CXX_GLOBAL_CSTD
+using std::strlen;
+#endif
//
// Names for the GUI
//
-string const GUIFamilyNames[6] =
-{ N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"), N_("Inherit"),
- N_("Ignore") };
-
-string const GUISeriesNames[4] =
+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", "wasy",
+ N_("Inherit"), N_("Ignore") };
+
+char const * GUISeriesNames[4] =
{ N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") };
-string const GUIShapeNames[6] =
+char const * GUIShapeNames[6] =
{ N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"),
N_("Ignore") };
-string 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") };
-
-string const lGUISizeNames[15] =
-{ 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"), string() };
-
-string 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
//
-string const LyXFamilyNames[6] =
-{ "roman", "sans", "typewriter", "symbol", "default", "error" };
-
-string const LyXSeriesNames[4] =
+char const * LyXFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
+{ "roman", "sans", "typewriter", "symbol",
+ "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy",
+ "default", "error" };
+
+char const * LyXSeriesNames[4] =
{ "medium", "bold", "default", "error" };
-
-string const LyXShapeNames[6] =
+
+char const * LyXShapeNames[6] =
{ "up", "italic", "slanted", "smallcaps", "default", "error" };
-
-string const LyXSizeNames[14] =
+
+char const * LyXSizeNames[14] =
{ "tiny", "scriptsize", "footnotesize", "small", "normal", "large",
- "larger", "largest", "huge", "giant",
- "increase-error", "decrease-error", "default", "error" };
+ "larger", "largest", "huge", "giant",
+ "increase", "decrease", "default", "error" };
-string const LyXMiscNames[12] =
+char const * LyXMiscNames[5] =
{ "off", "on", "toggle", "default", "error" };
//
// Strings used to write LaTeX files
//
-
-string const LaTeXFamilyNames[6] =
+char const * LaTeXFamilyNames[6] =
{ "textrm", "textsf", "texttt", "error1", "error2", "error3" };
-
-string const LaTeXSeriesNames[4] =
+
+char const * LaTeXSeriesNames[4] =
{ "textmd", "textbf", "error4", "error5" };
-
-string const LaTeXShapeNames[6] =
+
+char const * LaTeXShapeNames[6] =
{ "textup", "textit", "textsl", "textsc", "error6", "error7" };
-
-string const LaTeXSizeNames[14] =
+
+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 };
+// Initialize static member
LyXFont::FontBits LyXFont::inherit = {
INHERIT_FAMILY,
INHERIT_SERIES,
INHERIT,
INHERIT,
INHERIT,
- INHERIT };
+ OFF };
+// Initialize static member
LyXFont::FontBits LyXFont::ignore = {
IGNORE_FAMILY,
IGNORE_SERIES,
IGNORE };
+bool operator==(LyXFont::FontBits const & lhs,
+ LyXFont::FontBits const & rhs)
+{
+ 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()
+ : 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_MISC_STATE LyXFont::underbar() const
+{
+ return bits.underbar;
+}
+
+
+LColor_color LyXFont::color() const
+{
+ return LColor::color(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() &&
+ number() != ON);
+}
+
+
+void LyXFont::setFamily(LyXFont::FONT_FAMILY f)
+{
+ bits.family = f;
+}
+
+
+void LyXFont::setSeries(LyXFont::FONT_SERIES s)
+{
+ bits.series = s;
+}
+
+
+void LyXFont::setShape(LyXFont::FONT_SHAPE s)
+{
+ bits.shape = s;
+}
+
+
+void LyXFont::setSize(LyXFont::FONT_SIZE s)
+{
+ bits.size = s;
+}
+
+
+void LyXFont::setEmph(LyXFont::FONT_MISC_STATE e)
+{
+ bits.emph = e;
+}
+
+
+void LyXFont::setUnderbar(LyXFont::FONT_MISC_STATE u)
+{
+ bits.underbar = u;
+}
+
+
+void LyXFont::setNoun(LyXFont::FONT_MISC_STATE n)
+{
+ bits.noun = n;
+}
+
+
+void LyXFont::setColor(LColor_color c)
+{
+ bits.color = int(c);
+}
+
+
+void LyXFont::setLanguage(Language const * l)
+{
+ lang = l;
+}
+
+
+void LyXFont::setNumber(LyXFont::FONT_MISC_STATE n)
+{
+ bits.number = n;
+}
+
+
/// 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()) {
+ switch (size()) {
case SIZE_HUGER: break;
case SIZE_HUGE: setSize(SIZE_HUGER); break;
case SIZE_LARGEST: setSize(SIZE_HUGE); 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,
- Language const * document_language, bool toggleall)
+ 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());
case INHERIT_SERIES:
setSeries(newfont.series());
break;
- case IGNORE_SERIES:
+ case IGNORE_SERIES:
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());
}
setEmph(setMisc(newfont.emph(), emph()));
setUnderbar(setMisc(newfont.underbar(), underbar()));
setNoun(setMisc(newfont.noun(), noun()));
- setLatex(setMisc(newfont.latex(), latex()));
-
- if (newfont.language() != ignore_language)
- if (language() == newfont.language())
- if (language() == document_language)
- setLanguage(default_language);
- else
- setLanguage(document_language);
+
+ setNumber(setMisc(newfont.number(), number()));
+ if (newfont.language() == language() && toggleall)
+ if (language() == document_language)
+ setLanguage(default_language);
else
- setLanguage(newfont.language());
+ setLanguage(document_language);
+ else if (newfont.language() != ignore_language)
+ setLanguage(newfont.language());
if (newfont.color() == color() && toggleall)
setColor(LColor::inherit); // toggle 'back'
setUnderbar(INHERIT);
if (noun() == tmplt.noun())
setNoun(INHERIT);
- if (latex() == tmplt.latex())
- setLatex(INHERIT);
if (color() == tmplt.color())
setColor(LColor::inherit);
}
bits = tmplt.bits;
return *this;
}
-
+
if (bits.family == INHERIT_FAMILY) {
bits.family = tmplt.bits.family;
}
if (bits.noun == INHERIT) {
bits.noun = tmplt.bits.noun;
}
- if (bits.latex == INHERIT) {
- bits.latex = tmplt.bits.latex;
- }
if (bits.color == LColor::inherit) {
bits.color = tmplt.bits.color;
}
-
return *this;
}
{
return (family() != INHERIT_FAMILY && series() != INHERIT_SERIES &&
shape() != INHERIT_SHAPE && size() != INHERIT_SIZE &&
- emph() != INHERIT && underbar() != INHERIT &&
- noun() != INHERIT && latex() != INHERIT &&
+ emph() != INHERIT && underbar() != INHERIT &&
+ noun() != INHERIT &&
color() != LColor::inherit);
}
/// Build GUI description of font state
-string LyXFont::stateText() const
+string const LyXFont::stateText(BufferParams * params) const
{
- string buf;
+ ostringstream os;
if (family() != INHERIT_FAMILY)
- buf += string(_(GUIFamilyNames[family()].c_str())) + ", ";
+ os << _(GUIFamilyNames[family()]) << ", ";
if (series() != INHERIT_SERIES)
- buf += string(_(GUISeriesNames[series()].c_str())) + ", ";
+ os << _(GUISeriesNames[series()]) << ", ";
if (shape() != INHERIT_SHAPE)
- buf += string(_(GUIShapeNames[shape()].c_str())) + ", ";
+ os << _(GUIShapeNames[shape()]) << ", ";
if (size() != INHERIT_SIZE)
- buf += string(_(GUISizeNames[size()].c_str())) + ", ";
+ os << _(GUISizeNames[size()]) << ", ";
if (color() != LColor::inherit)
- buf += lcolor.getGUIName(color()) + ", ";
+ os << lcolor.getGUIName(color()) << ", ";
if (emph() != INHERIT)
- buf += string(_("Emphasis ")) + _(GUIMiscNames[emph()].c_str()) + ", ";
+ os << bformat(_("Emphasis %1$s, "), _(GUIMiscNames[emph()]));
if (underbar() != INHERIT)
- buf += string(_("Underline ")) + _(GUIMiscNames[underbar()].c_str()) + ", ";
+ os << bformat(_("Underline %1$s, "), _(GUIMiscNames[underbar()]));
if (noun() != INHERIT)
- buf += string(_("Noun ")) + _(GUIMiscNames[noun()].c_str()) + ", ";
- if (latex() != INHERIT)
- buf += string(_("Latex ")) + _(GUIMiscNames[latex()].c_str()) + ", ";
- if (buf.empty())
- buf = _("Default");
- buf = strip(buf, ' ');
- buf = strip(buf, ',');
- buf += " " + string(_("Language: ")) + _(language()->display.c_str());
- return buf;
+ os << bformat(_("Noun %1$s, "), _(GUIMiscNames[noun()]));
+ if (bits == inherit)
+ os << _("Default") << ", ";
+ if (!params || (language() != params->language))
+ os << bformat(_("Language: %1$s, "), _(language()->display()));
+ if (number() != OFF)
+ os << bformat(_(" Number %1$s"), _(GUIMiscNames[number()]));
+ return rtrim(os.str(), ", ");
}
// Set family according to lyx format string
LyXFont & LyXFont::setLyXFamily(string const & fam)
{
- string s = lowercase(fam);
+ 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;
// Set series according to lyx format string
LyXFont & LyXFont::setLyXSeries(string const & ser)
{
- string 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 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 s = lowercase(siz);
+ string const s = ascii_lowercase(siz);
int i = 0;
while (s != LyXSizeNames[i] && LyXSizeNames[i] != "error") ++i;
if (s == LyXSizeNames[i]) {
return *this;
}
+
// Set size according to lyx format string
LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz)
{
- string s = lowercase(siz);
- int i= 0;
+ string const s = ascii_lowercase(siz);
+ int i = 0;
while (s != LyXMiscNames[i] && LyXMiscNames[i] != "error") ++i;
if (s == LyXMiscNames[i])
return FONT_MISC_STATE(i);
return OFF;
}
+
/// Sets color after LyX text format
LyXFont & LyXFont::setLyXColor(string const & col)
{
}
-/// Sets size after GUI name
-LyXFont & LyXFont::setGUISize(string const & siz)
-{
-#warning 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 error = false;
bool finished = false;
- while (!finished && lex.IsOK() && !error) {
+ while (!finished && lex.isOK() && !error) {
lex.next();
- string tok = lowercase(lex.GetString());
+ string const tok = ascii_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);
- } else if (tok == "latex") {
- lex.next();
- string tok = lowercase(lex.GetString());
-
- if (tok == "no_latex") {
- setLatex(OFF);
- } else if (tok == "latex") {
- setLatex(ON);
- } else {
- lex.printError("Illegal LaTeX type`$$Token'");
- }
+ string const ttok = lex.getString();
+ setLyXSize(ttok);
} else if (tok == "misc") {
lex.next();
- string tok = lowercase(lex.GetString());
+ string const ttok = ascii_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;
/// Writes the changes from this font to orgfont in .lyx format in file
-void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const
+void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
+ ostream & os) const
{
os << "\n";
if (orgfont.family() != family()) {
- os << "\\family " << LyXFamilyNames[family()] << " \n";
+ os << "\\family " << LyXFamilyNames[family()] << "\n";
}
if (orgfont.series() != series()) {
- os << "\\series " << LyXSeriesNames[series()] << " \n";
+ os << "\\series " << LyXSeriesNames[series()] << "\n";
}
if (orgfont.shape() != shape()) {
- os << "\\shape " << LyXShapeNames[shape()] << " \n";
+ os << "\\shape " << LyXShapeNames[shape()] << "\n";
}
if (orgfont.size() != size()) {
- os << "\\size " << LyXSizeNames[size()] << " \n";
+ os << "\\size " << LyXSizeNames[size()] << "\n";
}
if (orgfont.emph() != emph()) {
- os << "\\emph " << LyXMiscNames[emph()] << " \n";
+ 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()) {
- case OFF: os << "\\bar no \n"; break;
- case ON: os << "\\bar under \n"; break;
+ case OFF: os << "\\bar no\n"; break;
+ case ON: os << "\\bar under\n"; break;
case TOGGLE: lyxerr << "LyXFont::lyxWriteFontChanges: "
"TOGGLE should not appear here!"
<< endl;
break;
- case INHERIT: os << "\\bar default \n"; break;
+ case INHERIT: os << "\\bar default\n"; break;
case IGNORE: lyxerr << "LyXFont::lyxWriteFontChanges: "
"IGNORE should not appear here!"
<< endl;
}
}
if (orgfont.noun() != noun()) {
- os << "\\noun " << LyXMiscNames[noun()] << " \n";
- }
- if (orgfont.latex() != latex()) {
- // This is only for backwards compatibility
- switch (latex()) {
- case OFF: os << "\\latex no_latex \n"; break;
- case ON: os << "\\latex latex \n"; break;
- case TOGGLE: lyxerr << "LyXFont::lyxWriteFontChanges: "
- "TOGGLE should not appear here!"
- << endl;
- break;
- case INHERIT: os << "\\latex default \n"; break;
- case IGNORE: lyxerr << "LyXFont::lyxWriteFontChanges: "
- "IGNORE should not appear here!"
- << endl;
- break;
- }
+ os << "\\noun " << LyXMiscNames[noun()] << "\n";
}
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 << endl;
+ os << "\\lang " << language()->lang() << "\n";
else
os << "\\lang unknown\n";
}
int count = 0;
bool env = false;
- if (language() != prev.language()) {
+ if (language()->babel() != base.language()->babel() &&
+ language() != prev.language()) {
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);
-
+
if (f.family() != INHERIT_FAMILY) {
os << '\\'
<< LaTeXFamilyNames[f.family()]
<< '{';
- count += LaTeXFamilyNames[f.family()].length() + 2;
+ count += strlen(LaTeXFamilyNames[f.family()]) + 2;
env = true; //We have opened a new environment
}
if (f.series() != INHERIT_SERIES) {
os << '\\'
<< LaTeXSeriesNames[f.series()]
<< '{';
- count += LaTeXSeriesNames[f.series()].length() + 2;
+ count += strlen(LaTeXSeriesNames[f.series()]) + 2;
env = true; //We have opened a new environment
}
if (f.shape() != INHERIT_SHAPE) {
os << '\\'
<< LaTeXShapeNames[f.shape()]
<< '{';
- count += LaTeXShapeNames[f.shape()].length() + 2;
+ 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())
<< "}{";
// \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) {
os << '\\'
<< LaTeXSizeNames[f.size()]
<< ' ';
- count += LaTeXSizeNames[f.size()].length() + 2;
+ count += strlen(LaTeXSizeNames[f.size()]) + 2;
}
return count;
}
int count = 0;
bool env = false;
- if (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)
+ // 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 << '}';
++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;
}
-LColor::color LyXFont::realColor() const
+LColor_color LyXFont::realColor() const
{
- if (latex() == ON)
- return LColor::latex;
if (color() == LColor::none)
return LColor::foreground;
return color();
}
-XFontStruct * LyXFont::getXFontstruct() const
-{
- return fontloader.load(family(), series(), realShape(), size());
-}
-
-
-int LyXFont::maxAscent() const
-{
- return getXFontstruct()->ascent;
-}
-
-
-int LyXFont::maxDescent() const
-{
- return getXFontstruct()->descent;
-}
-
-
-int LyXFont::ascent(char c) const
-{
- XFontStruct * finfo = getXFontstruct();
- unsigned int uc = static_cast<unsigned char>(c);
- if (finfo->per_char
- && uc >= finfo->min_char_or_byte2
- && uc <= finfo->max_char_or_byte2)
- return finfo->per_char[uc - finfo->min_char_or_byte2].ascent;
- else
- return finfo->ascent;
-}
-
-
-int LyXFont::descent(char c) const
-{
- XFontStruct * finfo = getXFontstruct();
- unsigned int uc = static_cast<unsigned char>(c);
- if (finfo->per_char
- && uc >= finfo->min_char_or_byte2
- && uc <= finfo->max_char_or_byte2)
- return finfo->per_char[uc - finfo->min_char_or_byte2].descent;
- else
- return finfo->descent;
-}
-
-
-int LyXFont::lbearing(char c) const
-{
- XFontStruct * finfo = getXFontstruct();
- unsigned int uc = static_cast<unsigned char>(c);
- if (finfo->per_char
- && uc >= finfo->min_char_or_byte2
- && uc <= finfo->max_char_or_byte2)
- return finfo->per_char[uc - finfo->min_char_or_byte2].lbearing;
- else
- return 0;
-}
-
-
-int LyXFont::rbearing(char c) const
-{
- XFontStruct * finfo = getXFontstruct();
- unsigned int uc = static_cast<unsigned char>(c);
- if (finfo->per_char
- && uc >= finfo->min_char_or_byte2
- && uc <= finfo->max_char_or_byte2)
- return finfo->per_char[uc - finfo->min_char_or_byte2].rbearing;
- else
- return width(c);
-}
-
-
-// Specialized after profiling. (Asger)
-int LyXFont::width(char c) const
+ostream & operator<<(ostream & os, LyXFont::FONT_MISC_STATE fms)
{
- if (realShape() != LyXFont::SMALLCAPS_SHAPE){
- return lyxrc.use_gui ? XTextWidth(getXFontstruct(), &c, 1) : 1;
- } else {
- return textWidth(&c, 1);
- }
+ return os << int(fms);
}
-int LyXFont::textWidth(char const * s, int n) const
-{
- if (!lyxrc.use_gui)
- return n;
-
- if (realShape() != LyXFont::SMALLCAPS_SHAPE){
- return XTextWidth(getXFontstruct(), s, n);
- } else {
- // emulate smallcaps since X doesn't support this
- unsigned int result = 0;
- char c;
- LyXFont smallfont = *this;
- smallfont.decSize();
- smallfont.decSize();
- smallfont.setShape(LyXFont::UP_SHAPE);
- for (int i = 0; i < n; ++i) {
- c = s[i];
- // when islower is a macro, the cast is needed (JMarc)
- if (islower(static_cast<unsigned char>(c))){
- c = toupper(c);
- result += XTextWidth(smallfont.getXFontstruct(), &c, 1);
- } else {
- result += XTextWidth(getXFontstruct(), &c, 1);
- }
- }
- return result;
- }
-}
-
-
-int LyXFont::stringWidth(string const & s) const
-{
- if (s.empty()) return 0;
- return textWidth(s.c_str(), s.length());
-}
-
-
-int LyXFont::signedStringWidth(string const & s) const
-{
- if (s.empty()) return 0;
- if (s.c_str()[0] == '-')
- return -textWidth(s.c_str()+1, s.length()-1);
- else
- return textWidth(s.c_str(), s.length());
-}
-
-
-int LyXFont::drawText(char const * s, int n, Pixmap,
- int, int x) const
-{
- if (realShape() != LyXFont::SMALLCAPS_SHAPE) {
- /* XDrawString(fl_display,
- pm,
- getGC(),
- x, baseline,
- s, n);
- XFlush(fl_display); */
- return XTextWidth(getXFontstruct(), s, n);
-
- } else {
- // emulate smallcaps since X doesn't support this
- char c;
- int sx = x;
- LyXFont smallfont = *this;
- smallfont.decSize();
- smallfont.decSize();
- smallfont.setShape(LyXFont::UP_SHAPE);
- for (int i = 0; i < n; ++i) {
- c = s[i];
- if (islower(static_cast<unsigned char>(c))){
- c = toupper(c);
- /* XDrawString(fl_display,
- pm,
- smallfont.getGC(),
- x, baseline,
- &c, 1); */
- x += XTextWidth(smallfont.getXFontstruct(),
- &c, 1);
- //XFlush(fl_display);
- } else {
- /* XDrawString(fl_display,
- pm,
- getGC(),
- x, baseline,
- &c, 1);*/
- x += XTextWidth(getXFontstruct(), &c, 1);
- //XFlush(fl_display);
- }
- }
- return x - sx;
- }
-}
-
-
-int LyXFont::drawString(string const & s, Pixmap pm, int baseline, int x) const
-{
- return drawText(s.c_str(), s.length(), pm, baseline, x);
-}
-
-
-bool LyXFont::equalExceptLatex(LyXFont const & f) const
-{
- LyXFont f1 = *this;
- f1.setLatex(f.latex());
- return f1 == f;
-}
-
-ostream & operator<<(ostream & o, LyXFont::FONT_MISC_STATE fms)
+std::ostream & operator<<(std::ostream & os, LyXFont const & font)
{
- return o << int(fms);
+ return os << "font:"
+ << " family " << font.bits.family
+ << " series " << font.bits.series
+ << " shape " << font.bits.shape
+ << " size " << font.bits.size
+ << " color " << font.bits.color
+ << " emph " << font.bits.emph
+ << " underbar " << font.bits.underbar
+ << " noun " << font.bits.noun
+ << " number " << font.bits.number
+ << " lang: " << (font.lang ? font.lang->lang() : 0);
}