Let getPosNearX take horizontal scrolling into account

[lyx.git] / src / FontInfo.h

diff --git a/src/FontInfo.h b/src/FontInfo.h
index b471c297194f8ec71063ff6470cd0459ea02d78f..c31c7fac779f7173b512d7672d23924277332fee 100644 (file)
--- a/src/FontInfo.h
+++ b/src/FontInfo.h
@@ -114,7 +114,7 @@ public:
                if (noun_ == FONT_ON)
                        return SMALLCAPS_SHAPE;
                if (emph_ == FONT_ON)
-                       return (shape_ == UP_SHAPE) ? ITALIC_SHAPE : UP_SHAPE;
+                       return (shape_ == ITALIC_SHAPE) ? UP_SHAPE : ITALIC_SHAPE;
                return shape_;
        }
 
@@ -127,6 +127,7 @@ public:
                case CMEX_FAMILY:
                case MSA_FAMILY:
                case MSB_FAMILY:
+               case STMARY_FAMILY:
                case WASY_FAMILY:
                case ESINT_FAMILY:
                        return true;
@@ -220,6 +221,9 @@ FontState setLyXMisc(std::string const &);
 /// Read a font specification from Lexer. Used for layout files.
 FontInfo lyxRead(Lexer &, FontInfo const & fi = sane_font);
 
+/// Write a font specification. Used for layout files.
+void lyxWrite(std::ostream &, FontInfo const &, std::string const &, int);
+
 } // namespace lyx
 
 #endif