*
* LyX, The Document Processor
*
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-1999 The LyX Team.
+ * Copyright 1995 Matthias Ettrich
+ * Copyright 1995-2000 The LyX Team.
*
* ====================================================== */
#include "vspace.h"
#include "lyxrc.h"
#include "lyxtext.h"
-#include <cstring>
#include "BufferView.h"
#include "support/lstrings.h"
-extern LyXRC * lyxrc;
-extern BufferView * current_view;
/* length units
*/
//static int number_index, unit_index;
int number_index, unit_index;
-static inline void lyx_advance (string & data, unsigned int n)
+
+static inline
+void lyx_advance(string & data, unsigned int n)
{
data.erase(0, n);
}
-static inline bool isEndOfData (string const & data)
+
+static inline
+bool isEndOfData(string const & data)
{
- return frontStrip (data).empty();
+ return frontStrip(data).empty();
}
-static char nextToken (string & data)
+
+static
+char nextToken(string & data)
{
data = frontStrip(data);
if (data.empty())
return '\0';
else if (data[0] == '+') {
- lyx_advance (data, 1);
+ lyx_advance(data, 1);
return '+';
- }
- else if (prefixIs(data, "plus")) {
- lyx_advance (data, 4);
+ } else if (prefixIs(data, "plus")) {
+ lyx_advance(data, 4);
return '+';
- }
- else if (data[0] == '-') {
- lyx_advance (data, 1);
+ } else if (data[0] == '-') {
+ lyx_advance(data, 1);
return '-';
- }
- else if (prefixIs(data, "minus")) {
- lyx_advance (data, 5);
+ } else if (prefixIs(data, "minus")) {
+ lyx_advance(data, 5);
return '-';
- }
- else {
- string::size_type i;
-
- // I really mean assignment ("=") below, not equality!
- if ((i = data.find_last_of("0123456789.")) != string::npos) {
- if (number_index > 3) return 'E'; // Error
- string buffer = data.substr(0, i + 1);
- if (sscanf (buffer.c_str(),
- "%f", &number[number_index]) == 1) {
- lyx_advance (data, i + 1);
+ } else {
+ string::size_type i = data.find_first_not_of("0123456789.");
+
+ if (i != 0) {
+ if (number_index > 3) return 'E';
+
+ string buffer;
+
+ // we have found some number
+ if (i == string::npos) {
+ buffer = data;
+ i = data.size() + 1;
+ } else
+ buffer = data.substr(0, i);
+
+ lyx_advance(data, i);
+
+ if (isStrDbl(buffer)) {
+ number[number_index] = strToDbl(buffer);
++number_index;
return 'n';
- } else
- return 'E'; // Error
- } else if ((i = data.find_last_of("abcdefghijklmnopqrstuvwxyz"))
- != string::npos) {
- if (unit_index > 3) return 'E'; // Error
- string buffer = data.substr(0, i + 1);
- unit[unit_index] = unitFromString (buffer);
+ } 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;
+ i = data.size() + 1;
+ } else
+ buffer = data.substr(0, i);
+
+ // possibly we have "mmplus" string or similar
+ if (buffer.size() > 5 && (buffer.substr(2,4) == string("plus") || buffer.substr(2,5) == string("minus"))) {
+ lyx_advance(data, 2);
+ unit[unit_index] = unitFromString(buffer.substr(0, 2));
+ } else {
+ lyx_advance(data, i);
+ unit[unit_index] = unitFromString(buffer);
+ }
+
if (unit[unit_index] != LyXLength::UNIT_NONE) {
- lyx_advance (data, i + 1);
++unit_index;
return 'u';
- } else
- return 'E'; // Error
- } else
- return 'E'; // Error
+ } else return 'E'; // Error
+ }
+ return 'E'; // Error
}
}
-static struct {
+
+struct LaTeXLength {
char const * pattern;
int plus_val_index, minus_val_index,
plus_uni_index, minus_uni_index;
-} table[] = { { "nu", 0, 0, 0, 0 },
- { "nu+nu", 2, 0, 2, 0 },
- { "nu+nu-nu", 2, 3, 2, 3 },
- { "nu+-nu", 2, 2, 2, 2 },
- { "nu-nu", 0, 2, 0, 2 },
- { "nu-nu+nu", 3, 2, 3, 2 },
- { "nu-+nu", 2, 2, 2, 2 },
- { "n+nu", 2, 0, 1, 0 },
- { "n+n-nu", 2, 3, 1, 1 },
- { "n+-nu", 2, 2, 1, 1 },
- { "n-nu", 0, 2, 0, 1 },
- { "n-n+nu", 3, 2, 1, 1 },
- { "n-+nu", 2, 2, 1, 1 },
- { "", 0, 0, 0, 0 } // sentinel, must be empty
};
+
+static
+LaTeXLength table[] = {
+ { "nu", 0, 0, 0, 0 },
+ { "nu+nu", 2, 0, 2, 0 },
+ { "nu+nu-nu", 2, 3, 2, 3 },
+ { "nu+-nu", 2, 2, 2, 2 },
+ { "nu-nu", 0, 2, 0, 2 },
+ { "nu-nu+nu", 3, 2, 3, 2 },
+ { "nu-+nu", 2, 2, 2, 2 },
+ { "n+nu", 2, 0, 1, 0 },
+ { "n+n-nu", 2, 3, 1, 1 },
+ { "n+-nu", 2, 2, 1, 1 },
+ { "n-nu", 0, 2, 0, 1 },
+ { "n-n+nu", 3, 2, 1, 1 },
+ { "n-+nu", 2, 2, 1, 1 },
+ { "", 0, 0, 0, 0 } // sentinel, must be empty
+};
+
+
bool isValidGlueLength (string const & data, LyXGlueLength * result)
{
// This parser is table-driven. First, it constructs a "pattern"
// To make isValidGlueLength recognize negative values as
// the first number this little hack is needed:
short val_sign = 1; // positive as default
- switch(buffer[0]) {
+ switch (buffer[0]) {
case '-':
lyx_advance(buffer, 1);
val_sign = -1;
/// glue, but since we already have it, using it is
/// easier than writing something from scratch.
- string buffer = data;
+ string buffer(data);
int pattern_index = 0;
char pattern[3];
// To make isValidLength recognize negative values
// this little hack is needed:
short val_sign = 1; // positive as default
- switch(buffer[0]) {
+ switch (buffer[0]) {
case '-':
lyx_advance(buffer, 1);
val_sign = -1;
return true;
}
+
/// LyXLength class
LyXLength::LyXLength(string const & data)
}
}
-bool LyXLength::operator== (LyXLength const & other) const
-{
- return (val == other.val &&
- uni == other.uni);
-}
-string LyXLength::asString() const
+string const LyXLength::asString() const
{
- char buffer[20];
-
- sprintf (buffer, "%g%s", val, unit_name[uni]);
- return string (buffer);
+ std::ostringstream buffer;
+ buffer << val << unit_name[uni]; // setw?
+ return buffer.str().c_str();
}
}
-bool LyXGlueLength::operator== (LyXGlueLength const & other) const
+string const LyXGlueLength::asString() const
{
- return (val == other.val &&
- uni == other.uni &&
- plus_val == other.plus_val &&
- plus_uni == other.plus_uni &&
- minus_val == other.minus_val &&
- minus_uni == other.minus_uni);
-}
-
+ std::ostringstream buffer;
-string LyXGlueLength::asString() const
-{
- char buffer[20];
-
if (plus_val != 0.0)
if (minus_val != 0.0)
if ((uni == plus_uni) && (uni == minus_uni))
if (plus_val == minus_val)
- sprintf (buffer, "%g+-%g%s",
- val, plus_val, unit_name[uni]);
+ buffer << val << "+-"
+ << plus_val << unit_name[uni];
else
- sprintf (buffer, "%g+%g-%g%s",
- val, plus_val, minus_val,
- unit_name[uni]);
+ buffer << val
+ << '+' << plus_val
+ << '-' << minus_val
+ << unit_name[uni];
else
- if ((plus_uni == minus_uni) && (plus_val == minus_val))
- sprintf (buffer, "%g%s+-%g%s",
- val, unit_name[uni],
- plus_val, unit_name[plus_uni]);
+ if (plus_uni == minus_uni
+ && plus_val == minus_val)
+ buffer << val << unit_name[uni]
+ << "+-" << plus_val
+ << unit_name[plus_uni];
+
else
- sprintf (buffer, "%g%s+%g%s-%g%s",
- val, unit_name[uni],
- plus_val, unit_name[plus_uni],
- minus_val, unit_name[minus_uni]);
+ buffer << val << unit_name[uni]
+ << '+' << plus_val
+ << unit_name[plus_uni]
+ << '-' << minus_val
+ << unit_name[minus_uni];
else
if (uni == plus_uni)
- sprintf (buffer, "%g+%g%s",
- val, plus_val, unit_name[uni]);
+ buffer << val << '+' << plus_val
+ << unit_name[uni];
else
- sprintf (buffer, "%g%s+%g%s",
- val, unit_name[uni],
- plus_val, unit_name[plus_uni]);
+ buffer << val << unit_name[uni]
+ << '+' << plus_val
+ << unit_name[plus_uni];
+
else
if (minus_val != 0.0)
if (uni == minus_uni)
- sprintf (buffer, "%g-%g%s",
- val, minus_val, unit_name[uni]);
+ buffer << val << '-' << minus_val
+ << unit_name[uni];
+
else
- sprintf (buffer, "%g%s-%g%s",
- val, unit_name[uni],
- minus_val, unit_name[minus_uni]);
+ buffer << val << unit_name[uni]
+ << '-' << minus_val
+ << unit_name[minus_uni];
else
- sprintf (buffer, "%g%s", val, unit_name[uni]);
- return string (buffer);
+ buffer << val << unit_name[uni];
+
+ return buffer.str().c_str();
}
-string LyXGlueLength::asLatexString() const
+string const LyXGlueLength::asLatexString() const
{
- char buffer[40];
+ std::ostringstream buffer;
if (plus_val != 0.0)
if (minus_val != 0.0)
- sprintf (buffer, "%g%s plus %g%s minus %g%s",
- val, unit_name[uni],
- plus_val, unit_name[plus_uni],
- minus_val, unit_name[minus_uni]);
+ buffer << val << unit_name[uni]
+ << " plus "
+ << plus_val << unit_name[plus_uni]
+ << " minus "
+ << minus_val << unit_name[minus_uni];
else
- sprintf (buffer, "%g%s plus %g%s",
- val, unit_name[uni],
- plus_val, unit_name[plus_uni]);
+ buffer << val << unit_name[uni]
+ << " plus "
+ << plus_val << unit_name[plus_uni];
else
if (minus_val != 0.0)
- sprintf (buffer, "%g%s minus %g%s",
- val, unit_name[uni],
- minus_val, unit_name[minus_uni]);
+ buffer << val << unit_name[uni]
+ << " minus "
+ << minus_val << unit_name[minus_uni];
else
- sprintf (buffer, "%g%s",
- val, unit_name[uni]);
- return string (buffer);
+ buffer << val << unit_name[uni];
+
+ return buffer.str().c_str();
}
else if (prefixIs (input, "vfill")) kin = VFILL;
else if (isValidGlueLength (input, &len))
kin = LENGTH;
- else if (sscanf (input.c_str(), "%f", &value) == 1) {
+ else if (sscanf(input.c_str(), "%f", &value) == 1) {
// This last one is for reading old .lyx files
// without units in added_space_top/bottom.
// Let unit default to centimeters here.
}
-string VSpace::asLyXCommand() const
+string const VSpace::asLyXCommand() const
{
string result;
}
-string VSpace::asLatexCommand() const
+string const VSpace::asLatexCommand(BufferParams const & params) const
{
switch (kin) {
case NONE: return string();
case DEFSKIP:
- return current_view->buffer()->params.getDefSkip().asLatexCommand();
+ return params.getDefSkip().asLatexCommand(params);
case SMALLSKIP: return kp ? "\\vspace*{\\smallskipamount}"
: "\\smallskip{}";
case MEDSKIP: return kp ? "\\vspace*{\\medskipamount}"
}
-int VSpace::inPixels() const
+int VSpace::inPixels(BufferView * bv) const
{
// Height of a normal line in pixels (zoom factor considered)
- int height = current_view->text->DefaultHeight(); // [pixels]
+ int height = bv->text->DefaultHeight(); // [pixels]
+ int skip = 0;
+ if (kin == DEFSKIP)
+ skip = bv->buffer()->params.getDefSkip().inPixels(bv);
+ return inPixels(height, skip);
+}
+
+int VSpace::inPixels(int default_height, int default_skip) const
+{
+ // Height of a normal line in pixels (zoom factor considered)
+ int height = default_height; // [pixels]
+
// Zoom factor specified by user in percent
- float const zoom = lyxrc->zoom / 100.0; // [percent]
+ float const zoom = lyxrc.zoom / 100.0; // [percent]
// DPI setting for monitor: pixels/inch
- float const dpi = lyxrc->dpi; // screen resolution [pixels/inch]
+ float const dpi = lyxrc.dpi; // screen resolution [pixels/inch]
// We want the result in pixels
float result, value;
case NONE: return 0;
case DEFSKIP:
- return current_view->buffer()->params.getDefSkip().inPixels();
+ return default_skip;
// This is how the skips are normally defined by
// LateX. But there should be some way to change
// this per document.
- case SMALLSKIP: return height/4;
- case MEDSKIP: return height/2;
+ case SMALLSKIP: return height / 4;
+ case MEDSKIP: return height / 2;
case BIGSKIP: return height;
- case VFILL: return 3*height;
+ case VFILL: return 3 * height;
// leave space for the vfill symbol
case LENGTH:
// Pixel values are scaled so that the ratio
projects / lyx.git / blobdiff