]> git.lyx.org Git - lyx.git/blobdiff - src/lyxfont.C
fix "make dist" target
[lyx.git] / src / lyxfont.C
index 86d7939f17ab11f3f8b4eff6795c29817e6deb26..e9b8aa8a42483015ecf1ce698b84dbc380f943ae 100644 (file)
 
 #include <config.h>
 #include <clocale>
+#include <cctype>
 
 #ifdef __GNUG__
-#pragma implementation "lyxfont.h"
+#pragma implementation
 #endif
 
-#include <cctype>
 
 #include "gettext.h"
 #include "lyxfont.h"
@@ -33,27 +33,24 @@ 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") };
 
@@ -61,49 +58,43 @@ char const * GUIMiscNames[5] =
 //
 // 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,
@@ -113,8 +104,10 @@ LyXFont::FontBits LyXFont::sane = {
        OFF,
        OFF,
        OFF,
+       OFF,
        OFF };
 
+// Initialize static member
 LyXFont::FontBits LyXFont::inherit = {
        INHERIT_FAMILY,
        INHERIT_SERIES,
@@ -124,8 +117,10 @@ LyXFont::FontBits LyXFont::inherit = {
        INHERIT,
        INHERIT,
        INHERIT,
-       INHERIT };
+       INHERIT,
+       OFF };
 
+// Initialize static member
 LyXFont::FontBits LyXFont::ignore = {
        IGNORE_FAMILY,
        IGNORE_SERIES,
@@ -135,20 +130,22 @@ LyXFont::FontBits LyXFont::ignore = {
        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;
 }
 
 
@@ -158,6 +155,155 @@ bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const
 }
 
 
+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;
+}
+
+
+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() 
 {
@@ -192,7 +338,7 @@ 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;
@@ -245,7 +391,7 @@ LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont,
 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());
@@ -268,7 +414,7 @@ void LyXFont::update(LyXFont const & newfont,
                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());
@@ -279,8 +425,6 @@ void LyXFont::update(LyXFont const & newfont,
                        incSize();
                else if (newfont.size() == DECREASE_SIZE)
                        decSize();
-               else if (newfont.size() == size() && toggleall)
-                       setSize(INHERIT_SIZE); // toggle 'back'
                else
                        setSize(newfont.size());
        }
@@ -365,7 +509,6 @@ LyXFont & LyXFont::realize(LyXFont const & tmplt)
        if (bits.color == LColor::inherit) {
                bits.color = tmplt.bits.color;
        }
-
        return *this;
 }
 
@@ -422,7 +565,7 @@ string const LyXFont::stateText(BufferParams * params) const
 // 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;
@@ -438,7 +581,7 @@ LyXFont & LyXFont::setLyXFamily(string const & fam)
 // 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;
@@ -454,7 +597,7 @@ LyXFont & LyXFont::setLyXSeries(string const & ser)
 // 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;
@@ -470,7 +613,7 @@ LyXFont & LyXFont::setLyXShape(string const & sha)
 // 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]) {
@@ -485,7 +628,7 @@ LyXFont & LyXFont::setLyXSize(string const & siz)
 // 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])
@@ -504,18 +647,6 @@ LyXFont & LyXFont::setLyXColor(string const & col)
 }
 
 
-/// 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 const LyXFont::latexSize() const
 {
@@ -531,7 +662,7 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
        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;
@@ -539,54 +670,54 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
                        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;
@@ -689,8 +820,8 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
                                count += 3;
                        }
                } else {
-                       string tmp = '{' + 
-                               subst(lyxrc.language_command_begin,
+                       string const tmp =
+                               subst(lyxrc.language_command_local,
                                      "$$lang", language()->babel());
                        os << tmp;
                        count += tmp.length();