e68383a591384d56176313e147d126961d6b13c1 braney Tue Apr 6 14:45:25 2021 -0700 turn freeType fonts on by default. Look for them in ../htdocs/urw-fonts by default diff --git src/hg/hgTracks/config.c src/hg/hgTracks/config.c index 2e74583..51dd445 100644 --- src/hg/hgTracks/config.c +++ src/hg/hgTracks/config.c @@ -98,36 +98,36 @@ "n021024l.pfb", "n022003l.pfb", "n022004l.pfb", "n022023l.pfb", "n022024l.pfb", "z003034l.pfb", }; char *emptyStyles[] = { "Normal" }; void maybeNewFonts(struct hvGfx *hvg) /* Check to see if we want to use the alternate font engine (FreeType2). */ { -if (sameString(cfgOptionDefault("freeType", "off"), "on")) +if (sameString(cfgOptionDefault("freeType", "on"), "on")) { if (sameString(tl.textFont, "Bitmap")) return; - char *fontDir = cfgOptionDefault("freeTypeDir", "/usr/share/fonts/default/Type1"); + char *fontDir = cfgOptionDefault("freeTypeDir", "../htdocs/urw-fonts"); char buffer[4096]; int ii; for(ii=0; ii < ArraySize(freeTypeFontNames); ii++) if (sameString(freeTypeFontNames[ii], tl.textFont)) break; char *fontFile = freeTypeFontFiles[ii]; char *fontName = freeTypeFontNames[ii]; safef(buffer, sizeof buffer, "%s/%s", fontDir, fontFile); hvGfxSetFontMethod(hvg, FONT_METHOD_FREETYPE, fontName, buffer ); } } static void textFontDropDown() /* Create drop down for font size. */ @@ -591,31 +591,31 @@ if (trackLayoutInclFontExtras()) { hPrintf("<TD>"); char *defaultStyle = cartUsualString(cart, "fontType", "medium"); cartMakeRadioButton(cart, "fontType", "medium", defaultStyle); hPrintf(" medium "); cartMakeRadioButton(cart, "fontType", "fixed", defaultStyle); hPrintf(" fixed "); cartMakeRadioButton(cart, "fontType", "bold", defaultStyle); hPrintf(" bold "); hPrintf(" "); hPrintf("</TD>"); } hPrintf("</TR>"); -if (sameString(cfgOptionDefault("freeType", "off"), "on")) +if (sameString(cfgOptionDefault("freeType", "on"), "on")) { hPrintf("<TR><TD>font:"); hPrintf("<TD style=\"text-align: right\">"); textFontDropDown(); hPrintf("</TD></TR>"); hPrintf("<TR><TD id='textStyleName'>style:"); hPrintf("<TD style=\"text-align: right\" id='textStyleDrop' >"); textStyleDropDown(); hPrintf("</TR>"); hPrintf("</TR>"); } themeDropDown(cart); hTableStart();