#include <config.h>
#include "Bullet.h"
-#include "support/LAssert.h"
-using namespace lyx::support;
+#include <boost/assert.hpp>
+
+namespace lyx {
+
+using std::string;
+
/** The four LaTeX itemize environment default bullets
*/
Bullet::Bullet(int f, int c, int s)
- : font(f), character(c), size(s), user_text(0)
+ : font(f), character(c), size(s), user_text(0)
{
if (f < MIN || f >= FONTMAX) {
font = MIN;
-Bullet::Bullet(string const & t)
- : font(MIN), character(MIN), size(MIN), user_text(1), text(t)
+Bullet::Bullet(docstring const & t)
+ : font(MIN), character(MIN), size(MIN), user_text(1), text(t)
{
testInvariant();
}
}
-void Bullet::setText(string const & t)
+void Bullet::setText(docstring const & t)
{
font = character = size = MIN;
user_text = 1;
}
-string const & Bullet::getText() const
+docstring const & Bullet::getText() const
{
if (user_text == 0) {
generateText();
}
-string const Bullet::bulletSize(int s)
+docstring const Bullet::bulletSize(int s)
{
// use a parameter rather than hard code `size' in here
// in case some future function may want to retrieve
"\\large", "\\Large", "\\LARGE", "\\huge", "\\Huge"
};
- return BulletSize[s];
+ return from_ascii(BulletSize[s]);
}
-string const Bullet::bulletEntry(int f, int c)
+docstring const Bullet::bulletEntry(int f, int c)
{
// Despite how this may at first appear the static local variables
// are only initialized once..
BulletPanel4, BulletPanel5
};
- return BulletPanels[f][c];
+ return from_ascii(BulletPanels[f][c]);
}
void Bullet::testInvariant() const
{
#ifdef ENABLE_ASSERTIONS
- 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);
+ BOOST_ASSERT(font >= MIN);
+ BOOST_ASSERT(font < FONTMAX);
+ BOOST_ASSERT(character >= MIN);
+ BOOST_ASSERT(character < CHARMAX);
+ BOOST_ASSERT(size >= MIN);
+ BOOST_ASSERT(size < SIZEMAX);
+ BOOST_ASSERT(user_text >= -1);
+ BOOST_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
+ BOOST_ASSERT(font == -1 && (character == -1 && size == -1));
+ // BOOST_ASSERT(!text.empty()); // this isn't necessarily an error
}
// else if (user_text == -1) {
- // Assert(!text.empty()); // this also isn't necessarily an error
+ // BOOST_ASSERT(!text.empty()); // this also isn't necessarily an error
// }
// else {
// // user_text == 0
- // Assert(text.empty()); // not usually true
+ // BOOST_ASSERT(text.empty()); // not usually true
// }
#endif
}
+
+
+} // namespace lyx