X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlength.C;h=c38e7a33729300a0e59ae5ecafa17f3faedb16a1;hb=5d3718cad2a2ef6a4d6a495054ab0705ba27b6b5;hp=1ae1de20986383cfded8dd10286ae487e3efe00c;hpb=6b5a92d3d67d891361bdb2f11448b56c9d75b9eb;p=lyx.git diff --git a/src/lyxlength.C b/src/lyxlength.C index 1ae1de2098..c38e7a3372 100644 --- a/src/lyxlength.C +++ b/src/lyxlength.C @@ -2,7 +2,7 @@ * ====================================================== * * LyX, The Document Processor - * + * * Copyright 1995 Matthias Ettrich * Copyright 1995-2001 The LyX Team. * @@ -10,21 +10,20 @@ #include -#ifdef __GNUG__ -#pragma implementation -#endif - #include "lyxlength.h" #include "lengthcommon.h" #include "lyxrc.h" +#include "support/lstrings.h" + #include "Lsstream.h" #include +using std::abs; LyXLength::LyXLength() - : val_(0), unit_(LyXLength::PT) + : val_(0), unit_(LyXLength::UNIT_NONE) {} @@ -37,8 +36,8 @@ LyXLength::LyXLength(string const & data) : val_(0), unit_(LyXLength::PT) { LyXLength tmp; - - if (!isValidLength (data, &tmp)) + + if (!isValidLength(data, &tmp)) return; // should raise an exception val_ = tmp.val_; @@ -50,35 +49,43 @@ string const LyXLength::asString() const { ostringstream buffer; buffer << val_ << unit_name[unit_]; // setw? - return buffer.str().c_str(); + return STRCONV(buffer.str()); } string const LyXLength::asLatexString() const { ostringstream buffer; - switch(unit_) { - case PW: - buffer << abs(static_cast(val_/100)) << "." + switch (unit_) { + case PTW: + buffer << abs(static_cast(val_/100)) << '.' << abs(static_cast(val_)%100) << "\\textwidth"; break; - case PE: - buffer << abs(static_cast(val_/100)) << "." + case PCW: + buffer << abs(static_cast(val_/100)) << '.' << abs(static_cast(val_)%100) << "\\columnwidth"; break; - case PP: - buffer << abs(static_cast(val_/100)) << "." + case PPW: + buffer << abs(static_cast(val_/100)) << '.' << abs(static_cast(val_)%100) << "\\paperwidth"; break; - case PL: - buffer << abs(static_cast(val_/100)) << "." + case PLW: + buffer << abs(static_cast(val_/100)) << '.' << abs(static_cast(val_)%100) << "\\linewidth"; break; + case PPH: + buffer << abs(static_cast(val_/100)) << '.' + << abs(static_cast(val_)%100) << "\\paperheight"; + break; + case PTH: + buffer << abs(static_cast(val_/100)) << '.' + << abs(static_cast(val_)%100) << "\\textheight"; + break; default: buffer << val_ << unit_name[unit_]; // setw? break; } - return buffer.str().c_str(); + return STRCONV(buffer.str()); } @@ -106,13 +113,19 @@ void LyXLength::unit(LyXLength::UNIT u) } -bool LyXLength::zero() const +bool LyXLength::zero() const { return val_ == 0.0; } -int LyXLength::inPixels(int default_width, int default_height) 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 double const zoom = lyxrc.zoom / 100.0; // [percent] @@ -120,15 +133,24 @@ int LyXLength::inPixels(int default_width, int default_height) const // DPI setting for monitor: pixels/inch double const dpi = lyxrc.dpi; // screen resolution [pixels/inch] + 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)) + // but this estimate might not be more accurate as the screen font + // is different then the latex font. + // Pixel values are scaled so that the ratio // between lengths and font sizes on the screen // is the same as on paper. - // we don't care about sign of value, we - // display negative space with text too +#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; - int val_sign = val_ < 0.0 ? -1 : 1; - + switch (unit_) { case LyXLength::SP: // Scaled point: sp = 1/65536 pt @@ -176,27 +198,64 @@ int LyXLength::inPixels(int default_width, int default_height) const break; case LyXLength::EX: // Ex: The height of an "x" - result = zoom * val_ * default_height / 2; // what to / width? + // 0.4305 is the ration between 1ex and 1em in cmr10 + result = val_ * em_width * 0.4305; break; - case LyXLength::EM: // what to / width? + case LyXLength::EM: // Em: The width of an "m" - result = zoom * val_ * default_height / 2; // Why 2? + result = val_ * em_width; + break; + case LyXLength::MU: + // math unit = 1/18em + result = val_ * em_width / 18; break; - case LyXLength::MU: // This is probably only allowed in - // math mode - result = zoom * val_ * default_height; + case LyXLength::PCW: // Always % of workarea + case LyXLength::PTW: + case LyXLength::PLW: + result = val_ * text_width / 100; break; - case LyXLength::PW: // Always % of workarea - case LyXLength::PE: - case LyXLength::PP: - case LyXLength::PL: - result = val_ * default_width / 100; + case LyXLength::PPW: + // paperwidth/textwidth is 1.7 for A4 paper with default margins + result = val_ * text_width * 1.7 / 100; + break; + case LyXLength::PTH: + result = val_ * text_width * 1.787 / 100; + break; + case LyXLength::PPH: + result = val_ * text_width * 2.2 / 100; break; case LyXLength::UNIT_NONE: result = 0; // this cannot happen break; } - return static_cast(result * val_sign + 0.5); + return static_cast(result + ((result >= 0) ? 0.5 : -0.5)); +} + + +int LyXLength::inBP() const +{ + // return any LyXLength value as a one with + // the PostScript point, called bp (big points) + double result = 0.0; + switch (unit_) { + case LyXLength::CM: + // 1bp = 0.2835cm + result = val_ * 28.346; + break; + case LyXLength::MM: + // 1bp = 0.02835mm + result = val_ * 2.8346; + break; + case LyXLength::IN: + // 1pt = 1/72in + result = val_ * 72.0; + break; + default: + // no other than bp possible + result = val_; + break; + } + return static_cast(result + 0.5); } @@ -210,4 +269,3 @@ bool operator!=(LyXLength const & l1, LyXLength const & l2) { return !(l1 == l2); } -