From 37362e255b8a2c8f966709cdf1366300c59358ab Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Tue, 15 Feb 2011 15:54:06 +0000 Subject: About PostScript text output under X11: Non-Xft fonts can have a different size from that required. Give to the PostScript font the same size as that used on the display. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8429 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_PostScript.cxx | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'src/Fl_PostScript.cxx') diff --git a/src/Fl_PostScript.cxx b/src/Fl_PostScript.cxx index 92ad12491..fc71ce199 100644 --- a/src/Fl_PostScript.cxx +++ b/src/Fl_PostScript.cxx @@ -31,6 +31,9 @@ #include #include #include +#if defined(USE_X11) && !USE_XFT +#include "Fl_Font.H" +#endif const char *Fl_PostScript_Graphics_Driver::class_id = "Fl_PostScript_Graphics_Driver"; const char *Fl_PostScript_File_Device::class_id = "Fl_PostScript_File_Device"; @@ -927,12 +930,24 @@ static const char *_fontNames[] = { }; void Fl_PostScript_Graphics_Driver::font(int f, int s) { + Fl_Display_Device::display_device()->driver()->font(f,s); // Use display fonts for font measurement + Fl_Graphics_Driver::font(f, s); if (f < FL_FREE_FONT) { + int ps_size = s; fprintf(output, "/%s SF\n" , _fontNames[f]); - fprintf(output,"%i FS\n", s); +#if defined(USE_X11) && !USE_XFT +// Non-Xft fonts can have a different size from that required. +// Give to the PostScript font the same size as that used on the display + Fl_Font_Descriptor *desc = Fl_Display_Device::display_device()->driver()->font_descriptor(); + this->font_descriptor(desc); + char *name = desc->font->font_name_list[0]; + char *p = strstr(name, "--"); + if (p) { + sscanf(p + 2, "%d", &ps_size); } - Fl_Display_Device::display_device()->driver()->font(f,s); // Use display fonts for font measurement - Fl_Graphics_Driver::font(f, s); +#endif + fprintf(output,"%i FS\n", ps_size); + } } void Fl_PostScript_Graphics_Driver::color(Fl_Color c) { -- cgit v1.2.3