summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2011-10-20 00:54:29 +0200
committerAlbert Astals Cid <aacid@kde.org>2011-10-20 00:54:29 +0200
commit9f42d17b11ff57aaa9b764d210813156214deae0 (patch)
treeb25fd59aba3c5b5d548fa3e6fb0fa5b528bc8094
parent77978cf2a7a361969201babc1b4707488ac819bc (diff)
xpdf303: More stuff into base14FontMap
-rw-r--r--ALL_DIFF46
1 files changed, 2 insertions, 44 deletions
diff --git a/ALL_DIFF b/ALL_DIFF
index a0731c7..922c8c8 100644
--- a/ALL_DIFF
+++ b/ALL_DIFF
@@ -9176,51 +9176,9 @@ diff -ru xpdf-3.02/xpdf/GfxFont.cc xpdf-3.03/xpdf/GfxFont.cc
#include "FoFiType1.h"
#include "FoFiType1C.h"
#include "FoFiTrueType.h"
-@@ -54,9 +55,13 @@
- { "Arial-Italic", "Helvetica-Oblique" },
- { "Arial-ItalicMT", "Helvetica-Oblique" },
- { "ArialMT", "Helvetica" },
-+ { "Courier", "Courier" },
- { "Courier,Bold", "Courier-Bold" },
- { "Courier,BoldItalic", "Courier-BoldOblique" },
- { "Courier,Italic", "Courier-Oblique" },
-+ { "Courier-Bold", "Courier-Bold" },
-+ { "Courier-BoldOblique", "Courier-BoldOblique" },
-+ { "Courier-Oblique", "Courier-Oblique" },
- { "CourierNew", "Courier" },
- { "CourierNew,Bold", "Courier-Bold" },
- { "CourierNew,BoldItalic", "Courier-BoldOblique" },
-@@ -68,14 +73,23 @@
- { "CourierNewPS-BoldMT", "Courier-Bold" },
- { "CourierNewPS-ItalicMT", "Courier-Oblique" },
- { "CourierNewPSMT", "Courier" },
-+ { "Helvetica", "Helvetica" },
- { "Helvetica,Bold", "Helvetica-Bold" },
- { "Helvetica,BoldItalic", "Helvetica-BoldOblique" },
- { "Helvetica,Italic", "Helvetica-Oblique" },
-+ { "Helvetica-Bold", "Helvetica-Bold" },
- { "Helvetica-BoldItalic", "Helvetica-BoldOblique" },
-+ { "Helvetica-BoldOblique", "Helvetica-BoldOblique" },
- { "Helvetica-Italic", "Helvetica-Oblique" },
-+ { "Helvetica-Oblique", "Helvetica-Oblique" },
-+ { "Symbol", "Symbol" },
- { "Symbol,Bold", "Symbol" },
- { "Symbol,BoldItalic", "Symbol" },
- { "Symbol,Italic", "Symbol" },
-+ { "Times-Bold", "Times-Bold" },
-+ { "Times-BoldItalic", "Times-BoldItalic" },
-+ { "Times-Italic", "Times-Italic" },
-+ { "Times-Roman", "Times-Roman" },
- { "TimesNewRoman", "Times-Roman" },
- { "TimesNewRoman,Bold", "Times-Bold" },
- { "TimesNewRoman,BoldItalic", "Times-BoldItalic" },
@@ -93,15 +107,66 @@
- { "TimesNewRomanPSMT", "Times-Roman" },
- { "TimesNewRomanPSMT,Bold", "Times-Bold" },
- { "TimesNewRomanPSMT,BoldItalic", "Times-BoldItalic" },
-- { "TimesNewRomanPSMT,Italic", "Times-Italic" }
-+ { "TimesNewRomanPSMT,Italic", "Times-Italic" },
-+ { "ZapfDingbats", "ZapfDingbats" }
+ { "TimesNewRomanPSMT,Italic", "Times-Italic" },
+ { "ZapfDingbats", "ZapfDingbats" }
};
//------------------------------------------------------------------------