/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "Lsstream.h"
#include "Spacing.h"
#include "LString.h"
using std::ios;
using std::ostream;
-/// how can I put this inside of Spacing (class)
-namespace {
-
-char const * const spacing_string[] = {"single", "onehalf", "double", "other"};
-
-} // namespace anon
+string const Spacing::spacing_string[]
+ = {"single", "onehalf", "double", "other"};
-
-float Spacing::getValue() const
+float Spacing::getValue() const
{
switch (space) {
case Default: // nothing special should happen with this...
void Spacing::set(Spacing::Space sp, string const & val)
{
- float fval;
+ float fval = 0.0;
istringstream istr(val.c_str());
istr >> fval;
set(sp, fval);
void Spacing::writeFile(ostream & os, bool para) const
{
if (space == Default) return;
-
+
string cmd = para ? "\\paragraph_spacing " : "\\spacing ";
-
+
if (getSpace() == Spacing::Other) {
os.setf(ios::showpoint|ios::fixed);
os.precision(2);
os << cmd << spacing_string[getSpace()]
- << " " << getValue() << " \n";
+ << ' ' << getValue() << " \n";
} else {
os << cmd << spacing_string[getSpace()] << " \n";
- }
+ }
}
{
ostringstream ost;
ost << "\\begin{spacing}{"
- << getValue() << "}";
- return ost.str().c_str();
+ << getValue() << '}';
+ return STRCONV(ost.str());
}
}
return string();