* generate the bullets in the bullet-panel's.
*
* This file is part of
- * ======================================================
+ * ======================================================
*
* LyX, The Document Processor
*
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "Bullet.h"
#include "support/LAssert.h"
+using namespace lyx::support;
+
/** The four LaTeX itemize environment default bullets
*/
extern
-Bullet::Bullet(string const & t)
+Bullet::Bullet(string const & t)
: font(MIN), character(MIN), size(MIN), user_text(1), text(t)
{
#ifdef ENABLE_ASSERTIONS
// See additional comments in bulletEntry() below.
static char const * BulletSize[SIZEMAX] = {
- "\\tiny", "\\scriptsize", "\\footnotesize", "\\small", "\\normalsize",
+ "\\tiny", "\\scriptsize", "\\footnotesize", "\\small", "\\normalsize",
"\\large", "\\Large", "\\LARGE", "\\huge", "\\Huge"
};
// to get around a compiler bug in an earler version of gcc (< 2.7.2.1)
// static string const BulletPanels[FONTMAX][CHARMAX] = {
static char const * BulletPanel0[CHARMAX] = {
- /* standard */
+ /* standard */
"\\normalfont\\bfseries{--}", "\\(\\vdash\\)",
"\\(\\dashv\\)", "\\(\\flat\\)", "\\(\\natural\\)",
- "\\(\\sharp\\)", "\\(\\ast\\)", "\\(\\star\\)",
+ "\\(\\sharp\\)", "\\(\\ast\\)", "\\(\\star\\)",
"\\(\\bullet\\)", "\\(\\circ\\)", "\\(\\cdot\\)",
"\\(\\dagger\\)", "\\(\\bigtriangleup\\)",
"\\(\\bigtriangledown\\)", "\\(\\triangleleft\\)",
"\\(\\oplus\\)", "\\(\\ominus\\)", "\\(\\otimes\\)",
"\\(\\oslash\\)", "\\(\\odot\\)", "\\(\\spadesuit\\)",
"\\(\\diamond\\)", "\\(\\Diamond\\)", "\\(\\Box\\)",
- "\\(\\diamondsuit\\)", "\\(\\heartsuit\\)",
+ "\\(\\diamondsuit\\)", "\\(\\heartsuit\\)",
"\\(\\clubsuit\\)", "\\(\\rightarrow\\)", "\\(\\leadsto\\)",
- "\\(\\rightharpoonup\\)", "\\(\\rightharpoondown\\)",
+ "\\(\\rightharpoonup\\)", "\\(\\rightharpoondown\\)",
"\\(\\Rightarrow\\)", "\\(\\succ\\)"
};
static char const * BulletPanel1[CHARMAX] = {
#ifdef ENABLE_ASSERTIONS
void Bullet::testInvariant() const {
- lyx::Assert(font >= MIN);
- lyx::Assert(font < FONTMAX);
- lyx::Assert(character >= MIN);
- lyx::Assert(character < CHARMAX);
- lyx::Assert(size >= MIN);
- lyx::Assert(size < SIZEMAX);
- lyx::Assert(user_text >= -1);
- lyx::Assert(user_text <= 1);
+ 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) {
- lyx::Assert(font == -1 && (character == -1 && size == -1));
+ Assert(font == -1 && (character == -1 && size == -1));
// Assert(!text.empty()); // this isn't necessarily an error
}
// else if (user_text == -1) {