X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fvspace.h;h=92ae53231921fe919f4e2c881f4f9f16a6ed63d5;hb=946895278050e4a464c9591e99232a72f5f4dec9;hp=8e224649899418477c2e5411bfbe07e50b601b8f;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git diff --git a/src/vspace.h b/src/vspace.h index 8e22464989..92ae532319 100644 --- a/src/vspace.h +++ b/src/vspace.h @@ -1,22 +1,25 @@ // -*- C++ -*- /* This file is part of - * ====================================================== + * ====================================================== * * LyX, The Document Processor * - * Copyright (C) 1995 1996 Matthias Ettrich - * and the LyX Team. + * Copyright 1995 Matthias Ettrich + * Copyright 1995-2000 The LyX Team. * - *======================================================*/ + * ====================================================== */ -#ifndef _VSPACE_H_ -#define _VSPACE_H_ +#ifndef VSPACE_H +#define VSPACE_H #ifdef __GNUG__ #pragma interface #endif -#include +#include "LString.h" + +class BufferParams; +class BufferView; /// LyXLength Class class LyXLength { @@ -54,11 +57,12 @@ public: //@Man: constructors //@{ /// - LyXLength() : val(0), uni(LyXLength::PT) {}; - LyXLength(float v, LyXLength::UNIT u) : val(v), uni(u) {}; + LyXLength() : val(0), uni(LyXLength::PT) {} + LyXLength(float v, LyXLength::UNIT u) : val(v), uni(u) {} /** "data" must be a decimal number, followed by a unit. */ - LyXLength(LString const & data); + explicit + LyXLength(string const & data); //@} //@Man: selectors @@ -69,26 +73,35 @@ public: LyXLength::UNIT unit() const { return uni; }; //@} - /// - bool operator==(LyXLength other); - /// conversion - virtual LString asString() const; - virtual LString asLatexString() const { return this->asString(); }; + virtual string asString() const; + /// + virtual string asLatexString() const { return this->asString(); }; /** If "data" is valid, the length represented by it is - stored into "result", if that is not NULL. */ - friend bool isValidLength(LString const & data, - LyXLength* result=NULL); + stored into "result", if that is not 0. */ + friend bool isValidLength(string const & data, + LyXLength * result= 0); protected: + /// float val; + /// LyXLength::UNIT uni; }; -extern LyXLength::UNIT unitFromString (LString const & data); -extern bool isValidLength(LString const &data, LyXLength* result); + +inline +bool operator==(LyXLength const & l1, LyXLength const & l2) +{ + return l1.value() == l2.value() + && l1.unit() == l2.unit(); +} + + +extern LyXLength::UNIT unitFromString (string const & data); +extern bool isValidLength(string const & data, LyXLength * result); /// LyXGlueLength class class LyXGlueLength : public LyXLength { @@ -96,12 +109,15 @@ public: //@Man: constructors //@{ /// - LyXGlueLength(float v, LyXLength::UNIT u, - float pv=0.0, LyXLength::UNIT pu=LyXLength::UNIT_NONE, - float mv=0.0, LyXLength::UNIT mu=LyXLength::UNIT_NONE) + LyXGlueLength(float v, + LyXLength::UNIT u, + float pv = 0.0, + LyXLength::UNIT pu = LyXLength::UNIT_NONE, + float mv = 0.0, + LyXLength::UNIT mu = LyXLength::UNIT_NONE) : LyXLength (v, u), plus_val(pv), minus_val(mv), - plus_uni(pu), minus_uni(mu) {}; + plus_uni(pu), minus_uni(mu) {} /** "data" must be a decimal number, followed by a unit, and optional "glue" indicated by "+" and "-". You may abbreviate @@ -109,7 +125,8 @@ public: 1.2 cm // 4mm +2pt // 2cm -4mm +2mm // 4+0.1-0.2cm The traditional Latex format is also accepted, like 4cm plus 10pt minus 10pt */ - LyXGlueLength(LString const & data); + explicit + LyXGlueLength(string const & data); //@} //@Man: selectors @@ -124,25 +141,39 @@ public: LyXLength::UNIT minusUnit() const { return minus_uni; }; //@} - /// - bool operator==(LyXGlueLength other); - /// conversion - virtual LString asString() const; - virtual LString asLatexString() const; + virtual string asString() const; + /// + virtual string asLatexString() const; /** If "data" is valid, the length represented by it is - stored into "result", if that is not NULL. */ - friend bool isValidGlueLength(LString const & data, - LyXGlueLength* result=NULL); + stored into "result", if that is not 0. */ + friend bool isValidGlueLength(string const & data, + LyXGlueLength* result= 0); protected: + /// float plus_val, minus_val; + /// LyXLength::UNIT plus_uni, minus_uni; }; -extern bool isValidGlueLength(LString const &data, LyXGlueLength* result); +/// +inline +bool operator==(LyXGlueLength const & l1, LyXGlueLength const & l2) +{ + return l1.value() == l2.value() + && l1.unit() == l2.unit() + && l1.plusValue() == l2.plusValue() + && l1.plusUnit() == l2.plusUnit() + && l1.minusValue() == l2.minusValue() + && l1.minusUnit() == l2.minusUnit(); +} + + + +extern bool isValidGlueLength(string const & data, LyXGlueLength * result); /// VSpace class class VSpace { @@ -151,50 +182,63 @@ public: enum vspace_kind { NONE, DEFSKIP, SMALLSKIP, MEDSKIP, BIGSKIP, VFILL, LENGTH }; - // constructors + /// constructors VSpace() : kin (NONE), len(0.0, LyXLength::PT), - kp (false) {}; - + kp (false) {} + /// + explicit VSpace(vspace_kind k) : kin (k), len (0.0, LyXLength::PT), - kp (false) {}; - + kp (false) {} + /// + explicit VSpace(LyXGlueLength l) : kin (LENGTH), len (l), - kp (false) {}; + kp (false) {} + /// + explicit VSpace(float v, LyXLength::UNIT u) : kin (LENGTH), len (v, u), - kp (false) {}; + kp (false) {} /// this constructor is for reading from a .lyx file - VSpace(LString const & data); + explicit + VSpace(string const & data); // access functions vspace_kind kind() const { return kin; } + /// LyXLength length() const { return len; } // a flag that switches between \vspace and \vspace* bool keep() const { return kp; } + /// void setKeep(bool val) { kp = val; } - - bool operator== (VSpace other); + /// + bool operator == (VSpace const &) const; // conversion - LString asLyXCommand() const; // how it goes into the LyX file - LString asLatexCommand() const; - int inPixels() const; + /// + string asLyXCommand() const; // how it goes into the LyX file + /// + string asLatexCommand(BufferParams const & params) const; + /// + int inPixels(BufferView * bv) const; + /// + int inPixels(int default_height, int default_skip) const; private: - vspace_kind kin; + /// + vspace_kind kin; + /// LyXGlueLength len; + /// bool kp; }; #endif - -