/**
* \file vspace.C
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
* \author Matthias Ettrich
+ *
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "vspace.h"
-#include "lengthcommon.h"
-#include "lyx_main.h"
#include "buffer.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
+#include "bufferparams.h"
#include "BufferView.h"
-#include "support/LAssert.h"
+#include "lengthcommon.h"
+#include "lyxtext.h"
#include "support/lstrings.h"
-#include <cstdio>
+using lyx::support::compare;
+using lyx::support::isStrDbl;
+using lyx::support::ltrim;
+using lyx::support::prefixIs;
+using lyx::support::rtrim;
+using lyx::support::strToDbl;
+
+using std::string;
namespace {
inline
bool isEndOfData(string const & data)
{
- return frontStrip(data).empty();
+ return ltrim(data).empty();
}
/**
* @param data input string
* @return a char representing the type of token returned
*
- * The possible return values are :
- * + stretch indicator for glue length
+ * The possible return values are :
+ * + stretch indicator for glue length
* - shrink indicator for glue length
* n a numeric value (stored in number array)
* u a unit type (stored in unit array)
*/
char nextToken(string & data)
{
- data = frontStrip(data);
+ data = ltrim(data);
if (data.empty())
return '\0';
else if (data[0] == '+') {
if (number_index > 3) return 'E';
string buffer;
-
+
// we have found some number
if (i == string::npos) {
buffer = data;
return 'n';
} else return 'E';
}
-
+
i = data.find_first_not_of("abcdefghijklmnopqrstuvwxyz%");
if (i != 0) {
if (unit_index > 3) return 'E';
string buffer;
-
+
// we have found some alphabetical string
if (i == string::npos) {
buffer = data;
if (data.empty())
return true;
- string buffer = frontStrip(data);
+ string buffer = ltrim(data);
// To make isValidGlueLength recognize negative values as
// the first number this little hack is needed:
break;
}
// end of hack
-
+
int pattern_index = 0;
int table_index = 0;
char pattern[20];
if (!*table[table_index].pattern)
return false;
}
-
+
// Get the values from the appropriate places. If an index
// is zero, the corresponding array value is zero or UNIT_NONE,
// so we needn't check this.
break;
}
// end of hack
-
+
number_index = unit_index = 1; // entries at index 0 are sentinels
// construct "pattern" from "data"
pattern[pattern_index] = '\0';
// only the most basic pattern is accepted here
- if (compare(pattern, "nu") != 0) return false;
-
+ if (compare(pattern, "nu") != 0) return false;
+
// It _was_ a correct length string.
// Store away the values we found.
if (result) {
if (data.empty())
return;
double value;
- string input = strip(data);
+ string input = rtrim(data);
string::size_type const length = input.length();
- if (length > 1 && input[length-1] == '*') {
+ if (length > 1 && input[length - 1] == '*') {
keep_ = true;
input.erase(length - 1);
}
else if (prefixIs (input, "bigskip")) kind_ = BIGSKIP;
else if (prefixIs (input, "vfill")) kind_ = VFILL;
else if (isValidGlueLength(input, &len_)) kind_ = LENGTH;
- else if (sscanf(input.c_str(), "%lf", &value) == 1) {
+ else if (isStrDbl(input)) {
+ value = strToDbl(input);
// This last one is for reading old .lyx files
// without units in added_space_top/bottom.
// Let unit default to centimeters here.
}
-LyXGlueLength VSpace::length() const
+LyXGlueLength const & VSpace::length() const
{
return len_;
}
string const VSpace::asLatexCommand(BufferParams const & params) const
{
+ string ret;
+
switch (kind_) {
- case NONE: return string();
+ case NONE:
+ break;
case DEFSKIP:
- return params.getDefSkip().asLatexCommand(params);
- case SMALLSKIP: return keep_ ? "\\vspace*{\\smallskipamount}"
- : "\\smallskip{}";
- case MEDSKIP: return keep_ ? "\\vspace*{\\medskipamount}"
- : "\\medskip{}";
- case BIGSKIP: return keep_ ? "\\vspace*{\\bigskipamount}"
- : "\\bigskip{}";
- case VFILL: return keep_ ? "\\vspace*{\\fill}"
- : "\\vfill{}";
- case LENGTH: return keep_ ? "\\vspace*{" + len_.asLatexString() + '}'
- : "\\vspace{" + len_.asLatexString() + '}';
+ ret = params.getDefSkip().asLatexCommand(params);
+ break;
+ case SMALLSKIP:
+ ret = keep_ ? "\\vspace*{\\smallskipamount}"
+ : "\\smallskip{}";
+ break;
+ case MEDSKIP:
+ ret = keep_ ? "\\vspace*{\\medskipamount}"
+ : "\\medskip{}";
+ break;
+ case BIGSKIP:
+ ret = keep_ ? "\\vspace*{\\bigskipamount}"
+ : "\\bigskip{}";
+ break;
+ case VFILL:
+ ret = keep_ ? "\\vspace*{\\fill}"
+ : "\\vfill{}";
+ break;
+ case LENGTH:
+ {
+ string const lenstr = len_.asLatexString();
+
+ ret = keep_ ? "\\vspace*{" + lenstr + '}'
+ : "\\vspace{" + lenstr + '}';
}
-
- lyx::Assert(0);
- // of course, we cannot get there, but gcc is too stupid to
- // see that. *Sigh*
- return string();
+ break;
+
+ }
+
+ return ret;
}
-int VSpace::inPixels(BufferView * bv) const
+
+int VSpace::inPixels(BufferView const & bv) const
{
// Height of a normal line in pixels (zoom factor considered)
- int const default_height = bv->text->defaultHeight(); // [pixels]
+ int const default_height = defaultRowHeight(); // [pixels]
int retval = 0;
-
+
switch (kind_) {
+
case NONE:
- // Value for this is already set
+ // value for this is already set
break;
+
case DEFSKIP:
- retval = bv->buffer()->params.getDefSkip().inPixels(bv);
+ retval = bv.buffer()->params().getDefSkip().inPixels(bv);
break;
-
- // This is how the skips are normally defined by
- // LateX. But there should be some way to change
- // this per document.
+
+ // This is how the skips are normally defined by LateX.
+ // But there should be some way to change this per document.
case SMALLSKIP:
retval = default_height / 4;
break;
-
+
case MEDSKIP:
retval = default_height / 2;
break;
-
+
case BIGSKIP:
retval = default_height;
break;
// leave space for the vfill symbol
retval = 3 * default_height;
break;
-
- case LENGTH: {
- int const default_width = bv->workWidth();
- retval = len_.len().inPixels(default_width, default_height);
+
+ case LENGTH:
+ retval = len_.len().inPixels(bv.workWidth());
break;
- }
-
+
}
return retval;
}