On Tue, Dec 11, 2001 at 07:16:33AM +0100, Andre Poenitz wrote:
> On Mon, Dec 10, 2001 at 08:21:49PM +0200, Dekel Tsur wrote:
> > You didn't add the string "eufrak" to the arrays
> > GUIFamilyNames/LyXFamilyNames defined in lyxfont.C.
Ok, next attempt attached.
Lars, Jean-Marc, ok to apply?
Andre'
--
Andr� P�nitz .............................................. [EMAIL PROTECTED]
Index: FontLoader.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/FontLoader.C,v
retrieving revision 1.33
diff -u -p -r1.33 FontLoader.C
--- FontLoader.C 2001/09/19 16:36:39 1.33
+++ FontLoader.C 2001/12/11 06:45:58
@@ -141,6 +141,11 @@ void FontLoader::getFontinfo(LyXFont::FO
new FontInfo("-*-msbm-*-*-*-*-*-*-*-*-*-*-*-*");
return;
+ case LyXFont::EUFRAK_FAMILY:
+ fontinfo[family][series][shape] =
+ new FontInfo("-*-eufrak-*-*-*-*-*-*-*-*-*-*-*-*");
+ return;
+
default:
break;
}
Index: lyxfont.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfont.C,v
retrieving revision 1.70
diff -u -p -r1.70 lyxfont.C
--- lyxfont.C 2001/11/26 18:03:23 1.70
+++ lyxfont.C 2001/12/11 06:45:58
@@ -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] =
Index: lyxfont.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfont.h,v
retrieving revision 1.45
diff -u -p -r1.45 lyxfont.h
--- lyxfont.h 2001/11/26 18:03:23 1.45
+++ lyxfont.h 2001/12/11 06:45:58
@@ -57,6 +57,8 @@ public:
///
MSB_FAMILY,
///
+ EUFRAK_FAMILY,
+ ///
INHERIT_FAMILY,
///
IGNORE_FAMILY,
Index: mathed/math_defs.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_defs.h,v
retrieving revision 1.65
diff -u -p -r1.65 math_defs.h
--- mathed/math_defs.h 2001/11/09 18:02:20 1.65
+++ mathed/math_defs.h 2001/12/11 06:45:58
@@ -44,6 +44,8 @@ enum MathTextCodes {
///
LM_TC_CAL,
///
+ LM_TC_EUFRAK,
+ ///
LM_TC_BF,
//
LM_TC_BB,
Index: mathed/math_hash.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_hash.C,v
retrieving revision 1.62
diff -u -p -r1.62 math_hash.C
--- mathed/math_hash.C 2001/11/12 18:00:20 1.62
+++ mathed/math_hash.C 2001/12/11 06:45:58
@@ -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},
Index: mathed/math_support.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_support.C,v
retrieving revision 1.2
diff -u -p -r1.2 math_support.C
--- mathed/math_support.C 2001/12/03 16:24:50 1.2
+++ mathed/math_support.C 2001/12/11 06:45:58
@@ -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(MathTextCo
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(MathTextCode
static char const * theFontNames[] = {
"mathrm",
"mathcal",
+ "mathfrak",
"mathbf",
"mathbb",
"mathsf",
