lyx_advance(data, 1);
return '+';
}
-
+
if (prefixIs(data, "plus")) {
lyx_advance(data, 4);
return '+';
}
-
+
if (data[0] == '-') {
lyx_advance(data, 1);
return '-';
const char * stringFromUnit(int unit)
{
- if (unit < 0 || unit >= num_units)
+ if (unit < 0 || unit > num_units)
return 0;
return unit_name[unit];
}
//
VSpace::VSpace()
- : kind_(NONE), len_(), keep_(false)
+ : kind_(DEFSKIP), len_(), keep_(false)
{}
VSpace::VSpace(string const & data)
- : kind_(NONE), len_(), keep_(false)
+ : kind_(DEFSKIP), len_(), keep_(false)
{
if (data.empty())
return;
{
string result;
switch (kind_) {
- case NONE: break;
case DEFSKIP: result = "defskip"; break;
case SMALLSKIP: result = "smallskip"; break;
case MEDSKIP: result = "medskip"; break;
case VFILL: result = "vfill"; break;
case LENGTH: result = len_.asString(); break;
}
- if (keep_ && kind_ != NONE && kind_ != DEFSKIP)
+ if (keep_)
result += '*';
return result;
}
case VFILL:
return keep_ ? "\\vspace*{\\fill}" : "\\vfill{}";
- case LENGTH:
+ case LENGTH:
return keep_ ? "\\vspace*{" + len_.asLatexString() + '}'
: "\\vspace{" + len_.asLatexString() + '}';
- case NONE:
- return string();
-
default:
BOOST_ASSERT(false);
return string();
int VSpace::inPixels(BufferView const & bv) const
{
// Height of a normal line in pixels (zoom factor considered)
- int const default_height = defaultRowHeight();
+ int const default_height = defaultRowHeight();
switch (kind_) {
case LENGTH:
return len_.len().inPixels(bv.workWidth());
- case NONE:
- return 0;
-
default:
BOOST_ASSERT(false);
return 0;