Small fixups to r40663

[lyx.git] / src / Length.cpp

diff --git a/src/Length.cpp b/src/Length.cpp
index c9d6be2a4e32843e35f17714792c8f303fc304f6..f8eb920c0ff48e5b58bd0065d0aad38d00c9009a 100644 (file)
--- a/src/Length.cpp
+++ b/src/Length.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Matthias Ettrich
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  * \author John Levon
@@ -16,19 +16,17 @@
 #include <config.h>
 
 #include "Length.h"
-#include "lengthcommon.h"
 #include "LyXRC.h"
 
 #include "support/docstream.h"
+
 #include <sstream>
 #include <iomanip>
 
+using namespace std;
 
 namespace lyx {
 
-using std::ostringstream;
-using std::string;
-
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -59,6 +57,13 @@ Length::Length(string const & data)
 }
 
 
+void Length::swap(Length & rhs)
+{
+       std::swap(val_, rhs.val_);
+       std::swap(unit_, rhs.unit_);
+}
+
+
 string const Length::asString() const
 {
        ostringstream os;
@@ -91,12 +96,12 @@ string const Length::asLatexString() const
        case PLW:
                os << val_ / 100.0 << "\\linewidth";
                break;
-       case PPH:
-               os << val_ / 100.0 << "\\paperheight";
-               break;
        case PTH:
                os << val_ / 100.0 << "\\textheight";
                break;
+       case PPH:
+               os << val_ / 100.0 << "\\paperheight";
+               break;
        default:
                os << val_ << unit_name[unit_];
          break;
@@ -105,6 +110,48 @@ string const Length::asLatexString() const
 }
 
 
+string const Length::asHTMLString() const
+{
+       ostringstream os;
+       switch (unit_) {
+       case PT:
+       case BP:
+       case DD:
+               // close enough
+               os << val_ << "pt";
+               break;
+       case MM:
+       case CM:
+       case PC:
+       case IN:
+       case EX:
+       case EM:
+               os << val_ << unit_name[unit_];
+               break;
+       case CC:
+               os << val_/12.0 << "pt";
+               break;
+       case MU:
+               os << val_/18.0 << "em";
+               break;
+       case PTW:
+       case PPW:
+       case PLW:
+       case PCW:
+       case PTH:
+       case PPH:
+               // what it's a percentage of probably won't make sense for HTML,
+               // so we'll assume people have chosen these appropriately
+               os << val_ << '%';
+               break;
+       case SP:
+       case UNIT_NONE:
+               break;
+       }
+       return os.str();
+}
+
+
 double Length::value() const
 {
        return val_;
@@ -153,7 +200,7 @@ int Length::inPixels(int text_width, int em_width_base) const
                ? em_width_base
                : 10*(dpi/72.27)*zoom;
        // A different estimate for em_width is
-       // theFontMetrics(LyXFont(LyXFont::ALL_SANE)).width('M')
+       // theFontMetrics(FontInfo(sane_font)).width('M')
        // but this estimate might not be more accurate as the screen font
        // is different then the latex font.
 
@@ -271,6 +318,13 @@ int Length::inBP() const
 }
 
 
+Length::UNIT Length::defaultUnit()
+{
+       return lyxrc.default_length_unit;
+}
+
+
+
 bool operator==(Length const & l1, Length const & l2)
 {
        return l1.value() == l2.value() && l1.unit() == l2.unit();
@@ -360,13 +414,12 @@ string const GlueLength::asString() const
 string const GlueLength::asLatexString() const
 {
        ostringstream buffer;
-
-       buffer << len_.value() << unit_name[len_.unit()];
-
+       // use Length::asLatexString() to handle also the percent lengths
+       buffer << len_.Length::asLatexString();
        if (!plus_.zero())
-               buffer << " plus " << plus_.value() << unit_name[plus_.unit()];
+               buffer << " plus " << plus_.Length::asLatexString();
        if (!minus_.zero())
-               buffer << " minus " << minus_.value() << unit_name[minus_.unit()];
+               buffer << " minus " << minus_.Length::asLatexString();
        return buffer.str();
 }