support for fraktur font in mathed

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3184 a592a061-630c-0410-9148-cb99ea01b6c8

src/ChangeLog

@@ -1,3 +1,8 @@
+2001-12-11  André Pönitz <poenitz@gmx.net>
+
+	* FontLoader.C:
+	* lyxfont.[Ch]: support for fraktur font used by \mathfrak
+
 2001-12-06  John Levon  <moz@compsoc.man.ac.uk>
 
 	* lyx_cb.C: another bv->text misuse, from insert label

src/FontLoader.C

@@ -141,6 +141,11 @@ void FontLoader::getFontinfo(LyXFont::FONT_FAMILY family,
 				new FontInfo("-*-msbm-*-*-*-*-*-*-*-*-*-*-*-*");
 			return;
 
+		case LyXFont::EUFRAK_FAMILY:
+			fontinfo[family][series][shape] = 
+				new FontInfo("-*-eufrak-*-*-*-*-*-*-*-*-*-*-*-*");
+			return;
+
 		default:
 			break;
 	}

src/lyxfont.C

@@ -64,9 +64,9 @@ char const * GUIMiscNames[5] =
 //
 // Strings used to read and write .lyx format files
 //
-char const * LyXFamilyNames[12] = 
+char const * LyXFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] = 
 { "roman", "sans", "typewriter", "symbol",
-  "cmr", "cmsy", "cmm", "cmex", "msa", "msb",
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak",
   "default", "error" };
 
 char const * LyXSeriesNames[4] = 

src/lyxfont.h

@@ -57,6 +57,8 @@ public:
 		///
 		MSB_FAMILY,
 		///
+		EUFRAK_FAMILY,
+		///
 		INHERIT_FAMILY,
 		///
 		IGNORE_FAMILY,

src/mathed/ChangeLog

@@ -1,3 +1,9 @@
+2001-12-11  André Pönitz <poenitz@gmx.net>
+
+	* math_defs.h:
+	* math_parser.C:
+	* math_hash.C: support for \mathfrak
+
 2001-12-12  Angus Leeming  <a.leeming@ic.ac.uk>
 
 	* math_streamstr.C: #include <iostream> to compile with DEC cxx

src/mathed/math_data.h

@@ -16,6 +16,7 @@
 #ifndef MATH_DATA_H
 #define MATH_DATA_H
 
+#include <iosfwd>
 #include <vector>
 
 #include "math_atom.h"
@@ -132,4 +133,8 @@ private:
 	buffer_type bf_;
 };
 
+///
+std::ostream & operator<<(std::ostream & os, MathArray const & ar);
+
+
 #endif

src/mathed/math_defs.h

@@ -44,6 +44,8 @@ enum MathTextCodes  {
 	///
 	LM_TC_CAL,
 	///
+	LM_TC_EUFRAK,
+	///
 	LM_TC_BF,
 	//
 	LM_TC_BB,

src/mathed/math_hash.C

@@ -92,6 +92,7 @@ key_type wordlist_array[] =
 	{"mathbb",  LM_TK_FONT, LM_TC_BB},
 	{"mathbf",  LM_TK_FONT, LM_TC_BF},
 	{"mathcal",  LM_TK_FONT, LM_TC_CAL},
+	{"mathfrak",  LM_TK_FONT, LM_TC_EUFRAK},
 	{"mathit",  LM_TK_FONT, LM_TC_IT},
 	{"mathnormal",  LM_TK_FONT, LM_TC_VAR},
 	{"mathrm",  LM_TK_FONT, LM_TC_RM},

src/mathed/math_parser.C

@@ -791,14 +791,14 @@ void Parser::parse_into(MathArray & array, unsigned flags, MathTextCodes code)
 		else if (t.cat() == catEnd) {
 			if (flags & FLAG_BRACE_LAST)
 				return;
-			//lyxerr << "found '}' unexpectedly, array: '" << array << "'\n";
-			lyxerr << "found '}' unexpectedly\n";
+			lyxerr << "found '}' unexpectedly, array: '" << array << "'\n";
+			//lyxerr << "found '}' unexpectedly\n";
 			add(array, '}', LM_TC_TEX);
 		}
 		
 		else if (t.cat() == catAlign) {
-			//lyxerr << "found tab unexpectedly, array: '" << array << "'\n";
-			lyxerr << "found tab unexpectedly\n";
+			lyxerr << "found tab unexpectedly, array: '" << array << "'\n";
+			//lyxerr << "found tab unexpectedly\n";
 			add(array, '&', LM_TC_TEX);
 		}
 		

src/mathed/math_support.C

@@ -78,6 +78,7 @@ enum MathFont {
 	FONT_CMEX,
 	FONT_MSA,
 	FONT_MSB,
+	FONT_EUFRAK,
 	FONT_NUM
 };
 
@@ -117,6 +118,7 @@ void mathed_init_fonts()
 	MathFonts[FONT_CMEX].setFamily(LyXFont::CMEX_FAMILY);
 	MathFonts[FONT_MSA].setFamily(LyXFont::MSA_FAMILY);
 	MathFonts[FONT_MSB].setFamily(LyXFont::MSB_FAMILY);
+	MathFonts[FONT_EUFRAK].setFamily(LyXFont::EUFRAK_FAMILY);
 
 	for (int i = 0; i < LM_FONT_END; ++i)
 		font_available_initialized[i] = false;
@@ -182,6 +184,12 @@ LyXFont const & whichFontBase(MathTextCodes type)
 	case LM_TC_MSB:
 		return MathFonts[FONT_MSB];
 
+	case LM_TC_EUFRAK:
+		if (math_font_available(LM_TC_EUFRAK))
+			return MathFonts[FONT_EUFRAK];
+		else
+			return MathFonts[FONT_BB];
+
 	default:
 		break;
 	}
@@ -744,6 +752,7 @@ char const * math_font_name(MathTextCodes code)
 	static char const * theFontNames[] = {
 		"mathrm",
 		"mathcal",
+		"mathfrak",
 		"mathbf",
 		"mathbb",
 		"mathsf",