Small fixes noticed by Jean-Marc.

[lyx.git] / src / Bullet.C

diff --git a/src/Bullet.C b/src/Bullet.C
index 15290d062b441ad9287dfdafd5ea7f7e9e025377..b14aea8e91566529ca34c0d3c441e314c01e5c12 100644 (file)
--- a/src/Bullet.C
+++ b/src/Bullet.C
@@ -8,7 +8,7 @@
  *
  *           LyX, The Document Processor
  *
- *           Copyright (C) 1997-1998 Allan Rae
+ *           Copyright 1997-1998 Allan Rae
  *           and the LyX Team
  *
  * ====================================================== */
@@ -21,12 +21,20 @@
 
 #include "Bullet.h"
 
+/** 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\\)"
+
 // will need these later if still using full text as below
 // \usepackage{latexsym,pifont,amssymb}
 // and wasysym when that panel is created
 
 
-Bullet::Bullet(const int f, const int c, const int s)
+Bullet::Bullet(int f, int c, int s)
   : font(f), character(c), size(s), user_text(0)
 {
        if (f < MIN || f >= FONTMAX) {
@@ -45,7 +53,7 @@ Bullet::Bullet(const int f, const int c, const int s)
 }
 
 
-string Bullet::getText()
+string const & Bullet::getText() const
 {
        if (user_text == 0) {
                generateText();
@@ -54,7 +62,7 @@ string Bullet::getText()
 }
 
 
-bool operator == (const Bullet & b1, const Bullet & b2)
+bool operator==(const Bullet & b1, const Bullet & b2)
 {
        bool result = false;
 
@@ -75,7 +83,7 @@ bool operator == (const Bullet & b1, const Bullet & b2)
 /*--------------------Private Member Functions-------------------*/
 
 
-void Bullet::generateText()
+void Bullet::generateText() const
 {
        // Assumption:
        // user hasn't defined their own text and/or I haven't generated
@@ -101,7 +109,7 @@ void Bullet::generateText()
 }
 
 
-string Bullet::bulletSize(const short & s)
+string const Bullet::bulletSize(short int s)
 {
        // use a parameter rather than hard code `size' in here
        // in case some future function may want to retrieve
@@ -117,7 +125,7 @@ string Bullet::bulletSize(const short & s)
 }
 
 
-string Bullet::bulletEntry(const short & f, const short & c)
+string const Bullet::bulletEntry(short int f, short int c)
 {
        // Despite how this may at first appear the static local variables
        // are only initialized once..