#include <config.h>
-#include "BufferView.h"
-#include "ColorSet.h"
-#include "LyXRC.h"
#include "MetricsInfo.h"
+#include "LyXRC.h"
+
#include "insets/Inset.h"
#include "mathed/MathSupport.h"
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
-#include "support/docstring.h"
-#include "support/lassert.h"
-#include "support/RefChanger.h"
-
using namespace std;
augmentFont(font, name);
font.setSize(rc->old.font.size());
font.setStyle(rc->old.font.style());
- if (name != "lyxtex"
+ if (name == "emph") {
+ font.setColor(oldcolor);
+ if (rc->old.font.shape() != UP_SHAPE)
+ font.setShape(UP_SHAPE);
+ else
+ font.setShape(ITALIC_SHAPE);
+ } else if (name != "lyxtex"
&& ((isTextFont(oldname) && oldcolor != Color_foreground)
|| (isMathFont(oldname) && oldcolor != Color_math)))
font.setColor(oldcolor);
{
switch (mode) {
case Inset::UNDECIDED_MODE:
- return Changer();
+ return noChange();
case Inset::TEXT_MODE:
- return isMathFont(fontname) ? changeFontSet("textnormal") : Changer();
+ return isMathFont(fontname) ? changeFontSet("textnormal") : noChange();
case Inset::MATH_MODE:
// FIXME:
// \textit{\ensuremath{\text{a}}}
// should appear in italics
- return isTextFont(fontname) ? changeFontSet("mathnormal"): Changer();
+ return isTextFont(fontname) ? changeFontSet("mathnormal"): noChange();
}
- return Changer();
+ return noChange();
}
/////////////////////////////////////////////////////////////////////////
MetricsInfo::MetricsInfo(BufferView * bv, FontInfo font, int textwidth,
- MacroContext const & mc)
- : base(bv, font, textwidth), macrocontext(mc)
+ MacroContext const & mc, bool vm, bool tight)
+ : base(bv, font, textwidth), macrocontext(mc), vmode(vm), tight_insets(tight)
{}
/////////////////////////////////////////////////////////////////////////
PainterInfo::PainterInfo(BufferView * bv, lyx::frontend::Painter & painter)
- : pain(painter), ltr_pos(false), change(), selected(false),
+ : pain(painter), ltr_pos(false), change(),
+ selected(false), selected_left(false), selected_right(false),
do_spellcheck(true), full_repaint(true), background_color(Color_background),
leftx(0), rightx(0)
{
return font.changeStyle(SCRIPTSCRIPT_STYLE);
case INHERIT_STYLE:
case IGNORE_STYLE:
- return Changer();
+ return noChange();
}
//remove Warning
- return Changer();
+ return noChange();
}
return font.changeStyle(SCRIPTSCRIPT_STYLE);
case INHERIT_STYLE:
case IGNORE_STYLE:
- return Changer();
+ return noChange();
}
//remove Warning
- return Changer();
+ return noChange();
}
if (small)
return font.changeStyle(SCRIPT_STYLE);
return (font.style() == DISPLAY_STYLE) ? font.changeStyle(TEXT_STYLE)
- : Changer();
+ : noChange();
}