anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify Length

Browse Source
This commit is contained in:
Yuriy Skalko 2020-11-19 15:53:33 +02:00
parent 2941bc0198
commit 916ceeba12
2 changed files with 25 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/support/Length.cpp
View File

@ -39,18 +39,7 @@ namespace lyx {
//
/////////////////////////////////////////////////////////////////////
Length::Length()
: val_(0), unit_(Length::UNIT_NONE)
{}
Length::Length(double v, Length::UNIT u)
: val_(v), unit_(u)
{}
Length::Length(string const & data)
: val_(0), unit_(Length::UNIT_NONE)
{
Length tmp;
@ -161,42 +150,6 @@ string const Length::asHTMLString() const
}
double Length::value() const
{
return val_;
}
Length::UNIT Length::unit() const
{
return unit_;
}
void Length::value(double v)
{
val_ = v;
}
void Length::unit(Length::UNIT u)
{
unit_ = u;
}
bool Length::zero() const
{
return val_ == 0.0;
}
bool Length::empty() const
{
return unit_ == Length::UNIT_NONE;
}
int Length::inPixels(int text_width, int em_width_base) const
{
// Zoom factor specified by user in percent
@ -325,37 +278,12 @@ Length::UNIT Length::defaultUnit()
}
bool operator==(Length const & l1, Length const & l2)
{
return l1.value() == l2.value() && l1.unit() == l2.unit();
}
bool operator!=(Length const & l1, Length const & l2)
{
return !(l1 == l2);
}
/////////////////////////////////////////////////////////////////////
//
// GlueLength
//
/////////////////////////////////////////////////////////////////////
GlueLength::GlueLength(Length const & len)
: len_(len)
{}
GlueLength::GlueLength(Length const & len, Length const & plus,
Length const & minus)
: len_(len), plus_(plus), minus_(minus)
{}
GlueLength::GlueLength(string const & data)
{
if (!isValidGlueLength(data, this))
@ -429,24 +357,6 @@ string const GlueLength::asLatexString() const
}
Length const & GlueLength::len() const
{
return len_;
}
Length const & GlueLength::plus() const
{
return plus_;
}
Length const & GlueLength::minus() const
{
return minus_;
}
bool operator==(GlueLength const & l1, GlueLength const & l2)
{
return l1.len() == l2.len()
@ -454,11 +364,4 @@ bool operator==(GlueLength const & l1, GlueLength const & l2)
&& l1.minus() == l2.minus();
}
bool operator!=(GlueLength const & l1, GlueLength const & l2)
{
return !(l1 == l2);
}
} // namespace lyx

46
src/support/Length.h
View File

@ -61,25 +61,25 @@ public:
};
///
Length();
Length() = default;
///
Length(double v, Length::UNIT u);
Length(double v, Length::UNIT u) : val_(v), unit_(u) {}
/// "data" must be a decimal number, followed by a unit
explicit Length(std::string const & data);
///
double value() const;
double value() const { return val_; };
///
Length::UNIT unit() const;
Length::UNIT unit() const { return unit_; };
///
void value(double);
void value(double val) { val_ = val; }
///
void unit(Length::UNIT unit);
void unit(Length::UNIT unit) { unit_ = unit; }
///
bool zero() const;
bool zero() const { return val_ == 0.0; }
///
bool empty() const;
bool empty() const { return unit_ == Length::UNIT_NONE; }
/// return string representation
std::string const asString() const;
/// return string representation
@ -109,15 +109,18 @@ private:
/// Convert value to inch for text width and em width given in inch
double inInch(double text_width, double em_width) const;
///
double val_;
double val_ = 0;
///
Length::UNIT unit_;
Length::UNIT unit_ = UNIT_NONE;
};
///
bool operator==(Length const & l1, Length const & l2);
inline bool operator==(Length const & l1, Length const & l2)
{ return l1.value() == l2.value() && l1.unit() == l2.unit(); }
///
bool operator!=(Length const & l1, Length const & l2);
inline bool operator!=(Length const & l1, Length const & l2)
{ return !(l1 == l2); }
/** Test whether \p data represents a valid length.
*
* \returns whether \p data is a valid length
@ -142,13 +145,12 @@ char const * stringFromUnit(int unit);
class GlueLength {
public:
///
GlueLength() {}
GlueLength() = default;
///
explicit GlueLength(Length const & len);
explicit GlueLength(Length const & len) : len_(len) {}
///
GlueLength(Length const & len,
Length const & plus,
Length const & minus);
GlueLength(Length const & len, Length const & plus, Length const & minus)
: len_(len), plus_(plus), minus_(minus) {}
/** "data" must be a decimal number, followed by a unit, and
optional "glue" indicated by "+" and "-". You may abbreviate
@ -159,11 +161,11 @@ public:
explicit GlueLength(std::string const & data);
///
Length const & len() const;
Length const & len() const { return len_; }
///
Length const & plus() const;
Length const & plus() const { return plus_; }
///
Length const & minus() const;
Length const & minus() const { return minus_; }
/// conversion
@ -186,7 +188,9 @@ private:
///
bool operator==(GlueLength const & l1, GlueLength const & l2);
///
bool operator!=(GlueLength const & l1, GlueLength const & l2);
inline bool operator!=(GlueLength const & l1, GlueLength const & l2)
{ return !(l1 == l2); }
/** If "data" is valid, the length represented by it is
stored into "result", if that is not 0. */
bool isValidGlueLength(std::string const & data, GlueLength * result = 0);