X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBullet.C;h=4104ee60f49fd8cfddf21c8d854ed2a7c3933b3f;hb=52eb91c94fb70d58dceef430659c8781de2eccda;hp=b14aea8e91566529ca34c0d3c441e314c01e5c12;hpb=45a03f4f67bb00f8142e465c615f348f0622eb32;p=lyx.git

diff --git a/src/Bullet.C b/src/Bullet.C
index b14aea8e91..4104ee60f4 100644
--- a/src/Bullet.C
+++ b/src/Bullet.C
@@ -1,33 +1,37 @@
-// -*- C++ -*-
+/**
+ * \file Bullet.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author Allan Rae
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 /* Completes the implementation of the Bullet class
  * It defines the various LaTeX commands etc. required to
  * generate the bullets in the bullet-panel's.
- *
- * This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 1997-1998 Allan Rae
- *           and the LyX Team
- *
- * ====================================================== */
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "Bullet.h"
 
+#include <boost/assert.hpp>
+
+namespace lyx {
+
+using std::string;
+
+
 /** The four LaTeX itemize environment default bullets
  */
 extern
-Bullet const ITEMIZE_DEFAULTS[4] = { Bullet( 0, 8 ),//"\\(\\bullet\\)"
-				     Bullet( 0, 0 ),//"\\normalfont\\bfseries{--}"
-				     Bullet( 0, 6 ),//"\\(\\ast\\)"
-				     Bullet( 0, 10 ) };//"\\(\\cdot\\)"
+Bullet const ITEMIZE_DEFAULTS[4] = { Bullet(0, 8),//"\\(\\bullet\\)"
+				     Bullet(0, 0),//"\\normalfont\\bfseries{--}"
+				     Bullet(0, 6),//"\\(\\ast\\)"
+				     Bullet(0, 10) };//"\\(\\cdot\\)"
 
 // will need these later if still using full text as below
 // \usepackage{latexsym,pifont,amssymb}
@@ -35,7 +39,7 @@ Bullet const ITEMIZE_DEFAULTS[4] = { Bullet( 0, 8 ),//"\\(\\bullet\\)"
 
 
 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;
@@ -47,13 +51,95 @@ Bullet::Bullet(int f, int c, int s)
 		size = MIN;
 	}
 	generateText();
-#ifdef ENABLE_ASSERTIONS
 	testInvariant();
-#endif
 }
 
 
-string const & Bullet::getText() const
+
+Bullet::Bullet(docstring const & t)
+	: font(MIN), character(MIN), size(MIN), user_text(1), text(t)
+{
+	testInvariant();
+}
+
+
+void Bullet::setCharacter(int c)
+{
+	if (c < MIN || c >= CHARMAX) {
+		character = MIN;
+	} else {
+		character = c;
+	}
+	user_text = 0;
+	testInvariant();
+}
+
+
+void Bullet::setFont(int f)
+{
+	if (f < MIN || f >= FONTMAX) {
+		font = MIN;
+	} else {
+		font = f;
+	}
+	user_text = 0;
+	testInvariant();
+}
+
+
+void Bullet::setSize(int s)
+{
+	if (s < MIN || s >= SIZEMAX) {
+		size = MIN;
+	} else {
+		size = s;
+	}
+	user_text = 0;
+	testInvariant();
+}
+
+
+void Bullet::setText(docstring const & t)
+{
+	font = character = size = MIN;
+	user_text = 1;
+	text = t;
+	testInvariant();
+}
+
+
+int Bullet::getCharacter() const
+{
+	return character;
+}
+
+
+int Bullet::getFont() const
+{
+	return font;
+}
+
+
+int Bullet::getSize() const
+{
+	return size;
+}
+
+
+Bullet & Bullet::operator=(Bullet const & b)
+{
+	b.testInvariant();
+	font = b.font;
+	character = b.character;
+	size = b.size;
+	user_text = b.user_text;
+	text = b.text;
+	this->testInvariant();
+	return *this;
+}
+
+
+docstring const & Bullet::getText() const
 {
 	if (user_text == 0) {
 		generateText();
@@ -109,7 +195,7 @@ void Bullet::generateText() const
 }
 
 
-string const Bullet::bulletSize(short 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
@@ -117,15 +203,15 @@ string const Bullet::bulletSize(short int s)
 	// 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"
 	};
 
-	return BulletSize[s];
+	return from_ascii(BulletSize[s]);
 }
 
 
-string const Bullet::bulletEntry(short int f, short 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..
@@ -140,10 +226,10 @@ string const Bullet::bulletEntry(short int f, short int c)
 	// 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\\)",
@@ -151,9 +237,9 @@ string const Bullet::bulletEntry(short int f, short int c)
 		"\\(\\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] = {
@@ -266,5 +352,34 @@ string const Bullet::bulletEntry(short int f, short int c)
 		BulletPanel4, BulletPanel5
 	};
 
-	return BulletPanels[f][c];
+	return from_ascii(BulletPanels[f][c]);
 }
+
+void Bullet::testInvariant() const
+{
+#ifdef ENABLE_ASSERTIONS
+	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) {
+		BOOST_ASSERT(font == -1 && (character == -1 && size == -1));
+		//        BOOST_ASSERT(!text.empty()); // this isn't necessarily an error
+	}
+	//      else if (user_text == -1) {
+	//        BOOST_ASSERT(!text.empty()); // this also isn't necessarily an error
+	//      }
+	//      else {
+	//        // user_text == 0
+	//        BOOST_ASSERT(text.empty()); // not usually true
+	//      }
+#endif
+}
+
+
+} // namespace lyx