From f162fed6b9b017e82df28d4b66492d0c59e02fa8 Mon Sep 17 00:00:00 2001 From: Tim van der Meij Date: Sat, 5 Jan 2019 19:03:53 +0100 Subject: [PATCH] Convert `src/core/charsets.js` and `src/core/standard_fonts.js` to ES6 syntax Moreover, include the "no var" ESLint comment to `src/core/annotation.js` and `src/core/ps_parser.js` since they are already converted. --- src/core/annotation.js | 1 + src/core/charsets.js | 7 ++++--- src/core/ps_parser.js | 1 + src/core/standard_fonts.js | 15 ++++++++------- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/core/annotation.js b/src/core/annotation.js index db95bd6be..c9dfa7faf 100644 --- a/src/core/annotation.js +++ b/src/core/annotation.js @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/* eslint no-var: error */ import { AnnotationBorderStyleType, AnnotationFieldFlag, AnnotationFlag, diff --git a/src/core/charsets.js b/src/core/charsets.js index fcf47da3a..2f6652efa 100644 --- a/src/core/charsets.js +++ b/src/core/charsets.js @@ -12,8 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/* eslint no-var: error */ -var ISOAdobeCharset = [ +const ISOAdobeCharset = [ '.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent', 'ampersand', 'quoteright', 'parenleft', 'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash', 'zero', @@ -50,7 +51,7 @@ var ISOAdobeCharset = [ 'ugrave', 'yacute', 'ydieresis', 'zcaron' ]; -var ExpertCharset = [ +const ExpertCharset = [ '.notdef', 'space', 'exclamsmall', 'Hungarumlautsmall', 'dollaroldstyle', 'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior', 'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma', @@ -90,7 +91,7 @@ var ExpertCharset = [ 'Ydieresissmall' ]; -var ExpertSubsetCharset = [ +const ExpertSubsetCharset = [ '.notdef', 'space', 'dollaroldstyle', 'dollarsuperior', 'parenleftsuperior', 'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma', 'hyphen', 'period', 'fraction', diff --git a/src/core/ps_parser.js b/src/core/ps_parser.js index e28a6e98a..8428760a1 100644 --- a/src/core/ps_parser.js +++ b/src/core/ps_parser.js @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/* eslint no-var: error */ import { FormatError, isSpace, shadow } from '../shared/util'; import { EOF } from './primitives'; diff --git a/src/core/standard_fonts.js b/src/core/standard_fonts.js index 3cb2e0160..9ead2b1c7 100644 --- a/src/core/standard_fonts.js +++ b/src/core/standard_fonts.js @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/* eslint no-var: error */ import { getLookupTableFactory } from '../shared/util'; @@ -19,7 +20,7 @@ import { getLookupTableFactory } from '../shared/util'; * Hold a map of decoded fonts and of the standard fourteen Type1 * fonts and their acronyms. */ -var getStdFontMap = getLookupTableFactory(function (t) { +const getStdFontMap = getLookupTableFactory(function (t) { t['ArialNarrow'] = 'Helvetica'; t['ArialNarrow-Bold'] = 'Helvetica-Bold'; t['ArialNarrow-BoldItalic'] = 'Helvetica-BoldOblique'; @@ -82,7 +83,7 @@ var getStdFontMap = getLookupTableFactory(function (t) { * Holds the map of the non-standard fonts that might be included as * a standard fonts without glyph data. */ -var getNonStdFontMap = getLookupTableFactory(function (t) { +const getNonStdFontMap = getLookupTableFactory(function (t) { t['Calibri'] = 'Helvetica'; t['Calibri-Bold'] = 'Helvetica-Bold'; t['Calibri-BoldItalic'] = 'Helvetica-BoldOblique'; @@ -120,7 +121,7 @@ var getNonStdFontMap = getLookupTableFactory(function (t) { t['Wingdings'] = 'ZapfDingbats'; }); -var getSerifFonts = getLookupTableFactory(function (t) { +const getSerifFonts = getLookupTableFactory(function (t) { t['Adobe Jenson'] = true; t['Adobe Text'] = true; t['Albertus'] = true; @@ -256,7 +257,7 @@ var getSerifFonts = getLookupTableFactory(function (t) { t['XITS'] = true; }); -var getSymbolsFonts = getLookupTableFactory(function (t) { +const getSymbolsFonts = getLookupTableFactory(function (t) { t['Dingbats'] = true; t['Symbol'] = true; t['ZapfDingbats'] = true; @@ -265,7 +266,7 @@ var getSymbolsFonts = getLookupTableFactory(function (t) { // Glyph map for well-known standard fonts. Sometimes Ghostscript uses CID // fonts, but does not embed the CID to GID mapping. The mapping is incomplete // for all glyphs, but common for some set of the standard fonts. -var getGlyphMapForStandardFonts = getLookupTableFactory(function (t) { +const getGlyphMapForStandardFonts = getLookupTableFactory(function (t) { t[2] = 10; t[3] = 32; t[4] = 33; t[5] = 34; t[6] = 35; t[7] = 36; t[8] = 37; t[9] = 38; t[10] = 39; t[11] = 40; t[12] = 41; t[13] = 42; t[14] = 43; t[15] = 44; t[16] = 45; t[17] = 46; t[18] = 47; t[19] = 48; t[20] = 49; @@ -355,7 +356,7 @@ var getGlyphMapForStandardFonts = getLookupTableFactory(function (t) { // The glyph map for ArialBlack differs slightly from the glyph map used for // other well-known standard fonts. Hence we use this (incomplete) CID to GID // mapping to adjust the glyph map for non-embedded ArialBlack fonts. -var getSupplementalGlyphMapForArialBlack = +const getSupplementalGlyphMapForArialBlack = getLookupTableFactory(function (t) { t[227] = 322; t[264] = 261; t[291] = 346; }); @@ -363,7 +364,7 @@ var getSupplementalGlyphMapForArialBlack = // The glyph map for Calibri (a Windows font) differs from the glyph map used // in the standard fonts. Hence we use this (incomplete) CID to GID mapping to // adjust the glyph map for non-embedded Calibri fonts. -let getSupplementalGlyphMapForCalibri = getLookupTableFactory(function(t) { +const getSupplementalGlyphMapForCalibri = getLookupTableFactory(function(t) { t[1] = 32; t[4] = 65; t[17] = 66; t[18] = 67; t[24] = 68; t[28] = 69; t[38] = 70; t[39] = 71; t[44] = 72; t[47] = 73; t[58] = 74; t[60] = 75; t[62] = 76; t[68] = 77; t[69] = 78; t[75] = 79; t[87] = 80; t[89] = 81;