X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBullet.h;h=cc955085709179977e34d24cbf7ff3599450ca4c;hb=27652900a60fd078f161ce866ddaed21dba21eff;hp=159a861733450dc6c0791baa2b0cdff2d6768ffa;hpb=a040c0bc6f017d0591bbc7ad1aa590589dbc40ff;p=lyx.git diff --git a/src/Bullet.h b/src/Bullet.h index 159a861733..cc95508570 100644 --- a/src/Bullet.h +++ b/src/Bullet.h @@ -6,7 +6,7 @@ * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich - * Copyright 1995-1999 The LyX Team. + * Copyright 1995-2001 The LyX Team. * * This file Copyright 1997-1999 * Allan Rae @@ -21,28 +21,21 @@ #include "LString.h" -#ifdef DEBUG_AS_DEFAULT -#include -#endif - /// class Bullet { public: /// - Bullet(const int f = -1, const int c = -1, const int s = -1); + Bullet(int f = -1, int c = -1, int s = -1); /// - Bullet(string const &); + explicit Bullet(string const &); /// - ~Bullet(); - + void setCharacter(int); /// - void setCharacter(const int); + void setFont(int); /// - void setFont(const int); - /// - void setSize(const int); + void setSize(int); /// void setText(string const &); /// @@ -52,58 +45,25 @@ public: /// int getSize() const; /// - string getText() const; - /// - string getText(); + string const & getText() const; /// - char const * c_str(); + Bullet & operator=(Bullet const &); /// - Bullet & operator = (const Bullet &); - /// - friend bool operator == (const Bullet &, const Bullet &); - /// - friend bool operator != (const Bullet & b1, const Bullet & b2) - { - return !(b1 == b2); - } - - + friend bool operator==(Bullet const &, Bullet const &); protected: -#ifdef DEBUG_AS_DEFAULT - void testInvariant() const - { - assert(font >= MIN); - assert(font < FONTMAX); - assert(character >= MIN); - assert(character < CHARMAX); - assert(size >= MIN); - assert(size < SIZEMAX); - assert(user_text >= -1); - assert(user_text <= 1); - // now some relational/operational tests - if (user_text == 1) { - assert(font == -1 && (character == -1 && size == -1)); - // assert(!text.empty()); // this isn't necessarily an error - } - // else if (user_text == -1) { - // assert(!text.empty()); // this also isn't necessarily an error - // } - // else { - // // user_text == 0 - // assert(text.empty()); // not usually true - // } - } +#ifdef ENABLE_ASSERTIONS + /// + void testInvariant() const; #endif - private: /** - This enum makes adding additional panels or changing panel sizes - easier. Since you only need change these values for all tests to - be correct for the new values. - - Note: MAX means the size of the array so to test you need: - (x < MAX) *not* (x <= MAX) - */ + This enum makes adding additional panels or changing panel sizes + easier. Since you only need change these values for all tests to + be correct for the new values. + + Note: MAX means the size of the array so to test you need: + (x < MAX) *not* (x <= MAX) + */ enum { /// MIN = -1, @@ -114,165 +74,49 @@ private: /// SIZEMAX = 10 }; - + /// - void generateText(); + void generateText() const; /// - static string const & bulletSize(const short &); + static string const bulletSize(int); /// - static string const & bulletEntry(const short &, const short &); - + static string const bulletEntry(int, int); + /// - short font; + int font; /// - short character; + int character; /// - short size; + int size; // size, character and font are array indices to access // the predefined arrays of LaTeX equivalent strings. - + /** flag indicates if user has control of text (1) - or if I can use it to generate strings (0) - or have already (-1) - */ - short user_text; - + or if I can use it to generate strings (0) + or have already (-1) + */ + mutable short user_text; + //NOTE: Arranging these four shorts above to be together // like this should ensure they are in a single cache line - + /** text may contain a user-defined LaTeX symbol command - or one generated internally from the font, character - and size settings. - */ - string text; + or one generated internally from the font, character + and size settings. + */ + mutable string text; }; -/*----------------Inline Bullet Member Functions------------------*/ - -inline Bullet::Bullet(string const & t) - : font(MIN), character(MIN), size(MIN), user_text(1), text(t) -{ -#ifdef DEBUG_AS_DEFAULT - testInvariant(); -#endif -} - - -inline Bullet::~Bullet() -{} - - -inline void Bullet::setCharacter(const int c) -{ - if (c < MIN || c >= CHARMAX) { - character = MIN; - } - else { - character = c; - } - user_text = 0; -#ifdef DEBUG_AS_DEFAULT - testInvariant(); -#endif -} - - -inline void Bullet::setFont(const int f) -{ - if (f < MIN || f >= FONTMAX) { - font = MIN; - } - else { - font = f; - } - user_text = 0; -#ifdef DEBUG_AS_DEFAULT - testInvariant(); -#endif -} - - -inline void Bullet::setSize(const int s) -{ - if (s < MIN || s >= SIZEMAX) { - size = MIN; - } - else { - size = s; - } - user_text = 0; -#ifdef DEBUG_AS_DEFAULT - testInvariant(); -#endif -} - - -inline void Bullet::setText(string const & t) -{ - font = character = size = MIN; - user_text = 1; - text = t; -#ifdef DEBUG_AS_DEFAULT - testInvariant(); -#endif -} - - -inline int Bullet::getCharacter() const -{ - return character; -} - - -inline int Bullet::getFont() const -{ - return font; -} - - -inline int Bullet::getSize() const -{ - return size; -} - - -inline string Bullet::getText() const -{ - return text; -} - - -inline Bullet & Bullet::operator = (const Bullet & b) +inline +bool operator!=(Bullet const & b1, Bullet const & b2) { -#ifdef DEBUG_AS_DEFAULT - b.testInvariant(); -#endif - font = b.font; - character = b.character; - size = b.size; - user_text = b.user_text; - text = b.text; -#ifdef DEBUG_AS_DEFAULT - this->testInvariant(); -#endif - return *this; + return !(b1 == b2); } +/// +extern +Bullet const ITEMIZE_DEFAULTS[]; -inline char const * Bullet::c_str() -{ - return this->getText().c_str(); -} - - -/*-----------------End Bullet Member Functions-----------------*/ - -/** The four LaTeX itemize environment default bullets - */ -static Bullet const ITEMIZE_DEFAULTS[4] = { Bullet( 0, 8 ),//"\\(\\bullet\\)" - Bullet( 0, 0 ),//"\\normalfont\\bfseries{--}" - Bullet( 0, 6 ),//"\\(\\ast\\)" - Bullet( 0, 10 ) };//"\\(\\cdot\\)" #endif /* BULLET_H_ */