Extend the navigate menu to child docs

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index fe884cdc2f308adb5131ee3d685363087d83d5cd..af6cc0bf7a056b40f31ab98825c44ddcf3270037 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -26,12 +26,13 @@
 
 #include "support/lstrings.h"
 
-#include <sstream>
 
-using lyx::support::ascii_lowercase;
-using lyx::support::bformat;
-using lyx::support::rtrim;
-using lyx::support::subst;
+namespace lyx {
+
+using support::ascii_lowercase;
+using support::bformat;
+using support::rtrim;
+using support::subst;
 
 using std::endl;
 using std::string;
@@ -497,31 +498,32 @@ string const LyXFont::stateText(BufferParams * params) const
 {
        ostringstream os;
        if (family() != INHERIT_FAMILY)
-               os << lyx::to_utf8(_(GUIFamilyNames[family()])) << ", ";
+               os << to_utf8(_(GUIFamilyNames[family()])) << ", ";
        if (series() != INHERIT_SERIES)
-               os << lyx::to_utf8(_(GUISeriesNames[series()])) << ", ";
+               os << to_utf8(_(GUISeriesNames[series()])) << ", ";
        if (shape() != INHERIT_SHAPE)
-               os << lyx::to_utf8(_(GUIShapeNames[shape()])) << ", ";
+               os << to_utf8(_(GUIShapeNames[shape()])) << ", ";
        if (size() != INHERIT_SIZE)
-               os << lyx::to_utf8(_(GUISizeNames[size()])) << ", ";
+               os << to_utf8(_(GUISizeNames[size()])) << ", ";
        if (color() != LColor::inherit)
                os << lcolor.getGUIName(color()) << ", ";
        if (emph() != INHERIT)
-               os << bformat(lyx::to_utf8(_("Emphasis %1$s, ")),
-                             lyx::to_utf8(_(GUIMiscNames[emph()])));
+               os << to_utf8(bformat(_("Emphasis %1$s, "),
+                             _(GUIMiscNames[emph()])));
        if (underbar() != INHERIT)
-               os << bformat(lyx::to_utf8(_("Underline %1$s, ")),
-                             lyx::to_utf8(_(GUIMiscNames[underbar()])));
+               os << to_utf8(bformat(_("Underline %1$s, "),
+                             _(GUIMiscNames[underbar()])));
        if (noun() != INHERIT)
-               os << bformat(lyx::to_utf8(_("Noun %1$s, ")),
-                             lyx::to_utf8(_(GUIMiscNames[noun()])));
+               os << to_utf8(bformat(_("Noun %1$s, "),
+                             _(GUIMiscNames[noun()])));
        if (bits == inherit)
-               os << lyx::to_utf8(_("Default")) << ", ";
+               os << to_utf8(_("Default")) << ", ";
        if (!params || (language() != params->language))
-               os << bformat(lyx::to_utf8(_("Language: %1$s, ")),
-                             lyx::to_utf8(_(language()->display())));
+               os << to_utf8(bformat(_("Language: %1$s, "),
+                             _(language()->display())));
        if (number() != OFF)
-               os << bformat(lyx::to_utf8(_("  Number %1$s")), lyx::to_utf8(_(GUIMiscNames[number()])));
+               os << to_utf8(bformat(_("  Number %1$s"),
+                               _(GUIMiscNames[number()])));
        return rtrim(os.str(), ", ");
 }
 
@@ -722,14 +724,8 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
        if (orgfont.noun() != noun()) {
                os << "\\noun " << LyXMiscNames[noun()] << "\n";
        }
-       if (orgfont.color() != color()) {
-               // 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.color() != color())
+               os << "\\color " << lcolor.getLyXName(color()) << '\n';
        if (orgfont.language() != language() &&
            language() != latex_language) {
                if (language())
@@ -742,7 +738,7 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
 
 /// Writes the head of the LaTeX needed to impose this font
 // Returns number of chars written.
-int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
+int LyXFont::latexWriteStartChanges(odocstream & os, LyXFont const & base,
                                    LyXFont const & prev) const
 {
        int count = 0;
@@ -762,7 +758,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
                        string const tmp =
                                subst(lyxrc.language_command_local,
                                      "$$lang", language()->babel());
-                       os << tmp;
+                       os << from_ascii(tmp);
                        count += tmp.length();
                }
        }
@@ -799,7 +795,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
        }
        if (f.color() != LColor::inherit && f.color() != LColor::ignore) {
                os << "\\textcolor{"
-                  << lcolor.getLaTeXName(f.color())
+                  << from_ascii(lcolor.getLaTeXName(f.color()))
                   << "}{";
                count += lcolor.getLaTeXName(f.color()).length() + 13;
                env = true; //We have opened a new environment
@@ -838,7 +834,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
 /// Writes ending block of LaTeX needed to close use of this font
 // Returns number of chars written
 // This one corresponds to latexWriteStartChanges(). (Asger)
-int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
+int LyXFont::latexWriteEndChanges(odocstream & os, LyXFont const & base,
                                  LyXFont const & next) const
 {
        int count = 0;
@@ -936,3 +932,6 @@ std::ostream & operator<<(std::ostream & os, LyXFont const & font)
                << " number " << font.bits.number
                << " lang: " << (font.lang ? font.lang->lang() : 0);
 }
+
+
+} // namespace lyx