#include "lyxlex.h"
#include "FontLoader.h"
#include "support/lstrings.h"
+#include "bufferparams.h" // stateText
+using std::ostream;
using std::endl;
-// The global fontloader
-FontLoader fontloader;
-
//
// Names for the GUI
//
N_("Larger"), N_("Largest"), N_("Huge"), N_("Huger"), N_("Increase"), N_("Decrease"),
N_("Inherit"), N_("Ignore") };
-//char 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() };
static
char const * GUIMiscNames[5] =
{ N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("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;
+}
+
+
+bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const
+{
+ return !(fb1 == *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());
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'
/// Build GUI description of font state
-string LyXFont::stateText() const
+string const LyXFont::stateText(BufferParams * params) const
{
-#ifdef HAVE_SSTREAM
- ostringstream ost;
-#else
- char str[1024];
- ostrstream ost(str, 1024);
-#endif
+ std::ostringstream ost;
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)
+ 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;
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;
+ 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()];
}
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() != 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 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() != 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;
}
}
-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
-{
- if (realShape() != LyXFont::SMALLCAPS_SHAPE){
- return lyxrc.use_gui ? XTextWidth(getXFontstruct(), &c, 1) : 1;
- } else {
- return textWidth(&c, 1);
- }
-}
-
-
-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) {
- 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);
- x += XTextWidth(smallfont.getXFontstruct(),
- &c, 1);
- } else {
- x += XTextWidth(getXFontstruct(), &c, 1);
- }
- }
- 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;
projects / lyx.git / blobdiff