mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-23 13:31:49 +00:00
94e7421a0a
It appears that gcc 4.9 does not implement the following part of C++11:
https://cplusplus.github.io/CWG/issues/1148.html
Therefore, we have to use a special case in C++11 mode that does an
explicit std:move.
With recent compilers (gcc >= 9), this leads in C++11 mode to a warning:
MetricsInfo.cpp: In member function ‘lyx::Changer lyx::MetricsBase::changeFontSet(const string&)’:
../../master/src/MetricsInfo.cpp:83:13: warning: redundant move in return statement [-Wredundant-move]
83 | return move(rc);
| ~~~~^~~~
MetricsInfo.cpp:83:13: note: remove ‘std::move’ call
Partly reverts commit fff28c57
.
242 lines
5.8 KiB
C++
242 lines
5.8 KiB
C++
/**
|
|
* \file MetricsInfo.cpp
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author André Pönitz
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "MetricsInfo.h"
|
|
|
|
#include "LyXRC.h"
|
|
|
|
#include "insets/Inset.h"
|
|
|
|
#include "mathed/MathSupport.h"
|
|
|
|
#include "frontends/FontMetrics.h"
|
|
#include "frontends/Painter.h"
|
|
|
|
using namespace std;
|
|
|
|
|
|
namespace lyx {
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// MetricsBase
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
MetricsBase::MetricsBase(BufferView * b, FontInfo f, int w)
|
|
: bv(b), font(std::move(f)), fontname("mathnormal"),
|
|
textwidth(w), macro_nesting(0),
|
|
solid_line_thickness_(1), solid_line_offset_(1), dotted_line_thickness_(1)
|
|
{
|
|
if (lyxrc.currentZoom >= 200) {
|
|
// derive the line thickness from zoom factor
|
|
// the zoom is given in percent
|
|
// (increase thickness at 250%, 450% etc.)
|
|
solid_line_thickness_ = (lyxrc.currentZoom + 150) / 200;
|
|
// adjust line_offset_ too
|
|
solid_line_offset_ = 1 + solid_line_thickness_ / 2;
|
|
}
|
|
if (lyxrc.currentZoom >= 100) {
|
|
// derive the line thickness from zoom factor
|
|
// the zoom is given in percent
|
|
// (increase thickness at 150%, 250% etc.)
|
|
dotted_line_thickness_ = (lyxrc.currentZoom + 50) / 100;
|
|
}
|
|
}
|
|
|
|
|
|
Changer MetricsBase::changeFontSet(string const & name)
|
|
{
|
|
RefChanger<MetricsBase> rc = make_save(*this);
|
|
ColorCode oldcolor = font.color();
|
|
string const oldname = fontname;
|
|
fontname = name;
|
|
if (isMathFont(name) || isMathFont(oldname))
|
|
font = sane_font;
|
|
augmentFont(font, name);
|
|
font.setSize(rc->old.font.size());
|
|
font.setStyle(rc->old.font.style());
|
|
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);
|
|
#if __cplusplus >= 201402L
|
|
return rc;
|
|
#else
|
|
/** In theory, this is not needed with C++11, and modern compilers
|
|
* will complain in C++11 mode, but gcc 4.9 requires this. */
|
|
return std::move(rc);
|
|
#endif
|
|
}
|
|
|
|
|
|
Changer MetricsBase::changeEnsureMath(Inset::mode_type mode)
|
|
{
|
|
switch (mode) {
|
|
case Inset::UNDECIDED_MODE:
|
|
return noChange();
|
|
case Inset::TEXT_MODE:
|
|
return isMathFont(fontname) ? changeFontSet("textnormal") : noChange();
|
|
case Inset::MATH_MODE:
|
|
// FIXME:
|
|
// \textit{\ensuremath{\text{a}}}
|
|
// should appear in italics
|
|
return isTextFont(fontname) ? changeFontSet("mathnormal"): noChange();
|
|
}
|
|
return noChange();
|
|
}
|
|
|
|
|
|
int MetricsBase::inPixels(Length const & len) const
|
|
{
|
|
FontInfo fi = font;
|
|
if (len.unit() == Length::MU)
|
|
// mu is 1/18th of an em in the math symbol font
|
|
fi.setFamily(SYMBOL_FAMILY);
|
|
else
|
|
// Math style is only taken into account in the case of mu
|
|
fi.setStyle(TEXT_STYLE);
|
|
return len.inPixels(textwidth, theFontMetrics(fi).em());
|
|
}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// MetricsInfo
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
MetricsInfo::MetricsInfo(BufferView * bv, FontInfo font, int textwidth,
|
|
MacroContext const & mc, bool vm, bool tight)
|
|
: base(bv, font, textwidth), macrocontext(mc), vmode(vm), tight_insets(tight)
|
|
{}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// PainterInfo
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
PainterInfo::PainterInfo(BufferView * bv, lyx::frontend::Painter & painter)
|
|
: 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)
|
|
{
|
|
base.bv = bv;
|
|
}
|
|
|
|
|
|
void PainterInfo::draw(int x, int y, char_type c)
|
|
{
|
|
pain.text(x, y, c, base.font);
|
|
}
|
|
|
|
|
|
void PainterInfo::draw(int x, int y, docstring const & str)
|
|
{
|
|
pain.text(x, y, str, base.font);
|
|
}
|
|
|
|
|
|
ColorCode PainterInfo::backgroundColor(Inset const * inset, bool sel) const
|
|
{
|
|
if (selected && sel)
|
|
// This inset is in a selection
|
|
return Color_selection;
|
|
|
|
// special handling for inset background
|
|
if (inset != nullptr) {
|
|
if (pain.develMode() && !inset->isBufferValid())
|
|
// This inset is in error
|
|
return Color_error;
|
|
|
|
ColorCode const color_bg = inset->backgroundColor(*this);
|
|
if (color_bg != Color_none)
|
|
// This inset has its own color
|
|
return color_bg;
|
|
}
|
|
|
|
if (background_color == Color_none)
|
|
// This inset has no own color and does not inherit a color
|
|
return Color_background;
|
|
|
|
// This inset has no own color, but inherits a color
|
|
return background_color;
|
|
}
|
|
|
|
|
|
Color PainterInfo::textColor(Color const & color) const
|
|
{
|
|
if (change.changed())
|
|
return change.color();
|
|
if (selected)
|
|
return Color_selectiontext;
|
|
return color;
|
|
}
|
|
|
|
|
|
Changer MetricsBase::changeScript()
|
|
{
|
|
switch (font.style()) {
|
|
case DISPLAY_STYLE:
|
|
case TEXT_STYLE:
|
|
return font.changeStyle(SCRIPT_STYLE);
|
|
case SCRIPT_STYLE:
|
|
case SCRIPTSCRIPT_STYLE:
|
|
return font.changeStyle(SCRIPTSCRIPT_STYLE);
|
|
case INHERIT_STYLE:
|
|
case IGNORE_STYLE:
|
|
return noChange();
|
|
}
|
|
//remove Warning
|
|
return noChange();
|
|
}
|
|
|
|
|
|
Changer MetricsBase::changeFrac()
|
|
{
|
|
switch (font.style()) {
|
|
case DISPLAY_STYLE:
|
|
return font.changeStyle(TEXT_STYLE);
|
|
case TEXT_STYLE:
|
|
return font.changeStyle(SCRIPT_STYLE);
|
|
case SCRIPT_STYLE:
|
|
case SCRIPTSCRIPT_STYLE:
|
|
return font.changeStyle(SCRIPTSCRIPT_STYLE);
|
|
case INHERIT_STYLE:
|
|
case IGNORE_STYLE:
|
|
return noChange();
|
|
}
|
|
//remove Warning
|
|
return noChange();
|
|
}
|
|
|
|
|
|
Changer MetricsBase::changeArray(bool small)
|
|
{
|
|
if (small)
|
|
return font.changeStyle(SCRIPT_STYLE);
|
|
return (font.style() == DISPLAY_STYLE) ? font.changeStyle(TEXT_STYLE)
|
|
: noChange();
|
|
}
|
|
|
|
|
|
} // namespace lyx
|