1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
from fedora: https://src.fedoraproject.org/rpms/xpdf/raw/f44/f/xpdf-4.06-urw-base35-fonts.patch
see https://bugs.gentoo.org/916446
fix urw-fonts
--- xpdf-4.06/xpdf/GlobalParams.cc.urw-font-fix
+++ xpdf-4.06/xpdf/GlobalParams.cc
@@ -84,98 +84,98 @@ static struct {
double obliqueFactor; // oblique sheer factor
} displayFontTab[] = {
{"Courier", // name
- "n022003l.pfb", // t1FileName
+ "NimbusMonoPS-Regular.t1", // t1FileName
"cour.ttf", // ttFileName
"Courier", "Courier", // macFileName, macFontName
"NimbusMonoPS-Regular", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"Courier-Bold", // name
- "n022004l.pfb", // t1FileName
+ "NimbusMonoPS-Bold.t1", // t1FileName
"courbd.ttf", // ttFileName
"Courier", "Courier Bold", // macFileName, macFontName
"NimbusMonoPS-Bold", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"Courier-BoldOblique", // name
- "n022024l.pfb", // t1FileName
+ "NimbusMonoPS-BoldItalic.t1", // t1FileName
"courbi.ttf", // ttFileName
"Courier", "Courier Bold Oblique", // macFileName, macFontName
"NimbusMonoPS-BoldItalic", // fcFontName
"Courier-Bold", 0.212557 // obliqueFont, obliqueFactor
},
{"Courier-Oblique", // name
- "n022023l.pfb", // t1FileName
+ "NimbusMonoPS-Italic.t1", // t1FileName
"couri.ttf", // ttFileName
"Courier", "Courier Oblique", // macFileName, macFontName
"NimbusMonoPS-Italic", // fcFontName
"Courier", 0.212557 // obliqueFont, obliqueFactor
},
{"Helvetica", // name
- "n019003l.pfb", // t1FileName
+ "NimbusSans-Regular.t1", // t1FileName
"arial.ttf", // ttFileName
"Helvetica", "Helvetica", // macFileName, macFontName
"NimbusSans-Regular", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"Helvetica-Bold", // name
- "n019004l.pfb", // t1FileName
+ "NimbusSans-Bold.t1", // t1FileName
"arialbd.ttf", // ttFileName
"Helvetica", "Helvetica Bold", // macFileName, macFontName
"NimbusSans-Bold", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"Helvetica-BoldOblique", // name
- "n019024l.pfb", // t1FileName
+ "NimbusSans-BoldItalic.t1", // t1FileName
"arialbi.ttf", // ttFileName
"Helvetica", "Helvetica Bold Oblique", // macFileName, macFontName
"NimbusSans-BoldItalic", // fcFontName
"Helvetica-Bold", 0.212557 // obliqueFont, obliqueFactor
},
{"Helvetica-Oblique", // name
- "n019023l.pfb", // t1FileName
+ "NimbusSans-Italic.t1", // t1FileName
"ariali.ttf", // ttFileName
"Helvetica", "Helvetica Oblique", // macFileName, macFontName
"NimbusSans-Italic", // fcFontName
"Helvetica", 0.212557 // obliqueFont, obliqueFactor
},
{"Symbol", // name
- "s050000l.pfb", // t1FileName
+ "StandardSymbolsPS.t1", // t1FileName
NULL, // ttFileName
"Symbol", "Symbol", // macFileName, macFontName
"Standard Symbols PS", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"Times-Bold", // name
- "n021004l.pfb", // t1FileName
+ "NimbusRoman-Bold.t1", // t1FileName
"timesbd.ttf", // ttFileName
"Times", "Times Bold", // macFileName, macFontName
"NimbusRoman-Bold", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"Times-BoldItalic", // name
- "n021024l.pfb", // t1FileName
+ "NimbusRoman-BoldItalic.t1", // t1FileName
"timesbi.ttf", // ttFileName
"Times", "Times Bold Italic", // macFileName, macFontName
"NimbusRoman-BoldItalic", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"Times-Italic", // name
- "n021023l.pfb", // t1FileName
+ "NimbusRoman-Italic.t1", // t1FileName
"timesi.ttf", // ttFileName
"Times", "Times Italic", // macFileName, macFontName
"NimbusRoman-Italic", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"Times-Roman", // name
- "n021003l.pfb", // t1FileName
+ "NimbusRoman-Regular.t1", // t1FileName
"times.ttf", // ttFileName
"Times", "Times Roman", // macFileName, macFontName
"NimbusRoman-Regular", // fcFontName
NULL, 0 // obliqueFont, obliqueFactor
},
{"ZapfDingbats", // name
- "d050000l.pfb", // t1FileName
+ "D050000L.t1", // t1FileName
NULL, // ttFileName
"ZapfDingbats", "Zapf Dingbats", // macFileName, macFontName
"D050000L", // fcFontName
@@ -192,6 +192,7 @@ static const char *displayFontDirs[] = {
"c:/windows/fonts",
"c:/winnt/fonts",
#else // _WIN32
+ "/usr/share/fonts/urw-fonts",
"/usr/share/ghostscript/fonts",
"/usr/local/share/ghostscript/fonts",
"/usr/share/fonts/default/Type1",
@@ -2788,7 +2789,7 @@ UnicodeRemapping *GlobalParams::getUnico
}
GString *GlobalParams::findFontFile(GString *fontName) {
- static const char *exts[] = { ".pfa", ".pfb", ".ttf", ".ttc", ".otf" };
+ static const char *exts[] = { ".pfa", ".pfb", ".t1", ".ttf", ".ttc", ".otf" };
GString *path, *dir;
#ifdef _WIN32
GString *fontNameU;
|
