X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlength.C;h=fded92c19bcfe53b595f0d24e86a7cc713607f6f;hb=46bd598fc5b0b1bb61e713428c54aedf9c6e6d98;hp=40eb3b5d06b72a1a2a114c7c93543c3d24ebee45;hpb=293767645f75c540a48e9498ec5dca6aabdd5455;p=lyx.git

diff --git a/src/lyxlength.C b/src/lyxlength.C
index 40eb3b5d06..fded92c19b 100644
--- a/src/lyxlength.C
+++ b/src/lyxlength.C
@@ -1,33 +1,38 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file lyxlength.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Matthias Ettrich
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author John Levon
+ * \author Dekel Tsur
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "lyxlength.h"
 #include "lengthcommon.h"
 #include "lyxrc.h"
 
-#include "support/lstrings.h"
+#include "support/docstream.h"
+#include <sstream>
+#include <iomanip>
+
 
-#include "Lsstream.h"
+namespace lyx {
 
-#include <cstdlib>
 
-using std::abs;
+using std::ostringstream;
+using std::string;
+
 
 LyXLength::LyXLength()
-	: val_(0), unit_(LyXLength::PT)
+	: val_(0), unit_(LyXLength::UNIT_NONE)
 {}
 
 
@@ -51,45 +56,47 @@ LyXLength::LyXLength(string const & data)
 
 string const LyXLength::asString() const
 {
-	ostringstream buffer;
-	buffer << val_ << unit_name[unit_]; // setw?
-	return buffer.str().c_str();
+	ostringstream os;
+	os << val_ << unit_name[unit_]; // setw?
+	return os.str();
+}
+
+
+docstring const LyXLength::asDocstring() const
+{
+	odocstringstream os;
+	os << val_ << unit_name[unit_]; // setw?
+	return os.str();
 }
 
 
 string const LyXLength::asLatexString() const
 {
-	ostringstream buffer;
+	ostringstream os;
 	switch (unit_) {
 	case PTW:
-	    buffer << abs(static_cast<int>(val_/100)) << "."
-		   << abs(static_cast<int>(val_)%100) << "\\textwidth";
-	    break;
+		os << val_ / 100.0 << "\\textwidth";
+		break;
 	case PCW:
-	    buffer << abs(static_cast<int>(val_/100)) << "."
-		   << abs(static_cast<int>(val_)%100) << "\\columnwidth";
-	    break;
+		os << val_ / 100.0 << "\\columnwidth";
+		break;
 	case PPW:
-	    buffer << abs(static_cast<int>(val_/100)) << "."
-		   << abs(static_cast<int>(val_)%100) << "\\paperwidth";
-	    break;
+		os << val_ / 100.0 << "\\paperwidth";
+		break;
 	case PLW:
-	    buffer << abs(static_cast<int>(val_/100)) << "."
-		   << abs(static_cast<int>(val_)%100) << "\\linewidth";
-	    break;
+		os << val_ / 100.0 << "\\linewidth";
+		break;
 	case PPH:
-	    buffer << abs(static_cast<int>(val_/100)) << "."
-		   << abs(static_cast<int>(val_)%100) << "\\paperheight";
-	    break;
+		os << val_ / 100.0 << "\\paperheight";
+		break;
 	case PTH:
-	    buffer << abs(static_cast<int>(val_/100)) << "."
-		   << abs(static_cast<int>(val_)%100) << "\\textheight";
-	    break;
+		os << val_ / 100.0 << "\\textheight";
+		break;
 	default:
-	    buffer << val_ << unit_name[unit_]; // setw?
-	    break;
+		os << val_ << unit_name[unit_];
+	  break;
 	}
-	return buffer.str().c_str();
+	return os.str();
 }
 
 
@@ -123,6 +130,12 @@ bool LyXLength::zero() const
 }
 
 
+bool LyXLength::empty() const
+{
+	return unit_ == LyXLength::UNIT_NONE;
+}
+
+
 int LyXLength::inPixels(int text_width, int em_width_base) const
 {
 	// Zoom factor specified by user in percent
@@ -134,8 +147,8 @@ int LyXLength::inPixels(int text_width, int em_width_base) const
 	double const em_width = (em_width_base > 0)
 		? em_width_base
 		: 10*(dpi/72.27)*zoom;
-	// A different estimate for em_width is 
-	// font_metrics::width('M', LyXFont(LyXFont::ALL_SANE))
+	// A different estimate for em_width is
+	// theFontMetrics(LyXFont(LyXFont::ALL_SANE)).width('M')
 	// but this estimate might not be more accurate as the screen font
 	// is different then the latex font.
 
@@ -143,10 +156,6 @@ int LyXLength::inPixels(int text_width, int em_width_base) const
 	// between lengths and font sizes on the screen
 	// is the same as on paper.
 
-#ifdef WITH_WARNINGS
-#warning if you don't care than either call this function differently or let it return negative values and call abs() explicitly when needed (Andre')
-#endif
-
 	double result = 0.0;
 
 	switch (unit_) {
@@ -267,3 +276,6 @@ bool operator!=(LyXLength const & l1, LyXLength const & l2)
 {
 	return !(l1 == l2);
 }
+
+
+} // namespace lyx