Small fixes noticed by Jean-Marc.

[lyx.git] / src / Bullet.C

diff --git a/src/Bullet.C b/src/Bullet.C
index d482a2312b03ff797b376fab27cd21fa365595c5..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,14 +109,14 @@ void Bullet::generateText()
 }
 
 
-string const & 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
        // an arbitrary entry.
        // See additional comments in bulletEntry() below.
 
-       static string const BulletSize[SIZEMAX] = {
+       static char const * BulletSize[SIZEMAX] = {
                "\\tiny",  "\\scriptsize", "\\footnotesize", "\\small", "\\normalsize", 
                "\\large", "\\Large",      "\\LARGE",        "\\huge",  "\\Huge"
        };
@@ -117,7 +125,7 @@ string const & Bullet::bulletSize(const short & s)
 }
 
 
-string const & 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..
@@ -131,7 +139,7 @@ string const & Bullet::bulletEntry(const short & f, const short & c)
        // The single 2-dim array had to be changed to multiple 1-dim arrays
        // to get around a compiler bug in an earler version of gcc (< 2.7.2.1)
        // static string const BulletPanels[FONTMAX][CHARMAX] = {
-       static string const BulletPanel0[CHARMAX] = {
+       static char const * BulletPanel0[CHARMAX] = {
                /* standard */ 
                "\\normalfont\\bfseries{--}", "\\(\\vdash\\)",
                "\\(\\dashv\\)", "\\(\\flat\\)", "\\(\\natural\\)",
@@ -148,7 +156,7 @@ string const & Bullet::bulletEntry(const short & f, const short & c)
                "\\(\\rightharpoonup\\)", "\\(\\rightharpoondown\\)", 
                "\\(\\Rightarrow\\)", "\\(\\succ\\)"
        };
-       static string const BulletPanel1[CHARMAX] = {
+       static char const * BulletPanel1[CHARMAX] = {
                /* amssymb */
                "\\(\\Rrightarrow\\)", "\\(\\rightarrowtail\\)",
                "\\(\\twoheadrightarrow\\)", "\\(\\rightsquigarrow\\)",
@@ -167,7 +175,7 @@ string const & Bullet::bulletEntry(const short & f, const short & c)
                "\\(\\blacktriangledown\\)", "\\(\\blacklozenge\\)",
                "\\(\\blacksquare\\)"
        };
-       static string const BulletPanel2[CHARMAX] = {
+       static char const * BulletPanel2[CHARMAX] = {
                /* psnfss1 */
                "\\ding{108}", "\\ding{109}",
                "\\ding{119}", "\\Pisymbol{psy}{197}",
@@ -188,7 +196,7 @@ string const & Bullet::bulletEntry(const short & f, const short & c)
                "\\ding{166}", "\\ding{167}",
                "\\ding{226}", "\\ding{227}"
        };
-       static string const BulletPanel3[CHARMAX] = {
+       static char const * BulletPanel3[CHARMAX] = {
                /* psnfss2 */
                "\\ding{37}", "\\ding{38}",
                "\\ding{34}", "\\ding{36}",
@@ -209,7 +217,7 @@ string const & Bullet::bulletEntry(const short & f, const short & c)
                "\\ding{171}", "\\ding{168}",
                "\\ding{169}", "\\ding{170}"
        };
-       static string const BulletPanel4[CHARMAX] = {
+       static char const * BulletPanel4[CHARMAX] = {
                /* psnfss3 */
                "\\ding{65}", "\\ding{76}",
                "\\ding{75}", "\\ding{72}",
@@ -230,7 +238,7 @@ string const & Bullet::bulletEntry(const short & f, const short & c)
                "\\ding{102}", "\\ding{96}",
                "\\ding{95}", "\\ding{97}"
        };
-       static string const BulletPanel5[CHARMAX] = {
+       static char const * BulletPanel5[CHARMAX] = {
                /* psnfss4 */
                "\\ding{223}", "\\ding{224}",
                "\\ding{225}", "\\ding{232}",
@@ -252,7 +260,7 @@ string const & Bullet::bulletEntry(const short & f, const short & c)
                "\\ding{231}", "\\Pisymbol{psy}{45}"
        };  /* string const BulletPanels[][] */
 
-       static string const * BulletPanels[FONTMAX] = {
+       static char const ** BulletPanels[FONTMAX] = {
                BulletPanel0, BulletPanel1,
                BulletPanel2, BulletPanel3,
                BulletPanel4, BulletPanel5