From 2a3f3f0c1bad4cd9a368405086d788ab54c7f99d Mon Sep 17 00:00:00 2001 From: Martin Kretzschmar Date: Sat, 22 Jan 2005 22:08:31 +0000 Subject: My 2005-01-05 change didn't actually fix the problem. Now I just removed the Adobe font names and hope that the URW fonts are always in outline format. Bug #164934 --- diff --git a/ChangeLog b/ChangeLog index 1021ef4..4eda2e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-01-22 Martin Kretzschmar + * pdf/xpdf/GlobalParams.cc: My 2005-01-05 change didn't actually + fix the problem. Now I just removed the Adobe font names and hope + that the URW fonts are always in outline format. Bug #164934 + * shell/ev-window.c (update_window_title): empty titles are useless, use filename in that case too. diff --git a/pdf/xpdf/GlobalParams.cc b/pdf/xpdf/GlobalParams.cc index 944fc9e..2bc997f 100644 --- a/pdf/xpdf/GlobalParams.cc +++ b/pdf/xpdf/GlobalParams.cc @@ -93,22 +93,24 @@ static struct { const char *name; const char *pattern; } displayFontTabFc[] = { - {"Courier", "Courier,Nimbus Mono L,Courier New,Cumberland AMT,Cumberland:style=Regular,Roman:outline=true"}, - {"Courier-Bold", "Courier,Nimbus Mono L,Courier New,Cumberland AMT,Cumberland:style=Bold:outline=true"}, - {"Courier-BoldOblique", "Courier,Nimbus Mono L,Courier New,Cumberland AMT,Cumberland:style=Oblique,Italic:outline=true"}, - {"Courier-Oblique", "Courier,Nimbus Mono L,Courier New,Cumberland AMT,Cumberland:style=BoldOblique,BoldItalic:outline=true"}, - {"Helvetica", "Helvetica,Nimbus Sans L,Arial,Albany AMT,Albany:style=Regular,Roman:outline=true"}, - {"Helvetica-Bold", "Helvetica,Nimbus Sans L,Arial,Albany AMT,Albany:style=Bold:outline=true"}, - {"Helvetica-BoldOblique", "Helvetica,Nimbus Sans L,Arial,Albany AMT,Albany:style=Oblique,Italic:outline=true"}, - {"Helvetica-Oblique", "Helvetica,Nimbus Sans L,Arial,Albany AMT,Albany:style=BoldOblique,BoldItalic:outline=true"}, + /* FIXME Adobe fonts should be here, but that breaks down if + fontconfig returns pcf fonts */ + {"Courier", "Nimbus Mono L,Courier New,Cumberland AMT,Cumberland:style=Regular,Roman"}, + {"Courier-Bold", "Nimbus Mono L,Courier New,Cumberland AMT,Cumberland:style=Bold"}, + {"Courier-BoldOblique", "Nimbus Mono L,Courier New,Cumberland AMT,Cumberland:style=Oblique,Italic"}, + {"Courier-Oblique", "Nimbus Mono L,Courier New,Cumberland AMT,Cumberland:style=BoldOblique,BoldItalic"}, + {"Helvetica", "Nimbus Sans L,Arial,Albany AMT,Albany:style=Regular,Roman"}, + {"Helvetica-Bold", "Nimbus Sans L,Arial,Albany AMT,Albany:style=Bold"}, + {"Helvetica-BoldOblique", "Nimbus Sans L,Arial,Albany AMT,Albany:style=Oblique,Italic"}, + {"Helvetica-Oblique", "Nimbus Sans L,Arial,Albany AMT,Albany:style=BoldOblique,BoldItalic"}, /* FIXME Symbol should be first, but that matches windows ttf which gets wrong encoding */ - {"Symbol", "Standard Symbols L,Symbol:outline=true"}, - {"Times-Bold", "Times,Nimbus Roman No9 L,Times New Roman,Thorndale AMT,Thorndale:style=Bold,Medium:outline=true"}, - {"Times-BoldItalic", "Times,Nimbus Roman No9 L,Times New Roman,Thorndale AMT,Thorndale:style=BoldItalic,Medium Italic:outline=true"}, - {"Times-Italic", "Times,Nimbus Roman No9 L,Times New Roman,Thorndale AMT,Thorndale:style=Italic,Regular Italic:outline=true"}, - {"Times-Roman", "Times,Nimbus Roman No9 L,Times New Roman,Thorndale AMT,Thorndale:style=Regular,Roman:outline=true"}, - {"ZapfDingbats", "Zapf Dingbats,Dingbats:outline=true"}, + {"Symbol", "Standard Symbols L,Symbol"}, + {"Times-Bold", "Nimbus Roman No9 L,Times New Roman,Thorndale AMT,Thorndale:style=Bold,Medium"}, + {"Times-BoldItalic", "Nimbus Roman No9 L,Times New Roman,Thorndale AMT,Thorndale:style=BoldItalic,Medium Italic"}, + {"Times-Italic", "Nimbus Roman No9 L,Times New Roman,Thorndale AMT,Thorndale:style=Italic,Regular Italic"}, + {"Times-Roman", "Nimbus Roman No9 L,Times New Roman,Thorndale AMT,Thorndale:style=Regular,Roman"}, + {"ZapfDingbats", "Dingbats:outline=true"}, {NULL} }; -- cgit v0.9.1