mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

About PostScript text output under X11: Non-Xft fonts can have a different size from that required.

Browse Source 
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
This commit is contained in:
Manolo Gouy 2011-02-15 15:54:06 +00:00
parent 63dbae51d2
commit 37362e255b
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Fl_PostScript.cxx
View File

@ -31,6 +31,9 @@
#include <stdio.h>
#include <FL/Fl_PostScript.H>
#include <FL/Fl_Native_File_Chooser.H>
#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) {
if (f < FL_FREE_FONT) {
fprintf(output, "/%s SF\n" , _fontNames[f]);
fprintf(output,"%i FS\n", 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]);
#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);
}
#endif
fprintf(output,"%i FS\n", ps_size);
}
}
void Fl_PostScript_Graphics_Driver::color(Fl_Color c) {

6
src/fl_font_x.cxx
View File

@ -273,9 +273,9 @@ void Fl_Xlib_Graphics_Driver::font(Fl_Font fnum, Fl_Fontsize size) {
if (fnum == Fl_Graphics_Driver::font() && size == Fl_Graphics_Driver::size()) return;
Fl_Graphics_Driver::font(fnum, size);
Fl_Font_Descriptor* f = find(fnum, size);
if (f != fl_graphics_driver->font_descriptor()) {
fl_graphics_driver->font_descriptor(f);
fl_xfont = current_font->fonts[0];
if (f != this->font_descriptor()) {
this->font_descriptor(f);
fl_xfont = f->font->fonts[0];
font_gc = 0;
}
}