You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2020/09/01 18:28:58 UTC
svn commit: r1881368 -
/pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java
Author: tilman
Date: Tue Sep 1 18:28:58 2020
New Revision: 1881368
URL: http://svn.apache.org/viewvc?rev=1881368&view=rev
Log:
PDFBOX-4947: create a real List instead of an AbstractList (created by Arrays.asList) so that addSubstitute() works, as suggested by Lonzak
Modified:
pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java
Modified: pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java?rev=1881368&r1=1881367&r2=1881368&view=diff
==============================================================================
--- pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java (original)
+++ pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java Tue Sep 1 18:28:58 2020
@@ -58,45 +58,50 @@ final class FontMapperImpl implements Fo
{
// substitutes for standard 14 fonts
substitutes.put("Courier",
- Arrays.asList("CourierNew", "CourierNewPSMT", "LiberationMono", "NimbusMonL-Regu"));
+ new ArrayList<String>(Arrays.asList("CourierNew", "CourierNewPSMT", "LiberationMono",
+ "NimbusMonL-Regu")));
substitutes.put("Courier-Bold",
- Arrays.asList("CourierNewPS-BoldMT", "CourierNew-Bold", "LiberationMono-Bold",
- "NimbusMonL-Bold"));
+ new ArrayList<String>(Arrays.asList("CourierNewPS-BoldMT", "CourierNew-Bold",
+ "LiberationMono-Bold", "NimbusMonL-Bold")));
substitutes.put("Courier-Oblique",
- Arrays.asList("CourierNewPS-ItalicMT","CourierNew-Italic",
- "LiberationMono-Italic", "NimbusMonL-ReguObli"));
+ new ArrayList<String>(Arrays.asList("CourierNewPS-ItalicMT","CourierNew-Italic",
+ "LiberationMono-Italic", "NimbusMonL-ReguObli")));
substitutes.put("Courier-BoldOblique",
- Arrays.asList("CourierNewPS-BoldItalicMT","CourierNew-BoldItalic",
- "LiberationMono-BoldItalic", "NimbusMonL-BoldObli"));
+ new ArrayList<String>(Arrays.asList("CourierNewPS-BoldItalicMT",
+ "CourierNew-BoldItalic", "LiberationMono-BoldItalic",
+ "NimbusMonL-BoldObli")));
substitutes.put("Helvetica",
- Arrays.asList("ArialMT", "Arial", "LiberationSans", "NimbusSanL-Regu"));
+ new ArrayList<String>(Arrays.asList("ArialMT", "Arial", "LiberationSans",
+ "NimbusSanL-Regu")));
substitutes.put("Helvetica-Bold",
- Arrays.asList("Arial-BoldMT", "Arial-Bold", "LiberationSans-Bold",
- "NimbusSanL-Bold"));
+ new ArrayList<String>(Arrays.asList("Arial-BoldMT", "Arial-Bold",
+ "LiberationSans-Bold", "NimbusSanL-Bold")));
substitutes.put("Helvetica-Oblique",
- Arrays.asList("Arial-ItalicMT", "Arial-Italic", "Helvetica-Italic",
- "LiberationSans-Italic", "NimbusSanL-ReguItal"));
+ new ArrayList<String>(Arrays.asList("Arial-ItalicMT", "Arial-Italic",
+ "Helvetica-Italic", "LiberationSans-Italic", "NimbusSanL-ReguItal")));
substitutes.put("Helvetica-BoldOblique",
- Arrays.asList("Arial-BoldItalicMT", "Helvetica-BoldItalic",
- "LiberationSans-BoldItalic", "NimbusSanL-BoldItal"));
+ new ArrayList<String>(Arrays.asList("Arial-BoldItalicMT", "Helvetica-BoldItalic",
+ "LiberationSans-BoldItalic", "NimbusSanL-BoldItal")));
substitutes.put("Times-Roman",
- Arrays.asList("TimesNewRomanPSMT", "TimesNewRoman", "TimesNewRomanPS",
- "LiberationSerif", "NimbusRomNo9L-Regu"));
+ new ArrayList<String>(Arrays.asList("TimesNewRomanPSMT", "TimesNewRoman",
+ "TimesNewRomanPS", "LiberationSerif", "NimbusRomNo9L-Regu")));
substitutes.put("Times-Bold",
- Arrays.asList("TimesNewRomanPS-BoldMT", "TimesNewRomanPS-Bold",
+ new ArrayList<String>(Arrays.asList("TimesNewRomanPS-BoldMT", "TimesNewRomanPS-Bold",
"TimesNewRoman-Bold", "LiberationSerif-Bold",
- "NimbusRomNo9L-Medi"));
+ "NimbusRomNo9L-Medi")));
substitutes.put("Times-Italic",
- Arrays.asList("TimesNewRomanPS-ItalicMT", "TimesNewRomanPS-Italic",
- "TimesNewRoman-Italic", "LiberationSerif-Italic",
- "NimbusRomNo9L-ReguItal"));
+ new ArrayList<String>(Arrays.asList("TimesNewRomanPS-ItalicMT",
+ "TimesNewRomanPS-Italic", "TimesNewRoman-Italic", "LiberationSerif-Italic",
+ "NimbusRomNo9L-ReguItal")));
substitutes.put("Times-BoldItalic",
- Arrays.asList("TimesNewRomanPS-BoldItalicMT", "TimesNewRomanPS-BoldItalic",
- "TimesNewRoman-BoldItalic", "LiberationSerif-BoldItalic",
- "NimbusRomNo9L-MediItal"));
- substitutes.put("Symbol", Arrays.asList("Symbol", "SymbolMT", "StandardSymL"));
- substitutes.put("ZapfDingbats", Arrays.asList("ZapfDingbatsITCbyBT-Regular",
- "ZapfDingbatsITC", "Dingbats", "MS-Gothic"));
+ new ArrayList<String>(Arrays.asList("TimesNewRomanPS-BoldItalicMT",
+ "TimesNewRomanPS-BoldItalic", "TimesNewRoman-BoldItalic",
+ "LiberationSerif-BoldItalic", "NimbusRomNo9L-MediItal")));
+ substitutes.put("Symbol",
+ new ArrayList<String>(Arrays.asList("Symbol", "SymbolMT", "StandardSymL")));
+ substitutes.put("ZapfDingbats", new ArrayList<String>(
+ Arrays.asList("ZapfDingbatsITCbyBT-Regular", "ZapfDingbatsITC", "Dingbats",
+ "MS-Gothic")));
// Acrobat also uses alternative names for Standard 14 fonts, which we map to those above
// these include names such as "Arial" and "TimesNewRoman"