X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBullet.h;h=662fa224d7d74e69f762fcf53f88bffebb252476;hb=3b30dbfca4936adac9a6eb94fced33d36e617734;hp=5e4e72684b90c0aef286fcf013597f2cd27bb036;hpb=4fb18536e9db6c72df397fcdd4ecfbed7ed4052c;p=features.git

diff --git a/src/Bullet.h b/src/Bullet.h
index 5e4e72684b..662fa224d7 100644
--- a/src/Bullet.h
+++ b/src/Bullet.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Allan Rae
  *
  * Full author contact details are available in file CREDITS.
@@ -13,7 +13,12 @@
 #ifndef BULLET_H
 #define BULLET_H
 
-#include "support/std_string.h"
+#include "FontEnums.h"
+
+#include "support/docstring.h"
+
+
+namespace lyx {
 
 ///
 class Bullet {
@@ -22,7 +27,7 @@ public:
 	Bullet(int f = -1, int c = -1, int s = -1);
 
 	///
-	explicit Bullet(string const &);
+	explicit Bullet(docstring const &);
 
 	///
 	void setCharacter(int);
@@ -31,7 +36,7 @@ public:
 	///
 	void setSize(int);
 	///
-	void setText(string const &);
+	void setText(docstring const &);
 	///
 	int getCharacter() const;
 	///
@@ -39,11 +44,17 @@ public:
 	///
 	int getSize() const;
 	///
-	string const & getText() const;
+	FontSize getFontSize() const;
+	/// The text to be output
+	docstring const & getText() const;
+	/// The label displayed in the workarea
+	docstring const & getLabel() const;
 	///
 	Bullet & operator=(Bullet const &);
 	///
 	friend bool operator==(Bullet const &, Bullet const &);
+	///
+	static docstring const bulletEntry(int, int);
 protected:
 	///
 	void testInvariant() const;
@@ -70,9 +81,11 @@ private:
 	///
 	void generateText() const;
 	///
-	static string const bulletSize(int);
+	static docstring const bulletSize(int);
 	///
-	static string const bulletEntry(int, int);
+	static FontSize bulletFontSize(int);
+	///
+	static docstring const bulletLabel(int, int);
 
 	///
 	int font;
@@ -97,7 +110,8 @@ private:
 	    or one generated internally from the font, character
 	    and size settings.
 	*/
-	mutable string text;
+	mutable docstring text;
+	mutable docstring label;
 };
 
 
@@ -111,4 +125,7 @@ bool operator!=(Bullet const & b1, Bullet const & b2)
 extern
 Bullet const ITEMIZE_DEFAULTS[];
 
+
+} // namespace lyx
+
 #endif /* BULLET_H_ */